From b43f6cb7ef33f38ee494f639e2704a25c1e68332 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Wed, 28 Feb 2024 21:52:10 +1100 Subject: [PATCH 001/333] Branch point for 2024q2 Breaking Change --- readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/readme.md b/readme.md index f0e49a08e95..c277ca0aade 100644 --- a/readme.md +++ b/readme.md @@ -1,3 +1,7 @@ +# THIS IS THE DEVELOP BRANCH + +Warning- This is the `develop` branch of QMK Firmware. You may encounter broken code here. Please see [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) for more information. + # Quantum Mechanical Keyboard Firmware [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags) From 0e02b0c41e47d5f5ad799a9860869b9d30ab881a Mon Sep 17 00:00:00 2001 From: Stefan Kerkmann Date: Wed, 28 Feb 2024 12:00:27 +0100 Subject: [PATCH 002/333] [Core] Refactor ChibiOS USB endpoints to be fully async (#21656) --- tmk_core/protocol/chibios/chibios.c | 16 +- tmk_core/protocol/chibios/chibios.mk | 2 + tmk_core/protocol/chibios/usb_driver.c | 586 +++++-------- tmk_core/protocol/chibios/usb_driver.h | 312 ++++--- tmk_core/protocol/chibios/usb_endpoints.c | 152 ++++ tmk_core/protocol/chibios/usb_endpoints.h | 137 +++ tmk_core/protocol/chibios/usb_main.c | 816 +++++------------- tmk_core/protocol/chibios/usb_main.h | 41 +- .../protocol/chibios/usb_report_handling.c | 296 +++++++ .../protocol/chibios/usb_report_handling.h | 77 ++ tmk_core/protocol/report.h | 8 +- tmk_core/protocol/usb_descriptor.h | 2 + 12 files changed, 1311 insertions(+), 1134 deletions(-) create mode 100644 tmk_core/protocol/chibios/usb_endpoints.c create mode 100644 tmk_core/protocol/chibios/usb_endpoints.h create mode 100644 tmk_core/protocol/chibios/usb_report_handling.c create mode 100644 tmk_core/protocol/chibios/usb_report_handling.h diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c index 91bb252c7c3..76a37ae538a 100644 --- a/tmk_core/protocol/chibios/chibios.c +++ b/tmk_core/protocol/chibios/chibios.c @@ -192,15 +192,18 @@ void protocol_pre_task(void) { /* Remote wakeup */ if ((USB_DRIVER.status & USB_GETSTATUS_REMOTE_WAKEUP_ENABLED) && suspend_wakeup_condition()) { usbWakeupHost(&USB_DRIVER); - restart_usb_driver(&USB_DRIVER); +# if USB_SUSPEND_WAKEUP_DELAY > 0 + // Some hubs, kvm switches, and monitors do + // weird things, with USB device state bouncing + // around wildly on wakeup, yielding race + // conditions that can corrupt the keyboard state. + // + // Pause for a while to let things settle... + wait_ms(USB_SUSPEND_WAKEUP_DELAY); +# endif } } /* Woken up */ - // variables has been already cleared by the wakeup hook - send_keyboard_report(); -# ifdef MOUSEKEY_ENABLE - mousekey_send(); -# endif /* MOUSEKEY_ENABLE */ } #endif } @@ -218,4 +221,5 @@ void protocol_post_task(void) { #ifdef RAW_ENABLE raw_hid_task(); #endif + usb_idle_task(); } diff --git a/tmk_core/protocol/chibios/chibios.mk b/tmk_core/protocol/chibios/chibios.mk index 8eaf5b10d29..aee3f5f0564 100644 --- a/tmk_core/protocol/chibios/chibios.mk +++ b/tmk_core/protocol/chibios/chibios.mk @@ -6,6 +6,8 @@ SRC += $(CHIBIOS_DIR)/usb_main.c SRC += $(CHIBIOS_DIR)/chibios.c SRC += usb_descriptor.c SRC += $(CHIBIOS_DIR)/usb_driver.c +SRC += $(CHIBIOS_DIR)/usb_endpoints.c +SRC += $(CHIBIOS_DIR)/usb_report_handling.c SRC += $(CHIBIOS_DIR)/usb_util.c SRC += $(LIBSRC) diff --git a/tmk_core/protocol/chibios/usb_driver.c b/tmk_core/protocol/chibios/usb_driver.c index ad45f9b1daa..7c3ce446876 100644 --- a/tmk_core/protocol/chibios/usb_driver.c +++ b/tmk_core/protocol/chibios/usb_driver.c @@ -1,127 +1,51 @@ -/* - ChibiOS - Copyright (C) 2006..2016 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. -*/ - -/** - * @file hal_serial_usb.c - * @brief Serial over USB Driver code. - * - * @addtogroup SERIAL_USB - * @{ - */ +// Copyright 2023 Stefan Kerkmann (@KarlK90) +// Copyright 2021 Purdea Andrei +// Copyright 2021 Michael Stapelberg +// Copyright 2020 Ryan (@fauxpark) +// Copyright 2016 Fredizzimo +// Copyright 2016 Giovanni Di Sirio +// SPDX-License-Identifier: GPL-3.0-or-later OR Apache-2.0 #include -#include "usb_driver.h" #include -/*===========================================================================*/ -/* Driver local definitions. */ -/*===========================================================================*/ - -/*===========================================================================*/ -/* Driver exported variables. */ -/*===========================================================================*/ - -/*===========================================================================*/ -/* Driver local variables and types. */ -/*===========================================================================*/ - -/* - * Current Line Coding. - */ -static cdc_linecoding_t linecoding = {{0x00, 0x96, 0x00, 0x00}, /* 38400. */ - LC_STOP_1, - LC_PARITY_NONE, - 8}; +#include "usb_driver.h" +#include "util.h" /*===========================================================================*/ /* Driver local functions. */ /*===========================================================================*/ -static bool qmkusb_start_receive(QMKUSBDriver *qmkusbp) { - uint8_t *buf; - +static void usb_start_receive(usb_endpoint_out_t *endpoint) { /* If the USB driver is not in the appropriate state then transactions must not be started.*/ - if ((usbGetDriverStateI(qmkusbp->config->usbp) != USB_ACTIVE) || (qmkusbp->state != QMKUSB_READY)) { - return true; + if ((usbGetDriverStateI(endpoint->config.usbp) != USB_ACTIVE)) { + return; } /* Checking if there is already a transaction ongoing on the endpoint.*/ - if (usbGetReceiveStatusI(qmkusbp->config->usbp, qmkusbp->config->bulk_out)) { - return true; + if (usbGetReceiveStatusI(endpoint->config.usbp, endpoint->config.ep)) { + return; } /* Checking if there is a buffer ready for incoming data.*/ - buf = ibqGetEmptyBufferI(&qmkusbp->ibqueue); - if (buf == NULL) { - return true; + uint8_t *buffer = ibqGetEmptyBufferI(&endpoint->ibqueue); + if (buffer == NULL) { + return; } /* Buffer found, starting a new transaction.*/ - usbStartReceiveI(qmkusbp->config->usbp, qmkusbp->config->bulk_out, buf, qmkusbp->ibqueue.bsize - sizeof(size_t)); - - return false; + usbStartReceiveI(endpoint->config.usbp, endpoint->config.ep, buffer, endpoint->ibqueue.bsize - sizeof(size_t)); } -/* - * Interface implementation. - */ - -static size_t _write(void *ip, const uint8_t *bp, size_t n) { - return obqWriteTimeout(&((QMKUSBDriver *)ip)->obqueue, bp, n, TIME_INFINITE); -} - -static size_t _read(void *ip, uint8_t *bp, size_t n) { - return ibqReadTimeout(&((QMKUSBDriver *)ip)->ibqueue, bp, n, TIME_INFINITE); -} - -static msg_t _put(void *ip, uint8_t b) { - return obqPutTimeout(&((QMKUSBDriver *)ip)->obqueue, b, TIME_INFINITE); -} - -static msg_t _get(void *ip) { - return ibqGetTimeout(&((QMKUSBDriver *)ip)->ibqueue, TIME_INFINITE); -} - -static msg_t _putt(void *ip, uint8_t b, sysinterval_t timeout) { - return obqPutTimeout(&((QMKUSBDriver *)ip)->obqueue, b, timeout); -} - -static msg_t _gett(void *ip, sysinterval_t timeout) { - return ibqGetTimeout(&((QMKUSBDriver *)ip)->ibqueue, timeout); -} - -static size_t _writet(void *ip, const uint8_t *bp, size_t n, sysinterval_t timeout) { - return obqWriteTimeout(&((QMKUSBDriver *)ip)->obqueue, bp, n, timeout); -} - -static size_t _readt(void *ip, uint8_t *bp, size_t n, sysinterval_t timeout) { - return ibqReadTimeout(&((QMKUSBDriver *)ip)->ibqueue, bp, n, timeout); -} - -static const struct QMKUSBDriverVMT vmt = {0, _write, _read, _put, _get, _putt, _gett, _writet, _readt}; - /** * @brief Notification of empty buffer released into the input buffers queue. * * @param[in] bqp the buffers queue pointer. */ static void ibnotify(io_buffers_queue_t *bqp) { - QMKUSBDriver *qmkusbp = bqGetLinkX(bqp); - (void)qmkusb_start_receive(qmkusbp); + usb_endpoint_out_t *endpoint = bqGetLinkX(bqp); + usb_start_receive(endpoint); } /** @@ -130,22 +54,22 @@ static void ibnotify(io_buffers_queue_t *bqp) { * @param[in] bqp the buffers queue pointer. */ static void obnotify(io_buffers_queue_t *bqp) { - size_t n; - QMKUSBDriver *qmkusbp = bqGetLinkX(bqp); + usb_endpoint_in_t *endpoint = bqGetLinkX(bqp); - /* If the USB driver is not in the appropriate state then transactions + /* If the USB endpoint is not in the appropriate state then transactions must not be started.*/ - if ((usbGetDriverStateI(qmkusbp->config->usbp) != USB_ACTIVE) || (qmkusbp->state != QMKUSB_READY)) { + if ((usbGetDriverStateI(endpoint->config.usbp) != USB_ACTIVE)) { return; } /* Checking if there is already a transaction ongoing on the endpoint.*/ - if (!usbGetTransmitStatusI(qmkusbp->config->usbp, qmkusbp->config->bulk_in)) { + if (!usbGetTransmitStatusI(endpoint->config.usbp, endpoint->config.ep)) { /* Trying to get a full buffer.*/ - uint8_t *buf = obqGetFullBufferI(&qmkusbp->obqueue, &n); - if (buf != NULL) { + size_t n; + uint8_t *buffer = obqGetFullBufferI(&endpoint->obqueue, &n); + if (buffer != NULL) { /* Buffer found, starting a new transaction.*/ - usbStartTransmitI(qmkusbp->config->usbp, qmkusbp->config->bulk_in, buf, n); + usbStartTransmitI(endpoint->config.usbp, endpoint->config.ep, buffer, n); } } } @@ -154,264 +78,149 @@ static void obnotify(io_buffers_queue_t *bqp) { /* Driver exported functions. */ /*===========================================================================*/ -/** - * @brief Serial Driver initialization. - * @note This function is implicitly invoked by @p halInit(), there is - * no need to explicitly initialize the driver. - * - * @init - */ -void qmkusbInit(void) {} +void usb_endpoint_in_init(usb_endpoint_in_t *endpoint) { + usb_endpoint_config_t *config = &endpoint->config; + endpoint->ep_config.in_state = &endpoint->ep_in_state; -/** - * @brief Initializes a generic full duplex driver object. - * @details The HW dependent part of the initialization has to be performed - * outside, usually in the hardware initialization code. - * - * @param[out] qmkusbp pointer to a @p QMKUSBDriver structure - * - * @init - */ -void qmkusbObjectInit(QMKUSBDriver *qmkusbp, const QMKUSBConfig *config) { - qmkusbp->vmt = &vmt; - osalEventObjectInit(&qmkusbp->event); - qmkusbp->state = QMKUSB_STOP; - // Note that the config uses the USB direction naming - ibqObjectInit(&qmkusbp->ibqueue, true, config->ob, config->out_size, config->out_buffers, ibnotify, qmkusbp); - obqObjectInit(&qmkusbp->obqueue, true, config->ib, config->in_size, config->in_buffers, obnotify, qmkusbp); +#if defined(USB_ENDPOINTS_ARE_REORDERABLE) + if (endpoint->is_shared) { + endpoint->ep_config.out_state = &endpoint->ep_out_state; + } +#endif + obqObjectInit(&endpoint->obqueue, true, config->buffer, config->buffer_size, config->buffer_capacity, obnotify, endpoint); } -/** - * @brief Configures and starts the driver. - * - * @param[in] qmkusbp pointer to a @p QMKUSBDriver object - * @param[in] config the serial over USB driver configuration - * - * @api - */ -void qmkusbStart(QMKUSBDriver *qmkusbp, const QMKUSBConfig *config) { - USBDriver *usbp = config->usbp; +void usb_endpoint_out_init(usb_endpoint_out_t *endpoint) { + usb_endpoint_config_t *config = &endpoint->config; + endpoint->ep_config.out_state = &endpoint->ep_out_state; + ibqObjectInit(&endpoint->ibqueue, true, config->buffer, config->buffer_size, config->buffer_capacity, ibnotify, endpoint); +} - osalDbgCheck(qmkusbp != NULL); +void usb_endpoint_in_start(usb_endpoint_in_t *endpoint) { + osalDbgCheck(endpoint != NULL); osalSysLock(); - osalDbgAssert((qmkusbp->state == QMKUSB_STOP) || (qmkusbp->state == QMKUSB_READY), "invalid state"); - usbp->in_params[config->bulk_in - 1U] = qmkusbp; - usbp->out_params[config->bulk_out - 1U] = qmkusbp; - if (config->int_in > 0U) { - usbp->in_params[config->int_in - 1U] = qmkusbp; - } - qmkusbp->config = config; - qmkusbp->state = QMKUSB_READY; + osalDbgAssert((usbGetDriverStateI(endpoint->config.usbp) == USB_STOP) || (usbGetDriverStateI(endpoint->config.usbp) == USB_READY), "invalid state"); + endpoint->config.usbp->in_params[endpoint->config.ep - 1U] = endpoint; + endpoint->timed_out = false; osalSysUnlock(); } -/** - * @brief Stops the driver. - * @details Any thread waiting on the driver's queues will be awakened with - * the message @p MSG_RESET. - * - * @param[in] qmkusbp pointer to a @p QMKUSBDriver object - * - * @api - */ -void qmkusbStop(QMKUSBDriver *qmkusbp) { - USBDriver *usbp = qmkusbp->config->usbp; - - osalDbgCheck(qmkusbp != NULL); +void usb_endpoint_out_start(usb_endpoint_out_t *endpoint) { + osalDbgCheck(endpoint != NULL); osalSysLock(); + osalDbgAssert((usbGetDriverStateI(endpoint->config.usbp) == USB_STOP) || (usbGetDriverStateI(endpoint->config.usbp) == USB_READY), "invalid state"); + endpoint->config.usbp->out_params[endpoint->config.ep - 1U] = endpoint; + endpoint->timed_out = false; + osalSysUnlock(); +} - osalDbgAssert((qmkusbp->state == QMKUSB_STOP) || (qmkusbp->state == QMKUSB_READY), "invalid state"); +void usb_endpoint_in_stop(usb_endpoint_in_t *endpoint) { + osalDbgCheck(endpoint != NULL); - /* Driver in stopped state.*/ - usbp->in_params[qmkusbp->config->bulk_in - 1U] = NULL; - usbp->out_params[qmkusbp->config->bulk_out - 1U] = NULL; - if (qmkusbp->config->int_in > 0U) { - usbp->in_params[qmkusbp->config->int_in - 1U] = NULL; + osalSysLock(); + endpoint->config.usbp->in_params[endpoint->config.ep - 1U] = NULL; + + bqSuspendI(&endpoint->obqueue); + obqResetI(&endpoint->obqueue); + if (endpoint->report_storage != NULL) { + endpoint->report_storage->reset_report(endpoint->report_storage->reports); } - qmkusbp->config = NULL; - qmkusbp->state = QMKUSB_STOP; - - /* Enforces a disconnection.*/ - chnAddFlagsI(qmkusbp, CHN_DISCONNECTED); - ibqResetI(&qmkusbp->ibqueue); - obqResetI(&qmkusbp->obqueue); osalOsRescheduleS(); - osalSysUnlock(); } -/** - * @brief USB device suspend handler. - * @details Generates a @p CHN_DISCONNECT event and puts queues in - * non-blocking mode, this way the application cannot get stuck - * in the middle of an I/O operations. - * @note If this function is not called from an ISR then an explicit call - * to @p osalOsRescheduleS() in necessary afterward. - * - * @param[in] qmkusbp pointer to a @p QMKUSBDriver object - * - * @iclass - */ -void qmkusbSuspendHookI(QMKUSBDriver *qmkusbp) { - chnAddFlagsI(qmkusbp, CHN_DISCONNECTED); - bqSuspendI(&qmkusbp->ibqueue); - bqSuspendI(&qmkusbp->obqueue); +void usb_endpoint_out_stop(usb_endpoint_out_t *endpoint) { + osalDbgCheck(endpoint != NULL); + + osalSysLock(); + osalDbgAssert((usbGetDriverStateI(endpoint->config.usbp) == USB_STOP) || (usbGetDriverStateI(endpoint->config.usbp) == USB_READY), "invalid state"); + + bqSuspendI(&endpoint->ibqueue); + ibqResetI(&endpoint->ibqueue); + osalOsRescheduleS(); + osalSysUnlock(); } -/** - * @brief USB device wakeup handler. - * @details Generates a @p CHN_CONNECT event and resumes normal queues - * operations. - * - * @note If this function is not called from an ISR then an explicit call - * to @p osalOsRescheduleS() in necessary afterward. - * - * @param[in] qmkusbp pointer to a @p QMKUSBDriver object - * - * @iclass - */ -void qmkusbWakeupHookI(QMKUSBDriver *qmkusbp) { - chnAddFlagsI(qmkusbp, CHN_CONNECTED); - bqResumeX(&qmkusbp->ibqueue); - bqResumeX(&qmkusbp->obqueue); -} +void usb_endpoint_in_suspend_cb(usb_endpoint_in_t *endpoint) { + bqSuspendI(&endpoint->obqueue); + obqResetI(&endpoint->obqueue); -/** - * @brief USB device configured handler. - * - * @param[in] qmkusbp pointer to a @p QMKUSBDriver object - * - * @iclass - */ -void qmkusbConfigureHookI(QMKUSBDriver *qmkusbp) { - ibqResetI(&qmkusbp->ibqueue); - bqResumeX(&qmkusbp->ibqueue); - obqResetI(&qmkusbp->obqueue); - bqResumeX(&qmkusbp->obqueue); - chnAddFlagsI(qmkusbp, CHN_CONNECTED); - (void)qmkusb_start_receive(qmkusbp); -} - -/** - * @brief Default requests hook. - * @details Applications wanting to use the Serial over USB driver can use - * this function as requests hook in the USB configuration. - * The following requests are emulated: - * - CDC_GET_LINE_CODING. - * - CDC_SET_LINE_CODING. - * - CDC_SET_CONTROL_LINE_STATE. - * . - * - * @param[in] usbp pointer to the @p USBDriver object - * @return The hook status. - * @retval true Message handled internally. - * @retval false Message not handled. - */ -bool qmkusbRequestsHook(USBDriver *usbp) { - if ((usbp->setup[0] & USB_RTYPE_TYPE_MASK) == USB_RTYPE_TYPE_CLASS) { - switch (usbp->setup[1]) { - case CDC_GET_LINE_CODING: - usbSetupTransfer(usbp, (uint8_t *)&linecoding, sizeof(linecoding), NULL); - return true; - case CDC_SET_LINE_CODING: - usbSetupTransfer(usbp, (uint8_t *)&linecoding, sizeof(linecoding), NULL); - return true; - case CDC_SET_CONTROL_LINE_STATE: - /* Nothing to do, there are no control lines.*/ - usbSetupTransfer(usbp, NULL, 0, NULL); - return true; - default: - return false; - } - } - return false; -} - -/** - * @brief SOF handler. - * @details The SOF interrupt is used for automatic flushing of incomplete - * buffers pending in the output queue. - * - * @param[in] qmkusbp pointer to a @p QMKUSBDriver object - * - * @iclass - */ -void qmkusbSOFHookI(QMKUSBDriver *qmkusbp) { - /* If the USB driver is not in the appropriate state then transactions - must not be started.*/ - if ((usbGetDriverStateI(qmkusbp->config->usbp) != USB_ACTIVE) || (qmkusbp->state != QMKUSB_READY)) { - return; - } - - /* If there is already a transaction ongoing then another one cannot be - started.*/ - if (usbGetTransmitStatusI(qmkusbp->config->usbp, qmkusbp->config->bulk_in)) { - return; - } - - /* Checking if there only a buffer partially filled, if so then it is - enforced in the queue and transmitted.*/ - if (obqTryFlushI(&qmkusbp->obqueue)) { - size_t n; - uint8_t *buf = obqGetFullBufferI(&qmkusbp->obqueue, &n); - - /* For fixed size drivers, fill the end with zeros */ - if (qmkusbp->config->fixed_size) { - memset(buf + n, 0, qmkusbp->config->in_size - n); - n = qmkusbp->config->in_size; - } - - osalDbgAssert(buf != NULL, "queue is empty"); - - usbStartTransmitI(qmkusbp->config->usbp, qmkusbp->config->bulk_in, buf, n); + if (endpoint->report_storage != NULL) { + endpoint->report_storage->reset_report(endpoint->report_storage->reports); } } -/** - * @brief Default data transmitted callback. - * @details The application must use this function as callback for the IN - * data endpoint. - * - * @param[in] usbp pointer to the @p USBDriver object - * @param[in] ep IN endpoint number - */ -void qmkusbDataTransmitted(USBDriver *usbp, usbep_t ep) { - uint8_t * buf; - size_t n; - QMKUSBDriver *qmkusbp = usbp->in_params[ep - 1U]; +void usb_endpoint_out_suspend_cb(usb_endpoint_out_t *endpoint) { + bqSuspendI(&endpoint->ibqueue); + ibqResetI(&endpoint->ibqueue); +} - if (qmkusbp == NULL) { +void usb_endpoint_in_wakeup_cb(usb_endpoint_in_t *endpoint) { + bqResumeX(&endpoint->obqueue); +} + +void usb_endpoint_out_wakeup_cb(usb_endpoint_out_t *endpoint) { + bqResumeX(&endpoint->ibqueue); +} + +void usb_endpoint_in_configure_cb(usb_endpoint_in_t *endpoint) { + usbInitEndpointI(endpoint->config.usbp, endpoint->config.ep, &endpoint->ep_config); + obqResetI(&endpoint->obqueue); + bqResumeX(&endpoint->obqueue); +} + +void usb_endpoint_out_configure_cb(usb_endpoint_out_t *endpoint) { + /* The current assumption is that there are no standalone OUT endpoints, + * therefore if we share an endpoint with an IN endpoint, it is already + * initialized. */ +#if !defined(USB_ENDPOINTS_ARE_REORDERABLE) + usbInitEndpointI(endpoint->config.usbp, endpoint->config.ep, &endpoint->ep_config); +#endif + ibqResetI(&endpoint->ibqueue); + bqResumeX(&endpoint->ibqueue); + (void)usb_start_receive(endpoint); +} + +void usb_endpoint_in_tx_complete_cb(USBDriver *usbp, usbep_t ep) { + usb_endpoint_in_t *endpoint = usbp->in_params[ep - 1U]; + size_t n; + uint8_t * buffer; + + if (endpoint == NULL) { return; } osalSysLockFromISR(); - /* Signaling that space is available in the output queue.*/ - chnAddFlagsI(qmkusbp, CHN_OUTPUT_EMPTY); + /* Sending succeded, so we can reset the timed out state. */ + endpoint->timed_out = false; /* Freeing the buffer just transmitted, if it was not a zero size packet.*/ - if (usbp->epc[ep]->in_state->txsize > 0U) { - obqReleaseEmptyBufferI(&qmkusbp->obqueue); + if (!obqIsEmptyI(&endpoint->obqueue) && usbp->epc[ep]->in_state->txsize > 0U) { + /* Store the last send report in the endpoint to be retrieved by a + * GET_REPORT request or IDLE report handling. */ + if (endpoint->report_storage != NULL) { + buffer = obqGetFullBufferI(&endpoint->obqueue, &n); + endpoint->report_storage->set_report(endpoint->report_storage->reports, buffer, n); + } + obqReleaseEmptyBufferI(&endpoint->obqueue); } /* Checking if there is a buffer ready for transmission.*/ - buf = obqGetFullBufferI(&qmkusbp->obqueue, &n); + buffer = obqGetFullBufferI(&endpoint->obqueue, &n); - if (buf != NULL) { + if (buffer != NULL) { /* The endpoint cannot be busy, we are in the context of the callback, so it is safe to transmit without a check.*/ - usbStartTransmitI(usbp, ep, buf, n); - } else if ((usbp->epc[ep]->in_state->txsize > 0U) && ((usbp->epc[ep]->in_state->txsize & ((size_t)usbp->epc[ep]->in_maxsize - 1U)) == 0U)) { + usbStartTransmitI(usbp, ep, buffer, n); + } else if ((usbp->epc[ep]->ep_mode == USB_EP_MODE_TYPE_BULK) && (usbp->epc[ep]->in_state->txsize > 0U) && ((usbp->epc[ep]->in_state->txsize & ((size_t)usbp->epc[ep]->in_maxsize - 1U)) == 0U)) { /* Transmit zero sized packet in case the last one has maximum allowed - size. Otherwise the recipient may expect more data coming soon and - not return buffered data to app. See section 5.8.3 Bulk Transfer - Packet Size Constraints of the USB Specification document.*/ - if (!qmkusbp->config->fixed_size) { - usbStartTransmitI(usbp, ep, usbp->setup, 0); - } - + * size. Otherwise the recipient may expect more data coming soon and + * not return buffered data to app. See section 5.8.3 Bulk Transfer + * Packet Size Constraints of the USB Specification document. */ + usbStartTransmitI(usbp, ep, usbp->setup, 0); } else { /* Nothing to transmit.*/ } @@ -419,47 +228,114 @@ void qmkusbDataTransmitted(USBDriver *usbp, usbep_t ep) { osalSysUnlockFromISR(); } -/** - * @brief Default data received callback. - * @details The application must use this function as callback for the OUT - * data endpoint. - * - * @param[in] usbp pointer to the @p USBDriver object - * @param[in] ep OUT endpoint number - */ -void qmkusbDataReceived(USBDriver *usbp, usbep_t ep) { - QMKUSBDriver *qmkusbp = usbp->out_params[ep - 1U]; - if (qmkusbp == NULL) { +void usb_endpoint_out_rx_complete_cb(USBDriver *usbp, usbep_t ep) { + usb_endpoint_out_t *endpoint = usbp->out_params[ep - 1U]; + if (endpoint == NULL) { return; } osalSysLockFromISR(); - /* Signaling that data is available in the input queue.*/ - chnAddFlagsI(qmkusbp, CHN_INPUT_AVAILABLE); + size_t size = usbGetReceiveTransactionSizeX(usbp, ep); + if (size > 0) { + /* Posting the filled buffer in the queue.*/ + ibqPostFullBufferI(&endpoint->ibqueue, usbGetReceiveTransactionSizeX(endpoint->config.usbp, endpoint->config.ep)); + } - /* Posting the filled buffer in the queue.*/ - ibqPostFullBufferI(&qmkusbp->ibqueue, usbGetReceiveTransactionSizeX(qmkusbp->config->usbp, qmkusbp->config->bulk_out)); - - /* The endpoint cannot be busy, we are in the context of the callback, - so a packet is in the buffer for sure. Trying to get a free buffer - for the next transaction.*/ - (void)qmkusb_start_receive(qmkusbp); + /* The endpoint cannot be busy, we are in the context of the callback, so a + * packet is in the buffer for sure. Trying to get a free buffer for the + * next transaction.*/ + usb_start_receive(endpoint); osalSysUnlockFromISR(); } -/** - * @brief Default data received callback. - * @details The application must use this function as callback for the IN - * interrupt endpoint. - * - * @param[in] usbp pointer to the @p USBDriver object - * @param[in] ep endpoint number - */ -void qmkusbInterruptTransmitted(USBDriver *usbp, usbep_t ep) { - (void)usbp; - (void)ep; +bool usb_endpoint_in_send(usb_endpoint_in_t *endpoint, const uint8_t *data, size_t size, sysinterval_t timeout, bool buffered) { + osalDbgCheck((endpoint != NULL) && (data != NULL) && (size > 0U) && (size <= endpoint->config.buffer_size)); + + osalSysLock(); + if (usbGetDriverStateI(endpoint->config.usbp) != USB_ACTIVE) { + osalSysUnlock(); + return false; + } + + /* Short circuit the waiting if this endpoint timed out before, e.g. if + * nobody is listening on this endpoint (is disconnected) such as + * `hid_listen`/`qmk console` or we are in an environment with a very + * restricted USB stack. The reason is to not introduce micro lock-ups if + * the report is send periodically. */ + if (endpoint->timed_out && timeout != TIME_INFINITE) { + timeout = TIME_IMMEDIATE; + } + osalSysUnlock(); + + while (true) { + size_t sent = obqWriteTimeout(&endpoint->obqueue, data, size, timeout); + + if (sent < size) { + osalSysLock(); + endpoint->timed_out |= sent == 0; + bqSuspendI(&endpoint->obqueue); + obqResetI(&endpoint->obqueue); + bqResumeX(&endpoint->obqueue); + osalOsRescheduleS(); + osalSysUnlock(); + continue; + } + + if (!buffered) { + obqFlush(&endpoint->obqueue); + } + + return true; + } } -/** @} */ +void usb_endpoint_in_flush(usb_endpoint_in_t *endpoint, bool padded) { + osalDbgCheck(endpoint != NULL); + + output_buffers_queue_t *obqp = &endpoint->obqueue; + + if (padded && obqp->ptr != NULL) { + ptrdiff_t bytes_left = (size_t)obqp->top - (size_t)obqp->ptr; + while (bytes_left > 0) { + // Putting bytes into a buffer that has space left should never + // fail and be instant, therefore we don't check the return value + // for errors here. + obqPutTimeout(obqp, 0, TIME_IMMEDIATE); + bytes_left--; + } + } + + obqFlush(obqp); +} + +bool usb_endpoint_in_is_inactive(usb_endpoint_in_t *endpoint) { + osalDbgCheck(endpoint != NULL); + + osalSysLock(); + bool inactive = obqIsEmptyI(&endpoint->obqueue) && !usbGetTransmitStatusI(endpoint->config.usbp, endpoint->config.ep); + osalSysUnlock(); + + return inactive; +} + +bool usb_endpoint_out_receive(usb_endpoint_out_t *endpoint, uint8_t *data, size_t size, sysinterval_t timeout) { + osalDbgCheck((endpoint != NULL) && (data != NULL) && (size > 0U)); + + osalSysLock(); + if (usbGetDriverStateI(endpoint->config.usbp) != USB_ACTIVE) { + osalSysUnlock(); + return false; + } + + if (endpoint->timed_out && timeout != TIME_INFINITE) { + timeout = TIME_IMMEDIATE; + } + osalSysUnlock(); + + const size_t received = ibqReadTimeout(&endpoint->ibqueue, data, size, timeout); + endpoint->timed_out = received == 0; + + return received == size; +} diff --git a/tmk_core/protocol/chibios/usb_driver.h b/tmk_core/protocol/chibios/usb_driver.h index f94387debdc..26787e1eba0 100644 --- a/tmk_core/protocol/chibios/usb_driver.h +++ b/tmk_core/protocol/chibios/usb_driver.h @@ -1,177 +1,209 @@ -/* - ChibiOS - Copyright (C) 2006..2016 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. -*/ - -/** - * @file usb_driver.h - * @brief Usb driver suitable for both packet and serial formats - * - * @addtogroup SERIAL_USB - * @{ - */ +// Copyright 2023 Stefan Kerkmann (@KarlK90) +// Copyright 2020 Ryan (@fauxpark) +// Copyright 2016 Fredizzimo +// Copyright 2016 Giovanni Di Sirio +// SPDX-License-Identifier: GPL-3.0-or-later OR Apache-2.0 #pragma once -#include - -/*===========================================================================*/ -/* Driver constants. */ -/*===========================================================================*/ - -/*===========================================================================*/ -/* Derived constants and error checks. */ -/*===========================================================================*/ +#include +#include "usb_descriptor.h" +#include "chibios_config.h" +#include "usb_report_handling.h" +#include "string.h" +#include "timer.h" #if HAL_USE_USB == FALSE # error "The USB Driver requires HAL_USE_USB" #endif -/*===========================================================================*/ -/* Driver data structures and types. */ -/*===========================================================================*/ +/* USB Low Level driver specific endpoint fields */ +#if !defined(usb_lld_endpoint_fields) +# define usb_lld_endpoint_fields \ + 2, /* IN multiplier */ \ + NULL, /* SETUP buffer (not a SETUP endpoint) */ +#endif -/** - * @brief Driver state machine possible states. +/* + * Implementation notes: + * + * USBEndpointConfig - Configured using explicit order instead of struct member name. + * This is due to ChibiOS hal LLD differences, which is dependent on hardware, + * "USBv1" devices have `ep_buffers` and "OTGv1" have `in_multiplier`. + * Given `USBv1/hal_usb_lld.h` marks the field as "not currently used" this code file + * makes the assumption this is safe to avoid littering with preprocessor directives. */ -typedef enum { - QMKUSB_UNINIT = 0, /**< Not initialized. */ - QMKUSB_STOP = 1, /**< Stopped. */ - QMKUSB_READY = 2 /**< Ready. */ -} qmkusbstate_t; +#define QMK_USB_ENDPOINT_IN(mode, ep_size, ep_num, _buffer_capacity, _usb_requests_cb, _report_storage) \ + { \ + .usb_requests_cb = _usb_requests_cb, .report_storage = _report_storage, \ + .ep_config = \ + { \ + mode, /* EP Mode */ \ + NULL, /* SETUP packet notification callback */ \ + usb_endpoint_in_tx_complete_cb, /* IN notification callback */ \ + NULL, /* OUT notification callback */ \ + ep_size, /* IN maximum packet size */ \ + 0, /* OUT maximum packet size */ \ + NULL, /* IN Endpoint state */ \ + NULL, /* OUT endpoint state */ \ + usb_lld_endpoint_fields /* USB driver specific endpoint fields */ \ + }, \ + .config = { \ + .usbp = &USB_DRIVER, \ + .ep = ep_num, \ + .buffer_capacity = _buffer_capacity, \ + .buffer_size = ep_size, \ + .buffer = (_Alignas(4) uint8_t[BQ_BUFFER_SIZE(_buffer_capacity, ep_size)]){0}, \ + } \ + } -/** - * @brief Structure representing a serial over USB driver. - */ -typedef struct QMKUSBDriver QMKUSBDriver; +#if !defined(USB_ENDPOINTS_ARE_REORDERABLE) + +# define QMK_USB_ENDPOINT_OUT(mode, ep_size, ep_num, _buffer_capacity) \ + { \ + .ep_config = \ + { \ + mode, /* EP Mode */ \ + NULL, /* SETUP packet notification callback */ \ + NULL, /* IN notification callback */ \ + usb_endpoint_out_rx_complete_cb, /* OUT notification callback */ \ + 0, /* IN maximum packet size */ \ + ep_size, /* OUT maximum packet size */ \ + NULL, /* IN Endpoint state */ \ + NULL, /* OUT endpoint state */ \ + usb_lld_endpoint_fields /* USB driver specific endpoint fields */ \ + }, \ + .config = { \ + .usbp = &USB_DRIVER, \ + .ep = ep_num, \ + .buffer_capacity = _buffer_capacity, \ + .buffer_size = ep_size, \ + .buffer = (_Alignas(4) uint8_t[BQ_BUFFER_SIZE(_buffer_capacity, ep_size)]){0} \ + } \ + } + +#else + +# define QMK_USB_ENDPOINT_IN_SHARED(mode, ep_size, ep_num, _buffer_capacity, _usb_requests_cb, _report_storage) \ + { \ + .usb_requests_cb = _usb_requests_cb, .is_shared = true, .report_storage = _report_storage, \ + .ep_config = \ + { \ + mode, /* EP Mode */ \ + NULL, /* SETUP packet notification callback */ \ + usb_endpoint_in_tx_complete_cb, /* IN notification callback */ \ + usb_endpoint_out_rx_complete_cb, /* OUT notification callback */ \ + ep_size, /* IN maximum packet size */ \ + ep_size, /* OUT maximum packet size */ \ + NULL, /* IN Endpoint state */ \ + NULL, /* OUT endpoint state */ \ + usb_lld_endpoint_fields /* USB driver specific endpoint fields */ \ + }, \ + .config = { \ + .usbp = &USB_DRIVER, \ + .ep = ep_num, \ + .buffer_capacity = _buffer_capacity, \ + .buffer_size = ep_size, \ + .buffer = (_Alignas(4) uint8_t[BQ_BUFFER_SIZE(_buffer_capacity, ep_size)]){0}, \ + } \ + } + +/* The current assumption is that there are no standalone OUT endpoints, so the + * OUT endpoint is always initialized by the IN endpoint. */ +# define QMK_USB_ENDPOINT_OUT(mode, ep_size, ep_num, _buffer_capacity) \ + { \ + .ep_config = \ + { \ + 0 /* Already defined in the IN endpoint */ \ + }, \ + .config = { \ + .usbp = &USB_DRIVER, \ + .ep = ep_num, \ + .buffer_capacity = _buffer_capacity, \ + .buffer_size = ep_size, \ + .buffer = (_Alignas(4) uint8_t[BQ_BUFFER_SIZE(_buffer_capacity, ep_size)]){0} \ + } \ + } + +#endif -/** - * @brief Serial over USB Driver configuration structure. - * @details An instance of this structure must be passed to @p sduStart() - * in order to configure and start the driver operations. - */ typedef struct { /** * @brief USB driver to use. */ USBDriver *usbp; - /** - * @brief Bulk IN endpoint used for outgoing data transfer. - */ - usbep_t bulk_in; - /** - * @brief Bulk OUT endpoint used for incoming data transfer. - */ - usbep_t bulk_out; - /** - * @brief Interrupt IN endpoint used for notifications. - * @note If set to zero then the INT endpoint is assumed to be not - * present, USB descriptors must be changed accordingly. - */ - usbep_t int_in; /** - * @brief The number of buffers in the queues + * @brief Endpoint used for data transfer */ - size_t in_buffers; - size_t out_buffers; + usbep_t ep; /** - * @brief The size of each buffer in the queue, typically the same as the endpoint size + * @brief The number of buffers in the queue */ - size_t in_size; - size_t out_size; + size_t buffer_capacity; /** - * @brief Always send full buffers in_size (the rest is filled with zeroes) + * @brief The size of each buffer in the queue, same as the endpoint size */ - bool fixed_size; + size_t buffer_size; - /* Input buffer - * @note needs to be initialized with a memory buffer of the right size + /** + * @brief Buffer backing storage */ - uint8_t *ib; - /* Output buffer - * @note needs to be initialized with a memory buffer of the right size - */ - uint8_t *ob; -} QMKUSBConfig; + uint8_t *buffer; +} usb_endpoint_config_t; -/** - * @brief @p SerialDriver specific data. - */ -#define _qmk_usb_driver_data \ - _base_asynchronous_channel_data /* Driver state.*/ \ - qmkusbstate_t state; \ - /* Input buffers queue.*/ \ - input_buffers_queue_t ibqueue; \ - /* Output queue.*/ \ - output_buffers_queue_t obqueue; \ - /* End of the mandatory fields.*/ \ - /* Current configuration data.*/ \ - const QMKUSBConfig *config; +typedef struct { + output_buffers_queue_t obqueue; + USBEndpointConfig ep_config; + USBInEndpointState ep_in_state; +#if defined(USB_ENDPOINTS_ARE_REORDERABLE) + USBOutEndpointState ep_out_state; + bool is_shared; +#endif + usb_endpoint_config_t config; + usbreqhandler_t usb_requests_cb; + bool timed_out; + usb_report_storage_t *report_storage; +} usb_endpoint_in_t; -/** - * @brief @p SerialUSBDriver specific methods. - */ -#define _qmk_usb_driver_methods _base_asynchronous_channel_methods - -/** - * @extends BaseAsynchronousChannelVMT - * - * @brief @p SerialDriver virtual methods table. - */ -struct QMKUSBDriverVMT { - _qmk_usb_driver_methods -}; - -/** - * @extends BaseAsynchronousChannel - * - * @brief Full duplex serial driver class. - * @details This class extends @p BaseAsynchronousChannel by adding physical - * I/O queues. - */ -struct QMKUSBDriver { - /** @brief Virtual Methods Table.*/ - const struct QMKUSBDriverVMT *vmt; - _qmk_usb_driver_data -}; - -/*===========================================================================*/ -/* Driver macros. */ -/*===========================================================================*/ - -/*===========================================================================*/ -/* External declarations. */ -/*===========================================================================*/ +typedef struct { + input_buffers_queue_t ibqueue; + USBEndpointConfig ep_config; + USBOutEndpointState ep_out_state; + usb_endpoint_config_t config; + bool timed_out; +} usb_endpoint_out_t; #ifdef __cplusplus extern "C" { #endif -void qmkusbInit(void); -void qmkusbObjectInit(QMKUSBDriver *qmkusbp, const QMKUSBConfig *config); -void qmkusbStart(QMKUSBDriver *qmkusbp, const QMKUSBConfig *config); -void qmkusbStop(QMKUSBDriver *qmkusbp); -void qmkusbSuspendHookI(QMKUSBDriver *qmkusbp); -void qmkusbWakeupHookI(QMKUSBDriver *qmkusbp); -void qmkusbConfigureHookI(QMKUSBDriver *qmkusbp); -bool qmkusbRequestsHook(USBDriver *usbp); -void qmkusbSOFHookI(QMKUSBDriver *qmkusbp); -void qmkusbDataTransmitted(USBDriver *usbp, usbep_t ep); -void qmkusbDataReceived(USBDriver *usbp, usbep_t ep); -void qmkusbInterruptTransmitted(USBDriver *usbp, usbep_t ep); + +void usb_endpoint_in_init(usb_endpoint_in_t *endpoint); +void usb_endpoint_in_start(usb_endpoint_in_t *endpoint); +void usb_endpoint_in_stop(usb_endpoint_in_t *endpoint); + +bool usb_endpoint_in_send(usb_endpoint_in_t *endpoint, const uint8_t *data, size_t size, sysinterval_t timeout, bool buffered); +void usb_endpoint_in_flush(usb_endpoint_in_t *endpoint, bool padded); +bool usb_endpoint_in_is_inactive(usb_endpoint_in_t *endpoint); + +void usb_endpoint_in_suspend_cb(usb_endpoint_in_t *endpoint); +void usb_endpoint_in_wakeup_cb(usb_endpoint_in_t *endpoint); +void usb_endpoint_in_configure_cb(usb_endpoint_in_t *endpoint); +void usb_endpoint_in_tx_complete_cb(USBDriver *usbp, usbep_t ep); + +void usb_endpoint_out_init(usb_endpoint_out_t *endpoint); +void usb_endpoint_out_start(usb_endpoint_out_t *endpoint); +void usb_endpoint_out_stop(usb_endpoint_out_t *endpoint); + +bool usb_endpoint_out_receive(usb_endpoint_out_t *endpoint, uint8_t *data, size_t size, sysinterval_t timeout); + +void usb_endpoint_out_suspend_cb(usb_endpoint_out_t *endpoint); +void usb_endpoint_out_wakeup_cb(usb_endpoint_out_t *endpoint); +void usb_endpoint_out_configure_cb(usb_endpoint_out_t *endpoint); +void usb_endpoint_out_rx_complete_cb(USBDriver *usbp, usbep_t ep); + #ifdef __cplusplus } #endif diff --git a/tmk_core/protocol/chibios/usb_endpoints.c b/tmk_core/protocol/chibios/usb_endpoints.c new file mode 100644 index 00000000000..37ec3c722f6 --- /dev/null +++ b/tmk_core/protocol/chibios/usb_endpoints.c @@ -0,0 +1,152 @@ +// Copyright 2023 Stefan Kerkmann (@KarlK90) +// SPDX-License-Identifier: GPL-3.0-or-later + +#include +#include + +#include "usb_main.h" +#include "usb_driver.h" +#include "usb_endpoints.h" +#include "report.h" + +usb_endpoint_in_t usb_endpoints_in[USB_ENDPOINT_IN_COUNT] = { +// clang-format off +#if defined(SHARED_EP_ENABLE) + [USB_ENDPOINT_IN_SHARED] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, SHARED_EPSIZE, SHARED_IN_EPNUM, SHARED_IN_CAPACITY, NULL, + QMK_USB_REPORT_STORAGE( + &usb_shared_get_report, + &usb_shared_set_report, + &usb_shared_reset_report, + &usb_shared_get_idle_rate, + &usb_shared_set_idle_rate, + &usb_shared_idle_timer_elapsed, + (REPORT_ID_COUNT + 1), +#if defined(KEYBOARD_SHARED_EP) + QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_KEYBOARD, sizeof(report_keyboard_t)), +#endif +#if defined(MOUSE_SHARED_EP) + QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_MOUSE, sizeof(report_mouse_t)), +#endif +#if defined(EXTRAKEY_ENABLE) + QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_SYSTEM, sizeof(report_extra_t)), + QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_CONSUMER, sizeof(report_extra_t)), +#endif +#if defined(PROGRAMMABLE_BUTTON_ENABLE) + QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_PROGRAMMABLE_BUTTON, sizeof(report_programmable_button_t)), +#endif +#if defined(NKRO_ENABLE) + QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_NKRO, sizeof(report_nkro_t)), +#endif +#if defined(JOYSTICK_SHARED_EP) + QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_JOYSTICK, sizeof(report_joystick_t)), +#endif +#if defined(DIGITIZER_SHARED_EP) + QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_DIGITIZER, sizeof(report_digitizer_t)), +#endif + ) + ), +#endif +// clang-format on + +#if !defined(KEYBOARD_SHARED_EP) + [USB_ENDPOINT_IN_KEYBOARD] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, KEYBOARD_EPSIZE, KEYBOARD_IN_EPNUM, KEYBOARD_IN_CAPACITY, NULL, QMK_USB_REPORT_STORAGE_DEFAULT(sizeof(report_keyboard_t))), +#endif + +#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP) + [USB_ENDPOINT_IN_MOUSE] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, MOUSE_EPSIZE, MOUSE_IN_EPNUM, MOUSE_IN_CAPACITY, NULL, QMK_USB_REPORT_STORAGE_DEFAULT(sizeof(report_mouse_t))), +#endif + +#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP) + [USB_ENDPOINT_IN_JOYSTICK] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, JOYSTICK_EPSIZE, JOYSTICK_IN_EPNUM, JOYSTICK_IN_CAPACITY, QMK_USB_REPORT_STORAGE_DEFAULT(sizeof(report_joystick_t))), +#endif + +#if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP) + [USB_ENDPOINT_IN_JOYSTICK] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, DIGITIZER_EPSIZE, DIGITIZER_IN_EPNUM, DIGITIZER_IN_CAPACITY, QMK_USB_REPORT_STORAGE_DEFAULT(sizeof(report_digitizer_t))), +#endif + +#if defined(CONSOLE_ENABLE) +# if defined(USB_ENDPOINTS_ARE_REORDERABLE) + [USB_ENDPOINT_IN_CONSOLE] = QMK_USB_ENDPOINT_IN_SHARED(USB_EP_MODE_TYPE_INTR, CONSOLE_EPSIZE, CONSOLE_IN_EPNUM, CONSOLE_IN_CAPACITY, NULL, QMK_USB_REPORT_STORAGE_DEFAULT(CONSOLE_EPSIZE)), +# else + [USB_ENDPOINT_IN_CONSOLE] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, CONSOLE_EPSIZE, CONSOLE_IN_EPNUM, CONSOLE_IN_CAPACITY, NULL, QMK_USB_REPORT_STORAGE_DEFAULT(CONSOLE_EPSIZE)), +# endif +#endif + +#if defined(RAW_ENABLE) +# if defined(USB_ENDPOINTS_ARE_REORDERABLE) + [USB_ENDPOINT_IN_RAW] = QMK_USB_ENDPOINT_IN_SHARED(USB_EP_MODE_TYPE_INTR, RAW_EPSIZE, RAW_IN_EPNUM, RAW_IN_CAPACITY, NULL, QMK_USB_REPORT_STORAGE_DEFAULT(RAW_EPSIZE)), +# else + [USB_ENDPOINT_IN_RAW] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, RAW_EPSIZE, RAW_IN_EPNUM, RAW_IN_CAPACITY, NULL, QMK_USB_REPORT_STORAGE_DEFAULT(RAW_EPSIZE)), +# endif +#endif + +#if defined(MIDI_ENABLE) +# if defined(USB_ENDPOINTS_ARE_REORDERABLE) + [USB_ENDPOINT_IN_MIDI] = QMK_USB_ENDPOINT_IN_SHARED(USB_EP_MODE_TYPE_BULK, MIDI_STREAM_EPSIZE, MIDI_STREAM_IN_EPNUM, MIDI_STREAM_IN_CAPACITY, NULL, NULL), +# else + [USB_ENDPOINT_IN_MIDI] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_BULK, MIDI_STREAM_EPSIZE, MIDI_STREAM_IN_EPNUM, MIDI_STREAM_IN_CAPACITY, NULL, NULL), +# endif +#endif + +#if defined(VIRTSER_ENABLE) +# if defined(USB_ENDPOINTS_ARE_REORDERABLE) + [USB_ENDPOINT_IN_CDC_DATA] = QMK_USB_ENDPOINT_IN_SHARED(USB_EP_MODE_TYPE_BULK, CDC_EPSIZE, CDC_IN_EPNUM, CDC_IN_CAPACITY, virtser_usb_request_cb, NULL), +# else + [USB_ENDPOINT_IN_CDC_DATA] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_BULK, CDC_EPSIZE, CDC_IN_EPNUM, CDC_IN_CAPACITY, virtser_usb_request_cb, NULL), +# endif + [USB_ENDPOINT_IN_CDC_SIGNALING] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, CDC_NOTIFICATION_EPSIZE, CDC_NOTIFICATION_EPNUM, CDC_SIGNALING_DUMMY_CAPACITY, NULL, NULL), +#endif +}; + +usb_endpoint_in_lut_t usb_endpoint_interface_lut[TOTAL_INTERFACES] = { +#if !defined(KEYBOARD_SHARED_EP) + [KEYBOARD_INTERFACE] = USB_ENDPOINT_IN_KEYBOARD, +#endif + +#if defined(RAW_ENABLE) + [RAW_INTERFACE] = USB_ENDPOINT_IN_RAW, +#endif + +#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP) + [MOUSE_INTERFACE] = USB_ENDPOINT_IN_MOUSE, +#endif + +#if defined(SHARED_EP_ENABLE) + [SHARED_INTERFACE] = USB_ENDPOINT_IN_SHARED, +#endif + +#if defined(CONSOLE_ENABLE) + [CONSOLE_INTERFACE] = USB_ENDPOINT_IN_CONSOLE, +#endif + +#if defined(MIDI_ENABLE) + [AS_INTERFACE] = USB_ENDPOINT_IN_MIDI, +#endif + +#if defined(VIRTSER_ENABLE) + [CCI_INTERFACE] = USB_ENDPOINT_IN_CDC_SIGNALING, + [CDI_INTERFACE] = USB_ENDPOINT_IN_CDC_DATA, +#endif + +#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP) + [JOYSTICK_INTERFACE] = USB_ENDPOINT_IN_JOYSTICK, +#endif + +#if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP) + [DIGITIZER_INTERFACE] = USB_ENDPOINT_IN_DIGITIZER, +#endif +}; + +usb_endpoint_out_t usb_endpoints_out[USB_ENDPOINT_OUT_COUNT] = { +#if defined(RAW_ENABLE) + [USB_ENDPOINT_OUT_RAW] = QMK_USB_ENDPOINT_OUT(USB_EP_MODE_TYPE_INTR, RAW_EPSIZE, RAW_OUT_EPNUM, RAW_OUT_CAPACITY), +#endif + +#if defined(MIDI_ENABLE) + [USB_ENDPOINT_OUT_MIDI] = QMK_USB_ENDPOINT_OUT(USB_EP_MODE_TYPE_BULK, MIDI_STREAM_EPSIZE, MIDI_STREAM_OUT_EPNUM, MIDI_STREAM_OUT_CAPACITY), +#endif + +#if defined(VIRTSER_ENABLE) + [USB_ENDPOINT_OUT_CDC_DATA] = QMK_USB_ENDPOINT_OUT(USB_EP_MODE_TYPE_BULK, CDC_EPSIZE, CDC_OUT_EPNUM, CDC_OUT_CAPACITY), +#endif +}; diff --git a/tmk_core/protocol/chibios/usb_endpoints.h b/tmk_core/protocol/chibios/usb_endpoints.h new file mode 100644 index 00000000000..a4e5ed88fce --- /dev/null +++ b/tmk_core/protocol/chibios/usb_endpoints.h @@ -0,0 +1,137 @@ +// Copyright 2023 Stefan Kerkmann (@KarlK90) +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include "usb_descriptor.h" + +#if !defined(USB_DEFAULT_BUFFER_CAPACITY) +# define USB_DEFAULT_BUFFER_CAPACITY 4 +#endif + +#if !defined(KEYBOARD_IN_CAPACITY) +# define KEYBOARD_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY +#endif +#if !defined(SHARED_IN_CAPACITY) +# define SHARED_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY +#endif +#if !defined(MOUSE_IN_CAPACITY) +# define MOUSE_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY +#endif + +#if !defined(JOYSTICK_IN_CAPACITY) +# define JOYSTICK_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY +#endif + +#if !defined(DIGITIZER_IN_CAPACITY) +# define DIGITIZER_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY +#endif + +#if !defined(CONSOLE_IN_CAPACITY) +# define CONSOLE_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY +#endif + +#if !defined(CONSOLE_OUT_CAPACITY) +# define CONSOLE_OUT_CAPACITY USB_DEFAULT_BUFFER_CAPACITY +#endif + +#if !defined(RAW_IN_CAPACITY) +# define RAW_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY +#endif + +#if !defined(RAW_OUT_CAPACITY) +# define RAW_OUT_CAPACITY USB_DEFAULT_BUFFER_CAPACITY +#endif + +#if !defined(MIDI_STREAM_IN_CAPACITY) +# define MIDI_STREAM_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY +#endif + +#if !defined(MIDI_STREAM_OUT_CAPACITY) +# define MIDI_STREAM_OUT_CAPACITY USB_DEFAULT_BUFFER_CAPACITY +#endif + +#if !defined(CDC_IN_CAPACITY) +# define CDC_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY +#endif + +#if !defined(CDC_OUT_CAPACITY) +# define CDC_OUT_CAPACITY USB_DEFAULT_BUFFER_CAPACITY +#endif + +#define CDC_SIGNALING_DUMMY_CAPACITY 1 + +typedef enum { +#if defined(SHARED_EP_ENABLE) + USB_ENDPOINT_IN_SHARED, +#endif + +#if !defined(KEYBOARD_SHARED_EP) + USB_ENDPOINT_IN_KEYBOARD, +#endif + +#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP) + USB_ENDPOINT_IN_MOUSE, +#endif + +#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP) + USB_ENDPOINT_IN_JOYSTICK, +#endif + +#if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP) + USB_ENDPOINT_IN_DIGITIZER, +#endif + +#if defined(CONSOLE_ENABLE) + USB_ENDPOINT_IN_CONSOLE, +#endif + +#if defined(RAW_ENABLE) + USB_ENDPOINT_IN_RAW, +#endif + +#if defined(MIDI_ENABLE) + USB_ENDPOINT_IN_MIDI, +#endif + +#if defined(VIRTSER_ENABLE) + USB_ENDPOINT_IN_CDC_DATA, + USB_ENDPOINT_IN_CDC_SIGNALING, +#endif + USB_ENDPOINT_IN_COUNT, +/* All non shared endpoints have to be consequtive numbers starting from 0, so + * that they can be used as array indices. The shared endpoints all point to + * the same endpoint so they have to be defined last to not reset the enum + * counter. */ +#if defined(SHARED_EP_ENABLE) +# if defined(KEYBOARD_SHARED_EP) + USB_ENDPOINT_IN_KEYBOARD = USB_ENDPOINT_IN_SHARED, +# endif +# if defined(MOUSE_SHARED_EP) + USB_ENDPOINT_IN_MOUSE = USB_ENDPOINT_IN_SHARED, +# endif +# if defined(JOYSTICK_SHARED_EP) + USB_ENDPOINT_IN_JOYSTICK = USB_ENDPOINT_IN_SHARED, +# endif +# if defined(DIGITIZER_SHARED_EP) + USB_ENDPOINT_IN_DIGITIZER = USB_ENDPOINT_IN_SHARED, +# endif +#endif +} usb_endpoint_in_lut_t; + +#define IS_VALID_USB_ENDPOINT_IN_LUT(i) ((i) >= 0 && (i) < USB_ENDPOINT_IN_COUNT) + +usb_endpoint_in_lut_t usb_endpoint_interface_lut[TOTAL_INTERFACES]; + +typedef enum { +#if defined(RAW_ENABLE) + USB_ENDPOINT_OUT_RAW, +#endif +#if defined(MIDI_ENABLE) + USB_ENDPOINT_OUT_MIDI, +#endif +#if defined(VIRTSER_ENABLE) + USB_ENDPOINT_OUT_CDC_DATA, +#endif + USB_ENDPOINT_OUT_COUNT, +} usb_endpoint_out_lut_t; diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c index 7b1e6412131..ced5fd4fc27 100644 --- a/tmk_core/protocol/chibios/usb_main.c +++ b/tmk_core/protocol/chibios/usb_main.c @@ -1,45 +1,32 @@ -/* - * (c) 2015 flabberast - * - * Based on the following work: - * - Guillaume Duc's raw hid example (MIT License) - * https://github.com/guiduc/usb-hid-chibios-example - * - PJRC Teensy examples (MIT License) - * https://www.pjrc.com/teensy/usb_keyboard.html - * - hasu's TMK keyboard code (GPL v2 and some code Modified BSD) - * https://github.com/tmk/tmk_keyboard/ - * - ChibiOS demo code (Apache 2.0 License) - * http://www.chibios.org - * - * Since some GPL'd code is used, this work is licensed under - * GPL v2 or later. - */ - -/* - * Implementation notes: - * - * USBEndpointConfig - Configured using explicit order instead of struct member name. - * This is due to ChibiOS hal LLD differences, which is dependent on hardware, - * "USBv1" devices have `ep_buffers` and "OTGv1" have `in_multiplier`. - * Given `USBv1/hal_usb_lld.h` marks the field as "not currently used" this code file - * makes the assumption this is safe to avoid littering with preprocessor directives. - */ +// Copyright 2023 Stefan Kerkmann +// Copyright 2020-2021 Ryan (@fauxpark) +// Copyright 2020 Nick Brassel (@tzarc) +// Copyright 2020 a-chol +// Copyright 2020 xyzz +// Copyright 2020 Joel Challis (@zvecr) +// Copyright 2020 George (@goshdarnharris) +// Copyright 2018 James Laird-Wah +// Copyright 2018 Drashna Jaelre (@drashna) +// Copyright 2016 Fredizzimo +// Copyright 2016 Giovanni Di Sirio +// SPDX-License-Identifier: GPL-3.0-or-later OR Apache-2.0 #include #include #include #include "usb_main.h" +#include "usb_report_handling.h" #include "host.h" -#include "chibios_config.h" -#include "debug.h" #include "suspend.h" +#include "timer.h" #ifdef SLEEP_LED_ENABLE # include "sleep_led.h" # include "led.h" #endif #include "wait.h" +#include "usb_endpoints.h" #include "usb_device_state.h" #include "usb_descriptor.h" #include "usb_driver.h" @@ -51,11 +38,6 @@ extern keymap_config_t keymap_config; #endif -#if defined(CONSOLE_ENABLE) -# define RBUF_SIZE 256 -# include "ring_buffer.h" -#endif - /* --------------------------------------------------------- * Global interface variables and declarations * --------------------------------------------------------- @@ -69,33 +51,16 @@ extern keymap_config_t keymap_config; # define usb_lld_disconnect_bus(usbp) #endif -uint8_t keyboard_idle __attribute__((aligned(2))) = 0; -uint8_t keyboard_protocol __attribute__((aligned(2))) = 1; -uint8_t keyboard_led_state = 0; -volatile uint16_t keyboard_idle_count = 0; -static virtual_timer_t keyboard_idle_timer; +extern usb_endpoint_in_t usb_endpoints_in[USB_ENDPOINT_IN_COUNT]; +extern usb_endpoint_out_t usb_endpoints_out[USB_ENDPOINT_OUT_COUNT]; -static void keyboard_idle_timer_cb(struct ch_virtual_timer *, void *arg); +uint8_t _Alignas(2) keyboard_idle = 0; +uint8_t _Alignas(2) keyboard_protocol = 1; +uint8_t keyboard_led_state = 0; -report_keyboard_t keyboard_report_sent = {0}; -report_mouse_t mouse_report_sent = {0}; - -union { - uint8_t report_id; - report_keyboard_t keyboard; -#ifdef EXTRAKEY_ENABLE - report_extra_t extra; -#endif -#ifdef MOUSE_ENABLE - report_mouse_t mouse; -#endif -#ifdef DIGITIZER_ENABLE - report_digitizer_t digitizer; -#endif -#ifdef JOYSTICK_ENABLE - report_joystick_t joystick; -#endif -} universal_report_blank = {0}; +static bool __attribute__((__unused__)) send_report_buffered(usb_endpoint_in_lut_t endpoint, void *report, size_t size); +static void __attribute__((__unused__)) flush_report_buffered(usb_endpoint_in_lut_t endpoint, bool padded); +static bool __attribute__((__unused__)) receive_report(usb_endpoint_out_lut_t endpoint, void *report, size_t size); /* --------------------------------------------------------- * Descriptors and USB driver objects @@ -109,6 +74,11 @@ union { NULL, /* SETUP buffer (not a SETUP endpoint) */ #endif +/* + * Handles the GET_DESCRIPTOR callback + * + * Returns the proper descriptor + */ static const USBDescriptor *usb_get_descriptor_cb(USBDriver *usbp, uint8_t dtype, uint8_t dindex, uint16_t wIndex) { usb_control_request_t *setup = (usb_control_request_t *)usbp->setup; @@ -123,299 +93,6 @@ static const USBDescriptor *usb_get_descriptor_cb(USBDriver *usbp, uint8_t dtype return &descriptor; } -/* - * USB notification callback that does nothing. Needed to work around bugs in - * some USB LLDs that fail to resume the waiting thread when the notification - * callback pointer is NULL. - */ -static void dummy_usb_cb(USBDriver *usbp, usbep_t ep) { - (void)usbp; - (void)ep; -} - -#ifndef KEYBOARD_SHARED_EP -/* keyboard endpoint state structure */ -static USBInEndpointState kbd_ep_state; -/* keyboard endpoint initialization structure (IN) - see USBEndpointConfig comment at top of file */ -static const USBEndpointConfig kbd_ep_config = { - USB_EP_MODE_TYPE_INTR, /* Interrupt EP */ - NULL, /* SETUP packet notification callback */ - dummy_usb_cb, /* IN notification callback */ - NULL, /* OUT notification callback */ - KEYBOARD_EPSIZE, /* IN maximum packet size */ - 0, /* OUT maximum packet size */ - &kbd_ep_state, /* IN Endpoint state */ - NULL, /* OUT endpoint state */ - usb_lld_endpoint_fields /* USB driver specific endpoint fields */ -}; -#endif - -#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP) -/* mouse endpoint state structure */ -static USBInEndpointState mouse_ep_state; - -/* mouse endpoint initialization structure (IN) - see USBEndpointConfig comment at top of file */ -static const USBEndpointConfig mouse_ep_config = { - USB_EP_MODE_TYPE_INTR, /* Interrupt EP */ - NULL, /* SETUP packet notification callback */ - dummy_usb_cb, /* IN notification callback */ - NULL, /* OUT notification callback */ - MOUSE_EPSIZE, /* IN maximum packet size */ - 0, /* OUT maximum packet size */ - &mouse_ep_state, /* IN Endpoint state */ - NULL, /* OUT endpoint state */ - usb_lld_endpoint_fields /* USB driver specific endpoint fields */ -}; -#endif - -#ifdef SHARED_EP_ENABLE -/* shared endpoint state structure */ -static USBInEndpointState shared_ep_state; - -/* shared endpoint initialization structure (IN) - see USBEndpointConfig comment at top of file */ -static const USBEndpointConfig shared_ep_config = { - USB_EP_MODE_TYPE_INTR, /* Interrupt EP */ - NULL, /* SETUP packet notification callback */ - dummy_usb_cb, /* IN notification callback */ - NULL, /* OUT notification callback */ - SHARED_EPSIZE, /* IN maximum packet size */ - 0, /* OUT maximum packet size */ - &shared_ep_state, /* IN Endpoint state */ - NULL, /* OUT endpoint state */ - usb_lld_endpoint_fields /* USB driver specific endpoint fields */ -}; -#endif - -#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP) -/* joystick endpoint state structure */ -static USBInEndpointState joystick_ep_state; - -/* joystick endpoint initialization structure (IN) - see USBEndpointConfig comment at top of file */ -static const USBEndpointConfig joystick_ep_config = { - USB_EP_MODE_TYPE_INTR, /* Interrupt EP */ - NULL, /* SETUP packet notification callback */ - dummy_usb_cb, /* IN notification callback */ - NULL, /* OUT notification callback */ - JOYSTICK_EPSIZE, /* IN maximum packet size */ - 0, /* OUT maximum packet size */ - &joystick_ep_state, /* IN Endpoint state */ - NULL, /* OUT endpoint state */ - usb_lld_endpoint_fields /* USB driver specific endpoint fields */ -}; -#endif - -#if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP) -/* digitizer endpoint state structure */ -static USBInEndpointState digitizer_ep_state; - -/* digitizer endpoint initialization structure (IN) - see USBEndpointConfig comment at top of file */ -static const USBEndpointConfig digitizer_ep_config = { - USB_EP_MODE_TYPE_INTR, /* Interrupt EP */ - NULL, /* SETUP packet notification callback */ - dummy_usb_cb, /* IN notification callback */ - NULL, /* OUT notification callback */ - DIGITIZER_EPSIZE, /* IN maximum packet size */ - 0, /* OUT maximum packet size */ - &digitizer_ep_state, /* IN Endpoint state */ - NULL, /* OUT endpoint state */ - usb_lld_endpoint_fields /* USB driver specific endpoint fields */ -}; -#endif - -#ifdef CONSOLE_ENABLE -/* Console endpoint state structure */ -static USBInEndpointState console_ep_state; - -/* Console endpoint initialization structure (IN) - see USBEndpointConfig comment at top of file */ -static const USBEndpointConfig console_ep_config = { - USB_EP_MODE_TYPE_INTR, /* Interrupt EP */ - NULL, /* SETUP packet notification callback */ - dummy_usb_cb, /* IN notification callback */ - NULL, /* OUT notification callback */ - CONSOLE_EPSIZE, /* IN maximum packet size */ - 0, /* OUT maximum packet size */ - &console_ep_state, /* IN Endpoint state */ - NULL, /* OUT endpoint state */ - usb_lld_endpoint_fields /* USB driver specific endpoint fields */ -}; -#endif - -#ifdef USB_ENDPOINTS_ARE_REORDERABLE -typedef struct { - size_t queue_capacity_in; - size_t queue_capacity_out; - USBInEndpointState in_ep_state; - USBOutEndpointState out_ep_state; - USBInEndpointState int_ep_state; - USBEndpointConfig inout_ep_config; - USBEndpointConfig int_ep_config; - const QMKUSBConfig config; - QMKUSBDriver driver; -} usb_driver_config_t; -#else -typedef struct { - size_t queue_capacity_in; - size_t queue_capacity_out; - USBInEndpointState in_ep_state; - USBOutEndpointState out_ep_state; - USBInEndpointState int_ep_state; - USBEndpointConfig in_ep_config; - USBEndpointConfig out_ep_config; - USBEndpointConfig int_ep_config; - const QMKUSBConfig config; - QMKUSBDriver driver; -} usb_driver_config_t; -#endif - -#ifdef USB_ENDPOINTS_ARE_REORDERABLE -/* Reusable initialization structure - see USBEndpointConfig comment at top of file */ -# define QMK_USB_DRIVER_CONFIG(stream, notification, fixedsize) \ - { \ - .queue_capacity_in = stream##_IN_CAPACITY, .queue_capacity_out = stream##_OUT_CAPACITY, \ - .inout_ep_config = \ - { \ - stream##_IN_MODE, /* Interrupt EP */ \ - NULL, /* SETUP packet notification callback */ \ - qmkusbDataTransmitted, /* IN notification callback */ \ - qmkusbDataReceived, /* OUT notification callback */ \ - stream##_EPSIZE, /* IN maximum packet size */ \ - stream##_EPSIZE, /* OUT maximum packet size */ \ - NULL, /* IN Endpoint state */ \ - NULL, /* OUT endpoint state */ \ - usb_lld_endpoint_fields /* USB driver specific endpoint fields */ \ - }, \ - .int_ep_config = \ - { \ - USB_EP_MODE_TYPE_INTR, /* Interrupt EP */ \ - NULL, /* SETUP packet notification callback */ \ - qmkusbInterruptTransmitted, /* IN notification callback */ \ - NULL, /* OUT notification callback */ \ - CDC_NOTIFICATION_EPSIZE, /* IN maximum packet size */ \ - 0, /* OUT maximum packet size */ \ - NULL, /* IN Endpoint state */ \ - NULL, /* OUT endpoint state */ \ - usb_lld_endpoint_fields /* USB driver specific endpoint fields */ \ - }, \ - .config = { \ - .usbp = &USB_DRIVER, \ - .bulk_in = stream##_IN_EPNUM, \ - .bulk_out = stream##_OUT_EPNUM, \ - .int_in = notification, \ - .in_buffers = stream##_IN_CAPACITY, \ - .out_buffers = stream##_OUT_CAPACITY, \ - .in_size = stream##_EPSIZE, \ - .out_size = stream##_EPSIZE, \ - .fixed_size = fixedsize, \ - .ib = (__attribute__((aligned(4))) uint8_t[BQ_BUFFER_SIZE(stream##_IN_CAPACITY, stream##_EPSIZE)]){}, \ - .ob = (__attribute__((aligned(4))) uint8_t[BQ_BUFFER_SIZE(stream##_OUT_CAPACITY, stream##_EPSIZE)]){}, \ - } \ - } -#else -/* Reusable initialization structure - see USBEndpointConfig comment at top of file */ -# define QMK_USB_DRIVER_CONFIG(stream, notification, fixedsize) \ - { \ - .queue_capacity_in = stream##_IN_CAPACITY, .queue_capacity_out = stream##_OUT_CAPACITY, \ - .in_ep_config = \ - { \ - stream##_IN_MODE, /* Interrupt EP */ \ - NULL, /* SETUP packet notification callback */ \ - qmkusbDataTransmitted, /* IN notification callback */ \ - NULL, /* OUT notification callback */ \ - stream##_EPSIZE, /* IN maximum packet size */ \ - 0, /* OUT maximum packet size */ \ - NULL, /* IN Endpoint state */ \ - NULL, /* OUT endpoint state */ \ - usb_lld_endpoint_fields /* USB driver specific endpoint fields */ \ - }, \ - .out_ep_config = \ - { \ - stream##_OUT_MODE, /* Interrupt EP */ \ - NULL, /* SETUP packet notification callback */ \ - NULL, /* IN notification callback */ \ - qmkusbDataReceived, /* OUT notification callback */ \ - 0, /* IN maximum packet size */ \ - stream##_EPSIZE, /* OUT maximum packet size */ \ - NULL, /* IN Endpoint state */ \ - NULL, /* OUT endpoint state */ \ - usb_lld_endpoint_fields /* USB driver specific endpoint fields */ \ - }, \ - .int_ep_config = \ - { \ - USB_EP_MODE_TYPE_INTR, /* Interrupt EP */ \ - NULL, /* SETUP packet notification callback */ \ - qmkusbInterruptTransmitted, /* IN notification callback */ \ - NULL, /* OUT notification callback */ \ - CDC_NOTIFICATION_EPSIZE, /* IN maximum packet size */ \ - 0, /* OUT maximum packet size */ \ - NULL, /* IN Endpoint state */ \ - NULL, /* OUT endpoint state */ \ - usb_lld_endpoint_fields /* USB driver specific endpoint fields */ \ - }, \ - .config = { \ - .usbp = &USB_DRIVER, \ - .bulk_in = stream##_IN_EPNUM, \ - .bulk_out = stream##_OUT_EPNUM, \ - .int_in = notification, \ - .in_buffers = stream##_IN_CAPACITY, \ - .out_buffers = stream##_OUT_CAPACITY, \ - .in_size = stream##_EPSIZE, \ - .out_size = stream##_EPSIZE, \ - .fixed_size = fixedsize, \ - .ib = (__attribute__((aligned(4))) uint8_t[BQ_BUFFER_SIZE(stream##_IN_CAPACITY, stream##_EPSIZE)]){}, \ - .ob = (__attribute__((aligned(4))) uint8_t[BQ_BUFFER_SIZE(stream##_OUT_CAPACITY, stream##_EPSIZE)]){}, \ - } \ - } -#endif - -typedef struct { - union { - struct { -#ifdef RAW_ENABLE - usb_driver_config_t raw_driver; -#endif -#ifdef MIDI_ENABLE - usb_driver_config_t midi_driver; -#endif -#ifdef VIRTSER_ENABLE - usb_driver_config_t serial_driver; -#endif - }; - usb_driver_config_t array[0]; - }; -} usb_driver_configs_t; - -static usb_driver_configs_t drivers = { -#ifdef RAW_ENABLE -# ifndef RAW_IN_CAPACITY -# define RAW_IN_CAPACITY 4 -# endif -# ifndef RAW_OUT_CAPACITY -# define RAW_OUT_CAPACITY 4 -# endif -# define RAW_IN_MODE USB_EP_MODE_TYPE_INTR -# define RAW_OUT_MODE USB_EP_MODE_TYPE_INTR - .raw_driver = QMK_USB_DRIVER_CONFIG(RAW, 0, false), -#endif - -#ifdef MIDI_ENABLE -# define MIDI_STREAM_IN_CAPACITY 4 -# define MIDI_STREAM_OUT_CAPACITY 4 -# define MIDI_STREAM_IN_MODE USB_EP_MODE_TYPE_BULK -# define MIDI_STREAM_OUT_MODE USB_EP_MODE_TYPE_BULK - .midi_driver = QMK_USB_DRIVER_CONFIG(MIDI_STREAM, 0, false), -#endif - -#ifdef VIRTSER_ENABLE -# define CDC_IN_CAPACITY 4 -# define CDC_OUT_CAPACITY 4 -# define CDC_IN_MODE USB_EP_MODE_TYPE_BULK -# define CDC_OUT_MODE USB_EP_MODE_TYPE_BULK - .serial_driver = QMK_USB_DRIVER_CONFIG(CDC, CDC_NOTIFICATION_EPNUM, false), -#endif -}; - -#define NUM_USB_DRIVERS (sizeof(drivers) / sizeof(usb_driver_config_t)) - /* --------------------------------------------------------- * USB driver functions * --------------------------------------------------------- @@ -507,36 +184,11 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) { case USB_EVENT_CONFIGURED: osalSysLockFromISR(); - /* Enable the endpoints specified into the configuration. */ -#ifndef KEYBOARD_SHARED_EP - usbInitEndpointI(usbp, KEYBOARD_IN_EPNUM, &kbd_ep_config); -#endif -#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP) - usbInitEndpointI(usbp, MOUSE_IN_EPNUM, &mouse_ep_config); -#endif -#ifdef SHARED_EP_ENABLE - usbInitEndpointI(usbp, SHARED_IN_EPNUM, &shared_ep_config); -#endif -#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP) - usbInitEndpointI(usbp, JOYSTICK_IN_EPNUM, &joystick_ep_config); -#endif -#if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP) - usbInitEndpointI(usbp, DIGITIZER_IN_EPNUM, &digitizer_ep_config); -#endif -#ifdef CONSOLE_ENABLE - usbInitEndpointI(usbp, CONSOLE_IN_EPNUM, &console_ep_config); -#endif - for (int i = 0; i < NUM_USB_DRIVERS; i++) { -#ifdef USB_ENDPOINTS_ARE_REORDERABLE - usbInitEndpointI(usbp, drivers.array[i].config.bulk_in, &drivers.array[i].inout_ep_config); -#else - usbInitEndpointI(usbp, drivers.array[i].config.bulk_in, &drivers.array[i].in_ep_config); - usbInitEndpointI(usbp, drivers.array[i].config.bulk_out, &drivers.array[i].out_ep_config); -#endif - if (drivers.array[i].config.int_in) { - usbInitEndpointI(usbp, drivers.array[i].config.int_in, &drivers.array[i].int_ep_config); - } - qmkusbConfigureHookI(&drivers.array[i].driver); + for (int i = 0; i < USB_ENDPOINT_IN_COUNT; i++) { + usb_endpoint_in_configure_cb(&usb_endpoints_in[i]); + } + for (int i = 0; i < USB_ENDPOINT_OUT_COUNT; i++) { + usb_endpoint_out_configure_cb(&usb_endpoints_out[i]); } osalSysUnlockFromISR(); if (last_suspend_state) { @@ -550,22 +202,25 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) { /* Falls into.*/ case USB_EVENT_RESET: usb_event_queue_enqueue(event); - for (int i = 0; i < NUM_USB_DRIVERS; i++) { - chSysLockFromISR(); - /* Disconnection event on suspend.*/ - qmkusbSuspendHookI(&drivers.array[i].driver); - chSysUnlockFromISR(); + chSysLockFromISR(); + for (int i = 0; i < USB_ENDPOINT_IN_COUNT; i++) { + usb_endpoint_in_suspend_cb(&usb_endpoints_in[i]); } + for (int i = 0; i < USB_ENDPOINT_OUT_COUNT; i++) { + usb_endpoint_out_suspend_cb(&usb_endpoints_out[i]); + } + chSysUnlockFromISR(); return; case USB_EVENT_WAKEUP: - // TODO: from ISR! print("[W]"); - for (int i = 0; i < NUM_USB_DRIVERS; i++) { - chSysLockFromISR(); - /* Disconnection event on suspend.*/ - qmkusbWakeupHookI(&drivers.array[i].driver); - chSysUnlockFromISR(); + chSysLockFromISR(); + for (int i = 0; i < USB_ENDPOINT_IN_COUNT; i++) { + usb_endpoint_in_wakeup_cb(&usb_endpoints_in[i]); } + for (int i = 0; i < USB_ENDPOINT_OUT_COUNT; i++) { + usb_endpoint_out_wakeup_cb(&usb_endpoints_out[i]); + } + chSysUnlockFromISR(); usb_event_queue_enqueue(USB_EVENT_WAKEUP); return; @@ -587,7 +242,7 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) { * Other Device Required Optional Optional Optional Optional Optional */ -static uint8_t set_report_buf[2] __attribute__((aligned(4))); +static uint8_t _Alignas(4) set_report_buf[2]; static void set_led_transfer_cb(USBDriver *usbp) { usb_control_request_t *setup = (usb_control_request_t *)usbp->setup; @@ -611,41 +266,7 @@ static bool usb_requests_hook_cb(USBDriver *usbp) { case USB_RTYPE_DIR_DEV2HOST: switch (setup->bRequest) { case HID_REQ_GetReport: - switch (setup->wIndex) { -#ifndef KEYBOARD_SHARED_EP - case KEYBOARD_INTERFACE: - usbSetupTransfer(usbp, (uint8_t *)&keyboard_report_sent, KEYBOARD_REPORT_SIZE, NULL); - return TRUE; - break; -#endif -#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP) - case MOUSE_INTERFACE: - usbSetupTransfer(usbp, (uint8_t *)&mouse_report_sent, sizeof(mouse_report_sent), NULL); - return TRUE; - break; -#endif -#ifdef SHARED_EP_ENABLE - case SHARED_INTERFACE: -# ifdef KEYBOARD_SHARED_EP - if (setup->wValue.lbyte == REPORT_ID_KEYBOARD) { - usbSetupTransfer(usbp, (uint8_t *)&keyboard_report_sent, KEYBOARD_REPORT_SIZE, NULL); - return true; - } -# endif -# ifdef MOUSE_SHARED_EP - if (setup->wValue.lbyte == REPORT_ID_MOUSE) { - usbSetupTransfer(usbp, (uint8_t *)&mouse_report_sent, sizeof(mouse_report_sent), NULL); - return true; - } -# endif -#endif /* SHARED_EP_ENABLE */ - default: - universal_report_blank.report_id = setup->wValue.lbyte; - usbSetupTransfer(usbp, (uint8_t *)&universal_report_blank, setup->wLength, NULL); - return true; - } - break; - + return usb_get_report_cb(usbp); case HID_REQ_GetProtocol: if (setup->wIndex == KEYBOARD_INTERFACE) { usbSetupTransfer(usbp, &keyboard_protocol, sizeof(uint8_t), NULL); @@ -654,10 +275,8 @@ static bool usb_requests_hook_cb(USBDriver *usbp) { break; case HID_REQ_GetIdle: - usbSetupTransfer(usbp, &keyboard_idle, sizeof(uint8_t), NULL); - return true; + return usb_get_idle_cb(usbp); } - break; case USB_RTYPE_DIR_HOST2DEV: switch (setup->bRequest) { @@ -671,38 +290,15 @@ static bool usb_requests_hook_cb(USBDriver *usbp) { return true; } break; - case HID_REQ_SetProtocol: if (setup->wIndex == KEYBOARD_INTERFACE) { keyboard_protocol = setup->wValue.word; -#ifdef NKRO_ENABLE - if (!keyboard_protocol && keyboard_idle) { -#else /* NKRO_ENABLE */ - if (keyboard_idle) { -#endif /* NKRO_ENABLE */ - /* arm the idle timer if boot protocol & idle */ - osalSysLockFromISR(); - chVTSetI(&keyboard_idle_timer, 4 * TIME_MS2I(keyboard_idle), keyboard_idle_timer_cb, (void *)usbp); - osalSysUnlockFromISR(); - } } usbSetupTransfer(usbp, NULL, 0, NULL); return true; - case HID_REQ_SetIdle: keyboard_idle = setup->wValue.hbyte; - /* arm the timer */ -#ifdef NKRO_ENABLE - if (!keymap_config.nkro && keyboard_idle) { -#else /* NKRO_ENABLE */ - if (keyboard_idle) { -#endif /* NKRO_ENABLE */ - osalSysLockFromISR(); - chVTSetI(&keyboard_idle_timer, 4 * TIME_MS2I(keyboard_idle), keyboard_idle_timer_cb, (void *)usbp); - osalSysUnlockFromISR(); - } - usbSetupTransfer(usbp, NULL, 0, NULL); - return true; + return usb_set_idle_cb(usbp); } break; } @@ -719,52 +315,40 @@ static bool usb_requests_hook_cb(USBDriver *usbp) { return true; } - for (int i = 0; i < NUM_USB_DRIVERS; i++) { - if (drivers.array[i].config.int_in) { - // NOTE: Assumes that we only have one serial driver - return qmkusbRequestsHook(usbp); + for (int i = 0; i < USB_ENDPOINT_IN_COUNT; i++) { + if (usb_endpoints_in[i].usb_requests_cb != NULL) { + if (usb_endpoints_in[i].usb_requests_cb(usbp)) { + return true; + } } } return false; } -static void usb_sof_cb(USBDriver *usbp) { - osalSysLockFromISR(); - for (int i = 0; i < NUM_USB_DRIVERS; i++) { - qmkusbSOFHookI(&drivers.array[i].driver); - } - osalSysUnlockFromISR(); +static __attribute__((unused)) void dummy_cb(USBDriver *usbp) { + (void)usbp; } -/* USB driver configuration */ static const USBConfig usbcfg = { usb_event_cb, /* USB events callback */ usb_get_descriptor_cb, /* Device GET_DESCRIPTOR request callback */ usb_requests_hook_cb, /* Requests hook callback */ - usb_sof_cb /* Start Of Frame callback */ +#if STM32_USB_USE_OTG1 == TRUE || STM32_USB_USE_OTG2 == TRUE + dummy_cb, /* Workaround for OTG Peripherals not servicing new interrupts + after resuming from suspend. */ +#endif }; -/* - * Initialize the USB driver - */ void init_usb_driver(USBDriver *usbp) { - for (int i = 0; i < NUM_USB_DRIVERS; i++) { -#ifdef USB_ENDPOINTS_ARE_REORDERABLE - QMKUSBDriver *driver = &drivers.array[i].driver; - drivers.array[i].inout_ep_config.in_state = &drivers.array[i].in_ep_state; - drivers.array[i].inout_ep_config.out_state = &drivers.array[i].out_ep_state; - drivers.array[i].int_ep_config.in_state = &drivers.array[i].int_ep_state; - qmkusbObjectInit(driver, &drivers.array[i].config); - qmkusbStart(driver, &drivers.array[i].config); -#else - QMKUSBDriver *driver = &drivers.array[i].driver; - drivers.array[i].in_ep_config.in_state = &drivers.array[i].in_ep_state; - drivers.array[i].out_ep_config.out_state = &drivers.array[i].out_ep_state; - drivers.array[i].int_ep_config.in_state = &drivers.array[i].int_ep_state; - qmkusbObjectInit(driver, &drivers.array[i].config); - qmkusbStart(driver, &drivers.array[i].config); -#endif + for (int i = 0; i < USB_ENDPOINT_IN_COUNT; i++) { + usb_endpoint_in_init(&usb_endpoints_in[i]); + usb_endpoint_in_start(&usb_endpoints_in[i]); + } + + for (int i = 0; i < USB_ENDPOINT_OUT_COUNT; i++) { + usb_endpoint_out_init(&usb_endpoints_out[i]); + usb_endpoint_out_start(&usb_endpoints_out[i]); } /* @@ -777,23 +361,31 @@ void init_usb_driver(USBDriver *usbp) { wait_ms(50); usbStart(usbp, &usbcfg); usbConnectBus(usbp); - - chVTObjectInit(&keyboard_idle_timer); } __attribute__((weak)) void restart_usb_driver(USBDriver *usbp) { usbDisconnectBus(usbp); usbStop(usbp); -#if USB_SUSPEND_WAKEUP_DELAY > 0 - // Some hubs, kvm switches, and monitors do - // weird things, with USB device state bouncing - // around wildly on wakeup, yielding race - // conditions that can corrupt the keyboard state. - // - // Pause for a while to let things settle... - wait_ms(USB_SUSPEND_WAKEUP_DELAY); -#endif + for (int i = 0; i < USB_ENDPOINT_IN_COUNT; i++) { + usb_endpoint_in_stop(&usb_endpoints_in[i]); + } + + for (int i = 0; i < USB_ENDPOINT_OUT_COUNT; i++) { + usb_endpoint_out_stop(&usb_endpoints_out[i]); + } + + wait_ms(50); + + for (int i = 0; i < USB_ENDPOINT_IN_COUNT; i++) { + usb_endpoint_in_init(&usb_endpoints_in[i]); + usb_endpoint_in_start(&usb_endpoints_in[i]); + } + + for (int i = 0; i < USB_ENDPOINT_OUT_COUNT; i++) { + usb_endpoint_out_init(&usb_endpoints_out[i]); + usb_endpoint_out_start(&usb_endpoints_out[i]); + } usbStart(usbp, &usbcfg); usbConnectBus(usbp); @@ -804,81 +396,78 @@ __attribute__((weak)) void restart_usb_driver(USBDriver *usbp) { * --------------------------------------------------------- */ -/* Idle requests timer code - * callback (called from ISR, unlocked state) */ -static void keyboard_idle_timer_cb(struct ch_virtual_timer *timer, void *arg) { - (void)timer; - USBDriver *usbp = (USBDriver *)arg; - - osalSysLockFromISR(); - - /* check that the states of things are as they're supposed to */ - if (usbGetDriverStateI(usbp) != USB_ACTIVE) { - /* do not rearm the timer, should be enabled on IDLE request */ - osalSysUnlockFromISR(); - return; - } - -#ifdef NKRO_ENABLE - if (!keymap_config.nkro && keyboard_idle && keyboard_protocol) { -#else /* NKRO_ENABLE */ - if (keyboard_idle && keyboard_protocol) { -#endif /* NKRO_ENABLE */ - /* TODO: are we sure we want the KBD_ENDPOINT? */ - if (!usbGetTransmitStatusI(usbp, KEYBOARD_IN_EPNUM)) { - usbStartTransmitI(usbp, KEYBOARD_IN_EPNUM, (uint8_t *)&keyboard_report_sent, KEYBOARD_EPSIZE); - } - /* rearm the timer */ - chVTSetI(&keyboard_idle_timer, 4 * TIME_MS2I(keyboard_idle), keyboard_idle_timer_cb, (void *)usbp); - } - - /* do not rearm the timer if the condition above fails - * it should be enabled again on either IDLE or SET_PROTOCOL requests */ - osalSysUnlockFromISR(); -} - /* LED status */ uint8_t keyboard_leds(void) { return keyboard_led_state; } -void send_report(uint8_t endpoint, void *report, size_t size) { - osalSysLock(); - if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) { - osalSysUnlock(); - return; - } - - if (usbGetTransmitStatusI(&USB_DRIVER, endpoint)) { - /* Need to either suspend, or loop and call unlock/lock during - * every iteration - otherwise the system will remain locked, - * no interrupts served, so USB not going through as well. - * Note: for suspend, need USB_USE_WAIT == TRUE in halconf.h */ - if (osalThreadSuspendTimeoutS(&(&USB_DRIVER)->epc[endpoint]->in_state->thread, TIME_MS2I(10)) == MSG_TIMEOUT) { - osalSysUnlock(); - return; - } - } - usbStartTransmitI(&USB_DRIVER, endpoint, report, size); - osalSysUnlock(); +/** + * @brief Send a report to the host, the report is enqueued into an output + * queue and send once the USB endpoint becomes empty. + * + * @param endpoint USB IN endpoint to send the report from + * @param report pointer to the report + * @param size size of the report + * @return true Success + * @return false Failure + */ +bool send_report(usb_endpoint_in_lut_t endpoint, void *report, size_t size) { + return usb_endpoint_in_send(&usb_endpoints_in[endpoint], (uint8_t *)report, size, TIME_MS2I(100), false); +} + +/** + * @brief Send a report to the host, but delay the sending until the size of + * endpoint report is reached or the incompletely filled buffer is flushed with + * a call to `flush_report_buffered`. This is useful if the report is being + * updated frequently. The complete report is then enqueued into an output + * queue and send once the USB endpoint becomes empty. + * + * @param endpoint USB IN endpoint to send the report from + * @param report pointer to the report + * @param size size of the report + * @return true Success + * @return false Failure + */ +static bool send_report_buffered(usb_endpoint_in_lut_t endpoint, void *report, size_t size) { + return usb_endpoint_in_send(&usb_endpoints_in[endpoint], (uint8_t *)report, size, TIME_MS2I(100), true); +} + +/** @brief Flush all buffered reports which were enqueued with a call to + * `send_report_buffered` that haven't been send. If necessary the buffered + * report can be padded with zeros up to the endpoints maximum size. + * + * @param endpoint USB IN endpoint to flush the reports from + * @param padded Pad the buffered report with zeros up to the endpoints maximum size + */ +static void flush_report_buffered(usb_endpoint_in_lut_t endpoint, bool padded) { + usb_endpoint_in_flush(&usb_endpoints_in[endpoint], padded); +} + +/** + * @brief Receive a report from the host. + * + * @param endpoint USB OUT endpoint to receive the report from + * @param report pointer to the report + * @param size size of the report + * @return true Success + * @return false Failure + */ +static bool receive_report(usb_endpoint_out_lut_t endpoint, void *report, size_t size) { + return usb_endpoint_out_receive(&usb_endpoints_out[endpoint], (uint8_t *)report, size, TIME_IMMEDIATE); } -/* prepare and start sending a report IN - * not callable from ISR or locked state */ void send_keyboard(report_keyboard_t *report) { /* If we're in Boot Protocol, don't send any report ID or other funky fields */ if (!keyboard_protocol) { - send_report(KEYBOARD_IN_EPNUM, &report->mods, 8); + send_report(USB_ENDPOINT_IN_KEYBOARD, &report->mods, 8); } else { - send_report(KEYBOARD_IN_EPNUM, report, KEYBOARD_REPORT_SIZE); + send_report(USB_ENDPOINT_IN_KEYBOARD, report, KEYBOARD_REPORT_SIZE); } - - keyboard_report_sent = *report; } void send_nkro(report_nkro_t *report) { #ifdef NKRO_ENABLE - send_report(SHARED_IN_EPNUM, report, sizeof(report_nkro_t)); + send_report(USB_ENDPOINT_IN_SHARED, report, sizeof(report_nkro_t)); #endif } @@ -889,8 +478,7 @@ void send_nkro(report_nkro_t *report) { void send_mouse(report_mouse_t *report) { #ifdef MOUSE_ENABLE - send_report(MOUSE_IN_EPNUM, report, sizeof(report_mouse_t)); - mouse_report_sent = *report; + send_report(USB_ENDPOINT_IN_MOUSE, report, sizeof(report_mouse_t)); #endif } @@ -901,25 +489,25 @@ void send_mouse(report_mouse_t *report) { void send_extra(report_extra_t *report) { #ifdef EXTRAKEY_ENABLE - send_report(SHARED_IN_EPNUM, report, sizeof(report_extra_t)); + send_report(USB_ENDPOINT_IN_SHARED, report, sizeof(report_extra_t)); #endif } void send_programmable_button(report_programmable_button_t *report) { #ifdef PROGRAMMABLE_BUTTON_ENABLE - send_report(SHARED_IN_EPNUM, report, sizeof(report_programmable_button_t)); + send_report(USB_ENDPOINT_IN_SHARED, report, sizeof(report_programmable_button_t)); #endif } void send_joystick(report_joystick_t *report) { #ifdef JOYSTICK_ENABLE - send_report(JOYSTICK_IN_EPNUM, report, sizeof(report_joystick_t)); + send_report(USB_ENDPOINT_IN_JOYSTICK, report, sizeof(report_joystick_t)); #endif } void send_digitizer(report_digitizer_t *report) { #ifdef DIGITIZER_ENABLE - send_report(DIGITIZER_IN_EPNUM, report, sizeof(report_digitizer_t)); + send_report(USB_ENDPOINT_IN_DIGITIZER, report, sizeof(report_digitizer_t)); #endif } @@ -931,46 +519,21 @@ void send_digitizer(report_digitizer_t *report) { #ifdef CONSOLE_ENABLE int8_t sendchar(uint8_t c) { - rbuf_enqueue(c); - return 0; + return (int8_t)send_report_buffered(USB_ENDPOINT_IN_CONSOLE, &c, sizeof(uint8_t)); } void console_task(void) { - if (!rbuf_has_data()) { - return; - } - - osalSysLock(); - if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) { - osalSysUnlock(); - return; - } - - if (usbGetTransmitStatusI(&USB_DRIVER, CONSOLE_IN_EPNUM)) { - osalSysUnlock(); - return; - } - - // Send in chunks - padded with zeros to 32 - char send_buf[CONSOLE_EPSIZE] = {0}; - uint8_t send_buf_count = 0; - while (rbuf_has_data() && send_buf_count < CONSOLE_EPSIZE) { - send_buf[send_buf_count++] = rbuf_dequeue(); - } - - usbStartTransmitI(&USB_DRIVER, CONSOLE_IN_EPNUM, (const uint8_t *)send_buf, CONSOLE_EPSIZE); - osalSysUnlock(); + flush_report_buffered(USB_ENDPOINT_IN_CONSOLE, true); } #endif /* CONSOLE_ENABLE */ #ifdef RAW_ENABLE void raw_hid_send(uint8_t *data, uint8_t length) { - // TODO: implement variable size packet if (length != RAW_EPSIZE) { return; } - chnWrite(&drivers.raw_driver.driver, data, length); + send_report(USB_ENDPOINT_IN_RAW, data, length); } __attribute__((weak)) void raw_hid_receive(uint8_t *data, uint8_t length) { @@ -981,13 +544,9 @@ __attribute__((weak)) void raw_hid_receive(uint8_t *data, uint8_t length) { void raw_hid_task(void) { uint8_t buffer[RAW_EPSIZE]; - size_t size = 0; - do { - size = chnReadTimeout(&drivers.raw_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE); - if (size > 0) { - raw_hid_receive(buffer, size); - } - } while (size > 0); + while (receive_report(USB_ENDPOINT_OUT_RAW, buffer, sizeof(buffer))) { + raw_hid_receive(buffer, sizeof(buffer)); + } } #endif @@ -995,32 +554,59 @@ void raw_hid_task(void) { #ifdef MIDI_ENABLE void send_midi_packet(MIDI_EventPacket_t *event) { - chnWrite(&drivers.midi_driver.driver, (uint8_t *)event, sizeof(MIDI_EventPacket_t)); + send_report(USB_ENDPOINT_IN_MIDI, (uint8_t *)event, sizeof(MIDI_EventPacket_t)); } bool recv_midi_packet(MIDI_EventPacket_t *const event) { - size_t size = chnReadTimeout(&drivers.midi_driver.driver, (uint8_t *)event, sizeof(MIDI_EventPacket_t), TIME_IMMEDIATE); - return size == sizeof(MIDI_EventPacket_t); + return receive_report(USB_ENDPOINT_OUT_MIDI, (uint8_t *)event, sizeof(MIDI_EventPacket_t)); } + void midi_ep_task(void) { uint8_t buffer[MIDI_STREAM_EPSIZE]; - size_t size = 0; - do { - size = chnReadTimeout(&drivers.midi_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE); - if (size > 0) { - MIDI_EventPacket_t event; - recv_midi_packet(&event); - } - } while (size > 0); + while (receive_report(USB_ENDPOINT_OUT_MIDI, buffer, sizeof(buffer))) { + MIDI_EventPacket_t event; + // TODO: this seems totally wrong? The midi task will never see any + // packets if we consume them here + recv_midi_packet(&event); + } } #endif #ifdef VIRTSER_ENABLE +# include "hal_usb_cdc.h" +/** + * @brief CDC serial driver configuration structure. Set to 9600 baud, 1 stop bit, no parity, 8 data bits. + */ +static cdc_linecoding_t linecoding = {{0x00, 0x96, 0x00, 0x00}, LC_STOP_1, LC_PARITY_NONE, 8}; + +bool virtser_usb_request_cb(USBDriver *usbp) { + if ((usbp->setup[0] & USB_RTYPE_TYPE_MASK) == USB_RTYPE_TYPE_CLASS) { /* bmRequestType */ + if (usbp->setup[4] == CCI_INTERFACE) { /* wIndex (LSB) */ + switch (usbp->setup[1]) { /* bRequest */ + case CDC_GET_LINE_CODING: + usbSetupTransfer(usbp, (uint8_t *)&linecoding, sizeof(linecoding), NULL); + return true; + case CDC_SET_LINE_CODING: + usbSetupTransfer(usbp, (uint8_t *)&linecoding, sizeof(linecoding), NULL); + return true; + case CDC_SET_CONTROL_LINE_STATE: + /* Nothing to do, there are no control lines.*/ + usbSetupTransfer(usbp, NULL, 0, NULL); + return true; + default: + return false; + } + } + } + + return false; +} + void virtser_init(void) {} void virtser_send(const uint8_t byte) { - chnWrite(&drivers.serial_driver.driver, &byte, 1); + send_report_buffered(USB_ENDPOINT_IN_CDC_DATA, (void *)&byte, sizeof(byte)); } __attribute__((weak)) void virtser_recv(uint8_t c) { @@ -1028,14 +614,14 @@ __attribute__((weak)) void virtser_recv(uint8_t c) { } void virtser_task(void) { - uint8_t numBytesReceived = 0; - uint8_t buffer[16]; - do { - numBytesReceived = chnReadTimeout(&drivers.serial_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE); - for (int i = 0; i < numBytesReceived; i++) { + uint8_t buffer[CDC_EPSIZE]; + while (receive_report(USB_ENDPOINT_OUT_CDC_DATA, buffer, sizeof(buffer))) { + for (int i = 0; i < sizeof(buffer); i++) { virtser_recv(buffer[i]); } - } while (numBytesReceived > 0); + } + + flush_report_buffered(USB_ENDPOINT_IN_CDC_DATA, false); } #endif diff --git a/tmk_core/protocol/chibios/usb_main.h b/tmk_core/protocol/chibios/usb_main.h index 3fd1e84fe84..5ba6fb1961e 100644 --- a/tmk_core/protocol/chibios/usb_main.h +++ b/tmk_core/protocol/chibios/usb_main.h @@ -1,25 +1,21 @@ -/* - * (c) 2015 flabberast - * - * Based on the following work: - * - Guillaume Duc's raw hid example (MIT License) - * https://github.com/guiduc/usb-hid-chibios-example - * - PJRC Teensy examples (MIT License) - * https://www.pjrc.com/teensy/usb_keyboard.html - * - hasu's TMK keyboard code (GPL v2 and some code Modified BSD) - * https://github.com/tmk/tmk_keyboard/ - * - ChibiOS demo code (Apache 2.0 License) - * http://www.chibios.org - * - * Since some GPL'd code is used, this work is licensed under - * GPL v2 or later. - */ +// Copyright 2023 Stefan Kerkmann (@KarlK90) +// Copyright 2020 Ryan (@fauxpark) +// Copyright 2020 Joel Challis (@zvecr) +// Copyright 2018 James Laird-Wah +// Copyright 2016 Fredizzimo +// Copyright 2016 Giovanni Di Sirio +// SPDX-License-Identifier: GPL-3.0-or-later OR Apache-2.0 #pragma once #include #include +#include "usb_device_state.h" +#include "usb_descriptor.h" +#include "usb_driver.h" +#include "usb_endpoints.h" + /* ------------------------- * General USB driver header * ------------------------- @@ -36,6 +32,8 @@ void init_usb_driver(USBDriver *usbp); /* Restart the USB driver and bus */ void restart_usb_driver(USBDriver *usbp); +bool send_report(usb_endpoint_in_lut_t endpoint, void *report, size_t size); + /* --------------- * USB Event queue * --------------- @@ -58,3 +56,14 @@ void usb_event_queue_task(void); int8_t sendchar(uint8_t c); #endif /* CONSOLE_ENABLE */ + +/* -------------- + * Virtser header + * -------------- + */ + +#if defined(VIRTSER_ENABLE) + +bool virtser_usb_request_cb(USBDriver *usbp); + +#endif diff --git a/tmk_core/protocol/chibios/usb_report_handling.c b/tmk_core/protocol/chibios/usb_report_handling.c new file mode 100644 index 00000000000..64074b21642 --- /dev/null +++ b/tmk_core/protocol/chibios/usb_report_handling.c @@ -0,0 +1,296 @@ +// Copyright 2023 Stefan Kerkmann (@KarlK90) +// SPDX-License-Identifier: GPL-3.0-or-later + +#include +#include +#include + +#include "usb_report_handling.h" +#include "usb_endpoints.h" +#include "usb_main.h" +#include "usb_types.h" +#include "usb_driver.h" +#include "report.h" + +extern usb_endpoint_in_t usb_endpoints_in[USB_ENDPOINT_IN_COUNT]; +extern usb_endpoint_in_lut_t usb_endpoint_interface_lut[TOTAL_INTERFACES]; + +void usb_set_report(usb_fs_report_t **reports, const uint8_t *data, size_t length) { + if (*reports == NULL) { + return; + } + + (*reports)->last_report = chVTGetSystemTimeX(); + (*reports)->length = length; + memcpy(&(*reports)->data, data, length); +} + +void usb_get_report(usb_fs_report_t **reports, uint8_t report_id, usb_fs_report_t *report) { + (void)report_id; + if (*reports == NULL) { + return; + } + + report->length = (*reports)->length; + memcpy(&report->data, &(*reports)->data, report->length); +} + +void usb_reset_report(usb_fs_report_t **reports) { + if (*reports == NULL) { + return; + } + + memset(&(*reports)->data, 0, (*reports)->length); + (*reports)->idle_rate = 0; + (*reports)->last_report = 0; +} + +void usb_shared_set_report(usb_fs_report_t **reports, const uint8_t *data, size_t length) { + uint8_t report_id = data[0]; + + if (report_id > REPORT_ID_COUNT || reports[report_id] == NULL) { + return; + } + + reports[report_id]->last_report = chVTGetSystemTimeX(); + reports[report_id]->length = length; + memcpy(&reports[report_id]->data, data, length); +} + +void usb_shared_get_report(usb_fs_report_t **reports, uint8_t report_id, usb_fs_report_t *report) { + if (report_id > REPORT_ID_COUNT || reports[report_id] == NULL) { + return; + } + + report->length = reports[report_id]->length; + memcpy(&report->data, &reports[report_id]->data, report->length); +} + +void usb_shared_reset_report(usb_fs_report_t **reports) { + for (int i = 0; i <= REPORT_ID_COUNT; i++) { + if (reports[i] == NULL) { + continue; + } + memset(&reports[i]->data, 0, reports[i]->length); + reports[i]->idle_rate = 0; + reports[i]->last_report = 0; + } +} + +bool usb_get_report_cb(USBDriver *driver) { + usb_control_request_t *setup = (usb_control_request_t *)driver->setup; + uint8_t interface = setup->wIndex; + uint8_t report_id = setup->wValue.lbyte; + + static usb_fs_report_t report; + + if (!IS_VALID_INTERFACE(interface) || !IS_VALID_REPORT_ID(report_id)) { + return false; + } + + usb_endpoint_in_lut_t ep = usb_endpoint_interface_lut[interface]; + + if (!IS_VALID_USB_ENDPOINT_IN_LUT(ep)) { + return false; + } + + usb_report_storage_t *report_storage = usb_endpoints_in[ep].report_storage; + + if (report_storage == NULL) { + return false; + } + + report_storage->get_report(report_storage->reports, report_id, &report); + + usbSetupTransfer(driver, (uint8_t *)report.data, report.length, NULL); + + return true; +} + +static bool run_idle_task = false; + +void usb_set_idle_rate(usb_fs_report_t **reports, uint8_t report_id, uint8_t idle_rate) { + (void)report_id; + + if (*reports == NULL) { + return; + } + + (*reports)->idle_rate = idle_rate * 4; + + run_idle_task |= idle_rate != 0; +} + +uint8_t usb_get_idle_rate(usb_fs_report_t **reports, uint8_t report_id) { + (void)report_id; + + if (*reports == NULL) { + return 0; + } + + return (*reports)->idle_rate / 4; +} + +bool usb_idle_timer_elapsed(usb_fs_report_t **reports, uint8_t report_id) { + (void)report_id; + + if (*reports == NULL) { + return false; + } + + osalSysLock(); + time_msecs_t idle_rate = (*reports)->idle_rate; + systime_t last_report = (*reports)->last_report; + osalSysUnlock(); + + if (idle_rate == 0) { + return false; + } + + return chTimeI2MS(chVTTimeElapsedSinceX(last_report)) >= idle_rate; +} + +void usb_shared_set_idle_rate(usb_fs_report_t **reports, uint8_t report_id, uint8_t idle_rate) { + // USB spec demands that a report_id of 0 would set the idle rate for all + // reports of that endpoint, but this can easily lead to resource + // exhaustion, therefore we deliberalty break the spec at this point. + if (report_id == 0 || report_id > REPORT_ID_COUNT || reports[report_id] == NULL) { + return; + } + + reports[report_id]->idle_rate = idle_rate * 4; + + run_idle_task |= idle_rate != 0; +} + +uint8_t usb_shared_get_idle_rate(usb_fs_report_t **reports, uint8_t report_id) { + if (report_id > REPORT_ID_COUNT || reports[report_id] == NULL) { + return 0; + } + + return reports[report_id]->idle_rate / 4; +} + +bool usb_shared_idle_timer_elapsed(usb_fs_report_t **reports, uint8_t report_id) { + if (report_id > REPORT_ID_COUNT || reports[report_id] == NULL) { + return false; + } + + osalSysLock(); + time_msecs_t idle_rate = reports[report_id]->idle_rate; + systime_t last_report = reports[report_id]->last_report; + osalSysUnlock(); + + if (idle_rate == 0) { + return false; + } + + return chTimeI2MS(chVTTimeElapsedSinceX(last_report)) >= idle_rate; +} + +void usb_idle_task(void) { + if (!run_idle_task) { + return; + } + + static usb_fs_report_t report; + bool non_zero_idle_rate_found = false; + + for (int ep = 0; ep < USB_ENDPOINT_IN_COUNT; ep++) { + usb_report_storage_t *report_storage = usb_endpoints_in[ep].report_storage; + + if (report_storage == NULL) { + continue; + } + +#if defined(SHARED_EP_ENABLE) + if (ep == USB_ENDPOINT_IN_SHARED) { + for (int report_id = 1; report_id <= REPORT_ID_COUNT; report_id++) { + osalSysLock(); + non_zero_idle_rate_found |= report_storage->get_idle(report_storage->reports, report_id) != 0; + osalSysUnlock(); + + if (usb_endpoint_in_is_inactive(&usb_endpoints_in[ep]) && report_storage->idle_timer_elasped(report_storage->reports, report_id)) { + osalSysLock(); + report_storage->get_report(report_storage->reports, report_id, &report); + osalSysUnlock(); + send_report(ep, &report.data, report.length); + } + } + continue; + } +#endif + + osalSysLock(); + non_zero_idle_rate_found |= report_storage->get_idle(report_storage->reports, 0) != 0; + osalSysUnlock(); + + if (usb_endpoint_in_is_inactive(&usb_endpoints_in[ep]) && report_storage->idle_timer_elasped(report_storage->reports, 0)) { + osalSysLock(); + report_storage->get_report(report_storage->reports, 0, &report); + osalSysUnlock(); + send_report(ep, &report.data, report.length); + } + } + + run_idle_task = non_zero_idle_rate_found; +} + +bool usb_get_idle_cb(USBDriver *driver) { + usb_control_request_t *setup = (usb_control_request_t *)driver->setup; + uint8_t interface = setup->wIndex; + uint8_t report_id = setup->wValue.lbyte; + + static uint8_t _Alignas(4) idle_rate; + + if (!IS_VALID_INTERFACE(interface) || !IS_VALID_REPORT_ID(report_id)) { + return false; + } + + usb_endpoint_in_lut_t ep = usb_endpoint_interface_lut[interface]; + + if (!IS_VALID_USB_ENDPOINT_IN_LUT(ep)) { + return false; + } + + usb_report_storage_t *report_storage = usb_endpoints_in[ep].report_storage; + + if (report_storage == NULL) { + return false; + } + + idle_rate = report_storage->get_idle(report_storage->reports, report_id); + + usbSetupTransfer(driver, &idle_rate, 1, NULL); + + return true; +} + +bool usb_set_idle_cb(USBDriver *driver) { + usb_control_request_t *setup = (usb_control_request_t *)driver->setup; + uint8_t interface = setup->wIndex; + uint8_t report_id = setup->wValue.lbyte; + uint8_t idle_rate = setup->wValue.hbyte; + + if (!IS_VALID_INTERFACE(interface) || !IS_VALID_REPORT_ID(report_id)) { + return false; + } + + usb_endpoint_in_lut_t ep = usb_endpoint_interface_lut[interface]; + + if (!IS_VALID_USB_ENDPOINT_IN_LUT(ep)) { + return false; + } + + usb_report_storage_t *report_storage = usb_endpoints_in[ep].report_storage; + + if (report_storage == NULL) { + return false; + } + + report_storage->set_idle(report_storage->reports, report_id, idle_rate); + + usbSetupTransfer(driver, NULL, 0, NULL); + + return true; +} diff --git a/tmk_core/protocol/chibios/usb_report_handling.h b/tmk_core/protocol/chibios/usb_report_handling.h new file mode 100644 index 00000000000..18b4ce5e263 --- /dev/null +++ b/tmk_core/protocol/chibios/usb_report_handling.h @@ -0,0 +1,77 @@ +// Copyright 2023 Stefan Kerkmann (@KarlK90) +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include +#include +#include + +#include "timer.h" + +typedef struct { + time_msecs_t idle_rate; + systime_t last_report; + uint8_t data[64]; + size_t length; +} usb_fs_report_t; + +typedef struct { + usb_fs_report_t **reports; + const void (*get_report)(usb_fs_report_t **, uint8_t, usb_fs_report_t *); + const void (*set_report)(usb_fs_report_t **, const uint8_t *, size_t); + const void (*reset_report)(usb_fs_report_t **); + const void (*set_idle)(usb_fs_report_t **, uint8_t, uint8_t); + const uint8_t (*get_idle)(usb_fs_report_t **, uint8_t); + const bool (*idle_timer_elasped)(usb_fs_report_t **, uint8_t); +} usb_report_storage_t; + +#define QMK_USB_REPORT_STROAGE_ENTRY(_report_id, _report_size) [_report_id] = &((usb_fs_report_t){.data = {[0] = _report_id}, .length = _report_size}) + +#define QMK_USB_REPORT_STORAGE(_get_report, _set_report, _reset_report, _get_idle, _set_idle, _idle_timer_elasped, _report_count, _reports...) \ + &((usb_report_storage_t){ \ + .reports = (_Alignas(4) usb_fs_report_t *[_report_count]){_reports}, \ + .get_report = _get_report, \ + .set_report = _set_report, \ + .reset_report = _reset_report, \ + .get_idle = _get_idle, \ + .set_idle = _set_idle, \ + .idle_timer_elasped = _idle_timer_elasped, \ + }) + +#define QMK_USB_REPORT_STORAGE_DEFAULT(_report_length) \ + QMK_USB_REPORT_STORAGE(&usb_get_report, /* _get_report */ \ + &usb_set_report, /* _set_report */ \ + &usb_reset_report, /* _reset_report */ \ + &usb_get_idle_rate, /* _get_idle */ \ + &usb_set_idle_rate, /* _set_idle */ \ + &usb_idle_timer_elapsed, /* _idle_timer_elasped */ \ + 1, /* _report_count */ \ + QMK_USB_REPORT_STROAGE_ENTRY(0, _report_length)) + +// USB HID SET_REPORT and GET_REPORT handling functions +void usb_set_report(usb_fs_report_t **reports, const uint8_t *data, size_t length); +void usb_shared_set_report(usb_fs_report_t **reports, const uint8_t *data, size_t length); + +void usb_get_report(usb_fs_report_t **reports, uint8_t report_id, usb_fs_report_t *report); +void usb_shared_get_report(usb_fs_report_t **reports, uint8_t report_id, usb_fs_report_t *report); + +void usb_reset_report(usb_fs_report_t **reports); +void usb_shared_reset_report(usb_fs_report_t **reports); + +bool usb_get_report_cb(USBDriver *driver); + +// USB HID SET_IDLE and GET_IDLE handling functions +void usb_idle_task(void); + +void usb_set_idle_rate(usb_fs_report_t **timers, uint8_t report_id, uint8_t idle_rate); +void usb_shared_set_idle_rate(usb_fs_report_t **timers, uint8_t report_id, uint8_t idle_rate); + +uint8_t usb_get_idle_rate(usb_fs_report_t **timers, uint8_t report_id); +uint8_t usb_shared_get_idle_rate(usb_fs_report_t **timers, uint8_t report_id); + +bool usb_idle_timer_elapsed(usb_fs_report_t **timers, uint8_t report_id); +bool usb_shared_idle_timer_elapsed(usb_fs_report_t **timers, uint8_t report_id); + +bool usb_get_idle_cb(USBDriver *driver); +bool usb_set_idle_cb(USBDriver *driver); diff --git a/tmk_core/protocol/report.h b/tmk_core/protocol/report.h index 47bc4f2f2bb..0e4f6e9defa 100644 --- a/tmk_core/protocol/report.h +++ b/tmk_core/protocol/report.h @@ -29,7 +29,8 @@ along with this program. If not, see . // clang-format off /* HID report IDs */ -enum hid_report_ids { +enum hid_report_ids { + REPORT_ID_ALL = 0, REPORT_ID_KEYBOARD = 1, REPORT_ID_MOUSE, REPORT_ID_SYSTEM, @@ -37,9 +38,12 @@ enum hid_report_ids { REPORT_ID_PROGRAMMABLE_BUTTON, REPORT_ID_NKRO, REPORT_ID_JOYSTICK, - REPORT_ID_DIGITIZER + REPORT_ID_DIGITIZER, + REPORT_ID_COUNT = REPORT_ID_DIGITIZER }; +#define IS_VALID_REPORT_ID(id) ((id) >= REPORT_ID_ALL && (id) <= REPORT_ID_COUNT) + /* Mouse buttons */ #define MOUSE_BTN_MASK(n) (1 << (n)) enum mouse_buttons { diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h index 2469990f4d8..ecfb022702b 100644 --- a/tmk_core/protocol/usb_descriptor.h +++ b/tmk_core/protocol/usb_descriptor.h @@ -196,6 +196,8 @@ enum usb_interfaces { TOTAL_INTERFACES }; +#define IS_VALID_INTERFACE(i) ((i) >= 0 && (i) < TOTAL_INTERFACES) + #define NEXT_EPNUM __COUNTER__ /* From b35389317e222eff6876ff74a69cd99ead49335a Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Wed, 28 Feb 2024 11:50:04 -0700 Subject: [PATCH 003/333] Fixup qk100 (firmware size) (#23169) * initial * further size reduction and more... remove rgb matrix effects --- keyboards/qwertykeys/qk100/ansi/info.json | 9 ++------- keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk | 1 - keyboards/qwertykeys/qk100/info.json | 6 ++++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/keyboards/qwertykeys/qk100/ansi/info.json b/keyboards/qwertykeys/qk100/ansi/info.json index 3469f1c62e2..fb52f388de1 100644 --- a/keyboards/qwertykeys/qk100/ansi/info.json +++ b/keyboards/qwertykeys/qk100/ansi/info.json @@ -140,7 +140,6 @@ "hue_breathing": true, "hue_pendulum": true, "hue_wave": true, - "pixel_fractal": true, "pixel_flow": true, "pixel_rain": true, "typing_heatmap": true, @@ -148,15 +147,11 @@ "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 + "solid_splash": true }, "default": { "val": 128 @@ -270,4 +265,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk b/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk index 43061db1dd4..1e5b99807cb 100644 --- a/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk +++ b/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk @@ -1,2 +1 @@ VIA_ENABLE = yes -LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/qwertykeys/qk100/info.json b/keyboards/qwertykeys/qk100/info.json index d020ca8ad20..6edea6dff7d 100644 --- a/keyboards/qwertykeys/qk100/info.json +++ b/keyboards/qwertykeys/qk100/info.json @@ -1,6 +1,5 @@ { "manufacturer": "Qwertykeys", - "url": "", "maintainer": "Qwertykeys", "usb": { "vid": "0x4F53" @@ -17,6 +16,9 @@ "rgblight": true, "nkro": true }, + "build": { + "lto": true + }, "processor": "STM32F103", "bootloader": "stm32duino", "ws2812": { @@ -47,4 +49,4 @@ "dynamic_keymap": { "layer_count": 2 } -} \ No newline at end of file +} From 4e953f1169627b75316390fbe7f2ed977fc2d14d Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Wed, 28 Feb 2024 19:13:04 -0700 Subject: [PATCH 004/333] Fixup mechlovin/octagon (#23179) * initial * replace led count --- keyboards/mechlovin/olly/octagon/halconf.h | 2 - keyboards/mechlovin/olly/octagon/info.json | 17 +++--- .../olly/octagon/keymaps/default/keymap.c | 9 ++-- .../olly/octagon/keymaps/default/readme.md | 1 - .../olly/octagon/keymaps/via/keymap.c | 33 ++---------- keyboards/mechlovin/olly/octagon/mcuconf.h | 1 - keyboards/mechlovin/olly/octagon/octagon.c | 53 ++++++++----------- keyboards/mechlovin/olly/octagon/readme.md | 4 +- keyboards/mechlovin/olly/octagon/rules.mk | 15 +----- 9 files changed, 43 insertions(+), 92 deletions(-) delete mode 100644 keyboards/mechlovin/olly/octagon/keymaps/default/readme.md diff --git a/keyboards/mechlovin/olly/octagon/halconf.h b/keyboards/mechlovin/olly/octagon/halconf.h index 3635a5c4a2d..55add1de633 100644 --- a/keyboards/mechlovin/olly/octagon/halconf.h +++ b/keyboards/mechlovin/olly/octagon/halconf.h @@ -20,6 +20,4 @@ #define HAL_USE_SPI TRUE - #include_next - diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json index 3ef290d3519..81b78b0b1cb 100644 --- a/keyboards/mechlovin/olly/octagon/info.json +++ b/keyboards/mechlovin/olly/octagon/info.json @@ -8,20 +8,25 @@ "pid": "0xD750", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "led_matrix": true, + "rgblight": true + }, + "build": { + "lto": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, "led_count": 26, "animations": { "breathing": true, - "rainbow_mood": true, "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, "static_gradient": true, - "rgb_test": true, - "alternating": true, "twinkle": true } }, diff --git a/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c b/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c index fcb4929654a..353f5f5d6de 100644 --- a/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c +++ b/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c @@ -15,16 +15,13 @@ */ #include QMK_KEYBOARD_H -#define LT1_CAP LT(1, KC_CAPS) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_split_bs( 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_F12, KC_PSCR, KC_PAUS, KC_DEL, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - LT1_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, _______, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) }; diff --git a/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md b/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md deleted file mode 100644 index 17d8ba9e078..00000000000 --- a/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for octagon \ No newline at end of file diff --git a/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c b/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c index 2de37e94d31..353f5f5d6de 100644 --- a/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c +++ b/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c @@ -15,40 +15,13 @@ */ #include QMK_KEYBOARD_H -#define LT1_CAP LT(1, KC_CAPS) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_split_bs( 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_F12, KC_PSCR, KC_PAUS, KC_DEL, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - LT1_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT_split_bs( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [1] = LAYOUT_split_bs( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [1] = LAYOUT_split_bs( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, _______, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) }; diff --git a/keyboards/mechlovin/olly/octagon/mcuconf.h b/keyboards/mechlovin/olly/octagon/mcuconf.h index 607305e5676..6e4987337d2 100644 --- a/keyboards/mechlovin/olly/octagon/mcuconf.h +++ b/keyboards/mechlovin/olly/octagon/mcuconf.h @@ -19,7 +19,6 @@ #include_next - #undef STM32_SPI_USE_SPI1 #define STM32_SPI_USE_SPI1 TRUE diff --git a/keyboards/mechlovin/olly/octagon/octagon.c b/keyboards/mechlovin/olly/octagon/octagon.c index 185ee32a3ee..c89565168b2 100644 --- a/keyboards/mechlovin/olly/octagon/octagon.c +++ b/keyboards/mechlovin/olly/octagon/octagon.c @@ -55,12 +55,13 @@ led_config_t g_led_config = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - } + } }; - bool led_matrix_indicators_kb(void) { - if (!led_matrix_indicators_user()) { return false; } + if (!led_matrix_indicators_user()) { + return false; + } if (host_keyboard_led_state().caps_lock) { led_matrix_set_value(87, 0xFF); led_matrix_set_value(47, 0xFF); @@ -80,33 +81,25 @@ bool led_matrix_indicators_kb(void) { return true; } - layer_state_t layer_state_set_kb(layer_state_t state) { - // if on layer 1, turn on L1 LED, otherwise off. - if (get_highest_layer(state) == 0) { - led_matrix_set_value(90, 0xFF); - } else { - led_matrix_set_value(90, 0x00); - } - // if on layer 2, turn on L2 LED, otherwise off. - if (get_highest_layer(state) == 1) { - led_matrix_set_value(91, 0xFF); - } else { - led_matrix_set_value(91, 0x00); - } - - // if on layer 3, turn on L3 LED, otherwise off. - if (get_highest_layer(state) == 2) { - led_matrix_set_value(92, 0xFF); - } else { - led_matrix_set_value(92, 0x00); - } - - // if on layer 4, turn on L4 LED, otherwise off. - if (get_highest_layer(state) == 3) { - led_matrix_set_value(93, 0xFF); - } else { - led_matrix_set_value(93, 0x00); + switch (get_highest_layer(state)) { + case 0: + led_matrix_set_value(90, 0xFF); + break; + case 1: + led_matrix_set_value(91, 0xFF); + break; + case 2: + led_matrix_set_value(92, 0xFF); + break; + case 3: + led_matrix_set_value(93, 0xFF); + break; + default: + led_matrix_set_value(90, 0x00); + led_matrix_set_value(91, 0x00); + led_matrix_set_value(92, 0x00); + led_matrix_set_value(93, 0x00); } return layer_state_set_user(state); -} \ No newline at end of file +} diff --git a/keyboards/mechlovin/olly/octagon/readme.md b/keyboards/mechlovin/olly/octagon/readme.md index 6f1833a571a..5bf144ff5b3 100644 --- a/keyboards/mechlovin/olly/octagon/readme.md +++ b/keyboards/mechlovin/olly/octagon/readme.md @@ -1,6 +1,6 @@ # Olly Octagon -![Olly Octagon](https://i.imgur.com/lDMnyS4l.png) +![Olly Octagon](https://i.imgur.com/lDMnyS4lh.png) A replacement PCB for Duck Octagon 75% keyboard. @@ -24,5 +24,5 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Escape) and plug in the keyboard * **Bootloader reset**: Hold down the key at (0,14) in the matrix (Backspace) and plug in the keyboard -* **Keycode in layout**: Press the key mapped to `RESET` if it is available +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available * **Hardware reset**: Press reset button (located on the bottom side of the PCB) diff --git a/keyboards/mechlovin/olly/octagon/rules.mk b/keyboards/mechlovin/olly/octagon/rules.mk index 97303c7e2f8..6e7633bfe01 100644 --- a/keyboards/mechlovin/olly/octagon/rules.mk +++ b/keyboards/mechlovin/olly/octagon/rules.mk @@ -1,14 +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 = 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 -LED_MATRIX_ENABLE = yes -RGBLIGHT_ENABLE = yes \ No newline at end of file +# This file intentionally left blank From d5ac75385bcff564d7f22a5c419dca2b61eb7ef0 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 2 Mar 2024 08:45:11 +1100 Subject: [PATCH 005/333] Fix up scanning for Djinn, post-asyncUSB. (#23188) --- keyboards/tzarc/djinn/djinn_portscan_matrix.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/keyboards/tzarc/djinn/djinn_portscan_matrix.c b/keyboards/tzarc/djinn/djinn_portscan_matrix.c index cb73c47def7..ac81ad18c1b 100644 --- a/keyboards/tzarc/djinn/djinn_portscan_matrix.c +++ b/keyboards/tzarc/djinn/djinn_portscan_matrix.c @@ -1,7 +1,8 @@ // Copyright 2018-2022 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later +#include +#include #include "quantum.h" -#include #include "djinn.h" #define GPIOB_BITMASK (1 << 13 | 1 << 14 | 1 << 15) // B13, B14, B15 @@ -34,6 +35,8 @@ void matrix_wait_for_port(stm32_gpio_t *port, uint32_t target_bitmask) { } } +static void dummy_vt_callback(virtual_timer_t *vtp, void *p) {} + void matrix_init_custom(void) { for (int i = 0; i < MATRIX_ROWS; ++i) { setPinInputHigh(row_pins[i]); @@ -41,6 +44,11 @@ void matrix_init_custom(void) { for (int i = 0; i < MATRIX_COLS; ++i) { setPinInputHigh(col_pins[i]); } + + // Start a virtual timer so we'll still get periodic wakeups, now that USB SOF doesn't wake up the main loop + static virtual_timer_t vt; + chVTObjectInit(&vt); + chVTSetContinuous(&vt, TIME_MS2I(10), dummy_vt_callback, NULL); } bool matrix_scan_custom(matrix_row_t current_matrix[]) { From 569b0c70beceb1bbd2b2c5e9cc4f0ff9209995f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 3 Mar 2024 04:16:47 +1100 Subject: [PATCH 006/333] WS2812 PWM: prefix for DMA defines (#23111) * WS2812 PWM: prefix for DMA defines * Add backward compatibility defines --- docs/ws2812_driver.md | 6 +- keyboards/acheron/apollo/87h/delta/config.h | 4 +- keyboards/acheron/apollo/87htsc/config.h | 4 +- keyboards/acheron/apollo/88htsc/config.h | 4 +- keyboards/acheron/athena/alpha/config.h | 4 +- keyboards/acheron/athena/beta/config.h | 4 +- keyboards/acheron/shark/beta/config.h | 4 +- keyboards/acheron/themis/87h/config.h | 4 +- keyboards/acheron/themis/87htsc/config.h | 4 +- keyboards/acheron/themis/88htsc/config.h | 4 +- keyboards/artifact/lvl/rev_hs01/config.h | 4 +- keyboards/aurora65/config.h | 4 +- .../charybdis/3x5/blackpill/config.h | 4 +- .../charybdis/3x5/v2/stemcell/config.h | 4 +- .../charybdis/3x6/blackpill/config.h | 4 +- .../charybdis/3x6/v2/stemcell/config.h | 4 +- .../charybdis/4x6/blackpill/config.h | 4 +- .../charybdis/4x6/v2/stemcell/config.h | 4 +- keyboards/bastardkb/scylla/blackpill/config.h | 4 +- .../bastardkb/scylla/v2/stemcell/config.h | 4 +- .../bastardkb/skeletyl/blackpill/config.h | 4 +- .../bastardkb/skeletyl/v2/stemcell/config.h | 4 +- .../bastardkb/tbkmini/blackpill/config.h | 4 +- .../bastardkb/tbkmini/v2/stemcell/config.h | 4 +- keyboards/bestway/config.h | 4 +- keyboards/black_hellebore/config.h | 4 +- keyboards/crypt_macro/config.h | 4 +- keyboards/custommk/evo70_r2/config.h | 4 +- keyboards/ebastler/isometria_75/rev1/config.h | 4 +- keyboards/edi/hardlight/mk2/config.h | 4 +- keyboards/geekboards/macropad_v2/config.h | 4 +- keyboards/handwired/cyberstar/config.h | 4 +- keyboards/handwired/macroboard/config.h | 4 +- .../tractyl_manuform/5x6_right/f303/config.h | 4 +- .../tractyl_manuform/5x6_right/f411/config.h | 4 +- keyboards/jacky_studio/piggy60/rev2/config.h | 4 +- keyboards/kabedon/kabedon98e/config.h | 4 +- keyboards/kprepublic/bm16a/v2/config.h | 4 +- keyboards/linworks/whale75/config.h | 4 +- keyboards/loki65/config.h | 4 +- keyboards/mariorion_v25/prod/config.h | 6 +- keyboards/mariorion_v25/proto/config.h | 6 +- keyboards/meetlab/kalice/config.h | 4 +- keyboards/meetlab/rena/config.h | 4 +- keyboards/misterknife/knife66/config.h | 4 +- keyboards/misterknife/knife66_iso/config.h | 4 +- keyboards/mode/m256wh/config.h | 4 +- keyboards/mode/m256ws/config.h | 4 +- keyboards/mode/m60h/config.h | 4 +- keyboards/mode/m60h_f/config.h | 4 +- keyboards/mode/m60s/config.h | 4 +- keyboards/mwstudio/mmk_3/config.h | 4 +- keyboards/mwstudio/mw660/config.h | 4 +- keyboards/novelkeys/nk20/config.h | 4 +- keyboards/novelkeys/nk65b/config.h | 4 +- keyboards/novelkeys/nk87b/config.h | 4 +- keyboards/novelkeys/nk_plus/config.h | 4 +- keyboards/planck/ez/config.h | 4 +- keyboards/planck/rev6/config.h | 4 +- keyboards/planck/rev6_drop/config.h | 4 +- keyboards/planck/rev7/config.h | 4 +- keyboards/preonic/rev3/config.h | 4 +- keyboards/preonic/rev3_drop/config.h | 4 +- keyboards/protozoa/p01/config.h | 4 +- keyboards/rgbkb/mun/config.h | 4 +- keyboards/rgbkb/sol3/config.h | 4 +- keyboards/skyloong/dt40/config.h | 4 +- keyboards/smithrune/iron165r2/f411/config.h | 4 +- keyboards/smithrune/magnus/m75h/config.h | 4 +- keyboards/smithrune/magnus/m75s/config.h | 4 +- keyboards/spaceholdings/nebula68/config.h | 4 +- keyboards/splitkb/kyria/rev1/config.h | 6 +- keyboards/splitkb/kyria/rev2/config.h | 6 +- keyboards/tg67/config.h | 4 +- keyboards/tkw/grandiceps/config.h | 4 +- keyboards/tkw/stoutgat/v2/config.h | 4 +- keyboards/tzarc/djinn/config.h | 6 +- keyboards/tzarc/ghoul/rev1/stm32/config.h | 4 +- keyboards/viendi8l/config.h | 4 +- keyboards/vinhcatba/uncertainty/config.h | 4 +- keyboards/xelus/ninjin/config.h | 4 +- keyboards/xelus/valor/rev2/config.h | 6 +- keyboards/yandrstudio/buff67v3/config.h | 4 +- keyboards/yandrstudio/eau_r2/config.h | 4 +- keyboards/yandrstudio/nightstar75/config.h | 4 +- keyboards/yandrstudio/nz64/config.h | 4 +- keyboards/yandrstudio/nz67v2/config.h | 4 +- keyboards/yandrstudio/tg67/config.h | 4 +- keyboards/yandrstudio/yr6095/config.h | 4 +- keyboards/yandrstudio/yr80/config.h | 4 +- keyboards/yanghu/unicorne/config.h | 4 +- keyboards/ymdk/id75/config.h | 4 +- keyboards/ymdk/ymd75/rev4/iso/config.h | 4 +- keyboards/zvecr/split_blackpill/config.h | 4 +- keyboards/zvecr/zv48/config.h | 4 +- .../chibios/boards/BONSAI_C4/configs/config.h | 8 +-- .../drivers/vendor/RP/RP2040/ws2812_vendor.c | 18 +++--- platforms/chibios/drivers/ws2812_pwm.c | 60 +++++++++++-------- 98 files changed, 246 insertions(+), 234 deletions(-) diff --git a/docs/ws2812_driver.md b/docs/ws2812_driver.md index 244d39dbe06..006529cc8ae 100644 --- a/docs/ws2812_driver.md +++ b/docs/ws2812_driver.md @@ -208,9 +208,9 @@ The following `#define`s apply only to the `pwm` driver: |`WS2812_PWM_DRIVER` |`PWMD2` |The PWM driver to use | |`WS2812_PWM_CHANNEL` |`2` |The PWM channel to use | |`WS2812_PWM_PAL_MODE` |`2` |The pin alternative function to use | -|`WS2812_DMA_STREAM` |`STM32_DMA1_STREAM2`|The DMA Stream for `TIMx_UP` | -|`WS2812_DMA_CHANNEL` |`2` |The DMA Channel for `TIMx_UP` | -|`WS2812_DMAMUX_ID` |*Not defined* |The DMAMUX configuration for `TIMx_UP` - only required if your MCU has a DMAMUX peripheral| +|`WS2812_PWM_DMA_STREAM` |`STM32_DMA1_STREAM2`|The DMA Stream for `TIMx_UP` | +|`WS2812_PWM_DMA_CHANNEL` |`2` |The DMA Channel for `TIMx_UP` | +|`WS2812_PWM_DMAMUX_ID` |*Not defined* |The DMAMUX configuration for `TIMx_UP` - only required if your MCU has a DMAMUX peripheral| |`WS2812_PWM_COMPLEMENTARY_OUTPUT`|*Not defined* |Whether the PWM output is complementary (`TIMx_CHyN`) | ?> Using a complementary timer output (`TIMx_CHyN`) is possible only for advanced-control timers (1, 8 and 20 on STM32), and the `STM32_PWM_USE_ADVANCED` option in `mcuconf.h` must be set to `TRUE`. Complementary outputs of general-purpose timers are not supported due to ChibiOS limitations. diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h index 578a443e882..17c09f0f576 100644 --- a/keyboards/acheron/apollo/87h/delta/config.h +++ b/keyboards/acheron/apollo/87h/delta/config.h @@ -28,5 +28,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h index 578a443e882..17c09f0f576 100644 --- a/keyboards/acheron/apollo/87htsc/config.h +++ b/keyboards/acheron/apollo/87htsc/config.h @@ -28,5 +28,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h index 578a443e882..17c09f0f576 100644 --- a/keyboards/acheron/apollo/88htsc/config.h +++ b/keyboards/acheron/apollo/88htsc/config.h @@ -28,5 +28,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index ba5c2dedf2c..c9f1d29f24b 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -27,8 +27,8 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 // If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state. #define CAPSLOCK_INDICATOR diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index 30c29fa6862..b2a8d2edf89 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -28,8 +28,8 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 // If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state. #define CAPSLOCK_INDICATOR diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index d862fd016de..1182d39d3b5 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -27,7 +27,7 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 #define EEPROM_I2C_24LC256 diff --git a/keyboards/acheron/themis/87h/config.h b/keyboards/acheron/themis/87h/config.h index ed1229c7793..fb2a5e1ed7f 100644 --- a/keyboards/acheron/themis/87h/config.h +++ b/keyboards/acheron/themis/87h/config.h @@ -24,5 +24,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/acheron/themis/87htsc/config.h b/keyboards/acheron/themis/87htsc/config.h index ed1229c7793..fb2a5e1ed7f 100644 --- a/keyboards/acheron/themis/87htsc/config.h +++ b/keyboards/acheron/themis/87htsc/config.h @@ -24,5 +24,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/acheron/themis/88htsc/config.h b/keyboards/acheron/themis/88htsc/config.h index ed1229c7793..fb2a5e1ed7f 100644 --- a/keyboards/acheron/themis/88htsc/config.h +++ b/keyboards/acheron/themis/88htsc/config.h @@ -24,5 +24,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/artifact/lvl/rev_hs01/config.h b/keyboards/artifact/lvl/rev_hs01/config.h index 674fb1110c8..8dec2b56f22 100755 --- a/keyboards/artifact/lvl/rev_hs01/config.h +++ b/keyboards/artifact/lvl/rev_hs01/config.h @@ -19,7 +19,7 @@ along with this program. If not, see . /* RGB Light */ #define WS2812_PWM_DRIVER PWMD1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 5 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB diff --git a/keyboards/aurora65/config.h b/keyboards/aurora65/config.h index ec0853212c9..1b51399c8d1 100644 --- a/keyboards/aurora65/config.h +++ b/keyboards/aurora65/config.h @@ -22,6 +22,6 @@ along with this program. If not, see . #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 2 #define WS2812_PWM_COMPLEMENTARY_OUTPUT -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 5 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h index 68901305c47..0467a1261f4 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h @@ -27,8 +27,8 @@ #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 #define WS2812_EXTERNAL_PULLUP -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_TARGET_PERIOD 800000 /* Serial configuration for split keyboard. */ diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h index 6aa20712f67..7a2bdd0aa82 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h @@ -30,8 +30,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 3 /* CRC. */ #define CRC8_USE_TABLE diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h index 985e79fabda..b41a1d3f574 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h @@ -25,8 +25,8 @@ #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 #define WS2812_EXTERNAL_PULLUP -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_TARGET_PERIOD 800000 /* Serial configuration for split keyboard. */ diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h index 6aa20712f67..7a2bdd0aa82 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h @@ -30,8 +30,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 3 /* CRC. */ #define CRC8_USE_TABLE diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h index 68901305c47..0467a1261f4 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h @@ -27,8 +27,8 @@ #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 #define WS2812_EXTERNAL_PULLUP -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_TARGET_PERIOD 800000 /* Serial configuration for split keyboard. */ diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h index 6aa20712f67..7a2bdd0aa82 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h @@ -30,8 +30,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 3 /* CRC. */ #define CRC8_USE_TABLE diff --git a/keyboards/bastardkb/scylla/blackpill/config.h b/keyboards/bastardkb/scylla/blackpill/config.h index 0c40ed74bc4..1d86b474ee9 100644 --- a/keyboards/bastardkb/scylla/blackpill/config.h +++ b/keyboards/bastardkb/scylla/blackpill/config.h @@ -27,8 +27,8 @@ #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 #define WS2812_EXTERNAL_PULLUP -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_TARGET_PERIOD 800000 /* Serial configuration for split keyboard. */ diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h index 0bbfd39aeef..ca1cc0f719d 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/config.h +++ b/keyboards/bastardkb/scylla/v2/stemcell/config.h @@ -30,8 +30,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 3 /* CRC. */ #define CRC8_USE_TABLE diff --git a/keyboards/bastardkb/skeletyl/blackpill/config.h b/keyboards/bastardkb/skeletyl/blackpill/config.h index 0c40ed74bc4..1d86b474ee9 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/config.h +++ b/keyboards/bastardkb/skeletyl/blackpill/config.h @@ -27,8 +27,8 @@ #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 #define WS2812_EXTERNAL_PULLUP -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_TARGET_PERIOD 800000 /* Serial configuration for split keyboard. */ diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h index 0bbfd39aeef..ca1cc0f719d 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h @@ -30,8 +30,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 3 /* CRC. */ #define CRC8_USE_TABLE diff --git a/keyboards/bastardkb/tbkmini/blackpill/config.h b/keyboards/bastardkb/tbkmini/blackpill/config.h index 0c40ed74bc4..1d86b474ee9 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/config.h +++ b/keyboards/bastardkb/tbkmini/blackpill/config.h @@ -27,8 +27,8 @@ #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 #define WS2812_EXTERNAL_PULLUP -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_TARGET_PERIOD 800000 /* Serial configuration for split keyboard. */ diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h index 0bbfd39aeef..ca1cc0f719d 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h @@ -30,8 +30,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 3 /* CRC. */ #define CRC8_USE_TABLE diff --git a/keyboards/bestway/config.h b/keyboards/bestway/config.h index c63a25d9a66..1800a114a01 100644 --- a/keyboards/bestway/config.h +++ b/keyboards/bestway/config.h @@ -18,5 +18,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/black_hellebore/config.h b/keyboards/black_hellebore/config.h index 53910fed097..e748b3d1859 100644 --- a/keyboards/black_hellebore/config.h +++ b/keyboards/black_hellebore/config.h @@ -20,5 +20,5 @@ #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 1 //TIM1_CH1N (AF1) #define WS2812_PWM_COMPLEMENTARY_OUTPUT -#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 -#define WS2812_DMA_CHANNEL 7 //7 works, CxS[3:0] 0111 = TIM1_UP on Channel 6? (RM0394.pdf pg.298) +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 +#define WS2812_PWM_DMA_CHANNEL 7 //7 works, CxS[3:0] 0111 = TIM1_UP on Channel 6? (RM0394.pdf pg.298) diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h index 4d9d9bf5c26..701ad8da86a 100644 --- a/keyboards/crypt_macro/config.h +++ b/keyboards/crypt_macro/config.h @@ -24,6 +24,6 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB diff --git a/keyboards/custommk/evo70_r2/config.h b/keyboards/custommk/evo70_r2/config.h index 62606cf1ee6..bd8744204c5 100644 --- a/keyboards/custommk/evo70_r2/config.h +++ b/keyboards/custommk/evo70_r2/config.h @@ -78,8 +78,8 @@ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 #define TAP_CODE_DELAY 10 diff --git a/keyboards/ebastler/isometria_75/rev1/config.h b/keyboards/ebastler/isometria_75/rev1/config.h index 0fc8019a1dd..19a79c9df6e 100644 --- a/keyboards/ebastler/isometria_75/rev1/config.h +++ b/keyboards/ebastler/isometria_75/rev1/config.h @@ -26,8 +26,8 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 /* ADC - will be used for battery monitoring once BT support is added */ /* #define ADC_PIN B0 */ diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h index 73f4b2baaed..52636c6484e 100644 --- a/keyboards/edi/hardlight/mk2/config.h +++ b/keyboards/edi/hardlight/mk2/config.h @@ -28,8 +28,8 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_EXTERNAL_PULLUP /* I2C driver overrides */ diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h index 6aed50ec2f6..dca98f0c954 100644 --- a/keyboards/geekboards/macropad_v2/config.h +++ b/keyboards/geekboards/macropad_v2/config.h @@ -19,7 +19,7 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 #define WAIT_FOR_USB diff --git a/keyboards/handwired/cyberstar/config.h b/keyboards/handwired/cyberstar/config.h index 4d9d9bf5c26..701ad8da86a 100644 --- a/keyboards/handwired/cyberstar/config.h +++ b/keyboards/handwired/cyberstar/config.h @@ -24,6 +24,6 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h index 95e7d9d1aa6..b8e437bddf9 100644 --- a/keyboards/handwired/macroboard/config.h +++ b/keyboards/handwired/macroboard/config.h @@ -20,8 +20,8 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #define WS2812_PWM_TARGET_PERIOD 800000 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h index 3a7f97f8d2f..a2818e7176f 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h @@ -26,8 +26,8 @@ along with this program. If not, see . #define WS2812_PWM_CHANNEL 1 // default: 2 #define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 //#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy). -// #define WS2812_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +// #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #define DEBUG_LED_PIN C13 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index 2ad18267ad5..87f830e1757 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -27,8 +27,8 @@ along with this program. If not, see . #define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 #define WS2812_EXTERNAL_PULLUP //#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy). -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #define WS2812_PWM_TARGET_PERIOD 800000 #define DEBUG_LED_PIN C13 diff --git a/keyboards/jacky_studio/piggy60/rev2/config.h b/keyboards/jacky_studio/piggy60/rev2/config.h index 2747834991f..8c9b292fb42 100644 --- a/keyboards/jacky_studio/piggy60/rev2/config.h +++ b/keyboards/jacky_studio/piggy60/rev2/config.h @@ -19,5 +19,5 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 7 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 7 diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h index 514a1121b35..8eb549c134d 100644 --- a/keyboards/kabedon/kabedon98e/config.h +++ b/keyboards/kabedon/kabedon98e/config.h @@ -17,8 +17,8 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kprepublic/bm16a/v2/config.h b/keyboards/kprepublic/bm16a/v2/config.h index 3ef55f3d42e..8014b69a98c 100644 --- a/keyboards/kprepublic/bm16a/v2/config.h +++ b/keyboards/kprepublic/bm16a/v2/config.h @@ -5,5 +5,5 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 7 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 7 diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h index 629c1dcf701..84b3c45cd91 100644 --- a/keyboards/linworks/whale75/config.h +++ b/keyboards/linworks/whale75/config.h @@ -24,5 +24,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 7 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 7 diff --git a/keyboards/loki65/config.h b/keyboards/loki65/config.h index 3627f4c7e6d..ac6b9f5ceb7 100644 --- a/keyboards/loki65/config.h +++ b/keyboards/loki65/config.h @@ -24,6 +24,6 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 5 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB diff --git a/keyboards/mariorion_v25/prod/config.h b/keyboards/mariorion_v25/prod/config.h index 042f7662d8e..8895d16ecef 100644 --- a/keyboards/mariorion_v25/prod/config.h +++ b/keyboards/mariorion_v25/prod/config.h @@ -7,9 +7,9 @@ #define WS2812_PWM_DRIVER PWMD17 #define WS2812_PWM_CHANNEL 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 1 -// #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM17_UP +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 1 +// #define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM17_UP #define INDICATOR_0 C9 #define INDICATOR_1 C8 diff --git a/keyboards/mariorion_v25/proto/config.h b/keyboards/mariorion_v25/proto/config.h index 6865f2dbb01..894b8fbf9e8 100644 --- a/keyboards/mariorion_v25/proto/config.h +++ b/keyboards/mariorion_v25/proto/config.h @@ -7,9 +7,9 @@ #define WS2812_PWM_DRIVER PWMD17 #define WS2812_PWM_CHANNEL 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 1 -// #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM17_UP +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 1 +// #define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM17_UP #define INDICATOR_0 C8 #define INDICATOR_1 C7 diff --git a/keyboards/meetlab/kalice/config.h b/keyboards/meetlab/kalice/config.h index 80bae79fd8e..052bfa4bdfd 100644 --- a/keyboards/meetlab/kalice/config.h +++ b/keyboards/meetlab/kalice/config.h @@ -19,5 +19,5 @@ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_COMPLEMENTARY_OUTPUT -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 5 \ No newline at end of file +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 5 \ No newline at end of file diff --git a/keyboards/meetlab/rena/config.h b/keyboards/meetlab/rena/config.h index ef8715e3842..6a6a4a2caec 100644 --- a/keyboards/meetlab/rena/config.h +++ b/keyboards/meetlab/rena/config.h @@ -18,5 +18,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 3 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/misterknife/knife66/config.h b/keyboards/misterknife/knife66/config.h index 7f7e1173032..2b8d7b8b9fe 100644 --- a/keyboards/misterknife/knife66/config.h +++ b/keyboards/misterknife/knife66/config.h @@ -20,5 +20,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 // default: PWMD1 #define WS2812_PWM_CHANNEL 2 // default: 2 #define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. diff --git a/keyboards/misterknife/knife66_iso/config.h b/keyboards/misterknife/knife66_iso/config.h index cb847450baa..f9f0707ff18 100644 --- a/keyboards/misterknife/knife66_iso/config.h +++ b/keyboards/misterknife/knife66_iso/config.h @@ -20,5 +20,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 // default: PWMD1 #define WS2812_PWM_CHANNEL 2 // default: 2 #define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. diff --git a/keyboards/mode/m256wh/config.h b/keyboards/mode/m256wh/config.h index c976b6bcc5b..06f1658ea52 100644 --- a/keyboards/mode/m256wh/config.h +++ b/keyboards/mode/m256wh/config.h @@ -21,7 +21,7 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 #define EECONFIG_KB_DATA_SIZE (1) diff --git a/keyboards/mode/m256ws/config.h b/keyboards/mode/m256ws/config.h index c976b6bcc5b..06f1658ea52 100644 --- a/keyboards/mode/m256ws/config.h +++ b/keyboards/mode/m256ws/config.h @@ -21,7 +21,7 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 #define EECONFIG_KB_DATA_SIZE (1) diff --git a/keyboards/mode/m60h/config.h b/keyboards/mode/m60h/config.h index f984cf28de9..cde4ffdbc61 100644 --- a/keyboards/mode/m60h/config.h +++ b/keyboards/mode/m60h/config.h @@ -5,6 +5,6 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 +#define WS2812_PWM_DMA_CHANNEL 2 #define WS2812_PWM_TARGET_PERIOD 800000 \ No newline at end of file diff --git a/keyboards/mode/m60h_f/config.h b/keyboards/mode/m60h_f/config.h index f984cf28de9..cde4ffdbc61 100644 --- a/keyboards/mode/m60h_f/config.h +++ b/keyboards/mode/m60h_f/config.h @@ -5,6 +5,6 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 +#define WS2812_PWM_DMA_CHANNEL 2 #define WS2812_PWM_TARGET_PERIOD 800000 \ No newline at end of file diff --git a/keyboards/mode/m60s/config.h b/keyboards/mode/m60s/config.h index f984cf28de9..cde4ffdbc61 100644 --- a/keyboards/mode/m60s/config.h +++ b/keyboards/mode/m60s/config.h @@ -5,6 +5,6 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 +#define WS2812_PWM_DMA_CHANNEL 2 #define WS2812_PWM_TARGET_PERIOD 800000 \ No newline at end of file diff --git a/keyboards/mwstudio/mmk_3/config.h b/keyboards/mwstudio/mmk_3/config.h index 0265d3ed6e3..f8916cddd03 100644 --- a/keyboards/mwstudio/mmk_3/config.h +++ b/keyboards/mwstudio/mmk_3/config.h @@ -22,5 +22,5 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/mwstudio/mw660/config.h b/keyboards/mwstudio/mw660/config.h index 87659c1f67c..58d0eee9e08 100644 --- a/keyboards/mwstudio/mw660/config.h +++ b/keyboards/mwstudio/mw660/config.h @@ -20,5 +20,5 @@ #define WS2812_PWM_CHANNEL 3 // default: 2 //#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy). #define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 2 \ No newline at end of file +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 2 \ No newline at end of file diff --git a/keyboards/novelkeys/nk20/config.h b/keyboards/novelkeys/nk20/config.h index 317cc2c3e83..750a0335689 100644 --- a/keyboards/novelkeys/nk20/config.h +++ b/keyboards/novelkeys/nk20/config.h @@ -20,5 +20,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/novelkeys/nk65b/config.h b/keyboards/novelkeys/nk65b/config.h index 40e3b54053e..eaddb87b820 100755 --- a/keyboards/novelkeys/nk65b/config.h +++ b/keyboards/novelkeys/nk65b/config.h @@ -20,5 +20,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/novelkeys/nk87b/config.h b/keyboards/novelkeys/nk87b/config.h index a79137e7d9f..933d4ed5c07 100644 --- a/keyboards/novelkeys/nk87b/config.h +++ b/keyboards/novelkeys/nk87b/config.h @@ -20,5 +20,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/novelkeys/nk_plus/config.h b/keyboards/novelkeys/nk_plus/config.h index 40e3b54053e..eaddb87b820 100644 --- a/keyboards/novelkeys/nk_plus/config.h +++ b/keyboards/novelkeys/nk_plus/config.h @@ -20,5 +20,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h index 74d8d21155d..e4fa0924d3a 100644 --- a/keyboards/planck/ez/config.h +++ b/keyboards/planck/ez/config.h @@ -46,8 +46,8 @@ // #define WS2812_TIM_CH 2 // #define PORT_WS2812 GPIOA // #define PIN_WS2812 1 -// #define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection) -//#define WS2812_DMA_CHANNEL 7 // DMA channel for TIMx_UP +// #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection) +//#define WS2812_PWM_DMA_CHANNEL 7 // DMA channel for TIMx_UP //#define WS2812_EXTERNAL_PULLUP #define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h index 7fec8be56bc..0935fad3588 100644 --- a/keyboards/planck/rev6/config.h +++ b/keyboards/planck/rev6/config.h @@ -46,5 +46,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h index 7fec8be56bc..0935fad3588 100644 --- a/keyboards/planck/rev6_drop/config.h +++ b/keyboards/planck/rev6_drop/config.h @@ -46,5 +46,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/planck/rev7/config.h b/keyboards/planck/rev7/config.h index a5e49c8a532..9ccbf4cc8a8 100644 --- a/keyboards/planck/rev7/config.h +++ b/keyboards/planck/rev7/config.h @@ -27,8 +27,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 /* * Feature disable options diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h index 7800131a90d..6a842105b2b 100644 --- a/keyboards/preonic/rev3/config.h +++ b/keyboards/preonic/rev3/config.h @@ -44,5 +44,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h index 7800131a90d..6a842105b2b 100644 --- a/keyboards/preonic/rev3_drop/config.h +++ b/keyboards/preonic/rev3_drop/config.h @@ -44,5 +44,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/protozoa/p01/config.h b/keyboards/protozoa/p01/config.h index fd58bda9123..3b14a164f6d 100644 --- a/keyboards/protozoa/p01/config.h +++ b/keyboards/protozoa/p01/config.h @@ -21,5 +21,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 5 diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h index b247fa91cd0..74db14c0611 100644 --- a/keyboards/rgbkb/mun/config.h +++ b/keyboards/rgbkb/mun/config.h @@ -54,8 +54,8 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 #define TOUCH_UPDATE_INTERVAL 33 #define OLED_UPDATE_INTERVAL 33 diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h index 2d3caeea4e4..8348b44f96e 100644 --- a/keyboards/rgbkb/sol3/config.h +++ b/keyboards/rgbkb/sol3/config.h @@ -46,8 +46,8 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 #define TOUCH_UPDATE_INTERVAL 33 #define OLED_UPDATE_INTERVAL 33 diff --git a/keyboards/skyloong/dt40/config.h b/keyboards/skyloong/dt40/config.h index b0aa9780633..7e101addcb9 100644 --- a/keyboards/skyloong/dt40/config.h +++ b/keyboards/skyloong/dt40/config.h @@ -24,5 +24,5 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/smithrune/iron165r2/f411/config.h b/keyboards/smithrune/iron165r2/f411/config.h index 8ed73d3ff48..bcd506ade3f 100644 --- a/keyboards/smithrune/iron165r2/f411/config.h +++ b/keyboards/smithrune/iron165r2/f411/config.h @@ -24,5 +24,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/smithrune/magnus/m75h/config.h b/keyboards/smithrune/magnus/m75h/config.h index e72ba069692..18fd960d8fc 100644 --- a/keyboards/smithrune/magnus/m75h/config.h +++ b/keyboards/smithrune/magnus/m75h/config.h @@ -25,5 +25,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/smithrune/magnus/m75s/config.h b/keyboards/smithrune/magnus/m75s/config.h index 1e8874caa4e..95fb2a420c6 100644 --- a/keyboards/smithrune/magnus/m75s/config.h +++ b/keyboards/smithrune/magnus/m75s/config.h @@ -27,5 +27,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h index 1b2441556b0..85d3261dd12 100755 --- a/keyboards/spaceholdings/nebula68/config.h +++ b/keyboards/spaceholdings/nebula68/config.h @@ -20,8 +20,8 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 #define WS2812_PWM_CHANNEL 2 // default: 2 #define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. /* Backlight options */ diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h index d6660991355..4f130293e22 100644 --- a/keyboards/splitkb/kyria/rev1/config.h +++ b/keyboards/splitkb/kyria/rev1/config.h @@ -33,9 +33,9 @@ along with this program. If not, see . # define WS2812_PWM_DRIVER PWMD2 // default: PWMD2 # define WS2812_PWM_CHANNEL 4 // default: 2 # define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -# define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -# define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -# define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU. #else # define WS2812_DI_PIN D3 # define SOFT_SERIAL_PIN D2 diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h index 452e011f0ab..54d8f0985ae 100644 --- a/keyboards/splitkb/kyria/rev2/config.h +++ b/keyboards/splitkb/kyria/rev2/config.h @@ -38,9 +38,9 @@ along with this program. If not, see . # define WS2812_PWM_DRIVER PWMD2 // default: PWMD2 # define WS2812_PWM_CHANNEL 4 // default: 2 # define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -# define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -# define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -# define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU. #else # define WS2812_DI_PIN D3 # define SOFT_SERIAL_PIN D2 diff --git a/keyboards/tg67/config.h b/keyboards/tg67/config.h index 7ede76f5513..0d54e925ae5 100644 --- a/keyboards/tg67/config.h +++ b/keyboards/tg67/config.h @@ -19,5 +19,5 @@ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_COMPLEMENTARY_OUTPUT -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 5 diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h index a963fbfb510..a02e14f91f0 100644 --- a/keyboards/tkw/grandiceps/config.h +++ b/keyboards/tkw/grandiceps/config.h @@ -20,5 +20,5 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 5 diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h index bf68edcfae9..79f47b9bb38 100644 --- a/keyboards/tkw/stoutgat/v2/config.h +++ b/keyboards/tkw/stoutgat/v2/config.h @@ -18,8 +18,8 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h index 74bb00edc21..24357b6a35e 100644 --- a/keyboards/tzarc/djinn/config.h +++ b/keyboards/tzarc/djinn/config.h @@ -39,9 +39,9 @@ #define WS2812_PWM_DRIVER PWMD20 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 3 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 1 -#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM20_UP +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 1 +#define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM20_UP // Audio configuration #define AUDIO_PIN A5 diff --git a/keyboards/tzarc/ghoul/rev1/stm32/config.h b/keyboards/tzarc/ghoul/rev1/stm32/config.h index 1dbc1640397..a835b341db4 100644 --- a/keyboards/tzarc/ghoul/rev1/stm32/config.h +++ b/keyboards/tzarc/ghoul/rev1/stm32/config.h @@ -28,8 +28,8 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 5 #define RGB_ENABLE_PIN C0 // ADC Configuration diff --git a/keyboards/viendi8l/config.h b/keyboards/viendi8l/config.h index 050a0cca223..a449301c2b2 100644 --- a/keyboards/viendi8l/config.h +++ b/keyboards/viendi8l/config.h @@ -37,5 +37,5 @@ along with this program. If not, see . #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/vinhcatba/uncertainty/config.h b/keyboards/vinhcatba/uncertainty/config.h index 5c02b78efe6..82671dfdc00 100644 --- a/keyboards/vinhcatba/uncertainty/config.h +++ b/keyboards/vinhcatba/uncertainty/config.h @@ -11,8 +11,8 @@ #define WS2812_PWM_CHANNEL 4 // CH4 #define WS2812_PWM_PAL_MODE 2 // AF2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA1 Stream 2 for TIM3_UP (table 28 in reference manual) -#define WS2812_DMA_CHANNEL 5 // DMA Channel 5 for TIM3_UP (table 28 in reference manual) +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 // DMA1 Stream 2 for TIM3_UP (table 28 in reference manual) +#define WS2812_PWM_DMA_CHANNEL 5 // DMA Channel 5 for TIM3_UP (table 28 in reference manual) #define I2C1_CLOCK_SPEED 400000 diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h index 9db59dcc66c..7a8ac2f0130 100644 --- a/keyboards/xelus/ninjin/config.h +++ b/keyboards/xelus/ninjin/config.h @@ -20,8 +20,8 @@ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_EXTERNAL_PULLUP /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h index f601945a152..9491d1f175d 100644 --- a/keyboards/xelus/valor/rev2/config.h +++ b/keyboards/xelus/valor/rev2/config.h @@ -40,9 +40,9 @@ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 -#define WS2812_DMA_CHANNEL 7 -#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM1_UP +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 +#define WS2812_PWM_DMA_CHANNEL 7 +#define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM1_UP // RGB Pullup #define WS2812_EXTERNAL_PULLUP diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h index 9d3f3e44c06..7ff76360877 100644 --- a/keyboards/yandrstudio/buff67v3/config.h +++ b/keyboards/yandrstudio/buff67v3/config.h @@ -23,8 +23,8 @@ # define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 # define WS2812_PWM_CHANNEL 1 // default: 2 -# define WS2812_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -# define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #endif diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h index aa9b295e020..3a741b3dfff 100644 --- a/keyboards/yandrstudio/eau_r2/config.h +++ b/keyboards/yandrstudio/eau_r2/config.h @@ -17,5 +17,5 @@ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 5 diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h index 4d5c6629996..f29bd573b80 100644 --- a/keyboards/yandrstudio/nightstar75/config.h +++ b/keyboards/yandrstudio/nightstar75/config.h @@ -20,5 +20,5 @@ #define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 #define WS2812_PWM_CHANNEL 2 // default: 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h index 81b549b60d7..6dd155f74ec 100644 --- a/keyboards/yandrstudio/nz64/config.h +++ b/keyboards/yandrstudio/nz64/config.h @@ -18,5 +18,5 @@ #define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 #define WS2812_PWM_CHANNEL 2 // default: 2 #define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h index 7ecdfeafcfc..a7ae3e713ce 100644 --- a/keyboards/yandrstudio/nz67v2/config.h +++ b/keyboards/yandrstudio/nz67v2/config.h @@ -18,5 +18,5 @@ #define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 #define WS2812_PWM_CHANNEL 2 // default: 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h index 686696be7d5..99deee32ac6 100644 --- a/keyboards/yandrstudio/tg67/config.h +++ b/keyboards/yandrstudio/tg67/config.h @@ -18,5 +18,5 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h index 05a8922788f..98372166261 100644 --- a/keyboards/yandrstudio/yr6095/config.h +++ b/keyboards/yandrstudio/yr6095/config.h @@ -19,5 +19,5 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h index 08e10e243ed..71d8e725879 100644 --- a/keyboards/yandrstudio/yr80/config.h +++ b/keyboards/yandrstudio/yr80/config.h @@ -21,5 +21,5 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h index 99d38fe44ab..8e625c6336c 100644 --- a/keyboards/yanghu/unicorne/config.h +++ b/keyboards/yanghu/unicorne/config.h @@ -31,6 +31,6 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 5 #define WS2812_EXTERNAL_PULLUP diff --git a/keyboards/ymdk/id75/config.h b/keyboards/ymdk/id75/config.h index 14ed1d644c0..cb5ac78304a 100644 --- a/keyboards/ymdk/id75/config.h +++ b/keyboards/ymdk/id75/config.h @@ -19,5 +19,5 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 7 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 7 diff --git a/keyboards/ymdk/ymd75/rev4/iso/config.h b/keyboards/ymdk/ymd75/rev4/iso/config.h index 58c4b34d617..3a0dddaad88 100644 --- a/keyboards/ymdk/ymd75/rev4/iso/config.h +++ b/keyboards/ymdk/ymd75/rev4/iso/config.h @@ -5,5 +5,5 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 7 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 7 diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h index 41739356422..dd26e9ca325 100644 --- a/keyboards/zvecr/split_blackpill/config.h +++ b/keyboards/zvecr/split_blackpill/config.h @@ -20,8 +20,8 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h index e503f07b801..a67a46a1850 100644 --- a/keyboards/zvecr/zv48/config.h +++ b/keyboards/zvecr/zv48/config.h @@ -22,8 +22,8 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/platforms/chibios/boards/BONSAI_C4/configs/config.h b/platforms/chibios/boards/BONSAI_C4/configs/config.h index 193b028bdec..e933cd6fd11 100644 --- a/platforms/chibios/boards/BONSAI_C4/configs/config.h +++ b/platforms/chibios/boards/BONSAI_C4/configs/config.h @@ -77,11 +77,11 @@ # ifndef WS2812_PWM_PAL_MODE # define WS2812_PWM_PAL_MODE 1 # endif -# ifndef WS2812_DMA_STREAM -# define WS2812_DMA_STREAM STM32_DMA2_STREAM5 +# ifndef WS2812_PWM_DMA_STREAM +# define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 # endif -# ifndef WS2812_DMA_CHANNEL -# define WS2812_DMA_CHANNEL 6 +# ifndef WS2812_PWM_DMA_CHANNEL +# define WS2812_PWM_DMA_CHANNEL 6 # endif #endif diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c index de317e269a6..799d96b3c64 100644 --- a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c +++ b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c @@ -136,7 +136,7 @@ static const pio_program_t ws2812_program = { }; static uint32_t WS2812_BUFFER[WS2812_LED_COUNT]; -static const rp_dma_channel_t* WS2812_DMA_CHANNEL; +static const rp_dma_channel_t* dma_channel; static uint32_t RP_DMA_MODE_WS2812; static int STATE_MACHINE = -1; @@ -236,9 +236,9 @@ bool ws2812_init(void) { pio_sm_init(pio, STATE_MACHINE, offset, &config); pio_sm_set_enabled(pio, STATE_MACHINE, true); - WS2812_DMA_CHANNEL = dmaChannelAlloc(RP_DMA_CHANNEL_ID_ANY, RP_DMA_PRIORITY_WS2812, (rp_dmaisr_t)ws2812_dma_callback, NULL); - dmaChannelEnableInterruptX(WS2812_DMA_CHANNEL); - dmaChannelSetDestinationX(WS2812_DMA_CHANNEL, (uint32_t)&pio->txf[STATE_MACHINE]); + dma_channel = dmaChannelAlloc(RP_DMA_CHANNEL_ID_ANY, RP_DMA_PRIORITY_WS2812, (rp_dmaisr_t)ws2812_dma_callback, NULL); + dmaChannelEnableInterruptX(dma_channel); + dmaChannelSetDestinationX(dma_channel, (uint32_t)&pio->txf[STATE_MACHINE]); // clang-format off RP_DMA_MODE_WS2812 = DMA_CTRL_TRIG_INCR_READ | @@ -256,7 +256,7 @@ static inline void sync_ws2812_transfer(void) { // count of LEDs in milliseconds. This is safely much longer than it // would take to push all the data out. dprintln("ERROR: WS2812 DMA transfer has stalled, aborting!"); - dmaChannelDisableX(WS2812_DMA_CHANNEL); + dmaChannelDisableX(dma_channel); pio_sm_clear_fifos(pio, STATE_MACHINE); pio_sm_restart(pio, STATE_MACHINE); chSemReset(&TRANSFER_COUNTER, 0); @@ -284,8 +284,8 @@ void ws2812_setleds(rgb_led_t* ledarray, uint16_t leds) { #endif } - dmaChannelSetSourceX(WS2812_DMA_CHANNEL, (uint32_t)WS2812_BUFFER); - dmaChannelSetCounterX(WS2812_DMA_CHANNEL, leds); - dmaChannelSetModeX(WS2812_DMA_CHANNEL, RP_DMA_MODE_WS2812); - dmaChannelEnableX(WS2812_DMA_CHANNEL); + dmaChannelSetSourceX(dma_channel, (uint32_t)WS2812_BUFFER); + dmaChannelSetCounterX(dma_channel, leds); + dmaChannelSetModeX(dma_channel, RP_DMA_MODE_WS2812); + dmaChannelEnableX(dma_channel); } diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c index 6bba22767f7..e0b3bfd5b55 100644 --- a/platforms/chibios/drivers/ws2812_pwm.c +++ b/platforms/chibios/drivers/ws2812_pwm.c @@ -2,6 +2,18 @@ #include "gpio.h" #include "chibios_config.h" +// ======== DEPRECATED DEFINES - DO NOT USE ======== +#ifdef WS2812_DMA_STREAM +# define WS2812_PWM_DMA_STREAM WS2812_DMA_STREAM +#endif +#ifdef WS2812_DMA_CHANNEL +# define WS2812_PWM_DMA_CHANNEL WS2812_DMA_CHANNEL +#endif +#ifdef WS2812_DMAMUX_ID +# define WS2812_PWM_DMAMUX_ID WS2812_DMAMUX_ID +#endif +// ======== + /* Adapted from https://github.com/joewa/WS2812-LED-Driver_ChibiOS/ */ #ifdef RGBW @@ -19,14 +31,14 @@ #ifndef WS2812_PWM_PAL_MODE # define WS2812_PWM_PAL_MODE 2 // DI Pin's alternate function value #endif -#ifndef WS2812_DMA_STREAM -# define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP +#ifndef WS2812_PWM_DMA_STREAM +# define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP #endif -#ifndef WS2812_DMA_CHANNEL -# define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP +#ifndef WS2812_PWM_DMA_CHANNEL +# define WS2812_PWM_DMA_CHANNEL 2 // DMA Channel for TIMx_UP #endif -#if (STM32_DMA_SUPPORTS_DMAMUX == TRUE) && !defined(WS2812_DMAMUX_ID) -# error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM?_UP" +#if (STM32_DMA_SUPPORTS_DMAMUX == TRUE) && !defined(WS2812_PWM_DMAMUX_ID) +# error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM?_UP" #endif /* Summarize https://www.st.com/resource/en/application_note/an4013-stm32-crossseries-timer-overview-stmicroelectronics.pdf to @@ -270,20 +282,20 @@ // For all other STM32 DMA transfer will automatically zero pad. We only need to set the right peripheral width. #if defined(STM32F2XX) || defined(STM32F4XX) || defined(STM32F7XX) # if defined(WS2812_PWM_TIMER_32BIT) -# define WS2812_DMA_MEMORY_WIDTH STM32_DMA_CR_MSIZE_WORD -# define WS2812_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_WORD +# define WS2812_PWM_DMA_MEMORY_WIDTH STM32_DMA_CR_MSIZE_WORD +# define WS2812_PWM_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_WORD typedef uint32_t ws2812_buffer_t; # else -# define WS2812_DMA_MEMORY_WIDTH STM32_DMA_CR_MSIZE_HWORD -# define WS2812_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_HWORD +# define WS2812_PWM_DMA_MEMORY_WIDTH STM32_DMA_CR_MSIZE_HWORD +# define WS2812_PWM_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_HWORD typedef uint16_t ws2812_buffer_t; # endif #else -# define WS2812_DMA_MEMORY_WIDTH STM32_DMA_CR_MSIZE_BYTE +# define WS2812_PWM_DMA_MEMORY_WIDTH STM32_DMA_CR_MSIZE_BYTE # if defined(WS2812_PWM_TIMER_32BIT) -# define WS2812_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_WORD +# define WS2812_PWM_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_WORD # else -# define WS2812_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_HWORD +# define WS2812_PWM_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_HWORD # endif typedef uint8_t ws2812_buffer_t; #endif @@ -326,26 +338,26 @@ void ws2812_init(void) { // Configure DMA // dmaInit(); // Joe added this #if defined(WB32F3G71xx) || defined(WB32FQ95xx) - dmaStreamAlloc(WS2812_DMA_STREAM - WB32_DMA_STREAM(0), 10, NULL, NULL); - dmaStreamSetSource(WS2812_DMA_STREAM, ws2812_frame_buffer); - dmaStreamSetDestination(WS2812_DMA_STREAM, &(WS2812_PWM_DRIVER.tim->CCR[WS2812_PWM_CHANNEL - 1])); // Ziel ist der An-Zeit im Cap-Comp-Register - dmaStreamSetMode(WS2812_DMA_STREAM, WB32_DMA_CHCFG_HWHIF(WS2812_DMA_CHANNEL) | WB32_DMA_CHCFG_DIR_M2P | WB32_DMA_CHCFG_PSIZE_WORD | WB32_DMA_CHCFG_MSIZE_WORD | WB32_DMA_CHCFG_MINC | WB32_DMA_CHCFG_CIRC | WB32_DMA_CHCFG_TCIE | WB32_DMA_CHCFG_PL(3)); + dmaStreamAlloc(WS2812_PWM_DMA_STREAM - WB32_DMA_STREAM(0), 10, NULL, NULL); + dmaStreamSetSource(WS2812_PWM_DMA_STREAM, ws2812_frame_buffer); + dmaStreamSetDestination(WS2812_PWM_DMA_STREAM, &(WS2812_PWM_DRIVER.tim->CCR[WS2812_PWM_CHANNEL - 1])); // Ziel ist der An-Zeit im Cap-Comp-Register + dmaStreamSetMode(WS2812_PWM_DMA_STREAM, WB32_DMA_CHCFG_HWHIF(WS2812_PWM_DMA_CHANNEL) | WB32_DMA_CHCFG_DIR_M2P | WB32_DMA_CHCFG_PSIZE_WORD | WB32_DMA_CHCFG_MSIZE_WORD | WB32_DMA_CHCFG_MINC | WB32_DMA_CHCFG_CIRC | WB32_DMA_CHCFG_TCIE | WB32_DMA_CHCFG_PL(3)); #else - dmaStreamAlloc(WS2812_DMA_STREAM - STM32_DMA_STREAM(0), 10, NULL, NULL); - dmaStreamSetPeripheral(WS2812_DMA_STREAM, &(WS2812_PWM_DRIVER.tim->CCR[WS2812_PWM_CHANNEL - 1])); // Ziel ist der An-Zeit im Cap-Comp-Register - dmaStreamSetMemory0(WS2812_DMA_STREAM, ws2812_frame_buffer); - dmaStreamSetMode(WS2812_DMA_STREAM, STM32_DMA_CR_CHSEL(WS2812_DMA_CHANNEL) | STM32_DMA_CR_DIR_M2P | WS2812_DMA_PERIPHERAL_WIDTH | WS2812_DMA_MEMORY_WIDTH | STM32_DMA_CR_MINC | STM32_DMA_CR_CIRC | STM32_DMA_CR_PL(3)); + dmaStreamAlloc(WS2812_PWM_DMA_STREAM - STM32_DMA_STREAM(0), 10, NULL, NULL); + dmaStreamSetPeripheral(WS2812_PWM_DMA_STREAM, &(WS2812_PWM_DRIVER.tim->CCR[WS2812_PWM_CHANNEL - 1])); // Ziel ist der An-Zeit im Cap-Comp-Register + dmaStreamSetMemory0(WS2812_PWM_DMA_STREAM, ws2812_frame_buffer); + dmaStreamSetMode(WS2812_PWM_DMA_STREAM, STM32_DMA_CR_CHSEL(WS2812_PWM_DMA_CHANNEL) | STM32_DMA_CR_DIR_M2P | WS2812_PWM_DMA_PERIPHERAL_WIDTH | WS2812_PWM_DMA_MEMORY_WIDTH | STM32_DMA_CR_MINC | STM32_DMA_CR_CIRC | STM32_DMA_CR_PL(3)); #endif - dmaStreamSetTransactionSize(WS2812_DMA_STREAM, WS2812_BIT_N); + dmaStreamSetTransactionSize(WS2812_PWM_DMA_STREAM, WS2812_BIT_N); // M2P: Memory 2 Periph; PL: Priority Level #if (STM32_DMA_SUPPORTS_DMAMUX == TRUE) // If the MCU has a DMAMUX we need to assign the correct resource - dmaSetRequestSource(WS2812_DMA_STREAM, WS2812_DMAMUX_ID); + dmaSetRequestSource(WS2812_PWM_DMA_STREAM, WS2812_PWM_DMAMUX_ID); #endif // Start DMA - dmaStreamEnable(WS2812_DMA_STREAM); + dmaStreamEnable(WS2812_PWM_DMA_STREAM); // Configure PWM // NOTE: It's required that preload be enabled on the timer channel CCR register. This is currently enabled in the From fcf906657b9e2d22b409aa9f8587fd3535e9b853 Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Sun, 3 Mar 2024 18:37:35 +0100 Subject: [PATCH 007/333] [Keyboard] Add rp2040_ce option to lotus58 (#23185) * Update keymap Corrected OLED orientation, added autoshift status on OLED. * Update keymap Corrected OLED orientation, added autoshift status on OLED. * Added make target to bottom folder With default folder * Update keyboards/tweetydabird/lotus58/keymaps/default/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Reformatted files * Update keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Updated name * Added rp2040ce * Update info.json * Update info.json * Added rp2040ce * Small fix * Update info.json Co-authored-by: jack <0x6a73@protonmail.com> * Update info.json * Update info.json * Update info.json * Update info.json * Update info.json * Update info.json * Apply suggestions from code review Co-authored-by: jack <0x6a73@protonmail.com> * Fixed stray char * Apply suggestions from code review Co-authored-by: jack <0x6a73@protonmail.com> * Update info.json Co-authored-by: Drashna Jaelre * Update info.json Co-authored-by: Drashna Jaelre * Moved LTO --------- Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre --- .../tweetydabird/lotus58/elite_c/info.json | 31 +++++++++++++++++- keyboards/tweetydabird/lotus58/info.json | 31 +----------------- .../tweetydabird/lotus58/nanoboot/info.json | 32 +++++++++++++++++++ .../tweetydabird/lotus58/promicro/info.json | 30 ++++++++++++++++- .../tweetydabird/lotus58/rp2040_ce/config.h | 9 ++++++ .../tweetydabird/lotus58/rp2040_ce/halconf.h | 21 ++++++++++++ .../tweetydabird/lotus58/rp2040_ce/info.json | 29 +++++++++++++++++ .../tweetydabird/lotus58/rp2040_ce/mcuconf.h | 22 +++++++++++++ .../tweetydabird/lotus58/rp2040_ce/rules.mk | 1 + 9 files changed, 174 insertions(+), 32 deletions(-) create mode 100644 keyboards/tweetydabird/lotus58/nanoboot/info.json create mode 100644 keyboards/tweetydabird/lotus58/rp2040_ce/config.h create mode 100644 keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h create mode 100644 keyboards/tweetydabird/lotus58/rp2040_ce/info.json create mode 100644 keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h create mode 100644 keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk diff --git a/keyboards/tweetydabird/lotus58/elite_c/info.json b/keyboards/tweetydabird/lotus58/elite_c/info.json index 606784570c7..af1a9f913c5 100644 --- a/keyboards/tweetydabird/lotus58/elite_c/info.json +++ b/keyboards/tweetydabird/lotus58/elite_c/info.json @@ -1,3 +1,32 @@ { - "bootloader": "atmel-dfu" + "build": { + "lto": true + }, + "development_board": "elite_c", + "pin_compatible": "elite_c", + "encoder": { + "rotary": [ + {"pin_a": "F5", "pin_b": "F4", "resolution": 2} + ] + }, + "matrix_pins": { + "cols": ["B1", "B2", "B3", "B6", "F7", "F6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "split": { + "encoder": { + "right": { + "rotary": [ + {"pin_a": "F4", "pin_b": "F5", "resolution": 2} + ] + } + }, + "handedness": { + "pin": "B5" + }, + "soft_serial_pin": "D2", + }, + "ws2812": { + "pin": "D3" + }, } diff --git a/keyboards/tweetydabird/lotus58/info.json b/keyboards/tweetydabird/lotus58/info.json index 646843e7652..f4660c3ad9f 100644 --- a/keyboards/tweetydabird/lotus58/info.json +++ b/keyboards/tweetydabird/lotus58/info.json @@ -1,17 +1,9 @@ { "manufacturer": "Tweetys Wild Thinking", - "keyboard_name": "Lotus 58 Glow (QMK)", + "keyboard_name": "Lotus 58 Glow", "maintainer": "TweetyDaBird", "bootloader_instructions": "Short marked pads on PCB, or hold top-outer key when plugging in each hand.", - "build": { - "lto": true - }, "diode_direction": "COL2ROW", - "encoder": { - "rotary": [ - {"pin_a": "F5", "pin_b": "F4", "resolution": 2} - ] - }, "features": { "bootmagic": true, "command": false, @@ -25,12 +17,6 @@ "split": true, "tri_layer": true }, - "matrix_pins": { - "cols": ["B1", "B2", "B3", "B6", "F7", "F6"], - "rows": ["D4", "C6", "D7", "E6", "B4"] - }, - "pin_compatible": "promicro", - "processor": "atmega32u4", "rgblight": { "default": { "val": 87 @@ -46,19 +32,7 @@ "matrix": [5, 0] }, "enabled": true, - "encoder": { - "right": { - "rotary": [ - {"pin_a": "F4", "pin_b": "F5", "resolution": 2} - ] - } - }, - "handedness": { - "pin": "B5" - }, - "soft_serial_pin": "D2", "transport": { - "protocol": "serial", "sync": { "indicators": true, "layer_state": true, @@ -78,9 +52,6 @@ "pid": "0x23B0", "vid": "0xFEED" }, - "ws2812": { - "pin": "D3" - }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tweetydabird/lotus58/nanoboot/info.json b/keyboards/tweetydabird/lotus58/nanoboot/info.json new file mode 100644 index 00000000000..e7586e6f2f2 --- /dev/null +++ b/keyboards/tweetydabird/lotus58/nanoboot/info.json @@ -0,0 +1,32 @@ +{ + "build": { + "lto": true + }, + "pin_compatible": "promicro", + "processor": "atmega32u4", + "encoder": { + "rotary": [ + {"pin_a": "F5", "pin_b": "F4", "resolution": 2} + ] + }, + "matrix_pins": { + "cols": ["B1", "B2", "B3", "B6", "F7", "F6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "split": { + "encoder": { + "right": { + "rotary": [ + {"pin_a": "F4", "pin_b": "F5", "resolution": 2} + ] + } + }, + "handedness": { + "pin": "B5" + }, + "soft_serial_pin": "D2", + }, + "ws2812": { + "pin": "D3" + }, +} diff --git a/keyboards/tweetydabird/lotus58/promicro/info.json b/keyboards/tweetydabird/lotus58/promicro/info.json index 56062f7ad37..62ee0355ef8 100644 --- a/keyboards/tweetydabird/lotus58/promicro/info.json +++ b/keyboards/tweetydabird/lotus58/promicro/info.json @@ -1,3 +1,31 @@ { - "bootloader": "caterina" + "build": { + "lto": true + }, + "development_board": "promicro", + "encoder": { + "rotary": [ + {"pin_a": "F5", "pin_b": "F4", "resolution": 2} + ] + }, + "matrix_pins": { + "cols": ["B1", "B2", "B3", "B6", "F7", "F6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "split": { + "encoder": { + "right": { + "rotary": [ + {"pin_a": "F4", "pin_b": "F5", "resolution": 2} + ] + } + }, + "handedness": { + "pin": "B5" + }, + "soft_serial_pin": "D2", + }, + "ws2812": { + "pin": "D3" + }, } diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/config.h b/keyboards/tweetydabird/lotus58/rp2040_ce/config.h new file mode 100644 index 00000000000..e4a23b7d7f0 --- /dev/null +++ b/keyboards/tweetydabird/lotus58/rp2040_ce/config.h @@ -0,0 +1,9 @@ +// Copyright 2024 Markus Knutsson (@TweetyDaBird) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#define SERIAL_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the Serial implementation uses the PIO0 peripheral + +#define I2C_DRIVER I2CD1 +#define I2C1_SDA_PIN GP2 +#define I2C1_SCL_PIN GP3 diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h b/keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h new file mode 100644 index 00000000000..2e098f5113d --- /dev/null +++ b/keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2022 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 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 + +#define HAL_USE_I2C TRUE + +#include_next diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/info.json b/keyboards/tweetydabird/lotus58/rp2040_ce/info.json new file mode 100644 index 00000000000..c8bf7117477 --- /dev/null +++ b/keyboards/tweetydabird/lotus58/rp2040_ce/info.json @@ -0,0 +1,29 @@ +{ + "development_board": "promicro_rp2040", + "encoder": { + "rotary": [ + {"pin_a": "GP28", "pin_b": "GP29", "resolution": 2} + ] + }, + "matrix_pins": { + "cols": ["GP22", "GP23", "GP20", "GP21", "GP26", "GP27"], + "rows": ["GP4", "GP5", "GP6", "GP7", "GP8"] + }, + "split": { + "encoder": { + "right": { + "rotary": [ + {"pin_a": "GP29", "pin_b": "GP28", "resolution": 2} + ] + } + }, + "soft_serial_pin": "GP1", + "handedness": { + "pin": "GP9" + } + }, + "ws2812": { + "driver": "vendor", + "pin": "GP0" + } +} diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h b/keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h new file mode 100644 index 00000000000..2ae39bf675d --- /dev/null +++ b/keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2022 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 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 + +#include_next + +#undef RP_I2C_USE_I2C1 +#define RP_I2C_USE_I2C1 TRUE diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk b/keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk new file mode 100644 index 00000000000..161ec22b16e --- /dev/null +++ b/keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = vendor From a2c23e9419478cc49d06634732e626a55eec6d66 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 5 Mar 2024 16:59:30 +0000 Subject: [PATCH 008/333] Initial 'qmk test-c' functionality (#23038) --- .github/workflows/unit_test.yml | 2 +- docs/cli_commands.md | 36 ++++++++++++++++++++++ lib/python/qmk/cli/__init__.py | 1 + lib/python/qmk/cli/test/__init__.py | 0 lib/python/qmk/cli/test/c.py | 47 +++++++++++++++++++++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 lib/python/qmk/cli/test/__init__.py create mode 100644 lib/python/qmk/cli/test/c.py diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index eec8c8b5fc2..a834053a76c 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -32,4 +32,4 @@ jobs: - name: Install dependencies run: pip3 install -r requirements-dev.txt - name: Run tests - run: make test:all + run: qmk test-c diff --git a/docs/cli_commands.md b/docs/cli_commands.md index cf174949afb..60268122caf 100644 --- a/docs/cli_commands.md +++ b/docs/cli_commands.md @@ -791,3 +791,39 @@ This command converts a TTF font to an intermediate format for editing, before c This command converts an intermediate font image to the QFF File Format. See the [Quantum Painter](quantum_painter.md?id=quantum-painter-cli) documentation for more information on this command. +## `qmk test-c` + +This command runs the C unit test suite. If you make changes to C code you should ensure this runs successfully. + +**Usage**: + +``` +qmk test-c [-h] [-t TEST] [-l] [-c] [-e ENV] [-j PARALLEL] + +options: + -h, --help show this help message and exit + -t TEST, --test TEST Test to run from the available list. Supports wildcard globs. May be passed multiple times. + -l, --list List available tests. + -c, --clean Remove object files before compiling. + -e ENV, --env ENV Set a variable to be passed to make. May be passed multiple times. + -j PARALLEL, --parallel PARALLEL + Set the number of parallel make jobs; 0 means unlimited. +``` + +**Examples**: + +Run entire test suite: + + qmk test-c + +List available tests: + + qmk test-c --list + +Run matching test: + + qmk test-c --test unicode* + +Run single test: + + qmk test-c --test basic diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py index e4a8166349b..6d05a5fc21c 100644 --- a/lib/python/qmk/cli/__init__.py +++ b/lib/python/qmk/cli/__init__.py @@ -81,6 +81,7 @@ subcommands = [ 'qmk.cli.new.keymap', 'qmk.cli.painter', 'qmk.cli.pytest', + 'qmk.cli.test.c', 'qmk.cli.userspace.add', 'qmk.cli.userspace.compile', 'qmk.cli.userspace.doctor', diff --git a/lib/python/qmk/cli/test/__init__.py b/lib/python/qmk/cli/test/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/lib/python/qmk/cli/test/c.py b/lib/python/qmk/cli/test/c.py new file mode 100644 index 00000000000..7a4e20d5e69 --- /dev/null +++ b/lib/python/qmk/cli/test/c.py @@ -0,0 +1,47 @@ +import fnmatch +import re +from subprocess import DEVNULL + +from milc import cli + +from qmk.commands import find_make, get_make_parallel_args, build_environment + + +@cli.argument('-j', '--parallel', type=int, default=1, help="Set the number of parallel make jobs; 0 means unlimited.") +@cli.argument('-e', '--env', arg_only=True, action='append', default=[], help="Set a variable to be passed to make. May be passed multiple times.") +@cli.argument('-c', '--clean', arg_only=True, action='store_true', help="Remove object files before compiling.") +@cli.argument('-l', '--list', arg_only=True, action='store_true', help='List available tests.') +@cli.argument('-t', '--test', arg_only=True, action='append', default=[], help="Test to run from the available list. Supports wildcard globs. May be passed multiple times.") +@cli.subcommand("QMK C Unit Tests.", hidden=False if cli.config.user.developer else True) +def test_c(cli): + """Run native unit tests. + """ + list_tests = cli.run([find_make(), 'list-tests', 'SILENT=true']) + available_tests = sorted(list_tests.stdout.strip().split()) + + if cli.args.list: + return print("\n".join(available_tests)) + + # expand any wildcards + filtered_tests = set() + for test in cli.args.test: + regex = re.compile(fnmatch.translate(test)) + filtered_tests |= set(filter(regex.match, available_tests)) + + for invalid in filtered_tests - set(available_tests): + cli.log.warning(f'Invalid test provided: {invalid}') + + # convert test names to build targets + targets = list(map(lambda x: f'test:{x}', filtered_tests or ['all'])) + + if cli.args.clean: + targets.insert(0, 'clean') + + # Add in the environment vars + for key, value in build_environment(cli.args.env).items(): + targets.append(f'{key}={value}') + + command = [find_make(), *get_make_parallel_args(cli.config.test_c.parallel), *targets] + + cli.log.info('Compiling tests with {fg_cyan}%s', ' '.join(command)) + return cli.run(command, capture_output=False, stdin=DEVNULL).returncode From 83e6ddbbb4c8e715bfe419c4d7fc0ae305ea5bd5 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Wed, 6 Mar 2024 03:02:37 -0800 Subject: [PATCH 009/333] [Audio] Add support for audio shutdown pin (#22731) Co-authored-by: Ryan --- data/mappings/info_config.hjson | 2 + data/schemas/keyboard.jsonschema | 8 ++++ docs/feature_audio.md | 48 ++++++++++--------- docs/reference_info_json.md | 7 +++ keyboards/adafruit/macropad/config.h | 2 - keyboards/adafruit/macropad/info.json | 5 ++ keyboards/adafruit/macropad/macropad.c | 42 ---------------- platforms/avr/drivers/audio_pwm_hardware.c | 6 +-- .../chibios/drivers/audio_dac_additive.c | 6 +-- platforms/chibios/drivers/audio_dac_basic.c | 6 +-- .../chibios/drivers/audio_pwm_hardware.c | 6 +-- .../chibios/drivers/audio_pwm_software.c | 6 +-- platforms/test/drivers/audio_pwm_hardware.c | 6 +-- quantum/audio/audio.c | 27 +++++++++++ quantum/audio/audio.h | 6 +-- 15 files changed, 95 insertions(+), 88 deletions(-) delete mode 100644 keyboards/adafruit/macropad/macropad.c diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index e2e9569372e..c0417b88396 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -19,6 +19,8 @@ // Audio "AUDIO_DEFAULT_ON": {"info_key": "audio.default.on", "value_type": "bool"}, "AUDIO_DEFAULT_CLICKY_ON": {"info_key": "audio.default.clicky", "value_type": "bool"}, + "AUDIO_POWER_CONTROL_PIN": {"info_key": "audio.power_control.pin"}, + "AUDIO_POWER_CONTROL_PIN_ON_STATE": {"info_key": "audio.power_control.on_state", "value_type": "int" }, "AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "flag"}, "SENDSTRING_BELL": {"info_key": "audio.macro_beep", "value_type": "flag"}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 340eb64ba1a..5c6788913b0 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -135,6 +135,14 @@ }, "macro_beep": {"type": "boolean"}, "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}, + "power_control": { + "type": "object", + "additionalProperties": false, + "properties": { + "on_state": {"$ref": "qmk.definitions.v1#/bit"}, + "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"} + } + }, "voices": {"type": "boolean"} } }, diff --git a/docs/feature_audio.md b/docs/feature_audio.md index 5227d063c3a..05f32e98401 100644 --- a/docs/feature_audio.md +++ b/docs/feature_audio.md @@ -171,29 +171,31 @@ The available keycodes for audio are: ## Audio Config -| Settings | Default | Description | -|---------------------------------|----------------------|-------------------------------------------------------------------------------| -|`AUDIO_PIN` | *Not defined* |Configures the pin that the speaker is connected to. | -|`AUDIO_PIN_ALT` | *Not defined* |Configures the pin for a second speaker or second pin connected to one speaker.| -|`AUDIO_PIN_ALT_AS_NEGATIVE` | *Not defined* |Enables support for one speaker connected to two pins. | -|`AUDIO_INIT_DELAY` | *Not defined* |Enables delay during startup song to accomidate for USB startup issues. | -|`AUDIO_ENABLE_TONE_MULTIPLEXING` | *Not defined* |Enables time splicing/multiplexing to create multiple tones simutaneously. | -|`STARTUP_SONG` | `STARTUP_SOUND` |Plays when the keyboard starts up (audio.c) | -|`GOODBYE_SONG` | `GOODBYE_SOUND` |Plays when you press the QK_BOOT key (quantum.c) | -|`AG_NORM_SONG` | `AG_NORM_SOUND` |Plays when you press AG_NORM (process_magic.c) | -|`AG_SWAP_SONG` | `AG_SWAP_SOUND` |Plays when you press AG_SWAP (process_magic.c) | -|`CG_NORM_SONG` | `AG_NORM_SOUND` |Plays when you press CG_NORM (process_magic.c) | -|`CG_SWAP_SONG` | `AG_SWAP_SOUND` |Plays when you press CG_SWAP (process_magic.c) | -|`MUSIC_ON_SONG` | `MUSIC_ON_SOUND` |Plays when music mode is activated (process_music.c) | -|`MUSIC_OFF_SONG` | `MUSIC_OFF_SOUND` |Plays when music mode is deactivated (process_music.c) | -|`MIDI_ON_SONG` | `MUSIC_ON_SOUND` |Plays when midi mode is activated (process_music.c) | -|`MIDI_OFF_SONG` | `MUSIC_OFF_SOUND` |Plays when midi mode is deactivated (process_music.c) | -|`CHROMATIC_SONG` | `CHROMATIC_SOUND` |Plays when the chromatic music mode is selected (process_music.c) | -|`GUITAR_SONG` | `GUITAR_SOUND` |Plays when the guitar music mode is selected (process_music.c) | -|`VIOLIN_SONG` | `VIOLIN_SOUND` |Plays when the violin music mode is selected (process_music.c) | -|`MAJOR_SONG` | `MAJOR_SOUND` |Plays when the major music mode is selected (process_music.c) | -|`DEFAULT_LAYER_SONGS` | *Not defined* |Plays song when switched default layers with [`set_single_persistent_default_layer(layer)`](ref_functions.md#setting-the-persistent-default-layer)(quantum.c) | -|`SENDSTRING_BELL` | *Not defined* |Plays chime when the "enter" ("\a") character is sent (send_string.c) | +| Settings | Default | Description | +|----------------------------------|----------------------|---------------------------------------------------------------------------------------------| +|`AUDIO_PIN` | *Not defined* |Configures the pin that the speaker is connected to. | +|`AUDIO_PIN_ALT` | *Not defined* |Configures the pin for a second speaker or second pin connected to one speaker. | +|`AUDIO_PIN_ALT_AS_NEGATIVE` | *Not defined* |Enables support for one speaker connected to two pins. | +|`AUDIO_INIT_DELAY` | *Not defined* |Enables delay during startup song to accomidate for USB startup issues. | +|`AUDIO_ENABLE_TONE_MULTIPLEXING` | *Not defined* |Enables time splicing/multiplexing to create multiple tones simutaneously. | +|`AUDIO_POWER_CONTROL_PIN` | *Not defined* |Enables power control code to enable or cut off power to speaker (such as with PAM8302 amp). | +|`AUDIO_POWER_CONTROL_PIN_ON_STATE`| `1` |The state of the audio power control pin when audio is "on" - `1` for high, `0` for low. | +|`STARTUP_SONG` | `STARTUP_SOUND` |Plays when the keyboard starts up (audio.c) | +|`GOODBYE_SONG` | `GOODBYE_SOUND` |Plays when you press the QK_BOOT key (quantum.c) | +|`AG_NORM_SONG` | `AG_NORM_SOUND` |Plays when you press AG_NORM (process_magic.c) | +|`AG_SWAP_SONG` | `AG_SWAP_SOUND` |Plays when you press AG_SWAP (process_magic.c) | +|`CG_NORM_SONG` | `AG_NORM_SOUND` |Plays when you press CG_NORM (process_magic.c) | +|`CG_SWAP_SONG` | `AG_SWAP_SOUND` |Plays when you press CG_SWAP (process_magic.c) | +|`MUSIC_ON_SONG` | `MUSIC_ON_SOUND` |Plays when music mode is activated (process_music.c) | +|`MUSIC_OFF_SONG` | `MUSIC_OFF_SOUND` |Plays when music mode is deactivated (process_music.c) | +|`MIDI_ON_SONG` | `MUSIC_ON_SOUND` |Plays when midi mode is activated (process_music.c) | +|`MIDI_OFF_SONG` | `MUSIC_OFF_SOUND` |Plays when midi mode is deactivated (process_music.c) | +|`CHROMATIC_SONG` | `CHROMATIC_SOUND` |Plays when the chromatic music mode is selected (process_music.c) | +|`GUITAR_SONG` | `GUITAR_SOUND` |Plays when the guitar music mode is selected (process_music.c) | +|`VIOLIN_SONG` | `VIOLIN_SOUND` |Plays when the violin music mode is selected (process_music.c) | +|`MAJOR_SONG` | `MAJOR_SOUND` |Plays when the major music mode is selected (process_music.c) | +|`DEFAULT_LAYER_SONGS` | *Not defined* |Plays song when switched default layers with [`set_single_persistent_default_layer(layer)`](ref_functions.md#setting-the-persistent-default-layer)(quantum.c). | +|`SENDSTRING_BELL` | *Not defined* |Plays chime when the "enter" ("\a") character is sent (send_string.c) | ## Tempo the 'speed' at which SONGs are played is dictated by the set Tempo, which is measured in beats-per-minute. Note lengths are defined relative to that. diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md index 796db1f2446..b715c14041c 100644 --- a/docs/reference_info_json.md +++ b/docs/reference_info_json.md @@ -123,10 +123,17 @@ Configures the [Audio](feature_audio.md) feature. * Default: `false` * `pins` (Required) * The GPIO pin(s) connected to the speaker(s). + * `power_control` + * `on_state` + * The logical GPIO state required to turn the speaker on. + * Default: `1` (on = high) + * `pin` + * The GPIO pin connected to speaker power circuit. * `voices` * Use multiple audio voices. * Default: `false` + ## Backlight :id=backlight Configures the [Backlight](feature_backlight.md) feature. diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h index 7f2e9ab6f96..725530a512b 100644 --- a/keyboards/adafruit/macropad/config.h +++ b/keyboards/adafruit/macropad/config.h @@ -48,5 +48,3 @@ #define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_A #define AUDIO_INIT_DELAY #define AUDIO_CLICKY - -#define SPEAKER_SHUTDOWN GP14 diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json index 0facf7e0f66..295af783398 100644 --- a/keyboards/adafruit/macropad/info.json +++ b/keyboards/adafruit/macropad/info.json @@ -8,6 +8,11 @@ "pid": "0x0108", "device_version": "0.0.1" }, + "audio": { + "power_control": { + "pin": "GP14" + } + }, "encoder": { "rotary": [ {"pin_a": "GP18", "pin_b": "GP17"} diff --git a/keyboards/adafruit/macropad/macropad.c b/keyboards/adafruit/macropad/macropad.c deleted file mode 100644 index 5c1d2ba5930..00000000000 --- a/keyboards/adafruit/macropad/macropad.c +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2022 Jose Pablo Ramirez - * - * 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 . - */ - -#include "quantum.h" - -#ifdef AUDIO_ENABLE -void keyboard_pre_init_kb(void) { - // ensure pin is set and enabled pre-audio init - setPinOutput(SPEAKER_SHUTDOWN); - writePinHigh(SPEAKER_SHUTDOWN); - keyboard_pre_init_user(); -} - -void keyboard_post_init_kb(void) { - // set pin based on active status - writePin(SPEAKER_SHUTDOWN, audio_is_on()); - keyboard_post_init_user(); -} - -void audio_on_user(void) { - writePinHigh(SPEAKER_SHUTDOWN); -} - -void audio_off_user(void) { - // needs a delay or it runs right after play note. - wait_ms(200); - writePinLow(SPEAKER_SHUTDOWN); -} -#endif diff --git a/platforms/avr/drivers/audio_pwm_hardware.c b/platforms/avr/drivers/audio_pwm_hardware.c index d484fba00fb..16264cf0a22 100644 --- a/platforms/avr/drivers/audio_pwm_hardware.c +++ b/platforms/avr/drivers/audio_pwm_hardware.c @@ -213,7 +213,7 @@ void channel_2_stop(void) { } #endif -void audio_driver_initialize(void) { +void audio_driver_initialize_impl(void) { #ifdef AUDIO1_PIN_SET channel_1_stop(); gpio_set_pin_output(AUDIO1_PIN); @@ -254,7 +254,7 @@ void audio_driver_initialize(void) { #endif } -void audio_driver_stop(void) { +void audio_driver_stop_impl(void) { #ifdef AUDIO1_PIN_SET channel_1_stop(); #endif @@ -264,7 +264,7 @@ void audio_driver_stop(void) { #endif } -void audio_driver_start(void) { +void audio_driver_start_impl(void) { #ifdef AUDIO1_PIN_SET channel_1_start(); if (playing_note) { diff --git a/platforms/chibios/drivers/audio_dac_additive.c b/platforms/chibios/drivers/audio_dac_additive.c index d6fde42b68f..8e29053301f 100644 --- a/platforms/chibios/drivers/audio_dac_additive.c +++ b/platforms/chibios/drivers/audio_dac_additive.c @@ -303,7 +303,7 @@ static const DACConfig dac_conf = {.init = AUDIO_DAC_OFF_VALUE, .datamode = DAC_ */ static const DACConversionGroup dac_conv_cfg = {.num_channels = 1U, .end_cb = dac_end, .error_cb = dac_error, .trigger = DAC_TRG(0b000)}; -void audio_driver_initialize(void) { +void audio_driver_initialize_impl(void) { if ((AUDIO_PIN == A4) || (AUDIO_PIN_ALT == A4)) { palSetLineMode(A4, PAL_MODE_INPUT_ANALOG); dacStart(&DACD1, &dac_conf); @@ -350,11 +350,11 @@ void audio_driver_initialize(void) { gptStart(&GPTD6, &gpt6cfg1); } -void audio_driver_stop(void) { +void audio_driver_stop_impl(void) { state = OUTPUT_SHOULD_STOP; } -void audio_driver_start(void) { +void audio_driver_start_impl(void) { gptStartContinuous(&GPTD6, 2U); for (uint8_t i = 0; i < AUDIO_MAX_SIMULTANEOUS_TONES; i++) { diff --git a/platforms/chibios/drivers/audio_dac_basic.c b/platforms/chibios/drivers/audio_dac_basic.c index 9a3f3fea1f3..99b938e610a 100644 --- a/platforms/chibios/drivers/audio_dac_basic.c +++ b/platforms/chibios/drivers/audio_dac_basic.c @@ -190,7 +190,7 @@ static void gpt_audio_state_cb(GPTDriver *gptp) { } } -void audio_driver_initialize(void) { +void audio_driver_initialize_impl(void) { if ((AUDIO_PIN == A4) || (AUDIO_PIN_ALT == A4)) { palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_ANALOG); dacStart(&DACD1, &dac_conf_ch1); @@ -223,7 +223,7 @@ void audio_driver_initialize(void) { gptStart(&AUDIO_STATE_TIMER, &gptStateUpdateCfg); } -void audio_driver_stop(void) { +void audio_driver_stop_impl(void) { if ((AUDIO_PIN == A4) || (AUDIO_PIN_ALT == A4)) { gptStopTimer(&GPTD6); @@ -241,7 +241,7 @@ void audio_driver_stop(void) { gptStopTimer(&AUDIO_STATE_TIMER); } -void audio_driver_start(void) { +void audio_driver_start_impl(void) { if ((AUDIO_PIN == A4) || (AUDIO_PIN_ALT == A4)) { dacStartConversion(&DACD1, &dac_conv_grp_ch1, (dacsample_t *)dac_buffer_1, AUDIO_DAC_BUFFER_SIZE); } diff --git a/platforms/chibios/drivers/audio_pwm_hardware.c b/platforms/chibios/drivers/audio_pwm_hardware.c index 21b5c6892cd..1ba7ec13bcf 100644 --- a/platforms/chibios/drivers/audio_pwm_hardware.c +++ b/platforms/chibios/drivers/audio_pwm_hardware.c @@ -87,7 +87,7 @@ static void audio_callback(virtual_timer_t *vtp, void *p) { chSysUnlockFromISR(); } -void audio_driver_initialize(void) { +void audio_driver_initialize_impl(void) { pwmStart(&AUDIO_PWM_DRIVER, &pwmCFG); // connect the AUDIO_PIN to the PWM hardware @@ -100,7 +100,7 @@ void audio_driver_initialize(void) { chVTObjectInit(&audio_vt); } -void audio_driver_start(void) { +void audio_driver_start_impl(void) { channel_1_stop(); channel_1_start(); @@ -115,7 +115,7 @@ void audio_driver_start(void) { } } -void audio_driver_stop(void) { +void audio_driver_stop_impl(void) { channel_1_stop(); chVTReset(&audio_vt); } diff --git a/platforms/chibios/drivers/audio_pwm_software.c b/platforms/chibios/drivers/audio_pwm_software.c index 663a9eca165..f48323900b4 100644 --- a/platforms/chibios/drivers/audio_pwm_software.c +++ b/platforms/chibios/drivers/audio_pwm_software.c @@ -121,7 +121,7 @@ GPTConfig gptCFG = { .callback = gpt_callback, }; -void audio_driver_initialize(void) { +void audio_driver_initialize_impl(void) { pwmStart(&AUDIO_PWM_DRIVER, &pwmCFG); palSetLineMode(AUDIO_PIN, PAL_MODE_OUTPUT_PUSHPULL); @@ -138,7 +138,7 @@ void audio_driver_initialize(void) { gptStart(&AUDIO_STATE_TIMER, &gptCFG); } -void audio_driver_start(void) { +void audio_driver_start_impl(void) { channel_1_stop(); channel_1_start(); @@ -147,7 +147,7 @@ void audio_driver_start(void) { } } -void audio_driver_stop(void) { +void audio_driver_stop_impl(void) { channel_1_stop(); gptStopTimer(&AUDIO_STATE_TIMER); } diff --git a/platforms/test/drivers/audio_pwm_hardware.c b/platforms/test/drivers/audio_pwm_hardware.c index 336e4f58449..3a0384117a4 100644 --- a/platforms/test/drivers/audio_pwm_hardware.c +++ b/platforms/test/drivers/audio_pwm_hardware.c @@ -15,6 +15,6 @@ #include "audio.h" -void audio_driver_initialize(void) {} -void audio_driver_start() {} -void audio_driver_stop() {} +void audio_driver_initialize_impl(void) {} +void audio_driver_start_impl() {} +void audio_driver_stop_impl() {} diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c index c1a15004930..b2611c5f099 100644 --- a/quantum/audio/audio.c +++ b/quantum/audio/audio.c @@ -20,6 +20,7 @@ #include "debug.h" #include "wait.h" #include "util.h" +#include "gpio.h" /* audio system: * @@ -121,6 +122,32 @@ static bool audio_initialized = false; static bool audio_driver_stopped = true; audio_config_t audio_config; +#ifndef AUDIO_POWER_CONTROL_PIN_ON_STATE +# define AUDIO_POWER_CONTROL_PIN_ON_STATE 1 +#endif + +void audio_driver_initialize(void) { +#ifdef AUDIO_POWER_CONTROL_PIN + gpio_set_pin_output_push_pull(AUDIO_POWER_CONTROL_PIN); + gpio_write_pin(AUDIO_POWER_CONTROL_PIN, !AUDIO_POWER_CONTROL_PIN_ON_STATE); +#endif + audio_driver_initialize_impl(); +} + +void audio_driver_stop(void) { + audio_driver_stop_impl(); +#ifdef AUDIO_POWER_CONTROL_PIN + gpio_write_pin(AUDIO_POWER_CONTROL_PIN, !AUDIO_POWER_CONTROL_PIN_ON_STATE); +#endif +} + +void audio_driver_start(void) { +#ifdef AUDIO_POWER_CONTROL_PIN + gpio_write_pin(AUDIO_POWER_CONTROL_PIN, AUDIO_POWER_CONTROL_PIN_ON_STATE); +#endif + audio_driver_start_impl(); +} + void eeconfig_update_audio_current(void) { eeconfig_update_audio(audio_config.raw); } diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h index eb0bedc6f9f..054331d6f33 100644 --- a/quantum/audio/audio.h +++ b/quantum/audio/audio.h @@ -215,9 +215,9 @@ void audio_startup(void); // hardware interface // implementation in the driver_avr/arm_* respective parts -void audio_driver_initialize(void); -void audio_driver_start(void); -void audio_driver_stop(void); +void audio_driver_initialize_impl(void); +void audio_driver_start_impl(void); +void audio_driver_stop_impl(void); /** * @brief get the number of currently active tones From c48f372c8756fda10b5045c620da7a4c1f16584f Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 6 Mar 2024 17:02:52 +0000 Subject: [PATCH 010/333] Migrate annepro2 away from custom matrix (#23221) * Migrate annepro2 away from custom matrix * LTO --- keyboards/annepro2/c15/config.h | 15 -------- keyboards/annepro2/c15/info.json | 5 +++ keyboards/annepro2/c15/rules.mk | 4 -- keyboards/annepro2/c18/config.h | 13 ------- keyboards/annepro2/c18/info.json | 5 +++ keyboards/annepro2/c18/rules.mk | 4 -- keyboards/annepro2/info.json | 3 ++ keyboards/annepro2/matrix.c | 63 -------------------------------- 8 files changed, 13 insertions(+), 99 deletions(-) delete mode 100644 keyboards/annepro2/matrix.c diff --git a/keyboards/annepro2/c15/config.h b/keyboards/annepro2/c15/config.h index 9ffce919579..9745cf50cce 100644 --- a/keyboards/annepro2/c15/config.h +++ b/keyboards/annepro2/c15/config.h @@ -19,27 +19,12 @@ #include "pin_defs.h" -// key matrix size -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 -// layer size: MATRIX_ROWS * MATRIX_COLS * sizeof(uint16_t) = 140 bytes - #define LINE_UART_TX B0 // Master TX, LED RX #define LINE_UART_RX B1 // Master RX, LED TX #define LINE_BT_UART_TX A4 // Master TX, BLE RX #define LINE_BT_UART_RX A5 // Master RX, BLE TX -// outputs (rows are pulled low) -#define MATRIX_ROW_PINS \ - { C2, C1, B5, B4, C3 } - -// inputs (columns are sampled) -// PORTA 12,13 conflict with SWD - -#define MATRIX_COL_PINS \ - { C4, C5, B10, B11, C0, A15, A8, A10, A11, A12, A13, A14, B2, B3 } - // Obins stock firmware has something similar to this already enabled, but disabled by default in QMK #define PERMISSIVE_HOLD diff --git a/keyboards/annepro2/c15/info.json b/keyboards/annepro2/c15/info.json index b92b446e4e9..091d0b1c5b7 100644 --- a/keyboards/annepro2/c15/info.json +++ b/keyboards/annepro2/c15/info.json @@ -10,6 +10,11 @@ "backing_size": 2048 } }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["C4", "C5", "B10", "B11", "C0", "A15", "A8", "A10", "A11", "A12", "A13", "A14", "B2", "B3"], + "rows": ["C2", "C1", "B5", "B4", "C3"] + }, "rgb_matrix": { "animations":{ "alphas_mods": true, diff --git a/keyboards/annepro2/c15/rules.mk b/keyboards/annepro2/c15/rules.mk index 374d8443385..c3bf551e4b6 100644 --- a/keyboards/annepro2/c15/rules.mk +++ b/keyboards/annepro2/c15/rules.mk @@ -26,12 +26,8 @@ NKRO_ENABLE = no # Enable N-Key Rollover # Custom RGB matrix handling RGB_MATRIX_ENABLE = yes -# Keys -CUSTOM_MATRIX = lite - # Anne Pro 2 SRC = \ - matrix.c \ annepro2_ble.c \ ap2_led.c \ protocol.c \ diff --git a/keyboards/annepro2/c18/config.h b/keyboards/annepro2/c18/config.h index 7010f19a3fc..dfc550160c3 100644 --- a/keyboards/annepro2/c18/config.h +++ b/keyboards/annepro2/c18/config.h @@ -19,25 +19,12 @@ #include "pin_defs.h" -// key matrix size -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 -// layer size: MATRIX_ROWS * MATRIX_COLS * sizeof(uint16_t) = 140 bytes - #define LINE_UART_TX B0 #define LINE_UART_RX B1 #define LINE_BT_UART_TX A4 // Master TX, BLE RX #define LINE_BT_UART_RX A5 // Master RX, BLE TX -// outputs (rows are pulled low) -#define MATRIX_ROW_PINS \ - { B5, B4, B3, B2, D1 } - -// inputs (columns are sampled) -#define MATRIX_COL_PINS \ - { C4, C5, D0, B15, C11, A15, C12, C13, A8, A10, A11, A14, D2, D3 } - // Obins stock firmware has something similar to this already enabled, but disabled by default in QMK #define PERMISSIVE_HOLD diff --git a/keyboards/annepro2/c18/info.json b/keyboards/annepro2/c18/info.json index 390dd819416..8c765338a5a 100644 --- a/keyboards/annepro2/c18/info.json +++ b/keyboards/annepro2/c18/info.json @@ -10,6 +10,11 @@ "backing_size": 2048 } }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["C4", "C5", "D0", "B15", "C11", "A15", "C12", "C13", "A8", "A10", "A11", "A14", "D2", "D3"], + "rows": ["B5", "B4", "B3", "B2", "D1"] + }, "rgb_matrix": { "animations":{ "alphas_mods": true, diff --git a/keyboards/annepro2/c18/rules.mk b/keyboards/annepro2/c18/rules.mk index 2c9a9077da5..484099b3aea 100644 --- a/keyboards/annepro2/c18/rules.mk +++ b/keyboards/annepro2/c18/rules.mk @@ -26,12 +26,8 @@ NKRO_ENABLE = no # Enable N-Key Rollover # Custom RGB matrix handling RGB_MATRIX_ENABLE = yes -# Keys -CUSTOM_MATRIX = lite - # Anne Pro 2 SRC = \ - matrix.c \ annepro2_ble.c \ ap2_led.c \ protocol.c \ diff --git a/keyboards/annepro2/info.json b/keyboards/annepro2/info.json index d06fe5bed49..f90edcfa835 100644 --- a/keyboards/annepro2/info.json +++ b/keyboards/annepro2/info.json @@ -6,6 +6,9 @@ "vid": "0xAC20", "device_version": "13.3.7" }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/annepro2/matrix.c b/keyboards/annepro2/matrix.c deleted file mode 100644 index a1585e4ddf1..00000000000 --- a/keyboards/annepro2/matrix.c +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2018 Charlie Waters - * - * 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 . - */ - -#include -#include -#include -#include -#include "timer.h" -#include "wait.h" -#include "print.h" -#include "matrix.h" -#include "annepro2.h" - -pin_t row_list[MATRIX_ROWS] = MATRIX_ROW_PINS; -pin_t col_list[MATRIX_COLS] = MATRIX_COL_PINS; - -bool matrix_scan_custom(matrix_row_t current_matrix[]) { - bool matrix_has_changed = false; - // cache of input ports for columns - static uint16_t port_cache[4]; - // scan each row - for (int row = 0; row < MATRIX_ROWS; row++) { - palClearLine(row_list[row]); - __NOP(); - __NOP(); - __NOP(); - __NOP(); - // read i/o ports - port_cache[0] = palReadPort(IOPORTA); - port_cache[1] = palReadPort(IOPORTB); - port_cache[2] = palReadPort(IOPORTC); - port_cache[3] = palReadPort(IOPORTD); - palSetLine(row_list[row]); - - // get columns from ports - matrix_row_t data = 0; - for (int col = 0; col < MATRIX_COLS; ++col) { - pin_t line = col_list[col]; - uint16_t port = port_cache[HT32_PAL_IDX(PAL_PORT(line))]; - data |= (((port & (1 << PAL_PAD(line))) ? 0 : 1) << col); - } - - if (current_matrix[row] != data) { - current_matrix[row] = data; - matrix_has_changed = true; - } - } - return matrix_has_changed; -} \ No newline at end of file From bd1f1068f7aec64a606e39aad09a336fe3584879 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Fri, 8 Mar 2024 08:27:40 -0700 Subject: [PATCH 011/333] Fixup annepro2 (#23206) Co-authored-by: Joel Challis --- keyboards/annepro2/c15/info.json | 122 +---------------- keyboards/annepro2/c15/rules.mk | 13 -- keyboards/annepro2/c18/info.json | 122 +---------------- keyboards/annepro2/c18/rules.mk | 13 -- keyboards/annepro2/info.json | 126 ++++++++++++++++++ .../keymaps/default-full-caps/keymap.c | 4 +- .../keymaps/default-layer-indicators/keymap.c | 4 +- keyboards/annepro2/keymaps/default/keymap.c | 4 +- .../annepro2/keymaps/iso_default/keymap.c | 8 +- 9 files changed, 138 insertions(+), 278 deletions(-) diff --git a/keyboards/annepro2/c15/info.json b/keyboards/annepro2/c15/info.json index 091d0b1c5b7..0f738c0999e 100644 --- a/keyboards/annepro2/c15/info.json +++ b/keyboards/annepro2/c15/info.json @@ -3,129 +3,9 @@ "usb": { "pid": "0x8008" }, - "eeprom": { - "driver": "wear_leveling", - "wear_leveling": { - "driver": "spi_flash", - "backing_size": 2048 - } - }, "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["C4", "C5", "B10", "B11", "C0", "A15", "A8", "A10", "A11", "A12", "A13", "A14", "B2", "B3"], "rows": ["C2", "C1", "B5", "B4", "C3"] - }, - "rgb_matrix": { - "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, - "rainbow_moving_chevron": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": 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 - }, - "driver": "custom", - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, - {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, - {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, - {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, - {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4}, - {"matrix": [0, 5], "x": 81, "y": 0, "flags": 4}, - {"matrix": [0, 6], "x": 97, "y": 0, "flags": 4}, - {"matrix": [0, 7], "x": 113, "y": 0, "flags": 4}, - {"matrix": [0, 8], "x": 129, "y": 0, "flags": 4}, - {"matrix": [0, 9], "x": 145, "y": 0, "flags": 4}, - {"matrix": [0, 10], "x": 161, "y": 0, "flags": 4}, - {"matrix": [0, 11], "x": 178, "y": 0, "flags": 4}, - {"matrix": [0, 12], "x": 194, "y": 0, "flags": 4}, - {"matrix": [0, 13], "x": 218, "y": 0, "flags": 4}, - {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4}, - {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4}, - {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4}, - {"matrix": [1, 3], "x": 57, "y": 16, "flags": 4}, - {"matrix": [1, 4], "x": 73, "y": 16, "flags": 4}, - {"matrix": [1, 5], "x": 89, "y": 16, "flags": 4}, - {"matrix": [1, 6], "x": 105, "y": 16, "flags": 4}, - {"matrix": [1, 7], "x": 121, "y": 16, "flags": 4}, - {"matrix": [1, 8], "x": 137, "y": 16, "flags": 4}, - {"matrix": [1, 9], "x": 153, "y": 16, "flags": 4}, - {"matrix": [1, 10], "x": 170, "y": 16, "flags": 4}, - {"matrix": [1, 11], "x": 186, "y": 16, "flags": 4}, - {"matrix": [1, 12], "x": 202, "y": 16, "flags": 4}, - {"matrix": [1, 13], "x": 222, "y": 16, "flags": 4}, - {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4}, - {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4}, - {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4}, - {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4}, - {"matrix": [2, 4], "x": 77, "y": 32, "flags": 4}, - {"matrix": [2, 5], "x": 93, "y": 32, "flags": 4}, - {"matrix": [2, 6], "x": 109, "y": 32, "flags": 4}, - {"matrix": [2, 7], "x": 125, "y": 32, "flags": 4}, - {"matrix": [2, 8], "x": 141, "y": 32, "flags": 4}, - {"matrix": [2, 9], "x": 157, "y": 32, "flags": 4}, - {"matrix": [2, 10], "x": 174, "y": 32, "flags": 4}, - {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4}, - {"matrix": [2, 12], "x": 216, "y": 32, "flags": 4}, - {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1}, - {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4}, - {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4}, - {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4}, - {"matrix": [3, 5], "x": 85, "y": 48, "flags": 4}, - {"matrix": [3, 6], "x": 101, "y": 48, "flags": 4}, - {"matrix": [3, 7], "x": 117, "y": 48, "flags": 4}, - {"matrix": [3, 8], "x": 133, "y": 48, "flags": 4}, - {"matrix": [3, 9], "x": 149, "y": 48, "flags": 4}, - {"matrix": [3, 10], "x": 165, "y": 48, "flags": 4}, - {"matrix": [3, 11], "x": 182, "y": 48, "flags": 4}, - {"matrix": [3, 12], "x": 212, "y": 48, "flags": 1}, - {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1}, - {"matrix": [4, 2], "x": 22, "y": 64, "flags": 1}, - {"matrix": [4, 3], "x": 42, "y": 64, "flags": 1}, - {"matrix": [4, 6], "x": 103, "y": 64, "flags": 4}, - {"matrix": [4, 9], "x": 163, "y": 64, "flags": 1}, - {"matrix": [4, 10], "x": 184, "y": 64, "flags": 1}, - {"matrix": [4, 11], "x": 204, "y": 64, "flags": 1}, - {"matrix": [4, 12], "x": 224, "y": 64, "flags": 1} - ], - "led_flush_limit": 40 - }, - "community_layouts": ["60_ansi"] + } } diff --git a/keyboards/annepro2/c15/rules.mk b/keyboards/annepro2/c15/rules.mk index c3bf551e4b6..f35d9002ef5 100644 --- a/keyboards/annepro2/c15/rules.mk +++ b/keyboards/annepro2/c15/rules.mk @@ -13,19 +13,6 @@ BOARD = ANNEPRO2_C15 BOOTLOADER = custom PROGRAM_CMD = annepro2_tools --boot $(BUILD_DIR)/$(TARGET).bin -# 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 - -# Custom RGB matrix handling -RGB_MATRIX_ENABLE = yes - # Anne Pro 2 SRC = \ annepro2_ble.c \ diff --git a/keyboards/annepro2/c18/info.json b/keyboards/annepro2/c18/info.json index 8c765338a5a..b3f3d367fef 100644 --- a/keyboards/annepro2/c18/info.json +++ b/keyboards/annepro2/c18/info.json @@ -3,129 +3,9 @@ "usb": { "pid": "0x8009" }, - "eeprom": { - "driver": "wear_leveling", - "wear_leveling": { - "driver": "spi_flash", - "backing_size": 2048 - } - }, "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["C4", "C5", "D0", "B15", "C11", "A15", "C12", "C13", "A8", "A10", "A11", "A14", "D2", "D3"], "rows": ["B5", "B4", "B3", "B2", "D1"] - }, - "rgb_matrix": { - "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, - "rainbow_moving_chevron": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": 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 - }, - "driver": "custom", - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, - {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, - {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, - {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, - {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4}, - {"matrix": [0, 5], "x": 81, "y": 0, "flags": 4}, - {"matrix": [0, 6], "x": 97, "y": 0, "flags": 4}, - {"matrix": [0, 7], "x": 113, "y": 0, "flags": 4}, - {"matrix": [0, 8], "x": 129, "y": 0, "flags": 4}, - {"matrix": [0, 9], "x": 145, "y": 0, "flags": 4}, - {"matrix": [0, 10], "x": 161, "y": 0, "flags": 4}, - {"matrix": [0, 11], "x": 178, "y": 0, "flags": 4}, - {"matrix": [0, 12], "x": 194, "y": 0, "flags": 4}, - {"matrix": [0, 13], "x": 218, "y": 0, "flags": 4}, - {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4}, - {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4}, - {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4}, - {"matrix": [1, 3], "x": 57, "y": 16, "flags": 4}, - {"matrix": [1, 4], "x": 73, "y": 16, "flags": 4}, - {"matrix": [1, 5], "x": 89, "y": 16, "flags": 4}, - {"matrix": [1, 6], "x": 105, "y": 16, "flags": 4}, - {"matrix": [1, 7], "x": 121, "y": 16, "flags": 4}, - {"matrix": [1, 8], "x": 137, "y": 16, "flags": 4}, - {"matrix": [1, 9], "x": 153, "y": 16, "flags": 4}, - {"matrix": [1, 10], "x": 170, "y": 16, "flags": 4}, - {"matrix": [1, 11], "x": 186, "y": 16, "flags": 4}, - {"matrix": [1, 12], "x": 202, "y": 16, "flags": 4}, - {"matrix": [1, 13], "x": 222, "y": 16, "flags": 4}, - {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4}, - {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4}, - {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4}, - {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4}, - {"matrix": [2, 4], "x": 77, "y": 32, "flags": 4}, - {"matrix": [2, 5], "x": 93, "y": 32, "flags": 4}, - {"matrix": [2, 6], "x": 109, "y": 32, "flags": 4}, - {"matrix": [2, 7], "x": 125, "y": 32, "flags": 4}, - {"matrix": [2, 8], "x": 141, "y": 32, "flags": 4}, - {"matrix": [2, 9], "x": 157, "y": 32, "flags": 4}, - {"matrix": [2, 10], "x": 174, "y": 32, "flags": 4}, - {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4}, - {"matrix": [2, 12], "x": 216, "y": 32, "flags": 4}, - {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1}, - {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4}, - {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4}, - {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4}, - {"matrix": [3, 5], "x": 85, "y": 48, "flags": 4}, - {"matrix": [3, 6], "x": 101, "y": 48, "flags": 4}, - {"matrix": [3, 7], "x": 117, "y": 48, "flags": 4}, - {"matrix": [3, 8], "x": 133, "y": 48, "flags": 4}, - {"matrix": [3, 9], "x": 149, "y": 48, "flags": 4}, - {"matrix": [3, 10], "x": 165, "y": 48, "flags": 4}, - {"matrix": [3, 11], "x": 182, "y": 48, "flags": 4}, - {"matrix": [3, 12], "x": 212, "y": 48, "flags": 1}, - {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1}, - {"matrix": [4, 2], "x": 22, "y": 64, "flags": 1}, - {"matrix": [4, 3], "x": 42, "y": 64, "flags": 1}, - {"matrix": [4, 6], "x": 103, "y": 64, "flags": 4}, - {"matrix": [4, 9], "x": 163, "y": 64, "flags": 1}, - {"matrix": [4, 10], "x": 184, "y": 64, "flags": 1}, - {"matrix": [4, 11], "x": 204, "y": 64, "flags": 1}, - {"matrix": [4, 12], "x": 224, "y": 64, "flags": 1} - ], - "led_flush_limit": 40 - }, - "community_layouts": ["60_ansi", "60_iso"] + } } diff --git a/keyboards/annepro2/c18/rules.mk b/keyboards/annepro2/c18/rules.mk index 484099b3aea..b310454c5d0 100644 --- a/keyboards/annepro2/c18/rules.mk +++ b/keyboards/annepro2/c18/rules.mk @@ -13,19 +13,6 @@ BOARD = ANNEPRO2_C18 BOOTLOADER = custom PROGRAM_CMD = annepro2_tools --boot $(BUILD_DIR)/$(TARGET).bin -# 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 - -# Custom RGB matrix handling -RGB_MATRIX_ENABLE = yes - # Anne Pro 2 SRC = \ annepro2_ble.c \ diff --git a/keyboards/annepro2/info.json b/keyboards/annepro2/info.json index f90edcfa835..8c7041005fb 100644 --- a/keyboards/annepro2/info.json +++ b/keyboards/annepro2/info.json @@ -9,6 +9,132 @@ "build": { "lto": true }, + "eeprom": { + "driver": "wear_leveling", + "wear_leveling": { + "driver": "spi_flash", + "backing_size": 2048 + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, + "rgb_matrix": { + "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, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": 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 + }, + "driver": "custom", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 81, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 97, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 113, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 129, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 145, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 161, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 178, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 194, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 218, "y": 0, "flags": 4}, + {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4}, + {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 57, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 73, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 89, "y": 16, "flags": 4}, + {"matrix": [1, 6], "x": 105, "y": 16, "flags": 4}, + {"matrix": [1, 7], "x": 121, "y": 16, "flags": 4}, + {"matrix": [1, 8], "x": 137, "y": 16, "flags": 4}, + {"matrix": [1, 9], "x": 153, "y": 16, "flags": 4}, + {"matrix": [1, 10], "x": 170, "y": 16, "flags": 4}, + {"matrix": [1, 11], "x": 186, "y": 16, "flags": 4}, + {"matrix": [1, 12], "x": 202, "y": 16, "flags": 4}, + {"matrix": [1, 13], "x": 222, "y": 16, "flags": 4}, + {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4}, + {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4}, + {"matrix": [2, 4], "x": 77, "y": 32, "flags": 4}, + {"matrix": [2, 5], "x": 93, "y": 32, "flags": 4}, + {"matrix": [2, 6], "x": 109, "y": 32, "flags": 4}, + {"matrix": [2, 7], "x": 125, "y": 32, "flags": 4}, + {"matrix": [2, 8], "x": 141, "y": 32, "flags": 4}, + {"matrix": [2, 9], "x": 157, "y": 32, "flags": 4}, + {"matrix": [2, 10], "x": 174, "y": 32, "flags": 4}, + {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4}, + {"matrix": [2, 12], "x": 216, "y": 32, "flags": 4}, + {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1}, + {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4}, + {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 85, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 101, "y": 48, "flags": 4}, + {"matrix": [3, 7], "x": 117, "y": 48, "flags": 4}, + {"matrix": [3, 8], "x": 133, "y": 48, "flags": 4}, + {"matrix": [3, 9], "x": 149, "y": 48, "flags": 4}, + {"matrix": [3, 10], "x": 165, "y": 48, "flags": 4}, + {"matrix": [3, 11], "x": 182, "y": 48, "flags": 4}, + {"matrix": [3, 12], "x": 212, "y": 48, "flags": 1}, + {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1}, + {"matrix": [4, 2], "x": 22, "y": 64, "flags": 1}, + {"matrix": [4, 3], "x": 42, "y": 64, "flags": 1}, + {"matrix": [4, 6], "x": 103, "y": 64, "flags": 4}, + {"matrix": [4, 9], "x": 163, "y": 64, "flags": 1}, + {"matrix": [4, 10], "x": 184, "y": 64, "flags": 1}, + {"matrix": [4, 11], "x": 204, "y": 64, "flags": 1}, + {"matrix": [4, 12], "x": 224, "y": 64, "flags": 1} + ], + "led_flush_limit": 40 + }, + "community_layouts": ["60_ansi", "60_iso"], "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/annepro2/keymaps/default-full-caps/keymap.c b/keyboards/annepro2/keymaps/default-full-caps/keymap.c index cb6147d40a9..7d517a179a7 100644 --- a/keyboards/annepro2/keymaps/default-full-caps/keymap.c +++ b/keyboards/annepro2/keymaps/default-full-caps/keymap.c @@ -97,10 +97,10 @@ enum anne_pro_layers { */ [FN2] = LAYOUT_60_ansi( /* FN2 */ _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_RGB_MOD, KC_AP_RGB_TOG, KC_AP_RGB_VAD, KC_AP_RGB_VAI, _______, - MO(FN2), _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_DEL, _______, - _______, _______, _______, _______, _______, MO(FN1), MO(FN2), _______ + _______, _______, _______, _______, _______, _______, _______, _______ ), }; // clang-format on diff --git a/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c b/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c index ca042dcd32c..298f44398bb 100644 --- a/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c +++ b/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c @@ -97,10 +97,10 @@ enum anne_pro_layers { */ [FN2] = LAYOUT_60_ansi( /* FN2 */ _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_RGB_MOD, KC_AP_RGB_TOG, KC_AP_RGB_VAD, KC_AP_RGB_VAI, _______, - MO(FN2), _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_DEL, _______, - _______, _______, _______, _______, _______, MO(FN1), MO(FN2), _______ + _______, _______, _______, _______, _______, _______, _______, _______ ), }; // clang-format on diff --git a/keyboards/annepro2/keymaps/default/keymap.c b/keyboards/annepro2/keymaps/default/keymap.c index 8af2d9a32c2..38be6ec54a6 100644 --- a/keyboards/annepro2/keymaps/default/keymap.c +++ b/keyboards/annepro2/keymaps/default/keymap.c @@ -97,10 +97,10 @@ enum anne_pro_layers { */ [FN2] = LAYOUT_60_ansi( /* FN2 */ _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_RGB_MOD, KC_AP_RGB_TOG, KC_AP_RGB_VAD, KC_AP_RGB_VAI, _______, - MO(FN2), _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_DEL, _______, - _______, _______, _______, _______, _______, MO(FN1), MO(FN2), _______ + _______, _______, _______, _______, _______, _______, _______, _______ ), }; // clang-format on diff --git a/keyboards/annepro2/keymaps/iso_default/keymap.c b/keyboards/annepro2/keymaps/iso_default/keymap.c index 4c1b259504e..a4953906034 100644 --- a/keyboards/annepro2/keymaps/iso_default/keymap.c +++ b/keyboards/annepro2/keymaps/iso_default/keymap.c @@ -76,9 +76,9 @@ enum anne_pro_layers { [FN1] = LAYOUT_60_iso( /* FN1 */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END, - MO(FN1), KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, KC_INS, KC_DEL, _______, - _______, _______, _______, _______, KC_APP, MO(FN1), MO(FN2), _______ + _______, _______, _______, _______, KC_APP, _______, MO(FN2), _______ ), /* * Layer FN2 @@ -98,9 +98,9 @@ enum anne_pro_layers { [FN2] = LAYOUT_60_iso( /* FN2 */ _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_RGB_MOD, KC_AP_RGB_TOG, KC_AP_RGB_VAD, KC_AP_RGB_VAI, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END, - MO(FN1), KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_DEL, _______, - _______, _______, _______, _______, KC_APP, MO(FN1), MO(FN2), _______ + _______, _______, _______, _______, KC_APP, _______, _______, _______ ), }; // clang-format on From acfbfe0daeb7af478b20b7ad2484623890676e40 Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Fri, 8 Mar 2024 14:44:26 -0600 Subject: [PATCH 012/333] Change default RGB effect for momokai keypads to solid white (#23217) --- keyboards/momokai/aurora/info.json | 6 ++++++ keyboards/momokai/tap_duo/info.json | 6 ++++++ keyboards/momokai/tap_trio/info.json | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/keyboards/momokai/aurora/info.json b/keyboards/momokai/aurora/info.json index 888398aa363..84ecbdeb4a1 100644 --- a/keyboards/momokai/aurora/info.json +++ b/keyboards/momokai/aurora/info.json @@ -43,6 +43,12 @@ "pin": "C7" }, "rgb_matrix": { + "default": { + "animation": "solid_color", + "hue": 0, + "sat": 0, + "val": 200 + }, "animations": { "gradient_up_down": true, "gradient_left_right": true, diff --git a/keyboards/momokai/tap_duo/info.json b/keyboards/momokai/tap_duo/info.json index 9a0a9a2e1d1..cbf5ce94d7d 100644 --- a/keyboards/momokai/tap_duo/info.json +++ b/keyboards/momokai/tap_duo/info.json @@ -12,6 +12,12 @@ "pin": "F0" }, "rgb_matrix": { + "default": { + "animation": "solid_color", + "hue": 0, + "sat": 0, + "val": 200 + }, "animations": { "gradient_left_right": true, "breathing": true, diff --git a/keyboards/momokai/tap_trio/info.json b/keyboards/momokai/tap_trio/info.json index f995501969c..c2ff9a5ff78 100644 --- a/keyboards/momokai/tap_trio/info.json +++ b/keyboards/momokai/tap_trio/info.json @@ -12,6 +12,12 @@ "pin": "F0" }, "rgb_matrix": { + "default": { + "animation": "solid_color", + "hue": 0, + "sat": 0, + "val": 200 + }, "animations": { "gradient_up_down": true, "gradient_left_right": true, From 58c38175e64452e309d9e74230e629b16fe661ba Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 9 Mar 2024 03:05:07 +0000 Subject: [PATCH 013/333] Remove redundant disabling of features (#22926) --- .../1upkeyboards/pi40/grid_v1_1/info.json | 5 +---- keyboards/1upkeyboards/pi40/mit_v1_0/info.json | 5 +---- keyboards/1upkeyboards/pi40/mit_v1_1/info.json | 5 +---- keyboards/1upkeyboards/pi50/info.json | 3 --- keyboards/1upkeyboards/pi60/info.json | 5 +---- keyboards/1upkeyboards/pi60_hse/info.json | 5 +---- keyboards/1upkeyboards/pi60_rgb/info.json | 5 +---- .../1upkeyboards/sweet16v2/kb2040/info.json | 5 +---- .../1upkeyboards/sweet16v2/pro_micro/info.json | 5 +---- keyboards/4pplet/steezy60/rev_a/info.json | 2 -- keyboards/4pplet/steezy60/rev_b/info.json | 2 -- .../4pplet/unextended_std/rev_a/info.json | 4 +--- keyboards/acheron/themis/87h/info.json | 3 --- keyboards/acheron/themis/87htsc/info.json | 3 --- keyboards/acheron/themis/88htsc/info.json | 3 --- keyboards/an_achronism/tetromino/info.json | 1 - keyboards/argo_works/ishi/80/mk0_avr/info.json | 3 +-- keyboards/ask55/info.json | 7 +------ keyboards/chickenman/ciel65/info.json | 5 +---- keyboards/clueboard/17/info.json | 4 +--- keyboards/clueboard/2x1800/2018/info.json | 4 +--- keyboards/clueboard/2x1800/2019/info.json | 5 +---- keyboards/clueboard/60/info.json | 1 - keyboards/clueboard/66/rev1/info.json | 8 +------- keyboards/clueboard/66/rev2/info.json | 7 +------ keyboards/clueboard/66/rev3/info.json | 6 +----- keyboards/clueboard/66/rev4/info.json | 7 +------ .../clueboard/66_hotswap/prototype/info.json | 5 +---- keyboards/clueboard/card/info.json | 5 +---- keyboards/dark/magnum_ergo_1/info.json | 5 +---- keyboards/doio/kb38/info.json | 3 +-- keyboards/fancytech/fancyalice66/info.json | 1 - keyboards/frobiac/blackbowl/info.json | 6 +----- keyboards/frobiac/blackflat/info.json | 6 +----- keyboards/frobiac/hypernano/info.json | 6 +----- keyboards/frobiac/redtilt/info.json | 6 +----- keyboards/giabalanai/info.json | 4 +--- keyboards/handwired/10k/info.json | 5 +---- keyboards/handwired/3dortho14u/rev1/info.json | 18 ++++++------------ keyboards/handwired/3dortho14u/rev2/info.json | 18 ++++++------------ keyboards/handwired/baredev/rev1/info.json | 9 +-------- keyboards/handwired/dactyl_kinesis/info.json | 5 +---- .../handwired/dactyl_lightcycle/info.json | 3 --- .../handwired/dactyl_manuform/5x6_68/info.json | 5 +---- .../handwired/dactyl_manuform/6x7/info.json | 5 +---- keyboards/handwired/onekey/info.json | 5 +---- keyboards/handwired/polly40/info.json | 6 +----- .../handwired/scottokeebs/scotto61/info.json | 3 +-- keyboards/handwired/wakizashi40/info.json | 8 +------- keyboards/idobao/id42/info.json | 4 +--- keyboards/idobao/id61/info.json | 4 +--- keyboards/idobao/id63/info.json | 4 +--- keyboards/idobao/id67/info.json | 4 +--- keyboards/idobao/id80/v3/ansi/info.json | 4 +--- keyboards/idobao/id87/v2/info.json | 4 +--- keyboards/idobao/montex/v2/info.json | 4 +--- keyboards/idyllic/tinny50_rgb/info.json | 3 --- keyboards/jels/boaty/info.json | 3 +-- keyboards/kbdfans/odinmini/info.json | 2 -- keyboards/kbdfans/tiger80/info.json | 2 -- keyboards/keebio/convolution/info.json | 4 +--- keyboards/keebio/convolution/rev1/info.json | 2 -- keyboards/keebio/sinc/info.json | 4 +--- keyboards/keebio/sinc/rev3/info.json | 2 -- keyboards/keychron/q4/info.json | 5 +---- keyboards/keyspensory/kp60/info.json | 4 +--- keyboards/kinesis/alvicstep/info.json | 4 +--- keyboards/kinesis/kint2pp/info.json | 4 +--- keyboards/kinesis/kint36/info.json | 4 +--- keyboards/kinesis/kint41/info.json | 4 +--- keyboards/kinesis/kintlc/info.json | 4 +--- keyboards/kinesis/kintwin/info.json | 4 +--- keyboards/kinesis/nguyenvietyen/info.json | 4 +--- keyboards/kinesis/stapelberg/info.json | 4 +--- keyboards/kprepublic/bm16a/v1/info.json | 3 +-- keyboards/kprepublic/bm40hsrgb/rev2/info.json | 4 +--- keyboards/kuro/kuro65/info.json | 4 ---- keyboards/laneware/raindrop/info.json | 6 +----- keyboards/linworks/fave84h/info.json | 3 +-- keyboards/maxr1998/phoebe/info.json | 1 - keyboards/mechlovin/mechlovin9/rev3/info.json | 3 --- keyboards/mechlovin/zed65/910/info.json | 1 - keyboards/miiiw/blackio83/info.json | 4 +--- keyboards/mk65/info.json | 5 +---- keyboards/mlego/m65/rev1/info.json | 2 -- keyboards/mlego/m65/rev2/info.json | 2 -- keyboards/mlego/m65/rev3/info.json | 2 -- keyboards/mlego/m65/rev4/info.json | 2 -- keyboards/montsinger/palmetto/info.json | 3 +-- keyboards/navi60/info.json | 6 +----- keyboards/novelkeys/nk_plus/info.json | 4 +--- .../sawnsprojects/eclipse/eclipse60/info.json | 5 +---- .../sawnsprojects/eclipse/tinyneko/info.json | 5 +---- keyboards/sharkoon/skiller_sgk50_s3/info.json | 3 +-- keyboards/smithrune/magnus/m75h/info.json | 3 --- keyboards/smithrune/magnus/m75s/info.json | 4 +--- keyboards/splitography/info.json | 4 +--- keyboards/stront/info.json | 1 - keyboards/synthlabs/060/info.json | 1 - keyboards/tzarc/djinn/info.json | 1 - keyboards/wolf/m60_b/info.json | 3 +-- keyboards/ymdk/melody96/hotswap/info.json | 1 - keyboards/yoichiro/lunakey_pico/info.json | 3 +-- 103 files changed, 85 insertions(+), 350 deletions(-) diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json index c7028f4a4e3..3512838186a 100644 --- a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json +++ b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json @@ -18,16 +18,13 @@ "driver": "vendor" }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": true, "nkro": false, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "matrix_pins": { "rows": ["GP21", "GP20", "GP19", "GP18"], diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json index 6b89f2c2ab4..230ce3d8574 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json @@ -18,16 +18,13 @@ "driver": "vendor" }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": true, "nkro": false, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "matrix_pins": { "rows": ["GP21", "GP20", "GP19", "GP18"], diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json index f19ef235d51..47625ecc4dd 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json +++ b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json @@ -18,16 +18,13 @@ "driver": "vendor" }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": true, "nkro": false, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "matrix_pins": { "rows": ["GP21", "GP20", "GP19", "GP18"], diff --git a/keyboards/1upkeyboards/pi50/info.json b/keyboards/1upkeyboards/pi50/info.json index 2a4fdef3844..2ee1aed4ccf 100644 --- a/keyboards/1upkeyboards/pi50/info.json +++ b/keyboards/1upkeyboards/pi50/info.json @@ -15,8 +15,6 @@ "layer_count": 10 }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, @@ -24,7 +22,6 @@ "mousekey": true, "nkro": false, "rgb_matrix": true, - "rgblight": false, "oled": true }, "matrix_pins": { diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json index 06abb1a4a64..71619db3605 100644 --- a/keyboards/1upkeyboards/pi60/info.json +++ b/keyboards/1upkeyboards/pi60/info.json @@ -15,8 +15,6 @@ "layer_count": 10 }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, @@ -24,8 +22,7 @@ "extrakey": true, "mousekey": true, "nkro": false, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "ws2812": { "pin": "GP17", diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json index 6b1fcdda411..204e42f48c7 100644 --- a/keyboards/1upkeyboards/pi60_hse/info.json +++ b/keyboards/1upkeyboards/pi60_hse/info.json @@ -15,16 +15,13 @@ "layer_count": 10 }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": true, "nkro": false, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "ws2812": { "pin": "GP15", diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json index 044e0e3b4b7..b6580e616a4 100644 --- a/keyboards/1upkeyboards/pi60_rgb/info.json +++ b/keyboards/1upkeyboards/pi60_rgb/info.json @@ -15,16 +15,13 @@ "layer_count": 10 }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": true, "nkro": false, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "ws2812": { "pin": "GP19", diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json index 40f96fb736b..0d09632a995 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json @@ -12,8 +12,6 @@ "vid": "0x6F75" }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, @@ -21,8 +19,7 @@ "extrakey": true, "mousekey": true, "nkro": false, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "ws2812": { "pin": "GP6", diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json index 31805fc9678..d23bc6633d2 100644 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json @@ -11,8 +11,6 @@ "vid": "0x6F75" }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, @@ -20,8 +18,7 @@ "extrakey": true, "mousekey": true, "nkro": false, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "ws2812": { "pin": "D7" diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json index 0e00abd2155..d64779bec3f 100644 --- a/keyboards/4pplet/steezy60/rev_a/info.json +++ b/keyboards/4pplet/steezy60/rev_a/info.json @@ -30,8 +30,6 @@ "rows": ["C2", "D0", "B0", "C7", "C5"] }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, diff --git a/keyboards/4pplet/steezy60/rev_b/info.json b/keyboards/4pplet/steezy60/rev_b/info.json index 77302d5a1ab..e087ff8d1bb 100644 --- a/keyboards/4pplet/steezy60/rev_b/info.json +++ b/keyboards/4pplet/steezy60/rev_b/info.json @@ -26,8 +26,6 @@ "rows": ["B8", "A15", "C13", "A2", "A6"] }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, diff --git a/keyboards/4pplet/unextended_std/rev_a/info.json b/keyboards/4pplet/unextended_std/rev_a/info.json index 4362ab761da..5aba94b50ab 100644 --- a/keyboards/4pplet/unextended_std/rev_a/info.json +++ b/keyboards/4pplet/unextended_std/rev_a/info.json @@ -22,9 +22,7 @@ "console": false, "command": false, "nkro": true, - "backlight": false, - "rgblight": true, - "audio": false + "rgblight": true }, "ws2812": { "pin": "A8" diff --git a/keyboards/acheron/themis/87h/info.json b/keyboards/acheron/themis/87h/info.json index a7bfb899978..ce2037bfade 100644 --- a/keyboards/acheron/themis/87h/info.json +++ b/keyboards/acheron/themis/87h/info.json @@ -16,10 +16,7 @@ "mousekey": true, "extrakey": true, "console": false, - "backlight": false, "rgblight": true, - "audio": false, - "encoder": false, "nkro": true }, "diode_direction": "COL2ROW", diff --git a/keyboards/acheron/themis/87htsc/info.json b/keyboards/acheron/themis/87htsc/info.json index 5f388147892..eaf8a323abb 100644 --- a/keyboards/acheron/themis/87htsc/info.json +++ b/keyboards/acheron/themis/87htsc/info.json @@ -16,10 +16,7 @@ "mousekey": true, "extrakey": true, "console": false, - "backlight": false, "rgblight": true, - "audio": false, - "encoder": false, "nkro": true }, "diode_direction": "COL2ROW", diff --git a/keyboards/acheron/themis/88htsc/info.json b/keyboards/acheron/themis/88htsc/info.json index 20b3d38828a..f8e65afbade 100644 --- a/keyboards/acheron/themis/88htsc/info.json +++ b/keyboards/acheron/themis/88htsc/info.json @@ -16,10 +16,7 @@ "mousekey": true, "extrakey": true, "console": false, - "backlight": false, "rgblight": true, - "audio": false, - "encoder": false, "nkro": true }, "diode_direction": "COL2ROW", diff --git a/keyboards/an_achronism/tetromino/info.json b/keyboards/an_achronism/tetromino/info.json index 8087c6489c4..98cb9faf3e6 100644 --- a/keyboards/an_achronism/tetromino/info.json +++ b/keyboards/an_achronism/tetromino/info.json @@ -17,7 +17,6 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgblight": false, "rgb_matrix": true }, "ws2812": { diff --git a/keyboards/argo_works/ishi/80/mk0_avr/info.json b/keyboards/argo_works/ishi/80/mk0_avr/info.json index 6bee024fed1..47414ee0c4e 100644 --- a/keyboards/argo_works/ishi/80/mk0_avr/info.json +++ b/keyboards/argo_works/ishi/80/mk0_avr/info.json @@ -19,8 +19,7 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true, - "encoder": false + "nkro": true }, "matrix_pins": { "cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"], diff --git a/keyboards/ask55/info.json b/keyboards/ask55/info.json index 61013e7f23d..d47d79612d3 100644 --- a/keyboards/ask55/info.json +++ b/keyboards/ask55/info.json @@ -5,18 +5,13 @@ "development_board": "promicro", "diode_direction": "COL2ROW", "features": { - "audio": false, - "backlight": false, - "bluetooth": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": true, "nkro": true, - "rgblight": true, - "sleep_led": false, - "unicode": false + "rgblight": true }, "matrix_pins": { "cols": ["E6", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], diff --git a/keyboards/chickenman/ciel65/info.json b/keyboards/chickenman/ciel65/info.json index 76578121795..8c316759a8c 100644 --- a/keyboards/chickenman/ciel65/info.json +++ b/keyboards/chickenman/ciel65/info.json @@ -22,10 +22,7 @@ "console": false, "command": false, "nkro": true, - "backlight": false, - "rgblight": true, - "audio": false, - "key_lock": false + "rgblight": true }, "rgblight": { "led_count": 14, diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json index ef03bd11b16..d6aec9cfcc8 100644 --- a/keyboards/clueboard/17/info.json +++ b/keyboards/clueboard/17/info.json @@ -11,11 +11,9 @@ "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, "nkro": true, - "rgblight": true, - "unicode": false + "rgblight": true }, "matrix_pins": { "cols": ["F4", "E6", "B1", "D2"], diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/info.json index 49e0ae17a84..fe0b5210343 100644 --- a/keyboards/clueboard/2x1800/2018/info.json +++ b/keyboards/clueboard/2x1800/2018/info.json @@ -11,11 +11,9 @@ "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, "nkro": true, - "rgblight": true, - "unicode": false + "rgblight": true }, "indicators": { "num_lock": "B4", diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/info.json index fc613d61002..6f33a11ca75 100644 --- a/keyboards/clueboard/2x1800/2019/info.json +++ b/keyboards/clueboard/2x1800/2019/info.json @@ -12,11 +12,8 @@ "console": true, "encoder": true, "extrakey": true, - "midi": false, "mousekey": true, - "nkro": true, - "rgblight": false, - "unicode": false + "nkro": true }, "matrix_pins": { "cols": ["D2", "D3", "D4", "D5", "D7", "E0", "E1", "B0", "E6", "B3", "B2"], diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/info.json index 322f8426802..d0b4d34999e 100644 --- a/keyboards/clueboard/60/info.json +++ b/keyboards/clueboard/60/info.json @@ -9,7 +9,6 @@ "diode_direction": "COL2ROW", "features": { "audio": true, - "backlight": false, "bootmagic": false, "command": false, "console": true, diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/info.json index fc186d9894c..ca1e3a6553b 100644 --- a/keyboards/clueboard/66/rev1/info.json +++ b/keyboards/clueboard/66/rev1/info.json @@ -6,18 +6,12 @@ "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "features": { - "audio": false, - "backlight": false, - "bluetooth": false, "bootmagic": false, "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, - "nkro": true, - "rgblight": false, - "unicode": false + "nkro": true }, "indicators": { "caps_lock": "F0" diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/info.json index e4a8c5a03b2..fea4f8d39bc 100644 --- a/keyboards/clueboard/66/rev2/info.json +++ b/keyboards/clueboard/66/rev2/info.json @@ -6,18 +6,13 @@ "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "features": { - "audio": false, - "backlight": true, - "bluetooth": false, "bootmagic": false, "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, "nkro": true, - "rgblight": true, - "unicode": false + "rgblight": true }, "indicators": { "caps_lock": "B4" diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/info.json index f0881e5be65..0aa3e7096fc 100644 --- a/keyboards/clueboard/66/rev3/info.json +++ b/keyboards/clueboard/66/rev3/info.json @@ -6,18 +6,14 @@ "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "features": { - "audio": false, "backlight": true, - "bluetooth": false, "bootmagic": false, "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, "nkro": true, - "rgblight": true, - "unicode": false + "rgblight": true }, "indicators": { "caps_lock": "B4" diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/info.json index e90ec9788e6..dbc1b94915d 100644 --- a/keyboards/clueboard/66/rev4/info.json +++ b/keyboards/clueboard/66/rev4/info.json @@ -8,17 +8,12 @@ "diode_direction": "COL2ROW", "features": { "audio": true, - "backlight": false, - "bluetooth": false, "bootmagic": false, "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, - "nkro": true, - "rgblight": false, - "unicode": false + "nkro": true }, "matrix_pins": { "cols": ["B10", "B2", "B1", "B0", "A7", "B4", "B3", "B5"], diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json index 779540a8c4a..2ef1fbec1eb 100644 --- a/keyboards/clueboard/66_hotswap/prototype/info.json +++ b/keyboards/clueboard/66_hotswap/prototype/info.json @@ -8,16 +8,13 @@ "features": { "audio": true, "backlight": true, - "bluetooth": false, "bootmagic": false, "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": false, "nkro": true, - "rgblight": true, - "unicode": false + "rgblight": true }, "indicators": { "caps_lock": "B4" diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json index 7799110ba6d..106b6f823da 100644 --- a/keyboards/clueboard/card/info.json +++ b/keyboards/clueboard/card/info.json @@ -9,16 +9,13 @@ "features": { "audio": true, "backlight": true, - "bluetooth": false, "bootmagic": false, "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, "nkro": false, - "rgblight": true, - "unicode": false + "rgblight": true }, "build": { "lto": true diff --git a/keyboards/dark/magnum_ergo_1/info.json b/keyboards/dark/magnum_ergo_1/info.json index cdabceec7f9..1aecfe86305 100644 --- a/keyboards/dark/magnum_ergo_1/info.json +++ b/keyboards/dark/magnum_ergo_1/info.json @@ -17,16 +17,13 @@ } }, "features": { - "audio": false, "backlight": true, "bootmagic": true, "command": false, "console": false, - "encoder": false, "extrakey": true, "mousekey": false, - "nkro": true, - "rgblight": false + "nkro": true }, "diode_direction": "COL2ROW", "backlight": { diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json index 9a67e3ed5c9..a89c5951e39 100644 --- a/keyboards/doio/kb38/info.json +++ b/keyboards/doio/kb38/info.json @@ -12,8 +12,7 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "matrix_pins": { "cols": ["F5", "F4", "F1", "F0", "B7", "B6", "B5", "B4"], diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index b2e219c1c90..869ebe74651 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -14,7 +14,6 @@ }, "features": { "bootmagic": true, - "encoder": false, "extrakey": true, "mousekey": true, "nkro": true, diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/info.json index 3d5d8483dd9..2e99c5806b2 100644 --- a/keyboards/frobiac/blackbowl/info.json +++ b/keyboards/frobiac/blackbowl/info.json @@ -7,17 +7,13 @@ "processor": "atmega32u4", "diode_direction": "ROW2COL", "features": { - "audio": false, - "backlight": false, "bootmagic": false, "command": false, "console": false, "dynamic_macro": true, "extrakey": true, "mousekey": true, - "nkro": false, - "unicode": false, - "rgblight": false + "nkro": false }, "build": { "lto": true diff --git a/keyboards/frobiac/blackflat/info.json b/keyboards/frobiac/blackflat/info.json index 2227f698df8..086d90d8f8b 100644 --- a/keyboards/frobiac/blackflat/info.json +++ b/keyboards/frobiac/blackflat/info.json @@ -7,17 +7,13 @@ "processor": "atmega32u4", "diode_direction": "COL2ROW", "features": { - "audio": false, - "backlight": false, "bootmagic": false, "command": false, "console": false, "dynamic_macro": true, "extrakey": true, "mousekey": true, - "nkro": false, - "unicode": false, - "rgblight": false + "nkro": false }, "build": { "lto": true diff --git a/keyboards/frobiac/hypernano/info.json b/keyboards/frobiac/hypernano/info.json index b06b2815657..403beed952f 100644 --- a/keyboards/frobiac/hypernano/info.json +++ b/keyboards/frobiac/hypernano/info.json @@ -7,17 +7,13 @@ "processor": "atmega32u4", "diode_direction": "COL2ROW", "features": { - "audio": false, - "backlight": false, "bootmagic": false, "command": false, "console": false, "dynamic_macro": true, "extrakey": true, "mousekey": true, - "nkro": false, - "unicode": false, - "rgblight": false + "nkro": false }, "build": { "lto": true diff --git a/keyboards/frobiac/redtilt/info.json b/keyboards/frobiac/redtilt/info.json index 633ca1d32d9..f3cbd96e1c3 100644 --- a/keyboards/frobiac/redtilt/info.json +++ b/keyboards/frobiac/redtilt/info.json @@ -7,17 +7,13 @@ "processor": "atmega32u4", "diode_direction": "COL2ROW", "features": { - "audio": false, - "backlight": false, "bootmagic": false, "command": false, "console": false, "dynamic_macro": true, "extrakey": true, "mousekey": true, - "nkro": false, - "unicode": false, - "rgblight": false + "nkro": false }, "build": { "lto": true diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json index b10cbe943ec..953e0bebc37 100644 --- a/keyboards/giabalanai/info.json +++ b/keyboards/giabalanai/info.json @@ -36,9 +36,7 @@ "bootmagic": false, "console": false, "mousekey": false, - "nkro": false, - "rgblight": false, - "audio": false + "nkro": false }, "encoder": { "rotary": [] diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json index af75560e843..9c215a5e860 100644 --- a/keyboards/handwired/10k/info.json +++ b/keyboards/handwired/10k/info.json @@ -8,15 +8,12 @@ "rows": ["B6"] }, "features": { - "audio": false, - "backlight": false, "bootmagic": false, "command": false, "console": false, "extrakey": false, "mousekey": false, - "nkro": false, - "rgblight": false + "nkro": false }, "usb": { "vid": "0x6869", diff --git a/keyboards/handwired/3dortho14u/rev1/info.json b/keyboards/handwired/3dortho14u/rev1/info.json index 9179bd3a1bb..63773d405f2 100644 --- a/keyboards/handwired/3dortho14u/rev1/info.json +++ b/keyboards/handwired/3dortho14u/rev1/info.json @@ -7,18 +7,12 @@ "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "features": { - "audio": false, - "backlight": false, - "bluetooth": false, - "bootmagic": true, - "command": false, - "console": true, - "extrakey": true, - "midi": false, - "mousekey": true, - "nkro": true, - "rgblight": false, - "unicode": false + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true }, "indicators": { "caps_lock": "F0" diff --git a/keyboards/handwired/3dortho14u/rev2/info.json b/keyboards/handwired/3dortho14u/rev2/info.json index 499d8603cee..9e048d643d2 100644 --- a/keyboards/handwired/3dortho14u/rev2/info.json +++ b/keyboards/handwired/3dortho14u/rev2/info.json @@ -7,18 +7,12 @@ "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "features": { - "audio": false, - "backlight": false, - "bluetooth": false, - "bootmagic": true, - "command": false, - "console": true, - "extrakey": true, - "midi": false, - "mousekey": true, - "nkro": true, - "rgblight": false, - "unicode": false + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true }, "indicators": { "caps_lock": "F4" diff --git a/keyboards/handwired/baredev/rev1/info.json b/keyboards/handwired/baredev/rev1/info.json index ab7747d43aa..470b926bb40 100644 --- a/keyboards/handwired/baredev/rev1/info.json +++ b/keyboards/handwired/baredev/rev1/info.json @@ -23,19 +23,12 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "features": { - "audio": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, - "midi": false, "mousekey": true, - "nkro": true, - "rgblight": false, - "unicode": false, - "bluetooth": false, - "backlight": false, - "sleep_led": false + "nkro": true }, "layout_aliases": { "LAYOUT": "LAYOUT_abnt2" diff --git a/keyboards/handwired/dactyl_kinesis/info.json b/keyboards/handwired/dactyl_kinesis/info.json index 91cb98e0409..ee68a2c515f 100644 --- a/keyboards/handwired/dactyl_kinesis/info.json +++ b/keyboards/handwired/dactyl_kinesis/info.json @@ -14,10 +14,7 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": false, - "audio": false, - "backlight": false, - "rgblight": false + "nkro": false }, "rgblight": { "led_count": 12 diff --git a/keyboards/handwired/dactyl_lightcycle/info.json b/keyboards/handwired/dactyl_lightcycle/info.json index 4d581b974e0..1b5f2dd39a3 100644 --- a/keyboards/handwired/dactyl_lightcycle/info.json +++ b/keyboards/handwired/dactyl_lightcycle/info.json @@ -14,9 +14,6 @@ "console": false, "mousekey": true, "extrakey": true, - "audio": false, - "rgblight": false, - "backlight": false, "nkro": false }, "ws2812": { diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/info.json b/keyboards/handwired/dactyl_manuform/5x6_68/info.json index 78a602cb64f..59d37ec15b0 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_68/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_68/info.json @@ -15,10 +15,7 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true, - "audio": false, - "backlight": false, - "rgblight": false + "nkro": true }, "split": { "enabled": true, diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json index 529d92bd3f9..5ce0affbeea 100644 --- a/keyboards/handwired/dactyl_manuform/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform/6x7/info.json @@ -14,10 +14,7 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": false, - "audio": false, - "backlight": false, - "rgblight": false + "nkro": false }, "ws2812": { "pin": "D3" diff --git a/keyboards/handwired/onekey/info.json b/keyboards/handwired/onekey/info.json index 17bb84a82c1..2d266f5ea3b 100644 --- a/keyboards/handwired/onekey/info.json +++ b/keyboards/handwired/onekey/info.json @@ -17,10 +17,7 @@ "extrakey": true, "console": false, "command": false, - "nkro": false, - "backlight": false, - "rgblight": false, - "audio": false + "nkro": false }, "community_layouts": ["ortho_1x1"], "layouts": { diff --git a/keyboards/handwired/polly40/info.json b/keyboards/handwired/polly40/info.json index 63856fa7394..9ff34b339ef 100644 --- a/keyboards/handwired/polly40/info.json +++ b/keyboards/handwired/polly40/info.json @@ -21,11 +21,7 @@ "extrakey": true, "console": false, "command": false, - "nkro": true, - "backlight": false, - "rgblight": false, - "audio": false, - "key_lock": false + "nkro": true }, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/scottokeebs/scotto61/info.json b/keyboards/handwired/scottokeebs/scotto61/info.json index 8614ec81ebe..cf321a2e976 100644 --- a/keyboards/handwired/scottokeebs/scotto61/info.json +++ b/keyboards/handwired/scottokeebs/scotto61/info.json @@ -10,8 +10,7 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true, - "rgblight": false + "nkro": true }, "matrix_pins": { "cols": ["GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP22", "GP20", "GP19", "GP18", "GP17", "GP16"], diff --git a/keyboards/handwired/wakizashi40/info.json b/keyboards/handwired/wakizashi40/info.json index 3a72e5d3102..495d9a0376a 100644 --- a/keyboards/handwired/wakizashi40/info.json +++ b/keyboards/handwired/wakizashi40/info.json @@ -6,18 +6,12 @@ "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "features": { - "audio": false, - "backlight": false, - "bluetooth": false, "bootmagic": true, "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, - "nkro": true, - "rgblight": false, - "unicode": false + "nkro": true }, "matrix_pins": { "cols": ["F4", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"], diff --git a/keyboards/idobao/id42/info.json b/keyboards/idobao/id42/info.json index b0702aaa94d..ace2033493b 100644 --- a/keyboards/idobao/id42/info.json +++ b/keyboards/idobao/id42/info.json @@ -10,9 +10,7 @@ "extrakey": true, "console": false, "command": false, - "nkro": true, - "backlight": false, - "rgblight": false + "nkro": true }, "ws2812": { "pin": "B3" diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/info.json index 255e88fc056..0b1c51279de 100644 --- a/keyboards/idobao/id61/info.json +++ b/keyboards/idobao/id61/info.json @@ -10,9 +10,7 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true, - "backlight": false, - "rgblight": false + "nkro": true }, "ws2812": { "pin": "F0" diff --git a/keyboards/idobao/id63/info.json b/keyboards/idobao/id63/info.json index 02c4d41bf4b..573fb440303 100644 --- a/keyboards/idobao/id63/info.json +++ b/keyboards/idobao/id63/info.json @@ -10,9 +10,7 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true, - "backlight": false, - "rgblight": false + "nkro": true }, "ws2812": { "pin": "B7" diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json index 5618311141f..7c5308d3156 100644 --- a/keyboards/idobao/id67/info.json +++ b/keyboards/idobao/id67/info.json @@ -10,9 +10,7 @@ "extrakey": true, "command": false, "console": false, - "nkro": true, - "backlight": false, - "rgblight": false + "nkro": true }, "ws2812": { "pin": "F0" diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json index 5cca0260ea0..19dc8c67a70 100644 --- a/keyboards/idobao/id80/v3/ansi/info.json +++ b/keyboards/idobao/id80/v3/ansi/info.json @@ -10,9 +10,7 @@ "extrakey": true, "console": false, "command": false, - "nkro": true, - "backlight": false, - "rgblight": false + "nkro": true }, "rgb_matrix": { "animations": { diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json index cb94ee763e9..4a6099207c2 100644 --- a/keyboards/idobao/id87/v2/info.json +++ b/keyboards/idobao/id87/v2/info.json @@ -10,9 +10,7 @@ "extrakey": true, "console": false, "command": false, - "nkro": true, - "backlight": false, - "rgblight": false + "nkro": true }, "ws2812": { "pin": "E2" diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/info.json index 774cde114f9..aefc3e45611 100755 --- a/keyboards/idobao/montex/v2/info.json +++ b/keyboards/idobao/montex/v2/info.json @@ -10,9 +10,7 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true, - "backlight": false, - "rgblight": false + "nkro": true }, "ws2812": { "pin": "B1" diff --git a/keyboards/idyllic/tinny50_rgb/info.json b/keyboards/idyllic/tinny50_rgb/info.json index 5407bd9c26a..b3eb34a4c0c 100644 --- a/keyboards/idyllic/tinny50_rgb/info.json +++ b/keyboards/idyllic/tinny50_rgb/info.json @@ -16,9 +16,6 @@ "console": false, "command": false, "nkro": true, - "backlight": false, - "rgblight": false, - "audio": false, "rgb_matrix": true }, "diode_direction": "COL2ROW", diff --git a/keyboards/jels/boaty/info.json b/keyboards/jels/boaty/info.json index ca6257f6ef6..6d85c5bd4f7 100644 --- a/keyboards/jels/boaty/info.json +++ b/keyboards/jels/boaty/info.json @@ -16,8 +16,7 @@ "mousekey": false, "extrakey": true, "console": false, - "command": false, - "backlight": false + "command": false }, "matrix_pins": { "cols": ["B1", "C0", "C1", "C2", "D4", "D1", "D0", "C5", "C4", "C3", "D5"], diff --git a/keyboards/kbdfans/odinmini/info.json b/keyboards/kbdfans/odinmini/info.json index 19a854c4ce4..a9cb1a798fc 100644 --- a/keyboards/kbdfans/odinmini/info.json +++ b/keyboards/kbdfans/odinmini/info.json @@ -5,8 +5,6 @@ "bootloader": "rp2040", "diode_direction": "COL2ROW", "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "extrakey": true, diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json index 1a2258deea8..9761cb892d0 100644 --- a/keyboards/kbdfans/tiger80/info.json +++ b/keyboards/kbdfans/tiger80/info.json @@ -4,8 +4,6 @@ "maintainer": "kbdfans", "bootloader": "atmel-dfu", "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, diff --git a/keyboards/keebio/convolution/info.json b/keyboards/keebio/convolution/info.json index 5e05d70ace3..9ea761c1a9f 100644 --- a/keyboards/keebio/convolution/info.json +++ b/keyboards/keebio/convolution/info.json @@ -10,9 +10,7 @@ "console": true, "extrakey": true, "mousekey": false, - "nkro": false, - "unicode": false, - "backlight": false + "nkro": false }, "layout_aliases": {"LAYOUT": "LAYOUT_all"} } diff --git a/keyboards/keebio/convolution/rev1/info.json b/keyboards/keebio/convolution/rev1/info.json index 5ff7c1f8f02..68ac532620b 100644 --- a/keyboards/keebio/convolution/rev1/info.json +++ b/keyboards/keebio/convolution/rev1/info.json @@ -9,8 +9,6 @@ "diode_direction": "COL2ROW", "features": { "console": true, - "rgblight": false, - "backlight": false, "rgb_matrix": true }, "matrix_pins": { diff --git a/keyboards/keebio/sinc/info.json b/keyboards/keebio/sinc/info.json index a55f42649e6..aa1e08f39dd 100644 --- a/keyboards/keebio/sinc/info.json +++ b/keyboards/keebio/sinc/info.json @@ -6,14 +6,12 @@ "vid": "0xCB10" }, "features": { - "audio": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": false, - "nkro": false, - "unicode": false + "nkro": false }, "split": { "enabled": true diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/info.json index e20cd24f192..da828dbb35f 100644 --- a/keyboards/keebio/sinc/rev3/info.json +++ b/keyboards/keebio/sinc/rev3/info.json @@ -9,8 +9,6 @@ "diode_direction": "COL2ROW", "features": { "console": true, - "rgblight": false, - "backlight": false, "rgb_matrix": true }, "split": { diff --git a/keyboards/keychron/q4/info.json b/keyboards/keychron/q4/info.json index e314477ab94..59f6caef923 100644 --- a/keyboards/keychron/q4/info.json +++ b/keyboards/keychron/q4/info.json @@ -16,16 +16,13 @@ } }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], diff --git a/keyboards/keyspensory/kp60/info.json b/keyboards/keyspensory/kp60/info.json index 469faa2cd26..1172e14d455 100644 --- a/keyboards/keyspensory/kp60/info.json +++ b/keyboards/keyspensory/kp60/info.json @@ -22,9 +22,7 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgblight": true, - "backlight": false, - "audio": false + "rgblight": true }, "rgblight": { "led_count": 8, diff --git a/keyboards/kinesis/alvicstep/info.json b/keyboards/kinesis/alvicstep/info.json index 293b0168a40..951f01203ca 100644 --- a/keyboards/kinesis/alvicstep/info.json +++ b/keyboards/kinesis/alvicstep/info.json @@ -12,9 +12,7 @@ "command": false, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "processor": "at90usb1286", "bootloader": "halfkay", diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json index ecf86658a84..48d77942db0 100644 --- a/keyboards/kinesis/kint2pp/info.json +++ b/keyboards/kinesis/kint2pp/info.json @@ -13,9 +13,7 @@ "command": false, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "build": { "debounce_type": "sym_eager_pk" diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json index 969f819f80e..592fade4cb4 100644 --- a/keyboards/kinesis/kint36/info.json +++ b/keyboards/kinesis/kint36/info.json @@ -13,9 +13,7 @@ "command": false, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "build": { "debounce_type": "sym_eager_pk" diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/info.json index eec726cf51e..c1eb7b84652 100644 --- a/keyboards/kinesis/kint41/info.json +++ b/keyboards/kinesis/kint41/info.json @@ -13,9 +13,7 @@ "command": false, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "build": { "debounce_type": "sym_eager_pk" diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json index 13c2f9a55c5..07c81e1c896 100644 --- a/keyboards/kinesis/kintlc/info.json +++ b/keyboards/kinesis/kintlc/info.json @@ -13,9 +13,7 @@ "command": false, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "build": { "debounce_type": "sym_eager_pk" diff --git a/keyboards/kinesis/kintwin/info.json b/keyboards/kinesis/kintwin/info.json index ed67c36af39..92727e9ecb9 100644 --- a/keyboards/kinesis/kintwin/info.json +++ b/keyboards/kinesis/kintwin/info.json @@ -18,9 +18,7 @@ "command": false, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "matrix_pins": { "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6"], diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/info.json index 123b42e9bfc..2a99a4e6003 100644 --- a/keyboards/kinesis/nguyenvietyen/info.json +++ b/keyboards/kinesis/nguyenvietyen/info.json @@ -12,9 +12,7 @@ "command": true, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "indicators": { "caps_lock": "E6", diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/info.json index 44e2a331575..6ad972d2472 100644 --- a/keyboards/kinesis/stapelberg/info.json +++ b/keyboards/kinesis/stapelberg/info.json @@ -12,9 +12,7 @@ "command": false, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"], diff --git a/keyboards/kprepublic/bm16a/v1/info.json b/keyboards/kprepublic/bm16a/v1/info.json index 9e99832b3e6..85173a89ccb 100644 --- a/keyboards/kprepublic/bm16a/v1/info.json +++ b/keyboards/kprepublic/bm16a/v1/info.json @@ -18,8 +18,7 @@ "command": false, "nkro": true, "backlight": true, - "rgblight": true, - "audio": false + "rgblight": true }, "matrix_pins": { "rows": ["D3", "D5", "D1", "D2"], diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/info.json b/keyboards/kprepublic/bm40hsrgb/rev2/info.json index 64b35fc25c2..cfaabd5c9ef 100644 --- a/keyboards/kprepublic/bm40hsrgb/rev2/info.json +++ b/keyboards/kprepublic/bm40hsrgb/rev2/info.json @@ -12,9 +12,7 @@ "tri_layer": true, "console": false, "command": false, - "nkro": false, - "backlight": false, - "audio": false + "nkro": false }, "usb": { "vid": "0x4B50", diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json index fc89b989d3e..72549735d96 100644 --- a/keyboards/kuro/kuro65/info.json +++ b/keyboards/kuro/kuro65/info.json @@ -25,10 +25,6 @@ "console": false, "command": false, "nkro": true, - "backlight": false, - "rgblight": false, - "audio": false, - "key_lock": false, "rgb_matrix": true }, "ws2812": { diff --git a/keyboards/laneware/raindrop/info.json b/keyboards/laneware/raindrop/info.json index bc67d437fa3..d1896a41b45 100644 --- a/keyboards/laneware/raindrop/info.json +++ b/keyboards/laneware/raindrop/info.json @@ -21,11 +21,7 @@ "extrakey": true, "console": false, "command": false, - "nkro": true, - "backlight": false, - "audio": false, - "rgblight": false, - "sleep_led": false + "nkro": true }, "layout_aliases": { "LAYOUT_all": "LAYOUT_64_ansi_split_bs" diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/info.json index 11ef16f2a34..1ca6cb911ab 100644 --- a/keyboards/linworks/fave84h/info.json +++ b/keyboards/linworks/fave84h/info.json @@ -12,8 +12,7 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "ws2812": { "pin": "D2" diff --git a/keyboards/maxr1998/phoebe/info.json b/keyboards/maxr1998/phoebe/info.json index 7bb3832cbef..f6913ece0b9 100644 --- a/keyboards/maxr1998/phoebe/info.json +++ b/keyboards/maxr1998/phoebe/info.json @@ -10,7 +10,6 @@ "features": { "bootmagic": true, "nkro": true, - "backlight": false, "rgblight": true, "key_lock": true, "leader": true diff --git a/keyboards/mechlovin/mechlovin9/rev3/info.json b/keyboards/mechlovin/mechlovin9/rev3/info.json index f5efcc1f6a9..faa4cf0a877 100644 --- a/keyboards/mechlovin/mechlovin9/rev3/info.json +++ b/keyboards/mechlovin/mechlovin9/rev3/info.json @@ -6,9 +6,6 @@ "pid": "0x6509", "device_version": "0.0.3" }, - "features": { - "backlight": false - }, "bootmagic": { "matrix": [0, 13] }, diff --git a/keyboards/mechlovin/zed65/910/info.json b/keyboards/mechlovin/zed65/910/info.json index d1de863c039..3b1472014d7 100644 --- a/keyboards/mechlovin/zed65/910/info.json +++ b/keyboards/mechlovin/zed65/910/info.json @@ -9,7 +9,6 @@ "device_version": "0.0.1" }, "features": { - "backlight": false, "nkro": true, "rgblight": true }, diff --git a/keyboards/miiiw/blackio83/info.json b/keyboards/miiiw/blackio83/info.json index ef0e15efb95..24dc644405f 100644 --- a/keyboards/miiiw/blackio83/info.json +++ b/keyboards/miiiw/blackio83/info.json @@ -6,7 +6,6 @@ "debounce": 3, "diode_direction": "COL2ROW", "features": { - "backlight": false, "bootmagic": true, "command": false, "console": false, @@ -15,8 +14,7 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "indicators": { "caps_lock": "B2", diff --git a/keyboards/mk65/info.json b/keyboards/mk65/info.json index 44a8e15f153..9135deaf199 100644 --- a/keyboards/mk65/info.json +++ b/keyboards/mk65/info.json @@ -30,10 +30,7 @@ "console": false, "command": false, "nkro": true, - "backlight": false, - "rgblight": true, - "audio": false, - "key_lock": false + "rgblight": true }, "rgblight": { "led_count": 7, diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json index d8bb91de300..2f77137eec9 100644 --- a/keyboards/mlego/m65/rev1/info.json +++ b/keyboards/mlego/m65/rev1/info.json @@ -11,8 +11,6 @@ ] }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json index e8575e23e85..00147673091 100644 --- a/keyboards/mlego/m65/rev2/info.json +++ b/keyboards/mlego/m65/rev2/info.json @@ -10,8 +10,6 @@ ] }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": true, "console": false, diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json index d48d52d9d97..4b7980b63bf 100644 --- a/keyboards/mlego/m65/rev3/info.json +++ b/keyboards/mlego/m65/rev3/info.json @@ -11,8 +11,6 @@ ] }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json index 56fed15317f..ab2a708ba88 100644 --- a/keyboards/mlego/m65/rev4/info.json +++ b/keyboards/mlego/m65/rev4/info.json @@ -11,8 +11,6 @@ ] }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": true, diff --git a/keyboards/montsinger/palmetto/info.json b/keyboards/montsinger/palmetto/info.json index efe81dd9c30..9ff29ba893f 100755 --- a/keyboards/montsinger/palmetto/info.json +++ b/keyboards/montsinger/palmetto/info.json @@ -8,8 +8,7 @@ "bootmagic": true, "extrakey": true, "mousekey": true, - "nkro": true, - "rgblight": false + "nkro": true }, "matrix_pins": { "cols": ["GP28", "GP27", "GP29", "GP0", "GP1", "GP9", "GP26", "GP18", "GP10", "GP11", "GP25", "GP24", "GP12", "GP21", "GP13"], diff --git a/keyboards/navi60/info.json b/keyboards/navi60/info.json index dde3b09ff86..42c3e5da1d1 100644 --- a/keyboards/navi60/info.json +++ b/keyboards/navi60/info.json @@ -21,11 +21,7 @@ "extrakey": true, "console": false, "command": false, - "nkro": true, - "backlight": false, - "rgblight": false, - "audio": false, - "key_lock": false + "nkro": true }, "layouts": { "LAYOUT": { diff --git a/keyboards/novelkeys/nk_plus/info.json b/keyboards/novelkeys/nk_plus/info.json index 41beca36824..b823d2808b8 100755 --- a/keyboards/novelkeys/nk_plus/info.json +++ b/keyboards/novelkeys/nk_plus/info.json @@ -14,15 +14,13 @@ "rows": ["B2", "B1", "B0", "B10", "B3"] }, "features": { - "backlight": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "processor": "STM32F072", "bootloader": "stm32-dfu", diff --git a/keyboards/sawnsprojects/eclipse/eclipse60/info.json b/keyboards/sawnsprojects/eclipse/eclipse60/info.json index ad6c9741366..7586ed5a347 100644 --- a/keyboards/sawnsprojects/eclipse/eclipse60/info.json +++ b/keyboards/sawnsprojects/eclipse/eclipse60/info.json @@ -22,10 +22,7 @@ "console": false, "command": false, "nkro": false, - "backlight": false, - "rgblight": true, - "audio": false, - "key_lock": false + "rgblight": true }, "rgblight": { "led_count": 18, diff --git a/keyboards/sawnsprojects/eclipse/tinyneko/info.json b/keyboards/sawnsprojects/eclipse/tinyneko/info.json index 387532d58bf..80ae2558f2d 100644 --- a/keyboards/sawnsprojects/eclipse/tinyneko/info.json +++ b/keyboards/sawnsprojects/eclipse/tinyneko/info.json @@ -22,10 +22,7 @@ "console": false, "command": false, "nkro": false, - "backlight": false, - "rgblight": true, - "audio": false, - "key_lock": false + "rgblight": true }, "rgblight": { "led_count": 18, diff --git a/keyboards/sharkoon/skiller_sgk50_s3/info.json b/keyboards/sharkoon/skiller_sgk50_s3/info.json index 0b228b034b6..6535ec63b77 100644 --- a/keyboards/sharkoon/skiller_sgk50_s3/info.json +++ b/keyboards/sharkoon/skiller_sgk50_s3/info.json @@ -18,8 +18,7 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "matrix_pins": { "cols": ["C0", "C1", "C2", "C3", "A6", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9"], diff --git a/keyboards/smithrune/magnus/m75h/info.json b/keyboards/smithrune/magnus/m75h/info.json index a4f2ce57682..325db7d1da1 100644 --- a/keyboards/smithrune/magnus/m75h/info.json +++ b/keyboards/smithrune/magnus/m75h/info.json @@ -17,12 +17,9 @@ } }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, - "encoder": false, "extrakey": true, "mousekey": true, "nkro": true, diff --git a/keyboards/smithrune/magnus/m75s/info.json b/keyboards/smithrune/magnus/m75s/info.json index 5b834631f78..352b529bb06 100644 --- a/keyboards/smithrune/magnus/m75s/info.json +++ b/keyboards/smithrune/magnus/m75s/info.json @@ -17,12 +17,10 @@ } }, "features": { - "audio": false, "backlight": true, "bootmagic": true, "command": false, "console": false, - "encoder": false, "extrakey": true, "mousekey": true, "nkro": true, @@ -36,7 +34,7 @@ }, "indicators": { "caps_lock": "A10" - } + }, "ws2812": { "pin": "B15" }, diff --git a/keyboards/splitography/info.json b/keyboards/splitography/info.json index 45ee7beed8d..3805f1ca2b0 100644 --- a/keyboards/splitography/info.json +++ b/keyboards/splitography/info.json @@ -11,9 +11,7 @@ "mousekey": false, "extrakey": true, "console": false, - "audio": false, - "command": false, - "backlight": false + "command": false }, "matrix_pins": { "rows": ["D0", "D1", "D2", "D3"], diff --git a/keyboards/stront/info.json b/keyboards/stront/info.json index 88ccb2c6d03..d2726c85f0e 100644 --- a/keyboards/stront/info.json +++ b/keyboards/stront/info.json @@ -85,7 +85,6 @@ "encoder": true, "backlight": true, "extrakey": true, - "rgblight": false, "rgb_matrix": true, "nkro": false }, diff --git a/keyboards/synthlabs/060/info.json b/keyboards/synthlabs/060/info.json index 0c5870b46aa..2fe90c96fda 100644 --- a/keyboards/synthlabs/060/info.json +++ b/keyboards/synthlabs/060/info.json @@ -13,7 +13,6 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgblight": false, "rgb_matrix": true }, "ws2812": { diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json index 64ed1da6904..fddee1c21fd 100644 --- a/keyboards/tzarc/djinn/info.json +++ b/keyboards/tzarc/djinn/info.json @@ -23,7 +23,6 @@ "nkro": true, "quantum_painter": true, "rgb_matrix": true, - "unicode": false, "usbpd": true, "wpm": true }, diff --git a/keyboards/wolf/m60_b/info.json b/keyboards/wolf/m60_b/info.json index 6d39d0bbf87..474974d3835 100644 --- a/keyboards/wolf/m60_b/info.json +++ b/keyboards/wolf/m60_b/info.json @@ -11,8 +11,7 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "ws2812": { "pin": "D1" diff --git a/keyboards/ymdk/melody96/hotswap/info.json b/keyboards/ymdk/melody96/hotswap/info.json index 61112d88ab3..6a00e050502 100644 --- a/keyboards/ymdk/melody96/hotswap/info.json +++ b/keyboards/ymdk/melody96/hotswap/info.json @@ -14,7 +14,6 @@ }, "diode_direction": "ROW2COL", "features": { - "audio": false, "backlight": true, "bootmagic": true, "command": false, diff --git a/keyboards/yoichiro/lunakey_pico/info.json b/keyboards/yoichiro/lunakey_pico/info.json index bf4b2a25109..d80aaf06129 100644 --- a/keyboards/yoichiro/lunakey_pico/info.json +++ b/keyboards/yoichiro/lunakey_pico/info.json @@ -11,8 +11,7 @@ "console": false, "command": false, "nkro": false, - "rgblight": true, - "audio": false + "rgblight": true }, "matrix_pins": { "cols": ["GP21", "GP20", "GP19", "GP18", "GP17", "GP16"], From bb691bed9646c31300eb85f0db4ec1e4978a5c46 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 9 Mar 2024 04:12:44 +0000 Subject: [PATCH 014/333] Fixes for idobao vendor keymaps (#23246) --- keyboards/idobao/id61/keymaps/idobao/keymap.c | 3 ++- keyboards/idobao/id63/keymaps/idobao/keymap.c | 2 +- keyboards/idobao/id87/v2/keymaps/idobao/keymap.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/keyboards/idobao/id61/keymaps/idobao/keymap.c b/keyboards/idobao/id61/keymaps/idobao/keymap.c index bd0b500615e..3bfe1db6f43 100644 --- a/keyboards/idobao/id61/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id61/keymaps/idobao/keymap.c @@ -186,7 +186,7 @@ void eeconfig_init_user(void) { ID61_update_rgb_mode(); } -void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { // Caps Lock key stuff if (host_keyboard_led_state().caps_lock) { @@ -204,6 +204,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { } else if (user_config.rgb_disable_perkey) { rgb_matrix_set_color(ID61_CAPS_LOCK_KEY_INDEX, HSV_OFF); // off } + return false; } #endif // RGB_MATRIX_ENABLE diff --git a/keyboards/idobao/id63/keymaps/idobao/keymap.c b/keyboards/idobao/id63/keymaps/idobao/keymap.c index 9213e4ffcf1..912da634268 100644 --- a/keyboards/idobao/id63/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id63/keymaps/idobao/keymap.c @@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN2] = LAYOUT_60_ansi_arrow( - KC_ESC, KC_BRID, KC_BRIU, KC_MCON, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PWR, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PWR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c index 53871f9161c..4f7dec65b69 100644 --- a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c +++ b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ */ [1] = LAYOUT_tkl_ansi( - QK_BOOT, KC_BRID, KC_BRIU, KC_MCON, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, + QK_BOOT, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI, _______, _______, RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From 1db7ff7f18b7d6922dec6e8746850e0f41cef984 Mon Sep 17 00:00:00 2001 From: Danny Date: Sat, 9 Mar 2024 02:39:08 -0500 Subject: [PATCH 015/333] Update BAMFK-1 (#23236) * Bump version number so VIA doesn't choke due to reconfiguration of keys/encoders * Move rules.mk stuff into info.json, convert RGBLIGHT TO RGB_MATRIX * Run format-json on info.json --- keyboards/keebio/bamfk1/config.h | 22 ------ keyboards/keebio/bamfk1/info.json | 124 ++++++++++++++++++++++-------- keyboards/keebio/bamfk1/rules.mk | 15 +--- 3 files changed, 93 insertions(+), 68 deletions(-) diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h index 6fd93072f52..46fd4d73169 100644 --- a/keyboards/keebio/bamfk1/config.h +++ b/keyboards/keebio/bamfk1/config.h @@ -8,25 +8,3 @@ # define STARTUP_SONG SONG(STARTUP_SOUND) #endif -#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * 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/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json index 4fa563f0e88..09e7edbd185 100644 --- a/keyboards/keebio/bamfk1/info.json +++ b/keyboards/keebio/bamfk1/info.json @@ -1,52 +1,112 @@ { - "keyboard_name": "BAMFK-1", "manufacturer": "Keebio", - "url": "https://keeb.io", + "keyboard_name": "BAMFK-1", "maintainer": "nooges", - "usb": { - "vid": "0xCB10", - "pid": "0x1111", - "device_version": "0.0.1" - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 16, - "sleep": true, - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true - } - }, - "ws2812": { - "pin": "D3" - }, + "bootloader": "atmel-dfu", "encoder": { "rotary": [ {"pin_a": "C7", "pin_b": "B5"}, {"pin_a": "D7", "pin_b": "D4"} ] }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "rgb_matrix": true + }, "matrix_pins": { "direct": [ ["E6", "B6", "D6"] ] }, + "processor": "atmega32u4", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "default": { + "animation": "cycle_pinwheel", + "speed": 48 + }, + "driver": "ws2812", + "layout": [ + {"x": 56, "y": 0, "flags": 4}, + {"x": 168, "y": 0, "flags": 4}, + {"x": 224, "y": 16, "flags": 4}, + {"x": 224, "y": 48, "flags": 4}, + {"matrix": [0, 2], "x": 168, "y": 64, "flags": 4}, + {"matrix": [0, 1], "x": 56, "y": 64, "flags": 4}, + {"x": 0, "y": 48, "flags": 4}, + {"x": 0, "y": 16, "flags": 4}, + {"x": 0, "y": 0, "flags": 2}, + {"x": 112, "y": 0, "flags": 2}, + {"x": 224, "y": 0, "flags": 2}, + {"x": 224, "y": 32, "flags": 2}, + {"x": 224, "y": 64, "flags": 2}, + {"x": 112, "y": 64, "flags": 2}, + {"x": 224, "y": 64, "flags": 2}, + {"matrix": [0, 0], "x": 112, "y": 32, "flags": 2} + ], + "sleep": true + }, + "url": "https://keeb.io", + "usb": { + "device_version": "0.0.1", + "pid": "0x1211", + "vid": "0xCB10" + }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ - {"x": 1, "y": 0, "h": 2, "w": 2, "matrix": [0, 0]}, - {"x": 0, "y": 2.25, "matrix": [0, 1]}, - {"x": 3, "y": 2.25, "matrix": [0, 2]} + {"matrix": [0, 0], "x": 1, "y": 0, "w": 2, "h": 2}, + {"matrix": [0, 1], "x": 0, "y": 2.25}, + {"matrix": [0, 2], "x": 3, "y": 2.25} ] } } diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk index 21df40039e9..6e7633bfe01 100644 --- a/keyboards/keebio/bamfk1/rules.mk +++ b/keyboards/keebio/bamfk1/rules.mk @@ -1,14 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes +# This file intentionally left blank From 461eaed7aac651e4dd1abbb86c99ce20b9ddc6d0 Mon Sep 17 00:00:00 2001 From: jotix <69703151+jotix@users.noreply.github.com> Date: Sat, 9 Mar 2024 11:52:49 -0300 Subject: [PATCH 016/333] [Keyboard] update Jotanck config(#23228) --- keyboards/handwired/jotanck/info.json | 16 +++++++++++++--- keyboards/handwired/jotanck/rules.mk | 13 +------------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/keyboards/handwired/jotanck/info.json b/keyboards/handwired/jotanck/info.json index 0e4966218ab..4c81ac1a61b 100644 --- a/keyboards/handwired/jotanck/info.json +++ b/keyboards/handwired/jotanck/info.json @@ -1,20 +1,30 @@ { "keyboard_name": "Jotanck", "manufacturer": "Jotix", - "url": "", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/jotanck", "maintainer": "jotix", "usb": { "vid": "0x4A4F", "pid": "0x5458", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "tapping": { + "term": 175 + }, + "development_board": "promicro", "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D3", "D2", "D1", "D0", "D4", "C6"], "rows": ["D7", "E6", "B6", "B2"] }, "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "caterina", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/handwired/jotanck/rules.mk b/keyboards/handwired/jotanck/rules.mk index 696f3387241..6e7633bfe01 100644 --- a/keyboards/handwired/jotanck/rules.mk +++ b/keyboards/handwired/jotanck/rules.mk @@ -1,12 +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 = 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. +# This file intentionally left blank From 729520f302e905e2b3e6711b1fc6d0061843e355 Mon Sep 17 00:00:00 2001 From: Thibaut CHARLES Date: Sun, 10 Mar 2024 01:06:58 +0100 Subject: [PATCH 017/333] Fix keychron q1v1 led config for iso layout (#23222) --- keyboards/keychron/q1v1/iso/iso.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/keyboards/keychron/q1v1/iso/iso.c b/keyboards/keychron/q1v1/iso/iso.c index affc41d2196..ef4f3425af0 100644 --- a/keyboards/keychron/q1v1/iso/iso.c +++ b/keyboards/keychron/q1v1/iso/iso.c @@ -121,28 +121,28 @@ led_config_t g_led_config = { // Key Matrix to LED Index { 0, __, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14 }, { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, - { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 }, - { 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 71, 57, 58 }, - { 59, __, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 80, 70, 13 }, - { 72, 73, 74, __, __, __, 75, __, __, __, 76, 77, 78, 79, 81 } + { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 57, 43 }, + { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 72, 56, 58 }, + { 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 81, 71, 13 }, + { 73, 74, 75, __, __, __, 76, __, __, __, 77, 78, 79, 80, 82 } }, { // LED Index to Physical Position {0,0}, {18,0}, {33,0}, {48,0}, {62,0}, {81,0}, {95,0}, {110,0}, {125,0}, {143,0}, {158,0}, {173,0}, {187,0}, {206,0}, {224,0}, {0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15}, {224,15}, - {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {202,26}, {224,26}, - {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {196,38}, {224,38}, - {9,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49}, {185,49}, {209,52}, - {2,61}, {20,61}, {39,61}, {94,61}, {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64} + {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {224,26}, + {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {187,38}, {203,32}, {224,38}, + {2,49}, {18,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49}, {185,49}, {209,52}, + {2,61}, {20,61}, {39,61}, {94,61}, {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64} }, { // RGB LED Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, - 1, 1, 1, 4, 1, 1, 1, 1, 1, 1 + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, + 1, 1, 1, 4, 1, 1, 1, 1, 1, 1 } }; From c5225ab5009476c60a9cb27837615d4f29c9b19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Mart=C3=ADnez?= <58857054+elpekenin@users.noreply.github.com> Date: Sun, 10 Mar 2024 01:29:09 +0100 Subject: [PATCH 018/333] [Feature] Some metadata on QGF/QFF files (#20101) --- .../qmk/cli/painter/convert_graphics.py | 34 ++---- lib/python/qmk/cli/painter/make_font.py | 36 ++----- lib/python/qmk/painter.py | 102 ++++++++++++++++++ lib/python/qmk/painter_qgf.py | 26 ++++- 4 files changed, 146 insertions(+), 52 deletions(-) diff --git a/lib/python/qmk/cli/painter/convert_graphics.py b/lib/python/qmk/cli/painter/convert_graphics.py index 2519c49b25f..553c26aa5d5 100644 --- a/lib/python/qmk/cli/painter/convert_graphics.py +++ b/lib/python/qmk/cli/painter/convert_graphics.py @@ -1,10 +1,8 @@ """This script tests QGF functionality. """ -import re -import datetime from io import BytesIO from qmk.path import normpath -from qmk.painter import render_header, render_source, render_license, render_bytes, valid_formats +from qmk.painter import generate_subs, render_header, render_source, valid_formats from milc import cli from PIL import Image @@ -12,7 +10,7 @@ from PIL import Image @cli.argument('-v', '--verbose', arg_only=True, action='store_true', help='Turns on verbose output.') @cli.argument('-i', '--input', required=True, help='Specify input graphic file.') @cli.argument('-o', '--output', default='', help='Specify output directory. Defaults to same directory as input.') -@cli.argument('-f', '--format', required=True, help='Output format, valid types: %s' % (', '.join(valid_formats.keys()))) +@cli.argument('-f', '--format', required=True, help=f'Output format, valid types: {", ".join(valid_formats.keys())}') @cli.argument('-r', '--no-rle', arg_only=True, action='store_true', help='Disables the use of RLE when encoding images.') @cli.argument('-d', '--no-deltas', arg_only=True, action='store_true', help='Disables the use of delta frames when encoding animations.') @cli.argument('-w', '--raw', arg_only=True, action='store_true', help='Writes out the QGF file as raw data instead of c/h combo.') @@ -51,43 +49,31 @@ def painter_convert_graphics(cli): # Convert the image to QGF using PIL out_data = BytesIO() - input_img.save(out_data, "QGF", use_deltas=(not cli.args.no_deltas), use_rle=(not cli.args.no_rle), qmk_format=format, verbose=cli.args.verbose) + metadata = [] + input_img.save(out_data, "QGF", use_deltas=(not cli.args.no_deltas), use_rle=(not cli.args.no_rle), qmk_format=format, verbose=cli.args.verbose, metadata=metadata) out_bytes = out_data.getvalue() if cli.args.raw: - raw_file = cli.args.output / (cli.args.input.stem + ".qgf") + raw_file = cli.args.output / f"{cli.args.input.stem}.qgf" with open(raw_file, 'wb') as raw: raw.write(out_bytes) return # Work out the text substitutions for rendering the output data - subs = { - 'generated_type': 'image', - 'var_prefix': 'gfx', - 'generator_command': f'qmk painter-convert-graphics -i {cli.args.input.name} -f {cli.args.format}', - 'year': datetime.date.today().strftime("%Y"), - 'input_file': cli.args.input.name, - 'sane_name': re.sub(r"[^a-zA-Z0-9]", "_", cli.args.input.stem), - 'byte_count': len(out_bytes), - 'bytes_lines': render_bytes(out_bytes), - 'format': cli.args.format, - } - - # Render the license - subs.update({'license': render_license(subs)}) + args_str = " ".join((f"--{arg} {getattr(cli.args, arg.replace('-', '_'))}" for arg in ["input", "output", "format", "no-rle", "no-deltas"])) + command = f"qmk painter-convert-graphics {args_str}" + subs = generate_subs(cli, out_bytes, image_metadata=metadata, command=command) # Render and write the header file header_text = render_header(subs) - header_file = cli.args.output / (cli.args.input.stem + ".qgf.h") + header_file = cli.args.output / f"{cli.args.input.stem}.qgf.h" with open(header_file, 'w') as header: print(f"Writing {header_file}...") header.write(header_text) - header.close() # Render and write the source file source_text = render_source(subs) - source_file = cli.args.output / (cli.args.input.stem + ".qgf.c") + source_file = cli.args.output / f"{cli.args.input.stem}.qgf.c" with open(source_file, 'w') as source: print(f"Writing {source_file}...") source.write(source_text) - source.close() diff --git a/lib/python/qmk/cli/painter/make_font.py b/lib/python/qmk/cli/painter/make_font.py index c0189920d2d..19db8449316 100644 --- a/lib/python/qmk/cli/painter/make_font.py +++ b/lib/python/qmk/cli/painter/make_font.py @@ -1,12 +1,10 @@ """This script automates the conversion of font files into a format QMK firmware understands. """ -import re -import datetime from io import BytesIO from qmk.path import normpath -from qmk.painter_qff import QFFFont -from qmk.painter import render_header, render_source, render_license, render_bytes, valid_formats +from qmk.painter_qff import _generate_font_glyphs_list, QFFFont +from qmk.painter import generate_subs, render_header, render_source, valid_formats from milc import cli @@ -31,7 +29,7 @@ def painter_make_font_image(cli): @cli.argument('-o', '--output', default='', help='Specify output directory. Defaults to same directory as input.') @cli.argument('-n', '--no-ascii', arg_only=True, action='store_true', help='Disables output of the full ASCII character set (0x20..0x7E), exporting only the glyphs specified.') @cli.argument('-u', '--unicode-glyphs', default='', help='Also generate the specified unicode glyphs.') -@cli.argument('-f', '--format', required=True, help='Output format, valid types: %s' % (', '.join(valid_formats.keys()))) +@cli.argument('-f', '--format', required=True, help=f'Output format, valid types: {", ".join(valid_formats.keys())}') @cli.argument('-r', '--no-rle', arg_only=True, action='store_true', help='Disable the use of RLE to minimise converted image size.') @cli.argument('-w', '--raw', arg_only=True, action='store_true', help='Writes out the QFF file as raw data instead of c/h combo.') @cli.subcommand('Converts an input font image to something QMK firmware understands') @@ -53,43 +51,31 @@ def painter_convert_font_image(cli): # Render out the data out_data = BytesIO() - font.save_to_qff(format, (False if cli.args.no_rle else True), out_data) + font.save_to_qff(format, not cli.args.no_rle, out_data) out_bytes = out_data.getvalue() if cli.args.raw: - raw_file = cli.args.output / (cli.args.input.stem + ".qff") + raw_file = cli.args.output / f"{cli.args.input.stem}.qff" with open(raw_file, 'wb') as raw: raw.write(out_bytes) return # Work out the text substitutions for rendering the output data - subs = { - 'generated_type': 'font', - 'var_prefix': 'font', - 'generator_command': f'qmk painter-convert-font-image -i {cli.args.input.name} -f {cli.args.format}', - 'year': datetime.date.today().strftime("%Y"), - 'input_file': cli.args.input.name, - 'sane_name': re.sub(r"[^a-zA-Z0-9]", "_", cli.args.input.stem), - 'byte_count': len(out_bytes), - 'bytes_lines': render_bytes(out_bytes), - 'format': cli.args.format, - } - - # Render the license - subs.update({'license': render_license(subs)}) + args_str = " ".join((f"--{arg} {getattr(cli.args, arg.replace('-', '_'))}" for arg in ["input", "output", "no-ascii", "unicode-glyphs", "format", "no-rle"])) + command = f"qmk painter-convert-font-image {args_str}" + metadata = {"glyphs": _generate_font_glyphs_list(not cli.args.no_ascii, cli.args.unicode_glyphs)} + subs = generate_subs(cli, out_bytes, font_metadata=metadata, command=command) # Render and write the header file header_text = render_header(subs) - header_file = cli.args.output / (cli.args.input.stem + ".qff.h") + header_file = cli.args.output / f"{cli.args.input.stem}.qff.h" with open(header_file, 'w') as header: print(f"Writing {header_file}...") header.write(header_text) - header.close() # Render and write the source file source_text = render_source(subs) - source_file = cli.args.output / (cli.args.input.stem + ".qff.c") + source_file = cli.args.output / f"{cli.args.input.stem}.qff.c" with open(source_file, 'w') as source: print(f"Writing {source_file}...") source.write(source_text) - source.close() diff --git a/lib/python/qmk/painter.py b/lib/python/qmk/painter.py index 381a9964431..512a486ce87 100644 --- a/lib/python/qmk/painter.py +++ b/lib/python/qmk/painter.py @@ -1,5 +1,6 @@ """Functions that help us work with Quantum Painter's file formats. """ +import datetime import math import re from string import Template @@ -79,6 +80,105 @@ valid_formats = { } } + +def _render_text(values): + # FIXME: May need more chars with GIFs containing lots of frames (or longer durations) + return "|".join([f"{i:4d}" for i in values]) + + +def _render_numeration(metadata): + return _render_text(range(len(metadata))) + + +def _render_values(metadata, key): + return _render_text([i[key] for i in metadata]) + + +def _render_image_metadata(metadata): + size = metadata.pop(0) + + lines = [ + "// Image's metadata", + "// ----------------", + f"// Width: {size['width']}", + f"// Height: {size['height']}", + ] + + if len(metadata) == 1: + lines.append("// Single frame") + + else: + lines.extend([ + f"// Frame: {_render_numeration(metadata)}", + f"// Duration(ms): {_render_values(metadata, 'delay')}", + f"// Compression: {_render_values(metadata, 'compression')} >> See qp.h, painter_compression_t", + f"// Delta: {_render_values(metadata, 'delta')}", + ]) + + deltas = [] + for i, v in enumerate(metadata): + # Not a delta frame, go to next one + if not v["delta"]: + continue + + # Unpack rect's coords + l, t, r, b = v["delta_rect"] + + delta_px = (r - l) * (b - t) + px = size["width"] * size["height"] + + # FIXME: May need need more chars here too + deltas.append(f"// Frame {i:3d}: ({l:3d}, {t:3d}) - ({r:3d}, {b:3d}) >> {delta_px:4d}/{px:4d} pixels ({100*delta_px/px:.2f}%)") + + if deltas: + lines.append("// Areas on delta frames") + lines.extend(deltas) + + return "\n".join(lines) + + +def generate_subs(cli, out_bytes, *, font_metadata=None, image_metadata=None, command): + if font_metadata is not None and image_metadata is not None: + raise ValueError("Cant generate subs for font and image at the same time") + + subs = { + "year": datetime.date.today().strftime("%Y"), + "input_file": cli.args.input.name, + "sane_name": re.sub(r"[^a-zA-Z0-9]", "_", cli.args.input.stem), + "byte_count": len(out_bytes), + "bytes_lines": render_bytes(out_bytes), + "format": cli.args.format, + "generator_command": command, + } + + if font_metadata is not None: + subs.update({ + "generated_type": "font", + "var_prefix": "font", + # not using triple quotes to avoid extra indentation/weird formatted code + "metadata": "\n".join([ + "// Font's metadata", + "// ---------------", + f"// Glyphs: {', '.join([i for i in font_metadata['glyphs']])}", + ]), + }) + + elif image_metadata is not None: + subs.update({ + "generated_type": "image", + "var_prefix": "gfx", + "generator_command": command, + "metadata": _render_image_metadata(image_metadata), + }) + + else: + raise ValueError("Pass metadata for either an image or a font") + + subs.update({"license": render_license(subs)}) + + return subs + + license_template = """\ // Copyright ${year} QMK -- generated source code only, ${generated_type} retains original copyright // SPDX-License-Identifier: GPL-2.0-or-later @@ -110,6 +210,8 @@ def render_header(subs): source_file_template = """\ ${license} +${metadata} + #include const uint32_t ${var_prefix}_${sane_name}_length = ${byte_count}; diff --git a/lib/python/qmk/painter_qgf.py b/lib/python/qmk/painter_qgf.py index cc4697f1c62..67ef0dd2338 100644 --- a/lib/python/qmk/painter_qgf.py +++ b/lib/python/qmk/painter_qgf.py @@ -327,8 +327,9 @@ def _compress_image(frame, last_frame, *, use_rle, use_deltas, format_, **_kwarg # Helper function to save each frame to the output file -def _write_frame(idx, frame, last_frame, *, fp, frame_offsets, **kwargs): - # Not an argument of the function as it would consume from **kwargs +def _write_frame(idx, frame, last_frame, *, fp, frame_offsets, metadata, **kwargs): + # Not an argument of the function as it would then not be part of kwargs + # This would cause an issue with `_compress_image(**kwargs)` missing an argument format_ = kwargs["format_"] # (potentially) Apply RLE and/or delta, and work out output image's information @@ -370,6 +371,21 @@ def _write_frame(idx, frame, last_frame, *, fp, frame_offsets, **kwargs): vprint(f'{f"Frame {idx:3d} delta":26s} {fp.tell():5d}d / {fp.tell():04X}h') delta_descriptor.write(fp) + # Store metadata, showed later in a comment in the generated file + frame_metadata = { + "compression": frame_descriptor.compression, + "delta": frame_descriptor.is_delta, + "delay": frame_descriptor.delay, + } + if frame_metadata["delta"]: + frame_metadata.update({"delta_rect": [ + delta_descriptor.left, + delta_descriptor.top, + delta_descriptor.right, + delta_descriptor.bottom, + ]}) + metadata.append(frame_metadata) + # Write out the data for this frame to the output data_descriptor = QGFFrameDataDescriptorV1() data_descriptor.data = image_data @@ -383,6 +399,10 @@ def _save(im, fp, _filename): # Work out from the parameters if we need to do anything special encoderinfo = im.encoderinfo.copy() + # Store image file in metadata structure + metadata = encoderinfo.get("metadata", []) + metadata.append({"width": im.width, "height": im.height}) + # Helper for prints, noop taking any args if not verbose global vprint verbose = encoderinfo.get("verbose", False) @@ -417,7 +437,7 @@ def _save(im, fp, _filename): frame_offsets.write(fp) # Iterate over each if the input frames, writing it to the output in the process - write_frame = functools.partial(_write_frame, format_=encoderinfo["qmk_format"], fp=fp, use_deltas=encoderinfo.get("use_deltas", True), use_rle=encoderinfo.get("use_rle", True), frame_offsets=frame_offsets) + write_frame = functools.partial(_write_frame, format_=encoderinfo["qmk_format"], fp=fp, use_deltas=encoderinfo.get("use_deltas", True), use_rle=encoderinfo.get("use_rle", True), frame_offsets=frame_offsets, metadata=metadata) for_all_frames(write_frame) # Go back and update the graphics descriptor now that we can determine the final file size From 9f4a9d5826dde903aa0dcec3264cbf192b5044da Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 10 Mar 2024 05:20:25 +0000 Subject: [PATCH 019/333] Enable 'keyboard.json' as a build target (#22891) --- .gitignore | 1 + builddefs/build_keyboard.mk | 40 +++++++++++++------ data/templates/keyboard/config.h | 20 ---------- .../keyboard/{info.json => keyboard.json} | 0 data/templates/keyboard/rules.mk | 1 - .../zv48/f401/{info.json => keyboard.json} | 0 keyboards/zvecr/zv48/f401/rules.mk | 3 -- .../qmk/cli/generate/make_dependencies.py | 3 +- lib/python/qmk/cli/new/keyboard.py | 2 +- lib/python/qmk/info.py | 15 ++++++- lib/python/qmk/keyboard.py | 10 +++-- lib/python/qmk/path.py | 3 +- 12 files changed, 53 insertions(+), 45 deletions(-) delete mode 100644 data/templates/keyboard/config.h rename data/templates/keyboard/{info.json => keyboard.json} (100%) delete mode 100644 data/templates/keyboard/rules.mk rename keyboards/zvecr/zv48/f401/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/zvecr/zv48/f401/rules.mk diff --git a/.gitignore b/.gitignore index ca9f00a7330..35b128606d7 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ quantum/version.h # DD config at wrong location /keyboards/**/keymaps/*/info.json +/keyboards/**/keymaps/*/keyboard.json # Old-style QMK Makefiles /keyboards/**/Makefile diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index f17171fe209..0b9ab8849f7 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -119,7 +119,7 @@ MAIN_KEYMAP_PATH_3 := $(KEYBOARD_PATH_3)/keymaps/$(KEYMAP) MAIN_KEYMAP_PATH_4 := $(KEYBOARD_PATH_4)/keymaps/$(KEYMAP) MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP) -# Pull in rules from info.json +# Pull in rules from DD keyboard config INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/info_rules.mk) include $(INFO_RULES_MK) @@ -221,7 +221,7 @@ include $(BUILDDEFS_PATH)/converters.mk MCU_ORIG := $(MCU) include $(wildcard $(PLATFORM_PATH)/*/mcu_selection.mk) -# PLATFORM_KEY should be detected in info.json via key 'processor' (or rules.mk 'MCU') +# PLATFORM_KEY should be detected in DD keyboard config via key 'processor' (or rules.mk 'MCU') ifeq ($(PLATFORM_KEY),) $(call CATASTROPHIC_ERROR,Platform not defined) endif @@ -335,38 +335,54 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_config.h)","") POST_CONFIG_H += $(KEYBOARD_PATH_5)/post_config.h endif -# Pull in stuff from info.json -INFO_JSON_FILES := +# Create dependencies on DD keyboard config - structure validated elsewhere +DD_CONFIG_FILES := ifneq ("$(wildcard $(KEYBOARD_PATH_1)/info.json)","") - INFO_JSON_FILES += $(KEYBOARD_PATH_1)/info.json + DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/info.json endif ifneq ("$(wildcard $(KEYBOARD_PATH_2)/info.json)","") - INFO_JSON_FILES += $(KEYBOARD_PATH_2)/info.json + DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/info.json endif ifneq ("$(wildcard $(KEYBOARD_PATH_3)/info.json)","") - INFO_JSON_FILES += $(KEYBOARD_PATH_3)/info.json + DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/info.json endif ifneq ("$(wildcard $(KEYBOARD_PATH_4)/info.json)","") - INFO_JSON_FILES += $(KEYBOARD_PATH_4)/info.json + DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/info.json endif ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","") - INFO_JSON_FILES += $(KEYBOARD_PATH_5)/info.json + DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/info.json +endif + +ifneq ("$(wildcard $(KEYBOARD_PATH_1)/keyboard.json)","") + DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/keyboard.json +endif +ifneq ("$(wildcard $(KEYBOARD_PATH_2)/keyboard.json)","") + DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/keyboard.json +endif +ifneq ("$(wildcard $(KEYBOARD_PATH_3)/keyboard.json)","") + DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/keyboard.json +endif +ifneq ("$(wildcard $(KEYBOARD_PATH_4)/keyboard.json)","") + DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/keyboard.json +endif +ifneq ("$(wildcard $(KEYBOARD_PATH_5)/keyboard.json)","") + DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/keyboard.json endif CONFIG_H += $(INTERMEDIATE_OUTPUT)/src/info_config.h KEYBOARD_SRC += $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c -$(INTERMEDIATE_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES) +$(INTERMEDIATE_OUTPUT)/src/info_config.h: $(DD_CONFIG_FILES) @$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD) $(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/info_config.h) @$(BUILD_CMD) -$(INTERMEDIATE_OUTPUT)/src/default_keyboard.c: $(INFO_JSON_FILES) +$(INTERMEDIATE_OUTPUT)/src/default_keyboard.c: $(DD_CONFIG_FILES) @$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD) $(eval CMD=$(QMK_BIN) generate-keyboard-c --quiet --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c) @$(BUILD_CMD) -$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES) +$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h: $(DD_CONFIG_FILES) @$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD) $(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --include $(FOUND_KEYBOARD_H) --output $(INTERMEDIATE_OUTPUT)/src/default_keyboard.h) @$(BUILD_CMD) diff --git a/data/templates/keyboard/config.h b/data/templates/keyboard/config.h deleted file mode 100644 index b15c8d31f14..00000000000 --- a/data/templates/keyboard/config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright %YEAR% %REAL_NAME% (@%USER_NAME%) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* - * 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/data/templates/keyboard/info.json b/data/templates/keyboard/keyboard.json similarity index 100% rename from data/templates/keyboard/info.json rename to data/templates/keyboard/keyboard.json diff --git a/data/templates/keyboard/rules.mk b/data/templates/keyboard/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/data/templates/keyboard/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/zvecr/zv48/f401/info.json b/keyboards/zvecr/zv48/f401/keyboard.json similarity index 100% rename from keyboards/zvecr/zv48/f401/info.json rename to keyboards/zvecr/zv48/f401/keyboard.json diff --git a/keyboards/zvecr/zv48/f401/rules.mk b/keyboards/zvecr/zv48/f401/rules.mk deleted file mode 100644 index 4df55cd2206..00000000000 --- a/keyboards/zvecr/zv48/f401/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# Disable unsupported hardware -AUDIO_SUPPORTED = no -BACKLIGHT_SUPPORTED = no diff --git a/lib/python/qmk/cli/generate/make_dependencies.py b/lib/python/qmk/cli/generate/make_dependencies.py index 9b695e907de..331132a20f5 100755 --- a/lib/python/qmk/cli/generate/make_dependencies.py +++ b/lib/python/qmk/cli/generate/make_dependencies.py @@ -18,10 +18,11 @@ from qmk.path import normpath, FileType @cli.argument('-km', '--keymap', completer=keymap_completer, help='The keymap to build a firmware for. Ignored when a configurator export is supplied.') @cli.subcommand('Generates the list of dependencies associated with a keyboard build and its generated files.', hidden=True) def generate_make_dependencies(cli): - """Generates the list of dependent info.json, rules.mk, and config.h files for a keyboard. + """Generates the list of dependent config files for a keyboard. """ interesting_files = [ 'info.json', + 'keyboard.json', 'rules.mk', 'post_rules.mk', 'config.h', diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py index cb50acf8bb9..700afc96a62 100644 --- a/lib/python/qmk/cli/new/keyboard.py +++ b/lib/python/qmk/cli/new/keyboard.py @@ -251,7 +251,7 @@ def new_keyboard(cli): # merge in infos community_info = Path(COMMUNITY / f'{default_layout}/info.json') - augment_community_info(community_info, keyboard(kb_name) / community_info.name) + augment_community_info(community_info, keyboard(kb_name) / 'keyboard.json') cli.log.info(f'{{fg_green}}Created a new keyboard called {{fg_cyan}}{kb_name}{{fg_green}}.{{fg_reset}}') cli.log.info(f"Build Command: {{fg_yellow}}qmk compile -kb {kb_name} -km default{{fg_reset}}.") diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 13588abdb85..24492846680 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -863,7 +863,17 @@ def unknown_processor_rules(info_data, rules): def merge_info_jsons(keyboard, info_data): """Return a merged copy of all the info.json files for a keyboard. """ - for info_file in find_info_json(keyboard): + config_files = find_info_json(keyboard) + + # keyboard.json can only exist at the deepest part of the tree + keyboard_json_count = 0 + for index, info_file in enumerate(config_files): + if Path(info_file).name == 'keyboard.json': + keyboard_json_count += 1 + if index != 0 or keyboard_json_count > 1: + _log_error(info_data, f'Invalid keyboard.json location detected: {info_file}.') + + for info_file in config_files: # Load and validate the JSON data new_info_data = json_load(info_file) @@ -921,7 +931,7 @@ def find_info_json(keyboard): base_path = Path('keyboards') keyboard_path = base_path / keyboard keyboard_parent = keyboard_path.parent - info_jsons = [keyboard_path / 'info.json'] + info_jsons = [keyboard_path / 'info.json', keyboard_path / 'keyboard.json'] # Add DEFAULT_FOLDER before parents, if present rules = rules_mk(keyboard) @@ -933,6 +943,7 @@ def find_info_json(keyboard): if keyboard_parent == base_path: break info_jsons.append(keyboard_parent / 'info.json') + info_jsons.append(keyboard_parent / 'keyboard.json') keyboard_parent = keyboard_parent.parent # Return a list of the info.json files that actually exist diff --git a/lib/python/qmk/keyboard.py b/lib/python/qmk/keyboard.py index b56505d649c..0fcc2e868d1 100644 --- a/lib/python/qmk/keyboard.py +++ b/lib/python/qmk/keyboard.py @@ -166,9 +166,9 @@ def keyboard_folder_or_all(keyboard): def _find_name(path): - """Determine the keyboard name by stripping off the base_path and rules.mk. + """Determine the keyboard name by stripping off the base_path and filename. """ - return path.replace(base_path, "").replace(os.path.sep + "rules.mk", "") + return path.replace(base_path, "").rsplit(os.path.sep, 1)[0] def keyboard_completer(prefix, action, parser, parsed_args): @@ -181,8 +181,10 @@ def list_keyboards(resolve_defaults=True): """Returns a list of all keyboards - optionally processing any DEFAULT_FOLDER. """ # We avoid pathlib here because this is performance critical code. - kb_wildcard = os.path.join(base_path, "**", "rules.mk") - paths = [path for path in glob(kb_wildcard, recursive=True) if os.path.sep + 'keymaps' + os.path.sep not in path] + paths = [] + for marker in ['rules.mk', 'keyboard.json']: + kb_wildcard = os.path.join(base_path, "**", marker) + paths += [path for path in glob(kb_wildcard, recursive=True) if os.path.sep + 'keymaps' + os.path.sep not in path] found = map(_find_name, paths) if resolve_defaults: diff --git a/lib/python/qmk/path.py b/lib/python/qmk/path.py index 74364ee04b0..85a8f48c4f8 100644 --- a/lib/python/qmk/path.py +++ b/lib/python/qmk/path.py @@ -15,8 +15,9 @@ def is_keyboard(keyboard_name): if keyboard_name: keyboard_path = QMK_FIRMWARE / 'keyboards' / keyboard_name rules_mk = keyboard_path / 'rules.mk' + keyboard_json = keyboard_path / 'keyboard.json' - return rules_mk.exists() + return rules_mk.exists() or keyboard_json.exists() def under_qmk_firmware(path=Path(os.environ['ORIG_CWD'])): From c0dbe9a33662a651fb91afb2e4810bae3f6a825e Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 9 Mar 2024 21:34:41 -0800 Subject: [PATCH 020/333] Add utility functions for Pointing Device Auto Mouse feature (#23144) * Make is_auto_mouse_active() available globally * Add mouse key tracker functions for auto mouse layer --- docs/feature_pointing_device.md | 3 +++ .../pointing_device_auto_mouse.c | 20 ++++++++++++++++++- .../pointing_device_auto_mouse.h | 4 +++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md index b091dec08b9..f55b3082861 100644 --- a/docs/feature_pointing_device.md +++ b/docs/feature_pointing_device.md @@ -780,6 +780,9 @@ There are several functions that allow for more advanced interaction with the au | `get_auto_mouse_timeout(void)` | Return the current timeout for turing off the layer | | `uint16_t` | | `set_auto_mouse_debounce(uint16_t timeout)` | Change/set the debounce for preventing layer activation | | `void`(None) | | `get_auto_mouse_debounce(void)` | Return the current debounce for preventing layer activation | | `uint8_t` | +| `is_auto_mouse_active(void)` | Returns the active state of the auto mouse layer (eg if the layer has been triggered)| | `bool` | +| `get_auto_mouse_key_tracker(void)` | Gets the current count for the auto mouse key tracker. | | `int8_t` | +| `set_auto_mouse_key_tracker(int8_t key_tracker)` | Sets/Overrides the current count for the auto mouse key tracker. | | `void`(None) | _NOTES:_ - _Due to the nature of how some functions work, the `auto_mouse_trigger_reset`, and `auto_mouse_layer_off` functions should never be called in the `layer_state_set_*` stack as this can cause indefinite loops._ diff --git a/quantum/pointing_device/pointing_device_auto_mouse.c b/quantum/pointing_device/pointing_device_auto_mouse.c index 1b11fffedb7..d9f924e258e 100644 --- a/quantum/pointing_device/pointing_device_auto_mouse.c +++ b/quantum/pointing_device/pointing_device_auto_mouse.c @@ -45,7 +45,7 @@ static inline bool layer_hold_check(void) { } /* check all layer activation criteria */ -static inline bool is_auto_mouse_active(void) { +bool is_auto_mouse_active(void) { return auto_mouse_context.status.is_activated || auto_mouse_context.status.mouse_key_tracker || layer_hold_check(); } @@ -98,6 +98,15 @@ bool get_auto_mouse_toggle(void) { return auto_mouse_context.status.is_toggled; } +/** + * @brief get key tracker value + * + * @return bool of current layer_toggled state + */ +int8_t get_auto_mouse_key_tracker(void) { + return auto_mouse_context.status.mouse_key_tracker; +} + /** * @brief Reset auto mouse context * @@ -163,6 +172,15 @@ void set_auto_mouse_debounce(uint8_t debounce) { auto_mouse_reset(); } +/** + * @brief Changes the timeout for the mouse auto layer to be disabled + * + * @param key_tracker + */ +void set_auto_mouse_key_tracker(int8_t key_tracker) { + auto_mouse_context.status.mouse_key_tracker = key_tracker; +} + /** * @brief toggle mouse layer setting * diff --git a/quantum/pointing_device/pointing_device_auto_mouse.h b/quantum/pointing_device/pointing_device_auto_mouse.h index 904f18b68e2..a596c065a31 100644 --- a/quantum/pointing_device/pointing_device_auto_mouse.h +++ b/quantum/pointing_device/pointing_device_auto_mouse.h @@ -81,9 +81,11 @@ void set_auto_mouse_timeout(uint16_t timeout); // set l uint16_t get_auto_mouse_timeout(void); // get layer timeout void set_auto_mouse_debounce(uint8_t debounce); // set debounce uint8_t get_auto_mouse_debounce(void); // get debounce +void set_auto_mouse_key_tracker(int8_t key_tracker); // set key tracker +int8_t get_auto_mouse_key_tracker(void); // get key tracker void auto_mouse_layer_off(void); // disable target layer if appropriate (DO NOT USE in layer_state_set stack!!) layer_state_t remove_auto_mouse_layer(layer_state_t state, bool force); // remove auto mouse target layer from state if appropriate (can be forced) - +bool is_auto_mouse_active(void); // check if target layer is active /* ----------For custom pointing device activation----------------------------------------------------------- */ bool auto_mouse_activation(report_mouse_t mouse_report); // handles pointing device trigger conditions for target layer activation (overwritable) From aa33d8ba8e9ca78b7738eadd5401348c51d3d9d9 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Tue, 12 Mar 2024 16:31:51 -0600 Subject: [PATCH 021/333] Fixup work_board (#23266) * initial * Update keyboards/work_louder/work_board/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --------- Co-authored-by: Drashna Jaelre --- keyboards/work_louder/work_board/config.h | 16 ----------- keyboards/work_louder/work_board/info.json | 12 ++++++++ .../work_board/keymaps/default/keymap.c | 11 ++------ .../work_board/keymaps/default/readme.md | 1 - .../work_board/keymaps/default/rules.mk | 1 + .../work_board/keymaps/via/config.h | 2 ++ .../work_board/keymaps/via/keymap.c | 28 ++++++++++--------- keyboards/work_louder/work_board/rules.mk | 17 ----------- 8 files changed, 32 insertions(+), 56 deletions(-) delete mode 100644 keyboards/work_louder/work_board/keymaps/default/readme.md diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h index 57f309513b2..2514a63ddec 100644 --- a/keyboards/work_louder/work_board/config.h +++ b/keyboards/work_louder/work_board/config.h @@ -24,20 +24,4 @@ along with this program. If not, see . #define RGB_MATRIX_LED_COUNT 49 #define RGB_MATRIX_DISABLE_KEYCODES -/* - * 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 - #define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x1 diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json index 8714133ae7e..dc412fdabd1 100644 --- a/keyboards/work_louder/work_board/info.json +++ b/keyboards/work_louder/work_board/info.json @@ -8,6 +8,18 @@ "pid": "0xDCD1", "max_power": 100 }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "rgb_matrix": true, + "encoder": true + }, + "build": { + "lto": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/work_louder/work_board/keymaps/default/keymap.c b/keyboards/work_louder/work_board/keymaps/default/keymap.c index 56c4a2ce1d3..e55cd5c5987 100644 --- a/keyboards/work_louder/work_board/keymaps/default/keymap.c +++ b/keyboards/work_louder/work_board/keymaps/default/keymap.c @@ -16,7 +16,7 @@ #include QMK_KEYBOARD_H -enum planck_layers { +enum layers { _QWERTY, _LOWER, _RAISE, @@ -27,15 +27,12 @@ enum tap_dances { ENC_TAP, }; -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, TD(ENC_TAP), KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT, - MO(3), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT + MO(3), KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT ), [_LOWER] = LAYOUT( @@ -85,7 +82,3 @@ void dance_enc_reset(tap_dance_state_t *state, void *user_data) { tap_dance_action_t tap_dance_actions[] = { [ENC_TAP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_enc_finished, dance_enc_reset), }; - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} diff --git a/keyboards/work_louder/work_board/keymaps/default/readme.md b/keyboards/work_louder/work_board/keymaps/default/readme.md deleted file mode 100644 index 3b2d89b9a6a..00000000000 --- a/keyboards/work_louder/work_board/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for work diff --git a/keyboards/work_louder/work_board/keymaps/default/rules.mk b/keyboards/work_louder/work_board/keymaps/default/rules.mk index e5ddcae8d92..ec22b308f75 100644 --- a/keyboards/work_louder/work_board/keymaps/default/rules.mk +++ b/keyboards/work_louder/work_board/keymaps/default/rules.mk @@ -1 +1,2 @@ TAP_DANCE_ENABLE = yes +TRI_LAYER_ENABLE = yes diff --git a/keyboards/work_louder/work_board/keymaps/via/config.h b/keyboards/work_louder/work_board/keymaps/via/config.h index d383467be7b..7aa3bebe9b8 100644 --- a/keyboards/work_louder/work_board/keymaps/via/config.h +++ b/keyboards/work_louder/work_board/keymaps/via/config.h @@ -2,3 +2,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once #define NO_ACTION_ONESHOT +#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL diff --git a/keyboards/work_louder/work_board/keymaps/via/keymap.c b/keyboards/work_louder/work_board/keymaps/via/keymap.c index e920c2f9bd0..7f0627eb672 100644 --- a/keyboards/work_louder/work_board/keymaps/via/keymap.c +++ b/keyboards/work_louder/work_board/keymaps/via/keymap.c @@ -16,14 +16,16 @@ #include QMK_KEYBOARD_H -enum planck_layers { _QWERTY, _LOWER, _RAISE, _ADJUST }; - -enum tap_dances { - ENC_TAP, +enum layers { + _QWERTY, + _LOWER, + _RAISE, + _ADJUST }; -#define LOWER TL_LOWR -#define RAISE TL_UPPR +enum tap_dances { + ENC_TAP +}; // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -31,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, QK_KB_9, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - MO(3), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + MO(3), KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), [_LOWER] = LAYOUT( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, _______, @@ -158,9 +160,9 @@ void wl_config_set_value(uint8_t *data) { work_louder_config.led_level = (bool)*value_data; layer_state_set_kb(layer_state); break; - // case id_wl_layer: - // layer_move(*value_data); - // break; + // case id_wl_layer: + // layer_move(*value_data); + // break; } } @@ -173,9 +175,9 @@ void wl_config_get_value(uint8_t *data) { case id_wl_brightness: *value_data = work_louder_config.led_level; break; - // case id_wl_layer: - // *value_data = get_highest_layer(layer_state); - // break; + // case id_wl_layer: + // *value_data = get_highest_layer(layer_state); + // break; } } diff --git a/keyboards/work_louder/work_board/rules.mk b/keyboards/work_louder/work_board/rules.mk index 9f4b9a4bc5c..a4c45393c01 100644 --- a/keyboards/work_louder/work_board/rules.mk +++ b/keyboards/work_louder/work_board/rules.mk @@ -1,20 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes - -RGB_MATRIX_ENABLE = yes - SRC += rgb_functions.c DEFAULT_FOLDER = work_louder/work_board/rev3 From c92277a8ae77b0ab9f70ec59ed92b4e64d16d842 Mon Sep 17 00:00:00 2001 From: DavidSannier Date: Wed, 13 Mar 2024 08:19:23 +0100 Subject: [PATCH 022/333] Remove unuseful layer_on() call (#23055) --- quantum/action.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/quantum/action.c b/quantum/action.c index 8dae32b2cb3..74ef55e5eb2 100644 --- a/quantum/action.c +++ b/quantum/action.c @@ -658,7 +658,6 @@ void process_action(keyrecord_t *record, action_t action) { layer_off(action.layer_tap.val); break; } else if (tap_count < ONESHOT_TAP_TOGGLE) { - layer_on(action.layer_tap.val); set_oneshot_layer(action.layer_tap.val, ONESHOT_START); } } else { @@ -671,7 +670,6 @@ void process_action(keyrecord_t *record, action_t action) { } # else if (event.pressed) { - layer_on(action.layer_tap.val); set_oneshot_layer(action.layer_tap.val, ONESHOT_START); } else { clear_oneshot_layer_state(ONESHOT_PRESSED); From af1ac6b1bd873986fe808dfd68420bc5f48dd43d Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 13 Mar 2024 23:04:49 +0000 Subject: [PATCH 023/333] Reject duplicate matrix locations in LAYOUT macros (#23273) --- lib/python/qmk/info.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 00da4936e16..99ac254e27c 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -107,6 +107,15 @@ def _validate_layouts(keyboard, info_data): # noqa C901 if col >= col_num: _log_error(info_data, f'{layout_name}: Matrix column for key {index} ({key_name}) is {col} but must be less than {col_num}') + # Reject duplicate matrix locations + for layout_name, layout_data in layouts.items(): + seen = set() + for index, key_data in enumerate(layout_data['layout']): + key = f"{key_data['matrix']}" + if key in seen: + _log_error(info_data, f'{layout_name}: Matrix location for key {index} is not unique {key_data}') + seen.add(key) + # Warn if physical positions are offset (at least one key should be at x=0, and at least one key at y=0) for layout_name, layout_data in layouts.items(): offset_x = min([_get_key_left_position(k) for k in layout_data['layout']]) From 8e5cd981e1cb8580cde65ac99f335b59d65da632 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 14 Mar 2024 03:56:42 +0000 Subject: [PATCH 024/333] Migrate features from rules.mk to DD (#23247) --- .../ellipse/rev1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/abstract/ellipse/rev1/rules.mk | 13 ------------- .../titan60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/acekeyboard/titan60/rules.mk | 12 ------------ .../87h/delta/{info.json => keyboard.json} | 9 +++++++++ keyboards/acheron/apollo/87h/delta/rules.mk | 14 -------------- .../apollo/87htsc/{info.json => keyboard.json} | 9 +++++++++ keyboards/acheron/apollo/87htsc/rules.mk | 14 -------------- .../apollo/88htsc/{info.json => keyboard.json} | 9 +++++++++ keyboards/acheron/apollo/88htsc/rules.mk | 14 -------------- .../acheron/arctic/{info.json => keyboard.json} | 8 ++++++++ keyboards/acheron/arctic/rules.mk | 13 ------------- .../acheron/austin/{info.json => keyboard.json} | 9 +++++++++ keyboards/acheron/austin/rules.mk | 12 ------------ .../elongate/delta/{info.json => keyboard.json} | 10 ++++++++++ keyboards/acheron/elongate/delta/rules.mk | 12 ------------ .../keebspcb/{info.json => keyboard.json} | 8 ++++++++ keyboards/acheron/keebspcb/rules.mk | 12 ------------ .../lasgweloth/{info.json => keyboard.json} | 8 ++++++++ keyboards/acheron/lasgweloth/rules.mk | 14 -------------- .../ada/ada1800mini/{info.json => keyboard.json} | 9 +++++++++ keyboards/ada/ada1800mini/rules.mk | 16 ---------------- .../ada/infinity81/{info.json => keyboard.json} | 9 +++++++++ keyboards/ada/infinity81/rules.mk | 12 ------------ keyboards/adelheid/{info.json => keyboard.json} | 9 +++++++++ keyboards/adelheid/rules.mk | 12 ------------ .../akemipad/{info.json => keyboard.json} | 11 +++++++++++ keyboards/adpenrose/akemipad/rules.mk | 14 -------------- .../kintsugi/{info.json => keyboard.json} | 11 +++++++++++ keyboards/adpenrose/kintsugi/rules.mk | 14 -------------- .../adpenrose/obi/{info.json => keyboard.json} | 10 ++++++++++ keyboards/adpenrose/obi/rules.mk | 13 ------------- .../shisaku/{info.json => keyboard.json} | 8 ++++++++ keyboards/adpenrose/shisaku/rules.mk | 12 ------------ .../aeboards/aegis/{info.json => keyboard.json} | 8 ++++++++ keyboards/aeboards/aegis/rules.mk | 11 ----------- .../gust/rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/afternoonlabs/gust/rev1/rules.mk | 12 ------------ .../ai03/andromeda/{info.json => keyboard.json} | 8 ++++++++ keyboards/ai03/andromeda/rules.mk | 13 ------------- .../equinox/rev0/{info.json => keyboard.json} | 9 +++++++++ keyboards/ai03/equinox/rev0/rules.mk | 12 ------------ .../equinox/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/ai03/equinox/rev1/rules.mk | 12 ------------ .../ai03/lunar/{info.json => keyboard.json} | 8 ++++++++ keyboards/ai03/lunar/rules.mk | 12 ------------ .../ai03/polaris/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ai03/polaris/rules.mk | 12 ------------ .../ai03/quasar/{info.json => keyboard.json} | 8 ++++++++ keyboards/ai03/quasar/rules.mk | 12 ------------ .../ai03/soyuz/{info.json => keyboard.json} | 8 ++++++++ keyboards/ai03/soyuz/rules.mk | 12 ------------ keyboards/ai03/vega/{info.json => keyboard.json} | 8 ++++++++ keyboards/ai03/vega/rules.mk | 13 ------------- .../voyager60_alps/{info.json => keyboard.json} | 9 +++++++++ keyboards/ai03/voyager60_alps/rules.mk | 12 ------------ keyboards/akb/eb46/{info.json => keyboard.json} | 8 ++++++++ keyboards/akb/eb46/rules.mk | 12 ------------ keyboards/akb/raine/{info.json => keyboard.json} | 8 ++++++++ keyboards/akb/raine/rules.mk | 12 ------------ keyboards/alf/dc60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/alf/dc60/rules.mk | 12 ------------ keyboards/alf/x2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/alf/x2/rules.mk | 12 ------------ .../swift65/hotswap/{info.json => keyboard.json} | 9 +++++++++ keyboards/alfredslab/swift65/hotswap/rules.mk | 12 ------------ .../swift65/solder/{info.json => keyboard.json} | 9 +++++++++ keyboards/alfredslab/swift65/solder/rules.mk | 12 ------------ keyboards/alpha/{info.json => keyboard.json} | 9 +++++++++ keyboards/alpha/rules.mk | 12 ------------ keyboards/alpine65/{info.json => keyboard.json} | 9 +++++++++ keyboards/alpine65/rules.mk | 13 ------------- keyboards/alps64/{info.json => keyboard.json} | 8 ++++++++ keyboards/alps64/rules.mk | 9 --------- keyboards/amag23/{info.json => keyboard.json} | 9 +++++++++ keyboards/amag23/rules.mk | 10 ---------- .../amj40/{info.json => keyboard.json} | 10 ++++++++++ keyboards/amjkeyboard/amj40/rules.mk | 12 ------------ .../amj60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/amjkeyboard/amj60/rules.mk | 12 ------------ .../amj84/{info.json => keyboard.json} | 9 +++++++++ keyboards/amjkeyboard/amj84/rules.mk | 12 ------------ .../amjpad/{info.json => keyboard.json} | 9 +++++++++ keyboards/amjkeyboard/amjpad/rules.mk | 12 ------------ .../anavi/macropad8/{info.json => keyboard.json} | 11 +++++++++++ keyboards/anavi/macropad8/rules.mk | 13 ------------- keyboards/ano/{info.json => keyboard.json} | 9 +++++++++ keyboards/ano/rules.mk | 13 ------------- .../anomalykb/a65i/{info.json => keyboard.json} | 8 ++++++++ keyboards/anomalykb/a65i/rules.mk | 12 ------------ keyboards/aos/tkl/{info.json => keyboard.json} | 9 +++++++++ keyboards/aos/tkl/rules.mk | 12 ------------ keyboards/aozora/{info.json => keyboard.json} | 8 ++++++++ keyboards/aozora/rules.mk | 13 ------------- .../aplx6/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/aplyard/aplx6/rev1/rules.mk | 13 ------------- .../aplx6/rev2/{info.json => keyboard.json} | 11 +++++++++++ keyboards/aplyard/aplx6/rev2/rules.mk | 15 --------------- keyboards/ares/{info.json => keyboard.json} | 9 +++++++++ keyboards/ares/rules.mk | 10 ---------- keyboards/arisu/{info.json => keyboard.json} | 8 ++++++++ keyboards/arisu/rules.mk | 12 ------------ .../1x4p1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/arrayperipherals/1x4p1/rules.mk | 14 -------------- keyboards/ash1800/{info.json => keyboard.json} | 8 ++++++++ keyboards/ash1800/rules.mk | 12 ------------ keyboards/ash_xiix/{info.json => keyboard.json} | 8 ++++++++ keyboards/ash_xiix/rules.mk | 12 ------------ keyboards/atlas_65/{info.json => keyboard.json} | 8 ++++++++ keyboards/atlas_65/rules.mk | 12 ------------ keyboards/atomic/{info.json => keyboard.json} | 9 +++++++++ keyboards/atomic/rules.mk | 12 ------------ keyboards/atreus62/{info.json => keyboard.json} | 9 +++++++++ keyboards/atreus62/rules.mk | 11 ----------- keyboards/atset/at1/{info.json => keyboard.json} | 8 ++++++++ keyboards/atset/at1/rules.mk | 12 ------------ .../atset/at12/{info.json => keyboard.json} | 8 ++++++++ keyboards/atset/at12/rules.mk | 12 ------------ .../atset/at16/{info.json => keyboard.json} | 8 ++++++++ keyboards/atset/at16/rules.mk | 12 ------------ keyboards/atset/at3/{info.json => keyboard.json} | 8 ++++++++ keyboards/atset/at3/rules.mk | 12 ------------ keyboards/atset/at6/{info.json => keyboard.json} | 8 ++++++++ keyboards/atset/at6/rules.mk | 12 ------------ keyboards/atset/at9/{info.json => keyboard.json} | 8 ++++++++ keyboards/atset/at9/rules.mk | 12 ------------ keyboards/aves60/{info.json => keyboard.json} | 8 ++++++++ keyboards/aves60/rules.mk | 12 ------------ keyboards/aves65/{info.json => keyboard.json} | 9 +++++++++ keyboards/aves65/rules.mk | 12 ------------ .../{info.json => keyboard.json} | 8 ++++++++ keyboards/axolstudio/foundation_gamma/rules.mk | 12 ------------ .../yeti/soldered/{info.json => keyboard.json} | 8 ++++++++ keyboards/axolstudio/yeti/soldered/rules.mk | 12 ------------ .../b_sides/rev41lp/{info.json => keyboard.json} | 9 +++++++++ keyboards/b_sides/rev41lp/rules.mk | 12 ------------ keyboards/bacca70/{info.json => keyboard.json} | 8 ++++++++ keyboards/bacca70/rules.mk | 12 ------------ keyboards/baguette/{info.json => keyboard.json} | 9 +++++++++ keyboards/baguette/rules.mk | 12 ------------ keyboards/bantam44/{info.json => keyboard.json} | 8 ++++++++ keyboards/bantam44/rules.mk | 10 ---------- keyboards/barracuda/{info.json => keyboard.json} | 8 ++++++++ keyboards/barracuda/rules.mk | 12 ------------ .../trifecta/{info.json => keyboard.json} | 10 ++++++++++ keyboards/basekeys/trifecta/rules.mk | 14 -------------- keyboards/beatervan/{info.json => keyboard.json} | 9 +++++++++ keyboards/beatervan/rules.mk | 12 ------------ keyboards/bfake/{info.json => keyboard.json} | 9 +++++++++ keyboards/bfake/rules.mk | 10 ---------- .../biacco42/meishi/{info.json => keyboard.json} | 8 ++++++++ keyboards/biacco42/meishi/rules.mk | 11 ----------- .../meishi2/{info.json => keyboard.json} | 8 ++++++++ keyboards/biacco42/meishi2/rules.mk | 12 ------------ .../binepad/bn003/{info.json => keyboard.json} | 8 ++++++++ keyboards/binepad/bn003/rules.mk | 12 ------------ keyboards/bioi/f60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/bioi/f60/rules.mk | 12 ------------ keyboards/blackplum/{info.json => keyboard.json} | 9 +++++++++ keyboards/blackplum/rules.mk | 12 ------------ .../blank/blank01/{info.json => keyboard.json} | 8 ++++++++ keyboards/blank/blank01/rules.mk | 12 ------------ keyboards/blaster75/{info.json => keyboard.json} | 8 ++++++++ keyboards/blaster75/rules.mk | 13 ------------- keyboards/blockey/{info.json => keyboard.json} | 9 +++++++++ keyboards/blockey/rules.mk | 13 ------------- .../bizarre/{info.json => keyboard.json} | 9 +++++++++ keyboards/boardrun/bizarre/rules.mk | 12 ------------ .../classic/{info.json => keyboard.json} | 9 +++++++++ keyboards/boardrun/classic/rules.mk | 12 ------------ keyboards/boardwalk/{info.json => keyboard.json} | 10 ++++++++++ keyboards/boardwalk/rules.mk | 13 ------------- keyboards/bobpad/{info.json => keyboard.json} | 9 +++++++++ keyboards/bobpad/rules.mk | 14 -------------- .../bolsa/bolsalice/{info.json => keyboard.json} | 9 +++++++++ keyboards/bolsa/bolsalice/rules.mk | 12 ------------ .../bolsa/damapad/{info.json => keyboard.json} | 10 ++++++++++ keyboards/bolsa/damapad/rules.mk | 14 -------------- keyboards/bop/{info.json => keyboard.json} | 8 ++++++++ keyboards/bop/rules.mk | 13 ------------- keyboards/boston/{info.json => keyboard.json} | 11 +++++++++++ keyboards/boston/rules.mk | 14 -------------- .../fm2u/{info.json => keyboard.json} | 8 ++++++++ keyboards/botanicalkeyboards/fm2u/rules.mk | 12 ------------ keyboards/box75/{info.json => keyboard.json} | 8 ++++++++ keyboards/box75/rules.mk | 14 -------------- .../four_banger/{info.json => keyboard.json} | 9 +++++++++ keyboards/bpiphany/four_banger/rules.mk | 12 ------------ .../sixshooter/{info.json => keyboard.json} | 8 ++++++++ keyboards/bpiphany/sixshooter/rules.mk | 11 ----------- .../bthlabs/geekpad/{info.json => keyboard.json} | 8 ++++++++ keyboards/bthlabs/geekpad/rules.mk | 12 ------------ .../potato65/{info.json => keyboard.json} | 9 +++++++++ keyboards/buildakb/potato65/rules.mk | 12 ------------ .../potato65hs/{info.json => keyboard.json} | 9 +++++++++ keyboards/buildakb/potato65hs/rules.mk | 12 ------------ .../potato65s/{info.json => keyboard.json} | 9 +++++++++ keyboards/buildakb/potato65s/rules.mk | 12 ------------ .../cypher/rev6/{info.json => keyboard.json} | 10 ++++++++++ keyboards/cablecardesigns/cypher/rev6/rules.mk | 12 ------------ .../serpent65/{info.json => keyboard.json} | 8 ++++++++ keyboards/caffeinated/serpent65/rules.mk | 12 ------------ .../adelie/{info.json => keyboard.json} | 9 +++++++++ keyboards/cannonkeys/adelie/rules.mk | 12 ------------ .../atlas/{info.json => keyboard.json} | 9 +++++++++ keyboards/cannonkeys/atlas/rules.mk | 11 ----------- .../atlas_alps/{info.json => keyboard.json} | 9 +++++++++ keyboards/cannonkeys/atlas_alps/rules.mk | 12 ------------ .../chimera65/{info.json => keyboard.json} | 9 +++++++++ keyboards/cannonkeys/chimera65/rules.mk | 13 ------------- .../hoodrowg/{info.json => keyboard.json} | 9 +++++++++ keyboards/cannonkeys/hoodrowg/rules.mk | 12 ------------ .../iron165/{info.json => keyboard.json} | 9 +++++++++ keyboards/cannonkeys/iron165/rules.mk | 13 ------------- .../nearfield/{info.json => keyboard.json} | 8 ++++++++ keyboards/cannonkeys/nearfield/rules.mk | 12 ------------ .../ortho48/{info.json => keyboard.json} | 11 +++++++++++ keyboards/cannonkeys/ortho48/rules.mk | 13 ------------- .../ortho60/{info.json => keyboard.json} | 11 +++++++++++ keyboards/cannonkeys/ortho60/rules.mk | 13 ------------- .../ortho75/{info.json => keyboard.json} | 12 ++++++++++++ keyboards/cannonkeys/ortho75/rules.mk | 14 -------------- .../practice65/{info.json => keyboard.json} | 11 +++++++++++ keyboards/cannonkeys/practice65/rules.mk | 13 ------------- .../cu24/{info.json => keyboard.json} | 10 ++++++++++ keyboards/capsunlocked/cu24/rules.mk | 12 ------------ .../cu65/{info.json => keyboard.json} | 8 ++++++++ keyboards/capsunlocked/cu65/rules.mk | 12 ------------ .../cu7/{info.json => keyboard.json} | 10 ++++++++++ keyboards/capsunlocked/cu7/rules.mk | 13 ------------- .../cu80/v1/{info.json => keyboard.json} | 8 ++++++++ keyboards/capsunlocked/cu80/v1/rules.mk | 12 ------------ keyboards/carbo65/{info.json => keyboard.json} | 8 ++++++++ keyboards/carbo65/rules.mk | 13 ------------- keyboards/catch22/{info.json => keyboard.json} | 9 +++++++++ keyboards/catch22/rules.mk | 12 ------------ .../cest73/tkm/{info.json => keyboard.json} | 9 +++++++++ keyboards/cest73/tkm/rules.mk | 12 ------------ keyboards/chalice/{info.json => keyboard.json} | 9 +++++++++ keyboards/chalice/rules.mk | 12 ------------ keyboards/chaos65/{info.json => keyboard.json} | 8 ++++++++ keyboards/chaos65/rules.mk | 12 ------------ .../charue/charon/{info.json => keyboard.json} | 8 ++++++++ keyboards/charue/charon/rules.mk | 12 ------------ .../sunsetter/{info.json => keyboard.json} | 8 ++++++++ keyboards/charue/sunsetter/rules.mk | 13 ------------- .../sunsetter_r2/{info.json => keyboard.json} | 9 +++++++++ keyboards/charue/sunsetter_r2/rules.mk | 12 ------------ .../chavdai40/rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/chavdai40/rev1/rules.mk | 12 ------------ .../chavdai40/rev2/{info.json => keyboard.json} | 8 ++++++++ keyboards/chavdai40/rev2/rules.mk | 12 ------------ .../axon40/{info.json => keyboard.json} | 9 +++++++++ keyboards/checkerboards/axon40/rules.mk | 12 ------------ .../candybar_ortho/{info.json => keyboard.json} | 9 +++++++++ keyboards/checkerboards/candybar_ortho/rules.mk | 12 ------------ .../g_idb60/{info.json => keyboard.json} | 8 ++++++++ keyboards/checkerboards/g_idb60/rules.mk | 12 ------------ .../nop60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/checkerboards/nop60/rules.mk | 12 ------------ .../plexus75/{info.json => keyboard.json} | 10 ++++++++++ keyboards/checkerboards/plexus75/rules.mk | 13 ------------- .../plexus75_he/{info.json => keyboard.json} | 9 +++++++++ keyboards/checkerboards/plexus75_he/rules.mk | 12 ------------ .../pursuit40/{info.json => keyboard.json} | 9 +++++++++ keyboards/checkerboards/pursuit40/rules.mk | 12 ------------ .../quark_lp/{info.json => keyboard.json} | 9 +++++++++ keyboards/checkerboards/quark_lp/rules.mk | 13 ------------- .../quark_plus/{info.json => keyboard.json} | 11 +++++++++++ keyboards/checkerboards/quark_plus/rules.mk | 13 ------------- .../ud40_ortho_alt/{info.json => keyboard.json} | 10 ++++++++++ keyboards/checkerboards/ud40_ortho_alt/rules.mk | 14 -------------- .../cb1800/{info.json => keyboard.json} | 9 +++++++++ keyboards/cherrybstudio/cb1800/rules.mk | 12 ------------ .../cb65/{info.json => keyboard.json} | 9 +++++++++ keyboards/cherrybstudio/cb65/rules.mk | 13 ------------- .../cb87/{info.json => keyboard.json} | 10 ++++++++++ keyboards/cherrybstudio/cb87/rules.mk | 12 ------------ .../cb87rgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/cherrybstudio/cb87rgb/rules.mk | 14 -------------- .../cb87v2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/cherrybstudio/cb87v2/rules.mk | 12 ------------ .../curiosity/{info.json => keyboard.json} | 9 +++++++++ keyboards/cheshire/curiosity/rules.mk | 11 ----------- .../chickenman/ciel/{info.json => keyboard.json} | 8 ++++++++ keyboards/chickenman/ciel/rules.mk | 12 ------------ .../chlx/merro60/{info.json => keyboard.json} | 8 ++++++++ keyboards/chlx/merro60/rules.mk | 12 ------------ .../chocofly/v1/{info.json => keyboard.json} | 9 +++++++++ keyboards/chocofly/v1/rules.mk | 14 -------------- keyboards/chocv/{info.json => keyboard.json} | 8 ++++++++ keyboards/chocv/rules.mk | 12 ------------ keyboards/ck60i/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ck60i/rules.mk | 13 ------------- .../handwire_101/{info.json => keyboard.json} | 8 ++++++++ keyboards/ckeys/handwire_101/rules.mk | 11 ----------- .../ckeys/nakey/{info.json => keyboard.json} | 8 ++++++++ keyboards/ckeys/nakey/rules.mk | 11 ----------- .../ckeys/obelus/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ckeys/obelus/rules.mk | 12 ------------ .../ckeys/thedora/{info.json => keyboard.json} | 11 +++++++++++ keyboards/ckeys/thedora/rules.mk | 15 --------------- .../washington/{info.json => keyboard.json} | 11 +++++++++++ keyboards/ckeys/washington/rules.mk | 14 -------------- .../bookerboard/{info.json => keyboard.json} | 8 ++++++++ keyboards/clawsome/bookerboard/rules.mk | 12 ------------ .../clawsome/coupe/{info.json => keyboard.json} | 8 ++++++++ keyboards/clawsome/coupe/rules.mk | 12 ------------ .../clawsome/doodle/{info.json => keyboard.json} | 8 ++++++++ keyboards/clawsome/doodle/rules.mk | 12 ------------ .../fightpad/{info.json => keyboard.json} | 8 ++++++++ keyboards/clawsome/fightpad/rules.mk | 12 ------------ .../gamebuddy/v1_0/{info.json => keyboard.json} | 8 ++++++++ keyboards/clawsome/gamebuddy/v1_0/rules.mk | 12 ------------ .../gamebuddy/v1_m/{info.json => keyboard.json} | 8 ++++++++ keyboards/clawsome/gamebuddy/v1_m/rules.mk | 12 ------------ .../hatchback/{info.json => keyboard.json} | 8 ++++++++ keyboards/clawsome/hatchback/rules.mk | 12 ------------ .../luggage_rack/{info.json => keyboard.json} | 8 ++++++++ keyboards/clawsome/luggage_rack/rules.mk | 12 ------------ .../numeros/{info.json => keyboard.json} | 8 ++++++++ keyboards/clawsome/numeros/rules.mk | 12 ------------ .../roadster/{info.json => keyboard.json} | 8 ++++++++ keyboards/clawsome/roadster/rules.mk | 12 ------------ .../clawsome/sedan/{info.json => keyboard.json} | 8 ++++++++ keyboards/clawsome/sedan/rules.mk | 12 ------------ .../sidekick/{info.json => keyboard.json} | 8 ++++++++ keyboards/clawsome/sidekick/rules.mk | 12 ------------ .../clawsome/suv/{info.json => keyboard.json} | 8 ++++++++ keyboards/clawsome/suv/rules.mk | 12 ------------ .../fuji65/{info.json => keyboard.json} | 9 +++++++++ keyboards/cmm_studio/fuji65/rules.mk | 15 --------------- .../saka68/hotswap/{info.json => keyboard.json} | 8 ++++++++ keyboards/cmm_studio/saka68/hotswap/rules.mk | 12 ------------ .../saka68/solder/{info.json => keyboard.json} | 8 ++++++++ keyboards/cmm_studio/saka68/solder/rules.mk | 12 ------------ .../cordillera/{info.json => keyboard.json} | 9 +++++++++ keyboards/coarse/cordillera/rules.mk | 13 ------------- .../coban/pad3a/{info.json => keyboard.json} | 9 +++++++++ keyboards/coban/pad3a/rules.mk | 3 --- keyboards/compound/{info.json => keyboard.json} | 8 ++++++++ keyboards/compound/rules.mk | 12 ------------ keyboards/contender/{info.json => keyboard.json} | 9 +++++++++ keyboards/contender/rules.mk | 12 ------------ .../a1200/miss1200/{info.json => keyboard.json} | 8 ++++++++ keyboards/converter/a1200/miss1200/rules.mk | 12 ------------ .../a1200/teensy2pp/{info.json => keyboard.json} | 8 ++++++++ keyboards/converter/a1200/teensy2pp/rules.mk | 12 ------------ .../{info.json => keyboard.json} | 8 ++++++++ keyboards/converter/numeric_keypad_iie/rules.mk | 12 ------------ keyboards/cool836a/{info.json => keyboard.json} | 8 ++++++++ keyboards/cool836a/rules.mk | 12 ------------ .../click_pad_v1/{info.json => keyboard.json} | 9 +++++++++ keyboards/copenhagen_click/click_pad_v1/rules.mk | 12 ------------ .../discipad/{info.json => keyboard.json} | 8 ++++++++ keyboards/coseyfannitutti/discipad/rules.mk | 12 ------------ .../mullet/{info.json => keyboard.json} | 9 +++++++++ keyboards/coseyfannitutti/mullet/rules.mk | 12 ------------ .../mulletpad/{info.json => keyboard.json} | 8 ++++++++ keyboards/coseyfannitutti/mulletpad/rules.mk | 12 ------------ .../romeo/{info.json => keyboard.json} | 8 ++++++++ keyboards/coseyfannitutti/romeo/rules.mk | 12 ------------ keyboards/cosmo65/{info.json => keyboard.json} | 9 +++++++++ keyboards/cosmo65/rules.mk | 12 ------------ .../bloomer/v2/{info.json => keyboard.json} | 9 +++++++++ keyboards/cozykeys/bloomer/v2/rules.mk | 12 ------------ .../bloomer/v3/{info.json => keyboard.json} | 9 +++++++++ keyboards/cozykeys/bloomer/v3/rules.mk | 12 ------------ .../speedo/v2/{info.json => keyboard.json} | 8 ++++++++ keyboards/cozykeys/speedo/v2/rules.mk | 12 ------------ keyboards/craftwalk/{info.json => keyboard.json} | 9 +++++++++ keyboards/craftwalk/rules.mk | 12 ------------ keyboards/crawlpad/{info.json => keyboard.json} | 8 ++++++++ keyboards/crawlpad/rules.mk | 12 ------------ .../{info.json => keyboard.json} | 9 +++++++++ keyboards/crazy_keyboard_68/rules.mk | 12 ------------ keyboards/crbn/{info.json => keyboard.json} | 9 +++++++++ keyboards/crbn/rules.mk | 13 ------------- .../glacier/{info.json => keyboard.json} | 8 ++++++++ keyboards/creatkeebs/glacier/rules.mk | 12 ------------ .../thera/{info.json => keyboard.json} | 8 ++++++++ keyboards/creatkeebs/thera/rules.mk | 12 ------------ keyboards/crin/{info.json => keyboard.json} | 8 ++++++++ keyboards/crin/rules.mk | 13 ------------- .../borsdorf/{info.json => keyboard.json} | 8 ++++++++ keyboards/cutie_club/borsdorf/rules.mk | 12 ------------ .../giant_macro_pad/{info.json => keyboard.json} | 8 ++++++++ keyboards/cutie_club/giant_macro_pad/rules.mk | 12 ------------ .../keebcats/denis/{info.json => keyboard.json} | 8 ++++++++ keyboards/cutie_club/keebcats/denis/rules.mk | 12 ------------ .../keebcats/dougal/{info.json => keyboard.json} | 8 ++++++++ keyboards/cutie_club/keebcats/dougal/rules.mk | 12 ------------ .../novus/{info.json => keyboard.json} | 8 ++++++++ keyboards/cutie_club/novus/rules.mk | 12 ------------ .../wraith/{info.json => keyboard.json} | 8 ++++++++ keyboards/cutie_club/wraith/rules.mk | 12 ------------ keyboards/cx60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/cx60/rules.mk | 12 ------------ .../macro25/{info.json => keyboard.json} | 8 ++++++++ keyboards/cybergear/macro25/rules.mk | 12 ------------ .../dailycraft/owl8/{info.json => keyboard.json} | 9 +++++++++ keyboards/dailycraft/owl8/rules.mk | 14 -------------- .../stickey4/{info.json => keyboard.json} | 9 +++++++++ keyboards/dailycraft/stickey4/rules.mk | 14 -------------- .../daji/seis_cinco/{info.json => keyboard.json} | 8 ++++++++ keyboards/daji/seis_cinco/rules.mk | 13 ------------- keyboards/db/db63/{info.json => keyboard.json} | 10 ++++++++++ keyboards/db/db63/rules.mk | 10 ---------- .../flatbread60/{info.json => keyboard.json} | 9 +++++++++ keyboards/delikeeb/flatbread60/rules.mk | 12 ------------ .../vaguettelite/{info.json => keyboard.json} | 10 ++++++++++ keyboards/delikeeb/vaguettelite/rules.mk | 13 ------------- .../vaneela/{info.json => keyboard.json} | 8 ++++++++ keyboards/delikeeb/vaneela/rules.mk | 12 ------------ .../vaneelaex/{info.json => keyboard.json} | 8 ++++++++ keyboards/delikeeb/vaneelaex/rules.mk | 12 ------------ keyboards/deltapad/{info.json => keyboard.json} | 8 ++++++++ keyboards/deltapad/rules.mk | 12 ------------ keyboards/demiurge/{info.json => keyboard.json} | 9 +++++++++ keyboards/demiurge/rules.mk | 12 ------------ keyboards/deng/djam/{info.json => keyboard.json} | 10 ++++++++++ keyboards/deng/djam/rules.mk | 13 ------------- .../fnrow/v1/{info.json => keyboard.json} | 8 ++++++++ keyboards/dinofizz/fnrow/v1/rules.mk | 13 ------------- keyboards/dk60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/dk60/rules.mk | 14 -------------- .../dm9records/lain/{info.json => keyboard.json} | 8 ++++++++ keyboards/dm9records/lain/rules.mk | 12 ------------ .../dmqdesign/spin/{info.json => keyboard.json} | 11 +++++++++++ keyboards/dmqdesign/spin/rules.mk | 14 -------------- keyboards/do60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/do60/rules.mk | 12 ------------ keyboards/doio/kb30/{info.json => keyboard.json} | 11 +++++++++++ keyboards/doio/kb30/rules.mk | 15 --------------- .../budget96/{info.json => keyboard.json} | 10 ++++++++++ keyboards/donutcables/budget96/rules.mk | 10 ---------- .../scrabblepad/{info.json => keyboard.json} | 8 ++++++++ keyboards/donutcables/scrabblepad/rules.mk | 12 ------------ .../duckboard/{info.json => keyboard.json} | 11 +++++++++++ keyboards/doodboard/duckboard/rules.mk | 15 --------------- .../duckboard_r2/{info.json => keyboard.json} | 11 +++++++++++ keyboards/doodboard/duckboard_r2/rules.mk | 15 --------------- .../doro67/multi/{info.json => keyboard.json} | 9 +++++++++ keyboards/doro67/multi/rules.mk | 12 ------------ .../doro67/regular/{info.json => keyboard.json} | 8 ++++++++ keyboards/doro67/regular/rules.mk | 12 ------------ .../doro67/rgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/doro67/rgb/rules.mk | 13 ------------- .../daisy/{info.json => keyboard.json} | 10 ++++++++++ keyboards/draytronics/daisy/rules.mk | 13 ------------- .../elise/{info.json => keyboard.json} | 9 +++++++++ keyboards/draytronics/elise/rules.mk | 12 ------------ .../elise_v2/{info.json => keyboard.json} | 9 +++++++++ keyboards/draytronics/elise_v2/rules.mk | 12 ------------ .../dtisaac/cg108/{info.json => keyboard.json} | 8 ++++++++ keyboards/dtisaac/cg108/rules.mk | 12 ------------ .../dtisaac01/{info.json => keyboard.json} | 9 +++++++++ keyboards/dtisaac/dtisaac01/rules.mk | 12 ------------ keyboards/dyz/dyz40/{info.json => keyboard.json} | 10 ++++++++++ keyboards/dyz/dyz40/rules.mk | 13 ------------- keyboards/dyz/dyz60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/dyz/dyz60/rules.mk | 13 ------------- .../dyz/dyz60_hs/{info.json => keyboard.json} | 9 +++++++++ keyboards/dyz/dyz60_hs/rules.mk | 13 ------------- .../dyz/dyz_tkl/{info.json => keyboard.json} | 9 +++++++++ keyboards/dyz/dyz_tkl/rules.mk | 12 ------------ .../dyz/selka40/{info.json => keyboard.json} | 10 ++++++++++ keyboards/dyz/selka40/rules.mk | 13 ------------- .../dyz/synthesis60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/dyz/synthesis60/rules.mk | 14 -------------- keyboards/dz60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/dz60/rules.mk | 12 ------------ .../dztech/bocc/{info.json => keyboard.json} | 10 ++++++++++ keyboards/dztech/bocc/rules.mk | 12 ------------ .../dztech/duo_s/{info.json => keyboard.json} | 9 +++++++++ keyboards/dztech/duo_s/rules.mk | 12 ------------ .../dz65rgb/v1/{info.json => keyboard.json} | 9 +++++++++ keyboards/dztech/dz65rgb/v1/rules.mk | 13 ------------- .../dz65rgb/v2/{info.json => keyboard.json} | 9 +++++++++ keyboards/dztech/dz65rgb/v2/rules.mk | 13 ------------- .../dztech/dz96/{info.json => keyboard.json} | 9 +++++++++ keyboards/dztech/dz96/rules.mk | 12 ------------ .../endless80/{info.json => keyboard.json} | 9 +++++++++ keyboards/dztech/endless80/rules.mk | 12 ------------ 484 files changed, 2147 insertions(+), 2980 deletions(-) rename keyboards/abstract/ellipse/rev1/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/abstract/ellipse/rev1/rules.mk rename keyboards/acekeyboard/titan60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/acekeyboard/titan60/rules.mk rename keyboards/acheron/apollo/87h/delta/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/acheron/apollo/87h/delta/rules.mk rename keyboards/acheron/apollo/87htsc/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/acheron/apollo/87htsc/rules.mk rename keyboards/acheron/apollo/88htsc/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/acheron/apollo/88htsc/rules.mk rename keyboards/acheron/arctic/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/acheron/arctic/rules.mk rename keyboards/acheron/austin/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/acheron/austin/rules.mk rename keyboards/acheron/elongate/delta/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/acheron/elongate/delta/rules.mk rename keyboards/acheron/keebspcb/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/acheron/keebspcb/rules.mk rename keyboards/acheron/lasgweloth/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/acheron/lasgweloth/rules.mk rename keyboards/ada/ada1800mini/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ada/ada1800mini/rules.mk rename keyboards/ada/infinity81/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ada/infinity81/rules.mk rename keyboards/adelheid/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/adelheid/rules.mk rename keyboards/adpenrose/akemipad/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/adpenrose/akemipad/rules.mk rename keyboards/adpenrose/kintsugi/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/adpenrose/kintsugi/rules.mk rename keyboards/adpenrose/obi/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/adpenrose/obi/rules.mk rename keyboards/adpenrose/shisaku/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/adpenrose/shisaku/rules.mk rename keyboards/aeboards/aegis/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/aeboards/aegis/rules.mk rename keyboards/afternoonlabs/gust/rev1/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/afternoonlabs/gust/rev1/rules.mk rename keyboards/ai03/andromeda/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ai03/andromeda/rules.mk rename keyboards/ai03/equinox/rev0/{info.json => keyboard.json} (65%) delete mode 100644 keyboards/ai03/equinox/rev0/rules.mk rename keyboards/ai03/equinox/rev1/{info.json => keyboard.json} (63%) delete mode 100644 keyboards/ai03/equinox/rev1/rules.mk rename keyboards/ai03/lunar/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ai03/lunar/rules.mk rename keyboards/ai03/polaris/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ai03/polaris/rules.mk rename keyboards/ai03/quasar/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ai03/quasar/rules.mk rename keyboards/ai03/soyuz/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/ai03/soyuz/rules.mk rename keyboards/ai03/vega/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/ai03/vega/rules.mk rename keyboards/ai03/voyager60_alps/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/ai03/voyager60_alps/rules.mk rename keyboards/akb/eb46/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/akb/eb46/rules.mk rename keyboards/akb/raine/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/akb/raine/rules.mk rename keyboards/alf/dc60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/alf/dc60/rules.mk rename keyboards/alf/x2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/alf/x2/rules.mk rename keyboards/alfredslab/swift65/hotswap/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/alfredslab/swift65/hotswap/rules.mk rename keyboards/alfredslab/swift65/solder/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/alfredslab/swift65/solder/rules.mk rename keyboards/alpha/{info.json => keyboard.json} (92%) delete mode 100755 keyboards/alpha/rules.mk rename keyboards/alpine65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/alpine65/rules.mk rename keyboards/alps64/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/alps64/rules.mk rename keyboards/amag23/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/amag23/rules.mk rename keyboards/amjkeyboard/amj40/{info.json => keyboard.json} (97%) delete mode 100755 keyboards/amjkeyboard/amj40/rules.mk rename keyboards/amjkeyboard/amj60/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/amjkeyboard/amj60/rules.mk rename keyboards/amjkeyboard/amj84/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/amjkeyboard/amj84/rules.mk rename keyboards/amjkeyboard/amjpad/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/amjkeyboard/amjpad/rules.mk rename keyboards/anavi/macropad8/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/anavi/macropad8/rules.mk rename keyboards/ano/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ano/rules.mk rename keyboards/anomalykb/a65i/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/anomalykb/a65i/rules.mk rename keyboards/aos/tkl/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/aos/tkl/rules.mk rename keyboards/aozora/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/aozora/rules.mk rename keyboards/aplyard/aplx6/rev1/{info.json => keyboard.json} (76%) delete mode 100644 keyboards/aplyard/aplx6/rev1/rules.mk rename keyboards/aplyard/aplx6/rev2/{info.json => keyboard.json} (76%) delete mode 100644 keyboards/aplyard/aplx6/rev2/rules.mk rename keyboards/ares/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/ares/rules.mk rename keyboards/arisu/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/arisu/rules.mk rename keyboards/arrayperipherals/1x4p1/{info.json => keyboard.json} (80%) delete mode 100644 keyboards/arrayperipherals/1x4p1/rules.mk rename keyboards/ash1800/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/ash1800/rules.mk rename keyboards/ash_xiix/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/ash_xiix/rules.mk rename keyboards/atlas_65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/atlas_65/rules.mk rename keyboards/atomic/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/atomic/rules.mk rename keyboards/atreus62/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/atreus62/rules.mk rename keyboards/atset/at1/{info.json => keyboard.json} (74%) delete mode 100644 keyboards/atset/at1/rules.mk rename keyboards/atset/at12/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/atset/at12/rules.mk rename keyboards/atset/at16/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/atset/at16/rules.mk rename keyboards/atset/at3/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/atset/at3/rules.mk rename keyboards/atset/at6/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/atset/at6/rules.mk rename keyboards/atset/at9/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/atset/at9/rules.mk rename keyboards/aves60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/aves60/rules.mk rename keyboards/aves65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/aves65/rules.mk rename keyboards/axolstudio/foundation_gamma/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/axolstudio/foundation_gamma/rules.mk rename keyboards/axolstudio/yeti/soldered/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/axolstudio/yeti/soldered/rules.mk rename keyboards/b_sides/rev41lp/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/b_sides/rev41lp/rules.mk rename keyboards/bacca70/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/bacca70/rules.mk rename keyboards/baguette/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/baguette/rules.mk rename keyboards/bantam44/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/bantam44/rules.mk rename keyboards/barracuda/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/barracuda/rules.mk rename keyboards/basekeys/trifecta/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/basekeys/trifecta/rules.mk rename keyboards/beatervan/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/beatervan/rules.mk rename keyboards/bfake/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/bfake/rules.mk rename keyboards/biacco42/meishi/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/biacco42/meishi/rules.mk rename keyboards/biacco42/meishi2/{info.json => keyboard.json} (80%) delete mode 100644 keyboards/biacco42/meishi2/rules.mk rename keyboards/binepad/bn003/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/binepad/bn003/rules.mk rename keyboards/bioi/f60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/bioi/f60/rules.mk rename keyboards/blackplum/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/blackplum/rules.mk rename keyboards/blank/blank01/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/blank/blank01/rules.mk rename keyboards/blaster75/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/blaster75/rules.mk rename keyboards/blockey/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/blockey/rules.mk rename keyboards/boardrun/bizarre/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/boardrun/bizarre/rules.mk rename keyboards/boardrun/classic/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/boardrun/classic/rules.mk rename keyboards/boardwalk/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/boardwalk/rules.mk rename keyboards/bobpad/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/bobpad/rules.mk rename keyboards/bolsa/bolsalice/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/bolsa/bolsalice/rules.mk rename keyboards/bolsa/damapad/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/bolsa/damapad/rules.mk rename keyboards/bop/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/bop/rules.mk rename keyboards/boston/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/boston/rules.mk rename keyboards/botanicalkeyboards/fm2u/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/botanicalkeyboards/fm2u/rules.mk rename keyboards/box75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/box75/rules.mk rename keyboards/bpiphany/four_banger/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/bpiphany/four_banger/rules.mk rename keyboards/bpiphany/sixshooter/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/bpiphany/sixshooter/rules.mk rename keyboards/bthlabs/geekpad/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/bthlabs/geekpad/rules.mk rename keyboards/buildakb/potato65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/buildakb/potato65/rules.mk rename keyboards/buildakb/potato65hs/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/buildakb/potato65hs/rules.mk rename keyboards/buildakb/potato65s/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/buildakb/potato65s/rules.mk rename keyboards/cablecardesigns/cypher/rev6/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/cablecardesigns/cypher/rev6/rules.mk rename keyboards/caffeinated/serpent65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/caffeinated/serpent65/rules.mk rename keyboards/cannonkeys/adelie/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/cannonkeys/adelie/rules.mk rename keyboards/cannonkeys/atlas/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/cannonkeys/atlas/rules.mk rename keyboards/cannonkeys/atlas_alps/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/cannonkeys/atlas_alps/rules.mk rename keyboards/cannonkeys/chimera65/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/cannonkeys/chimera65/rules.mk rename keyboards/cannonkeys/hoodrowg/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/cannonkeys/hoodrowg/rules.mk rename keyboards/cannonkeys/iron165/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/cannonkeys/iron165/rules.mk rename keyboards/cannonkeys/nearfield/{info.json => keyboard.json} (98%) delete mode 100755 keyboards/cannonkeys/nearfield/rules.mk rename keyboards/cannonkeys/ortho48/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/cannonkeys/ortho48/rules.mk rename keyboards/cannonkeys/ortho60/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/cannonkeys/ortho60/rules.mk rename keyboards/cannonkeys/ortho75/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/cannonkeys/ortho75/rules.mk rename keyboards/cannonkeys/practice65/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/cannonkeys/practice65/rules.mk rename keyboards/capsunlocked/cu24/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/capsunlocked/cu24/rules.mk rename keyboards/capsunlocked/cu65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/capsunlocked/cu65/rules.mk rename keyboards/capsunlocked/cu7/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/capsunlocked/cu7/rules.mk rename keyboards/capsunlocked/cu80/v1/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/capsunlocked/cu80/v1/rules.mk rename keyboards/carbo65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/carbo65/rules.mk rename keyboards/catch22/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/catch22/rules.mk rename keyboards/cest73/tkm/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/cest73/tkm/rules.mk rename keyboards/chalice/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/chalice/rules.mk rename keyboards/chaos65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/chaos65/rules.mk rename keyboards/charue/charon/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/charue/charon/rules.mk rename keyboards/charue/sunsetter/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/charue/sunsetter/rules.mk rename keyboards/charue/sunsetter_r2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/charue/sunsetter_r2/rules.mk rename keyboards/chavdai40/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/chavdai40/rev1/rules.mk rename keyboards/chavdai40/rev2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/chavdai40/rev2/rules.mk rename keyboards/checkerboards/axon40/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/checkerboards/axon40/rules.mk rename keyboards/checkerboards/candybar_ortho/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/checkerboards/candybar_ortho/rules.mk rename keyboards/checkerboards/g_idb60/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/checkerboards/g_idb60/rules.mk rename keyboards/checkerboards/nop60/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/checkerboards/nop60/rules.mk rename keyboards/checkerboards/plexus75/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/checkerboards/plexus75/rules.mk rename keyboards/checkerboards/plexus75_he/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/checkerboards/plexus75_he/rules.mk rename keyboards/checkerboards/pursuit40/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/checkerboards/pursuit40/rules.mk rename keyboards/checkerboards/quark_lp/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/checkerboards/quark_lp/rules.mk rename keyboards/checkerboards/quark_plus/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/checkerboards/quark_plus/rules.mk rename keyboards/checkerboards/ud40_ortho_alt/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/checkerboards/ud40_ortho_alt/rules.mk rename keyboards/cherrybstudio/cb1800/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/cherrybstudio/cb1800/rules.mk rename keyboards/cherrybstudio/cb65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/cherrybstudio/cb65/rules.mk rename keyboards/cherrybstudio/cb87/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/cherrybstudio/cb87/rules.mk rename keyboards/cherrybstudio/cb87rgb/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/cherrybstudio/cb87rgb/rules.mk rename keyboards/cherrybstudio/cb87v2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/cherrybstudio/cb87v2/rules.mk rename keyboards/cheshire/curiosity/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/cheshire/curiosity/rules.mk rename keyboards/chickenman/ciel/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/chickenman/ciel/rules.mk rename keyboards/chlx/merro60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/chlx/merro60/rules.mk rename keyboards/chocofly/v1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/chocofly/v1/rules.mk rename keyboards/chocv/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/chocv/rules.mk rename keyboards/ck60i/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/ck60i/rules.mk rename keyboards/ckeys/handwire_101/{info.json => keyboard.json} (89%) delete mode 100755 keyboards/ckeys/handwire_101/rules.mk rename keyboards/ckeys/nakey/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/ckeys/nakey/rules.mk rename keyboards/ckeys/obelus/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/ckeys/obelus/rules.mk rename keyboards/ckeys/thedora/{info.json => keyboard.json} (88%) delete mode 100755 keyboards/ckeys/thedora/rules.mk rename keyboards/ckeys/washington/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/ckeys/washington/rules.mk rename keyboards/clawsome/bookerboard/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/clawsome/bookerboard/rules.mk rename keyboards/clawsome/coupe/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/clawsome/coupe/rules.mk rename keyboards/clawsome/doodle/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/clawsome/doodle/rules.mk rename keyboards/clawsome/fightpad/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/clawsome/fightpad/rules.mk rename keyboards/clawsome/gamebuddy/v1_0/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/clawsome/gamebuddy/v1_0/rules.mk rename keyboards/clawsome/gamebuddy/v1_m/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/clawsome/gamebuddy/v1_m/rules.mk rename keyboards/clawsome/hatchback/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/clawsome/hatchback/rules.mk rename keyboards/clawsome/luggage_rack/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/clawsome/luggage_rack/rules.mk rename keyboards/clawsome/numeros/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/clawsome/numeros/rules.mk rename keyboards/clawsome/roadster/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/clawsome/roadster/rules.mk rename keyboards/clawsome/sedan/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/clawsome/sedan/rules.mk rename keyboards/clawsome/sidekick/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/clawsome/sidekick/rules.mk rename keyboards/clawsome/suv/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/clawsome/suv/rules.mk rename keyboards/cmm_studio/fuji65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/cmm_studio/fuji65/rules.mk rename keyboards/cmm_studio/saka68/hotswap/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/cmm_studio/saka68/hotswap/rules.mk rename keyboards/cmm_studio/saka68/solder/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/cmm_studio/saka68/solder/rules.mk rename keyboards/coarse/cordillera/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/coarse/cordillera/rules.mk rename keyboards/coban/pad3a/{info.json => keyboard.json} (80%) delete mode 100644 keyboards/coban/pad3a/rules.mk rename keyboards/compound/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/compound/rules.mk rename keyboards/contender/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/contender/rules.mk rename keyboards/converter/a1200/miss1200/{info.json => keyboard.json} (75%) delete mode 100644 keyboards/converter/a1200/miss1200/rules.mk rename keyboards/converter/a1200/teensy2pp/{info.json => keyboard.json} (74%) delete mode 100644 keyboards/converter/a1200/teensy2pp/rules.mk rename keyboards/converter/numeric_keypad_iie/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/converter/numeric_keypad_iie/rules.mk rename keyboards/cool836a/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/cool836a/rules.mk rename keyboards/copenhagen_click/click_pad_v1/{info.json => keyboard.json} (76%) delete mode 100755 keyboards/copenhagen_click/click_pad_v1/rules.mk rename keyboards/coseyfannitutti/discipad/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/coseyfannitutti/discipad/rules.mk rename keyboards/coseyfannitutti/mullet/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/coseyfannitutti/mullet/rules.mk rename keyboards/coseyfannitutti/mulletpad/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/coseyfannitutti/mulletpad/rules.mk rename keyboards/coseyfannitutti/romeo/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/coseyfannitutti/romeo/rules.mk rename keyboards/cosmo65/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/cosmo65/rules.mk rename keyboards/cozykeys/bloomer/v2/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/cozykeys/bloomer/v2/rules.mk rename keyboards/cozykeys/bloomer/v3/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/cozykeys/bloomer/v3/rules.mk rename keyboards/cozykeys/speedo/v2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/cozykeys/speedo/v2/rules.mk rename keyboards/craftwalk/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/craftwalk/rules.mk rename keyboards/crawlpad/{info.json => keyboard.json} (91%) delete mode 100755 keyboards/crawlpad/rules.mk rename keyboards/crazy_keyboard_68/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/crazy_keyboard_68/rules.mk rename keyboards/crbn/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/crbn/rules.mk rename keyboards/creatkeebs/glacier/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/creatkeebs/glacier/rules.mk rename keyboards/creatkeebs/thera/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/creatkeebs/thera/rules.mk rename keyboards/crin/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/crin/rules.mk rename keyboards/cutie_club/borsdorf/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/cutie_club/borsdorf/rules.mk rename keyboards/cutie_club/giant_macro_pad/{info.json => keyboard.json} (99%) delete mode 100755 keyboards/cutie_club/giant_macro_pad/rules.mk rename keyboards/cutie_club/keebcats/denis/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/cutie_club/keebcats/denis/rules.mk rename keyboards/cutie_club/keebcats/dougal/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/cutie_club/keebcats/dougal/rules.mk rename keyboards/cutie_club/novus/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/cutie_club/novus/rules.mk rename keyboards/cutie_club/wraith/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/cutie_club/wraith/rules.mk rename keyboards/cx60/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/cx60/rules.mk rename keyboards/cybergear/macro25/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/cybergear/macro25/rules.mk rename keyboards/dailycraft/owl8/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/dailycraft/owl8/rules.mk rename keyboards/dailycraft/stickey4/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/dailycraft/stickey4/rules.mk rename keyboards/daji/seis_cinco/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/daji/seis_cinco/rules.mk rename keyboards/db/db63/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/db/db63/rules.mk rename keyboards/delikeeb/flatbread60/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/delikeeb/flatbread60/rules.mk rename keyboards/delikeeb/vaguettelite/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/delikeeb/vaguettelite/rules.mk rename keyboards/delikeeb/vaneela/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/delikeeb/vaneela/rules.mk rename keyboards/delikeeb/vaneelaex/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/delikeeb/vaneelaex/rules.mk rename keyboards/deltapad/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/deltapad/rules.mk rename keyboards/demiurge/{info.json => keyboard.json} (98%) delete mode 100755 keyboards/demiurge/rules.mk rename keyboards/deng/djam/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/deng/djam/rules.mk rename keyboards/dinofizz/fnrow/v1/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/dinofizz/fnrow/v1/rules.mk rename keyboards/dk60/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/dk60/rules.mk rename keyboards/dm9records/lain/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/dm9records/lain/rules.mk rename keyboards/dmqdesign/spin/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/dmqdesign/spin/rules.mk rename keyboards/do60/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/do60/rules.mk rename keyboards/doio/kb30/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/doio/kb30/rules.mk rename keyboards/donutcables/budget96/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/donutcables/budget96/rules.mk rename keyboards/donutcables/scrabblepad/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/donutcables/scrabblepad/rules.mk rename keyboards/doodboard/duckboard/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/doodboard/duckboard/rules.mk rename keyboards/doodboard/duckboard_r2/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/doodboard/duckboard_r2/rules.mk rename keyboards/doro67/multi/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/doro67/multi/rules.mk rename keyboards/doro67/regular/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/doro67/regular/rules.mk rename keyboards/doro67/rgb/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/doro67/rgb/rules.mk rename keyboards/draytronics/daisy/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/draytronics/daisy/rules.mk rename keyboards/draytronics/elise/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/draytronics/elise/rules.mk rename keyboards/draytronics/elise_v2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/draytronics/elise_v2/rules.mk rename keyboards/dtisaac/cg108/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/dtisaac/cg108/rules.mk rename keyboards/dtisaac/dtisaac01/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/dtisaac/dtisaac01/rules.mk rename keyboards/dyz/dyz40/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/dyz/dyz40/rules.mk rename keyboards/dyz/dyz60/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/dyz/dyz60/rules.mk rename keyboards/dyz/dyz60_hs/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/dyz/dyz60_hs/rules.mk rename keyboards/dyz/dyz_tkl/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/dyz/dyz_tkl/rules.mk rename keyboards/dyz/selka40/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/dyz/selka40/rules.mk rename keyboards/dyz/synthesis60/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/dyz/synthesis60/rules.mk rename keyboards/dz60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/dz60/rules.mk rename keyboards/dztech/bocc/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/dztech/bocc/rules.mk rename keyboards/dztech/duo_s/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/dztech/duo_s/rules.mk rename keyboards/dztech/dz65rgb/v1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/dztech/dz65rgb/v1/rules.mk rename keyboards/dztech/dz65rgb/v2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/dztech/dz65rgb/v2/rules.mk rename keyboards/dztech/dz96/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/dztech/dz96/rules.mk rename keyboards/dztech/endless80/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/dztech/endless80/rules.mk diff --git a/keyboards/abstract/ellipse/rev1/info.json b/keyboards/abstract/ellipse/rev1/keyboard.json similarity index 85% rename from keyboards/abstract/ellipse/rev1/info.json rename to keyboards/abstract/ellipse/rev1/keyboard.json index 341b5229265..31a17301a7a 100644 --- a/keyboards/abstract/ellipse/rev1/info.json +++ b/keyboards/abstract/ellipse/rev1/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "B6", "B5"], "rows": ["D3", "C7"] diff --git a/keyboards/abstract/ellipse/rev1/rules.mk b/keyboards/abstract/ellipse/rev1/rules.mk deleted file mode 100644 index e0bcc619523..00000000000 --- a/keyboards/abstract/ellipse/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = no # Audio output -ENCODER_ENABLE = yes # Enable support for rotary encoders diff --git a/keyboards/acekeyboard/titan60/info.json b/keyboards/acekeyboard/titan60/keyboard.json similarity index 99% rename from keyboards/acekeyboard/titan60/info.json rename to keyboards/acekeyboard/titan60/keyboard.json index 8f11e1df071..3111e1e9d7f 100644 --- a/keyboards/acekeyboard/titan60/info.json +++ b/keyboards/acekeyboard/titan60/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x5449", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "F0", "F1"] diff --git a/keyboards/acekeyboard/titan60/rules.mk b/keyboards/acekeyboard/titan60/rules.mk deleted file mode 100644 index 63a5839b10b..00000000000 --- a/keyboards/acekeyboard/titan60/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 = 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 diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/keyboard.json similarity index 97% rename from keyboards/acheron/apollo/87h/delta/info.json rename to keyboards/acheron/apollo/87h/delta/keyboard.json index 729512839ff..c2d5e206923 100644 --- a/keyboards/acheron/apollo/87h/delta/info.json +++ b/keyboards/acheron/apollo/87h/delta/keyboard.json @@ -59,6 +59,15 @@ "driver": "ws2812", "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] diff --git a/keyboards/acheron/apollo/87h/delta/rules.mk b/keyboards/acheron/apollo/87h/delta/rules.mk deleted file mode 100644 index 723724b7aa2..00000000000 --- a/keyboards/acheron/apollo/87h/delta/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 = 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 - diff --git a/keyboards/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/keyboard.json similarity index 97% rename from keyboards/acheron/apollo/87htsc/info.json rename to keyboards/acheron/apollo/87htsc/keyboard.json index 91e2cb320e2..5f7d30e65a3 100644 --- a/keyboards/acheron/apollo/87htsc/info.json +++ b/keyboards/acheron/apollo/87htsc/keyboard.json @@ -63,6 +63,15 @@ "driver": "ws2812", "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] diff --git a/keyboards/acheron/apollo/87htsc/rules.mk b/keyboards/acheron/apollo/87htsc/rules.mk deleted file mode 100644 index 723724b7aa2..00000000000 --- a/keyboards/acheron/apollo/87htsc/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 = 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 - diff --git a/keyboards/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/keyboard.json similarity index 97% rename from keyboards/acheron/apollo/88htsc/info.json rename to keyboards/acheron/apollo/88htsc/keyboard.json index 17c12b3bebc..e29300019ca 100644 --- a/keyboards/acheron/apollo/88htsc/info.json +++ b/keyboards/acheron/apollo/88htsc/keyboard.json @@ -63,6 +63,15 @@ "driver": "ws2812", "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] diff --git a/keyboards/acheron/apollo/88htsc/rules.mk b/keyboards/acheron/apollo/88htsc/rules.mk deleted file mode 100644 index 723724b7aa2..00000000000 --- a/keyboards/acheron/apollo/88htsc/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 = 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 - diff --git a/keyboards/acheron/arctic/info.json b/keyboards/acheron/arctic/keyboard.json similarity index 97% rename from keyboards/acheron/arctic/info.json rename to keyboards/acheron/arctic/keyboard.json index 22eb5763bbd..e8c9e92f61c 100644 --- a/keyboards/acheron/arctic/info.json +++ b/keyboards/acheron/arctic/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4152", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8"], "rows": ["B7", "B6", "A6", "A7", "B1"] diff --git a/keyboards/acheron/arctic/rules.mk b/keyboards/acheron/arctic/rules.mk deleted file mode 100644 index 7f4f202a1b7..00000000000 --- a/keyboards/acheron/arctic/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 -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 - diff --git a/keyboards/acheron/austin/info.json b/keyboards/acheron/austin/keyboard.json similarity index 99% rename from keyboards/acheron/austin/info.json rename to keyboards/acheron/austin/keyboard.json index d36258fb92c..6c467a7da05 100755 --- a/keyboards/acheron/austin/info.json +++ b/keyboards/acheron/austin/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4175", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A5", "A15", "B3", "B4", "B5", "B8", "A3", "C15", "C14", "F1"], "rows": ["C13", "A4", "A7", "B0", "B1", "B2"] diff --git a/keyboards/acheron/austin/rules.mk b/keyboards/acheron/austin/rules.mk deleted file mode 100644 index a5089d51a5b..00000000000 --- a/keyboards/acheron/austin/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 = 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/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/keyboard.json similarity index 95% rename from keyboards/acheron/elongate/delta/info.json rename to keyboards/acheron/elongate/delta/keyboard.json index 19991ecb861..33fc5b55ddd 100644 --- a/keyboards/acheron/elongate/delta/info.json +++ b/keyboards/acheron/elongate/delta/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x454D", "device_version": "0.0.2" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B14", "B12", "B11", "B10", "B2", "B1", "A7", "A5", "B9", "B8", "B7", "B6"], "rows": ["B3", "A15", "B0", "B4", "B5"] diff --git a/keyboards/acheron/elongate/delta/rules.mk b/keyboards/acheron/elongate/delta/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/acheron/elongate/delta/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/acheron/keebspcb/info.json b/keyboards/acheron/keebspcb/keyboard.json similarity index 95% rename from keyboards/acheron/keebspcb/info.json rename to keyboards/acheron/keebspcb/keyboard.json index 9609611059b..1017cf47ecf 100644 --- a/keyboards/acheron/keebspcb/info.json +++ b/keyboards/acheron/keebspcb/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4B45", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B12", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B6", "B5"], "rows": ["B4", "B3", "A2", "A3", "A4"] diff --git a/keyboards/acheron/keebspcb/rules.mk b/keyboards/acheron/keebspcb/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/acheron/keebspcb/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 = 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/acheron/lasgweloth/info.json b/keyboards/acheron/lasgweloth/keyboard.json similarity index 97% rename from keyboards/acheron/lasgweloth/info.json rename to keyboards/acheron/lasgweloth/keyboard.json index 653af34452f..ccdf9d6f302 100644 --- a/keyboards/acheron/lasgweloth/info.json +++ b/keyboards/acheron/lasgweloth/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x7641", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B12", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5", "A4", "B7"], "rows": ["B9", "B8", "A3", "B0", "B1"] diff --git a/keyboards/acheron/lasgweloth/rules.mk b/keyboards/acheron/lasgweloth/rules.mk deleted file mode 100644 index 5b6b0c92991..00000000000 --- a/keyboards/acheron/lasgweloth/rules.mk +++ /dev/null @@ -1,14 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no - diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/keyboard.json similarity index 96% rename from keyboards/ada/ada1800mini/info.json rename to keyboards/ada/ada1800mini/keyboard.json index 22cac5ade4d..80e8ee64aa5 100644 --- a/keyboards/ada/ada1800mini/info.json +++ b/keyboards/ada/ada1800mini/keyboard.json @@ -30,6 +30,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B3", "B2", "B1"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/ada/ada1800mini/rules.mk b/keyboards/ada/ada1800mini/rules.mk deleted file mode 100644 index 7d5bd18e35a..00000000000 --- a/keyboards/ada/ada1800mini/rules.mk +++ /dev/null @@ -1,16 +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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - - -# generated by KBFirmware JSON to QMK Parser -# https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ada/infinity81/info.json b/keyboards/ada/infinity81/keyboard.json similarity index 96% rename from keyboards/ada/infinity81/info.json rename to keyboards/ada/infinity81/keyboard.json index f56b6f92d13..934bd6fca2c 100644 --- a/keyboards/ada/infinity81/info.json +++ b/keyboards/ada/infinity81/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "D0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F1", "F4"], "rows": ["B3", "B2", "B1", "B0", "F6", "B7"] diff --git a/keyboards/ada/infinity81/rules.mk b/keyboards/ada/infinity81/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/ada/infinity81/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/adelheid/info.json b/keyboards/adelheid/keyboard.json similarity index 96% rename from keyboards/adelheid/info.json rename to keyboards/adelheid/keyboard.json index fa203432c12..e066e5d5f18 100644 --- a/keyboards/adelheid/info.json +++ b/keyboards/adelheid/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xAD78", "device_version": "0.0.2" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "F6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "F4", "D1", "D2", "D3", "D5", "F7"] diff --git a/keyboards/adelheid/rules.mk b/keyboards/adelheid/rules.mk deleted file mode 100644 index a1d35866e5c..00000000000 --- a/keyboards/adelheid/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 = 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/keyboard.json similarity index 94% rename from keyboards/adpenrose/akemipad/info.json rename to keyboards/adpenrose/akemipad/keyboard.json index 28ac8d6d4c5..50003fbb5f5 100644 --- a/keyboards/adpenrose/akemipad/info.json +++ b/keyboards/adpenrose/akemipad/keyboard.json @@ -20,6 +20,17 @@ "max_brightness": 175, "sleep": true }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D3", "D2", "F5", "F6", "B2"], "rows": ["D4", "D7", "E6", "B6", "B4", "B5"] diff --git a/keyboards/adpenrose/akemipad/rules.mk b/keyboards/adpenrose/akemipad/rules.mk deleted file mode 100644 index 084dbaec059..00000000000 --- a/keyboards/adpenrose/akemipad/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 = 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 -RGB_MATRIX_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/keyboard.json similarity index 95% rename from keyboards/adpenrose/kintsugi/info.json rename to keyboards/adpenrose/kintsugi/keyboard.json index 42cc69ed7fe..46504298f8a 100644 --- a/keyboards/adpenrose/kintsugi/info.json +++ b/keyboards/adpenrose/kintsugi/keyboard.json @@ -28,6 +28,17 @@ "ws2812": { "pin": "F1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "F0"], "rows": ["B0", "E6", "D7", "C6", "D4", "D2", "F4", "F5", "B5", "B4"] diff --git a/keyboards/adpenrose/kintsugi/rules.mk b/keyboards/adpenrose/kintsugi/rules.mk deleted file mode 100644 index 864f929c81e..00000000000 --- a/keyboards/adpenrose/kintsugi/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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Encoder functionality -OLED_ENABLE = yes # OLED functionality diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/keyboard.json similarity index 97% rename from keyboards/adpenrose/obi/info.json rename to keyboards/adpenrose/obi/keyboard.json index d11e00a50e7..8c1428ca818 100644 --- a/keyboards/adpenrose/obi/info.json +++ b/keyboards/adpenrose/obi/keyboard.json @@ -27,6 +27,16 @@ "ws2812": { "pin": "F7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "B7", "B6", "B4", "B5", "D6", "D5", "D3", "D7", "D4", "D2", "D1", "D0", "B0"], "rows": ["F4", "F5", "C7", "C6"] diff --git a/keyboards/adpenrose/obi/rules.mk b/keyboards/adpenrose/obi/rules.mk deleted file mode 100644 index eef937e03ad..00000000000 --- a/keyboards/adpenrose/obi/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Encoder functionality diff --git a/keyboards/adpenrose/shisaku/info.json b/keyboards/adpenrose/shisaku/keyboard.json similarity index 94% rename from keyboards/adpenrose/shisaku/info.json rename to keyboards/adpenrose/shisaku/keyboard.json index 5ccc7e1d115..1382ee3b62c 100644 --- a/keyboards/adpenrose/shisaku/info.json +++ b/keyboards/adpenrose/shisaku/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "C3", "C4", "D4", "C0", "C1", "C2"], "rows": ["B2", "B0", "B1", "D0", "B4", "D6", "B3", "D7"] diff --git a/keyboards/adpenrose/shisaku/rules.mk b/keyboards/adpenrose/shisaku/rules.mk deleted file mode 100644 index 0fa77115165..00000000000 --- a/keyboards/adpenrose/shisaku/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 = 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 \ No newline at end of file diff --git a/keyboards/aeboards/aegis/info.json b/keyboards/aeboards/aegis/keyboard.json similarity index 99% rename from keyboards/aeboards/aegis/info.json rename to keyboards/aeboards/aegis/keyboard.json index 823e45c8e2e..26414ba55a3 100644 --- a/keyboards/aeboards/aegis/info.json +++ b/keyboards/aeboards/aegis/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0807", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C7", "C6", "B7", "D2", "D3", "B3", "B2", "B1", "B0"], "rows": ["F5", "F6", "E6", "F7", "D1", "D0", "D6", "D4", "B4", "D7", "B6", "B5"] diff --git a/keyboards/aeboards/aegis/rules.mk b/keyboards/aeboards/aegis/rules.mk deleted file mode 100644 index 29eb5c8fbe8..00000000000 --- a/keyboards/aeboards/aegis/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/afternoonlabs/gust/rev1/info.json b/keyboards/afternoonlabs/gust/rev1/keyboard.json similarity index 84% rename from keyboards/afternoonlabs/gust/rev1/info.json rename to keyboards/afternoonlabs/gust/rev1/keyboard.json index 4cfac9dc592..93ad60ad7d6 100644 --- a/keyboards/afternoonlabs/gust/rev1/info.json +++ b/keyboards/afternoonlabs/gust/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D2", "D3"], "rows": ["F5", "F4", "D0"] diff --git a/keyboards/afternoonlabs/gust/rev1/rules.mk b/keyboards/afternoonlabs/gust/rev1/rules.mk deleted file mode 100644 index b48a43e89fc..00000000000 --- a/keyboards/afternoonlabs/gust/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 = 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 \ No newline at end of file diff --git a/keyboards/ai03/andromeda/info.json b/keyboards/ai03/andromeda/keyboard.json similarity index 96% rename from keyboards/ai03/andromeda/info.json rename to keyboards/ai03/andromeda/keyboard.json index fb3cf0d78d6..5a9bf32ef15 100644 --- a/keyboards/ai03/andromeda/info.json +++ b/keyboards/ai03/andromeda/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "B5", "B8", "B9"], "rows": ["B4", "B3", "A15", "A3", "A4", "A5"] diff --git a/keyboards/ai03/andromeda/rules.mk b/keyboards/ai03/andromeda/rules.mk deleted file mode 100644 index 7f4f202a1b7..00000000000 --- a/keyboards/ai03/andromeda/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 -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 - diff --git a/keyboards/ai03/equinox/rev0/info.json b/keyboards/ai03/equinox/rev0/keyboard.json similarity index 65% rename from keyboards/ai03/equinox/rev0/info.json rename to keyboards/ai03/equinox/rev0/keyboard.json index 396f50c3765..e38fada3338 100644 --- a/keyboards/ai03/equinox/rev0/info.json +++ b/keyboards/ai03/equinox/rev0/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C4", "B7", "C6", "C7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6"], "rows": ["D3", "C5", "D4", "D5"] diff --git a/keyboards/ai03/equinox/rev0/rules.mk b/keyboards/ai03/equinox/rev0/rules.mk deleted file mode 100644 index 5e28d2cc453..00000000000 --- a/keyboards/ai03/equinox/rev0/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 = no # Console for debug -COMMAND_ENABLE = yes # 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/ai03/equinox/rev1/info.json b/keyboards/ai03/equinox/rev1/keyboard.json similarity index 63% rename from keyboards/ai03/equinox/rev1/info.json rename to keyboards/ai03/equinox/rev1/keyboard.json index 9c0727f7baa..590a84b31c8 100644 --- a/keyboards/ai03/equinox/rev1/info.json +++ b/keyboards/ai03/equinox/rev1/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D1", "D2", "C6", "C7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6"], "rows": ["D3", "C5", "D4", "D5"] diff --git a/keyboards/ai03/equinox/rev1/rules.mk b/keyboards/ai03/equinox/rev1/rules.mk deleted file mode 100644 index 5e28d2cc453..00000000000 --- a/keyboards/ai03/equinox/rev1/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 = no # Console for debug -COMMAND_ENABLE = yes # 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/ai03/lunar/info.json b/keyboards/ai03/lunar/keyboard.json similarity index 96% rename from keyboards/ai03/lunar/info.json rename to keyboards/ai03/lunar/keyboard.json index 6e7845b136f..8a5bc145765 100644 --- a/keyboards/ai03/lunar/info.json +++ b/keyboards/ai03/lunar/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B3", "D0", "D1", "D2", "D3"] diff --git a/keyboards/ai03/lunar/rules.mk b/keyboards/ai03/lunar/rules.mk deleted file mode 100644 index 0a85fffb85c..00000000000 --- a/keyboards/ai03/lunar/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/ai03/polaris/info.json b/keyboards/ai03/polaris/keyboard.json similarity index 98% rename from keyboards/ai03/polaris/info.json rename to keyboards/ai03/polaris/keyboard.json index dca6df3dbad..169118a0cf6 100644 --- a/keyboards/ai03/polaris/info.json +++ b/keyboards/ai03/polaris/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "F0", "F1"] diff --git a/keyboards/ai03/polaris/rules.mk b/keyboards/ai03/polaris/rules.mk deleted file mode 100644 index 45377383806..00000000000 --- a/keyboards/ai03/polaris/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 = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ai03/quasar/info.json b/keyboards/ai03/quasar/keyboard.json similarity index 96% rename from keyboards/ai03/quasar/info.json rename to keyboards/ai03/quasar/keyboard.json index fc2d39cc3b2..b0514f9e9aa 100644 --- a/keyboards/ai03/quasar/info.json +++ b/keyboards/ai03/quasar/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4"], "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"] diff --git a/keyboards/ai03/quasar/rules.mk b/keyboards/ai03/quasar/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/ai03/quasar/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/ai03/soyuz/info.json b/keyboards/ai03/soyuz/keyboard.json similarity index 93% rename from keyboards/ai03/soyuz/info.json rename to keyboards/ai03/soyuz/keyboard.json index 0c1cd54810f..61e8375dd18 100644 --- a/keyboards/ai03/soyuz/info.json +++ b/keyboards/ai03/soyuz/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0018", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "B3", "D7", "B5"], "rows": ["D4", "C6", "B6", "E6", "B4"] diff --git a/keyboards/ai03/soyuz/rules.mk b/keyboards/ai03/soyuz/rules.mk deleted file mode 100644 index ed40609648d..00000000000 --- a/keyboards/ai03/soyuz/rules.mk +++ /dev/null @@ -1,12 +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 -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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ai03/vega/info.json b/keyboards/ai03/vega/keyboard.json similarity index 99% rename from keyboards/ai03/vega/info.json rename to keyboards/ai03/vega/keyboard.json index 35127edbc24..64eaf5eadd7 100644 --- a/keyboards/ai03/vega/info.json +++ b/keyboards/ai03/vega/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0015", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6"], "rows": ["A1", "A2", "B3", "A15", "A10"] diff --git a/keyboards/ai03/vega/rules.mk b/keyboards/ai03/vega/rules.mk deleted file mode 100644 index 7f4f202a1b7..00000000000 --- a/keyboards/ai03/vega/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 -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 - diff --git a/keyboards/ai03/voyager60_alps/info.json b/keyboards/ai03/voyager60_alps/keyboard.json similarity index 95% rename from keyboards/ai03/voyager60_alps/info.json rename to keyboards/ai03/voyager60_alps/keyboard.json index 440f061432f..9b8fa051b59 100644 --- a/keyboards/ai03/voyager60_alps/info.json +++ b/keyboards/ai03/voyager60_alps/keyboard.json @@ -17,6 +17,15 @@ "ws2812": { "pin": "D2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "F0", "F1"] diff --git a/keyboards/ai03/voyager60_alps/rules.mk b/keyboards/ai03/voyager60_alps/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/ai03/voyager60_alps/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 = 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/akb/eb46/info.json b/keyboards/akb/eb46/keyboard.json similarity index 94% rename from keyboards/akb/eb46/info.json rename to keyboards/akb/eb46/keyboard.json index fafd42cd907..ec00eaa44ee 100644 --- a/keyboards/akb/eb46/info.json +++ b/keyboards/akb/eb46/keyboard.json @@ -7,6 +7,14 @@ "pid": "0xFEED", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "C6"], "rows": ["B5", "B4", "D7", "B6"] diff --git a/keyboards/akb/eb46/rules.mk b/keyboards/akb/eb46/rules.mk deleted file mode 100644 index c58df49ea8f..00000000000 --- a/keyboards/akb/eb46/rules.mk +++ /dev/null @@ -1,12 +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 = 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/akb/raine/info.json b/keyboards/akb/raine/keyboard.json similarity index 96% rename from keyboards/akb/raine/info.json rename to keyboards/akb/raine/keyboard.json index 71490b1e6a2..f3631068fd5 100644 --- a/keyboards/akb/raine/info.json +++ b/keyboards/akb/raine/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "B1", "F1", "F0", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"], "rows": ["E6", "C6", "F7", "B2", "B0"] diff --git a/keyboards/akb/raine/rules.mk b/keyboards/akb/raine/rules.mk deleted file mode 100644 index c58df49ea8f..00000000000 --- a/keyboards/akb/raine/rules.mk +++ /dev/null @@ -1,12 +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 = 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/alf/dc60/info.json b/keyboards/alf/dc60/keyboard.json similarity index 99% rename from keyboards/alf/dc60/info.json rename to keyboards/alf/dc60/keyboard.json index e0aa59f44f6..7fd360d726a 100644 --- a/keyboards/alf/dc60/info.json +++ b/keyboards/alf/dc60/keyboard.json @@ -7,6 +7,16 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/alf/dc60/rules.mk b/keyboards/alf/dc60/rules.mk deleted file mode 100644 index 16be45209b4..00000000000 --- a/keyboards/alf/dc60/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 = 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/keyboard.json similarity index 98% rename from keyboards/alf/x2/info.json rename to keyboards/alf/x2/keyboard.json index a7e76061f68..fe700979327 100644 --- a/keyboards/alf/x2/info.json +++ b/keyboards/alf/x2/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/alf/x2/rules.mk b/keyboards/alf/x2/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/alf/x2/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/keyboard.json similarity index 96% rename from keyboards/alfredslab/swift65/hotswap/info.json rename to keyboards/alfredslab/swift65/hotswap/keyboard.json index 5be2a3798ce..7799374e7cf 100644 --- a/keyboards/alfredslab/swift65/hotswap/info.json +++ b/keyboards/alfredslab/swift65/hotswap/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "D2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D1"], "rows": ["B1", "B2", "B3", "D6", "D4"] diff --git a/keyboards/alfredslab/swift65/hotswap/rules.mk b/keyboards/alfredslab/swift65/hotswap/rules.mk deleted file mode 100644 index bb40a3ee66c..00000000000 --- a/keyboards/alfredslab/swift65/hotswap/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 = 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 \ No newline at end of file diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/keyboard.json similarity index 99% rename from keyboards/alfredslab/swift65/solder/info.json rename to keyboards/alfredslab/swift65/solder/keyboard.json index 83ca4d9b8aa..3bd15e74964 100644 --- a/keyboards/alfredslab/swift65/solder/info.json +++ b/keyboards/alfredslab/swift65/solder/keyboard.json @@ -30,6 +30,15 @@ "ws2812": { "pin": "D2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D1", "D0"], "rows": ["B1", "B2", "B3", "D4", "D6"] diff --git a/keyboards/alfredslab/swift65/solder/rules.mk b/keyboards/alfredslab/swift65/solder/rules.mk deleted file mode 100644 index 2697ebc6d5d..00000000000 --- a/keyboards/alfredslab/swift65/solder/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/alpha/info.json b/keyboards/alpha/keyboard.json similarity index 92% rename from keyboards/alpha/info.json rename to keyboards/alpha/keyboard.json index 61f7f9d437c..f708ad2b9f5 100644 --- a/keyboards/alpha/info.json +++ b/keyboards/alpha/keyboard.json @@ -27,6 +27,15 @@ "ws2812": { "pin": "F4" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], "rows": ["D4", "B4", "B5"] diff --git a/keyboards/alpha/rules.mk b/keyboards/alpha/rules.mk deleted file mode 100755 index ec53f47e70e..00000000000 --- a/keyboards/alpha/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 = 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 -RGBLIGHT_ENABLE = yes diff --git a/keyboards/alpine65/info.json b/keyboards/alpine65/keyboard.json similarity index 96% rename from keyboards/alpine65/info.json rename to keyboards/alpine65/keyboard.json index c0322f72b50..4fccb3c564e 100644 --- a/keyboards/alpine65/info.json +++ b/keyboards/alpine65/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "B15" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A9", "A8", "B14", "B12", "A10", "A0", "A1"], "rows": ["C14", "C15", "C13", "A2", "A3"] diff --git a/keyboards/alpine65/rules.mk b/keyboards/alpine65/rules.mk deleted file mode 100644 index 747e719be4a..00000000000 --- a/keyboards/alpine65/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 -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 -ENCODER_ENABLE = no - diff --git a/keyboards/alps64/info.json b/keyboards/alps64/keyboard.json similarity index 99% rename from keyboards/alps64/info.json rename to keyboards/alps64/keyboard.json index 87a141b53c2..72f21d0c33d 100644 --- a/keyboards/alps64/info.json +++ b/keyboards/alps64/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"], "rows": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2"] diff --git a/keyboards/alps64/rules.mk b/keyboards/alps64/rules.mk deleted file mode 100644 index b07ffbcaaa7..00000000000 --- a/keyboards/alps64/rules.mk +++ /dev/null @@ -1,9 +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 diff --git a/keyboards/amag23/info.json b/keyboards/amag23/keyboard.json similarity index 93% rename from keyboards/amag23/info.json rename to keyboards/amag23/keyboard.json index fd8aa85bbb6..ed37a36e548 100644 --- a/keyboards/amag23/info.json +++ b/keyboards/amag23/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "driver": "i2c" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B4", "B5"], "rows": ["A0", "A1", "A2", "A3"] diff --git a/keyboards/amag23/rules.mk b/keyboards/amag23/rules.mk deleted file mode 100644 index 8bee1e931e8..00000000000 --- a/keyboards/amag23/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/keyboard.json similarity index 97% rename from keyboards/amjkeyboard/amj40/info.json rename to keyboards/amjkeyboard/amj40/keyboard.json index dca520375ab..8ce166728ca 100644 --- a/keyboards/amjkeyboard/amj40/info.json +++ b/keyboards/amjkeyboard/amj40/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6072", "device_version": "0.0.2" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/amjkeyboard/amj40/rules.mk b/keyboards/amjkeyboard/amj40/rules.mk deleted file mode 100755 index 3d5cb57ad50..00000000000 --- a/keyboards/amjkeyboard/amj40/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/keyboard.json similarity index 98% rename from keyboards/amjkeyboard/amj60/info.json rename to keyboards/amjkeyboard/amj60/keyboard.json index 7c626b5a5f3..0b65c742aa4 100644 --- a/keyboards/amjkeyboard/amj60/info.json +++ b/keyboards/amjkeyboard/amj60/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6066", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["F7", "F6", "F5", "F4", "D5"] diff --git a/keyboards/amjkeyboard/amj60/rules.mk b/keyboards/amjkeyboard/amj60/rules.mk deleted file mode 100644 index 262dfb657d1..00000000000 --- a/keyboards/amjkeyboard/amj60/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 = 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/keyboard.json similarity index 99% rename from keyboards/amjkeyboard/amj84/info.json rename to keyboards/amjkeyboard/amj84/keyboard.json index 85832229a33..217b685391f 100644 --- a/keyboards/amjkeyboard/amj84/info.json +++ b/keyboards/amjkeyboard/amj84/keyboard.json @@ -9,6 +9,15 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "D1"], "rows": ["D0", "F7", "F6", "F5", "F4", "D5"] diff --git a/keyboards/amjkeyboard/amj84/rules.mk b/keyboards/amjkeyboard/amj84/rules.mk deleted file mode 100644 index 254b0bc7bd1..00000000000 --- a/keyboards/amjkeyboard/amj84/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 = 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/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/keyboard.json similarity index 94% rename from keyboards/amjkeyboard/amjpad/info.json rename to keyboards/amjkeyboard/amjpad/keyboard.json index fbaa2499d62..bd960d8c8ab 100644 --- a/keyboards/amjkeyboard/amjpad/info.json +++ b/keyboards/amjkeyboard/amjpad/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.3" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F0", "E6", "C7"], "rows": ["F7", "F6", "F5", "F4", "D5", "D0"] diff --git a/keyboards/amjkeyboard/amjpad/rules.mk b/keyboards/amjkeyboard/amjpad/rules.mk deleted file mode 100644 index cd5d6b66ea5..00000000000 --- a/keyboards/amjkeyboard/amjpad/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 = 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 -RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no diff --git a/keyboards/anavi/macropad8/info.json b/keyboards/anavi/macropad8/keyboard.json similarity index 85% rename from keyboards/anavi/macropad8/info.json rename to keyboards/anavi/macropad8/keyboard.json index 63f295069d4..d70d3fa0475 100644 --- a/keyboards/anavi/macropad8/info.json +++ b/keyboards/anavi/macropad8/keyboard.json @@ -35,6 +35,17 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "direct": [ ["D4", "F6", "B5", "E6"], diff --git a/keyboards/anavi/macropad8/rules.mk b/keyboards/anavi/macropad8/rules.mk deleted file mode 100644 index 63d200481c7..00000000000 --- a/keyboards/anavi/macropad8/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 -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 # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -OLED_ENABLE = yes diff --git a/keyboards/ano/info.json b/keyboards/ano/keyboard.json similarity index 96% rename from keyboards/ano/info.json rename to keyboards/ano/keyboard.json index ce88965500b..c522f816ce5 100644 --- a/keyboards/ano/info.json +++ b/keyboards/ano/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0651", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "A5", "A6", "A7", "A8", "A15", "A2", "A1", "A0", "B8", "B13"], "rows": ["A4", "B14", "B15", "B9", "B10", "B11"] diff --git a/keyboards/ano/rules.mk b/keyboards/ano/rules.mk deleted file mode 100644 index f0a88209b69..00000000000 --- a/keyboards/ano/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 -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 -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/anomalykb/a65i/info.json b/keyboards/anomalykb/a65i/keyboard.json similarity index 99% rename from keyboards/anomalykb/a65i/info.json rename to keyboards/anomalykb/a65i/keyboard.json index 553ad35daf7..98015fcd72b 100644 --- a/keyboards/anomalykb/a65i/info.json +++ b/keyboards/anomalykb/a65i/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "D6", "D4", "B4", "B6", "E6", "F1", "B7", "C6", "C7", "D5", "D3", "D2", "F0", "D1", "D0"], "rows": ["B3", "B2", "B1", "B0", "B5"] diff --git a/keyboards/anomalykb/a65i/rules.mk b/keyboards/anomalykb/a65i/rules.mk deleted file mode 100644 index 0df1feb1812..00000000000 --- a/keyboards/anomalykb/a65i/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 = 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/aos/tkl/info.json b/keyboards/aos/tkl/keyboard.json similarity index 96% rename from keyboards/aos/tkl/info.json rename to keyboards/aos/tkl/keyboard.json index 165344004bd..730a262366a 100644 --- a/keyboards/aos/tkl/info.json +++ b/keyboards/aos/tkl/keyboard.json @@ -28,6 +28,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"], "rows": ["D3", "D2", "B7", "F1", "C7", "D5"] diff --git a/keyboards/aos/tkl/rules.mk b/keyboards/aos/tkl/rules.mk deleted file mode 100644 index a927de843cb..00000000000 --- a/keyboards/aos/tkl/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/aozora/info.json b/keyboards/aozora/keyboard.json similarity index 98% rename from keyboards/aozora/info.json rename to keyboards/aozora/keyboard.json index 21db981dab5..6ce231680f5 100644 --- a/keyboards/aozora/info.json +++ b/keyboards/aozora/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xE86A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D2"], "rows": ["F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/aozora/rules.mk b/keyboards/aozora/rules.mk deleted file mode 100644 index 67d4dee2c76..00000000000 --- a/keyboards/aozora/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 -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/aplyard/aplx6/rev1/info.json b/keyboards/aplyard/aplx6/rev1/keyboard.json similarity index 76% rename from keyboards/aplyard/aplx6/rev1/info.json rename to keyboards/aplyard/aplx6/rev1/keyboard.json index 943624fb8f2..e7f59d12c60 100644 --- a/keyboards/aplyard/aplx6/rev1/info.json +++ b/keyboards/aplyard/aplx6/rev1/keyboard.json @@ -3,6 +3,15 @@ "pid": "0x0030", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["F7", "B6", "F4"], "rows": ["E6", "B3"] diff --git a/keyboards/aplyard/aplx6/rev1/rules.mk b/keyboards/aplyard/aplx6/rev1/rules.mk deleted file mode 100644 index 879e2c47a37..00000000000 --- a/keyboards/aplyard/aplx6/rev1/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 -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 -UNICODE_ENABLE = yes # Unicode diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/keyboard.json similarity index 76% rename from keyboards/aplyard/aplx6/rev2/info.json rename to keyboards/aplyard/aplx6/rev2/keyboard.json index 06e0296b684..7cd8d005444 100644 --- a/keyboards/aplyard/aplx6/rev2/info.json +++ b/keyboards/aplyard/aplx6/rev2/keyboard.json @@ -3,6 +3,17 @@ "pid": "0x0040", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "unicode": true + }, "matrix_pins": { "cols": ["C6", "D7", "E6"], "rows": ["B4", "B5"] diff --git a/keyboards/aplyard/aplx6/rev2/rules.mk b/keyboards/aplyard/aplx6/rev2/rules.mk deleted file mode 100644 index bb653a97f2b..00000000000 --- a/keyboards/aplyard/aplx6/rev2/rules.mk +++ /dev/null @@ -1,15 +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 -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 -UNICODE_ENABLE = yes # Unicode -OLED_ENABLE = yes -ENCODER_ENABLE = yes # Enable Support for Encoder diff --git a/keyboards/ares/info.json b/keyboards/ares/keyboard.json similarity index 99% rename from keyboards/ares/info.json rename to keyboards/ares/keyboard.json index 125db97ed28..38945657027 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/ares/rules.mk b/keyboards/ares/rules.mk deleted file mode 100644 index ce73d877e7d..00000000000 --- a/keyboards/ares/rules.mk +++ /dev/null @@ -1,10 +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 -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow diff --git a/keyboards/arisu/info.json b/keyboards/arisu/keyboard.json similarity index 96% rename from keyboards/arisu/info.json rename to keyboards/arisu/keyboard.json index 4e59c2c211a..af1cb819dc9 100644 --- a/keyboards/arisu/info.json +++ b/keyboards/arisu/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/arisu/rules.mk b/keyboards/arisu/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/arisu/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 = 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/arrayperipherals/1x4p1/info.json b/keyboards/arrayperipherals/1x4p1/keyboard.json similarity index 80% rename from keyboards/arrayperipherals/1x4p1/info.json rename to keyboards/arrayperipherals/1x4p1/keyboard.json index 6d450188c96..f9344e35380 100644 --- a/keyboards/arrayperipherals/1x4p1/info.json +++ b/keyboards/arrayperipherals/1x4p1/keyboard.json @@ -15,6 +15,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "direct": [ ["C7", "B7", "D6", "F5", "F7"] diff --git a/keyboards/arrayperipherals/1x4p1/rules.mk b/keyboards/arrayperipherals/1x4p1/rules.mk deleted file mode 100644 index 125977e0276..00000000000 --- a/keyboards/arrayperipherals/1x4p1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 -ENCODER_ENABLE = yes diff --git a/keyboards/ash1800/info.json b/keyboards/ash1800/keyboard.json similarity index 97% rename from keyboards/ash1800/info.json rename to keyboards/ash1800/keyboard.json index 658e76962d8..9e60de6b343 100644 --- a/keyboards/ash1800/info.json +++ b/keyboards/ash1800/keyboard.json @@ -13,6 +13,14 @@ "scroll_lock": "F7", "on_state": 0 }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"], "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"] diff --git a/keyboards/ash1800/rules.mk b/keyboards/ash1800/rules.mk deleted file mode 100644 index d1322df0ab6..00000000000 --- a/keyboards/ash1800/rules.mk +++ /dev/null @@ -1,12 +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 = 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 diff --git a/keyboards/ash_xiix/info.json b/keyboards/ash_xiix/keyboard.json similarity index 97% rename from keyboards/ash_xiix/info.json rename to keyboards/ash_xiix/keyboard.json index d9f99640354..d1e32efec13 100644 --- a/keyboards/ash_xiix/info.json +++ b/keyboards/ash_xiix/keyboard.json @@ -14,6 +14,14 @@ "scroll_lock": "F7", "on_state": 0 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"], "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"] diff --git a/keyboards/ash_xiix/rules.mk b/keyboards/ash_xiix/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/ash_xiix/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 = 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/atlas_65/info.json b/keyboards/atlas_65/keyboard.json similarity index 96% rename from keyboards/atlas_65/info.json rename to keyboards/atlas_65/keyboard.json index 5ed5466d472..896ecf6f20c 100644 --- a/keyboards/atlas_65/info.json +++ b/keyboards/atlas_65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/atlas_65/rules.mk b/keyboards/atlas_65/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/atlas_65/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 = 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/atomic/info.json b/keyboards/atomic/keyboard.json similarity index 97% rename from keyboards/atomic/info.json rename to keyboards/atomic/keyboard.json index 8635648ea03..cb4bddceae5 100644 --- a/keyboards/atomic/info.json +++ b/keyboards/atomic/keyboard.json @@ -7,6 +7,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7", "D3", "D2", "D1"], "rows": ["D0", "D5", "B5", "B6", "C6"] diff --git a/keyboards/atomic/rules.mk b/keyboards/atomic/rules.mk deleted file mode 100644 index 2b1de65bb47..00000000000 --- a/keyboards/atomic/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # 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/atreus62/info.json b/keyboards/atreus62/keyboard.json similarity index 96% rename from keyboards/atreus62/info.json rename to keyboards/atreus62/keyboard.json index d27f97ce974..5263e799df3 100644 --- a/keyboards/atreus62/info.json +++ b/keyboards/atreus62/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6062", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "unicode": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6"], "rows": ["D2", "D3", "D1", "D0", "D4"] diff --git a/keyboards/atreus62/rules.mk b/keyboards/atreus62/rules.mk deleted file mode 100644 index d1f7ba08156..00000000000 --- a/keyboards/atreus62/rules.mk +++ /dev/null @@ -1,11 +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 -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 -UNICODE_ENABLE = yes # Unicode diff --git a/keyboards/atset/at1/info.json b/keyboards/atset/at1/keyboard.json similarity index 74% rename from keyboards/atset/at1/info.json rename to keyboards/atset/at1/keyboard.json index 6948e6bc442..e8fa5f8b5fe 100644 --- a/keyboards/atset/at1/info.json +++ b/keyboards/atset/at1/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6"], "rows": ["D2"] diff --git a/keyboards/atset/at1/rules.mk b/keyboards/atset/at1/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/atset/at1/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 = 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/atset/at12/info.json b/keyboards/atset/at12/keyboard.json similarity index 86% rename from keyboards/atset/at12/info.json rename to keyboards/atset/at12/keyboard.json index c80f434460c..c15ff3f46ea 100644 --- a/keyboards/atset/at12/info.json +++ b/keyboards/atset/at12/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "B5", "B4"], "rows": ["D3", "D2", "D1", "D0"] diff --git a/keyboards/atset/at12/rules.mk b/keyboards/atset/at12/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/atset/at12/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 = 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/atset/at16/info.json b/keyboards/atset/at16/keyboard.json similarity index 88% rename from keyboards/atset/at16/info.json rename to keyboards/atset/at16/keyboard.json index abe1745e7a3..0db5ad692c7 100644 --- a/keyboards/atset/at16/info.json +++ b/keyboards/atset/at16/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "B5", "B4", "B2"], "rows": ["D3", "D2", "D1", "D0"] diff --git a/keyboards/atset/at16/rules.mk b/keyboards/atset/at16/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/atset/at16/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 = 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/atset/at3/info.json b/keyboards/atset/at3/keyboard.json similarity index 78% rename from keyboards/atset/at3/info.json rename to keyboards/atset/at3/keyboard.json index 959bbebce8a..171faf984a0 100644 --- a/keyboards/atset/at3/info.json +++ b/keyboards/atset/at3/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "B5", "B4"], "rows": ["D2"] diff --git a/keyboards/atset/at3/rules.mk b/keyboards/atset/at3/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/atset/at3/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 = 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/atset/at6/info.json b/keyboards/atset/at6/keyboard.json similarity index 82% rename from keyboards/atset/at6/info.json rename to keyboards/atset/at6/keyboard.json index bc8c770692d..c24611f8b74 100644 --- a/keyboards/atset/at6/info.json +++ b/keyboards/atset/at6/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "B5", "B4"], "rows": ["D2", "D1"] diff --git a/keyboards/atset/at6/rules.mk b/keyboards/atset/at6/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/atset/at6/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 = 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/atset/at9/info.json b/keyboards/atset/at9/keyboard.json similarity index 84% rename from keyboards/atset/at9/info.json rename to keyboards/atset/at9/keyboard.json index ee263e71bb3..35bdf95550e 100644 --- a/keyboards/atset/at9/info.json +++ b/keyboards/atset/at9/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "B5", "B4"], "rows": ["D2", "D1", "D0"] diff --git a/keyboards/atset/at9/rules.mk b/keyboards/atset/at9/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/atset/at9/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 = 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/aves60/info.json b/keyboards/aves60/keyboard.json similarity index 99% rename from keyboards/aves60/info.json rename to keyboards/aves60/keyboard.json index 111fcab3bdc..fce12cd9f73 100644 --- a/keyboards/aves60/info.json +++ b/keyboards/aves60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xD408", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B2", "B3", "D0", "D1", "D2", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F6", "F7", "F5", "F1", "F4"] diff --git a/keyboards/aves60/rules.mk b/keyboards/aves60/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/aves60/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 = 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/aves65/info.json b/keyboards/aves65/keyboard.json similarity index 99% rename from keyboards/aves65/info.json rename to keyboards/aves65/keyboard.json index 44299f80c50..fba7dcaf387 100644 --- a/keyboards/aves65/info.json +++ b/keyboards/aves65/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x9038", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6"], "rows": ["D4", "D6", "D7", "B4", "E6"] diff --git a/keyboards/aves65/rules.mk b/keyboards/aves65/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/aves65/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/axolstudio/foundation_gamma/info.json b/keyboards/axolstudio/foundation_gamma/keyboard.json similarity index 98% rename from keyboards/axolstudio/foundation_gamma/info.json rename to keyboards/axolstudio/foundation_gamma/keyboard.json index 230f0cef434..86ba316268c 100644 --- a/keyboards/axolstudio/foundation_gamma/info.json +++ b/keyboards/axolstudio/foundation_gamma/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xE3EB", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "F4", "F1", "F0"], "rows": ["B2", "B1", "B0", "F7", "F6", "F5"] diff --git a/keyboards/axolstudio/foundation_gamma/rules.mk b/keyboards/axolstudio/foundation_gamma/rules.mk deleted file mode 100644 index f84fabb7665..00000000000 --- a/keyboards/axolstudio/foundation_gamma/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/axolstudio/yeti/soldered/info.json b/keyboards/axolstudio/yeti/soldered/keyboard.json similarity index 98% rename from keyboards/axolstudio/yeti/soldered/info.json rename to keyboards/axolstudio/yeti/soldered/keyboard.json index a2b3097716b..9edb8083305 100644 --- a/keyboards/axolstudio/yeti/soldered/info.json +++ b/keyboards/axolstudio/yeti/soldered/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x9F9F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "F0", "F7", "D7", "D6", "D4", "B3", "B7", "D0", "D1", "D2", "D3", "D5"], "rows": ["C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/axolstudio/yeti/soldered/rules.mk b/keyboards/axolstudio/yeti/soldered/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/axolstudio/yeti/soldered/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/b_sides/rev41lp/info.json b/keyboards/b_sides/rev41lp/keyboard.json similarity index 93% rename from keyboards/b_sides/rev41lp/info.json rename to keyboards/b_sides/rev41lp/keyboard.json index 9d121083bd4..75c7affbf5e 100644 --- a/keyboards/b_sides/rev41lp/info.json +++ b/keyboards/b_sides/rev41lp/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x5F10", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "B2", "F5", "B3", "F6", "B1", "F7"] diff --git a/keyboards/b_sides/rev41lp/rules.mk b/keyboards/b_sides/rev41lp/rules.mk deleted file mode 100644 index a2444417d6c..00000000000 --- a/keyboards/b_sides/rev41lp/rules.mk +++ /dev/null @@ -1,12 +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 = yes # Console for debug -COMMAND_ENABLE = yes # 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/bacca70/info.json b/keyboards/bacca70/keyboard.json similarity index 98% rename from keyboards/bacca70/info.json rename to keyboards/bacca70/keyboard.json index 143c19d987b..c192fb0eb23 100644 --- a/keyboards/bacca70/info.json +++ b/keyboards/bacca70/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6970", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "B12", "B13", "B14", "B15", "A8"], "rows": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "A9", "A10"] diff --git a/keyboards/bacca70/rules.mk b/keyboards/bacca70/rules.mk deleted file mode 100644 index 718a1e8d099..00000000000 --- a/keyboards/bacca70/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/baguette/info.json b/keyboards/baguette/keyboard.json similarity index 97% rename from keyboards/baguette/info.json rename to keyboards/baguette/keyboard.json index 0a008f45faf..f6797dd9390 100644 --- a/keyboards/baguette/info.json +++ b/keyboards/baguette/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x5050", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "D0", "D1", "D2", "D3", "D5", "D4"], "rows": ["B3", "B2", "B1", "E6", "D6"] diff --git a/keyboards/baguette/rules.mk b/keyboards/baguette/rules.mk deleted file mode 100644 index a949e5d4d9a..00000000000 --- a/keyboards/baguette/rules.mk +++ /dev/null @@ -1,12 +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 -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/bantam44/info.json b/keyboards/bantam44/keyboard.json similarity index 94% rename from keyboards/bantam44/info.json rename to keyboards/bantam44/keyboard.json index 62713f82d77..2a884c2524e 100644 --- a/keyboards/bantam44/info.json +++ b/keyboards/bantam44/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "B6", "F7", "F6", "F5", "F4", "F1"], "rows": ["F0", "D6", "D4", "D5"] diff --git a/keyboards/bantam44/rules.mk b/keyboards/bantam44/rules.mk deleted file mode 100644 index 34dd06e002a..00000000000 --- a/keyboards/bantam44/rules.mk +++ /dev/null @@ -1,10 +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 = yes # Enable keyboard backlight functionality diff --git a/keyboards/barracuda/info.json b/keyboards/barracuda/keyboard.json similarity index 92% rename from keyboards/barracuda/info.json rename to keyboards/barracuda/keyboard.json index 3b68e6e3f3b..56cf8f08bb3 100644 --- a/keyboards/barracuda/info.json +++ b/keyboards/barracuda/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "D5", "D6", "B0", "B1", "B2"], "rows": ["C4", "C5", "C6", "D1", "D2", "D3"] diff --git a/keyboards/barracuda/rules.mk b/keyboards/barracuda/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/barracuda/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 = 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/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/keyboard.json similarity index 96% rename from keyboards/basekeys/trifecta/info.json rename to keyboards/basekeys/trifecta/keyboard.json index d9afe40a0c9..8777b1ffa9d 100644 --- a/keyboards/basekeys/trifecta/info.json +++ b/keyboards/basekeys/trifecta/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xEAF3", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "D1", "B2", "D0", "B3"], "rows": ["B0", "B7", "F7", "B1", "B6", "C6", "C7", "B5", "F6", "D2"] diff --git a/keyboards/basekeys/trifecta/rules.mk b/keyboards/basekeys/trifecta/rules.mk deleted file mode 100644 index 3989cc05ff0..00000000000 --- a/keyboards/basekeys/trifecta/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes diff --git a/keyboards/beatervan/info.json b/keyboards/beatervan/keyboard.json similarity index 98% rename from keyboards/beatervan/info.json rename to keyboards/beatervan/keyboard.json index 8d4c77d2ce3..4828127d14b 100644 --- a/keyboards/beatervan/info.json +++ b/keyboards/beatervan/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6276", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D1", "D0", "D4", "C6"] diff --git a/keyboards/beatervan/rules.mk b/keyboards/beatervan/rules.mk deleted file mode 100644 index 5cc6e14a93b..00000000000 --- a/keyboards/beatervan/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 = 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 -UNICODE_ENABLE = yes # Unicode -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/bfake/info.json b/keyboards/bfake/keyboard.json similarity index 97% rename from keyboards/bfake/info.json rename to keyboards/bfake/keyboard.json index 3aae216047f..4774e282d7a 100644 --- a/keyboards/bfake/info.json +++ b/keyboards/bfake/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/bfake/rules.mk b/keyboards/bfake/rules.mk deleted file mode 100644 index 90550484a66..00000000000 --- a/keyboards/bfake/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = no diff --git a/keyboards/biacco42/meishi/info.json b/keyboards/biacco42/meishi/keyboard.json similarity index 79% rename from keyboards/biacco42/meishi/info.json rename to keyboards/biacco42/meishi/keyboard.json index 96e67d50783..d9d37d72fe4 100644 --- a/keyboards/biacco42/meishi/info.json +++ b/keyboards/biacco42/meishi/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B1", "B3", "B2", "B6"], "rows": ["B5"] diff --git a/keyboards/biacco42/meishi/rules.mk b/keyboards/biacco42/meishi/rules.mk deleted file mode 100644 index b6e2a5f9a41..00000000000 --- a/keyboards/biacco42/meishi/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/biacco42/meishi2/info.json b/keyboards/biacco42/meishi2/keyboard.json similarity index 80% rename from keyboards/biacco42/meishi2/info.json rename to keyboards/biacco42/meishi2/keyboard.json index fb883569680..3a392442f24 100644 --- a/keyboards/biacco42/meishi2/info.json +++ b/keyboards/biacco42/meishi2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "F6"], "rows": ["D7", "E6"] diff --git a/keyboards/biacco42/meishi2/rules.mk b/keyboards/biacco42/meishi2/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/biacco42/meishi2/rules.mk +++ /dev/null @@ -1,12 +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 -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/binepad/bn003/info.json b/keyboards/binepad/bn003/keyboard.json similarity index 79% rename from keyboards/binepad/bn003/info.json rename to keyboards/binepad/bn003/keyboard.json index 408e670b957..695518828ec 100644 --- a/keyboards/binepad/bn003/info.json +++ b/keyboards/binepad/bn003/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4287", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B4", "B5", "B6"], "rows": ["C6"] diff --git a/keyboards/binepad/bn003/rules.mk b/keyboards/binepad/bn003/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/binepad/bn003/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 = 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/bioi/f60/info.json b/keyboards/bioi/f60/keyboard.json similarity index 99% rename from keyboards/bioi/f60/info.json rename to keyboards/bioi/f60/keyboard.json index 6223ba7b579..9adbb2f48ab 100644 --- a/keyboards/bioi/f60/info.json +++ b/keyboards/bioi/f60/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x4660", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D0", "D1"], "rows": ["B0", "E6", "F1", "F5", "F4"] diff --git a/keyboards/bioi/f60/rules.mk b/keyboards/bioi/f60/rules.mk deleted file mode 100644 index 85830d31150..00000000000 --- a/keyboards/bioi/f60/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 = 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 diff --git a/keyboards/blackplum/info.json b/keyboards/blackplum/keyboard.json similarity index 96% rename from keyboards/blackplum/info.json rename to keyboards/blackplum/keyboard.json index ba93091bcc6..d17bc378321 100644 --- a/keyboards/blackplum/info.json +++ b/keyboards/blackplum/keyboard.json @@ -30,6 +30,15 @@ "ws2812": { "pin": "C7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "F7", "F6", "F5", "F4", "F1"], "rows": ["C6", "B6", "B4", "B5", "D6", "D7", "D5", "D3", "D4"] diff --git a/keyboards/blackplum/rules.mk b/keyboards/blackplum/rules.mk deleted file mode 100644 index 817d092c27c..00000000000 --- a/keyboards/blackplum/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 = 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 -RGBLIGHT_ENABLE = yes diff --git a/keyboards/blank/blank01/info.json b/keyboards/blank/blank01/keyboard.json similarity index 97% rename from keyboards/blank/blank01/info.json rename to keyboards/blank/blank01/keyboard.json index 13b49715460..5dfa7e67ecc 100644 --- a/keyboards/blank/blank01/info.json +++ b/keyboards/blank/blank01/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4B01", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B5", "B4", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D0", "D1", "D2", "D3", "B3"] diff --git a/keyboards/blank/blank01/rules.mk b/keyboards/blank/blank01/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/blank/blank01/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 = 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/blaster75/info.json b/keyboards/blaster75/keyboard.json similarity index 98% rename from keyboards/blaster75/info.json rename to keyboards/blaster75/keyboard.json index 406de750283..81cc789da6a 100644 --- a/keyboards/blaster75/info.json +++ b/keyboards/blaster75/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xB075", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "B4", "B5", "B6", "B7", "C6", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/blaster75/rules.mk b/keyboards/blaster75/rules.mk deleted file mode 100644 index 997fedb0b17..00000000000 --- a/keyboards/blaster75/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = 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/blockey/info.json b/keyboards/blockey/keyboard.json similarity index 95% rename from keyboards/blockey/info.json rename to keyboards/blockey/keyboard.json index 2ed60f6e69a..0c150420dc9 100644 --- a/keyboards/blockey/info.json +++ b/keyboards/blockey/keyboard.json @@ -27,6 +27,15 @@ "ws2812": { "pin": "B1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "B4", "C6", "D7", "F4", "F5", "F7"], "rows": ["D3", "D1", "D4", "E6", "B5", "D2", "F6", "B3", "B2", "B6"] diff --git a/keyboards/blockey/rules.mk b/keyboards/blockey/rules.mk deleted file mode 100644 index 08022075e7f..00000000000 --- a/keyboards/blockey/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - -RGBLIGHT_ENABLE = yes diff --git a/keyboards/boardrun/bizarre/info.json b/keyboards/boardrun/bizarre/keyboard.json similarity index 98% rename from keyboards/boardrun/bizarre/info.json rename to keyboards/boardrun/bizarre/keyboard.json index 428ca3bac60..6901f93625d 100644 --- a/keyboards/boardrun/bizarre/info.json +++ b/keyboards/boardrun/bizarre/keyboard.json @@ -30,6 +30,15 @@ "ws2812": { "pin": "B7" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/boardrun/bizarre/rules.mk b/keyboards/boardrun/bizarre/rules.mk deleted file mode 100644 index e027898b626..00000000000 --- a/keyboards/boardrun/bizarre/rules.mk +++ /dev/null @@ -1,12 +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 # 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/boardrun/classic/info.json b/keyboards/boardrun/classic/keyboard.json similarity index 96% rename from keyboards/boardrun/classic/info.json rename to keyboards/boardrun/classic/keyboard.json index 4518961b4ae..cd83ef58f06 100644 --- a/keyboards/boardrun/classic/info.json +++ b/keyboards/boardrun/classic/keyboard.json @@ -30,6 +30,15 @@ "ws2812": { "pin": "B7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/boardrun/classic/rules.mk b/keyboards/boardrun/classic/rules.mk deleted file mode 100644 index 3c777809b4a..00000000000 --- a/keyboards/boardrun/classic/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/boardwalk/info.json b/keyboards/boardwalk/keyboard.json similarity index 99% rename from keyboards/boardwalk/info.json rename to keyboards/boardwalk/keyboard.json index 82b8fb23e40..8c4ad37eb09 100644 --- a/keyboards/boardwalk/info.json +++ b/keyboards/boardwalk/keyboard.json @@ -29,6 +29,16 @@ "ws2812": { "pin": "B7" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true, + "unicode": true + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/boardwalk/rules.mk b/keyboards/boardwalk/rules.mk deleted file mode 100644 index bca0082d2ed..00000000000 --- a/keyboards/boardwalk/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. diff --git a/keyboards/bobpad/info.json b/keyboards/bobpad/keyboard.json similarity index 84% rename from keyboards/bobpad/info.json rename to keyboards/bobpad/keyboard.json index eb6a25104be..feddbbf222f 100644 --- a/keyboards/bobpad/info.json +++ b/keyboards/bobpad/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F5", "F4"], "rows": ["F7", "B1"] diff --git a/keyboards/bobpad/rules.mk b/keyboards/bobpad/rules.mk deleted file mode 100644 index 453f0a34d38..00000000000 --- a/keyboards/bobpad/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes diff --git a/keyboards/bolsa/bolsalice/info.json b/keyboards/bolsa/bolsalice/keyboard.json similarity index 97% rename from keyboards/bolsa/bolsalice/info.json rename to keyboards/bolsa/bolsalice/keyboard.json index 51e342b10b3..8ada9b55461 100644 --- a/keyboards/bolsa/bolsalice/info.json +++ b/keyboards/bolsa/bolsalice/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "B1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["B2", "B3", "C7", "C6", "B5"] diff --git a/keyboards/bolsa/bolsalice/rules.mk b/keyboards/bolsa/bolsalice/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/bolsa/bolsalice/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 = 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/bolsa/damapad/info.json b/keyboards/bolsa/damapad/keyboard.json similarity index 91% rename from keyboards/bolsa/damapad/info.json rename to keyboards/bolsa/damapad/keyboard.json index 2a3867c6d5c..5a47d123229 100644 --- a/keyboards/bolsa/damapad/info.json +++ b/keyboards/bolsa/damapad/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6470", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "B7"], "rows": ["E6", "F7", "C7"] diff --git a/keyboards/bolsa/damapad/rules.mk b/keyboards/bolsa/damapad/rules.mk deleted file mode 100644 index 9c75f75d52d..00000000000 --- a/keyboards/bolsa/damapad/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/bop/info.json b/keyboards/bop/keyboard.json similarity index 97% rename from keyboards/bop/info.json rename to keyboards/bop/keyboard.json index f7ae94b3bee..81bbbf33f08 100644 --- a/keyboards/bop/info.json +++ b/keyboards/bop/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x626F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D5", "C5", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "E7", "E6", "F0", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "C6"], "rows": ["B7", "D0", "D1", "D2", "D3", "D4"] diff --git a/keyboards/bop/rules.mk b/keyboards/bop/rules.mk deleted file mode 100644 index 1eca777d610..00000000000 --- a/keyboards/bop/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 -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 = no diff --git a/keyboards/boston/info.json b/keyboards/boston/keyboard.json similarity index 99% rename from keyboards/boston/info.json rename to keyboards/boston/keyboard.json index 39c5a7c160d..1960df6d45f 100644 --- a/keyboards/boston/info.json +++ b/keyboards/boston/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x4176", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3", "B4", "B7", "B8", "B9", "C14", "C15", "F0", "A3"], "rows": ["B5", "B6", "A7", "B0", "B1", "B2", "A4"] diff --git a/keyboards/boston/rules.mk b/keyboards/boston/rules.mk deleted file mode 100644 index 80d17a2dfd1..00000000000 --- a/keyboards/boston/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - diff --git a/keyboards/botanicalkeyboards/fm2u/info.json b/keyboards/botanicalkeyboards/fm2u/keyboard.json similarity index 93% rename from keyboards/botanicalkeyboards/fm2u/info.json rename to keyboards/botanicalkeyboards/fm2u/keyboard.json index 3f9009625d9..907d5d46b87 100644 --- a/keyboards/botanicalkeyboards/fm2u/info.json +++ b/keyboards/botanicalkeyboards/fm2u/keyboard.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u2", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "direct": [ ["C4"] diff --git a/keyboards/botanicalkeyboards/fm2u/rules.mk b/keyboards/botanicalkeyboards/fm2u/rules.mk deleted file mode 100644 index 6ff9b4e02ba..00000000000 --- a/keyboards/botanicalkeyboards/fm2u/rules.mk +++ /dev/null @@ -1,12 +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 = 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/box75/info.json b/keyboards/box75/keyboard.json similarity index 96% rename from keyboards/box75/info.json rename to keyboards/box75/keyboard.json index 35689400f7c..8932f81ae72 100644 --- a/keyboards/box75/info.json +++ b/keyboards/box75/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xB075", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14", "B13", "A15"], "rows": ["A10", "A9", "B12", "A2", "A1", "A0"] diff --git a/keyboards/box75/rules.mk b/keyboards/box75/rules.mk deleted file mode 100644 index 5b6b0c92991..00000000000 --- a/keyboards/box75/rules.mk +++ /dev/null @@ -1,14 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no - diff --git a/keyboards/bpiphany/four_banger/info.json b/keyboards/bpiphany/four_banger/keyboard.json similarity index 85% rename from keyboards/bpiphany/four_banger/info.json rename to keyboards/bpiphany/four_banger/keyboard.json index e267922ab88..24620506849 100644 --- a/keyboards/bpiphany/four_banger/info.json +++ b/keyboards/bpiphany/four_banger/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "E6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "B4"], "rows": ["B2", "B6"] diff --git a/keyboards/bpiphany/four_banger/rules.mk b/keyboards/bpiphany/four_banger/rules.mk deleted file mode 100644 index 21fd8f40ee0..00000000000 --- a/keyboards/bpiphany/four_banger/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 = 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 -RGBLIGHT_ENABLE = yes diff --git a/keyboards/bpiphany/sixshooter/info.json b/keyboards/bpiphany/sixshooter/keyboard.json similarity index 82% rename from keyboards/bpiphany/sixshooter/info.json rename to keyboards/bpiphany/sixshooter/keyboard.json index 9705eb2f186..21e52f3629e 100644 --- a/keyboards/bpiphany/sixshooter/info.json +++ b/keyboards/bpiphany/sixshooter/keyboard.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "direct": [ ["F7", "F6", "F1"], diff --git a/keyboards/bpiphany/sixshooter/rules.mk b/keyboards/bpiphany/sixshooter/rules.mk deleted file mode 100644 index 315dc5de534..00000000000 --- a/keyboards/bpiphany/sixshooter/rules.mk +++ /dev/null @@ -1,11 +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 -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 # Audio output diff --git a/keyboards/bthlabs/geekpad/info.json b/keyboards/bthlabs/geekpad/keyboard.json similarity index 85% rename from keyboards/bthlabs/geekpad/info.json rename to keyboards/bthlabs/geekpad/keyboard.json index 5c193f9f85e..43ce11edf51 100644 --- a/keyboards/bthlabs/geekpad/info.json +++ b/keyboards/bthlabs/geekpad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4257", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "D0", "D1"], "rows": ["F4", "F5", "F6"] diff --git a/keyboards/bthlabs/geekpad/rules.mk b/keyboards/bthlabs/geekpad/rules.mk deleted file mode 100644 index 4d82dff69aa..00000000000 --- a/keyboards/bthlabs/geekpad/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 = 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/buildakb/potato65/info.json b/keyboards/buildakb/potato65/keyboard.json similarity index 98% rename from keyboards/buildakb/potato65/info.json rename to keyboards/buildakb/potato65/keyboard.json index 7fee44a1cea..1aeba49bde2 100644 --- a/keyboards/buildakb/potato65/info.json +++ b/keyboards/buildakb/potato65/keyboard.json @@ -30,6 +30,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/buildakb/potato65/rules.mk b/keyboards/buildakb/potato65/rules.mk deleted file mode 100644 index abd8c0135a9..00000000000 --- a/keyboards/buildakb/potato65/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 = 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 # Audio output -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/buildakb/potato65hs/info.json b/keyboards/buildakb/potato65hs/keyboard.json similarity index 96% rename from keyboards/buildakb/potato65hs/info.json rename to keyboards/buildakb/potato65hs/keyboard.json index 2b6a22179eb..61ecd61a150 100644 --- a/keyboards/buildakb/potato65hs/info.json +++ b/keyboards/buildakb/potato65hs/keyboard.json @@ -30,6 +30,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"], "rows": ["F5", "F4", "F6", "F0", "D2"] diff --git a/keyboards/buildakb/potato65hs/rules.mk b/keyboards/buildakb/potato65hs/rules.mk deleted file mode 100644 index 0ce88ac19eb..00000000000 --- a/keyboards/buildakb/potato65hs/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 = 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 = yes # Enable keyboard RGB underglow diff --git a/keyboards/buildakb/potato65s/info.json b/keyboards/buildakb/potato65s/keyboard.json similarity index 99% rename from keyboards/buildakb/potato65s/info.json rename to keyboards/buildakb/potato65s/keyboard.json index fcd6cbf56f1..915f9674268 100644 --- a/keyboards/buildakb/potato65s/info.json +++ b/keyboards/buildakb/potato65s/keyboard.json @@ -30,6 +30,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"], "rows": ["F5", "F4", "F6", "F0", "D2"] diff --git a/keyboards/buildakb/potato65s/rules.mk b/keyboards/buildakb/potato65s/rules.mk deleted file mode 100644 index 0ce88ac19eb..00000000000 --- a/keyboards/buildakb/potato65s/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 = 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 = yes # Enable keyboard RGB underglow diff --git a/keyboards/cablecardesigns/cypher/rev6/info.json b/keyboards/cablecardesigns/cypher/rev6/keyboard.json similarity index 98% rename from keyboards/cablecardesigns/cypher/rev6/info.json rename to keyboards/cablecardesigns/cypher/rev6/keyboard.json index 9bc6e26814b..57bd4356351 100644 --- a/keyboards/cablecardesigns/cypher/rev6/info.json +++ b/keyboards/cablecardesigns/cypher/rev6/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xAA99", "device_version": "0.0.2" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5", "B6", "B7", "B3", "B2", "B1", "F0"], "rows": ["B0", "F1", "F5", "F6", "F7", "D1", "F4", "D4", "C6", "C7"] diff --git a/keyboards/cablecardesigns/cypher/rev6/rules.mk b/keyboards/cablecardesigns/cypher/rev6/rules.mk deleted file mode 100644 index d9c776a9b1d..00000000000 --- a/keyboards/cablecardesigns/cypher/rev6/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/caffeinated/serpent65/info.json b/keyboards/caffeinated/serpent65/keyboard.json similarity index 99% rename from keyboards/caffeinated/serpent65/info.json rename to keyboards/caffeinated/serpent65/keyboard.json index e4cc62c61ea..f8c7a90ce9f 100644 --- a/keyboards/caffeinated/serpent65/info.json +++ b/keyboards/caffeinated/serpent65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6501", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "B14", "B15", "A8", "A9"], "rows": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B13", "B12"] diff --git a/keyboards/caffeinated/serpent65/rules.mk b/keyboards/caffeinated/serpent65/rules.mk deleted file mode 100644 index 718a1e8d099..00000000000 --- a/keyboards/caffeinated/serpent65/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/cannonkeys/adelie/info.json b/keyboards/cannonkeys/adelie/keyboard.json similarity index 98% rename from keyboards/cannonkeys/adelie/info.json rename to keyboards/cannonkeys/adelie/keyboard.json index 798c5996926..f4d46b35d16 100644 --- a/keyboards/cannonkeys/adelie/info.json +++ b/keyboards/cannonkeys/adelie/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "F0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B2"], "rows": ["F4", "F1", "B1", "B0"] diff --git a/keyboards/cannonkeys/adelie/rules.mk b/keyboards/cannonkeys/adelie/rules.mk deleted file mode 100644 index 6d85e16f920..00000000000 --- a/keyboards/cannonkeys/adelie/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/cannonkeys/atlas/info.json b/keyboards/cannonkeys/atlas/keyboard.json similarity index 97% rename from keyboards/cannonkeys/atlas/info.json rename to keyboards/cannonkeys/atlas/keyboard.json index 8173ec6a8fa..86eaec2d519 100644 --- a/keyboards/cannonkeys/atlas/info.json +++ b/keyboards/cannonkeys/atlas/keyboard.json @@ -27,6 +27,15 @@ "pin": "B15", "driver": "spi" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "A15", "A10", "A9"], "rows": ["A8", "B14", "B12", "B4", "B3"] diff --git a/keyboards/cannonkeys/atlas/rules.mk b/keyboards/cannonkeys/atlas/rules.mk deleted file mode 100644 index 451e1c675c9..00000000000 --- a/keyboards/cannonkeys/atlas/rules.mk +++ /dev/null @@ -1,11 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = yes diff --git a/keyboards/cannonkeys/atlas_alps/info.json b/keyboards/cannonkeys/atlas_alps/keyboard.json similarity index 95% rename from keyboards/cannonkeys/atlas_alps/info.json rename to keyboards/cannonkeys/atlas_alps/keyboard.json index 7166206f051..6f8c1305c38 100644 --- a/keyboards/cannonkeys/atlas_alps/info.json +++ b/keyboards/cannonkeys/atlas_alps/keyboard.json @@ -30,6 +30,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B6", "C6", "D2", "E6", "C7", "B3", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B5", "B4", "D1", "D7", "D6"] diff --git a/keyboards/cannonkeys/atlas_alps/rules.mk b/keyboards/cannonkeys/atlas_alps/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/cannonkeys/atlas_alps/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 = 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/cannonkeys/chimera65/info.json b/keyboards/cannonkeys/chimera65/keyboard.json similarity index 95% rename from keyboards/cannonkeys/chimera65/info.json rename to keyboards/cannonkeys/chimera65/keyboard.json index e9881750d9c..7cf30d2ea7b 100644 --- a/keyboards/cannonkeys/chimera65/info.json +++ b/keyboards/cannonkeys/chimera65/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xC024", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "A5", "A4", "A3", "A2", "A1", "F0", "C15", "C14", "A9", "A8", "A10", "B3"], "rows": ["A13", "A14", "A15", "C13", "B8"] diff --git a/keyboards/cannonkeys/chimera65/rules.mk b/keyboards/cannonkeys/chimera65/rules.mk deleted file mode 100644 index 9bdf6b80937..00000000000 --- a/keyboards/cannonkeys/chimera65/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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = no - - diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/keyboard.json similarity index 99% rename from keyboards/cannonkeys/hoodrowg/info.json rename to keyboards/cannonkeys/hoodrowg/keyboard.json index 1c1fbf59647..231b67e244f 100644 --- a/keyboards/cannonkeys/hoodrowg/info.json +++ b/keyboards/cannonkeys/hoodrowg/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "B4", "D7", "F5", "F6", "F7", "F4", "D2", "D0"], "rows": ["E6", "B7", "B0", "B1", "F1", "F0", "C6", "C7", "D4", "D6", "D5", "D3"] diff --git a/keyboards/cannonkeys/hoodrowg/rules.mk b/keyboards/cannonkeys/hoodrowg/rules.mk deleted file mode 100644 index b483118606d..00000000000 --- a/keyboards/cannonkeys/hoodrowg/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 = 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/cannonkeys/iron165/info.json b/keyboards/cannonkeys/iron165/keyboard.json similarity index 95% rename from keyboards/cannonkeys/iron165/info.json rename to keyboards/cannonkeys/iron165/keyboard.json index 3ec67e95b60..bc0c6af503b 100644 --- a/keyboards/cannonkeys/iron165/info.json +++ b/keyboards/cannonkeys/iron165/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x5165", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A5", "B10", "A3", "A2", "B0", "A8", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["B12", "B13", "B14", "B15", "A1"] diff --git a/keyboards/cannonkeys/iron165/rules.mk b/keyboards/cannonkeys/iron165/rules.mk deleted file mode 100644 index 9bdf6b80937..00000000000 --- a/keyboards/cannonkeys/iron165/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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = no - - diff --git a/keyboards/cannonkeys/nearfield/info.json b/keyboards/cannonkeys/nearfield/keyboard.json similarity index 98% rename from keyboards/cannonkeys/nearfield/info.json rename to keyboards/cannonkeys/nearfield/keyboard.json index ab3a2d765dc..e516198f09e 100644 --- a/keyboards/cannonkeys/nearfield/info.json +++ b/keyboards/cannonkeys/nearfield/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D5", "C6", "C7", "B6", "B5", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "D1"], "rows": ["B4", "D2", "D4", "D6", "D7"] diff --git a/keyboards/cannonkeys/nearfield/rules.mk b/keyboards/cannonkeys/nearfield/rules.mk deleted file mode 100755 index 3b6a1809db1..00000000000 --- a/keyboards/cannonkeys/nearfield/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 = 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/cannonkeys/ortho48/info.json b/keyboards/cannonkeys/ortho48/keyboard.json similarity index 96% rename from keyboards/cannonkeys/ortho48/info.json rename to keyboards/cannonkeys/ortho48/keyboard.json index c995210ba4e..1f35187e291 100644 --- a/keyboards/cannonkeys/ortho48/info.json +++ b/keyboards/cannonkeys/ortho48/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x4F48", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "B14", "A15", "A0", "C15", "C14"], "rows": ["B12", "C13", "A2", "A1"] diff --git a/keyboards/cannonkeys/ortho48/rules.mk b/keyboards/cannonkeys/ortho48/rules.mk deleted file mode 100644 index 7b6ddd5ad36..00000000000 --- a/keyboards/cannonkeys/ortho48/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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -SLEEP_LED_ENABLE = yes - diff --git a/keyboards/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/keyboard.json similarity index 96% rename from keyboards/cannonkeys/ortho60/info.json rename to keyboards/cannonkeys/ortho60/keyboard.json index 18fcbc828be..f429bd9f405 100644 --- a/keyboards/cannonkeys/ortho60/info.json +++ b/keyboards/cannonkeys/ortho60/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x4F60", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"], "rows": ["B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/cannonkeys/ortho60/rules.mk b/keyboards/cannonkeys/ortho60/rules.mk deleted file mode 100644 index 7b6ddd5ad36..00000000000 --- a/keyboards/cannonkeys/ortho60/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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -SLEEP_LED_ENABLE = yes - diff --git a/keyboards/cannonkeys/ortho75/info.json b/keyboards/cannonkeys/ortho75/keyboard.json similarity index 95% rename from keyboards/cannonkeys/ortho75/info.json rename to keyboards/cannonkeys/ortho75/keyboard.json index 1f9fa940865..236334c5985 100644 --- a/keyboards/cannonkeys/ortho75/info.json +++ b/keyboards/cannonkeys/ortho75/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "B14", "A15", "A0", "C15", "C14", "B7", "B6", "B5"], "rows": ["B12", "C13", "A2", "A1", "A3"] diff --git a/keyboards/cannonkeys/ortho75/rules.mk b/keyboards/cannonkeys/ortho75/rules.mk deleted file mode 100644 index 5a1f61bac05..00000000000 --- a/keyboards/cannonkeys/ortho75/rules.mk +++ /dev/null @@ -1,14 +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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -SLEEP_LED_ENABLE = yes -ENCODER_ENABLE = yes - diff --git a/keyboards/cannonkeys/practice65/info.json b/keyboards/cannonkeys/practice65/keyboard.json similarity index 95% rename from keyboards/cannonkeys/practice65/info.json rename to keyboards/cannonkeys/practice65/keyboard.json index f86951bf5c9..950d1bae9ff 100644 --- a/keyboards/cannonkeys/practice65/info.json +++ b/keyboards/cannonkeys/practice65/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x6565", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["B8", "B0", "A0", "B5", "B10", "B9", "A6", "B12", "A7", "A5", "A4", "A3", "A2", "A1", "B13", "B14"], "rows": ["B4", "B11", "B1", "B7", "B6"] diff --git a/keyboards/cannonkeys/practice65/rules.mk b/keyboards/cannonkeys/practice65/rules.mk deleted file mode 100644 index 7b6ddd5ad36..00000000000 --- a/keyboards/cannonkeys/practice65/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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -SLEEP_LED_ENABLE = yes - diff --git a/keyboards/capsunlocked/cu24/info.json b/keyboards/capsunlocked/cu24/keyboard.json similarity index 93% rename from keyboards/capsunlocked/cu24/info.json rename to keyboards/capsunlocked/cu24/keyboard.json index f5d56e383ed..c3c262734d9 100644 --- a/keyboards/capsunlocked/cu24/info.json +++ b/keyboards/capsunlocked/cu24/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "D0", "D1"], "rows": ["E6", "F5", "B4", "B6", "C6", "C7"] diff --git a/keyboards/capsunlocked/cu24/rules.mk b/keyboards/capsunlocked/cu24/rules.mk deleted file mode 100644 index 0dc735b9cd9..00000000000 --- a/keyboards/capsunlocked/cu24/rules.mk +++ /dev/null @@ -1,12 +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 -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 # Audio output -RGBLIGHT_ENABLE = yes # RGB drivers diff --git a/keyboards/capsunlocked/cu65/info.json b/keyboards/capsunlocked/cu65/keyboard.json similarity index 98% rename from keyboards/capsunlocked/cu65/info.json rename to keyboards/capsunlocked/cu65/keyboard.json index 71b7fe0a9fc..eabb7694688 100644 --- a/keyboards/capsunlocked/cu65/info.json +++ b/keyboards/capsunlocked/cu65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D6", "D7", "D4", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "E6", "B0", "B1", "B7", "B3", "B2"], "rows": ["F1", "F4", "F5", "F6", "D3"] diff --git a/keyboards/capsunlocked/cu65/rules.mk b/keyboards/capsunlocked/cu65/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/capsunlocked/cu65/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 = 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/capsunlocked/cu7/info.json b/keyboards/capsunlocked/cu7/keyboard.json similarity index 86% rename from keyboards/capsunlocked/cu7/info.json rename to keyboards/capsunlocked/cu7/keyboard.json index 06deeacd692..6f96c00e50b 100644 --- a/keyboards/capsunlocked/cu7/info.json +++ b/keyboards/capsunlocked/cu7/keyboard.json @@ -28,6 +28,16 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F7", "F4"], "rows": ["D7", "F0", "F6"] diff --git a/keyboards/capsunlocked/cu7/rules.mk b/keyboards/capsunlocked/cu7/rules.mk deleted file mode 100644 index c5c4d8f35f1..00000000000 --- a/keyboards/capsunlocked/cu7/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/capsunlocked/cu80/v1/info.json b/keyboards/capsunlocked/cu80/v1/keyboard.json similarity index 98% rename from keyboards/capsunlocked/cu80/v1/info.json rename to keyboards/capsunlocked/cu80/v1/keyboard.json index 34b4e3c95eb..a5379a45cc9 100644 --- a/keyboards/capsunlocked/cu80/v1/info.json +++ b/keyboards/capsunlocked/cu80/v1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B0", "E6", "B7", "B3", "B2", "D2", "D3", "D5", "D4"], "rows": ["B1", "B5", "B4", "F7", "D7", "D6"] diff --git a/keyboards/capsunlocked/cu80/v1/rules.mk b/keyboards/capsunlocked/cu80/v1/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/capsunlocked/cu80/v1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/carbo65/info.json b/keyboards/carbo65/keyboard.json similarity index 96% rename from keyboards/carbo65/info.json rename to keyboards/carbo65/keyboard.json index c1a331d7be5..f2a4ce0dac9 100644 --- a/keyboards/carbo65/info.json +++ b/keyboards/carbo65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4336", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15"], "rows": ["A2", "B9", "B8", "B5", "B4"] diff --git a/keyboards/carbo65/rules.mk b/keyboards/carbo65/rules.mk deleted file mode 100644 index d3ca7b060e1..00000000000 --- a/keyboards/carbo65/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 -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/catch22/info.json b/keyboards/catch22/keyboard.json similarity index 91% rename from keyboards/catch22/info.json rename to keyboards/catch22/keyboard.json index baaee6ca98f..3c1d9c57779 100644 --- a/keyboards/catch22/info.json +++ b/keyboards/catch22/keyboard.json @@ -24,6 +24,15 @@ "ws2812": { "pin": "F6" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6"], "rows": ["B6", "B2", "B3", "B1", "F7"] diff --git a/keyboards/catch22/rules.mk b/keyboards/catch22/rules.mk deleted file mode 100644 index f258c568578..00000000000 --- a/keyboards/catch22/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 = yes # Commands for debug and configuration -NKRO_ENABLE = no # 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 = yes # This can be enabled if a ws2812 strip is connected to the expansion port. diff --git a/keyboards/cest73/tkm/info.json b/keyboards/cest73/tkm/keyboard.json similarity index 99% rename from keyboards/cest73/tkm/info.json rename to keyboards/cest73/tkm/keyboard.json index 6447189b936..e9aad4461b8 100644 --- a/keyboards/cest73/tkm/info.json +++ b/keyboards/cest73/tkm/keyboard.json @@ -9,6 +9,15 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7", "D0"] diff --git a/keyboards/cest73/tkm/rules.mk b/keyboards/cest73/tkm/rules.mk deleted file mode 100644 index cb644340504..00000000000 --- a/keyboards/cest73/tkm/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/chalice/info.json b/keyboards/chalice/keyboard.json similarity index 97% rename from keyboards/chalice/info.json rename to keyboards/chalice/keyboard.json index 8e6a6f2ed63..9332431184f 100644 --- a/keyboards/chalice/info.json +++ b/keyboards/chalice/keyboard.json @@ -27,6 +27,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "C6", "B1", "D2", "E6", "B3", "D7"], "rows": ["F4", "D1", "D0", "F5", "D4", "F6", "B4", "B5", "B2", "B6"] diff --git a/keyboards/chalice/rules.mk b/keyboards/chalice/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/chalice/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 = 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/chaos65/info.json b/keyboards/chaos65/keyboard.json similarity index 99% rename from keyboards/chaos65/info.json rename to keyboards/chaos65/keyboard.json index bd88ac3f5f3..ed3f33e0c30 100644 --- a/keyboards/chaos65/info.json +++ b/keyboards/chaos65/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/chaos65/rules.mk b/keyboards/chaos65/rules.mk deleted file mode 100644 index 48888d45c99..00000000000 --- a/keyboards/chaos65/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 = 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/charue/charon/info.json b/keyboards/charue/charon/keyboard.json similarity index 99% rename from keyboards/charue/charon/info.json rename to keyboards/charue/charon/keyboard.json index 12d28b14185..3dede57ba49 100644 --- a/keyboards/charue/charon/info.json +++ b/keyboards/charue/charon/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4348", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "D5", "B4", "D7", "D6", "D4", "F7", "F6", "F5", "F4", "F1", "F0", "B5", "B6", "C6"], "rows": ["B0", "B1", "B2", "B3", "C7"] diff --git a/keyboards/charue/charon/rules.mk b/keyboards/charue/charon/rules.mk deleted file mode 100644 index 3f6eff7f550..00000000000 --- a/keyboards/charue/charon/rules.mk +++ /dev/null @@ -1,12 +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 = 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/charue/sunsetter/info.json b/keyboards/charue/sunsetter/keyboard.json similarity index 99% rename from keyboards/charue/sunsetter/info.json rename to keyboards/charue/sunsetter/keyboard.json index 0a6d7696e26..565cebf5e2d 100644 --- a/keyboards/charue/sunsetter/info.json +++ b/keyboards/charue/sunsetter/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5353", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B13", "B12", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "F0", "B3", "A15"], "rows": ["A8", "B14", "B11", "B10", "B2"] diff --git a/keyboards/charue/sunsetter/rules.mk b/keyboards/charue/sunsetter/rules.mk deleted file mode 100644 index 7f4f202a1b7..00000000000 --- a/keyboards/charue/sunsetter/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 -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 - diff --git a/keyboards/charue/sunsetter_r2/info.json b/keyboards/charue/sunsetter_r2/keyboard.json similarity index 99% rename from keyboards/charue/sunsetter_r2/info.json rename to keyboards/charue/sunsetter_r2/keyboard.json index 9bbc6a7f94d..b961c21e26c 100644 --- a/keyboards/charue/sunsetter_r2/info.json +++ b/keyboards/charue/sunsetter_r2/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "E6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F7", "B1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["B3", "B2", "F4", "F5", "F6"] diff --git a/keyboards/charue/sunsetter_r2/rules.mk b/keyboards/charue/sunsetter_r2/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/charue/sunsetter_r2/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/chavdai40/rev1/info.json b/keyboards/chavdai40/rev1/keyboard.json similarity index 96% rename from keyboards/chavdai40/rev1/info.json rename to keyboards/chavdai40/rev1/keyboard.json index 67705c25bb5..22c4ccfb7bc 100644 --- a/keyboards/chavdai40/rev1/info.json +++ b/keyboards/chavdai40/rev1/keyboard.json @@ -4,6 +4,14 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B8", "B4", "B3", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"], "rows": ["A0", "A15", "B5", "B6"] diff --git a/keyboards/chavdai40/rev1/rules.mk b/keyboards/chavdai40/rev1/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/chavdai40/rev1/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 = 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/chavdai40/rev2/info.json b/keyboards/chavdai40/rev2/keyboard.json similarity index 96% rename from keyboards/chavdai40/rev2/info.json rename to keyboards/chavdai40/rev2/keyboard.json index acefcabdc70..b43c68604fb 100644 --- a/keyboards/chavdai40/rev2/info.json +++ b/keyboards/chavdai40/rev2/keyboard.json @@ -4,6 +4,14 @@ "device_version": "0.0.2", "max_power": 100 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B7", "B4", "B3", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"], "rows": ["A0", "A15", "B5", "B6"] diff --git a/keyboards/chavdai40/rev2/rules.mk b/keyboards/chavdai40/rev2/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/chavdai40/rev2/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 = 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/checkerboards/axon40/info.json b/keyboards/checkerboards/axon40/keyboard.json similarity index 94% rename from keyboards/checkerboards/axon40/info.json rename to keyboards/checkerboards/axon40/keyboard.json index f9097042808..8a3f0d58572 100644 --- a/keyboards/checkerboards/axon40/info.json +++ b/keyboards/checkerboards/axon40/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "D7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "B7", "D4", "D6", "F0", "F1", "C6", "B6", "B5", "B4", "E6", "B0"], "rows": ["D2", "D3", "D1", "D5"] diff --git a/keyboards/checkerboards/axon40/rules.mk b/keyboards/checkerboards/axon40/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/checkerboards/axon40/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 = 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/checkerboards/candybar_ortho/info.json b/keyboards/checkerboards/candybar_ortho/keyboard.json similarity index 98% rename from keyboards/checkerboards/candybar_ortho/info.json rename to keyboards/checkerboards/candybar_ortho/keyboard.json index c91f0d924d6..6067d1c2771 100644 --- a/keyboards/checkerboards/candybar_ortho/info.json +++ b/keyboards/checkerboards/candybar_ortho/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "B7" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D0", "D1", "D2"], "rows": ["B4", "D4", "D7", "D6", "B5", "B6", "C7", "C6"] diff --git a/keyboards/checkerboards/candybar_ortho/rules.mk b/keyboards/checkerboards/candybar_ortho/rules.mk deleted file mode 100644 index 28c29a3b4dc..00000000000 --- a/keyboards/checkerboards/candybar_ortho/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 = 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/checkerboards/g_idb60/info.json b/keyboards/checkerboards/g_idb60/keyboard.json similarity index 98% rename from keyboards/checkerboards/g_idb60/info.json rename to keyboards/checkerboards/g_idb60/keyboard.json index 0bb9854f967..7ef5a8e0cdc 100644 --- a/keyboards/checkerboards/g_idb60/info.json +++ b/keyboards/checkerboards/g_idb60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3508", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "C6", "C7", "D4", "F6", "F0", "B0", "F1", "F4", "F5", "D1", "D0", "D3", "D5"], "rows": ["D6", "D7", "B4", "B5", "F7"] diff --git a/keyboards/checkerboards/g_idb60/rules.mk b/keyboards/checkerboards/g_idb60/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/checkerboards/g_idb60/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 = 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/checkerboards/nop60/info.json b/keyboards/checkerboards/nop60/keyboard.json similarity index 97% rename from keyboards/checkerboards/nop60/info.json rename to keyboards/checkerboards/nop60/keyboard.json index f59c70ac29c..f12b7a54d28 100644 --- a/keyboards/checkerboards/nop60/info.json +++ b/keyboards/checkerboards/nop60/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x1416", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "D0", "D7", "D3", "D4", "D5", "D6", "F7", "C7", "B4", "B6", "B5"], "rows": ["F0", "F1", "E6", "B7", "C6"] diff --git a/keyboards/checkerboards/nop60/rules.mk b/keyboards/checkerboards/nop60/rules.mk deleted file mode 100644 index ec647701401..00000000000 --- a/keyboards/checkerboards/nop60/rules.mk +++ /dev/null @@ -1,12 +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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/checkerboards/plexus75/info.json b/keyboards/checkerboards/plexus75/keyboard.json similarity index 98% rename from keyboards/checkerboards/plexus75/info.json rename to keyboards/checkerboards/plexus75/keyboard.json index 943262b885c..1757cdeb572 100644 --- a/keyboards/checkerboards/plexus75/info.json +++ b/keyboards/checkerboards/plexus75/keyboard.json @@ -29,6 +29,16 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true, + "unicode": true + }, "matrix_pins": { "cols": ["B2", "B0", "D1", "F7", "F6", "F5", "F4", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D2", "B3", "B1", "F1", "F0"] diff --git a/keyboards/checkerboards/plexus75/rules.mk b/keyboards/checkerboards/plexus75/rules.mk deleted file mode 100644 index 4f1bd7941bc..00000000000 --- a/keyboards/checkerboards/plexus75/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 -UNICODE_ENABLE = yes # Unicode diff --git a/keyboards/checkerboards/plexus75_he/info.json b/keyboards/checkerboards/plexus75_he/keyboard.json similarity index 98% rename from keyboards/checkerboards/plexus75_he/info.json rename to keyboards/checkerboards/plexus75_he/keyboard.json index d9817cbbe13..c089e58e613 100644 --- a/keyboards/checkerboards/plexus75_he/info.json +++ b/keyboards/checkerboards/plexus75_he/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "D4" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C4", "C5", "D3", "C7", "B7", "B6", "B5", "B4"], "rows": ["C2", "D0", "D1", "D2", "D6", "B0", "B3", "B2", "C6", "B1"] diff --git a/keyboards/checkerboards/plexus75_he/rules.mk b/keyboards/checkerboards/plexus75_he/rules.mk deleted file mode 100644 index 5046e297d0e..00000000000 --- a/keyboards/checkerboards/plexus75_he/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/checkerboards/pursuit40/info.json b/keyboards/checkerboards/pursuit40/keyboard.json similarity index 94% rename from keyboards/checkerboards/pursuit40/info.json rename to keyboards/checkerboards/pursuit40/keyboard.json index f7a0be79e33..6e65dde2f1c 100644 --- a/keyboards/checkerboards/pursuit40/info.json +++ b/keyboards/checkerboards/pursuit40/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "F0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "E6", "B7", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D2", "D1", "F4", "F5"] diff --git a/keyboards/checkerboards/pursuit40/rules.mk b/keyboards/checkerboards/pursuit40/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/checkerboards/pursuit40/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 = 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/checkerboards/quark_lp/info.json b/keyboards/checkerboards/quark_lp/keyboard.json similarity index 97% rename from keyboards/checkerboards/quark_lp/info.json rename to keyboards/checkerboards/quark_lp/keyboard.json index 006e4548868..35b599879eb 100644 --- a/keyboards/checkerboards/quark_lp/info.json +++ b/keyboards/checkerboards/quark_lp/keyboard.json @@ -38,6 +38,15 @@ "speed_steps": 10, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B6", "B5", "B4", "B3", "B0", "D6", "D5", "D4", "D3", "D2", "D1", "D0"], "rows": ["C5", "C4", "C6", "C7"] diff --git a/keyboards/checkerboards/quark_lp/rules.mk b/keyboards/checkerboards/quark_lp/rules.mk deleted file mode 100644 index f868af936dc..00000000000 --- a/keyboards/checkerboards/quark_lp/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 -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 diff --git a/keyboards/checkerboards/quark_plus/info.json b/keyboards/checkerboards/quark_plus/keyboard.json similarity index 97% rename from keyboards/checkerboards/quark_plus/info.json rename to keyboards/checkerboards/quark_plus/keyboard.json index dc5bc478ca4..6e7f5a8cc28 100644 --- a/keyboards/checkerboards/quark_plus/info.json +++ b/keyboards/checkerboards/quark_plus/keyboard.json @@ -29,6 +29,17 @@ "ws2812": { "pin": "C5" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C6", "D1", "D5", "D4", "D3", "D2"], "rows": ["B4", "B1", "C2", "D0", "D6", "B0", "B6", "B5"] diff --git a/keyboards/checkerboards/quark_plus/rules.mk b/keyboards/checkerboards/quark_plus/rules.mk deleted file mode 100644 index c10c82105d5..00000000000 --- a/keyboards/checkerboards/quark_plus/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable rotary encoder diff --git a/keyboards/checkerboards/ud40_ortho_alt/info.json b/keyboards/checkerboards/ud40_ortho_alt/keyboard.json similarity index 98% rename from keyboards/checkerboards/ud40_ortho_alt/info.json rename to keyboards/checkerboards/ud40_ortho_alt/keyboard.json index c47c2c4c6bf..4e025c181fb 100644 --- a/keyboards/checkerboards/ud40_ortho_alt/info.json +++ b/keyboards/checkerboards/ud40_ortho_alt/keyboard.json @@ -29,6 +29,16 @@ "ws2812": { "pin": "D4" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "unicode": true + }, "matrix_pins": { "cols": ["B2", "B1", "F7", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6"], "rows": ["E6", "F0", "F1", "F4"] diff --git a/keyboards/checkerboards/ud40_ortho_alt/rules.mk b/keyboards/checkerboards/ud40_ortho_alt/rules.mk deleted file mode 100644 index 653e1ef309c..00000000000 --- a/keyboards/checkerboards/ud40_ortho_alt/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode - diff --git a/keyboards/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/keyboard.json similarity index 99% rename from keyboards/cherrybstudio/cb1800/info.json rename to keyboards/cherrybstudio/cb1800/keyboard.json index e6819d40ee3..fedcc1c75e9 100644 --- a/keyboards/cherrybstudio/cb1800/info.json +++ b/keyboards/cherrybstudio/cb1800/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1818", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7"] diff --git a/keyboards/cherrybstudio/cb1800/rules.mk b/keyboards/cherrybstudio/cb1800/rules.mk deleted file mode 100644 index 95093e241aa..00000000000 --- a/keyboards/cherrybstudio/cb1800/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 = 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/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/keyboard.json similarity index 99% rename from keyboards/cherrybstudio/cb65/info.json rename to keyboards/cherrybstudio/cb65/keyboard.json index 841dae6103d..8f14ec09418 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6565", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "F7", "B5", "B6", "C6"], "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3"] diff --git a/keyboards/cherrybstudio/cb65/rules.mk b/keyboards/cherrybstudio/cb65/rules.mk deleted file mode 100644 index b5dd02b992c..00000000000 --- a/keyboards/cherrybstudio/cb65/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 -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 -ENCODER_ENABLE = no # Encoder support diff --git a/keyboards/cherrybstudio/cb87/info.json b/keyboards/cherrybstudio/cb87/keyboard.json similarity index 98% rename from keyboards/cherrybstudio/cb87/info.json rename to keyboards/cherrybstudio/cb87/keyboard.json index 228cc030bbe..417c40e53d5 100644 --- a/keyboards/cherrybstudio/cb87/info.json +++ b/keyboards/cherrybstudio/cb87/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x8787", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3"] diff --git a/keyboards/cherrybstudio/cb87/rules.mk b/keyboards/cherrybstudio/cb87/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/cherrybstudio/cb87/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/keyboard.json similarity index 99% rename from keyboards/cherrybstudio/cb87rgb/info.json rename to keyboards/cherrybstudio/cb87rgb/keyboard.json index e5d52993361..bba6bea541d 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/keyboard.json @@ -61,6 +61,15 @@ "max_brightness": 200, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "F6"] diff --git a/keyboards/cherrybstudio/cb87rgb/rules.mk b/keyboards/cherrybstudio/cb87rgb/rules.mk deleted file mode 100644 index 2539b3f85ff..00000000000 --- a/keyboards/cherrybstudio/cb87rgb/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/keyboard.json similarity index 99% rename from keyboards/cherrybstudio/cb87v2/info.json rename to keyboards/cherrybstudio/cb87v2/keyboard.json index 1023cac5d18..c40bb1778f9 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x8788", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "F6"] diff --git a/keyboards/cherrybstudio/cb87v2/rules.mk b/keyboards/cherrybstudio/cb87v2/rules.mk deleted file mode 100644 index cdde6d344ba..00000000000 --- a/keyboards/cherrybstudio/cb87v2/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/cheshire/curiosity/info.json b/keyboards/cheshire/curiosity/keyboard.json similarity index 97% rename from keyboards/cheshire/curiosity/info.json rename to keyboards/cheshire/curiosity/keyboard.json index 678305ae329..09b01e896fe 100644 --- a/keyboards/cheshire/curiosity/info.json +++ b/keyboards/cheshire/curiosity/keyboard.json @@ -25,6 +25,15 @@ "ws2812": { "pin": "B15" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], "rows": ["B13", "B14", "A4", "A2", "A1"] diff --git a/keyboards/cheshire/curiosity/rules.mk b/keyboards/cheshire/curiosity/rules.mk deleted file mode 100644 index 5937fde2872..00000000000 --- a/keyboards/cheshire/curiosity/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/chickenman/ciel/info.json b/keyboards/chickenman/ciel/keyboard.json similarity index 98% rename from keyboards/chickenman/ciel/info.json rename to keyboards/chickenman/ciel/keyboard.json index 1dc9812187d..d6813a23aaf 100644 --- a/keyboards/chickenman/ciel/info.json +++ b/keyboards/chickenman/ciel/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D3", "D2", "D1", "D0", "C2"], "rows": ["C5", "C4", "B0", "C7", "B7"] diff --git a/keyboards/chickenman/ciel/rules.mk b/keyboards/chickenman/ciel/rules.mk deleted file mode 100644 index 59c896dbff6..00000000000 --- a/keyboards/chickenman/ciel/rules.mk +++ /dev/null @@ -1,12 +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 -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/chlx/merro60/info.json b/keyboards/chlx/merro60/keyboard.json similarity index 99% rename from keyboards/chlx/merro60/info.json rename to keyboards/chlx/merro60/keyboard.json index f9de8194bad..d34489607ac 100644 --- a/keyboards/chlx/merro60/info.json +++ b/keyboards/chlx/merro60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0601", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "D1", "D0", "B0", "B1", "E6", "B2", "B3", "D2", "D7", "B4", "B6", "C6", "C7", "D6"], "rows": ["D4", "D5", "D3", "B5", "F4"] diff --git a/keyboards/chlx/merro60/rules.mk b/keyboards/chlx/merro60/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/chlx/merro60/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 = 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/chocofly/v1/info.json b/keyboards/chocofly/v1/keyboard.json similarity index 95% rename from keyboards/chocofly/v1/info.json rename to keyboards/chocofly/v1/keyboard.json index f811a6b14b2..195d1e9a9fe 100644 --- a/keyboards/chocofly/v1/info.json +++ b/keyboards/chocofly/v1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/chocofly/v1/rules.mk b/keyboards/chocofly/v1/rules.mk deleted file mode 100644 index 70f23a97a50..00000000000 --- a/keyboards/chocofly/v1/rules.mk +++ /dev/null @@ -1,14 +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 - -ENCODER_ENABLE = yes diff --git a/keyboards/chocv/info.json b/keyboards/chocv/keyboard.json similarity index 93% rename from keyboards/chocv/info.json rename to keyboards/chocv/keyboard.json index e5361b1399d..670e46f8177 100644 --- a/keyboards/chocv/info.json +++ b/keyboards/chocv/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "D1", "D0"] diff --git a/keyboards/chocv/rules.mk b/keyboards/chocv/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/chocv/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 = 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/ck60i/info.json b/keyboards/ck60i/keyboard.json similarity index 95% rename from keyboards/ck60i/info.json rename to keyboards/ck60i/keyboard.json index d35eac99200..62ddd817288 100644 --- a/keyboards/ck60i/info.json +++ b/keyboards/ck60i/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6049", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B12", "A2", "A1", "A0", "F1", "F0", "B11", "B10", "B2", "B1", "B0", "A7", "C15", "C14"], "rows": ["B9", "C13", "A3", "B14", "A8"] diff --git a/keyboards/ck60i/rules.mk b/keyboards/ck60i/rules.mk deleted file mode 100644 index 3ec023e5e84..00000000000 --- a/keyboards/ck60i/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 -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 -ENCODER_ENABLE = yes - diff --git a/keyboards/ckeys/handwire_101/info.json b/keyboards/ckeys/handwire_101/keyboard.json similarity index 89% rename from keyboards/ckeys/handwire_101/info.json rename to keyboards/ckeys/handwire_101/keyboard.json index 27e43a65125..f8e2b383c23 100644 --- a/keyboards/ckeys/handwire_101/info.json +++ b/keyboards/ckeys/handwire_101/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/ckeys/handwire_101/rules.mk b/keyboards/ckeys/handwire_101/rules.mk deleted file mode 100755 index 4cbb58307a2..00000000000 --- a/keyboards/ckeys/handwire_101/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/ckeys/nakey/info.json b/keyboards/ckeys/nakey/keyboard.json similarity index 89% rename from keyboards/ckeys/nakey/info.json rename to keyboards/ckeys/nakey/keyboard.json index 5971c432d0b..1454858d9d4 100644 --- a/keyboards/ckeys/nakey/info.json +++ b/keyboards/ckeys/nakey/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3"], "rows": ["F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/ckeys/nakey/rules.mk b/keyboards/ckeys/nakey/rules.mk deleted file mode 100644 index b6e2a5f9a41..00000000000 --- a/keyboards/ckeys/nakey/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/ckeys/obelus/info.json b/keyboards/ckeys/obelus/keyboard.json similarity index 86% rename from keyboards/ckeys/obelus/info.json rename to keyboards/ckeys/obelus/keyboard.json index 78ef0227c59..969e6a2d495 100644 --- a/keyboards/ckeys/obelus/info.json +++ b/keyboards/ckeys/obelus/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "audio": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "midi": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "B2", "B3"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/ckeys/obelus/rules.mk b/keyboards/ckeys/obelus/rules.mk deleted file mode 100644 index 08744b16baa..00000000000 --- a/keyboards/ckeys/obelus/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 = 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 -MIDI_ENABLE = yes # MIDI support -AUDIO_ENABLE = yes # Audio output diff --git a/keyboards/ckeys/thedora/info.json b/keyboards/ckeys/thedora/keyboard.json similarity index 88% rename from keyboards/ckeys/thedora/info.json rename to keyboards/ckeys/thedora/keyboard.json index e86d162ace1..0e52b24dfa6 100644 --- a/keyboards/ckeys/thedora/info.json +++ b/keyboards/ckeys/thedora/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "midi": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "B4", "B3", "B2", "B1", "B0"], "rows": ["A2", "A1", "A0", "B8"] diff --git a/keyboards/ckeys/thedora/rules.mk b/keyboards/ckeys/thedora/rules.mk deleted file mode 100755 index ac8d5677b2c..00000000000 --- a/keyboards/ckeys/thedora/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output - -MIDI_ENABLE = yes # MIDI support -ENCODER_ENABLE = yes diff --git a/keyboards/ckeys/washington/info.json b/keyboards/ckeys/washington/keyboard.json similarity index 82% rename from keyboards/ckeys/washington/info.json rename to keyboards/ckeys/washington/keyboard.json index d6029eeabb8..b6952fe44af 100644 --- a/keyboards/ckeys/washington/info.json +++ b/keyboards/ckeys/washington/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x002A", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true + }, "matrix_pins": { "cols": ["F7", "B1", "B3"], "rows": ["F4", "F5", "F6"] diff --git a/keyboards/ckeys/washington/rules.mk b/keyboards/ckeys/washington/rules.mk deleted file mode 100644 index c6c08dda595..00000000000 --- a/keyboards/ckeys/washington/rules.mk +++ /dev/null @@ -1,14 +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 -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 -ENCODER_ENABLE = yes # Enable support for encoders -OLED_ENABLE = yes diff --git a/keyboards/clawsome/bookerboard/info.json b/keyboards/clawsome/bookerboard/keyboard.json similarity index 86% rename from keyboards/clawsome/bookerboard/info.json rename to keyboards/clawsome/bookerboard/keyboard.json index 8c6a4dc0f9f..a72260eb60c 100644 --- a/keyboards/clawsome/bookerboard/info.json +++ b/keyboards/clawsome/bookerboard/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x41CE", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "B2", "B3"], "rows": ["B5", "B4", "E6", "D7"] diff --git a/keyboards/clawsome/bookerboard/rules.mk b/keyboards/clawsome/bookerboard/rules.mk deleted file mode 100644 index afdf78fc5f6..00000000000 --- a/keyboards/clawsome/bookerboard/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/clawsome/coupe/info.json b/keyboards/clawsome/coupe/keyboard.json similarity index 95% rename from keyboards/clawsome/coupe/info.json rename to keyboards/clawsome/coupe/keyboard.json index b68fa51029c..576b8e71641 100644 --- a/keyboards/clawsome/coupe/info.json +++ b/keyboards/clawsome/coupe/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x7E94", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B6", "B3", "B2"], "rows": ["D7", "D2", "C6", "B5", "D4", "B4", "D0", "D3", "D1", "E6"] diff --git a/keyboards/clawsome/coupe/rules.mk b/keyboards/clawsome/coupe/rules.mk deleted file mode 100644 index afdf78fc5f6..00000000000 --- a/keyboards/clawsome/coupe/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/clawsome/doodle/info.json b/keyboards/clawsome/doodle/keyboard.json similarity index 82% rename from keyboards/clawsome/doodle/info.json rename to keyboards/clawsome/doodle/keyboard.json index e7883a6f1a3..0b3f4cc4e70 100644 --- a/keyboards/clawsome/doodle/info.json +++ b/keyboards/clawsome/doodle/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D7", "F4", "E6"], "rows": ["D4", "C6"] diff --git a/keyboards/clawsome/doodle/rules.mk b/keyboards/clawsome/doodle/rules.mk deleted file mode 100644 index 1ac8624bb1e..00000000000 --- a/keyboards/clawsome/doodle/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 \ No newline at end of file diff --git a/keyboards/clawsome/fightpad/info.json b/keyboards/clawsome/fightpad/keyboard.json similarity index 86% rename from keyboards/clawsome/fightpad/info.json rename to keyboards/clawsome/fightpad/keyboard.json index fbd4673dd78..73333490280 100644 --- a/keyboards/clawsome/fightpad/info.json +++ b/keyboards/clawsome/fightpad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x481C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B2", "B3", "B1", "F7"], "rows": ["B5", "B6"] diff --git a/keyboards/clawsome/fightpad/rules.mk b/keyboards/clawsome/fightpad/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/clawsome/fightpad/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 = 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/clawsome/gamebuddy/v1_0/info.json b/keyboards/clawsome/gamebuddy/v1_0/keyboard.json similarity index 91% rename from keyboards/clawsome/gamebuddy/v1_0/info.json rename to keyboards/clawsome/gamebuddy/v1_0/keyboard.json index 269c4b86027..978a3ad9748 100644 --- a/keyboards/clawsome/gamebuddy/v1_0/info.json +++ b/keyboards/clawsome/gamebuddy/v1_0/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x17B9", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "C6", "D7", "B6"], "rows": ["D1", "D0", "E6", "B3", "B2"] diff --git a/keyboards/clawsome/gamebuddy/v1_0/rules.mk b/keyboards/clawsome/gamebuddy/v1_0/rules.mk deleted file mode 100644 index afdf78fc5f6..00000000000 --- a/keyboards/clawsome/gamebuddy/v1_0/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/clawsome/gamebuddy/v1_m/info.json b/keyboards/clawsome/gamebuddy/v1_m/keyboard.json similarity index 91% rename from keyboards/clawsome/gamebuddy/v1_m/info.json rename to keyboards/clawsome/gamebuddy/v1_m/keyboard.json index 3709bbbe3c4..dd9f39f97ec 100644 --- a/keyboards/clawsome/gamebuddy/v1_m/info.json +++ b/keyboards/clawsome/gamebuddy/v1_m/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B1", "F7", "F6", "F5", "E6", "B4", "B6"], "rows": ["C6", "D7", "B5", "B3", "B2"] diff --git a/keyboards/clawsome/gamebuddy/v1_m/rules.mk b/keyboards/clawsome/gamebuddy/v1_m/rules.mk deleted file mode 100644 index 1ac8624bb1e..00000000000 --- a/keyboards/clawsome/gamebuddy/v1_m/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 \ No newline at end of file diff --git a/keyboards/clawsome/hatchback/info.json b/keyboards/clawsome/hatchback/keyboard.json similarity index 97% rename from keyboards/clawsome/hatchback/info.json rename to keyboards/clawsome/hatchback/keyboard.json index 90d1ad6ee25..6da4bd46851 100644 --- a/keyboards/clawsome/hatchback/info.json +++ b/keyboards/clawsome/hatchback/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D5", "C7", "F1"], "rows": ["B0", "B6", "D4", "B4", "D0", "B5", "D1", "E6", "D2", "D7", "D3", "C6"] diff --git a/keyboards/clawsome/hatchback/rules.mk b/keyboards/clawsome/hatchback/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/clawsome/hatchback/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/clawsome/luggage_rack/info.json b/keyboards/clawsome/luggage_rack/keyboard.json similarity index 87% rename from keyboards/clawsome/luggage_rack/info.json rename to keyboards/clawsome/luggage_rack/keyboard.json index 5996c9d8f48..2f53bdf49e0 100644 --- a/keyboards/clawsome/luggage_rack/info.json +++ b/keyboards/clawsome/luggage_rack/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "D0", "D1"], "rows": ["D3", "F4", "B0", "B2", "F7", "B6", "B1", "F5", "F6"] diff --git a/keyboards/clawsome/luggage_rack/rules.mk b/keyboards/clawsome/luggage_rack/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/clawsome/luggage_rack/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/clawsome/numeros/info.json b/keyboards/clawsome/numeros/keyboard.json similarity index 89% rename from keyboards/clawsome/numeros/info.json rename to keyboards/clawsome/numeros/keyboard.json index c1b3565b636..728a1a1853b 100644 --- a/keyboards/clawsome/numeros/info.json +++ b/keyboards/clawsome/numeros/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B3", "E6", "D7", "D4"], "rows": ["D0", "C6", "B2", "B6", "B5"] diff --git a/keyboards/clawsome/numeros/rules.mk b/keyboards/clawsome/numeros/rules.mk deleted file mode 100644 index afdf78fc5f6..00000000000 --- a/keyboards/clawsome/numeros/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/clawsome/roadster/info.json b/keyboards/clawsome/roadster/keyboard.json similarity index 94% rename from keyboards/clawsome/roadster/info.json rename to keyboards/clawsome/roadster/keyboard.json index 2e5bc24484a..895b97721ba 100644 --- a/keyboards/clawsome/roadster/info.json +++ b/keyboards/clawsome/roadster/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"], "rows": ["D2", "D3", "D0", "D1"] diff --git a/keyboards/clawsome/roadster/rules.mk b/keyboards/clawsome/roadster/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/clawsome/roadster/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/clawsome/sedan/info.json b/keyboards/clawsome/sedan/keyboard.json similarity index 96% rename from keyboards/clawsome/sedan/info.json rename to keyboards/clawsome/sedan/keyboard.json index dd116e64874..7ff4980a7c8 100644 --- a/keyboards/clawsome/sedan/info.json +++ b/keyboards/clawsome/sedan/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x8C78", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "F4", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "C7", "D5", "B7", "B5", "B4", "E6"], "rows": ["C6", "D4", "D0", "D1", "D3"] diff --git a/keyboards/clawsome/sedan/rules.mk b/keyboards/clawsome/sedan/rules.mk deleted file mode 100644 index afdf78fc5f6..00000000000 --- a/keyboards/clawsome/sedan/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/clawsome/sidekick/info.json b/keyboards/clawsome/sidekick/keyboard.json similarity index 91% rename from keyboards/clawsome/sidekick/info.json rename to keyboards/clawsome/sidekick/keyboard.json index ee4df7538ca..4f535d09aae 100644 --- a/keyboards/clawsome/sidekick/info.json +++ b/keyboards/clawsome/sidekick/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xDB9F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F5", "B1", "B3", "E6", "D7", "D4"], "rows": ["D0", "C6", "B2", "B6", "B5"] diff --git a/keyboards/clawsome/sidekick/rules.mk b/keyboards/clawsome/sidekick/rules.mk deleted file mode 100644 index afdf78fc5f6..00000000000 --- a/keyboards/clawsome/sidekick/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/clawsome/suv/info.json b/keyboards/clawsome/suv/keyboard.json similarity index 97% rename from keyboards/clawsome/suv/info.json rename to keyboards/clawsome/suv/keyboard.json index 2f0b2d6bfee..ec84d6117c2 100644 --- a/keyboards/clawsome/suv/info.json +++ b/keyboards/clawsome/suv/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "B4", "B5", "B7", "D5", "C7", "F1", "F5", "F4"], "rows": ["F0", "B6", "D0", "F6", "D4", "F7", "B3", "B1", "B0", "C6", "B2", "D7"] diff --git a/keyboards/clawsome/suv/rules.mk b/keyboards/clawsome/suv/rules.mk deleted file mode 100644 index 1ac8624bb1e..00000000000 --- a/keyboards/clawsome/suv/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 \ No newline at end of file diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/keyboard.json similarity index 99% rename from keyboards/cmm_studio/fuji65/info.json rename to keyboards/cmm_studio/fuji65/keyboard.json index 860608042f6..c4f1e5156e3 100644 --- a/keyboards/cmm_studio/fuji65/info.json +++ b/keyboards/cmm_studio/fuji65/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "E6" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "D5", "D3", "D2", "D1", "D0"], "rows": ["B5", "B4", "D7", "D6", "B6"] diff --git a/keyboards/cmm_studio/fuji65/rules.mk b/keyboards/cmm_studio/fuji65/rules.mk deleted file mode 100644 index 7db37f02821..00000000000 --- a/keyboards/cmm_studio/fuji65/rules.mk +++ /dev/null @@ -1,15 +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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# generated by KBFirmware JSON to QMK Parser -# https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/cmm_studio/saka68/hotswap/info.json b/keyboards/cmm_studio/saka68/hotswap/keyboard.json similarity index 97% rename from keyboards/cmm_studio/saka68/hotswap/info.json rename to keyboards/cmm_studio/saka68/hotswap/keyboard.json index e2327e81451..6dc3ec639a2 100644 --- a/keyboards/cmm_studio/saka68/hotswap/info.json +++ b/keyboards/cmm_studio/saka68/hotswap/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5348", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "D3", "D5"], "rows": ["D2", "D1", "B0", "F6", "F7"] diff --git a/keyboards/cmm_studio/saka68/hotswap/rules.mk b/keyboards/cmm_studio/saka68/hotswap/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/cmm_studio/saka68/hotswap/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/cmm_studio/saka68/solder/info.json b/keyboards/cmm_studio/saka68/solder/keyboard.json similarity index 98% rename from keyboards/cmm_studio/saka68/solder/info.json rename to keyboards/cmm_studio/saka68/solder/keyboard.json index 145883fc1de..d5aea407638 100644 --- a/keyboards/cmm_studio/saka68/solder/info.json +++ b/keyboards/cmm_studio/saka68/solder/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x534B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "D2", "D3", "D5"], "rows": ["D1", "D0", "B0", "F6", "F7"] diff --git a/keyboards/cmm_studio/saka68/solder/rules.mk b/keyboards/cmm_studio/saka68/solder/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/cmm_studio/saka68/solder/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/coarse/cordillera/info.json b/keyboards/coarse/cordillera/keyboard.json similarity index 98% rename from keyboards/coarse/cordillera/info.json rename to keyboards/coarse/cordillera/keyboard.json index 7252f65f29d..de78b3027c2 100644 --- a/keyboards/coarse/cordillera/info.json +++ b/keyboards/coarse/cordillera/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1401", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["A13", "B9", "F1", "A10", "A9"] diff --git a/keyboards/coarse/cordillera/rules.mk b/keyboards/coarse/cordillera/rules.mk deleted file mode 100644 index d6cd9d5f0da..00000000000 --- a/keyboards/coarse/cordillera/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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # 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/coban/pad3a/info.json b/keyboards/coban/pad3a/keyboard.json similarity index 80% rename from keyboards/coban/pad3a/info.json rename to keyboards/coban/pad3a/keyboard.json index fc5c8ee71ee..a9a78b82201 100644 --- a/keyboards/coban/pad3a/info.json +++ b/keyboards/coban/pad3a/keyboard.json @@ -14,6 +14,15 @@ {"pin_a": "GP5", "pin_b": "GP4"} ] }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "direct": [ ["GP8", "GP7", "GP6"] diff --git a/keyboards/coban/pad3a/rules.mk b/keyboards/coban/pad3a/rules.mk deleted file mode 100644 index 62aabd36434..00000000000 --- a/keyboards/coban/pad3a/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/compound/info.json b/keyboards/compound/keyboard.json similarity index 95% rename from keyboards/compound/info.json rename to keyboards/compound/keyboard.json index 9f31c7efc1c..a0a1e1e9494 100644 --- a/keyboards/compound/info.json +++ b/keyboards/compound/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xB0BA", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], "rows": ["B0", "B7", "D0", "D1", "D2"] diff --git a/keyboards/compound/rules.mk b/keyboards/compound/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/compound/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/contender/info.json b/keyboards/contender/keyboard.json similarity index 92% rename from keyboards/contender/info.json rename to keyboards/contender/keyboard.json index b09556f3d6f..5bef1f0633c 100644 --- a/keyboards/contender/info.json +++ b/keyboards/contender/keyboard.json @@ -29,6 +29,15 @@ "alternating": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "D6", "B3", "B0", "B1"], "rows": ["D4", "D3", "B5", "B7", "B4", "B2"] diff --git a/keyboards/contender/rules.mk b/keyboards/contender/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/contender/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/converter/a1200/miss1200/info.json b/keyboards/converter/a1200/miss1200/keyboard.json similarity index 75% rename from keyboards/converter/a1200/miss1200/info.json rename to keyboards/converter/a1200/miss1200/keyboard.json index 74d569b8d95..1f7bfcda3f9 100644 --- a/keyboards/converter/a1200/miss1200/info.json +++ b/keyboards/converter/a1200/miss1200/keyboard.json @@ -6,6 +6,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D1", "C7", "D6", "B7", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "B2", "D5", "D3", "D2"], "rows": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B3"] diff --git a/keyboards/converter/a1200/miss1200/rules.mk b/keyboards/converter/a1200/miss1200/rules.mk deleted file mode 100644 index ac2c4626d98..00000000000 --- a/keyboards/converter/a1200/miss1200/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/converter/a1200/teensy2pp/info.json b/keyboards/converter/a1200/teensy2pp/keyboard.json similarity index 74% rename from keyboards/converter/a1200/teensy2pp/info.json rename to keyboards/converter/a1200/teensy2pp/keyboard.json index e4d0c09c0fe..07661239139 100644 --- a/keyboards/converter/a1200/teensy2pp/info.json +++ b/keyboards/converter/a1200/teensy2pp/keyboard.json @@ -6,6 +6,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"], "rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"] diff --git a/keyboards/converter/a1200/teensy2pp/rules.mk b/keyboards/converter/a1200/teensy2pp/rules.mk deleted file mode 100644 index b8f2be564de..00000000000 --- a/keyboards/converter/a1200/teensy2pp/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/converter/numeric_keypad_iie/info.json b/keyboards/converter/numeric_keypad_iie/keyboard.json similarity index 91% rename from keyboards/converter/numeric_keypad_iie/info.json rename to keyboards/converter/numeric_keypad_iie/keyboard.json index abec316be71..6dcffe7e213 100644 --- a/keyboards/converter/numeric_keypad_iie/info.json +++ b/keyboards/converter/numeric_keypad_iie/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6"], "rows": ["B0", "B2", "D2", "D3"] diff --git a/keyboards/converter/numeric_keypad_iie/rules.mk b/keyboards/converter/numeric_keypad_iie/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/converter/numeric_keypad_iie/rules.mk +++ /dev/null @@ -1,12 +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 -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/cool836a/info.json b/keyboards/cool836a/keyboard.json similarity index 93% rename from keyboards/cool836a/info.json rename to keyboards/cool836a/keyboard.json index 8f7f688a6b1..18dd9cfcdc9 100644 --- a/keyboards/cool836a/info.json +++ b/keyboards/cool836a/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "D0", "B2", "C6", "D7", "E6"], "rows": ["D1", "B5", "B4", "F4", "B1", "B6"] diff --git a/keyboards/cool836a/rules.mk b/keyboards/cool836a/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/cool836a/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 = 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/copenhagen_click/click_pad_v1/info.json b/keyboards/copenhagen_click/click_pad_v1/keyboard.json similarity index 76% rename from keyboards/copenhagen_click/click_pad_v1/info.json rename to keyboards/copenhagen_click/click_pad_v1/keyboard.json index 9eee0f4fec8..1c402db576b 100755 --- a/keyboards/copenhagen_click/click_pad_v1/info.json +++ b/keyboards/copenhagen_click/click_pad_v1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5"], "rows": ["F7"] diff --git a/keyboards/copenhagen_click/click_pad_v1/rules.mk b/keyboards/copenhagen_click/click_pad_v1/rules.mk deleted file mode 100755 index 8a6570c496a..00000000000 --- a/keyboards/copenhagen_click/click_pad_v1/rules.mk +++ /dev/null @@ -1,12 +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 -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/coseyfannitutti/discipad/info.json b/keyboards/coseyfannitutti/discipad/keyboard.json similarity index 89% rename from keyboards/coseyfannitutti/discipad/info.json rename to keyboards/coseyfannitutti/discipad/keyboard.json index 6950e4d17c7..a169863dba2 100644 --- a/keyboards/coseyfannitutti/discipad/info.json +++ b/keyboards/coseyfannitutti/discipad/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C0", "C1", "C2", "C3"], "rows": ["B1", "B0", "D7", "D6", "D4"] diff --git a/keyboards/coseyfannitutti/discipad/rules.mk b/keyboards/coseyfannitutti/discipad/rules.mk deleted file mode 100644 index 6e0404820cd..00000000000 --- a/keyboards/coseyfannitutti/discipad/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 = 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/coseyfannitutti/mullet/info.json b/keyboards/coseyfannitutti/mullet/keyboard.json similarity index 96% rename from keyboards/coseyfannitutti/mullet/info.json rename to keyboards/coseyfannitutti/mullet/keyboard.json index 3b63ece2209..1cc76eccfaf 100644 --- a/keyboards/coseyfannitutti/mullet/info.json +++ b/keyboards/coseyfannitutti/mullet/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "D5" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3"], "rows": ["D0", "D1", "B0", "F0", "F1"] diff --git a/keyboards/coseyfannitutti/mullet/rules.mk b/keyboards/coseyfannitutti/mullet/rules.mk deleted file mode 100644 index b0ffb80ff38..00000000000 --- a/keyboards/coseyfannitutti/mullet/rules.mk +++ /dev/null @@ -1,12 +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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/coseyfannitutti/mulletpad/info.json b/keyboards/coseyfannitutti/mulletpad/keyboard.json similarity index 89% rename from keyboards/coseyfannitutti/mulletpad/info.json rename to keyboards/coseyfannitutti/mulletpad/keyboard.json index 7de583e8a96..13e7212297b 100644 --- a/keyboards/coseyfannitutti/mulletpad/info.json +++ b/keyboards/coseyfannitutti/mulletpad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6666", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "C7", "C6", "B6"], "rows": ["F4", "F1", "F5", "F6", "F7"] diff --git a/keyboards/coseyfannitutti/mulletpad/rules.mk b/keyboards/coseyfannitutti/mulletpad/rules.mk deleted file mode 100644 index 7829a2753bb..00000000000 --- a/keyboards/coseyfannitutti/mulletpad/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 = 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/coseyfannitutti/romeo/info.json b/keyboards/coseyfannitutti/romeo/keyboard.json similarity index 98% rename from keyboards/coseyfannitutti/romeo/info.json rename to keyboards/coseyfannitutti/romeo/keyboard.json index 54559abad67..5392cf00f1a 100644 --- a/keyboards/coseyfannitutti/romeo/info.json +++ b/keyboards/coseyfannitutti/romeo/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4069", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C5", "C4", "C3", "D0", "C2", "D1", "C1", "C0", "D4", "B0", "D7", "D6"], "rows": ["B1", "B4", "B3", "B2"] diff --git a/keyboards/coseyfannitutti/romeo/rules.mk b/keyboards/coseyfannitutti/romeo/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/coseyfannitutti/romeo/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 = 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/cosmo65/info.json b/keyboards/cosmo65/keyboard.json similarity index 95% rename from keyboards/cosmo65/info.json rename to keyboards/cosmo65/keyboard.json index 1cc4ff4e637..1814b3f0d0c 100644 --- a/keyboards/cosmo65/info.json +++ b/keyboards/cosmo65/keyboard.json @@ -25,6 +25,15 @@ "ws2812": { "pin": "F7" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D1", "D2", "D3", "F1", "F6"], "rows": ["D5", "D0", "F0", "F5", "F4"] diff --git a/keyboards/cosmo65/rules.mk b/keyboards/cosmo65/rules.mk deleted file mode 100644 index 940a788addd..00000000000 --- a/keyboards/cosmo65/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 = 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 \ No newline at end of file diff --git a/keyboards/cozykeys/bloomer/v2/info.json b/keyboards/cozykeys/bloomer/v2/keyboard.json similarity index 97% rename from keyboards/cozykeys/bloomer/v2/info.json rename to keyboards/cozykeys/bloomer/v2/keyboard.json index 1d519d7aad6..9f09db86fa0 100644 --- a/keyboards/cozykeys/bloomer/v2/info.json +++ b/keyboards/cozykeys/bloomer/v2/keyboard.json @@ -2,6 +2,15 @@ "usb": { "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B4", "C6", "E6", "B5", "B6", "B7", "D6", "C7"], "rows": ["D0", "D1", "D3", "D2", "D4", "B2"] diff --git a/keyboards/cozykeys/bloomer/v2/rules.mk b/keyboards/cozykeys/bloomer/v2/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/cozykeys/bloomer/v2/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/cozykeys/bloomer/v3/info.json b/keyboards/cozykeys/bloomer/v3/keyboard.json similarity index 97% rename from keyboards/cozykeys/bloomer/v3/info.json rename to keyboards/cozykeys/bloomer/v3/keyboard.json index 3b630f852a3..a0f04956af4 100644 --- a/keyboards/cozykeys/bloomer/v3/info.json +++ b/keyboards/cozykeys/bloomer/v3/keyboard.json @@ -2,6 +2,15 @@ "usb": { "device_version": "0.0.3" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B4", "C6", "E6", "B5", "B6", "B7", "D6", "C7"], "rows": ["D0", "D1", "D3", "D2", "D4", "B2"] diff --git a/keyboards/cozykeys/bloomer/v3/rules.mk b/keyboards/cozykeys/bloomer/v3/rules.mk deleted file mode 100644 index aa4c817d2a2..00000000000 --- a/keyboards/cozykeys/bloomer/v3/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/cozykeys/speedo/v2/info.json b/keyboards/cozykeys/speedo/v2/keyboard.json similarity index 96% rename from keyboards/cozykeys/speedo/v2/info.json rename to keyboards/cozykeys/speedo/v2/keyboard.json index 9e70d28b41c..48412e7e7d6 100644 --- a/keyboards/cozykeys/speedo/v2/info.json +++ b/keyboards/cozykeys/speedo/v2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1192", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "D0", "B7", "B3", "B2", "B1", "B0"], "rows": ["D1", "D2", "D3", "C6", "C7"] diff --git a/keyboards/cozykeys/speedo/v2/rules.mk b/keyboards/cozykeys/speedo/v2/rules.mk deleted file mode 100644 index 59c896dbff6..00000000000 --- a/keyboards/cozykeys/speedo/v2/rules.mk +++ /dev/null @@ -1,12 +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 -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/craftwalk/info.json b/keyboards/craftwalk/keyboard.json similarity index 89% rename from keyboards/craftwalk/info.json rename to keyboards/craftwalk/keyboard.json index 51030e9e64b..e1cee6d56b9 100644 --- a/keyboards/craftwalk/info.json +++ b/keyboards/craftwalk/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": false, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B1", "F7", "F5", "F4", "B2", "E6", "B4"], "rows": ["F6", "B3", "B5"] diff --git a/keyboards/craftwalk/rules.mk b/keyboards/craftwalk/rules.mk deleted file mode 100644 index 2ce5bcb2bb6..00000000000 --- a/keyboards/craftwalk/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # 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 = no # 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/crawlpad/info.json b/keyboards/crawlpad/keyboard.json similarity index 91% rename from keyboards/crawlpad/info.json rename to keyboards/crawlpad/keyboard.json index 3eb3b329555..1e9bb74c765 100644 --- a/keyboards/crawlpad/info.json +++ b/keyboards/crawlpad/keyboard.json @@ -26,6 +26,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "D5", "D6", "D7"], "rows": ["F0", "F1", "F4", "F5"] diff --git a/keyboards/crawlpad/rules.mk b/keyboards/crawlpad/rules.mk deleted file mode 100755 index 516dd414797..00000000000 --- a/keyboards/crawlpad/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # [Crawlpad] Custom backlighting code is used, so this should not be enabled -AUDIO_ENABLE = no # [Crawlpad] This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = no # [Crawlpad] This can be enabled if a ws2812 strip is connected to the expansion port. diff --git a/keyboards/crazy_keyboard_68/info.json b/keyboards/crazy_keyboard_68/keyboard.json similarity index 96% rename from keyboards/crazy_keyboard_68/info.json rename to keyboards/crazy_keyboard_68/keyboard.json index 704bcb5897f..fa36b106be0 100644 --- a/keyboards/crazy_keyboard_68/info.json +++ b/keyboards/crazy_keyboard_68/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x13DE", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F4"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/crazy_keyboard_68/rules.mk b/keyboards/crazy_keyboard_68/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/crazy_keyboard_68/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 = 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/crbn/info.json b/keyboards/crbn/keyboard.json similarity index 97% rename from keyboards/crbn/info.json rename to keyboards/crbn/keyboard.json index e227792440b..63c82470471 100644 --- a/keyboards/crbn/info.json +++ b/keyboards/crbn/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2"], "rows": ["B3", "B1", "F7", "F6"] diff --git a/keyboards/crbn/rules.mk b/keyboards/crbn/rules.mk deleted file mode 100644 index 131aa72aeb5..00000000000 --- a/keyboards/crbn/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/creatkeebs/glacier/info.json b/keyboards/creatkeebs/glacier/keyboard.json similarity index 97% rename from keyboards/creatkeebs/glacier/info.json rename to keyboards/creatkeebs/glacier/keyboard.json index 8b4aeacfcae..c6b5dccd2c1 100644 --- a/keyboards/creatkeebs/glacier/info.json +++ b/keyboards/creatkeebs/glacier/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "F6", "B0", "B6", "C6", "C7", "B1", "B2", "B3", "B7", "D3", "D2", "D1"], "rows": ["F0", "F1", "F4", "E6", "F5", "D0"] diff --git a/keyboards/creatkeebs/glacier/rules.mk b/keyboards/creatkeebs/glacier/rules.mk deleted file mode 100644 index 241d1099ca1..00000000000 --- a/keyboards/creatkeebs/glacier/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 = 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 -AUDIO_ENABLE = no # Enable keyboard RGB underglow -RGBLIGHT_ENABLE = no # Audio output diff --git a/keyboards/creatkeebs/thera/info.json b/keyboards/creatkeebs/thera/keyboard.json similarity index 99% rename from keyboards/creatkeebs/thera/info.json rename to keyboards/creatkeebs/thera/keyboard.json index ee098dfcb01..ab10fda3249 100644 --- a/keyboards/creatkeebs/thera/info.json +++ b/keyboards/creatkeebs/thera/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6061", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5"], "rows": ["B2", "B1", "B0", "E6", "B3", "B7"] diff --git a/keyboards/creatkeebs/thera/rules.mk b/keyboards/creatkeebs/thera/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/creatkeebs/thera/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 = 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/crin/info.json b/keyboards/crin/keyboard.json similarity index 99% rename from keyboards/crin/info.json rename to keyboards/crin/keyboard.json index 7e2c402a110..e6680219363 100644 --- a/keyboards/crin/info.json +++ b/keyboards/crin/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xCC11", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "B3"], "rows": ["A9", "A8", "B15", "B14", "B13"] diff --git a/keyboards/crin/rules.mk b/keyboards/crin/rules.mk deleted file mode 100644 index 7f4f202a1b7..00000000000 --- a/keyboards/crin/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 -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 - diff --git a/keyboards/cutie_club/borsdorf/info.json b/keyboards/cutie_club/borsdorf/keyboard.json similarity index 97% rename from keyboards/cutie_club/borsdorf/info.json rename to keyboards/cutie_club/borsdorf/keyboard.json index 0d038b74c1b..ba3b6f8376e 100644 --- a/keyboards/cutie_club/borsdorf/info.json +++ b/keyboards/cutie_club/borsdorf/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6D8A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0"], "rows": ["A15", "A14", "B12", "B5", "B4"] diff --git a/keyboards/cutie_club/borsdorf/rules.mk b/keyboards/cutie_club/borsdorf/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/cutie_club/borsdorf/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 = 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/cutie_club/giant_macro_pad/info.json b/keyboards/cutie_club/giant_macro_pad/keyboard.json similarity index 99% rename from keyboards/cutie_club/giant_macro_pad/info.json rename to keyboards/cutie_club/giant_macro_pad/keyboard.json index 8132fa62a5d..fc5ce85a2a8 100644 --- a/keyboards/cutie_club/giant_macro_pad/info.json +++ b/keyboards/cutie_club/giant_macro_pad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x74B6", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C9", "C8", "C7", "C6", "B15", "B14", "B13", "B12", "A8", "A15", "B9", "A2", "A1", "A0", "C3", "C2", "C1", "C0", "F1", "F0"], "rows": ["C10", "C11", "C12", "D2", "B3", "B4", "B5", "B6", "B7", "B8", "A3", "B2", "B1", "B0", "C5", "C4", "A7", "A6", "A5", "A4"] diff --git a/keyboards/cutie_club/giant_macro_pad/rules.mk b/keyboards/cutie_club/giant_macro_pad/rules.mk deleted file mode 100755 index ab2c49da70e..00000000000 --- a/keyboards/cutie_club/giant_macro_pad/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 = 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/cutie_club/keebcats/denis/info.json b/keyboards/cutie_club/keebcats/denis/keyboard.json similarity index 99% rename from keyboards/cutie_club/keebcats/denis/info.json rename to keyboards/cutie_club/keebcats/denis/keyboard.json index 3d3abea4348..9f583d9797b 100644 --- a/keyboards/cutie_club/keebcats/denis/info.json +++ b/keyboards/cutie_club/keebcats/denis/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xB260", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["E6", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["B2", "D0", "F5", "F4", "F1"] diff --git a/keyboards/cutie_club/keebcats/denis/rules.mk b/keyboards/cutie_club/keebcats/denis/rules.mk deleted file mode 100644 index b306c637e9d..00000000000 --- a/keyboards/cutie_club/keebcats/denis/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable bootmagic -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/cutie_club/keebcats/dougal/info.json b/keyboards/cutie_club/keebcats/dougal/keyboard.json similarity index 98% rename from keyboards/cutie_club/keebcats/dougal/info.json rename to keyboards/cutie_club/keebcats/dougal/keyboard.json index da7f99283b5..19a422b9ba5 100644 --- a/keyboards/cutie_club/keebcats/dougal/info.json +++ b/keyboards/cutie_club/keebcats/dougal/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xB265", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["E6", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "B7"], "rows": ["B2", "D0", "F5", "F4", "F1"] diff --git a/keyboards/cutie_club/keebcats/dougal/rules.mk b/keyboards/cutie_club/keebcats/dougal/rules.mk deleted file mode 100644 index 8048c29cc0c..00000000000 --- a/keyboards/cutie_club/keebcats/dougal/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic -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/cutie_club/novus/info.json b/keyboards/cutie_club/novus/keyboard.json similarity index 98% rename from keyboards/cutie_club/novus/info.json rename to keyboards/cutie_club/novus/keyboard.json index ddbfad6af8b..8738fcc32c8 100644 --- a/keyboards/cutie_club/novus/info.json +++ b/keyboards/cutie_club/novus/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3F42", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "C6", "C7", "B2", "B3", "D0", "D1", "D2", "D3", "D7", "B4", "B5", "D5", "D4", "D6"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/cutie_club/novus/rules.mk b/keyboards/cutie_club/novus/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/cutie_club/novus/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 = 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/cutie_club/wraith/info.json b/keyboards/cutie_club/wraith/keyboard.json similarity index 98% rename from keyboards/cutie_club/wraith/info.json rename to keyboards/cutie_club/wraith/keyboard.json index 4a9809fe4a8..6f217e420f3 100644 --- a/keyboards/cutie_club/wraith/info.json +++ b/keyboards/cutie_club/wraith/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7"] diff --git a/keyboards/cutie_club/wraith/rules.mk b/keyboards/cutie_club/wraith/rules.mk deleted file mode 100644 index 8d97e04e77d..00000000000 --- a/keyboards/cutie_club/wraith/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 = 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/cx60/info.json b/keyboards/cx60/keyboard.json similarity index 96% rename from keyboards/cx60/info.json rename to keyboards/cx60/keyboard.json index e03587e3e46..9748d934a6c 100644 --- a/keyboards/cx60/info.json +++ b/keyboards/cx60/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x3630", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "C6", "F7", "F0", "B4", "D7", "D6", "B0", "B1", "B2", "B3", "D2", "D3", "D5"], "rows": ["F1", "F4", "F5", "F6", "E6"] diff --git a/keyboards/cx60/rules.mk b/keyboards/cx60/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/cx60/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/cybergear/macro25/info.json b/keyboards/cybergear/macro25/keyboard.json similarity index 86% rename from keyboards/cybergear/macro25/info.json rename to keyboards/cybergear/macro25/keyboard.json index 1737c5f8fd0..a1fca494061 100644 --- a/keyboards/cybergear/macro25/info.json +++ b/keyboards/cybergear/macro25/keyboard.json @@ -28,6 +28,14 @@ ] } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "rows": ["E6", "B4"], "cols": ["B1", "F7", "F6", "F5", "F4"] diff --git a/keyboards/cybergear/macro25/rules.mk b/keyboards/cybergear/macro25/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/cybergear/macro25/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 = 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/dailycraft/owl8/info.json b/keyboards/dailycraft/owl8/keyboard.json similarity index 86% rename from keyboards/dailycraft/owl8/info.json rename to keyboards/dailycraft/owl8/keyboard.json index 9dc42c8fd78..9d654b7d3fb 100644 --- a/keyboards/dailycraft/owl8/info.json +++ b/keyboards/dailycraft/owl8/keyboard.json @@ -16,6 +16,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "direct": [ ["F4", "F7", "B3", "B6", "F5", "F6", "B1", "B2", "D4", "C6", "D7", "E6"] diff --git a/keyboards/dailycraft/owl8/rules.mk b/keyboards/dailycraft/owl8/rules.mk deleted file mode 100644 index 453f0a34d38..00000000000 --- a/keyboards/dailycraft/owl8/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes diff --git a/keyboards/dailycraft/stickey4/info.json b/keyboards/dailycraft/stickey4/keyboard.json similarity index 79% rename from keyboards/dailycraft/stickey4/info.json rename to keyboards/dailycraft/stickey4/keyboard.json index 156a6d63a1f..101c796b4ea 100644 --- a/keyboards/dailycraft/stickey4/info.json +++ b/keyboards/dailycraft/stickey4/keyboard.json @@ -16,6 +16,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "direct": [ ["D4", "C6", "D7", "E6"] diff --git a/keyboards/dailycraft/stickey4/rules.mk b/keyboards/dailycraft/stickey4/rules.mk deleted file mode 100644 index 453f0a34d38..00000000000 --- a/keyboards/dailycraft/stickey4/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes diff --git a/keyboards/daji/seis_cinco/info.json b/keyboards/daji/seis_cinco/keyboard.json similarity index 97% rename from keyboards/daji/seis_cinco/info.json rename to keyboards/daji/seis_cinco/keyboard.json index 3e561061888..a358ae86a1c 100644 --- a/keyboards/daji/seis_cinco/info.json +++ b/keyboards/daji/seis_cinco/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xBF22", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B1", "B0", "A7", "B14", "A8", "B15", "A0", "C15", "C14", "C13", "B5", "B4", "B3", "A15", "A10", "A14"], "rows": ["B2", "B10", "B11", "A9", "A6"] diff --git a/keyboards/daji/seis_cinco/rules.mk b/keyboards/daji/seis_cinco/rules.mk deleted file mode 100644 index c3b8e77d77a..00000000000 --- a/keyboards/daji/seis_cinco/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 -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/db/db63/info.json b/keyboards/db/db63/keyboard.json similarity index 95% rename from keyboards/db/db63/info.json rename to keyboards/db/db63/keyboard.json index 30a94c2b9cf..ec41b8c313a 100644 --- a/keyboards/db/db63/info.json +++ b/keyboards/db/db63/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5"] diff --git a/keyboards/db/db63/rules.mk b/keyboards/db/db63/rules.mk deleted file mode 100644 index 166b3d3ec8d..00000000000 --- a/keyboards/db/db63/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/delikeeb/flatbread60/info.json b/keyboards/delikeeb/flatbread60/keyboard.json similarity index 95% rename from keyboards/delikeeb/flatbread60/info.json rename to keyboards/delikeeb/flatbread60/keyboard.json index ac581c2d0e6..8a4614e5b46 100644 --- a/keyboards/delikeeb/flatbread60/info.json +++ b/keyboards/delikeeb/flatbread60/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "F7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["F6", "B1", "B3", "B2", "B6"] diff --git a/keyboards/delikeeb/flatbread60/rules.mk b/keyboards/delikeeb/flatbread60/rules.mk deleted file mode 100644 index 2eba275490a..00000000000 --- a/keyboards/delikeeb/flatbread60/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/delikeeb/vaguettelite/info.json b/keyboards/delikeeb/vaguettelite/keyboard.json similarity index 97% rename from keyboards/delikeeb/vaguettelite/info.json rename to keyboards/delikeeb/vaguettelite/keyboard.json index 45e17c432a0..98311fe1155 100644 --- a/keyboards/delikeeb/vaguettelite/info.json +++ b/keyboards/delikeeb/vaguettelite/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0011", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D0", "D4"], "rows": ["F4", "B3", "D1", "D2", "D3", "F5"] diff --git a/keyboards/delikeeb/vaguettelite/rules.mk b/keyboards/delikeeb/vaguettelite/rules.mk deleted file mode 100644 index c5c4d8f35f1..00000000000 --- a/keyboards/delikeeb/vaguettelite/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/delikeeb/vaneela/info.json b/keyboards/delikeeb/vaneela/keyboard.json similarity index 95% rename from keyboards/delikeeb/vaneela/info.json rename to keyboards/delikeeb/vaneela/keyboard.json index 0ddbf2f162d..226014b8a0b 100644 --- a/keyboards/delikeeb/vaneela/info.json +++ b/keyboards/delikeeb/vaneela/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["F6", "F7", "B3", "B2", "B6"] diff --git a/keyboards/delikeeb/vaneela/rules.mk b/keyboards/delikeeb/vaneela/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/delikeeb/vaneela/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 = 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/delikeeb/vaneelaex/info.json b/keyboards/delikeeb/vaneelaex/keyboard.json similarity index 95% rename from keyboards/delikeeb/vaneelaex/info.json rename to keyboards/delikeeb/vaneelaex/keyboard.json index 1da7fbec92b..8bf40b169bc 100644 --- a/keyboards/delikeeb/vaneelaex/info.json +++ b/keyboards/delikeeb/vaneelaex/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B5", "B4", "E6", "D7", "C6", "D4"], "rows": ["D3", "D2", "D1", "D0", "B2", "B6"] diff --git a/keyboards/delikeeb/vaneelaex/rules.mk b/keyboards/delikeeb/vaneelaex/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/delikeeb/vaneelaex/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 = 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/deltapad/info.json b/keyboards/deltapad/keyboard.json similarity index 92% rename from keyboards/deltapad/info.json rename to keyboards/deltapad/keyboard.json index 1b79bf47a34..256f2ba1055 100644 --- a/keyboards/deltapad/info.json +++ b/keyboards/deltapad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0123", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["D2", "D3", "D1", "D0"] diff --git a/keyboards/deltapad/rules.mk b/keyboards/deltapad/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/deltapad/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 = 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/demiurge/info.json b/keyboards/demiurge/keyboard.json similarity index 98% rename from keyboards/demiurge/info.json rename to keyboards/demiurge/keyboard.json index 8fc707be2c2..ad5264323bf 100644 --- a/keyboards/demiurge/info.json +++ b/keyboards/demiurge/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6475", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "F5", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2"], "rows": ["F0", "F4", "F6", "F7", "C7"] diff --git a/keyboards/demiurge/rules.mk b/keyboards/demiurge/rules.mk deleted file mode 100755 index 135b7958b67..00000000000 --- a/keyboards/demiurge/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/keyboard.json similarity index 89% rename from keyboards/deng/djam/info.json rename to keyboards/deng/djam/keyboard.json index 47d9559d304..94e2aca2ecc 100644 --- a/keyboards/deng/djam/info.json +++ b/keyboards/deng/djam/keyboard.json @@ -18,6 +18,16 @@ }, "driver": "ws2812" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4"] diff --git a/keyboards/deng/djam/rules.mk b/keyboards/deng/djam/rules.mk deleted file mode 100644 index 150b7c690d8..00000000000 --- a/keyboards/deng/djam/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/dinofizz/fnrow/v1/info.json b/keyboards/dinofizz/fnrow/v1/keyboard.json similarity index 87% rename from keyboards/dinofizz/fnrow/v1/info.json rename to keyboards/dinofizz/fnrow/v1/keyboard.json index 9beff28ec89..16f80b780d0 100644 --- a/keyboards/dinofizz/fnrow/v1/info.json +++ b/keyboards/dinofizz/fnrow/v1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0100", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "B1", "B3", "B4", "B5", "B6", "B7"], "rows": ["A0", "A1"] diff --git a/keyboards/dinofizz/fnrow/v1/rules.mk b/keyboards/dinofizz/fnrow/v1/rules.mk deleted file mode 100644 index a1e56ea4862..00000000000 --- a/keyboards/dinofizz/fnrow/v1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/dk60/info.json b/keyboards/dk60/keyboard.json similarity index 94% rename from keyboards/dk60/info.json rename to keyboards/dk60/keyboard.json index 5af417c2b70..3e451a5c8dc 100644 --- a/keyboards/dk60/info.json +++ b/keyboards/dk60/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x56C2", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "sleep_led": true, + "unicode": true + }, "matrix_pins": { "cols": ["B0", "B3", "B2", "B1", "D3", "D5", "B5", "B7", "C6", "C7", "D0", "D1", "D2"], "rows": ["B6", "B4", "D7", "D6", "D4"] diff --git a/keyboards/dk60/rules.mk b/keyboards/dk60/rules.mk deleted file mode 100644 index 99c7eb0fa2e..00000000000 --- a/keyboards/dk60/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 = 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 -SLEEP_LED_ENABLE = yes -UNICODE_ENABLE = yes diff --git a/keyboards/dm9records/lain/info.json b/keyboards/dm9records/lain/keyboard.json similarity index 95% rename from keyboards/dm9records/lain/info.json rename to keyboards/dm9records/lain/keyboard.json index 250eb2ddafd..3736d04aeee 100644 --- a/keyboards/dm9records/lain/info.json +++ b/keyboards/dm9records/lain/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xE8F4", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "D2", "D3", "D5"], "rows": ["C6", "D7", "D6", "D4"] diff --git a/keyboards/dm9records/lain/rules.mk b/keyboards/dm9records/lain/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/dm9records/lain/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 = 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/dmqdesign/spin/info.json b/keyboards/dmqdesign/spin/keyboard.json similarity index 86% rename from keyboards/dmqdesign/spin/info.json rename to keyboards/dmqdesign/spin/keyboard.json index aeeb19299e2..a2bc050e910 100644 --- a/keyboards/dmqdesign/spin/info.json +++ b/keyboards/dmqdesign/spin/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "midi": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "C7", "C6"], "rows": ["F0", "F1", "F4"] diff --git a/keyboards/dmqdesign/spin/rules.mk b/keyboards/dmqdesign/spin/rules.mk deleted file mode 100644 index e77cf66617e..00000000000 --- a/keyboards/dmqdesign/spin/rules.mk +++ /dev/null @@ -1,14 +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 -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 -MIDI_ENABLE = yes # MIDI support -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable rotary encoder support diff --git a/keyboards/do60/info.json b/keyboards/do60/keyboard.json similarity index 98% rename from keyboards/do60/info.json rename to keyboards/do60/keyboard.json index e3cab833a04..76de66f6d7d 100644 --- a/keyboards/do60/info.json +++ b/keyboards/do60/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "F4", "B4", "D7", "D6", "B3", "B0"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/do60/rules.mk b/keyboards/do60/rules.mk deleted file mode 100644 index d22d1cd2f42..00000000000 --- a/keyboards/do60/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -AUDIO_ENABLE = no # Audio output -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -COMMAND_ENABLE = no # Commands for debug and configuration -CONSOLE_ENABLE = no # Console for debug -EXTRAKEY_ENABLE = yes # Audio control and System control -MOUSEKEY_ENABLE = yes # Mouse keys -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/keyboard.json similarity index 93% rename from keyboards/doio/kb30/info.json rename to keyboards/doio/kb30/keyboard.json index 60e02a58baa..637a1fe68b1 100644 --- a/keyboards/doio/kb30/info.json +++ b/keyboards/doio/kb30/keyboard.json @@ -48,6 +48,17 @@ "max_brightness": 200, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B14", "B13", "B12", "B0", "A7", "A9", "A8"], "rows": ["B3", "B4", "B9", "B8", "A5", "A6"] diff --git a/keyboards/doio/kb30/rules.mk b/keyboards/doio/kb30/rules.mk deleted file mode 100644 index 1e48f891f28..00000000000 --- a/keyboards/doio/kb30/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes -OLED_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/donutcables/budget96/info.json b/keyboards/donutcables/budget96/keyboard.json similarity index 99% rename from keyboards/donutcables/budget96/info.json rename to keyboards/donutcables/budget96/keyboard.json index a6028115353..eaba1b7c464 100644 --- a/keyboards/donutcables/budget96/info.json +++ b/keyboards/donutcables/budget96/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xB960", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/donutcables/budget96/rules.mk b/keyboards/donutcables/budget96/rules.mk deleted file mode 100644 index 166b3d3ec8d..00000000000 --- a/keyboards/donutcables/budget96/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/donutcables/scrabblepad/info.json b/keyboards/donutcables/scrabblepad/keyboard.json similarity index 99% rename from keyboards/donutcables/scrabblepad/info.json rename to keyboards/donutcables/scrabblepad/keyboard.json index fb9b6f3a1d7..ed31e35018d 100644 --- a/keyboards/donutcables/scrabblepad/info.json +++ b/keyboards/donutcables/scrabblepad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x21D7", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D6", "D7", "E0", "E1", "B7", "D2", "D3", "D4", "C0", "B4", "B5", "B6", "F0", "E6", "E7"], "rows": ["D5", "F1", "C7", "F2", "C6", "F3", "C5", "F4", "C4", "F5", "C3", "F6", "C2", "F7", "C1"] diff --git a/keyboards/donutcables/scrabblepad/rules.mk b/keyboards/donutcables/scrabblepad/rules.mk deleted file mode 100644 index 84ab7f32b2b..00000000000 --- a/keyboards/donutcables/scrabblepad/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 = 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 diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/keyboard.json similarity index 87% rename from keyboards/doodboard/duckboard/info.json rename to keyboards/doodboard/duckboard/keyboard.json index 3d457701121..bb0b5c0f002 100644 --- a/keyboards/doodboard/duckboard/info.json +++ b/keyboards/doodboard/duckboard/keyboard.json @@ -8,6 +8,17 @@ "pid": "0xFF44", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/doodboard/duckboard/rules.mk b/keyboards/doodboard/duckboard/rules.mk deleted file mode 100644 index 0551c8b3709..00000000000 --- a/keyboards/doodboard/duckboard/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/doodboard/duckboard_r2/info.json b/keyboards/doodboard/duckboard_r2/keyboard.json similarity index 88% rename from keyboards/doodboard/duckboard_r2/info.json rename to keyboards/doodboard/duckboard_r2/keyboard.json index 4c47e9a70ea..94c79d382c9 100644 --- a/keyboards/doodboard/duckboard_r2/info.json +++ b/keyboards/doodboard/duckboard_r2/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x6462", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/doodboard/duckboard_r2/rules.mk b/keyboards/doodboard/duckboard_r2/rules.mk deleted file mode 100644 index 0551c8b3709..00000000000 --- a/keyboards/doodboard/duckboard_r2/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/doro67/multi/info.json b/keyboards/doro67/multi/keyboard.json similarity index 98% rename from keyboards/doro67/multi/info.json rename to keyboards/doro67/multi/keyboard.json index 10cd3bb652a..81f2940b362 100644 --- a/keyboards/doro67/multi/info.json +++ b/keyboards/doro67/multi/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4D4C", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6", "F7"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/doro67/multi/rules.mk b/keyboards/doro67/multi/rules.mk deleted file mode 100644 index f89945313a8..00000000000 --- a/keyboards/doro67/multi/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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/doro67/regular/info.json b/keyboards/doro67/regular/keyboard.json similarity index 95% rename from keyboards/doro67/regular/info.json rename to keyboards/doro67/regular/keyboard.json index 863d935b0a6..511dbc2ba4b 100644 --- a/keyboards/doro67/regular/info.json +++ b/keyboards/doro67/regular/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x5245", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6", "F7"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/doro67/regular/rules.mk b/keyboards/doro67/regular/rules.mk deleted file mode 100644 index e70cd601e74..00000000000 --- a/keyboards/doro67/regular/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/doro67/rgb/info.json b/keyboards/doro67/rgb/keyboard.json similarity index 96% rename from keyboards/doro67/rgb/info.json rename to keyboards/doro67/rgb/keyboard.json index 3c2461a90b9..87a31e6e21e 100644 --- a/keyboards/doro67/rgb/info.json +++ b/keyboards/doro67/rgb/keyboard.json @@ -56,6 +56,15 @@ }, "driver": "ws2812" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6", "F7"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/doro67/rgb/rules.mk b/keyboards/doro67/rgb/rules.mk deleted file mode 100644 index b400e0a170e..00000000000 --- a/keyboards/doro67/rgb/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 -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 diff --git a/keyboards/draytronics/daisy/info.json b/keyboards/draytronics/daisy/keyboard.json similarity index 89% rename from keyboards/draytronics/daisy/info.json rename to keyboards/draytronics/daisy/keyboard.json index 4597ca9d178..f871517e879 100644 --- a/keyboards/draytronics/daisy/info.json +++ b/keyboards/draytronics/daisy/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x4441", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C2", "C3", "C4", "C5"], "rows": ["B0", "C0", "C1"] diff --git a/keyboards/draytronics/daisy/rules.mk b/keyboards/draytronics/daisy/rules.mk deleted file mode 100644 index 09169eaf7f0..00000000000 --- a/keyboards/draytronics/daisy/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Rotary encoder support diff --git a/keyboards/draytronics/elise/info.json b/keyboards/draytronics/elise/keyboard.json similarity index 99% rename from keyboards/draytronics/elise/info.json rename to keyboards/draytronics/elise/keyboard.json index 80f4fa69e53..62ccd9babbe 100644 --- a/keyboards/draytronics/elise/info.json +++ b/keyboards/draytronics/elise/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x454C", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "D5"], "rows": ["B2", "B3", "B1", "F0", "F1"] diff --git a/keyboards/draytronics/elise/rules.mk b/keyboards/draytronics/elise/rules.mk deleted file mode 100644 index 28c29a3b4dc..00000000000 --- a/keyboards/draytronics/elise/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 = 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/draytronics/elise_v2/info.json b/keyboards/draytronics/elise_v2/keyboard.json similarity index 99% rename from keyboards/draytronics/elise_v2/info.json rename to keyboards/draytronics/elise_v2/keyboard.json index 966ca3faa42..91f34c23f87 100644 --- a/keyboards/draytronics/elise_v2/info.json +++ b/keyboards/draytronics/elise_v2/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "D1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "D5"], "rows": ["B2", "B3", "B1", "F0", "F1"] diff --git a/keyboards/draytronics/elise_v2/rules.mk b/keyboards/draytronics/elise_v2/rules.mk deleted file mode 100644 index 28c29a3b4dc..00000000000 --- a/keyboards/draytronics/elise_v2/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 = 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/dtisaac/cg108/info.json b/keyboards/dtisaac/cg108/keyboard.json similarity index 97% rename from keyboards/dtisaac/cg108/info.json rename to keyboards/dtisaac/cg108/keyboard.json index bad71681c0a..703586e3d06 100644 --- a/keyboards/dtisaac/cg108/info.json +++ b/keyboards/dtisaac/cg108/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4973", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C7", "C6", "B4", "D7", "B3", "B2", "B0", "E6", "B1", "D1", "D6"], "rows": ["F4", "F1", "F0", "F5", "F6", "F7", "D4", "D5", "D3", "D2", "D0"] diff --git a/keyboards/dtisaac/cg108/rules.mk b/keyboards/dtisaac/cg108/rules.mk deleted file mode 100644 index 718a1e8d099..00000000000 --- a/keyboards/dtisaac/cg108/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/keyboard.json similarity index 99% rename from keyboards/dtisaac/dtisaac01/info.json rename to keyboards/dtisaac/dtisaac01/keyboard.json index 3d16da6d222..0b4b1b30575 100644 --- a/keyboards/dtisaac/dtisaac01/info.json +++ b/keyboards/dtisaac/dtisaac01/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4973", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "C6", "D0", "B5", "F0", "D7", "B0", "B7", "D1"], "rows": ["F7", "F6", "F5", "F4", "F1", "B4", "D2", "B2", "B1", "B3", "D4", "D6"] diff --git a/keyboards/dtisaac/dtisaac01/rules.mk b/keyboards/dtisaac/dtisaac01/rules.mk deleted file mode 100644 index e2a6fcff00f..00000000000 --- a/keyboards/dtisaac/dtisaac01/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 = 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/dyz/dyz40/info.json b/keyboards/dyz/dyz40/keyboard.json similarity index 98% rename from keyboards/dyz/dyz40/info.json rename to keyboards/dyz/dyz40/keyboard.json index fdd14a7c428..4916ec7ecd0 100644 --- a/keyboards/dyz/dyz40/info.json +++ b/keyboards/dyz/dyz40/keyboard.json @@ -4,6 +4,16 @@ "url": "https://github.com/dayatz/mechanical-keyboards/tree/master/dyz40", "maintainer": "dayatz", "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7"], "rows": ["B0", "B1", "B3", "B2"] diff --git a/keyboards/dyz/dyz40/rules.mk b/keyboards/dyz/dyz40/rules.mk deleted file mode 100644 index e3c4a42def8..00000000000 --- a/keyboards/dyz/dyz40/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/dyz/dyz60/info.json b/keyboards/dyz/dyz60/keyboard.json similarity index 98% rename from keyboards/dyz/dyz60/info.json rename to keyboards/dyz/dyz60/keyboard.json index 28300d79143..824e23d709b 100644 --- a/keyboards/dyz/dyz60/info.json +++ b/keyboards/dyz/dyz60/keyboard.json @@ -4,6 +4,16 @@ "url": "https://github.com/dayatz/mechanical-keyboards/tree/master/dyz60", "maintainer": "dayatz", "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B3", "B2", "B1", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B0", "E6", "F0", "F5", "F4"] diff --git a/keyboards/dyz/dyz60/rules.mk b/keyboards/dyz/dyz60/rules.mk deleted file mode 100644 index e3c4a42def8..00000000000 --- a/keyboards/dyz/dyz60/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/dyz/dyz60_hs/info.json b/keyboards/dyz/dyz60_hs/keyboard.json similarity index 99% rename from keyboards/dyz/dyz60_hs/info.json rename to keyboards/dyz/dyz60_hs/keyboard.json index 598f236980b..637f02d910d 100644 --- a/keyboards/dyz/dyz60_hs/info.json +++ b/keyboards/dyz/dyz60_hs/keyboard.json @@ -4,6 +4,15 @@ "url": "https://github.com/dayatz/mechanical-keyboards/tree/master/dyz60_hs", "maintainer": "dayatz", "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "B3", "B2", "B1", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["E6", "B0", "F0", "F6", "F7"] diff --git a/keyboards/dyz/dyz60_hs/rules.mk b/keyboards/dyz/dyz60_hs/rules.mk deleted file mode 100644 index d8668fc8312..00000000000 --- a/keyboards/dyz/dyz60_hs/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no diff --git a/keyboards/dyz/dyz_tkl/info.json b/keyboards/dyz/dyz_tkl/keyboard.json similarity index 99% rename from keyboards/dyz/dyz_tkl/info.json rename to keyboards/dyz/dyz_tkl/keyboard.json index 298611a742f..4d8bba17108 100644 --- a/keyboards/dyz/dyz_tkl/info.json +++ b/keyboards/dyz/dyz_tkl/keyboard.json @@ -4,6 +4,15 @@ "url": "https://github.com/dayatz/mechanical-keyboards/tree/master/dyz_tkl", "maintainer": "dayatz", "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "rows": ["E6", "B0", "B3", "B1", "B7", "B2", "F1", "F0", "F5", "F4", "F7", "F6"], "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D0"] diff --git a/keyboards/dyz/dyz_tkl/rules.mk b/keyboards/dyz/dyz_tkl/rules.mk deleted file mode 100644 index 3c777809b4a..00000000000 --- a/keyboards/dyz/dyz_tkl/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/dyz/selka40/info.json b/keyboards/dyz/selka40/keyboard.json similarity index 96% rename from keyboards/dyz/selka40/info.json rename to keyboards/dyz/selka40/keyboard.json index 95ac00a8831..4a8df196339 100644 --- a/keyboards/dyz/selka40/info.json +++ b/keyboards/dyz/selka40/keyboard.json @@ -4,6 +4,16 @@ "url": "https://github.com/dayatz/mechanical-keyboards/tree/master/selka40", "maintainer": "dayatz", "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "B7", "D5", "D3", "D2", "D1", "D0"], "rows": ["C7", "C6", "B6", "B5"] diff --git a/keyboards/dyz/selka40/rules.mk b/keyboards/dyz/selka40/rules.mk deleted file mode 100644 index e3c4a42def8..00000000000 --- a/keyboards/dyz/selka40/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/dyz/synthesis60/info.json b/keyboards/dyz/synthesis60/keyboard.json similarity index 98% rename from keyboards/dyz/synthesis60/info.json rename to keyboards/dyz/synthesis60/keyboard.json index 09120c47af0..cdb4760381a 100644 --- a/keyboards/dyz/synthesis60/info.json +++ b/keyboards/dyz/synthesis60/keyboard.json @@ -4,6 +4,16 @@ "url": "https://github.com/dayatz/mechanical-keyboards/tree/master/synthesis60", "maintainer": "dayatz", "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D7", "D3", "D2", "E6", "B3", "B2", "B1", "B0"], "rows": ["B4", "B5", "B6", "D6", "D4"] diff --git a/keyboards/dyz/synthesis60/rules.mk b/keyboards/dyz/synthesis60/rules.mk deleted file mode 100644 index f5d7b73330d..00000000000 --- a/keyboards/dyz/synthesis60/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 = 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 -ENCODER_ENABLE = no -OLED_ENABLE = yes diff --git a/keyboards/dz60/info.json b/keyboards/dz60/keyboard.json similarity index 99% rename from keyboards/dz60/info.json rename to keyboards/dz60/keyboard.json index a46b1564ec5..eb831143b79 100644 --- a/keyboards/dz60/info.json +++ b/keyboards/dz60/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x2260", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/dz60/rules.mk b/keyboards/dz60/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/dz60/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/dztech/bocc/info.json b/keyboards/dztech/bocc/keyboard.json similarity index 99% rename from keyboards/dztech/bocc/info.json rename to keyboards/dztech/bocc/keyboard.json index 1b284df4e35..5d56524b3fb 100644 --- a/keyboards/dztech/bocc/info.json +++ b/keyboards/dztech/bocc/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x1010", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B0", "B1", "B2", "B3", "F0"] diff --git a/keyboards/dztech/bocc/rules.mk b/keyboards/dztech/bocc/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/dztech/bocc/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/keyboard.json similarity index 96% rename from keyboards/dztech/duo_s/info.json rename to keyboards/dztech/duo_s/keyboard.json index ef5af799be5..46f9b4fc349 100644 --- a/keyboards/dztech/duo_s/info.json +++ b/keyboards/dztech/duo_s/keyboard.json @@ -33,6 +33,15 @@ "ws2812": { "pin": "B15" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B12", "B13", "B14", "A8", "B9", "C13", "C14", "C15", "A1", "A2", "A3", "A4", "A5", "A6", "A7"], "rows": ["A15", "B3", "B4", "B5", "B11"] diff --git a/keyboards/dztech/duo_s/rules.mk b/keyboards/dztech/duo_s/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/dztech/duo_s/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 = 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/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/keyboard.json similarity index 96% rename from keyboards/dztech/dz65rgb/v1/info.json rename to keyboards/dztech/dz65rgb/v1/keyboard.json index 98c69134ebf..6dcc88b59e6 100644 --- a/keyboards/dztech/dz65rgb/v1/info.json +++ b/keyboards/dztech/dz65rgb/v1/keyboard.json @@ -44,6 +44,15 @@ "max_brightness": 200, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"], "rows": ["B1", "B10", "B11", "B14", "B12"] diff --git a/keyboards/dztech/dz65rgb/v1/rules.mk b/keyboards/dztech/dz65rgb/v1/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/dztech/dz65rgb/v1/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 -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 = yes # Use RGB matrix diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/keyboard.json similarity index 96% rename from keyboards/dztech/dz65rgb/v2/info.json rename to keyboards/dztech/dz65rgb/v2/keyboard.json index 16919905d89..16d38a3af54 100644 --- a/keyboards/dztech/dz65rgb/v2/info.json +++ b/keyboards/dztech/dz65rgb/v2/keyboard.json @@ -44,6 +44,15 @@ "max_brightness": 200, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F0", "F1", "F4", "E6", "C6"] diff --git a/keyboards/dztech/dz65rgb/v2/rules.mk b/keyboards/dztech/dz65rgb/v2/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/dztech/dz65rgb/v2/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 -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 = yes # Use RGB matrix diff --git a/keyboards/dztech/dz96/info.json b/keyboards/dztech/dz96/keyboard.json similarity index 99% rename from keyboards/dztech/dz96/info.json rename to keyboards/dztech/dz96/keyboard.json index c1d3b84623e..ef2de26a704 100644 --- a/keyboards/dztech/dz96/info.json +++ b/keyboards/dztech/dz96/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xDB96", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "F1", "F4", "F5", "F6", "F7", "D7", "B4", "B5", "D0", "D1", "D2", "D3"], "rows": ["B7", "B3", "E6", "F0", "D5", "D4", "D6", "C7"] diff --git a/keyboards/dztech/dz96/rules.mk b/keyboards/dztech/dz96/rules.mk deleted file mode 100644 index 14e80e7106b..00000000000 --- a/keyboards/dztech/dz96/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/keyboard.json similarity index 98% rename from keyboards/dztech/endless80/info.json rename to keyboards/dztech/endless80/keyboard.json index 4572b091fa6..9387b67eadc 100644 --- a/keyboards/dztech/endless80/info.json +++ b/keyboards/dztech/endless80/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1015", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "C6", "C7", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7", "B5"] diff --git a/keyboards/dztech/endless80/rules.mk b/keyboards/dztech/endless80/rules.mk deleted file mode 100644 index 4ae26a099a5..00000000000 --- a/keyboards/dztech/endless80/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 = 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 From f1a279810fbab3b5d5c4cfa0b4146cf042dae3bb Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 14 Mar 2024 03:57:48 +0000 Subject: [PATCH 025/333] Migrate features from rules.mk to DD (#23202) --- .../0xcb/tutelpad/{info.json => keyboard.json} | 10 ++++++++++ keyboards/0xcb/tutelpad/rules.mk | 13 ------------- .../1up60rgb/{info.json => keyboard.json} | 10 ++++++++++ keyboards/1upkeyboards/1up60rgb/rules.mk | 12 ------------ .../super16/{info.json => keyboard.json} | 9 +++++++++ keyboards/1upkeyboards/super16/rules.mk | 13 ------------- .../super16v2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/1upkeyboards/super16v2/rules.mk | 14 -------------- keyboards/2key2crawl/{info.json => keyboard.json} | 9 +++++++++ keyboards/2key2crawl/rules.mk | 13 ------------- keyboards/30wer/{info.json => keyboard.json} | 8 ++++++++ keyboards/30wer/rules.mk | 12 ------------ .../2key2/{info.json => keyboard.json} | 9 +++++++++ keyboards/3keyecosystem/2key2/rules.mk | 13 ------------- .../4pack/{info.json => keyboard.json} | 9 +++++++++ keyboards/40percentclub/4pack/rules.mk | 12 ------------ .../5x5/{info.json => keyboard.json} | 8 ++++++++ keyboards/40percentclub/5x5/rules.mk | 11 ----------- .../luddite/{info.json => keyboard.json} | 10 ++++++++++ keyboards/40percentclub/luddite/rules.mk | 12 ------------ .../mf68/{info.json => keyboard.json} | 9 +++++++++ keyboards/40percentclub/mf68/rules.mk | 12 ------------ .../nano/{info.json => keyboard.json} | 10 ++++++++++ keyboards/40percentclub/nano/rules.mk | 13 ------------- .../nein/{info.json => keyboard.json} | 8 ++++++++ keyboards/40percentclub/nein/rules.mk | 12 ------------ .../sixpack/{info.json => keyboard.json} | 9 +++++++++ keyboards/40percentclub/sixpack/rules.mk | 12 ------------ .../tomato/{info.json => keyboard.json} | 9 +++++++++ keyboards/40percentclub/tomato/rules.mk | 12 ------------ keyboards/45_ats/{info.json => keyboard.json} | 8 ++++++++ keyboards/45_ats/rules.mk | 12 ------------ keyboards/4by3/{info.json => keyboard.json} | 8 ++++++++ keyboards/4by3/rules.mk | 4 ---- .../aekiso60/rev_a/{info.json => keyboard.json} | 8 ++++++++ keyboards/4pplet/aekiso60/rev_a/rules.mk | 12 ------------ .../bootleg/rev_a/{info.json => keyboard.json} | 8 ++++++++ keyboards/4pplet/bootleg/rev_a/rules.mk | 12 ------------ .../perk60_iso/rev_a/{info.json => keyboard.json} | 9 +++++++++ keyboards/4pplet/perk60_iso/rev_a/rules.mk | 14 -------------- .../waffling60/rev_a/{info.json => keyboard.json} | 8 ++++++++ keyboards/4pplet/waffling60/rev_a/rules.mk | 12 ------------ .../waffling60/rev_b/{info.json => keyboard.json} | 9 +++++++++ keyboards/4pplet/waffling60/rev_b/rules.mk | 12 ------------ .../waffling60/rev_c/{info.json => keyboard.json} | 9 +++++++++ keyboards/4pplet/waffling60/rev_c/rules.mk | 12 ------------ .../waffling80/rev_a/{info.json => keyboard.json} | 9 +++++++++ keyboards/4pplet/waffling80/rev_a/rules.mk | 12 ------------ .../yakiimo/rev_a/{info.json => keyboard.json} | 8 ++++++++ keyboards/4pplet/yakiimo/rev_a/rules.mk | 13 ------------- .../7c8/framework/{info.json => keyboard.json} | 10 ++++++++++ keyboards/7c8/framework/rules.mk | 15 --------------- keyboards/9key/{info.json => keyboard.json} | 9 +++++++++ keyboards/9key/rules.mk | 13 ------------- 54 files changed, 240 insertions(+), 329 deletions(-) rename keyboards/0xcb/tutelpad/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/0xcb/tutelpad/rules.mk rename keyboards/1upkeyboards/1up60rgb/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/1upkeyboards/1up60rgb/rules.mk rename keyboards/1upkeyboards/super16/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/1upkeyboards/super16/rules.mk rename keyboards/1upkeyboards/super16v2/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/1upkeyboards/super16v2/rules.mk rename keyboards/2key2crawl/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/2key2crawl/rules.mk rename keyboards/30wer/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/30wer/rules.mk rename keyboards/3keyecosystem/2key2/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/3keyecosystem/2key2/rules.mk rename keyboards/40percentclub/4pack/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/40percentclub/4pack/rules.mk rename keyboards/40percentclub/5x5/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/40percentclub/5x5/rules.mk rename keyboards/40percentclub/luddite/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/40percentclub/luddite/rules.mk rename keyboards/40percentclub/mf68/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/40percentclub/mf68/rules.mk rename keyboards/40percentclub/nano/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/40percentclub/nano/rules.mk rename keyboards/40percentclub/nein/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/40percentclub/nein/rules.mk rename keyboards/40percentclub/sixpack/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/40percentclub/sixpack/rules.mk rename keyboards/40percentclub/tomato/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/40percentclub/tomato/rules.mk rename keyboards/45_ats/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/45_ats/rules.mk rename keyboards/4by3/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/4by3/rules.mk rename keyboards/4pplet/aekiso60/rev_a/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/4pplet/aekiso60/rev_a/rules.mk rename keyboards/4pplet/bootleg/rev_a/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/4pplet/bootleg/rev_a/rules.mk rename keyboards/4pplet/perk60_iso/rev_a/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/4pplet/perk60_iso/rev_a/rules.mk rename keyboards/4pplet/waffling60/rev_a/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/4pplet/waffling60/rev_a/rules.mk rename keyboards/4pplet/waffling60/rev_b/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/4pplet/waffling60/rev_b/rules.mk rename keyboards/4pplet/waffling60/rev_c/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/4pplet/waffling60/rev_c/rules.mk rename keyboards/4pplet/waffling80/rev_a/{info.json => keyboard.json} (76%) delete mode 100644 keyboards/4pplet/waffling80/rev_a/rules.mk rename keyboards/4pplet/yakiimo/rev_a/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/4pplet/yakiimo/rev_a/rules.mk rename keyboards/7c8/framework/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/7c8/framework/rules.mk rename keyboards/9key/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/9key/rules.mk diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/keyboard.json similarity index 86% rename from keyboards/0xcb/tutelpad/info.json rename to keyboards/0xcb/tutelpad/keyboard.json index e4c7fce98ab..2885377262a 100644 --- a/keyboards/0xcb/tutelpad/info.json +++ b/keyboards/0xcb/tutelpad/keyboard.json @@ -33,6 +33,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "direct": [ ["E6", "D7", "B1", "B3"], diff --git a/keyboards/0xcb/tutelpad/rules.mk b/keyboards/0xcb/tutelpad/rules.mk deleted file mode 100644 index f06d31c5f13..00000000000 --- a/keyboards/0xcb/tutelpad/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/keyboard.json similarity index 99% rename from keyboards/1upkeyboards/1up60rgb/info.json rename to keyboards/1upkeyboards/1up60rgb/keyboard.json index 0d288916cc4..2985b5ae4f7 100644 --- a/keyboards/1upkeyboards/1up60rgb/info.json +++ b/keyboards/1upkeyboards/1up60rgb/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x7267", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/1upkeyboards/1up60rgb/rules.mk b/keyboards/1upkeyboards/1up60rgb/rules.mk deleted file mode 100644 index 32e82925ccf..00000000000 --- a/keyboards/1upkeyboards/1up60rgb/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 = 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 = yes diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/keyboard.json similarity index 95% rename from keyboards/1upkeyboards/super16/info.json rename to keyboards/1upkeyboards/super16/keyboard.json index 81b28c66557..4bc18e98f73 100644 --- a/keyboards/1upkeyboards/super16/info.json +++ b/keyboards/1upkeyboards/super16/keyboard.json @@ -77,6 +77,15 @@ }, "driver": "ws2812" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D4", "C6", "F6", "F7"], "rows": ["D1", "D0", "F4", "F5"] diff --git a/keyboards/1upkeyboards/super16/rules.mk b/keyboards/1upkeyboards/super16/rules.mk deleted file mode 100644 index b5532d03ff0..00000000000 --- a/keyboards/1upkeyboards/super16/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 -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 -RGB_MATRIX_ENABLE = yes -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/keyboard.json similarity index 91% rename from keyboards/1upkeyboards/super16v2/info.json rename to keyboards/1upkeyboards/super16v2/keyboard.json index 20a06f4c5ec..3bc7bf0e07f 100644 --- a/keyboards/1upkeyboards/super16v2/info.json +++ b/keyboards/1upkeyboards/super16v2/keyboard.json @@ -49,6 +49,16 @@ "driver": "ws2812", "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D5", "D6", "C2", "D0"], "rows": ["D1", "D2", "D3", "D4"] diff --git a/keyboards/1upkeyboards/super16v2/rules.mk b/keyboards/1upkeyboards/super16v2/rules.mk deleted file mode 100644 index a7f5baf8078..00000000000 --- a/keyboards/1upkeyboards/super16v2/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/keyboard.json similarity index 89% rename from keyboards/2key2crawl/info.json rename to keyboards/2key2crawl/keyboard.json index b8644a07129..4dfecbd696f 100644 --- a/keyboards/2key2crawl/info.json +++ b/keyboards/2key2crawl/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6090", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "encoder": true, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B3", "B4", "B5", "B6", "B7", "C7", "B2"], "rows": ["C4", "C5"] diff --git a/keyboards/2key2crawl/rules.mk b/keyboards/2key2crawl/rules.mk deleted file mode 100644 index 5e715569bca..00000000000 --- a/keyboards/2key2crawl/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = 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 # [Crawlpad] Custom backlighting code is used, so this should not be enabled -AUDIO_ENABLE = no # [Crawlpad] This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = no # [Crawlpad] This can be enabled if a ws2812 strip is connected to the expansion port. -ENCODER_ENABLE = yes # [2Key2crawl] Make the knobs turn diff --git a/keyboards/30wer/info.json b/keyboards/30wer/keyboard.json similarity index 93% rename from keyboards/30wer/info.json rename to keyboards/30wer/keyboard.json index 85f3826acd3..606c13f7aad 100644 --- a/keyboards/30wer/info.json +++ b/keyboards/30wer/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5678", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1", "D0", "D4", "C6", "D7"], "rows": ["E6", "B4", "B5"] diff --git a/keyboards/30wer/rules.mk b/keyboards/30wer/rules.mk deleted file mode 100644 index 0048c643519..00000000000 --- a/keyboards/30wer/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 = 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/keyboard.json similarity index 92% rename from keyboards/3keyecosystem/2key2/info.json rename to keyboards/3keyecosystem/2key2/keyboard.json index 129662175ca..5c77fdf6ae8 100644 --- a/keyboards/3keyecosystem/2key2/info.json +++ b/keyboards/3keyecosystem/2key2/keyboard.json @@ -67,6 +67,15 @@ "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F4", "D7"], "rows": ["F6"] diff --git a/keyboards/3keyecosystem/2key2/rules.mk b/keyboards/3keyecosystem/2key2/rules.mk deleted file mode 100644 index 94674b71a1c..00000000000 --- a/keyboards/3keyecosystem/2key2/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Enable RGB matrix -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/40percentclub/4pack/info.json b/keyboards/40percentclub/4pack/keyboard.json similarity index 78% rename from keyboards/40percentclub/4pack/info.json rename to keyboards/40percentclub/4pack/keyboard.json index 31d45598833..edfd64ad33e 100644 --- a/keyboards/40percentclub/4pack/info.json +++ b/keyboards/40percentclub/4pack/keyboard.json @@ -14,6 +14,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "direct": [ ["E6", "D7", "C6", "D4"] diff --git a/keyboards/40percentclub/4pack/rules.mk b/keyboards/40percentclub/4pack/rules.mk deleted file mode 100644 index ffd7289e96a..00000000000 --- a/keyboards/40percentclub/4pack/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 = 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/40percentclub/5x5/info.json b/keyboards/40percentclub/5x5/keyboard.json similarity index 98% rename from keyboards/40percentclub/5x5/info.json rename to keyboards/40percentclub/5x5/keyboard.json index 3ebc123c9b9..0a50d29ffe7 100644 --- a/keyboards/40percentclub/5x5/info.json +++ b/keyboards/40percentclub/5x5/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x05B5", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"], "rows": ["B2", "D1", "D0", "D4", "C6"] diff --git a/keyboards/40percentclub/5x5/rules.mk b/keyboards/40percentclub/5x5/rules.mk deleted file mode 100644 index cb3f21e8240..00000000000 --- a/keyboards/40percentclub/5x5/rules.mk +++ /dev/null @@ -1,11 +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 -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 RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/keyboard.json similarity index 95% rename from keyboards/40percentclub/luddite/info.json rename to keyboards/40percentclub/luddite/keyboard.json index a8c8c13b2a5..8a0b5d5913b 100644 --- a/keyboards/40percentclub/luddite/info.json +++ b/keyboards/40percentclub/luddite/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x4C55", "device_version": "10.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"] diff --git a/keyboards/40percentclub/luddite/rules.mk b/keyboards/40percentclub/luddite/rules.mk deleted file mode 100644 index ca7b02cbdd2..00000000000 --- a/keyboards/40percentclub/luddite/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 = 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 = yes diff --git a/keyboards/40percentclub/mf68/info.json b/keyboards/40percentclub/mf68/keyboard.json similarity index 96% rename from keyboards/40percentclub/mf68/info.json rename to keyboards/40percentclub/mf68/keyboard.json index 72185738564..47259ac23f9 100644 --- a/keyboards/40percentclub/mf68/info.json +++ b/keyboards/40percentclub/mf68/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4D68", "device_version": "1.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"], "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"] diff --git a/keyboards/40percentclub/mf68/rules.mk b/keyboards/40percentclub/mf68/rules.mk deleted file mode 100644 index b325f3f0c79..00000000000 --- a/keyboards/40percentclub/mf68/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 = 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/40percentclub/nano/info.json b/keyboards/40percentclub/nano/keyboard.json similarity index 86% rename from keyboards/40percentclub/nano/info.json rename to keyboards/40percentclub/nano/keyboard.json index 4cfd3a9a295..547aed16f9f 100644 --- a/keyboards/40percentclub/nano/info.json +++ b/keyboards/40percentclub/nano/keyboard.json @@ -28,6 +28,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "unicode": true + }, "matrix_pins": { "direct": [ ["F4", "F5", "F6", "F7"], diff --git a/keyboards/40percentclub/nano/rules.mk b/keyboards/40percentclub/nano/rules.mk deleted file mode 100644 index a73f2bd6931..00000000000 --- a/keyboards/40percentclub/nano/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 -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 -UNICODE_ENABLE = yes # Unicode -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/40percentclub/nein/info.json b/keyboards/40percentclub/nein/keyboard.json similarity index 85% rename from keyboards/40percentclub/nein/info.json rename to keyboards/40percentclub/nein/keyboard.json index 0712923e49e..53a3a7639b8 100644 --- a/keyboards/40percentclub/nein/info.json +++ b/keyboards/40percentclub/nein/keyboard.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "direct": [ ["F4", "F5", "F6"], diff --git a/keyboards/40percentclub/nein/rules.mk b/keyboards/40percentclub/nein/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/40percentclub/nein/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 = 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/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/keyboard.json similarity index 84% rename from keyboards/40percentclub/sixpack/info.json rename to keyboards/40percentclub/sixpack/keyboard.json index cd4864fbd12..059c9de091d 100644 --- a/keyboards/40percentclub/sixpack/info.json +++ b/keyboards/40percentclub/sixpack/keyboard.json @@ -21,6 +21,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "direct": [ ["D4", "C6", "D7"], diff --git a/keyboards/40percentclub/sixpack/rules.mk b/keyboards/40percentclub/sixpack/rules.mk deleted file mode 100644 index 254b0bc7bd1..00000000000 --- a/keyboards/40percentclub/sixpack/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 = 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/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/keyboard.json similarity index 92% rename from keyboards/40percentclub/tomato/info.json rename to keyboards/40percentclub/tomato/keyboard.json index eabe3545683..a44946d3725 100644 --- a/keyboards/40percentclub/tomato/info.json +++ b/keyboards/40percentclub/tomato/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "B5" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "E6", "D7", "C6", "D4", "D0"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/40percentclub/tomato/rules.mk b/keyboards/40percentclub/tomato/rules.mk deleted file mode 100644 index d781d36d3b4..00000000000 --- a/keyboards/40percentclub/tomato/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 = 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 -RGBLIGHT_ENABLE = yes diff --git a/keyboards/45_ats/info.json b/keyboards/45_ats/keyboard.json similarity index 97% rename from keyboards/45_ats/info.json rename to keyboards/45_ats/keyboard.json index 410a2a9ee1f..7c873f21ede 100644 --- a/keyboards/45_ats/info.json +++ b/keyboards/45_ats/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4511", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "F6", "F5", "F4", "C7", "F7", "C6", "B6", "D4"], "rows": ["D3", "D5", "D7", "D6"] diff --git a/keyboards/45_ats/rules.mk b/keyboards/45_ats/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/45_ats/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/4by3/info.json b/keyboards/4by3/keyboard.json similarity index 93% rename from keyboards/4by3/info.json rename to keyboards/4by3/keyboard.json index faab285d2c8..8801a1e9203 100644 --- a/keyboards/4by3/info.json +++ b/keyboards/4by3/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x2019", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4"], "rows": ["D1", "D0", "D4"] diff --git a/keyboards/4by3/rules.mk b/keyboards/4by3/rules.mk deleted file mode 100644 index e7d97d60d35..00000000000 --- a/keyboards/4by3/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -EXTRAKEY_ENABLE = yes -NKRO_ENABLE = yes # Enable N-Key Rollover -CONSOLE_ENABLE = yes -COMMAND_ENABLE = yes diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/keyboard.json similarity index 84% rename from keyboards/4pplet/aekiso60/rev_a/info.json rename to keyboards/4pplet/aekiso60/rev_a/keyboard.json index 7728ab50bb3..5e236adc9ac 100644 --- a/keyboards/4pplet/aekiso60/rev_a/info.json +++ b/keyboards/4pplet/aekiso60/rev_a/keyboard.json @@ -24,6 +24,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C4", "C6", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D2", "D1"], "rows": ["C2", "D0", "B0", "C7", "C5"] diff --git a/keyboards/4pplet/aekiso60/rev_a/rules.mk b/keyboards/4pplet/aekiso60/rev_a/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/4pplet/aekiso60/rev_a/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/4pplet/bootleg/rev_a/info.json b/keyboards/4pplet/bootleg/rev_a/keyboard.json similarity index 98% rename from keyboards/4pplet/bootleg/rev_a/info.json rename to keyboards/4pplet/bootleg/rev_a/keyboard.json index 0e0929fcfcd..10aa3de6783 100644 --- a/keyboards/4pplet/bootleg/rev_a/info.json +++ b/keyboards/4pplet/bootleg/rev_a/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5", "D3", "D1"], "rows": ["D0", "C2", "C4", "D4", "D2"] diff --git a/keyboards/4pplet/bootleg/rev_a/rules.mk b/keyboards/4pplet/bootleg/rev_a/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/4pplet/bootleg/rev_a/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/4pplet/perk60_iso/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/keyboard.json similarity index 96% rename from keyboards/4pplet/perk60_iso/rev_a/info.json rename to keyboards/4pplet/perk60_iso/rev_a/keyboard.json index 06b16d1900a..ae60e30d7a5 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/info.json +++ b/keyboards/4pplet/perk60_iso/rev_a/keyboard.json @@ -40,6 +40,15 @@ }, "driver": "is31fl3733" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A1", "B12", "B14", "A2", "A0", "A3", "A4"], "rows": ["C14", "C13", "B5", "B4", "B8", "A15", "B3", "B9", "A5", "A7"] diff --git a/keyboards/4pplet/perk60_iso/rev_a/rules.mk b/keyboards/4pplet/perk60_iso/rev_a/rules.mk deleted file mode 100644 index 6a7da3e998d..00000000000 --- a/keyboards/4pplet/perk60_iso/rev_a/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 = 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 = yes - diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/keyboard.json similarity index 96% rename from keyboards/4pplet/waffling60/rev_a/info.json rename to keyboards/4pplet/waffling60/rev_a/keyboard.json index fbd30bdd29e..cbb24bd56a4 100644 --- a/keyboards/4pplet/waffling60/rev_a/info.json +++ b/keyboards/4pplet/waffling60/rev_a/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "D0", "D2", "B6", "B5", "B4", "B3", "D6", "D5", "B0", "B1"], "rows": ["D4", "D1", "C2", "C4", "C7", "B2"] diff --git a/keyboards/4pplet/waffling60/rev_a/rules.mk b/keyboards/4pplet/waffling60/rev_a/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/4pplet/waffling60/rev_a/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/keyboard.json similarity index 96% rename from keyboards/4pplet/waffling60/rev_b/info.json rename to keyboards/4pplet/waffling60/rev_b/keyboard.json index 7ba1964c7ca..54e51b388b7 100644 --- a/keyboards/4pplet/waffling60/rev_b/info.json +++ b/keyboards/4pplet/waffling60/rev_b/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"], "rows": ["C2", "D0", "B0", "D6", "D5"] diff --git a/keyboards/4pplet/waffling60/rev_b/rules.mk b/keyboards/4pplet/waffling60/rev_b/rules.mk deleted file mode 100644 index a927de843cb..00000000000 --- a/keyboards/4pplet/waffling60/rev_b/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/keyboard.json similarity index 96% rename from keyboards/4pplet/waffling60/rev_c/info.json rename to keyboards/4pplet/waffling60/rev_c/keyboard.json index f2461aeaa9b..a7c23cc3495 100644 --- a/keyboards/4pplet/waffling60/rev_c/info.json +++ b/keyboards/4pplet/waffling60/rev_c/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0008", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"], "rows": ["C2", "D0", "B0", "D6", "D5"] diff --git a/keyboards/4pplet/waffling60/rev_c/rules.mk b/keyboards/4pplet/waffling60/rev_c/rules.mk deleted file mode 100644 index a927de843cb..00000000000 --- a/keyboards/4pplet/waffling60/rev_c/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/keyboard.json similarity index 76% rename from keyboards/4pplet/waffling80/rev_a/info.json rename to keyboards/4pplet/waffling80/rev_a/keyboard.json index 8c3a84be1e6..157cefa5362 100644 --- a/keyboards/4pplet/waffling80/rev_a/info.json +++ b/keyboards/4pplet/waffling80/rev_a/keyboard.json @@ -12,6 +12,15 @@ "ws2812": { "pin": "D7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C6", "C7", "B7", "B6", "B5", "B2", "D0", "C2"], "rows": ["C4", "C5", "B4", "B3", "B1", "B0", "D6", "D5", "D3", "D4", "D1", "D2"] diff --git a/keyboards/4pplet/waffling80/rev_a/rules.mk b/keyboards/4pplet/waffling80/rev_a/rules.mk deleted file mode 100644 index ceea2d612c4..00000000000 --- a/keyboards/4pplet/waffling80/rev_a/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 = 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/4pplet/yakiimo/rev_a/info.json b/keyboards/4pplet/yakiimo/rev_a/keyboard.json similarity index 99% rename from keyboards/4pplet/yakiimo/rev_a/info.json rename to keyboards/4pplet/yakiimo/rev_a/keyboard.json index ae4654007da..ec5addd8501 100644 --- a/keyboards/4pplet/yakiimo/rev_a/info.json +++ b/keyboards/4pplet/yakiimo/rev_a/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x000A", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A8"], "rows": ["B10", "B1", "C13", "C14", "B14", "B12", "B9", "B8", "B5", "B4", "A15", "B3"] diff --git a/keyboards/4pplet/yakiimo/rev_a/rules.mk b/keyboards/4pplet/yakiimo/rev_a/rules.mk deleted file mode 100644 index c3b8e77d77a..00000000000 --- a/keyboards/4pplet/yakiimo/rev_a/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 -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/7c8/framework/info.json b/keyboards/7c8/framework/keyboard.json similarity index 97% rename from keyboards/7c8/framework/info.json rename to keyboards/7c8/framework/keyboard.json index 19325af9cbd..33f9cfc591f 100644 --- a/keyboards/7c8/framework/info.json +++ b/keyboards/7c8/framework/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "leader": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C0", "C1", "C2", "C3", "C4", "C5"], "rows": ["B0", "B1", "D7", "B2", "D6", "B3", "D5", "B4", "D4", "B5"] diff --git a/keyboards/7c8/framework/rules.mk b/keyboards/7c8/framework/rules.mk deleted file mode 100644 index a9d41f8eff9..00000000000 --- a/keyboards/7c8/framework/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = no -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no -AUDIO_ENABLE = no -FAUXCLICKY_ENABLE = no -ENCODER_ENABLE = yes -LEADER_ENABLE = yes diff --git a/keyboards/9key/info.json b/keyboards/9key/keyboard.json similarity index 84% rename from keyboards/9key/info.json rename to keyboards/9key/keyboard.json index d4061d82614..c1e95e3f081 100644 --- a/keyboards/9key/info.json +++ b/keyboards/9key/keyboard.json @@ -14,6 +14,15 @@ "ws2812": { "pin": "F7" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6"], "rows": ["D1", "D0", "D4"] diff --git a/keyboards/9key/rules.mk b/keyboards/9key/rules.mk deleted file mode 100644 index 02054dd0236..00000000000 --- a/keyboards/9key/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 -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 -UNICODE_ENABLE = yes # Unicode -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. From aea414fd828964c13301191b88a56174f85fad8d Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 14 Mar 2024 10:21:33 +0000 Subject: [PATCH 026/333] Migrate content where only parent info.json exists (#22895) --- .../bpiphany/frosty_flake/20130602/20130602.c | 24 ------------------- .../frosty_flake/20130602/keyboard.json | 16 +++++++++++++ .../bpiphany/frosty_flake/20130602/rules.mk | 12 ---------- .../bpiphany/frosty_flake/20140521/20140521.c | 24 ------------------- .../frosty_flake/20140521/keyboard.json | 16 +++++++++++++ .../bpiphany/frosty_flake/20140521/rules.mk | 12 ---------- keyboards/canary/canary60rgb/info.json | 13 ++++++++++ keyboards/canary/canary60rgb/v1/rules.mk | 16 +------------ keyboards/handwired/qc60/info.json | 10 ++++++++ keyboards/handwired/qc60/proto/rules.mk | 2 +- keyboards/handwired/qc60/rules.mk | 15 ------------ .../handwired/stef9998/split_5x7/info.json | 9 +++++++ .../handwired/stef9998/split_5x7/rules.mk | 17 +------------ .../ibm/model_m/mschwingen/led_ffc/rules.mk | 2 +- .../ibm/model_m/mschwingen/led_wired/rules.mk | 2 +- .../mechwild/sugarglider/f401/keyboard.json | 3 +++ keyboards/mechwild/sugarglider/f401/rules.mk | 3 --- .../mechwild/sugarglider/f411/keyboard.json | 3 +++ keyboards/mechwild/sugarglider/f411/rules.mk | 3 --- keyboards/mechwild/sugarglider/info.json | 1 - .../sugarglider/wide_oled/f401/keyboard.json | 3 +++ .../sugarglider/wide_oled/f401/rules.mk | 3 --- .../sugarglider/wide_oled/f411/keyboard.json | 3 +++ .../sugarglider/wide_oled/f411/rules.mk | 3 --- keyboards/melgeek/mojo68/info.json | 9 +++++++ keyboards/melgeek/mojo68/rev1/rules.mk | 13 +--------- keyboards/melgeek/mojo75/info.json | 9 +++++++ keyboards/melgeek/mojo75/rev1/rules.mk | 14 +---------- keyboards/melgeek/tegic/info.json | 12 ++++++++++ keyboards/melgeek/tegic/rev1/rules.mk | 16 +------------ keyboards/melgeek/z70ultra/info.json | 9 +++++++ keyboards/melgeek/z70ultra/rev1/rules.mk | 14 +---------- keyboards/murcielago/info.json | 10 ++++++++ keyboards/murcielago/rev1/rules.mk | 15 +----------- keyboards/polilla/info.json | 8 +++++++ keyboards/polilla/rev1/rules.mk | 13 +--------- keyboards/spacetime/info.json | 9 +++++++ keyboards/spacetime/rev1/rules.mk | 2 +- keyboards/spacetime/rev2/keyboard.json | 5 ++++ keyboards/spacetime/rev2/rules.mk | 1 - keyboards/spacetime/rules.mk | 17 ------------- .../xd004/{info.json => v1/keyboard.json} | 12 ++++++++++ keyboards/xiudi/xd004/v1/rules.mk | 15 ------------ 43 files changed, 171 insertions(+), 247 deletions(-) delete mode 100644 keyboards/bpiphany/frosty_flake/20130602/20130602.c create mode 100644 keyboards/bpiphany/frosty_flake/20130602/keyboard.json delete mode 100644 keyboards/bpiphany/frosty_flake/20140521/20140521.c create mode 100644 keyboards/bpiphany/frosty_flake/20140521/keyboard.json create mode 100644 keyboards/mechwild/sugarglider/f401/keyboard.json delete mode 100644 keyboards/mechwild/sugarglider/f401/rules.mk create mode 100644 keyboards/mechwild/sugarglider/f411/keyboard.json delete mode 100644 keyboards/mechwild/sugarglider/f411/rules.mk create mode 100644 keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json delete mode 100644 keyboards/mechwild/sugarglider/wide_oled/f401/rules.mk create mode 100644 keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json delete mode 100644 keyboards/mechwild/sugarglider/wide_oled/f411/rules.mk create mode 100644 keyboards/spacetime/rev2/keyboard.json delete mode 100644 keyboards/spacetime/rev2/rules.mk rename keyboards/xiudi/xd004/{info.json => v1/keyboard.json} (81%) delete mode 100644 keyboards/xiudi/xd004/v1/rules.mk diff --git a/keyboards/bpiphany/frosty_flake/20130602/20130602.c b/keyboards/bpiphany/frosty_flake/20130602/20130602.c deleted file mode 100644 index 05abbb567ec..00000000000 --- a/keyboards/bpiphany/frosty_flake/20130602/20130602.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "quantum.h" - -void keyboard_pre_init_kb(void) { - setPinOutput(B7); // caps lock - writePinHigh(B7); - setPinOutput(C5); // num lock - writePinHigh(C7); - setPinOutput(C6); // scroll lock - writePinHigh(C6); - - keyboard_pre_init_user(); -} - -bool led_update_kb(led_t usb_led) { - // user requests no further processing - if (!led_update_user(usb_led)) - return true; - - writePin(C5, !usb_led.num_lock); - writePin(B7, !usb_led.caps_lock); - writePin(C6, !usb_led.scroll_lock); - - return true; -} diff --git a/keyboards/bpiphany/frosty_flake/20130602/keyboard.json b/keyboards/bpiphany/frosty_flake/20130602/keyboard.json new file mode 100644 index 00000000000..142010c9c4a --- /dev/null +++ b/keyboards/bpiphany/frosty_flake/20130602/keyboard.json @@ -0,0 +1,16 @@ +{ + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "indicators": { + "caps_lock": "B7", + "num_lock": "C5", + "scroll_lock": "C6", + "on_state": 0 + } +} diff --git a/keyboards/bpiphany/frosty_flake/20130602/rules.mk b/keyboards/bpiphany/frosty_flake/20130602/rules.mk index 0e2690e65e2..e891eb1dc0b 100644 --- a/keyboards/bpiphany/frosty_flake/20130602/rules.mk +++ b/keyboards/bpiphany/frosty_flake/20130602/rules.mk @@ -1,14 +1,2 @@ -# 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 -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite SRC += 20130602/matrix.c diff --git a/keyboards/bpiphany/frosty_flake/20140521/20140521.c b/keyboards/bpiphany/frosty_flake/20140521/20140521.c deleted file mode 100644 index 3c8bf3bd79a..00000000000 --- a/keyboards/bpiphany/frosty_flake/20140521/20140521.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "quantum.h" - -void keyboard_pre_init_kb(void) { - setPinOutput(B7); // num lock - writePinHigh(B7); - setPinOutput(C5); // caps lock - writePinHigh(C7); - setPinOutput(C6); // scroll lock - writePinHigh(C6); - - keyboard_pre_init_user(); -} - -bool led_update_kb(led_t usb_led) { - // user requests no further processing - if (!led_update_user(usb_led)) - return true; - - writePin(C5, !usb_led.caps_lock); - writePin(B7, !usb_led.num_lock); - writePin(C6, !usb_led.scroll_lock); - - return true; -} diff --git a/keyboards/bpiphany/frosty_flake/20140521/keyboard.json b/keyboards/bpiphany/frosty_flake/20140521/keyboard.json new file mode 100644 index 00000000000..2ca004c24d7 --- /dev/null +++ b/keyboards/bpiphany/frosty_flake/20140521/keyboard.json @@ -0,0 +1,16 @@ +{ + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "indicators": { + "caps_lock": "C5", + "num_lock": "B7", + "scroll_lock": "C6", + "on_state": 0 + } +} diff --git a/keyboards/bpiphany/frosty_flake/20140521/rules.mk b/keyboards/bpiphany/frosty_flake/20140521/rules.mk index 6b5ffd3fc8e..2b2d976fc67 100644 --- a/keyboards/bpiphany/frosty_flake/20140521/rules.mk +++ b/keyboards/bpiphany/frosty_flake/20140521/rules.mk @@ -1,14 +1,2 @@ -# 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 -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite SRC += 20140521/matrix.c diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json index fc973b88103..ac1ba67de00 100644 --- a/keyboards/canary/canary60rgb/info.json +++ b/keyboards/canary/canary60rgb/info.json @@ -8,6 +8,19 @@ "pid": "0x0621", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true, + "rgb_matrix": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/canary/canary60rgb/v1/rules.mk b/keyboards/canary/canary60rgb/v1/rules.mk index 3bbc9263796..6e7633bfe01 100644 --- a/keyboards/canary/canary60rgb/v1/rules.mk +++ b/keyboards/canary/canary60rgb/v1/rules.mk @@ -1,15 +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 -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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix - -LTO_ENABLE = yes +# This file intentionally left blank diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json index 7fba95f9d13..0015ac5f669 100644 --- a/keyboards/handwired/qc60/info.json +++ b/keyboards/handwired/qc60/info.json @@ -8,6 +8,15 @@ "pid": "0x0C60", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "rgblight": { "led_count": 1 }, @@ -20,6 +29,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/qc60/proto/rules.mk b/keyboards/handwired/qc60/proto/rules.mk index 7ad666d1a38..6e7633bfe01 100644 --- a/keyboards/handwired/qc60/proto/rules.mk +++ b/keyboards/handwired/qc60/proto/rules.mk @@ -1 +1 @@ -RGBLIGHT_ENABLE = yes \ No newline at end of file +# This file intentionally left blank diff --git a/keyboards/handwired/qc60/rules.mk b/keyboards/handwired/qc60/rules.mk index 9af766b35c3..4905848cf91 100644 --- a/keyboards/handwired/qc60/rules.mk +++ b/keyboards/handwired/qc60/rules.mk @@ -1,16 +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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = handwired/qc60/proto diff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/info.json index f1471efe8ed..fe277ebde00 100644 --- a/keyboards/handwired/stef9998/split_5x7/info.json +++ b/keyboards/handwired/stef9998/split_5x7/info.json @@ -8,12 +8,21 @@ "pid": "0x6063", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B2", "B6", "B1", "B3", "F7", "F5", "F6"], "rows": ["C6", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { diff --git a/keyboards/handwired/stef9998/split_5x7/rules.mk b/keyboards/handwired/stef9998/split_5x7/rules.mk index f74fc175456..f06c490f000 100644 --- a/keyboards/handwired/stef9998/split_5x7/rules.mk +++ b/keyboards/handwired/stef9998/split_5x7/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 = 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 - -SPLIT_KEYBOARD = yes - -DEFAULT_FOLDER = handwired/stef9998/split_5x7/rev1 \ No newline at end of file +DEFAULT_FOLDER = handwired/stef9998/split_5x7/rev1 diff --git a/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk b/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk index 8b137891791..6e7633bfe01 100644 --- a/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk +++ b/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk @@ -1 +1 @@ - +# This file intentionally left blank diff --git a/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk b/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk index 8b137891791..6e7633bfe01 100644 --- a/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk +++ b/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk @@ -1 +1 @@ - +# This file intentionally left blank diff --git a/keyboards/mechwild/sugarglider/f401/keyboard.json b/keyboards/mechwild/sugarglider/f401/keyboard.json new file mode 100644 index 00000000000..797e9900595 --- /dev/null +++ b/keyboards/mechwild/sugarglider/f401/keyboard.json @@ -0,0 +1,3 @@ +{ + "development_board": "blackpill_f401" +} diff --git a/keyboards/mechwild/sugarglider/f401/rules.mk b/keyboards/mechwild/sugarglider/f401/rules.mk deleted file mode 100644 index a92d8a85c61..00000000000 --- a/keyboards/mechwild/sugarglider/f401/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 diff --git a/keyboards/mechwild/sugarglider/f411/keyboard.json b/keyboards/mechwild/sugarglider/f411/keyboard.json new file mode 100644 index 00000000000..a41c5f4dd14 --- /dev/null +++ b/keyboards/mechwild/sugarglider/f411/keyboard.json @@ -0,0 +1,3 @@ +{ + "development_board": "blackpill_f411" +} diff --git a/keyboards/mechwild/sugarglider/f411/rules.mk b/keyboards/mechwild/sugarglider/f411/rules.mk deleted file mode 100644 index db1d4054fdf..00000000000 --- a/keyboards/mechwild/sugarglider/f411/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json index c9095b3db4f..749b0952cbd 100644 --- a/keyboards/mechwild/sugarglider/info.json +++ b/keyboards/mechwild/sugarglider/info.json @@ -3,7 +3,6 @@ "keyboard_name": "Sugar Glider", "maintainer": "kylemccreery", "url": "https://mechwild.com/product/sugar-glider/", - "bootloader": "stm32-dfu", "features": { "bootmagic": true, "command": false, diff --git a/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json b/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json new file mode 100644 index 00000000000..797e9900595 --- /dev/null +++ b/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json @@ -0,0 +1,3 @@ +{ + "development_board": "blackpill_f401" +} diff --git a/keyboards/mechwild/sugarglider/wide_oled/f401/rules.mk b/keyboards/mechwild/sugarglider/wide_oled/f401/rules.mk deleted file mode 100644 index a92d8a85c61..00000000000 --- a/keyboards/mechwild/sugarglider/wide_oled/f401/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 diff --git a/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json b/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json new file mode 100644 index 00000000000..a41c5f4dd14 --- /dev/null +++ b/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json @@ -0,0 +1,3 @@ +{ + "development_board": "blackpill_f411" +} diff --git a/keyboards/mechwild/sugarglider/wide_oled/f411/rules.mk b/keyboards/mechwild/sugarglider/wide_oled/f411/rules.mk deleted file mode 100644 index db1d4054fdf..00000000000 --- a/keyboards/mechwild/sugarglider/wide_oled/f411/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json index 8938bd8a133..b97de4fbd2c 100755 --- a/keyboards/melgeek/mojo68/info.json +++ b/keyboards/melgeek/mojo68/info.json @@ -8,6 +8,15 @@ "pid": "0x0068", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/melgeek/mojo68/rev1/rules.mk b/keyboards/melgeek/mojo68/rev1/rules.mk index c66b1abcd45..6e7633bfe01 100755 --- a/keyboards/melgeek/mojo68/rev1/rules.mk +++ b/keyboards/melgeek/mojo68/rev1/rules.mk @@ -1,12 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Use RGB matrix +# This file intentionally left blank diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/info.json index e934cb9f4b6..a1b93afb69b 100644 --- a/keyboards/melgeek/mojo75/info.json +++ b/keyboards/melgeek/mojo75/info.json @@ -8,6 +8,15 @@ "pid": "0x7075", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/melgeek/mojo75/rev1/rules.mk b/keyboards/melgeek/mojo75/rev1/rules.mk index 30e3240a944..6e7633bfe01 100644 --- a/keyboards/melgeek/mojo75/rev1/rules.mk +++ b/keyboards/melgeek/mojo75/rev1/rules.mk @@ -1,13 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in +# This file intentionally left blank diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/info.json index 755ae3db3eb..0a2e9306f6e 100644 --- a/keyboards/melgeek/tegic/info.json +++ b/keyboards/melgeek/tegic/info.json @@ -8,6 +8,18 @@ "pid": "0x0081", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/melgeek/tegic/rev1/rules.mk b/keyboards/melgeek/tegic/rev1/rules.mk index d05853b8b07..6e7633bfe01 100755 --- a/keyboards/melgeek/tegic/rev1/rules.mk +++ b/keyboards/melgeek/tegic/rev1/rules.mk @@ -1,15 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Use RGB matrix - -LTO_ENABLE = yes - +# This file intentionally left blank diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/info.json index 471929f9dbf..de1b1df646c 100644 --- a/keyboards/melgeek/z70ultra/info.json +++ b/keyboards/melgeek/z70ultra/info.json @@ -8,6 +8,15 @@ "pid": "0x6570", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/melgeek/z70ultra/rev1/rules.mk b/keyboards/melgeek/z70ultra/rev1/rules.mk index 30e3240a944..6e7633bfe01 100644 --- a/keyboards/melgeek/z70ultra/rev1/rules.mk +++ b/keyboards/melgeek/z70ultra/rev1/rules.mk @@ -1,13 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in +# This file intentionally left blank diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/info.json index 54a1a221e76..2dd650666a2 100644 --- a/keyboards/murcielago/info.json +++ b/keyboards/murcielago/info.json @@ -8,6 +8,15 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "D7", "D6", "D4"], "rows": ["B4", "D5", "B3", "B2", "B1", "B0"] @@ -19,6 +28,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "E6", "encoder": { "right": { diff --git a/keyboards/murcielago/rev1/rules.mk b/keyboards/murcielago/rev1/rules.mk index c067a2faa03..6e7633bfe01 100644 --- a/keyboards/murcielago/rev1/rules.mk +++ b/keyboards/murcielago/rev1/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 = 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 -SPLIT_KEYBOARD = yes # Enable split keyboard mode -ENCODER_ENABLE = yes +# This file intentionally left blank diff --git a/keyboards/polilla/info.json b/keyboards/polilla/info.json index d0074da4e58..ea6c5aafa89 100644 --- a/keyboards/polilla/info.json +++ b/keyboards/polilla/info.json @@ -8,6 +8,14 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["A6", "A5", "A4", "A3", "A2", "A1", "F0", "B7", "B6", "B5", "B4", "B3"], "rows": ["B1", "B0", "A7", "F1", "A0"] diff --git a/keyboards/polilla/rev1/rules.mk b/keyboards/polilla/rev1/rules.mk index 1ffb0c55b90..6e7633bfe01 100644 --- a/keyboards/polilla/rev1/rules.mk +++ b/keyboards/polilla/rev1/rules.mk @@ -1,12 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output +# This file intentionally left blank diff --git a/keyboards/spacetime/info.json b/keyboards/spacetime/info.json index 0d1ece48f09..a55223b653a 100644 --- a/keyboards/spacetime/info.json +++ b/keyboards/spacetime/info.json @@ -8,12 +8,21 @@ "pid": "0x0A0C", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/spacetime/rev1/rules.mk b/keyboards/spacetime/rev1/rules.mk index 517f469b6d7..6e7633bfe01 100644 --- a/keyboards/spacetime/rev1/rules.mk +++ b/keyboards/spacetime/rev1/rules.mk @@ -1 +1 @@ -OLED_ENABLE = no +# This file intentionally left blank diff --git a/keyboards/spacetime/rev2/keyboard.json b/keyboards/spacetime/rev2/keyboard.json new file mode 100644 index 00000000000..91763679833 --- /dev/null +++ b/keyboards/spacetime/rev2/keyboard.json @@ -0,0 +1,5 @@ +{ + "features": { + "oled": true + } +} diff --git a/keyboards/spacetime/rev2/rules.mk b/keyboards/spacetime/rev2/rules.mk deleted file mode 100644 index dd68e9d3b09..00000000000 --- a/keyboards/spacetime/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = yes diff --git a/keyboards/spacetime/rules.mk b/keyboards/spacetime/rules.mk index 01714f80cb4..ac339c2cefb 100644 --- a/keyboards/spacetime/rules.mk +++ b/keyboards/spacetime/rules.mk @@ -1,18 +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 = 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 -OLED_ENABLE = no - -# Enable generic behavior for split boards -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = spacetime/rev1 diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/v1/keyboard.json similarity index 81% rename from keyboards/xiudi/xd004/info.json rename to keyboards/xiudi/xd004/v1/keyboard.json index 531283c78a9..a6211edfec5 100644 --- a/keyboards/xiudi/xd004/info.json +++ b/keyboards/xiudi/xd004/v1/keyboard.json @@ -7,6 +7,18 @@ "pid": "0x0404", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "space_cadet": false + }, "backlight": { "pin": "D5", "levels": 6 diff --git a/keyboards/xiudi/xd004/v1/rules.mk b/keyboards/xiudi/xd004/v1/rules.mk deleted file mode 100644 index f5f21384361..00000000000 --- a/keyboards/xiudi/xd004/v1/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 = 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 -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SPACE_CADET_ENABLE = no -# Saves about 5% of space: -LTO_ENABLE = yes From 6720e9c58c3a239ff0de4be1ff2ad075a0b2c248 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 14 Mar 2024 10:24:24 +0000 Subject: [PATCH 027/333] `qmk new-keyboard` - detach community layout when selecting "none of the above" (#20405) --- lib/python/qmk/cli/new/keyboard.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py index 700afc96a62..37bf2923d63 100644 --- a/lib/python/qmk/cli/new/keyboard.py +++ b/lib/python/qmk/cli/new/keyboard.py @@ -74,6 +74,10 @@ def replace_placeholders(src, dest, tokens): dest.write_text(content) +def replace_string(src, token, value): + src.write_text(src.read_text().replace(token, value)) + + def augment_community_info(src, dest): """Splice in any additional data into info.json """ @@ -218,6 +222,11 @@ def new_keyboard(cli): else: bootloader = select_default_bootloader(mcu) + detach_layout = False + if default_layout == 'none of the above': + default_layout = "ortho_4x4" + detach_layout = True + tokens = { # Comment here is to force multiline formatting 'YEAR': str(date.today().year), 'KEYBOARD': kb_name, @@ -233,10 +242,6 @@ def new_keyboard(cli): for key, value in tokens.items(): cli.echo(f" {key.ljust(10)}: {value}") - # TODO: detach community layout and rename to just "LAYOUT" - if default_layout == 'none of the above': - default_layout = "ortho_4x4" - # begin with making the deepest folder in the tree keymaps_path = keyboard(kb_name) / 'keymaps/' keymaps_path.mkdir(parents=True) @@ -253,6 +258,11 @@ def new_keyboard(cli): community_info = Path(COMMUNITY / f'{default_layout}/info.json') augment_community_info(community_info, keyboard(kb_name) / 'keyboard.json') + # detach community layout and rename to just "LAYOUT" + if detach_layout: + replace_string(keyboard(kb_name) / 'keyboard.json', 'LAYOUT_ortho_4x4', 'LAYOUT') + replace_string(keymaps_path / 'default/keymap.c', 'LAYOUT_ortho_4x4', 'LAYOUT') + cli.log.info(f'{{fg_green}}Created a new keyboard called {{fg_cyan}}{kb_name}{{fg_green}}.{{fg_reset}}') cli.log.info(f"Build Command: {{fg_yellow}}qmk compile -kb {kb_name} -km default{{fg_reset}}.") cli.log.info(f'Project Location: {{fg_cyan}}{QMK_FIRMWARE}/{keyboard(kb_name)}{{fg_reset}},') From 4bbfecae90e994b4a7d9bf5db06a995fb05d6ab2 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 14 Mar 2024 10:45:03 +0000 Subject: [PATCH 028/333] Infer eeconfig identifiers (#22135) Co-authored-by: Nick Brassel --- platforms/eeprom.h | 4 +++ quantum/eeconfig.c | 6 ++--- quantum/eeconfig.h | 64 ++++++++++++++++++++++++++++++---------------- 3 files changed, 49 insertions(+), 25 deletions(-) diff --git a/platforms/eeprom.h b/platforms/eeprom.h index fbfef203341..8e69eecc4cb 100644 --- a/platforms/eeprom.h +++ b/platforms/eeprom.h @@ -22,6 +22,10 @@ void eeprom_update_dword(uint32_t *__p, uint32_t __value); void eeprom_update_block(const void *__src, void *__dst, size_t __n); #endif +static inline void eeprom_write_qword(uint64_t *__p, uint64_t __value) { + eeprom_update_block(&__value, __p, sizeof(uint64_t)); +} + #if defined(EEPROM_CUSTOM) # ifndef EEPROM_SIZE # error EEPROM_SIZE has not been defined for custom driver. diff --git a/quantum/eeconfig.c b/quantum/eeconfig.c index 2d2180b4b44..40690d6a97a 100644 --- a/quantum/eeconfig.c +++ b/quantum/eeconfig.c @@ -19,6 +19,8 @@ void via_eeprom_set_valid(bool valid); void eeconfig_init_via(void); #endif +_Static_assert((intptr_t)EECONFIG_HANDEDNESS == 14, "EEPROM handedness offset is incorrect"); + /** \brief eeconfig enable * * FIXME: needs doc @@ -57,11 +59,9 @@ void eeconfig_init_quantum(void) { eeprom_update_byte(EECONFIG_AUDIO, 0); eeprom_update_dword(EECONFIG_RGBLIGHT, 0); eeprom_update_byte(EECONFIG_RGBLIGHT_EXTENDED, 0); - eeprom_update_byte(EECONFIG_UNUSED, 0); eeprom_update_byte(EECONFIG_UNICODEMODE, 0); eeprom_update_byte(EECONFIG_STENOMODE, 0); - uint64_t dummy = 0; - eeprom_update_block(&dummy, EECONFIG_RGB_MATRIX, sizeof(uint64_t)); + eeprom_write_qword(EECONFIG_RGB_MATRIX, 0); eeprom_update_dword(EECONFIG_HAPTIC, 0); #if defined(HAPTIC_ENABLE) haptic_reset(); diff --git a/quantum/eeconfig.h b/quantum/eeconfig.h index d7cce166bd7..fa0dd799d19 100644 --- a/quantum/eeconfig.h +++ b/quantum/eeconfig.h @@ -19,37 +19,57 @@ along with this program. If not, see . #include #include +#include // offsetof #include "eeprom.h" +#include "util.h" #ifndef EECONFIG_MAGIC_NUMBER -# define EECONFIG_MAGIC_NUMBER (uint16_t)0xFEE6 // When changing, decrement this value to avoid future re-init issues +# define EECONFIG_MAGIC_NUMBER (uint16_t)0xFEE5 // When changing, decrement this value to avoid future re-init issues #endif #define EECONFIG_MAGIC_NUMBER_OFF (uint16_t)0xFFFF -/* EEPROM parameter address */ -#define EECONFIG_MAGIC (uint16_t *)0 -#define EECONFIG_DEBUG (uint8_t *)2 -#define EECONFIG_DEFAULT_LAYER (uint8_t *)3 -#define EECONFIG_KEYMAP (uint16_t *)4 -#define EECONFIG_BACKLIGHT (uint8_t *)6 -#define EECONFIG_AUDIO (uint8_t *)7 -#define EECONFIG_RGBLIGHT (uint32_t *)8 -#define EECONFIG_UNICODEMODE (uint8_t *)12 -#define EECONFIG_STENOMODE (uint8_t *)13 -// EEHANDS for two handed boards -#define EECONFIG_HANDEDNESS (uint8_t *)14 -#define EECONFIG_KEYBOARD (uint32_t *)15 -#define EECONFIG_USER (uint32_t *)19 -#define EECONFIG_UNUSED (uint8_t *)23 -// Mutually exclusive -#define EECONFIG_LED_MATRIX (uint32_t *)24 -#define EECONFIG_RGB_MATRIX (uint64_t *)24 +// Dummy struct only used to calculate offsets +typedef struct PACKED { + uint16_t magic; + uint8_t debug; + uint8_t default_layer; + uint16_t keymap; + uint8_t backlight; + uint8_t audio; + uint32_t rgblight; + uint8_t unicode; + uint8_t steno; + uint8_t handedness; + uint32_t keyboard; + uint32_t user; + union { // Mutually exclusive + uint32_t led_matrix; + uint64_t rgb_matrix; + }; + uint32_t haptic; + uint8_t rgblight_ext; +} eeprom_core_t; -#define EECONFIG_HAPTIC (uint32_t *)32 -#define EECONFIG_RGBLIGHT_EXTENDED (uint8_t *)36 +/* EEPROM parameter address */ +#define EECONFIG_MAGIC (uint16_t *)(offsetof(eeprom_core_t, magic)) +#define EECONFIG_DEBUG (uint8_t *)(offsetof(eeprom_core_t, debug)) +#define EECONFIG_DEFAULT_LAYER (uint8_t *)(offsetof(eeprom_core_t, default_layer)) +#define EECONFIG_KEYMAP (uint16_t *)(offsetof(eeprom_core_t, keymap)) +#define EECONFIG_BACKLIGHT (uint8_t *)(offsetof(eeprom_core_t, backlight)) +#define EECONFIG_AUDIO (uint8_t *)(offsetof(eeprom_core_t, audio)) +#define EECONFIG_RGBLIGHT (uint32_t *)(offsetof(eeprom_core_t, rgblight)) +#define EECONFIG_UNICODEMODE (uint8_t *)(offsetof(eeprom_core_t, unicode)) +#define EECONFIG_STENOMODE (uint8_t *)(offsetof(eeprom_core_t, steno)) +#define EECONFIG_HANDEDNESS (uint8_t *)(offsetof(eeprom_core_t, handedness)) +#define EECONFIG_KEYBOARD (uint32_t *)(offsetof(eeprom_core_t, keyboard)) +#define EECONFIG_USER (uint32_t *)(offsetof(eeprom_core_t, user)) +#define EECONFIG_LED_MATRIX (uint32_t *)(offsetof(eeprom_core_t, led_matrix)) +#define EECONFIG_RGB_MATRIX (uint64_t *)(offsetof(eeprom_core_t, rgb_matrix)) +#define EECONFIG_HAPTIC (uint32_t *)(offsetof(eeprom_core_t, haptic)) +#define EECONFIG_RGBLIGHT_EXTENDED (uint8_t *)(offsetof(eeprom_core_t, rgblight_ext)) // Size of EEPROM being used for core data storage -#define EECONFIG_BASE_SIZE 37 +#define EECONFIG_BASE_SIZE ((uint8_t)sizeof(eeprom_core_t)) // Size of EEPROM dedicated to keyboard- and user-specific data #ifndef EECONFIG_KB_DATA_SIZE From 63dd131d812be4b8d4894fc20ca9968e25996b07 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 14 Mar 2024 10:45:12 +0000 Subject: [PATCH 029/333] Refactor vusb to protocol use pre/post task (#14944) --- quantum/main.c | 35 +++++++++++++++-------------- tmk_core/protocol/chibios/chibios.c | 13 ----------- tmk_core/protocol/lufa/lufa.c | 6 +---- tmk_core/protocol/vusb/protocol.c | 32 ++++++-------------------- tmk_core/protocol/vusb/vusb.c | 10 ++++++++- 5 files changed, 35 insertions(+), 61 deletions(-) diff --git a/quantum/main.c b/quantum/main.c index 3b101c522c3..3159c558507 100644 --- a/quantum/main.c +++ b/quantum/main.c @@ -25,22 +25,9 @@ void protocol_pre_task(void); void protocol_post_task(void); // Bodge as refactoring this area sucks.... -void protocol_init(void) __attribute__((weak)); -void protocol_init(void) { - protocol_pre_init(); - - keyboard_init(); - - protocol_post_init(); -} - -void protocol_task(void) __attribute__((weak)); -void protocol_task(void) { - protocol_pre_task(); - +void protocol_keyboard_task(void) __attribute__((weak)); +void protocol_keyboard_task(void) { keyboard_task(); - - protocol_post_task(); } /** \brief Main @@ -53,11 +40,25 @@ int main(void) { protocol_setup(); keyboard_setup(); - protocol_init(); + protocol_pre_init(); + keyboard_init(); + protocol_post_init(); /* Main loop */ while (true) { - protocol_task(); + protocol_pre_task(); + protocol_keyboard_task(); + protocol_post_task(); + +#ifdef RAW_ENABLE + void raw_hid_task(void); + raw_hid_task(); +#endif + +#ifdef CONSOLE_ENABLE + void console_task(void); + console_task(); +#endif #ifdef QUANTUM_PAINTER_ENABLE // Run Quantum Painter task diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c index 76a37ae538a..360e6b4b046 100644 --- a/tmk_core/protocol/chibios/chibios.c +++ b/tmk_core/protocol/chibios/chibios.c @@ -70,13 +70,6 @@ host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_nkro, send_mo void virtser_task(void); #endif -#ifdef RAW_ENABLE -void raw_hid_task(void); -#endif - -#ifdef CONSOLE_ENABLE -void console_task(void); -#endif #ifdef MIDI_ENABLE void midi_ep_task(void); #endif @@ -209,17 +202,11 @@ void protocol_pre_task(void) { } void protocol_post_task(void) { -#ifdef CONSOLE_ENABLE - console_task(); -#endif #ifdef MIDI_ENABLE midi_ep_task(); #endif #ifdef VIRTSER_ENABLE virtser_task(); -#endif -#ifdef RAW_ENABLE - raw_hid_task(); #endif usb_idle_task(); } diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 22cc0db8ced..d6f0c69b6b0 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -151,7 +151,7 @@ __attribute__((weak)) void raw_hid_receive(uint8_t *data, uint8_t length) { * * FIXME: Needs doc */ -static void raw_hid_task(void) { +void raw_hid_task(void) { // Create a temporary buffer to hold the read in data from the host uint8_t data[RAW_EPSIZE]; bool data_read = false; @@ -865,10 +865,6 @@ void protocol_post_task(void) { CDC_Device_USBTask(&cdc_device); #endif -#ifdef RAW_ENABLE - raw_hid_task(); -#endif - #if !defined(INTERRUPT_CONTROL_ENDPOINT) USB_USBTask(); #endif diff --git a/tmk_core/protocol/vusb/protocol.c b/tmk_core/protocol/vusb/protocol.c index 6178d48ef2a..41ccf451fdb 100644 --- a/tmk_core/protocol/vusb/protocol.c +++ b/tmk_core/protocol/vusb/protocol.c @@ -31,14 +31,6 @@ # include "sleep_led.h" #endif -#ifdef CONSOLE_ENABLE -void console_task(void); -#endif - -#ifdef RAW_ENABLE -void raw_hid_task(void); -#endif - /* This is from main.c of USBaspLoader */ static void initForUsbConnectivity(void) { uint8_t i = 0; @@ -136,7 +128,7 @@ static inline bool should_do_suspend(void) { return vusb_suspended; } -void protocol_task(void) { +void protocol_pre_task(void) { #if !defined(NO_USB_STARTUP_CHECK) if (should_do_suspend()) { dprintln("suspending keyboard"); @@ -159,7 +151,9 @@ void protocol_task(void) { vusb_wakeup(); } #endif +} +void protocol_keyboard_task(void) { usbPoll(); // TODO: configuration process is inconsistent. it sometime fails. @@ -167,20 +161,8 @@ void protocol_task(void) { if (usbConfiguration && usbInterruptIsReady()) { keyboard_task(); } - -#ifdef RAW_ENABLE - usbPoll(); - - if (usbConfiguration && usbInterruptIsReady4()) { - raw_hid_task(); - } -#endif - -#ifdef CONSOLE_ENABLE - usbPoll(); - - if (usbConfiguration && usbInterruptIsReady3()) { - console_task(); - } -#endif +} + +void protocol_post_task(void) { + // do nothing } diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c index cfeeed37126..c8ab4942536 100644 --- a/tmk_core/protocol/vusb/vusb.c +++ b/tmk_core/protocol/vusb/vusb.c @@ -162,6 +162,12 @@ __attribute__((weak)) void raw_hid_receive(uint8_t *data, uint8_t length) { } void raw_hid_task(void) { + usbPoll(); + + if (!usbConfiguration || !usbInterruptIsReady4()) { + return; + } + if (raw_output_received_bytes == RAW_BUFFER_SIZE) { raw_hid_receive(raw_output_buffer, RAW_BUFFER_SIZE); raw_output_received_bytes = 0; @@ -182,7 +188,9 @@ int8_t sendchar(uint8_t c) { } void console_task(void) { - if (!usbConfiguration) { + usbPoll(); + + if (!usbConfiguration || !usbInterruptIsReady3()) { return; } From 539fa21bf80308a21048334909b6512917aa3c7b Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 15 Mar 2024 01:42:15 +0000 Subject: [PATCH 030/333] Migrate features from rules.mk to data driven - IJK (#23276) --- .../grooveboard/{info.json => keyboard.json} | 8 ++++++++ keyboards/ianklug/grooveboard/rules.mk | 12 ------------ .../ashpil_usbc/{info.json => keyboard.json} | 8 ++++++++ keyboards/ibm/model_m/ashpil_usbc/rules.mk | 12 ------------ .../model_m/teensy2/{info.json => keyboard.json} | 8 ++++++++ keyboards/ibm/model_m/teensy2/rules.mk | 12 ------------ .../model_m/yugo_m/{info.json => keyboard.json} | 8 ++++++++ keyboards/ibm/model_m/yugo_m/rules.mk | 12 ------------ .../ibm122m/{info.json => keyboard.json} | 9 +++++++++ keyboards/ibm/model_m_122/ibm122m/rules.mk | 11 ----------- .../blackpill/{info.json => keyboard.json} | 8 ++++++++ .../ibm/model_m_122/m122_3270/blackpill/rules.mk | 12 ------------ .../m122_3270/teensy/{info.json => keyboard.json} | 8 ++++++++ .../ibm/model_m_122/m122_3270/teensy/rules.mk | 12 ------------ .../teensypp_ssk/{info.json => keyboard.json} | 8 ++++++++ keyboards/ibm/model_m_ssk/teensypp_ssk/rules.mk | 12 ------------ .../alicia_cook/{info.json => keyboard.json} | 8 ++++++++ keyboards/ibnuda/alicia_cook/rules.mk | 12 ------------ .../ibnuda/gurindam/{info.json => keyboard.json} | 9 +++++++++ keyboards/ibnuda/gurindam/rules.mk | 12 ------------ keyboards/idb/idb_60/{info.json => keyboard.json} | 8 ++++++++ keyboards/idb/idb_60/rules.mk | 10 ---------- .../idobao/id87/v1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/idobao/id87/v1/rules.mk | 12 ------------ .../idobao/id96/{info.json => keyboard.json} | 10 ++++++++++ keyboards/idobao/id96/rules.mk | 12 ------------ .../idobao/montex/v1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/idobao/montex/v1/rules.mk | 12 ------------ .../montex/v1rgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/idobao/montex/v1rgb/rules.mk | 12 ------------ .../illuminati/is0/{info.json => keyboard.json} | 9 +++++++++ keyboards/illuminati/is0/rules.mk | 12 ------------ .../illusion/rosa/{info.json => keyboard.json} | 8 ++++++++ keyboards/illusion/rosa/rules.mk | 12 ------------ .../ilumkb/primus75/{info.json => keyboard.json} | 9 +++++++++ keyboards/ilumkb/primus75/rules.mk | 12 ------------ .../ilumkb/simpler61/{info.json => keyboard.json} | 9 +++++++++ keyboards/ilumkb/simpler61/rules.mk | 13 ------------- .../ilumkb/simpler64/{info.json => keyboard.json} | 9 +++++++++ keyboards/ilumkb/simpler64/rules.mk | 13 ------------- .../volcano660/{info.json => keyboard.json} | 9 +++++++++ keyboards/ilumkb/volcano660/rules.mk | 12 ------------ .../k_type/{info.json => keyboard.json} | 8 ++++++++ keyboards/input_club/k_type/rules.mk | 15 --------------- .../whitefox/{info.json => keyboard.json} | 9 +++++++++ keyboards/input_club/whitefox/rules.mk | 14 -------------- .../io_mini1800/{info.json => keyboard.json} | 9 +++++++++ keyboards/io_mini1800/rules.mk | 14 -------------- keyboards/irene/{info.json => keyboard.json} | 9 +++++++++ keyboards/irene/rules.mk | 12 ------------ .../iriskeyboards/{info.json => keyboard.json} | 8 ++++++++ keyboards/iriskeyboards/rules.mk | 12 ------------ keyboards/iron180/{info.json => keyboard.json} | 9 +++++++++ keyboards/iron180/rules.mk | 14 -------------- keyboards/j80/{info.json => keyboard.json} | 9 +++++++++ keyboards/j80/rules.mk | 10 ---------- .../s7_elephant/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/jacky_studio/s7_elephant/rev1/rules.mk | 11 ----------- .../jadookb/jkb2/{info.json => keyboard.json} | 8 ++++++++ keyboards/jadookb/jkb2/rules.mk | 12 ------------ keyboards/jae/j01/{info.json => keyboard.json} | 9 +++++++++ keyboards/jae/j01/rules.mk | 12 ------------ keyboards/jc65/v32a/{info.json => keyboard.json} | 10 ++++++++++ keyboards/jc65/v32a/rules.mk | 10 ---------- keyboards/jc65/v32u4/{info.json => keyboard.json} | 10 ++++++++++ keyboards/jc65/v32u4/rules.mk | 12 ------------ keyboards/jd40/{info.json => keyboard.json} | 9 +++++++++ keyboards/jd40/rules.mk | 11 ----------- keyboards/jd45/{info.json => keyboard.json} | 10 ++++++++++ keyboards/jd45/rules.mk | 11 ----------- .../jels/jels88/{info.json => keyboard.json} | 9 +++++++++ keyboards/jels/jels88/rules.mk | 13 ------------- .../binary_monkey/{info.json => keyboard.json} | 8 ++++++++ keyboards/jkdlab/binary_monkey/rules.mk | 12 ------------ .../gentleman65/{info.json => keyboard.json} | 10 ++++++++++ keyboards/jkeys_design/gentleman65/rules.mk | 14 -------------- .../gentleman65_se_s/{info.json => keyboard.json} | 10 ++++++++++ keyboards/jkeys_design/gentleman65_se_s/rules.mk | 14 -------------- .../denial75/{info.json => keyboard.json} | 9 +++++++++ keyboards/jolofsor/denial75/rules.mk | 12 ------------ .../hub20/{info.json => keyboard.json} | 10 ++++++++++ keyboards/joshajohnson/hub20/rules.mk | 15 --------------- keyboards/k34/{info.json => keyboard.json} | 8 ++++++++ keyboards/k34/rules.mk | 12 ------------ .../kabedon78s/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kabedon/kabedon78s/rules.mk | 13 ------------- .../kabedon980/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kabedon/kabedon980/rules.mk | 13 ------------- .../kabedon98e/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kabedon/kabedon98e/rules.mk | 13 ------------- .../halberd/{info.json => keyboard.json} | 9 +++++++++ keyboards/kagizaraya/halberd/rules.mk | 12 ------------ .../kapcave/arya/{info.json => keyboard.json} | 9 +++++++++ keyboards/kapcave/arya/rules.mk | 14 -------------- .../kapcave/gskt00/{info.json => keyboard.json} | 8 ++++++++ keyboards/kapcave/gskt00/rules.mk | 12 ------------ .../paladin64/{info.json => keyboard.json} | 9 +++++++++ keyboards/kapcave/paladin64/rules.mk | 12 ------------ .../karlb/kbic65/{info.json => keyboard.json} | 8 ++++++++ keyboards/karlb/kbic65/rules.mk | 11 ----------- .../kb_elmo/67mk_e/{info.json => keyboard.json} | 8 ++++++++ keyboards/kb_elmo/67mk_e/rules.mk | 12 ------------ .../kb_elmo/noah_avr/{info.json => keyboard.json} | 9 +++++++++ keyboards/kb_elmo/noah_avr/rules.mk | 12 ------------ .../kb_elmo/qez/{info.json => keyboard.json} | 8 ++++++++ keyboards/kb_elmo/qez/rules.mk | 12 ------------ .../kb_elmo/vertex/{info.json => keyboard.json} | 8 ++++++++ keyboards/kb_elmo/vertex/rules.mk | 12 ------------ .../kaishi65/{info.json => keyboard.json} | 8 ++++++++ keyboards/kbdclack/kaishi65/rules.mk | 12 ------------ .../baguette66/rgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/baguette66/rgb/rules.mk | 13 ------------- .../soldered/{info.json => keyboard.json} | 8 ++++++++ keyboards/kbdfans/baguette66/soldered/rules.mk | 12 ------------ .../bella/soldered/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/bella/soldered/rules.mk | 12 ------------ .../boop65/rgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/boop65/rgb/rules.mk | 13 ------------- .../75/hotswap/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/bounce/75/hotswap/rules.mk | 12 ------------ .../75/soldered/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/bounce/75/soldered/rules.mk | 12 ------------ .../bounce/pad/{info.json => keyboard.json} | 8 ++++++++ keyboards/kbdfans/bounce/pad/rules.mk | 12 ------------ .../kbdfans/epoch80/{info.json => keyboard.json} | 8 ++++++++ keyboards/kbdfans/epoch80/rules.mk | 12 ------------ .../kbdfans/kbd19x/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kbdfans/kbd19x/rules.mk | 12 ------------ .../kbdfans/kbd66/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/kbd66/rules.mk | 11 ----------- .../kbd67/hotswap/{info.json => keyboard.json} | 8 ++++++++ keyboards/kbdfans/kbd67/hotswap/rules.mk | 12 ------------ .../mkii_soldered/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/kbd67/mkii_soldered/rules.mk | 12 ------------ .../kbd67/mkiirgb/v1/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk | 12 ------------ .../kbd67/mkiirgb/v4/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk | 13 ------------- .../kbd67/rev2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kbdfans/kbd67/rev2/rules.mk | 12 ------------ .../kbdfans/kbd6x/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kbdfans/kbd6x/rules.mk | 12 ------------ .../kbdfans/kbd75hs/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/kbd75hs/rules.mk | 12 ------------ .../kbdfans/kbd8x/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kbdfans/kbd8x/rules.mk | 12 ------------ .../kbd8x_mk2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kbdfans/kbd8x_mk2/rules.mk | 12 ------------ .../kbdfans/kbdmini/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/kbdmini/rules.mk | 13 ------------- .../kbdpad/mk1/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/kbdpad/mk1/rules.mk | 10 ---------- .../kbdpad/mk2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kbdfans/kbdpad/mk2/rules.mk | 12 ------------ .../kbdfans/odin/rgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/odin/rgb/rules.mk | 14 -------------- .../odin/soldered/{info.json => keyboard.json} | 8 ++++++++ keyboards/kbdfans/odin/soldered/rules.mk | 13 ------------- .../kbdfans/odin/v2/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/odin/v2/rules.mk | 13 ------------- .../kbdfans/phaseone/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/phaseone/rules.mk | 12 ------------ .../nordic60/rev_a/{info.json => keyboard.json} | 8 ++++++++ keyboards/kbnordic/nordic60/rev_a/rules.mk | 12 ------------ keyboards/kc60/{info.json => keyboard.json} | 9 +++++++++ keyboards/kc60/rules.mk | 12 ------------ keyboards/kc60se/{info.json => keyboard.json} | 9 +++++++++ keyboards/kc60se/rules.mk | 11 ----------- .../bigswitchseat/{info.json => keyboard.json} | 8 ++++++++ keyboards/keebio/bigswitchseat/rules.mk | 12 ------------ .../keebio/choconum/{info.json => keyboard.json} | 8 ++++++++ keyboards/keebio/choconum/rules.mk | 13 ------------- .../keebio/dilly/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keebio/dilly/rules.mk | 12 ------------ .../ergodicity/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keebio/ergodicity/rules.mk | 12 ------------ .../keebio/laplace/{info.json => keyboard.json} | 9 +++++++++ keyboards/keebio/laplace/rules.mk | 12 ------------ .../keebio/stick/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keebio/stick/rules.mk | 14 -------------- .../tragicforce68/{info.json => keyboard.json} | 9 +++++++++ keyboards/keebio/tragicforce68/rules.mk | 11 ----------- .../keebio/tukey/{info.json => keyboard.json} | 9 +++++++++ keyboards/keebio/tukey/rules.mk | 12 ------------ .../kbmg68/{info.json => keyboard.json} | 9 +++++++++ keyboards/keebmonkey/kbmg68/rules.mk | 12 ------------ .../coarse60/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keebsforall/coarse60/rules.mk | 15 --------------- .../freebird60/{info.json => keyboard.json} | 8 ++++++++ keyboards/keebsforall/freebird60/rules.mk | 12 ------------ .../freebirdnp/lite/{info.json => keyboard.json} | 8 ++++++++ keyboards/keebsforall/freebirdnp/lite/rules.mk | 12 ------------ .../freebirdnp/pro/{info.json => keyboard.json} | 9 +++++++++ keyboards/keebsforall/freebirdnp/pro/rules.mk | 13 ------------- .../freebirdtkl/{info.json => keyboard.json} | 8 ++++++++ keyboards/keebsforall/freebirdtkl/rules.mk | 12 ------------ .../keebzdotnet/fme/{info.json => keyboard.json} | 8 ++++++++ keyboards/keebzdotnet/fme/rules.mk | 12 ------------ .../wazowski/{info.json => keyboard.json} | 8 ++++++++ keyboards/keebzdotnet/wazowski/rules.mk | 12 ------------ keyboards/kegen/gboy/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kegen/gboy/rules.mk | 12 ------------ .../keybee/keybee65/{info.json => keyboard.json} | 9 +++++++++ keyboards/keybee/keybee65/rules.mk | 14 -------------- .../atreus/{info.json => keyboard.json} | 9 +++++++++ keyboards/keyboardio/atreus/rules.mk | 14 -------------- .../o4l_5x12/{info.json => keyboard.json} | 9 +++++++++ keyboards/keycapsss/o4l_5x12/rules.mk | 12 ------------ .../q60/ansi/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/q60/ansi/rules.mk | 14 -------------- .../s1/ansi/rgb/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/s1/ansi/rgb/rules.mk | 14 -------------- .../s1/ansi/white/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/s1/ansi/white/rules.mk | 14 -------------- .../keychron/v2/ansi/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/v2/ansi/rules.mk | 14 -------------- .../v2/ansi_encoder/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keychron/v2/ansi_encoder/rules.mk | 15 --------------- .../keychron/v2/iso/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/v2/iso/rules.mk | 14 -------------- .../v2/iso_encoder/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keychron/v2/iso_encoder/rules.mk | 15 --------------- .../keychron/v2/jis/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/v2/jis/rules.mk | 14 -------------- .../v2/jis_encoder/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keychron/v2/jis_encoder/rules.mk | 15 --------------- .../keychron/v3/ansi/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/v3/ansi/rules.mk | 14 -------------- .../keychron/v3/iso/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/v3/iso/rules.mk | 14 -------------- .../keychron/v3/jis/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/v3/jis/rules.mk | 14 -------------- .../keychron/v4/ansi/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/v4/ansi/rules.mk | 14 -------------- .../keychron/v4/iso/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/v4/iso/rules.mk | 14 -------------- .../keychron/v7/ansi/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/v7/ansi/rules.mk | 14 -------------- .../keychron/v7/iso/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/v7/iso/rules.mk | 14 -------------- .../keychron/v8/ansi/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/v8/ansi/rules.mk | 11 ----------- .../v8/ansi_encoder/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keychron/v8/ansi_encoder/rules.mk | 12 ------------ .../keychron/v8/iso/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keychron/v8/iso/rules.mk | 15 --------------- .../v8/iso_encoder/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keychron/v8/iso_encoder/rules.mk | 12 ------------ .../keyhive/absinthe/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keyhive/absinthe/rules.mk | 14 -------------- .../ergosaurus/{info.json => keyboard.json} | 8 ++++++++ keyboards/keyhive/ergosaurus/rules.mk | 12 ------------ .../keyhive/maypad/{info.json => keyboard.json} | 8 ++++++++ keyboards/keyhive/maypad/rules.mk | 12 ------------ .../keyhive/opus/{info.json => keyboard.json} | 8 ++++++++ keyboards/keyhive/opus/rules.mk | 12 ------------ .../keyhive/smallice/{info.json => keyboard.json} | 9 +++++++++ keyboards/keyhive/smallice/rules.mk | 12 ------------ .../southpole/{info.json => keyboard.json} | 8 ++++++++ keyboards/keyhive/southpole/rules.mk | 12 ------------ .../keyhive/ut472/{info.json => keyboard.json} | 9 +++++++++ keyboards/keyhive/ut472/rules.mk | 12 ------------ .../keyprez/corgi/{info.json => keyboard.json} | 9 +++++++++ keyboards/keyprez/corgi/rules.mk | 13 ------------- .../keyprez/rhino/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keyprez/rhino/rules.mk | 13 ------------- .../twokey/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keysofkings/twokey/rules.mk | 13 ------------- .../keyten/kt3700/{info.json => keyboard.json} | 8 ++++++++ keyboards/keyten/kt3700/rules.mk | 12 ------------ keyboards/kikkou/{info.json => keyboard.json} | 8 ++++++++ keyboards/kikkou/rules.mk | 12 ------------ .../ellora65/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kikoslab/ellora65/rules.mk | 13 ------------- .../kikoslab/kl90/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kikoslab/kl90/rules.mk | 14 -------------- .../conone65/{info.json => keyboard.json} | 8 ++++++++ keyboards/kindakeyboards/conone65/rules.mk | 12 ------------ .../emu/hotswap/{info.json => keyboard.json} | 8 ++++++++ keyboards/kineticlabs/emu/hotswap/rules.mk | 12 ------------ .../emu/soldered/{info.json => keyboard.json} | 8 ++++++++ keyboards/kineticlabs/emu/soldered/rules.mk | 12 ------------ .../ave/ortho/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kingly_keys/ave/ortho/rules.mk | 13 ------------- .../ave/staggered/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kingly_keys/ave/staggered/rules.mk | 13 ------------- .../little_foot/{info.json => keyboard.json} | 9 +++++++++ keyboards/kingly_keys/little_foot/rules.mk | 12 ------------ .../romac/{info.json => keyboard.json} | 8 ++++++++ keyboards/kingly_keys/romac/rules.mk | 13 ------------- .../romac_plus/{info.json => keyboard.json} | 11 +++++++++++ keyboards/kingly_keys/romac_plus/rules.mk | 12 ------------ .../ropro/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kingly_keys/ropro/rules.mk | 13 ------------- .../smd_milk/{info.json => keyboard.json} | 9 +++++++++ keyboards/kingly_keys/smd_milk/rules.mk | 12 ------------ .../kingly_keys/soap/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kingly_keys/soap/rules.mk | 13 ------------- .../kira/kira75/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kira/kira75/rules.mk | 12 ------------ .../kira/kira80/{info.json => keyboard.json} | 9 +++++++++ keyboards/kira/kira80/rules.mk | 10 ---------- .../kiwikeebs/macro/{info.json => keyboard.json} | 9 +++++++++ keyboards/kiwikeebs/macro/rules.mk | 13 ------------- .../macro_v2/{info.json => keyboard.json} | 9 +++++++++ keyboards/kiwikeebs/macro_v2/rules.mk | 13 ------------- .../wanderland/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kiwikey/wanderland/rules.mk | 12 ------------ .../bakeneko60/{info.json => keyboard.json} | 8 ++++++++ keyboards/kkatano/bakeneko60/rules.mk | 12 ------------ .../bakeneko65/rev2/{info.json => keyboard.json} | 8 ++++++++ keyboards/kkatano/bakeneko65/rev2/rules.mk | 12 ------------ .../bakeneko65/rev3/{info.json => keyboard.json} | 8 ++++++++ keyboards/kkatano/bakeneko65/rev3/rules.mk | 12 ------------ .../bakeneko80/{info.json => keyboard.json} | 8 ++++++++ keyboards/kkatano/bakeneko80/rules.mk | 12 ------------ .../kkatano/wallaby/{info.json => keyboard.json} | 8 ++++++++ keyboards/kkatano/wallaby/rules.mk | 12 ------------ .../kkatano/yurei/{info.json => keyboard.json} | 8 ++++++++ keyboards/kkatano/yurei/rules.mk | 12 ------------ keyboards/knobgoblin/{info.json => keyboard.json} | 10 ++++++++++ keyboards/knobgoblin/rules.mk | 15 --------------- keyboards/knops/mini/{info.json => keyboard.json} | 8 ++++++++ keyboards/knops/mini/rules.mk | 11 ----------- .../kona_classic/{info.json => keyboard.json} | 8 ++++++++ keyboards/kona_classic/rules.mk | 11 ----------- .../kopibeng/mnk65/{info.json => keyboard.json} | 8 ++++++++ keyboards/kopibeng/mnk65/rules.mk | 12 ------------ .../kopibeng/mnk88/{info.json => keyboard.json} | 9 +++++++++ keyboards/kopibeng/mnk88/rules.mk | 14 -------------- .../kopibeng/typ65/{info.json => keyboard.json} | 8 ++++++++ keyboards/kopibeng/typ65/rules.mk | 13 ------------- .../kopibeng/xt60/{info.json => keyboard.json} | 9 +++++++++ keyboards/kopibeng/xt60/rules.mk | 12 ------------ .../xt60_singa/{info.json => keyboard.json} | 9 +++++++++ keyboards/kopibeng/xt60_singa/rules.mk | 12 ------------ .../kopibeng/xt65/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kopibeng/xt65/rules.mk | 12 ------------ .../kopibeng/xt8x/{info.json => keyboard.json} | 9 +++++++++ keyboards/kopibeng/xt8x/rules.mk | 14 -------------- .../kprepublic/bm16s/{info.json => keyboard.json} | 9 +++++++++ keyboards/kprepublic/bm16s/rules.mk | 12 ------------ .../bm40hsrgb/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/kprepublic/bm40hsrgb/rev1/rules.mk | 12 ------------ .../kprepublic/bm43a/{info.json => keyboard.json} | 8 ++++++++ keyboards/kprepublic/bm43a/rules.mk | 12 ------------ .../bm43hsrgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/kprepublic/bm43hsrgb/rules.mk | 14 -------------- .../rev1/{info.json => keyboard.json} | 9 +++++++++ .../kprepublic/bm60hsrgb_poker/rev1/rules.mk | 13 ------------- .../cospad/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kprepublic/cospad/rules.mk | 12 ------------ .../kprepublic/jj4x4/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kprepublic/jj4x4/rules.mk | 12 ------------ keyboards/ktec/daisy/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ktec/daisy/rules.mk | 12 ------------ .../ktec/staryu/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ktec/staryu/rules.mk | 12 ------------ keyboards/kv/revt/{info.json => keyboard.json} | 8 ++++++++ keyboards/kv/revt/rules.mk | 12 ------------ keyboards/kwub/bloop/{info.json => keyboard.json} | 8 ++++++++ keyboards/kwub/bloop/rules.mk | 12 ------------ keyboards/ky01/{info.json => keyboard.json} | 8 ++++++++ keyboards/ky01/rules.mk | 12 ------------ 364 files changed, 1649 insertions(+), 2270 deletions(-) rename keyboards/ianklug/grooveboard/{info.json => keyboard.json} (80%) delete mode 100644 keyboards/ianklug/grooveboard/rules.mk rename keyboards/ibm/model_m/ashpil_usbc/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ibm/model_m/ashpil_usbc/rules.mk rename keyboards/ibm/model_m/teensy2/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/ibm/model_m/teensy2/rules.mk rename keyboards/ibm/model_m/yugo_m/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/ibm/model_m/yugo_m/rules.mk rename keyboards/ibm/model_m_122/ibm122m/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/ibm/model_m_122/ibm122m/rules.mk rename keyboards/ibm/model_m_122/m122_3270/blackpill/{info.json => keyboard.json} (70%) delete mode 100644 keyboards/ibm/model_m_122/m122_3270/blackpill/rules.mk rename keyboards/ibm/model_m_122/m122_3270/teensy/{info.json => keyboard.json} (68%) delete mode 100644 keyboards/ibm/model_m_122/m122_3270/teensy/rules.mk rename keyboards/ibm/model_m_ssk/teensypp_ssk/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ibm/model_m_ssk/teensypp_ssk/rules.mk rename keyboards/ibnuda/alicia_cook/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ibnuda/alicia_cook/rules.mk rename keyboards/ibnuda/gurindam/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/ibnuda/gurindam/rules.mk rename keyboards/idb/idb_60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/idb/idb_60/rules.mk rename keyboards/idobao/id87/v1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/idobao/id87/v1/rules.mk rename keyboards/idobao/id96/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/idobao/id96/rules.mk rename keyboards/idobao/montex/v1/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/idobao/montex/v1/rules.mk rename keyboards/idobao/montex/v1rgb/{info.json => keyboard.json} (93%) delete mode 100755 keyboards/idobao/montex/v1rgb/rules.mk rename keyboards/illuminati/is0/{info.json => keyboard.json} (76%) delete mode 100644 keyboards/illuminati/is0/rules.mk rename keyboards/illusion/rosa/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/illusion/rosa/rules.mk rename keyboards/ilumkb/primus75/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/ilumkb/primus75/rules.mk rename keyboards/ilumkb/simpler61/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ilumkb/simpler61/rules.mk rename keyboards/ilumkb/simpler64/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ilumkb/simpler64/rules.mk rename keyboards/ilumkb/volcano660/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ilumkb/volcano660/rules.mk rename keyboards/input_club/k_type/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/input_club/k_type/rules.mk rename keyboards/input_club/whitefox/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/input_club/whitefox/rules.mk rename keyboards/io_mini1800/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/io_mini1800/rules.mk rename keyboards/irene/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/irene/rules.mk rename keyboards/iriskeyboards/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/iriskeyboards/rules.mk rename keyboards/iron180/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/iron180/rules.mk rename keyboards/j80/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/j80/rules.mk rename keyboards/jacky_studio/s7_elephant/rev1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/jacky_studio/s7_elephant/rev1/rules.mk rename keyboards/jadookb/jkb2/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/jadookb/jkb2/rules.mk rename keyboards/jae/j01/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/jae/j01/rules.mk rename keyboards/jc65/v32a/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/jc65/v32a/rules.mk rename keyboards/jc65/v32u4/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/jc65/v32u4/rules.mk rename keyboards/jd40/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/jd40/rules.mk rename keyboards/jd45/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/jd45/rules.mk rename keyboards/jels/jels88/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/jels/jels88/rules.mk rename keyboards/jkdlab/binary_monkey/{info.json => keyboard.json} (80%) delete mode 100644 keyboards/jkdlab/binary_monkey/rules.mk rename keyboards/jkeys_design/gentleman65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/jkeys_design/gentleman65/rules.mk rename keyboards/jkeys_design/gentleman65_se_s/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/jkeys_design/gentleman65_se_s/rules.mk rename keyboards/jolofsor/denial75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/jolofsor/denial75/rules.mk rename keyboards/joshajohnson/hub20/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/joshajohnson/hub20/rules.mk rename keyboards/k34/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/k34/rules.mk rename keyboards/kabedon/kabedon78s/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kabedon/kabedon78s/rules.mk rename keyboards/kabedon/kabedon980/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kabedon/kabedon980/rules.mk rename keyboards/kabedon/kabedon98e/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kabedon/kabedon98e/rules.mk rename keyboards/kagizaraya/halberd/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/kagizaraya/halberd/rules.mk rename keyboards/kapcave/arya/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kapcave/arya/rules.mk rename keyboards/kapcave/gskt00/{info.json => keyboard.json} (98%) delete mode 100755 keyboards/kapcave/gskt00/rules.mk rename keyboards/kapcave/paladin64/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/kapcave/paladin64/rules.mk rename keyboards/karlb/kbic65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/karlb/kbic65/rules.mk rename keyboards/kb_elmo/67mk_e/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kb_elmo/67mk_e/rules.mk rename keyboards/kb_elmo/noah_avr/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kb_elmo/noah_avr/rules.mk rename keyboards/kb_elmo/qez/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kb_elmo/qez/rules.mk rename keyboards/kb_elmo/vertex/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/kb_elmo/vertex/rules.mk rename keyboards/kbdclack/kaishi65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kbdclack/kaishi65/rules.mk rename keyboards/kbdfans/baguette66/rgb/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kbdfans/baguette66/rgb/rules.mk rename keyboards/kbdfans/baguette66/soldered/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kbdfans/baguette66/soldered/rules.mk rename keyboards/kbdfans/bella/soldered/{info.json => keyboard.json} (99%) delete mode 100755 keyboards/kbdfans/bella/soldered/rules.mk rename keyboards/kbdfans/boop65/rgb/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kbdfans/boop65/rgb/rules.mk rename keyboards/kbdfans/bounce/75/hotswap/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kbdfans/bounce/75/hotswap/rules.mk rename keyboards/kbdfans/bounce/75/soldered/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kbdfans/bounce/75/soldered/rules.mk rename keyboards/kbdfans/bounce/pad/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/kbdfans/bounce/pad/rules.mk rename keyboards/kbdfans/epoch80/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kbdfans/epoch80/rules.mk rename keyboards/kbdfans/kbd19x/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kbdfans/kbd19x/rules.mk rename keyboards/kbdfans/kbd66/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kbdfans/kbd66/rules.mk rename keyboards/kbdfans/kbd67/hotswap/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kbdfans/kbd67/hotswap/rules.mk rename keyboards/kbdfans/kbd67/mkii_soldered/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kbdfans/kbd67/mkii_soldered/rules.mk rename keyboards/kbdfans/kbd67/mkiirgb/v1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk rename keyboards/kbdfans/kbd67/mkiirgb/v4/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk rename keyboards/kbdfans/kbd67/rev2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kbdfans/kbd67/rev2/rules.mk rename keyboards/kbdfans/kbd6x/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/kbdfans/kbd6x/rules.mk rename keyboards/kbdfans/kbd75hs/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kbdfans/kbd75hs/rules.mk rename keyboards/kbdfans/kbd8x/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/kbdfans/kbd8x/rules.mk rename keyboards/kbdfans/kbd8x_mk2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/kbdfans/kbd8x_mk2/rules.mk rename keyboards/kbdfans/kbdmini/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/kbdfans/kbdmini/rules.mk rename keyboards/kbdfans/kbdpad/mk1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/kbdfans/kbdpad/mk1/rules.mk rename keyboards/kbdfans/kbdpad/mk2/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/kbdfans/kbdpad/mk2/rules.mk rename keyboards/kbdfans/odin/rgb/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kbdfans/odin/rgb/rules.mk rename keyboards/kbdfans/odin/soldered/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kbdfans/odin/soldered/rules.mk rename keyboards/kbdfans/odin/v2/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kbdfans/odin/v2/rules.mk rename keyboards/kbdfans/phaseone/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kbdfans/phaseone/rules.mk rename keyboards/kbnordic/nordic60/rev_a/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kbnordic/nordic60/rev_a/rules.mk rename keyboards/kc60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kc60/rules.mk rename keyboards/kc60se/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/kc60se/rules.mk rename keyboards/keebio/bigswitchseat/{info.json => keyboard.json} (76%) delete mode 100644 keyboards/keebio/bigswitchseat/rules.mk rename keyboards/keebio/choconum/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/keebio/choconum/rules.mk rename keyboards/keebio/dilly/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/keebio/dilly/rules.mk rename keyboards/keebio/ergodicity/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keebio/ergodicity/rules.mk rename keyboards/keebio/laplace/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keebio/laplace/rules.mk rename keyboards/keebio/stick/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/keebio/stick/rules.mk rename keyboards/keebio/tragicforce68/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/keebio/tragicforce68/rules.mk rename keyboards/keebio/tukey/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/keebio/tukey/rules.mk rename keyboards/keebmonkey/kbmg68/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keebmonkey/kbmg68/rules.mk rename keyboards/keebsforall/coarse60/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/keebsforall/coarse60/rules.mk rename keyboards/keebsforall/freebird60/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/keebsforall/freebird60/rules.mk rename keyboards/keebsforall/freebirdnp/lite/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/keebsforall/freebirdnp/lite/rules.mk rename keyboards/keebsforall/freebirdnp/pro/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keebsforall/freebirdnp/pro/rules.mk rename keyboards/keebsforall/freebirdtkl/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/keebsforall/freebirdtkl/rules.mk rename keyboards/keebzdotnet/fme/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/keebzdotnet/fme/rules.mk rename keyboards/keebzdotnet/wazowski/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/keebzdotnet/wazowski/rules.mk rename keyboards/kegen/gboy/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kegen/gboy/rules.mk rename keyboards/keybee/keybee65/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keybee/keybee65/rules.mk rename keyboards/keyboardio/atreus/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/keyboardio/atreus/rules.mk rename keyboards/keycapsss/o4l_5x12/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/keycapsss/o4l_5x12/rules.mk rename keyboards/keychron/q60/ansi/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keychron/q60/ansi/rules.mk rename keyboards/keychron/s1/ansi/rgb/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keychron/s1/ansi/rgb/rules.mk rename keyboards/keychron/s1/ansi/white/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keychron/s1/ansi/white/rules.mk rename keyboards/keychron/v2/ansi/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keychron/v2/ansi/rules.mk rename keyboards/keychron/v2/ansi_encoder/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keychron/v2/ansi_encoder/rules.mk rename keyboards/keychron/v2/iso/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keychron/v2/iso/rules.mk rename keyboards/keychron/v2/iso_encoder/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keychron/v2/iso_encoder/rules.mk rename keyboards/keychron/v2/jis/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keychron/v2/jis/rules.mk rename keyboards/keychron/v2/jis_encoder/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keychron/v2/jis_encoder/rules.mk rename keyboards/keychron/v3/ansi/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keychron/v3/ansi/rules.mk rename keyboards/keychron/v3/iso/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keychron/v3/iso/rules.mk rename keyboards/keychron/v3/jis/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keychron/v3/jis/rules.mk rename keyboards/keychron/v4/ansi/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keychron/v4/ansi/rules.mk rename keyboards/keychron/v4/iso/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keychron/v4/iso/rules.mk rename keyboards/keychron/v7/ansi/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keychron/v7/ansi/rules.mk rename keyboards/keychron/v7/iso/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keychron/v7/iso/rules.mk rename keyboards/keychron/v8/ansi/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keychron/v8/ansi/rules.mk rename keyboards/keychron/v8/ansi_encoder/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keychron/v8/ansi_encoder/rules.mk rename keyboards/keychron/v8/iso/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keychron/v8/iso/rules.mk rename keyboards/keychron/v8/iso_encoder/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keychron/v8/iso_encoder/rules.mk rename keyboards/keyhive/absinthe/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/keyhive/absinthe/rules.mk rename keyboards/keyhive/ergosaurus/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keyhive/ergosaurus/rules.mk rename keyboards/keyhive/maypad/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keyhive/maypad/rules.mk rename keyboards/keyhive/opus/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keyhive/opus/rules.mk rename keyboards/keyhive/smallice/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keyhive/smallice/rules.mk rename keyboards/keyhive/southpole/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keyhive/southpole/rules.mk rename keyboards/keyhive/ut472/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keyhive/ut472/rules.mk rename keyboards/keyprez/corgi/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keyprez/corgi/rules.mk rename keyboards/keyprez/rhino/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/keyprez/rhino/rules.mk rename keyboards/keysofkings/twokey/{info.json => keyboard.json} (83%) delete mode 100755 keyboards/keysofkings/twokey/rules.mk rename keyboards/keyten/kt3700/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keyten/kt3700/rules.mk rename keyboards/kikkou/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kikkou/rules.mk rename keyboards/kikoslab/ellora65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kikoslab/ellora65/rules.mk rename keyboards/kikoslab/kl90/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kikoslab/kl90/rules.mk rename keyboards/kindakeyboards/conone65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kindakeyboards/conone65/rules.mk rename keyboards/kineticlabs/emu/hotswap/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kineticlabs/emu/hotswap/rules.mk rename keyboards/kineticlabs/emu/soldered/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/kineticlabs/emu/soldered/rules.mk rename keyboards/kingly_keys/ave/ortho/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kingly_keys/ave/ortho/rules.mk rename keyboards/kingly_keys/ave/staggered/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kingly_keys/ave/staggered/rules.mk rename keyboards/kingly_keys/little_foot/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kingly_keys/little_foot/rules.mk rename keyboards/kingly_keys/romac/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/kingly_keys/romac/rules.mk rename keyboards/kingly_keys/romac_plus/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/kingly_keys/romac_plus/rules.mk rename keyboards/kingly_keys/ropro/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/kingly_keys/ropro/rules.mk rename keyboards/kingly_keys/smd_milk/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/kingly_keys/smd_milk/rules.mk rename keyboards/kingly_keys/soap/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/kingly_keys/soap/rules.mk rename keyboards/kira/kira75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kira/kira75/rules.mk rename keyboards/kira/kira80/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kira/kira80/rules.mk rename keyboards/kiwikeebs/macro/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/kiwikeebs/macro/rules.mk rename keyboards/kiwikeebs/macro_v2/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/kiwikeebs/macro_v2/rules.mk rename keyboards/kiwikey/wanderland/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kiwikey/wanderland/rules.mk rename keyboards/kkatano/bakeneko60/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/kkatano/bakeneko60/rules.mk rename keyboards/kkatano/bakeneko65/rev2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/kkatano/bakeneko65/rev2/rules.mk rename keyboards/kkatano/bakeneko65/rev3/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kkatano/bakeneko65/rev3/rules.mk rename keyboards/kkatano/bakeneko80/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kkatano/bakeneko80/rules.mk rename keyboards/kkatano/wallaby/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kkatano/wallaby/rules.mk rename keyboards/kkatano/yurei/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kkatano/yurei/rules.mk rename keyboards/knobgoblin/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/knobgoblin/rules.mk rename keyboards/knops/mini/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/knops/mini/rules.mk rename keyboards/kona_classic/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kona_classic/rules.mk rename keyboards/kopibeng/mnk65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kopibeng/mnk65/rules.mk rename keyboards/kopibeng/mnk88/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kopibeng/mnk88/rules.mk rename keyboards/kopibeng/typ65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kopibeng/typ65/rules.mk rename keyboards/kopibeng/xt60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kopibeng/xt60/rules.mk rename keyboards/kopibeng/xt60_singa/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kopibeng/xt60_singa/rules.mk rename keyboards/kopibeng/xt65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/kopibeng/xt65/rules.mk rename keyboards/kopibeng/xt8x/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kopibeng/xt8x/rules.mk rename keyboards/kprepublic/bm16s/{info.json => keyboard.json} (89%) delete mode 100755 keyboards/kprepublic/bm16s/rules.mk rename keyboards/kprepublic/bm40hsrgb/rev1/{info.json => keyboard.json} (95%) delete mode 100755 keyboards/kprepublic/bm40hsrgb/rev1/rules.mk rename keyboards/kprepublic/bm43a/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/kprepublic/bm43a/rules.mk rename keyboards/kprepublic/bm43hsrgb/{info.json => keyboard.json} (94%) delete mode 100755 keyboards/kprepublic/bm43hsrgb/rules.mk rename keyboards/kprepublic/bm60hsrgb_poker/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk rename keyboards/kprepublic/cospad/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kprepublic/cospad/rules.mk rename keyboards/kprepublic/jj4x4/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/kprepublic/jj4x4/rules.mk rename keyboards/ktec/daisy/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ktec/daisy/rules.mk rename keyboards/ktec/staryu/{info.json => keyboard.json} (85%) delete mode 100755 keyboards/ktec/staryu/rules.mk rename keyboards/kv/revt/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kv/revt/rules.mk rename keyboards/kwub/bloop/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/kwub/bloop/rules.mk rename keyboards/ky01/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ky01/rules.mk diff --git a/keyboards/ianklug/grooveboard/info.json b/keyboards/ianklug/grooveboard/keyboard.json similarity index 80% rename from keyboards/ianklug/grooveboard/info.json rename to keyboards/ianklug/grooveboard/keyboard.json index a38e793544e..81dd715867d 100644 --- a/keyboards/ianklug/grooveboard/info.json +++ b/keyboards/ianklug/grooveboard/keyboard.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "direct": [ ["F7", "F6", "D1", "D2"] diff --git a/keyboards/ianklug/grooveboard/rules.mk b/keyboards/ianklug/grooveboard/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/ianklug/grooveboard/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 = 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/ashpil_usbc/info.json b/keyboards/ibm/model_m/ashpil_usbc/keyboard.json similarity index 98% rename from keyboards/ibm/model_m/ashpil_usbc/info.json rename to keyboards/ibm/model_m/ashpil_usbc/keyboard.json index ffdb608edc5..451589017e4 100644 --- a/keyboards/ibm/model_m/ashpil_usbc/info.json +++ b/keyboards/ibm/model_m/ashpil_usbc/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["E6", "E7", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5"], "rows": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0"] diff --git a/keyboards/ibm/model_m/ashpil_usbc/rules.mk b/keyboards/ibm/model_m/ashpil_usbc/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/ibm/model_m/ashpil_usbc/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ibm/model_m/teensy2/info.json b/keyboards/ibm/model_m/teensy2/keyboard.json similarity index 97% rename from keyboards/ibm/model_m/teensy2/info.json rename to keyboards/ibm/model_m/teensy2/keyboard.json index 19603adb7a5..173f9e772f5 100644 --- a/keyboards/ibm/model_m/teensy2/info.json +++ b/keyboards/ibm/model_m/teensy2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "B0", "B1", "B2", "B3", "B7"], "rows": ["D0", "D1", "D2", "D3", "C6", "C7", "D5", "D4"] diff --git a/keyboards/ibm/model_m/teensy2/rules.mk b/keyboards/ibm/model_m/teensy2/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/ibm/model_m/teensy2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ibm/model_m/yugo_m/info.json b/keyboards/ibm/model_m/yugo_m/keyboard.json similarity index 99% rename from keyboards/ibm/model_m/yugo_m/info.json rename to keyboards/ibm/model_m/yugo_m/keyboard.json index f4d9cc1d944..968c637b783 100644 --- a/keyboards/ibm/model_m/yugo_m/info.json +++ b/keyboards/ibm/model_m/yugo_m/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x8E81", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"], "rows": ["B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"] diff --git a/keyboards/ibm/model_m/yugo_m/rules.mk b/keyboards/ibm/model_m/yugo_m/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/ibm/model_m/yugo_m/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 = 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_122/ibm122m/info.json b/keyboards/ibm/model_m_122/ibm122m/keyboard.json similarity index 97% rename from keyboards/ibm/model_m_122/ibm122m/info.json rename to keyboards/ibm/model_m_122/ibm122m/keyboard.json index 54b0e9badea..3c43d17d92d 100644 --- a/keyboards/ibm/model_m_122/ibm122m/info.json +++ b/keyboards/ibm/model_m_122/ibm122m/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "audio": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["E6", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C7", "F1"], "rows": ["F0", "B5", "B4", "B3", "B2", "B1", "B0", "E7"] diff --git a/keyboards/ibm/model_m_122/ibm122m/rules.mk b/keyboards/ibm/model_m_122/ibm122m/rules.mk deleted file mode 100644 index 3b2469ecc8f..00000000000 --- a/keyboards/ibm/model_m_122/ibm122m/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/ibm/model_m_122/m122_3270/blackpill/info.json b/keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json similarity index 70% rename from keyboards/ibm/model_m_122/m122_3270/blackpill/info.json rename to keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json index b17554b7e03..46abafb2c42 100644 --- a/keyboards/ibm/model_m_122/m122_3270/blackpill/info.json +++ b/keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json @@ -2,6 +2,14 @@ "usb": { "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B1", "B10", "B12", "B13", "B14", "B15", "A8", "A7", "A10", "A6", "A5", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"], "rows": ["C13", "C14", "C15", "A0", "A1", "A2", "A3", "A4"] diff --git a/keyboards/ibm/model_m_122/m122_3270/blackpill/rules.mk b/keyboards/ibm/model_m_122/m122_3270/blackpill/rules.mk deleted file mode 100644 index 0a85fffb85c..00000000000 --- a/keyboards/ibm/model_m_122/m122_3270/blackpill/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/ibm/model_m_122/m122_3270/teensy/info.json b/keyboards/ibm/model_m_122/m122_3270/teensy/keyboard.json similarity index 68% rename from keyboards/ibm/model_m_122/m122_3270/teensy/info.json rename to keyboards/ibm/model_m_122/m122_3270/teensy/keyboard.json index 7596f5fc15d..ca2dd31fbff 100644 --- a/keyboards/ibm/model_m_122/m122_3270/teensy/info.json +++ b/keyboards/ibm/model_m_122/m122_3270/teensy/keyboard.json @@ -2,6 +2,14 @@ "usb": { "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "B6", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"], "rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"] diff --git a/keyboards/ibm/model_m_122/m122_3270/teensy/rules.mk b/keyboards/ibm/model_m_122/m122_3270/teensy/rules.mk deleted file mode 100644 index 0a85fffb85c..00000000000 --- a/keyboards/ibm/model_m_122/m122_3270/teensy/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/ibm/model_m_ssk/teensypp_ssk/info.json b/keyboards/ibm/model_m_ssk/teensypp_ssk/keyboard.json similarity index 96% rename from keyboards/ibm/model_m_ssk/teensypp_ssk/info.json rename to keyboards/ibm/model_m_ssk/teensypp_ssk/keyboard.json index fbc3076c472..5994d820f45 100644 --- a/keyboards/ibm/model_m_ssk/teensypp_ssk/info.json +++ b/keyboards/ibm/model_m_ssk/teensypp_ssk/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D5", "D4", "D3", "D2", "D1"], "rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"] diff --git a/keyboards/ibm/model_m_ssk/teensypp_ssk/rules.mk b/keyboards/ibm/model_m_ssk/teensypp_ssk/rules.mk deleted file mode 100644 index 2904475d7dc..00000000000 --- a/keyboards/ibm/model_m_ssk/teensypp_ssk/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 = 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 diff --git a/keyboards/ibnuda/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/keyboard.json similarity index 98% rename from keyboards/ibnuda/alicia_cook/info.json rename to keyboards/ibnuda/alicia_cook/keyboard.json index 1405e5d0938..fd3b23285ca 100644 --- a/keyboards/ibnuda/alicia_cook/info.json +++ b/keyboards/ibnuda/alicia_cook/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6955", "device_version": "8.9.9" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["D2", "D3", "F4", "F5"] diff --git a/keyboards/ibnuda/alicia_cook/rules.mk b/keyboards/ibnuda/alicia_cook/rules.mk deleted file mode 100644 index 64562f09320..00000000000 --- a/keyboards/ibnuda/alicia_cook/rules.mk +++ /dev/null @@ -1,12 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/keyboard.json similarity index 95% rename from keyboards/ibnuda/gurindam/info.json rename to keyboards/ibnuda/gurindam/keyboard.json index b4a4de5a743..e1253b7d7a4 100644 --- a/keyboards/ibnuda/gurindam/info.json +++ b/keyboards/ibnuda/gurindam/keyboard.json @@ -25,6 +25,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"], "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"] diff --git a/keyboards/ibnuda/gurindam/rules.mk b/keyboards/ibnuda/gurindam/rules.mk deleted file mode 100644 index 76a5b62f607..00000000000 --- a/keyboards/ibnuda/gurindam/rules.mk +++ /dev/null @@ -1,12 +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 -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/idb/idb_60/info.json b/keyboards/idb/idb_60/keyboard.json similarity index 99% rename from keyboards/idb/idb_60/info.json rename to keyboards/idb/idb_60/keyboard.json index 18148f5e657..df88de1dff6 100644 --- a/keyboards/idb/idb_60/info.json +++ b/keyboards/idb/idb_60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B2", "B3", "B4", "C6", "B6", "B7", "C7", "B5"], "rows": ["C2", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "B0", "B1"] diff --git a/keyboards/idb/idb_60/rules.mk b/keyboards/idb/idb_60/rules.mk deleted file mode 100644 index bb93c95954a..00000000000 --- a/keyboards/idb/idb_60/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/keyboard.json similarity index 96% rename from keyboards/idobao/id87/v1/info.json rename to keyboards/idobao/id87/v1/keyboard.json index 9b84530637f..5ae86f8d5e1 100644 --- a/keyboards/idobao/id87/v1/info.json +++ b/keyboards/idobao/id87/v1/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0087", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/idobao/id87/v1/rules.mk b/keyboards/idobao/id87/v1/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/idobao/id87/v1/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/keyboard.json similarity index 98% rename from keyboards/idobao/id96/info.json rename to keyboards/idobao/id96/keyboard.json index 1febd541e56..3213cd74a9f 100644 --- a/keyboards/idobao/id96/info.json +++ b/keyboards/idobao/id96/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0096", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/idobao/id96/rules.mk b/keyboards/idobao/id96/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/idobao/id96/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/keyboard.json similarity index 92% rename from keyboards/idobao/montex/v1/info.json rename to keyboards/idobao/montex/v1/keyboard.json index 2abbef46ba6..d439a2d09ca 100644 --- a/keyboards/idobao/montex/v1/info.json +++ b/keyboards/idobao/montex/v1/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0"], "rows": ["D4", "D6", "D7", "B4", "B5", "C6"] diff --git a/keyboards/idobao/montex/v1/rules.mk b/keyboards/idobao/montex/v1/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/idobao/montex/v1/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/keyboard.json similarity index 93% rename from keyboards/idobao/montex/v1rgb/info.json rename to keyboards/idobao/montex/v1rgb/keyboard.json index 08c62297ac2..f4c18764b13 100755 --- a/keyboards/idobao/montex/v1rgb/info.json +++ b/keyboards/idobao/montex/v1rgb/keyboard.json @@ -35,6 +35,15 @@ "driver": "ws2812", "max_brightness": 170 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0"], "rows": ["D4", "D6", "D7", "B4", "B5", "C6"] diff --git a/keyboards/idobao/montex/v1rgb/rules.mk b/keyboards/idobao/montex/v1rgb/rules.mk deleted file mode 100755 index 88f044a7ecb..00000000000 --- a/keyboards/idobao/montex/v1rgb/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 = 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 -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/illuminati/is0/info.json b/keyboards/illuminati/is0/keyboard.json similarity index 76% rename from keyboards/illuminati/is0/info.json rename to keyboards/illuminati/is0/keyboard.json index b5a534e142d..d03af345073 100644 --- a/keyboards/illuminati/is0/info.json +++ b/keyboards/illuminati/is0/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D0"], "rows": ["D2"] diff --git a/keyboards/illuminati/is0/rules.mk b/keyboards/illuminati/is0/rules.mk deleted file mode 100644 index 5e28d2cc453..00000000000 --- a/keyboards/illuminati/is0/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 = no # Console for debug -COMMAND_ENABLE = yes # 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/illusion/rosa/info.json b/keyboards/illusion/rosa/keyboard.json similarity index 98% rename from keyboards/illusion/rosa/info.json rename to keyboards/illusion/rosa/keyboard.json index d6e3ab365db..c5e9c88a770 100644 --- a/keyboards/illusion/rosa/info.json +++ b/keyboards/illusion/rosa/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6952", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D0", "D2", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["D1", "D4", "F0", "B0", "B1"] diff --git a/keyboards/illusion/rosa/rules.mk b/keyboards/illusion/rosa/rules.mk deleted file mode 100644 index 184072b19e4..00000000000 --- a/keyboards/illusion/rosa/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 = 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 diff --git a/keyboards/ilumkb/primus75/info.json b/keyboards/ilumkb/primus75/keyboard.json similarity index 99% rename from keyboards/ilumkb/primus75/info.json rename to keyboards/ilumkb/primus75/keyboard.json index 5e32832622b..f00c146740d 100644 --- a/keyboards/ilumkb/primus75/info.json +++ b/keyboards/ilumkb/primus75/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1014", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"], "rows": ["D0", "D1", "D2", "D3", "D5", "B7"] diff --git a/keyboards/ilumkb/primus75/rules.mk b/keyboards/ilumkb/primus75/rules.mk deleted file mode 100644 index b325f3f0c79..00000000000 --- a/keyboards/ilumkb/primus75/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 = 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/ilumkb/simpler61/info.json b/keyboards/ilumkb/simpler61/keyboard.json similarity index 96% rename from keyboards/ilumkb/simpler61/info.json rename to keyboards/ilumkb/simpler61/keyboard.json index 9f8f5f014a4..8e7680fb9f7 100644 --- a/keyboards/ilumkb/simpler61/info.json +++ b/keyboards/ilumkb/simpler61/keyboard.json @@ -48,6 +48,15 @@ "led_flush_limit": 26, "sleep": true }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/ilumkb/simpler61/rules.mk b/keyboards/ilumkb/simpler61/rules.mk deleted file mode 100644 index c2f7c0e0930..00000000000 --- a/keyboards/ilumkb/simpler61/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 -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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/ilumkb/simpler64/info.json b/keyboards/ilumkb/simpler64/keyboard.json similarity index 96% rename from keyboards/ilumkb/simpler64/info.json rename to keyboards/ilumkb/simpler64/keyboard.json index af617da861b..65aa627b042 100644 --- a/keyboards/ilumkb/simpler64/info.json +++ b/keyboards/ilumkb/simpler64/keyboard.json @@ -48,6 +48,15 @@ "led_flush_limit": 26, "sleep": true }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/ilumkb/simpler64/rules.mk b/keyboards/ilumkb/simpler64/rules.mk deleted file mode 100644 index c2f7c0e0930..00000000000 --- a/keyboards/ilumkb/simpler64/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 -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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/ilumkb/volcano660/info.json b/keyboards/ilumkb/volcano660/keyboard.json similarity index 98% rename from keyboards/ilumkb/volcano660/info.json rename to keyboards/ilumkb/volcano660/keyboard.json index 1af06ccc47e..7412a249f8f 100644 --- a/keyboards/ilumkb/volcano660/info.json +++ b/keyboards/ilumkb/volcano660/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B1", "B2", "B3", "B6"] diff --git a/keyboards/ilumkb/volcano660/rules.mk b/keyboards/ilumkb/volcano660/rules.mk deleted file mode 100644 index b325f3f0c79..00000000000 --- a/keyboards/ilumkb/volcano660/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 = 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/input_club/k_type/info.json b/keyboards/input_club/k_type/keyboard.json similarity index 97% rename from keyboards/input_club/k_type/info.json rename to keyboards/input_club/k_type/keyboard.json index 17076a82d8f..a4e8e2419ed 100644 --- a/keyboards/input_club/k_type/info.json +++ b/keyboards/input_club/k_type/keyboard.json @@ -56,6 +56,14 @@ }, "driver": "custom" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "D0", "D1", "D4"], "rows": ["D5", "D6", "D7", "C1", "C2", "C3", "C4", "C5", "C6", "C7"] diff --git a/keyboards/input_club/k_type/rules.mk b/keyboards/input_club/k_type/rules.mk deleted file mode 100644 index 684de50562d..00000000000 --- a/keyboards/input_club/k_type/rules.mk +++ /dev/null @@ -1,15 +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 = 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 options -RGB_MATRIX_ENABLE = no diff --git a/keyboards/input_club/whitefox/info.json b/keyboards/input_club/whitefox/keyboard.json similarity index 99% rename from keyboards/input_club/whitefox/info.json rename to keyboards/input_club/whitefox/keyboard.json index 0428907fb8d..d2fd36bbd57 100644 --- a/keyboards/input_club/whitefox/info.json +++ b/keyboards/input_club/whitefox/keyboard.json @@ -33,6 +33,15 @@ "driver": "is31fl3731", "sleep": true }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "led_matrix": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "C10", "C11"], "rows": ["D0", "D1", "D4", "D5", "D6", "D7", "C1", "C2"] diff --git a/keyboards/input_club/whitefox/rules.mk b/keyboards/input_club/whitefox/rules.mk deleted file mode 100644 index 821041ea832..00000000000 --- a/keyboards/input_club/whitefox/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LED_MATRIX_ENABLE = yes - diff --git a/keyboards/io_mini1800/info.json b/keyboards/io_mini1800/keyboard.json similarity index 98% rename from keyboards/io_mini1800/info.json rename to keyboards/io_mini1800/keyboard.json index 94400c2907c..884d17aa069 100644 --- a/keyboards/io_mini1800/info.json +++ b/keyboards/io_mini1800/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D0", "B7", "B2", "F0", "F1", "F7", "F6", "F4", "F5"], "rows": ["D6", "D7", "B4", "B5", "D4", "E6", "B3", "D2", "D5", "D3"] diff --git a/keyboards/io_mini1800/rules.mk b/keyboards/io_mini1800/rules.mk deleted file mode 100644 index 453f0a34d38..00000000000 --- a/keyboards/io_mini1800/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes diff --git a/keyboards/irene/info.json b/keyboards/irene/keyboard.json similarity index 99% rename from keyboards/irene/info.json rename to keyboards/irene/keyboard.json index 67f3457c5d1..fb8b1818c27 100644 --- a/keyboards/irene/info.json +++ b/keyboards/irene/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "F1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C6", "B6", "B5", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B0", "F0", "C7", "B4", "B7"] diff --git a/keyboards/irene/rules.mk b/keyboards/irene/rules.mk deleted file mode 100644 index 2eba275490a..00000000000 --- a/keyboards/irene/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/iriskeyboards/info.json b/keyboards/iriskeyboards/keyboard.json similarity index 99% rename from keyboards/iriskeyboards/info.json rename to keyboards/iriskeyboards/keyboard.json index 08092da8d4b..b0926531b65 100644 --- a/keyboards/iriskeyboards/info.json +++ b/keyboards/iriskeyboards/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3031", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/iriskeyboards/rules.mk b/keyboards/iriskeyboards/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/iriskeyboards/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 = 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/iron180/info.json b/keyboards/iron180/keyboard.json similarity index 99% rename from keyboards/iron180/info.json rename to keyboards/iron180/keyboard.json index b413f62d381..3952656d28f 100644 --- a/keyboards/iron180/info.json +++ b/keyboards/iron180/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1180", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "B6", "B5", "B4", "B3", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B2", "A4", "B1", "A3"], "rows": ["B9", "B8", "A15", "B0", "A7", "A5"] diff --git a/keyboards/iron180/rules.mk b/keyboards/iron180/rules.mk deleted file mode 100644 index 6f5c5c3b7e5..00000000000 --- a/keyboards/iron180/rules.mk +++ /dev/null @@ -1,14 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no - diff --git a/keyboards/j80/info.json b/keyboards/j80/keyboard.json similarity index 99% rename from keyboards/j80/info.json rename to keyboards/j80/keyboard.json index 6f41163187b..72745d262fd 100644 --- a/keyboards/j80/info.json +++ b/keyboards/j80/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "A0"], "rows": ["B1", "B2", "B3", "B5", "B6", "B7", "B0"] diff --git a/keyboards/j80/rules.mk b/keyboards/j80/rules.mk deleted file mode 100644 index 109bdfc4db8..00000000000 --- a/keyboards/j80/rules.mk +++ /dev/null @@ -1,10 +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 -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/keyboard.json similarity index 99% rename from keyboards/jacky_studio/s7_elephant/rev1/info.json rename to keyboards/jacky_studio/s7_elephant/rev1/keyboard.json index bf8455ee4b5..fc87e986ba7 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev1/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "E6" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7", "F1"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/jacky_studio/s7_elephant/rev1/rules.mk b/keyboards/jacky_studio/s7_elephant/rev1/rules.mk deleted file mode 100644 index 718a761cb41..00000000000 --- a/keyboards/jacky_studio/s7_elephant/rev1/rules.mk +++ /dev/null @@ -1,11 +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 -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 underlight functionality diff --git a/keyboards/jadookb/jkb2/info.json b/keyboards/jadookb/jkb2/keyboard.json similarity index 78% rename from keyboards/jadookb/jkb2/info.json rename to keyboards/jadookb/jkb2/keyboard.json index 764efa8767c..4b57e3a54e7 100644 --- a/keyboards/jadookb/jkb2/info.json +++ b/keyboards/jadookb/jkb2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3225", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B3", "B2"], "rows": ["B1"] diff --git a/keyboards/jadookb/jkb2/rules.mk b/keyboards/jadookb/jkb2/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/jadookb/jkb2/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 = 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/jae/j01/info.json b/keyboards/jae/j01/keyboard.json similarity index 97% rename from keyboards/jae/j01/info.json rename to keyboards/jae/j01/keyboard.json index 57d7ee7bb37..4bf7171dd5f 100644 --- a/keyboards/jae/j01/info.json +++ b/keyboards/jae/j01/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0143", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], "rows": ["B2", "B1", "B3", "B0", "D0"] diff --git a/keyboards/jae/j01/rules.mk b/keyboards/jae/j01/rules.mk deleted file mode 100644 index 8dea3757839..00000000000 --- a/keyboards/jae/j01/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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/jc65/v32a/info.json b/keyboards/jc65/v32a/keyboard.json similarity index 95% rename from keyboards/jc65/v32a/info.json rename to keyboards/jc65/v32a/keyboard.json index 8083cb0bc1d..7fd13e06266 100644 --- a/keyboards/jc65/v32a/info.json +++ b/keyboards/jc65/v32a/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x5679", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B6", "B7"] diff --git a/keyboards/jc65/v32a/rules.mk b/keyboards/jc65/v32a/rules.mk deleted file mode 100644 index 6b0cec85a44..00000000000 --- a/keyboards/jc65/v32a/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/jc65/v32u4/info.json b/keyboards/jc65/v32u4/keyboard.json similarity index 95% rename from keyboards/jc65/v32u4/info.json rename to keyboards/jc65/v32u4/keyboard.json index f173cc97835..6a8d923507c 100644 --- a/keyboards/jc65/v32u4/info.json +++ b/keyboards/jc65/v32u4/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.2" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F5"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/jc65/v32u4/rules.mk b/keyboards/jc65/v32u4/rules.mk deleted file mode 100644 index 854004ccf73..00000000000 --- a/keyboards/jc65/v32u4/rules.mk +++ /dev/null @@ -1,12 +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 -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 = yes -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/jd40/info.json b/keyboards/jd40/keyboard.json similarity index 94% rename from keyboards/jd40/info.json rename to keyboards/jd40/keyboard.json index ff352a2216a..6ce0ca5da3a 100644 --- a/keyboards/jd40/info.json +++ b/keyboards/jd40/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2"], "rows": ["F0", "F1", "F5", "B4"] diff --git a/keyboards/jd40/rules.mk b/keyboards/jd40/rules.mk deleted file mode 100644 index 08d4d2d8869..00000000000 --- a/keyboards/jd40/rules.mk +++ /dev/null @@ -1,11 +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 = yes # Enable N-Key Rollover -# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable RGB Underglow diff --git a/keyboards/jd45/info.json b/keyboards/jd45/keyboard.json similarity index 93% rename from keyboards/jd45/info.json rename to keyboards/jd45/keyboard.json index 367c9291db4..c9d5bfb123e 100644 --- a/keyboards/jd45/info.json +++ b/keyboards/jd45/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "midi": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2", "B0"], "rows": ["F0", "F1", "F5", "B4"] diff --git a/keyboards/jd45/rules.mk b/keyboards/jd45/rules.mk deleted file mode 100644 index 4870b8d6a17..00000000000 --- a/keyboards/jd45/rules.mk +++ /dev/null @@ -1,11 +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 = yes # Enable keyboard backlight functionality -MIDI_ENABLE = yes # MIDI support diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/keyboard.json similarity index 98% rename from keyboards/jels/jels88/info.json rename to keyboards/jels/jels88/keyboard.json index 598075fd424..bcddf648a02 100644 --- a/keyboards/jels/jels88/info.json +++ b/keyboards/jels/jels88/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0088", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "C6", "F7", "F6", "F5", "F4", "B1", "D2", "D3"], "rows": ["B3", "B2", "D1", "D0", "E6", "B0", "F0", "F1", "B5", "B4", "D7", "D6"] diff --git a/keyboards/jels/jels88/rules.mk b/keyboards/jels/jels88/rules.mk deleted file mode 100644 index 0098dc473ac..00000000000 --- a/keyboards/jels/jels88/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 -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/jkdlab/binary_monkey/info.json b/keyboards/jkdlab/binary_monkey/keyboard.json similarity index 80% rename from keyboards/jkdlab/binary_monkey/info.json rename to keyboards/jkdlab/binary_monkey/keyboard.json index 50b92ff899b..c1aad15cb43 100644 --- a/keyboards/jkdlab/binary_monkey/info.json +++ b/keyboards/jkdlab/binary_monkey/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D2", "D3"], "rows": ["D0"] diff --git a/keyboards/jkdlab/binary_monkey/rules.mk b/keyboards/jkdlab/binary_monkey/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/jkdlab/binary_monkey/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/jkeys_design/gentleman65/info.json b/keyboards/jkeys_design/gentleman65/keyboard.json similarity index 98% rename from keyboards/jkeys_design/gentleman65/info.json rename to keyboards/jkeys_design/gentleman65/keyboard.json index 734916fb404..150cf4d351a 100644 --- a/keyboards/jkeys_design/gentleman65/info.json +++ b/keyboards/jkeys_design/gentleman65/keyboard.json @@ -26,6 +26,16 @@ "ws2812": { "pin": "F4" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "B2", "B1", "B3", "B0", "B7", "D0"], "rows": ["D3", "D2", "D1", "F7", "F1"] diff --git a/keyboards/jkeys_design/gentleman65/rules.mk b/keyboards/jkeys_design/gentleman65/rules.mk deleted file mode 100644 index bb89340fbf1..00000000000 --- a/keyboards/jkeys_design/gentleman65/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = no -ENCODER_ENABLE = yes diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/keyboard.json similarity index 98% rename from keyboards/jkeys_design/gentleman65_se_s/info.json rename to keyboards/jkeys_design/gentleman65_se_s/keyboard.json index b19e5ef9a38..cd4570a765e 100644 --- a/keyboards/jkeys_design/gentleman65_se_s/info.json +++ b/keyboards/jkeys_design/gentleman65_se_s/keyboard.json @@ -26,6 +26,16 @@ "ws2812": { "pin": "F7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "D4", "D6", "D7", "C7", "C6", "B6", "B5", "B4"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/jkeys_design/gentleman65_se_s/rules.mk b/keyboards/jkeys_design/gentleman65_se_s/rules.mk deleted file mode 100644 index f81996d7021..00000000000 --- a/keyboards/jkeys_design/gentleman65_se_s/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = no -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/jolofsor/denial75/info.json b/keyboards/jolofsor/denial75/keyboard.json similarity index 96% rename from keyboards/jolofsor/denial75/info.json rename to keyboards/jolofsor/denial75/keyboard.json index 18becc3ffb0..e77c9e4a1fb 100644 --- a/keyboards/jolofsor/denial75/info.json +++ b/keyboards/jolofsor/denial75/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B5", "B4", "D7", "D6", "D4", "E6", "B1", "B2", "B3", "B7", "D0", "D1", "D3"], "rows": ["B0", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/jolofsor/denial75/rules.mk b/keyboards/jolofsor/denial75/rules.mk deleted file mode 100644 index 18684e62d3e..00000000000 --- a/keyboards/jolofsor/denial75/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 = 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/joshajohnson/hub20/info.json b/keyboards/joshajohnson/hub20/keyboard.json similarity index 95% rename from keyboards/joshajohnson/hub20/info.json rename to keyboards/joshajohnson/hub20/keyboard.json index b1b25dc1d48..4bedd20c4a2 100644 --- a/keyboards/joshajohnson/hub20/info.json +++ b/keyboards/joshajohnson/hub20/keyboard.json @@ -30,6 +30,16 @@ }, "driver": "ws2812" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A6", "A7", "B7", "B6"], "rows": ["A13", "B14", "A10", "A0", "A2", "A1"] diff --git a/keyboards/joshajohnson/hub20/rules.mk b/keyboards/joshajohnson/hub20/rules.mk deleted file mode 100644 index f559246b9e3..00000000000 --- a/keyboards/joshajohnson/hub20/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes -ENCODER_ENABLE = yes - diff --git a/keyboards/k34/info.json b/keyboards/k34/keyboard.json similarity index 93% rename from keyboards/k34/info.json rename to keyboards/k34/keyboard.json index 715cb9060bd..b9a69fb667f 100644 --- a/keyboards/k34/info.json +++ b/keyboards/k34/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "F5", "F6", "F7", "B1", "B3"], "rows": ["F4", "B2", "E6", "B4"] diff --git a/keyboards/k34/rules.mk b/keyboards/k34/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/k34/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kabedon/kabedon78s/info.json b/keyboards/kabedon/kabedon78s/keyboard.json similarity index 96% rename from keyboards/kabedon/kabedon78s/info.json rename to keyboards/kabedon/kabedon78s/keyboard.json index 4e8ca04aa5c..b875f9b35ad 100644 --- a/keyboards/kabedon/kabedon78s/info.json +++ b/keyboards/kabedon/kabedon78s/keyboard.json @@ -28,6 +28,16 @@ "ws2812": { "pin": "B7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true, + "unicode": true + }, "matrix_pins": { "cols": ["F5", "F4", "F6", "C6", "B6", "B4", "D3", "D1", "D4", "F1", "B3", "D5", "F0", "C7", "D7", "B5", "B2", "E6"], "rows": ["D0", "D2", "F7", "B1", "B0", "D6"] diff --git a/keyboards/kabedon/kabedon78s/rules.mk b/keyboards/kabedon/kabedon78s/rules.mk deleted file mode 100644 index 360d1d3206b..00000000000 --- a/keyboards/kabedon/kabedon78s/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode diff --git a/keyboards/kabedon/kabedon980/info.json b/keyboards/kabedon/kabedon980/keyboard.json similarity index 96% rename from keyboards/kabedon/kabedon980/info.json rename to keyboards/kabedon/kabedon980/keyboard.json index f443f58a3d5..cf9def2b8fe 100644 --- a/keyboards/kabedon/kabedon980/info.json +++ b/keyboards/kabedon/kabedon980/keyboard.json @@ -28,6 +28,16 @@ "ws2812": { "pin": "B7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true, + "unicode": true + }, "matrix_pins": { "cols": ["F5", "F4", "F6", "C6", "B6", "B4", "D3", "D1", "D4", "F1", "B3", "D5", "F0"], "rows": ["D0", "D2", "F7", "B1", "B0", "D6", "C7", "D7", "B5", "B2"] diff --git a/keyboards/kabedon/kabedon980/rules.mk b/keyboards/kabedon/kabedon980/rules.mk deleted file mode 100644 index 360d1d3206b..00000000000 --- a/keyboards/kabedon/kabedon980/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/keyboard.json similarity index 96% rename from keyboards/kabedon/kabedon98e/info.json rename to keyboards/kabedon/kabedon98e/keyboard.json index 6f99aa6c308..a08bfeb0aa4 100644 --- a/keyboards/kabedon/kabedon98e/info.json +++ b/keyboards/kabedon/kabedon98e/keyboard.json @@ -28,6 +28,16 @@ "pin": "B4", "driver": "pwm" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "B7", "B8", "B6", "A3", "A2", "A1", "B9", "A7", "A5", "A6"], "rows": ["A4", "B10", "B2", "B1", "B0", "B15", "B13", "B14", "B12", "A10", "A9", "A8"] diff --git a/keyboards/kabedon/kabedon98e/rules.mk b/keyboards/kabedon/kabedon98e/rules.mk deleted file mode 100644 index 7e8534dae5a..00000000000 --- a/keyboards/kabedon/kabedon98e/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/kagizaraya/halberd/info.json b/keyboards/kagizaraya/halberd/keyboard.json similarity index 93% rename from keyboards/kagizaraya/halberd/info.json rename to keyboards/kagizaraya/halberd/keyboard.json index b8e09252414..ecaa267cbd3 100644 --- a/keyboards/kagizaraya/halberd/info.json +++ b/keyboards/kagizaraya/halberd/keyboard.json @@ -31,6 +31,15 @@ "ws2812": { "pin": "F0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D7", "B4", "C7", "C6", "B6", "B5", "F7", "F6", "F5", "F4", "F1"], "rows": ["D6", "D4", "D5", "E6"] diff --git a/keyboards/kagizaraya/halberd/rules.mk b/keyboards/kagizaraya/halberd/rules.mk deleted file mode 100644 index 266798f905c..00000000000 --- a/keyboards/kagizaraya/halberd/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kapcave/arya/info.json b/keyboards/kapcave/arya/keyboard.json similarity index 97% rename from keyboards/kapcave/arya/info.json rename to keyboards/kapcave/arya/keyboard.json index ebcb7001500..9c08d91247e 100644 --- a/keyboards/kapcave/arya/info.json +++ b/keyboards/kapcave/arya/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4152", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B5", "B4", "B2", "C13", "F1", "F0", "A14"], "rows": ["B8", "A13", "B1", "A15", "B9", "B10", "B11", "A0", "A8"] diff --git a/keyboards/kapcave/arya/rules.mk b/keyboards/kapcave/arya/rules.mk deleted file mode 100644 index 73bb6b769ba..00000000000 --- a/keyboards/kapcave/arya/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 = 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 -ENCODER_ENABLE = yes - diff --git a/keyboards/kapcave/gskt00/info.json b/keyboards/kapcave/gskt00/keyboard.json similarity index 98% rename from keyboards/kapcave/gskt00/info.json rename to keyboards/kapcave/gskt00/keyboard.json index f6d1c99e2be..10fd2307e3b 100644 --- a/keyboards/kapcave/gskt00/info.json +++ b/keyboards/kapcave/gskt00/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6061", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F6", "D7", "F5", "C7", "B4", "C6", "B6", "B5"], "rows": ["F1", "D1", "D2", "D4", "D6", "F7", "B0", "F4"] diff --git a/keyboards/kapcave/gskt00/rules.mk b/keyboards/kapcave/gskt00/rules.mk deleted file mode 100755 index ebecd0f9dbe..00000000000 --- a/keyboards/kapcave/gskt00/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 = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no diff --git a/keyboards/kapcave/paladin64/info.json b/keyboards/kapcave/paladin64/keyboard.json similarity index 98% rename from keyboards/kapcave/paladin64/info.json rename to keyboards/kapcave/paladin64/keyboard.json index d32be70b60f..d03a98be529 100644 --- a/keyboards/kapcave/paladin64/info.json +++ b/keyboards/kapcave/paladin64/keyboard.json @@ -11,6 +11,15 @@ "ws2812": { "pin": "D0" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "D1"], "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "B0", "D3"] diff --git a/keyboards/kapcave/paladin64/rules.mk b/keyboards/kapcave/paladin64/rules.mk deleted file mode 100644 index b483118606d..00000000000 --- a/keyboards/kapcave/paladin64/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 = 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/karlb/kbic65/info.json b/keyboards/karlb/kbic65/keyboard.json similarity index 99% rename from keyboards/karlb/kbic65/info.json rename to keyboards/karlb/kbic65/keyboard.json index 87cd3184b96..c0342851894 100644 --- a/keyboards/karlb/kbic65/info.json +++ b/keyboards/karlb/kbic65/keyboard.json @@ -4,6 +4,14 @@ "url": "https://karlb.eu/kbic65/", "maintainer": "b-karl", "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B2", "B6", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["B5", "D1", "B4", "D0", "E6", "D4", "D7", "C6", "D2"] diff --git a/keyboards/karlb/kbic65/rules.mk b/keyboards/karlb/kbic65/rules.mk deleted file mode 100644 index c5b4c0254f3..00000000000 --- a/keyboards/karlb/kbic65/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -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 diff --git a/keyboards/kb_elmo/67mk_e/info.json b/keyboards/kb_elmo/67mk_e/keyboard.json similarity index 99% rename from keyboards/kb_elmo/67mk_e/info.json rename to keyboards/kb_elmo/67mk_e/keyboard.json index 655ba8a866f..4e842f28e6a 100644 --- a/keyboards/kb_elmo/67mk_e/info.json +++ b/keyboards/kb_elmo/67mk_e/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xD03E", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "D4", "D2", "D3", "C7", "C6", "B5", "B6", "F7", "F6", "F5", "F0", "F1", "F4"], "rows": ["D7", "B4", "D6", "D5", "B0"] diff --git a/keyboards/kb_elmo/67mk_e/rules.mk b/keyboards/kb_elmo/67mk_e/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/kb_elmo/67mk_e/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kb_elmo/noah_avr/info.json b/keyboards/kb_elmo/noah_avr/keyboard.json similarity index 99% rename from keyboards/kb_elmo/noah_avr/info.json rename to keyboards/kb_elmo/noah_avr/keyboard.json index edc75f2b1f1..48cbb6e5e2f 100644 --- a/keyboards/kb_elmo/noah_avr/info.json +++ b/keyboards/kb_elmo/noah_avr/keyboard.json @@ -27,6 +27,15 @@ "ws2812": { "pin": "B5" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "D4", "C6", "C7", "F7", "F6", "F5", "F4", "F0", "F1", "B3", "B2", "B1", "B0"], "rows": ["B4", "B6", "D7", "D5", "D0"] diff --git a/keyboards/kb_elmo/noah_avr/rules.mk b/keyboards/kb_elmo/noah_avr/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/kb_elmo/noah_avr/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kb_elmo/qez/info.json b/keyboards/kb_elmo/qez/keyboard.json similarity index 97% rename from keyboards/kb_elmo/qez/info.json rename to keyboards/kb_elmo/qez/keyboard.json index a93c918479f..ab1f8230439 100644 --- a/keyboards/kb_elmo/qez/info.json +++ b/keyboards/kb_elmo/qez/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x675F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "B7", "B6", "B5", "B4", "B3", "D6", "D5", "D4", "D3"], "rows": ["C6", "C4", "B1", "B0"] diff --git a/keyboards/kb_elmo/qez/rules.mk b/keyboards/kb_elmo/qez/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/kb_elmo/qez/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kb_elmo/vertex/info.json b/keyboards/kb_elmo/vertex/keyboard.json similarity index 98% rename from keyboards/kb_elmo/vertex/info.json rename to keyboards/kb_elmo/vertex/keyboard.json index 4fefa6bb34b..5585386296b 100644 --- a/keyboards/kb_elmo/vertex/info.json +++ b/keyboards/kb_elmo/vertex/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6B47", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C4", "C7", "D3", "D5", "B6", "D6", "B5", "B0", "B4", "B1", "B3", "B2"], "rows": ["D2", "D4", "B7", "C6"] diff --git a/keyboards/kb_elmo/vertex/rules.mk b/keyboards/kb_elmo/vertex/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/kb_elmo/vertex/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 = 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/kbdclack/kaishi65/info.json b/keyboards/kbdclack/kaishi65/keyboard.json similarity index 96% rename from keyboards/kbdclack/kaishi65/info.json rename to keyboards/kbdclack/kaishi65/keyboard.json index fbae47d0f5b..573f2b8a3af 100644 --- a/keyboards/kbdclack/kaishi65/info.json +++ b/keyboards/kbdclack/kaishi65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1A81", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3"], "rows": ["D0", "D1", "B0", "F0", "F1"] diff --git a/keyboards/kbdclack/kaishi65/rules.mk b/keyboards/kbdclack/kaishi65/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/kbdclack/kaishi65/rules.mk +++ /dev/null @@ -1,12 +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 -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/kbdfans/baguette66/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/keyboard.json similarity index 96% rename from keyboards/kbdfans/baguette66/rgb/info.json rename to keyboards/kbdfans/baguette66/rgb/keyboard.json index 70f0098d40b..e72d56e6f96 100644 --- a/keyboards/kbdfans/baguette66/rgb/info.json +++ b/keyboards/kbdfans/baguette66/rgb/keyboard.json @@ -64,6 +64,15 @@ "val_steps": 8, "speed_steps": 10 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6"], "rows": ["F0", "F1", "F4", "F5", "B6"] diff --git a/keyboards/kbdfans/baguette66/rgb/rules.mk b/keyboards/kbdfans/baguette66/rgb/rules.mk deleted file mode 100644 index c9c55ceed1d..00000000000 --- a/keyboards/kbdfans/baguette66/rgb/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes # Use RGB matrix diff --git a/keyboards/kbdfans/baguette66/soldered/info.json b/keyboards/kbdfans/baguette66/soldered/keyboard.json similarity index 96% rename from keyboards/kbdfans/baguette66/soldered/info.json rename to keyboards/kbdfans/baguette66/soldered/keyboard.json index adbfbf53c89..da473daf915 100644 --- a/keyboards/kbdfans/baguette66/soldered/info.json +++ b/keyboards/kbdfans/baguette66/soldered/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x0107", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6"], "rows": ["F0", "F1", "F4", "F5", "B6"] diff --git a/keyboards/kbdfans/baguette66/soldered/rules.mk b/keyboards/kbdfans/baguette66/soldered/rules.mk deleted file mode 100644 index 718a1e8d099..00000000000 --- a/keyboards/kbdfans/baguette66/soldered/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/kbdfans/bella/soldered/info.json b/keyboards/kbdfans/bella/soldered/keyboard.json similarity index 99% rename from keyboards/kbdfans/bella/soldered/info.json rename to keyboards/kbdfans/bella/soldered/keyboard.json index a1246600f03..10e45f1cf70 100644 --- a/keyboards/kbdfans/bella/soldered/info.json +++ b/keyboards/kbdfans/bella/soldered/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B1", "B2", "B3", "D1", "B6"] diff --git a/keyboards/kbdfans/bella/soldered/rules.mk b/keyboards/kbdfans/bella/soldered/rules.mk deleted file mode 100755 index b325f3f0c79..00000000000 --- a/keyboards/kbdfans/bella/soldered/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 = 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/kbdfans/boop65/rgb/info.json b/keyboards/kbdfans/boop65/rgb/keyboard.json similarity index 96% rename from keyboards/kbdfans/boop65/rgb/info.json rename to keyboards/kbdfans/boop65/rgb/keyboard.json index fc7196bec02..49fa78b3159 100644 --- a/keyboards/kbdfans/boop65/rgb/info.json +++ b/keyboards/kbdfans/boop65/rgb/keyboard.json @@ -62,6 +62,15 @@ "max_brightness": 200, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F0", "F1", "F4", "E6", "C6"] diff --git a/keyboards/kbdfans/boop65/rgb/rules.mk b/keyboards/kbdfans/boop65/rgb/rules.mk deleted file mode 100644 index 65ec78fd377..00000000000 --- a/keyboards/kbdfans/boop65/rgb/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes # Use RGB matrix diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/keyboard.json similarity index 97% rename from keyboards/kbdfans/bounce/75/hotswap/info.json rename to keyboards/kbdfans/bounce/75/hotswap/keyboard.json index f467e2a909e..478b4bc372e 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/info.json +++ b/keyboards/kbdfans/bounce/75/hotswap/keyboard.json @@ -7,6 +7,15 @@ "pid": "0x7001", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["E6", "B0", "B1", "B2", "B3", "B6"] diff --git a/keyboards/kbdfans/bounce/75/hotswap/rules.mk b/keyboards/kbdfans/bounce/75/hotswap/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/kbdfans/bounce/75/hotswap/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 = 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/kbdfans/bounce/75/soldered/info.json b/keyboards/kbdfans/bounce/75/soldered/keyboard.json similarity index 99% rename from keyboards/kbdfans/bounce/75/soldered/info.json rename to keyboards/kbdfans/bounce/75/soldered/keyboard.json index 5fc246655d7..e1610872e1b 100644 --- a/keyboards/kbdfans/bounce/75/soldered/info.json +++ b/keyboards/kbdfans/bounce/75/soldered/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x7000", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["E6", "B0", "B1", "B2", "B3", "B6"] diff --git a/keyboards/kbdfans/bounce/75/soldered/rules.mk b/keyboards/kbdfans/bounce/75/soldered/rules.mk deleted file mode 100644 index bb40a3ee66c..00000000000 --- a/keyboards/kbdfans/bounce/75/soldered/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 = 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 \ No newline at end of file diff --git a/keyboards/kbdfans/bounce/pad/info.json b/keyboards/kbdfans/bounce/pad/keyboard.json similarity index 91% rename from keyboards/kbdfans/bounce/pad/info.json rename to keyboards/kbdfans/bounce/pad/keyboard.json index 34ae9489ac9..0e4f2e9d85d 100644 --- a/keyboards/kbdfans/bounce/pad/info.json +++ b/keyboards/kbdfans/bounce/pad/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x7002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "B4", "D0", "C2"], "rows": ["C7", "B7", "B6", "B0", "B1", "B2"] diff --git a/keyboards/kbdfans/bounce/pad/rules.mk b/keyboards/kbdfans/bounce/pad/rules.mk deleted file mode 100644 index 0942de29321..00000000000 --- a/keyboards/kbdfans/bounce/pad/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 = 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kbdfans/epoch80/info.json b/keyboards/kbdfans/epoch80/keyboard.json similarity index 99% rename from keyboards/kbdfans/epoch80/info.json rename to keyboards/kbdfans/epoch80/keyboard.json index 7a67933c2f2..08ed973b927 100644 --- a/keyboards/kbdfans/epoch80/info.json +++ b/keyboards/kbdfans/epoch80/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"], "rows": ["D1", "D0", "B3", "B0", "B2", "B1"] diff --git a/keyboards/kbdfans/epoch80/rules.mk b/keyboards/kbdfans/epoch80/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/kbdfans/epoch80/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/keyboard.json similarity index 99% rename from keyboards/kbdfans/kbd19x/info.json rename to keyboards/kbdfans/kbd19x/keyboard.json index f2b28e4a086..a8a71de3b65 100644 --- a/keyboards/kbdfans/kbd19x/info.json +++ b/keyboards/kbdfans/kbd19x/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0191", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C6", "F1", "F4", "F5", "F6", "F7", "D7", "B4", "B5", "D0", "D1", "D2", "D3"], "rows": ["B7", "B3", "E6", "F0", "D5", "D4", "D6", "C7"] diff --git a/keyboards/kbdfans/kbd19x/rules.mk b/keyboards/kbdfans/kbd19x/rules.mk deleted file mode 100644 index a4b56c37ddd..00000000000 --- a/keyboards/kbdfans/kbd19x/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kbdfans/kbd66/info.json b/keyboards/kbdfans/kbd66/keyboard.json similarity index 99% rename from keyboards/kbdfans/kbd66/info.json rename to keyboards/kbdfans/kbd66/keyboard.json index 3b72b8de676..d95a80baa42 100644 --- a/keyboards/kbdfans/kbd66/info.json +++ b/keyboards/kbdfans/kbd66/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xBD66", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "C7", "E2", "F5", "F6", "F4", "D3", "D2", "D5", "D0", "D1", "B4", "D7", "D6", "E6", "B3"], "rows": ["B0", "B1", "F0", "F1", "D4"] diff --git a/keyboards/kbdfans/kbd66/rules.mk b/keyboards/kbdfans/kbd66/rules.mk deleted file mode 100644 index df4dea661be..00000000000 --- a/keyboards/kbdfans/kbd66/rules.mk +++ /dev/null @@ -1,11 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kbdfans/kbd67/hotswap/info.json b/keyboards/kbdfans/kbd67/hotswap/keyboard.json similarity index 97% rename from keyboards/kbdfans/kbd67/hotswap/info.json rename to keyboards/kbdfans/kbd67/hotswap/keyboard.json index 32ac10767d0..574633396cd 100644 --- a/keyboards/kbdfans/kbd67/hotswap/info.json +++ b/keyboards/kbdfans/kbd67/hotswap/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6065", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7", "C6"], "rows": ["B3", "B2", "B1", "B0", "D4"] diff --git a/keyboards/kbdfans/kbd67/hotswap/rules.mk b/keyboards/kbdfans/kbd67/hotswap/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/kbdfans/kbd67/hotswap/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 = 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/kbdfans/kbd67/mkii_soldered/info.json b/keyboards/kbdfans/kbd67/mkii_soldered/keyboard.json similarity index 99% rename from keyboards/kbdfans/kbd67/mkii_soldered/info.json rename to keyboards/kbdfans/kbd67/mkii_soldered/keyboard.json index 44d54983718..7a9d4f8444b 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/info.json +++ b/keyboards/kbdfans/kbd67/mkii_soldered/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0013", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], "rows": ["B3", "D0", "D1", "D2", "D3"] diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk b/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk deleted file mode 100644 index 5e28d2cc453..00000000000 --- a/keyboards/kbdfans/kbd67/mkii_soldered/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 = no # Console for debug -COMMAND_ENABLE = yes # 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/kbdfans/kbd67/mkiirgb/v1/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v1/keyboard.json similarity index 96% rename from keyboards/kbdfans/kbd67/mkiirgb/v1/info.json rename to keyboards/kbdfans/kbd67/mkiirgb/v1/keyboard.json index adac32cc74f..a90fd8b26b9 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/keyboard.json @@ -42,6 +42,15 @@ "max_brightness": 200, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"], "rows": ["B1", "B10", "B11", "B14", "B12"] diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk deleted file mode 100644 index 8e872c17ff5..00000000000 --- a/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/keyboard.json similarity index 96% rename from keyboards/kbdfans/kbd67/mkiirgb/v4/info.json rename to keyboards/kbdfans/kbd67/mkiirgb/v4/keyboard.json index 0f05bd24d05..79853d2d0f4 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/keyboard.json @@ -58,6 +58,15 @@ "speed_steps": 10, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B1", "F1", "B2", "B3", "C6"] diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk deleted file mode 100644 index c552dae7c77..00000000000 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/keyboard.json similarity index 99% rename from keyboards/kbdfans/kbd67/rev2/info.json rename to keyboards/kbdfans/kbd67/rev2/keyboard.json index 7bd48689be7..1e9d87ba0de 100644 --- a/keyboards/kbdfans/kbd67/rev2/info.json +++ b/keyboards/kbdfans/kbd67/rev2/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6067", "device_version": "0.0.2" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D1", "D2", "D3", "D6", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5"], "rows": ["B7", "D0", "F0", "F1", "F4"] diff --git a/keyboards/kbdfans/kbd67/rev2/rules.mk b/keyboards/kbdfans/kbd67/rev2/rules.mk deleted file mode 100644 index 8ff144aa352..00000000000 --- a/keyboards/kbdfans/kbd67/rev2/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/keyboard.json similarity index 95% rename from keyboards/kbdfans/kbd6x/info.json rename to keyboards/kbdfans/kbd6x/keyboard.json index 654c01c0eca..85cfdf8388e 100644 --- a/keyboards/kbdfans/kbd6x/info.json +++ b/keyboards/kbdfans/kbd6x/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x3658", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"], "rows": ["B3", "B2", "B1", "B0", "D4"] diff --git a/keyboards/kbdfans/kbd6x/rules.mk b/keyboards/kbdfans/kbd6x/rules.mk deleted file mode 100644 index 999f36c7db2..00000000000 --- a/keyboards/kbdfans/kbd6x/rules.mk +++ /dev/null @@ -1,12 +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 = yes # 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 = yes -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/keyboard.json similarity index 96% rename from keyboards/kbdfans/kbd75hs/info.json rename to keyboards/kbdfans/kbd75hs/keyboard.json index 097bb6003ad..3545f2357db 100644 --- a/keyboards/kbdfans/kbd75hs/info.json +++ b/keyboards/kbdfans/kbd75hs/keyboard.json @@ -8,6 +8,15 @@ "device_version": "0.0.3", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["E6", "B0", "B1", "B2", "B3", "B6"] diff --git a/keyboards/kbdfans/kbd75hs/rules.mk b/keyboards/kbdfans/kbd75hs/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/kbdfans/kbd75hs/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 = 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/kbdfans/kbd8x/info.json b/keyboards/kbdfans/kbd8x/keyboard.json similarity index 98% rename from keyboards/kbdfans/kbd8x/info.json rename to keyboards/kbdfans/kbd8x/keyboard.json index 4dc48901ddd..f98f12d8b1e 100644 --- a/keyboards/kbdfans/kbd8x/info.json +++ b/keyboards/kbdfans/kbd8x/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "D0", "F7", "F6", "F5", "D5", "D3", "D2", "C7", "C6", "B5", "F4", "F1", "B4", "B0"], "rows": ["E6", "B7", "D4", "F0", "D6", "D7"] diff --git a/keyboards/kbdfans/kbd8x/rules.mk b/keyboards/kbdfans/kbd8x/rules.mk deleted file mode 100644 index 80535f911d2..00000000000 --- a/keyboards/kbdfans/kbd8x/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 = 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kbdfans/kbd8x_mk2/info.json b/keyboards/kbdfans/kbd8x_mk2/keyboard.json similarity index 98% rename from keyboards/kbdfans/kbd8x_mk2/info.json rename to keyboards/kbdfans/kbd8x_mk2/keyboard.json index e6e2e5c168f..1bded44b6c7 100644 --- a/keyboards/kbdfans/kbd8x_mk2/info.json +++ b/keyboards/kbdfans/kbd8x_mk2/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"], "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"] diff --git a/keyboards/kbdfans/kbd8x_mk2/rules.mk b/keyboards/kbdfans/kbd8x_mk2/rules.mk deleted file mode 100644 index 45377383806..00000000000 --- a/keyboards/kbdfans/kbd8x_mk2/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 = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kbdfans/kbdmini/info.json b/keyboards/kbdfans/kbdmini/keyboard.json similarity index 95% rename from keyboards/kbdfans/kbdmini/info.json rename to keyboards/kbdfans/kbdmini/keyboard.json index 3b16188b32c..8f2dade705d 100644 --- a/keyboards/kbdfans/kbdmini/info.json +++ b/keyboards/kbdfans/kbdmini/keyboard.json @@ -40,6 +40,15 @@ "driver": "is31fl3733", "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "B0", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B7", "E6", "F5", "F4"] diff --git a/keyboards/kbdfans/kbdmini/rules.mk b/keyboards/kbdfans/kbdmini/rules.mk deleted file mode 100644 index 4a443969ff6..00000000000 --- a/keyboards/kbdfans/kbdmini/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 -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 = yes diff --git a/keyboards/kbdfans/kbdpad/mk1/info.json b/keyboards/kbdfans/kbdpad/mk1/keyboard.json similarity index 95% rename from keyboards/kbdfans/kbdpad/mk1/info.json rename to keyboards/kbdfans/kbdpad/mk1/keyboard.json index fbb5649a8f7..10de0d04366 100644 --- a/keyboards/kbdfans/kbdpad/mk1/info.json +++ b/keyboards/kbdfans/kbdpad/mk1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5"] diff --git a/keyboards/kbdfans/kbdpad/mk1/rules.mk b/keyboards/kbdfans/kbdpad/mk1/rules.mk deleted file mode 100644 index ae7a0b4e167..00000000000 --- a/keyboards/kbdfans/kbdpad/mk1/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = no -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = no # PCB has underglow LEDs, but case doesn't let them show. diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/keyboard.json similarity index 94% rename from keyboards/kbdfans/kbdpad/mk2/info.json rename to keyboards/kbdfans/kbdpad/mk2/keyboard.json index 8c773f43e1c..7c174a62a25 100644 --- a/keyboards/kbdfans/kbdpad/mk2/info.json +++ b/keyboards/kbdfans/kbdpad/mk2/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C4", "C5", "B3", "B2"], "rows": ["D3", "D1", "D2", "C6", "C7", "B6"] diff --git a/keyboards/kbdfans/kbdpad/mk2/rules.mk b/keyboards/kbdfans/kbdpad/mk2/rules.mk deleted file mode 100644 index 45377383806..00000000000 --- a/keyboards/kbdfans/kbdpad/mk2/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 = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kbdfans/odin/rgb/info.json b/keyboards/kbdfans/odin/rgb/keyboard.json similarity index 97% rename from keyboards/kbdfans/odin/rgb/info.json rename to keyboards/kbdfans/odin/rgb/keyboard.json index 064f755f427..1777e2cdc0b 100644 --- a/keyboards/kbdfans/odin/rgb/info.json +++ b/keyboards/kbdfans/odin/rgb/keyboard.json @@ -63,6 +63,15 @@ "max_brightness": 150, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B12", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "C14", "C15", "A0"], "rows": ["A10", "A9", "A8", "B14", "B13", "A2"] diff --git a/keyboards/kbdfans/odin/rgb/rules.mk b/keyboards/kbdfans/odin/rgb/rules.mk deleted file mode 100644 index c49a369dd02..00000000000 --- a/keyboards/kbdfans/odin/rgb/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes - diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/keyboard.json similarity index 99% rename from keyboards/kbdfans/odin/soldered/info.json rename to keyboards/kbdfans/odin/soldered/keyboard.json index 9eaa340a4b3..42a8a0e0567 100644 --- a/keyboards/kbdfans/odin/soldered/info.json +++ b/keyboards/kbdfans/odin/soldered/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0101", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B12", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "C14", "C15", "A0"], "rows": ["A10", "A9", "A8", "B14", "B13", "A2"] diff --git a/keyboards/kbdfans/odin/soldered/rules.mk b/keyboards/kbdfans/odin/soldered/rules.mk deleted file mode 100644 index c3b8e77d77a..00000000000 --- a/keyboards/kbdfans/odin/soldered/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 -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/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/keyboard.json similarity index 97% rename from keyboards/kbdfans/odin/v2/info.json rename to keyboards/kbdfans/odin/v2/keyboard.json index 94255371250..595a5596fe2 100644 --- a/keyboards/kbdfans/odin/v2/info.json +++ b/keyboards/kbdfans/odin/v2/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0101", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B12", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "C14", "C15", "A0"], "rows": ["A10", "A9", "A8", "B14", "B13", "A2"] diff --git a/keyboards/kbdfans/odin/v2/rules.mk b/keyboards/kbdfans/odin/v2/rules.mk deleted file mode 100644 index 0098dc473ac..00000000000 --- a/keyboards/kbdfans/odin/v2/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 -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/kbdfans/phaseone/info.json b/keyboards/kbdfans/phaseone/keyboard.json similarity index 99% rename from keyboards/kbdfans/phaseone/info.json rename to keyboards/kbdfans/phaseone/keyboard.json index aea255aaf44..517dafc96b3 100644 --- a/keyboards/kbdfans/phaseone/info.json +++ b/keyboards/kbdfans/phaseone/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0103", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "E6", "B7", "D0", "D1", "D2", "D3", "D5"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/kbdfans/phaseone/rules.mk b/keyboards/kbdfans/phaseone/rules.mk deleted file mode 100644 index 3c777809b4a..00000000000 --- a/keyboards/kbdfans/phaseone/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/kbnordic/nordic60/rev_a/info.json b/keyboards/kbnordic/nordic60/rev_a/keyboard.json similarity index 99% rename from keyboards/kbnordic/nordic60/rev_a/info.json rename to keyboards/kbnordic/nordic60/rev_a/keyboard.json index 1d6b6eae861..0b1da369b36 100644 --- a/keyboards/kbnordic/nordic60/rev_a/info.json +++ b/keyboards/kbnordic/nordic60/rev_a/keyboard.json @@ -28,6 +28,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"], "rows": ["C2", "D0", "B0", "D6", "D5"] diff --git a/keyboards/kbnordic/nordic60/rev_a/rules.mk b/keyboards/kbnordic/nordic60/rev_a/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/kbnordic/nordic60/rev_a/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kc60/info.json b/keyboards/kc60/keyboard.json similarity index 99% rename from keyboards/kc60/info.json rename to keyboards/kc60/keyboard.json index 5dbead0c5f4..e2c408e0c4c 100644 --- a/keyboards/kc60/info.json +++ b/keyboards/kc60/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6FFC", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "F6", "F7", "D5"] diff --git a/keyboards/kc60/rules.mk b/keyboards/kc60/rules.mk deleted file mode 100644 index 2b2f2b1159a..00000000000 --- a/keyboards/kc60/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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kc60se/info.json b/keyboards/kc60se/keyboard.json similarity index 98% rename from keyboards/kc60se/info.json rename to keyboards/kc60se/keyboard.json index ff9fa351651..b7123b5749d 100644 --- a/keyboards/kc60se/info.json +++ b/keyboards/kc60se/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/kc60se/rules.mk b/keyboards/kc60se/rules.mk deleted file mode 100644 index aa085b605e5..00000000000 --- a/keyboards/kc60se/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # default keymap does not map mouse -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 # Audio output diff --git a/keyboards/keebio/bigswitchseat/info.json b/keyboards/keebio/bigswitchseat/keyboard.json similarity index 76% rename from keyboards/keebio/bigswitchseat/info.json rename to keyboards/keebio/bigswitchseat/keyboard.json index f2fe9771ed4..b1acf6c1b39 100644 --- a/keyboards/keebio/bigswitchseat/info.json +++ b/keyboards/keebio/bigswitchseat/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1011", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0"], "rows": ["E6"] diff --git a/keyboards/keebio/bigswitchseat/rules.mk b/keyboards/keebio/bigswitchseat/rules.mk deleted file mode 100644 index 3f6eff7f550..00000000000 --- a/keyboards/keebio/bigswitchseat/rules.mk +++ /dev/null @@ -1,12 +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 = 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/keebio/choconum/info.json b/keyboards/keebio/choconum/keyboard.json similarity index 93% rename from keyboards/keebio/choconum/info.json rename to keyboards/keebio/choconum/keyboard.json index b5f50cc4866..0315a9f3dce 100644 --- a/keyboards/keebio/choconum/info.json +++ b/keyboards/keebio/choconum/keyboard.json @@ -10,6 +10,14 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "direct": [ ["B2", "B10", "B3", "B4"], diff --git a/keyboards/keebio/choconum/rules.mk b/keyboards/keebio/choconum/rules.mk deleted file mode 100644 index 67d4dee2c76..00000000000 --- a/keyboards/keebio/choconum/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 -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/keebio/dilly/info.json b/keyboards/keebio/dilly/keyboard.json similarity index 92% rename from keyboards/keebio/dilly/info.json rename to keyboards/keebio/dilly/keyboard.json index b229ca021f2..45665940544 100644 --- a/keyboards/keebio/dilly/info.json +++ b/keyboards/keebio/dilly/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x113A", "device_version": "1.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D2", "D4", "C6", "F6", "F5"], "rows": ["D7", "E6", "B4", "B1", "B3", "B2"] diff --git a/keyboards/keebio/dilly/rules.mk b/keyboards/keebio/dilly/rules.mk deleted file mode 100644 index 32e82925ccf..00000000000 --- a/keyboards/keebio/dilly/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 = 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 = yes diff --git a/keyboards/keebio/ergodicity/info.json b/keyboards/keebio/ergodicity/keyboard.json similarity index 95% rename from keyboards/keebio/ergodicity/info.json rename to keyboards/keebio/ergodicity/keyboard.json index 94c94193edc..1305a4359f1 100644 --- a/keyboards/keebio/ergodicity/info.json +++ b/keyboards/keebio/ergodicity/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x125F", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B7", "B3"], "rows": ["B0", "B1", "C7", "B6", "B4"] diff --git a/keyboards/keebio/ergodicity/rules.mk b/keyboards/keebio/ergodicity/rules.mk deleted file mode 100644 index c358b798e4c..00000000000 --- a/keyboards/keebio/ergodicity/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = yes # 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 diff --git a/keyboards/keebio/laplace/info.json b/keyboards/keebio/laplace/keyboard.json similarity index 94% rename from keyboards/keebio/laplace/info.json rename to keyboards/keebio/laplace/keyboard.json index 6a81a6e8991..22cced0ee33 100644 --- a/keyboards/keebio/laplace/info.json +++ b/keyboards/keebio/laplace/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "D4" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "F4", "D2", "F5", "D7", "B4", "C6", "E6"] diff --git a/keyboards/keebio/laplace/rules.mk b/keyboards/keebio/laplace/rules.mk deleted file mode 100644 index fb930c2a929..00000000000 --- a/keyboards/keebio/laplace/rules.mk +++ /dev/null @@ -1,12 +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 -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 = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/keyboard.json similarity index 93% rename from keyboards/keebio/stick/info.json rename to keyboards/keebio/stick/keyboard.json index b24d4d64308..2e2b3539abc 100644 --- a/keyboards/keebio/stick/info.json +++ b/keyboards/keebio/stick/keyboard.json @@ -85,6 +85,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "direct": [ ["F4", "B6", "B5", "B4", "E6", "D7", "F6", "F7", "B1", "B3", "B2", "F5"] diff --git a/keyboards/keebio/stick/rules.mk b/keyboards/keebio/stick/rules.mk deleted file mode 100644 index 0f932779f59..00000000000 --- a/keyboards/keebio/stick/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keebio/tragicforce68/info.json b/keyboards/keebio/tragicforce68/keyboard.json similarity index 98% rename from keyboards/keebio/tragicforce68/info.json rename to keyboards/keebio/tragicforce68/keyboard.json index 07d292728be..49ada60863c 100644 --- a/keyboards/keebio/tragicforce68/info.json +++ b/keyboards/keebio/tragicforce68/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0510", "device_version": "1.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "D2", "D1", "D0", "B4", "E6", "C6", "D7", "D4"] diff --git a/keyboards/keebio/tragicforce68/rules.mk b/keyboards/keebio/tragicforce68/rules.mk deleted file mode 100644 index 86bb2554d89..00000000000 --- a/keyboards/keebio/tragicforce68/rules.mk +++ /dev/null @@ -1,11 +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 -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 -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keebio/tukey/info.json b/keyboards/keebio/tukey/keyboard.json similarity index 82% rename from keyboards/keebio/tukey/info.json rename to keyboards/keebio/tukey/keyboard.json index 9df46b0c1e1..5d8bd37a282 100644 --- a/keyboards/keebio/tukey/info.json +++ b/keyboards/keebio/tukey/keyboard.json @@ -30,6 +30,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "direct": [ ["D4", "F6"] diff --git a/keyboards/keebio/tukey/rules.mk b/keyboards/keebio/tukey/rules.mk deleted file mode 100644 index 4465ace1727..00000000000 --- a/keyboards/keebio/tukey/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keebmonkey/kbmg68/info.json b/keyboards/keebmonkey/kbmg68/keyboard.json similarity index 96% rename from keyboards/keebmonkey/kbmg68/info.json rename to keyboards/keebmonkey/kbmg68/keyboard.json index b56a61f4804..5cb0fa0e450 100644 --- a/keyboards/keebmonkey/kbmg68/info.json +++ b/keyboards/keebmonkey/kbmg68/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "B0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B6", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F7", "F6", "F5", "F4"], "rows": ["B1", "B2", "B3", "B4", "B5"] diff --git a/keyboards/keebmonkey/kbmg68/rules.mk b/keyboards/keebmonkey/kbmg68/rules.mk deleted file mode 100644 index 10d95a77523..00000000000 --- a/keyboards/keebmonkey/kbmg68/rules.mk +++ /dev/null @@ -1,12 +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 -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keebsforall/coarse60/info.json b/keyboards/keebsforall/coarse60/keyboard.json similarity index 97% rename from keyboards/keebsforall/coarse60/info.json rename to keyboards/keebsforall/coarse60/keyboard.json index 11ef47d2cc6..d8e769914c5 100644 --- a/keyboards/keebsforall/coarse60/info.json +++ b/keyboards/keebsforall/coarse60/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x5341", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B1", "B0", "A7", "B14", "A5", "A4", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], "rows": ["A9", "A10", "B12", "A2", "C13"] diff --git a/keyboards/keebsforall/coarse60/rules.mk b/keyboards/keebsforall/coarse60/rules.mk deleted file mode 100644 index 33b9c9f1591..00000000000 --- a/keyboards/keebsforall/coarse60/rules.mk +++ /dev/null @@ -1,15 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - - diff --git a/keyboards/keebsforall/freebird60/info.json b/keyboards/keebsforall/freebird60/keyboard.json similarity index 97% rename from keyboards/keebsforall/freebird60/info.json rename to keyboards/keebsforall/freebird60/keyboard.json index d2742610acb..3c4df7472a4 100644 --- a/keyboards/keebsforall/freebird60/info.json +++ b/keyboards/keebsforall/freebird60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xFB60", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D0", "D1", "D2", "D3", "D5"], "rows": ["F5", "F4", "F1", "F0", "F6"] diff --git a/keyboards/keebsforall/freebird60/rules.mk b/keyboards/keebsforall/freebird60/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/keebsforall/freebird60/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 = 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/keebsforall/freebirdnp/lite/info.json b/keyboards/keebsforall/freebirdnp/lite/keyboard.json similarity index 93% rename from keyboards/keebsforall/freebirdnp/lite/info.json rename to keyboards/keebsforall/freebirdnp/lite/keyboard.json index 91d43ffef8b..c27bb0e2b99 100644 --- a/keyboards/keebsforall/freebirdnp/lite/info.json +++ b/keyboards/keebsforall/freebirdnp/lite/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1013", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "B2", "B1", "B0"], "rows": ["B7", "B6", "B5", "B4", "B3"] diff --git a/keyboards/keebsforall/freebirdnp/lite/rules.mk b/keyboards/keebsforall/freebirdnp/lite/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/keebsforall/freebirdnp/lite/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 = 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/keebsforall/freebirdnp/pro/info.json b/keyboards/keebsforall/freebirdnp/pro/keyboard.json similarity index 94% rename from keyboards/keebsforall/freebirdnp/pro/info.json rename to keyboards/keebsforall/freebirdnp/pro/keyboard.json index f3c83075263..7ed9584f823 100644 --- a/keyboards/keebsforall/freebirdnp/pro/info.json +++ b/keyboards/keebsforall/freebirdnp/pro/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1014", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "B2", "B1", "B0"], "rows": ["D3", "B7", "B6", "B5", "B4", "B3"] diff --git a/keyboards/keebsforall/freebirdnp/pro/rules.mk b/keyboards/keebsforall/freebirdnp/pro/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/keebsforall/freebirdnp/pro/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/keebsforall/freebirdtkl/info.json b/keyboards/keebsforall/freebirdtkl/keyboard.json similarity index 99% rename from keyboards/keebsforall/freebirdtkl/info.json rename to keyboards/keebsforall/freebirdtkl/keyboard.json index eab9bcd23a2..a2c6ec426d9 100644 --- a/keyboards/keebsforall/freebirdtkl/info.json +++ b/keyboards/keebsforall/freebirdtkl/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0088", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D3", "D2", "D1"], "rows": ["B2", "B1", "B0", "B3", "D5", "B7"] diff --git a/keyboards/keebsforall/freebirdtkl/rules.mk b/keyboards/keebsforall/freebirdtkl/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/keebsforall/freebirdtkl/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 = 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/keebzdotnet/fme/info.json b/keyboards/keebzdotnet/fme/keyboard.json similarity index 93% rename from keyboards/keebzdotnet/fme/info.json rename to keyboards/keebzdotnet/fme/keyboard.json index 2254343f7b9..f1a352c1e5e 100644 --- a/keyboards/keebzdotnet/fme/info.json +++ b/keyboards/keebzdotnet/fme/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x8008", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B4", "B1", "B3", "B2"], "rows": ["B6", "B5", "B7", "D2"] diff --git a/keyboards/keebzdotnet/fme/rules.mk b/keyboards/keebzdotnet/fme/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/keebzdotnet/fme/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 = 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/keebzdotnet/wazowski/info.json b/keyboards/keebzdotnet/wazowski/keyboard.json similarity index 87% rename from keyboards/keebzdotnet/wazowski/info.json rename to keyboards/keebzdotnet/wazowski/keyboard.json index c993b41ac97..0047deeb4cd 100644 --- a/keyboards/keebzdotnet/wazowski/info.json +++ b/keyboards/keebzdotnet/wazowski/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x53FC", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F7", "B1", "B3", "B2", "B6"], "rows": ["F4", "F5", "F6"] diff --git a/keyboards/keebzdotnet/wazowski/rules.mk b/keyboards/keebzdotnet/wazowski/rules.mk deleted file mode 100644 index 6e0404820cd..00000000000 --- a/keyboards/keebzdotnet/wazowski/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 = 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/kegen/gboy/info.json b/keyboards/kegen/gboy/keyboard.json similarity index 99% rename from keyboards/kegen/gboy/info.json rename to keyboards/kegen/gboy/keyboard.json index 0e9f0f753d0..8c611d6664f 100644 --- a/keyboards/kegen/gboy/info.json +++ b/keyboards/kegen/gboy/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6762", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E2", "E6", "C6", "C7", "D7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D4", "D6", "D5", "F0"], "rows": ["F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/kegen/gboy/rules.mk b/keyboards/kegen/gboy/rules.mk deleted file mode 100644 index de8df1910ce..00000000000 --- a/keyboards/kegen/gboy/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# comment out to disable the options. -# -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 # Audio output -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/keybee/keybee65/info.json b/keyboards/keybee/keybee65/keyboard.json similarity index 95% rename from keyboards/keybee/keybee65/info.json rename to keyboards/keybee/keybee65/keyboard.json index 30067891d7b..7952378b15b 100644 --- a/keyboards/keybee/keybee65/info.json +++ b/keyboards/keybee/keybee65/keyboard.json @@ -18,6 +18,15 @@ "rgblight": { "max_brightness": 96 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["E6", "D1", "D5", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D3", "D2", "D0", "B0", "F0"] diff --git a/keyboards/keybee/keybee65/rules.mk b/keyboards/keybee/keybee65/rules.mk deleted file mode 100644 index c97335f3c53..00000000000 --- a/keyboards/keybee/keybee65/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 = 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 -ENCODER_ENABLE = no -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keyboardio/atreus/info.json b/keyboards/keyboardio/atreus/keyboard.json similarity index 93% rename from keyboards/keyboardio/atreus/info.json rename to keyboards/keyboardio/atreus/keyboard.json index b251151be48..4bdea354bde 100644 --- a/keyboards/keyboardio/atreus/info.json +++ b/keyboards/keyboardio/atreus/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x2303", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["F7", "E2", "C7", "C6", "B6", "B5", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F6", "F5", "F4", "F1"] diff --git a/keyboards/keyboardio/atreus/rules.mk b/keyboards/keyboardio/atreus/rules.mk deleted file mode 100644 index 2513240d91e..00000000000 --- a/keyboards/keyboardio/atreus/rules.mk +++ /dev/null @@ -1,14 +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 = 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 diff --git a/keyboards/keycapsss/o4l_5x12/info.json b/keyboards/keycapsss/o4l_5x12/keyboard.json similarity index 98% rename from keyboards/keycapsss/o4l_5x12/info.json rename to keyboards/keycapsss/o4l_5x12/keyboard.json index 91dc0564683..8816155fcca 100644 --- a/keyboards/keycapsss/o4l_5x12/info.json +++ b/keyboards/keycapsss/o4l_5x12/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "F6", "F5", "F4"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/keycapsss/o4l_5x12/rules.mk b/keyboards/keycapsss/o4l_5x12/rules.mk deleted file mode 100644 index ede7e9753e0..00000000000 --- a/keyboards/keycapsss/o4l_5x12/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keychron/q60/ansi/info.json b/keyboards/keychron/q60/ansi/keyboard.json similarity index 94% rename from keyboards/keychron/q60/ansi/info.json rename to keyboards/keychron/q60/ansi/keyboard.json index 1d074c5e3ca..4d6f6808905 100644 --- a/keyboards/keychron/q60/ansi/info.json +++ b/keyboards/keychron/q60/ansi/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x01C0", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/q60/ansi/rules.mk b/keyboards/keychron/q60/ansi/rules.mk deleted file mode 100644 index 468ed6fae39..00000000000 --- a/keyboards/keychron/q60/ansi/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable. -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB 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 -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/s1/ansi/rgb/info.json b/keyboards/keychron/s1/ansi/rgb/keyboard.json similarity index 96% rename from keyboards/keychron/s1/ansi/rgb/info.json rename to keyboards/keychron/s1/ansi/rgb/keyboard.json index 2e78ccfe427..23ea66071eb 100644 --- a/keyboards/keychron/s1/ansi/rgb/info.json +++ b/keyboards/keychron/s1/ansi/rgb/keyboard.json @@ -35,6 +35,16 @@ "driver": "snled27351", "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/s1/ansi/rgb/rules.mk b/keyboards/keychron/s1/ansi/rgb/rules.mk deleted file mode 100644 index cf31e094cbf..00000000000 --- a/keyboards/keychron/s1/ansi/rgb/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB 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 -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/s1/ansi/white/info.json b/keyboards/keychron/s1/ansi/white/keyboard.json similarity index 96% rename from keyboards/keychron/s1/ansi/white/info.json rename to keyboards/keychron/s1/ansi/white/keyboard.json index 0e20c9ebe65..cab38a4ae66 100644 --- a/keyboards/keychron/s1/ansi/white/info.json +++ b/keyboards/keychron/s1/ansi/white/keyboard.json @@ -35,6 +35,16 @@ "sleep": true, "react_on_keyup": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "led_matrix": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/s1/ansi/white/rules.mk b/keyboards/keychron/s1/ansi/white/rules.mk deleted file mode 100644 index afcbe18d626..00000000000 --- a/keyboards/keychron/s1/ansi/white/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB 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 -LED_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v2/ansi/info.json b/keyboards/keychron/v2/ansi/keyboard.json similarity index 95% rename from keyboards/keychron/v2/ansi/info.json rename to keyboards/keychron/v2/ansi/keyboard.json index 528d4378294..015aae6e3ed 100644 --- a/keyboards/keychron/v2/ansi/info.json +++ b/keyboards/keychron/v2/ansi/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0320", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v2/ansi/rules.mk b/keyboards/keychron/v2/ansi/rules.mk deleted file mode 100644 index cf31e094cbf..00000000000 --- a/keyboards/keychron/v2/ansi/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB 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 -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v2/ansi_encoder/info.json b/keyboards/keychron/v2/ansi_encoder/keyboard.json similarity index 94% rename from keyboards/keychron/v2/ansi_encoder/info.json rename to keyboards/keychron/v2/ansi_encoder/keyboard.json index 42efdae9844..ca62bab1484 100644 --- a/keyboards/keychron/v2/ansi_encoder/info.json +++ b/keyboards/keychron/v2/ansi_encoder/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0321", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v2/ansi_encoder/rules.mk b/keyboards/keychron/v2/ansi_encoder/rules.mk deleted file mode 100644 index 5d77f099712..00000000000 --- a/keyboards/keychron/v2/ansi_encoder/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v2/iso/info.json b/keyboards/keychron/v2/iso/keyboard.json similarity index 95% rename from keyboards/keychron/v2/iso/info.json rename to keyboards/keychron/v2/iso/keyboard.json index 171407e75f1..827f6132479 100644 --- a/keyboards/keychron/v2/iso/info.json +++ b/keyboards/keychron/v2/iso/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0322", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v2/iso/rules.mk b/keyboards/keychron/v2/iso/rules.mk deleted file mode 100644 index cf31e094cbf..00000000000 --- a/keyboards/keychron/v2/iso/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB 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 -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v2/iso_encoder/info.json b/keyboards/keychron/v2/iso_encoder/keyboard.json similarity index 94% rename from keyboards/keychron/v2/iso_encoder/info.json rename to keyboards/keychron/v2/iso_encoder/keyboard.json index 75a8bf1f1ff..10774d6974b 100644 --- a/keyboards/keychron/v2/iso_encoder/info.json +++ b/keyboards/keychron/v2/iso_encoder/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0323", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v2/iso_encoder/rules.mk b/keyboards/keychron/v2/iso_encoder/rules.mk deleted file mode 100644 index 5d77f099712..00000000000 --- a/keyboards/keychron/v2/iso_encoder/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v2/jis/info.json b/keyboards/keychron/v2/jis/keyboard.json similarity index 95% rename from keyboards/keychron/v2/jis/info.json rename to keyboards/keychron/v2/jis/keyboard.json index 64058d4c130..c7759440092 100644 --- a/keyboards/keychron/v2/jis/info.json +++ b/keyboards/keychron/v2/jis/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0324", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v2/jis/rules.mk b/keyboards/keychron/v2/jis/rules.mk deleted file mode 100644 index cf31e094cbf..00000000000 --- a/keyboards/keychron/v2/jis/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB 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 -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v2/jis_encoder/info.json b/keyboards/keychron/v2/jis_encoder/keyboard.json similarity index 95% rename from keyboards/keychron/v2/jis_encoder/info.json rename to keyboards/keychron/v2/jis_encoder/keyboard.json index 12fadfec730..c783b3553e2 100644 --- a/keyboards/keychron/v2/jis_encoder/info.json +++ b/keyboards/keychron/v2/jis_encoder/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0325", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v2/jis_encoder/rules.mk b/keyboards/keychron/v2/jis_encoder/rules.mk deleted file mode 100644 index 5d77f099712..00000000000 --- a/keyboards/keychron/v2/jis_encoder/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v3/ansi/info.json b/keyboards/keychron/v3/ansi/keyboard.json similarity index 95% rename from keyboards/keychron/v3/ansi/info.json rename to keyboards/keychron/v3/ansi/keyboard.json index f01b2394a7b..b8489a43b40 100644 --- a/keyboards/keychron/v3/ansi/info.json +++ b/keyboards/keychron/v3/ansi/keyboard.json @@ -3,6 +3,16 @@ "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "usb": { "vid": "0x3434", "pid": "0x0330", diff --git a/keyboards/keychron/v3/ansi/rules.mk b/keyboards/keychron/v3/ansi/rules.mk deleted file mode 100644 index cf31e094cbf..00000000000 --- a/keyboards/keychron/v3/ansi/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB 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 -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v3/iso/info.json b/keyboards/keychron/v3/iso/keyboard.json similarity index 96% rename from keyboards/keychron/v3/iso/info.json rename to keyboards/keychron/v3/iso/keyboard.json index f57ccbd7d0a..b257deb1c0c 100644 --- a/keyboards/keychron/v3/iso/info.json +++ b/keyboards/keychron/v3/iso/keyboard.json @@ -3,6 +3,16 @@ "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "features": { + "bootmagic": true, + "command": false, + "console": true, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "usb": { "vid": "0x3434", "pid": "0x0332", diff --git a/keyboards/keychron/v3/iso/rules.mk b/keyboards/keychron/v3/iso/rules.mk deleted file mode 100644 index 118bf40e5a9..00000000000 --- a/keyboards/keychron/v3/iso/rules.mk +++ /dev/null @@ -1,14 +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 = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB 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 -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v3/jis/info.json b/keyboards/keychron/v3/jis/keyboard.json similarity index 96% rename from keyboards/keychron/v3/jis/info.json rename to keyboards/keychron/v3/jis/keyboard.json index cce7372c317..f00716b2db1 100644 --- a/keyboards/keychron/v3/jis/info.json +++ b/keyboards/keychron/v3/jis/keyboard.json @@ -3,6 +3,16 @@ "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "usb": { "vid": "0x3434", "pid": "0x0334", diff --git a/keyboards/keychron/v3/jis/rules.mk b/keyboards/keychron/v3/jis/rules.mk deleted file mode 100644 index cf31e094cbf..00000000000 --- a/keyboards/keychron/v3/jis/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB 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 -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v4/ansi/info.json b/keyboards/keychron/v4/ansi/keyboard.json similarity index 94% rename from keyboards/keychron/v4/ansi/info.json rename to keyboards/keychron/v4/ansi/keyboard.json index a8b980ddd6c..d66eb3f9562 100644 --- a/keyboards/keychron/v4/ansi/info.json +++ b/keyboards/keychron/v4/ansi/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0340", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v4/ansi/rules.mk b/keyboards/keychron/v4/ansi/rules.mk deleted file mode 100644 index 468ed6fae39..00000000000 --- a/keyboards/keychron/v4/ansi/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable. -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB 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 -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v4/iso/info.json b/keyboards/keychron/v4/iso/keyboard.json similarity index 94% rename from keyboards/keychron/v4/iso/info.json rename to keyboards/keychron/v4/iso/keyboard.json index 81153c3621f..c7854307e4e 100644 --- a/keyboards/keychron/v4/iso/info.json +++ b/keyboards/keychron/v4/iso/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0342", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v4/iso/rules.mk b/keyboards/keychron/v4/iso/rules.mk deleted file mode 100644 index 468ed6fae39..00000000000 --- a/keyboards/keychron/v4/iso/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable. -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB 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 -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v7/ansi/info.json b/keyboards/keychron/v7/ansi/keyboard.json similarity index 95% rename from keyboards/keychron/v7/ansi/info.json rename to keyboards/keychron/v7/ansi/keyboard.json index ea01b3ff393..a60b46dc971 100644 --- a/keyboards/keychron/v7/ansi/info.json +++ b/keyboards/keychron/v7/ansi/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0370", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v7/ansi/rules.mk b/keyboards/keychron/v7/ansi/rules.mk deleted file mode 100644 index 468ed6fae39..00000000000 --- a/keyboards/keychron/v7/ansi/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable. -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB 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 -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v7/iso/info.json b/keyboards/keychron/v7/iso/keyboard.json similarity index 95% rename from keyboards/keychron/v7/iso/info.json rename to keyboards/keychron/v7/iso/keyboard.json index e241232d065..0022222635b 100644 --- a/keyboards/keychron/v7/iso/info.json +++ b/keyboards/keychron/v7/iso/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0372", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v7/iso/rules.mk b/keyboards/keychron/v7/iso/rules.mk deleted file mode 100644 index 468ed6fae39..00000000000 --- a/keyboards/keychron/v7/iso/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable. -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB 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 -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v8/ansi/info.json b/keyboards/keychron/v8/ansi/keyboard.json similarity index 95% rename from keyboards/keychron/v8/ansi/info.json rename to keyboards/keychron/v8/ansi/keyboard.json index df6ef81b8da..7827270228d 100644 --- a/keyboards/keychron/v8/ansi/info.json +++ b/keyboards/keychron/v8/ansi/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0380", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v8/ansi/rules.mk b/keyboards/keychron/v8/ansi/rules.mk deleted file mode 100644 index 50b09aa58ac..00000000000 --- a/keyboards/keychron/v8/ansi/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v8/ansi_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/keyboard.json similarity index 94% rename from keyboards/keychron/v8/ansi_encoder/info.json rename to keyboards/keychron/v8/ansi_encoder/keyboard.json index 100d215ee8a..a5d84021d08 100644 --- a/keyboards/keychron/v8/ansi_encoder/info.json +++ b/keyboards/keychron/v8/ansi_encoder/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0381", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v8/ansi_encoder/rules.mk b/keyboards/keychron/v8/ansi_encoder/rules.mk deleted file mode 100644 index bc154c1788b..00000000000 --- a/keyboards/keychron/v8/ansi_encoder/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v8/iso/info.json b/keyboards/keychron/v8/iso/keyboard.json similarity index 95% rename from keyboards/keychron/v8/iso/info.json rename to keyboards/keychron/v8/iso/keyboard.json index d7897406448..89310111f55 100644 --- a/keyboards/keychron/v8/iso/info.json +++ b/keyboards/keychron/v8/iso/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0382", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v8/iso/rules.mk b/keyboards/keychron/v8/iso/rules.mk deleted file mode 100644 index 4aa9221c247..00000000000 --- a/keyboards/keychron/v8/iso/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keychron/v8/iso_encoder/info.json b/keyboards/keychron/v8/iso_encoder/keyboard.json similarity index 95% rename from keyboards/keychron/v8/iso_encoder/info.json rename to keyboards/keychron/v8/iso_encoder/keyboard.json index 23efd329aae..2e50de74212 100644 --- a/keyboards/keychron/v8/iso_encoder/info.json +++ b/keyboards/keychron/v8/iso_encoder/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0383", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/v8/iso_encoder/rules.mk b/keyboards/keychron/v8/iso_encoder/rules.mk deleted file mode 100644 index bc154c1788b..00000000000 --- a/keyboards/keychron/v8/iso_encoder/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keyhive/absinthe/info.json b/keyboards/keyhive/absinthe/keyboard.json similarity index 97% rename from keyboards/keyhive/absinthe/info.json rename to keyboards/keyhive/absinthe/keyboard.json index 1496756d9a2..2a58178bf16 100644 --- a/keyboards/keyhive/absinthe/info.json +++ b/keyboards/keyhive/absinthe/keyboard.json @@ -23,6 +23,16 @@ "ws2812": { "pin": "B0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D3", "D0"], "rows": ["D2", "D1", "B6", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/keyhive/absinthe/rules.mk b/keyboards/keyhive/absinthe/rules.mk deleted file mode 100644 index 5d5924f767b..00000000000 --- a/keyboards/keyhive/absinthe/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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/keyhive/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/keyboard.json similarity index 96% rename from keyboards/keyhive/ergosaurus/info.json rename to keyboards/keyhive/ergosaurus/keyboard.json index 76d1988da08..bce4b9d0fec 100644 --- a/keyboards/keyhive/ergosaurus/info.json +++ b/keyboards/keyhive/ergosaurus/keyboard.json @@ -23,6 +23,14 @@ "static_gradient": true } }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D7", "C6", "D0", "D1", "F7", "B1", "B3", "B2"], "rows": ["B5", "B4", "E6", "D4", "F6", "D3", "D2", "F4", "F5"] diff --git a/keyboards/keyhive/ergosaurus/rules.mk b/keyboards/keyhive/ergosaurus/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/keyhive/ergosaurus/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/keyhive/maypad/info.json b/keyboards/keyhive/maypad/keyboard.json similarity index 95% rename from keyboards/keyhive/maypad/info.json rename to keyboards/keyhive/maypad/keyboard.json index 6f61b99df39..c4c39b0eddf 100644 --- a/keyboards/keyhive/maypad/info.json +++ b/keyboards/keyhive/maypad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4D50", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/keyhive/maypad/rules.mk b/keyboards/keyhive/maypad/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/keyhive/maypad/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/keyhive/opus/info.json b/keyboards/keyhive/opus/keyboard.json similarity index 94% rename from keyboards/keyhive/opus/info.json rename to keyboards/keyhive/opus/keyboard.json index 5bef38ca0a4..252958c0b98 100644 --- a/keyboards/keyhive/opus/info.json +++ b/keyboards/keyhive/opus/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x4F50", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7"], "rows": ["B1", "B3", "B2", "B6"] diff --git a/keyboards/keyhive/opus/rules.mk b/keyboards/keyhive/opus/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/keyhive/opus/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 = 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/keyhive/smallice/info.json b/keyboards/keyhive/smallice/keyboard.json similarity index 95% rename from keyboards/keyhive/smallice/info.json rename to keyboards/keyhive/smallice/keyboard.json index fae716f8208..f7118ed3cf6 100644 --- a/keyboards/keyhive/smallice/info.json +++ b/keyboards/keyhive/smallice/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "B7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "C6", "F7", "F6", "F5", "F4", "F1", "D4", "D6", "D7", "D0", "D1", "D2", "D3", "D5"], "rows": ["B0", "B6", "B5", "B4"] diff --git a/keyboards/keyhive/smallice/rules.mk b/keyboards/keyhive/smallice/rules.mk deleted file mode 100644 index 2eba275490a..00000000000 --- a/keyboards/keyhive/smallice/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keyhive/southpole/info.json b/keyboards/keyhive/southpole/keyboard.json similarity index 96% rename from keyboards/keyhive/southpole/info.json rename to keyboards/keyhive/southpole/keyboard.json index 8514a299866..aea03ffc60b 100644 --- a/keyboards/keyhive/southpole/info.json +++ b/keyboards/keyhive/southpole/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "E6"], "rows": ["D2", "D3", "C6", "C7", "D5"] diff --git a/keyboards/keyhive/southpole/rules.mk b/keyboards/keyhive/southpole/rules.mk deleted file mode 100644 index e3ebdd5cf3c..00000000000 --- a/keyboards/keyhive/southpole/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 = 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 -RGBLIGHT_ENABLE = no diff --git a/keyboards/keyhive/ut472/info.json b/keyboards/keyhive/ut472/keyboard.json similarity index 94% rename from keyboards/keyhive/ut472/info.json rename to keyboards/keyhive/ut472/keyboard.json index 6c3dd26eef6..340e5210742 100644 --- a/keyboards/keyhive/ut472/info.json +++ b/keyboards/keyhive/ut472/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "C6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C4", "C5", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5"], "rows": ["D1", "D2", "D3", "D4"] diff --git a/keyboards/keyhive/ut472/rules.mk b/keyboards/keyhive/ut472/rules.mk deleted file mode 100644 index 9ebb40efd6b..00000000000 --- a/keyboards/keyhive/ut472/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 = 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 = yes diff --git a/keyboards/keyprez/corgi/info.json b/keyboards/keyprez/corgi/keyboard.json similarity index 94% rename from keyboards/keyprez/corgi/info.json rename to keyboards/keyprez/corgi/keyboard.json index 6e4c5682f52..07962899c4e 100644 --- a/keyboards/keyprez/corgi/info.json +++ b/keyboards/keyprez/corgi/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6", "D2", "B7"], "rows": ["F5", "F7", "B2", "B6", "F4", "F6", "B1", "B3"] diff --git a/keyboards/keyprez/corgi/rules.mk b/keyboards/keyprez/corgi/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/keyprez/corgi/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/keyprez/rhino/info.json b/keyboards/keyprez/rhino/keyboard.json similarity index 97% rename from keyboards/keyprez/rhino/info.json rename to keyboards/keyprez/rhino/keyboard.json index 105cc0446ac..4f334e8fcfa 100644 --- a/keyboards/keyprez/rhino/info.json +++ b/keyboards/keyprez/rhino/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "D2", "D4", "D7", "E6", "B4", "B5"], "rows": ["B3", "B2", "B6", "B1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/keyprez/rhino/rules.mk b/keyboards/keyprez/rhino/rules.mk deleted file mode 100644 index 7439cd7de21..00000000000 --- a/keyboards/keyprez/rhino/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/keysofkings/twokey/info.json b/keyboards/keysofkings/twokey/keyboard.json similarity index 83% rename from keyboards/keysofkings/twokey/info.json rename to keyboards/keysofkings/twokey/keyboard.json index e7564bf2a54..5f9a84e58ba 100644 --- a/keyboards/keysofkings/twokey/info.json +++ b/keyboards/keysofkings/twokey/keyboard.json @@ -29,6 +29,17 @@ "ws2812": { "pin": "D3" }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B3", "B2"], "rows": ["B4", "B5"] diff --git a/keyboards/keysofkings/twokey/rules.mk b/keyboards/keysofkings/twokey/rules.mk deleted file mode 100755 index 9982ce0a871..00000000000 --- a/keyboards/keysofkings/twokey/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/keyten/kt3700/info.json b/keyboards/keyten/kt3700/keyboard.json similarity index 94% rename from keyboards/keyten/kt3700/info.json rename to keyboards/keyten/kt3700/keyboard.json index 1a977797110..9f89ee14530 100644 --- a/keyboards/keyten/kt3700/info.json +++ b/keyboards/keyten/kt3700/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3700", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B13", "B9", "B8"], "rows": ["B12", "B7", "B5", "B4", "B3", "A15"] diff --git a/keyboards/keyten/kt3700/rules.mk b/keyboards/keyten/kt3700/rules.mk deleted file mode 100644 index e3ecf72b085..00000000000 --- a/keyboards/keyten/kt3700/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 = 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/kikkou/info.json b/keyboards/kikkou/keyboard.json similarity index 97% rename from keyboards/kikkou/info.json rename to keyboards/kikkou/keyboard.json index ff891e8688e..af684bbc296 100644 --- a/keyboards/kikkou/info.json +++ b/keyboards/kikkou/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["F0", "F1", "F4", "F5", "E6"] diff --git a/keyboards/kikkou/rules.mk b/keyboards/kikkou/rules.mk deleted file mode 100644 index d65d32df0aa..00000000000 --- a/keyboards/kikkou/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 = 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 \ No newline at end of file diff --git a/keyboards/kikoslab/ellora65/info.json b/keyboards/kikoslab/ellora65/keyboard.json similarity index 99% rename from keyboards/kikoslab/ellora65/info.json rename to keyboards/kikoslab/ellora65/keyboard.json index 0ab7f7015af..9dd8404a0bf 100644 --- a/keyboards/kikoslab/ellora65/info.json +++ b/keyboards/kikoslab/ellora65/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xE88F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "C6", "B6", "B5", "B4", "B3"], "rows": ["B7", "B2", "F1", "F4", "D6", "D7", "D5", "D4", "D3", "D2"] diff --git a/keyboards/kikoslab/ellora65/rules.mk b/keyboards/kikoslab/ellora65/rules.mk deleted file mode 100644 index 52e7b596ee2..00000000000 --- a/keyboards/kikoslab/ellora65/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/kikoslab/kl90/info.json b/keyboards/kikoslab/kl90/keyboard.json similarity index 96% rename from keyboards/kikoslab/kl90/info.json rename to keyboards/kikoslab/kl90/keyboard.json index c925c028326..391008b58f5 100644 --- a/keyboards/kikoslab/kl90/info.json +++ b/keyboards/kikoslab/kl90/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xEA53", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true + }, "matrix_pins": { "cols": ["F2", "F0", "A2", "A1", "A0", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2"], "rows": ["F1", "F3", "F4", "F5", "F6", "F7"] diff --git a/keyboards/kikoslab/kl90/rules.mk b/keyboards/kikoslab/kl90/rules.mk deleted file mode 100644 index a62bc3d00cd..00000000000 --- a/keyboards/kikoslab/kl90/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/kindakeyboards/conone65/info.json b/keyboards/kindakeyboards/conone65/keyboard.json similarity index 99% rename from keyboards/kindakeyboards/conone65/info.json rename to keyboards/kindakeyboards/conone65/keyboard.json index 6639665ba9b..0c44723f62b 100644 --- a/keyboards/kindakeyboards/conone65/info.json +++ b/keyboards/kindakeyboards/conone65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6AAB", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B7", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F6", "F5", "F4", "F1", "F0", "D0"], "rows": ["D5", "D3", "E6", "D1", "D2"] diff --git a/keyboards/kindakeyboards/conone65/rules.mk b/keyboards/kindakeyboards/conone65/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/kindakeyboards/conone65/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 = 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/kineticlabs/emu/hotswap/info.json b/keyboards/kineticlabs/emu/hotswap/keyboard.json similarity index 96% rename from keyboards/kineticlabs/emu/hotswap/info.json rename to keyboards/kineticlabs/emu/hotswap/keyboard.json index 8f9cb70fe04..ec53c2f6bfe 100644 --- a/keyboards/kineticlabs/emu/hotswap/info.json +++ b/keyboards/kineticlabs/emu/hotswap/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xC387", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "D4", "B3", "B1", "B0", "B7"] diff --git a/keyboards/kineticlabs/emu/hotswap/rules.mk b/keyboards/kineticlabs/emu/hotswap/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/kineticlabs/emu/hotswap/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kineticlabs/emu/soldered/info.json b/keyboards/kineticlabs/emu/soldered/keyboard.json similarity index 98% rename from keyboards/kineticlabs/emu/soldered/info.json rename to keyboards/kineticlabs/emu/soldered/keyboard.json index 811a837f5a2..4aaf523d2ae 100644 --- a/keyboards/kineticlabs/emu/soldered/info.json +++ b/keyboards/kineticlabs/emu/soldered/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xC386", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "D4", "B3", "B1", "B0", "B7"] diff --git a/keyboards/kineticlabs/emu/soldered/rules.mk b/keyboards/kineticlabs/emu/soldered/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/kineticlabs/emu/soldered/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kingly_keys/ave/ortho/info.json b/keyboards/kingly_keys/ave/ortho/keyboard.json similarity index 97% rename from keyboards/kingly_keys/ave/ortho/info.json rename to keyboards/kingly_keys/ave/ortho/keyboard.json index c17f41dcb40..8c91b27615c 100644 --- a/keyboards/kingly_keys/ave/ortho/info.json +++ b/keyboards/kingly_keys/ave/ortho/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x1225", "device_version": "0.1.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B3", "F4", "F7", "F6", "F5"] diff --git a/keyboards/kingly_keys/ave/ortho/rules.mk b/keyboards/kingly_keys/ave/ortho/rules.mk deleted file mode 100644 index 12ee1bcfbd2..00000000000 --- a/keyboards/kingly_keys/ave/ortho/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/kingly_keys/ave/staggered/info.json b/keyboards/kingly_keys/ave/staggered/keyboard.json similarity index 96% rename from keyboards/kingly_keys/ave/staggered/info.json rename to keyboards/kingly_keys/ave/staggered/keyboard.json index 66e6bb3a4c1..581e86c11b8 100644 --- a/keyboards/kingly_keys/ave/staggered/info.json +++ b/keyboards/kingly_keys/ave/staggered/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x1225", "device_version": "0.1.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B3", "F4", "F7", "F6", "F5"] diff --git a/keyboards/kingly_keys/ave/staggered/rules.mk b/keyboards/kingly_keys/ave/staggered/rules.mk deleted file mode 100644 index 12ee1bcfbd2..00000000000 --- a/keyboards/kingly_keys/ave/staggered/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/kingly_keys/little_foot/info.json b/keyboards/kingly_keys/little_foot/keyboard.json similarity index 96% rename from keyboards/kingly_keys/little_foot/info.json rename to keyboards/kingly_keys/little_foot/keyboard.json index 314693d561e..19e6a0f5478 100644 --- a/keyboards/kingly_keys/little_foot/info.json +++ b/keyboards/kingly_keys/little_foot/keyboard.json @@ -30,6 +30,15 @@ "ws2812": { "pin": "F4" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["F6", "B6", "B2", "B3", "B1"] diff --git a/keyboards/kingly_keys/little_foot/rules.mk b/keyboards/kingly_keys/little_foot/rules.mk deleted file mode 100644 index 53b742083f1..00000000000 --- a/keyboards/kingly_keys/little_foot/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 = 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 -RGBLIGHT_ENABLE = yes diff --git a/keyboards/kingly_keys/romac/info.json b/keyboards/kingly_keys/romac/keyboard.json similarity index 86% rename from keyboards/kingly_keys/romac/info.json rename to keyboards/kingly_keys/romac/keyboard.json index a6a8a4b8eb3..4c5e9298481 100644 --- a/keyboards/kingly_keys/romac/info.json +++ b/keyboards/kingly_keys/romac/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F7", "B1", "B3"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/kingly_keys/romac/rules.mk b/keyboards/kingly_keys/romac/rules.mk deleted file mode 100644 index 5e7b5aadb5a..00000000000 --- a/keyboards/kingly_keys/romac/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 -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 -RGBLIGHT_ENABLE = no - diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/keyboard.json similarity index 87% rename from keyboards/kingly_keys/romac_plus/info.json rename to keyboards/kingly_keys/romac_plus/keyboard.json index 5808d7fe581..bc4ad616e18 100644 --- a/keyboards/kingly_keys/romac_plus/info.json +++ b/keyboards/kingly_keys/romac_plus/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F5", "F4"], "rows": ["C6", "D4", "D2", "D3"] diff --git a/keyboards/kingly_keys/romac_plus/rules.mk b/keyboards/kingly_keys/romac_plus/rules.mk deleted file mode 100644 index 3eef56841c4..00000000000 --- a/keyboards/kingly_keys/romac_plus/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 -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable support for EC11 Rotary Encoder -OLED_ENABLE = yes diff --git a/keyboards/kingly_keys/ropro/info.json b/keyboards/kingly_keys/ropro/keyboard.json similarity index 95% rename from keyboards/kingly_keys/ropro/info.json rename to keyboards/kingly_keys/ropro/keyboard.json index 8026d5c7643..ed0bba5366f 100644 --- a/keyboards/kingly_keys/ropro/info.json +++ b/keyboards/kingly_keys/ropro/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3", "B2", "B6", "D2", "C7"], "rows": ["F4", "F5", "F6", "F7", "B1", "F1", null] diff --git a/keyboards/kingly_keys/ropro/rules.mk b/keyboards/kingly_keys/ropro/rules.mk deleted file mode 100644 index 2fde11543ff..00000000000 --- a/keyboards/kingly_keys/ropro/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 -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 -ENCODER_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/keyboard.json similarity index 85% rename from keyboards/kingly_keys/smd_milk/info.json rename to keyboards/kingly_keys/smd_milk/keyboard.json index 84174ac248a..e510ea80b41 100644 --- a/keyboards/kingly_keys/smd_milk/info.json +++ b/keyboards/kingly_keys/smd_milk/keyboard.json @@ -30,6 +30,15 @@ "ws2812": { "pin": "B3" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": false, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D3"], "rows": ["C5", "D2"] diff --git a/keyboards/kingly_keys/smd_milk/rules.mk b/keyboards/kingly_keys/smd_milk/rules.mk deleted file mode 100644 index 5d1006936de..00000000000 --- a/keyboards/kingly_keys/smd_milk/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 = 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 = yes # This can be enabled if a ws2812 strip is connected to the expansion port. diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/keyboard.json similarity index 87% rename from keyboards/kingly_keys/soap/info.json rename to keyboards/kingly_keys/soap/keyboard.json index e6d2cee4212..b4f8fb9e86b 100644 --- a/keyboards/kingly_keys/soap/info.json +++ b/keyboards/kingly_keys/soap/keyboard.json @@ -26,6 +26,16 @@ "ws2812": { "pin": "B6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F1", "F0", "D5"], "rows": ["C7", "C6"] diff --git a/keyboards/kingly_keys/soap/rules.mk b/keyboards/kingly_keys/soap/rules.mk deleted file mode 100644 index 2fde11543ff..00000000000 --- a/keyboards/kingly_keys/soap/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 -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 -ENCODER_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/kira/kira75/info.json b/keyboards/kira/kira75/keyboard.json similarity index 96% rename from keyboards/kira/kira75/info.json rename to keyboards/kira/kira75/keyboard.json index 0a923fa44e4..c48f2bf4923 100644 --- a/keyboards/kira/kira75/info.json +++ b/keyboards/kira/kira75/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "C7", "C6", "B6", "B5", "B4", "F5", "F4", "F1", "F0", "E6", "B3", "B2", "B1", "B0"], "rows": ["D0", "D1", "D2", "D3", "D5", "D4"] diff --git a/keyboards/kira/kira75/rules.mk b/keyboards/kira/kira75/rules.mk deleted file mode 100644 index 609fcf84a87..00000000000 --- a/keyboards/kira/kira75/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 = 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kira/kira80/info.json b/keyboards/kira/kira80/keyboard.json similarity index 99% rename from keyboards/kira/kira80/info.json rename to keyboards/kira/kira80/keyboard.json index 0ec9e0b258c..137e1f65656 100644 --- a/keyboards/kira/kira80/info.json +++ b/keyboards/kira/kira80/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xC583", "device_version": "1.0.2" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "A0", "C2", "D7"], "rows": ["B1", "B2", "B3", "B5", "B6", "B7", "B0"] diff --git a/keyboards/kira/kira80/rules.mk b/keyboards/kira/kira80/rules.mk deleted file mode 100644 index f7616462037..00000000000 --- a/keyboards/kira/kira80/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# 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 = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/keyboard.json similarity index 84% rename from keyboards/kiwikeebs/macro/info.json rename to keyboards/kiwikeebs/macro/keyboard.json index 84b8afb9828..d8bc9f39254 100644 --- a/keyboards/kiwikeebs/macro/info.json +++ b/keyboards/kiwikeebs/macro/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4712", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F7", "B1", "B3", "B2"], "rows": ["E6", "D7"] diff --git a/keyboards/kiwikeebs/macro/rules.mk b/keyboards/kiwikeebs/macro/rules.mk deleted file mode 100644 index f0a88209b69..00000000000 --- a/keyboards/kiwikeebs/macro/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 -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 -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/kiwikeebs/macro_v2/info.json b/keyboards/kiwikeebs/macro_v2/keyboard.json similarity index 84% rename from keyboards/kiwikeebs/macro_v2/info.json rename to keyboards/kiwikeebs/macro_v2/keyboard.json index efdf6d860f9..d9b693dd1ac 100644 --- a/keyboards/kiwikeebs/macro_v2/info.json +++ b/keyboards/kiwikeebs/macro_v2/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4712", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "C6", "C7", "D4"], "rows": ["B5", "B4"] diff --git a/keyboards/kiwikeebs/macro_v2/rules.mk b/keyboards/kiwikeebs/macro_v2/rules.mk deleted file mode 100644 index 131aa72aeb5..00000000000 --- a/keyboards/kiwikeebs/macro_v2/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/kiwikey/wanderland/info.json b/keyboards/kiwikey/wanderland/keyboard.json similarity index 97% rename from keyboards/kiwikey/wanderland/info.json rename to keyboards/kiwikey/wanderland/keyboard.json index f0e9317fe17..b4d4d4f5166 100644 --- a/keyboards/kiwikey/wanderland/info.json +++ b/keyboards/kiwikey/wanderland/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x574C", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F6", "B4", "D7", "D6", "D5", "D2", "D3", "B0", "F0", "B1", "B2", "B3"], "rows": ["F4", "F1", "E6", "E2", "C7", "D4"] diff --git a/keyboards/kiwikey/wanderland/rules.mk b/keyboards/kiwikey/wanderland/rules.mk deleted file mode 100644 index 85830d31150..00000000000 --- a/keyboards/kiwikey/wanderland/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 = 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 diff --git a/keyboards/kkatano/bakeneko60/info.json b/keyboards/kkatano/bakeneko60/keyboard.json similarity index 98% rename from keyboards/kkatano/bakeneko60/info.json rename to keyboards/kkatano/bakeneko60/keyboard.json index 1f6c5f8ac42..a8d9e655a19 100644 --- a/keyboards/kkatano/bakeneko60/info.json +++ b/keyboards/kkatano/bakeneko60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xCBDC", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/kkatano/bakeneko60/rules.mk b/keyboards/kkatano/bakeneko60/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/kkatano/bakeneko60/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 = 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/kkatano/bakeneko65/rev2/info.json b/keyboards/kkatano/bakeneko65/rev2/keyboard.json similarity index 98% rename from keyboards/kkatano/bakeneko65/rev2/info.json rename to keyboards/kkatano/bakeneko65/rev2/keyboard.json index fa20fc0fe2a..92193e52dbb 100644 --- a/keyboards/kkatano/bakeneko65/rev2/info.json +++ b/keyboards/kkatano/bakeneko65/rev2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4C82", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/kkatano/bakeneko65/rev2/rules.mk b/keyboards/kkatano/bakeneko65/rev2/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/kkatano/bakeneko65/rev2/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 = 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/kkatano/bakeneko65/rev3/info.json b/keyboards/kkatano/bakeneko65/rev3/keyboard.json similarity index 99% rename from keyboards/kkatano/bakeneko65/rev3/info.json rename to keyboards/kkatano/bakeneko65/rev3/keyboard.json index d819d2e95a3..d0717c1893d 100644 --- a/keyboards/kkatano/bakeneko65/rev3/info.json +++ b/keyboards/kkatano/bakeneko65/rev3/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4C83", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/kkatano/bakeneko65/rev3/rules.mk b/keyboards/kkatano/bakeneko65/rev3/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/kkatano/bakeneko65/rev3/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 = 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/kkatano/bakeneko80/info.json b/keyboards/kkatano/bakeneko80/keyboard.json similarity index 97% rename from keyboards/kkatano/bakeneko80/info.json rename to keyboards/kkatano/bakeneko80/keyboard.json index 3549a3e8c79..ee005086c3b 100644 --- a/keyboards/kkatano/bakeneko80/info.json +++ b/keyboards/kkatano/bakeneko80/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x8DEF", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["E6", "B0", "B1", "B7", "D1", "D0"] diff --git a/keyboards/kkatano/bakeneko80/rules.mk b/keyboards/kkatano/bakeneko80/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/kkatano/bakeneko80/rules.mk +++ /dev/null @@ -1,12 +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 -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/kkatano/wallaby/info.json b/keyboards/kkatano/wallaby/keyboard.json similarity index 97% rename from keyboards/kkatano/wallaby/info.json rename to keyboards/kkatano/wallaby/keyboard.json index 6939509fac7..e7c76c46a0a 100644 --- a/keyboards/kkatano/wallaby/info.json +++ b/keyboards/kkatano/wallaby/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5967", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"], "rows": ["B5", "B4", "B3", "B2", "B1", "B0"] diff --git a/keyboards/kkatano/wallaby/rules.mk b/keyboards/kkatano/wallaby/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/kkatano/wallaby/rules.mk +++ /dev/null @@ -1,12 +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 -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/kkatano/yurei/info.json b/keyboards/kkatano/yurei/keyboard.json similarity index 97% rename from keyboards/kkatano/yurei/info.json rename to keyboards/kkatano/yurei/keyboard.json index 20430f84903..32490148465 100644 --- a/keyboards/kkatano/yurei/info.json +++ b/keyboards/kkatano/yurei/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5D5E", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"], "rows": ["B5", "B4", "B3", "B2", "B1", "B0"] diff --git a/keyboards/kkatano/yurei/rules.mk b/keyboards/kkatano/yurei/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/kkatano/yurei/rules.mk +++ /dev/null @@ -1,12 +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 -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/knobgoblin/info.json b/keyboards/knobgoblin/keyboard.json similarity index 89% rename from keyboards/knobgoblin/info.json rename to keyboards/knobgoblin/keyboard.json index bdf826777d5..8494eea4659 100644 --- a/keyboards/knobgoblin/info.json +++ b/keyboards/knobgoblin/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "oled": true + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6"], "rows": ["D4", "B6", "B2", "B3", "B1"] diff --git a/keyboards/knobgoblin/rules.mk b/keyboards/knobgoblin/rules.mk deleted file mode 100644 index 41cfa4949a4..00000000000 --- a/keyboards/knobgoblin/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 = 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 - -ENCODER_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/knops/mini/info.json b/keyboards/knops/mini/keyboard.json similarity index 82% rename from keyboards/knops/mini/info.json rename to keyboards/knops/mini/keyboard.json index fc6e8053c38..721e3d7b36b 100644 --- a/keyboards/knops/mini/info.json +++ b/keyboards/knops/mini/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x9460", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D0"] diff --git a/keyboards/knops/mini/rules.mk b/keyboards/knops/mini/rules.mk deleted file mode 100644 index b6e2a5f9a41..00000000000 --- a/keyboards/knops/mini/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/kona_classic/info.json b/keyboards/kona_classic/keyboard.json similarity index 99% rename from keyboards/kona_classic/info.json rename to keyboards/kona_classic/keyboard.json index 7202c358696..01388f363a8 100644 --- a/keyboards/kona_classic/info.json +++ b/keyboards/kona_classic/keyboard.json @@ -29,6 +29,14 @@ "ws2812": { "pin": "B2" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F4", "B5", "B4", "D7", "D6", "B0", "B1", "B3", "D2", "B7", "D0", "D1", "D3", "C6", "C7"], "rows": ["F1", "F5", "F6", "F7", "B6"] diff --git a/keyboards/kona_classic/rules.mk b/keyboards/kona_classic/rules.mk deleted file mode 100644 index b6e2a5f9a41..00000000000 --- a/keyboards/kona_classic/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/kopibeng/mnk65/info.json b/keyboards/kopibeng/mnk65/keyboard.json similarity index 99% rename from keyboards/kopibeng/mnk65/info.json rename to keyboards/kopibeng/mnk65/keyboard.json index 49944100cf7..24113c3ce51 100644 --- a/keyboards/kopibeng/mnk65/info.json +++ b/keyboards/kopibeng/mnk65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0651", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F5"], "rows": ["B3", "D0", "F6", "F4", "F1"] diff --git a/keyboards/kopibeng/mnk65/rules.mk b/keyboards/kopibeng/mnk65/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/kopibeng/mnk65/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 = 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/kopibeng/mnk88/info.json b/keyboards/kopibeng/mnk88/keyboard.json similarity index 99% rename from keyboards/kopibeng/mnk88/info.json rename to keyboards/kopibeng/mnk88/keyboard.json index 67ef66c6479..8a63d6562b0 100644 --- a/keyboards/kopibeng/mnk88/info.json +++ b/keyboards/kopibeng/mnk88/keyboard.json @@ -25,6 +25,15 @@ "rgb_test": true } }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A2", "A1", "A0", "B11", "B10", "B2", "F1", "B1", "B0", "A7", "A6", "A5", "F0", "A4", "C15", "C14", "C13"], "rows": ["A8", "B15", "A9", "B12", "A3", "B14"] diff --git a/keyboards/kopibeng/mnk88/rules.mk b/keyboards/kopibeng/mnk88/rules.mk deleted file mode 100644 index 65bc2097f51..00000000000 --- a/keyboards/kopibeng/mnk88/rules.mk +++ /dev/null @@ -1,14 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no # Enable Encoder - diff --git a/keyboards/kopibeng/typ65/info.json b/keyboards/kopibeng/typ65/keyboard.json similarity index 99% rename from keyboards/kopibeng/typ65/info.json rename to keyboards/kopibeng/typ65/keyboard.json index d142f099d84..c2598cadcb6 100644 --- a/keyboards/kopibeng/typ65/info.json +++ b/keyboards/kopibeng/typ65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x065E", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F5", "F4", "F1", "F0", "E6"], "rows": ["D0", "D1", "D2", "F6", "B0"] diff --git a/keyboards/kopibeng/typ65/rules.mk b/keyboards/kopibeng/typ65/rules.mk deleted file mode 100644 index 76764d6e0d9..00000000000 --- a/keyboards/kopibeng/typ65/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 -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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no # Enable Encoder \ No newline at end of file diff --git a/keyboards/kopibeng/xt60/info.json b/keyboards/kopibeng/xt60/keyboard.json similarity index 99% rename from keyboards/kopibeng/xt60/info.json rename to keyboards/kopibeng/xt60/keyboard.json index 2eefea13108..70b5a06ab4e 100644 --- a/keyboards/kopibeng/xt60/info.json +++ b/keyboards/kopibeng/xt60/keyboard.json @@ -24,6 +24,15 @@ "ws2812": { "pin": "F6" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "F5", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1"], "rows": ["F7", "F4", "D0", "B3", "B7"] diff --git a/keyboards/kopibeng/xt60/rules.mk b/keyboards/kopibeng/xt60/rules.mk deleted file mode 100644 index 0b221b7e17a..00000000000 --- a/keyboards/kopibeng/xt60/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/kopibeng/xt60_singa/info.json b/keyboards/kopibeng/xt60_singa/keyboard.json similarity index 99% rename from keyboards/kopibeng/xt60_singa/info.json rename to keyboards/kopibeng/xt60_singa/keyboard.json index 7ccfee941d0..844d9b7aca6 100644 --- a/keyboards/kopibeng/xt60_singa/info.json +++ b/keyboards/kopibeng/xt60_singa/keyboard.json @@ -24,6 +24,15 @@ "ws2812": { "pin": "F6" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "F5", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1"], "rows": ["F7", "F4", "D0", "B3", "B7"] diff --git a/keyboards/kopibeng/xt60_singa/rules.mk b/keyboards/kopibeng/xt60_singa/rules.mk deleted file mode 100644 index 0b221b7e17a..00000000000 --- a/keyboards/kopibeng/xt60_singa/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/kopibeng/xt65/info.json b/keyboards/kopibeng/xt65/keyboard.json similarity index 98% rename from keyboards/kopibeng/xt65/info.json rename to keyboards/kopibeng/xt65/keyboard.json index d761667b9dd..f5d53e0af42 100644 --- a/keyboards/kopibeng/xt65/info.json +++ b/keyboards/kopibeng/xt65/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0650", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "B6", "C6", "C7", "F0", "F1", "F4", "F5", "F6", "F7", "B2", "B3", "B7"], "rows": ["B5", "B4", "D7", "D6", "D4"] diff --git a/keyboards/kopibeng/xt65/rules.mk b/keyboards/kopibeng/xt65/rules.mk deleted file mode 100644 index 45377383806..00000000000 --- a/keyboards/kopibeng/xt65/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 = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kopibeng/xt8x/info.json b/keyboards/kopibeng/xt8x/keyboard.json similarity index 99% rename from keyboards/kopibeng/xt8x/info.json rename to keyboards/kopibeng/xt8x/keyboard.json index 882dc0521aa..379ca9ee679 100644 --- a/keyboards/kopibeng/xt8x/info.json +++ b/keyboards/kopibeng/xt8x/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x8788", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A2", "A1", "A0", "B11", "B10", "B2", "F1", "B1", "B0", "A7", "A6", "A5", "F0", "A4", "C15", "C14", "C13"], "rows": ["A8", "B15", "A9", "B12", "A3", "B14"] diff --git a/keyboards/kopibeng/xt8x/rules.mk b/keyboards/kopibeng/xt8x/rules.mk deleted file mode 100644 index 65bc2097f51..00000000000 --- a/keyboards/kopibeng/xt8x/rules.mk +++ /dev/null @@ -1,14 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no # Enable Encoder - diff --git a/keyboards/kprepublic/bm16s/info.json b/keyboards/kprepublic/bm16s/keyboard.json similarity index 89% rename from keyboards/kprepublic/bm16s/info.json rename to keyboards/kprepublic/bm16s/keyboard.json index de0d51cc4b2..c1dce5d3009 100644 --- a/keyboards/kprepublic/bm16s/info.json +++ b/keyboards/kprepublic/bm16s/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "E2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "D4", "D6"], "rows": ["D1", "D0", "D3", "D2"] diff --git a/keyboards/kprepublic/bm16s/rules.mk b/keyboards/kprepublic/bm16s/rules.mk deleted file mode 100755 index 483ffc81068..00000000000 --- a/keyboards/kprepublic/bm16s/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 = 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 -RGBLIGHT_ENABLE = yes diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/info.json b/keyboards/kprepublic/bm40hsrgb/rev1/keyboard.json similarity index 95% rename from keyboards/kprepublic/bm40hsrgb/rev1/info.json rename to keyboards/kprepublic/bm40hsrgb/rev1/keyboard.json index c50ac648d04..83da66a0a1c 100644 --- a/keyboards/kprepublic/bm40hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm40hsrgb/rev1/keyboard.json @@ -64,6 +64,15 @@ "rgblight": { "max_brightness": 180 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B6", "C6", "B4", "D7", "D4", "D6", "C7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B3", "B2", "E6", "B5"] diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm40hsrgb/rev1/rules.mk deleted file mode 100755 index b0daa10a9ce..00000000000 --- a/keyboards/kprepublic/bm40hsrgb/rev1/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 = 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 # Audio output -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/kprepublic/bm43a/info.json b/keyboards/kprepublic/bm43a/keyboard.json similarity index 94% rename from keyboards/kprepublic/bm43a/info.json rename to keyboards/kprepublic/bm43a/keyboard.json index 041da2164d1..79c089c68cf 100644 --- a/keyboards/kprepublic/bm43a/info.json +++ b/keyboards/kprepublic/bm43a/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D1", "F4", "F1", "F0"] diff --git a/keyboards/kprepublic/bm43a/rules.mk b/keyboards/kprepublic/bm43a/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/kprepublic/bm43a/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/kprepublic/bm43hsrgb/info.json b/keyboards/kprepublic/bm43hsrgb/keyboard.json similarity index 94% rename from keyboards/kprepublic/bm43hsrgb/info.json rename to keyboards/kprepublic/bm43hsrgb/keyboard.json index 93821f3b53e..9fa40bdd9cc 100755 --- a/keyboards/kprepublic/bm43hsrgb/info.json +++ b/keyboards/kprepublic/bm43hsrgb/keyboard.json @@ -29,6 +29,15 @@ "alternating": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C6", "D2", "D1", "D0", "D7", "D6", "D4", "D5", "D3", "B7", "B3", "B2"], "rows": ["E6", "B6", "B4", "B5"] diff --git a/keyboards/kprepublic/bm43hsrgb/rules.mk b/keyboards/kprepublic/bm43hsrgb/rules.mk deleted file mode 100755 index f8265c4c244..00000000000 --- a/keyboards/kprepublic/bm43hsrgb/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -KEY_LOCK_ENABLE = no diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keyboard.json similarity index 96% rename from keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keyboard.json index 5840054b8cf..d7923b84320 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keyboard.json @@ -78,6 +78,15 @@ "twinkle": true } }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk deleted file mode 100644 index 7b60a214125..00000000000 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/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 -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 diff --git a/keyboards/kprepublic/cospad/info.json b/keyboards/kprepublic/cospad/keyboard.json similarity index 97% rename from keyboards/kprepublic/cospad/info.json rename to keyboards/kprepublic/cospad/keyboard.json index 02551a2f46f..233e258e1d7 100644 --- a/keyboards/kprepublic/cospad/info.json +++ b/keyboards/kprepublic/cospad/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xB1E5", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7"], "rows": ["D0", "D1", "D2", "D3", "D4", "D5"] diff --git a/keyboards/kprepublic/cospad/rules.mk b/keyboards/kprepublic/cospad/rules.mk deleted file mode 100644 index 1955f1d315b..00000000000 --- a/keyboards/kprepublic/cospad/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kprepublic/jj4x4/info.json b/keyboards/kprepublic/jj4x4/keyboard.json similarity index 89% rename from keyboards/kprepublic/jj4x4/info.json rename to keyboards/kprepublic/jj4x4/keyboard.json index 5fc9c493430..2f53db2e88e 100644 --- a/keyboards/kprepublic/jj4x4/info.json +++ b/keyboards/kprepublic/jj4x4/keyboard.json @@ -9,6 +9,16 @@ "device_version": "2.0.0", "max_power": 100 }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A1", "A0", "A2", "A3"], "rows": ["B5", "B0", "B3", "B4"] diff --git a/keyboards/kprepublic/jj4x4/rules.mk b/keyboards/kprepublic/jj4x4/rules.mk deleted file mode 100644 index 5b9cc80e47a..00000000000 --- a/keyboards/kprepublic/jj4x4/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 = 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 diff --git a/keyboards/ktec/daisy/info.json b/keyboards/ktec/daisy/keyboard.json similarity index 96% rename from keyboards/ktec/daisy/info.json rename to keyboards/ktec/daisy/keyboard.json index 32a289dace2..3d230b03f48 100644 --- a/keyboards/ktec/daisy/info.json +++ b/keyboards/ktec/daisy/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xD7DC", "device_version": "5.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6"], "rows": ["D2", "D3", "D5", "B7"] diff --git a/keyboards/ktec/daisy/rules.mk b/keyboards/ktec/daisy/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/ktec/daisy/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/keyboard.json similarity index 85% rename from keyboards/ktec/staryu/info.json rename to keyboards/ktec/staryu/keyboard.json index ec29a53168f..a2799703be5 100644 --- a/keyboards/ktec/staryu/info.json +++ b/keyboards/ktec/staryu/keyboard.json @@ -37,6 +37,16 @@ }, "processor": "atmega32u2", "bootloader": "lufa-dfu", + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "direct": [ [null, "D0", "D1"], diff --git a/keyboards/ktec/staryu/rules.mk b/keyboards/ktec/staryu/rules.mk deleted file mode 100755 index 8a6e2c7b715..00000000000 --- a/keyboards/ktec/staryu/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kv/revt/info.json b/keyboards/kv/revt/keyboard.json similarity index 97% rename from keyboards/kv/revt/info.json rename to keyboards/kv/revt/keyboard.json index 7697f2acbc0..c54a4ba537c 100644 --- a/keyboards/kv/revt/info.json +++ b/keyboards/kv/revt/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6520", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "B6", "B5", "B4", "B3", "B2", "B14", "B1", "B15", "B0", "B9", "B10", "B11", "B12", "A14", "A13", "A4", "A5", "A7", "A8", "A15"], "rows": ["A6", "B13", "B8", "A0", "A1", "A2"] diff --git a/keyboards/kv/revt/rules.mk b/keyboards/kv/revt/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/kv/revt/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 = 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/kwub/bloop/info.json b/keyboards/kwub/bloop/keyboard.json similarity index 98% rename from keyboards/kwub/bloop/info.json rename to keyboards/kwub/bloop/keyboard.json index d0a45bccfc4..b482b571be3 100644 --- a/keyboards/kwub/bloop/info.json +++ b/keyboards/kwub/bloop/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "F6", "F1", "F7", "F0", "B0", "B7", "D3", "D2", "D1", "D5", "D4", "D6"], "rows": ["F5", "F4", "C6", "C7", "D7"] diff --git a/keyboards/kwub/bloop/rules.mk b/keyboards/kwub/bloop/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/kwub/bloop/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 = 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/ky01/info.json b/keyboards/ky01/keyboard.json similarity index 96% rename from keyboards/ky01/info.json rename to keyboards/ky01/keyboard.json index 3439c6d768a..b9e4eeef70f 100644 --- a/keyboards/ky01/info.json +++ b/keyboards/ky01/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4B59", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6"], "rows": ["E6", "B5", "B4", "D7", "D4", "D6"] diff --git a/keyboards/ky01/rules.mk b/keyboards/ky01/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/ky01/rules.mk +++ /dev/null @@ -1,12 +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 -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 From 80b72487ce053f128817c5d4c625a63cb3cf9c10 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 15 Mar 2024 01:42:33 +0000 Subject: [PATCH 031/333] Migrate features from rules.mk to data drive - LMN (#23277) --- .../labbeminiv1/{info.json => keyboard.json} | 8 ++++++++ keyboards/labbe/labbeminiv1/rules.mk | 12 ------------ .../labyrinth75/{info.json => keyboard.json} | 9 +++++++++ keyboards/labyrinth75/rules.mk | 12 ------------ .../laneware/lpad/{info.json => keyboard.json} | 9 +++++++++ keyboards/laneware/lpad/rules.mk | 14 -------------- .../laneware/lw67/{info.json => keyboard.json} | 9 +++++++++ keyboards/laneware/lw67/rules.mk | 13 ------------- .../laneware/lw75/{info.json => keyboard.json} | 9 +++++++++ keyboards/laneware/lw75/rules.mk | 13 ------------- .../macro1/{info.json => keyboard.json} | 9 +++++++++ keyboards/laneware/macro1/rules.mk | 13 ------------- .../latin60rgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/latincompass/latin60rgb/rules.mk | 13 ------------- .../latinpad/{info.json => keyboard.json} | 11 +++++++++++ keyboards/latincompass/latinpad/rules.mk | 15 --------------- .../bolt/{info.json => keyboard.json} | 9 +++++++++ keyboards/lazydesigners/bolt/rules.mk | 12 ------------ .../cassette8/{info.json => keyboard.json} | 9 +++++++++ keyboards/lazydesigners/cassette8/rules.mk | 12 ------------ .../dimpleplus/{info.json => keyboard.json} | 10 ++++++++++ keyboards/lazydesigners/dimpleplus/rules.mk | 13 ------------- .../the30/{info.json => keyboard.json} | 9 +++++++++ keyboards/lazydesigners/the30/rules.mk | 12 ------------ .../the40/{info.json => keyboard.json} | 10 ++++++++++ keyboards/lazydesigners/the40/rules.mk | 12 ------------ .../the50/{info.json => keyboard.json} | 8 ++++++++ keyboards/lazydesigners/the50/rules.mk | 11 ----------- .../the60/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/lazydesigners/the60/rev1/rules.mk | 10 ---------- .../the60/rev2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/lazydesigners/the60/rev2/rules.mk | 12 ------------ .../bigknob/{info.json => keyboard.json} | 10 ++++++++++ keyboards/leafcutterlabs/bigknob/rules.mk | 13 ------------- .../finger65/{info.json => keyboard.json} | 8 ++++++++ keyboards/leeku/finger65/rules.mk | 9 --------- .../lfkpad/{info.json => keyboard.json} | 8 ++++++++ keyboards/lfkeyboards/lfkpad/rules.mk | 11 ----------- .../dolice/{info.json => keyboard.json} | 9 +++++++++ keyboards/linworks/dolice/rules.mk | 12 ------------ .../fave104/{info.json => keyboard.json} | 9 +++++++++ keyboards/linworks/fave104/rules.mk | 14 -------------- .../fave87/{info.json => keyboard.json} | 10 ++++++++++ keyboards/linworks/fave87/rules.mk | 11 ----------- .../whale75/{info.json => keyboard.json} | 11 +++++++++++ keyboards/linworks/whale75/rules.mk | 14 -------------- .../mute/{info.json => keyboard.json} | 9 +++++++++ keyboards/littlealby/mute/rules.mk | 12 ------------ .../{info.json => keyboard.json} | 9 +++++++++ .../lizard_trick/tenkey_plusplus/rules.mk | 13 ------------- .../bongopad/{info.json => keyboard.json} | 11 +++++++++++ keyboards/ll3macorn/bongopad/rules.mk | 15 --------------- .../lm60n/{info.json => keyboard.json} | 9 +++++++++ keyboards/lm_keyboard/lm60n/rules.mk | 12 ------------ .../corin/{info.json => keyboard.json} | 9 +++++++++ keyboards/longnald/corin/rules.mk | 12 ------------ .../lyso1/lefishe/{info.json => keyboard.json} | 9 +++++++++ keyboards/lyso1/lefishe/rules.mk | 14 -------------- keyboards/m10a/{info.json => keyboard.json} | 10 ++++++++++ keyboards/m10a/rules.mk | 14 -------------- .../m4_a/{info.json => keyboard.json} | 8 ++++++++ keyboards/machine_industries/m4_a/rules.mk | 12 ------------ .../mach3/{info.json => keyboard.json} | 10 ++++++++++ keyboards/machkeyboards/mach3/rules.mk | 13 ------------- .../mf34/{info.json => keyboard.json} | 9 +++++++++ keyboards/magic_force/mf34/rules.mk | 11 ----------- .../makeymakey/{info.json => keyboard.json} | 8 ++++++++ keyboards/makeymakey/rules.mk | 12 ------------ keyboards/makrosu/{info.json => keyboard.json} | 9 +++++++++ keyboards/makrosu/rules.mk | 13 ------------- .../macro/{info.json => keyboard.json} | 10 ++++++++++ keyboards/manyboard/macro/rules.mk | 13 ------------- .../6ball/{info.json => keyboard.json} | 10 ++++++++++ keyboards/maple_computing/6ball/rules.mk | 13 ------------- .../c39/{info.json => keyboard.json} | 8 ++++++++ keyboards/maple_computing/c39/rules.mk | 12 ------------ .../the_ruler/{info.json => keyboard.json} | 9 +++++++++ keyboards/maple_computing/the_ruler/rules.mk | 12 ------------ .../leftover30/{info.json => keyboard.json} | 9 +++++++++ keyboards/marksard/leftover30/rules.mk | 12 ------------ .../rev_a/{info.json => keyboard.json} | 8 ++++++++ .../masterworks/classy_tkl/rev_a/rules.mk | 12 ------------ .../cain_re/{info.json => keyboard.json} | 9 +++++++++ keyboards/matrix/cain_re/rules.mk | 12 ------------ .../matrix/falcon/{info.json => keyboard.json} | 9 +++++++++ keyboards/matrix/falcon/rules.mk | 12 ------------ .../m12og/rev2/{info.json => keyboard.json} | 9 +++++++++ keyboards/matrix/m12og/rev2/rules.mk | 12 ------------ .../matrix/me/{info.json => keyboard.json} | 9 +++++++++ keyboards/matrix/me/rules.mk | 12 ------------ .../m3n3van/{info.json => keyboard.json} | 9 +++++++++ keyboards/matthewdias/m3n3van/rules.mk | 13 ------------- .../minim/{info.json => keyboard.json} | 8 ++++++++ keyboards/matthewdias/minim/rules.mk | 12 ------------ .../model_v/{info.json => keyboard.json} | 8 ++++++++ keyboards/matthewdias/model_v/rules.mk | 12 ------------ .../txuu/{info.json => keyboard.json} | 8 ++++++++ keyboards/matthewdias/txuu/rules.mk | 12 ------------ .../pulse4k/{info.json => keyboard.json} | 10 ++++++++++ keyboards/maxr1998/pulse4k/rules.mk | 13 ------------- keyboards/mb44/{info.json => keyboard.json} | 9 +++++++++ keyboards/mb44/rules.mk | 13 ------------- keyboards/mc_76k/{info.json => keyboard.json} | 8 ++++++++ keyboards/mc_76k/rules.mk | 12 ------------ .../miniashen40/{info.json => keyboard.json} | 8 ++++++++ keyboards/mechanickeys/miniashen40/rules.mk | 12 ------------ .../acr60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mechkeys/acr60/rules.mk | 12 ------------ .../alu84/{info.json => keyboard.json} | 11 +++++++++++ keyboards/mechkeys/alu84/rules.mk | 13 ------------- .../espectro/{info.json => keyboard.json} | 11 +++++++++++ keyboards/mechkeys/espectro/rules.mk | 13 ------------- .../mechkeys/mk60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mechkeys/mk60/rules.mk | 12 ------------ .../foundation/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mechlovin/foundation/rules.mk | 13 ------------- .../hex6c/{info.json => keyboard.json} | 9 +++++++++ keyboards/mechlovin/hex6c/rules.mk | 11 ----------- .../infinity88/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mechlovin/infinity88/rules.mk | 11 ----------- .../infinityce/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mechlovin/infinityce/rules.mk | 12 ------------ .../kanu/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mechlovin/kanu/rules.mk | 12 ------------ .../kay60/{info.json => keyboard.json} | 9 +++++++++ keyboards/mechlovin/kay60/rules.mk | 12 ------------ .../kay65/{info.json => keyboard.json} | 9 +++++++++ keyboards/mechlovin/kay65/rules.mk | 12 ------------ .../olly/orion/{info.json => keyboard.json} | 9 +++++++++ keyboards/mechlovin/olly/orion/rules.mk | 13 ------------- .../pisces/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mechlovin/pisces/rules.mk | 12 ------------ .../tmkl/{info.json => keyboard.json} | 9 +++++++++ keyboards/mechlovin/tmkl/rules.mk | 11 ----------- .../zed60/{info.json => keyboard.json} | 9 +++++++++ keyboards/mechlovin/zed60/rules.mk | 12 ------------ .../dawn/{info.json => keyboard.json} | 8 ++++++++ keyboards/mechstudio/dawn/rules.mk | 12 ------------ .../mercutio/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mechwild/mercutio/rules.mk | 14 -------------- .../murphpad/{info.json => keyboard.json} | 11 +++++++++++ keyboards/mechwild/murphpad/rules.mk | 14 -------------- .../mehkee96/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mehkee96/rules.mk | 10 ---------- .../zoom65/{info.json => keyboard.json} | 9 +++++++++ keyboards/meletrix/zoom65/rules.mk | 13 ------------- .../zoom65_lite/{info.json => keyboard.json} | 9 +++++++++ keyboards/meletrix/zoom65_lite/rules.mk | 13 ------------- .../zoom87/{info.json => keyboard.json} | 9 +++++++++ keyboards/meletrix/zoom87/rules.mk | 12 ------------ .../mj6xy/rev3/{info.json => keyboard.json} | 10 ++++++++++ keyboards/melgeek/mj6xy/rev3/rules.mk | 12 ------------ keyboards/meme/{info.json => keyboard.json} | 8 ++++++++ keyboards/meme/rules.mk | 11 ----------- keyboards/meow48/{info.json => keyboard.json} | 10 ++++++++++ keyboards/meow48/rules.mk | 13 ------------- keyboards/meow65/{info.json => keyboard.json} | 8 ++++++++ keyboards/meow65/rules.mk | 12 ------------ .../iso_macro/{info.json => keyboard.json} | 10 ++++++++++ keyboards/merge/iso_macro/rules.mk | 13 ------------- .../merge/uc1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/merge/uc1/rules.mk | 13 ------------- .../mesa/mesa_tkl/{info.json => keyboard.json} | 8 ++++++++ keyboards/mesa/mesa_tkl/rules.mk | 12 ------------ .../mikeneko65/{info.json => keyboard.json} | 8 ++++++++ keyboards/mikeneko65/rules.mk | 12 ------------ .../millipad/{info.json => keyboard.json} | 9 +++++++++ keyboards/millipad/rules.mk | 13 ------------- .../mini_elixivy/{info.json => keyboard.json} | 9 +++++++++ keyboards/mini_elixivy/rules.mk | 13 ------------- .../{info.json => keyboard.json} | 9 +++++++++ keyboards/mini_ten_key_plus/rules.mk | 13 ------------- .../minimacro5/{info.json => keyboard.json} | 10 ++++++++++ keyboards/minimacro5/rules.mk | 13 ------------- .../index_tab/{info.json => keyboard.json} | 9 +++++++++ keyboards/minimon/index_tab/rules.mk | 12 ------------ .../chocolatebar/{info.json => keyboard.json} | 10 ++++++++++ keyboards/misonoworks/chocolatebar/rules.mk | 14 -------------- .../karina/{info.json => keyboard.json} | 10 ++++++++++ keyboards/misonoworks/karina/rules.mk | 13 ------------- .../knife66/{info.json => keyboard.json} | 9 +++++++++ keyboards/misterknife/knife66/rules.mk | 13 ------------- .../knife66_iso/{info.json => keyboard.json} | 9 +++++++++ keyboards/misterknife/knife66_iso/rules.mk | 13 ------------- keyboards/miuni32/{info.json => keyboard.json} | 9 +++++++++ keyboards/miuni32/rules.mk | 12 ------------ keyboards/mixi/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mixi/rules.mk | 13 ------------- .../ml/gas75/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ml/gas75/rules.mk | 18 ------------------ .../m48/rev1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mlego/m48/rev1/rules.mk | 13 ------------- .../m60/rev1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mlego/m60/rev1/rules.mk | 14 -------------- .../mmkzoo65/{info.json => keyboard.json} | 8 ++++++++ keyboards/mmkzoo65/rules.mk | 13 ------------- keyboards/mntre/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mntre/rules.mk | 13 ------------- .../m65ha_alpha/{info.json => keyboard.json} | 8 ++++++++ keyboards/mode/m65ha_alpha/rules.mk | 12 ------------ .../m65hi_alpha/{info.json => keyboard.json} | 8 ++++++++ keyboards/mode/m65hi_alpha/rules.mk | 12 ------------ .../mode/m65s/{info.json => keyboard.json} | 8 ++++++++ keyboards/mode/m65s/rules.mk | 12 ------------ .../m80v1/m80h/{info.json => keyboard.json} | 8 ++++++++ keyboards/mode/m80v1/m80h/rules.mk | 13 ------------- .../m80v1/m80s/{info.json => keyboard.json} | 8 ++++++++ keyboards/mode/m80v1/m80s/rules.mk | 13 ------------- .../m80v2/m80v2h/{info.json => keyboard.json} | 8 ++++++++ keyboards/mode/m80v2/m80v2h/rules.mk | 13 ------------- .../m80v2/m80v2s/{info.json => keyboard.json} | 8 ++++++++ keyboards/mode/m80v2/m80v2s/rules.mk | 13 ------------- .../ginkgo65/{info.json => keyboard.json} | 9 +++++++++ keyboards/mokey/ginkgo65/rules.mk | 12 ------------ .../ginkgo65hot/{info.json => keyboard.json} | 9 +++++++++ keyboards/mokey/ginkgo65hot/rules.mk | 12 ------------ .../mokey/ibis80/{info.json => keyboard.json} | 8 ++++++++ keyboards/mokey/ibis80/rules.mk | 12 ------------ .../mokey/mokey63/{info.json => keyboard.json} | 8 ++++++++ keyboards/mokey/mokey63/rules.mk | 12 ------------ .../mokey/mokey64/{info.json => keyboard.json} | 8 ++++++++ keyboards/mokey/mokey64/rules.mk | 12 ------------ .../mokey/xox70/{info.json => keyboard.json} | 8 ++++++++ keyboards/mokey/xox70/rules.mk | 12 ------------ .../xox70hot/{info.json => keyboard.json} | 8 ++++++++ keyboards/mokey/xox70hot/rules.mk | 12 ------------ keyboards/monarch/{info.json => keyboard.json} | 11 +++++++++++ keyboards/monarch/rules.mk | 15 --------------- .../xo87/rgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/monstargear/xo87/rgb/rules.mk | 14 -------------- .../solderable/{info.json => keyboard.json} | 10 ++++++++++ keyboards/monstargear/xo87/solderable/rules.mk | 12 ------------ .../rewind/{info.json => keyboard.json} | 8 ++++++++ keyboards/montsinger/rewind/rules.mk | 12 ------------ keyboards/morizon/{info.json => keyboard.json} | 8 ++++++++ keyboards/morizon/rules.mk | 12 ------------ .../mb17/{info.json => keyboard.json} | 8 ++++++++ keyboards/mountainblocks/mb17/rules.mk | 12 ------------ .../m63_rgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/mss_studio/m63_rgb/rules.mk | 15 --------------- .../m64_rgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/mss_studio/m64_rgb/rules.mk | 15 --------------- .../mt/blocked65/{info.json => keyboard.json} | 9 +++++++++ keyboards/mt/blocked65/rules.mk | 12 ------------ keyboards/mt/mt40/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mt/mt40/rules.mk | 12 ------------ .../mt/mt980/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mt/mt980/rules.mk | 13 ------------- .../mtb60/hotswap/{info.json => keyboard.json} | 9 +++++++++ keyboards/mtbkeys/mtb60/hotswap/rules.mk | 12 ------------ .../mtb60/solder/{info.json => keyboard.json} | 9 +++++++++ keyboards/mtbkeys/mtb60/solder/rules.mk | 12 ------------ .../alicekk/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mwstudio/alicekk/rules.mk | 15 --------------- .../mw65_black/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mwstudio/mw65_black/rules.mk | 13 ------------- .../mw65_rgb/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mwstudio/mw65_rgb/rules.mk | 16 ---------------- .../mwstudio/mw75/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mwstudio/mw75/rules.mk | 14 -------------- .../mw75r2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mwstudio/mw75r2/rules.mk | 14 -------------- .../wyvern/{info.json => keyboard.json} | 8 ++++++++ keyboards/mysticworks/wyvern/rules.mk | 12 ------------ .../nacly/ua62/{info.json => keyboard.json} | 8 ++++++++ keyboards/nacly/ua62/rules.mk | 12 ------------ .../ncc1701kb/{info.json => keyboard.json} | 11 +++++++++++ keyboards/ncc1701kb/rules.mk | 14 -------------- keyboards/neito/{info.json => keyboard.json} | 11 +++++++++++ keyboards/neito/rules.mk | 13 ------------- keyboards/nemui/{info.json => keyboard.json} | 8 ++++++++ keyboards/nemui/rules.mk | 13 ------------- .../element_hs/{info.json => keyboard.json} | 10 ++++++++++ keyboards/neokeys/g67/element_hs/rules.mk | 14 -------------- .../g67/hotswap/{info.json => keyboard.json} | 10 ++++++++++ keyboards/neokeys/g67/hotswap/rules.mk | 14 -------------- .../g67/soldered/{info.json => keyboard.json} | 10 ++++++++++ keyboards/neokeys/g67/soldered/rules.mk | 12 ------------ .../newgame40/{info.json => keyboard.json} | 10 ++++++++++ keyboards/newgame40/rules.mk | 14 -------------- .../stream15/{info.json => keyboard.json} | 8 ++++++++ keyboards/nibiria/stream15/rules.mk | 13 ------------- .../hailey/{info.json => keyboard.json} | 9 +++++++++ keyboards/nightingale_studios/hailey/rules.mk | 13 ------------- .../alter/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/nightly_boards/alter/rev1/rules.mk | 12 ------------ .../alter_lite/{info.json => keyboard.json} | 8 ++++++++ keyboards/nightly_boards/alter_lite/rules.mk | 11 ----------- .../daily60/{info.json => keyboard.json} | 8 ++++++++ keyboards/nightly_boards/daily60/rules.mk | 11 ----------- .../jisoo/{info.json => keyboard.json} | 8 ++++++++ keyboards/nightly_boards/jisoo/rules.mk | 11 ----------- .../n2/{info.json => keyboard.json} | 9 +++++++++ keyboards/nightly_boards/n2/rules.mk | 12 ------------ .../n87/{info.json => keyboard.json} | 10 ++++++++++ keyboards/nightly_boards/n87/rules.mk | 13 ------------- .../n9/{info.json => keyboard.json} | 9 +++++++++ keyboards/nightly_boards/n9/rules.mk | 11 ----------- .../octopadplus/{info.json => keyboard.json} | 10 ++++++++++ keyboards/nightly_boards/octopadplus/rules.mk | 13 ------------- .../ph_arisu/{info.json => keyboard.json} | 8 ++++++++ keyboards/nightly_boards/ph_arisu/rules.mk | 12 ------------ .../nightmare/{info.json => keyboard.json} | 8 ++++++++ keyboards/nightmare/rules.mk | 12 ------------ keyboards/nimrod/{info.json => keyboard.json} | 8 ++++++++ keyboards/nimrod/rules.mk | 12 ------------ .../n60_a/{info.json => keyboard.json} | 8 ++++++++ keyboards/nix_studio/n60_a/rules.mk | 14 -------------- .../day_off/{info.json => keyboard.json} | 9 +++++++++ keyboards/nixkeyboards/day_off/rules.mk | 13 ------------- .../v1/{info.json => keyboard.json} | 8 ++++++++ keyboards/nopunin10did/jabberwocky/v1/rules.mk | 12 ------------ .../v2/{info.json => keyboard.json} | 9 +++++++++ keyboards/nopunin10did/jabberwocky/v2/rules.mk | 12 ------------ .../{info.json => keyboard.json} | 9 +++++++++ .../nopunin10did/kastenwagen1840/rules.mk | 14 -------------- .../kastenwagen48/{info.json => keyboard.json} | 9 +++++++++ keyboards/nopunin10did/kastenwagen48/rules.mk | 14 -------------- .../railroad/rev0/{info.json => keyboard.json} | 8 ++++++++ keyboards/nopunin10did/railroad/rev0/rules.mk | 12 ------------ .../novelkeys/nk1/{info.json => keyboard.json} | 9 +++++++++ keyboards/novelkeys/nk1/rules.mk | 12 ------------ .../novelpad/{info.json => keyboard.json} | 10 ++++++++++ keyboards/novelkeys/novelpad/rules.mk | 12 ------------ .../noxary/220/{info.json => keyboard.json} | 9 +++++++++ keyboards/noxary/220/rules.mk | 12 ------------ .../noxary/268/{info.json => keyboard.json} | 9 +++++++++ keyboards/noxary/268/rules.mk | 12 ------------ .../noxary/268_2/{info.json => keyboard.json} | 9 +++++++++ keyboards/noxary/268_2/rules.mk | 12 ------------ .../268_2_rgb/{info.json => keyboard.json} | 10 ++++++++++ keyboards/noxary/268_2_rgb/rules.mk | 12 ------------ .../noxary/280/{info.json => keyboard.json} | 9 +++++++++ keyboards/noxary/280/rules.mk | 12 ------------ .../noxary/378/{info.json => keyboard.json} | 8 ++++++++ keyboards/noxary/378/rules.mk | 13 ------------- .../valhalla/{info.json => keyboard.json} | 8 ++++++++ keyboards/noxary/valhalla/rules.mk | 13 ------------- .../noxary/vulcan/{info.json => keyboard.json} | 8 ++++++++ keyboards/noxary/vulcan/rules.mk | 12 ------------ .../noxary/x268/{info.json => keyboard.json} | 10 ++++++++++ keyboards/noxary/x268/rules.mk | 12 ------------ keyboards/np12/{info.json => keyboard.json} | 9 +++++++++ keyboards/np12/rules.mk | 13 ------------- .../nyhxis/nfr_70/{info.json => keyboard.json} | 8 ++++++++ keyboards/nyhxis/nfr_70/rules.mk | 12 ------------ 346 files changed, 1572 insertions(+), 2173 deletions(-) rename keyboards/labbe/labbeminiv1/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/labbe/labbeminiv1/rules.mk rename keyboards/labyrinth75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/labyrinth75/rules.mk rename keyboards/laneware/lpad/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/laneware/lpad/rules.mk rename keyboards/laneware/lw67/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/laneware/lw67/rules.mk rename keyboards/laneware/lw75/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/laneware/lw75/rules.mk rename keyboards/laneware/macro1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/laneware/macro1/rules.mk rename keyboards/latincompass/latin60rgb/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/latincompass/latin60rgb/rules.mk rename keyboards/latincompass/latinpad/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/latincompass/latinpad/rules.mk rename keyboards/lazydesigners/bolt/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/lazydesigners/bolt/rules.mk rename keyboards/lazydesigners/cassette8/{info.json => keyboard.json} (87%) delete mode 100755 keyboards/lazydesigners/cassette8/rules.mk rename keyboards/lazydesigners/dimpleplus/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/lazydesigners/dimpleplus/rules.mk rename keyboards/lazydesigners/the30/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/lazydesigners/the30/rules.mk rename keyboards/lazydesigners/the40/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/lazydesigners/the40/rules.mk rename keyboards/lazydesigners/the50/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/lazydesigners/the50/rules.mk rename keyboards/lazydesigners/the60/rev1/{info.json => keyboard.json} (95%) delete mode 100755 keyboards/lazydesigners/the60/rev1/rules.mk rename keyboards/lazydesigners/the60/rev2/{info.json => keyboard.json} (99%) delete mode 100755 keyboards/lazydesigners/the60/rev2/rules.mk rename keyboards/leafcutterlabs/bigknob/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/leafcutterlabs/bigknob/rules.mk rename keyboards/leeku/finger65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/leeku/finger65/rules.mk rename keyboards/lfkeyboards/lfkpad/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/lfkeyboards/lfkpad/rules.mk rename keyboards/linworks/dolice/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/linworks/dolice/rules.mk rename keyboards/linworks/fave104/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/linworks/fave104/rules.mk rename keyboards/linworks/fave87/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/linworks/fave87/rules.mk rename keyboards/linworks/whale75/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/linworks/whale75/rules.mk rename keyboards/littlealby/mute/{info.json => keyboard.json} (74%) delete mode 100644 keyboards/littlealby/mute/rules.mk rename keyboards/lizard_trick/tenkey_plusplus/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/lizard_trick/tenkey_plusplus/rules.mk rename keyboards/ll3macorn/bongopad/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/ll3macorn/bongopad/rules.mk rename keyboards/lm_keyboard/lm60n/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/lm_keyboard/lm60n/rules.mk rename keyboards/longnald/corin/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/longnald/corin/rules.mk rename keyboards/lyso1/lefishe/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/lyso1/lefishe/rules.mk rename keyboards/m10a/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/m10a/rules.mk rename keyboards/machine_industries/m4_a/{info.json => keyboard.json} (80%) delete mode 100644 keyboards/machine_industries/m4_a/rules.mk rename keyboards/machkeyboards/mach3/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/machkeyboards/mach3/rules.mk rename keyboards/magic_force/mf34/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/magic_force/mf34/rules.mk rename keyboards/makeymakey/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/makeymakey/rules.mk rename keyboards/makrosu/{info.json => keyboard.json} (83%) delete mode 100644 keyboards/makrosu/rules.mk rename keyboards/manyboard/macro/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/manyboard/macro/rules.mk rename keyboards/maple_computing/6ball/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/maple_computing/6ball/rules.mk rename keyboards/maple_computing/c39/{info.json => keyboard.json} (93%) delete mode 100755 keyboards/maple_computing/c39/rules.mk rename keyboards/maple_computing/the_ruler/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/maple_computing/the_ruler/rules.mk rename keyboards/marksard/leftover30/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/marksard/leftover30/rules.mk rename keyboards/masterworks/classy_tkl/rev_a/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/masterworks/classy_tkl/rev_a/rules.mk rename keyboards/matrix/cain_re/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/matrix/cain_re/rules.mk rename keyboards/matrix/falcon/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/matrix/falcon/rules.mk rename keyboards/matrix/m12og/rev2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/matrix/m12og/rev2/rules.mk rename keyboards/matrix/me/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/matrix/me/rules.mk rename keyboards/matthewdias/m3n3van/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/matthewdias/m3n3van/rules.mk rename keyboards/matthewdias/minim/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/matthewdias/minim/rules.mk rename keyboards/matthewdias/model_v/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/matthewdias/model_v/rules.mk rename keyboards/matthewdias/txuu/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/matthewdias/txuu/rules.mk rename keyboards/maxr1998/pulse4k/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/maxr1998/pulse4k/rules.mk rename keyboards/mb44/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mb44/rules.mk rename keyboards/mc_76k/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/mc_76k/rules.mk rename keyboards/mechanickeys/miniashen40/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/mechanickeys/miniashen40/rules.mk rename keyboards/mechkeys/acr60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/mechkeys/acr60/rules.mk rename keyboards/mechkeys/alu84/{info.json => keyboard.json} (95%) delete mode 100755 keyboards/mechkeys/alu84/rules.mk rename keyboards/mechkeys/espectro/{info.json => keyboard.json} (98%) delete mode 100755 keyboards/mechkeys/espectro/rules.mk rename keyboards/mechkeys/mk60/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/mechkeys/mk60/rules.mk rename keyboards/mechlovin/foundation/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/foundation/rules.mk rename keyboards/mechlovin/hex6c/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/mechlovin/hex6c/rules.mk rename keyboards/mechlovin/infinity88/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/infinity88/rules.mk rename keyboards/mechlovin/infinityce/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/infinityce/rules.mk rename keyboards/mechlovin/kanu/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/kanu/rules.mk rename keyboards/mechlovin/kay60/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/mechlovin/kay60/rules.mk rename keyboards/mechlovin/kay65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/kay65/rules.mk rename keyboards/mechlovin/olly/orion/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/olly/orion/rules.mk rename keyboards/mechlovin/pisces/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/mechlovin/pisces/rules.mk rename keyboards/mechlovin/tmkl/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mechlovin/tmkl/rules.mk rename keyboards/mechlovin/zed60/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/zed60/rules.mk rename keyboards/mechstudio/dawn/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mechstudio/dawn/rules.mk rename keyboards/mechwild/mercutio/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/mechwild/mercutio/rules.mk rename keyboards/mechwild/murphpad/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/mechwild/murphpad/rules.mk rename keyboards/mehkee96/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mehkee96/rules.mk rename keyboards/meletrix/zoom65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/meletrix/zoom65/rules.mk rename keyboards/meletrix/zoom65_lite/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/meletrix/zoom65_lite/rules.mk rename keyboards/meletrix/zoom87/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/meletrix/zoom87/rules.mk rename keyboards/melgeek/mj6xy/rev3/{info.json => keyboard.json} (79%) delete mode 100755 keyboards/melgeek/mj6xy/rev3/rules.mk rename keyboards/meme/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/meme/rules.mk rename keyboards/meow48/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/meow48/rules.mk rename keyboards/meow65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/meow65/rules.mk rename keyboards/merge/iso_macro/{info.json => keyboard.json} (83%) delete mode 100644 keyboards/merge/iso_macro/rules.mk rename keyboards/merge/uc1/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/merge/uc1/rules.mk rename keyboards/mesa/mesa_tkl/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mesa/mesa_tkl/rules.mk rename keyboards/mikeneko65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mikeneko65/rules.mk rename keyboards/millipad/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/millipad/rules.mk rename keyboards/mini_elixivy/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/mini_elixivy/rules.mk rename keyboards/mini_ten_key_plus/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/mini_ten_key_plus/rules.mk rename keyboards/minimacro5/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/minimacro5/rules.mk rename keyboards/minimon/index_tab/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/minimon/index_tab/rules.mk rename keyboards/misonoworks/chocolatebar/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/misonoworks/chocolatebar/rules.mk rename keyboards/misonoworks/karina/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/misonoworks/karina/rules.mk rename keyboards/misterknife/knife66/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/misterknife/knife66/rules.mk rename keyboards/misterknife/knife66_iso/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/misterknife/knife66_iso/rules.mk rename keyboards/miuni32/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/miuni32/rules.mk rename keyboards/mixi/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/mixi/rules.mk rename keyboards/ml/gas75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ml/gas75/rules.mk rename keyboards/mlego/m48/rev1/{info.json => keyboard.json} (81%) delete mode 100644 keyboards/mlego/m48/rev1/rules.mk rename keyboards/mlego/m60/rev1/{info.json => keyboard.json} (81%) delete mode 100644 keyboards/mlego/m60/rev1/rules.mk rename keyboards/mmkzoo65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mmkzoo65/rules.mk rename keyboards/mntre/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/mntre/rules.mk rename keyboards/mode/m65ha_alpha/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mode/m65ha_alpha/rules.mk rename keyboards/mode/m65hi_alpha/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mode/m65hi_alpha/rules.mk rename keyboards/mode/m65s/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/mode/m65s/rules.mk rename keyboards/mode/m80v1/m80h/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mode/m80v1/m80h/rules.mk rename keyboards/mode/m80v1/m80s/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mode/m80v1/m80s/rules.mk rename keyboards/mode/m80v2/m80v2h/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/mode/m80v2/m80v2h/rules.mk rename keyboards/mode/m80v2/m80v2s/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/mode/m80v2/m80v2s/rules.mk rename keyboards/mokey/ginkgo65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/mokey/ginkgo65/rules.mk rename keyboards/mokey/ginkgo65hot/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/mokey/ginkgo65hot/rules.mk rename keyboards/mokey/ibis80/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mokey/ibis80/rules.mk rename keyboards/mokey/mokey63/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/mokey/mokey63/rules.mk rename keyboards/mokey/mokey64/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/mokey/mokey64/rules.mk rename keyboards/mokey/xox70/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/mokey/xox70/rules.mk rename keyboards/mokey/xox70hot/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mokey/xox70hot/rules.mk rename keyboards/monarch/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/monarch/rules.mk rename keyboards/monstargear/xo87/rgb/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/monstargear/xo87/rgb/rules.mk rename keyboards/monstargear/xo87/solderable/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/monstargear/xo87/solderable/rules.mk rename keyboards/montsinger/rewind/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/montsinger/rewind/rules.mk rename keyboards/morizon/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/morizon/rules.mk rename keyboards/mountainblocks/mb17/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/mountainblocks/mb17/rules.mk rename keyboards/mss_studio/m63_rgb/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mss_studio/m63_rgb/rules.mk rename keyboards/mss_studio/m64_rgb/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mss_studio/m64_rgb/rules.mk rename keyboards/mt/blocked65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mt/blocked65/rules.mk rename keyboards/mt/mt40/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/mt/mt40/rules.mk rename keyboards/mt/mt980/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mt/mt980/rules.mk rename keyboards/mtbkeys/mtb60/hotswap/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/mtbkeys/mtb60/hotswap/rules.mk rename keyboards/mtbkeys/mtb60/solder/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/mtbkeys/mtb60/solder/rules.mk rename keyboards/mwstudio/alicekk/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/mwstudio/alicekk/rules.mk rename keyboards/mwstudio/mw65_black/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/mwstudio/mw65_black/rules.mk rename keyboards/mwstudio/mw65_rgb/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mwstudio/mw65_rgb/rules.mk rename keyboards/mwstudio/mw75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mwstudio/mw75/rules.mk rename keyboards/mwstudio/mw75r2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mwstudio/mw75r2/rules.mk rename keyboards/mysticworks/wyvern/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/mysticworks/wyvern/rules.mk rename keyboards/nacly/ua62/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/nacly/ua62/rules.mk rename keyboards/ncc1701kb/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/ncc1701kb/rules.mk rename keyboards/neito/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/neito/rules.mk rename keyboards/nemui/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/nemui/rules.mk rename keyboards/neokeys/g67/element_hs/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/neokeys/g67/element_hs/rules.mk rename keyboards/neokeys/g67/hotswap/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/neokeys/g67/hotswap/rules.mk rename keyboards/neokeys/g67/soldered/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/neokeys/g67/soldered/rules.mk rename keyboards/newgame40/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/newgame40/rules.mk rename keyboards/nibiria/stream15/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/nibiria/stream15/rules.mk rename keyboards/nightingale_studios/hailey/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/nightingale_studios/hailey/rules.mk rename keyboards/nightly_boards/alter/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/nightly_boards/alter/rev1/rules.mk rename keyboards/nightly_boards/alter_lite/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/nightly_boards/alter_lite/rules.mk rename keyboards/nightly_boards/daily60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/nightly_boards/daily60/rules.mk rename keyboards/nightly_boards/jisoo/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/nightly_boards/jisoo/rules.mk rename keyboards/nightly_boards/n2/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/nightly_boards/n2/rules.mk rename keyboards/nightly_boards/n87/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/nightly_boards/n87/rules.mk rename keyboards/nightly_boards/n9/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/nightly_boards/n9/rules.mk rename keyboards/nightly_boards/octopadplus/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/nightly_boards/octopadplus/rules.mk rename keyboards/nightly_boards/ph_arisu/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/nightly_boards/ph_arisu/rules.mk rename keyboards/nightmare/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/nightmare/rules.mk rename keyboards/nimrod/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/nimrod/rules.mk rename keyboards/nix_studio/n60_a/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/nix_studio/n60_a/rules.mk rename keyboards/nixkeyboards/day_off/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/nixkeyboards/day_off/rules.mk rename keyboards/nopunin10did/jabberwocky/v1/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/nopunin10did/jabberwocky/v1/rules.mk rename keyboards/nopunin10did/jabberwocky/v2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/nopunin10did/jabberwocky/v2/rules.mk rename keyboards/nopunin10did/kastenwagen1840/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/nopunin10did/kastenwagen1840/rules.mk rename keyboards/nopunin10did/kastenwagen48/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/nopunin10did/kastenwagen48/rules.mk rename keyboards/nopunin10did/railroad/rev0/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/nopunin10did/railroad/rev0/rules.mk rename keyboards/novelkeys/nk1/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/novelkeys/nk1/rules.mk rename keyboards/novelkeys/novelpad/{info.json => keyboard.json} (90%) delete mode 100755 keyboards/novelkeys/novelpad/rules.mk rename keyboards/noxary/220/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/noxary/220/rules.mk rename keyboards/noxary/268/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/noxary/268/rules.mk rename keyboards/noxary/268_2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/noxary/268_2/rules.mk rename keyboards/noxary/268_2_rgb/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/noxary/268_2_rgb/rules.mk rename keyboards/noxary/280/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/noxary/280/rules.mk rename keyboards/noxary/378/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/noxary/378/rules.mk rename keyboards/noxary/valhalla/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/noxary/valhalla/rules.mk rename keyboards/noxary/vulcan/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/noxary/vulcan/rules.mk rename keyboards/noxary/x268/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/noxary/x268/rules.mk rename keyboards/np12/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/np12/rules.mk rename keyboards/nyhxis/nfr_70/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/nyhxis/nfr_70/rules.mk diff --git a/keyboards/labbe/labbeminiv1/info.json b/keyboards/labbe/labbeminiv1/keyboard.json similarity index 79% rename from keyboards/labbe/labbeminiv1/info.json rename to keyboards/labbe/labbeminiv1/keyboard.json index ff53873f2ba..1bb3b6ff4bd 100644 --- a/keyboards/labbe/labbeminiv1/info.json +++ b/keyboards/labbe/labbeminiv1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4C4D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4"], "rows": ["F5", "F6"] diff --git a/keyboards/labbe/labbeminiv1/rules.mk b/keyboards/labbe/labbeminiv1/rules.mk deleted file mode 100644 index 57f52095a4e..00000000000 --- a/keyboards/labbe/labbeminiv1/rules.mk +++ /dev/null @@ -1,12 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/labyrinth75/info.json b/keyboards/labyrinth75/keyboard.json similarity index 96% rename from keyboards/labyrinth75/info.json rename to keyboards/labyrinth75/keyboard.json index 49b84b280a3..5ff83582b1f 100644 --- a/keyboards/labyrinth75/info.json +++ b/keyboards/labyrinth75/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x464B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"], "rows": ["B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"] diff --git a/keyboards/labyrinth75/rules.mk b/keyboards/labyrinth75/rules.mk deleted file mode 100644 index 502dc1b7bdf..00000000000 --- a/keyboards/labyrinth75/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/laneware/lpad/info.json b/keyboards/laneware/lpad/keyboard.json similarity index 84% rename from keyboards/laneware/lpad/info.json rename to keyboards/laneware/lpad/keyboard.json index 0d8016f8427..473a6552c5d 100644 --- a/keyboards/laneware/lpad/info.json +++ b/keyboards/laneware/lpad/keyboard.json @@ -10,6 +10,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D4", "D6"], "rows": ["E6", "B7", "D0"] diff --git a/keyboards/laneware/lpad/rules.mk b/keyboards/laneware/lpad/rules.mk deleted file mode 100644 index 524fa11adca..00000000000 --- a/keyboards/laneware/lpad/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/laneware/lw67/info.json b/keyboards/laneware/lw67/keyboard.json similarity index 98% rename from keyboards/laneware/lw67/info.json rename to keyboards/laneware/lw67/keyboard.json index e9bba7c858f..08c5bc355cb 100644 --- a/keyboards/laneware/lw67/info.json +++ b/keyboards/laneware/lw67/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x9998", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "B0", "B1"], "rows": ["E6", "B7", "D0", "D1", "D2"] diff --git a/keyboards/laneware/lw67/rules.mk b/keyboards/laneware/lw67/rules.mk deleted file mode 100644 index 131aa72aeb5..00000000000 --- a/keyboards/laneware/lw67/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/laneware/lw75/info.json b/keyboards/laneware/lw75/keyboard.json similarity index 99% rename from keyboards/laneware/lw75/info.json rename to keyboards/laneware/lw75/keyboard.json index bb9aceb95f9..7fae15b1758 100644 --- a/keyboards/laneware/lw75/info.json +++ b/keyboards/laneware/lw75/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1111", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "B0", "B2"], "rows": ["E6", "B7", "D0", "D1", "D2", "B1"] diff --git a/keyboards/laneware/lw75/rules.mk b/keyboards/laneware/lw75/rules.mk deleted file mode 100644 index 131aa72aeb5..00000000000 --- a/keyboards/laneware/lw75/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/laneware/macro1/info.json b/keyboards/laneware/macro1/keyboard.json similarity index 95% rename from keyboards/laneware/macro1/info.json rename to keyboards/laneware/macro1/keyboard.json index dd226270310..ea9be78cd34 100644 --- a/keyboards/laneware/macro1/info.json +++ b/keyboards/laneware/macro1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x9999", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D4", "D6", "D7"], "rows": ["E6", "B7", "D0", "D1", "D2", "B3"] diff --git a/keyboards/laneware/macro1/rules.mk b/keyboards/laneware/macro1/rules.mk deleted file mode 100644 index f0a88209b69..00000000000 --- a/keyboards/laneware/macro1/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 -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 -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/latincompass/latin60rgb/info.json b/keyboards/latincompass/latin60rgb/keyboard.json similarity index 96% rename from keyboards/latincompass/latin60rgb/info.json rename to keyboards/latincompass/latin60rgb/keyboard.json index 5fef17fd09b..6c9bfdc47b4 100644 --- a/keyboards/latincompass/latin60rgb/info.json +++ b/keyboards/latincompass/latin60rgb/keyboard.json @@ -42,6 +42,15 @@ "driver": "is31fl3733", "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D6", "D4", "D3"], "rows": ["C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/latincompass/latin60rgb/rules.mk b/keyboards/latincompass/latin60rgb/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/latincompass/latin60rgb/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 -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 = yes # Use RGB matrix diff --git a/keyboards/latincompass/latinpad/info.json b/keyboards/latincompass/latinpad/keyboard.json similarity index 91% rename from keyboards/latincompass/latinpad/info.json rename to keyboards/latincompass/latinpad/keyboard.json index f007efbf882..1e2c8ca90c0 100644 --- a/keyboards/latincompass/latinpad/info.json +++ b/keyboards/latincompass/latinpad/keyboard.json @@ -42,6 +42,17 @@ }, "driver": "ws2812" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6"], "rows": ["F4", "F5", "F6", "F7", "B1"] diff --git a/keyboards/latincompass/latinpad/rules.mk b/keyboards/latincompass/latinpad/rules.mk deleted file mode 100644 index c6959a65903..00000000000 --- a/keyboards/latincompass/latinpad/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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no -OLED_ENABLE = yes -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/lazydesigners/bolt/info.json b/keyboards/lazydesigners/bolt/keyboard.json similarity index 94% rename from keyboards/lazydesigners/bolt/info.json rename to keyboards/lazydesigners/bolt/keyboard.json index 8319972abda..c155c852df0 100644 --- a/keyboards/lazydesigners/bolt/info.json +++ b/keyboards/lazydesigners/bolt/keyboard.json @@ -27,6 +27,15 @@ "ws2812": { "pin": "E6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "F7", "C6", "B3", "B7", "D0", "D3", "D2", "D1"], "rows": ["F0", "C7", "B6", "D5"] diff --git a/keyboards/lazydesigners/bolt/rules.mk b/keyboards/lazydesigners/bolt/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/lazydesigners/bolt/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/lazydesigners/cassette8/info.json b/keyboards/lazydesigners/cassette8/keyboard.json similarity index 87% rename from keyboards/lazydesigners/cassette8/info.json rename to keyboards/lazydesigners/cassette8/keyboard.json index c801c1352ea..623b804efe0 100755 --- a/keyboards/lazydesigners/cassette8/info.json +++ b/keyboards/lazydesigners/cassette8/keyboard.json @@ -27,6 +27,15 @@ "ws2812": { "pin": "C2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "B4", "B1", "B0"], "rows": ["B3", "B2"] diff --git a/keyboards/lazydesigners/cassette8/rules.mk b/keyboards/lazydesigners/cassette8/rules.mk deleted file mode 100755 index 58d6460e33e..00000000000 --- a/keyboards/lazydesigners/cassette8/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 = 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/lazydesigners/dimpleplus/info.json b/keyboards/lazydesigners/dimpleplus/keyboard.json similarity index 96% rename from keyboards/lazydesigners/dimpleplus/info.json rename to keyboards/lazydesigners/dimpleplus/keyboard.json index 35a40b60ff2..afae905c7b8 100644 --- a/keyboards/lazydesigners/dimpleplus/info.json +++ b/keyboards/lazydesigners/dimpleplus/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0061", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "D5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B3", "F0", "E6", "F4", "F5"] diff --git a/keyboards/lazydesigners/dimpleplus/rules.mk b/keyboards/lazydesigners/dimpleplus/rules.mk deleted file mode 100644 index e3b4d3b94d5..00000000000 --- a/keyboards/lazydesigners/dimpleplus/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 -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 - diff --git a/keyboards/lazydesigners/the30/info.json b/keyboards/lazydesigners/the30/keyboard.json similarity index 91% rename from keyboards/lazydesigners/the30/info.json rename to keyboards/lazydesigners/the30/keyboard.json index fab36b7f9cc..64562ada664 100644 --- a/keyboards/lazydesigners/the30/info.json +++ b/keyboards/lazydesigners/the30/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0030", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6"], "rows": ["D0", "D1", "D2"] diff --git a/keyboards/lazydesigners/the30/rules.mk b/keyboards/lazydesigners/the30/rules.mk deleted file mode 100644 index b325f3f0c79..00000000000 --- a/keyboards/lazydesigners/the30/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 = 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/lazydesigners/the40/info.json b/keyboards/lazydesigners/the40/keyboard.json similarity index 97% rename from keyboards/lazydesigners/the40/info.json rename to keyboards/lazydesigners/the40/keyboard.json index b87fc9a29dd..0e06e16ea8b 100644 --- a/keyboards/lazydesigners/the40/info.json +++ b/keyboards/lazydesigners/the40/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0042", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F6", "F7", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B0"], "rows": ["D0", "D1", "B6", "F5"] diff --git a/keyboards/lazydesigners/the40/rules.mk b/keyboards/lazydesigners/the40/rules.mk deleted file mode 100644 index 8d59557bc89..00000000000 --- a/keyboards/lazydesigners/the40/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 = 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 diff --git a/keyboards/lazydesigners/the50/info.json b/keyboards/lazydesigners/the50/keyboard.json similarity index 95% rename from keyboards/lazydesigners/the50/info.json rename to keyboards/lazydesigners/the50/keyboard.json index 0c76516e803..75e39ab0ca0 100644 --- a/keyboards/lazydesigners/the50/info.json +++ b/keyboards/lazydesigners/the50/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/lazydesigners/the50/rules.mk b/keyboards/lazydesigners/the50/rules.mk deleted file mode 100644 index 0cc1bff4116..00000000000 --- a/keyboards/lazydesigners/the50/rules.mk +++ /dev/null @@ -1,11 +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 -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 underlight functionality diff --git a/keyboards/lazydesigners/the60/rev1/info.json b/keyboards/lazydesigners/the60/rev1/keyboard.json similarity index 95% rename from keyboards/lazydesigners/the60/rev1/info.json rename to keyboards/lazydesigners/the60/rev1/keyboard.json index 7c1fa4883e4..f06e695bf42 100755 --- a/keyboards/lazydesigners/the60/rev1/info.json +++ b/keyboards/lazydesigners/the60/rev1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/lazydesigners/the60/rev1/rules.mk b/keyboards/lazydesigners/the60/rev1/rules.mk deleted file mode 100755 index a0debe7a23e..00000000000 --- a/keyboards/lazydesigners/the60/rev1/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality diff --git a/keyboards/lazydesigners/the60/rev2/info.json b/keyboards/lazydesigners/the60/rev2/keyboard.json similarity index 99% rename from keyboards/lazydesigners/the60/rev2/info.json rename to keyboards/lazydesigners/the60/rev2/keyboard.json index 6070b3a59a2..f9a0fd95b50 100755 --- a/keyboards/lazydesigners/the60/rev2/info.json +++ b/keyboards/lazydesigners/the60/rev2/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0062", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "F0", "F1"] diff --git a/keyboards/lazydesigners/the60/rev2/rules.mk b/keyboards/lazydesigners/the60/rev2/rules.mk deleted file mode 100755 index a4b56c37ddd..00000000000 --- a/keyboards/lazydesigners/the60/rev2/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/leafcutterlabs/bigknob/info.json b/keyboards/leafcutterlabs/bigknob/keyboard.json similarity index 85% rename from keyboards/leafcutterlabs/bigknob/info.json rename to keyboards/leafcutterlabs/bigknob/keyboard.json index 4e955777a75..8250f7eb614 100644 --- a/keyboards/leafcutterlabs/bigknob/info.json +++ b/keyboards/leafcutterlabs/bigknob/keyboard.json @@ -33,6 +33,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "direct": [ ["B7", "D4", "D6", "F6", "F7"] diff --git a/keyboards/leafcutterlabs/bigknob/rules.mk b/keyboards/leafcutterlabs/bigknob/rules.mk deleted file mode 100644 index 5a3a85a3eb0..00000000000 --- a/keyboards/leafcutterlabs/bigknob/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 -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 -ENCODER_ENABLE = yes # Enable rotary encoders diff --git a/keyboards/leeku/finger65/info.json b/keyboards/leeku/finger65/keyboard.json similarity index 98% rename from keyboards/leeku/finger65/info.json rename to keyboards/leeku/finger65/keyboard.json index ad158a1a64c..c9b7338856c 100644 --- a/keyboards/leeku/finger65/info.json +++ b/keyboards/leeku/finger65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6050", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"], "rows": ["C3", "C4", "C5", "C6", "C7"] diff --git a/keyboards/leeku/finger65/rules.mk b/keyboards/leeku/finger65/rules.mk deleted file mode 100644 index d0fd1ea5dd6..00000000000 --- a/keyboards/leeku/finger65/rules.mk +++ /dev/null @@ -1,9 +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 diff --git a/keyboards/lfkeyboards/lfkpad/info.json b/keyboards/lfkeyboards/lfkpad/keyboard.json similarity index 90% rename from keyboards/lfkeyboards/lfkpad/info.json rename to keyboards/lfkeyboards/lfkpad/keyboard.json index 0a41696cdce..50e02cb7ee4 100644 --- a/keyboards/lfkeyboards/lfkpad/info.json +++ b/keyboards/lfkeyboards/lfkpad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3231", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F1", "F0", "D4", "D6"], "rows": ["D5", "F4", "F6", "F7", "C7", "C6"] diff --git a/keyboards/lfkeyboards/lfkpad/rules.mk b/keyboards/lfkeyboards/lfkpad/rules.mk deleted file mode 100644 index 996d454d74e..00000000000 --- a/keyboards/lfkeyboards/lfkpad/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -AUDIO_ENABLE = no # Audio output -WATCHDOG_ENABLE = no # Resets keyboard if matrix_scan() isn't run every 250ms diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/keyboard.json similarity index 98% rename from keyboards/linworks/dolice/info.json rename to keyboards/linworks/dolice/keyboard.json index 23fb708cf64..6a556db6544 100644 --- a/keyboards/linworks/dolice/info.json +++ b/keyboards/linworks/dolice/keyboard.json @@ -8,6 +8,15 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "B4", "D5", "D3", "D2", "B2"], "rows": ["F5", "F4", "F6", "F7", "B0", "B7", "D7", "D6", "D4"] diff --git a/keyboards/linworks/dolice/rules.mk b/keyboards/linworks/dolice/rules.mk deleted file mode 100644 index 477fb5989c0..00000000000 --- a/keyboards/linworks/dolice/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/linworks/fave104/info.json b/keyboards/linworks/fave104/keyboard.json similarity index 99% rename from keyboards/linworks/fave104/info.json rename to keyboards/linworks/fave104/keyboard.json index e5fcf4f0c84..c71fdd56613 100644 --- a/keyboards/linworks/fave104/info.json +++ b/keyboards/linworks/fave104/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "A10", "A13", "A14", "A15", "B3"], "rows": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A0"] diff --git a/keyboards/linworks/fave104/rules.mk b/keyboards/linworks/fave104/rules.mk deleted file mode 100644 index d6925994b5f..00000000000 --- a/keyboards/linworks/fave104/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 = 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 -ENCODER_ENABLE = no - diff --git a/keyboards/linworks/fave87/info.json b/keyboards/linworks/fave87/keyboard.json similarity index 99% rename from keyboards/linworks/fave87/info.json rename to keyboards/linworks/fave87/keyboard.json index 8f551d8d391..9083b8c8ece 100644 --- a/keyboards/linworks/fave87/info.json +++ b/keyboards/linworks/fave87/keyboard.json @@ -8,6 +8,16 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F0", "E6", "B0", "B1", "B2", "B3", "D6", "D7"], "rows": ["D3", "D5", "D1", "D2", "D4", "D0", "F5", "F4", "F7", "F6", "B5", "B4"] diff --git a/keyboards/linworks/fave87/rules.mk b/keyboards/linworks/fave87/rules.mk deleted file mode 100644 index dd1bb7c54f6..00000000000 --- a/keyboards/linworks/fave87/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/keyboard.json similarity index 98% rename from keyboards/linworks/whale75/info.json rename to keyboards/linworks/whale75/keyboard.json index c5bd5d78b72..88598d8e8c9 100644 --- a/keyboards/linworks/whale75/info.json +++ b/keyboards/linworks/whale75/keyboard.json @@ -21,6 +21,17 @@ "pin": "B9", "driver": "pwm" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15"], "rows": ["B3", "B4", "B5", "B6", "B7", "A0"] diff --git a/keyboards/linworks/whale75/rules.mk b/keyboards/linworks/whale75/rules.mk deleted file mode 100644 index 76b31f0a0a0..00000000000 --- a/keyboards/linworks/whale75/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 = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - diff --git a/keyboards/littlealby/mute/info.json b/keyboards/littlealby/mute/keyboard.json similarity index 74% rename from keyboards/littlealby/mute/info.json rename to keyboards/littlealby/mute/keyboard.json index a4a2a5822ec..96c2e26a74a 100644 --- a/keyboards/littlealby/mute/info.json +++ b/keyboards/littlealby/mute/keyboard.json @@ -17,6 +17,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "direct": [ ["B5"] diff --git a/keyboards/littlealby/mute/rules.mk b/keyboards/littlealby/mute/rules.mk deleted file mode 100644 index e673ad8b73a..00000000000 --- a/keyboards/littlealby/mute/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 = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/lizard_trick/tenkey_plusplus/info.json b/keyboards/lizard_trick/tenkey_plusplus/keyboard.json similarity index 90% rename from keyboards/lizard_trick/tenkey_plusplus/info.json rename to keyboards/lizard_trick/tenkey_plusplus/keyboard.json index a14dcbdee7d..9371ef22d66 100644 --- a/keyboards/lizard_trick/tenkey_plusplus/info.json +++ b/keyboards/lizard_trick/tenkey_plusplus/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "F7"], "rows": ["B7", "D4", "B5", "B6", "C6", "C7"] diff --git a/keyboards/lizard_trick/tenkey_plusplus/rules.mk b/keyboards/lizard_trick/tenkey_plusplus/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/lizard_trick/tenkey_plusplus/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/ll3macorn/bongopad/info.json b/keyboards/ll3macorn/bongopad/keyboard.json similarity index 84% rename from keyboards/ll3macorn/bongopad/info.json rename to keyboards/ll3macorn/bongopad/keyboard.json index cde72e5882f..7a6f0ff0430 100644 --- a/keyboards/ll3macorn/bongopad/info.json +++ b/keyboards/ll3macorn/bongopad/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x2949", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "oled": true, + "wpm": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6"], "rows": ["F7", "D7", "C6", "D4"] diff --git a/keyboards/ll3macorn/bongopad/rules.mk b/keyboards/ll3macorn/bongopad/rules.mk deleted file mode 100644 index 722f12e66ec..00000000000 --- a/keyboards/ll3macorn/bongopad/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 = 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 -ENCODER_ENABLE = yes -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/lm_keyboard/lm60n/info.json b/keyboards/lm_keyboard/lm60n/keyboard.json similarity index 99% rename from keyboards/lm_keyboard/lm60n/info.json rename to keyboards/lm_keyboard/lm60n/keyboard.json index 6698ed9f34d..fe7b1b946e8 100644 --- a/keyboards/lm_keyboard/lm60n/info.json +++ b/keyboards/lm_keyboard/lm60n/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4B01", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "C6", "B6", "B5", "F4", "F0", "E6"], "rows": ["F1", "F5", "F6", "F7", "B3", "B2", "B1"] diff --git a/keyboards/lm_keyboard/lm60n/rules.mk b/keyboards/lm_keyboard/lm60n/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/lm_keyboard/lm60n/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 = 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/longnald/corin/info.json b/keyboards/longnald/corin/keyboard.json similarity index 95% rename from keyboards/longnald/corin/info.json rename to keyboards/longnald/corin/keyboard.json index f3d42039222..a423348b784 100644 --- a/keyboards/longnald/corin/info.json +++ b/keyboards/longnald/corin/keyboard.json @@ -25,6 +25,15 @@ "static_gradient": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F1", "F5", "B1", "E6", "D4", "B7", "D1", "D2", "D0", "B4", "B6", "C6", "C7"], "rows": ["F4", "F0", "B2", "B3", "D5"] diff --git a/keyboards/longnald/corin/rules.mk b/keyboards/longnald/corin/rules.mk deleted file mode 100644 index 3c777809b4a..00000000000 --- a/keyboards/longnald/corin/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/lyso1/lefishe/info.json b/keyboards/lyso1/lefishe/keyboard.json similarity index 98% rename from keyboards/lyso1/lefishe/info.json rename to keyboards/lyso1/lefishe/keyboard.json index b6c3b21aca2..d2036895658 100644 --- a/keyboards/lyso1/lefishe/info.json +++ b/keyboards/lyso1/lefishe/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6169", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "unicode": true + }, "matrix_pins": { "cols": ["F0", "F1", "D5", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B3", "B2", "B1"], "rows": ["B7", "F7", "F6", "F5", "F4"] diff --git a/keyboards/lyso1/lefishe/rules.mk b/keyboards/lyso1/lefishe/rules.mk deleted file mode 100644 index f91ecd04338..00000000000 --- a/keyboards/lyso1/lefishe/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 = 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 - diff --git a/keyboards/m10a/info.json b/keyboards/m10a/keyboard.json similarity index 82% rename from keyboards/m10a/info.json rename to keyboards/m10a/keyboard.json index 08da6e584a0..7f2c7c90b7c 100644 --- a/keyboards/m10a/info.json +++ b/keyboards/m10a/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x00AA", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["F5", "F1", "F0"], "rows": ["B6", "F7", "F6", "D6"] diff --git a/keyboards/m10a/rules.mk b/keyboards/m10a/rules.mk deleted file mode 100644 index df1f40ed766..00000000000 --- a/keyboards/m10a/rules.mk +++ /dev/null @@ -1,14 +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 -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 - -UNICODE_ENABLE = yes # Unicode diff --git a/keyboards/machine_industries/m4_a/info.json b/keyboards/machine_industries/m4_a/keyboard.json similarity index 80% rename from keyboards/machine_industries/m4_a/info.json rename to keyboards/machine_industries/m4_a/keyboard.json index 7ab42a02130..bf89d742393 100644 --- a/keyboards/machine_industries/m4_a/info.json +++ b/keyboards/machine_industries/m4_a/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x004A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F7"], "rows": ["C7", "C6"] diff --git a/keyboards/machine_industries/m4_a/rules.mk b/keyboards/machine_industries/m4_a/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/machine_industries/m4_a/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 = 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/machkeyboards/mach3/info.json b/keyboards/machkeyboards/mach3/keyboard.json similarity index 82% rename from keyboards/machkeyboards/mach3/info.json rename to keyboards/machkeyboards/mach3/keyboard.json index edb8793759a..9f9d492bcce 100644 --- a/keyboards/machkeyboards/mach3/info.json +++ b/keyboards/machkeyboards/mach3/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x4D33", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "unicode": true + }, "matrix_pins": { "cols": ["E6", "B4", "B5"], "rows": ["D1", "D0", "D4"] diff --git a/keyboards/machkeyboards/mach3/rules.mk b/keyboards/machkeyboards/mach3/rules.mk deleted file mode 100644 index 75c6a286e5f..00000000000 --- a/keyboards/machkeyboards/mach3/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 -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 -UNICODE_ENABLE = yes diff --git a/keyboards/magic_force/mf34/info.json b/keyboards/magic_force/mf34/keyboard.json similarity index 95% rename from keyboards/magic_force/mf34/info.json rename to keyboards/magic_force/mf34/keyboard.json index 027904e7296..50ad33408f7 100644 --- a/keyboards/magic_force/mf34/info.json +++ b/keyboards/magic_force/mf34/keyboard.json @@ -64,6 +64,15 @@ "driver": "ws2812", "max_brightness": 200 }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A2", "A1", "B14", "B4", "B5", "B6", "B7"], "rows": ["A7", "B0", "B1", "B2", "B10", "B11"] diff --git a/keyboards/magic_force/mf34/rules.mk b/keyboards/magic_force/mf34/rules.mk deleted file mode 100644 index 24a8c52e481..00000000000 --- a/keyboards/magic_force/mf34/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -RGB_MATRIX_ENABLE = yes - -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 -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/makeymakey/info.json b/keyboards/makeymakey/keyboard.json similarity index 89% rename from keyboards/makeymakey/info.json rename to keyboards/makeymakey/keyboard.json index 1fc7bf9415d..8f045350323 100644 --- a/keyboards/makeymakey/info.json +++ b/keyboards/makeymakey/keyboard.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "direct": [ ["D6", "B4", "C7", "B1", "E6", "D7"], diff --git a/keyboards/makeymakey/rules.mk b/keyboards/makeymakey/rules.mk deleted file mode 100644 index 9244882477d..00000000000 --- a/keyboards/makeymakey/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 = 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 diff --git a/keyboards/makrosu/info.json b/keyboards/makrosu/keyboard.json similarity index 83% rename from keyboards/makrosu/info.json rename to keyboards/makrosu/keyboard.json index ad6acdb100a..99b425d81a8 100644 --- a/keyboards/makrosu/info.json +++ b/keyboards/makrosu/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x8585", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B2", "B3", "B1", "F7", "F6", "F5"], "rows": ["B6"] diff --git a/keyboards/makrosu/rules.mk b/keyboards/makrosu/rules.mk deleted file mode 100644 index 0334a51bb5b..00000000000 --- a/keyboards/makrosu/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/keyboard.json similarity index 87% rename from keyboards/manyboard/macro/info.json rename to keyboards/manyboard/macro/keyboard.json index 10218337d96..b40861414f3 100644 --- a/keyboards/manyboard/macro/info.json +++ b/keyboards/manyboard/macro/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0015", "device_version": "1.0.3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "D5", "D6", "D7"], "rows": ["D0", "D1", "D2", "D3"] diff --git a/keyboards/manyboard/macro/rules.mk b/keyboards/manyboard/macro/rules.mk deleted file mode 100644 index 51c7b089b0c..00000000000 --- a/keyboards/manyboard/macro/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Encoder Input diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/keyboard.json similarity index 84% rename from keyboards/maple_computing/6ball/info.json rename to keyboards/maple_computing/6ball/keyboard.json index 56531d6fa25..3f125c75c43 100644 --- a/keyboards/maple_computing/6ball/info.json +++ b/keyboards/maple_computing/6ball/keyboard.json @@ -26,6 +26,16 @@ "ws2812": { "pin": "F7" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "unicode": true + }, "matrix_pins": { "cols": ["F4", "D4", "B5", "B6", "B2", "F6"], "rows": ["F5"] diff --git a/keyboards/maple_computing/6ball/rules.mk b/keyboards/maple_computing/6ball/rules.mk deleted file mode 100644 index a73f2bd6931..00000000000 --- a/keyboards/maple_computing/6ball/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 -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 -UNICODE_ENABLE = yes # Unicode -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/maple_computing/c39/info.json b/keyboards/maple_computing/c39/keyboard.json similarity index 93% rename from keyboards/maple_computing/c39/info.json rename to keyboards/maple_computing/c39/keyboard.json index 8a70fe365e1..de4cbc6aebb 100755 --- a/keyboards/maple_computing/c39/info.json +++ b/keyboards/maple_computing/c39/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xCA39", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "C6", "D2", "D3"], "rows": ["D1", "B4", "B5"] diff --git a/keyboards/maple_computing/c39/rules.mk b/keyboards/maple_computing/c39/rules.mk deleted file mode 100755 index 3328e87188b..00000000000 --- a/keyboards/maple_computing/c39/rules.mk +++ /dev/null @@ -1,12 +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 -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 -RGBLIGHT_ENABLE = no # RGB Enable / Disable diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/keyboard.json similarity index 86% rename from keyboards/maple_computing/the_ruler/info.json rename to keyboards/maple_computing/the_ruler/keyboard.json index 9ba1355fdd3..c38af0a3205 100644 --- a/keyboards/maple_computing/the_ruler/info.json +++ b/keyboards/maple_computing/the_ruler/keyboard.json @@ -27,6 +27,15 @@ "ws2812": { "pin": "E6" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5", "B6", "C6"], "rows": ["C7"] diff --git a/keyboards/maple_computing/the_ruler/rules.mk b/keyboards/maple_computing/the_ruler/rules.mk deleted file mode 100644 index 473689d8144..00000000000 --- a/keyboards/maple_computing/the_ruler/rules.mk +++ /dev/null @@ -1,12 +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 -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/marksard/leftover30/info.json b/keyboards/marksard/leftover30/keyboard.json similarity index 96% rename from keyboards/marksard/leftover30/info.json rename to keyboards/marksard/leftover30/keyboard.json index 139214ad497..72a1f9a3e05 100644 --- a/keyboards/marksard/leftover30/info.json +++ b/keyboards/marksard/leftover30/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xDFA8", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6"], "rows": ["B6", "B2", "F7", "F6", "B3", "B1", "D4", "D0"] diff --git a/keyboards/marksard/leftover30/rules.mk b/keyboards/marksard/leftover30/rules.mk deleted file mode 100644 index 9f1aa1c0bff..00000000000 --- a/keyboards/marksard/leftover30/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/masterworks/classy_tkl/rev_a/info.json b/keyboards/masterworks/classy_tkl/rev_a/keyboard.json similarity index 98% rename from keyboards/masterworks/classy_tkl/rev_a/info.json rename to keyboards/masterworks/classy_tkl/rev_a/keyboard.json index d71614e7375..7c7458f9c89 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/info.json +++ b/keyboards/masterworks/classy_tkl/rev_a/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "C6", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0", "E6", "F7"], "rows": ["C7", "F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/masterworks/classy_tkl/rev_a/rules.mk b/keyboards/masterworks/classy_tkl/rev_a/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/masterworks/classy_tkl/rev_a/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 = 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/matrix/cain_re/info.json b/keyboards/matrix/cain_re/keyboard.json similarity index 98% rename from keyboards/matrix/cain_re/info.json rename to keyboards/matrix/cain_re/keyboard.json index 37e129f1f2f..02c6cbbeb56 100644 --- a/keyboards/matrix/cain_re/info.json +++ b/keyboards/matrix/cain_re/keyboard.json @@ -30,6 +30,15 @@ "ws2812": { "pin": "E6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "B5", "B6", "B3", "B2", "B1", "D0", "B4", "D6"], "rows": ["F0", "C7", "C6", "D5", "D2", "D4", "D7", "B7", "D1"] diff --git a/keyboards/matrix/cain_re/rules.mk b/keyboards/matrix/cain_re/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/matrix/cain_re/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 = 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/matrix/falcon/info.json b/keyboards/matrix/falcon/keyboard.json similarity index 97% rename from keyboards/matrix/falcon/info.json rename to keyboards/matrix/falcon/keyboard.json index 4984562fe05..0c387f5bc24 100644 --- a/keyboards/matrix/falcon/info.json +++ b/keyboards/matrix/falcon/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x474E", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "B3", "B2", "B1", "B0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F1", "B7", "F7", "F5", "F4"] diff --git a/keyboards/matrix/falcon/rules.mk b/keyboards/matrix/falcon/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/matrix/falcon/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/matrix/m12og/rev2/info.json b/keyboards/matrix/m12og/rev2/keyboard.json similarity index 98% rename from keyboards/matrix/m12og/rev2/info.json rename to keyboards/matrix/m12og/rev2/keyboard.json index 2205db43fa5..42df6a75e87 100644 --- a/keyboards/matrix/m12og/rev2/info.json +++ b/keyboards/matrix/m12og/rev2/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "B3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D0", "D2", "D6", "D4", "D5"], "rows": ["E6", "F0", "B7", "C7", "D3", "B0", "D1"] diff --git a/keyboards/matrix/m12og/rev2/rules.mk b/keyboards/matrix/m12og/rev2/rules.mk deleted file mode 100644 index f1af8ca4c9c..00000000000 --- a/keyboards/matrix/m12og/rev2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes diff --git a/keyboards/matrix/me/info.json b/keyboards/matrix/me/keyboard.json similarity index 98% rename from keyboards/matrix/me/info.json rename to keyboards/matrix/me/keyboard.json index 147fc7c5c87..8349fbd7e67 100644 --- a/keyboards/matrix/me/info.json +++ b/keyboards/matrix/me/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x454D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B7", "B3", "B2", "B1", "B0", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "D7"], "rows": ["D3", "D5", "D4", "D6", "B5", "B4"] diff --git a/keyboards/matrix/me/rules.mk b/keyboards/matrix/me/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/matrix/me/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/matthewdias/m3n3van/info.json b/keyboards/matthewdias/m3n3van/keyboard.json similarity index 96% rename from keyboards/matthewdias/m3n3van/info.json rename to keyboards/matthewdias/m3n3van/keyboard.json index a6c4a53aeda..3fdfb7f61d3 100644 --- a/keyboards/matthewdias/m3n3van/info.json +++ b/keyboards/matthewdias/m3n3van/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x2323", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F1", "F7", "F0", "E6", "D3", "D0", "D1", "D2", "D4", "D6"], "rows": ["B5", "B6", "C6", "C7"] diff --git a/keyboards/matthewdias/m3n3van/rules.mk b/keyboards/matthewdias/m3n3van/rules.mk deleted file mode 100644 index 131aa72aeb5..00000000000 --- a/keyboards/matthewdias/m3n3van/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/matthewdias/minim/info.json b/keyboards/matthewdias/minim/keyboard.json similarity index 94% rename from keyboards/matthewdias/minim/info.json rename to keyboards/matthewdias/minim/keyboard.json index c431ae5f106..b9ff70ca408 100644 --- a/keyboards/matthewdias/minim/info.json +++ b/keyboards/matthewdias/minim/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xAAAA", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F1", "F7", "F0", "B0", "D1", "B1", "D2", "B2", "D3", "D5", "B3"], "rows": ["D6", "D7", "B4", "B5"] diff --git a/keyboards/matthewdias/minim/rules.mk b/keyboards/matthewdias/minim/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/matthewdias/minim/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 = 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/matthewdias/model_v/info.json b/keyboards/matthewdias/model_v/keyboard.json similarity index 97% rename from keyboards/matthewdias/model_v/info.json rename to keyboards/matthewdias/model_v/keyboard.json index f3fa150d57f..00d4c4c0eb2 100644 --- a/keyboards/matthewdias/model_v/info.json +++ b/keyboards/matthewdias/model_v/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x6D76", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7"], "rows": ["D3", "D5", "D6", "D4"] diff --git a/keyboards/matthewdias/model_v/rules.mk b/keyboards/matthewdias/model_v/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/matthewdias/model_v/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 = 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/matthewdias/txuu/info.json b/keyboards/matthewdias/txuu/keyboard.json similarity index 96% rename from keyboards/matthewdias/txuu/info.json rename to keyboards/matthewdias/txuu/keyboard.json index bfad8a5e670..b4c1597e5fc 100644 --- a/keyboards/matthewdias/txuu/info.json +++ b/keyboards/matthewdias/txuu/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x2809", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F5", "F6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["B1", "B0", "F7", "F4", "F1"] diff --git a/keyboards/matthewdias/txuu/rules.mk b/keyboards/matthewdias/txuu/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/matthewdias/txuu/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 = 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/maxr1998/pulse4k/info.json b/keyboards/maxr1998/pulse4k/keyboard.json similarity index 86% rename from keyboards/maxr1998/pulse4k/info.json rename to keyboards/maxr1998/pulse4k/keyboard.json index 5502edcb9ef..22d1d67a519 100644 --- a/keyboards/maxr1998/pulse4k/info.json +++ b/keyboards/maxr1998/pulse4k/keyboard.json @@ -26,6 +26,16 @@ "ws2812": { "pin": "F7" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B7", "B3", "F0"], "rows": ["B4", "E6"] diff --git a/keyboards/maxr1998/pulse4k/rules.mk b/keyboards/maxr1998/pulse4k/rules.mk deleted file mode 100644 index 3b110a7ade0..00000000000 --- a/keyboards/maxr1998/pulse4k/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -ENCODER_ENABLE = yes # Rotary encoders -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/mb44/info.json b/keyboards/mb44/keyboard.json similarity index 98% rename from keyboards/mb44/info.json rename to keyboards/mb44/keyboard.json index 95acbc9ba24..c349d11d387 100644 --- a/keyboards/mb44/info.json +++ b/keyboards/mb44/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6D62", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"], "rows": ["D1", "D6", "D5", "D4"] diff --git a/keyboards/mb44/rules.mk b/keyboards/mb44/rules.mk deleted file mode 100644 index 9d77ae8a3c8..00000000000 --- a/keyboards/mb44/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable rotary encoder diff --git a/keyboards/mc_76k/info.json b/keyboards/mc_76k/keyboard.json similarity index 97% rename from keyboards/mc_76k/info.json rename to keyboards/mc_76k/keyboard.json index 5e35e45c354..2d8e7351be8 100644 --- a/keyboards/mc_76k/info.json +++ b/keyboards/mc_76k/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4D43", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D5", "D3", "D4", "B1", "D6", "D7", "B4", "B5", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["C7", "C6", "B6", "B0", "D1", "D0"] diff --git a/keyboards/mc_76k/rules.mk b/keyboards/mc_76k/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/mc_76k/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechanickeys/miniashen40/info.json b/keyboards/mechanickeys/miniashen40/keyboard.json similarity index 94% rename from keyboards/mechanickeys/miniashen40/info.json rename to keyboards/mechanickeys/miniashen40/keyboard.json index 78f1156d321..2adee31c1dd 100644 --- a/keyboards/mechanickeys/miniashen40/info.json +++ b/keyboards/mechanickeys/miniashen40/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6D6E", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C5", "C4", "C3", "D0", "C2", "D1", "C1", "C0", "D4", "B0", "D7", "D6", "B5"], "rows": ["B1", "B2", "B3", "B4"] diff --git a/keyboards/mechanickeys/miniashen40/rules.mk b/keyboards/mechanickeys/miniashen40/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/mechanickeys/miniashen40/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 = 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/mechkeys/acr60/info.json b/keyboards/mechkeys/acr60/keyboard.json similarity index 99% rename from keyboards/mechkeys/acr60/info.json rename to keyboards/mechkeys/acr60/keyboard.json index 04012cf2342..f2d618b8bd1 100644 --- a/keyboards/mechkeys/acr60/info.json +++ b/keyboards/mechkeys/acr60/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xCA60", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/mechkeys/acr60/rules.mk b/keyboards/mechkeys/acr60/rules.mk deleted file mode 100644 index 32e82925ccf..00000000000 --- a/keyboards/mechkeys/acr60/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 = 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 = yes diff --git a/keyboards/mechkeys/alu84/info.json b/keyboards/mechkeys/alu84/keyboard.json similarity index 95% rename from keyboards/mechkeys/alu84/info.json rename to keyboards/mechkeys/alu84/keyboard.json index 73efa61268e..890ddabbc44 100644 --- a/keyboards/mechkeys/alu84/info.json +++ b/keyboards/mechkeys/alu84/keyboard.json @@ -8,6 +8,17 @@ "pid": "0xCA75", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"], "rows": ["D0", "D1", "D2", "D3", "D5", "B7"] diff --git a/keyboards/mechkeys/alu84/rules.mk b/keyboards/mechkeys/alu84/rules.mk deleted file mode 100755 index 730863ddccc..00000000000 --- a/keyboards/mechkeys/alu84/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SLEEP_LED_ENABLE = yes diff --git a/keyboards/mechkeys/espectro/info.json b/keyboards/mechkeys/espectro/keyboard.json similarity index 98% rename from keyboards/mechkeys/espectro/info.json rename to keyboards/mechkeys/espectro/keyboard.json index 53dbc75dcf1..838ff42bd18 100644 --- a/keyboards/mechkeys/espectro/info.json +++ b/keyboards/mechkeys/espectro/keyboard.json @@ -8,6 +8,17 @@ "pid": "0xCA96", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["C6", "F1", "F4", "F5", "F6", "F7", "D7", "B4", "B5", "D0", "D1", "D2", "D3"], "rows": ["B7", "B3", "E6", "F0", "D5", "D4", "D6", "C7"] diff --git a/keyboards/mechkeys/espectro/rules.mk b/keyboards/mechkeys/espectro/rules.mk deleted file mode 100755 index 5b869c14545..00000000000 --- a/keyboards/mechkeys/espectro/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes -SLEEP_LED_ENABLE = yes diff --git a/keyboards/mechkeys/mk60/info.json b/keyboards/mechkeys/mk60/keyboard.json similarity index 95% rename from keyboards/mechkeys/mk60/info.json rename to keyboards/mechkeys/mk60/keyboard.json index 4cc03cec3b1..c1e8af5348c 100644 --- a/keyboards/mechkeys/mk60/info.json +++ b/keyboards/mechkeys/mk60/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/mechkeys/mk60/rules.mk b/keyboards/mechkeys/mk60/rules.mk deleted file mode 100644 index 0922d3d5112..00000000000 --- a/keyboards/mechkeys/mk60/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 = 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 diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/keyboard.json similarity index 98% rename from keyboards/mechlovin/foundation/info.json rename to keyboards/mechlovin/foundation/keyboard.json index bec0c883c5c..3bd05add2f1 100644 --- a/keyboards/mechlovin/foundation/info.json +++ b/keyboards/mechlovin/foundation/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0180", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A15", "B9", "B8", "B7", "B6", "B5", "B4", "B3"], "rows": ["B12", "B13", "B14", "A8", "A2"] diff --git a/keyboards/mechlovin/foundation/rules.mk b/keyboards/mechlovin/foundation/rules.mk deleted file mode 100644 index c0fdd8a2cea..00000000000 --- a/keyboards/mechlovin/foundation/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 -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 -ENCODER_ENABLE = yes -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/keyboard.json similarity index 99% rename from keyboards/mechlovin/hex6c/info.json rename to keyboards/mechlovin/hex6c/keyboard.json index 483566e7f48..e068420b81a 100644 --- a/keyboards/mechlovin/hex6c/info.json +++ b/keyboards/mechlovin/hex6c/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6C01", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A13", "A14", "A1", "A0", "C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"], "rows": ["A10", "B13", "B12", "B11", "C14", "C15"] diff --git a/keyboards/mechlovin/hex6c/rules.mk b/keyboards/mechlovin/hex6c/rules.mk deleted file mode 100644 index 61776ab8924..00000000000 --- a/keyboards/mechlovin/hex6c/rules.mk +++ /dev/null @@ -1,11 +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 = yes # Enable N-Key Rollover -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/keyboard.json similarity index 98% rename from keyboards/mechlovin/infinity88/info.json rename to keyboards/mechlovin/infinity88/keyboard.json index 3724d8a82d9..14371d24598 100644 --- a/keyboards/mechlovin/infinity88/info.json +++ b/keyboards/mechlovin/infinity88/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x8802", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"], "rows": ["A10", "B13", "B12", "B11", "C14", "C15"] diff --git a/keyboards/mechlovin/infinity88/rules.mk b/keyboards/mechlovin/infinity88/rules.mk deleted file mode 100644 index ca7f10db504..00000000000 --- a/keyboards/mechlovin/infinity88/rules.mk +++ /dev/null @@ -1,11 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/mechlovin/infinityce/info.json b/keyboards/mechlovin/infinityce/keyboard.json similarity index 98% rename from keyboards/mechlovin/infinityce/info.json rename to keyboards/mechlovin/infinityce/keyboard.json index 0ded6a5eee8..5b10e056bac 100644 --- a/keyboards/mechlovin/infinityce/info.json +++ b/keyboards/mechlovin/infinityce/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x8801", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "B4", "B0", "D5", "D4", "D1", "D0", "E6", "F7", "F6", "F5", "F4", "F1", "F0", "B2", "D3", "D2"], "rows": ["D7", "D6", "B6", "B1", "C6", "C7"] diff --git a/keyboards/mechlovin/infinityce/rules.mk b/keyboards/mechlovin/infinityce/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/mechlovin/infinityce/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/kanu/info.json b/keyboards/mechlovin/kanu/keyboard.json similarity index 98% rename from keyboards/mechlovin/kanu/info.json rename to keyboards/mechlovin/kanu/keyboard.json index f8931cdff8c..10cd22319a8 100644 --- a/keyboards/mechlovin/kanu/info.json +++ b/keyboards/mechlovin/kanu/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x4B4E", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], "rows": ["B5", "B6", "D3", "C6", "C7"] diff --git a/keyboards/mechlovin/kanu/rules.mk b/keyboards/mechlovin/kanu/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/mechlovin/kanu/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/keyboard.json similarity index 97% rename from keyboards/mechlovin/kay60/info.json rename to keyboards/mechlovin/kay60/keyboard.json index 7e1ba1fa2d7..7c382739471 100644 --- a/keyboards/mechlovin/kay60/info.json +++ b/keyboards/mechlovin/kay60/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0601", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B2", "B3", "B7", "B4", "D7", "D6", "D4"], "rows": ["D5", "D3", "D2", "B1", "B5"] diff --git a/keyboards/mechlovin/kay60/rules.mk b/keyboards/mechlovin/kay60/rules.mk deleted file mode 100644 index 48c738da8f9..00000000000 --- a/keyboards/mechlovin/kay60/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 = 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/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/keyboard.json similarity index 98% rename from keyboards/mechlovin/kay65/info.json rename to keyboards/mechlovin/kay65/keyboard.json index 9a8cf1b5d2f..f5d58979396 100644 --- a/keyboards/mechlovin/kay65/info.json +++ b/keyboards/mechlovin/kay65/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6502", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "E6", "B0", "D2", "D1", "D0", "B3", "B2", "B1"], "rows": ["B7", "D3", "D5", "D4", "C6"] diff --git a/keyboards/mechlovin/kay65/rules.mk b/keyboards/mechlovin/kay65/rules.mk deleted file mode 100644 index 2eba275490a..00000000000 --- a/keyboards/mechlovin/kay65/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/keyboard.json similarity index 98% rename from keyboards/mechlovin/olly/orion/info.json rename to keyboards/mechlovin/olly/orion/keyboard.json index 0c0ee86c95c..2780e219494 100644 --- a/keyboards/mechlovin/olly/orion/info.json +++ b/keyboards/mechlovin/olly/orion/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xD870", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B14", "B13", "B12", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "A15", "B3", "B4"], "rows": ["A8", "A9", "A10", "B11", "C13", "C14"] diff --git a/keyboards/mechlovin/olly/orion/rules.mk b/keyboards/mechlovin/olly/orion/rules.mk deleted file mode 100644 index ef83f572ccb..00000000000 --- a/keyboards/mechlovin/olly/orion/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 -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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/keyboard.json similarity index 97% rename from keyboards/mechlovin/pisces/info.json rename to keyboards/mechlovin/pisces/keyboard.json index bf084ba863c..37915826e66 100644 --- a/keyboards/mechlovin/pisces/info.json +++ b/keyboards/mechlovin/pisces/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6501", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "B1", "B3", "D0", "D1", "D2", "D3", "D5", "F4", "F1", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "F0", "F5", "F6", "F7"] diff --git a/keyboards/mechlovin/pisces/rules.mk b/keyboards/mechlovin/pisces/rules.mk deleted file mode 100644 index bb8afde082e..00000000000 --- a/keyboards/mechlovin/pisces/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/mechlovin/tmkl/info.json b/keyboards/mechlovin/tmkl/keyboard.json similarity index 96% rename from keyboards/mechlovin/tmkl/info.json rename to keyboards/mechlovin/tmkl/keyboard.json index f5ff5420b4c..8b66e9a4666 100644 --- a/keyboards/mechlovin/tmkl/info.json +++ b/keyboards/mechlovin/tmkl/keyboard.json @@ -7,6 +7,15 @@ "pid": "0xC601", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"], "rows": ["A8", "A4", "A5", "A3", "A2", "A1"] diff --git a/keyboards/mechlovin/tmkl/rules.mk b/keyboards/mechlovin/tmkl/rules.mk deleted file mode 100644 index 80b09b5e419..00000000000 --- a/keyboards/mechlovin/tmkl/rules.mk +++ /dev/null @@ -1,11 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow diff --git a/keyboards/mechlovin/zed60/info.json b/keyboards/mechlovin/zed60/keyboard.json similarity index 98% rename from keyboards/mechlovin/zed60/info.json rename to keyboards/mechlovin/zed60/keyboard.json index 83b8c3f449e..39a8ae7ea78 100644 --- a/keyboards/mechlovin/zed60/info.json +++ b/keyboards/mechlovin/zed60/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0602", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A10", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B5", "B4", "B3", "A15", "B7", "B6"], "rows": ["B10", "B2", "B1", "B0", "A2"] diff --git a/keyboards/mechlovin/zed60/rules.mk b/keyboards/mechlovin/zed60/rules.mk deleted file mode 100644 index 622edc34081..00000000000 --- a/keyboards/mechlovin/zed60/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechstudio/dawn/info.json b/keyboards/mechstudio/dawn/keyboard.json similarity index 96% rename from keyboards/mechstudio/dawn/info.json rename to keyboards/mechstudio/dawn/keyboard.json index cc1f5a425f5..dc1894f4e5f 100644 --- a/keyboards/mechstudio/dawn/info.json +++ b/keyboards/mechstudio/dawn/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0004", "device_version": "0.0.4" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D2"], "rows": ["B1", "B2", "B3", "D1", "D6", "D4"] diff --git a/keyboards/mechstudio/dawn/rules.mk b/keyboards/mechstudio/dawn/rules.mk deleted file mode 100644 index 0a7f474acba..00000000000 --- a/keyboards/mechstudio/dawn/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 = 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 \ No newline at end of file diff --git a/keyboards/mechwild/mercutio/info.json b/keyboards/mechwild/mercutio/keyboard.json similarity index 97% rename from keyboards/mechwild/mercutio/info.json rename to keyboards/mechwild/mercutio/keyboard.json index 796d22e3639..a07874e2a2a 100644 --- a/keyboards/mechwild/mercutio/info.json +++ b/keyboards/mechwild/mercutio/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x1703", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true + }, "matrix_pins": { "cols": ["B0", "D7", "D6", "D5", "B1", "B2", "B3"], "rows": ["D0", "D1", "D4", "C3", "C0", "C1", "C2"] diff --git a/keyboards/mechwild/mercutio/rules.mk b/keyboards/mechwild/mercutio/rules.mk deleted file mode 100644 index a62bc3d00cd..00000000000 --- a/keyboards/mechwild/mercutio/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/keyboard.json similarity index 91% rename from keyboards/mechwild/murphpad/info.json rename to keyboards/mechwild/murphpad/keyboard.json index dd635fed599..a2a5eba926b 100644 --- a/keyboards/mechwild/murphpad/info.json +++ b/keyboards/mechwild/murphpad/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x1705", "device_version": "3.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "D7", "C6", "D4", "B6"], "rows": ["F5", "B2", "B3", "B1", "F7", "F6"] diff --git a/keyboards/mechwild/murphpad/rules.mk b/keyboards/mechwild/murphpad/rules.mk deleted file mode 100644 index df9b208bb21..00000000000 --- a/keyboards/mechwild/murphpad/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable encoder -OLED_ENABLE = yes diff --git a/keyboards/mehkee96/info.json b/keyboards/mehkee96/keyboard.json similarity index 96% rename from keyboards/mehkee96/info.json rename to keyboards/mehkee96/keyboard.json index 9a81cba932a..4f4d4853c8f 100644 --- a/keyboards/mehkee96/info.json +++ b/keyboards/mehkee96/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/mehkee96/rules.mk b/keyboards/mehkee96/rules.mk deleted file mode 100644 index e629a74231f..00000000000 --- a/keyboards/mehkee96/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes diff --git a/keyboards/meletrix/zoom65/info.json b/keyboards/meletrix/zoom65/keyboard.json similarity index 99% rename from keyboards/meletrix/zoom65/info.json rename to keyboards/meletrix/zoom65/keyboard.json index 59de004989f..997b6d55e39 100644 --- a/keyboards/meletrix/zoom65/info.json +++ b/keyboards/meletrix/zoom65/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "E6", "D5", "F1", "F4"] diff --git a/keyboards/meletrix/zoom65/rules.mk b/keyboards/meletrix/zoom65/rules.mk deleted file mode 100644 index c310a235a93..00000000000 --- a/keyboards/meletrix/zoom65/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 -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 -ENCODER_ENABLE = yes # Enable Encoder diff --git a/keyboards/meletrix/zoom65_lite/info.json b/keyboards/meletrix/zoom65_lite/keyboard.json similarity index 99% rename from keyboards/meletrix/zoom65_lite/info.json rename to keyboards/meletrix/zoom65_lite/keyboard.json index 932dc8571e2..990c34206db 100644 --- a/keyboards/meletrix/zoom65_lite/info.json +++ b/keyboards/meletrix/zoom65_lite/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "E6", "D5", "F1", "F4"] diff --git a/keyboards/meletrix/zoom65_lite/rules.mk b/keyboards/meletrix/zoom65_lite/rules.mk deleted file mode 100644 index c310a235a93..00000000000 --- a/keyboards/meletrix/zoom65_lite/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 -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 -ENCODER_ENABLE = yes # Enable Encoder diff --git a/keyboards/meletrix/zoom87/info.json b/keyboards/meletrix/zoom87/keyboard.json similarity index 99% rename from keyboards/meletrix/zoom87/info.json rename to keyboards/meletrix/zoom87/keyboard.json index 551bdc76aa9..b2cec7968fc 100644 --- a/keyboards/meletrix/zoom87/info.json +++ b/keyboards/meletrix/zoom87/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"], "rows": ["B3", "B7", "B2", "F0", "D3", "D0"] diff --git a/keyboards/meletrix/zoom87/rules.mk b/keyboards/meletrix/zoom87/rules.mk deleted file mode 100644 index 9f087183c5e..00000000000 --- a/keyboards/meletrix/zoom87/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 = 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/melgeek/mj6xy/rev3/info.json b/keyboards/melgeek/mj6xy/rev3/keyboard.json similarity index 79% rename from keyboards/melgeek/mj6xy/rev3/info.json rename to keyboards/melgeek/mj6xy/rev3/keyboard.json index e6900656398..8888b78c2db 100644 --- a/keyboards/melgeek/mj6xy/rev3/info.json +++ b/keyboards/melgeek/mj6xy/rev3/keyboard.json @@ -1,4 +1,14 @@ { + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "F7", "D2", "D1", "D0"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/melgeek/mj6xy/rev3/rules.mk b/keyboards/melgeek/mj6xy/rev3/rules.mk deleted file mode 100755 index 51b869696a0..00000000000 --- a/keyboards/melgeek/mj6xy/rev3/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/meme/info.json b/keyboards/meme/keyboard.json similarity index 98% rename from keyboards/meme/info.json rename to keyboards/meme/keyboard.json index d844fc45ca4..e75f7e13aa6 100644 --- a/keyboards/meme/info.json +++ b/keyboards/meme/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "D2", "B5", "B6", "C7", "C6", "C5", "C4"], "rows": ["C2", "D0", "D1", "D4", "D5", "D6", "B0", "B1", "B2", "B3"] diff --git a/keyboards/meme/rules.mk b/keyboards/meme/rules.mk deleted file mode 100644 index b6e2a5f9a41..00000000000 --- a/keyboards/meme/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/meow48/info.json b/keyboards/meow48/keyboard.json similarity index 95% rename from keyboards/meow48/info.json rename to keyboards/meow48/keyboard.json index a38eee886bf..3bb78af1168 100644 --- a/keyboards/meow48/info.json +++ b/keyboards/meow48/keyboard.json @@ -30,6 +30,16 @@ "twinkle": true } }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"] diff --git a/keyboards/meow48/rules.mk b/keyboards/meow48/rules.mk deleted file mode 100644 index 50a1438ecd3..00000000000 --- a/keyboards/meow48/rules.mk +++ /dev/null @@ -1,13 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes diff --git a/keyboards/meow65/info.json b/keyboards/meow65/keyboard.json similarity index 96% rename from keyboards/meow65/info.json rename to keyboards/meow65/keyboard.json index 2187a021fb4..510f8318c8c 100644 --- a/keyboards/meow65/info.json +++ b/keyboards/meow65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4D36", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "F6", "B0", "F4", "F1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "C7"], "rows": ["C6", "B6", "B5", "B7", "F7"] diff --git a/keyboards/meow65/rules.mk b/keyboards/meow65/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/meow65/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 = 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/merge/iso_macro/info.json b/keyboards/merge/iso_macro/keyboard.json similarity index 83% rename from keyboards/merge/iso_macro/info.json rename to keyboards/merge/iso_macro/keyboard.json index fe20e701ba4..1c6d9052824 100644 --- a/keyboards/merge/iso_macro/info.json +++ b/keyboards/merge/iso_macro/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x1200", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B4", "B5", "B6"], "rows": ["F4", "F5", "F6"] diff --git a/keyboards/merge/iso_macro/rules.mk b/keyboards/merge/iso_macro/rules.mk deleted file mode 100644 index f6b1d47e1a9..00000000000 --- a/keyboards/merge/iso_macro/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 -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 -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/keyboard.json similarity index 85% rename from keyboards/merge/uc1/info.json rename to keyboards/merge/uc1/keyboard.json index b1f032417f1..85e9b03c64c 100644 --- a/keyboards/merge/uc1/info.json +++ b/keyboards/merge/uc1/keyboard.json @@ -30,6 +30,16 @@ "ws2812": { "pin": "B5" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B3", "B4"], "rows": ["B1", "B2"] diff --git a/keyboards/merge/uc1/rules.mk b/keyboards/merge/uc1/rules.mk deleted file mode 100644 index e78e1f6cec4..00000000000 --- a/keyboards/merge/uc1/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/mesa/mesa_tkl/info.json b/keyboards/mesa/mesa_tkl/keyboard.json similarity index 98% rename from keyboards/mesa/mesa_tkl/info.json rename to keyboards/mesa/mesa_tkl/keyboard.json index 28379d19bb5..ac12e879778 100644 --- a/keyboards/mesa/mesa_tkl/info.json +++ b/keyboards/mesa/mesa_tkl/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x8001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3"], "rows": ["D2", "D1", "D0", "B0", "C6", "C7"] diff --git a/keyboards/mesa/mesa_tkl/rules.mk b/keyboards/mesa/mesa_tkl/rules.mk deleted file mode 100644 index 718a1e8d099..00000000000 --- a/keyboards/mesa/mesa_tkl/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/mikeneko65/info.json b/keyboards/mikeneko65/keyboard.json similarity index 96% rename from keyboards/mikeneko65/info.json rename to keyboards/mikeneko65/keyboard.json index ebd6a4a7a4d..77bb74598e4 100644 --- a/keyboards/mikeneko65/info.json +++ b/keyboards/mikeneko65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6D54", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D4", "D6", "D7", "B6", "B5", "B4"], "rows": ["D0", "D1", "D2", "D3", "C7"] diff --git a/keyboards/mikeneko65/rules.mk b/keyboards/mikeneko65/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/mikeneko65/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 = 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/millipad/info.json b/keyboards/millipad/keyboard.json similarity index 86% rename from keyboards/millipad/info.json rename to keyboards/millipad/keyboard.json index 0734c9ae609..f7646b39ea6 100644 --- a/keyboards/millipad/info.json +++ b/keyboards/millipad/keyboard.json @@ -9,6 +9,15 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "D7", "D6", "D4"], "rows": ["C6", "C7"] diff --git a/keyboards/millipad/rules.mk b/keyboards/millipad/rules.mk deleted file mode 100644 index 4b9105caf38..00000000000 --- a/keyboards/millipad/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/mini_elixivy/info.json b/keyboards/mini_elixivy/keyboard.json similarity index 97% rename from keyboards/mini_elixivy/info.json rename to keyboards/mini_elixivy/keyboard.json index 396c27506c0..2485897ef60 100644 --- a/keyboards/mini_elixivy/info.json +++ b/keyboards/mini_elixivy/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F7", "F5", "F4", "F1", "F0", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B4", "C6"], "rows": ["B5", "B6", "E6", "F6", "C7"] diff --git a/keyboards/mini_elixivy/rules.mk b/keyboards/mini_elixivy/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/mini_elixivy/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/mini_ten_key_plus/info.json b/keyboards/mini_ten_key_plus/keyboard.json similarity index 94% rename from keyboards/mini_ten_key_plus/info.json rename to keyboards/mini_ten_key_plus/keyboard.json index d8c0baa6cda..2284c58d3c6 100644 --- a/keyboards/mini_ten_key_plus/info.json +++ b/keyboards/mini_ten_key_plus/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "F4", "B6", "D7", "C6"], "rows": ["D4", "B1", "B5", "B4", "E6"] diff --git a/keyboards/mini_ten_key_plus/rules.mk b/keyboards/mini_ten_key_plus/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/mini_ten_key_plus/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/minimacro5/info.json b/keyboards/minimacro5/keyboard.json similarity index 87% rename from keyboards/minimacro5/info.json rename to keyboards/minimacro5/keyboard.json index 4396783673a..32be6abd5f6 100644 --- a/keyboards/minimacro5/info.json +++ b/keyboards/minimacro5/keyboard.json @@ -37,6 +37,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "direct": [ ["F4", "B6", "B2", "D7", "B4"] diff --git a/keyboards/minimacro5/rules.mk b/keyboards/minimacro5/rules.mk deleted file mode 100644 index 897a356cf68..00000000000 --- a/keyboards/minimacro5/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 -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 -ENCODER_ENABLE = yes #enable rotary encoders diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/keyboard.json similarity index 98% rename from keyboards/minimon/index_tab/info.json rename to keyboards/minimon/index_tab/keyboard.json index 62a8d2df942..c8ff091790a 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "E6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D2", "F1", "F0"], "rows": ["D3", "B7", "B3", "B2", "B1", "B0"] diff --git a/keyboards/minimon/index_tab/rules.mk b/keyboards/minimon/index_tab/rules.mk deleted file mode 100644 index 26982ff0073..00000000000 --- a/keyboards/minimon/index_tab/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 = 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/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/keyboard.json similarity index 94% rename from keyboards/misonoworks/chocolatebar/info.json rename to keyboards/misonoworks/chocolatebar/keyboard.json index 51ce82d1bac..cf34557bb12 100644 --- a/keyboards/misonoworks/chocolatebar/info.json +++ b/keyboards/misonoworks/chocolatebar/keyboard.json @@ -24,6 +24,16 @@ "ws2812": { "pin": "B1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B3", "B2"], "rows": ["B0", "B7", "D2", "D3"] diff --git a/keyboards/misonoworks/chocolatebar/rules.mk b/keyboards/misonoworks/chocolatebar/rules.mk deleted file mode 100644 index e61a4270e14..00000000000 --- a/keyboards/misonoworks/chocolatebar/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no -OLED_ENABLE = yes diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/keyboard.json similarity index 93% rename from keyboards/misonoworks/karina/info.json rename to keyboards/misonoworks/karina/keyboard.json index d7bfaf11f02..cf01cbdbf27 100644 --- a/keyboards/misonoworks/karina/info.json +++ b/keyboards/misonoworks/karina/keyboard.json @@ -27,6 +27,16 @@ "ws2812": { "pin": "D1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["D2", "D3", "D5", "F0"] diff --git a/keyboards/misonoworks/karina/rules.mk b/keyboards/misonoworks/karina/rules.mk deleted file mode 100644 index 7e8534dae5a..00000000000 --- a/keyboards/misonoworks/karina/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/misterknife/knife66/info.json b/keyboards/misterknife/knife66/keyboard.json similarity index 99% rename from keyboards/misterknife/knife66/info.json rename to keyboards/misterknife/knife66/keyboard.json index aa196e14821..9e3d0c66b75 100644 --- a/keyboards/misterknife/knife66/info.json +++ b/keyboards/misterknife/knife66/keyboard.json @@ -31,6 +31,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], "rows": ["B15", "A8", "A3", "A2", "A1"] diff --git a/keyboards/misterknife/knife66/rules.mk b/keyboards/misterknife/knife66/rules.mk deleted file mode 100644 index 0098dc473ac..00000000000 --- a/keyboards/misterknife/knife66/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 -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/misterknife/knife66_iso/info.json b/keyboards/misterknife/knife66_iso/keyboard.json similarity index 99% rename from keyboards/misterknife/knife66_iso/info.json rename to keyboards/misterknife/knife66_iso/keyboard.json index 98fb591a40c..88f87461093 100644 --- a/keyboards/misterknife/knife66_iso/info.json +++ b/keyboards/misterknife/knife66_iso/keyboard.json @@ -31,6 +31,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], "rows": ["B15", "A8", "A3", "A2", "A1"] diff --git a/keyboards/misterknife/knife66_iso/rules.mk b/keyboards/misterknife/knife66_iso/rules.mk deleted file mode 100644 index 0098dc473ac..00000000000 --- a/keyboards/misterknife/knife66_iso/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 -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/miuni32/info.json b/keyboards/miuni32/keyboard.json similarity index 95% rename from keyboards/miuni32/info.json rename to keyboards/miuni32/keyboard.json index f9c9b5b7275..43f74f1812e 100644 --- a/keyboards/miuni32/info.json +++ b/keyboards/miuni32/keyboard.json @@ -27,6 +27,15 @@ "ws2812": { "pin": "D0" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F1", "E6", "B7", "B3", "B2", "B1", "B0"], "rows": ["F0", "F4", "D7"] diff --git a/keyboards/miuni32/rules.mk b/keyboards/miuni32/rules.mk deleted file mode 100644 index 34c8bbc6337..00000000000 --- a/keyboards/miuni32/rules.mk +++ /dev/null @@ -1,12 +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 -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes diff --git a/keyboards/mixi/info.json b/keyboards/mixi/keyboard.json similarity index 88% rename from keyboards/mixi/info.json rename to keyboards/mixi/keyboard.json index 44b1d0aad90..2f948931731 100644 --- a/keyboards/mixi/info.json +++ b/keyboards/mixi/keyboard.json @@ -37,6 +37,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "direct": [ ["D1", "D4", "F4"], diff --git a/keyboards/mixi/rules.mk b/keyboards/mixi/rules.mk deleted file mode 100644 index bb895a7bf2e..00000000000 --- a/keyboards/mixi/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -ENCODER_ENABLE = yes -AUDIO_ENABLE = no diff --git a/keyboards/ml/gas75/info.json b/keyboards/ml/gas75/keyboard.json similarity index 96% rename from keyboards/ml/gas75/info.json rename to keyboards/ml/gas75/keyboard.json index 492573c9be5..25289db9c8d 100644 --- a/keyboards/ml/gas75/info.json +++ b/keyboards/ml/gas75/keyboard.json @@ -56,6 +56,16 @@ "driver": "ws2812", "max_brightness": 200 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D1", "D2", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "E6", "B0", "B1", "B2", "B3"], "rows": ["D3", "D5", "D4", "D7", "D6", "B4"] diff --git a/keyboards/ml/gas75/rules.mk b/keyboards/ml/gas75/rules.mk deleted file mode 100644 index 27645344aeb..00000000000 --- a/keyboards/ml/gas75/rules.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 enabled -RGB_MATRIX_ENABLE = yes - -# Encoder enabled -ENCODER_ENABLE = yes diff --git a/keyboards/mlego/m48/rev1/info.json b/keyboards/mlego/m48/rev1/keyboard.json similarity index 81% rename from keyboards/mlego/m48/rev1/info.json rename to keyboards/mlego/m48/rev1/keyboard.json index a1f42260a24..c8259424f3e 100644 --- a/keyboards/mlego/m48/rev1/info.json +++ b/keyboards/mlego/m48/rev1/keyboard.json @@ -3,6 +3,16 @@ "pid": "0x6261", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A10", "A15", "B3", "B4", "B5", "B7", "B6", "A1", "A2", "A3", "A4", "A5"], "rows": ["A6", "A7", "B0", "B10"] diff --git a/keyboards/mlego/m48/rev1/rules.mk b/keyboards/mlego/m48/rev1/rules.mk deleted file mode 100644 index 52fd5e68dc5..00000000000 --- a/keyboards/mlego/m48/rev1/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 -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 -ENCODER_ENABLE = yes # Enable encoder diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/keyboard.json similarity index 81% rename from keyboards/mlego/m60/rev1/info.json rename to keyboards/mlego/m60/rev1/keyboard.json index 293041db82f..989474db830 100644 --- a/keyboards/mlego/m60/rev1/info.json +++ b/keyboards/mlego/m60/rev1/keyboard.json @@ -3,6 +3,16 @@ "pid": "0x6161", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A10", "A15", "B3", "B4", "B5", "B7", "B6", "A1", "A2", "A3", "A4", "A5"], "rows": ["A6", "A7", "B0", "B1", "B10"] diff --git a/keyboards/mlego/m60/rev1/rules.mk b/keyboards/mlego/m60/rev1/rules.mk deleted file mode 100644 index a8c86807b4e..00000000000 --- a/keyboards/mlego/m60/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# - -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable encoder diff --git a/keyboards/mmkzoo65/info.json b/keyboards/mmkzoo65/keyboard.json similarity index 96% rename from keyboards/mmkzoo65/info.json rename to keyboards/mmkzoo65/keyboard.json index 504e7b10612..f023f34ef04 100644 --- a/keyboards/mmkzoo65/info.json +++ b/keyboards/mmkzoo65/keyboard.json @@ -10,6 +10,14 @@ "force_nkro": true, "polling_interval": 2 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B1", "F0", "F1", "F4", "F5", "F6", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["B2", "B3", "B7", "E6", "B0"] diff --git a/keyboards/mmkzoo65/rules.mk b/keyboards/mmkzoo65/rules.mk deleted file mode 100644 index 299541fa82d..00000000000 --- a/keyboards/mmkzoo65/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 -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 -ENCODER_ENABLE = no diff --git a/keyboards/mntre/info.json b/keyboards/mntre/keyboard.json similarity index 95% rename from keyboards/mntre/info.json rename to keyboards/mntre/keyboard.json index 90bfc3fc560..4e14dd19f53 100644 --- a/keyboards/mntre/info.json +++ b/keyboards/mntre/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x1302", "device_version": "0.0.2" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "oled": true + }, "matrix_pins": { "cols": ["D5", "F7", "E6", "C7", "B3", "B2", "B1", "B0", "F0", "F1", "F4", "F5", "F6", "C6"], "rows": ["B6", "B5", "B4", "D7", "D6", "D4"] diff --git a/keyboards/mntre/rules.mk b/keyboards/mntre/rules.mk deleted file mode 100644 index a56f94b3128..00000000000 --- a/keyboards/mntre/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes diff --git a/keyboards/mode/m65ha_alpha/info.json b/keyboards/mode/m65ha_alpha/keyboard.json similarity index 98% rename from keyboards/mode/m65ha_alpha/info.json rename to keyboards/mode/m65ha_alpha/keyboard.json index 3332182127c..8297f3b2bd6 100644 --- a/keyboards/mode/m65ha_alpha/info.json +++ b/keyboards/mode/m65ha_alpha/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6566", "device_version": "0.6.5" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B10", "B12", "C8", "C4", "C5", "B0", "C10", "B13", "B14", "B15", "A15", "C6", "C7", "A8", "C9"], "rows": ["A7", "A10", "D2", "C12", "B1", "C11"] diff --git a/keyboards/mode/m65ha_alpha/rules.mk b/keyboards/mode/m65ha_alpha/rules.mk deleted file mode 100644 index 942e6c10612..00000000000 --- a/keyboards/mode/m65ha_alpha/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mode/m65hi_alpha/info.json b/keyboards/mode/m65hi_alpha/keyboard.json similarity index 98% rename from keyboards/mode/m65hi_alpha/info.json rename to keyboards/mode/m65hi_alpha/keyboard.json index a2a4416efed..ff6c75f55be 100644 --- a/keyboards/mode/m65hi_alpha/info.json +++ b/keyboards/mode/m65hi_alpha/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6574", "device_version": "0.6.5" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B10", "B12", "C8", "C4", "C5", "B0", "C10", "B13", "B14", "B15", "A15", "C6", "C7", "A8", "C9"], "rows": ["A7", "A10", "D2", "C12", "B1", "C11"] diff --git a/keyboards/mode/m65hi_alpha/rules.mk b/keyboards/mode/m65hi_alpha/rules.mk deleted file mode 100644 index 942e6c10612..00000000000 --- a/keyboards/mode/m65hi_alpha/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mode/m65s/info.json b/keyboards/mode/m65s/keyboard.json similarity index 99% rename from keyboards/mode/m65s/info.json rename to keyboards/mode/m65s/keyboard.json index b1875027369..8ed817a1801 100644 --- a/keyboards/mode/m65s/info.json +++ b/keyboards/mode/m65s/keyboard.json @@ -11,6 +11,14 @@ "qmk": { "tap_keycode_delay": 50 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "A8", "A10", "A4", "A5", "A6", "C10", "A7", "C4", "C5", "A15", "B0", "B1", "B12", "B10", "B13"], "rows": ["A3", "B14", "B15", "C9", "C6", "C11"] diff --git a/keyboards/mode/m65s/rules.mk b/keyboards/mode/m65s/rules.mk deleted file mode 100644 index 4d827a42544..00000000000 --- a/keyboards/mode/m65s/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mode/m80v1/m80h/info.json b/keyboards/mode/m80v1/m80h/keyboard.json similarity index 96% rename from keyboards/mode/m80v1/m80h/info.json rename to keyboards/mode/m80v1/m80h/keyboard.json index f132f25fe58..8d743dcb62f 100644 --- a/keyboards/mode/m80v1/m80h/info.json +++ b/keyboards/mode/m80v1/m80h/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0081", "device_version": "0.7.2" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B8", "B7", "B6", "B5", "B4", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5"], "rows": ["A10", "A15", "B3", "B9", "A3", "A4"] diff --git a/keyboards/mode/m80v1/m80h/rules.mk b/keyboards/mode/m80v1/m80h/rules.mk deleted file mode 100644 index 5742215e0a0..00000000000 --- a/keyboards/mode/m80v1/m80h/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/mode/m80v1/m80s/info.json b/keyboards/mode/m80v1/m80s/keyboard.json similarity index 96% rename from keyboards/mode/m80v1/m80s/info.json rename to keyboards/mode/m80v1/m80s/keyboard.json index 3c141c4e08a..f4585389344 100644 --- a/keyboards/mode/m80v1/m80s/info.json +++ b/keyboards/mode/m80v1/m80s/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0080", "device_version": "0.8.3" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B8", "B7", "B6", "B5", "B4", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5"], "rows": ["A10", "A15", "B3", "B9", "A3", "A4"] diff --git a/keyboards/mode/m80v1/m80s/rules.mk b/keyboards/mode/m80v1/m80s/rules.mk deleted file mode 100644 index 5742215e0a0..00000000000 --- a/keyboards/mode/m80v1/m80s/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/keyboard.json similarity index 97% rename from keyboards/mode/m80v2/m80v2h/info.json rename to keyboards/mode/m80v2/m80v2h/keyboard.json index b332a6853b8..e8bd7f2912b 100644 --- a/keyboards/mode/m80v2/m80v2h/info.json +++ b/keyboards/mode/m80v2/m80v2h/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0083", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "A8", "A10", "B15", "A15", "B5", "B8", "C13"], "rows": ["B12", "B13", "B14", "B3", "B4", "B9"] diff --git a/keyboards/mode/m80v2/m80v2h/rules.mk b/keyboards/mode/m80v2/m80v2h/rules.mk deleted file mode 100644 index 475d3a239cf..00000000000 --- a/keyboards/mode/m80v2/m80v2h/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/keyboard.json similarity index 97% rename from keyboards/mode/m80v2/m80v2s/info.json rename to keyboards/mode/m80v2/m80v2s/keyboard.json index 829448f9aed..8f5ecc9ac2e 100644 --- a/keyboards/mode/m80v2/m80v2s/info.json +++ b/keyboards/mode/m80v2/m80v2s/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0082", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "A8", "A10", "B15", "A15", "B5", "B8", "C13"], "rows": ["B12", "B13", "B14", "B3", "B4", "B9"] diff --git a/keyboards/mode/m80v2/m80v2s/rules.mk b/keyboards/mode/m80v2/m80v2s/rules.mk deleted file mode 100644 index 475d3a239cf..00000000000 --- a/keyboards/mode/m80v2/m80v2s/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/mokey/ginkgo65/info.json b/keyboards/mokey/ginkgo65/keyboard.json similarity index 99% rename from keyboards/mokey/ginkgo65/info.json rename to keyboards/mokey/ginkgo65/keyboard.json index 4fffbd596a3..311d91f2d31 100644 --- a/keyboards/mokey/ginkgo65/info.json +++ b/keyboards/mokey/ginkgo65/keyboard.json @@ -11,6 +11,15 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B1", "B2", "B3", "F7"] diff --git a/keyboards/mokey/ginkgo65/rules.mk b/keyboards/mokey/ginkgo65/rules.mk deleted file mode 100644 index 14e80e7106b..00000000000 --- a/keyboards/mokey/ginkgo65/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mokey/ginkgo65hot/info.json b/keyboards/mokey/ginkgo65hot/keyboard.json similarity index 95% rename from keyboards/mokey/ginkgo65hot/info.json rename to keyboards/mokey/ginkgo65hot/keyboard.json index d63a1f9beb2..1674607310c 100644 --- a/keyboards/mokey/ginkgo65hot/info.json +++ b/keyboards/mokey/ginkgo65hot/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x3366", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B0", "B1", "B2", "B3", "F7"] diff --git a/keyboards/mokey/ginkgo65hot/rules.mk b/keyboards/mokey/ginkgo65hot/rules.mk deleted file mode 100644 index 14e80e7106b..00000000000 --- a/keyboards/mokey/ginkgo65hot/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mokey/ibis80/info.json b/keyboards/mokey/ibis80/keyboard.json similarity index 98% rename from keyboards/mokey/ibis80/info.json rename to keyboards/mokey/ibis80/keyboard.json index 5324930df8e..d6cd985d016 100644 --- a/keyboards/mokey/ibis80/info.json +++ b/keyboards/mokey/ibis80/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3380", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], "rows": ["B0", "B1", "B2", "E6", "F0", "F1"] diff --git a/keyboards/mokey/ibis80/rules.mk b/keyboards/mokey/ibis80/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/mokey/ibis80/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 = 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/mokey/mokey63/info.json b/keyboards/mokey/mokey63/keyboard.json similarity index 97% rename from keyboards/mokey/mokey63/info.json rename to keyboards/mokey/mokey63/keyboard.json index bf0b078789f..bebc6005103 100644 --- a/keyboards/mokey/mokey63/info.json +++ b/keyboards/mokey/mokey63/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x063A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B5", "B6", "B2", "B3", "B1"] diff --git a/keyboards/mokey/mokey63/rules.mk b/keyboards/mokey/mokey63/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/mokey/mokey63/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mokey/mokey64/info.json b/keyboards/mokey/mokey64/keyboard.json similarity index 95% rename from keyboards/mokey/mokey64/info.json rename to keyboards/mokey/mokey64/keyboard.json index caff88fb420..0234cf6292d 100644 --- a/keyboards/mokey/mokey64/info.json +++ b/keyboards/mokey/mokey64/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x001A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D2", "D1", "D3", "D5", "D4", "D6", "D7", "B6"], "rows": ["B1", "B2", "B3", "B4", "B5"] diff --git a/keyboards/mokey/mokey64/rules.mk b/keyboards/mokey/mokey64/rules.mk deleted file mode 100644 index c21ddd50844..00000000000 --- a/keyboards/mokey/mokey64/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mokey/xox70/info.json b/keyboards/mokey/xox70/keyboard.json similarity index 99% rename from keyboards/mokey/xox70/info.json rename to keyboards/mokey/xox70/keyboard.json index 9d3216ab15f..4f8f5439f50 100644 --- a/keyboards/mokey/xox70/info.json +++ b/keyboards/mokey/xox70/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3370", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "C7", "F4", "F5", "F1", "B6", "D0", "D2", "D3", "D1", "D7", "D4", "D5", "D6", "B4", "B5", "C6", "B7"], "rows": ["F7", "B7", "F5", "F1", "B0"] diff --git a/keyboards/mokey/xox70/rules.mk b/keyboards/mokey/xox70/rules.mk deleted file mode 100644 index 33ab188ca78..00000000000 --- a/keyboards/mokey/xox70/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mokey/xox70hot/info.json b/keyboards/mokey/xox70hot/keyboard.json similarity index 96% rename from keyboards/mokey/xox70hot/info.json rename to keyboards/mokey/xox70hot/keyboard.json index 590684d79f3..7d5f338b626 100644 --- a/keyboards/mokey/xox70hot/info.json +++ b/keyboards/mokey/xox70hot/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3371", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "C7", "F4", "F5", "F1", "B6", "D0", "D2", "D3", "D1", "D7", "D4", "D5", "D6", "B4", "B5", "C6", "B7"], "rows": ["F7", "B7", "F5", "F1", "B0"] diff --git a/keyboards/mokey/xox70hot/rules.mk b/keyboards/mokey/xox70hot/rules.mk deleted file mode 100644 index 9e621339867..00000000000 --- a/keyboards/mokey/xox70hot/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/monarch/info.json b/keyboards/monarch/keyboard.json similarity index 97% rename from keyboards/monarch/info.json rename to keyboards/monarch/keyboard.json index ff47a1be3e1..f5dee1f9f60 100644 --- a/keyboards/monarch/info.json +++ b/keyboards/monarch/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x43C1", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B10", "B2", "B1", "B0", "A5", "A7", "A4", "A3", "B6"], "rows": ["A15", "B3", "B11", "A2", "A1", "B9"] diff --git a/keyboards/monarch/rules.mk b/keyboards/monarch/rules.mk deleted file mode 100644 index 195a2958ce7..00000000000 --- a/keyboards/monarch/rules.mk +++ /dev/null @@ -1,15 +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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # 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 -SLEEP_LED_ENABLE = yes -ENCODER_ENABLE = yes - diff --git a/keyboards/monstargear/xo87/rgb/info.json b/keyboards/monstargear/xo87/rgb/keyboard.json similarity index 97% rename from keyboards/monstargear/xo87/rgb/info.json rename to keyboards/monstargear/xo87/rgb/keyboard.json index c96111b0f29..cedc1868450 100644 --- a/keyboards/monstargear/xo87/rgb/info.json +++ b/keyboards/monstargear/xo87/rgb/keyboard.json @@ -64,6 +64,15 @@ "rgblight": { "max_brightness": 100 }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C5", "C3", "C1", "E1", "D6", "D2", "B7", "B3", "F6", "F7", "F3", "A5", "A1", "E2", "C7", "A6"], "rows": ["E6", "E7", "E3", "B0", "B1", "A2"] diff --git a/keyboards/monstargear/xo87/rgb/rules.mk b/keyboards/monstargear/xo87/rgb/rules.mk deleted file mode 100644 index 332aa40f385..00000000000 --- a/keyboards/monstargear/xo87/rgb/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 -RGB_MATRIX_ENABLE = yes -RAW_ENABLE = no diff --git a/keyboards/monstargear/xo87/solderable/info.json b/keyboards/monstargear/xo87/solderable/keyboard.json similarity index 99% rename from keyboards/monstargear/xo87/solderable/info.json rename to keyboards/monstargear/xo87/solderable/keyboard.json index 4c569a89dfd..f8436f4bacd 100644 --- a/keyboards/monstargear/xo87/solderable/info.json +++ b/keyboards/monstargear/xo87/solderable/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x5344", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C5", "C3", "C1", "E1", "D6", "D2", "B7", "B3", "F6", "F7", "F3", "A5", "A1", "E2", "C7", "A6"], "rows": ["E6", "E7", "E3", "B0", "B1", "A2"] diff --git a/keyboards/monstargear/xo87/solderable/rules.mk b/keyboards/monstargear/xo87/solderable/rules.mk deleted file mode 100644 index d845a512bb7..00000000000 --- a/keyboards/monstargear/xo87/solderable/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 = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/montsinger/rewind/info.json b/keyboards/montsinger/rewind/keyboard.json similarity index 94% rename from keyboards/montsinger/rewind/info.json rename to keyboards/montsinger/rewind/keyboard.json index 6e56b3de3bf..b8a70296633 100644 --- a/keyboards/montsinger/rewind/info.json +++ b/keyboards/montsinger/rewind/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["B5", "B4", "D2", "D3", "B2"] diff --git a/keyboards/montsinger/rewind/rules.mk b/keyboards/montsinger/rewind/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/montsinger/rewind/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/morizon/info.json b/keyboards/morizon/keyboard.json similarity index 95% rename from keyboards/morizon/info.json rename to keyboards/morizon/keyboard.json index 12cd59a31f7..440047c6902 100644 --- a/keyboards/morizon/info.json +++ b/keyboards/morizon/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/morizon/rules.mk b/keyboards/morizon/rules.mk deleted file mode 100644 index 03778480554..00000000000 --- a/keyboards/morizon/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 -COMMAND_ENABLE = no # Commands for debug and configuration -CONSOLE_ENABLE = yes # Console for debug -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/mountainblocks/mb17/info.json b/keyboards/mountainblocks/mb17/keyboard.json similarity index 89% rename from keyboards/mountainblocks/mb17/info.json rename to keyboards/mountainblocks/mb17/keyboard.json index 411e23a4206..dca8ca8ee97 100644 --- a/keyboards/mountainblocks/mb17/info.json +++ b/keyboards/mountainblocks/mb17/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0017", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F7", "E6", "D7", "C6"], "rows": ["F4", "B1", "B3", "B2", "B6"] diff --git a/keyboards/mountainblocks/mb17/rules.mk b/keyboards/mountainblocks/mb17/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/mountainblocks/mb17/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/mss_studio/m63_rgb/info.json b/keyboards/mss_studio/m63_rgb/keyboard.json similarity index 96% rename from keyboards/mss_studio/m63_rgb/info.json rename to keyboards/mss_studio/m63_rgb/keyboard.json index 3ac3725f1b0..1b1745bc201 100644 --- a/keyboards/mss_studio/m63_rgb/info.json +++ b/keyboards/mss_studio/m63_rgb/keyboard.json @@ -60,6 +60,15 @@ "driver": "ws2812", "max_brightness": 200 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B10", "A7", "A6", "A5", "A4", "B5", "B6", "A1", "B7", "B8", "B9"], "rows": ["B3", "B4", "A0", "A2", "A3"] diff --git a/keyboards/mss_studio/m63_rgb/rules.mk b/keyboards/mss_studio/m63_rgb/rules.mk deleted file mode 100644 index 138bf78056e..00000000000 --- a/keyboards/mss_studio/m63_rgb/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 = 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 enabled -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/mss_studio/m64_rgb/info.json b/keyboards/mss_studio/m64_rgb/keyboard.json similarity index 96% rename from keyboards/mss_studio/m64_rgb/info.json rename to keyboards/mss_studio/m64_rgb/keyboard.json index f956ac50b5e..eb1cabb3059 100644 --- a/keyboards/mss_studio/m64_rgb/info.json +++ b/keyboards/mss_studio/m64_rgb/keyboard.json @@ -60,6 +60,15 @@ "driver": "ws2812", "max_brightness": 200 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B10", "A7", "A6", "A5", "A4", "B5", "B6", "A1", "B7", "B8", "B9"], "rows": ["B3", "B4", "A0", "A2", "A3"] diff --git a/keyboards/mss_studio/m64_rgb/rules.mk b/keyboards/mss_studio/m64_rgb/rules.mk deleted file mode 100644 index 138bf78056e..00000000000 --- a/keyboards/mss_studio/m64_rgb/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 = 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 enabled -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/mt/blocked65/info.json b/keyboards/mt/blocked65/keyboard.json similarity index 96% rename from keyboards/mt/blocked65/info.json rename to keyboards/mt/blocked65/keyboard.json index d260a51b607..14e5942228d 100644 --- a/keyboards/mt/blocked65/info.json +++ b/keyboards/mt/blocked65/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "E2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/mt/blocked65/rules.mk b/keyboards/mt/blocked65/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/mt/blocked65/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mt/mt40/info.json b/keyboards/mt/mt40/keyboard.json similarity index 94% rename from keyboards/mt/mt40/info.json rename to keyboards/mt/mt40/keyboard.json index 83980bf7943..d1700389f7e 100644 --- a/keyboards/mt/mt40/info.json +++ b/keyboards/mt/mt40/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B6", "B7"] diff --git a/keyboards/mt/mt40/rules.mk b/keyboards/mt/mt40/rules.mk deleted file mode 100644 index 5aa98ed4d81..00000000000 --- a/keyboards/mt/mt40/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/mt/mt980/info.json b/keyboards/mt/mt980/keyboard.json similarity index 96% rename from keyboards/mt/mt980/info.json rename to keyboards/mt/mt980/keyboard.json index b27bf8aae81..6ecc9f86108 100644 --- a/keyboards/mt/mt980/info.json +++ b/keyboards/mt/mt980/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/mt/mt980/rules.mk b/keyboards/mt/mt980/rules.mk deleted file mode 100644 index 9107b459049..00000000000 --- a/keyboards/mt/mt980/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes -KEY_LOCK_ENABLE = no diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/keyboard.json similarity index 95% rename from keyboards/mtbkeys/mtb60/hotswap/info.json rename to keyboards/mtbkeys/mtb60/hotswap/keyboard.json index 554587e8163..8d39de83230 100644 --- a/keyboards/mtbkeys/mtb60/hotswap/info.json +++ b/keyboards/mtbkeys/mtb60/hotswap/keyboard.json @@ -32,6 +32,15 @@ "ws2812": { "pin": "D4" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "B7", "B6", "F7", "C6", "C7", "F6", "F4", "F1", "F0", "F5", "E6"], "rows": ["D6", "D7", "B4", "B5", "D5"] diff --git a/keyboards/mtbkeys/mtb60/hotswap/rules.mk b/keyboards/mtbkeys/mtb60/hotswap/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/mtbkeys/mtb60/hotswap/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/keyboard.json similarity index 99% rename from keyboards/mtbkeys/mtb60/solder/info.json rename to keyboards/mtbkeys/mtb60/solder/keyboard.json index dae43e69697..1770e3a997a 100644 --- a/keyboards/mtbkeys/mtb60/solder/info.json +++ b/keyboards/mtbkeys/mtb60/solder/keyboard.json @@ -32,6 +32,15 @@ "ws2812": { "pin": "B0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "F0", "F5", "F6", "F7", "D5", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D0", "D1", "F4", "F1", "D2"] diff --git a/keyboards/mtbkeys/mtb60/solder/rules.mk b/keyboards/mtbkeys/mtb60/solder/rules.mk deleted file mode 100644 index 2eba275490a..00000000000 --- a/keyboards/mtbkeys/mtb60/solder/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/keyboard.json similarity index 95% rename from keyboards/mwstudio/alicekk/info.json rename to keyboards/mwstudio/alicekk/keyboard.json index 75b65279d64..141be9909e3 100644 --- a/keyboards/mwstudio/alicekk/info.json +++ b/keyboards/mwstudio/alicekk/keyboard.json @@ -7,6 +7,16 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "A4", "A2", "A1", "B6", "B5", "B4", "B3", "A15"], "rows": ["A3", "A5", "A6", "A7", "B0"] diff --git a/keyboards/mwstudio/alicekk/rules.mk b/keyboards/mwstudio/alicekk/rules.mk deleted file mode 100644 index f365071da0e..00000000000 --- a/keyboards/mwstudio/alicekk/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - - diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/keyboard.json similarity index 97% rename from keyboards/mwstudio/mw65_black/info.json rename to keyboards/mwstudio/mw65_black/keyboard.json index 26463406587..8955cf96883 100644 --- a/keyboards/mwstudio/mw65_black/info.json +++ b/keyboards/mwstudio/mw65_black/keyboard.json @@ -16,6 +16,16 @@ "ws2812": { "pin": "C7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "D0", "D1", "D2", "D3", "D5", "C6", "F7", "F4", "F6", "F5", "F1", "F0"], "rows": ["D4", "D7", "B4", "B3", "B6"] diff --git a/keyboards/mwstudio/mw65_black/rules.mk b/keyboards/mwstudio/mw65_black/rules.mk deleted file mode 100644 index 6c261600bc0..00000000000 --- a/keyboards/mwstudio/mw65_black/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/mwstudio/mw65_rgb/info.json b/keyboards/mwstudio/mw65_rgb/keyboard.json similarity index 96% rename from keyboards/mwstudio/mw65_rgb/info.json rename to keyboards/mwstudio/mw65_rgb/keyboard.json index 502a112c43b..f1a8190948b 100644 --- a/keyboards/mwstudio/mw65_rgb/info.json +++ b/keyboards/mwstudio/mw65_rgb/keyboard.json @@ -57,6 +57,16 @@ "driver": "ws2812", "max_brightness": 200 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["D0", "D1", "D2", "D3", "B7"] diff --git a/keyboards/mwstudio/mw65_rgb/rules.mk b/keyboards/mwstudio/mw65_rgb/rules.mk deleted file mode 100644 index faabb5cad76..00000000000 --- a/keyboards/mwstudio/mw65_rgb/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes - -ENCODER_ENABLE = yes diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/keyboard.json similarity index 96% rename from keyboards/mwstudio/mw75/info.json rename to keyboards/mwstudio/mw75/keyboard.json index 61533f6266f..d19d6b49ba1 100644 --- a/keyboards/mwstudio/mw75/info.json +++ b/keyboards/mwstudio/mw75/keyboard.json @@ -56,6 +56,16 @@ "driver": "ws2812", "max_brightness": 200 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["B7", "D0", "D1", "D2", "D3", "D5", "B0"] diff --git a/keyboards/mwstudio/mw75/rules.mk b/keyboards/mwstudio/mw75/rules.mk deleted file mode 100644 index 041f588c14e..00000000000 --- a/keyboards/mwstudio/mw75/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes -ENCODER_ENABLE = yes diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/keyboard.json similarity index 96% rename from keyboards/mwstudio/mw75r2/info.json rename to keyboards/mwstudio/mw75r2/keyboard.json index 950ded1e80d..ae227830e59 100644 --- a/keyboards/mwstudio/mw75r2/info.json +++ b/keyboards/mwstudio/mw75r2/keyboard.json @@ -42,6 +42,16 @@ }, "driver": "ws2812" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "F7", "F6", "E6", "F0", "F1", "F4", "F5"], "rows": ["B7", "D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/mwstudio/mw75r2/rules.mk b/keyboards/mwstudio/mw75r2/rules.mk deleted file mode 100644 index 041f588c14e..00000000000 --- a/keyboards/mwstudio/mw75r2/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes -ENCODER_ENABLE = yes diff --git a/keyboards/mysticworks/wyvern/info.json b/keyboards/mysticworks/wyvern/keyboard.json similarity index 99% rename from keyboards/mysticworks/wyvern/info.json rename to keyboards/mysticworks/wyvern/keyboard.json index 01c16c41f9b..ddc240dd8f3 100644 --- a/keyboards/mysticworks/wyvern/info.json +++ b/keyboards/mysticworks/wyvern/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["E6", "B0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D0", "D1", "D5", "D3", "F7", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/mysticworks/wyvern/rules.mk b/keyboards/mysticworks/wyvern/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/mysticworks/wyvern/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 = 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/nacly/ua62/info.json b/keyboards/nacly/ua62/keyboard.json similarity index 95% rename from keyboards/nacly/ua62/info.json rename to keyboards/nacly/ua62/keyboard.json index 383825414b6..92323d51646 100644 --- a/keyboards/nacly/ua62/info.json +++ b/keyboards/nacly/ua62/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xFFFF", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0", "D4"] diff --git a/keyboards/nacly/ua62/rules.mk b/keyboards/nacly/ua62/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/nacly/ua62/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/ncc1701kb/info.json b/keyboards/ncc1701kb/keyboard.json similarity index 82% rename from keyboards/ncc1701kb/info.json rename to keyboards/ncc1701kb/keyboard.json index 246edae9475..f30b85f47ad 100644 --- a/keyboards/ncc1701kb/info.json +++ b/keyboards/ncc1701kb/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x1701", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["B4", "B5", "B6"], "rows": ["D4", "D6", "D7"] diff --git a/keyboards/ncc1701kb/rules.mk b/keyboards/ncc1701kb/rules.mk deleted file mode 100644 index 86884fb0826..00000000000 --- a/keyboards/ncc1701kb/rules.mk +++ /dev/null @@ -1,14 +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 -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 -UNICODE_ENABLE = yes # Unicode -ENCODER_ENABLE = yes diff --git a/keyboards/neito/info.json b/keyboards/neito/keyboard.json similarity index 95% rename from keyboards/neito/info.json rename to keyboards/neito/keyboard.json index fcf24c68c8e..d79ab685082 100644 --- a/keyboards/neito/info.json +++ b/keyboards/neito/keyboard.json @@ -8,6 +8,17 @@ "pid": "0xB44C", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F1", "F7", "B2", "D1", "D2", "B3", "B1"], "rows": ["E6", "F0", "F5", "F6", "C7", "C6", "B4", "D7", "D6", "D4"] diff --git a/keyboards/neito/rules.mk b/keyboards/neito/rules.mk deleted file mode 100644 index a36b9d8dca8..00000000000 --- a/keyboards/neito/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 -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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # We have a encoder diff --git a/keyboards/nemui/info.json b/keyboards/nemui/keyboard.json similarity index 96% rename from keyboards/nemui/info.json rename to keyboards/nemui/keyboard.json index 867512a8f57..d8fbc4db1c2 100644 --- a/keyboards/nemui/info.json +++ b/keyboards/nemui/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x2371", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B2", "B1", "B0", "B10", "B11", "A7", "B12", "B13", "B14", "A10", "A9", "A8", "B7", "B8", "B9"], "rows": ["A3", "A4", "A5", "A6", "A2"] diff --git a/keyboards/nemui/rules.mk b/keyboards/nemui/rules.mk deleted file mode 100644 index 7f4f202a1b7..00000000000 --- a/keyboards/nemui/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 -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 - diff --git a/keyboards/neokeys/g67/element_hs/info.json b/keyboards/neokeys/g67/element_hs/keyboard.json similarity index 95% rename from keyboards/neokeys/g67/element_hs/info.json rename to keyboards/neokeys/g67/element_hs/keyboard.json index 707993d4a3c..f477c33d6a8 100644 --- a/keyboards/neokeys/g67/element_hs/info.json +++ b/keyboards/neokeys/g67/element_hs/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x5049", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "key_lock": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"], "rows": ["B0", "B1", "B2", "B3", "F7"] diff --git a/keyboards/neokeys/g67/element_hs/rules.mk b/keyboards/neokeys/g67/element_hs/rules.mk deleted file mode 100644 index f819a9f1e02..00000000000 --- a/keyboards/neokeys/g67/element_hs/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -KEY_LOCK_ENABLE = yes diff --git a/keyboards/neokeys/g67/hotswap/info.json b/keyboards/neokeys/g67/hotswap/keyboard.json similarity index 95% rename from keyboards/neokeys/g67/hotswap/info.json rename to keyboards/neokeys/g67/hotswap/keyboard.json index 526da4ba06d..937e802fa03 100644 --- a/keyboards/neokeys/g67/hotswap/info.json +++ b/keyboards/neokeys/g67/hotswap/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x5048", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "key_lock": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B4"], "rows": ["B0", "B1", "B2", "B3", "F7"] diff --git a/keyboards/neokeys/g67/hotswap/rules.mk b/keyboards/neokeys/g67/hotswap/rules.mk deleted file mode 100644 index f819a9f1e02..00000000000 --- a/keyboards/neokeys/g67/hotswap/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -KEY_LOCK_ENABLE = yes diff --git a/keyboards/neokeys/g67/soldered/info.json b/keyboards/neokeys/g67/soldered/keyboard.json similarity index 99% rename from keyboards/neokeys/g67/soldered/info.json rename to keyboards/neokeys/g67/soldered/keyboard.json index 567a56d9268..541f07ee09c 100644 --- a/keyboards/neokeys/g67/soldered/info.json +++ b/keyboards/neokeys/g67/soldered/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x5053", "device_version": "1.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B5", "B4"], "rows": ["B0", "B1", "B2", "B3", "F7"] diff --git a/keyboards/neokeys/g67/soldered/rules.mk b/keyboards/neokeys/g67/soldered/rules.mk deleted file mode 100644 index 85830d31150..00000000000 --- a/keyboards/neokeys/g67/soldered/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 = 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 diff --git a/keyboards/newgame40/info.json b/keyboards/newgame40/keyboard.json similarity index 93% rename from keyboards/newgame40/info.json rename to keyboards/newgame40/keyboard.json index 809d685ed1f..063260b99f6 100644 --- a/keyboards/newgame40/info.json +++ b/keyboards/newgame40/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "unicode": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2"] diff --git a/keyboards/newgame40/rules.mk b/keyboards/newgame40/rules.mk deleted file mode 100644 index e05b73d6d98..00000000000 --- a/keyboards/newgame40/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -IOS_DEVICE_ENABLE = no # connect to IOS Device diff --git a/keyboards/nibiria/stream15/info.json b/keyboards/nibiria/stream15/keyboard.json similarity index 88% rename from keyboards/nibiria/stream15/info.json rename to keyboards/nibiria/stream15/keyboard.json index 0fe4b9ed23d..899a5ecbce0 100644 --- a/keyboards/nibiria/stream15/info.json +++ b/keyboards/nibiria/stream15/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A1", "A2", "B11", "B12", "B13"], "rows": ["B10", "B9", "B8"] diff --git a/keyboards/nibiria/stream15/rules.mk b/keyboards/nibiria/stream15/rules.mk deleted file mode 100644 index c3b8e77d77a..00000000000 --- a/keyboards/nibiria/stream15/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 -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/nightingale_studios/hailey/info.json b/keyboards/nightingale_studios/hailey/keyboard.json similarity index 98% rename from keyboards/nightingale_studios/hailey/info.json rename to keyboards/nightingale_studios/hailey/keyboard.json index 588bb832102..ccf4e9adba6 100644 --- a/keyboards/nightingale_studios/hailey/info.json +++ b/keyboards/nightingale_studios/hailey/keyboard.json @@ -7,6 +7,15 @@ "pid": "0x4879", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["A4", "A3", "F1", "F0", "C15", "C14", "C13", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A6", "B5", "A15"], "rows": ["A8", "B15", "B14", "B13", "B12", "B6", "A14"] diff --git a/keyboards/nightingale_studios/hailey/rules.mk b/keyboards/nightingale_studios/hailey/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/nightingale_studios/hailey/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/keyboard.json similarity index 96% rename from keyboards/nightly_boards/alter/rev1/info.json rename to keyboards/nightly_boards/alter/rev1/keyboard.json index 48e8da0c9ae..84eb93fac31 100644 --- a/keyboards/nightly_boards/alter/rev1/info.json +++ b/keyboards/nightly_boards/alter/rev1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B0", "B1", "B2", "B3"], "rows": ["F7", "F6", "F5", "E6", "D0", "B7", "D5", "D3", "D2", "D1"] diff --git a/keyboards/nightly_boards/alter/rev1/rules.mk b/keyboards/nightly_boards/alter/rev1/rules.mk deleted file mode 100644 index 178b634fcbe..00000000000 --- a/keyboards/nightly_boards/alter/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/nightly_boards/alter_lite/info.json b/keyboards/nightly_boards/alter_lite/keyboard.json similarity index 96% rename from keyboards/nightly_boards/alter_lite/info.json rename to keyboards/nightly_boards/alter_lite/keyboard.json index 4fe29568a01..f92e848d22a 100644 --- a/keyboards/nightly_boards/alter_lite/info.json +++ b/keyboards/nightly_boards/alter_lite/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0013", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "E6", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], "rows": ["F0", "F1", "D3", "D5", "B5"] diff --git a/keyboards/nightly_boards/alter_lite/rules.mk b/keyboards/nightly_boards/alter_lite/rules.mk deleted file mode 100644 index 1576a6efb62..00000000000 --- a/keyboards/nightly_boards/alter_lite/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow \ No newline at end of file diff --git a/keyboards/nightly_boards/daily60/info.json b/keyboards/nightly_boards/daily60/keyboard.json similarity index 99% rename from keyboards/nightly_boards/daily60/info.json rename to keyboards/nightly_boards/daily60/keyboard.json index 8a00c5e2d6b..7a05b2f86d8 100644 --- a/keyboards/nightly_boards/daily60/info.json +++ b/keyboards/nightly_boards/daily60/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x0024", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["GP22", "GP0", "GP1", "GP2", "GP5", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15"], "rows": ["GP23", "GP24", "GP20", "GP19", "GP18"] diff --git a/keyboards/nightly_boards/daily60/rules.mk b/keyboards/nightly_boards/daily60/rules.mk deleted file mode 100644 index 0cd6926a62a..00000000000 --- a/keyboards/nightly_boards/daily60/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow diff --git a/keyboards/nightly_boards/jisoo/info.json b/keyboards/nightly_boards/jisoo/keyboard.json similarity index 96% rename from keyboards/nightly_boards/jisoo/info.json rename to keyboards/nightly_boards/jisoo/keyboard.json index 4dca4dec609..978c6c323ba 100644 --- a/keyboards/nightly_boards/jisoo/info.json +++ b/keyboards/nightly_boards/jisoo/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x0025", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["GP25", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP0"], "rows": ["GP26", "GP27", "GP28", "GP18", "GP19", "GP20"] diff --git a/keyboards/nightly_boards/jisoo/rules.mk b/keyboards/nightly_boards/jisoo/rules.mk deleted file mode 100644 index 0cd6926a62a..00000000000 --- a/keyboards/nightly_boards/jisoo/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow diff --git a/keyboards/nightly_boards/n2/info.json b/keyboards/nightly_boards/n2/keyboard.json similarity index 84% rename from keyboards/nightly_boards/n2/info.json rename to keyboards/nightly_boards/n2/keyboard.json index 2a068e1a2e9..050f6fedeef 100644 --- a/keyboards/nightly_boards/n2/info.json +++ b/keyboards/nightly_boards/n2/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "C6"], "rows": ["F1", "C7"] diff --git a/keyboards/nightly_boards/n2/rules.mk b/keyboards/nightly_boards/n2/rules.mk deleted file mode 100644 index a927de843cb..00000000000 --- a/keyboards/nightly_boards/n2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/nightly_boards/n87/info.json b/keyboards/nightly_boards/n87/keyboard.json similarity index 98% rename from keyboards/nightly_boards/n87/info.json rename to keyboards/nightly_boards/n87/keyboard.json index 71f78c1f3ac..fd8589b18d8 100644 --- a/keyboards/nightly_boards/n87/info.json +++ b/keyboards/nightly_boards/n87/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "C7", "C6", "B6", "B5", "D6"], "rows": ["B0", "B1", "B2", "B3", "F1", "F0", "D7", "B4", "D1", "D2", "D3", "D5"] diff --git a/keyboards/nightly_boards/n87/rules.mk b/keyboards/nightly_boards/n87/rules.mk deleted file mode 100644 index a32639a0b58..00000000000 --- a/keyboards/nightly_boards/n87/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 -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 = yes # Audio output - diff --git a/keyboards/nightly_boards/n9/info.json b/keyboards/nightly_boards/n9/keyboard.json similarity index 88% rename from keyboards/nightly_boards/n9/info.json rename to keyboards/nightly_boards/n9/keyboard.json index e3fd75c9609..6adb9efe683 100644 --- a/keyboards/nightly_boards/n9/info.json +++ b/keyboards/nightly_boards/n9/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "D4"], "rows": ["F4", "B1", "B3"] diff --git a/keyboards/nightly_boards/n9/rules.mk b/keyboards/nightly_boards/n9/rules.mk deleted file mode 100644 index c2fee558278..00000000000 --- a/keyboards/nightly_boards/n9/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/nightly_boards/octopadplus/info.json b/keyboards/nightly_boards/octopadplus/keyboard.json similarity index 89% rename from keyboards/nightly_boards/octopadplus/info.json rename to keyboards/nightly_boards/octopadplus/keyboard.json index 7a27cef0208..629aa93aa3e 100644 --- a/keyboards/nightly_boards/octopadplus/info.json +++ b/keyboards/nightly_boards/octopadplus/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "F5", "C7", "D7", "F4", "D2"], "rows": ["F6", "D3"] diff --git a/keyboards/nightly_boards/octopadplus/rules.mk b/keyboards/nightly_boards/octopadplus/rules.mk deleted file mode 100644 index 89c0d63d8b9..00000000000 --- a/keyboards/nightly_boards/octopadplus/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 -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 -ENCODER_ENABLE = yes # Enable Rotary Encoders - diff --git a/keyboards/nightly_boards/ph_arisu/info.json b/keyboards/nightly_boards/ph_arisu/keyboard.json similarity index 96% rename from keyboards/nightly_boards/ph_arisu/info.json rename to keyboards/nightly_boards/ph_arisu/keyboard.json index 43cd5ad1a0c..90cd8f3b8f6 100644 --- a/keyboards/nightly_boards/ph_arisu/info.json +++ b/keyboards/nightly_boards/ph_arisu/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/nightly_boards/ph_arisu/rules.mk b/keyboards/nightly_boards/ph_arisu/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/nightly_boards/ph_arisu/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 = 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/nightmare/info.json b/keyboards/nightmare/keyboard.json similarity index 97% rename from keyboards/nightmare/info.json rename to keyboards/nightmare/keyboard.json index 87f0187e597..c41d95e64d8 100644 --- a/keyboards/nightmare/info.json +++ b/keyboards/nightmare/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4E49", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B4", "B5", "D3", "D2", "D1", "D0", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/nightmare/rules.mk b/keyboards/nightmare/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/nightmare/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/nimrod/info.json b/keyboards/nimrod/keyboard.json similarity index 98% rename from keyboards/nimrod/info.json rename to keyboards/nimrod/keyboard.json index 4c14f8fd071..5f07885d0d7 100644 --- a/keyboards/nimrod/info.json +++ b/keyboards/nimrod/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x720D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D1", "F4", "B5", "B4", "E6", "F6", "F7", "B1", "B3", "B2"], "rows": ["F5", "B6", "D7", "C6"] diff --git a/keyboards/nimrod/rules.mk b/keyboards/nimrod/rules.mk deleted file mode 100644 index fadee908150..00000000000 --- a/keyboards/nimrod/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/nix_studio/n60_a/info.json b/keyboards/nix_studio/n60_a/keyboard.json similarity index 95% rename from keyboards/nix_studio/n60_a/info.json rename to keyboards/nix_studio/n60_a/keyboard.json index dc04bfca6a5..3f9b4dd0869 100644 --- a/keyboards/nix_studio/n60_a/info.json +++ b/keyboards/nix_studio/n60_a/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3630", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/nix_studio/n60_a/rules.mk b/keyboards/nix_studio/n60_a/rules.mk deleted file mode 100644 index 7fb99d788f2..00000000000 --- a/keyboards/nix_studio/n60_a/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 = 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 - - diff --git a/keyboards/nixkeyboards/day_off/info.json b/keyboards/nixkeyboards/day_off/keyboard.json similarity index 99% rename from keyboards/nixkeyboards/day_off/info.json rename to keyboards/nixkeyboards/day_off/keyboard.json index 1dfdc38867b..2edbcdf883b 100644 --- a/keyboards/nixkeyboards/day_off/info.json +++ b/keyboards/nixkeyboards/day_off/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x444F", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B3", "B7", "F5", "F4", "F1"] diff --git a/keyboards/nixkeyboards/day_off/rules.mk b/keyboards/nixkeyboards/day_off/rules.mk deleted file mode 100644 index bb4ad767b29..00000000000 --- a/keyboards/nixkeyboards/day_off/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/nopunin10did/jabberwocky/v1/info.json b/keyboards/nopunin10did/jabberwocky/v1/keyboard.json similarity index 98% rename from keyboards/nopunin10did/jabberwocky/v1/info.json rename to keyboards/nopunin10did/jabberwocky/v1/keyboard.json index 59ecc815b0f..b82a9642c71 100644 --- a/keyboards/nopunin10did/jabberwocky/v1/info.json +++ b/keyboards/nopunin10did/jabberwocky/v1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4A57", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "D7", "C6", "D4", "D0", "D2", "D3"], "rows": ["E6", "B4", "B5", "B7", "D5", "C7", "F1", "F0", "B1", "B3", "B2", "B6"] diff --git a/keyboards/nopunin10did/jabberwocky/v1/rules.mk b/keyboards/nopunin10did/jabberwocky/v1/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/nopunin10did/jabberwocky/v1/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 = 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/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/keyboard.json similarity index 98% rename from keyboards/nopunin10did/jabberwocky/v2/info.json rename to keyboards/nopunin10did/jabberwocky/v2/keyboard.json index 263ae7df8ff..549daef9719 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/info.json +++ b/keyboards/nopunin10did/jabberwocky/v2/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4A58", "device_version": "0.2.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D2", "D3", "D5", "B5", "D7", "F6", "F7", "C7", "B6"], "rows": ["B2", "B3", "B1", "D4", "B4", "D1", "E6", "B0", "F0", "F1", "F4", "F5"] diff --git a/keyboards/nopunin10did/jabberwocky/v2/rules.mk b/keyboards/nopunin10did/jabberwocky/v2/rules.mk deleted file mode 100644 index b325f3f0c79..00000000000 --- a/keyboards/nopunin10did/jabberwocky/v2/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 = 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/nopunin10did/kastenwagen1840/info.json b/keyboards/nopunin10did/kastenwagen1840/keyboard.json similarity index 98% rename from keyboards/nopunin10did/kastenwagen1840/info.json rename to keyboards/nopunin10did/kastenwagen1840/keyboard.json index a43f84fa576..771df3d82c7 100644 --- a/keyboards/nopunin10did/kastenwagen1840/info.json +++ b/keyboards/nopunin10did/kastenwagen1840/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4B57", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "E6", "D7"], "rows": ["B4", "B5", "B7", "D5", "C7", "F1", "F0", "B6"] diff --git a/keyboards/nopunin10did/kastenwagen1840/rules.mk b/keyboards/nopunin10did/kastenwagen1840/rules.mk deleted file mode 100644 index 0cf05c09d15..00000000000 --- a/keyboards/nopunin10did/kastenwagen1840/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes # Enable rotary encoder input diff --git a/keyboards/nopunin10did/kastenwagen48/info.json b/keyboards/nopunin10did/kastenwagen48/keyboard.json similarity index 97% rename from keyboards/nopunin10did/kastenwagen48/info.json rename to keyboards/nopunin10did/kastenwagen48/keyboard.json index 20332aaa43f..58a9d7c2a80 100644 --- a/keyboards/nopunin10did/kastenwagen48/info.json +++ b/keyboards/nopunin10did/kastenwagen48/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4B30", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "E6"], "rows": ["B4", "B5", "B7", "D5", "C7", "F1", "F0", "B6"] diff --git a/keyboards/nopunin10did/kastenwagen48/rules.mk b/keyboards/nopunin10did/kastenwagen48/rules.mk deleted file mode 100644 index 0cf05c09d15..00000000000 --- a/keyboards/nopunin10did/kastenwagen48/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes # Enable rotary encoder input diff --git a/keyboards/nopunin10did/railroad/rev0/info.json b/keyboards/nopunin10did/railroad/rev0/keyboard.json similarity index 97% rename from keyboards/nopunin10did/railroad/rev0/info.json rename to keyboards/nopunin10did/railroad/rev0/keyboard.json index 04c3f7e5e9e..db740a4d483 100644 --- a/keyboards/nopunin10did/railroad/rev0/info.json +++ b/keyboards/nopunin10did/railroad/rev0/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x9111", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6"], "rows": ["D2", "D3", "D5", "C6", "C7", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/nopunin10did/railroad/rev0/rules.mk b/keyboards/nopunin10did/railroad/rev0/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/nopunin10did/railroad/rev0/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 = 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/novelkeys/nk1/info.json b/keyboards/novelkeys/nk1/keyboard.json similarity index 84% rename from keyboards/novelkeys/nk1/info.json rename to keyboards/novelkeys/nk1/keyboard.json index 480bc968c2f..0fa15cf9f2a 100755 --- a/keyboards/novelkeys/nk1/info.json +++ b/keyboards/novelkeys/nk1/keyboard.json @@ -31,6 +31,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "direct": [ ["D4"] diff --git a/keyboards/novelkeys/nk1/rules.mk b/keyboards/novelkeys/nk1/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/novelkeys/nk1/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 = 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/novelkeys/novelpad/info.json b/keyboards/novelkeys/novelpad/keyboard.json similarity index 90% rename from keyboards/novelkeys/novelpad/info.json rename to keyboards/novelkeys/novelpad/keyboard.json index 1e5f6b4f73c..03c76764dfb 100644 --- a/keyboards/novelkeys/novelpad/info.json +++ b/keyboards/novelkeys/novelpad/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6070", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D7", "D6", "D5", "D4"], "rows": ["C2", "C4", "C5", "C6", "C7"] diff --git a/keyboards/novelkeys/novelpad/rules.mk b/keyboards/novelkeys/novelpad/rules.mk deleted file mode 100755 index 40888f5a30e..00000000000 --- a/keyboards/novelkeys/novelpad/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 = 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 = yes # In-switch LEDs -AUDIO_ENABLE = no # There is no available timer or pin for audio on the NovelPad -RGBLIGHT_ENABLE = yes # RGB LEDs for underglow, installed and enabled by default for the NovelPad diff --git a/keyboards/noxary/220/info.json b/keyboards/noxary/220/keyboard.json similarity index 90% rename from keyboards/noxary/220/info.json rename to keyboards/noxary/220/keyboard.json index 9b04a0465f1..f40c0f7280a 100644 --- a/keyboards/noxary/220/info.json +++ b/keyboards/noxary/220/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0899", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B4", "C5", "D2", "D1"], "rows": ["C4", "B0", "D3", "D4", "D5", "D6"] diff --git a/keyboards/noxary/220/rules.mk b/keyboards/noxary/220/rules.mk deleted file mode 100644 index 8dea3757839..00000000000 --- a/keyboards/noxary/220/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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/noxary/268/info.json b/keyboards/noxary/268/keyboard.json similarity index 98% rename from keyboards/noxary/268/info.json rename to keyboards/noxary/268/keyboard.json index b1bbeace6f2..bb0bc191d39 100644 --- a/keyboards/noxary/268/info.json +++ b/keyboards/noxary/268/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0A79", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "E6", "B0", "D1", "B2", "B3", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["F5", "F4", "F0", "F1", "D0"] diff --git a/keyboards/noxary/268/rules.mk b/keyboards/noxary/268/rules.mk deleted file mode 100644 index 8dea3757839..00000000000 --- a/keyboards/noxary/268/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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/noxary/268_2/info.json b/keyboards/noxary/268_2/keyboard.json similarity index 98% rename from keyboards/noxary/268_2/info.json rename to keyboards/noxary/268_2/keyboard.json index a652276c6d1..6e983a07f61 100644 --- a/keyboards/noxary/268_2/info.json +++ b/keyboards/noxary/268_2/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0A7A", "device_version": "0.0.2" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "B6", "C7", "F4", "E6", "D0", "D7", "D1", "D2", "B4", "D6", "D4", "D5", "F1", "D3", "B1"], "rows": ["F7", "F6", "F5", "F0", "B5"] diff --git a/keyboards/noxary/268_2/rules.mk b/keyboards/noxary/268_2/rules.mk deleted file mode 100644 index 4caf87aa2b1..00000000000 --- a/keyboards/noxary/268_2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/noxary/268_2_rgb/info.json b/keyboards/noxary/268_2_rgb/keyboard.json similarity index 98% rename from keyboards/noxary/268_2_rgb/info.json rename to keyboards/noxary/268_2_rgb/keyboard.json index f742581e0fb..971e4450367 100644 --- a/keyboards/noxary/268_2_rgb/info.json +++ b/keyboards/noxary/268_2_rgb/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0A7C", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F1", "E6", "B2", "B1", "D6", "B4", "D7", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["F6", "F5", "F4", "F0", "B6"] diff --git a/keyboards/noxary/268_2_rgb/rules.mk b/keyboards/noxary/268_2_rgb/rules.mk deleted file mode 100644 index 1955f1d315b..00000000000 --- a/keyboards/noxary/268_2_rgb/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/noxary/280/info.json b/keyboards/noxary/280/keyboard.json similarity index 96% rename from keyboards/noxary/280/info.json rename to keyboards/noxary/280/keyboard.json index aca07e4fa92..f4b77260a57 100644 --- a/keyboards/noxary/280/info.json +++ b/keyboards/noxary/280/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0AF1", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "B0", "B3"], "rows": ["F0", "E6", "D6", "D4", "F6", "F5", "F4", "F1", "B2", "D3", "D2", "D1"] diff --git a/keyboards/noxary/280/rules.mk b/keyboards/noxary/280/rules.mk deleted file mode 100644 index 8dea3757839..00000000000 --- a/keyboards/noxary/280/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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/noxary/378/info.json b/keyboards/noxary/378/keyboard.json similarity index 98% rename from keyboards/noxary/378/info.json rename to keyboards/noxary/378/keyboard.json index 198f34a3e1d..09c5d39b048 100644 --- a/keyboards/noxary/378/info.json +++ b/keyboards/noxary/378/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x017A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A7", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A2", "A1", "A0", "F1", "F0", "C14", "C15"], "rows": ["A10", "B11", "A4", "A5", "A6"] diff --git a/keyboards/noxary/378/rules.mk b/keyboards/noxary/378/rules.mk deleted file mode 100644 index 93e50cd795b..00000000000 --- a/keyboards/noxary/378/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 -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/noxary/valhalla/info.json b/keyboards/noxary/valhalla/keyboard.json similarity index 98% rename from keyboards/noxary/valhalla/info.json rename to keyboards/noxary/valhalla/keyboard.json index 165a4155a9d..9cf12969c18 100644 --- a/keyboards/noxary/valhalla/info.json +++ b/keyboards/noxary/valhalla/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5648", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B12", "B11", "B10", "B2", "B1", "B0", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], "rows": ["A8", "A9", "B13", "B14", "B15"] diff --git a/keyboards/noxary/valhalla/rules.mk b/keyboards/noxary/valhalla/rules.mk deleted file mode 100644 index 93e50cd795b..00000000000 --- a/keyboards/noxary/valhalla/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 -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/noxary/vulcan/info.json b/keyboards/noxary/vulcan/keyboard.json similarity index 95% rename from keyboards/noxary/vulcan/info.json rename to keyboards/noxary/vulcan/keyboard.json index 579ab525f45..8ae658f68e1 100644 --- a/keyboards/noxary/vulcan/info.json +++ b/keyboards/noxary/vulcan/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["D1", "D0", "D2", "F0", "F1"] diff --git a/keyboards/noxary/vulcan/rules.mk b/keyboards/noxary/vulcan/rules.mk deleted file mode 100644 index ab9ede17169..00000000000 --- a/keyboards/noxary/vulcan/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 = 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/noxary/x268/info.json b/keyboards/noxary/x268/keyboard.json similarity index 95% rename from keyboards/noxary/x268/info.json rename to keyboards/noxary/x268/keyboard.json index cd94a8cdd5a..675cc0b1a39 100644 --- a/keyboards/noxary/x268/info.json +++ b/keyboards/noxary/x268/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0A7B", "device_version": "0.7.8" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C6", "B6", "C7", "F4", "E6", "B2", "D6", "D0", "D1", "D7", "D4", "D5", "D3", "F1", "D2", "B1"], "rows": ["F7", "F6", "F5", "F0", "B4"] diff --git a/keyboards/noxary/x268/rules.mk b/keyboards/noxary/x268/rules.mk deleted file mode 100644 index a4b56c37ddd..00000000000 --- a/keyboards/noxary/x268/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/np12/info.json b/keyboards/np12/keyboard.json similarity index 86% rename from keyboards/np12/info.json rename to keyboards/np12/keyboard.json index 834c51f5774..d7f6f8cfb7c 100644 --- a/keyboards/np12/info.json +++ b/keyboards/np12/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4401", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "F6"], "rows": ["D7", "E6", "B4", "F7"] diff --git a/keyboards/np12/rules.mk b/keyboards/np12/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/np12/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/nyhxis/nfr_70/info.json b/keyboards/nyhxis/nfr_70/keyboard.json similarity index 98% rename from keyboards/nyhxis/nfr_70/info.json rename to keyboards/nyhxis/nfr_70/keyboard.json index d6d621db78e..0fbb4681d8a 100644 --- a/keyboards/nyhxis/nfr_70/info.json +++ b/keyboards/nyhxis/nfr_70/keyboard.json @@ -4,6 +4,14 @@ "url": "https://github.com/Nyhxis/keyboard-resources/tree/master/NFR-70", "maintainer": "Nyhxis", "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0", "C6", "D4", "E6", "D7", "B5", "B4", "B6"] diff --git a/keyboards/nyhxis/nfr_70/rules.mk b/keyboards/nyhxis/nfr_70/rules.mk deleted file mode 100644 index d65d32df0aa..00000000000 --- a/keyboards/nyhxis/nfr_70/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 = 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 \ No newline at end of file From 01473075f8e78adcfbd4f9f4b6bb1d7682a7ee4d Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 15 Mar 2024 01:42:55 +0000 Subject: [PATCH 032/333] Migrate features from rules.mk to data driven - EFGH (#23248) --- keyboards/e88/{info.json => keyboard.json} | 8 ++++++++ keyboards/e88/rules.mk | 12 ------------ .../quadrant/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ealdin/quadrant/rules.mk | 13 ------------- .../earth_rover/{info.json => keyboard.json} | 8 ++++++++ keyboards/earth_rover/rules.mk | 12 ------------ .../aeroboard/{info.json => keyboard.json} | 10 ++++++++++ keyboards/eason/aeroboard/rules.mk | 13 ------------- .../capsule65/{info.json => keyboard.json} | 9 +++++++++ keyboards/eason/capsule65/rules.mk | 12 ------------ .../greatsword80/{info.json => keyboard.json} | 8 ++++++++ keyboards/eason/greatsword80/rules.mk | 12 ------------ .../rev1/{info.json => keyboard.json} | 11 +++++++++++ keyboards/ebastler/isometria_75/rev1/rules.mk | 14 -------------- keyboards/edc40/{info.json => keyboard.json} | 9 +++++++++ keyboards/edc40/rules.mk | 13 ------------- keyboards/edda/{info.json => keyboard.json} | 8 ++++++++ keyboards/edda/rules.mk | 12 ------------ .../hardlight/mk1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/edi/hardlight/mk1/rules.mk | 13 ------------- .../standaside/{info.json => keyboard.json} | 9 +++++++++ keyboards/edi/standaside/rules.mk | 12 ------------ keyboards/ein_60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ein_60/rules.mk | 15 --------------- .../emajesty/eiri/{info.json => keyboard.json} | 8 ++++++++ keyboards/emajesty/eiri/rules.mk | 12 ------------ keyboards/emi20/{info.json => keyboard.json} | 8 ++++++++ keyboards/emi20/rules.mk | 12 ------------ .../nqg/{info.json => keyboard.json} | 8 ++++++++ keyboards/emptystring/nqg/rules.mk | 12 ------------ .../ek60/{info.json => keyboard.json} | 8 ++++++++ keyboards/eniigmakeyboards/ek60/rules.mk | 12 ------------ .../ek65/{info.json => keyboard.json} | 8 ++++++++ keyboards/eniigmakeyboards/ek65/rules.mk | 12 ------------ .../ek87/{info.json => keyboard.json} | 8 ++++++++ keyboards/eniigmakeyboards/ek87/rules.mk | 12 ------------ keyboards/ep/40/{info.json => keyboard.json} | 8 ++++++++ keyboards/ep/40/rules.mk | 12 ------------ keyboards/ep/96/{info.json => keyboard.json} | 8 ++++++++ keyboards/ep/96/rules.mk | 12 ------------ .../ep/comsn/hs68/{info.json => keyboard.json} | 8 ++++++++ keyboards/ep/comsn/hs68/rules.mk | 12 ------------ .../mollydooker/{info.json => keyboard.json} | 9 +++++++++ keyboards/ep/comsn/mollydooker/rules.mk | 12 ------------ .../tf_longeboye/{info.json => keyboard.json} | 8 ++++++++ keyboards/ep/comsn/tf_longeboye/rules.mk | 12 ------------ .../{info.json => keyboard.json} | 9 +++++++++ keyboards/eternal_keypad/rules.mk | 12 ------------ .../{info.json => keyboard.json} | 8 ++++++++ .../evancookaudio/sleepingdinosaur/rules.mk | 12 ------------ .../tenpad/{info.json => keyboard.json} | 8 ++++++++ keyboards/evancookaudio/tenpad/rules.mk | 12 ------------ .../eve/meteor/{info.json => keyboard.json} | 9 +++++++++ keyboards/eve/meteor/rules.mk | 10 ---------- keyboards/evil80/{info.json => keyboard.json} | 9 +++++++++ keyboards/evil80/rules.mk | 12 ------------ keyboards/evolv/{info.json => keyboard.json} | 10 ++++++++++ keyboards/evolv/rules.mk | 14 -------------- .../evyd13/eon65/{info.json => keyboard.json} | 9 +++++++++ keyboards/evyd13/eon65/rules.mk | 12 ------------ .../evyd13/eon75/{info.json => keyboard.json} | 8 ++++++++ keyboards/evyd13/eon75/rules.mk | 12 ------------ .../evyd13/eon87/{info.json => keyboard.json} | 9 +++++++++ keyboards/evyd13/eon87/rules.mk | 12 ------------ .../evyd13/eon95/{info.json => keyboard.json} | 8 ++++++++ keyboards/evyd13/eon95/rules.mk | 12 ------------ .../gh80_1800/{info.json => keyboard.json} | 8 ++++++++ keyboards/evyd13/gh80_1800/rules.mk | 11 ----------- .../gh80_3700/{info.json => keyboard.json} | 9 +++++++++ keyboards/evyd13/gh80_3700/rules.mk | 12 ------------ .../evyd13/gud70/{info.json => keyboard.json} | 8 ++++++++ keyboards/evyd13/gud70/rules.mk | 12 ------------ .../minitomic/{info.json => keyboard.json} | 8 ++++++++ keyboards/evyd13/minitomic/rules.mk | 12 ------------ .../evyd13/mx5160/{info.json => keyboard.json} | 8 ++++++++ keyboards/evyd13/mx5160/rules.mk | 12 ------------ .../evyd13/nt750/{info.json => keyboard.json} | 8 ++++++++ keyboards/evyd13/nt750/rules.mk | 12 ------------ .../evyd13/nt980/{info.json => keyboard.json} | 8 ++++++++ keyboards/evyd13/nt980/rules.mk | 12 ------------ .../omrontkl/{info.json => keyboard.json} | 8 ++++++++ keyboards/evyd13/omrontkl/rules.mk | 12 ------------ .../plain60/{info.json => keyboard.json} | 8 ++++++++ keyboards/evyd13/plain60/rules.mk | 12 ------------ .../quackfire/{info.json => keyboard.json} | 8 ++++++++ keyboards/evyd13/quackfire/rules.mk | 12 ------------ .../solheim68/{info.json => keyboard.json} | 8 ++++++++ keyboards/evyd13/solheim68/rules.mk | 12 ------------ .../evyd13/ta65/{info.json => keyboard.json} | 10 ++++++++++ keyboards/evyd13/ta65/rules.mk | 13 ------------- .../wonderland/{info.json => keyboard.json} | 10 ++++++++++ keyboards/evyd13/wonderland/rules.mk | 14 -------------- .../exclusive/e65/{info.json => keyboard.json} | 10 ++++++++++ keyboards/exclusive/e65/rules.mk | 12 ------------ .../e6_rgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/exclusive/e6_rgb/rules.mk | 13 ------------- .../e6v2/le/{info.json => keyboard.json} | 10 ++++++++++ keyboards/exclusive/e6v2/le/rules.mk | 12 ------------ .../e6v2/le_bmc/{info.json => keyboard.json} | 10 ++++++++++ keyboards/exclusive/e6v2/le_bmc/rules.mk | 12 ------------ .../e6v2/oe/{info.json => keyboard.json} | 10 ++++++++++ keyboards/exclusive/e6v2/oe/rules.mk | 12 ------------ .../e6v2/oe_bmc/{info.json => keyboard.json} | 10 ++++++++++ keyboards/exclusive/e6v2/oe_bmc/rules.mk | 12 ------------ .../e7v1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/exclusive/e7v1/rules.mk | 12 ------------ .../e7v1se/{info.json => keyboard.json} | 10 ++++++++++ keyboards/exclusive/e7v1se/rules.mk | 12 ------------ keyboards/exent/{info.json => keyboard.json} | 10 ++++++++++ keyboards/exent/rules.mk | 11 ----------- .../babyv/{info.json => keyboard.json} | 10 ++++++++++ keyboards/eyeohdesigns/babyv/rules.mk | 12 ------------ .../sprh/{info.json => keyboard.json} | 9 +++++++++ keyboards/eyeohdesigns/sprh/rules.mk | 13 ------------- .../theboulevard/{info.json => keyboard.json} | 10 ++++++++++ keyboards/eyeohdesigns/theboulevard/rules.mk | 13 ------------- keyboards/facew/{info.json => keyboard.json} | 10 ++++++++++ keyboards/facew/rules.mk | 10 ---------- .../feels/feels65/{info.json => keyboard.json} | 8 ++++++++ keyboards/feels/feels65/rules.mk | 12 ------------ .../ffkeebs/siris/{info.json => keyboard.json} | 9 +++++++++ keyboards/ffkeebs/siris/rules.mk | 13 ------------- .../bigswitch/{info.json => keyboard.json} | 9 +++++++++ keyboards/flehrad/bigswitch/rules.mk | 13 ------------- .../downbubble/{info.json => keyboard.json} | 8 ++++++++ keyboards/flehrad/downbubble/rules.mk | 12 ------------ .../numbrero/{info.json => keyboard.json} | 8 ++++++++ keyboards/flehrad/numbrero/rules.mk | 12 ------------ .../snagpad/{info.json => keyboard.json} | 8 ++++++++ keyboards/flehrad/snagpad/rules.mk | 12 ------------ .../tradestation/{info.json => keyboard.json} | 8 ++++++++ keyboards/flehrad/tradestation/rules.mk | 12 ------------ keyboards/fleuron/{info.json => keyboard.json} | 9 +++++++++ keyboards/fleuron/rules.mk | 13 ------------- .../cornelius/{info.json => keyboard.json} | 8 ++++++++ keyboards/foostan/cornelius/rules.mk | 12 ------------ .../key65/hotswap/{info.json => keyboard.json} | 10 ++++++++++ keyboards/foxlab/key65/hotswap/rules.mk | 12 ------------ .../universal/{info.json => keyboard.json} | 10 ++++++++++ keyboards/foxlab/key65/universal/rules.mk | 12 ------------ .../hotswap/{info.json => keyboard.json} | 10 ++++++++++ keyboards/foxlab/leaf60/hotswap/rules.mk | 12 ------------ .../universal/{info.json => keyboard.json} | 10 ++++++++++ keyboards/foxlab/leaf60/universal/rules.mk | 12 ------------ .../foxlab/time80/{info.json => keyboard.json} | 8 ++++++++ keyboards/foxlab/time80/rules.mk | 10 ---------- .../info.json => hotswap/keyboard.json} | 18 ++++++++++++++---- keyboards/foxlab/time_re/hotswap/rules.mk | 12 ------------ .../info.json => universal/keyboard.json} | 18 ++++++++++++++---- keyboards/foxlab/time_re/universal/rules.mk | 12 ------------ .../southpaw75/{info.json => keyboard.json} | 8 ++++++++ keyboards/fr4/southpaw75/rules.mk | 12 ------------ .../fr4/unix60/{info.json => keyboard.json} | 8 ++++++++ keyboards/fr4/unix60/rules.mk | 12 ------------ .../free_willy/{info.json => keyboard.json} | 8 ++++++++ keyboards/free_willy/rules.mk | 12 ------------ .../friedrich/{info.json => keyboard.json} | 8 ++++++++ keyboards/friedrich/rules.mk | 12 ------------ .../nano/{info.json => keyboard.json} | 9 +++++++++ keyboards/frooastboard/nano/rules.mk | 12 ------------ .../ft/mars80/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ft/mars80/rules.mk | 10 ---------- .../function96/v1/{info.json => keyboard.json} | 8 ++++++++ keyboards/function96/v1/rules.mk | 12 ------------ .../function96/v2/{info.json => keyboard.json} | 8 ++++++++ keyboards/function96/v2/rules.mk | 12 ------------ keyboards/funky40/{info.json => keyboard.json} | 8 ++++++++ keyboards/funky40/rules.mk | 12 ------------ .../lex60/{info.json => keyboard.json} | 9 +++++++++ keyboards/gami_studio/lex60/rules.mk | 12 ------------ .../macropad_v2/{info.json => keyboard.json} | 9 +++++++++ keyboards/geekboards/macropad_v2/rules.mk | 14 -------------- .../tester/{info.json => keyboard.json} | 9 +++++++++ keyboards/geekboards/tester/rules.mk | 12 ------------ .../panda65_01/{info.json => keyboard.json} | 8 ++++++++ keyboards/generic_panda/panda65_01/rules.mk | 12 ------------ .../eclipse_65/{info.json => keyboard.json} | 8 ++++++++ keyboards/genone/eclipse_65/rules.mk | 12 ------------ .../genone/g1_65/{info.json => keyboard.json} | 8 ++++++++ keyboards/genone/g1_65/rules.mk | 12 ------------ .../hotswap/{info.json => keyboard.json} | 8 ++++++++ keyboards/ggkeyboards/genesis/hotswap/rules.mk | 12 ------------ .../solder/{info.json => keyboard.json} | 8 ++++++++ keyboards/ggkeyboards/genesis/solder/rules.mk | 12 ------------ .../gh60/revc/{info.json => keyboard.json} | 8 ++++++++ keyboards/gh60/revc/rules.mk | 10 ---------- .../gh60/satan/{info.json => keyboard.json} | 10 ++++++++++ keyboards/gh60/satan/rules.mk | 12 ------------ .../gh60/v1p3/{info.json => keyboard.json} | 10 ++++++++++ keyboards/gh60/v1p3/rules.mk | 12 ------------ .../gh80_3000/{info.json => keyboard.json} | 8 ++++++++ keyboards/gh80_3000/rules.mk | 12 ------------ keyboards/ghs/rar/{info.json => keyboard.json} | 9 +++++++++ keyboards/ghs/rar/rules.mk | 12 ------------ .../gk6/{info.json => keyboard.json} | 9 +++++++++ keyboards/gizmo_engineering/gk6/rules.mk | 14 -------------- .../gkb_m16/{info.json => keyboard.json} | 9 +++++++++ keyboards/gkeyboard/gkb_m16/rules.mk | 12 ------------ .../p65/ansi/{info.json => keyboard.json} | 9 +++++++++ keyboards/gmmk/gmmk2/p65/ansi/rules.mk | 13 ------------- .../gmmk2/p65/iso/{info.json => keyboard.json} | 9 +++++++++ keyboards/gmmk/gmmk2/p65/iso/rules.mk | 13 ------------- .../p96/ansi/{info.json => keyboard.json} | 9 +++++++++ keyboards/gmmk/gmmk2/p96/ansi/rules.mk | 13 ------------- .../gmmk2/p96/iso/{info.json => keyboard.json} | 9 +++++++++ keyboards/gmmk/gmmk2/p96/iso/rules.mk | 13 ------------- .../pro/rev1/ansi/{info.json => keyboard.json} | 10 ++++++++++ keyboards/gmmk/pro/rev1/ansi/rules.mk | 14 -------------- .../pro/rev1/iso/{info.json => keyboard.json} | 10 ++++++++++ keyboards/gmmk/pro/rev1/iso/rules.mk | 14 -------------- .../pro/rev2/ansi/{info.json => keyboard.json} | 10 ++++++++++ keyboards/gmmk/pro/rev2/ansi/rules.mk | 14 -------------- .../pro/rev2/iso/{info.json => keyboard.json} | 10 ++++++++++ keyboards/gmmk/pro/rev2/iso/rules.mk | 17 ----------------- .../{info.json => keyboard.json} | 9 +++++++++ keyboards/gorthage_truck/rules.mk | 14 -------------- keyboards/gowla/{info.json => keyboard.json} | 8 ++++++++ keyboards/gowla/rules.mk | 12 ------------ .../aero75/{info.json => keyboard.json} | 9 +++++++++ keyboards/gray_studio/aero75/rules.mk | 13 ------------- .../apollo80/{info.json => keyboard.json} | 9 +++++++++ keyboards/gray_studio/apollo80/rules.mk | 12 ------------ .../hb85/{info.json => keyboard.json} | 10 ++++++++++ keyboards/gray_studio/hb85/rules.mk | 10 ---------- .../space65/{info.json => keyboard.json} | 10 ++++++++++ keyboards/gray_studio/space65/rules.mk | 12 ------------ .../space65r3/{info.json => keyboard.json} | 9 +++++++++ keyboards/gray_studio/space65r3/rules.mk | 13 ------------- .../grid600/press/{info.json => keyboard.json} | 9 +++++++++ keyboards/grid600/press/rules.mk | 12 ------------ .../h0oni/deskpad/{info.json => keyboard.json} | 9 +++++++++ keyboards/h0oni/deskpad/rules.mk | 13 ------------- .../h0oni/hotduck/{info.json => keyboard.json} | 9 +++++++++ keyboards/h0oni/hotduck/rules.mk | 12 ------------ .../elemental75/{info.json => keyboard.json} | 10 ++++++++++ keyboards/halokeys/elemental75/rules.mk | 13 ------------- keyboards/han60/{info.json => keyboard.json} | 8 ++++++++ keyboards/han60/rules.mk | 12 ------------ .../2x5keypad/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/2x5keypad/rules.mk | 13 ------------- .../3dfoxc/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/3dfoxc/rules.mk | 12 ------------ .../412_64/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/412_64/rules.mk | 11 ----------- .../6key/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/6key/rules.mk | 13 ------------- .../6macro/{info.json => keyboard.json} | 10 ++++++++++ keyboards/handwired/6macro/rules.mk | 14 -------------- .../aek64/{info.json => keyboard.json} | 10 ++++++++++ keyboards/handwired/aek64/rules.mk | 11 ----------- .../aim65/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/aim65/rules.mk | 12 ------------ .../amigopunk/{info.json => keyboard.json} | 10 ++++++++++ keyboards/handwired/amigopunk/rules.mk | 14 -------------- .../angel/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/angel/rules.mk | 12 ------------ .../aplx2/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/aplx2/rules.mk | 12 ------------ .../aranck/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/aranck/rules.mk | 12 ------------ .../arrow_pad/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/arrow_pad/rules.mk | 11 ----------- .../atreus50/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/atreus50/rules.mk | 12 ------------ .../axon/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/axon/rules.mk | 12 ------------ .../bigmac/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/bigmac/rules.mk | 12 ------------ .../bolek/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/bolek/rules.mk | 12 ------------ .../redragon_vara/{info.json => keyboard.json} | 8 ++++++++ .../handwired/boss566y/redragon_vara/rules.mk | 12 ------------ .../bstk100/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/bstk100/rules.mk | 12 ------------ .../cans12er/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/cans12er/rules.mk | 12 ------------ .../carpolly/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/carpolly/rules.mk | 15 --------------- .../cmd60/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/cmd60/rules.mk | 11 ----------- .../co60/rev1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/handwired/co60/rev1/rules.mk | 12 ------------ .../co60/rev6/{info.json => keyboard.json} | 10 ++++++++++ keyboards/handwired/co60/rev6/rules.mk | 13 ------------- .../co60/rev7/{info.json => keyboard.json} | 11 +++++++++++ keyboards/handwired/co60/rev7/rules.mk | 13 ------------- .../64key/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/concertina/64key/rules.mk | 12 ------------ .../croxsplit44/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/croxsplit44/rules.mk | 12 ------------ .../dactyl_left/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/dactyl_left/rules.mk | 12 ------------ .../daishi/{info.json => keyboard.json} | 10 ++++++++++ keyboards/handwired/daishi/rules.mk | 14 -------------- .../dc/mc/001/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/dc/mc/001/rules.mk | 13 ------------- .../ddg_56/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/ddg_56/rules.mk | 11 ----------- .../eagleii/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/eagleii/rules.mk | 12 ------------ .../ergocheap/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/ergocheap/rules.mk | 14 -------------- .../evk/v1_3/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/evk/v1_3/rules.mk | 12 ------------ .../fc200rt_qmk/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/fc200rt_qmk/rules.mk | 12 ------------ .../fivethirteen/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/fivethirteen/rules.mk | 11 ----------- .../floorboard/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/floorboard/rules.mk | 12 ------------ .../gamenum/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/gamenum/rules.mk | 11 ----------- .../heisenberg/{info.json => keyboard.json} | 10 ++++++++++ keyboards/handwired/heisenberg/rules.mk | 12 ------------ .../hexon38/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/hexon38/rules.mk | 12 ------------ .../hnah108/{info.json => keyboard.json} | 11 +++++++++++ keyboards/handwired/hnah108/rules.mk | 14 -------------- .../hnah40/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/hnah40/rules.mk | 12 ------------ .../hnah40rgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/hnah40rgb/rules.mk | 13 ------------- .../hwpm87/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/hwpm87/rules.mk | 14 -------------- .../{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/ibm_wheelwriter/rules.mk | 12 ------------ .../jn68m/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/jn68m/rules.mk | 12 ------------ .../jopr/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/jopr/rules.mk | 13 ------------- .../jot50/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/jot50/rules.mk | 12 ------------ .../jotpad16/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/jotpad16/rules.mk | 12 ------------ .../juliet/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/juliet/rules.mk | 12 ------------ .../k8split/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/k8split/rules.mk | 12 ------------ .../k_numpad17/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/k_numpad17/rules.mk | 12 ------------ .../kbod/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/kbod/rules.mk | 11 ----------- .../leftynumpad/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/leftynumpad/rules.mk | 12 ------------ .../lovelive9/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/lovelive9/rules.mk | 12 ------------ .../magicforce61/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/magicforce61/rules.mk | 11 ----------- .../magicforce68/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/magicforce68/rules.mk | 11 ----------- .../{info.json => keyboard.json} | 8 ++++++++ .../handwired/mechboards_micropad/rules.mk | 12 ------------ .../minorca/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/minorca/rules.mk | 12 ------------ .../misterdeck/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/misterdeck/rules.mk | 12 ------------ .../mutepad/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/mutepad/rules.mk | 13 ------------- .../nicekey/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/nicekey/rules.mk | 12 ------------ .../nozbe_macro/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/nozbe_macro/rules.mk | 12 ------------ .../numpad20/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/numpad20/rules.mk | 11 ----------- .../spaget/{info.json => keyboard.json} | 11 +++++++++++ .../handwired/obuwunkunubi/spaget/rules.mk | 17 ----------------- .../{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/oem_ansi_fullsize/rules.mk | 12 ------------ .../{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/oem_iso_fullsize/rules.mk | 12 ------------ .../ortho5x13/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/ortho5x13/rules.mk | 11 ----------- .../ortho5x14/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/ortho5x14/rules.mk | 11 ----------- .../pilcrow/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/pilcrow/rules.mk | 11 ----------- .../prime_exl/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/prime_exl/rules.mk | 12 ------------ .../{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/prime_exl_plus/rules.mk | 12 ------------ .../promicro/{info.json => keyboard.json} | 10 ++++++++++ keyboards/handwired/prkl30/promicro/rules.mk | 13 ------------- .../pteron/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/pteron/rules.mk | 11 ----------- .../pteron38/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/pteron38/rules.mk | 12 ------------ .../pteron44/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/pteron44/rules.mk | 12 ------------ .../retro_refit/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/retro_refit/rules.mk | 10 ---------- .../rs60/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/rs60/rules.mk | 12 ------------ .../selene/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/selene/rules.mk | 12 ------------ .../sick68/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/sick68/rules.mk | 12 ------------ .../sick_pad/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/sick_pad/rules.mk | 12 ------------ .../snatchpad/{info.json => keyboard.json} | 10 ++++++++++ keyboards/handwired/snatchpad/rules.mk | 14 -------------- .../space_oddity/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/space_oddity/rules.mk | 13 ------------- .../steamvan/rev1/{info.json => keyboard.json} | 11 +++++++++++ keyboards/handwired/steamvan/rev1/rules.mk | 14 -------------- .../sticc14/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/sticc14/rules.mk | 12 ------------ .../2x3/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/stream_cheap/2x3/rules.mk | 12 ------------ .../2x5/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/stream_cheap/2x5/rules.mk | 12 ------------ .../astro65/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/swiftrax/astro65/rules.mk | 12 ------------ .../bebol/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/swiftrax/bebol/rules.mk | 12 ------------ .../beegboy/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/swiftrax/beegboy/rules.mk | 13 ------------- .../bumblebee/{info.json => keyboard.json} | 10 ++++++++++ .../handwired/swiftrax/bumblebee/rules.mk | 13 ------------- .../cowfish/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/swiftrax/cowfish/rules.mk | 12 ------------ .../digicarp65/{info.json => keyboard.json} | 9 +++++++++ .../handwired/swiftrax/digicarp65/rules.mk | 13 ------------- .../digicarpice/{info.json => keyboard.json} | 8 ++++++++ .../handwired/swiftrax/digicarpice/rules.mk | 12 ------------ .../equator/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/swiftrax/equator/rules.mk | 12 ------------ .../glacier/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/swiftrax/glacier/rules.mk | 12 ------------ .../joypad/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/swiftrax/joypad/rules.mk | 13 ------------- .../{info.json => keyboard.json} | 10 ++++++++++ .../handwired/swiftrax/koalafications/rules.mk | 14 -------------- .../swiftrax/nodu/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/swiftrax/nodu/rules.mk | 12 ------------ .../pandamic/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/swiftrax/pandamic/rules.mk | 13 ------------- .../the_galleon/{info.json => keyboard.json} | 9 +++++++++ .../handwired/swiftrax/the_galleon/rules.mk | 14 -------------- .../unsplit/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/swiftrax/unsplit/rules.mk | 13 ------------- .../walter/{info.json => keyboard.json} | 10 ++++++++++ keyboards/handwired/swiftrax/walter/rules.mk | 13 ------------- .../t111/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/t111/rules.mk | 13 ------------- .../tennie/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/tennie/rules.mk | 12 ------------ .../terminus_mini/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/terminus_mini/rules.mk | 12 ------------ .../traveller/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/traveller/rules.mk | 12 ------------ .../{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/tritium_numpad/rules.mk | 12 ------------ .../twig/twig50/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/twig/twig50/rules.mk | 12 ------------ .../{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/unicomp_mini_m/rules.mk | 12 ------------ .../videowriter/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/videowriter/rules.mk | 12 ------------ .../wabi/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/wabi/rules.mk | 12 ------------ .../woodpad/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/woodpad/rules.mk | 12 ------------ .../z150/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/z150/rules.mk | 13 ------------- .../zergo/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/zergo/rules.mk | 12 ------------ .../otd_plus/{info.json => keyboard.json} | 8 ++++++++ keyboards/hardlineworks/otd_plus/rules.mk | 12 ------------ .../wm1_hotswap/{info.json => keyboard.json} | 9 +++++++++ keyboards/heliar/wm1_hotswap/rules.mk | 12 ------------ .../hfdkb/ac001/{info.json => keyboard.json} | 9 +++++++++ keyboards/hfdkb/ac001/rules.mk | 12 ------------ .../hhkb_lite_2/{info.json => keyboard.json} | 9 +++++++++ keyboards/hhkb_lite_2/rules.mk | 13 ------------- keyboards/hifumi/{info.json => keyboard.json} | 9 +++++++++ keyboards/hifumi/rules.mk | 13 ------------- .../h08_ocelot/{info.json => keyboard.json} | 9 +++++++++ keyboards/hineybush/h08_ocelot/rules.mk | 12 ------------ .../hineybush/h10/{info.json => keyboard.json} | 9 +++++++++ keyboards/hineybush/h10/rules.mk | 12 ------------ .../hineybush/h60/{info.json => keyboard.json} | 11 +++++++++++ keyboards/hineybush/h60/rules.mk | 13 ------------- .../hineybush/h65/{info.json => keyboard.json} | 10 ++++++++++ keyboards/hineybush/h65/rules.mk | 12 ------------ .../h65_hotswap/{info.json => keyboard.json} | 10 ++++++++++ keyboards/hineybush/h65_hotswap/rules.mk | 12 ------------ .../h660s/{info.json => keyboard.json} | 11 +++++++++++ keyboards/hineybush/h660s/rules.mk | 13 ------------- .../h75_singa/{info.json => keyboard.json} | 10 ++++++++++ keyboards/hineybush/h75_singa/rules.mk | 12 ------------ .../hineyg80/{info.json => keyboard.json} | 8 ++++++++ keyboards/hineybush/hineyg80/rules.mk | 12 ------------ .../physix/{info.json => keyboard.json} | 10 ++++++++++ keyboards/hineybush/physix/rules.mk | 12 ------------ .../sm68/{info.json => keyboard.json} | 9 +++++++++ keyboards/hineybush/sm68/rules.mk | 12 ------------ .../hnahkb/freyr/{info.json => keyboard.json} | 9 +++++++++ keyboards/hnahkb/freyr/rules.mk | 12 ------------ .../hnahkb/stella/{info.json => keyboard.json} | 10 ++++++++++ keyboards/hnahkb/stella/rules.mk | 12 ------------ .../southpaw75/{info.json => keyboard.json} | 8 ++++++++ keyboards/holyswitch/southpaw75/rules.mk | 12 ------------ keyboards/horizon/{info.json => keyboard.json} | 8 ++++++++ keyboards/horizon/rules.mk | 12 ------------ .../black_e65/{info.json => keyboard.json} | 10 ++++++++++ .../horrortroll/chinese_pcb/black_e65/rules.mk | 12 ------------ .../devil68_pro/{info.json => keyboard.json} | 9 +++++++++ .../chinese_pcb/devil68_pro/rules.mk | 15 --------------- .../paws60/{info.json => keyboard.json} | 8 ++++++++ keyboards/horrortroll/paws60/rules.mk | 12 ------------ keyboards/hp69/{info.json => keyboard.json} | 9 +++++++++ keyboards/hp69/rules.mk | 12 ------------ .../huytbt/h50/{info.json => keyboard.json} | 8 ++++++++ keyboards/huytbt/h50/rules.mk | 10 ---------- 514 files changed, 2258 insertions(+), 3158 deletions(-) rename keyboards/e88/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/e88/rules.mk rename keyboards/ealdin/quadrant/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ealdin/quadrant/rules.mk rename keyboards/earth_rover/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/earth_rover/rules.mk rename keyboards/eason/aeroboard/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/eason/aeroboard/rules.mk rename keyboards/eason/capsule65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/eason/capsule65/rules.mk rename keyboards/eason/greatsword80/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/eason/greatsword80/rules.mk rename keyboards/ebastler/isometria_75/rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/ebastler/isometria_75/rev1/rules.mk rename keyboards/edc40/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/edc40/rules.mk rename keyboards/edda/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/edda/rules.mk rename keyboards/edi/hardlight/mk1/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/edi/hardlight/mk1/rules.mk rename keyboards/edi/standaside/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/edi/standaside/rules.mk rename keyboards/ein_60/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/ein_60/rules.mk rename keyboards/emajesty/eiri/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/emajesty/eiri/rules.mk rename keyboards/emi20/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/emi20/rules.mk rename keyboards/emptystring/nqg/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/emptystring/nqg/rules.mk rename keyboards/eniigmakeyboards/ek60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/eniigmakeyboards/ek60/rules.mk rename keyboards/eniigmakeyboards/ek65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/eniigmakeyboards/ek65/rules.mk rename keyboards/eniigmakeyboards/ek87/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/eniigmakeyboards/ek87/rules.mk rename keyboards/ep/40/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/ep/40/rules.mk rename keyboards/ep/96/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/ep/96/rules.mk rename keyboards/ep/comsn/hs68/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ep/comsn/hs68/rules.mk rename keyboards/ep/comsn/mollydooker/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ep/comsn/mollydooker/rules.mk rename keyboards/ep/comsn/tf_longeboye/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ep/comsn/tf_longeboye/rules.mk rename keyboards/eternal_keypad/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/eternal_keypad/rules.mk rename keyboards/evancookaudio/sleepingdinosaur/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/evancookaudio/sleepingdinosaur/rules.mk rename keyboards/evancookaudio/tenpad/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/evancookaudio/tenpad/rules.mk rename keyboards/eve/meteor/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/eve/meteor/rules.mk rename keyboards/evil80/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/evil80/rules.mk rename keyboards/evolv/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/evolv/rules.mk rename keyboards/evyd13/eon65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/evyd13/eon65/rules.mk rename keyboards/evyd13/eon75/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/evyd13/eon75/rules.mk rename keyboards/evyd13/eon87/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/evyd13/eon87/rules.mk rename keyboards/evyd13/eon95/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/evyd13/eon95/rules.mk rename keyboards/evyd13/gh80_1800/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/evyd13/gh80_1800/rules.mk rename keyboards/evyd13/gh80_3700/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/evyd13/gh80_3700/rules.mk rename keyboards/evyd13/gud70/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/evyd13/gud70/rules.mk rename keyboards/evyd13/minitomic/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/evyd13/minitomic/rules.mk rename keyboards/evyd13/mx5160/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/evyd13/mx5160/rules.mk rename keyboards/evyd13/nt750/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/evyd13/nt750/rules.mk rename keyboards/evyd13/nt980/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/evyd13/nt980/rules.mk rename keyboards/evyd13/omrontkl/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/evyd13/omrontkl/rules.mk rename keyboards/evyd13/plain60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/evyd13/plain60/rules.mk rename keyboards/evyd13/quackfire/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/evyd13/quackfire/rules.mk rename keyboards/evyd13/solheim68/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/evyd13/solheim68/rules.mk rename keyboards/evyd13/ta65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/evyd13/ta65/rules.mk rename keyboards/evyd13/wonderland/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/evyd13/wonderland/rules.mk rename keyboards/exclusive/e65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/exclusive/e65/rules.mk rename keyboards/exclusive/e6_rgb/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/exclusive/e6_rgb/rules.mk rename keyboards/exclusive/e6v2/le/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/exclusive/e6v2/le/rules.mk rename keyboards/exclusive/e6v2/le_bmc/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/exclusive/e6v2/le_bmc/rules.mk rename keyboards/exclusive/e6v2/oe/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/exclusive/e6v2/oe/rules.mk rename keyboards/exclusive/e6v2/oe_bmc/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/exclusive/e6v2/oe_bmc/rules.mk rename keyboards/exclusive/e7v1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/exclusive/e7v1/rules.mk rename keyboards/exclusive/e7v1se/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/exclusive/e7v1se/rules.mk rename keyboards/exent/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/exent/rules.mk rename keyboards/eyeohdesigns/babyv/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/eyeohdesigns/babyv/rules.mk rename keyboards/eyeohdesigns/sprh/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/eyeohdesigns/sprh/rules.mk rename keyboards/eyeohdesigns/theboulevard/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/eyeohdesigns/theboulevard/rules.mk rename keyboards/facew/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/facew/rules.mk rename keyboards/feels/feels65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/feels/feels65/rules.mk rename keyboards/ffkeebs/siris/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/ffkeebs/siris/rules.mk rename keyboards/flehrad/bigswitch/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/flehrad/bigswitch/rules.mk rename keyboards/flehrad/downbubble/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/flehrad/downbubble/rules.mk rename keyboards/flehrad/numbrero/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/flehrad/numbrero/rules.mk rename keyboards/flehrad/snagpad/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/flehrad/snagpad/rules.mk rename keyboards/flehrad/tradestation/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/flehrad/tradestation/rules.mk rename keyboards/fleuron/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/fleuron/rules.mk rename keyboards/foostan/cornelius/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/foostan/cornelius/rules.mk rename keyboards/foxlab/key65/hotswap/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/foxlab/key65/hotswap/rules.mk rename keyboards/foxlab/key65/universal/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/foxlab/key65/universal/rules.mk rename keyboards/foxlab/leaf60/hotswap/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/foxlab/leaf60/hotswap/rules.mk rename keyboards/foxlab/leaf60/universal/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/foxlab/leaf60/universal/rules.mk rename keyboards/foxlab/time80/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/foxlab/time80/rules.mk rename keyboards/foxlab/time_re/{universal/info.json => hotswap/keyboard.json} (96%) delete mode 100644 keyboards/foxlab/time_re/hotswap/rules.mk rename keyboards/foxlab/time_re/{hotswap/info.json => universal/keyboard.json} (96%) delete mode 100644 keyboards/foxlab/time_re/universal/rules.mk rename keyboards/fr4/southpaw75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/fr4/southpaw75/rules.mk rename keyboards/fr4/unix60/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/fr4/unix60/rules.mk rename keyboards/free_willy/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/free_willy/rules.mk rename keyboards/friedrich/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/friedrich/rules.mk rename keyboards/frooastboard/nano/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/frooastboard/nano/rules.mk rename keyboards/ft/mars80/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ft/mars80/rules.mk rename keyboards/function96/v1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/function96/v1/rules.mk rename keyboards/function96/v2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/function96/v2/rules.mk rename keyboards/funky40/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/funky40/rules.mk rename keyboards/gami_studio/lex60/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/gami_studio/lex60/rules.mk rename keyboards/geekboards/macropad_v2/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/geekboards/macropad_v2/rules.mk rename keyboards/geekboards/tester/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/geekboards/tester/rules.mk rename keyboards/generic_panda/panda65_01/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/generic_panda/panda65_01/rules.mk rename keyboards/genone/eclipse_65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/genone/eclipse_65/rules.mk rename keyboards/genone/g1_65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/genone/g1_65/rules.mk rename keyboards/ggkeyboards/genesis/hotswap/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/ggkeyboards/genesis/hotswap/rules.mk rename keyboards/ggkeyboards/genesis/solder/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ggkeyboards/genesis/solder/rules.mk rename keyboards/gh60/revc/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/gh60/revc/rules.mk rename keyboards/gh60/satan/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/gh60/satan/rules.mk rename keyboards/gh60/v1p3/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/gh60/v1p3/rules.mk rename keyboards/gh80_3000/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/gh80_3000/rules.mk rename keyboards/ghs/rar/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/ghs/rar/rules.mk rename keyboards/gizmo_engineering/gk6/{info.json => keyboard.json} (98%) delete mode 100755 keyboards/gizmo_engineering/gk6/rules.mk rename keyboards/gkeyboard/gkb_m16/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/gkeyboard/gkb_m16/rules.mk rename keyboards/gmmk/gmmk2/p65/ansi/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/gmmk/gmmk2/p65/ansi/rules.mk rename keyboards/gmmk/gmmk2/p65/iso/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/gmmk/gmmk2/p65/iso/rules.mk rename keyboards/gmmk/gmmk2/p96/ansi/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/gmmk/gmmk2/p96/ansi/rules.mk rename keyboards/gmmk/gmmk2/p96/iso/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/gmmk/gmmk2/p96/iso/rules.mk rename keyboards/gmmk/pro/rev1/ansi/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/gmmk/pro/rev1/ansi/rules.mk rename keyboards/gmmk/pro/rev1/iso/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/gmmk/pro/rev1/iso/rules.mk rename keyboards/gmmk/pro/rev2/ansi/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/gmmk/pro/rev2/ansi/rules.mk rename keyboards/gmmk/pro/rev2/iso/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/gmmk/pro/rev2/iso/rules.mk rename keyboards/gorthage_truck/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/gorthage_truck/rules.mk rename keyboards/gowla/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/gowla/rules.mk rename keyboards/gray_studio/aero75/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/gray_studio/aero75/rules.mk rename keyboards/gray_studio/apollo80/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/gray_studio/apollo80/rules.mk rename keyboards/gray_studio/hb85/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/gray_studio/hb85/rules.mk rename keyboards/gray_studio/space65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/gray_studio/space65/rules.mk rename keyboards/gray_studio/space65r3/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/gray_studio/space65r3/rules.mk rename keyboards/grid600/press/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/grid600/press/rules.mk rename keyboards/h0oni/deskpad/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/h0oni/deskpad/rules.mk rename keyboards/h0oni/hotduck/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/h0oni/hotduck/rules.mk rename keyboards/halokeys/elemental75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/halokeys/elemental75/rules.mk rename keyboards/han60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/han60/rules.mk rename keyboards/handwired/2x5keypad/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/handwired/2x5keypad/rules.mk rename keyboards/handwired/3dfoxc/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/3dfoxc/rules.mk rename keyboards/handwired/412_64/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/412_64/rules.mk rename keyboards/handwired/6key/{info.json => keyboard.json} (80%) delete mode 100644 keyboards/handwired/6key/rules.mk rename keyboards/handwired/6macro/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/handwired/6macro/rules.mk rename keyboards/handwired/aek64/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/aek64/rules.mk rename keyboards/handwired/aim65/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/aim65/rules.mk rename keyboards/handwired/amigopunk/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/amigopunk/rules.mk rename keyboards/handwired/angel/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/angel/rules.mk rename keyboards/handwired/aplx2/{info.json => keyboard.json} (76%) delete mode 100644 keyboards/handwired/aplx2/rules.mk rename keyboards/handwired/aranck/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/handwired/aranck/rules.mk rename keyboards/handwired/arrow_pad/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/handwired/arrow_pad/rules.mk rename keyboards/handwired/atreus50/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/atreus50/rules.mk rename keyboards/handwired/axon/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/handwired/axon/rules.mk rename keyboards/handwired/bigmac/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/bigmac/rules.mk rename keyboards/handwired/bolek/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/handwired/bolek/rules.mk rename keyboards/handwired/boss566y/redragon_vara/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/boss566y/redragon_vara/rules.mk rename keyboards/handwired/bstk100/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/handwired/bstk100/rules.mk rename keyboards/handwired/cans12er/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/handwired/cans12er/rules.mk rename keyboards/handwired/carpolly/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/carpolly/rules.mk rename keyboards/handwired/cmd60/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/cmd60/rules.mk rename keyboards/handwired/co60/rev1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/handwired/co60/rev1/rules.mk rename keyboards/handwired/co60/rev6/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/handwired/co60/rev6/rules.mk rename keyboards/handwired/co60/rev7/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/handwired/co60/rev7/rules.mk rename keyboards/handwired/concertina/64key/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/concertina/64key/rules.mk rename keyboards/handwired/croxsplit44/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/croxsplit44/rules.mk rename keyboards/handwired/dactyl_left/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/handwired/dactyl_left/rules.mk rename keyboards/handwired/daishi/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/daishi/rules.mk rename keyboards/handwired/dc/mc/001/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/handwired/dc/mc/001/rules.mk rename keyboards/handwired/ddg_56/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/ddg_56/rules.mk rename keyboards/handwired/eagleii/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/eagleii/rules.mk rename keyboards/handwired/ergocheap/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/ergocheap/rules.mk rename keyboards/handwired/evk/v1_3/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/evk/v1_3/rules.mk rename keyboards/handwired/fc200rt_qmk/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/fc200rt_qmk/rules.mk rename keyboards/handwired/fivethirteen/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/fivethirteen/rules.mk rename keyboards/handwired/floorboard/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/floorboard/rules.mk rename keyboards/handwired/gamenum/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/handwired/gamenum/rules.mk rename keyboards/handwired/heisenberg/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/heisenberg/rules.mk rename keyboards/handwired/hexon38/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/handwired/hexon38/rules.mk rename keyboards/handwired/hnah108/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/handwired/hnah108/rules.mk rename keyboards/handwired/hnah40/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/hnah40/rules.mk rename keyboards/handwired/hnah40rgb/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/hnah40rgb/rules.mk rename keyboards/handwired/hwpm87/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/hwpm87/rules.mk rename keyboards/handwired/ibm_wheelwriter/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/ibm_wheelwriter/rules.mk rename keyboards/handwired/jn68m/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/jn68m/rules.mk rename keyboards/handwired/jopr/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/jopr/rules.mk rename keyboards/handwired/jot50/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/jot50/rules.mk rename keyboards/handwired/jotpad16/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/handwired/jotpad16/rules.mk rename keyboards/handwired/juliet/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/handwired/juliet/rules.mk rename keyboards/handwired/k8split/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/k8split/rules.mk rename keyboards/handwired/k_numpad17/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/handwired/k_numpad17/rules.mk rename keyboards/handwired/kbod/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/kbod/rules.mk rename keyboards/handwired/leftynumpad/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/handwired/leftynumpad/rules.mk rename keyboards/handwired/lovelive9/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/handwired/lovelive9/rules.mk rename keyboards/handwired/magicforce61/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/magicforce61/rules.mk rename keyboards/handwired/magicforce68/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/magicforce68/rules.mk rename keyboards/handwired/mechboards_micropad/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/handwired/mechboards_micropad/rules.mk rename keyboards/handwired/minorca/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/minorca/rules.mk rename keyboards/handwired/misterdeck/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/handwired/misterdeck/rules.mk rename keyboards/handwired/mutepad/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/handwired/mutepad/rules.mk rename keyboards/handwired/nicekey/{info.json => keyboard.json} (74%) delete mode 100644 keyboards/handwired/nicekey/rules.mk rename keyboards/handwired/nozbe_macro/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/handwired/nozbe_macro/rules.mk rename keyboards/handwired/numpad20/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/handwired/numpad20/rules.mk rename keyboards/handwired/obuwunkunubi/spaget/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/handwired/obuwunkunubi/spaget/rules.mk rename keyboards/handwired/oem_ansi_fullsize/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/oem_ansi_fullsize/rules.mk rename keyboards/handwired/oem_iso_fullsize/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/oem_iso_fullsize/rules.mk rename keyboards/handwired/ortho5x13/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/ortho5x13/rules.mk rename keyboards/handwired/ortho5x14/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/ortho5x14/rules.mk rename keyboards/handwired/pilcrow/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/handwired/pilcrow/rules.mk rename keyboards/handwired/prime_exl/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/prime_exl/rules.mk rename keyboards/handwired/prime_exl_plus/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/prime_exl_plus/rules.mk rename keyboards/handwired/prkl30/promicro/{info.json => keyboard.json} (77%) delete mode 100644 keyboards/handwired/prkl30/promicro/rules.mk rename keyboards/handwired/pteron/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/pteron/rules.mk rename keyboards/handwired/pteron38/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/handwired/pteron38/rules.mk rename keyboards/handwired/pteron44/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/pteron44/rules.mk rename keyboards/handwired/retro_refit/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/retro_refit/rules.mk rename keyboards/handwired/rs60/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/rs60/rules.mk rename keyboards/handwired/selene/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/selene/rules.mk rename keyboards/handwired/sick68/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/sick68/rules.mk rename keyboards/handwired/sick_pad/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/handwired/sick_pad/rules.mk rename keyboards/handwired/snatchpad/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/handwired/snatchpad/rules.mk rename keyboards/handwired/space_oddity/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/space_oddity/rules.mk rename keyboards/handwired/steamvan/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/steamvan/rev1/rules.mk rename keyboards/handwired/sticc14/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/handwired/sticc14/rules.mk rename keyboards/handwired/stream_cheap/2x3/{info.json => keyboard.json} (83%) delete mode 100644 keyboards/handwired/stream_cheap/2x3/rules.mk rename keyboards/handwired/stream_cheap/2x5/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/handwired/stream_cheap/2x5/rules.mk rename keyboards/handwired/swiftrax/astro65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/swiftrax/astro65/rules.mk rename keyboards/handwired/swiftrax/bebol/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/handwired/swiftrax/bebol/rules.mk rename keyboards/handwired/swiftrax/beegboy/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/swiftrax/beegboy/rules.mk rename keyboards/handwired/swiftrax/bumblebee/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/swiftrax/bumblebee/rules.mk rename keyboards/handwired/swiftrax/cowfish/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/handwired/swiftrax/cowfish/rules.mk rename keyboards/handwired/swiftrax/digicarp65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/handwired/swiftrax/digicarp65/rules.mk rename keyboards/handwired/swiftrax/digicarpice/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/swiftrax/digicarpice/rules.mk rename keyboards/handwired/swiftrax/equator/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/swiftrax/equator/rules.mk rename keyboards/handwired/swiftrax/glacier/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/handwired/swiftrax/glacier/rules.mk rename keyboards/handwired/swiftrax/joypad/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/handwired/swiftrax/joypad/rules.mk rename keyboards/handwired/swiftrax/koalafications/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/handwired/swiftrax/koalafications/rules.mk rename keyboards/handwired/swiftrax/nodu/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/swiftrax/nodu/rules.mk rename keyboards/handwired/swiftrax/pandamic/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/swiftrax/pandamic/rules.mk rename keyboards/handwired/swiftrax/the_galleon/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/handwired/swiftrax/the_galleon/rules.mk rename keyboards/handwired/swiftrax/unsplit/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/swiftrax/unsplit/rules.mk rename keyboards/handwired/swiftrax/walter/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/handwired/swiftrax/walter/rules.mk rename keyboards/handwired/t111/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/t111/rules.mk rename keyboards/handwired/tennie/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/handwired/tennie/rules.mk rename keyboards/handwired/terminus_mini/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/terminus_mini/rules.mk rename keyboards/handwired/traveller/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/traveller/rules.mk rename keyboards/handwired/tritium_numpad/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/tritium_numpad/rules.mk rename keyboards/handwired/twig/twig50/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/twig/twig50/rules.mk rename keyboards/handwired/unicomp_mini_m/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/unicomp_mini_m/rules.mk rename keyboards/handwired/videowriter/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/videowriter/rules.mk rename keyboards/handwired/wabi/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/wabi/rules.mk rename keyboards/handwired/woodpad/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/handwired/woodpad/rules.mk rename keyboards/handwired/z150/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/z150/rules.mk rename keyboards/handwired/zergo/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/zergo/rules.mk rename keyboards/hardlineworks/otd_plus/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/hardlineworks/otd_plus/rules.mk rename keyboards/heliar/wm1_hotswap/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/heliar/wm1_hotswap/rules.mk rename keyboards/hfdkb/ac001/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/hfdkb/ac001/rules.mk rename keyboards/hhkb_lite_2/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/hhkb_lite_2/rules.mk rename keyboards/hifumi/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/hifumi/rules.mk rename keyboards/hineybush/h08_ocelot/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/hineybush/h08_ocelot/rules.mk rename keyboards/hineybush/h10/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/hineybush/h10/rules.mk rename keyboards/hineybush/h60/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/hineybush/h60/rules.mk rename keyboards/hineybush/h65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/hineybush/h65/rules.mk rename keyboards/hineybush/h65_hotswap/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/hineybush/h65_hotswap/rules.mk rename keyboards/hineybush/h660s/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/hineybush/h660s/rules.mk rename keyboards/hineybush/h75_singa/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/hineybush/h75_singa/rules.mk rename keyboards/hineybush/hineyg80/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/hineybush/hineyg80/rules.mk rename keyboards/hineybush/physix/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/hineybush/physix/rules.mk rename keyboards/hineybush/sm68/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/hineybush/sm68/rules.mk rename keyboards/hnahkb/freyr/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/hnahkb/freyr/rules.mk rename keyboards/hnahkb/stella/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/hnahkb/stella/rules.mk rename keyboards/holyswitch/southpaw75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/holyswitch/southpaw75/rules.mk rename keyboards/horizon/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/horizon/rules.mk rename keyboards/horrortroll/chinese_pcb/black_e65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/horrortroll/chinese_pcb/black_e65/rules.mk rename keyboards/horrortroll/chinese_pcb/devil68_pro/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk rename keyboards/horrortroll/paws60/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/horrortroll/paws60/rules.mk rename keyboards/hp69/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/hp69/rules.mk rename keyboards/huytbt/h50/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/huytbt/h50/rules.mk diff --git a/keyboards/e88/info.json b/keyboards/e88/keyboard.json similarity index 99% rename from keyboards/e88/info.json rename to keyboards/e88/keyboard.json index c169788341f..4d3fe72caa6 100644 --- a/keyboards/e88/info.json +++ b/keyboards/e88/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0187", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D0", "D1", "D2", "D3", "B3", "B2", "B1", "E6", "D5", "D6", "D4"], "rows": ["B7", "D7", "B4", "C6", "B5", "B6"] diff --git a/keyboards/e88/rules.mk b/keyboards/e88/rules.mk deleted file mode 100644 index 6ff9b4e02ba..00000000000 --- a/keyboards/e88/rules.mk +++ /dev/null @@ -1,12 +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 = 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/ealdin/quadrant/info.json b/keyboards/ealdin/quadrant/keyboard.json similarity index 98% rename from keyboards/ealdin/quadrant/info.json rename to keyboards/ealdin/quadrant/keyboard.json index 75b36063a67..12ef41c41bd 100644 --- a/keyboards/ealdin/quadrant/info.json +++ b/keyboards/ealdin/quadrant/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x5154", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B7", "F6", "F5", "F4"], "rows": ["B2", "F7", "B3", "B6", "B1"] diff --git a/keyboards/ealdin/quadrant/rules.mk b/keyboards/ealdin/quadrant/rules.mk deleted file mode 100644 index a8ce2452a8c..00000000000 --- a/keyboards/ealdin/quadrant/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable rotary encoders diff --git a/keyboards/earth_rover/info.json b/keyboards/earth_rover/keyboard.json similarity index 88% rename from keyboards/earth_rover/info.json rename to keyboards/earth_rover/keyboard.json index f53eb4d6108..0ab2cb08a0c 100644 --- a/keyboards/earth_rover/info.json +++ b/keyboards/earth_rover/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xEE11", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/earth_rover/rules.mk b/keyboards/earth_rover/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/earth_rover/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 = 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/eason/aeroboard/info.json b/keyboards/eason/aeroboard/keyboard.json similarity index 97% rename from keyboards/eason/aeroboard/info.json rename to keyboards/eason/aeroboard/keyboard.json index c8046d40e4f..3d8c2a6db61 100644 --- a/keyboards/eason/aeroboard/info.json +++ b/keyboards/eason/aeroboard/keyboard.json @@ -28,6 +28,16 @@ "pin": "B15", "driver": "spi" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5", "A4"], "rows": ["B10", "B1", "B0", "A7", "A6"] diff --git a/keyboards/eason/aeroboard/rules.mk b/keyboards/eason/aeroboard/rules.mk deleted file mode 100644 index f8a65f43e91..00000000000 --- a/keyboards/eason/aeroboard/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 -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 -SLEEP_LED_ENABLE = yes diff --git a/keyboards/eason/capsule65/info.json b/keyboards/eason/capsule65/keyboard.json similarity index 99% rename from keyboards/eason/capsule65/info.json rename to keyboards/eason/capsule65/keyboard.json index 1ad66fdd653..87b7b945680 100644 --- a/keyboards/eason/capsule65/info.json +++ b/keyboards/eason/capsule65/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6E6E", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D5", "D2", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "B3", "B1", "B0", "B2"], "rows": ["F4", "D1", "B7", "D0", "F5"] diff --git a/keyboards/eason/capsule65/rules.mk b/keyboards/eason/capsule65/rules.mk deleted file mode 100644 index b96c8ddbec0..00000000000 --- a/keyboards/eason/capsule65/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/eason/greatsword80/info.json b/keyboards/eason/greatsword80/keyboard.json similarity index 97% rename from keyboards/eason/greatsword80/info.json rename to keyboards/eason/greatsword80/keyboard.json index 74c469f7ced..6500fac9784 100644 --- a/keyboards/eason/greatsword80/info.json +++ b/keyboards/eason/greatsword80/keyboard.json @@ -12,6 +12,14 @@ "caps_lock": "F0", "on_state": 0 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "F7", "F6", "F5", "F4", "B0", "B1", "B2", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5", "D4"] diff --git a/keyboards/eason/greatsword80/rules.mk b/keyboards/eason/greatsword80/rules.mk deleted file mode 100644 index 2542628fd4a..00000000000 --- a/keyboards/eason/greatsword80/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 = 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/ebastler/isometria_75/rev1/info.json b/keyboards/ebastler/isometria_75/rev1/keyboard.json similarity index 95% rename from keyboards/ebastler/isometria_75/rev1/info.json rename to keyboards/ebastler/isometria_75/rev1/keyboard.json index ad53a34525b..cf36d60df13 100644 --- a/keyboards/ebastler/isometria_75/rev1/info.json +++ b/keyboards/ebastler/isometria_75/rev1/keyboard.json @@ -21,6 +21,17 @@ "pin": "B3", "driver": "pwm" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B12", "B13", "B14", "B15", "A8", "A10", "A13", "A14", "B9", "C13", "F0", "F1", "A0", "B2", "B10", "B11"], "rows": ["A15", "B4", "B5", "B6", "B7", "B8"] diff --git a/keyboards/ebastler/isometria_75/rev1/rules.mk b/keyboards/ebastler/isometria_75/rev1/rules.mk deleted file mode 100644 index 76b31f0a0a0..00000000000 --- a/keyboards/ebastler/isometria_75/rev1/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 = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - diff --git a/keyboards/edc40/info.json b/keyboards/edc40/keyboard.json similarity index 93% rename from keyboards/edc40/info.json rename to keyboards/edc40/keyboard.json index ccd1b12a0d4..304fb3f1123 100644 --- a/keyboards/edc40/info.json +++ b/keyboards/edc40/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "B4", "B5"], "rows": ["D4", "D6", "D7", "F7"] diff --git a/keyboards/edc40/rules.mk b/keyboards/edc40/rules.mk deleted file mode 100644 index 11a655da353..00000000000 --- a/keyboards/edc40/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 -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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes diff --git a/keyboards/edda/info.json b/keyboards/edda/keyboard.json similarity index 97% rename from keyboards/edda/info.json rename to keyboards/edda/keyboard.json index 3cf050fb9ea..4a997abeac5 100644 --- a/keyboards/edda/info.json +++ b/keyboards/edda/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4544", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B3", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["F1", "F0", "E6", "B5", "B4"] diff --git a/keyboards/edda/rules.mk b/keyboards/edda/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/edda/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 = 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/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/keyboard.json similarity index 94% rename from keyboards/edi/hardlight/mk1/info.json rename to keyboards/edi/hardlight/mk1/keyboard.json index dc8bcd01c66..7f33c262278 100644 --- a/keyboards/edi/hardlight/mk1/info.json +++ b/keyboards/edi/hardlight/mk1/keyboard.json @@ -6,6 +6,16 @@ "pid": "0x2401", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "key_lock": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5"], "rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"] diff --git a/keyboards/edi/hardlight/mk1/rules.mk b/keyboards/edi/hardlight/mk1/rules.mk deleted file mode 100644 index 1763386b87e..00000000000 --- a/keyboards/edi/hardlight/mk1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -KEY_LOCK_ENABLE = yes \ No newline at end of file diff --git a/keyboards/edi/standaside/info.json b/keyboards/edi/standaside/keyboard.json similarity index 95% rename from keyboards/edi/standaside/info.json rename to keyboards/edi/standaside/keyboard.json index 69f94729fb8..ccfa5cf1da7 100644 --- a/keyboards/edi/standaside/info.json +++ b/keyboards/edi/standaside/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0412", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["D1", "F4", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/edi/standaside/rules.mk b/keyboards/edi/standaside/rules.mk deleted file mode 100644 index 8dd3faf689b..00000000000 --- a/keyboards/edi/standaside/rules.mk +++ /dev/null @@ -1,12 +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 = 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 -RGBLIGHT_ENABLE = yes # Enable RGB underlighting support diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/keyboard.json similarity index 94% rename from keyboards/ein_60/info.json rename to keyboards/ein_60/keyboard.json index 14b5578f259..cb84c45095f 100644 --- a/keyboards/ein_60/info.json +++ b/keyboards/ein_60/keyboard.json @@ -36,6 +36,16 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true + }, "matrix_pins": { "cols": ["A3", "A2", "A1", "A0", "F6", "F5", "F0", "E0", "E1", "C0", "C1", "C2", "C3"], "rows": ["F1", "F2", "F3", "F4"] diff --git a/keyboards/ein_60/rules.mk b/keyboards/ein_60/rules.mk deleted file mode 100644 index 541e00aa442..00000000000 --- a/keyboards/ein_60/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 = 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 -RGB_MATRIX_ENABLE = no # Enable for pretty RGB matrix effects -ENCODER_ENABLE = yes # Enables the use of one or more encoders -OLED_ENABLE = yes # Enables the use of OLED displays diff --git a/keyboards/emajesty/eiri/info.json b/keyboards/emajesty/eiri/keyboard.json similarity index 94% rename from keyboards/emajesty/eiri/info.json rename to keyboards/emajesty/eiri/keyboard.json index 3163fb1cf57..6941bb921d9 100644 --- a/keyboards/emajesty/eiri/info.json +++ b/keyboards/emajesty/eiri/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x9372", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["B4", "B5", "B2", "B6"] diff --git a/keyboards/emajesty/eiri/rules.mk b/keyboards/emajesty/eiri/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/emajesty/eiri/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 = 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/emi20/info.json b/keyboards/emi20/keyboard.json similarity index 89% rename from keyboards/emi20/info.json rename to keyboards/emi20/keyboard.json index c4406cec31b..56f13af8759 100644 --- a/keyboards/emi20/info.json +++ b/keyboards/emi20/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C7", "C6", "B5", "B4"], "rows": ["F4", "F5", "F6", "F7", "B6"] diff --git a/keyboards/emi20/rules.mk b/keyboards/emi20/rules.mk deleted file mode 100644 index 718a1e8d099..00000000000 --- a/keyboards/emi20/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/emptystring/nqg/info.json b/keyboards/emptystring/nqg/keyboard.json similarity index 93% rename from keyboards/emptystring/nqg/info.json rename to keyboards/emptystring/nqg/keyboard.json index a64d7067190..96f9391dcc8 100644 --- a/keyboards/emptystring/nqg/info.json +++ b/keyboards/emptystring/nqg/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0037", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F7", "F6", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["B6", "B2", "B3", "B1"] diff --git a/keyboards/emptystring/nqg/rules.mk b/keyboards/emptystring/nqg/rules.mk deleted file mode 100644 index ca64cddccd2..00000000000 --- a/keyboards/emptystring/nqg/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/eniigmakeyboards/ek60/info.json b/keyboards/eniigmakeyboards/ek60/keyboard.json similarity index 99% rename from keyboards/eniigmakeyboards/ek60/info.json rename to keyboards/eniigmakeyboards/ek60/keyboard.json index c4116f2daa0..6446dbce341 100644 --- a/keyboards/eniigmakeyboards/ek60/info.json +++ b/keyboards/eniigmakeyboards/ek60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F7", "C6", "F6", "B6", "F5", "F4", "B5", "F1", "E6", "D0", "D7", "D5", "D1", "D3", "D2"], "rows": ["B2", "B1", "B0", "F0", "B4"] diff --git a/keyboards/eniigmakeyboards/ek60/rules.mk b/keyboards/eniigmakeyboards/ek60/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/eniigmakeyboards/ek60/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 = 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/eniigmakeyboards/ek65/info.json b/keyboards/eniigmakeyboards/ek65/keyboard.json similarity index 98% rename from keyboards/eniigmakeyboards/ek65/info.json rename to keyboards/eniigmakeyboards/ek65/keyboard.json index f97de35dd24..129a73e5651 100644 --- a/keyboards/eniigmakeyboards/ek65/info.json +++ b/keyboards/eniigmakeyboards/ek65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "E6", "B2", "B1", "B0"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/eniigmakeyboards/ek65/rules.mk b/keyboards/eniigmakeyboards/ek65/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/eniigmakeyboards/ek65/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 = 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/eniigmakeyboards/ek87/info.json b/keyboards/eniigmakeyboards/ek87/keyboard.json similarity index 99% rename from keyboards/eniigmakeyboards/ek87/info.json rename to keyboards/eniigmakeyboards/ek87/keyboard.json index 78a4c799fb8..553c34ac53e 100644 --- a/keyboards/eniigmakeyboards/ek87/info.json +++ b/keyboards/eniigmakeyboards/ek87/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "F0", "F1", "E6", "D3", "D2", "D1"], "rows": ["B0", "B1", "B2", "B3", "B7", "D0"] diff --git a/keyboards/eniigmakeyboards/ek87/rules.mk b/keyboards/eniigmakeyboards/ek87/rules.mk deleted file mode 100644 index 9e8f5833179..00000000000 --- a/keyboards/eniigmakeyboards/ek87/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ep/40/info.json b/keyboards/ep/40/keyboard.json similarity index 94% rename from keyboards/ep/40/info.json rename to keyboards/ep/40/keyboard.json index 9ceef32703c..e04bb8ca09c 100644 --- a/keyboards/ep/40/info.json +++ b/keyboards/ep/40/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x4040", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["C7", "C6", "B6", "B5"] diff --git a/keyboards/ep/40/rules.mk b/keyboards/ep/40/rules.mk deleted file mode 100644 index 7829a2753bb..00000000000 --- a/keyboards/ep/40/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 = 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/ep/96/info.json b/keyboards/ep/96/keyboard.json similarity index 97% rename from keyboards/ep/96/info.json rename to keyboards/ep/96/keyboard.json index d554c9297f1..a6708a3a80b 100644 --- a/keyboards/ep/96/info.json +++ b/keyboards/ep/96/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x9696", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["B0", "B1", "B3", "B2", "B7", "C6"] diff --git a/keyboards/ep/96/rules.mk b/keyboards/ep/96/rules.mk deleted file mode 100644 index 7829a2753bb..00000000000 --- a/keyboards/ep/96/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 = 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/ep/comsn/hs68/info.json b/keyboards/ep/comsn/hs68/keyboard.json similarity index 96% rename from keyboards/ep/comsn/hs68/info.json rename to keyboards/ep/comsn/hs68/keyboard.json index 28b1044b917..80ebbcf9a87 100644 --- a/keyboards/ep/comsn/hs68/info.json +++ b/keyboards/ep/comsn/hs68/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x6868", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "B1", "B3", "B2", "B7", "D3", "F1", "D5", "D6", "D7", "F4", "F5", "C7", "C6", "F0"], "rows": ["B6", "B5", "B4", "D0", "F6"] diff --git a/keyboards/ep/comsn/hs68/rules.mk b/keyboards/ep/comsn/hs68/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/ep/comsn/hs68/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/ep/comsn/mollydooker/info.json b/keyboards/ep/comsn/mollydooker/keyboard.json similarity index 96% rename from keyboards/ep/comsn/mollydooker/info.json rename to keyboards/ep/comsn/mollydooker/keyboard.json index 868a418403d..dd5f9e6739a 100644 --- a/keyboards/ep/comsn/mollydooker/info.json +++ b/keyboards/ep/comsn/mollydooker/keyboard.json @@ -7,6 +7,15 @@ "pid": "0x9696", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B1", "B2", "B3", "E6", "B7", "F1", "F0", "D0", "D1", "D7", "D5", "D4", "D6", "B4", "B5", "D3", "B6", "C6", "C7"], "rows": ["F4", "F5", "F6", "F7", "D2"] diff --git a/keyboards/ep/comsn/mollydooker/rules.mk b/keyboards/ep/comsn/mollydooker/rules.mk deleted file mode 100644 index 7cc66e743d4..00000000000 --- a/keyboards/ep/comsn/mollydooker/rules.mk +++ /dev/null @@ -1,12 +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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ep/comsn/tf_longeboye/info.json b/keyboards/ep/comsn/tf_longeboye/keyboard.json similarity index 96% rename from keyboards/ep/comsn/tf_longeboye/info.json rename to keyboards/ep/comsn/tf_longeboye/keyboard.json index 0ab6b6d5208..deb00d24061 100644 --- a/keyboards/ep/comsn/tf_longeboye/info.json +++ b/keyboards/ep/comsn/tf_longeboye/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x9696", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "C7", "D5", "B7", "E6", "D7", "C6", "D4", "D0"], "rows": ["B5", "B4", "D1", "D2", "D3"] diff --git a/keyboards/ep/comsn/tf_longeboye/rules.mk b/keyboards/ep/comsn/tf_longeboye/rules.mk deleted file mode 100644 index c58df49ea8f..00000000000 --- a/keyboards/ep/comsn/tf_longeboye/rules.mk +++ /dev/null @@ -1,12 +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 = 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/eternal_keypad/info.json b/keyboards/eternal_keypad/keyboard.json similarity index 93% rename from keyboards/eternal_keypad/info.json rename to keyboards/eternal_keypad/keyboard.json index d17b501909c..c35a66986d7 100644 --- a/keyboards/eternal_keypad/info.json +++ b/keyboards/eternal_keypad/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xDB00", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["B5", "B4", "E6", "D7", "C6"] diff --git a/keyboards/eternal_keypad/rules.mk b/keyboards/eternal_keypad/rules.mk deleted file mode 100644 index 0855a8f38f8..00000000000 --- a/keyboards/eternal_keypad/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/evancookaudio/sleepingdinosaur/info.json b/keyboards/evancookaudio/sleepingdinosaur/keyboard.json similarity index 92% rename from keyboards/evancookaudio/sleepingdinosaur/info.json rename to keyboards/evancookaudio/sleepingdinosaur/keyboard.json index 688dda6341f..c6b77a26c89 100644 --- a/keyboards/evancookaudio/sleepingdinosaur/info.json +++ b/keyboards/evancookaudio/sleepingdinosaur/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D1", "D0", "D4", "C6", "D7"] diff --git a/keyboards/evancookaudio/sleepingdinosaur/rules.mk b/keyboards/evancookaudio/sleepingdinosaur/rules.mk deleted file mode 100644 index 6ff9b4e02ba..00000000000 --- a/keyboards/evancookaudio/sleepingdinosaur/rules.mk +++ /dev/null @@ -1,12 +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 = 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/evancookaudio/tenpad/info.json b/keyboards/evancookaudio/tenpad/keyboard.json similarity index 85% rename from keyboards/evancookaudio/tenpad/info.json rename to keyboards/evancookaudio/tenpad/keyboard.json index 0a628634881..46107a1c9b2 100644 --- a/keyboards/evancookaudio/tenpad/info.json +++ b/keyboards/evancookaudio/tenpad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1"], "rows": ["D0", "D1"] diff --git a/keyboards/evancookaudio/tenpad/rules.mk b/keyboards/evancookaudio/tenpad/rules.mk deleted file mode 100644 index e10edc34f25..00000000000 --- a/keyboards/evancookaudio/tenpad/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 = 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/eve/meteor/info.json b/keyboards/eve/meteor/keyboard.json similarity index 97% rename from keyboards/eve/meteor/info.json rename to keyboards/eve/meteor/keyboard.json index ba8e4569584..a8136496f0e 100644 --- a/keyboards/eve/meteor/info.json +++ b/keyboards/eve/meteor/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4D54", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "D7"], "rows": ["B5", "B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/eve/meteor/rules.mk b/keyboards/eve/meteor/rules.mk deleted file mode 100644 index 88711b21277..00000000000 --- a/keyboards/eve/meteor/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = no diff --git a/keyboards/evil80/info.json b/keyboards/evil80/keyboard.json similarity index 96% rename from keyboards/evil80/info.json rename to keyboards/evil80/keyboard.json index 8e843f18952..68e99167843 100644 --- a/keyboards/evil80/info.json +++ b/keyboards/evil80/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B2", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B1", "C6", "C7", "E6", "F6", "F7"], "rows": ["F1", "F4", "F5", "F0", "B3", "B0"] diff --git a/keyboards/evil80/rules.mk b/keyboards/evil80/rules.mk deleted file mode 100644 index 21fa7badffb..00000000000 --- a/keyboards/evil80/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/evolv/info.json b/keyboards/evolv/keyboard.json similarity index 98% rename from keyboards/evolv/info.json rename to keyboards/evolv/keyboard.json index 4274e9e4377..ab4ccfd9d79 100644 --- a/keyboards/evolv/info.json +++ b/keyboards/evolv/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0E75", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A6", "A5", "A4", "A3", "A2", "A1", "A0", "C14", "F0", "C15", "B9", "B8", "B7", "B6", "B5", "B4"], "rows": ["B10", "B11", "A7", "B0", "B1", "B2"] diff --git a/keyboards/evolv/rules.mk b/keyboards/evolv/rules.mk deleted file mode 100644 index 87802fbd6f5..00000000000 --- a/keyboards/evolv/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - diff --git a/keyboards/evyd13/eon65/info.json b/keyboards/evyd13/eon65/keyboard.json similarity index 99% rename from keyboards/evyd13/eon65/info.json rename to keyboards/evyd13/eon65/keyboard.json index 7d0f3ab2e00..66bae813826 100644 --- a/keyboards/evyd13/eon65/info.json +++ b/keyboards/evyd13/eon65/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xAEB4", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B0", "D2", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D3", "D5", "B1", "B2", "B3"] diff --git a/keyboards/evyd13/eon65/rules.mk b/keyboards/evyd13/eon65/rules.mk deleted file mode 100644 index 8eee1b53bbe..00000000000 --- a/keyboards/evyd13/eon65/rules.mk +++ /dev/null @@ -1,12 +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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/evyd13/eon75/info.json b/keyboards/evyd13/eon75/keyboard.json similarity index 98% rename from keyboards/evyd13/eon75/info.json rename to keyboards/evyd13/eon75/keyboard.json index 07a55549101..9908f4a9cc1 100644 --- a/keyboards/evyd13/eon75/info.json +++ b/keyboards/evyd13/eon75/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5C62", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B3"], "rows": ["D1", "D0", "D3", "D2", "D6", "D4", "D7", "B4", "B5", "B6", "C6", "C7"] diff --git a/keyboards/evyd13/eon75/rules.mk b/keyboards/evyd13/eon75/rules.mk deleted file mode 100644 index 6ff9b4e02ba..00000000000 --- a/keyboards/evyd13/eon75/rules.mk +++ /dev/null @@ -1,12 +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 = 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/evyd13/eon87/info.json b/keyboards/evyd13/eon87/keyboard.json similarity index 98% rename from keyboards/evyd13/eon87/info.json rename to keyboards/evyd13/eon87/keyboard.json index bc9dcec1286..ad0d42eaf93 100644 --- a/keyboards/evyd13/eon87/info.json +++ b/keyboards/evyd13/eon87/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xAA6B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "E6", "B7", "D3", "D2"], "rows": ["B1", "B2", "B3", "D4", "D1", "D5"] diff --git a/keyboards/evyd13/eon87/rules.mk b/keyboards/evyd13/eon87/rules.mk deleted file mode 100644 index 008b63b24e0..00000000000 --- a/keyboards/evyd13/eon87/rules.mk +++ /dev/null @@ -1,12 +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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/evyd13/eon95/info.json b/keyboards/evyd13/eon95/keyboard.json similarity index 99% rename from keyboards/evyd13/eon95/info.json rename to keyboards/evyd13/eon95/keyboard.json index c928894dbae..6b5ee8f191b 100644 --- a/keyboards/evyd13/eon95/info.json +++ b/keyboards/evyd13/eon95/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x8A18", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "B1"], "rows": ["D1", "D0", "D3", "D2", "D6", "D4", "D7", "B4", "B5", "B6", "C6", "C7"] diff --git a/keyboards/evyd13/eon95/rules.mk b/keyboards/evyd13/eon95/rules.mk deleted file mode 100644 index 6ff9b4e02ba..00000000000 --- a/keyboards/evyd13/eon95/rules.mk +++ /dev/null @@ -1,12 +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 = 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/evyd13/gh80_1800/info.json b/keyboards/evyd13/gh80_1800/keyboard.json similarity index 99% rename from keyboards/evyd13/gh80_1800/info.json rename to keyboards/evyd13/gh80_1800/keyboard.json index 86a7eaf9b4d..3200086a171 100644 --- a/keyboards/evyd13/gh80_1800/info.json +++ b/keyboards/evyd13/gh80_1800/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x8B23", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D3", "D2", "D1", "D0", "B7"], "rows": ["D5", "B4", "B5", "B6", "C6", "C7", "B0", "B2", "B1", "B3"] diff --git a/keyboards/evyd13/gh80_1800/rules.mk b/keyboards/evyd13/gh80_1800/rules.mk deleted file mode 100644 index 1d7a3a739f2..00000000000 --- a/keyboards/evyd13/gh80_1800/rules.mk +++ /dev/null @@ -1,11 +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 = 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 diff --git a/keyboards/evyd13/gh80_3700/info.json b/keyboards/evyd13/gh80_3700/keyboard.json similarity index 94% rename from keyboards/evyd13/gh80_3700/info.json rename to keyboards/evyd13/gh80_3700/keyboard.json index 6f4f5c3e4f9..fee94f3a55f 100644 --- a/keyboards/evyd13/gh80_3700/info.json +++ b/keyboards/evyd13/gh80_3700/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x633A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "D7", "D6", "D4"], "rows": ["B3", "C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/evyd13/gh80_3700/rules.mk b/keyboards/evyd13/gh80_3700/rules.mk deleted file mode 100644 index f41f81105e4..00000000000 --- a/keyboards/evyd13/gh80_3700/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = yes # Enable support for rotary encoders diff --git a/keyboards/evyd13/gud70/info.json b/keyboards/evyd13/gud70/keyboard.json similarity index 98% rename from keyboards/evyd13/gud70/info.json rename to keyboards/evyd13/gud70/keyboard.json index 8e4b7199439..00211d61672 100644 --- a/keyboards/evyd13/gud70/info.json +++ b/keyboards/evyd13/gud70/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x198B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0", "B4", "B5", "B6", "C6", "C7", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["D7", "D6", "D4", "E6", "B7"] diff --git a/keyboards/evyd13/gud70/rules.mk b/keyboards/evyd13/gud70/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/evyd13/gud70/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/evyd13/minitomic/info.json b/keyboards/evyd13/minitomic/keyboard.json similarity index 97% rename from keyboards/evyd13/minitomic/info.json rename to keyboards/evyd13/minitomic/keyboard.json index 3146b514102..4bf23b1a564 100644 --- a/keyboards/evyd13/minitomic/info.json +++ b/keyboards/evyd13/minitomic/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0145", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4", "D7", "F0", "F1", "F4", "F5", "F6", "F7", "B7", "E6"], "rows": ["B1", "B3", "D4", "D6"] diff --git a/keyboards/evyd13/minitomic/rules.mk b/keyboards/evyd13/minitomic/rules.mk deleted file mode 100644 index 27b0a2549ed..00000000000 --- a/keyboards/evyd13/minitomic/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 = 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/evyd13/mx5160/info.json b/keyboards/evyd13/mx5160/keyboard.json similarity index 99% rename from keyboards/evyd13/mx5160/info.json rename to keyboards/evyd13/mx5160/keyboard.json index b9c7e54a571..5b430797ec7 100644 --- a/keyboards/evyd13/mx5160/info.json +++ b/keyboards/evyd13/mx5160/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5160", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["C6", "C7", "B5", "B6", "D7", "B4", "D4", "D6", "D5", "D3"] diff --git a/keyboards/evyd13/mx5160/rules.mk b/keyboards/evyd13/mx5160/rules.mk deleted file mode 100644 index 1ffb0c55b90..00000000000 --- a/keyboards/evyd13/mx5160/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 = 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/evyd13/nt750/info.json b/keyboards/evyd13/nt750/keyboard.json similarity index 98% rename from keyboards/evyd13/nt750/info.json rename to keyboards/evyd13/nt750/keyboard.json index b12c2b5352d..5ead6193dea 100644 --- a/keyboards/evyd13/nt750/info.json +++ b/keyboards/evyd13/nt750/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3320", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B1", "B0"], "rows": ["B2", "B3", "B7", "D0", "D1", "D2"] diff --git a/keyboards/evyd13/nt750/rules.mk b/keyboards/evyd13/nt750/rules.mk deleted file mode 100644 index bb5eab12a15..00000000000 --- a/keyboards/evyd13/nt750/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/evyd13/nt980/info.json b/keyboards/evyd13/nt980/keyboard.json similarity index 99% rename from keyboards/evyd13/nt980/info.json rename to keyboards/evyd13/nt980/keyboard.json index d8d31e0e7fe..307f35cecc1 100644 --- a/keyboards/evyd13/nt980/info.json +++ b/keyboards/evyd13/nt980/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xAAF8", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "D3", "D2"], "rows": ["B0", "B1", "D1", "D0", "C6", "C7", "B5", "B6", "B4", "D7", "D4", "D6"] diff --git a/keyboards/evyd13/nt980/rules.mk b/keyboards/evyd13/nt980/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/evyd13/nt980/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 = 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/evyd13/omrontkl/info.json b/keyboards/evyd13/omrontkl/keyboard.json similarity index 98% rename from keyboards/evyd13/omrontkl/info.json rename to keyboards/evyd13/omrontkl/keyboard.json index e5c01ddae44..28f59b4f537 100644 --- a/keyboards/evyd13/omrontkl/info.json +++ b/keyboards/evyd13/omrontkl/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xEA78", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "C7", "F1", "C6", "F4", "B6", "F5", "B5", "F6", "B4", "F7", "D7", "D6", "D5", "B3", "B1", "B2"], "rows": ["D0", "D1", "D2", "D3", "D4", "B7"] diff --git a/keyboards/evyd13/omrontkl/rules.mk b/keyboards/evyd13/omrontkl/rules.mk deleted file mode 100644 index 3f6eff7f550..00000000000 --- a/keyboards/evyd13/omrontkl/rules.mk +++ /dev/null @@ -1,12 +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 = 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/evyd13/plain60/info.json b/keyboards/evyd13/plain60/keyboard.json similarity index 99% rename from keyboards/evyd13/plain60/info.json rename to keyboards/evyd13/plain60/keyboard.json index 7db6a08f078..711bc515596 100644 --- a/keyboards/evyd13/plain60/info.json +++ b/keyboards/evyd13/plain60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0160", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D2", "D1", "D0", "D3", "D5", "B5", "F0", "B6", "C6", "C7", "F1", "F4", "F5", "F6", "F7"], "rows": ["B4", "D7", "D6", "D4", "E6"] diff --git a/keyboards/evyd13/plain60/rules.mk b/keyboards/evyd13/plain60/rules.mk deleted file mode 100644 index 6eb8e9eb37a..00000000000 --- a/keyboards/evyd13/plain60/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no diff --git a/keyboards/evyd13/quackfire/info.json b/keyboards/evyd13/quackfire/keyboard.json similarity index 98% rename from keyboards/evyd13/quackfire/info.json rename to keyboards/evyd13/quackfire/keyboard.json index 493559b38ee..a0d0e819fa5 100644 --- a/keyboards/evyd13/quackfire/info.json +++ b/keyboards/evyd13/quackfire/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x87C9", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B3", "F1", "B1", "D5", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D3", "F5", "F4", "F0", "B7", "B2", "E6", "B0"] diff --git a/keyboards/evyd13/quackfire/rules.mk b/keyboards/evyd13/quackfire/rules.mk deleted file mode 100644 index 718a1e8d099..00000000000 --- a/keyboards/evyd13/quackfire/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/evyd13/solheim68/info.json b/keyboards/evyd13/solheim68/keyboard.json similarity index 99% rename from keyboards/evyd13/solheim68/info.json rename to keyboards/evyd13/solheim68/keyboard.json index f348b985568..d48281763e8 100644 --- a/keyboards/evyd13/solheim68/info.json +++ b/keyboards/evyd13/solheim68/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x7BFF", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["E6", "B0", "B1", "B2", "B3"] diff --git a/keyboards/evyd13/solheim68/rules.mk b/keyboards/evyd13/solheim68/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/evyd13/solheim68/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/evyd13/ta65/info.json b/keyboards/evyd13/ta65/keyboard.json similarity index 98% rename from keyboards/evyd13/ta65/info.json rename to keyboards/evyd13/ta65/keyboard.json index 38da22f4067..97090c611cb 100644 --- a/keyboards/evyd13/ta65/info.json +++ b/keyboards/evyd13/ta65/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x7465", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D2", "D1", "D0", "D3", "D5", "C7", "C6", "B6", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "B0"], "rows": ["B4", "D7", "D6", "D4", "B3"] diff --git a/keyboards/evyd13/ta65/rules.mk b/keyboards/evyd13/ta65/rules.mk deleted file mode 100644 index 27132e67478..00000000000 --- a/keyboards/evyd13/ta65/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 -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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/keyboard.json similarity index 97% rename from keyboards/evyd13/wonderland/info.json rename to keyboards/evyd13/wonderland/keyboard.json index 1609c969718..526416fd716 100644 --- a/keyboards/evyd13/wonderland/info.json +++ b/keyboards/evyd13/wonderland/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xA71C", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true, + "velocikey": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/evyd13/wonderland/rules.mk b/keyboards/evyd13/wonderland/rules.mk deleted file mode 100644 index 5cf8a3ec50f..00000000000 --- a/keyboards/evyd13/wonderland/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 = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no -AUTO_SHIFT_ENABLE = no -VELOCIKEY_ENABLE = yes diff --git a/keyboards/exclusive/e65/info.json b/keyboards/exclusive/e65/keyboard.json similarity index 99% rename from keyboards/exclusive/e65/info.json rename to keyboards/exclusive/e65/keyboard.json index 76f37e9883b..14bed7b7651 100644 --- a/keyboards/exclusive/e65/info.json +++ b/keyboards/exclusive/e65/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xE605", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C6", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/exclusive/e65/rules.mk b/keyboards/exclusive/e65/rules.mk deleted file mode 100644 index 363aa021cbe..00000000000 --- a/keyboards/exclusive/e65/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 = 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 = yes diff --git a/keyboards/exclusive/e6_rgb/info.json b/keyboards/exclusive/e6_rgb/keyboard.json similarity index 98% rename from keyboards/exclusive/e6_rgb/info.json rename to keyboards/exclusive/e6_rgb/keyboard.json index 3b833c3a97f..36c186584f3 100644 --- a/keyboards/exclusive/e6_rgb/info.json +++ b/keyboards/exclusive/e6_rgb/keyboard.json @@ -11,6 +11,15 @@ "rgb_matrix": { "driver": "is31fl3733" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D7", "B4", "B5", "B6", "C6", "C7", "F7", "F0", "B0", "B1", "D2", "D3", "B3", "B2"], "rows": ["F1", "F4", "F5", "F6", "D6"] diff --git a/keyboards/exclusive/e6_rgb/rules.mk b/keyboards/exclusive/e6_rgb/rules.mk deleted file mode 100644 index 0bdf20535c3..00000000000 --- a/keyboards/exclusive/e6_rgb/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = no # Use RGB matrix diff --git a/keyboards/exclusive/e6v2/le/info.json b/keyboards/exclusive/e6v2/le/keyboard.json similarity index 98% rename from keyboards/exclusive/e6v2/le/info.json rename to keyboards/exclusive/e6v2/le/keyboard.json index 551efa299c1..e6d551126ee 100644 --- a/keyboards/exclusive/e6v2/le/info.json +++ b/keyboards/exclusive/e6v2/le/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.2" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/exclusive/e6v2/le/rules.mk b/keyboards/exclusive/e6v2/le/rules.mk deleted file mode 100644 index 854004ccf73..00000000000 --- a/keyboards/exclusive/e6v2/le/rules.mk +++ /dev/null @@ -1,12 +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 -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 = yes -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/exclusive/e6v2/le_bmc/info.json b/keyboards/exclusive/e6v2/le_bmc/keyboard.json similarity index 98% rename from keyboards/exclusive/e6v2/le_bmc/info.json rename to keyboards/exclusive/e6v2/le_bmc/keyboard.json index 123ab8f7bb3..09d99d670f9 100644 --- a/keyboards/exclusive/e6v2/le_bmc/info.json +++ b/keyboards/exclusive/e6v2/le_bmc/keyboard.json @@ -7,6 +7,16 @@ "pid": "0xE62D", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "C2", "C3", "C4", "C5", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/exclusive/e6v2/le_bmc/rules.mk b/keyboards/exclusive/e6v2/le_bmc/rules.mk deleted file mode 100644 index 0a7c71a8ee3..00000000000 --- a/keyboards/exclusive/e6v2/le_bmc/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # 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 diff --git a/keyboards/exclusive/e6v2/oe/info.json b/keyboards/exclusive/e6v2/oe/keyboard.json similarity index 98% rename from keyboards/exclusive/e6v2/oe/info.json rename to keyboards/exclusive/e6v2/oe/keyboard.json index 90a9a8b40b0..587205d2df2 100644 --- a/keyboards/exclusive/e6v2/oe/info.json +++ b/keyboards/exclusive/e6v2/oe/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.2" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "C6", "B5", "B4", "D7", "D6", "D4", "F6", "F7", "F5", "F4", "F1", "F0", "B0", "B1"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/exclusive/e6v2/oe/rules.mk b/keyboards/exclusive/e6v2/oe/rules.mk deleted file mode 100644 index 854004ccf73..00000000000 --- a/keyboards/exclusive/e6v2/oe/rules.mk +++ /dev/null @@ -1,12 +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 -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 = yes -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/exclusive/e6v2/oe_bmc/info.json b/keyboards/exclusive/e6v2/oe_bmc/keyboard.json similarity index 98% rename from keyboards/exclusive/e6v2/oe_bmc/info.json rename to keyboards/exclusive/e6v2/oe_bmc/keyboard.json index 65be093b493..7ff30992491 100644 --- a/keyboards/exclusive/e6v2/oe_bmc/info.json +++ b/keyboards/exclusive/e6v2/oe_bmc/keyboard.json @@ -7,6 +7,16 @@ "pid": "0xE62B", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "C2", "C3", "C4", "C5", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/exclusive/e6v2/oe_bmc/rules.mk b/keyboards/exclusive/e6v2/oe_bmc/rules.mk deleted file mode 100644 index 0a7c71a8ee3..00000000000 --- a/keyboards/exclusive/e6v2/oe_bmc/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # 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 diff --git a/keyboards/exclusive/e7v1/info.json b/keyboards/exclusive/e7v1/keyboard.json similarity index 99% rename from keyboards/exclusive/e7v1/info.json rename to keyboards/exclusive/e7v1/keyboard.json index ed94f9805e5..c6efe800b4f 100644 --- a/keyboards/exclusive/e7v1/info.json +++ b/keyboards/exclusive/e7v1/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xE701", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7", "F1"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5"] diff --git a/keyboards/exclusive/e7v1/rules.mk b/keyboards/exclusive/e7v1/rules.mk deleted file mode 100644 index 363aa021cbe..00000000000 --- a/keyboards/exclusive/e7v1/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 = 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 = yes diff --git a/keyboards/exclusive/e7v1se/info.json b/keyboards/exclusive/e7v1se/keyboard.json similarity index 96% rename from keyboards/exclusive/e7v1se/info.json rename to keyboards/exclusive/e7v1se/keyboard.json index 33e17f14b58..6dcb6ac8664 100644 --- a/keyboards/exclusive/e7v1se/info.json +++ b/keyboards/exclusive/e7v1se/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x7051", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0", "D7", "D6", "D4", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F4"], "rows": ["E6", "B0", "B1", "B2", "B3", "F0"] diff --git a/keyboards/exclusive/e7v1se/rules.mk b/keyboards/exclusive/e7v1se/rules.mk deleted file mode 100644 index 5681a9b5977..00000000000 --- a/keyboards/exclusive/e7v1se/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/exent/info.json b/keyboards/exent/keyboard.json similarity index 98% rename from keyboards/exent/info.json rename to keyboards/exent/keyboard.json index 54d54f08978..1fcd11084b4 100644 --- a/keyboards/exent/info.json +++ b/keyboards/exent/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x4558", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D7", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A1", "A0"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"] diff --git a/keyboards/exent/rules.mk b/keyboards/exent/rules.mk deleted file mode 100644 index e402cb508cf..00000000000 --- a/keyboards/exent/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# 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 = yes # Commands for debug and configuration -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/eyeohdesigns/babyv/info.json b/keyboards/eyeohdesigns/babyv/keyboard.json similarity index 98% rename from keyboards/eyeohdesigns/babyv/info.json rename to keyboards/eyeohdesigns/babyv/keyboard.json index 14f52889ba0..11975331897 100644 --- a/keyboards/eyeohdesigns/babyv/info.json +++ b/keyboards/eyeohdesigns/babyv/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "B4", "D7", "D6", "D4", "B0", "B1", "B2", "F0", "F1", "F4"], "rows": ["B5", "D2", "D5", "D3"] diff --git a/keyboards/eyeohdesigns/babyv/rules.mk b/keyboards/eyeohdesigns/babyv/rules.mk deleted file mode 100644 index 5b9cc80e47a..00000000000 --- a/keyboards/eyeohdesigns/babyv/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 = 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 diff --git a/keyboards/eyeohdesigns/sprh/info.json b/keyboards/eyeohdesigns/sprh/keyboard.json similarity index 99% rename from keyboards/eyeohdesigns/sprh/info.json rename to keyboards/eyeohdesigns/sprh/keyboard.json index 3ef613f9a92..55fe0cf4e41 100644 --- a/keyboards/eyeohdesigns/sprh/info.json +++ b/keyboards/eyeohdesigns/sprh/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "C6", "B6", "B5", "B4", "D7", "D6", "F7", "D4"], "rows": ["B3", "B7", "D2", "D5", "D3"] diff --git a/keyboards/eyeohdesigns/sprh/rules.mk b/keyboards/eyeohdesigns/sprh/rules.mk deleted file mode 100644 index 3e97617a39e..00000000000 --- a/keyboards/eyeohdesigns/sprh/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 -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 -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/eyeohdesigns/theboulevard/info.json b/keyboards/eyeohdesigns/theboulevard/keyboard.json similarity index 99% rename from keyboards/eyeohdesigns/theboulevard/info.json rename to keyboards/eyeohdesigns/theboulevard/keyboard.json index afec9c4419d..94007dd2c55 100644 --- a/keyboards/eyeohdesigns/theboulevard/info.json +++ b/keyboards/eyeohdesigns/theboulevard/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["F7", "B1", "E6", "F0", "F1"] diff --git a/keyboards/eyeohdesigns/theboulevard/rules.mk b/keyboards/eyeohdesigns/theboulevard/rules.mk deleted file mode 100644 index 8561958b642..00000000000 --- a/keyboards/eyeohdesigns/theboulevard/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/facew/info.json b/keyboards/facew/keyboard.json similarity index 97% rename from keyboards/facew/info.json rename to keyboards/facew/keyboard.json index 1f7844a8ef7..a8a7543b7a6 100644 --- a/keyboards/facew/info.json +++ b/keyboards/facew/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/facew/rules.mk b/keyboards/facew/rules.mk deleted file mode 100644 index 166b3d3ec8d..00000000000 --- a/keyboards/facew/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/feels/feels65/info.json b/keyboards/feels/feels65/keyboard.json similarity index 99% rename from keyboards/feels/feels65/info.json rename to keyboards/feels/feels65/keyboard.json index efa67dd33ab..f43078f69ec 100644 --- a/keyboards/feels/feels65/info.json +++ b/keyboards/feels/feels65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xE965", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3"], "rows": ["D5", "D3", "D2", "D1", "D0"] diff --git a/keyboards/feels/feels65/rules.mk b/keyboards/feels/feels65/rules.mk deleted file mode 100644 index c6b71a4aaa6..00000000000 --- a/keyboards/feels/feels65/rules.mk +++ /dev/null @@ -1,12 +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 = 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 diff --git a/keyboards/ffkeebs/siris/info.json b/keyboards/ffkeebs/siris/keyboard.json similarity index 95% rename from keyboards/ffkeebs/siris/info.json rename to keyboards/ffkeebs/siris/keyboard.json index 6a1347cdf61..86531b6d01f 100644 --- a/keyboards/ffkeebs/siris/info.json +++ b/keyboards/ffkeebs/siris/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xE96C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D2", "D1", "D0", "B7", "B3", "B2", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["B5", "B4", "D7", "D6", "D4"] diff --git a/keyboards/ffkeebs/siris/rules.mk b/keyboards/ffkeebs/siris/rules.mk deleted file mode 100644 index b9cfa98be04..00000000000 --- a/keyboards/ffkeebs/siris/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Rotary Encoder \ No newline at end of file diff --git a/keyboards/flehrad/bigswitch/info.json b/keyboards/flehrad/bigswitch/keyboard.json similarity index 82% rename from keyboards/flehrad/bigswitch/info.json rename to keyboards/flehrad/bigswitch/keyboard.json index cf981b0d90e..a56c0b1e9ef 100644 --- a/keyboards/flehrad/bigswitch/info.json +++ b/keyboards/flehrad/bigswitch/keyboard.json @@ -25,6 +25,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B6"], "rows": ["B5"] diff --git a/keyboards/flehrad/bigswitch/rules.mk b/keyboards/flehrad/bigswitch/rules.mk deleted file mode 100644 index e39d118e931..00000000000 --- a/keyboards/flehrad/bigswitch/rules.mk +++ /dev/null @@ -1,13 +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 = yes # Commands for debug and configuration -NKRO_ENABLE = no # 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 = yes # This can be enabled if a ws2812 strip is connected to the expansion port. - diff --git a/keyboards/flehrad/downbubble/info.json b/keyboards/flehrad/downbubble/keyboard.json similarity index 99% rename from keyboards/flehrad/downbubble/info.json rename to keyboards/flehrad/downbubble/keyboard.json index fa81b51e429..94f29b89f2b 100644 --- a/keyboards/flehrad/downbubble/info.json +++ b/keyboards/flehrad/downbubble/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D6", "D5", "D4", "D3", "D2", "D1", "D0", "B7"], "rows": ["F1", "F2", "F3", "F4", "F5", "F6"] diff --git a/keyboards/flehrad/downbubble/rules.mk b/keyboards/flehrad/downbubble/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/flehrad/downbubble/rules.mk +++ /dev/null @@ -1,12 +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 -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/flehrad/numbrero/info.json b/keyboards/flehrad/numbrero/keyboard.json similarity index 94% rename from keyboards/flehrad/numbrero/info.json rename to keyboards/flehrad/numbrero/keyboard.json index 9f86df14d9d..035aaa85b9c 100644 --- a/keyboards/flehrad/numbrero/info.json +++ b/keyboards/flehrad/numbrero/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "F5", "F4"], "rows": ["F6", "B5", "B4", "E6", "F7"] diff --git a/keyboards/flehrad/numbrero/rules.mk b/keyboards/flehrad/numbrero/rules.mk deleted file mode 100644 index 06845b8e21c..00000000000 --- a/keyboards/flehrad/numbrero/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 = 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 -RGBLIGHT_ENABLE = no diff --git a/keyboards/flehrad/snagpad/info.json b/keyboards/flehrad/snagpad/keyboard.json similarity index 93% rename from keyboards/flehrad/snagpad/info.json rename to keyboards/flehrad/snagpad/keyboard.json index 7795b0a6b7e..3c513a4b485 100644 --- a/keyboards/flehrad/snagpad/info.json +++ b/keyboards/flehrad/snagpad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5350", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7"], "rows": ["D1", "D0", "D4", "C6", "D7"] diff --git a/keyboards/flehrad/snagpad/rules.mk b/keyboards/flehrad/snagpad/rules.mk deleted file mode 100644 index 06845b8e21c..00000000000 --- a/keyboards/flehrad/snagpad/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 = 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 -RGBLIGHT_ENABLE = no diff --git a/keyboards/flehrad/tradestation/info.json b/keyboards/flehrad/tradestation/keyboard.json similarity index 92% rename from keyboards/flehrad/tradestation/info.json rename to keyboards/flehrad/tradestation/keyboard.json index fff21fa7bc0..52620b87be8 100644 --- a/keyboards/flehrad/tradestation/info.json +++ b/keyboards/flehrad/tradestation/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F7", "B1", "D7", "E6"], "rows": ["D1", "C6", "D4", "D0"] diff --git a/keyboards/flehrad/tradestation/rules.mk b/keyboards/flehrad/tradestation/rules.mk deleted file mode 100644 index 06845b8e21c..00000000000 --- a/keyboards/flehrad/tradestation/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 = 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 -RGBLIGHT_ENABLE = no diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/keyboard.json similarity index 96% rename from keyboards/fleuron/info.json rename to keyboards/fleuron/keyboard.json index 70be63d3c20..dbf11d6161c 100644 --- a/keyboards/fleuron/info.json +++ b/keyboards/fleuron/keyboard.json @@ -7,6 +7,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "B6", "B3", "B5", "B4", "D7", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B0", "B1", "B2"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/fleuron/rules.mk b/keyboards/fleuron/rules.mk deleted file mode 100644 index b59c21b0333..00000000000 --- a/keyboards/fleuron/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 -AUDIO_ENABLE = no # Audio output - -RGBLIGHT_ENABLE = yes diff --git a/keyboards/foostan/cornelius/info.json b/keyboards/foostan/cornelius/keyboard.json similarity index 94% rename from keyboards/foostan/cornelius/info.json rename to keyboards/foostan/cornelius/keyboard.json index fc67cc0100d..a8dba9c3e74 100644 --- a/keyboards/foostan/cornelius/info.json +++ b/keyboards/foostan/cornelius/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["B0", "B1", "B2", "C7"] diff --git a/keyboards/foostan/cornelius/rules.mk b/keyboards/foostan/cornelius/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/foostan/cornelius/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 = 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/foxlab/key65/hotswap/info.json b/keyboards/foxlab/key65/hotswap/keyboard.json similarity index 95% rename from keyboards/foxlab/key65/hotswap/info.json rename to keyboards/foxlab/key65/hotswap/keyboard.json index 20f5c06ecd1..0a98932eb00 100644 --- a/keyboards/foxlab/key65/hotswap/info.json +++ b/keyboards/foxlab/key65/hotswap/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F4", "F1", "F0", "B0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D2", "D1", "D0", "D3", "B3"] diff --git a/keyboards/foxlab/key65/hotswap/rules.mk b/keyboards/foxlab/key65/hotswap/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/foxlab/key65/hotswap/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/foxlab/key65/universal/info.json b/keyboards/foxlab/key65/universal/keyboard.json similarity index 98% rename from keyboards/foxlab/key65/universal/info.json rename to keyboards/foxlab/key65/universal/keyboard.json index e2e526303d0..7523d7051d3 100644 --- a/keyboards/foxlab/key65/universal/info.json +++ b/keyboards/foxlab/key65/universal/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B1", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B0"], "rows": ["D0", "D1", "F0", "F4", "F1"] diff --git a/keyboards/foxlab/key65/universal/rules.mk b/keyboards/foxlab/key65/universal/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/foxlab/key65/universal/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/foxlab/leaf60/hotswap/info.json b/keyboards/foxlab/leaf60/hotswap/keyboard.json similarity index 95% rename from keyboards/foxlab/leaf60/hotswap/info.json rename to keyboards/foxlab/leaf60/hotswap/keyboard.json index f7f3d202ff6..8c74898e37d 100644 --- a/keyboards/foxlab/leaf60/hotswap/info.json +++ b/keyboards/foxlab/leaf60/hotswap/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F4", "F1", "F0", "B0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D2", "D1", "D0", "D3", "D5"] diff --git a/keyboards/foxlab/leaf60/hotswap/rules.mk b/keyboards/foxlab/leaf60/hotswap/rules.mk deleted file mode 100644 index 0922d3d5112..00000000000 --- a/keyboards/foxlab/leaf60/hotswap/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 = 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 diff --git a/keyboards/foxlab/leaf60/universal/info.json b/keyboards/foxlab/leaf60/universal/keyboard.json similarity index 98% rename from keyboards/foxlab/leaf60/universal/info.json rename to keyboards/foxlab/leaf60/universal/keyboard.json index f4b9c704f74..1cf7f235a51 100644 --- a/keyboards/foxlab/leaf60/universal/info.json +++ b/keyboards/foxlab/leaf60/universal/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B0", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["D0", "D1", "F0", "F4", "F1"] diff --git a/keyboards/foxlab/leaf60/universal/rules.mk b/keyboards/foxlab/leaf60/universal/rules.mk deleted file mode 100644 index 0922d3d5112..00000000000 --- a/keyboards/foxlab/leaf60/universal/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 = 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 diff --git a/keyboards/foxlab/time80/info.json b/keyboards/foxlab/time80/keyboard.json similarity index 99% rename from keyboards/foxlab/time80/info.json rename to keyboards/foxlab/time80/keyboard.json index b19e3c31041..29a374b5649 100644 --- a/keyboards/foxlab/time80/info.json +++ b/keyboards/foxlab/time80/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7", "A0"], "rows": ["B1", "B2", "B3", "B5", "B6", "B7", "B0"] diff --git a/keyboards/foxlab/time80/rules.mk b/keyboards/foxlab/time80/rules.mk deleted file mode 100644 index 62a9a9a51a6..00000000000 --- a/keyboards/foxlab/time80/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow diff --git a/keyboards/foxlab/time_re/universal/info.json b/keyboards/foxlab/time_re/hotswap/keyboard.json similarity index 96% rename from keyboards/foxlab/time_re/universal/info.json rename to keyboards/foxlab/time_re/hotswap/keyboard.json index a7c9bbc7e62..cfef3317f20 100644 --- a/keyboards/foxlab/time_re/universal/info.json +++ b/keyboards/foxlab/time_re/hotswap/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"], "rows": ["D1", "D0", "B3", "B0", "B2", "B1"] @@ -16,6 +26,10 @@ "backlight": { "pin": "B7" }, + "indicators": { + "caps_lock": "E6", + "on_state": 0 + }, "ws2812": { "pin": "E2" }, @@ -38,10 +52,6 @@ "twinkle": true } }, - "indicators": { - "caps_lock": "E6", - "on_state": 0 - }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/foxlab/time_re/hotswap/rules.mk b/keyboards/foxlab/time_re/hotswap/rules.mk deleted file mode 100644 index d96164b489f..00000000000 --- a/keyboards/foxlab/time_re/hotswap/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/foxlab/time_re/hotswap/info.json b/keyboards/foxlab/time_re/universal/keyboard.json similarity index 96% rename from keyboards/foxlab/time_re/hotswap/info.json rename to keyboards/foxlab/time_re/universal/keyboard.json index d210a854377..b53364a5896 100644 --- a/keyboards/foxlab/time_re/hotswap/info.json +++ b/keyboards/foxlab/time_re/universal/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"], "rows": ["D1", "D0", "B3", "B0", "B2", "B1"] @@ -16,10 +26,6 @@ "backlight": { "pin": "B7" }, - "indicators": { - "caps_lock": "E6", - "on_state": 0 - }, "ws2812": { "pin": "E2" }, @@ -42,6 +48,10 @@ "twinkle": true } }, + "indicators": { + "caps_lock": "E6", + "on_state": 0 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/foxlab/time_re/universal/rules.mk b/keyboards/foxlab/time_re/universal/rules.mk deleted file mode 100644 index 37ab2ebad17..00000000000 --- a/keyboards/foxlab/time_re/universal/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/fr4/southpaw75/info.json b/keyboards/fr4/southpaw75/keyboard.json similarity index 96% rename from keyboards/fr4/southpaw75/info.json rename to keyboards/fr4/southpaw75/keyboard.json index 3eb325d0eb6..d29aa877373 100644 --- a/keyboards/fr4/southpaw75/info.json +++ b/keyboards/fr4/southpaw75/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x350C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/fr4/southpaw75/rules.mk b/keyboards/fr4/southpaw75/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/fr4/southpaw75/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 = 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/fr4/unix60/info.json b/keyboards/fr4/unix60/keyboard.json similarity index 98% rename from keyboards/fr4/unix60/info.json rename to keyboards/fr4/unix60/keyboard.json index 14c686a0407..a6c3d0cb6a0 100644 --- a/keyboards/fr4/unix60/info.json +++ b/keyboards/fr4/unix60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5558", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7"] diff --git a/keyboards/fr4/unix60/rules.mk b/keyboards/fr4/unix60/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/fr4/unix60/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 = 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/free_willy/info.json b/keyboards/free_willy/keyboard.json similarity index 93% rename from keyboards/free_willy/info.json rename to keyboards/free_willy/keyboard.json index c9457da71d2..512d56516aa 100644 --- a/keyboards/free_willy/info.json +++ b/keyboards/free_willy/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4657", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/free_willy/rules.mk b/keyboards/free_willy/rules.mk deleted file mode 100644 index 1ffb0c55b90..00000000000 --- a/keyboards/free_willy/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 = 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/friedrich/info.json b/keyboards/friedrich/keyboard.json similarity index 95% rename from keyboards/friedrich/info.json rename to keyboards/friedrich/keyboard.json index d3d3fc950e7..d5dd68e0bc4 100644 --- a/keyboards/friedrich/info.json +++ b/keyboards/friedrich/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xB4A2", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F7", "E6", "B2", "B3", "D4", "D6", "D7", "B4", "C6", "B5", "B6"], "rows": ["F4", "F1", "F0", "F5", "D5"] diff --git a/keyboards/friedrich/rules.mk b/keyboards/friedrich/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/friedrich/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/nano/keyboard.json similarity index 86% rename from keyboards/frooastboard/nano/info.json rename to keyboards/frooastboard/nano/keyboard.json index c81d7a3dfb0..5d7783145e0 100644 --- a/keyboards/frooastboard/nano/info.json +++ b/keyboards/frooastboard/nano/keyboard.json @@ -15,6 +15,15 @@ ] } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "rows": ["B0", "B1"], "cols": ["B2", "B3"] diff --git a/keyboards/frooastboard/nano/rules.mk b/keyboards/frooastboard/nano/rules.mk deleted file mode 100644 index c4f25d88037..00000000000 --- a/keyboards/frooastboard/nano/rules.mk +++ /dev/null @@ -1,12 +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 = 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/ft/mars80/info.json b/keyboards/ft/mars80/keyboard.json similarity index 98% rename from keyboards/ft/mars80/info.json rename to keyboards/ft/mars80/keyboard.json index 82727ffd3e7..1d5e53dcbe1 100644 --- a/keyboards/ft/mars80/info.json +++ b/keyboards/ft/mars80/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2"], "rows": ["B0", "B1", "B2", "B3", "B5", "B6", "B7"] diff --git a/keyboards/ft/mars80/rules.mk b/keyboards/ft/mars80/rules.mk deleted file mode 100644 index 51df0b642e1..00000000000 --- a/keyboards/ft/mars80/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/function96/v1/info.json b/keyboards/function96/v1/keyboard.json similarity index 97% rename from keyboards/function96/v1/info.json rename to keyboards/function96/v1/keyboard.json index 63bd287f473..945042b284b 100644 --- a/keyboards/function96/v1/info.json +++ b/keyboards/function96/v1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x672A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B12", "A13", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], "rows": ["F1", "F0", "C15", "C14", "C13", "B9"] diff --git a/keyboards/function96/v1/rules.mk b/keyboards/function96/v1/rules.mk deleted file mode 100644 index 9dc5131823e..00000000000 --- a/keyboards/function96/v1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/function96/v2/info.json b/keyboards/function96/v2/keyboard.json similarity index 99% rename from keyboards/function96/v2/info.json rename to keyboards/function96/v2/keyboard.json index 88d54b5147e..21d677d9a59 100644 --- a/keyboards/function96/v2/info.json +++ b/keyboards/function96/v2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x672B", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"], "rows": ["A9", "A8", "B15", "B14", "B13", "B12"] diff --git a/keyboards/function96/v2/rules.mk b/keyboards/function96/v2/rules.mk deleted file mode 100644 index 9dc5131823e..00000000000 --- a/keyboards/function96/v2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/funky40/info.json b/keyboards/funky40/keyboard.json similarity index 94% rename from keyboards/funky40/info.json rename to keyboards/funky40/keyboard.json index 43a424a664d..5825c0e3b70 100644 --- a/keyboards/funky40/info.json +++ b/keyboards/funky40/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xC4B5", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "F5", "F4", "F7", "B1", "B6", "B2", "B3", "D2", "F6", "E6", "D7"], "rows": ["D4", "C6", "B4", "B5"] diff --git a/keyboards/funky40/rules.mk b/keyboards/funky40/rules.mk deleted file mode 100644 index d963880594e..00000000000 --- a/keyboards/funky40/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration - this may disable space cadet right shift/enter -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/gami_studio/lex60/info.json b/keyboards/gami_studio/lex60/keyboard.json similarity index 95% rename from keyboards/gami_studio/lex60/info.json rename to keyboards/gami_studio/lex60/keyboard.json index 871d1f77fc4..be1715c8448 100644 --- a/keyboards/gami_studio/lex60/info.json +++ b/keyboards/gami_studio/lex60/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "D1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B7", "F7", "C7", "E6", "C6", "F0", "B6", "F1", "B5", "F4", "B4", "F5", "D7", "F6", "D6"], "rows": ["D5", "D4", "B0", "D2", "D3"] diff --git a/keyboards/gami_studio/lex60/rules.mk b/keyboards/gami_studio/lex60/rules.mk deleted file mode 100644 index f2e6e3b073e..00000000000 --- a/keyboards/gami_studio/lex60/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 = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/keyboard.json similarity index 91% rename from keyboards/geekboards/macropad_v2/info.json rename to keyboards/geekboards/macropad_v2/keyboard.json index cb8c3b81be9..035a83c157d 100644 --- a/keyboards/geekboards/macropad_v2/info.json +++ b/keyboards/geekboards/macropad_v2/keyboard.json @@ -55,6 +55,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "direct": [ ["B13", "B15", "B3", "B5"], diff --git a/keyboards/geekboards/macropad_v2/rules.mk b/keyboards/geekboards/macropad_v2/rules.mk deleted file mode 100644 index c49a369dd02..00000000000 --- a/keyboards/geekboards/macropad_v2/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes - diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/keyboard.json similarity index 92% rename from keyboards/geekboards/tester/info.json rename to keyboards/geekboards/tester/keyboard.json index 03fb6827512..0bd115906d2 100644 --- a/keyboards/geekboards/tester/info.json +++ b/keyboards/geekboards/tester/keyboard.json @@ -52,6 +52,15 @@ }, "driver": "is31fl3731" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F7", "F6", "D2", "D3"], "rows": ["B0", "D4"] diff --git a/keyboards/geekboards/tester/rules.mk b/keyboards/geekboards/tester/rules.mk deleted file mode 100644 index 8ac152f428a..00000000000 --- a/keyboards/geekboards/tester/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/generic_panda/panda65_01/info.json b/keyboards/generic_panda/panda65_01/keyboard.json similarity index 97% rename from keyboards/generic_panda/panda65_01/info.json rename to keyboards/generic_panda/panda65_01/keyboard.json index 8e8b58b5c01..098f3df1c02 100644 --- a/keyboards/generic_panda/panda65_01/info.json +++ b/keyboards/generic_panda/panda65_01/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6501", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["A3", "A10", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A2", "A1", "A0", "F1", "F0", "B10", "B11"], "rows": ["A9", "A8", "B15", "A6", "A4"] diff --git a/keyboards/generic_panda/panda65_01/rules.mk b/keyboards/generic_panda/panda65_01/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/generic_panda/panda65_01/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/genone/eclipse_65/info.json b/keyboards/genone/eclipse_65/keyboard.json similarity index 96% rename from keyboards/genone/eclipse_65/info.json rename to keyboards/genone/eclipse_65/keyboard.json index d97a15616b6..aeb2d8973c8 100644 --- a/keyboards/genone/eclipse_65/info.json +++ b/keyboards/genone/eclipse_65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x2222", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["B3", "B7", "B0", "B1", "B2"] diff --git a/keyboards/genone/eclipse_65/rules.mk b/keyboards/genone/eclipse_65/rules.mk deleted file mode 100644 index 2155cba5650..00000000000 --- a/keyboards/genone/eclipse_65/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keybaord RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/genone/g1_65/info.json b/keyboards/genone/g1_65/keyboard.json similarity index 96% rename from keyboards/genone/g1_65/info.json rename to keyboards/genone/g1_65/keyboard.json index eed4c85ab55..367bdfe7bbb 100644 --- a/keyboards/genone/g1_65/info.json +++ b/keyboards/genone/g1_65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["B3", "B7", "B0", "B1", "B2"] diff --git a/keyboards/genone/g1_65/rules.mk b/keyboards/genone/g1_65/rules.mk deleted file mode 100644 index 2155cba5650..00000000000 --- a/keyboards/genone/g1_65/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keybaord RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ggkeyboards/genesis/hotswap/info.json b/keyboards/ggkeyboards/genesis/hotswap/keyboard.json similarity index 97% rename from keyboards/ggkeyboards/genesis/hotswap/info.json rename to keyboards/ggkeyboards/genesis/hotswap/keyboard.json index 72663cf6d25..5cd4f077168 100644 --- a/keyboards/ggkeyboards/genesis/hotswap/info.json +++ b/keyboards/ggkeyboards/genesis/hotswap/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xD4D3", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C6", "C7"], "rows": ["C5", "C4", "C3", "C2", "C1", "C0"] diff --git a/keyboards/ggkeyboards/genesis/hotswap/rules.mk b/keyboards/ggkeyboards/genesis/hotswap/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/ggkeyboards/genesis/hotswap/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/ggkeyboards/genesis/solder/info.json b/keyboards/ggkeyboards/genesis/solder/keyboard.json similarity index 98% rename from keyboards/ggkeyboards/genesis/solder/info.json rename to keyboards/ggkeyboards/genesis/solder/keyboard.json index 7649b7b04b3..485be430e59 100644 --- a/keyboards/ggkeyboards/genesis/solder/info.json +++ b/keyboards/ggkeyboards/genesis/solder/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xD4D2", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C6", "C7"], "rows": ["C5", "C4", "C3", "C2", "C1", "C0"] diff --git a/keyboards/ggkeyboards/genesis/solder/rules.mk b/keyboards/ggkeyboards/genesis/solder/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/ggkeyboards/genesis/solder/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/gh60/revc/info.json b/keyboards/gh60/revc/keyboard.json similarity index 99% rename from keyboards/gh60/revc/info.json rename to keyboards/gh60/revc/keyboard.json index c8b881841b2..bc30efd02f5 100644 --- a/keyboards/gh60/revc/info.json +++ b/keyboards/gh60/revc/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/gh60/revc/rules.mk b/keyboards/gh60/revc/rules.mk deleted file mode 100644 index 53acbde1062..00000000000 --- a/keyboards/gh60/revc/rules.mk +++ /dev/null @@ -1,10 +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 = yes # Enable N-Key Rollover -# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/keyboard.json similarity index 99% rename from keyboards/gh60/satan/info.json rename to keyboards/gh60/satan/keyboard.json index 53e2b04df65..54e9d42bcd4 100644 --- a/keyboards/gh60/satan/info.json +++ b/keyboards/gh60/satan/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0002", "device_version": "0.0.3" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/gh60/satan/rules.mk b/keyboards/gh60/satan/rules.mk deleted file mode 100644 index 4680ba6e6f0..00000000000 --- a/keyboards/gh60/satan/rules.mk +++ /dev/null @@ -1,12 +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 = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no diff --git a/keyboards/gh60/v1p3/info.json b/keyboards/gh60/v1p3/keyboard.json similarity index 99% rename from keyboards/gh60/v1p3/info.json rename to keyboards/gh60/v1p3/keyboard.json index 0597c2e7a07..18ac7608bb9 100644 --- a/keyboards/gh60/v1p3/info.json +++ b/keyboards/gh60/v1p3/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B4", "B5"], "rows": ["B0", "B1", "B2", "B3", "F7"] diff --git a/keyboards/gh60/v1p3/rules.mk b/keyboards/gh60/v1p3/rules.mk deleted file mode 100644 index 85830d31150..00000000000 --- a/keyboards/gh60/v1p3/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 = 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 diff --git a/keyboards/gh80_3000/info.json b/keyboards/gh80_3000/keyboard.json similarity index 99% rename from keyboards/gh80_3000/info.json rename to keyboards/gh80_3000/keyboard.json index 4d4bca16613..f5f4ba75332 100644 --- a/keyboards/gh80_3000/info.json +++ b/keyboards/gh80_3000/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C7", "C6", "B4", "D7", "B3", "B2", "B0", "E6", "B1", "D1", "D6"], "rows": ["F4", "F1", "F0", "F5", "F6", "F7", "D4", "D5", "D3", "D2", "D0"] diff --git a/keyboards/gh80_3000/rules.mk b/keyboards/gh80_3000/rules.mk deleted file mode 100644 index 51c80ed6cf1..00000000000 --- a/keyboards/gh80_3000/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 = 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 -RGBLIGHT_ENABLE = no diff --git a/keyboards/ghs/rar/info.json b/keyboards/ghs/rar/keyboard.json similarity index 99% rename from keyboards/ghs/rar/info.json rename to keyboards/ghs/rar/keyboard.json index 6bf890b3f8d..e033b08f510 100644 --- a/keyboards/ghs/rar/info.json +++ b/keyboards/ghs/rar/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "D0" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D1"], "rows": ["B0", "B7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"] diff --git a/keyboards/ghs/rar/rules.mk b/keyboards/ghs/rar/rules.mk deleted file mode 100644 index 8288dff3765..00000000000 --- a/keyboards/ghs/rar/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/gizmo_engineering/gk6/info.json b/keyboards/gizmo_engineering/gk6/keyboard.json similarity index 98% rename from keyboards/gizmo_engineering/gk6/info.json rename to keyboards/gizmo_engineering/gk6/keyboard.json index 8a50b365f59..d68b356d9cf 100644 --- a/keyboards/gizmo_engineering/gk6/info.json +++ b/keyboards/gizmo_engineering/gk6/keyboard.json @@ -27,6 +27,15 @@ "react_on_keyup": true, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B5", "C6", "C7", "F7", "F6", "D5", "D3", "D2", "F1", "F4", "B7", "F5"], "rows": ["B6", "B4", "D7", "D6", "D4"] diff --git a/keyboards/gizmo_engineering/gk6/rules.mk b/keyboards/gizmo_engineering/gk6/rules.mk deleted file mode 100755 index c6a142275fd..00000000000 --- a/keyboards/gizmo_engineering/gk6/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 = 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 diff --git a/keyboards/gkeyboard/gkb_m16/info.json b/keyboards/gkeyboard/gkb_m16/keyboard.json similarity index 90% rename from keyboards/gkeyboard/gkb_m16/info.json rename to keyboards/gkeyboard/gkb_m16/keyboard.json index 9d80eba885c..0d4ddbd4c3c 100644 --- a/keyboards/gkeyboard/gkb_m16/info.json +++ b/keyboards/gkeyboard/gkb_m16/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "F1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7"], "rows": ["D4", "D5", "D6", "D7"] diff --git a/keyboards/gkeyboard/gkb_m16/rules.mk b/keyboards/gkeyboard/gkb_m16/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/gkeyboard/gkb_m16/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 = 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/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/keyboard.json similarity index 95% rename from keyboards/gmmk/gmmk2/p65/ansi/info.json rename to keyboards/gmmk/gmmk2/p65/ansi/keyboard.json index 2d2230a3b91..a5c4c92552f 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p65/ansi/keyboard.json @@ -11,6 +11,15 @@ "qmk": { "tap_keycode_delay": 10 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"] diff --git a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk deleted file mode 100644 index 2d2e9895fd8..00000000000 --- a/keyboards/gmmk/gmmk2/p65/ansi/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. -CONSOLE_ENABLE = no # Console for debug. -COMMAND_ENABLE = no # Commands for debug and configuration. -NKRO_ENABLE = yes # Enable NKRO Rollover. -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality. -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow. -AUDIO_ENABLE = no # Audio output. -RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects. diff --git a/keyboards/gmmk/gmmk2/p65/iso/info.json b/keyboards/gmmk/gmmk2/p65/iso/keyboard.json similarity index 95% rename from keyboards/gmmk/gmmk2/p65/iso/info.json rename to keyboards/gmmk/gmmk2/p65/iso/keyboard.json index aa31b50f612..a4576c8c7f1 100644 --- a/keyboards/gmmk/gmmk2/p65/iso/info.json +++ b/keyboards/gmmk/gmmk2/p65/iso/keyboard.json @@ -11,6 +11,15 @@ "qmk": { "tap_keycode_delay": 10 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"] diff --git a/keyboards/gmmk/gmmk2/p65/iso/rules.mk b/keyboards/gmmk/gmmk2/p65/iso/rules.mk deleted file mode 100644 index 2d2e9895fd8..00000000000 --- a/keyboards/gmmk/gmmk2/p65/iso/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. -CONSOLE_ENABLE = no # Console for debug. -COMMAND_ENABLE = no # Commands for debug and configuration. -NKRO_ENABLE = yes # Enable NKRO Rollover. -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality. -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow. -AUDIO_ENABLE = no # Audio output. -RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects. diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/keyboard.json similarity index 97% rename from keyboards/gmmk/gmmk2/p96/ansi/info.json rename to keyboards/gmmk/gmmk2/p96/ansi/keyboard.json index d7e0e38ceb1..8fd81ba1a08 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p96/ansi/keyboard.json @@ -11,6 +11,15 @@ "qmk": { "tap_keycode_delay": 10 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"] diff --git a/keyboards/gmmk/gmmk2/p96/ansi/rules.mk b/keyboards/gmmk/gmmk2/p96/ansi/rules.mk deleted file mode 100644 index 2d2e9895fd8..00000000000 --- a/keyboards/gmmk/gmmk2/p96/ansi/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. -CONSOLE_ENABLE = no # Console for debug. -COMMAND_ENABLE = no # Commands for debug and configuration. -NKRO_ENABLE = yes # Enable NKRO Rollover. -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality. -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow. -AUDIO_ENABLE = no # Audio output. -RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects. diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/keyboard.json similarity index 97% rename from keyboards/gmmk/gmmk2/p96/iso/info.json rename to keyboards/gmmk/gmmk2/p96/iso/keyboard.json index c5079a22dd6..040b6f9c6fc 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/info.json +++ b/keyboards/gmmk/gmmk2/p96/iso/keyboard.json @@ -11,6 +11,15 @@ "qmk": { "tap_keycode_delay": 10 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"] diff --git a/keyboards/gmmk/gmmk2/p96/iso/rules.mk b/keyboards/gmmk/gmmk2/p96/iso/rules.mk deleted file mode 100644 index 2d2e9895fd8..00000000000 --- a/keyboards/gmmk/gmmk2/p96/iso/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. -CONSOLE_ENABLE = no # Console for debug. -COMMAND_ENABLE = no # Commands for debug and configuration. -NKRO_ENABLE = yes # Enable NKRO Rollover. -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality. -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow. -AUDIO_ENABLE = no # Audio output. -RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects. diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/keyboard.json similarity index 96% rename from keyboards/gmmk/pro/rev1/ansi/info.json rename to keyboards/gmmk/pro/rev1/ansi/keyboard.json index 533a3796568..867f7e1d027 100644 --- a/keyboards/gmmk/pro/rev1/ansi/info.json +++ b/keyboards/gmmk/pro/rev1/ansi/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x5044", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] diff --git a/keyboards/gmmk/pro/rev1/ansi/rules.mk b/keyboards/gmmk/pro/rev1/ansi/rules.mk deleted file mode 100644 index 6d23fe350a4..00000000000 --- a/keyboards/gmmk/pro/rev1/ansi/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/keyboard.json similarity index 96% rename from keyboards/gmmk/pro/rev1/iso/info.json rename to keyboards/gmmk/pro/rev1/iso/keyboard.json index 90f66171aa4..6eabec96feb 100644 --- a/keyboards/gmmk/pro/rev1/iso/info.json +++ b/keyboards/gmmk/pro/rev1/iso/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x5044", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] diff --git a/keyboards/gmmk/pro/rev1/iso/rules.mk b/keyboards/gmmk/pro/rev1/iso/rules.mk deleted file mode 100644 index 6d23fe350a4..00000000000 --- a/keyboards/gmmk/pro/rev1/iso/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/keyboard.json similarity index 96% rename from keyboards/gmmk/pro/rev2/ansi/info.json rename to keyboards/gmmk/pro/rev2/ansi/keyboard.json index 56150443166..21bc7df7fb3 100644 --- a/keyboards/gmmk/pro/rev2/ansi/info.json +++ b/keyboards/gmmk/pro/rev2/ansi/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] diff --git a/keyboards/gmmk/pro/rev2/ansi/rules.mk b/keyboards/gmmk/pro/rev2/ansi/rules.mk deleted file mode 100644 index 6d23fe350a4..00000000000 --- a/keyboards/gmmk/pro/rev2/ansi/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/keyboard.json similarity index 96% rename from keyboards/gmmk/pro/rev2/iso/info.json rename to keyboards/gmmk/pro/rev2/iso/keyboard.json index 3b7c0ca5445..83d1fd30284 100644 --- a/keyboards/gmmk/pro/rev2/iso/info.json +++ b/keyboards/gmmk/pro/rev2/iso/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] diff --git a/keyboards/gmmk/pro/rev2/iso/rules.mk b/keyboards/gmmk/pro/rev2/iso/rules.mk deleted file mode 100644 index 46eda64be72..00000000000 --- a/keyboards/gmmk/pro/rev2/iso/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/gorthage_truck/info.json b/keyboards/gorthage_truck/keyboard.json similarity index 98% rename from keyboards/gorthage_truck/info.json rename to keyboards/gorthage_truck/keyboard.json index 688a8fc575b..1a0a364f967 100644 --- a/keyboards/gorthage_truck/info.json +++ b/keyboards/gorthage_truck/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x58E4", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F7", "D6", "E6", "B0", "B1", "B2"], "rows": ["C6", "B6", "B5", "B4", "C7", "B3", "B7", "D7"] diff --git a/keyboards/gorthage_truck/rules.mk b/keyboards/gorthage_truck/rules.mk deleted file mode 100644 index 453f0a34d38..00000000000 --- a/keyboards/gorthage_truck/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes diff --git a/keyboards/gowla/info.json b/keyboards/gowla/keyboard.json similarity index 85% rename from keyboards/gowla/info.json rename to keyboards/gowla/keyboard.json index 680ee27e597..0f64cad79bb 100644 --- a/keyboards/gowla/info.json +++ b/keyboards/gowla/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xE9B6", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "B4", "E6"], "rows": ["D1", "D0", "D4"] diff --git a/keyboards/gowla/rules.mk b/keyboards/gowla/rules.mk deleted file mode 100644 index 84ab7f32b2b..00000000000 --- a/keyboards/gowla/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 = 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 diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/keyboard.json similarity index 97% rename from keyboards/gray_studio/aero75/info.json rename to keyboards/gray_studio/aero75/keyboard.json index f6de1b9f966..4119aff5b6e 100644 --- a/keyboards/gray_studio/aero75/info.json +++ b/keyboards/gray_studio/aero75/keyboard.json @@ -37,6 +37,15 @@ "override_rgb": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B1", "A8", "B15", "B14", "B13"], "rows": ["A7", "A6", "B12", "A2", "A1", "A0"] diff --git a/keyboards/gray_studio/aero75/rules.mk b/keyboards/gray_studio/aero75/rules.mk deleted file mode 100644 index 4a544448674..00000000000 --- a/keyboards/gray_studio/aero75/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/keyboard.json similarity index 97% rename from keyboards/gray_studio/apollo80/info.json rename to keyboards/gray_studio/apollo80/keyboard.json index 21fa7c72d25..f3425aa20dd 100644 --- a/keyboards/gray_studio/apollo80/info.json +++ b/keyboards/gray_studio/apollo80/keyboard.json @@ -33,6 +33,15 @@ "animation": "rainbow_mood" } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"], "rows": ["D1", "D0", "B3", "B0", "B2", "B1"] diff --git a/keyboards/gray_studio/apollo80/rules.mk b/keyboards/gray_studio/apollo80/rules.mk deleted file mode 100644 index bb40a3ee66c..00000000000 --- a/keyboards/gray_studio/apollo80/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 = 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 \ No newline at end of file diff --git a/keyboards/gray_studio/hb85/info.json b/keyboards/gray_studio/hb85/keyboard.json similarity index 98% rename from keyboards/gray_studio/hb85/info.json rename to keyboards/gray_studio/hb85/keyboard.json index c0bd4749c14..61387a27094 100644 --- a/keyboards/gray_studio/hb85/info.json +++ b/keyboards/gray_studio/hb85/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x2000", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/gray_studio/hb85/rules.mk b/keyboards/gray_studio/hb85/rules.mk deleted file mode 100644 index 51df0b642e1..00000000000 --- a/keyboards/gray_studio/hb85/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/gray_studio/space65/info.json b/keyboards/gray_studio/space65/keyboard.json similarity index 98% rename from keyboards/gray_studio/space65/info.json rename to keyboards/gray_studio/space65/keyboard.json index db7c2f3b68b..7d5270d0da6 100644 --- a/keyboards/gray_studio/space65/info.json +++ b/keyboards/gray_studio/space65/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x3000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B0", "B3", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["D0", "D1", "F0", "F4", "F1"] diff --git a/keyboards/gray_studio/space65/rules.mk b/keyboards/gray_studio/space65/rules.mk deleted file mode 100644 index 0922d3d5112..00000000000 --- a/keyboards/gray_studio/space65/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 = 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 diff --git a/keyboards/gray_studio/space65r3/info.json b/keyboards/gray_studio/space65r3/keyboard.json similarity index 98% rename from keyboards/gray_studio/space65r3/info.json rename to keyboards/gray_studio/space65r3/keyboard.json index 7e559ab3fa8..5895a591944 100644 --- a/keyboards/gray_studio/space65r3/info.json +++ b/keyboards/gray_studio/space65r3/keyboard.json @@ -37,6 +37,15 @@ "override_rgb": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B0", "A8", "B15", "B14", "B13"], "rows": ["A6", "B12", "A2", "A0", "A1"] diff --git a/keyboards/gray_studio/space65r3/rules.mk b/keyboards/gray_studio/space65r3/rules.mk deleted file mode 100644 index edf9d72c6e6..00000000000 --- a/keyboards/gray_studio/space65r3/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -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 # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output on port C6 diff --git a/keyboards/grid600/press/info.json b/keyboards/grid600/press/keyboard.json similarity index 85% rename from keyboards/grid600/press/info.json rename to keyboards/grid600/press/keyboard.json index e808036385d..df8f857afeb 100644 --- a/keyboards/grid600/press/info.json +++ b/keyboards/grid600/press/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x7539", "device_version": "0.0.5" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6"], "rows": ["F0"] diff --git a/keyboards/grid600/press/rules.mk b/keyboards/grid600/press/rules.mk deleted file mode 100644 index cae8f12b1b7..00000000000 --- a/keyboards/grid600/press/rules.mk +++ /dev/null @@ -1,12 +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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/h0oni/deskpad/info.json b/keyboards/h0oni/deskpad/keyboard.json similarity index 82% rename from keyboards/h0oni/deskpad/info.json rename to keyboards/h0oni/deskpad/keyboard.json index e51aa7e7dfc..471d101693b 100644 --- a/keyboards/h0oni/deskpad/info.json +++ b/keyboards/h0oni/deskpad/keyboard.json @@ -11,6 +11,15 @@ "tapping": { "term": 250 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D4", "D1"], "rows": ["D7", "C6"] diff --git a/keyboards/h0oni/deskpad/rules.mk b/keyboards/h0oni/deskpad/rules.mk deleted file mode 100644 index 3f362330c96..00000000000 --- a/keyboards/h0oni/deskpad/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 -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 -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/h0oni/hotduck/info.json b/keyboards/h0oni/hotduck/keyboard.json similarity index 96% rename from keyboards/h0oni/hotduck/info.json rename to keyboards/h0oni/hotduck/keyboard.json index 939d1ec262b..c034e7a3a48 100644 --- a/keyboards/h0oni/hotduck/info.json +++ b/keyboards/h0oni/hotduck/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6844", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5"] diff --git a/keyboards/h0oni/hotduck/rules.mk b/keyboards/h0oni/hotduck/rules.mk deleted file mode 100644 index bb40a3ee66c..00000000000 --- a/keyboards/h0oni/hotduck/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 = 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 \ No newline at end of file diff --git a/keyboards/halokeys/elemental75/info.json b/keyboards/halokeys/elemental75/keyboard.json similarity index 96% rename from keyboards/halokeys/elemental75/info.json rename to keyboards/halokeys/elemental75/keyboard.json index 1ee23d967ba..ccb1de12b68 100644 --- a/keyboards/halokeys/elemental75/info.json +++ b/keyboards/halokeys/elemental75/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xEA75", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B2", "B1", "B0", "B10", "B11", "B13", "B14", "B15", "A8", "A9", "A14", "A15", "B3", "B4", "B7"], "rows": ["A2", "A3", "A4", "A5", "A6", "A7"] diff --git a/keyboards/halokeys/elemental75/rules.mk b/keyboards/halokeys/elemental75/rules.mk deleted file mode 100644 index c5c4d8f35f1..00000000000 --- a/keyboards/halokeys/elemental75/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/han60/info.json b/keyboards/han60/keyboard.json similarity index 99% rename from keyboards/han60/info.json rename to keyboards/han60/keyboard.json index 0373a5e6588..d1dcff6baf6 100644 --- a/keyboards/han60/info.json +++ b/keyboards/han60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xFB60", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D5", "D3", "D2", "D1", "D0"] diff --git a/keyboards/han60/rules.mk b/keyboards/han60/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/han60/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 = 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/2x5keypad/info.json b/keyboards/handwired/2x5keypad/keyboard.json similarity index 85% rename from keyboards/handwired/2x5keypad/info.json rename to keyboards/handwired/2x5keypad/keyboard.json index b33273e19db..8b492c6fe6c 100644 --- a/keyboards/handwired/2x5keypad/info.json +++ b/keyboards/handwired/2x5keypad/keyboard.json @@ -11,6 +11,14 @@ "tapping": { "term": 250 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4"], "rows": ["B3", "B2"] diff --git a/keyboards/handwired/2x5keypad/rules.mk b/keyboards/handwired/2x5keypad/rules.mk deleted file mode 100644 index 81d4ba4f3b5..00000000000 --- a/keyboards/handwired/2x5keypad/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -AUDIO_ENABLE = no -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -COMMAND_ENABLE = no # Commands for debug and configuration -CONSOLE_ENABLE= no # Console for debug -EXTRAKEY_ENABLE = yes # Audio control and System control -MOUSEKEY_ENABLE = yes # Mouse keys -NKRO_ENABLE = yes # Enable N-Key Rollover - -RGBLIGHT_ENABLE = no diff --git a/keyboards/handwired/3dfoxc/info.json b/keyboards/handwired/3dfoxc/keyboard.json similarity index 96% rename from keyboards/handwired/3dfoxc/info.json rename to keyboards/handwired/3dfoxc/keyboard.json index c1fec23580e..7675acd73b1 100644 --- a/keyboards/handwired/3dfoxc/info.json +++ b/keyboards/handwired/3dfoxc/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["F0", "F1", "C7", "D5", "B7"] diff --git a/keyboards/handwired/3dfoxc/rules.mk b/keyboards/handwired/3dfoxc/rules.mk deleted file mode 100644 index c6b71a4aaa6..00000000000 --- a/keyboards/handwired/3dfoxc/rules.mk +++ /dev/null @@ -1,12 +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 = 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 diff --git a/keyboards/handwired/412_64/info.json b/keyboards/handwired/412_64/keyboard.json similarity index 95% rename from keyboards/handwired/412_64/info.json rename to keyboards/handwired/412_64/keyboard.json index 0468744b1bf..736c1886bbb 100644 --- a/keyboards/handwired/412_64/info.json +++ b/keyboards/handwired/412_64/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0412", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "D2", "D0", "D1", "D4", "C6", "D7", "E6"], "rows": ["D3", "F4", "F5", "F6", "F7", "B1", "B3", "B2"] diff --git a/keyboards/handwired/412_64/rules.mk b/keyboards/handwired/412_64/rules.mk deleted file mode 100644 index 0ad8161240c..00000000000 --- a/keyboards/handwired/412_64/rules.mk +++ /dev/null @@ -1,11 +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 -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/6key/info.json b/keyboards/handwired/6key/keyboard.json similarity index 80% rename from keyboards/handwired/6key/info.json rename to keyboards/handwired/6key/keyboard.json index 8e33a60e2e8..7883c1e7840 100644 --- a/keyboards/handwired/6key/info.json +++ b/keyboards/handwired/6key/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1"], "rows": ["B4", "D0"] diff --git a/keyboards/handwired/6key/rules.mk b/keyboards/handwired/6key/rules.mk deleted file mode 100644 index 64e4af7ab76..00000000000 --- a/keyboards/handwired/6key/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 -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 -DIP_SWITCH_ENABLE = yes diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/keyboard.json similarity index 84% rename from keyboards/handwired/6macro/info.json rename to keyboards/handwired/6macro/keyboard.json index 63dc42e7db6..702008de344 100644 --- a/keyboards/handwired/6macro/info.json +++ b/keyboards/handwired/6macro/keyboard.json @@ -26,6 +26,16 @@ "rgb_matrix": { "driver": "ws2812" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "unicode": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2"], "rows": ["B3", "B4"] diff --git a/keyboards/handwired/6macro/rules.mk b/keyboards/handwired/6macro/rules.mk deleted file mode 100644 index 083cc21a34a..00000000000 --- a/keyboards/handwired/6macro/rules.mk +++ /dev/null @@ -1,14 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -RGB_MATRIX_ENABLE = no # Enable per-key coordinate based RGB effects. Do not enable with RGBlight -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -UNICODE_ENABLE = yes # Unicode -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/aek64/info.json b/keyboards/handwired/aek64/keyboard.json similarity index 94% rename from keyboards/handwired/aek64/info.json rename to keyboards/handwired/aek64/keyboard.json index e71156e9882..a06ed6deccb 100644 --- a/keyboards/handwired/aek64/info.json +++ b/keyboards/handwired/aek64/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["F0", "E6", "E7", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "D3", "D0", "D1", "D2"], "rows": ["E0", "E1", "C0", "C1", "C2"] diff --git a/keyboards/handwired/aek64/rules.mk b/keyboards/handwired/aek64/rules.mk deleted file mode 100644 index 1295dc41baf..00000000000 --- a/keyboards/handwired/aek64/rules.mk +++ /dev/null @@ -1,11 +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 -UNICODE_ENABLE = yes # Enable support for arrow keys icon on the second layer. -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes diff --git a/keyboards/handwired/aim65/info.json b/keyboards/handwired/aim65/keyboard.json similarity index 95% rename from keyboards/handwired/aim65/info.json rename to keyboards/handwired/aim65/keyboard.json index e7c363794fe..3f026a91fa3 100644 --- a/keyboards/handwired/aim65/info.json +++ b/keyboards/handwired/aim65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0F34", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "C6", "B6", "B2", "F7", "F6", "F5", "F4"], "rows": ["D0", "D4", "D7", "E6", "B4", "B5", "B3", "B1"] diff --git a/keyboards/handwired/aim65/rules.mk b/keyboards/handwired/aim65/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/aim65/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 = 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/amigopunk/info.json b/keyboards/handwired/amigopunk/keyboard.json similarity index 95% rename from keyboards/handwired/amigopunk/info.json rename to keyboards/handwired/amigopunk/keyboard.json index 301c358140d..d9ef295a4f3 100644 --- a/keyboards/handwired/amigopunk/info.json +++ b/keyboards/handwired/amigopunk/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x1805", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true + }, "matrix_pins": { "cols": ["B6", "B5", "B4", "B3", "B2", "B1", "B0", "E7", "E6", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"], "rows": ["C0", "C1", "C2", "C3", "C4", "C5"] diff --git a/keyboards/handwired/amigopunk/rules.mk b/keyboards/handwired/amigopunk/rules.mk deleted file mode 100644 index 9c75f75d52d..00000000000 --- a/keyboards/handwired/amigopunk/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/handwired/angel/info.json b/keyboards/handwired/angel/keyboard.json similarity index 94% rename from keyboards/handwired/angel/info.json rename to keyboards/handwired/angel/keyboard.json index 10916016cfc..6a4b40bb214 100644 --- a/keyboards/handwired/angel/info.json +++ b/keyboards/handwired/angel/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0805", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B3", "B1", "F7", "F6", "F5"], "rows": ["B6", "B2", "B5", "B4"] diff --git a/keyboards/handwired/angel/rules.mk b/keyboards/handwired/angel/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/handwired/angel/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 = 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/aplx2/info.json b/keyboards/handwired/aplx2/keyboard.json similarity index 76% rename from keyboards/handwired/aplx2/info.json rename to keyboards/handwired/aplx2/keyboard.json index d3f7962fe7c..6a9d7130bda 100644 --- a/keyboards/handwired/aplx2/info.json +++ b/keyboards/handwired/aplx2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0030", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "D3"], "rows": ["D1"] diff --git a/keyboards/handwired/aplx2/rules.mk b/keyboards/handwired/aplx2/rules.mk deleted file mode 100644 index 3e66b069b36..00000000000 --- a/keyboards/handwired/aplx2/rules.mk +++ /dev/null @@ -1,12 +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 -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/aranck/info.json b/keyboards/handwired/aranck/keyboard.json similarity index 93% rename from keyboards/handwired/aranck/info.json rename to keyboards/handwired/aranck/keyboard.json index d7bf45b8848..ddd72b0e654 100644 --- a/keyboards/handwired/aranck/info.json +++ b/keyboards/handwired/aranck/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "audio": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0"] diff --git a/keyboards/handwired/aranck/rules.mk b/keyboards/handwired/aranck/rules.mk deleted file mode 100644 index 63666f07d75..00000000000 --- a/keyboards/handwired/aranck/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 = 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 = yes # Audio output diff --git a/keyboards/handwired/arrow_pad/info.json b/keyboards/handwired/arrow_pad/keyboard.json similarity index 90% rename from keyboards/handwired/arrow_pad/info.json rename to keyboards/handwired/arrow_pad/keyboard.json index 79016d5d21e..237c1f0749c 100644 --- a/keyboards/handwired/arrow_pad/info.json +++ b/keyboards/handwired/arrow_pad/keyboard.json @@ -9,6 +9,15 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/handwired/arrow_pad/rules.mk b/keyboards/handwired/arrow_pad/rules.mk deleted file mode 100644 index df4dea661be..00000000000 --- a/keyboards/handwired/arrow_pad/rules.mk +++ /dev/null @@ -1,11 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/atreus50/info.json b/keyboards/handwired/atreus50/keyboard.json similarity index 95% rename from keyboards/handwired/atreus50/info.json rename to keyboards/handwired/atreus50/keyboard.json index 3df8e9f7bb1..dc62d3e849e 100644 --- a/keyboards/handwired/atreus50/info.json +++ b/keyboards/handwired/atreus50/keyboard.json @@ -27,6 +27,14 @@ "ws2812": { "pin": "C6" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0"] diff --git a/keyboards/handwired/atreus50/rules.mk b/keyboards/handwired/atreus50/rules.mk deleted file mode 100644 index d9e13747733..00000000000 --- a/keyboards/handwired/atreus50/rules.mk +++ /dev/null @@ -1,12 +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 -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/handwired/axon/info.json b/keyboards/handwired/axon/keyboard.json similarity index 98% rename from keyboards/handwired/axon/info.json rename to keyboards/handwired/axon/keyboard.json index 0d12e92dbe4..fe7818d97f0 100644 --- a/keyboards/handwired/axon/info.json +++ b/keyboards/handwired/axon/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "D7", "B1", "B2", "C0", "C1", "C2", "C3", "C4", "C5", "D1"], "rows": ["D5", "D6", "D4", "D0"] diff --git a/keyboards/handwired/axon/rules.mk b/keyboards/handwired/axon/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/axon/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 = 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/bigmac/info.json b/keyboards/handwired/bigmac/keyboard.json similarity index 96% rename from keyboards/handwired/bigmac/info.json rename to keyboards/handwired/bigmac/keyboard.json index 2481a63db5f..8eff62a7eaa 100644 --- a/keyboards/handwired/bigmac/info.json +++ b/keyboards/handwired/bigmac/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1010", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"], "rows": ["F0", "F1", "C7", "D5", "B7"] diff --git a/keyboards/handwired/bigmac/rules.mk b/keyboards/handwired/bigmac/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/handwired/bigmac/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/bolek/info.json b/keyboards/handwired/bolek/keyboard.json similarity index 93% rename from keyboards/handwired/bolek/info.json rename to keyboards/handwired/bolek/keyboard.json index e8cf3c82db3..a966044ebe8 100644 --- a/keyboards/handwired/bolek/info.json +++ b/keyboards/handwired/bolek/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3708", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "E6", "D7", "C6", "D0", "D4"], "rows": ["F4", "F5", "F6", "B5", "D3", "D2", "D1", "B4"] diff --git a/keyboards/handwired/bolek/rules.mk b/keyboards/handwired/bolek/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/bolek/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 = 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/boss566y/redragon_vara/info.json b/keyboards/handwired/boss566y/redragon_vara/keyboard.json similarity index 97% rename from keyboards/handwired/boss566y/redragon_vara/info.json rename to keyboards/handwired/boss566y/redragon_vara/keyboard.json index a4d0b11b58b..b75caa6544f 100644 --- a/keyboards/handwired/boss566y/redragon_vara/info.json +++ b/keyboards/handwired/boss566y/redragon_vara/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "C6", "D5", "C7", "D4", "D7", "B4", "B5", "B6"], "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/handwired/boss566y/redragon_vara/rules.mk b/keyboards/handwired/boss566y/redragon_vara/rules.mk deleted file mode 100644 index 42dce570241..00000000000 --- a/keyboards/handwired/boss566y/redragon_vara/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 = 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/bstk100/info.json b/keyboards/handwired/bstk100/keyboard.json similarity index 90% rename from keyboards/handwired/bstk100/info.json rename to keyboards/handwired/bstk100/keyboard.json index 257203511ae..b4f036631db 100644 --- a/keyboards/handwired/bstk100/info.json +++ b/keyboards/handwired/bstk100/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xB100", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6"], "rows": ["B6", "B2", "B3", "B1", "F7"] diff --git a/keyboards/handwired/bstk100/rules.mk b/keyboards/handwired/bstk100/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/bstk100/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 = 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/cans12er/info.json b/keyboards/handwired/cans12er/keyboard.json similarity index 86% rename from keyboards/handwired/cans12er/info.json rename to keyboards/handwired/cans12er/keyboard.json index c51fad15eeb..058f8a98b16 100644 --- a/keyboards/handwired/cans12er/info.json +++ b/keyboards/handwired/cans12er/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D4", "C6", "D7"], "rows": ["F7", "B1", "B3"] diff --git a/keyboards/handwired/cans12er/rules.mk b/keyboards/handwired/cans12er/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/handwired/cans12er/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 = 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/carpolly/info.json b/keyboards/handwired/carpolly/keyboard.json similarity index 94% rename from keyboards/handwired/carpolly/info.json rename to keyboards/handwired/carpolly/keyboard.json index a0f28d3eebb..c727e801810 100644 --- a/keyboards/handwired/carpolly/info.json +++ b/keyboards/handwired/carpolly/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0017", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "C7"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/handwired/carpolly/rules.mk b/keyboards/handwired/carpolly/rules.mk deleted file mode 100644 index c71e41438f5..00000000000 --- a/keyboards/handwired/carpolly/rules.mk +++ /dev/null @@ -1,15 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# generated by KBFirmware JSON to QMK Parser -# https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/cmd60/info.json b/keyboards/handwired/cmd60/keyboard.json similarity index 95% rename from keyboards/handwired/cmd60/info.json rename to keyboards/handwired/cmd60/keyboard.json index 7236fc79615..4ac953e560a 100644 --- a/keyboards/handwired/cmd60/info.json +++ b/keyboards/handwired/cmd60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "C6", "D7", "B4", "B5", "B6"], "rows": ["F0", "F4", "F5", "F6", "F7"] diff --git a/keyboards/handwired/cmd60/rules.mk b/keyboards/handwired/cmd60/rules.mk deleted file mode 100644 index b6e2a5f9a41..00000000000 --- a/keyboards/handwired/cmd60/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/handwired/co60/rev1/info.json b/keyboards/handwired/co60/rev1/keyboard.json similarity index 99% rename from keyboards/handwired/co60/rev1/info.json rename to keyboards/handwired/co60/rev1/keyboard.json index 3676b624b1a..1bf60673fb9 100644 --- a/keyboards/handwired/co60/rev1/info.json +++ b/keyboards/handwired/co60/rev1/keyboard.json @@ -3,6 +3,16 @@ "usb": { "device_version": "1.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "leader": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B2", "B5", "B4", "D7", "D6", "B3", "B0"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/handwired/co60/rev1/rules.mk b/keyboards/handwired/co60/rev1/rules.mk deleted file mode 100644 index 3d0b53a5dd4..00000000000 --- a/keyboards/handwired/co60/rev1/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 = 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 # Audio output -LEADER_ENABLE = yes # Turn on leader support diff --git a/keyboards/handwired/co60/rev6/info.json b/keyboards/handwired/co60/rev6/keyboard.json similarity index 99% rename from keyboards/handwired/co60/rev6/info.json rename to keyboards/handwired/co60/rev6/keyboard.json index d51d450803d..e772f0ba425 100644 --- a/keyboards/handwired/co60/rev6/info.json +++ b/keyboards/handwired/co60/rev6/keyboard.json @@ -3,6 +3,16 @@ "usb": { "device_version": "6.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "leader": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A2", "A3", "A6", "B14", "B15", "A8", "A9", "A7", "B3", "B4", "C14", "C15", "C13", "B5", "B6"], "rows": ["B0", "B1", "B2", "A15", "A10"] diff --git a/keyboards/handwired/co60/rev6/rules.mk b/keyboards/handwired/co60/rev6/rules.mk deleted file mode 100644 index ca3fc91ea5a..00000000000 --- a/keyboards/handwired/co60/rev6/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = yes -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 = yes # Enable N-Key Rollover -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality -LEADER_ENABLE = yes diff --git a/keyboards/handwired/co60/rev7/info.json b/keyboards/handwired/co60/rev7/keyboard.json similarity index 99% rename from keyboards/handwired/co60/rev7/info.json rename to keyboards/handwired/co60/rev7/keyboard.json index 0fb11d04181..967c673d39c 100644 --- a/keyboards/handwired/co60/rev7/info.json +++ b/keyboards/handwired/co60/rev7/keyboard.json @@ -3,6 +3,17 @@ "usb": { "device_version": "7.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "leader": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A10", "A9", "A3", "A4", "A5", "A6", "B0", "B1", "A15", "B3", "B4", "B5", "C13", "C14", "C15"], "rows": ["A8", "A2", "B13", "B2", "B10"] diff --git a/keyboards/handwired/co60/rev7/rules.mk b/keyboards/handwired/co60/rev7/rules.mk deleted file mode 100644 index 3d43c0cadbe..00000000000 --- a/keyboards/handwired/co60/rev7/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = yes -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 = yes # Enable N-Key Rollover -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality -LEADER_ENABLE = yes diff --git a/keyboards/handwired/concertina/64key/info.json b/keyboards/handwired/concertina/64key/keyboard.json similarity index 95% rename from keyboards/handwired/concertina/64key/info.json rename to keyboards/handwired/concertina/64key/keyboard.json index 2786c334519..71719c8505f 100644 --- a/keyboards/handwired/concertina/64key/info.json +++ b/keyboards/handwired/concertina/64key/keyboard.json @@ -14,6 +14,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/concertina/64key/rules.mk b/keyboards/handwired/concertina/64key/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/concertina/64key/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 = 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/croxsplit44/info.json b/keyboards/handwired/croxsplit44/keyboard.json similarity index 94% rename from keyboards/handwired/croxsplit44/info.json rename to keyboards/handwired/croxsplit44/keyboard.json index c788072d920..d497942b953 100644 --- a/keyboards/handwired/croxsplit44/info.json +++ b/keyboards/handwired/croxsplit44/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "C4" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B6", "B5", "B4", "D2", "C0", "C1", "F5", "F4", "F3", "F2", "F1", "F0"], "rows": ["D4", "D5", "D6", "D7"] diff --git a/keyboards/handwired/croxsplit44/rules.mk b/keyboards/handwired/croxsplit44/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/handwired/croxsplit44/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/dactyl_left/info.json b/keyboards/handwired/dactyl_left/keyboard.json similarity index 93% rename from keyboards/handwired/dactyl_left/info.json rename to keyboards/handwired/dactyl_left/keyboard.json index d05e3a5d79a..ba374c87a34 100644 --- a/keyboards/handwired/dactyl_left/info.json +++ b/keyboards/handwired/dactyl_left/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D0", "B7", "B3", "B2", "B1", "B0"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/handwired/dactyl_left/rules.mk b/keyboards/handwired/dactyl_left/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/handwired/dactyl_left/rules.mk +++ /dev/null @@ -1,12 +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 -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/daishi/info.json b/keyboards/handwired/daishi/keyboard.json similarity index 97% rename from keyboards/handwired/daishi/info.json rename to keyboards/handwired/daishi/keyboard.json index 6b6508eb83b..22044faab3c 100644 --- a/keyboards/handwired/daishi/info.json +++ b/keyboards/handwired/daishi/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": true, + "dynamic_macro": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["E6", "E7", "E3", "B0", "B1", "B2", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7", "F6", "F5", "F4", "F3"], "rows": ["D6", "D7", "E0", "E1", "C0", "C1", "C2"] diff --git a/keyboards/handwired/daishi/rules.mk b/keyboards/handwired/daishi/rules.mk deleted file mode 100644 index 41a36f4cca9..00000000000 --- a/keyboards/handwired/daishi/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -ENCODER_ENABLE = yes # Add rotary encoder support -DYNAMIC_MACRO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/handwired/dc/mc/001/info.json b/keyboards/handwired/dc/mc/001/keyboard.json similarity index 82% rename from keyboards/handwired/dc/mc/001/info.json rename to keyboards/handwired/dc/mc/001/keyboard.json index 404cf2e45dc..c91df1ca8bc 100644 --- a/keyboards/handwired/dc/mc/001/info.json +++ b/keyboards/handwired/dc/mc/001/keyboard.json @@ -19,6 +19,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "direct": [ ["B4", "B0", "B1", "B2", "B3"] diff --git a/keyboards/handwired/dc/mc/001/rules.mk b/keyboards/handwired/dc/mc/001/rules.mk deleted file mode 100644 index c94a511d8be..00000000000 --- a/keyboards/handwired/dc/mc/001/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -EXTRAKEY_ENABLE = yes # Audio control and System control -ENCODER_ENABLE = yes # Using a rotary encoder for volume control -MOUSEKEY_ENABLE = no # Mouse keys -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/ddg_56/info.json b/keyboards/handwired/ddg_56/keyboard.json similarity index 96% rename from keyboards/handwired/ddg_56/info.json rename to keyboards/handwired/ddg_56/keyboard.json index a077e7925df..e211821dae5 100644 --- a/keyboards/handwired/ddg_56/info.json +++ b/keyboards/handwired/ddg_56/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xB195", "device_version": "0.0.1" }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["A2", "B8", "B13", "B14", "B4", "B11", "B12", "A13", "A15", "A8", "A7", "A6", "B0", "B1"], "rows": ["B5", "B15", "B9", "B10", "A14"] diff --git a/keyboards/handwired/ddg_56/rules.mk b/keyboards/handwired/ddg_56/rules.mk deleted file mode 100644 index 93900acf532..00000000000 --- a/keyboards/handwired/ddg_56/rules.mk +++ /dev/null @@ -1,11 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = yes # Audio output diff --git a/keyboards/handwired/eagleii/info.json b/keyboards/handwired/eagleii/keyboard.json similarity index 96% rename from keyboards/handwired/eagleii/info.json rename to keyboards/handwired/eagleii/keyboard.json index 7e40afdedd2..4179a4cdd62 100644 --- a/keyboards/handwired/eagleii/info.json +++ b/keyboards/handwired/eagleii/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x9789", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D2", "C6", "E6", "D5", "B3", "D3", "D1", "C7", "F0", "B6", "B1", "F4"], "rows": ["D0", "B5", "F1", "B2", "F7", "F6", "D4", "D7", "B4", "B7", "F5", "B0"] diff --git a/keyboards/handwired/eagleii/rules.mk b/keyboards/handwired/eagleii/rules.mk deleted file mode 100644 index 694c2ccd384..00000000000 --- a/keyboards/handwired/eagleii/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 -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = no -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no diff --git a/keyboards/handwired/ergocheap/info.json b/keyboards/handwired/ergocheap/keyboard.json similarity index 95% rename from keyboards/handwired/ergocheap/info.json rename to keyboards/handwired/ergocheap/keyboard.json index 17d78632377..72be536d64b 100644 --- a/keyboards/handwired/ergocheap/info.json +++ b/keyboards/handwired/ergocheap/keyboard.json @@ -11,6 +11,15 @@ "tapping": { "term": 500 }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["A8", "A9", "B14", "B12", "B13", "B15", "B3", "B11", "A4", "A5", "A6", "A7", "B0", "B1", "B10"], "rows": ["B5", "B6", "B7", "B9", "B8"] diff --git a/keyboards/handwired/ergocheap/rules.mk b/keyboards/handwired/ergocheap/rules.mk deleted file mode 100644 index 10c9a692dff..00000000000 --- a/keyboards/handwired/ergocheap/rules.mk +++ /dev/null @@ -1,14 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SLEEP_LED_ENABLE = yes diff --git a/keyboards/handwired/evk/v1_3/info.json b/keyboards/handwired/evk/v1_3/keyboard.json similarity index 96% rename from keyboards/handwired/evk/v1_3/info.json rename to keyboards/handwired/evk/v1_3/keyboard.json index 7e3baab9add..5553db0a1f0 100644 --- a/keyboards/handwired/evk/v1_3/info.json +++ b/keyboards/handwired/evk/v1_3/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "C6", "C7", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6"], "rows": ["B0", "B1", "B2", "B3", "B7", "D0"] diff --git a/keyboards/handwired/evk/v1_3/rules.mk b/keyboards/handwired/evk/v1_3/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/handwired/evk/v1_3/rules.mk +++ /dev/null @@ -1,12 +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 -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/fc200rt_qmk/info.json b/keyboards/handwired/fc200rt_qmk/keyboard.json similarity index 96% rename from keyboards/handwired/fc200rt_qmk/info.json rename to keyboards/handwired/fc200rt_qmk/keyboard.json index 41c1ab563f7..1cde9518811 100644 --- a/keyboards/handwired/fc200rt_qmk/info.json +++ b/keyboards/handwired/fc200rt_qmk/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xFFFF", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D2", "D3", "C6", "C7", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1"], "rows": ["B0", "B1", "B2", "B3", "E6", "B7", "D0", "D1"] diff --git a/keyboards/handwired/fc200rt_qmk/rules.mk b/keyboards/handwired/fc200rt_qmk/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/handwired/fc200rt_qmk/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 = 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/fivethirteen/info.json b/keyboards/handwired/fivethirteen/keyboard.json similarity index 95% rename from keyboards/handwired/fivethirteen/info.json rename to keyboards/handwired/fivethirteen/keyboard.json index 66d556f7ac1..11baaf78cc1 100644 --- a/keyboards/handwired/fivethirteen/info.json +++ b/keyboards/handwired/fivethirteen/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "F0", "D0", "D1", "D2", "D3", "C6", "C7", "D6", "D7"], "rows": ["F6", "F7", "B6", "B5", "B4"] diff --git a/keyboards/handwired/fivethirteen/rules.mk b/keyboards/handwired/fivethirteen/rules.mk deleted file mode 100644 index b6e2a5f9a41..00000000000 --- a/keyboards/handwired/fivethirteen/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/handwired/floorboard/info.json b/keyboards/handwired/floorboard/keyboard.json similarity index 94% rename from keyboards/handwired/floorboard/info.json rename to keyboards/handwired/floorboard/keyboard.json index 262a26afb6e..97e6395957f 100644 --- a/keyboards/handwired/floorboard/info.json +++ b/keyboards/handwired/floorboard/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B7", "B6", "B5", "B4", "B3", "B2", "B1", "B9", "B0", "B15", "B14", "B13"], "rows": ["A2", "A1", "A0", "B8"] diff --git a/keyboards/handwired/floorboard/rules.mk b/keyboards/handwired/floorboard/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/handwired/floorboard/rules.mk +++ /dev/null @@ -1,12 +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 -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/gamenum/info.json b/keyboards/handwired/gamenum/keyboard.json similarity index 89% rename from keyboards/handwired/gamenum/info.json rename to keyboards/handwired/gamenum/keyboard.json index 78dbfce5f76..17460f4dcaa 100644 --- a/keyboards/handwired/gamenum/info.json +++ b/keyboards/handwired/gamenum/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5678", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["B6", "B2", "B3", "B1", "F7"] diff --git a/keyboards/handwired/gamenum/rules.mk b/keyboards/handwired/gamenum/rules.mk deleted file mode 100644 index b6e2a5f9a41..00000000000 --- a/keyboards/handwired/gamenum/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/handwired/heisenberg/info.json b/keyboards/handwired/heisenberg/keyboard.json similarity index 94% rename from keyboards/handwired/heisenberg/info.json rename to keyboards/handwired/heisenberg/keyboard.json index 09e03bd0631..88f001d0754 100644 --- a/keyboards/handwired/heisenberg/info.json +++ b/keyboards/handwired/heisenberg/keyboard.json @@ -26,6 +26,16 @@ "ws2812": { "pin": "D4" }, + "features": { + "audio": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0"] diff --git a/keyboards/handwired/heisenberg/rules.mk b/keyboards/handwired/heisenberg/rules.mk deleted file mode 100644 index bf4e1231535..00000000000 --- a/keyboards/handwired/heisenberg/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 = 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 diff --git a/keyboards/handwired/hexon38/info.json b/keyboards/handwired/hexon38/keyboard.json similarity index 93% rename from keyboards/handwired/hexon38/info.json rename to keyboards/handwired/hexon38/keyboard.json index 5bb94b0c405..dfc11eb532f 100644 --- a/keyboards/handwired/hexon38/info.json +++ b/keyboards/handwired/hexon38/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "D3", "D2", "D1", "D0", "B7", "F6", "F7", "B6", "B5", "B4", "D7"], "rows": ["B0", "F0", "B2", "F4"] diff --git a/keyboards/handwired/hexon38/rules.mk b/keyboards/handwired/hexon38/rules.mk deleted file mode 100644 index fb9061cbb5a..00000000000 --- a/keyboards/handwired/hexon38/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/keyboard.json similarity index 98% rename from keyboards/handwired/hnah108/info.json rename to keyboards/handwired/hnah108/keyboard.json index 63017532e3e..e062dcee6f2 100644 --- a/keyboards/handwired/hnah108/info.json +++ b/keyboards/handwired/hnah108/keyboard.json @@ -56,6 +56,17 @@ }, "driver": "ws2812" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F0", "E6", "B0", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"], "rows": ["F7", "F6", "F5", "F4", "F1", "C7", "B4", "B5", "B6", "C6"] diff --git a/keyboards/handwired/hnah108/rules.mk b/keyboards/handwired/hnah108/rules.mk deleted file mode 100644 index ec5f27bde82..00000000000 --- a/keyboards/handwired/hnah108/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 = 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 -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/handwired/hnah40/info.json b/keyboards/handwired/hnah40/keyboard.json similarity index 94% rename from keyboards/handwired/hnah40/info.json rename to keyboards/handwired/hnah40/keyboard.json index b35f3fc40cc..649ad84d100 100644 --- a/keyboards/handwired/hnah40/info.json +++ b/keyboards/handwired/hnah40/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.2", "max_power": 100 }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1"], "rows": ["B4", "B5", "B3", "D4"] diff --git a/keyboards/handwired/hnah40/rules.mk b/keyboards/handwired/hnah40/rules.mk deleted file mode 100644 index d4acd7ecd13..00000000000 --- a/keyboards/handwired/hnah40/rules.mk +++ /dev/null @@ -1,12 +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 -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/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/keyboard.json similarity index 97% rename from keyboards/handwired/hnah40rgb/info.json rename to keyboards/handwired/hnah40rgb/keyboard.json index 51a934564c3..753b5dd00a6 100644 --- a/keyboards/handwired/hnah40rgb/info.json +++ b/keyboards/handwired/hnah40rgb/keyboard.json @@ -65,6 +65,15 @@ "max_brightness": 200, "react_on_keyup": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D5", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], "rows": ["B7", "D7", "F1", "F0"] diff --git a/keyboards/handwired/hnah40rgb/rules.mk b/keyboards/handwired/hnah40rgb/rules.mk deleted file mode 100644 index 7c04c864834..00000000000 --- a/keyboards/handwired/hnah40rgb/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = 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 -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/keyboard.json similarity index 96% rename from keyboards/handwired/hwpm87/info.json rename to keyboards/handwired/hwpm87/keyboard.json index 88079c32adc..0dbbb0472a1 100644 --- a/keyboards/handwired/hwpm87/info.json +++ b/keyboards/handwired/hwpm87/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B7", "F0", "F1", "D6", "C7", "B6", "F7", "F6", "F5", "F4"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5"] diff --git a/keyboards/handwired/hwpm87/rules.mk b/keyboards/handwired/hwpm87/rules.mk deleted file mode 100644 index 90f47aeb931..00000000000 --- a/keyboards/handwired/hwpm87/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 = 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/ibm_wheelwriter/info.json b/keyboards/handwired/ibm_wheelwriter/keyboard.json similarity index 96% rename from keyboards/handwired/ibm_wheelwriter/info.json rename to keyboards/handwired/ibm_wheelwriter/keyboard.json index 4ec01887e16..91f56540e2a 100644 --- a/keyboards/handwired/ibm_wheelwriter/info.json +++ b/keyboards/handwired/ibm_wheelwriter/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5F89", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2"] diff --git a/keyboards/handwired/ibm_wheelwriter/rules.mk b/keyboards/handwired/ibm_wheelwriter/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/handwired/ibm_wheelwriter/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/jn68m/info.json b/keyboards/handwired/jn68m/keyboard.json similarity index 97% rename from keyboards/handwired/jn68m/info.json rename to keyboards/handwired/jn68m/keyboard.json index 6c83157843b..25dfb005ebf 100644 --- a/keyboards/handwired/jn68m/info.json +++ b/keyboards/handwired/jn68m/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1010", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "D1"], "rows": ["B0", "B1", "D5", "D3", "D2"] diff --git a/keyboards/handwired/jn68m/rules.mk b/keyboards/handwired/jn68m/rules.mk deleted file mode 100644 index d4acd7ecd13..00000000000 --- a/keyboards/handwired/jn68m/rules.mk +++ /dev/null @@ -1,12 +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 -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/jopr/info.json b/keyboards/handwired/jopr/keyboard.json similarity index 97% rename from keyboards/handwired/jopr/info.json rename to keyboards/handwired/jopr/keyboard.json index 78fb52cb995..c01e622325f 100644 --- a/keyboards/handwired/jopr/info.json +++ b/keyboards/handwired/jopr/keyboard.json @@ -17,6 +17,15 @@ "ws2812": { "pin": "F4" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "B0", "F7", "E6", "F6", "B5", "C7", "B4", "D1"], "rows": ["D0", "D6", "D2", "D4", "D3", "D5", "D7", "C6", "B6", "F5"] diff --git a/keyboards/handwired/jopr/rules.mk b/keyboards/handwired/jopr/rules.mk deleted file mode 100644 index 5bb5e8e0dc0..00000000000 --- a/keyboards/handwired/jopr/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 -UNICODE_ENABLE = yes -RGBLIGHT_ENABLE = no diff --git a/keyboards/handwired/jot50/info.json b/keyboards/handwired/jot50/keyboard.json similarity index 94% rename from keyboards/handwired/jot50/info.json rename to keyboards/handwired/jot50/keyboard.json index 07a369a9372..260fd6dffc9 100644 --- a/keyboards/handwired/jot50/info.json +++ b/keyboards/handwired/jot50/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D3", "D2", "D1", "D0", "D4", "C6"], "rows": ["D7", "E6", "B4", "B6", "B2"] diff --git a/keyboards/handwired/jot50/rules.mk b/keyboards/handwired/jot50/rules.mk deleted file mode 100644 index 8135e806711..00000000000 --- a/keyboards/handwired/jot50/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = yes # 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 # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/handwired/jotpad16/info.json b/keyboards/handwired/jotpad16/keyboard.json similarity index 88% rename from keyboards/handwired/jotpad16/info.json rename to keyboards/handwired/jotpad16/keyboard.json index 289ef636b4b..944af735efe 100644 --- a/keyboards/handwired/jotpad16/info.json +++ b/keyboards/handwired/jotpad16/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["E6", "D7", "B3", "B1"], "rows": ["B6", "B2", "D2", "D3"] diff --git a/keyboards/handwired/jotpad16/rules.mk b/keyboards/handwired/jotpad16/rules.mk deleted file mode 100644 index 39356ef6f6d..00000000000 --- a/keyboards/handwired/jotpad16/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 = 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/handwired/juliet/info.json b/keyboards/handwired/juliet/keyboard.json similarity index 98% rename from keyboards/handwired/juliet/info.json rename to keyboards/handwired/juliet/keyboard.json index d723557d4b1..e08a0266923 100644 --- a/keyboards/handwired/juliet/info.json +++ b/keyboards/handwired/juliet/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4069", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B1", "B3", "B2", "B6"], "rows": ["F5", "D2", "D3", "F4"] diff --git a/keyboards/handwired/juliet/rules.mk b/keyboards/handwired/juliet/rules.mk deleted file mode 100644 index fa6fbf34d9f..00000000000 --- a/keyboards/handwired/juliet/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/k8split/info.json b/keyboards/handwired/k8split/keyboard.json similarity index 94% rename from keyboards/handwired/k8split/info.json rename to keyboards/handwired/k8split/keyboard.json index 3ec5d1c36f9..62ea64604a0 100644 --- a/keyboards/handwired/k8split/info.json +++ b/keyboards/handwired/k8split/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xC868", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D5", "D3", "D2", "D1", "D0", "B7"] diff --git a/keyboards/handwired/k8split/rules.mk b/keyboards/handwired/k8split/rules.mk deleted file mode 100644 index 3e66b069b36..00000000000 --- a/keyboards/handwired/k8split/rules.mk +++ /dev/null @@ -1,12 +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 -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/k_numpad17/info.json b/keyboards/handwired/k_numpad17/keyboard.json similarity index 89% rename from keyboards/handwired/k_numpad17/info.json rename to keyboards/handwired/k_numpad17/keyboard.json index 97d5f38774b..edf69bc5d58 100644 --- a/keyboards/handwired/k_numpad17/info.json +++ b/keyboards/handwired/k_numpad17/keyboard.json @@ -11,6 +11,14 @@ "tapping": { "term": 400 }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B2", "B1", "F6", "F4"], "rows": ["D1", "D4", "C6", "D7", "E6"] diff --git a/keyboards/handwired/k_numpad17/rules.mk b/keyboards/handwired/k_numpad17/rules.mk deleted file mode 100644 index d0901838085..00000000000 --- a/keyboards/handwired/k_numpad17/rules.mk +++ /dev/null @@ -1,12 +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 = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no diff --git a/keyboards/handwired/kbod/info.json b/keyboards/handwired/kbod/keyboard.json similarity index 95% rename from keyboards/handwired/kbod/info.json rename to keyboards/handwired/kbod/keyboard.json index 69005c65790..127595a0cee 100644 --- a/keyboards/handwired/kbod/info.json +++ b/keyboards/handwired/kbod/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D0", "D1", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6"] diff --git a/keyboards/handwired/kbod/rules.mk b/keyboards/handwired/kbod/rules.mk deleted file mode 100644 index 14ece75f470..00000000000 --- a/keyboards/handwired/kbod/rules.mk +++ /dev/null @@ -1,11 +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 -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 # Audio output diff --git a/keyboards/handwired/leftynumpad/info.json b/keyboards/handwired/leftynumpad/keyboard.json similarity index 91% rename from keyboards/handwired/leftynumpad/info.json rename to keyboards/handwired/leftynumpad/keyboard.json index 0a769a43f9d..045fd7e8757 100644 --- a/keyboards/handwired/leftynumpad/info.json +++ b/keyboards/handwired/leftynumpad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xBEEF", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["E6", "B4", "B5", "B6", "B2"], "rows": ["D1", "D0", "D4", "C6", "D7"] diff --git a/keyboards/handwired/leftynumpad/rules.mk b/keyboards/handwired/leftynumpad/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/leftynumpad/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 = 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/lovelive9/info.json b/keyboards/handwired/lovelive9/keyboard.json similarity index 88% rename from keyboards/handwired/lovelive9/info.json rename to keyboards/handwired/lovelive9/keyboard.json index 835fa55bef6..f8962bf7618 100644 --- a/keyboards/handwired/lovelive9/info.json +++ b/keyboards/handwired/lovelive9/keyboard.json @@ -9,6 +9,15 @@ "device_version": "0.0.1", "max_power": 400 }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "B6", "B2", "D7", "B1", "F7", "F6", "F5", "F4"], "rows": [null] diff --git a/keyboards/handwired/lovelive9/rules.mk b/keyboards/handwired/lovelive9/rules.mk deleted file mode 100644 index f99fed15e7f..00000000000 --- a/keyboards/handwired/lovelive9/rules.mk +++ /dev/null @@ -1,12 +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 -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 = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/handwired/magicforce61/info.json b/keyboards/handwired/magicforce61/keyboard.json similarity index 95% rename from keyboards/handwired/magicforce61/info.json rename to keyboards/handwired/magicforce61/keyboard.json index 9ec845614c7..dbcae2f21af 100644 --- a/keyboards/handwired/magicforce61/info.json +++ b/keyboards/handwired/magicforce61/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B5", "B4", "B3", "B2", "B1", "B0", "E7", "E6", "F0", "F1", "F2", "F3", "F4", "F5"], "rows": ["D0", "D1", "D2", "D3", "D4"] diff --git a/keyboards/handwired/magicforce61/rules.mk b/keyboards/handwired/magicforce61/rules.mk deleted file mode 100644 index b6e2a5f9a41..00000000000 --- a/keyboards/handwired/magicforce61/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/handwired/magicforce68/info.json b/keyboards/handwired/magicforce68/keyboard.json similarity index 96% rename from keyboards/handwired/magicforce68/info.json rename to keyboards/handwired/magicforce68/keyboard.json index dcffe0f5d74..a9afdf913a2 100644 --- a/keyboards/handwired/magicforce68/info.json +++ b/keyboards/handwired/magicforce68/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B2", "B0", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/handwired/magicforce68/rules.mk b/keyboards/handwired/magicforce68/rules.mk deleted file mode 100644 index b6e2a5f9a41..00000000000 --- a/keyboards/handwired/magicforce68/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/handwired/mechboards_micropad/info.json b/keyboards/handwired/mechboards_micropad/keyboard.json similarity index 79% rename from keyboards/handwired/mechboards_micropad/info.json rename to keyboards/handwired/mechboards_micropad/keyboard.json index a61a11bc942..16e6653a338 100644 --- a/keyboards/handwired/mechboards_micropad/info.json +++ b/keyboards/handwired/mechboards_micropad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B2", "B3", "B1", "F7"], "rows": ["B6"] diff --git a/keyboards/handwired/mechboards_micropad/rules.mk b/keyboards/handwired/mechboards_micropad/rules.mk deleted file mode 100644 index d4acd7ecd13..00000000000 --- a/keyboards/handwired/mechboards_micropad/rules.mk +++ /dev/null @@ -1,12 +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 -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/minorca/info.json b/keyboards/handwired/minorca/keyboard.json similarity index 94% rename from keyboards/handwired/minorca/info.json rename to keyboards/handwired/minorca/keyboard.json index ba2b6d0ed59..9642927f1ae 100644 --- a/keyboards/handwired/minorca/info.json +++ b/keyboards/handwired/minorca/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6660", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/handwired/minorca/rules.mk b/keyboards/handwired/minorca/rules.mk deleted file mode 100644 index 283a46b6ae1..00000000000 --- a/keyboards/handwired/minorca/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 = 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 = no # Enable WS2812 RGB underlight -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/misterdeck/info.json b/keyboards/handwired/misterdeck/keyboard.json similarity index 86% rename from keyboards/handwired/misterdeck/info.json rename to keyboards/handwired/misterdeck/keyboard.json index 59062f16dc9..02c43487818 100644 --- a/keyboards/handwired/misterdeck/info.json +++ b/keyboards/handwired/misterdeck/keyboard.json @@ -11,6 +11,14 @@ "processor": "atmega32u4", "bootloader": "caterina", "diode_direction": "ROW2COL", + "features": { + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["D1", "D0", "D4"] diff --git a/keyboards/handwired/misterdeck/rules.mk b/keyboards/handwired/misterdeck/rules.mk deleted file mode 100644 index 20825c8cfa6..00000000000 --- a/keyboards/handwired/misterdeck/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/handwired/mutepad/info.json b/keyboards/handwired/mutepad/keyboard.json similarity index 82% rename from keyboards/handwired/mutepad/info.json rename to keyboards/handwired/mutepad/keyboard.json index 5adb2505fbc..9bb273d4e85 100644 --- a/keyboards/handwired/mutepad/info.json +++ b/keyboards/handwired/mutepad/keyboard.json @@ -9,6 +9,15 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B1", "B3", "B2", "B6"], "rows": ["F6"] diff --git a/keyboards/handwired/mutepad/rules.mk b/keyboards/handwired/mutepad/rules.mk deleted file mode 100644 index 131aa72aeb5..00000000000 --- a/keyboards/handwired/mutepad/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/handwired/nicekey/info.json b/keyboards/handwired/nicekey/keyboard.json similarity index 74% rename from keyboards/handwired/nicekey/info.json rename to keyboards/handwired/nicekey/keyboard.json index 066e5b852f9..0ae1b3280bf 100644 --- a/keyboards/handwired/nicekey/info.json +++ b/keyboards/handwired/nicekey/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C6"], "rows": ["B6"] diff --git a/keyboards/handwired/nicekey/rules.mk b/keyboards/handwired/nicekey/rules.mk deleted file mode 100644 index 59c896dbff6..00000000000 --- a/keyboards/handwired/nicekey/rules.mk +++ /dev/null @@ -1,12 +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 -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/nozbe_macro/info.json b/keyboards/handwired/nozbe_macro/keyboard.json similarity index 78% rename from keyboards/handwired/nozbe_macro/info.json rename to keyboards/handwired/nozbe_macro/keyboard.json index a4b37eec4a8..c87205c9177 100644 --- a/keyboards/handwired/nozbe_macro/info.json +++ b/keyboards/handwired/nozbe_macro/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6"], "rows": ["B0"] diff --git a/keyboards/handwired/nozbe_macro/rules.mk b/keyboards/handwired/nozbe_macro/rules.mk deleted file mode 100644 index b325f3f0c79..00000000000 --- a/keyboards/handwired/nozbe_macro/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 = 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/numpad20/info.json b/keyboards/handwired/numpad20/keyboard.json similarity index 89% rename from keyboards/handwired/numpad20/info.json rename to keyboards/handwired/numpad20/keyboard.json index 5c96b7e5dbb..7e3888bbe0a 100644 --- a/keyboards/handwired/numpad20/info.json +++ b/keyboards/handwired/numpad20/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0504", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D0", "F5", "F4"], "rows": ["F6", "B1", "B3", "B6", "B5"] diff --git a/keyboards/handwired/numpad20/rules.mk b/keyboards/handwired/numpad20/rules.mk deleted file mode 100644 index b6e2a5f9a41..00000000000 --- a/keyboards/handwired/numpad20/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/handwired/obuwunkunubi/spaget/info.json b/keyboards/handwired/obuwunkunubi/spaget/keyboard.json similarity index 88% rename from keyboards/handwired/obuwunkunubi/spaget/info.json rename to keyboards/handwired/obuwunkunubi/spaget/keyboard.json index 001705ee729..7cbf1b3c0bc 100644 --- a/keyboards/handwired/obuwunkunubi/spaget/info.json +++ b/keyboards/handwired/obuwunkunubi/spaget/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "unicode": true + }, "matrix_pins": { "cols": ["B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/obuwunkunubi/spaget/rules.mk b/keyboards/handwired/obuwunkunubi/spaget/rules.mk deleted file mode 100644 index 9652815de21..00000000000 --- a/keyboards/handwired/obuwunkunubi/spaget/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no -UNICODE_ENABLE = yes # Unicode -AUDIO_ENABLE = no # Audio output - -OLED_ENABLE = yes -ENCODER_ENABLE = yes # Enable encoder support diff --git a/keyboards/handwired/oem_ansi_fullsize/info.json b/keyboards/handwired/oem_ansi_fullsize/keyboard.json similarity index 97% rename from keyboards/handwired/oem_ansi_fullsize/info.json rename to keyboards/handwired/oem_ansi_fullsize/keyboard.json index ac892719adb..6c48bfcc369 100644 --- a/keyboards/handwired/oem_ansi_fullsize/info.json +++ b/keyboards/handwired/oem_ansi_fullsize/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C3", "C2", "C1", "C0", "E1", "E0", "D7", "E6", "D5", "D4", "D3", "D2", "D1", "D0", "B7", "B0", "B1", "B2", "B3", "B4", "B5", "F6"], "rows": ["F5", "F4", "F3", "F2", "F1", "F0"] diff --git a/keyboards/handwired/oem_ansi_fullsize/rules.mk b/keyboards/handwired/oem_ansi_fullsize/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/handwired/oem_ansi_fullsize/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/oem_iso_fullsize/info.json b/keyboards/handwired/oem_iso_fullsize/keyboard.json similarity index 97% rename from keyboards/handwired/oem_iso_fullsize/info.json rename to keyboards/handwired/oem_iso_fullsize/keyboard.json index e943b65643f..dcff4541f1e 100644 --- a/keyboards/handwired/oem_iso_fullsize/info.json +++ b/keyboards/handwired/oem_iso_fullsize/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x7070", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C2", "C1", "E0", "D4", "D5", "A4", "A0", "B2", "B0", "E7", "E6", "D6", "B1", "B3", "D3", "D2", "B6", "F7", "F0", "F1", "F2"], "rows": ["C0", "B4", "F3", "F4", "F5", "F6"] diff --git a/keyboards/handwired/oem_iso_fullsize/rules.mk b/keyboards/handwired/oem_iso_fullsize/rules.mk deleted file mode 100644 index ac49f53a205..00000000000 --- a/keyboards/handwired/oem_iso_fullsize/rules.mk +++ /dev/null @@ -1,12 +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 = 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 diff --git a/keyboards/handwired/ortho5x13/info.json b/keyboards/handwired/ortho5x13/keyboard.json similarity index 95% rename from keyboards/handwired/ortho5x13/info.json rename to keyboards/handwired/ortho5x13/keyboard.json index 3fed9e24602..097ac3863d1 100644 --- a/keyboards/handwired/ortho5x13/info.json +++ b/keyboards/handwired/ortho5x13/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x050D", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0", "D4"] diff --git a/keyboards/handwired/ortho5x13/rules.mk b/keyboards/handwired/ortho5x13/rules.mk deleted file mode 100644 index b6e2a5f9a41..00000000000 --- a/keyboards/handwired/ortho5x13/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/handwired/ortho5x14/info.json b/keyboards/handwired/ortho5x14/keyboard.json similarity index 95% rename from keyboards/handwired/ortho5x14/info.json rename to keyboards/handwired/ortho5x14/keyboard.json index 67b4cc4c2e0..fe34f2b800f 100644 --- a/keyboards/handwired/ortho5x14/info.json +++ b/keyboards/handwired/ortho5x14/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x050D", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["F0", "F1", "C7", "D5", "B7"] diff --git a/keyboards/handwired/ortho5x14/rules.mk b/keyboards/handwired/ortho5x14/rules.mk deleted file mode 100644 index c8758ba64c3..00000000000 --- a/keyboards/handwired/ortho5x14/rules.mk +++ /dev/null @@ -1,11 +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 -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 -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/pilcrow/info.json b/keyboards/handwired/pilcrow/keyboard.json similarity index 93% rename from keyboards/handwired/pilcrow/info.json rename to keyboards/handwired/pilcrow/keyboard.json index 0a826c6ba8b..b1c96a495e5 100644 --- a/keyboards/handwired/pilcrow/info.json +++ b/keyboards/handwired/pilcrow/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "F5", "F6", "B6", "B2", "F4", "B5"], "rows": ["B4", "F7", "B1", "B3"] diff --git a/keyboards/handwired/pilcrow/rules.mk b/keyboards/handwired/pilcrow/rules.mk deleted file mode 100644 index b6e2a5f9a41..00000000000 --- a/keyboards/handwired/pilcrow/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/handwired/prime_exl/info.json b/keyboards/handwired/prime_exl/keyboard.json similarity index 96% rename from keyboards/handwired/prime_exl/info.json rename to keyboards/handwired/prime_exl/keyboard.json index 9a4d4b96366..ea8f6821a29 100644 --- a/keyboards/handwired/prime_exl/info.json +++ b/keyboards/handwired/prime_exl/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6578", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "B3", "B2", "D1", "D2", "D3", "F7", "F6", "F5"], "rows": ["B1", "E6", "D5", "D6", "B4", "D7", "D4", "F1", "F0", "B0"] diff --git a/keyboards/handwired/prime_exl/rules.mk b/keyboards/handwired/prime_exl/rules.mk deleted file mode 100644 index 9ce191fd81e..00000000000 --- a/keyboards/handwired/prime_exl/rules.mk +++ /dev/null @@ -1,12 +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 -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/prime_exl_plus/info.json b/keyboards/handwired/prime_exl_plus/keyboard.json similarity index 96% rename from keyboards/handwired/prime_exl_plus/info.json rename to keyboards/handwired/prime_exl_plus/keyboard.json index c463d5baa7a..4ff9bb10494 100644 --- a/keyboards/handwired/prime_exl_plus/info.json +++ b/keyboards/handwired/prime_exl_plus/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "D4" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B7", "B3", "D1", "D0"], "rows": ["D2", "D6", "B4", "F1", "E6", "F0", "F4", "B5", "D7", "D3"] diff --git a/keyboards/handwired/prime_exl_plus/rules.mk b/keyboards/handwired/prime_exl_plus/rules.mk deleted file mode 100644 index 18684e62d3e..00000000000 --- a/keyboards/handwired/prime_exl_plus/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 = 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/handwired/prkl30/promicro/info.json b/keyboards/handwired/prkl30/promicro/keyboard.json similarity index 77% rename from keyboards/handwired/prkl30/promicro/info.json rename to keyboards/handwired/prkl30/promicro/keyboard.json index 395cb9f2760..d681781c8be 100644 --- a/keyboards/handwired/prkl30/promicro/info.json +++ b/keyboards/handwired/prkl30/promicro/keyboard.json @@ -1,4 +1,14 @@ { + "features": { + "bootmagic": false, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "B5", "F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/handwired/prkl30/promicro/rules.mk b/keyboards/handwired/prkl30/promicro/rules.mk deleted file mode 100644 index a4e07e76d82..00000000000 --- a/keyboards/handwired/prkl30/promicro/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -ENCODER_ENABLE = yes -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 -AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = yes # This can be enabled if a ws2812 strip is connected to the expansion port. diff --git a/keyboards/handwired/pteron/info.json b/keyboards/handwired/pteron/keyboard.json similarity index 95% rename from keyboards/handwired/pteron/info.json rename to keyboards/handwired/pteron/keyboard.json index c8b5e9d4d8c..7aa2470cc15 100644 --- a/keyboards/handwired/pteron/info.json +++ b/keyboards/handwired/pteron/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["D7", "E6", "B4", "B5", "B6"] diff --git a/keyboards/handwired/pteron/rules.mk b/keyboards/handwired/pteron/rules.mk deleted file mode 100644 index a77b52c38bd..00000000000 --- a/keyboards/handwired/pteron/rules.mk +++ /dev/null @@ -1,11 +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 -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 diff --git a/keyboards/handwired/pteron38/info.json b/keyboards/handwired/pteron38/keyboard.json similarity index 93% rename from keyboards/handwired/pteron38/info.json rename to keyboards/handwired/pteron38/keyboard.json index 6770e467eb0..266aefec1f7 100644 --- a/keyboards/handwired/pteron38/info.json +++ b/keyboards/handwired/pteron38/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2"], "rows": ["E6", "B4", "B5", "B6"] diff --git a/keyboards/handwired/pteron38/rules.mk b/keyboards/handwired/pteron38/rules.mk deleted file mode 100644 index 3e66b069b36..00000000000 --- a/keyboards/handwired/pteron38/rules.mk +++ /dev/null @@ -1,12 +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 -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/pteron44/info.json b/keyboards/handwired/pteron44/keyboard.json similarity index 94% rename from keyboards/handwired/pteron44/info.json rename to keyboards/handwired/pteron44/keyboard.json index da32096bf12..26321317eb5 100644 --- a/keyboards/handwired/pteron44/info.json +++ b/keyboards/handwired/pteron44/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x542C", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["E6", "B4", "B5", "B6"] diff --git a/keyboards/handwired/pteron44/rules.mk b/keyboards/handwired/pteron44/rules.mk deleted file mode 100644 index 3e66b069b36..00000000000 --- a/keyboards/handwired/pteron44/rules.mk +++ /dev/null @@ -1,12 +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 -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/retro_refit/info.json b/keyboards/handwired/retro_refit/keyboard.json similarity index 96% rename from keyboards/handwired/retro_refit/info.json rename to keyboards/handwired/retro_refit/keyboard.json index ca0dffdc832..d1a5831fc36 100644 --- a/keyboards/handwired/retro_refit/info.json +++ b/keyboards/handwired/retro_refit/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D2", "D3", "C7", "D5"], "rows": ["D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/handwired/retro_refit/rules.mk b/keyboards/handwired/retro_refit/rules.mk deleted file mode 100644 index eb35f5c4d2a..00000000000 --- a/keyboards/handwired/retro_refit/rules.mk +++ /dev/null @@ -1,10 +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 = yes # Enable N-Key Rollover -# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality diff --git a/keyboards/handwired/rs60/info.json b/keyboards/handwired/rs60/keyboard.json similarity index 95% rename from keyboards/handwired/rs60/info.json rename to keyboards/handwired/rs60/keyboard.json index 214eb64dfcd..15364743432 100644 --- a/keyboards/handwired/rs60/info.json +++ b/keyboards/handwired/rs60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4260", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": true, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "D4", "D0", "D1", "D2", "D3", "F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["B5", "B6", "B4", "B2", "E6"] diff --git a/keyboards/handwired/rs60/rules.mk b/keyboards/handwired/rs60/rules.mk deleted file mode 100644 index c827f15dcf8..00000000000 --- a/keyboards/handwired/rs60/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 # 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. diff --git a/keyboards/handwired/selene/info.json b/keyboards/handwired/selene/keyboard.json similarity index 97% rename from keyboards/handwired/selene/info.json rename to keyboards/handwired/selene/keyboard.json index b99e41bda58..ed3231981df 100644 --- a/keyboards/handwired/selene/info.json +++ b/keyboards/handwired/selene/keyboard.json @@ -14,6 +14,15 @@ "ws2812": { "pin": "A3" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A9", "A10", "B11", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "C14", "A4", "A5", "A6", "A7", "A8", "A15", "A13", "A14", "B12"], "rows": ["B10", "B9", "B15", "B14", "B13", "B8"] diff --git a/keyboards/handwired/selene/rules.mk b/keyboards/handwired/selene/rules.mk deleted file mode 100644 index a8a8f03322a..00000000000 --- a/keyboards/handwired/selene/rules.mk +++ /dev/null @@ -1,12 +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 = 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 diff --git a/keyboards/handwired/sick68/info.json b/keyboards/handwired/sick68/keyboard.json similarity index 96% rename from keyboards/handwired/sick68/info.json rename to keyboards/handwired/sick68/keyboard.json index 14232fd6c38..f5fbe24873c 100644 --- a/keyboards/handwired/sick68/info.json +++ b/keyboards/handwired/sick68/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5F00", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5", "B0", "D5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0", "D4"] diff --git a/keyboards/handwired/sick68/rules.mk b/keyboards/handwired/sick68/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/handwired/sick68/rules.mk +++ /dev/null @@ -1,12 +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 -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/sick_pad/info.json b/keyboards/handwired/sick_pad/keyboard.json similarity index 89% rename from keyboards/handwired/sick_pad/info.json rename to keyboards/handwired/sick_pad/keyboard.json index fc1e39eb33c..8298a497ed3 100644 --- a/keyboards/handwired/sick_pad/info.json +++ b/keyboards/handwired/sick_pad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xDA20", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B9", "B15", "B14", "B13"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/handwired/sick_pad/rules.mk b/keyboards/handwired/sick_pad/rules.mk deleted file mode 100644 index 61bbba1c9e5..00000000000 --- a/keyboards/handwired/sick_pad/rules.mk +++ /dev/null @@ -1,12 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/snatchpad/info.json b/keyboards/handwired/snatchpad/keyboard.json similarity index 82% rename from keyboards/handwired/snatchpad/info.json rename to keyboards/handwired/snatchpad/keyboard.json index 162f5601b53..3ff80ad2fd6 100644 --- a/keyboards/handwired/snatchpad/info.json +++ b/keyboards/handwired/snatchpad/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x7370", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "key_lock": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B1", "B3", "B2"], "rows": ["F4", "F5", "F6"] diff --git a/keyboards/handwired/snatchpad/rules.mk b/keyboards/handwired/snatchpad/rules.mk deleted file mode 100644 index 74f5b93cb9b..00000000000 --- a/keyboards/handwired/snatchpad/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -KEY_LOCK_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/handwired/space_oddity/info.json b/keyboards/handwired/space_oddity/keyboard.json similarity index 95% rename from keyboards/handwired/space_oddity/info.json rename to keyboards/handwired/space_oddity/keyboard.json index b0e72ccabdc..b02b48ac627 100644 --- a/keyboards/handwired/space_oddity/info.json +++ b/keyboards/handwired/space_oddity/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dynamic_macro": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3"] diff --git a/keyboards/handwired/space_oddity/rules.mk b/keyboards/handwired/space_oddity/rules.mk deleted file mode 100644 index 8b3a3ef3691..00000000000 --- a/keyboards/handwired/space_oddity/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 -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 -RGBLIGHT_ENABLE = no -DYNAMIC_MACRO_ENABLE = yes diff --git a/keyboards/handwired/steamvan/rev1/info.json b/keyboards/handwired/steamvan/rev1/keyboard.json similarity index 97% rename from keyboards/handwired/steamvan/rev1/info.json rename to keyboards/handwired/steamvan/rev1/keyboard.json index 54164b57388..9808d50faae 100644 --- a/keyboards/handwired/steamvan/rev1/info.json +++ b/keyboards/handwired/steamvan/rev1/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "leader": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A9", "A8", "B15", "B14", "B13", "A10", "B9", "B6", "B5", "B4", "B3", "A15"], "rows": ["A6", "A5", "A4", "A3"] diff --git a/keyboards/handwired/steamvan/rev1/rules.mk b/keyboards/handwired/steamvan/rev1/rules.mk deleted file mode 100644 index 30e27ae8b87..00000000000 --- a/keyboards/handwired/steamvan/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = yes -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 = yes # Enable N-Key Rollover -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality -LEADER_ENABLE = yes - diff --git a/keyboards/handwired/sticc14/info.json b/keyboards/handwired/sticc14/keyboard.json similarity index 87% rename from keyboards/handwired/sticc14/info.json rename to keyboards/handwired/sticc14/keyboard.json index 8659152f52b..1c0d683a7c6 100644 --- a/keyboards/handwired/sticc14/info.json +++ b/keyboards/handwired/sticc14/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "B2", "B3"], "rows": ["F4", "F5", "F6", "F7", "B1"] diff --git a/keyboards/handwired/sticc14/rules.mk b/keyboards/handwired/sticc14/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/handwired/sticc14/rules.mk +++ /dev/null @@ -1,12 +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 -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/stream_cheap/2x3/info.json b/keyboards/handwired/stream_cheap/2x3/keyboard.json similarity index 83% rename from keyboards/handwired/stream_cheap/2x3/info.json rename to keyboards/handwired/stream_cheap/2x3/keyboard.json index 074a5f89548..b10b4f7a7c0 100644 --- a/keyboards/handwired/stream_cheap/2x3/info.json +++ b/keyboards/handwired/stream_cheap/2x3/keyboard.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "direct": [ ["D1", "C6", "B4"], diff --git a/keyboards/handwired/stream_cheap/2x3/rules.mk b/keyboards/handwired/stream_cheap/2x3/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/handwired/stream_cheap/2x3/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 = 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/stream_cheap/2x5/info.json b/keyboards/handwired/stream_cheap/2x5/keyboard.json similarity index 85% rename from keyboards/handwired/stream_cheap/2x5/info.json rename to keyboards/handwired/stream_cheap/2x5/keyboard.json index be24426de0d..ccf47996e35 100644 --- a/keyboards/handwired/stream_cheap/2x5/info.json +++ b/keyboards/handwired/stream_cheap/2x5/keyboard.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "direct": [ ["D1", "C6", "B4", "B5", "B2"], diff --git a/keyboards/handwired/stream_cheap/2x5/rules.mk b/keyboards/handwired/stream_cheap/2x5/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/handwired/stream_cheap/2x5/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 = 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/swiftrax/astro65/info.json b/keyboards/handwired/swiftrax/astro65/keyboard.json similarity index 96% rename from keyboards/handwired/swiftrax/astro65/info.json rename to keyboards/handwired/swiftrax/astro65/keyboard.json index 01ab1df856d..c72c0e4b3de 100644 --- a/keyboards/handwired/swiftrax/astro65/info.json +++ b/keyboards/handwired/swiftrax/astro65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xEAEF", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["E6", "D5", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B3", "F7", "B1", "B2"] diff --git a/keyboards/handwired/swiftrax/astro65/rules.mk b/keyboards/handwired/swiftrax/astro65/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/swiftrax/astro65/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 = 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/swiftrax/bebol/info.json b/keyboards/handwired/swiftrax/bebol/keyboard.json similarity index 99% rename from keyboards/handwired/swiftrax/bebol/info.json rename to keyboards/handwired/swiftrax/bebol/keyboard.json index b833dfbdf61..242d1b99a99 100644 --- a/keyboards/handwired/swiftrax/bebol/info.json +++ b/keyboards/handwired/swiftrax/bebol/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xEAC4", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B1", "D2", "D3", "F1", "F4", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], "rows": ["B2", "B3", "F7", "F0", "B7"] diff --git a/keyboards/handwired/swiftrax/bebol/rules.mk b/keyboards/handwired/swiftrax/bebol/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/swiftrax/bebol/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 = 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/swiftrax/beegboy/info.json b/keyboards/handwired/swiftrax/beegboy/keyboard.json similarity index 97% rename from keyboards/handwired/swiftrax/beegboy/info.json rename to keyboards/handwired/swiftrax/beegboy/keyboard.json index e35d1f36e72..75edd62c1e4 100644 --- a/keyboards/handwired/swiftrax/beegboy/info.json +++ b/keyboards/handwired/swiftrax/beegboy/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xEAC5", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D5", "D3"], "rows": ["B1", "B0", "B3", "B2", "D0", "B7", "D2", "D1", "B5", "B4", "C6", "B6"] diff --git a/keyboards/handwired/swiftrax/beegboy/rules.mk b/keyboards/handwired/swiftrax/beegboy/rules.mk deleted file mode 100644 index da25f7f3dc3..00000000000 --- a/keyboards/handwired/swiftrax/beegboy/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no # Rotary Encoder diff --git a/keyboards/handwired/swiftrax/bumblebee/info.json b/keyboards/handwired/swiftrax/bumblebee/keyboard.json similarity index 94% rename from keyboards/handwired/swiftrax/bumblebee/info.json rename to keyboards/handwired/swiftrax/bumblebee/keyboard.json index e2cad64ad8b..9a68fe1b4fe 100644 --- a/keyboards/handwired/swiftrax/bumblebee/info.json +++ b/keyboards/handwired/swiftrax/bumblebee/keyboard.json @@ -14,6 +14,16 @@ "ws2812": { "pin": "E6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7"] diff --git a/keyboards/handwired/swiftrax/bumblebee/rules.mk b/keyboards/handwired/swiftrax/bumblebee/rules.mk deleted file mode 100644 index 0ca8090ba86..00000000000 --- a/keyboards/handwired/swiftrax/bumblebee/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Rotary Encoder diff --git a/keyboards/handwired/swiftrax/cowfish/info.json b/keyboards/handwired/swiftrax/cowfish/keyboard.json similarity index 99% rename from keyboards/handwired/swiftrax/cowfish/info.json rename to keyboards/handwired/swiftrax/cowfish/keyboard.json index 8aea3b0c1b9..efa8c39d19f 100644 --- a/keyboards/handwired/swiftrax/cowfish/info.json +++ b/keyboards/handwired/swiftrax/cowfish/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xEB53", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "F0", "F1", "F4", "F5", "F6", "F7", "B5", "B6", "B4", "C6", "D7", "C7", "D2", "D3", "D5"], "rows": ["D0", "D1", "B7", "E6", "D4", "D6"] diff --git a/keyboards/handwired/swiftrax/cowfish/rules.mk b/keyboards/handwired/swiftrax/cowfish/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/handwired/swiftrax/cowfish/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/swiftrax/digicarp65/info.json b/keyboards/handwired/swiftrax/digicarp65/keyboard.json similarity index 98% rename from keyboards/handwired/swiftrax/digicarp65/info.json rename to keyboards/handwired/swiftrax/digicarp65/keyboard.json index 7d8ea44f3bc..59442c33ecc 100644 --- a/keyboards/handwired/swiftrax/digicarp65/info.json +++ b/keyboards/handwired/swiftrax/digicarp65/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xE7F1", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "C6", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B2", "B1", "F4", "F1", "F0"] diff --git a/keyboards/handwired/swiftrax/digicarp65/rules.mk b/keyboards/handwired/swiftrax/digicarp65/rules.mk deleted file mode 100644 index 21a966bffa4..00000000000 --- a/keyboards/handwired/swiftrax/digicarp65/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Rotary Encoder diff --git a/keyboards/handwired/swiftrax/digicarpice/info.json b/keyboards/handwired/swiftrax/digicarpice/keyboard.json similarity index 97% rename from keyboards/handwired/swiftrax/digicarpice/info.json rename to keyboards/handwired/swiftrax/digicarpice/keyboard.json index 538a39c14b7..6d857f5998a 100644 --- a/keyboards/handwired/swiftrax/digicarpice/info.json +++ b/keyboards/handwired/swiftrax/digicarpice/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xE79A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"], "rows": ["F0", "D5", "D7", "D6", "D4"] diff --git a/keyboards/handwired/swiftrax/digicarpice/rules.mk b/keyboards/handwired/swiftrax/digicarpice/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/swiftrax/digicarpice/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 = 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/swiftrax/equator/info.json b/keyboards/handwired/swiftrax/equator/keyboard.json similarity index 97% rename from keyboards/handwired/swiftrax/equator/info.json rename to keyboards/handwired/swiftrax/equator/keyboard.json index 3e53acb40cc..6a539c786af 100644 --- a/keyboards/handwired/swiftrax/equator/info.json +++ b/keyboards/handwired/swiftrax/equator/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xE984", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B2", "B3", "C7", "B4", "B5"] diff --git a/keyboards/handwired/swiftrax/equator/rules.mk b/keyboards/handwired/swiftrax/equator/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/swiftrax/equator/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 = 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/swiftrax/glacier/info.json b/keyboards/handwired/swiftrax/glacier/keyboard.json similarity index 98% rename from keyboards/handwired/swiftrax/glacier/info.json rename to keyboards/handwired/swiftrax/glacier/keyboard.json index ddfb4ce1ad1..d455cbe2664 100644 --- a/keyboards/handwired/swiftrax/glacier/info.json +++ b/keyboards/handwired/swiftrax/glacier/keyboard.json @@ -25,6 +25,15 @@ "ws2812": { "pin": "B0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "D0", "D1", "D2"], "rows": ["B1", "B2", "B3", "B4", "B5", "B6", "E5", "E4", "D4", "D5", "D7", "D6"] diff --git a/keyboards/handwired/swiftrax/glacier/rules.mk b/keyboards/handwired/swiftrax/glacier/rules.mk deleted file mode 100644 index 9be7a1985b1..00000000000 --- a/keyboards/handwired/swiftrax/glacier/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/handwired/swiftrax/joypad/info.json b/keyboards/handwired/swiftrax/joypad/keyboard.json similarity index 90% rename from keyboards/handwired/swiftrax/joypad/info.json rename to keyboards/handwired/swiftrax/joypad/keyboard.json index e55940cf0cb..b894dcbe546 100644 --- a/keyboards/handwired/swiftrax/joypad/info.json +++ b/keyboards/handwired/swiftrax/joypad/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xEA68", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "B4", "D0", "C2"], "rows": ["C6", "B3", "B0", "B1", "D6", "D5"] diff --git a/keyboards/handwired/swiftrax/joypad/rules.mk b/keyboards/handwired/swiftrax/joypad/rules.mk deleted file mode 100644 index deedc379986..00000000000 --- a/keyboards/handwired/swiftrax/joypad/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/handwired/swiftrax/koalafications/info.json b/keyboards/handwired/swiftrax/koalafications/keyboard.json similarity index 99% rename from keyboards/handwired/swiftrax/koalafications/info.json rename to keyboards/handwired/swiftrax/koalafications/keyboard.json index 0b456af7aa2..78686a8e70e 100644 --- a/keyboards/handwired/swiftrax/koalafications/info.json +++ b/keyboards/handwired/swiftrax/koalafications/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xEA44", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "wpm": true + }, "matrix_pins": { "cols": ["F0", "D5", "D3", "D2", "B3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B1", "B2", "E6", "F1", "F4", "F5"] diff --git a/keyboards/handwired/swiftrax/koalafications/rules.mk b/keyboards/handwired/swiftrax/koalafications/rules.mk deleted file mode 100644 index efd14377bf4..00000000000 --- a/keyboards/handwired/swiftrax/koalafications/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/handwired/swiftrax/nodu/info.json b/keyboards/handwired/swiftrax/nodu/keyboard.json similarity index 96% rename from keyboards/handwired/swiftrax/nodu/info.json rename to keyboards/handwired/swiftrax/nodu/keyboard.json index 9deacb8238f..47c604c35fb 100644 --- a/keyboards/handwired/swiftrax/nodu/info.json +++ b/keyboards/handwired/swiftrax/nodu/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xEA6E", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "B7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1", "D0"], "rows": ["B0", "B3", "F5", "F4", "F1"] diff --git a/keyboards/handwired/swiftrax/nodu/rules.mk b/keyboards/handwired/swiftrax/nodu/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/swiftrax/nodu/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 = 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/swiftrax/pandamic/info.json b/keyboards/handwired/swiftrax/pandamic/keyboard.json similarity index 96% rename from keyboards/handwired/swiftrax/pandamic/info.json rename to keyboards/handwired/swiftrax/pandamic/keyboard.json index 97ea8928cc8..9fce9c80c52 100644 --- a/keyboards/handwired/swiftrax/pandamic/info.json +++ b/keyboards/handwired/swiftrax/pandamic/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xEB0E", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D0"], "rows": ["D1", "D2", "B5", "B7", "D3", "D5", "D6", "D4", "D7", "B4"] diff --git a/keyboards/handwired/swiftrax/pandamic/rules.mk b/keyboards/handwired/swiftrax/pandamic/rules.mk deleted file mode 100644 index 0d8c75f6af6..00000000000 --- a/keyboards/handwired/swiftrax/pandamic/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Rotary Encoder diff --git a/keyboards/handwired/swiftrax/the_galleon/info.json b/keyboards/handwired/swiftrax/the_galleon/keyboard.json similarity index 99% rename from keyboards/handwired/swiftrax/the_galleon/info.json rename to keyboards/handwired/swiftrax/the_galleon/keyboard.json index 2e0771e22c6..1d87ce18933 100644 --- a/keyboards/handwired/swiftrax/the_galleon/info.json +++ b/keyboards/handwired/swiftrax/the_galleon/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xEA2D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2"], "rows": ["B1", "B0", "D2", "B7", "D5", "D3", "D6", "D4", "B4", "D7", "B6", "B5", "C7", "C6"] diff --git a/keyboards/handwired/swiftrax/the_galleon/rules.mk b/keyboards/handwired/swiftrax/the_galleon/rules.mk deleted file mode 100644 index dec78ae4080..00000000000 --- a/keyboards/handwired/swiftrax/the_galleon/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no # Rotary Encoder -OLED_ENABLE = yes diff --git a/keyboards/handwired/swiftrax/unsplit/info.json b/keyboards/handwired/swiftrax/unsplit/keyboard.json similarity index 94% rename from keyboards/handwired/swiftrax/unsplit/info.json rename to keyboards/handwired/swiftrax/unsplit/keyboard.json index 545e0b66e56..bb18c0dea89 100644 --- a/keyboards/handwired/swiftrax/unsplit/info.json +++ b/keyboards/handwired/swiftrax/unsplit/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xEAB1", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "C6", "C7", "F6", "F5", "F4", "F1"], "rows": ["B6", "D7", "B5", "B4"] diff --git a/keyboards/handwired/swiftrax/unsplit/rules.mk b/keyboards/handwired/swiftrax/unsplit/rules.mk deleted file mode 100644 index d737227db3c..00000000000 --- a/keyboards/handwired/swiftrax/unsplit/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no # Rotary Encoder \ No newline at end of file diff --git a/keyboards/handwired/swiftrax/walter/info.json b/keyboards/handwired/swiftrax/walter/keyboard.json similarity index 98% rename from keyboards/handwired/swiftrax/walter/info.json rename to keyboards/handwired/swiftrax/walter/keyboard.json index 804f88503bc..cbf603a4ffc 100644 --- a/keyboards/handwired/swiftrax/walter/info.json +++ b/keyboards/handwired/swiftrax/walter/keyboard.json @@ -26,6 +26,16 @@ "ws2812": { "pin": "E6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "C6", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B2", "B1", "F4", "F1", "F0"] diff --git a/keyboards/handwired/swiftrax/walter/rules.mk b/keyboards/handwired/swiftrax/walter/rules.mk deleted file mode 100644 index 5e11a757b75..00000000000 --- a/keyboards/handwired/swiftrax/walter/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Rotary Encder diff --git a/keyboards/handwired/t111/info.json b/keyboards/handwired/t111/keyboard.json similarity index 97% rename from keyboards/handwired/t111/info.json rename to keyboards/handwired/t111/keyboard.json index f25b0790988..4c2b7ac4690 100644 --- a/keyboards/handwired/t111/info.json +++ b/keyboards/handwired/t111/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6FAA", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B15", "B11", "B10", "B1", "B0", "A10", "A9", "A7", "A6", "A5", "A4", "A8", "B13", "B14"], "rows": ["A15", "B6", "B5", "B4", "B3", "B9", "B8", "B7"] diff --git a/keyboards/handwired/t111/rules.mk b/keyboards/handwired/t111/rules.mk deleted file mode 100644 index 2542c545bff..00000000000 --- a/keyboards/handwired/t111/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 -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/handwired/tennie/info.json b/keyboards/handwired/tennie/keyboard.json similarity index 88% rename from keyboards/handwired/tennie/info.json rename to keyboards/handwired/tennie/keyboard.json index 32198e1cf62..34e6676c953 100644 --- a/keyboards/handwired/tennie/info.json +++ b/keyboards/handwired/tennie/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "D1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["C6", "D4", "D0"] diff --git a/keyboards/handwired/tennie/rules.mk b/keyboards/handwired/tennie/rules.mk deleted file mode 100644 index 477ce541fd5..00000000000 --- a/keyboards/handwired/tennie/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/terminus_mini/info.json b/keyboards/handwired/terminus_mini/keyboard.json similarity index 94% rename from keyboards/handwired/terminus_mini/info.json rename to keyboards/handwired/terminus_mini/keyboard.json index 5593be8bb7a..1bf37da57b4 100644 --- a/keyboards/handwired/terminus_mini/info.json +++ b/keyboards/handwired/terminus_mini/keyboard.json @@ -12,6 +12,14 @@ "term": 150, "toggle": 1 }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "D0", "D5", "B6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B5", "B4", "D7", "D6"] diff --git a/keyboards/handwired/terminus_mini/rules.mk b/keyboards/handwired/terminus_mini/rules.mk deleted file mode 100644 index 304b8ba7b9f..00000000000 --- a/keyboards/handwired/terminus_mini/rules.mk +++ /dev/null @@ -1,12 +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 -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/keyboard.json similarity index 94% rename from keyboards/handwired/traveller/info.json rename to keyboards/handwired/traveller/keyboard.json index ea1b3e35305..e6941036f50 100644 --- a/keyboards/handwired/traveller/info.json +++ b/keyboards/handwired/traveller/keyboard.json @@ -15,6 +15,15 @@ "ws2812": { "pin": "B2" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B5", "D6", "B7", "B6", "F6", "B1", "B3", "F7", "B4", "E6", "D7", "C6", "D4"], "rows": ["D0", "D1", "D3", "D2"] diff --git a/keyboards/handwired/traveller/rules.mk b/keyboards/handwired/traveller/rules.mk deleted file mode 100644 index aa4c817d2a2..00000000000 --- a/keyboards/handwired/traveller/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/keyboard.json similarity index 95% rename from keyboards/handwired/tritium_numpad/info.json rename to keyboards/handwired/tritium_numpad/keyboard.json index 2e2fc6c81f6..b87f4768219 100644 --- a/keyboards/handwired/tritium_numpad/info.json +++ b/keyboards/handwired/tritium_numpad/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.3" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F6", "B1", "B2"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6"] diff --git a/keyboards/handwired/tritium_numpad/rules.mk b/keyboards/handwired/tritium_numpad/rules.mk deleted file mode 100644 index ad6bc60f96f..00000000000 --- a/keyboards/handwired/tritium_numpad/rules.mk +++ /dev/null @@ -1,12 +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 = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no diff --git a/keyboards/handwired/twig/twig50/info.json b/keyboards/handwired/twig/twig50/keyboard.json similarity index 94% rename from keyboards/handwired/twig/twig50/info.json rename to keyboards/handwired/twig/twig50/keyboard.json index 24eb51d03c1..aa78691838c 100644 --- a/keyboards/handwired/twig/twig50/info.json +++ b/keyboards/handwired/twig/twig50/keyboard.json @@ -12,6 +12,15 @@ "tapping": { "term": 150 }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9", "B10", "B11", "B3", "B2", "B1", "B0"], "rows": ["B7", "B6", "B5", "B4"] diff --git a/keyboards/handwired/twig/twig50/rules.mk b/keyboards/handwired/twig/twig50/rules.mk deleted file mode 100644 index 60962ea47d9..00000000000 --- a/keyboards/handwired/twig/twig50/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 = 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 = yes # Audio output diff --git a/keyboards/handwired/unicomp_mini_m/info.json b/keyboards/handwired/unicomp_mini_m/keyboard.json similarity index 97% rename from keyboards/handwired/unicomp_mini_m/info.json rename to keyboards/handwired/unicomp_mini_m/keyboard.json index 0b110c98bdb..50ae0330282 100644 --- a/keyboards/handwired/unicomp_mini_m/info.json +++ b/keyboards/handwired/unicomp_mini_m/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": true, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "B7", "D5", "D4", "D3", "D2"], "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "E6", "E7", "B0", "B1"] diff --git a/keyboards/handwired/unicomp_mini_m/rules.mk b/keyboards/handwired/unicomp_mini_m/rules.mk deleted file mode 100644 index 7ae681a542b..00000000000 --- a/keyboards/handwired/unicomp_mini_m/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/handwired/videowriter/info.json b/keyboards/handwired/videowriter/keyboard.json similarity index 96% rename from keyboards/handwired/videowriter/info.json rename to keyboards/handwired/videowriter/keyboard.json index 14c33f399f4..c8b0141767e 100644 --- a/keyboards/handwired/videowriter/info.json +++ b/keyboards/handwired/videowriter/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5657", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D7", "C6", "D1", "D0", "D4", "D2", "D3", "E6", "B4", "B5"] diff --git a/keyboards/handwired/videowriter/rules.mk b/keyboards/handwired/videowriter/rules.mk deleted file mode 100644 index 6e0404820cd..00000000000 --- a/keyboards/handwired/videowriter/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 = 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/wabi/info.json b/keyboards/handwired/wabi/keyboard.json similarity index 96% rename from keyboards/handwired/wabi/info.json rename to keyboards/handwired/wabi/keyboard.json index 8c833feeb43..26c82a209c2 100644 --- a/keyboards/handwired/wabi/info.json +++ b/keyboards/handwired/wabi/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xB07D", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F1", "F0", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B5"], "rows": ["D5", "F5", "F6", "F7", "B0"] diff --git a/keyboards/handwired/wabi/rules.mk b/keyboards/handwired/wabi/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/handwired/wabi/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/woodpad/info.json b/keyboards/handwired/woodpad/keyboard.json similarity index 90% rename from keyboards/handwired/woodpad/info.json rename to keyboards/handwired/woodpad/keyboard.json index f3394897fc7..3af8bd19df0 100644 --- a/keyboards/handwired/woodpad/info.json +++ b/keyboards/handwired/woodpad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6069", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B1", "B3", "B2", "B6"], "rows": ["D1", "D0", "D4", "C6", "D7"] diff --git a/keyboards/handwired/woodpad/rules.mk b/keyboards/handwired/woodpad/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/handwired/woodpad/rules.mk +++ /dev/null @@ -1,12 +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 -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/z150/info.json b/keyboards/handwired/z150/keyboard.json similarity index 96% rename from keyboards/handwired/z150/info.json rename to keyboards/handwired/z150/keyboard.json index f027c7da1f7..0658bb52339 100644 --- a/keyboards/handwired/z150/info.json +++ b/keyboards/handwired/z150/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4"], "rows": ["B13", "B14", "B15", "A8", "A9", "A3", "A10", "A1", "A2", "A15", "A0"] diff --git a/keyboards/handwired/z150/rules.mk b/keyboards/handwired/z150/rules.mk deleted file mode 100644 index 421d72570ef..00000000000 --- a/keyboards/handwired/z150/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 -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/zergo/info.json b/keyboards/handwired/zergo/keyboard.json similarity index 96% rename from keyboards/handwired/zergo/info.json rename to keyboards/handwired/zergo/keyboard.json index 56b1b8f0cd9..7ee2cd4774e 100644 --- a/keyboards/handwired/zergo/info.json +++ b/keyboards/handwired/zergo/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xB92B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C7", "C6", "C5", "C4", "C2", "C1", "B7", "D3", "D2", "B6", "B5", "B4", "B3", "B2"], "rows": ["B1", "D7", "C3", "D6", "D5", "D4"] diff --git a/keyboards/handwired/zergo/rules.mk b/keyboards/handwired/zergo/rules.mk deleted file mode 100644 index 7d0adddded9..00000000000 --- a/keyboards/handwired/zergo/rules.mk +++ /dev/null @@ -1,12 +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 = 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 diff --git a/keyboards/hardlineworks/otd_plus/info.json b/keyboards/hardlineworks/otd_plus/keyboard.json similarity index 96% rename from keyboards/hardlineworks/otd_plus/info.json rename to keyboards/hardlineworks/otd_plus/keyboard.json index 6dcb95fa50d..50a7eb22246 100644 --- a/keyboards/hardlineworks/otd_plus/info.json +++ b/keyboards/hardlineworks/otd_plus/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0087", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "B7", "B0", "F1", "D7", "F7", "C7"], "rows": ["D2", "D4", "D1", "E6", "F5", "C6", "B6", "F6", "F0", "D0", "D6", "D3"] diff --git a/keyboards/hardlineworks/otd_plus/rules.mk b/keyboards/hardlineworks/otd_plus/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/hardlineworks/otd_plus/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 = 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/heliar/wm1_hotswap/info.json b/keyboards/heliar/wm1_hotswap/keyboard.json similarity index 95% rename from keyboards/heliar/wm1_hotswap/info.json rename to keyboards/heliar/wm1_hotswap/keyboard.json index b534f6e8d68..3fa1a8e6cb8 100644 --- a/keyboards/heliar/wm1_hotswap/info.json +++ b/keyboards/heliar/wm1_hotswap/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xD070", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D2", "B0", "B1", "B2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "F4", "F5", "F6", "F1"], "rows": ["D5", "D3", "B3", "F0", "E6"] diff --git a/keyboards/heliar/wm1_hotswap/rules.mk b/keyboards/heliar/wm1_hotswap/rules.mk deleted file mode 100644 index 201a97b6f2b..00000000000 --- a/keyboards/heliar/wm1_hotswap/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 = 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/hfdkb/ac001/info.json b/keyboards/hfdkb/ac001/keyboard.json similarity index 86% rename from keyboards/hfdkb/ac001/info.json rename to keyboards/hfdkb/ac001/keyboard.json index 4c45251504b..daf3e735f0e 100644 --- a/keyboards/hfdkb/ac001/info.json +++ b/keyboards/hfdkb/ac001/keyboard.json @@ -21,6 +21,15 @@ "react_on_keyup": true, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A5", "A6", "A7", "C4", "C5"], "rows": ["B15"] diff --git a/keyboards/hfdkb/ac001/rules.mk b/keyboards/hfdkb/ac001/rules.mk deleted file mode 100644 index 1358ab075a7..00000000000 --- a/keyboards/hfdkb/ac001/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/hhkb_lite_2/info.json b/keyboards/hhkb_lite_2/keyboard.json similarity index 95% rename from keyboards/hhkb_lite_2/info.json rename to keyboards/hhkb_lite_2/keyboard.json index 9b937416ccc..3e9099f0e5b 100644 --- a/keyboards/hhkb_lite_2/info.json +++ b/keyboards/hhkb_lite_2/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x88B2", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "C7", "C6", "D3", "D2", "D1"], "rows": ["F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3"] diff --git a/keyboards/hhkb_lite_2/rules.mk b/keyboards/hhkb_lite_2/rules.mk deleted file mode 100644 index 11e507797bb..00000000000 --- a/keyboards/hhkb_lite_2/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 -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 -UNICODE_ENABLE = yes diff --git a/keyboards/hifumi/info.json b/keyboards/hifumi/keyboard.json similarity index 86% rename from keyboards/hifumi/info.json rename to keyboards/hifumi/keyboard.json index 6c2f53aab83..457c8a73985 100644 --- a/keyboards/hifumi/info.json +++ b/keyboards/hifumi/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6"], "rows": ["D4", "C6"] diff --git a/keyboards/hifumi/rules.mk b/keyboards/hifumi/rules.mk deleted file mode 100644 index da7ffbbc488..00000000000 --- a/keyboards/hifumi/rules.mk +++ /dev/null @@ -1,13 +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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SWAP_HANDS_ENABLE = no # Enable one-hand typing diff --git a/keyboards/hineybush/h08_ocelot/info.json b/keyboards/hineybush/h08_ocelot/keyboard.json similarity index 87% rename from keyboards/hineybush/h08_ocelot/info.json rename to keyboards/hineybush/h08_ocelot/keyboard.json index 989e23e7574..0e6ccb732bc 100644 --- a/keyboards/hineybush/h08_ocelot/info.json +++ b/keyboards/hineybush/h08_ocelot/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xE8E9", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "C7", "D0", "D1"], "rows": ["B4", "B6"] diff --git a/keyboards/hineybush/h08_ocelot/rules.mk b/keyboards/hineybush/h08_ocelot/rules.mk deleted file mode 100644 index c09eb37bfd8..00000000000 --- a/keyboards/hineybush/h08_ocelot/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 = 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/hineybush/h10/info.json b/keyboards/hineybush/h10/keyboard.json similarity index 97% rename from keyboards/hineybush/h10/info.json rename to keyboards/hineybush/h10/keyboard.json index 295b34da10a..924acb515f9 100644 --- a/keyboards/hineybush/h10/info.json +++ b/keyboards/hineybush/h10/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xEBD8", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "C7", "B1", "B2"], "rows": ["B0", "C6", "B6", "B5", "B4", "D7"] diff --git a/keyboards/hineybush/h10/rules.mk b/keyboards/hineybush/h10/rules.mk deleted file mode 100644 index 432c9ea5d27..00000000000 --- a/keyboards/hineybush/h10/rules.mk +++ /dev/null @@ -1,12 +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 = yes # Console for debug -COMMAND_ENABLE = yes # 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/hineybush/h60/info.json b/keyboards/hineybush/h60/keyboard.json similarity index 98% rename from keyboards/hineybush/h60/info.json rename to keyboards/hineybush/h60/keyboard.json index 59820b17979..63d41a55b41 100644 --- a/keyboards/hineybush/h60/info.json +++ b/keyboards/hineybush/h60/keyboard.json @@ -8,6 +8,17 @@ "pid": "0xEBBE", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["B3", "D0", "D1", "D2", "D3", "D5", "D6", "C7", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["B6", "B5", "B4", "D7", "E6"] diff --git a/keyboards/hineybush/h60/rules.mk b/keyboards/hineybush/h60/rules.mk deleted file mode 100644 index 6764167b6b4..00000000000 --- a/keyboards/hineybush/h60/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SLEEP_LED_ENABLE = yes diff --git a/keyboards/hineybush/h65/info.json b/keyboards/hineybush/h65/keyboard.json similarity index 99% rename from keyboards/hineybush/h65/info.json rename to keyboards/hineybush/h65/keyboard.json index f6fd12edaa0..cacc673311e 100644 --- a/keyboards/hineybush/h65/info.json +++ b/keyboards/hineybush/h65/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xE9E4", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "B0", "B1", "B2", "B3"], "rows": ["D7", "D6", "D4", "D1", "D0"] diff --git a/keyboards/hineybush/h65/rules.mk b/keyboards/hineybush/h65/rules.mk deleted file mode 100644 index 85830d31150..00000000000 --- a/keyboards/hineybush/h65/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 = 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 diff --git a/keyboards/hineybush/h65_hotswap/info.json b/keyboards/hineybush/h65_hotswap/keyboard.json similarity index 98% rename from keyboards/hineybush/h65_hotswap/info.json rename to keyboards/hineybush/h65_hotswap/keyboard.json index 63b78036171..0cabdf074bb 100644 --- a/keyboards/hineybush/h65_hotswap/info.json +++ b/keyboards/hineybush/h65_hotswap/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xE8B7", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "B0", "B1", "B2", "B3"], "rows": ["D7", "D6", "D4", "D1", "D0"] diff --git a/keyboards/hineybush/h65_hotswap/rules.mk b/keyboards/hineybush/h65_hotswap/rules.mk deleted file mode 100644 index 85830d31150..00000000000 --- a/keyboards/hineybush/h65_hotswap/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 = 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 diff --git a/keyboards/hineybush/h660s/info.json b/keyboards/hineybush/h660s/keyboard.json similarity index 99% rename from keyboards/hineybush/h660s/info.json rename to keyboards/hineybush/h660s/keyboard.json index 6c5d07cc835..de658ff1296 100644 --- a/keyboards/hineybush/h660s/info.json +++ b/keyboards/hineybush/h660s/keyboard.json @@ -8,6 +8,17 @@ "pid": "0xEB1B", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], "rows": ["B1", "E6", "B3", "D3", "D2"] diff --git a/keyboards/hineybush/h660s/rules.mk b/keyboards/hineybush/h660s/rules.mk deleted file mode 100644 index 5ed3676575c..00000000000 --- a/keyboards/hineybush/h660s/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 -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 -SLEEP_LED_ENABLE = yes diff --git a/keyboards/hineybush/h75_singa/info.json b/keyboards/hineybush/h75_singa/keyboard.json similarity index 97% rename from keyboards/hineybush/h75_singa/info.json rename to keyboards/hineybush/h75_singa/keyboard.json index 22a04e509da..a313213e67e 100644 --- a/keyboards/hineybush/h75_singa/info.json +++ b/keyboards/hineybush/h75_singa/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xEC9A", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "B2", "D4", "D5", "D3"], "rows": ["B0", "B1", "D0", "D1", "D2", "D6"] diff --git a/keyboards/hineybush/h75_singa/rules.mk b/keyboards/hineybush/h75_singa/rules.mk deleted file mode 100644 index 0a394ac16e9..00000000000 --- a/keyboards/hineybush/h75_singa/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 = 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 diff --git a/keyboards/hineybush/hineyg80/info.json b/keyboards/hineybush/hineyg80/keyboard.json similarity index 99% rename from keyboards/hineybush/hineyg80/info.json rename to keyboards/hineybush/hineyg80/keyboard.json index 1d7b00d4db9..fa6e3401204 100644 --- a/keyboards/hineybush/hineyg80/info.json +++ b/keyboards/hineybush/hineyg80/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B7", "B0"], "rows": ["B2", "B3", "D0", "B1", "D2", "D1", "D5", "D3", "D6", "D4", "B4", "D7"] diff --git a/keyboards/hineybush/hineyg80/rules.mk b/keyboards/hineybush/hineyg80/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/hineybush/hineyg80/rules.mk +++ /dev/null @@ -1,12 +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 -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/hineybush/physix/info.json b/keyboards/hineybush/physix/keyboard.json similarity index 98% rename from keyboards/hineybush/physix/info.json rename to keyboards/hineybush/physix/keyboard.json index 60d86fbebb7..a08e09af185 100644 --- a/keyboards/hineybush/physix/info.json +++ b/keyboards/hineybush/physix/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xEC81", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "B1", "B0", "B5", "B4", "D7", "D6", "D4"], "rows": ["D0", "D1", "D2", "C7", "C6"] diff --git a/keyboards/hineybush/physix/rules.mk b/keyboards/hineybush/physix/rules.mk deleted file mode 100644 index 0922d3d5112..00000000000 --- a/keyboards/hineybush/physix/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 = 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 diff --git a/keyboards/hineybush/sm68/info.json b/keyboards/hineybush/sm68/keyboard.json similarity index 97% rename from keyboards/hineybush/sm68/info.json rename to keyboards/hineybush/sm68/keyboard.json index 234c595d481..d4280b6747f 100644 --- a/keyboards/hineybush/sm68/info.json +++ b/keyboards/hineybush/sm68/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xEC9F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D3", "D2"], "rows": ["B2", "B1", "B0", "D4", "D1"] diff --git a/keyboards/hineybush/sm68/rules.mk b/keyboards/hineybush/sm68/rules.mk deleted file mode 100644 index 3414d97c204..00000000000 --- a/keyboards/hineybush/sm68/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/hnahkb/freyr/info.json b/keyboards/hnahkb/freyr/keyboard.json similarity index 99% rename from keyboards/hnahkb/freyr/info.json rename to keyboards/hnahkb/freyr/keyboard.json index 26d1fc52d8a..4ddc37d3dce 100644 --- a/keyboards/hnahkb/freyr/info.json +++ b/keyboards/hnahkb/freyr/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1895", "device_version": "0.0.2" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "C6", "F5", "F6", "F7"], "rows": ["D3", "B2", "B1", "B0", "E6", "F0", "D2", "D5", "F4", "F1"] diff --git a/keyboards/hnahkb/freyr/rules.mk b/keyboards/hnahkb/freyr/rules.mk deleted file mode 100644 index 26064ab2ac9..00000000000 --- a/keyboards/hnahkb/freyr/rules.mk +++ /dev/null @@ -1,12 +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 = yes # Console for debug -COMMAND_ENABLE = yes # 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/hnahkb/stella/info.json b/keyboards/hnahkb/stella/keyboard.json similarity index 98% rename from keyboards/hnahkb/stella/info.json rename to keyboards/hnahkb/stella/keyboard.json index 98f8f721f30..13abbffbec2 100644 --- a/keyboards/hnahkb/stella/info.json +++ b/keyboards/hnahkb/stella/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0AB7", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "C6", "F5", "F6", "F7"], "rows": ["D3", "B2", "B1", "B0", "E6", "F0", "D2", "D5", "F4", "F1"] diff --git a/keyboards/hnahkb/stella/rules.mk b/keyboards/hnahkb/stella/rules.mk deleted file mode 100644 index b7e8d8e706b..00000000000 --- a/keyboards/hnahkb/stella/rules.mk +++ /dev/null @@ -1,12 +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 = yes # Console for debug -COMMAND_ENABLE = yes # 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 diff --git a/keyboards/holyswitch/southpaw75/info.json b/keyboards/holyswitch/southpaw75/keyboard.json similarity index 96% rename from keyboards/holyswitch/southpaw75/info.json rename to keyboards/holyswitch/southpaw75/keyboard.json index a99be3e1ce7..1483e1fc315 100644 --- a/keyboards/holyswitch/southpaw75/info.json +++ b/keyboards/holyswitch/southpaw75/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5350", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "F7", "F6", "F5", "F4", "D0", "D1", "D7", "B4"], "rows": ["B2", "F0", "C6", "D4", "D3", "F1", "D2", "B5", "D5"] diff --git a/keyboards/holyswitch/southpaw75/rules.mk b/keyboards/holyswitch/southpaw75/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/holyswitch/southpaw75/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 = 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/horizon/info.json b/keyboards/horizon/keyboard.json similarity index 95% rename from keyboards/horizon/info.json rename to keyboards/horizon/keyboard.json index 140194a9804..0d1c633e5fd 100644 --- a/keyboards/horizon/info.json +++ b/keyboards/horizon/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0"], "rows": ["D3", "D2", "D1", "F4"] diff --git a/keyboards/horizon/rules.mk b/keyboards/horizon/rules.mk deleted file mode 100644 index 03778480554..00000000000 --- a/keyboards/horizon/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 -COMMAND_ENABLE = no # Commands for debug and configuration -CONSOLE_ENABLE = yes # Console for debug -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/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/keyboard.json similarity index 99% rename from keyboards/horrortroll/chinese_pcb/black_e65/info.json rename to keyboards/horrortroll/chinese_pcb/black_e65/keyboard.json index 7ee7b8b3f88..cef69593d74 100644 --- a/keyboards/horrortroll/chinese_pcb/black_e65/info.json +++ b/keyboards/horrortroll/chinese_pcb/black_e65/keyboard.json @@ -9,6 +9,16 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/rules.mk b/keyboards/horrortroll/chinese_pcb/black_e65/rules.mk deleted file mode 100644 index 1955f1d315b..00000000000 --- a/keyboards/horrortroll/chinese_pcb/black_e65/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/keyboard.json similarity index 96% rename from keyboards/horrortroll/chinese_pcb/devil68_pro/info.json rename to keyboards/horrortroll/chinese_pcb/devil68_pro/keyboard.json index 6146bd517a8..77eac52ebd0 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keyboard.json @@ -58,6 +58,15 @@ "driver": "ws2812", "max_brightness": 200 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B1", "B0", "B5", "B6", "C6", "C7", "E2", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B7", "B3", "B2", "F6", "F7"] diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk b/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk deleted file mode 100644 index 138bf78056e..00000000000 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/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 = 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 enabled -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/horrortroll/paws60/info.json b/keyboards/horrortroll/paws60/keyboard.json similarity index 98% rename from keyboards/horrortroll/paws60/info.json rename to keyboards/horrortroll/paws60/keyboard.json index a8da9ee2c23..ac93b580a08 100644 --- a/keyboards/horrortroll/paws60/info.json +++ b/keyboards/horrortroll/paws60/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/horrortroll/paws60/rules.mk b/keyboards/horrortroll/paws60/rules.mk deleted file mode 100644 index 718a1e8d099..00000000000 --- a/keyboards/horrortroll/paws60/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/hp69/info.json b/keyboards/hp69/keyboard.json similarity index 96% rename from keyboards/hp69/info.json rename to keyboards/hp69/keyboard.json index e852321e897..83ed922a279 100644 --- a/keyboards/hp69/info.json +++ b/keyboards/hp69/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0001", "device_version": "0.1.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B12", "B15", "B10", "B13", "B14", "B11", "B8", "A0", "A1", "B5", "B0", "B2", "B6", "B1", "B4"], "rows": ["B3", "B7", "A10", "B9", "A9"] diff --git a/keyboards/hp69/rules.mk b/keyboards/hp69/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/hp69/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 = 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/huytbt/h50/info.json b/keyboards/huytbt/h50/keyboard.json similarity index 95% rename from keyboards/huytbt/h50/info.json rename to keyboards/huytbt/h50/keyboard.json index 4a7e60d3870..cd62966e58a 100644 --- a/keyboards/huytbt/h50/info.json +++ b/keyboards/huytbt/h50/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "B4", "B5", "D2", "D3"], "rows": ["D1", "D0", "D4", "C6"] diff --git a/keyboards/huytbt/h50/rules.mk b/keyboards/huytbt/h50/rules.mk deleted file mode 100644 index 88b3b117198..00000000000 --- a/keyboards/huytbt/h50/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Disable keyboard backlight functionality From add7c13d612e08180d575383dc12217b4d061884 Mon Sep 17 00:00:00 2001 From: Joe Scotto <8194147+joe-scotto@users.noreply.github.com> Date: Fri, 15 Mar 2024 01:03:23 -0400 Subject: [PATCH 033/333] Update ScottoAlp handwired keyboard to 12 column layout (#22962) Co-authored-by: Ryan --- .../handwired/scottokeebs/scottoalp/info.json | 100 +++++++++--------- .../scottoalp/keymaps/default/keymap.c | 40 +++---- .../handwired/scottokeebs/scottoalp/readme.md | 4 +- keyboards/scottokeebs/scotto34/info.json | 18 +++- 4 files changed, 90 insertions(+), 72 deletions(-) diff --git a/keyboards/handwired/scottokeebs/scottoalp/info.json b/keyboards/handwired/scottokeebs/scottoalp/info.json index 7a4210bb403..5bce6ae62c2 100644 --- a/keyboards/handwired/scottokeebs/scottoalp/info.json +++ b/keyboards/handwired/scottokeebs/scottoalp/info.json @@ -2,6 +2,12 @@ "manufacturer": "ScottoKeebs", "keyboard_name": "ScottoAlp", "maintainer": "joe-scotto", + "bootmagic": { + "matrix": [0, 1] + }, + "build": { + "lto": true + }, "development_board": "promicro", "diode_direction": "COL2ROW", "features": { @@ -13,10 +19,7 @@ "nkro": true }, "matrix_pins": { - // 4, 5, 6, 7, 8, 9, A3, A2, A1, A0 - "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7"], - - // 15, 14, 16, 10 + "cols": ["D1", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7", "D0"], "rows": ["B1", "B3", "B2", "B6"] }, "url": "https://scottokeebs.com", @@ -26,51 +29,52 @@ "vid": "0x534B" }, "layouts": { - "LAYOUT_ortho_3x10_5": { + "LAYOUT": { "layout": [ - // Row 1 - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 1], "x": 1, "y": 0 }, - { "matrix": [0, 2], "x": 2, "y": 0 }, - { "matrix": [0, 3], "x": 3, "y": 0 }, - { "matrix": [0, 4], "x": 4, "y": 0 }, - { "matrix": [0, 5], "x": 5, "y": 0 }, - { "matrix": [0, 6], "x": 6, "y": 0 }, - { "matrix": [0, 7], "x": 7, "y": 0 }, - { "matrix": [0, 8], "x": 8, "y": 0 }, - { "matrix": [0, 9], "x": 9, "y": 0 }, - - // Row 2 - { "matrix": [1, 0], "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1, "y": 1 }, - { "matrix": [1, 2], "x": 2, "y": 1 }, - { "matrix": [1, 3], "x": 3, "y": 1 }, - { "matrix": [1, 4], "x": 4, "y": 1 }, - { "matrix": [1, 5], "x": 5, "y": 1 }, - { "matrix": [1, 6], "x": 6, "y": 1 }, - { "matrix": [1, 7], "x": 7, "y": 1 }, - { "matrix": [1, 8], "x": 8, "y": 1 }, - { "matrix": [1, 9], "x": 9, "y": 1 }, - - // Row 3 - { "matrix": [2, 0], "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1, "y": 2 }, - { "matrix": [2, 2], "x": 2, "y": 2 }, - { "matrix": [2, 3], "x": 3, "y": 2 }, - { "matrix": [2, 4], "x": 4, "y": 2 }, - { "matrix": [2, 5], "x": 5, "y": 2 }, - { "matrix": [2, 6], "x": 6, "y": 2 }, - { "matrix": [2, 7], "x": 7, "y": 2 }, - { "matrix": [2, 8], "x": 8, "y": 2 }, - { "matrix": [2, 9], "x": 9, "y": 2 }, - - // Row 4 - { "matrix": [3, 1], "x": 1.5, "y": 3 }, - { "matrix": [3, 2], "x": 2.5, "y": 3 }, - { "matrix": [3, 4], "x": 3.5, "y": 3, "w": 3 }, - { "matrix": [3, 6], "x": 6.5, "y": 3 }, - { "matrix": [3, 7], "x": 7.5, "y": 3 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [3, 1], "x": 0, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3} ] } } -} +} \ No newline at end of file diff --git a/keyboards/handwired/scottokeebs/scottoalp/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottoalp/keymaps/default/keymap.c index 88b4a4b0b43..cc334629f69 100644 --- a/keyboards/handwired/scottokeebs/scottoalp/keymaps/default/keymap.c +++ b/keyboards/handwired/scottokeebs/scottoalp/keymaps/default/keymap.c @@ -18,28 +18,28 @@ along with this program. If not, see . #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ortho_3x10_5( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_BSPC, - LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH), - KC_LGUI, KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT) + [0] = LAYOUT( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_ENT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_BSPC, KC_QUOT, + KC_LSFT, LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH), KC_RSFT, + KC_ESC, KC_LGUI, KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT), KC_ESC ), - [1] = LAYOUT_ortho_3x10_5( - KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL, - KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, - LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS), - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + [1] = LAYOUT( + KC_TRNS, KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL, KC_TRNS, + KC_TRNS, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_TRNS, + KC_TRNS, LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS), KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [2] = LAYOUT_ortho_3x10_5( - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC, - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + [2] = LAYOUT( + KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC, KC_TRNS, + KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, + KC_TRNS, KC_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT_ortho_3x10_5( - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, - KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + [3] = LAYOUT( + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, + KC_TRNS, KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; \ No newline at end of file diff --git a/keyboards/handwired/scottokeebs/scottoalp/readme.md b/keyboards/handwired/scottokeebs/scottoalp/readme.md index 07c7d889de7..3f49d611992 100644 --- a/keyboards/handwired/scottokeebs/scottoalp/readme.md +++ b/keyboards/handwired/scottokeebs/scottoalp/readme.md @@ -2,7 +2,7 @@ ![ScottoAlp](https://i.imgur.com/XKpYcMgh.jpeg) -A 35-key ortholinear keyboard with a 3u spacebar and is compatible with both MX or Alps. Case files available [here](https://github.com/joe-scotto/scottokeebs). +A 35 or 43-key ortholinear keyboard with a 3u spacebar and is compatible with both MX or Alps. Case files available [here](https://github.com/joe-scotto/scottokeebs). * Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto) * Hardware Supported: ATmega32U4 @@ -22,6 +22,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: -* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Bootmagic reset**: Hold down the key at (0,1) in the matrix (usually the top left key or Escape) and plug in the keyboard * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file diff --git a/keyboards/scottokeebs/scotto34/info.json b/keyboards/scottokeebs/scotto34/info.json index 72a1801bead..ecf3fed933f 100644 --- a/keyboards/scottokeebs/scotto34/info.json +++ b/keyboards/scottokeebs/scotto34/info.json @@ -21,7 +21,7 @@ "url": "https://scottokeebs.com", "usb": { "device_version": "1.0.0", - "pid": "0x1013", + "pid": "0x1019", "vid": "0x534B" }, "ws2812": { @@ -29,7 +29,21 @@ "driver": "vendor" }, "rgblight": { - "led_count": 1 + "led_count": 5, + "default": { + "animation": "rainbow_swirl" + }, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "alternating": true, + "twinkle": true + } }, "community_layouts": ["split_3x5_2"], "layouts": { From 68e8d74188a251336bf2eaa8d58e1e04983ac29e Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Thu, 14 Mar 2024 22:15:44 -0700 Subject: [PATCH 034/333] [Keyboard] Overhaul ploopyco devices (#22967) --- keyboards/ploopyco/{ => common}/opt_encoder.h | 0 .../opt_encoder_default.c} | 14 +- .../{ => common}/opt_encoder_simple.c | 29 +-- keyboards/ploopyco/common/opt_encoder_tiny.c | 116 +++++++++ keyboards/ploopyco/madromys/config.h | 5 +- keyboards/ploopyco/madromys/info.json | 4 +- keyboards/ploopyco/madromys/madromys.c | 176 ------------- keyboards/ploopyco/madromys/madromys.h | 37 --- keyboards/ploopyco/madromys/readme.md | 15 +- keyboards/ploopyco/mouse/config.h | 5 + keyboards/ploopyco/mouse/info.json | 12 +- .../mouse/keymaps/drag_scroll/keymap.c | 27 -- .../mouse/keymaps/drag_scroll/readme.md | 3 - keyboards/ploopyco/mouse/mouse.h | 49 ---- keyboards/ploopyco/mouse/readme.md | 46 +--- keyboards/ploopyco/mouse/rules.mk | 17 -- .../ploopyco/{mouse/mouse.c => ploopyco.c} | 159 ++++++------ .../{trackball/trackball.h => ploopyco.h} | 8 - keyboards/ploopyco/post_rules.mk | 12 + keyboards/ploopyco/readme.md | 45 ++++ keyboards/ploopyco/trackball/config.h | 6 + keyboards/ploopyco/trackball/info.json | 6 + .../trackball/keymaps/drag_scroll/keymap.c | 30 --- .../trackball/keymaps/drag_scroll/readme.md | 3 - keyboards/ploopyco/trackball/readme.md | 43 +--- keyboards/ploopyco/trackball/rules.mk | 17 -- keyboards/ploopyco/trackball/trackball.c | 243 ------------------ keyboards/ploopyco/trackball_mini/config.h | 5 + keyboards/ploopyco/trackball_mini/info.json | 9 +- .../keymaps/drag_scroll/keymap.c | 66 ----- .../keymaps/drag_scroll/readme.md | 5 - keyboards/ploopyco/trackball_mini/readme.md | 50 +--- keyboards/ploopyco/trackball_mini/rules.mk | 17 -- .../ploopyco/trackball_mini/trackball_mini.c | 214 --------------- .../ploopyco/trackball_mini/trackball_mini.h | 49 ---- keyboards/ploopyco/trackball_nano/info.json | 3 + .../trackball_nano/keymaps/lkbm/keymap.c | 167 ------------ .../trackball_nano/keymaps/lkbm/readme.md | 2 - .../trackball_nano/keymaps/lkbm/rules.mk | 1 - keyboards/ploopyco/trackball_nano/readme.md | 19 +- keyboards/ploopyco/trackball_nano/rules.mk | 13 - .../ploopyco/trackball_nano/trackball_nano.c | 115 --------- .../ploopyco/trackball_nano/trackball_nano.h | 37 --- keyboards/ploopyco/trackball_thumb/config.h | 16 +- .../keymaps/drag_scroll/keymap.c | 30 --- .../keymaps/drag_scroll/readme.md | 3 - .../trackball_thumb/keymaps/via/rules.mk | 1 + keyboards/ploopyco/trackball_thumb/readme.md | 41 +-- keyboards/ploopyco/trackball_thumb/rules.mk | 4 - .../trackball_thumb/trackball_thumb.c | 225 ---------------- .../trackball_thumb/trackball_thumb.h | 45 ---- 51 files changed, 355 insertions(+), 1909 deletions(-) rename keyboards/ploopyco/{ => common}/opt_encoder.h (100%) rename keyboards/ploopyco/{opt_encoder.c => common/opt_encoder_default.c} (93%) rename keyboards/ploopyco/{ => common}/opt_encoder_simple.c (85%) create mode 100644 keyboards/ploopyco/common/opt_encoder_tiny.c delete mode 100644 keyboards/ploopyco/madromys/madromys.c delete mode 100644 keyboards/ploopyco/madromys/madromys.h delete mode 100644 keyboards/ploopyco/mouse/keymaps/drag_scroll/keymap.c delete mode 100644 keyboards/ploopyco/mouse/keymaps/drag_scroll/readme.md delete mode 100644 keyboards/ploopyco/mouse/mouse.h rename keyboards/ploopyco/{mouse/mouse.c => ploopyco.c} (58%) rename keyboards/ploopyco/{trackball/trackball.h => ploopyco.h} (89%) create mode 100644 keyboards/ploopyco/post_rules.mk create mode 100644 keyboards/ploopyco/readme.md delete mode 100644 keyboards/ploopyco/trackball/keymaps/drag_scroll/keymap.c delete mode 100644 keyboards/ploopyco/trackball/keymaps/drag_scroll/readme.md delete mode 100644 keyboards/ploopyco/trackball/trackball.c delete mode 100644 keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/keymap.c delete mode 100644 keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/readme.md delete mode 100644 keyboards/ploopyco/trackball_mini/trackball_mini.c delete mode 100644 keyboards/ploopyco/trackball_mini/trackball_mini.h delete mode 100644 keyboards/ploopyco/trackball_nano/keymaps/lkbm/keymap.c delete mode 100644 keyboards/ploopyco/trackball_nano/keymaps/lkbm/readme.md delete mode 100644 keyboards/ploopyco/trackball_nano/keymaps/lkbm/rules.mk delete mode 100644 keyboards/ploopyco/trackball_nano/trackball_nano.c delete mode 100644 keyboards/ploopyco/trackball_nano/trackball_nano.h delete mode 100644 keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/keymap.c delete mode 100644 keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/readme.md delete mode 100644 keyboards/ploopyco/trackball_thumb/trackball_thumb.c delete mode 100644 keyboards/ploopyco/trackball_thumb/trackball_thumb.h diff --git a/keyboards/ploopyco/opt_encoder.h b/keyboards/ploopyco/common/opt_encoder.h similarity index 100% rename from keyboards/ploopyco/opt_encoder.h rename to keyboards/ploopyco/common/opt_encoder.h diff --git a/keyboards/ploopyco/opt_encoder.c b/keyboards/ploopyco/common/opt_encoder_default.c similarity index 93% rename from keyboards/ploopyco/opt_encoder.c rename to keyboards/ploopyco/common/opt_encoder_default.c index 226db0a8094..cc8d3b7e22a 100644 --- a/keyboards/ploopyco/opt_encoder.c +++ b/keyboards/ploopyco/common/opt_encoder_default.c @@ -142,7 +142,7 @@ int8_t opt_encoder_handler(uint16_t curA, uint16_t curB) { } } - else { // state must be LOHI + else { // state must be LOHI if (sA == HI && sB == HI) { state = HIHI; lohif = true; @@ -157,9 +157,13 @@ int8_t opt_encoder_handler(uint16_t curA, uint16_t curB) { return ret; } -void calculateThresholdA(int curA) { scrollThresholdA = calculateThreshold(curA, &lowA, &highA, &cLowA, &cHighA, arLowA, arHighA, &lowIndexA, &highIndexA, &lowOverflowA, &highOverflowA); } +void calculateThresholdA(int curA) { + scrollThresholdA = calculateThreshold(curA, &lowA, &highA, &cLowA, &cHighA, arLowA, arHighA, &lowIndexA, &highIndexA, &lowOverflowA, &highOverflowA); +} -void calculateThresholdB(int curB) { scrollThresholdB = calculateThreshold(curB, &lowB, &highB, &cLowB, &cHighB, arLowB, arHighB, &lowIndexB, &highIndexB, &lowOverflowB, &highOverflowB); } +void calculateThresholdB(int curB) { + scrollThresholdB = calculateThreshold(curB, &lowB, &highB, &cLowB, &cHighB, arLowB, arHighB, &lowIndexB, &highIndexB, &lowOverflowB, &highOverflowB); +} int calculateThreshold(int cur, int* low, int* high, bool* cLow, bool* cHigh, int arLow[], int arHigh[], int* lowIndex, int* highIndex, bool* lowOverflow, bool* highOverflow) { if (cur < *low) *low = cur; @@ -236,7 +240,9 @@ int calculateThreshold(int cur, int* low, int* high, bool* cLow, bool* cHigh, in return thresholdEquation(calcLow, calcHigh); } -int thresholdEquation(int lo, int hi) { return ((hi - lo) / 3) + lo; } +int thresholdEquation(int lo, int hi) { + return ((hi - lo) / 3) + lo; +} void incrementIndex(int* index, bool* ovflw) { if (*index < SCROLLER_AR_SIZE - 1) diff --git a/keyboards/ploopyco/opt_encoder_simple.c b/keyboards/ploopyco/common/opt_encoder_simple.c similarity index 85% rename from keyboards/ploopyco/opt_encoder_simple.c rename to keyboards/ploopyco/common/opt_encoder_simple.c index c30deb9ca4b..9c1bbb8577b 100644 --- a/keyboards/ploopyco/opt_encoder_simple.c +++ b/keyboards/ploopyco/common/opt_encoder_simple.c @@ -63,7 +63,7 @@ typedef enum { CALIBRATION, /* Recalibrate encoder state by waiting for a 01 -> 00 or 10 -> 00 transistion */ - DECODE /* Translate changes in the encoder state into movement */ + DECODE /* Translate changes in the encoder state into movement */ } encoder_state_t; static encoder_state_t mode; @@ -87,15 +87,14 @@ static const uint8_t movement[] = { // 10 -> 00, 01, 10, 11 MOVE_DOWN, MOVE_ERR, MOVE_NONE, MOVE_UP, // 11 -> 00, 01, 10, 11 - MOVE_ERR, MOVE_UP, MOVE_DOWN, MOVE_NONE -}; + MOVE_ERR, MOVE_UP, MOVE_DOWN, MOVE_NONE}; void opt_encoder_init(void) { - mode = CALIBRATION; + mode = CALIBRATION; lastState = 0; - lowA = ENCODER_MAX; - lowB = ENCODER_MAX; + lowA = ENCODER_MAX; + lowB = ENCODER_MAX; highA = ENCODER_MIN; highB = ENCODER_MIN; } @@ -104,26 +103,22 @@ int8_t opt_encoder_handler(uint16_t encA, uint16_t encB) { int8_t result = 0; highA = MAX(encA, highA); - lowA = MIN(encA, lowA); + lowA = MIN(encA, lowA); highB = MAX(encB, highB); - lowB = MIN(encB, lowB); + lowB = MIN(encB, lowB); /* Only compute the thresholds after a large enough range is established */ if (highA - lowA > SCROLL_THRESH_RANGE_LIM && highB - lowB > SCROLL_THRESH_RANGE_LIM) { - const int16_t lowThresholdA = (highA + lowA) / 4; + const int16_t lowThresholdA = (highA + lowA) / 4; const int16_t highThresholdA = (highA + lowA) - lowThresholdA; - const int16_t lowThresholdB = (highB + lowB) / 4; + const int16_t lowThresholdB = (highB + lowB) / 4; const int16_t highThresholdB = (highB + lowB) - lowThresholdB; - uint8_t state = MAKE_STATE( - STATE_A(lastState) ? encA > lowThresholdA : encA > highThresholdA, - STATE_B(lastState) ? encB > lowThresholdB : encB > highThresholdB - ); + uint8_t state = MAKE_STATE(STATE_A(lastState) ? encA > lowThresholdA : encA > highThresholdA, STATE_B(lastState) ? encB > lowThresholdB : encB > highThresholdB); switch (mode) { case CALIBRATION: - if ((lastState == HILO && state == LOLO) - || (lastState == LOHI && state == LOLO)) + if ((lastState == HILO && state == LOLO) || (lastState == LOHI && state == LOLO)) mode = DECODE; else mode = CALIBRATION; @@ -134,7 +129,7 @@ int8_t opt_encoder_handler(uint16_t encA, uint16_t encB) { /* If we detect a state change that should not be possible, * then the wheel might have moved too fast and we need to * recalibrate the encoder position. */ - mode = result == MOVE_ERR ? CALIBRATION : mode; + mode = result == MOVE_ERR ? CALIBRATION : mode; result = result == MOVE_ERR ? MOVE_NONE : result; break; diff --git a/keyboards/ploopyco/common/opt_encoder_tiny.c b/keyboards/ploopyco/common/opt_encoder_tiny.c new file mode 100644 index 00000000000..29796a5fa63 --- /dev/null +++ b/keyboards/ploopyco/common/opt_encoder_tiny.c @@ -0,0 +1,116 @@ +/* Copyright 2023 Leorize + * Copyright 2011 Ben Buxton + * + * 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 . + */ +#include "opt_encoder.h" +#include +#include + +/* An extremely simple implementation of the encoder: + * + * For read out, the mechanism mimics that of a Schmitt trigger, with + * statically defined high/low thresholds used instead of computing + * one at runtime. + * + * The advantage of this approach is computing less in the decoder + * implementation and allow the state to be measured before the wheel + * moved. + * + * Compared to opt_encoder_simple.c, the use of an intermediary state + * reduces sensitivity and de-sensitize against tiny movements caused + * when lifting finger off the wheel. + * + * For turning decoded values into rotation, an algorithm inspired by + * http://www.buxtronix.net/2011/10/rotary-encoders-done-properly.html + * is employed. + */ + +#if !defined(ENCODER_LOW_THRES_A) || !defined(ENCODER_HIGH_THRES_A) +# error "The thresholds for phototransistors A is not defined in config.h" +#endif +#if !defined(ENCODER_LOW_THRES_B) || !defined(ENCODER_HIGH_THRES_B) +# error "The thresholds for phototransistors B is not defined in config.h" +#endif +/* + * Sample values, captured for a Ploopy Mini Trackball + * + * The following min-max values was captured by aggregating data recorded + * when debug_encoder is enabled: + * + * A: min: 0, max: 214 + * B: min: 0, max: 204 + * + * The threshold specified is then defined at the 1/4 and the 3/4 points. + * + * As these values might vary between units, you're encouraged to + * measure your own. + */ +#if 0 +# define ENCODER_LOW_THRES_A 53 +# define ENCODER_HIGH_THRES_A 161 +# define ENCODER_LOW_THRES_B 52 +# define ENCODER_HIGH_THRES_B 153 +#endif + +/* Utilities for composing the encoder state */ +#define MAKE_STATE(HI_A, HI_B) (((uint8_t)((HI_A) & 0x1) << 1) | ((uint8_t)((HI_B) & 0x1))) +#define STATE_A(st) ((st & 0x2) >> 1) +#define STATE_B(st) (st & 0x1) + +typedef enum { + START, + DOWN_BEGIN, + UP_BEGIN, + START_MID, + DOWN_BEGIN_MID, + UP_BEGIN_MID, + STATE_MASK = 0xf, /* 0b1111 */ + EMIT_UP = 0x10, + EMIT_UP_MID = EMIT_UP & START_MID, + EMIT_DOWN = 0x80, + EMIT_DOWN_MID = EMIT_DOWN & START_MID, + EMIT_MASK = 0xf0 +} encoder_state_t; + +static encoder_state_t state; +static uint8_t encState; + +static const uint8_t transitions[] = { + // clang-format off + // START -> 00, 01, 10, 11 + START, DOWN_BEGIN, UP_BEGIN, START_MID, + // DOWN_BEGIN -> 00, 01, 10, 11 + START, DOWN_BEGIN, START, EMIT_DOWN_MID, + // UP_BEGIN -> 00, 01, 10, 11 + START, START, UP_BEGIN, EMIT_UP_MID, + // START_MID -> 00, 01, 10, 11 + START, UP_BEGIN_MID, DOWN_BEGIN_MID, START_MID, + // DOWN_BEGIN_MID -> 00, 01, 10, 11 + EMIT_DOWN, START_MID, DOWN_BEGIN_MID, START_MID, + // UP_BEGIN_MID -> 00, 01, 10, 11 + EMIT_UP, UP_BEGIN_MID, START_MID, START_MID, + // clang-format on +}; + +void opt_encoder_init(void) { + state = START; + encState = 0; +} + +int8_t opt_encoder_handler(uint16_t encA, uint16_t encB) { + encState = MAKE_STATE((STATE_A(encState) & (encA > ENCODER_LOW_THRES_A)) | (encA > ENCODER_HIGH_THRES_A), (STATE_B(encState) & (encB > ENCODER_LOW_THRES_B)) | (encB > ENCODER_HIGH_THRES_B)); + state = transitions[((state & STATE_MASK) << 2) + encState]; + return state & EMIT_MASK; +} diff --git a/keyboards/ploopyco/madromys/config.h b/keyboards/ploopyco/madromys/config.h index 19fa1fada40..db600a16d1f 100644 --- a/keyboards/ploopyco/madromys/config.h +++ b/keyboards/ploopyco/madromys/config.h @@ -18,6 +18,9 @@ #pragma once +#define UNUSABLE_PINS \ + { GP1, GP3, GP4, GP6, GP8, GP10, GP14, GP16, GP18, GP20, GP22, GP24, GP25, GP26, GP27, GP28, GP29 } + // #define ROTATIONAL_TRANSFORM_ANGLE 0 #define POINTING_DEVICE_INVERT_Y @@ -26,4 +29,4 @@ #define PMW33XX_CS_PIN GP5 #define SPI_SCK_PIN GP2 #define SPI_MISO_PIN GP0 -#define SPI_MOSI_PIN GP7 \ No newline at end of file +#define SPI_MOSI_PIN GP7 diff --git a/keyboards/ploopyco/madromys/info.json b/keyboards/ploopyco/madromys/info.json index e39f593df9f..b5e74d3bc2d 100644 --- a/keyboards/ploopyco/madromys/info.json +++ b/keyboards/ploopyco/madromys/info.json @@ -15,7 +15,7 @@ "extrakey": true, "mousekey": true, "nkro": true, - "pointing_device": true, + "pointing_device": true }, "layouts": { "LAYOUT": { @@ -31,5 +31,5 @@ }, "dynamic_keymap": { "layer_count": 8 - }, + } } diff --git a/keyboards/ploopyco/madromys/madromys.c b/keyboards/ploopyco/madromys/madromys.c deleted file mode 100644 index 8ea1bcdbd78..00000000000 --- a/keyboards/ploopyco/madromys/madromys.c +++ /dev/null @@ -1,176 +0,0 @@ -/* Copyright 2023 Colin Lam (Ploopy Corporation) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * - * 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 . - */ - -#include "madromys.h" - -#ifndef PLOOPY_DPI_OPTIONS -# define PLOOPY_DPI_OPTIONS \ - { 600, 900, 1200, 1600 } -# ifndef PLOOPY_DPI_DEFAULT -# define PLOOPY_DPI_DEFAULT 1 -# endif -#endif -#ifndef PLOOPY_DPI_DEFAULT -# define PLOOPY_DPI_DEFAULT 0 -#endif -#ifndef PLOOPY_DRAGSCROLL_DPI -# define PLOOPY_DRAGSCROLL_DPI 100 // Fixed-DPI Drag Scroll -#endif -#ifndef PLOOPY_DRAGSCROLL_FIXED -# define PLOOPY_DRAGSCROLL_FIXED 1 -#endif -#ifndef PLOOPY_DRAGSCROLL_MULTIPLIER -# define PLOOPY_DRAGSCROLL_MULTIPLIER 0.75 // Variable-DPI Drag Scroll -#endif -#ifndef PLOOPY_DRAGSCROLL_SEMAPHORE -# define PLOOPY_DRAGSCROLL_SEMAPHORE 4 -#endif -#ifndef PLOOPY_DRAGSCROLL_MOMENTARY -# define PLOOPY_DRAGSCROLL_MOMENTARY 1 -#endif -#ifndef PLOOPY_DRAGSCROLL_INVERT -# define PLOOPY_DRAGSCROLL_INVERT 1 -#endif - -keyboard_config_t keyboard_config; -uint16_t dpi_array[] = PLOOPY_DPI_OPTIONS; -#define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t)) - -// TODO: Implement libinput profiles -// https://wayland.freedesktop.org/libinput/doc/latest/pointer-acceleration.html -// Compile time accel selection -// Valid options are ACC_NONE, ACC_LINEAR, ACC_CUSTOM, ACC_QUADRATIC - -// Trackball State -bool is_drag_scroll = false; - -// drag scroll divisor state -int8_t drag_scroll_x_semaphore = 0; -int8_t drag_scroll_y_semaphore = 0; - -report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) { - if (is_drag_scroll) { - int16_t mouse_report_x_temp = mouse_report.x; - int16_t mouse_report_y_temp = mouse_report.y; - int16_t mouse_report_x_calc = 0; - int16_t mouse_report_y_calc = 0; - int16_t valx = (mouse_report_x_temp > 0) ? -1 : 1; - int16_t valy = (mouse_report_y_temp > 0) ? -1 : 1; - - while (mouse_report_x_temp != 0) { - mouse_report_x_temp += valx; - drag_scroll_x_semaphore -= valx; - - if (abs(drag_scroll_x_semaphore) >= PLOOPY_DRAGSCROLL_SEMAPHORE) { - mouse_report_x_calc -= valx; - drag_scroll_x_semaphore = 0; - } - } - - while (mouse_report_y_temp != 0) { - mouse_report_y_temp += valy; - drag_scroll_y_semaphore -= valy; - - if (abs(drag_scroll_y_semaphore) >= PLOOPY_DRAGSCROLL_SEMAPHORE) { - mouse_report_y_calc -= valy; - drag_scroll_y_semaphore = 0; - } - } - - mouse_report.h = mouse_report_x_calc; - -#ifdef PLOOPY_DRAGSCROLL_INVERT - // Invert vertical scroll direction - mouse_report.v = -mouse_report_y_calc; -#else - mouse_report.v = mouse_report_y_calc; -#endif - mouse_report.x = 0; - mouse_report.y = 0; - } - - return pointing_device_task_user(mouse_report); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t* record) { - if (!process_record_user(keycode, record)) { - return false; - } - - if (keycode == DPI_CONFIG && record->event.pressed) { - keyboard_config.dpi_config = (keyboard_config.dpi_config + 1) % DPI_OPTION_SIZE; - eeconfig_update_kb(keyboard_config.raw); - pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]); - } - - if (keycode == DRAG_SCROLL) { -#ifndef PLOOPY_DRAGSCROLL_MOMENTARY - if (record->event.pressed) -#endif - { - is_drag_scroll ^= 1; - } -#ifdef PLOOPY_DRAGSCROLL_FIXED - pointing_device_set_cpi(is_drag_scroll ? PLOOPY_DRAGSCROLL_DPI : dpi_array[keyboard_config.dpi_config]); -#else - pointing_device_set_cpi(is_drag_scroll ? (dpi_array[keyboard_config.dpi_config] * PLOOPY_DRAGSCROLL_MULTIPLIER) : dpi_array[keyboard_config.dpi_config]); -#endif - } - - return true; -} - -// Hardware Setup -void keyboard_pre_init_kb(void) { - // debug_enable = true; - // debug_matrix = true; - // debug_mouse = true; - // debug_encoder = true; - - /* Ground all output pins connected to ground. This provides additional - * pathways to ground. If you're messing with this, know this: driving ANY - * of these pins high will cause a short. On the MCU. Ka-blooey. - */ - const pin_t unused_pins[] = { GP1, GP3, GP4, GP6, GP8, GP10, GP14, GP16, - GP18, GP20, GP22, GP24, GP25, GP26, GP27, GP28, GP29 }; - - for (uint8_t i = 0; i < (sizeof(unused_pins) / sizeof(pin_t)); i++) { - setPinOutput(unused_pins[i]); - writePinLow(unused_pins[i]); - } - - keyboard_pre_init_user(); -} - -void pointing_device_init_kb(void) { pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]); } - -void eeconfig_init_kb(void) { - keyboard_config.dpi_config = PLOOPY_DPI_DEFAULT; - eeconfig_update_kb(keyboard_config.raw); - eeconfig_init_user(); -} - -void matrix_init_kb(void) { - // is safe to just read DPI setting since matrix init - // comes before pointing device init. - keyboard_config.raw = eeconfig_read_kb(); - if (keyboard_config.dpi_config > DPI_OPTION_SIZE) { - eeconfig_init_kb(); - } - matrix_init_user(); -} diff --git a/keyboards/ploopyco/madromys/madromys.h b/keyboards/ploopyco/madromys/madromys.h deleted file mode 100644 index 944cce937b4..00000000000 --- a/keyboards/ploopyco/madromys/madromys.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2023 Colin Lam (Ploopy Corporation) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * - * 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 - -#include "quantum.h" - -typedef union { - uint32_t raw; - struct { - uint8_t dpi_config; - }; -} keyboard_config_t; -_Static_assert(sizeof(keyboard_config_t) == sizeof(uint32_t), "keyboard_config_t size mismatch compared to EEPROM area"); - -extern keyboard_config_t keyboard_config; -extern uint16_t dpi_array[]; - -enum ploopy_keycodes { - DPI_CONFIG = QK_KB_0, - DRAG_SCROLL, -}; diff --git a/keyboards/ploopyco/madromys/readme.md b/keyboards/ploopyco/madromys/readme.md index 456a3c7db20..4f9d7579539 100644 --- a/keyboards/ploopyco/madromys/readme.md +++ b/keyboards/ploopyco/madromys/readme.md @@ -27,17 +27,6 @@ If you want to upload a new firmware file (a ".uf2" file, like "madromys_awesome **TIP**: If your firmware is in some kind of strange state and uploading new firmware isn't fixing it, try uploading [a flash nuke](https://learn.adafruit.com/getting-started-with-raspberry-pi-pico-circuitpython/circuitpython#flash-resetting-uf2-3083182) to the Madromys board before flashing the new firmware. It wipes the memory of the Madromys board completely clean, which can help clear a few types of errors. -# Drag Scroll +# Customizing your Ploopy Madromys -Drag Scroll is a custom keycode for Ploopy devices that allows you to hold or tap a button and have the mouse movement translate into scrolling instead. - -Nothing needs to be enabled to use this functionality; it's enabled on Madromys by default. - -### Drag Scroll Configuration - -* `#define PLOOPY_DRAGSCROLL_MOMENTARY` - Makes the key into a momentary key, rather than a toggle. -* `#define PLOOPY_DRAGSCROLL_MULTIPLIER 0.75` - Sets the DPI multiplier to use when drag scroll is enabled. -* `#define PLOOPY_DRAGSCROLL_FIXED` - Normally, when activating Drag Scroll, it uses a fraction of the current DPI. You can define this to use a specific, set DPI rather than a fraction of the current DPI. - * `#define PLOOPY_DRAGSCROLL_DPI 100` - When the fixed DPI option is enabled, this sets the DPI to be used for Drag Scroll. -* `#define PLOOPY_DRAGSCROLL_INVERT` - This reverses the direction that the scroll is performed. -* `#define PLOOPY_DRAGSCROLL_SEMAPHORE` - This is a divisor on the drag scroll sensitivity. The default is 0, which means that the drag scroll is at maximum sensitivity. A value of 4 would mean that the drag scroll is 4 times less sensitive. \ No newline at end of file +You can find customziation options [here](../readme.md). diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h index 86af11fc94b..0375a8875a4 100644 --- a/keyboards/ploopyco/mouse/config.h +++ b/keyboards/ploopyco/mouse/config.h @@ -33,5 +33,10 @@ /* PMW33XX Settings */ #define PMW33XX_CS_PIN B0 +#define ENCODER_BUTTON_COL 1 +#define ENCODER_BUTTON_ROW 0 /* Custom encoder needs to specify just how many encoders we have */ #define NUM_ENCODERS 1 + +#define ENCODERS_PAD_A { F0 } +#define ENCODERS_PAD_B { F4 } diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json index 1f110aad71f..e24572cc54c 100644 --- a/keyboards/ploopyco/mouse/info.json +++ b/keyboards/ploopyco/mouse/info.json @@ -9,6 +9,15 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "pointing_device": true, + "rgblight": false, + "encoder": true + }, "bootmagic": { "matrix": [0, 3] }, @@ -31,9 +40,6 @@ ["D4", "D2", "E6", "B6", "D7", "C6", "C7", "B7"] ] }, - "features": { - "encoder": true - }, "encoder": { "driver": "custom" }, diff --git a/keyboards/ploopyco/mouse/keymaps/drag_scroll/keymap.c b/keyboards/ploopyco/mouse/keymaps/drag_scroll/keymap.c deleted file mode 100644 index a072dfceca9..00000000000 --- a/keyboards/ploopyco/mouse/keymaps/drag_scroll/keymap.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2020 Ploopy Corporation - * - * 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 . - */ -#include QMK_KEYBOARD_H - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT(/* Base */ - C(KC_C), KC_BTN1, KC_BTN3, LT(1, KC_BTN2), C(KC_V), KC_BTN4, KC_BTN5, DPI_CONFIG), - [1] = LAYOUT(/* Base */ - _______, DRAG_SCROLL, _______, _______, _______, _______, _______, QK_BOOT), - -}; diff --git a/keyboards/ploopyco/mouse/keymaps/drag_scroll/readme.md b/keyboards/ploopyco/mouse/keymaps/drag_scroll/readme.md deleted file mode 100644 index ddf5eb7084e..00000000000 --- a/keyboards/ploopyco/mouse/keymaps/drag_scroll/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The Drag Scroll keymap for PloopyCo Mouse - -This is a sample keymap showing off what you can do with the custom callback drivers. diff --git a/keyboards/ploopyco/mouse/mouse.h b/keyboards/ploopyco/mouse/mouse.h deleted file mode 100644 index 9123315fd4f..00000000000 --- a/keyboards/ploopyco/mouse/mouse.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2020 Ploopy Corporation - * - * 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 - -#include "quantum.h" -#include "analog.h" -#include "opt_encoder.h" - -// Sensor defs -#define OPT_ENC1 F0 -#define OPT_ENC2 F4 -#define OPT_ENC1_MUX 0 -#define OPT_ENC2_MUX 4 - -void process_wheel(void); - -typedef union { - uint32_t raw; - struct { - uint8_t dpi_config; - }; -} keyboard_config_t; - -extern keyboard_config_t keyboard_config; -extern uint16_t dpi_array[]; - -enum ploopy_keycodes { - DPI_CONFIG = QK_KB_0, - DRAG_SCROLL, -}; - -bool encoder_update_user(uint8_t index, bool clockwise); -bool encoder_update_kb(uint8_t index, bool clockwise); diff --git a/keyboards/ploopyco/mouse/readme.md b/keyboards/ploopyco/mouse/readme.md index af3cb3520fe..060448c2bf2 100644 --- a/keyboards/ploopyco/mouse/readme.md +++ b/keyboards/ploopyco/mouse/readme.md @@ -19,48 +19,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to # Customizing your PloopyCo Mouse -While the defaults are designed so that it can be plugged in and used right away, there are a number of things that you may want to change. Such as adding DPI control, or to use the ball to scroll while holding a button. To allow for this sort of control, there is a callback for both the scroll wheel and the mouse sensor. - -The default behavior for this is: - -```c -void process_wheel_user(report_mouse_t* mouse_report, int16_t h, int16_t v) { - mouse_report->h = h; - mouse_report->v = v; -} - -void process_mouse_user(report_mouse_t* mouse_report, int16_t x, int16_t y) { - mouse_report->x = x; - mouse_report->y = y; -} -``` - -This should allow you to more heavily customize the behavior. - -Alternatively, the `process_wheel` and `process_mouse` functions can both be replaced too, to allow for even more functionality. - -Additionally, you can change the DPI/CPI or speed of the trackball by calling `pointing_device_set_cpi` at any time. Additionally, there is a `DPI_CONFIG` macro that will cycle through an array of options for the DPI. This is set to 1200, 1600, and 2400, but can be changed. 1600 is also set to the default. - -To configure/set your own array, there are two defines to use, `PLOOPY_DPI_OPTIONS` to set the array, and `PLOOPY_DPI_DEFAULT`. - -```c -#define PLOOPY_DPI_OPTIONS { 1200, 1600, 2400 } -#define PLOOPY_DPI_DEFAULT 1 -``` -The `PLOOPY_DPI_OPTIONS` array sets the values that you want to be able to cycle through, and the order they are in. The "default" define lets the firmware know which of these options is the default and should be loaded by default. - -The `DPI_CONFIG` macro will cycle through the values in the array, each time you hit it. And it stores this value in persistent memory, so it will load it the next time the device powers up. - -## Drag Scroll - -Drag Sroll is a custom keycode for the Ploopy devices that allow you to hold or tap a button and have the mouse movement translate into scrolling instead. - -Nothing needs to be enabled to use this functionality. Just add the `DRAG_SCROLL` to your keymap. - -### Drag Scroll Configuration - -* `#define PLOOPY_DRAGSCROLL_MOMENTARY` - Makes the key into a momentary key, rather than a toggle. -* `#define PLOOPY_DRAGSCROLL_MULTIPLIER 0.75` - Sets the DPI multiplier to use when drag scroll is enabled. -* `#define PLOOPY_DRAGSCROLL_FIXED` - Normally, when activating Drag Scroll, it uses a fraction of the current DPI. You can define this to use a specific, set DPI rather than a fraction of the current DPI. - * `#define PLOOPY_DRAGSCROLL_DPI 100` - When the fixed DPI option is enabled, this sets the DPI to be used for Drag Scroll. -* `#define PLOOPY_DRAGSCROLL_INVERT` - This reverses the direction that the scroll is performed. +You can find customziation options [here](../readme.md). diff --git a/keyboards/ploopyco/mouse/rules.mk b/keyboards/ploopyco/mouse/rules.mk index 63569507805..3d1d3fc961b 100644 --- a/keyboards/ploopyco/mouse/rules.mk +++ b/keyboards/ploopyco/mouse/rules.mk @@ -1,21 +1,4 @@ # Processor frequency F_CPU = 8000000 -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -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 -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pmw3360 -MOUSEKEY_ENABLE = yes # Mouse keys - -ANALOG_DRIVER_REQUIRED = yes - -SRC += opt_encoder.c diff --git a/keyboards/ploopyco/mouse/mouse.c b/keyboards/ploopyco/ploopyco.c similarity index 58% rename from keyboards/ploopyco/mouse/mouse.c rename to keyboards/ploopyco/ploopyco.c index 5f4a82e474c..e4726238f26 100644 --- a/keyboards/ploopyco/mouse/mouse.c +++ b/keyboards/ploopyco/ploopyco.c @@ -16,23 +16,28 @@ * along with this program. If not, see . */ -#include "mouse.h" +#include "ploopyco.h" +#include "analog.h" +#include "opt_encoder.h" -#ifndef OPT_DEBOUNCE -# define OPT_DEBOUNCE 5 // (ms) Time between scroll events +// for legacy support +#if defined(OPT_DEBOUNCE) && !defined(PLOOPY_SCROLL_DEBOUNCE) +# define PLOOPY_SCROLL_DEBOUNCE OPT_DEBOUNCE #endif -#ifndef SCROLL_BUTT_DEBOUNCE -# define SCROLL_BUTT_DEBOUNCE 100 // (ms) Time between scroll events +#if defined(SCROLL_BUTT_DEBOUNCE) && !defined(PLOOPY_SCROLL_BUTTON_DEBOUNCE) +# define PLOOPY_SCROLL_BUTTON_DEBOUNCE SCROLL_BUTT_DEBOUNCE #endif -#ifndef OPT_THRES -# define OPT_THRES 150 // (0-1024) Threshold for actication + +#ifndef PLOOPY_SCROLL_DEBOUNCE +# define PLOOPY_SCROLL_DEBOUNCE 5 #endif -#ifndef OPT_SCALE -# define OPT_SCALE 1 // Multiplier for wheel +#ifndef PLOOPY_SCROLL_BUTTON_DEBOUNCE +# define PLOOPY_SCROLL_BUTTON_DEBOUNCE 100 #endif + #ifndef PLOOPY_DPI_OPTIONS # define PLOOPY_DPI_OPTIONS \ - { 1200, 1600, 2400 } + { 600, 900, 1200, 1600, 2400 } # ifndef PLOOPY_DPI_DEFAULT # define PLOOPY_DPI_DEFAULT 1 # endif @@ -40,94 +45,110 @@ #ifndef PLOOPY_DPI_DEFAULT # define PLOOPY_DPI_DEFAULT 0 #endif -#ifndef PLOOPY_DRAGSCROLL_DPI -# define PLOOPY_DRAGSCROLL_DPI 100 // Fixed-DPI Drag Scroll +#ifndef PLOOPY_DRAGSCROLL_DIVISOR_H +# define PLOOPY_DRAGSCROLL_DIVISOR_H 8.0 #endif -#ifndef PLOOPY_DRAGSCROLL_MULTIPLIER -# define PLOOPY_DRAGSCROLL_MULTIPLIER 0.75 // Variable-DPI Drag Scroll +#ifndef PLOOPY_DRAGSCROLL_DIVISOR_V +# define PLOOPY_DRAGSCROLL_DIVISOR_V 8.0 +#endif +#ifndef ENCODER_BUTTON_ROW +# define ENCODER_BUTTON_ROW 0 +#endif +#ifndef ENCODER_BUTTON_COL +# define ENCODER_BUTTON_COL 0 #endif keyboard_config_t keyboard_config; uint16_t dpi_array[] = PLOOPY_DPI_OPTIONS; #define DPI_OPTION_SIZE ARRAY_SIZE(dpi_array) -// TODO: Implement libinput profiles -// https://wayland.freedesktop.org/libinput/doc/latest/pointer-acceleration.html -// Compile time accel selection -// Valid options are ACC_NONE, ACC_LINEAR, ACC_CUSTOM, ACC_QUADRATIC - // Trackball State -bool is_scroll_clicked = false; -bool BurstState = false; // init burst state for Trackball module -uint16_t MotionStart = 0; // Timer for accel, 0 is resting state -uint16_t lastScroll = 0; // Previous confirmed wheel event -uint16_t lastMidClick = 0; // Stops scrollwheel from being read if it was pressed -uint8_t OptLowPin = OPT_ENC1; +bool is_scroll_clicked = false; +bool is_drag_scroll = false; +float scroll_accumulated_h = 0; +float scroll_accumulated_v = 0; + +#ifdef ENCODER_ENABLE +uint16_t lastScroll = 0; // Previous confirmed wheel event +uint16_t lastMidClick = 0; // Stops scrollwheel from being read if it was pressed +pin_t encoder_pins_a[1] = ENCODERS_PAD_A; +pin_t encoder_pins_b[1] = ENCODERS_PAD_B; bool debug_encoder = false; -bool is_drag_scroll = false; bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; } -#ifdef MOUSEKEY_ENABLE +# ifdef MOUSEKEY_ENABLE tap_code(clockwise ? KC_WH_U : KC_WH_D); -#else +# else report_mouse_t mouse_report = pointing_device_get_report(); - mouse_report.v = clockwise ? 1 : -1; + mouse_report.v = clockwise ? 1 : -1; pointing_device_set_report(mouse_report); pointing_device_send(); -#endif +# endif return true; } void encoder_driver_init(void) { - setPinInput(OPT_ENC1); - setPinInput(OPT_ENC2); - + for (uint8_t i = 0; i < ARRAY_SIZE(encoder_pins_a); i++) { + gpio_set_pin_input(encoder_pins_a[i]); + gpio_set_pin_input(encoder_pins_b[i]); + } opt_encoder_init(); } void encoder_driver_task(void) { - // Lovingly ripped from the Ploopy Source + uint16_t p1 = analogReadPin(encoder_pins_a[0]); + uint16_t p2 = analogReadPin(encoder_pins_b[0]); + if (debug_encoder) dprintf("OPT1: %d, OPT2: %d\n", p1, p2); + + int8_t dir = opt_encoder_handler(p1, p2); // If the mouse wheel was just released, do not scroll. - if (timer_elapsed(lastMidClick) < SCROLL_BUTT_DEBOUNCE) { + if (timer_elapsed(lastMidClick) < PLOOPY_SCROLL_BUTTON_DEBOUNCE) { return; } // Limit the number of scrolls per unit time. - if (timer_elapsed(lastScroll) < OPT_DEBOUNCE) { + if (timer_elapsed(lastScroll) < PLOOPY_SCROLL_DEBOUNCE) { return; } // Don't scroll if the middle button is depressed. if (is_scroll_clicked) { -#ifndef IGNORE_SCROLL_CLICK +# ifndef PLOOPY_IGNORE_SCROLL_CLICK return; -#endif +# endif } - lastScroll = timer_read(); - uint16_t p1 = adc_read(OPT_ENC1_MUX); - uint16_t p2 = adc_read(OPT_ENC2_MUX); - if (debug_encoder) dprintf("OPT1: %d, OPT2: %d\n", p1, p2); - - int dir = opt_encoder_handler(p1, p2); - if (dir == 0) return; - encoder_queue_event(0, dir == 1); + encoder_queue_event(0, dir > 0); + lastScroll = timer_read(); } +#endif report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) { if (is_drag_scroll) { - mouse_report.h = mouse_report.x; + scroll_accumulated_h += (float)mouse_report.x / PLOOPY_DRAGSCROLL_DIVISOR_H; + scroll_accumulated_v += (float)mouse_report.y / PLOOPY_DRAGSCROLL_DIVISOR_V; + + // Assign integer parts of accumulated scroll values to the mouse report + mouse_report.h = (int8_t)scroll_accumulated_h; #ifdef PLOOPY_DRAGSCROLL_INVERT - // Invert vertical scroll direction - mouse_report.v = -mouse_report.y; + mouse_report.v = -(int8_t)scroll_accumulated_v; #else - mouse_report.v = mouse_report.y; + mouse_report.v = (int8_t)scroll_accumulated_v; #endif + + // Update accumulated scroll values by subtracting the integer parts + scroll_accumulated_h -= (int8_t)scroll_accumulated_h; + scroll_accumulated_v -= (int8_t)scroll_accumulated_v; + + // Clear the X and Y values of the mouse report + mouse_report.x = 0; + mouse_report.y = 0; + mouse_report.x = 0; mouse_report.y = 0; } @@ -141,10 +162,12 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) { } // Update Timer to prevent accidental scrolls - if ((record->event.key.col == 1) && (record->event.key.row == 0)) { +#ifdef ENCODER_ENABLE + if ((record->event.key.col == ENCODER_BUTTON_COL) && (record->event.key.row == ENCODER_BUTTON_ROW)) { lastMidClick = timer_read(); is_scroll_clicked = record->event.pressed; } +#endif if (!process_record_user(keycode, record)) { return false; @@ -157,16 +180,12 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) { } if (keycode == DRAG_SCROLL) { -#ifndef PLOOPY_DRAGSCROLL_MOMENTARY - if (record->event.pressed) -#endif - { +#ifdef PLOOPY_DRAGSCROLL_MOMENTARY + is_drag_scroll = record->event.pressed; +#else + if (record->event.pressed) { is_drag_scroll ^= 1; } -#ifdef PLOOPY_DRAGSCROLL_FIXED - pointing_device_set_cpi(is_drag_scroll ? PLOOPY_DRAGSCROLL_DPI : dpi_array[keyboard_config.dpi_config]); -#else - pointing_device_set_cpi(is_drag_scroll ? (dpi_array[keyboard_config.dpi_config] * PLOOPY_DRAGSCROLL_MULTIPLIER) : dpi_array[keyboard_config.dpi_config]); #endif } @@ -188,21 +207,25 @@ void keyboard_pre_init_kb(void) { const pin_t unused_pins[] = UNUSABLE_PINS; for (uint8_t i = 0; i < ARRAY_SIZE(unused_pins); i++) { - setPinOutput(unused_pins[i]); - writePinLow(unused_pins[i]); + gpio_set_pin_output_push_pull(unused_pins[i]); + gpio_write_pin_low(unused_pins[i]); } #endif // This is the debug LED. #if defined(DEBUG_LED_PIN) - setPinOutput(DEBUG_LED_PIN); - writePin(DEBUG_LED_PIN, debug_enable); + gpio_set_pin_output_push_pull(DEBUG_LED_PIN); + gpio_write_pin(DEBUG_LED_PIN, debug_enable); #endif keyboard_pre_init_user(); } void pointing_device_init_kb(void) { + keyboard_config.raw = eeconfig_read_kb(); + if (keyboard_config.dpi_config > DPI_OPTION_SIZE) { + eeconfig_init_kb(); + } pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]); } @@ -211,13 +234,3 @@ void eeconfig_init_kb(void) { eeconfig_update_kb(keyboard_config.raw); eeconfig_init_user(); } - -void matrix_init_kb(void) { - // is safe to just read DPI setting since matrix init - // comes before pointing device init. - keyboard_config.raw = eeconfig_read_kb(); - if (keyboard_config.dpi_config > DPI_OPTION_SIZE) { - eeconfig_init_kb(); - } - matrix_init_user(); -} diff --git a/keyboards/ploopyco/trackball/trackball.h b/keyboards/ploopyco/ploopyco.h similarity index 89% rename from keyboards/ploopyco/trackball/trackball.h rename to keyboards/ploopyco/ploopyco.h index f4516222e04..61a8d58a933 100644 --- a/keyboards/ploopyco/trackball/trackball.h +++ b/keyboards/ploopyco/ploopyco.h @@ -19,14 +19,6 @@ #pragma once #include "quantum.h" -#include "analog.h" -#include "opt_encoder.h" - -// Sensor defs -#define OPT_ENC1 F0 -#define OPT_ENC2 F4 -#define OPT_ENC1_MUX 0 -#define OPT_ENC2_MUX 4 typedef union { uint32_t raw; diff --git a/keyboards/ploopyco/post_rules.mk b/keyboards/ploopyco/post_rules.mk new file mode 100644 index 00000000000..8fe47c5310c --- /dev/null +++ b/keyboards/ploopyco/post_rules.mk @@ -0,0 +1,12 @@ +OPT_ENCODER_TYPE ?= default +VALID_OPT_ENCODER_TYPES := default simple tiny custom + +ifeq ($(filter $(OPT_ENCODER_TYPE),$(VALID_OPT_ENCODER_TYPES)),) + $(call CATASTROPHIC_ERROR,Invalid OPT_ENCODER_TYPE,OPT_ENCODER_TYPE="$(OPT_ENCODER_TYPE)" is not a valid pointing device type) +else + ifneq ($(strip $(OPT_ENCODER_TYPE)), custom) + VPATH += keyboards/ploopyco/common + SRC += opt_encoder_$(strip $(OPT_ENCODER_TYPE)).c + ANALOG_DRIVER_REQUIRED = yes + endif +endif diff --git a/keyboards/ploopyco/readme.md b/keyboards/ploopyco/readme.md new file mode 100644 index 00000000000..a468058ce04 --- /dev/null +++ b/keyboards/ploopyco/readme.md @@ -0,0 +1,45 @@ +# Ploopyco + +* [Mouse](mouse/) +* [Trackball](trackball/) +* [Trackball Mini](trackball_mini/) +* [Trackball Nano](trackball_nano/) +* [Trackball Thumb](trackball_thumb/) +* [Adept/Madromys](manromys/) + +# Customizing your PloopyCo Device + +There are a number of behavioral settings that you can use to help customize your experience +| | | | +|---------------------------------|-------------------|-----------------------------------------------------------| +| `PLOOPY_IGNORE_SCROLL_CLICK` | *__not_defined__* | Ignores scroll wheel if it is pressed down. | +| `PLOOPY_SCROLL_DEBOUNCE` | `5` | Number of milliseconds between scroll events. | +| `PLOOPY_SCROLL_BUTTON_DEBOUNCE` | `100` | Time to ignore scroll events after pressing scroll wheel. | + +## DPI + +You can change the DPI/CPI or speed of the trackball by calling `pointing_device_set_cpi` at any time. Additionally, there is a `DPI_CONFIG` macro that will cycle through an array of options for the DPI. This is set to 1200, 1600, and 2400, but can be changed. 1600 is also set to the default. + +To configure/set your own array, there are two defines to use, `PLOOPY_DPI_OPTIONS` to set the array, and `PLOOPY_DPI_DEFAULT`. + +```c +#define PLOOPY_DPI_OPTIONS { 1200, 1600, 2400 } +#define PLOOPY_DPI_DEFAULT 1 +``` + +The `PLOOPY_DPI_OPTIONS` array sets the values that you want to be able to cycle through, and the order they are in. The "default" define lets the firmware know which of these options is the default and should be loaded by default. + +The `DPI_CONFIG` macro will cycle through the values in the array, each time you hit it. And it stores this value in persistent memory, so it will load it the next time the device powers up. + +## Drag Scroll + +Drag Sroll is a custom keycode for the Ploopy devices that allow you to hold or tap a button and have the mouse movement translate into scrolling instead. + +Nothing needs to be enabled to use this functionality. Just add the `DRAG_SCROLL` to your keymap. + +### Drag Scroll Configuration + +* `#define PLOOPY_DRAGSCROLL_MOMENTARY` - Makes the key into a momentary key, rather than a toggle. +* `#define PLOOPY_DRAGSCROLL_DIVISOR_H 8.0` - Sets the horizontal movement divisor to use when drag scroll is enabled. +* `#define PLOOPY_DRAGSCROLL_DIVISOR_V 8.0` - Sets the vertical movement divisor to use when drag scroll is enabled. +* `#define PLOOPY_DRAGSCROLL_INVERT` - This reverses the direction that the scroll is performed. diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h index a1f3695d815..80457d062aa 100644 --- a/keyboards/ploopyco/trackball/config.h +++ b/keyboards/ploopyco/trackball/config.h @@ -32,5 +32,11 @@ #define PMW33XX_CS_PIN B0 #define POINTING_DEVICE_INVERT_Y + +#define ENCODER_BUTTON_COL 1 +#define ENCODER_BUTTON_ROW 0 /* Custom encoder needs to specify just how many encoders we have */ #define NUM_ENCODERS 1 + +#define ENCODERS_PAD_A { F0 } +#define ENCODERS_PAD_B { F4 } diff --git a/keyboards/ploopyco/trackball/info.json b/keyboards/ploopyco/trackball/info.json index 110264ef1c6..8014db1d638 100644 --- a/keyboards/ploopyco/trackball/info.json +++ b/keyboards/ploopyco/trackball/info.json @@ -12,7 +12,13 @@ "bootmagic": { "matrix": [0, 3] }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "pointing_device": true, "encoder": true }, "encoder": { diff --git a/keyboards/ploopyco/trackball/keymaps/drag_scroll/keymap.c b/keyboards/ploopyco/trackball/keymaps/drag_scroll/keymap.c deleted file mode 100644 index fbf07935c82..00000000000 --- a/keyboards/ploopyco/trackball/keymaps/drag_scroll/keymap.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2020 Ploopy Corporation - * - * 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 . - */ -#include QMK_KEYBOARD_H - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( /* Base */ - KC_BTN1, KC_BTN3, KC_BTN2, - KC_BTN4, LT(1, KC_BTN5) - ), - [1] = LAYOUT( - DRAG_SCROLL, _______, _______, - _______, _______ - ) -}; diff --git a/keyboards/ploopyco/trackball/keymaps/drag_scroll/readme.md b/keyboards/ploopyco/trackball/keymaps/drag_scroll/readme.md deleted file mode 100644 index cafa11bfc1a..00000000000 --- a/keyboards/ploopyco/trackball/keymaps/drag_scroll/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The Drag Scroll keymap for Ploopyco Trackball - -This is a sample keymap showing off what you can do with the custom callback drivers. diff --git a/keyboards/ploopyco/trackball/readme.md b/keyboards/ploopyco/trackball/readme.md index 5c76f101878..c668c5dd031 100644 --- a/keyboards/ploopyco/trackball/readme.md +++ b/keyboards/ploopyco/trackball/readme.md @@ -27,45 +27,4 @@ The PCB should indicate which revision this is. # Customizing your PloopyCo Trackball -While the defaults are designed so that it can be plugged in and used right away, there are a number of things that you may want to change. Such as adding DPI control, or to use the ball to scroll while holding a button. To allow for this sort of control, there is a callback for both the scroll wheel and the mouse sensor. - - -```c -report_mouse_t pointing_device_task_user(report_mouse_t mouse_report){ - // executed each time the sensor is updated - // mouse_report. - can be used to access indivdual mouse attributes - return mouse_report; -} -``` - -More information on `report_mouse_t` may be found [here](https://docs.qmk.fm/#/feature_pointing_device?id=manipulating-mouse-reports). - -This should allow you to more heavily customize the behavior. - -Alternatively, the `process_wheel` and `process_mouse` functions can both be replaced too, to allow for even more functionality. - -Additionally, you can change the DPI/CPI or speed of the trackball by calling `pointing_device_set_cpi` at any time. Additionally, there is a `DPI_CONFIG` macro that will cycle through an array of options for the DPI. This is set to 1200, 1600, and 2400, but can be changed. 1600 is also set to the default. - -To configure/set your own array, there are two defines to use, `PLOOPY_DPI_OPTIONS` to set the array, and `PLOOPY_DPI_DEFAULT`. - -```c -#define PLOOPY_DPI_OPTIONS { 1200, 1600, 2400 } -#define PLOOPY_DPI_DEFAULT 1 -``` -The `PLOOPY_DPI_OPTIONS` array sets the values that you want to be able to cycle through, and the order they are in. The "default" define lets the firmware know which of these options is the default and should be loaded by default. - -The `DPI_CONFIG` macro will cycle through the values in the array, each time you hit it. And it stores this value in persistent memory, so it will load it the next time the device powers up. - -## Drag Scroll - -Drag Sroll is a custom keycode for the Ploopy devices that allow you to hold or tap a button and have the mouse movement translate into scrolling instead. - -Nothing needs to be enabled to use this functionality. Just add the `DRAG_SCROLL` to your keymap. - -### Drag Scroll Configuration - -* `#define PLOOPY_DRAGSCROLL_MOMENTARY` - Makes the key into a momentary key, rather than a toggle. -* `#define PLOOPY_DRAGSCROLL_MULTIPLIER 0.75` - Sets the DPI multiplier to use when drag scroll is enabled. -* `#define PLOOPY_DRAGSCROLL_FIXED` - Normally, when activating Drag Scroll, it uses a fraction of the current DPI. You can define this to use a specific, set DPI rather than a fraction of the current DPI. - * `#define PLOOPY_DRAGSCROLL_DPI 100` - When the fixed DPI option is enabled, this sets the DPI to be used for Drag Scroll. -* `#define PLOOPY_DRAGSCROLL_INVERT` - This reverses the direction that the scroll is performed. +You can find customziation options [here](../readme.md). diff --git a/keyboards/ploopyco/trackball/rules.mk b/keyboards/ploopyco/trackball/rules.mk index ca1a8fd17a1..9ea10ba6e8f 100644 --- a/keyboards/ploopyco/trackball/rules.mk +++ b/keyboards/ploopyco/trackball/rules.mk @@ -1,23 +1,6 @@ # Processor frequency F_CPU = 8000000 -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -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 -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pmw3360 -MOUSEKEY_ENABLE = yes # Mouse keys - -ANALOG_DRIVER_REQUIRED = yes - -SRC += opt_encoder.c DEFAULT_FOLDER = ploopyco/trackball/rev1_005 diff --git a/keyboards/ploopyco/trackball/trackball.c b/keyboards/ploopyco/trackball/trackball.c deleted file mode 100644 index 0c606bab070..00000000000 --- a/keyboards/ploopyco/trackball/trackball.c +++ /dev/null @@ -1,243 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2020 Ploopy Corporation - * - * 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 . - */ - -#include "trackball.h" - -#ifndef OPT_DEBOUNCE -# define OPT_DEBOUNCE 5 // (ms) Time between scroll events -#endif -#ifndef SCROLL_BUTT_DEBOUNCE -# define SCROLL_BUTT_DEBOUNCE 100 // (ms) Time between scroll events -#endif -#ifndef OPT_THRES -# define OPT_THRES 150 // (0-1024) Threshold for actication -#endif -#ifndef OPT_SCALE -# define OPT_SCALE 1 // Multiplier for wheel -#endif -#ifndef PLOOPY_DPI_OPTIONS -# define PLOOPY_DPI_OPTIONS \ - { 1200, 1600, 2400 } -# ifndef PLOOPY_DPI_DEFAULT -# define PLOOPY_DPI_DEFAULT 1 -# endif -#endif -#ifndef PLOOPY_DPI_DEFAULT -# define PLOOPY_DPI_DEFAULT 0 -#endif -#ifndef PLOOPY_DRAGSCROLL_DPI -# define PLOOPY_DRAGSCROLL_DPI 100 // Fixed-DPI Drag Scroll -#endif -#ifndef PLOOPY_DRAGSCROLL_MULTIPLIER -# define PLOOPY_DRAGSCROLL_MULTIPLIER 0.75 // Variable-DPI Drag Scroll -#endif - -keyboard_config_t keyboard_config; -uint16_t dpi_array[] = PLOOPY_DPI_OPTIONS; -#define DPI_OPTION_SIZE ARRAY_SIZE(dpi_array) - -// TODO: Implement libinput profiles -// https://wayland.freedesktop.org/libinput/doc/latest/pointer-acceleration.html -// Compile time accel selection -// Valid options are ACC_NONE, ACC_LINEAR, ACC_CUSTOM, ACC_QUADRATIC - -// Trackball State -bool is_scroll_clicked = false; -bool BurstState = false; // init burst state for Trackball module -uint16_t MotionStart = 0; // Timer for accel, 0 is resting state -uint16_t lastScroll = 0; // Previous confirmed wheel event -uint16_t lastMidClick = 0; // Stops scrollwheel from being read if it was pressed -uint8_t OptLowPin = OPT_ENC1; -bool debug_encoder = false; -bool is_drag_scroll = false; - -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } -#ifdef MOUSEKEY_ENABLE - tap_code(clockwise ? KC_WH_U : KC_WH_D); -#else - report_mouse_t mouse_report = pointing_device_get_report(); - mouse_report.v = clockwise ? 1 : -1; - pointing_device_set_report(mouse_report); - pointing_device_send(); -#endif - return true; -} - - -void encoder_driver_init(void) { - setPinInput(OPT_ENC1); - setPinInput(OPT_ENC2); - - opt_encoder_init(); -} - -void encoder_driver_task(void) { - // TODO: Replace this with interrupt driven code, polling is S L O W - // Lovingly ripped from the Ploopy Source - - // If the mouse wheel was just released, do not scroll. - if (timer_elapsed(lastMidClick) < SCROLL_BUTT_DEBOUNCE) { - return; - } - - // Limit the number of scrolls per unit time. - if (timer_elapsed(lastScroll) < OPT_DEBOUNCE) { - return; - } - - // Don't scroll if the middle button is depressed. - if (is_scroll_clicked) { -#ifndef IGNORE_SCROLL_CLICK - return; -#endif - } - - lastScroll = timer_read(); - uint16_t p1 = adc_read(OPT_ENC1_MUX); - uint16_t p2 = adc_read(OPT_ENC2_MUX); - if (debug_encoder) dprintf("OPT1: %d, OPT2: %d\n", p1, p2); - - int dir = opt_encoder_handler(p1, p2); - - if (dir == 0) return; - encoder_queue_event(0, dir == 1); -} - -report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) { - - if (is_drag_scroll) { -#ifdef PLOOPY_DRAGSCROLL_H_INVERT - // Invert horizontal scroll direction - mouse_report.h = -mouse_report.x; -#else - mouse_report.h = mouse_report.x; -#endif -#ifdef PLOOPY_DRAGSCROLL_INVERT - // Invert vertical scroll direction - mouse_report.v = -mouse_report.y; -#else - mouse_report.v = mouse_report.y; -#endif - mouse_report.x = 0; - mouse_report.y = 0; - } - - return pointing_device_task_user(mouse_report); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t* record) { - if (true) { - xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed); - } - - // Update Timer to prevent accidental scrolls - if ((record->event.key.col == 1) && (record->event.key.row == 0)) { - lastMidClick = timer_read(); - is_scroll_clicked = record->event.pressed; - } - - if (!process_record_user(keycode, record)) { - return false; - } - - if (keycode == DPI_CONFIG && record->event.pressed) { - keyboard_config.dpi_config = (keyboard_config.dpi_config + 1) % DPI_OPTION_SIZE; - eeconfig_update_kb(keyboard_config.raw); - pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]); - } - - if (keycode == DRAG_SCROLL) { -#ifndef PLOOPY_DRAGSCROLL_MOMENTARY - if (record->event.pressed) -#endif - { - is_drag_scroll ^= 1; - } -#ifdef PLOOPY_DRAGSCROLL_FIXED - pointing_device_set_cpi(is_drag_scroll ? PLOOPY_DRAGSCROLL_DPI : dpi_array[keyboard_config.dpi_config]); -#else - pointing_device_set_cpi(is_drag_scroll ? (dpi_array[keyboard_config.dpi_config] * PLOOPY_DRAGSCROLL_MULTIPLIER) : dpi_array[keyboard_config.dpi_config]); -#endif - } - -/* If Mousekeys is disabled, then use handle the mouse button - * keycodes. This makes things simpler, and allows usage of - * the keycodes in a consistent manner. But only do this if - * Mousekeys is not enable, so it's not handled twice. - */ - - return true; -} - -// Hardware Setup -void keyboard_pre_init_kb(void) { - // debug_enable = true; - // debug_matrix = true; - // debug_mouse = true; - // debug_encoder = true; - - /* Ground all output pins connected to ground. This provides additional - * pathways to ground. If you're messing with this, know this: driving ANY - * of these pins high will cause a short. On the MCU. Ka-blooey. - */ -#ifdef UNUSABLE_PINS - const pin_t unused_pins[] = UNUSABLE_PINS; - - for (uint8_t i = 0; i < ARRAY_SIZE(unused_pins); i++) { - setPinOutput(unused_pins[i]); - writePinLow(unused_pins[i]); - } -#endif - - // This is the debug LED. -#if defined(DEBUG_LED_PIN) - setPinOutput(DEBUG_LED_PIN); - writePin(DEBUG_LED_PIN, debug_enable); -#endif - - keyboard_pre_init_user(); -} - -void pointing_device_init_kb(void) { - pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]); -} - -void eeconfig_init_kb(void) { - keyboard_config.dpi_config = PLOOPY_DPI_DEFAULT; - eeconfig_update_kb(keyboard_config.raw); - eeconfig_init_user(); -} - -void matrix_init_kb(void) { - // is safe to just read DPI setting since matrix init - // comes before pointing device init. - keyboard_config.raw = eeconfig_read_kb(); - if (keyboard_config.dpi_config > DPI_OPTION_SIZE) { - eeconfig_init_kb(); - } - matrix_init_user(); -} - -void keyboard_post_init_kb(void) { - pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]); - - keyboard_post_init_user(); -} diff --git a/keyboards/ploopyco/trackball_mini/config.h b/keyboards/ploopyco/trackball_mini/config.h index 6b92563fa9e..c5d2d5694e4 100644 --- a/keyboards/ploopyco/trackball_mini/config.h +++ b/keyboards/ploopyco/trackball_mini/config.h @@ -33,5 +33,10 @@ #define POINTING_DEVICE_ROTATION_270 +#define ENCODER_BUTTON_COL 1 +#define ENCODER_BUTTON_ROW 0 /* Custom encoder needs to specify just how many encoders we have */ #define NUM_ENCODERS 1 + +#define ENCODERS_PAD_A { F0 } +#define ENCODERS_PAD_B { F4 } diff --git a/keyboards/ploopyco/trackball_mini/info.json b/keyboards/ploopyco/trackball_mini/info.json index 0e7b12d20d3..ae37742a974 100644 --- a/keyboards/ploopyco/trackball_mini/info.json +++ b/keyboards/ploopyco/trackball_mini/info.json @@ -12,11 +12,16 @@ "bootmagic": { "matrix": [0, 3] }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "pointing_device": true, "encoder": true }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "encoder": { "driver": "custom" }, diff --git a/keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/keymap.c b/keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/keymap.c deleted file mode 100644 index b6c71c6ece0..00000000000 --- a/keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/keymap.c +++ /dev/null @@ -1,66 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2020 Ploopy Corporation - * - * 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 . - */ -#include QMK_KEYBOARD_H - -// used for tracking the state -bool is_drag_scroll = false; - -enum custom_keycodes { - DRAG_SCROLL = SAFE_RANGE, -}; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case DRAG_SCROLL: - if (record->event.pressed) { - // this toggles the state each time you tap it - is_drag_scroll ^= 1; - } - break; - } - return true; -} - -// The real magic is here. -// This function is called to translate the processed sensor movement -// from the mouse sensor and translates it into x and y movement for -// the mouse report. Normally. So if "drag scroll" is toggled on, -// moving the ball scrolls instead. You could remove the x or y here -// to only scroll in one direction, if you wanted, as well. In fact, -// there is no reason that you need to send this to the mouse report. -// You could have it register a key, instead. -void process_mouse_user(report_mouse_t* mouse_report, int8_t x, int8_t y) { - if (is_drag_scroll) { - mouse_report->h = x; - mouse_report->v = y; - } else { - mouse_report->x = x; - mouse_report->y = y; - } -} - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( /* Base */ - KC_BTN1, KC_BTN3, KC_BTN2, - KC_BTN4, LT(1, KC_BTN5) - ), - [1] = LAYOUT( - DRAG_SCROLL, _______, _______, - _______, _______ - ) -}; diff --git a/keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/readme.md b/keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/readme.md deleted file mode 100644 index 362821832fd..00000000000 --- a/keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The Drag Scroll keymap for the Ploopy Trackball Mini - -This is a sample keymap showing off what you can do with the custom callback drivers. - -This particular example enables "drag scrolling". The movement of the ball is used to scroll up and down. \ No newline at end of file diff --git a/keyboards/ploopyco/trackball_mini/readme.md b/keyboards/ploopyco/trackball_mini/readme.md index bc94482c719..26a01837468 100644 --- a/keyboards/ploopyco/trackball_mini/readme.md +++ b/keyboards/ploopyco/trackball_mini/readme.md @@ -29,52 +29,6 @@ Occasionally, new revisions of the PCB will be released. Every board comes with Match the firmware that you flash onto the board with the designator on the board. -# Customizing your Ploopy Mini Trackball - -While the defaults are designed so that it can be plugged in and used right away, there are a number of things that you may want to change, such as adding DPI control, or using the ball to scroll while holding a button. To allow for this sort of control, there is a callback for both the scroll wheel and the mouse sensor. - -The default behavior for this is: - -```c -void process_wheel_user(report_mouse_t* mouse_report, int16_t h, int16_t v) { - mouse_report->h = h; - mouse_report->v = v; -} - -void process_mouse_user(report_mouse_t* mouse_report, int16_t x, int16_t y) { - mouse_report->x = x; - mouse_report->y = y; -} -``` - -This should allow you to more heavily customize the behavior. - -Alternatively, the `process_wheel` and `process_mouse` functions can both be replaced too, to allow for even more functionality. - -Additionally, you can change the DPI/CPI or speed of the trackball by calling `adns_set_cpi` at any time. Additionally, there is a `DPI_CONFIG` macro that will cycle through an array of options for the DPI. This is set to 375, 750, and 1375, but can be changed. 1375 is the default. - -To configure/set your own array, there are two defines to use, `PLOOPY_DPI_OPTIONS` to set the array, and `PLOOPY_DPI_DEFAULT`. - -```c -#define PLOOPY_DPI_OPTIONS { 375, 750, 1375} -#define PLOOPY_DPI_DEFAULT 2 -``` - -The `PLOOPY_DPI_OPTIONS` array sets the values that you want to be able to cycle through, and the order they are in. The "default" define lets the firmware know which of these options is the default and should be loaded by default. - -The `DPI_CONFIG` macro will cycle through the values in the array, each time you hit it. It stores this value in persistent memory, so it will load it the next time the device powers up. - -## Drag Scroll - -Drag Sroll is a custom keycode for the Ploopy devices that allow you to hold or tap a button and have the mouse movement translate into scrolling instead. - -Nothing needs to be enabled to use this functionality. Just add the `DRAG_SCROLL` to your keymap. - -### Drag Scroll Configuration - -* `#define PLOOPY_DRAGSCROLL_MOMENTARY` - Makes the key into a momentary key, rather than a toggle. -* `#define PLOOPY_DRAGSCROLL_DPI 375` - When the fixed DPI option is enabled, this sets the DPI to be used for Drag Scroll. -* `#define PLOOPY_DRAGSCROLL_INVERT` - This reverses the direction that the scroll is performed. ## Fuse settings When flashing the bootloader, use the following fuse settings: @@ -84,3 +38,7 @@ When flashing the bootloader, use the following fuse settings: | Low | `0x5E` | | High | `0x99` | | Extended | `0xC3` | + +# Customizing your Ploopy Mini Trackball + +You can find customziation options [here](../readme.md). diff --git a/keyboards/ploopyco/trackball_mini/rules.mk b/keyboards/ploopyco/trackball_mini/rules.mk index d2bacc39740..2705ac6855c 100644 --- a/keyboards/ploopyco/trackball_mini/rules.mk +++ b/keyboards/ploopyco/trackball_mini/rules.mk @@ -1,20 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -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 -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = adns5050 -MOUSEKEY_ENABLE = yes # Mouse keys - -ANALOG_DRIVER_REQUIRED = yes - -SRC += opt_encoder.c DEFAULT_FOLDER = ploopyco/trackball_mini/rev1_001 diff --git a/keyboards/ploopyco/trackball_mini/trackball_mini.c b/keyboards/ploopyco/trackball_mini/trackball_mini.c deleted file mode 100644 index 8517a54e708..00000000000 --- a/keyboards/ploopyco/trackball_mini/trackball_mini.c +++ /dev/null @@ -1,214 +0,0 @@ -/* Copyright 2021 Colin Lam (Ploopy Corporation) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2019 Hiroyuki Okada - * - * 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 . - */ - -#include "trackball_mini.h" -#include "wait.h" -#include "debug.h" - -#ifndef OPT_DEBOUNCE -# define OPT_DEBOUNCE 5 // (ms) Time between scroll events -#endif - -#ifndef SCROLL_BUTT_DEBOUNCE -# define SCROLL_BUTT_DEBOUNCE 100 // (ms) Time between scroll events -#endif - -#ifndef OPT_THRES -# define OPT_THRES 150 // (0-1024) Threshold for actication -#endif - -#ifndef OPT_SCALE -# define OPT_SCALE 1 // Multiplier for wheel -#endif - -#ifndef PLOOPY_DPI_OPTIONS -# define PLOOPY_DPI_OPTIONS \ - { 375, 750, 1375 } -# ifndef PLOOPY_DPI_DEFAULT -# define PLOOPY_DPI_DEFAULT 1 -# endif -#endif -#ifndef PLOOPY_DPI_DEFAULT -# define PLOOPY_DPI_DEFAULT 0 -#endif - -#ifndef PLOOPY_DRAGSCROLL_DPI -# define PLOOPY_DRAGSCROLL_DPI 375 // Fixed-DPI Drag Scroll -#endif -#ifndef PLOOPY_DRAGSCROLL_MULTIPLIER -# define PLOOPY_DRAGSCROLL_MULTIPLIER 0.75 // Variable-DPI Drag Scroll -#endif - -keyboard_config_t keyboard_config; -uint16_t dpi_array[] = PLOOPY_DPI_OPTIONS; -#define DPI_OPTION_SIZE ARRAY_SIZE(dpi_array) - -// TODO: Implement libinput profiles -// https://wayland.freedesktop.org/libinput/doc/latest/pointer-acceleration.html -// Compile time accel selection -// Valid options are ACC_NONE, ACC_LINEAR, ACC_CUSTOM, ACC_QUADRATIC - -// Trackball State -bool is_scroll_clicked = false; -bool BurstState = false; // init burst state for Trackball module -uint16_t MotionStart = 0; // Timer for accel, 0 is resting state -uint16_t lastScroll = 0; // Previous confirmed wheel event -uint16_t lastMidClick = 0; // Stops scrollwheel from being read if it was pressed -uint8_t OptLowPin = OPT_ENC1; -bool debug_encoder = false; -bool is_drag_scroll = false; - -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } -#ifdef MOUSEKEY_ENABLE - tap_code(clockwise ? KC_WH_U : KC_WH_D); -#else - report_mouse_t mouse_report = pointing_device_get_report(); - mouse_report.v = clockwise ? 1 : -1; - pointing_device_set_report(mouse_report); - pointing_device_send(); -#endif - return true; -} - -void encoder_driver_init(void) { - setPinInput(OPT_ENC1); - setPinInput(OPT_ENC2); - - opt_encoder_init(); -} - -void encoder_driver_task(void) { - uint16_t p1 = adc_read(OPT_ENC1_MUX); - uint16_t p2 = adc_read(OPT_ENC2_MUX); - - if (debug_encoder) dprintf("OPT1: %d, OPT2: %d\n", p1, p2); - - int8_t dir = opt_encoder_handler(p1, p2); - - // If the mouse wheel was just released, do not scroll. - if (timer_elapsed(lastMidClick) < SCROLL_BUTT_DEBOUNCE) return; - - // Limit the number of scrolls per unit time. - if (timer_elapsed(lastScroll) < OPT_DEBOUNCE) return; - - // Don't scroll if the middle button is depressed. - if (is_scroll_clicked) { -#ifndef IGNORE_SCROLL_CLICK - return; -#endif - } - - if (dir == 0) return; - encoder_queue_event(0, dir == 1); - - lastScroll = timer_read(); -} - -void pointing_device_init_kb(void) { - // set the DPI. - pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]); -} - -report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) { - if (is_drag_scroll) { - mouse_report.h = mouse_report.x; -#ifdef PLOOPY_DRAGSCROLL_INVERT - // Invert vertical scroll direction - mouse_report.v = -mouse_report.y; -#else - mouse_report.v = mouse_report.y; -#endif - mouse_report.x = 0; - mouse_report.y = 0; - } - - return pointing_device_task_user(mouse_report); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t* record) { - xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed); - - // Update Timer to prevent accidental scrolls - if ((record->event.key.col == 1) && (record->event.key.row == 0)) { - lastMidClick = timer_read(); - is_scroll_clicked = record->event.pressed; - } - - if (!process_record_user(keycode, record)) return false; - - if (keycode == DPI_CONFIG && record->event.pressed) { - keyboard_config.dpi_config = (keyboard_config.dpi_config + 1) % DPI_OPTION_SIZE; - eeconfig_update_kb(keyboard_config.raw); - pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]); - } - - if (keycode == DRAG_SCROLL) { -#ifndef PLOOPY_DRAGSCROLL_MOMENTARY - if (record->event.pressed) -#endif - { - is_drag_scroll ^= 1; - } - pointing_device_set_cpi(is_drag_scroll ? PLOOPY_DRAGSCROLL_DPI : dpi_array[keyboard_config.dpi_config]); - } - - return true; -} - -// Hardware Setup -void keyboard_pre_init_kb(void) { - // debug_enable = true; - // debug_matrix = true; - // debug_mouse = true; - // debug_encoder = true; - - /* Ground all output pins connected to ground. This provides additional - * pathways to ground. If you're messing with this, know this: driving ANY - * of these pins high will cause a short. On the MCU. Ka-blooey. - */ -#ifdef UNUSABLE_PINS - const pin_t unused_pins[] = UNUSABLE_PINS; - - for (uint8_t i = 0; i < ARRAY_SIZE(unused_pins); i++) { - setPinOutput(unused_pins[i]); - writePinLow(unused_pins[i]); - } -#endif - - keyboard_pre_init_user(); -} - -void eeconfig_init_kb(void) { - keyboard_config.dpi_config = PLOOPY_DPI_DEFAULT; - eeconfig_update_kb(keyboard_config.raw); - eeconfig_init_user(); -} - -void matrix_init_kb(void) { - // is safe to just read DPI setting since matrix init - // comes before pointing device init. - keyboard_config.raw = eeconfig_read_kb(); - if (keyboard_config.dpi_config > DPI_OPTION_SIZE) { - eeconfig_init_kb(); - } - matrix_init_user(); -} diff --git a/keyboards/ploopyco/trackball_mini/trackball_mini.h b/keyboards/ploopyco/trackball_mini/trackball_mini.h deleted file mode 100644 index f212ec17ca4..00000000000 --- a/keyboards/ploopyco/trackball_mini/trackball_mini.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2021 Colin Lam (Ploopy Corporation) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2019 Hiroyuki Okada - * - * 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 - -#include "quantum.h" -#include "analog.h" -#include "opt_encoder.h" - -// Sensor defs -#define OPT_ENC1 F0 -#define OPT_ENC2 F4 -#define OPT_ENC1_MUX 0 -#define OPT_ENC2_MUX 4 - -void process_wheel(void); - -typedef union { - uint32_t raw; - struct { - uint8_t dpi_config; - }; -} keyboard_config_t; - -extern keyboard_config_t keyboard_config; - -enum ploopy_keycodes { - DPI_CONFIG = QK_KB_0, - DRAG_SCROLL, -}; - -bool encoder_update_user(uint8_t index, bool clockwise); -bool encoder_update_kb(uint8_t index, bool clockwise); diff --git a/keyboards/ploopyco/trackball_nano/info.json b/keyboards/ploopyco/trackball_nano/info.json index c1309ad2705..e73b480d707 100644 --- a/keyboards/ploopyco/trackball_nano/info.json +++ b/keyboards/ploopyco/trackball_nano/info.json @@ -9,6 +9,9 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "pointing_device": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 0, diff --git a/keyboards/ploopyco/trackball_nano/keymaps/lkbm/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/lkbm/keymap.c deleted file mode 100644 index 6c3a38d1278..00000000000 --- a/keyboards/ploopyco/trackball_nano/keymaps/lkbm/keymap.c +++ /dev/null @@ -1,167 +0,0 @@ -/* Copyright 2022 Aidan Gauland - * Copyright 2021 Colin Lam (Ploopy Corporation) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2019 Hiroyuki Okada - * - * 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 . - */ -#include QMK_KEYBOARD_H -#include "print.h" - -#define NUM_LOCK_BITMASK 0b01 -#define CAPS_LOCK_BITMASK 0b10 - -// World record for fastest index finger tapping is 1092 taps per minute, which -// is 55ms for a single tap. -// https://recordsetter.com/world-record/index-finger-taps-minute/46066 -#define LED_CMD_TIMEOUT 25 -#define DELTA_X_THRESHOLD 60 -#define DELTA_Y_THRESHOLD 15 - -typedef enum { - // You could theoretically define 0b00 and send it by having a macro send - // the second tap after LED_CMD_TIMEOUT has elapsed. - // CMD_EXTRA = 0b00, - TG_SCROLL = 0b01, - CYC_DPI = 0b10, - CMD_RESET = 0b11 // CMD_ prefix to avoid clash with QMK macro -} led_cmd_t; - -// State -static bool scroll_enabled = false; -static bool num_lock_state = false; -static bool caps_lock_state = false; -static bool in_cmd_window = false; -static int8_t delta_x = 0; -static int8_t delta_y = 0; - -typedef struct { - led_cmd_t led_cmd; - uint8_t num_lock_count; - uint8_t caps_lock_count; -} cmd_window_state_t; - -// Dummy -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{{KC_NO}}}; - -report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) { - if (scroll_enabled) { - delta_x += mouse_report.x; - delta_y += mouse_report.y; - - if (delta_x > DELTA_X_THRESHOLD) { - mouse_report.h = 1; - delta_x = 0; - } else if (delta_x < -DELTA_X_THRESHOLD) { - mouse_report.h = -1; - delta_x = 0; - } - - if (delta_y > DELTA_Y_THRESHOLD) { - mouse_report.v = -1; - delta_y = 0; - } else if (delta_y < -DELTA_Y_THRESHOLD) { - mouse_report.v = 1; - delta_y = 0; - } - mouse_report.x = 0; - mouse_report.y = 0; - } - return mouse_report; -} - -void keyboard_post_init_user(void) { - num_lock_state = host_keyboard_led_state().num_lock; - caps_lock_state = host_keyboard_led_state().caps_lock; -} - -uint32_t command_timeout(uint32_t trigger_time, void *cb_arg) { - cmd_window_state_t *cmd_window_state = (cmd_window_state_t *)cb_arg; -# ifdef CONSOLE_ENABLE - uprintf("Received command 0b%02b (", cmd_window_state->led_cmd); -# endif - switch (cmd_window_state->led_cmd) { - case TG_SCROLL: -# ifdef CONSOLE_ENABLE - uprint("TG_SCROLL)\n"); -# endif - scroll_enabled = !scroll_enabled; - break; - case CYC_DPI: -# ifdef CONSOLE_ENABLE - uprint("CYC_DPI)\n"); -# endif - cycle_dpi(); - break; - case CMD_RESET: -# ifdef CONSOLE_ENABLE - uprint("QK_BOOT)\n"); -# endif - reset_keyboard(); - break; - default: -# ifdef CONSOLE_ENABLE - uprint("unknown)\n"); -# endif - // Ignore unrecognised commands. - break; - } - cmd_window_state->led_cmd = 0; - cmd_window_state->num_lock_count = 0; - cmd_window_state->caps_lock_count = 0; - in_cmd_window = false; - - return 0; // Don't repeat -} - -bool led_update_user(led_t led_state) { - static cmd_window_state_t cmd_window_state = { - .led_cmd = 0b00, - .num_lock_count = 0, - .caps_lock_count = 0 - }; - - // Start timer to end command window if we are not already in the middle of - // one. - if (!in_cmd_window) { - in_cmd_window = true; - defer_exec(LED_CMD_TIMEOUT, command_timeout, &cmd_window_state); - } - - // Set num lock and caps lock bits when each is toggled on and off within - // the window. - if (led_state.num_lock != num_lock_state) { - cmd_window_state.num_lock_count++; - - if (cmd_window_state.num_lock_count == 2) { - cmd_window_state.led_cmd |= NUM_LOCK_BITMASK; - cmd_window_state.num_lock_count = 0; - } - } - - if (led_state.caps_lock != caps_lock_state) { - cmd_window_state.caps_lock_count++; - - if (cmd_window_state.caps_lock_count == 2) { - cmd_window_state.led_cmd |= CAPS_LOCK_BITMASK; - cmd_window_state.caps_lock_count = 0; - } - } - - // Keep our copy of the LED states in sync with the host. - num_lock_state = led_state.num_lock; - caps_lock_state = led_state.caps_lock; - return true; -} diff --git a/keyboards/ploopyco/trackball_nano/keymaps/lkbm/readme.md b/keyboards/ploopyco/trackball_nano/keymaps/lkbm/readme.md deleted file mode 100644 index 3b2f698e521..00000000000 --- a/keyboards/ploopyco/trackball_nano/keymaps/lkbm/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The keymap that takes commands as LED-Key BitMasks (lkbm) -Based on [maddie](../maddie), this keymap lets you send a 2-bit command by having a macro on your keyboard tap `KC_NUM_LOCK` and `KC_CAPS_LOCK` on and off within a very short window (25ms by default) to represent bits 1 and 2 respectively. The keymap uses this to allow toggling between sending mouse-movement events and scrolling events; cycling DPI presets, and resetting to the bootloader, so you can reflash without having to unscrew your Ploopy Nano. diff --git a/keyboards/ploopyco/trackball_nano/keymaps/lkbm/rules.mk b/keyboards/ploopyco/trackball_nano/keymaps/lkbm/rules.mk deleted file mode 100644 index 199bad85f3c..00000000000 --- a/keyboards/ploopyco/trackball_nano/keymaps/lkbm/rules.mk +++ /dev/null @@ -1 +0,0 @@ -DEFERRED_EXEC_ENABLE = yes diff --git a/keyboards/ploopyco/trackball_nano/readme.md b/keyboards/ploopyco/trackball_nano/readme.md index 0d427bfb55e..a3ef878bdf5 100644 --- a/keyboards/ploopyco/trackball_nano/readme.md +++ b/keyboards/ploopyco/trackball_nano/readme.md @@ -28,21 +28,6 @@ Occasionally, new revisions of the PCB will be released. Every board comes with Match the firmware that you flash onto the board with the designator on the board. -# Customizing your Ploopy Nano Trackball - -You can change the DPI/CPI or speed of the trackball by calling `adns_set_cpi` at any time. Additionally, there is a `DPI_CONFIG` macro that will cycle through an array of options for the DPI. This is set to 375, 750, and 1375, but can be changed. 750 is the default. - -To configure/set your own array, there are two defines to use, `PLOOPY_DPI_OPTIONS` to set the array, and `PLOOPY_DPI_DEFAULT`. - -```c -#define PLOOPY_DPI_OPTIONS { 375, 750, 1375} -#define PLOOPY_DPI_DEFAULT 1 -``` - -The `PLOOPY_DPI_OPTIONS` array sets the values that you want to be able to cycle through, and the order they are in. The "default" define lets the firmware know which of these options is the default and should be loaded by default. - -The `DPI_CONFIG` macro will cycle through the values in the array, each time you hit it. It stores this value in persistent memory, so it will load it the next time the device powers up. - ## Fuse settings When flashing the bootloader, use the following fuse settings: @@ -52,3 +37,7 @@ When flashing the bootloader, use the following fuse settings: | Low | `0x5E` | | High | `0x99` | | Extended | `0xC3` | + +# Customizing your PloopyCo Trackball Nano + +You can find customziation options [here](../readme.md). diff --git a/keyboards/ploopyco/trackball_nano/rules.mk b/keyboards/ploopyco/trackball_nano/rules.mk index 7a1052a4fac..df29dfbc07f 100644 --- a/keyboards/ploopyco/trackball_nano/rules.mk +++ b/keyboards/ploopyco/trackball_nano/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -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 -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = adns5050 -MOUSEKEY_ENABLE = no # Mouse keys DEFAULT_FOLDER = ploopyco/trackball_nano/rev1_001 diff --git a/keyboards/ploopyco/trackball_nano/trackball_nano.c b/keyboards/ploopyco/trackball_nano/trackball_nano.c deleted file mode 100644 index 366918e1340..00000000000 --- a/keyboards/ploopyco/trackball_nano/trackball_nano.c +++ /dev/null @@ -1,115 +0,0 @@ -/* Copyright 2021 Colin Lam (Ploopy Corporation) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2019 Hiroyuki Okada - * - * 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 . - */ - -#include "trackball_nano.h" -#include "wait.h" - -#ifndef OPT_DEBOUNCE -# define OPT_DEBOUNCE 5 // (ms) Time between scroll events -#endif - -#ifndef SCROLL_BUTT_DEBOUNCE -# define SCROLL_BUTT_DEBOUNCE 100 // (ms) Time between scroll events -#endif - -#ifndef OPT_THRES -# define OPT_THRES 150 // (0-1024) Threshold for actication -#endif - -#ifndef OPT_SCALE -# define OPT_SCALE 1 // Multiplier for wheel -#endif - -#ifndef PLOOPY_DPI_OPTIONS -# define PLOOPY_DPI_OPTIONS \ - { 375, 750, 1375 } -# ifndef PLOOPY_DPI_DEFAULT -# define PLOOPY_DPI_DEFAULT 2 -# endif -#endif - -#ifndef PLOOPY_DPI_DEFAULT -# define PLOOPY_DPI_DEFAULT 2 -#endif - -keyboard_config_t keyboard_config; -uint16_t dpi_array[] = PLOOPY_DPI_OPTIONS; -#define DPI_OPTION_SIZE ARRAY_SIZE(dpi_array) - -void cycle_dpi(void) { - keyboard_config.dpi_config = (keyboard_config.dpi_config + 1) % DPI_OPTION_SIZE; - pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]); -#ifdef CONSOLE_ENABLE - uprintf("DPI is now %d\n", dpi_array[keyboard_config.dpi_config]); -#endif -} - -// TODO: Implement libinput profiles -// https://wayland.freedesktop.org/libinput/doc/latest/pointer-acceleration.html -// Compile time accel selection -// Valid options are ACC_NONE, ACC_LINEAR, ACC_CUSTOM, ACC_QUADRATIC - -// Trackball State -bool is_scroll_clicked = false; -bool BurstState = false; // init burst state for Trackball module -uint16_t MotionStart = 0; // Timer for accel, 0 is resting state - -void pointing_device_init_kb(void) { - // set the DPI. - pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]); -} - -// Hardware Setup -void keyboard_pre_init_kb(void) { - // debug_enable = true; - // debug_matrix = true; - // debug_mouse = true; - // debug_encoder = true; - - /* Ground all output pins connected to ground. This provides additional - * pathways to ground. If you're messing with this, know this: driving ANY - * of these pins high will cause a short. On the MCU. Ka-blooey. - */ -#ifdef UNUSABLE_PINS - const pin_t unused_pins[] = UNUSABLE_PINS; - - for (uint8_t i = 0; i < ARRAY_SIZE(unused_pins); i++) { - setPinOutput(unused_pins[i]); - writePinLow(unused_pins[i]); - } -#endif - - keyboard_pre_init_user(); -} - -void eeconfig_init_kb(void) { - keyboard_config.dpi_config = PLOOPY_DPI_DEFAULT; - eeconfig_update_kb(keyboard_config.raw); - eeconfig_init_user(); -} - -void matrix_init_kb(void) { - // is safe to just read DPI setting since matrix init - // comes before pointing device init. - keyboard_config.raw = eeconfig_read_kb(); - if (keyboard_config.dpi_config > DPI_OPTION_SIZE) { - eeconfig_init_kb(); - } - matrix_init_user(); -} diff --git a/keyboards/ploopyco/trackball_nano/trackball_nano.h b/keyboards/ploopyco/trackball_nano/trackball_nano.h deleted file mode 100644 index e3bd0cb351e..00000000000 --- a/keyboards/ploopyco/trackball_nano/trackball_nano.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 Colin Lam (Ploopy Corporation) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2019 Hiroyuki Okada - * - * 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 - -#include "quantum.h" - -typedef union { - uint32_t raw; - struct { - uint8_t dpi_config; - }; -} keyboard_config_t; - -extern keyboard_config_t keyboard_config; - -enum ploopy_keycodes { - DPI_CONFIG = QK_KB_0, -}; - -void cycle_dpi(void); diff --git a/keyboards/ploopyco/trackball_thumb/config.h b/keyboards/ploopyco/trackball_thumb/config.h index 316755f6866..631456d9d31 100644 --- a/keyboards/ploopyco/trackball_thumb/config.h +++ b/keyboards/ploopyco/trackball_thumb/config.h @@ -19,9 +19,9 @@ #pragma once /* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT +// #define NO_ACTION_LAYER +// #define NO_ACTION_TAPPING +// #define NO_ACTION_ONESHOT // #define ROTATIONAL_TRANSFORM_ANGLE 0 #define POINTING_DEVICE_INVERT_Y @@ -32,5 +32,15 @@ /* PMW3360 Settings */ #define POINTING_DEVICE_CS_PIN B0 +#define ENCODER_BUTTON_COL 1 +#define ENCODER_BUTTON_ROW 0 + +#define ENCODER_LOW_THRES_A 20 +#define ENCODER_HIGH_THRES_A 75 +#define ENCODER_LOW_THRES_B 20 +#define ENCODER_HIGH_THRES_B 90 /* Custom encoder needs to specify just how many encoders we have */ #define NUM_ENCODERS 1 + +#define ENCODERS_PAD_A { F4 } +#define ENCODERS_PAD_B { F0 } diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/keymap.c b/keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/keymap.c deleted file mode 100644 index 03202cc8f7a..00000000000 --- a/keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/keymap.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2021 Colin Lam (Ploopy Corporation) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * - * 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 . - */ -#include QMK_KEYBOARD_H - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( /* Base */ - KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN5, - MO(1) - ), - [1] = LAYOUT( - _______, _______, _______, _______, _______, - DRAG_SCROLL - ) -}; diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/readme.md b/keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/readme.md deleted file mode 100644 index 22119b7ef9b..00000000000 --- a/keyboards/ploopyco/trackball_thumb/keymaps/drag_scroll/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The Drag Scroll keymap for Ploopyco Thumb Trackball - -This is a sample keymap showing off what you can do with the custom callback drivers. diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/via/rules.mk b/keyboards/ploopyco/trackball_thumb/keymaps/via/rules.mk index 1e5b99807cb..36b7ba9cbc9 100644 --- a/keyboards/ploopyco/trackball_thumb/keymaps/via/rules.mk +++ b/keyboards/ploopyco/trackball_thumb/keymaps/via/rules.mk @@ -1 +1,2 @@ VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/ploopyco/trackball_thumb/readme.md b/keyboards/ploopyco/trackball_thumb/readme.md index 83ac740f855..8299c088094 100644 --- a/keyboards/ploopyco/trackball_thumb/readme.md +++ b/keyboards/ploopyco/trackball_thumb/readme.md @@ -16,43 +16,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to # Customizing your PloopyCo Thumb -While the defaults are designed so that it can be plugged in and used right away, there are a number of things that you may want to change. Such as adding DPI control, or to use the ball to scroll while holding a button. To allow for this sort of control, there is a callback for both the scroll wheel and the mouse sensor. - -The default behavior for this is: - -```c -report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) { - - return mouse_report; -} -``` - -This should allow you to more heavily customize the behavior. - -Alternatively, the `process_wheel` and `process_mouse` functions can both be replaced too, to allow for even more functionality. - -Additionally, you can change the DPI/CPI or speed of the trackball by calling `pmw_set_cpi` at any time. Additionally, there is a `DPI_CONFIG` keycode that will cycle through an array of options for the DPI. This is set to 1200, 1600, and 2400, but can be changed. 1600 is also set to the default. - -To configure/set your own array, there are two defines to use, `PLOOPY_DPI_OPTIONS` to set the array, and `PLOOPY_DPI_DEFAULT`, which is the `0`-based index into the `PLOOPY_DPI_OPTIONS` array. - -```c -#define PLOOPY_DPI_OPTIONS { 1200, 1600, 2400 } -#define PLOOPY_DPI_DEFAULT 1 -``` -The `PLOOPY_DPI_OPTIONS` array sets the values that you want to be able to cycle through, and the order they are in. The "default" define lets the firmware know which of these options is the default and should be loaded by default. - -When inserted into your keymap, the `DPI_CONFIG` keycode will cycle through the values in the array each time you hit it. It stores this value in persistent memory, so it will remember your selection the next time the device powers up. - -## Drag Scroll - -Drag Scroll is a custom keycode for the Ploopy devices that allow you to hold or tap a button and have the mouse movement translate into scrolling instead. - -Nothing needs to be enabled to use this functionality. Just add the `DRAG_SCROLL` to your keymap. - -### Drag Scroll Configuration - -* `#define PLOOPY_DRAGSCROLL_MOMENTARY` - Makes the key into a momentary key, rather than a toggle. -* `#define PLOOPY_DRAGSCROLL_MULTIPLIER 0.75` - Sets the DPI multiplier to use when drag scroll is enabled. -* `#define PLOOPY_DRAGSCROLL_FIXED` - Normally, when activating Drag Scroll, it uses a fraction of the current DPI. You can define this to use a specific, set DPI rather than a fraction of the current DPI. - * `#define PLOOPY_DRAGSCROLL_DPI 100` - When the fixed DPI option is enabled, this sets the DPI to be used for Drag Scroll. -* `#define PLOOPY_DRAGSCROLL_INVERT` - This reverses the direction that the scroll is performed. +You can find customziation options [here](../readme.md). diff --git a/keyboards/ploopyco/trackball_thumb/rules.mk b/keyboards/ploopyco/trackball_thumb/rules.mk index 6b82d7734b4..0bd44d316a3 100644 --- a/keyboards/ploopyco/trackball_thumb/rules.mk +++ b/keyboards/ploopyco/trackball_thumb/rules.mk @@ -3,8 +3,4 @@ F_CPU = 8000000 POINTING_DEVICE_DRIVER = pmw3360 -ANALOG_DRIVER_REQUIRED = yes - -SRC += opt_encoder.c - DEFAULT_FOLDER = ploopyco/trackball_thumb/rev1_001 diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.c b/keyboards/ploopyco/trackball_thumb/trackball_thumb.c deleted file mode 100644 index 326410cf136..00000000000 --- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.c +++ /dev/null @@ -1,225 +0,0 @@ -/* Copyright 2021 Colin Lam (Ploopy Corporation) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * - * 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 . - */ - -#include "trackball_thumb.h" -#include "encoder.h" - -#ifndef OPT_DEBOUNCE -# define OPT_DEBOUNCE 5 // (ms) Time between scroll events -#endif -#ifndef SCROLL_BUTT_DEBOUNCE -# define SCROLL_BUTT_DEBOUNCE 100 // (ms) Time between scroll events -#endif -#ifndef PLOOPY_DPI_OPTIONS -# define PLOOPY_DPI_OPTIONS \ - { 600, 900, 1200, 1600 } -# ifndef PLOOPY_DPI_DEFAULT -# define PLOOPY_DPI_DEFAULT 1 -# endif -#endif -#ifndef PLOOPY_DPI_DEFAULT -# define PLOOPY_DPI_DEFAULT 0 -#endif -#ifndef PLOOPY_DRAGSCROLL_DPI -# define PLOOPY_DRAGSCROLL_DPI 100 // Fixed-DPI Drag Scroll -#endif -#ifndef PLOOPY_DRAGSCROLL_MULTIPLIER -# define PLOOPY_DRAGSCROLL_MULTIPLIER 0.75 // Variable-DPI Drag Scroll -#endif - -keyboard_config_t keyboard_config; -uint16_t dpi_array[] = PLOOPY_DPI_OPTIONS; -#define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t)) - -// TODO: Implement libinput profiles -// https://wayland.freedesktop.org/libinput/doc/latest/pointer-acceleration.html -// Compile time accel selection -// Valid options are ACC_NONE, ACC_LINEAR, ACC_CUSTOM, ACC_QUADRATIC - -// Trackball State -bool is_scroll_clicked = false; -uint16_t last_scroll = 0; // Previous confirmed wheel event -uint16_t last_mid_click = 0; // Stops scrollwheel from being read if it was pressed; -bool debug_encoder = false; -bool is_drag_scroll = false; - -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } -#ifdef MOUSEKEY_ENABLE - tap_code(clockwise ? KC_WH_U : KC_WH_D); -#else - report_mouse_t mouse_report = pointing_device_get_report(); - mouse_report.v = clockwise ? 1 : -1; - pointing_device_set_report(mouse_report); - pointing_device_send(); -#endif - return true; -} - -void encoder_driver_init(void) { opt_encoder_init(); } - -void encoder_driver_task(void) { - // Lovingly ripped from the Ploopy Source - - // If the mouse wheel was just released, do not scroll. - if (timer_elapsed(last_mid_click) < SCROLL_BUTT_DEBOUNCE) { - return; - } - - // Limit the number of scrolls per unit time. - if (timer_elapsed(last_scroll) < OPT_DEBOUNCE) { - return; - } - - // Don't scroll if the middle button is depressed. - if (is_scroll_clicked) { -#ifndef IGNORE_SCROLL_CLICK - return; -#endif - } - - last_scroll = timer_read(); - uint16_t p1 = adc_read(OPT_ENC1_MUX); - uint16_t p2 = adc_read(OPT_ENC2_MUX); - if (debug_encoder) dprintf("OPT1: %d, OPT2: %d\n", p1, p2); - - int dir = opt_encoder_handler(p1, p2); - - if (dir == 0) return; - encoder_queue_event(0, dir == 1); -} - -report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) { - if (is_drag_scroll) { - mouse_report.h = mouse_report.x; -#ifdef PLOOPY_DRAGSCROLL_INVERT - // Invert vertical scroll direction - mouse_report.v = -mouse_report.y; -#else - mouse_report.v = mouse_report.y; -#endif - mouse_report.x = 0; - mouse_report.y = 0; - } - - return pointing_device_task_user(mouse_report); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t* record) { - // Update Timer to prevent accidental scrolls - if ((record->event.key.col == 1) && (record->event.key.row == 0)) { - last_mid_click = timer_read(); - is_scroll_clicked = record->event.pressed; - } - - if (!process_record_user(keycode, record)) { - return false; - } - - if (keycode == DPI_CONFIG && record->event.pressed) { - keyboard_config.dpi_config = (keyboard_config.dpi_config + 1) % DPI_OPTION_SIZE; - eeconfig_update_kb(keyboard_config.raw); - pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]); - } - - if (keycode == DRAG_SCROLL) { -#ifndef PLOOPY_DRAGSCROLL_MOMENTARY - if (record->event.pressed) -#endif - { - is_drag_scroll ^= 1; - } -#ifdef PLOOPY_DRAGSCROLL_FIXED - pointing_device_set_cpi(is_drag_scroll ? PLOOPY_DRAGSCROLL_DPI : dpi_array[keyboard_config.dpi_config]); -#else - pointing_device_set_cpi(is_drag_scroll ? (dpi_array[keyboard_config.dpi_config] * PLOOPY_DRAGSCROLL_MULTIPLIER) : dpi_array[keyboard_config.dpi_config]); -#endif - } - -/* If Mousekeys is disabled, then use handle the mouse button - * keycodes. This makes things simpler, and allows usage of - * the keycodes in a consistent manner. But only do this if - * Mousekeys is not enable, so it's not handled twice. - */ -#ifndef MOUSEKEY_ENABLE - if (IS_MOUSEKEY_BUTTON(keycode)) { - report_mouse_t currentReport = pointing_device_get_report(); - if (record->event.pressed) { - currentReport.buttons |= 1 << (keycode - KC_MS_BTN1); - } else { - currentReport.buttons &= ~(1 << (keycode - KC_MS_BTN1)); - } - pointing_device_set_report(currentReport); - pointing_device_send(); - } -#endif - - return true; -} - -// Hardware Setup -void keyboard_pre_init_kb(void) { - // debug_enable = true; - // debug_matrix = true; - // debug_mouse = true; - // debug_encoder = true; - - setPinInput(OPT_ENC1); - setPinInput(OPT_ENC2); - - /* Ground all output pins connected to ground. This provides additional - * pathways to ground. If you're messing with this, know this: driving ANY - * of these pins high will cause a short. On the MCU. Ka-blooey. - */ -#ifdef UNUSABLE_PINS - const pin_t unused_pins[] = UNUSABLE_PINS; - - for (uint8_t i = 0; i < (sizeof(unused_pins) / sizeof(pin_t)); i++) { - setPinOutput(unused_pins[i]); - writePinLow(unused_pins[i]); - } -#endif - - // This is the debug LED. -#if defined(DEBUG_LED_PIN) - setPinOutput(DEBUG_LED_PIN); - writePin(DEBUG_LED_PIN, debug_enable); -#endif - - keyboard_pre_init_user(); -} - -void pointing_device_init_kb(void) { pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]); } - -void eeconfig_init_kb(void) { - keyboard_config.dpi_config = PLOOPY_DPI_DEFAULT; - eeconfig_update_kb(keyboard_config.raw); - eeconfig_init_user(); -} - -void matrix_init_kb(void) { - // is safe to just read DPI setting since matrix init - // comes before pointing device init. - keyboard_config.raw = eeconfig_read_kb(); - if (keyboard_config.dpi_config > DPI_OPTION_SIZE) { - eeconfig_init_kb(); - } - matrix_init_user(); -} diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h deleted file mode 100644 index 50a71601cf2..00000000000 --- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2021 Colin Lam (Ploopy Corporation) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * - * 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 - -#include "quantum.h" -#include "analog.h" -#include "opt_encoder.h" - -// Sensor defs -#define OPT_ENC1 F4 -#define OPT_ENC2 F0 -#define OPT_ENC1_MUX 4 -#define OPT_ENC2_MUX 0 - -typedef union { - uint32_t raw; - struct { - uint8_t dpi_config; - }; -} keyboard_config_t; -_Static_assert(sizeof(keyboard_config_t) == sizeof(uint32_t), "keyboard_config_t size mismatch compared to EEPROM area"); - -extern keyboard_config_t keyboard_config; -extern uint16_t dpi_array[]; - -enum ploopy_keycodes { - DPI_CONFIG = QK_KB_0, - DRAG_SCROLL, -}; From 24d824aae40b932dbcdc5036d7f30a6f2f352442 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 15 Mar 2024 22:23:40 +0000 Subject: [PATCH 035/333] Migrate features from rules.mk to data driven - UVWXYZ (#23287) --- keyboards/ubest/vn/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ubest/vn/rules.mk | 12 ------------ keyboards/uk78/{info.json => keyboard.json} | 10 ++++++++++ keyboards/uk78/rules.mk | 12 ------------ .../ungodly/nines/{info.json => keyboard.json} | 9 +++++++++ keyboards/ungodly/nines/rules.mk | 13 ------------- .../unikeyboard/felix/{info.json => keyboard.json} | 9 +++++++++ keyboards/unikeyboard/felix/rules.mk | 12 ------------ keyboards/unikorn/{info.json => keyboard.json} | 9 +++++++++ keyboards/unikorn/rules.mk | 10 ---------- keyboards/uranuma/{info.json => keyboard.json} | 8 ++++++++ keyboards/uranuma/rules.mk | 14 -------------- keyboards/utd80/{info.json => keyboard.json} | 10 ++++++++++ keyboards/utd80/rules.mk | 12 ------------ .../v4n4g0rth0n/v1/{info.json => keyboard.json} | 8 ++++++++ keyboards/v4n4g0rth0n/v1/rules.mk | 12 ------------ keyboards/vagrant_10/{info.json => keyboard.json} | 8 ++++++++ keyboards/vagrant_10/rules.mk | 12 ------------ .../vertex/angler2/{info.json => keyboard.json} | 9 +++++++++ keyboards/vertex/angler2/rules.mk | 12 ------------ .../vertex/arc60h/{info.json => keyboard.json} | 10 ++++++++++ keyboards/vertex/arc60h/rules.mk | 14 -------------- .../viktus/at101_bh/{info.json => keyboard.json} | 8 ++++++++ keyboards/viktus/at101_bh/rules.mk | 12 ------------ .../viktus/omnikey_bh/{info.json => keyboard.json} | 8 ++++++++ keyboards/viktus/omnikey_bh/rules.mk | 12 ------------ .../viktus/smolka/{info.json => keyboard.json} | 9 +++++++++ keyboards/viktus/smolka/rules.mk | 13 ------------- .../viktus/styrka/{info.json => keyboard.json} | 8 ++++++++ keyboards/viktus/styrka/rules.mk | 12 ------------ .../viktus/z150_bh/{info.json => keyboard.json} | 8 ++++++++ keyboards/viktus/z150_bh/rules.mk | 12 ------------ keyboards/waldo/{info.json => keyboard.json} | 10 ++++++++++ keyboards/waldo/rules.mk | 12 ------------ .../cajal/{info.json => keyboard.json} | 10 ++++++++++ keyboards/walletburner/cajal/rules.mk | 13 ------------- .../neuron/{info.json => keyboard.json} | 9 +++++++++ keyboards/walletburner/neuron/rules.mk | 12 ------------ .../foundation/{info.json => keyboard.json} | 9 +++++++++ keyboards/wavtype/foundation/rules.mk | 12 ------------ .../wavtype/p01_ultra/{info.json => keyboard.json} | 9 +++++++++ keyboards/wavtype/p01_ultra/rules.mk | 12 ------------ .../weirdo/geminate60/{info.json => keyboard.json} | 9 +++++++++ keyboards/weirdo/geminate60/rules.mk | 12 ------------ .../kelowna/rgb64/{info.json => keyboard.json} | 9 +++++++++ keyboards/weirdo/kelowna/rgb64/rules.mk | 12 ------------ .../weirdo/ls_60/{info.json => keyboard.json} | 9 +++++++++ keyboards/weirdo/ls_60/rules.mk | 12 ------------ .../naiping/np64/{info.json => keyboard.json} | 9 +++++++++ keyboards/weirdo/naiping/np64/rules.mk | 12 ------------ .../naiping/nphhkb/{info.json => keyboard.json} | 9 +++++++++ keyboards/weirdo/naiping/nphhkb/rules.mk | 12 ------------ .../naiping/npminila/{info.json => keyboard.json} | 9 +++++++++ keyboards/weirdo/naiping/npminila/rules.mk | 12 ------------ .../weirdo/tiger910/{info.json => keyboard.json} | 9 +++++++++ keyboards/weirdo/tiger910/rules.mk | 13 ------------- .../wekey/polaris/{info.json => keyboard.json} | 8 ++++++++ keyboards/wekey/polaris/rules.mk | 12 ------------ .../aanzee/{info.json => keyboard.json} | 10 ++++++++++ keyboards/westfoxtrot/aanzee/rules.mk | 13 ------------- .../cyclops/{info.json => keyboard.json} | 8 ++++++++ keyboards/westfoxtrot/cyclops/rules.mk | 12 ------------ .../cypher/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/westfoxtrot/cypher/rev1/rules.mk | 12 ------------ .../cypher/rev5/{info.json => keyboard.json} | 10 ++++++++++ keyboards/westfoxtrot/cypher/rev5/rules.mk | 12 ------------ .../prophet/{info.json => keyboard.json} | 9 +++++++++ keyboards/westfoxtrot/prophet/rules.mk | 13 ------------- .../rama_works_m10_b/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/rama_works_m10_b/rules.mk | 11 ----------- .../rama_works_m50_ax/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/rama_works_m50_ax/rules.mk | 12 ------------ .../wilba_tech/wt60_g/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/wt60_g/rules.mk | 12 ------------ .../wt60_g2/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/wt60_g2/rules.mk | 12 ------------ .../wt60_h1/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/wt60_h1/rules.mk | 12 ------------ .../wt60_h2/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/wt60_h2/rules.mk | 12 ------------ .../wt60_h3/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/wt60_h3/rules.mk | 12 ------------ .../wt60_xt/{info.json => keyboard.json} | 9 +++++++++ keyboards/wilba_tech/wt60_xt/rules.mk | 11 ----------- .../wilba_tech/wt65_d/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/wt65_d/rules.mk | 12 ------------ .../wilba_tech/wt65_f/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/wt65_f/rules.mk | 12 ------------ .../wt65_fx/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/wt65_fx/rules.mk | 12 ------------ .../wilba_tech/wt65_g/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/wt65_g/rules.mk | 12 ------------ .../wt65_g2/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/wt65_g2/rules.mk | 12 ------------ .../wt65_h1/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/wt65_h1/rules.mk | 12 ------------ .../wt65_xt/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/wt65_xt/rules.mk | 12 ------------ .../wt65_xtx/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/wt65_xtx/rules.mk | 12 ------------ .../wt70_jb/{info.json => keyboard.json} | 9 +++++++++ keyboards/wilba_tech/wt70_jb/rules.mk | 12 ------------ .../wilba_tech/wt80_g/{info.json => keyboard.json} | 8 ++++++++ keyboards/wilba_tech/wt80_g/rules.mk | 12 ------------ .../winkeyless/b87/{info.json => keyboard.json} | 10 ++++++++++ keyboards/winkeyless/b87/rules.mk | 11 ----------- .../winkeyless/bface/{info.json => keyboard.json} | 10 ++++++++++ keyboards/winkeyless/bface/rules.mk | 10 ---------- .../winkeyless/bmini/{info.json => keyboard.json} | 10 ++++++++++ keyboards/winkeyless/bmini/rules.mk | 10 ---------- .../bminiex/{info.json => keyboard.json} | 10 ++++++++++ keyboards/winkeyless/bminiex/rules.mk | 11 ----------- .../mini_winni/{info.json => keyboard.json} | 9 +++++++++ keyboards/winkeys/mini_winni/rules.mk | 12 ------------ .../winry/winry25tc/{info.json => keyboard.json} | 10 ++++++++++ keyboards/winry/winry25tc/rules.mk | 13 ------------- .../winry/winry315/{info.json => keyboard.json} | 10 ++++++++++ keyboards/winry/winry315/rules.mk | 14 -------------- .../bigseries/1key/{info.json => keyboard.json} | 9 +++++++++ keyboards/woodkeys/bigseries/1key/rules.mk | 12 ------------ .../bigseries/2key/{info.json => keyboard.json} | 9 +++++++++ keyboards/woodkeys/bigseries/2key/rules.mk | 12 ------------ .../bigseries/3key/{info.json => keyboard.json} | 9 +++++++++ keyboards/woodkeys/bigseries/3key/rules.mk | 12 ------------ .../bigseries/4key/{info.json => keyboard.json} | 9 +++++++++ keyboards/woodkeys/bigseries/4key/rules.mk | 12 ------------ keyboards/wsk/alpha9/{info.json => keyboard.json} | 9 +++++++++ keyboards/wsk/alpha9/rules.mk | 12 ------------ .../wsk/g4m3ralpha/{info.json => keyboard.json} | 9 +++++++++ keyboards/wsk/g4m3ralpha/rules.mk | 12 ------------ .../wsk/gothic50/{info.json => keyboard.json} | 9 +++++++++ keyboards/wsk/gothic50/rules.mk | 12 ------------ .../wsk/gothic70/{info.json => keyboard.json} | 9 +++++++++ keyboards/wsk/gothic70/rules.mk | 12 ------------ .../wsk/houndstooth/{info.json => keyboard.json} | 8 ++++++++ keyboards/wsk/houndstooth/rules.mk | 12 ------------ keyboards/wsk/jerkin/{info.json => keyboard.json} | 8 ++++++++ keyboards/wsk/jerkin/rules.mk | 12 ------------ .../wsk/kodachi50/{info.json => keyboard.json} | 9 +++++++++ keyboards/wsk/kodachi50/rules.mk | 12 ------------ keyboards/wsk/pain27/{info.json => keyboard.json} | 9 +++++++++ keyboards/wsk/pain27/rules.mk | 12 ------------ keyboards/wsk/sl40/{info.json => keyboard.json} | 9 +++++++++ keyboards/wsk/sl40/rules.mk | 12 ------------ keyboards/wsk/tkl30/{info.json => keyboard.json} | 8 ++++++++ keyboards/wsk/tkl30/rules.mk | 12 ------------ .../wuque/ikki68/{info.json => keyboard.json} | 9 +++++++++ keyboards/wuque/ikki68/rules.mk | 12 ------------ .../wuque/mammoth20x/{info.json => keyboard.json} | 9 +++++++++ keyboards/wuque/mammoth20x/rules.mk | 14 -------------- .../wuque/mammoth75x/{info.json => keyboard.json} | 9 +++++++++ keyboards/wuque/mammoth75x/rules.mk | 13 ------------- .../promise87/ansi/{info.json => keyboard.json} | 9 +++++++++ keyboards/wuque/promise87/ansi/rules.mk | 12 ------------ .../promise87/wkl/{info.json => keyboard.json} | 9 +++++++++ keyboards/wuque/promise87/wkl/rules.mk | 12 ------------ .../wuque/tata80/wk/{info.json => keyboard.json} | 8 ++++++++ keyboards/wuque/tata80/wk/rules.mk | 13 ------------- .../wuque/tata80/wkl/{info.json => keyboard.json} | 8 ++++++++ keyboards/wuque/tata80/wkl/rules.mk | 13 ------------- keyboards/x16/{info.json => keyboard.json} | 9 +++++++++ keyboards/x16/rules.mk | 12 ------------ .../xbows/knight/{info.json => keyboard.json} | 9 +++++++++ keyboards/xbows/knight/rules.mk | 13 ------------- .../xbows/knight_plus/{info.json => keyboard.json} | 9 +++++++++ keyboards/xbows/knight_plus/rules.mk | 13 ------------- .../xbows/nature/{info.json => keyboard.json} | 9 +++++++++ keyboards/xbows/nature/rules.mk | 13 ------------- .../xbows/numpad/{info.json => keyboard.json} | 9 +++++++++ keyboards/xbows/numpad/rules.mk | 13 ------------- .../xbows/ranger/{info.json => keyboard.json} | 9 +++++++++ keyboards/xbows/ranger/rules.mk | 13 ------------- .../xelus/dharma/{info.json => keyboard.json} | 8 ++++++++ keyboards/xelus/dharma/rules.mk | 12 ------------ .../kangaroo/rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/xelus/kangaroo/rev1/rules.mk | 11 ----------- .../kangaroo/rev2/{info.json => keyboard.json} | 8 ++++++++ keyboards/xelus/kangaroo/rev2/rules.mk | 11 ----------- .../xelus/ninjin/{info.json => keyboard.json} | 9 +++++++++ keyboards/xelus/ninjin/rules.mk | 13 ------------- .../pachi/mini_32u4/{info.json => keyboard.json} | 8 ++++++++ keyboards/xelus/pachi/mini_32u4/rules.mk | 12 ------------ .../xelus/pachi/rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/xelus/pachi/rev1/rules.mk | 13 ------------- .../xelus/rs60/rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/xelus/rs60/rev1/rules.mk | 12 ------------ .../xelus/snap96/{info.json => keyboard.json} | 8 ++++++++ keyboards/xelus/snap96/rules.mk | 12 ------------ .../rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/xelus/valor_frl_tkl/rev1/rules.mk | 12 ------------ keyboards/xelus/xs108/{info.json => keyboard.json} | 8 ++++++++ keyboards/xelus/xs108/rules.mk | 12 ------------ .../xiudi/xd60/rev2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/xiudi/xd60/rev2/rules.mk | 12 ------------ .../xiudi/xd60/rev3/{info.json => keyboard.json} | 10 ++++++++++ keyboards/xiudi/xd60/rev3/rules.mk | 12 ------------ keyboards/xiudi/xd68/{info.json => keyboard.json} | 10 ++++++++++ keyboards/xiudi/xd68/rules.mk | 12 ------------ keyboards/xiudi/xd75/{info.json => keyboard.json} | 9 +++++++++ keyboards/xiudi/xd75/rules.mk | 12 ------------ .../xiudi/xd84pro/{info.json => keyboard.json} | 10 ++++++++++ keyboards/xiudi/xd84pro/rules.mk | 12 ------------ keyboards/xiudi/xd87/{info.json => keyboard.json} | 9 +++++++++ keyboards/xiudi/xd87/rules.mk | 12 ------------ keyboards/xmmx/{info.json => keyboard.json} | 8 ++++++++ keyboards/xmmx/rules.mk | 12 ------------ .../yandrstudio/nz64/{info.json => keyboard.json} | 9 +++++++++ keyboards/yandrstudio/nz64/rules.mk | 13 ------------- .../zhou65/{info.json => keyboard.json} | 8 ++++++++ keyboards/yandrstudio/zhou65/rules.mk | 12 ------------ .../yatara/drink_me/{info.json => keyboard.json} | 8 ++++++++ keyboards/yatara/drink_me/rules.mk | 12 ------------ keyboards/ydkb/chili/{info.json => keyboard.json} | 9 +++++++++ keyboards/ydkb/chili/rules.mk | 12 ------------ keyboards/ydkb/yd68/{info.json => keyboard.json} | 9 +++++++++ keyboards/ydkb/yd68/rules.mk | 12 ------------ keyboards/yeehaw/{info.json => keyboard.json} | 10 ++++++++++ keyboards/yeehaw/rules.mk | 10 ---------- keyboards/ymdk/bface/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ymdk/bface/rules.mk | 10 ---------- keyboards/ymdk/np21/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ymdk/np21/rules.mk | 10 ---------- .../ymdk/np24/u4rgb6/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ymdk/np24/u4rgb6/rules.mk | 12 ------------ keyboards/ymdk/wings/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ymdk/wings/rules.mk | 12 ------------ .../ymdk/wingshs/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ymdk/wingshs/rules.mk | 12 ------------ keyboards/ymdk/ym68/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ymdk/ym68/rules.mk | 12 ------------ .../ymdk/ymd21/v2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ymdk/ymd21/v2/rules.mk | 12 ------------ keyboards/ymdk/ymd67/{info.json => keyboard.json} | 10 ++++++++++ keyboards/ymdk/ymd67/rules.mk | 12 ------------ .../ymdk/ymd75/rev1/{info.json => keyboard.json} | 11 +++++++++++ keyboards/ymdk/ymd75/rev1/rules.mk | 13 ------------- .../ymdk/ymd75/rev2/{info.json => keyboard.json} | 11 +++++++++++ keyboards/ymdk/ymd75/rev2/rules.mk | 13 ------------- .../ymdk/ymd75/rev3/{info.json => keyboard.json} | 11 +++++++++++ keyboards/ymdk/ymd75/rev3/rules.mk | 13 ------------- keyboards/ymdk/ymd96/{info.json => keyboard.json} | 11 +++++++++++ keyboards/ymdk/ymd96/rules.mk | 14 -------------- .../yncognito/batpad/{info.json => keyboard.json} | 9 +++++++++ keyboards/yncognito/batpad/rules.mk | 12 ------------ .../lunakey_macro/{info.json => keyboard.json} | 8 ++++++++ keyboards/yoichiro/lunakey_macro/rules.mk | 12 ------------ .../yushakobo/quick7/{info.json => keyboard.json} | 10 ++++++++++ keyboards/yushakobo/quick7/rules.mk | 14 -------------- .../yynmt/dozen0/{info.json => keyboard.json} | 9 +++++++++ keyboards/yynmt/dozen0/rules.mk | 12 ------------ .../yynmt/kagamidget/{info.json => keyboard.json} | 9 +++++++++ keyboards/yynmt/kagamidget/rules.mk | 14 -------------- .../big_switch/{info.json => keyboard.json} | 9 +++++++++ keyboards/zfrontier/big_switch/rules.mk | 12 ------------ keyboards/ziggurat/{info.json => keyboard.json} | 8 ++++++++ keyboards/ziggurat/rules.mk | 12 ------------ keyboards/zj68/{info.json => keyboard.json} | 9 +++++++++ keyboards/zj68/rules.mk | 13 ------------- keyboards/zoo/wampus/{info.json => keyboard.json} | 10 ++++++++++ keyboards/zoo/wampus/rules.mk | 14 -------------- .../ztboards/after/{info.json => keyboard.json} | 9 +++++++++ keyboards/ztboards/after/rules.mk | 13 ------------- .../ztboards/noon/{info.json => keyboard.json} | 8 ++++++++ keyboards/ztboards/noon/rules.mk | 12 ------------ 264 files changed, 1180 insertions(+), 1605 deletions(-) rename keyboards/ubest/vn/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ubest/vn/rules.mk rename keyboards/uk78/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/uk78/rules.mk rename keyboards/ungodly/nines/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/ungodly/nines/rules.mk rename keyboards/unikeyboard/felix/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/unikeyboard/felix/rules.mk rename keyboards/unikorn/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/unikorn/rules.mk rename keyboards/uranuma/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/uranuma/rules.mk rename keyboards/utd80/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/utd80/rules.mk rename keyboards/v4n4g0rth0n/v1/{info.json => keyboard.json} (64%) delete mode 100644 keyboards/v4n4g0rth0n/v1/rules.mk rename keyboards/vagrant_10/{info.json => keyboard.json} (86%) delete mode 100755 keyboards/vagrant_10/rules.mk rename keyboards/vertex/angler2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/vertex/angler2/rules.mk rename keyboards/vertex/arc60h/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/vertex/arc60h/rules.mk rename keyboards/viktus/at101_bh/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/viktus/at101_bh/rules.mk rename keyboards/viktus/omnikey_bh/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/viktus/omnikey_bh/rules.mk rename keyboards/viktus/smolka/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/viktus/smolka/rules.mk rename keyboards/viktus/styrka/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/viktus/styrka/rules.mk rename keyboards/viktus/z150_bh/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/viktus/z150_bh/rules.mk rename keyboards/waldo/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/waldo/rules.mk rename keyboards/walletburner/cajal/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/walletburner/cajal/rules.mk rename keyboards/walletburner/neuron/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/walletburner/neuron/rules.mk rename keyboards/wavtype/foundation/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/wavtype/foundation/rules.mk rename keyboards/wavtype/p01_ultra/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wavtype/p01_ultra/rules.mk rename keyboards/weirdo/geminate60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/weirdo/geminate60/rules.mk rename keyboards/weirdo/kelowna/rgb64/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/weirdo/kelowna/rgb64/rules.mk rename keyboards/weirdo/ls_60/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/weirdo/ls_60/rules.mk rename keyboards/weirdo/naiping/np64/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/weirdo/naiping/np64/rules.mk rename keyboards/weirdo/naiping/nphhkb/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/weirdo/naiping/nphhkb/rules.mk rename keyboards/weirdo/naiping/npminila/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/weirdo/naiping/npminila/rules.mk rename keyboards/weirdo/tiger910/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/weirdo/tiger910/rules.mk rename keyboards/wekey/polaris/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/wekey/polaris/rules.mk rename keyboards/westfoxtrot/aanzee/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/westfoxtrot/aanzee/rules.mk rename keyboards/westfoxtrot/cyclops/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/westfoxtrot/cyclops/rules.mk rename keyboards/westfoxtrot/cypher/rev1/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/westfoxtrot/cypher/rev1/rules.mk rename keyboards/westfoxtrot/cypher/rev5/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/westfoxtrot/cypher/rev5/rules.mk rename keyboards/westfoxtrot/prophet/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/westfoxtrot/prophet/rules.mk rename keyboards/wilba_tech/rama_works_m10_b/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/wilba_tech/rama_works_m10_b/rules.mk rename keyboards/wilba_tech/rama_works_m50_ax/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/wilba_tech/rama_works_m50_ax/rules.mk rename keyboards/wilba_tech/wt60_g/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wilba_tech/wt60_g/rules.mk rename keyboards/wilba_tech/wt60_g2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wilba_tech/wt60_g2/rules.mk rename keyboards/wilba_tech/wt60_h1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/wilba_tech/wt60_h1/rules.mk rename keyboards/wilba_tech/wt60_h2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/wilba_tech/wt60_h2/rules.mk rename keyboards/wilba_tech/wt60_h3/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/wilba_tech/wt60_h3/rules.mk rename keyboards/wilba_tech/wt60_xt/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wilba_tech/wt60_xt/rules.mk rename keyboards/wilba_tech/wt65_d/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wilba_tech/wt65_d/rules.mk rename keyboards/wilba_tech/wt65_f/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/wilba_tech/wt65_f/rules.mk rename keyboards/wilba_tech/wt65_fx/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wilba_tech/wt65_fx/rules.mk rename keyboards/wilba_tech/wt65_g/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wilba_tech/wt65_g/rules.mk rename keyboards/wilba_tech/wt65_g2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wilba_tech/wt65_g2/rules.mk rename keyboards/wilba_tech/wt65_h1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/wilba_tech/wt65_h1/rules.mk rename keyboards/wilba_tech/wt65_xt/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/wilba_tech/wt65_xt/rules.mk rename keyboards/wilba_tech/wt65_xtx/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wilba_tech/wt65_xtx/rules.mk rename keyboards/wilba_tech/wt70_jb/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/wilba_tech/wt70_jb/rules.mk rename keyboards/wilba_tech/wt80_g/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wilba_tech/wt80_g/rules.mk rename keyboards/winkeyless/b87/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/winkeyless/b87/rules.mk rename keyboards/winkeyless/bface/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/winkeyless/bface/rules.mk rename keyboards/winkeyless/bmini/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/winkeyless/bmini/rules.mk rename keyboards/winkeyless/bminiex/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/winkeyless/bminiex/rules.mk rename keyboards/winkeys/mini_winni/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/winkeys/mini_winni/rules.mk rename keyboards/winry/winry25tc/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/winry/winry25tc/rules.mk rename keyboards/winry/winry315/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/winry/winry315/rules.mk rename keyboards/woodkeys/bigseries/1key/{info.json => keyboard.json} (83%) delete mode 100755 keyboards/woodkeys/bigseries/1key/rules.mk rename keyboards/woodkeys/bigseries/2key/{info.json => keyboard.json} (84%) delete mode 100755 keyboards/woodkeys/bigseries/2key/rules.mk rename keyboards/woodkeys/bigseries/3key/{info.json => keyboard.json} (85%) delete mode 100755 keyboards/woodkeys/bigseries/3key/rules.mk rename keyboards/woodkeys/bigseries/4key/{info.json => keyboard.json} (86%) delete mode 100755 keyboards/woodkeys/bigseries/4key/rules.mk rename keyboards/wsk/alpha9/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/wsk/alpha9/rules.mk rename keyboards/wsk/g4m3ralpha/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/wsk/g4m3ralpha/rules.mk rename keyboards/wsk/gothic50/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/wsk/gothic50/rules.mk rename keyboards/wsk/gothic70/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/wsk/gothic70/rules.mk rename keyboards/wsk/houndstooth/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/wsk/houndstooth/rules.mk rename keyboards/wsk/jerkin/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/wsk/jerkin/rules.mk rename keyboards/wsk/kodachi50/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/wsk/kodachi50/rules.mk rename keyboards/wsk/pain27/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/wsk/pain27/rules.mk rename keyboards/wsk/sl40/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/wsk/sl40/rules.mk rename keyboards/wsk/tkl30/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/wsk/tkl30/rules.mk rename keyboards/wuque/ikki68/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/wuque/ikki68/rules.mk rename keyboards/wuque/mammoth20x/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/wuque/mammoth20x/rules.mk rename keyboards/wuque/mammoth75x/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wuque/mammoth75x/rules.mk rename keyboards/wuque/promise87/ansi/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wuque/promise87/ansi/rules.mk rename keyboards/wuque/promise87/wkl/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wuque/promise87/wkl/rules.mk rename keyboards/wuque/tata80/wk/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/wuque/tata80/wk/rules.mk rename keyboards/wuque/tata80/wkl/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/wuque/tata80/wkl/rules.mk rename keyboards/x16/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/x16/rules.mk rename keyboards/xbows/knight/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/xbows/knight/rules.mk rename keyboards/xbows/knight_plus/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/xbows/knight_plus/rules.mk rename keyboards/xbows/nature/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/xbows/nature/rules.mk rename keyboards/xbows/numpad/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/xbows/numpad/rules.mk rename keyboards/xbows/ranger/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/xbows/ranger/rules.mk rename keyboards/xelus/dharma/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/xelus/dharma/rules.mk rename keyboards/xelus/kangaroo/rev1/{info.json => keyboard.json} (72%) delete mode 100644 keyboards/xelus/kangaroo/rev1/rules.mk rename keyboards/xelus/kangaroo/rev2/{info.json => keyboard.json} (73%) delete mode 100644 keyboards/xelus/kangaroo/rev2/rules.mk rename keyboards/xelus/ninjin/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/xelus/ninjin/rules.mk rename keyboards/xelus/pachi/mini_32u4/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/xelus/pachi/mini_32u4/rules.mk rename keyboards/xelus/pachi/rev1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/xelus/pachi/rev1/rules.mk rename keyboards/xelus/rs60/rev1/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/xelus/rs60/rev1/rules.mk rename keyboards/xelus/snap96/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/xelus/snap96/rules.mk rename keyboards/xelus/valor_frl_tkl/rev1/{info.json => keyboard.json} (71%) delete mode 100644 keyboards/xelus/valor_frl_tkl/rev1/rules.mk rename keyboards/xelus/xs108/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/xelus/xs108/rules.mk rename keyboards/xiudi/xd60/rev2/{info.json => keyboard.json} (80%) delete mode 100644 keyboards/xiudi/xd60/rev2/rules.mk rename keyboards/xiudi/xd60/rev3/{info.json => keyboard.json} (80%) delete mode 100644 keyboards/xiudi/xd60/rev3/rules.mk rename keyboards/xiudi/xd68/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/xiudi/xd68/rules.mk rename keyboards/xiudi/xd75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/xiudi/xd75/rules.mk rename keyboards/xiudi/xd84pro/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/xiudi/xd84pro/rules.mk rename keyboards/xiudi/xd87/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/xiudi/xd87/rules.mk rename keyboards/xmmx/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/xmmx/rules.mk rename keyboards/yandrstudio/nz64/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/yandrstudio/nz64/rules.mk rename keyboards/yandrstudio/zhou65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/yandrstudio/zhou65/rules.mk rename keyboards/yatara/drink_me/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/yatara/drink_me/rules.mk rename keyboards/ydkb/chili/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/ydkb/chili/rules.mk rename keyboards/ydkb/yd68/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ydkb/yd68/rules.mk rename keyboards/yeehaw/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/yeehaw/rules.mk rename keyboards/ymdk/bface/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ymdk/bface/rules.mk rename keyboards/ymdk/np21/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/ymdk/np21/rules.mk rename keyboards/ymdk/np24/u4rgb6/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ymdk/np24/u4rgb6/rules.mk rename keyboards/ymdk/wings/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ymdk/wings/rules.mk rename keyboards/ymdk/wingshs/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ymdk/wingshs/rules.mk rename keyboards/ymdk/ym68/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/ymdk/ym68/rules.mk rename keyboards/ymdk/ymd21/v2/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/ymdk/ymd21/v2/rules.mk rename keyboards/ymdk/ymd67/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/ymdk/ymd67/rules.mk rename keyboards/ymdk/ymd75/rev1/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ymdk/ymd75/rev1/rules.mk rename keyboards/ymdk/ymd75/rev2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ymdk/ymd75/rev2/rules.mk rename keyboards/ymdk/ymd75/rev3/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ymdk/ymd75/rev3/rules.mk rename keyboards/ymdk/ymd96/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ymdk/ymd96/rules.mk rename keyboards/yncognito/batpad/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/yncognito/batpad/rules.mk rename keyboards/yoichiro/lunakey_macro/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/yoichiro/lunakey_macro/rules.mk rename keyboards/yushakobo/quick7/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/yushakobo/quick7/rules.mk rename keyboards/yynmt/dozen0/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/yynmt/dozen0/rules.mk rename keyboards/yynmt/kagamidget/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/yynmt/kagamidget/rules.mk rename keyboards/zfrontier/big_switch/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/zfrontier/big_switch/rules.mk rename keyboards/ziggurat/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/ziggurat/rules.mk rename keyboards/zj68/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/zj68/rules.mk rename keyboards/zoo/wampus/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/zoo/wampus/rules.mk rename keyboards/ztboards/after/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ztboards/after/rules.mk rename keyboards/ztboards/noon/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ztboards/noon/rules.mk diff --git a/keyboards/ubest/vn/info.json b/keyboards/ubest/vn/keyboard.json similarity index 98% rename from keyboards/ubest/vn/info.json rename to keyboards/ubest/vn/keyboard.json index 078605e4a57..c50ceebbba8 100644 --- a/keyboards/ubest/vn/info.json +++ b/keyboards/ubest/vn/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0868", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["E6", "B0", "B7", "D0", "D1"] diff --git a/keyboards/ubest/vn/rules.mk b/keyboards/ubest/vn/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/ubest/vn/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/uk78/info.json b/keyboards/uk78/keyboard.json similarity index 98% rename from keyboards/uk78/info.json rename to keyboards/uk78/keyboard.json index af41223de20..8b6b5e9feda 100644 --- a/keyboards/uk78/info.json +++ b/keyboards/uk78/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x004E", "device_version": "0.0.2" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A2", "A1", "F5", "F4", "E6", "E7", "E5", "E4", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B5", "E0"], "rows": ["F3", "F2", "F1", "F0", "A0"] diff --git a/keyboards/uk78/rules.mk b/keyboards/uk78/rules.mk deleted file mode 100644 index ce70b7c8f23..00000000000 --- a/keyboards/uk78/rules.mk +++ /dev/null @@ -1,12 +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 -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 = yes diff --git a/keyboards/ungodly/nines/info.json b/keyboards/ungodly/nines/keyboard.json similarity index 85% rename from keyboards/ungodly/nines/info.json rename to keyboards/ungodly/nines/keyboard.json index 8c2ab4c2499..07496dd5150 100644 --- a/keyboards/ungodly/nines/info.json +++ b/keyboards/ungodly/nines/keyboard.json @@ -16,6 +16,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "direct": [ ["F4", "F5", "F6"], diff --git a/keyboards/ungodly/nines/rules.mk b/keyboards/ungodly/nines/rules.mk deleted file mode 100644 index 00d9411a632..00000000000 --- a/keyboards/ungodly/nines/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 -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 -ENCODER_ENABLE = yes # Rotary encoder support diff --git a/keyboards/unikeyboard/felix/info.json b/keyboards/unikeyboard/felix/keyboard.json similarity index 89% rename from keyboards/unikeyboard/felix/info.json rename to keyboards/unikeyboard/felix/keyboard.json index 7c5a013d8ae..319340f5e62 100644 --- a/keyboards/unikeyboard/felix/info.json +++ b/keyboards/unikeyboard/felix/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7"], "rows": ["B2", "B3", "B1", "F7", "F6"] diff --git a/keyboards/unikeyboard/felix/rules.mk b/keyboards/unikeyboard/felix/rules.mk deleted file mode 100644 index b325f3f0c79..00000000000 --- a/keyboards/unikeyboard/felix/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 = 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/unikorn/info.json b/keyboards/unikorn/keyboard.json similarity index 98% rename from keyboards/unikorn/info.json rename to keyboards/unikorn/keyboard.json index 35c749b2923..4d50e2ad749 100644 --- a/keyboards/unikorn/info.json +++ b/keyboards/unikorn/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x556B", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B1", "B2", "B3", "B4", "B5"] diff --git a/keyboards/unikorn/rules.mk b/keyboards/unikorn/rules.mk deleted file mode 100644 index 88711b21277..00000000000 --- a/keyboards/unikorn/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = no diff --git a/keyboards/uranuma/info.json b/keyboards/uranuma/keyboard.json similarity index 94% rename from keyboards/uranuma/info.json rename to keyboards/uranuma/keyboard.json index c2e0e11192d..8ac5b8063ae 100644 --- a/keyboards/uranuma/info.json +++ b/keyboards/uranuma/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D2", "D4"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/uranuma/rules.mk b/keyboards/uranuma/rules.mk deleted file mode 100644 index 0dba652d235..00000000000 --- a/keyboards/uranuma/rules.mk +++ /dev/null @@ -1,14 +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 -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 - -#SRC += .nicola.c \ diff --git a/keyboards/utd80/info.json b/keyboards/utd80/keyboard.json similarity index 95% rename from keyboards/utd80/info.json rename to keyboards/utd80/keyboard.json index a62bb41df6e..6e4c966d403 100644 --- a/keyboards/utd80/info.json +++ b/keyboards/utd80/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x001C", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B1", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D3", "E6", "D7", "D6", "D4", "D2", "D1"], "rows": ["B4", "D5", "D0", "B2", "B3", "B0"] diff --git a/keyboards/utd80/rules.mk b/keyboards/utd80/rules.mk deleted file mode 100644 index 5681a9b5977..00000000000 --- a/keyboards/utd80/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/v4n4g0rth0n/v1/info.json b/keyboards/v4n4g0rth0n/v1/keyboard.json similarity index 64% rename from keyboards/v4n4g0rth0n/v1/info.json rename to keyboards/v4n4g0rth0n/v1/keyboard.json index 769c35d8caf..7dec8892087 100644 --- a/keyboards/v4n4g0rth0n/v1/info.json +++ b/keyboards/v4n4g0rth0n/v1/keyboard.json @@ -2,6 +2,14 @@ "usb": { "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "F0"], "rows": ["C7", "C6", "B6", "B5", "B7"] diff --git a/keyboards/v4n4g0rth0n/v1/rules.mk b/keyboards/v4n4g0rth0n/v1/rules.mk deleted file mode 100644 index b3aa8c531b1..00000000000 --- a/keyboards/v4n4g0rth0n/v1/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 = 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/vagrant_10/info.json b/keyboards/vagrant_10/keyboard.json similarity index 86% rename from keyboards/vagrant_10/info.json rename to keyboards/vagrant_10/keyboard.json index 46435c9deea..7291dea3028 100644 --- a/keyboards/vagrant_10/info.json +++ b/keyboards/vagrant_10/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5E99", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F6", "F5"], "rows": ["F7", "B1", "B3", "B2"] diff --git a/keyboards/vagrant_10/rules.mk b/keyboards/vagrant_10/rules.mk deleted file mode 100755 index 3b6a1809db1..00000000000 --- a/keyboards/vagrant_10/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 = 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/vertex/angler2/info.json b/keyboards/vertex/angler2/keyboard.json similarity index 99% rename from keyboards/vertex/angler2/info.json rename to keyboards/vertex/angler2/keyboard.json index bf3d28bc457..9b9d2266140 100644 --- a/keyboards/vertex/angler2/info.json +++ b/keyboards/vertex/angler2/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x408F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "E2", "C7", "C6", "B6", "F1", "B5", "B4", "D7", "D6", "D4", "D3", "D0", "B1"], "rows": ["F4", "B2", "F0", "D5", "D1", "D2"] diff --git a/keyboards/vertex/angler2/rules.mk b/keyboards/vertex/angler2/rules.mk deleted file mode 100644 index b5cde0eb87a..00000000000 --- a/keyboards/vertex/angler2/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/vertex/arc60h/info.json b/keyboards/vertex/arc60h/keyboard.json similarity index 95% rename from keyboards/vertex/arc60h/info.json rename to keyboards/vertex/arc60h/keyboard.json index 6a7a39cd162..e79d8f0dc5e 100644 --- a/keyboards/vertex/arc60h/info.json +++ b/keyboards/vertex/arc60h/keyboard.json @@ -32,6 +32,16 @@ "pin": "B15", "driver": "spi" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"], "rows": ["B10", "B1", "B0", "A7", "A6"] diff --git a/keyboards/vertex/arc60h/rules.mk b/keyboards/vertex/arc60h/rules.mk deleted file mode 100644 index e86dfab3272..00000000000 --- a/keyboards/vertex/arc60h/rules.mk +++ /dev/null @@ -1,14 +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 -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 -SLEEP_LED_ENABLE = yes - diff --git a/keyboards/viktus/at101_bh/info.json b/keyboards/viktus/at101_bh/keyboard.json similarity index 97% rename from keyboards/viktus/at101_bh/info.json rename to keyboards/viktus/at101_bh/keyboard.json index 23148f16cfb..b950aec2d02 100644 --- a/keyboards/viktus/at101_bh/info.json +++ b/keyboards/viktus/at101_bh/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D1", "D0", "B7", "B3", "B2", "B1", "B0", "E6", "D2", "D3"], "rows": ["F0", "F1", "F4", "D4", "F6", "F5", "F7", "B6", "B5", "D5", "C7", "C6"] diff --git a/keyboards/viktus/at101_bh/rules.mk b/keyboards/viktus/at101_bh/rules.mk deleted file mode 100644 index 06845b8e21c..00000000000 --- a/keyboards/viktus/at101_bh/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 = 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 -RGBLIGHT_ENABLE = no diff --git a/keyboards/viktus/omnikey_bh/info.json b/keyboards/viktus/omnikey_bh/keyboard.json similarity index 97% rename from keyboards/viktus/omnikey_bh/info.json rename to keyboards/viktus/omnikey_bh/keyboard.json index a641192f32c..a44b23d6552 100644 --- a/keyboards/viktus/omnikey_bh/info.json +++ b/keyboards/viktus/omnikey_bh/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C2", "C3", "C4", "C7", "C1", "C0", "E1", "E0", "D7", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "E6", "E7", "B0", "B1", "B2", "B3"], "rows": ["B7", "D0", "D1", "D2", "D3", "D4"] diff --git a/keyboards/viktus/omnikey_bh/rules.mk b/keyboards/viktus/omnikey_bh/rules.mk deleted file mode 100644 index 06845b8e21c..00000000000 --- a/keyboards/viktus/omnikey_bh/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 = 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 -RGBLIGHT_ENABLE = no diff --git a/keyboards/viktus/smolka/info.json b/keyboards/viktus/smolka/keyboard.json similarity index 99% rename from keyboards/viktus/smolka/info.json rename to keyboards/viktus/smolka/keyboard.json index cb44b43eb75..ade26b37351 100644 --- a/keyboards/viktus/smolka/info.json +++ b/keyboards/viktus/smolka/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5", "B6", "D4", "B1", "B2"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6"] diff --git a/keyboards/viktus/smolka/rules.mk b/keyboards/viktus/smolka/rules.mk deleted file mode 100644 index 131aa72aeb5..00000000000 --- a/keyboards/viktus/smolka/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/viktus/styrka/info.json b/keyboards/viktus/styrka/keyboard.json similarity index 98% rename from keyboards/viktus/styrka/info.json rename to keyboards/viktus/styrka/keyboard.json index 52cf5823a07..e5a642e471e 100644 --- a/keyboards/viktus/styrka/info.json +++ b/keyboards/viktus/styrka/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "B14", "B15", "A8", "A9"], "rows": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B13", "B12"] diff --git a/keyboards/viktus/styrka/rules.mk b/keyboards/viktus/styrka/rules.mk deleted file mode 100644 index 718a1e8d099..00000000000 --- a/keyboards/viktus/styrka/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/viktus/z150_bh/info.json b/keyboards/viktus/z150_bh/keyboard.json similarity index 98% rename from keyboards/viktus/z150_bh/info.json rename to keyboards/viktus/z150_bh/keyboard.json index fb4970e259a..5875b6d1712 100644 --- a/keyboards/viktus/z150_bh/info.json +++ b/keyboards/viktus/z150_bh/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D7", "E0", "C7", "C6", "C5", "C4", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"], "rows": ["C3", "C2", "C1", "C0", "E1"] diff --git a/keyboards/viktus/z150_bh/rules.mk b/keyboards/viktus/z150_bh/rules.mk deleted file mode 100644 index 06845b8e21c..00000000000 --- a/keyboards/viktus/z150_bh/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 = 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 -RGBLIGHT_ENABLE = no diff --git a/keyboards/waldo/info.json b/keyboards/waldo/keyboard.json similarity index 98% rename from keyboards/waldo/info.json rename to keyboards/waldo/keyboard.json index f6aa8a8190e..204f4bf7072 100644 --- a/keyboards/waldo/info.json +++ b/keyboards/waldo/keyboard.json @@ -7,6 +7,16 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "D5", "D3", "D2", "B3", "B2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B1"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/waldo/rules.mk b/keyboards/waldo/rules.mk deleted file mode 100644 index 0e7e90f4394..00000000000 --- a/keyboards/waldo/rules.mk +++ /dev/null @@ -1,12 +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 = yes # 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 # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/walletburner/cajal/info.json b/keyboards/walletburner/cajal/keyboard.json similarity index 96% rename from keyboards/walletburner/cajal/info.json rename to keyboards/walletburner/cajal/keyboard.json index 5578ba3d8c1..2419c6c7f42 100644 --- a/keyboards/walletburner/cajal/info.json +++ b/keyboards/walletburner/cajal/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6361", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "B4", "F6"], "rows": ["D4", "D5", "C7", "C6"] diff --git a/keyboards/walletburner/cajal/rules.mk b/keyboards/walletburner/cajal/rules.mk deleted file mode 100644 index aa609619e76..00000000000 --- a/keyboards/walletburner/cajal/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 -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 -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes # Enable support for EC11 Rotary Encoder diff --git a/keyboards/walletburner/neuron/info.json b/keyboards/walletburner/neuron/keyboard.json similarity index 94% rename from keyboards/walletburner/neuron/info.json rename to keyboards/walletburner/neuron/keyboard.json index fc9aad49e20..7637f5435a9 100644 --- a/keyboards/walletburner/neuron/info.json +++ b/keyboards/walletburner/neuron/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "B1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F7", "F6", "F4", "F1", "E6", "D6", "D2", "B4", "D7", "B6", "D5"], "rows": ["D0", "D1", "D3", "F5"] diff --git a/keyboards/walletburner/neuron/rules.mk b/keyboards/walletburner/neuron/rules.mk deleted file mode 100644 index 21fd8f40ee0..00000000000 --- a/keyboards/walletburner/neuron/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 = 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 -RGBLIGHT_ENABLE = yes diff --git a/keyboards/wavtype/foundation/info.json b/keyboards/wavtype/foundation/keyboard.json similarity index 98% rename from keyboards/wavtype/foundation/info.json rename to keyboards/wavtype/foundation/keyboard.json index b5e8793b8fb..f13d2268064 100644 --- a/keyboards/wavtype/foundation/info.json +++ b/keyboards/wavtype/foundation/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "B0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "D2", "D1", "D0", "D3", "D5", "D4", "B7", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["B3", "B2", "B1", "F0", "F1"] diff --git a/keyboards/wavtype/foundation/rules.mk b/keyboards/wavtype/foundation/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/wavtype/foundation/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/wavtype/p01_ultra/info.json b/keyboards/wavtype/p01_ultra/keyboard.json similarity index 99% rename from keyboards/wavtype/p01_ultra/info.json rename to keyboards/wavtype/p01_ultra/keyboard.json index 7205b503664..7bfc2424686 100644 --- a/keyboards/wavtype/p01_ultra/info.json +++ b/keyboards/wavtype/p01_ultra/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "E6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5"], "rows": ["B4", "D7", "D6", "B5", "B6", "D4"] diff --git a/keyboards/wavtype/p01_ultra/rules.mk b/keyboards/wavtype/p01_ultra/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/wavtype/p01_ultra/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/weirdo/geminate60/info.json b/keyboards/weirdo/geminate60/keyboard.json similarity index 99% rename from keyboards/weirdo/geminate60/info.json rename to keyboards/weirdo/geminate60/keyboard.json index 722d1d3bfe0..4240d3a075e 100644 --- a/keyboards/weirdo/geminate60/info.json +++ b/keyboards/weirdo/geminate60/keyboard.json @@ -14,6 +14,15 @@ "ws2812": { "pin": "A6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], "rows": ["A9", "A10", "B10", "B11", "B15"] diff --git a/keyboards/weirdo/geminate60/rules.mk b/keyboards/weirdo/geminate60/rules.mk deleted file mode 100644 index 3c777809b4a..00000000000 --- a/keyboards/weirdo/geminate60/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/weirdo/kelowna/rgb64/info.json b/keyboards/weirdo/kelowna/rgb64/keyboard.json similarity index 95% rename from keyboards/weirdo/kelowna/rgb64/info.json rename to keyboards/weirdo/kelowna/rgb64/keyboard.json index 12188f6f302..6e86f8cc478 100644 --- a/keyboards/weirdo/kelowna/rgb64/info.json +++ b/keyboards/weirdo/kelowna/rgb64/keyboard.json @@ -14,6 +14,15 @@ "ws2812": { "pin": "A6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A3", "A4", "A5", "A7", "B0", "B1", "B10", "B15", "A8", "A9", "A10", "B7", "B6", "B5", "B4"], "rows": ["B12", "B13", "B14", "C11", "A1"] diff --git a/keyboards/weirdo/kelowna/rgb64/rules.mk b/keyboards/weirdo/kelowna/rgb64/rules.mk deleted file mode 100644 index 3c777809b4a..00000000000 --- a/keyboards/weirdo/kelowna/rgb64/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/weirdo/ls_60/info.json b/keyboards/weirdo/ls_60/keyboard.json similarity index 95% rename from keyboards/weirdo/ls_60/info.json rename to keyboards/weirdo/ls_60/keyboard.json index 0dadf9d32ce..eeaf5a23a59 100644 --- a/keyboards/weirdo/ls_60/info.json +++ b/keyboards/weirdo/ls_60/keyboard.json @@ -14,6 +14,15 @@ "ws2812": { "pin": "A6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], "rows": ["A9", "A10", "B10", "B11", "B15"] diff --git a/keyboards/weirdo/ls_60/rules.mk b/keyboards/weirdo/ls_60/rules.mk deleted file mode 100644 index 3c777809b4a..00000000000 --- a/keyboards/weirdo/ls_60/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/weirdo/naiping/np64/info.json b/keyboards/weirdo/naiping/np64/keyboard.json similarity index 95% rename from keyboards/weirdo/naiping/np64/info.json rename to keyboards/weirdo/naiping/np64/keyboard.json index 63e6297f7d5..ddbbfecc3c1 100644 --- a/keyboards/weirdo/naiping/np64/info.json +++ b/keyboards/weirdo/naiping/np64/keyboard.json @@ -14,6 +14,15 @@ "ws2812": { "pin": "B1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/weirdo/naiping/np64/rules.mk b/keyboards/weirdo/naiping/np64/rules.mk deleted file mode 100644 index 3c777809b4a..00000000000 --- a/keyboards/weirdo/naiping/np64/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/weirdo/naiping/nphhkb/info.json b/keyboards/weirdo/naiping/nphhkb/keyboard.json similarity index 95% rename from keyboards/weirdo/naiping/nphhkb/info.json rename to keyboards/weirdo/naiping/nphhkb/keyboard.json index 931f81db1f0..13fe77f4764 100644 --- a/keyboards/weirdo/naiping/nphhkb/info.json +++ b/keyboards/weirdo/naiping/nphhkb/keyboard.json @@ -14,6 +14,15 @@ "ws2812": { "pin": "A7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A4", "C15", "C14", "A5", "A6", "A15", "B1", "B10", "B12", "B13", "B14", "B15", "B6", "A8", "B5"], "rows": ["B7", "B8", "B9", "C13", "B4"] diff --git a/keyboards/weirdo/naiping/nphhkb/rules.mk b/keyboards/weirdo/naiping/nphhkb/rules.mk deleted file mode 100644 index 3c777809b4a..00000000000 --- a/keyboards/weirdo/naiping/nphhkb/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/weirdo/naiping/npminila/info.json b/keyboards/weirdo/naiping/npminila/keyboard.json similarity index 95% rename from keyboards/weirdo/naiping/npminila/info.json rename to keyboards/weirdo/naiping/npminila/keyboard.json index 3824802e020..37c297a3fc1 100644 --- a/keyboards/weirdo/naiping/npminila/info.json +++ b/keyboards/weirdo/naiping/npminila/keyboard.json @@ -14,6 +14,15 @@ "ws2812": { "pin": "D1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/weirdo/naiping/npminila/rules.mk b/keyboards/weirdo/naiping/npminila/rules.mk deleted file mode 100644 index 3c777809b4a..00000000000 --- a/keyboards/weirdo/naiping/npminila/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/weirdo/tiger910/info.json b/keyboards/weirdo/tiger910/keyboard.json similarity index 95% rename from keyboards/weirdo/tiger910/info.json rename to keyboards/weirdo/tiger910/keyboard.json index 526b9be4d16..90f4208b8d7 100644 --- a/keyboards/weirdo/tiger910/info.json +++ b/keyboards/weirdo/tiger910/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x5447", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "sleep_led": true + }, "matrix_pins": { "cols": ["B5", "B6", "B7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0", "D1", "D2", "D3", "D4"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/weirdo/tiger910/rules.mk b/keyboards/weirdo/tiger910/rules.mk deleted file mode 100644 index 1533e2ee82b..00000000000 --- a/keyboards/weirdo/tiger910/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 -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 -SLEEP_LED_ENABLE = yes diff --git a/keyboards/wekey/polaris/info.json b/keyboards/wekey/polaris/keyboard.json similarity index 98% rename from keyboards/wekey/polaris/info.json rename to keyboards/wekey/polaris/keyboard.json index 661799f750d..356e3f951ee 100644 --- a/keyboards/wekey/polaris/info.json +++ b/keyboards/wekey/polaris/keyboard.json @@ -11,6 +11,14 @@ "build": { "debounce_type": "sym_defer_pk" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["E6", "B4", "B5", "B6", "D0", "D1", "D2", "D3"], "rows": ["F4", "F1", "F0", "B7", "F7", "D5", "C6", "C7", "F5", "F6"] diff --git a/keyboards/wekey/polaris/rules.mk b/keyboards/wekey/polaris/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/wekey/polaris/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 = 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/westfoxtrot/aanzee/info.json b/keyboards/westfoxtrot/aanzee/keyboard.json similarity index 97% rename from keyboards/westfoxtrot/aanzee/info.json rename to keyboards/westfoxtrot/aanzee/keyboard.json index 9524eaea127..7a12a3e52e3 100644 --- a/keyboards/westfoxtrot/aanzee/info.json +++ b/keyboards/westfoxtrot/aanzee/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xAA01", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D2", "D1", "D0", "D3", "D5", "C7", "C6", "B6", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "B0"], "rows": ["B4", "D7", "D6", "D4", "B3"] diff --git a/keyboards/westfoxtrot/aanzee/rules.mk b/keyboards/westfoxtrot/aanzee/rules.mk deleted file mode 100644 index 0db53fb7e83..00000000000 --- a/keyboards/westfoxtrot/aanzee/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 -RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no - diff --git a/keyboards/westfoxtrot/cyclops/info.json b/keyboards/westfoxtrot/cyclops/keyboard.json similarity index 96% rename from keyboards/westfoxtrot/cyclops/info.json rename to keyboards/westfoxtrot/cyclops/keyboard.json index fe6b685be3c..7bfcd859b03 100644 --- a/keyboards/westfoxtrot/cyclops/info.json +++ b/keyboards/westfoxtrot/cyclops/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0A66", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D2", "D5", "D6", "B6", "B1", "B2", "B3", "C6", "C7", "F7", "F6", "F4", "F5", "F1"], "rows": ["D1", "D0", "D7", "B4", "F0"] diff --git a/keyboards/westfoxtrot/cyclops/rules.mk b/keyboards/westfoxtrot/cyclops/rules.mk deleted file mode 100644 index 2e0e4f94c04..00000000000 --- a/keyboards/westfoxtrot/cyclops/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 = 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 diff --git a/keyboards/westfoxtrot/cypher/rev1/info.json b/keyboards/westfoxtrot/cypher/rev1/keyboard.json similarity index 98% rename from keyboards/westfoxtrot/cypher/rev1/info.json rename to keyboards/westfoxtrot/cypher/rev1/keyboard.json index d6e5689df92..46c0dd298ef 100644 --- a/keyboards/westfoxtrot/cypher/rev1/info.json +++ b/keyboards/westfoxtrot/cypher/rev1/keyboard.json @@ -6,6 +6,15 @@ "pid": "0xAA97", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E6", "F0"], "rows": ["B0", "B1", "B2", "B3", "B4", "F6", "B6", "B7", "C6", "C7"] diff --git a/keyboards/westfoxtrot/cypher/rev1/rules.mk b/keyboards/westfoxtrot/cypher/rev1/rules.mk deleted file mode 100644 index 7cbb60ad2b7..00000000000 --- a/keyboards/westfoxtrot/cypher/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 = 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 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/westfoxtrot/cypher/rev5/info.json b/keyboards/westfoxtrot/cypher/rev5/keyboard.json similarity index 99% rename from keyboards/westfoxtrot/cypher/rev5/info.json rename to keyboards/westfoxtrot/cypher/rev5/keyboard.json index b72f7173e46..74938c45635 100644 --- a/keyboards/westfoxtrot/cypher/rev5/info.json +++ b/keyboards/westfoxtrot/cypher/rev5/keyboard.json @@ -6,6 +6,16 @@ "pid": "0xAA98", "device_version": "0.0.2" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5", "B6", "B7", "B3", "B2", "B1", "F0"], "rows": ["B0", "F1", "F5", "F6", "F7", "D1", "F4", "D4", "C6", "C7"] diff --git a/keyboards/westfoxtrot/cypher/rev5/rules.mk b/keyboards/westfoxtrot/cypher/rev5/rules.mk deleted file mode 100644 index 456eb8a455a..00000000000 --- a/keyboards/westfoxtrot/cypher/rev5/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 = 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 -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/westfoxtrot/prophet/info.json b/keyboards/westfoxtrot/prophet/keyboard.json similarity index 99% rename from keyboards/westfoxtrot/prophet/info.json rename to keyboards/westfoxtrot/prophet/keyboard.json index c9b356d0515..1d6067a4e2b 100644 --- a/keyboards/westfoxtrot/prophet/info.json +++ b/keyboards/westfoxtrot/prophet/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xAA03", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["A6", "A7", "B0", "A9", "A8", "A14", "A15", "B3", "B4", "B5", "B8", "B7", "B6", "B9"], "rows": ["C13", "B2", "B1", "A4", "A3"] diff --git a/keyboards/westfoxtrot/prophet/rules.mk b/keyboards/westfoxtrot/prophet/rules.mk deleted file mode 100644 index 14d4af4e142..00000000000 --- a/keyboards/westfoxtrot/prophet/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -SLEEP_LED_ENABLE = yes -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no - diff --git a/keyboards/wilba_tech/rama_works_m10_b/info.json b/keyboards/wilba_tech/rama_works_m10_b/keyboard.json similarity index 87% rename from keyboards/wilba_tech/rama_works_m10_b/info.json rename to keyboards/wilba_tech/rama_works_m10_b/keyboard.json index eb861e8d3f8..b66b5c64cf5 100644 --- a/keyboards/wilba_tech/rama_works_m10_b/info.json +++ b/keyboards/wilba_tech/rama_works_m10_b/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x00AB", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"], "rows": ["E6"] diff --git a/keyboards/wilba_tech/rama_works_m10_b/rules.mk b/keyboards/wilba_tech/rama_works_m10_b/rules.mk deleted file mode 100644 index 29eb5c8fbe8..00000000000 --- a/keyboards/wilba_tech/rama_works_m10_b/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/wilba_tech/rama_works_m50_ax/info.json b/keyboards/wilba_tech/rama_works_m50_ax/keyboard.json similarity index 95% rename from keyboards/wilba_tech/rama_works_m50_ax/info.json rename to keyboards/wilba_tech/rama_works_m50_ax/keyboard.json index ea833236b88..29dec482bbe 100644 --- a/keyboards/wilba_tech/rama_works_m50_ax/info.json +++ b/keyboards/wilba_tech/rama_works_m50_ax/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x150A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"], "rows": ["F0", "F1", "F5", "F6"] diff --git a/keyboards/wilba_tech/rama_works_m50_ax/rules.mk b/keyboards/wilba_tech/rama_works_m50_ax/rules.mk deleted file mode 100644 index c843e8a475a..00000000000 --- a/keyboards/wilba_tech/rama_works_m50_ax/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/wilba_tech/wt60_g/info.json b/keyboards/wilba_tech/wt60_g/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt60_g/info.json rename to keyboards/wilba_tech/wt60_g/keyboard.json index 7910eaa8666..3c1a6aef557 100644 --- a/keyboards/wilba_tech/wt60_g/info.json +++ b/keyboards/wilba_tech/wt60_g/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0021", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_g/rules.mk b/keyboards/wilba_tech/wt60_g/rules.mk deleted file mode 100644 index c843e8a475a..00000000000 --- a/keyboards/wilba_tech/wt60_g/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/wilba_tech/wt60_g2/info.json b/keyboards/wilba_tech/wt60_g2/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt60_g2/info.json rename to keyboards/wilba_tech/wt60_g2/keyboard.json index 6b744ac0cbe..2167847133d 100644 --- a/keyboards/wilba_tech/wt60_g2/info.json +++ b/keyboards/wilba_tech/wt60_g2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x002F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_g2/rules.mk b/keyboards/wilba_tech/wt60_g2/rules.mk deleted file mode 100644 index c843e8a475a..00000000000 --- a/keyboards/wilba_tech/wt60_g2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/wilba_tech/wt60_h1/info.json b/keyboards/wilba_tech/wt60_h1/keyboard.json similarity index 96% rename from keyboards/wilba_tech/wt60_h1/info.json rename to keyboards/wilba_tech/wt60_h1/keyboard.json index cbbf0b39cbe..279f7eab51d 100644 --- a/keyboards/wilba_tech/wt60_h1/info.json +++ b/keyboards/wilba_tech/wt60_h1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0024", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_h1/rules.mk b/keyboards/wilba_tech/wt60_h1/rules.mk deleted file mode 100644 index 718a1e8d099..00000000000 --- a/keyboards/wilba_tech/wt60_h1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/wilba_tech/wt60_h2/info.json b/keyboards/wilba_tech/wt60_h2/keyboard.json similarity index 96% rename from keyboards/wilba_tech/wt60_h2/info.json rename to keyboards/wilba_tech/wt60_h2/keyboard.json index 981cf979ec5..9655469ffcd 100644 --- a/keyboards/wilba_tech/wt60_h2/info.json +++ b/keyboards/wilba_tech/wt60_h2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x002B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_h2/rules.mk b/keyboards/wilba_tech/wt60_h2/rules.mk deleted file mode 100644 index 718a1e8d099..00000000000 --- a/keyboards/wilba_tech/wt60_h2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/wilba_tech/wt60_h3/info.json b/keyboards/wilba_tech/wt60_h3/keyboard.json similarity index 96% rename from keyboards/wilba_tech/wt60_h3/info.json rename to keyboards/wilba_tech/wt60_h3/keyboard.json index ea2a59ef945..5ff272a98d3 100644 --- a/keyboards/wilba_tech/wt60_h3/info.json +++ b/keyboards/wilba_tech/wt60_h3/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x002C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_h3/rules.mk b/keyboards/wilba_tech/wt60_h3/rules.mk deleted file mode 100644 index 718a1e8d099..00000000000 --- a/keyboards/wilba_tech/wt60_h3/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/wilba_tech/wt60_xt/info.json b/keyboards/wilba_tech/wt60_xt/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt60_xt/info.json rename to keyboards/wilba_tech/wt60_xt/keyboard.json index 1c5867821f8..6cd3d64be28 100644 --- a/keyboards/wilba_tech/wt60_xt/info.json +++ b/keyboards/wilba_tech/wt60_xt/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x001C", "device_version": "0.0.1" }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_xt/rules.mk b/keyboards/wilba_tech/wt60_xt/rules.mk deleted file mode 100644 index 388b9f97e35..00000000000 --- a/keyboards/wilba_tech/wt60_xt/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = yes # Audio output diff --git a/keyboards/wilba_tech/wt65_d/info.json b/keyboards/wilba_tech/wt65_d/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt65_d/info.json rename to keyboards/wilba_tech/wt65_d/keyboard.json index b9fd2dcf466..d41d39bcb29 100644 --- a/keyboards/wilba_tech/wt65_d/info.json +++ b/keyboards/wilba_tech/wt65_d/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0031", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "D3", "D2", "B7", "B0", "B3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["E6", "F0", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_d/rules.mk b/keyboards/wilba_tech/wt65_d/rules.mk deleted file mode 100644 index c843e8a475a..00000000000 --- a/keyboards/wilba_tech/wt65_d/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/wilba_tech/wt65_f/info.json b/keyboards/wilba_tech/wt65_f/keyboard.json similarity index 96% rename from keyboards/wilba_tech/wt65_f/info.json rename to keyboards/wilba_tech/wt65_f/keyboard.json index e420388fad3..bb39a09a91c 100644 --- a/keyboards/wilba_tech/wt65_f/info.json +++ b/keyboards/wilba_tech/wt65_f/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x002D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_f/rules.mk b/keyboards/wilba_tech/wt65_f/rules.mk deleted file mode 100644 index c843e8a475a..00000000000 --- a/keyboards/wilba_tech/wt65_f/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/wilba_tech/wt65_fx/info.json b/keyboards/wilba_tech/wt65_fx/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt65_fx/info.json rename to keyboards/wilba_tech/wt65_fx/keyboard.json index a551dc45583..a070bfd6f93 100644 --- a/keyboards/wilba_tech/wt65_fx/info.json +++ b/keyboards/wilba_tech/wt65_fx/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x002E", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_fx/rules.mk b/keyboards/wilba_tech/wt65_fx/rules.mk deleted file mode 100644 index c843e8a475a..00000000000 --- a/keyboards/wilba_tech/wt65_fx/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/wilba_tech/wt65_g/info.json b/keyboards/wilba_tech/wt65_g/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt65_g/info.json rename to keyboards/wilba_tech/wt65_g/keyboard.json index e66c5394c7c..d9fe012ce40 100644 --- a/keyboards/wilba_tech/wt65_g/info.json +++ b/keyboards/wilba_tech/wt65_g/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0022", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_g/rules.mk b/keyboards/wilba_tech/wt65_g/rules.mk deleted file mode 100644 index c843e8a475a..00000000000 --- a/keyboards/wilba_tech/wt65_g/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/wilba_tech/wt65_g2/info.json b/keyboards/wilba_tech/wt65_g2/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt65_g2/info.json rename to keyboards/wilba_tech/wt65_g2/keyboard.json index 73aab6df690..7c55f5e3efa 100644 --- a/keyboards/wilba_tech/wt65_g2/info.json +++ b/keyboards/wilba_tech/wt65_g2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x002A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_g2/rules.mk b/keyboards/wilba_tech/wt65_g2/rules.mk deleted file mode 100644 index c843e8a475a..00000000000 --- a/keyboards/wilba_tech/wt65_g2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/wilba_tech/wt65_h1/info.json b/keyboards/wilba_tech/wt65_h1/keyboard.json similarity index 96% rename from keyboards/wilba_tech/wt65_h1/info.json rename to keyboards/wilba_tech/wt65_h1/keyboard.json index dc992e625fe..a6f22273dcb 100644 --- a/keyboards/wilba_tech/wt65_h1/info.json +++ b/keyboards/wilba_tech/wt65_h1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0025", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_h1/rules.mk b/keyboards/wilba_tech/wt65_h1/rules.mk deleted file mode 100644 index 718a1e8d099..00000000000 --- a/keyboards/wilba_tech/wt65_h1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/wilba_tech/wt65_xt/info.json b/keyboards/wilba_tech/wt65_xt/keyboard.json similarity index 97% rename from keyboards/wilba_tech/wt65_xt/info.json rename to keyboards/wilba_tech/wt65_xt/keyboard.json index c977624dd9b..73d39017769 100644 --- a/keyboards/wilba_tech/wt65_xt/info.json +++ b/keyboards/wilba_tech/wt65_xt/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x001D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_xt/rules.mk b/keyboards/wilba_tech/wt65_xt/rules.mk deleted file mode 100644 index c843e8a475a..00000000000 --- a/keyboards/wilba_tech/wt65_xt/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/wilba_tech/wt65_xtx/info.json b/keyboards/wilba_tech/wt65_xtx/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt65_xtx/info.json rename to keyboards/wilba_tech/wt65_xtx/keyboard.json index bfd3e36e116..96678860ee2 100644 --- a/keyboards/wilba_tech/wt65_xtx/info.json +++ b/keyboards/wilba_tech/wt65_xtx/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x001E", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_xtx/rules.mk b/keyboards/wilba_tech/wt65_xtx/rules.mk deleted file mode 100644 index c843e8a475a..00000000000 --- a/keyboards/wilba_tech/wt65_xtx/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/wilba_tech/wt70_jb/info.json b/keyboards/wilba_tech/wt70_jb/keyboard.json similarity index 98% rename from keyboards/wilba_tech/wt70_jb/info.json rename to keyboards/wilba_tech/wt70_jb/keyboard.json index e02cb615098..a1ffe1e5616 100644 --- a/keyboards/wilba_tech/wt70_jb/info.json +++ b/keyboards/wilba_tech/wt70_jb/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "B2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "D5", "D3", "D2", "D1", "D0", "B7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B3"], "rows": ["E6", "F0", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt70_jb/rules.mk b/keyboards/wilba_tech/wt70_jb/rules.mk deleted file mode 100644 index 4d010d8a29c..00000000000 --- a/keyboards/wilba_tech/wt70_jb/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/wilba_tech/wt80_g/info.json b/keyboards/wilba_tech/wt80_g/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt80_g/info.json rename to keyboards/wilba_tech/wt80_g/keyboard.json index 2bbdce654bb..410b5a8ec21 100644 --- a/keyboards/wilba_tech/wt80_g/info.json +++ b/keyboards/wilba_tech/wt80_g/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0023", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt80_g/rules.mk b/keyboards/wilba_tech/wt80_g/rules.mk deleted file mode 100644 index c843e8a475a..00000000000 --- a/keyboards/wilba_tech/wt80_g/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/winkeyless/b87/info.json b/keyboards/winkeyless/b87/keyboard.json similarity index 99% rename from keyboards/winkeyless/b87/info.json rename to keyboards/winkeyless/b87/keyboard.json index 8a5f6fdbea4..a941445d72b 100644 --- a/keyboards/winkeyless/b87/info.json +++ b/keyboards/winkeyless/b87/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0B87", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "C5", "C4", "C3", "C2", "D7", "C6", "C7", "A7", "A6"], "rows": ["B5", "B4", "B3", "B2", "B1", "B0", "B6", "B7"] diff --git a/keyboards/winkeyless/b87/rules.mk b/keyboards/winkeyless/b87/rules.mk deleted file mode 100644 index d3a23ba0b6d..00000000000 --- a/keyboards/winkeyless/b87/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/winkeyless/bface/info.json b/keyboards/winkeyless/bface/keyboard.json similarity index 95% rename from keyboards/winkeyless/bface/info.json rename to keyboards/winkeyless/bface/keyboard.json index 6e8369272f2..cc5194ef343 100644 --- a/keyboards/winkeyless/bface/info.json +++ b/keyboards/winkeyless/bface/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x4246", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/winkeyless/bface/rules.mk b/keyboards/winkeyless/bface/rules.mk deleted file mode 100644 index 166b3d3ec8d..00000000000 --- a/keyboards/winkeyless/bface/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/winkeyless/bmini/info.json b/keyboards/winkeyless/bmini/keyboard.json similarity index 97% rename from keyboards/winkeyless/bmini/info.json rename to keyboards/winkeyless/bmini/keyboard.json index 05c6fbe9b8d..6fdaf621825 100644 --- a/keyboards/winkeyless/bmini/info.json +++ b/keyboards/winkeyless/bmini/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x424D", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/winkeyless/bmini/rules.mk b/keyboards/winkeyless/bmini/rules.mk deleted file mode 100644 index 6b0cec85a44..00000000000 --- a/keyboards/winkeyless/bmini/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/winkeyless/bminiex/info.json b/keyboards/winkeyless/bminiex/keyboard.json similarity index 98% rename from keyboards/winkeyless/bminiex/info.json rename to keyboards/winkeyless/bminiex/keyboard.json index fbd0f9b024a..9e213bd1f86 100644 --- a/keyboards/winkeyless/bminiex/info.json +++ b/keyboards/winkeyless/bminiex/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x4258", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/winkeyless/bminiex/rules.mk b/keyboards/winkeyless/bminiex/rules.mk deleted file mode 100644 index 274e41d419c..00000000000 --- a/keyboards/winkeyless/bminiex/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -DEBUG_ENABLE = no -COMMAND_ENABLE = no -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/winkeys/mini_winni/info.json b/keyboards/winkeys/mini_winni/keyboard.json similarity index 88% rename from keyboards/winkeys/mini_winni/info.json rename to keyboards/winkeys/mini_winni/keyboard.json index 21cfdc6a2be..8f80960f247 100644 --- a/keyboards/winkeys/mini_winni/info.json +++ b/keyboards/winkeys/mini_winni/keyboard.json @@ -9,6 +9,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "direct": [ ["F4", "F5", "B4", "D7"], diff --git a/keyboards/winkeys/mini_winni/rules.mk b/keyboards/winkeys/mini_winni/rules.mk deleted file mode 100644 index ed20f2bf91e..00000000000 --- a/keyboards/winkeys/mini_winni/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 = 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/winry/winry25tc/info.json b/keyboards/winry/winry25tc/keyboard.json similarity index 90% rename from keyboards/winry/winry25tc/info.json rename to keyboards/winry/winry25tc/keyboard.json index a5d3b71a261..9a83aded2c2 100644 --- a/keyboards/winry/winry25tc/info.json +++ b/keyboards/winry/winry25tc/keyboard.json @@ -20,6 +20,16 @@ "rainbow_swirl": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "key_lock": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "C7", "B7", "B2", "B4"], "rows": ["E6", "F0", "D6", "D2", "B6"] diff --git a/keyboards/winry/winry25tc/rules.mk b/keyboards/winry/winry25tc/rules.mk deleted file mode 100644 index e1908949b39..00000000000 --- a/keyboards/winry/winry25tc/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow - -KEY_LOCK_ENABLE = yes diff --git a/keyboards/winry/winry315/info.json b/keyboards/winry/winry315/keyboard.json similarity index 96% rename from keyboards/winry/winry315/info.json rename to keyboards/winry/winry315/keyboard.json index a7d71aca462..81971b339f2 100644 --- a/keyboards/winry/winry315/info.json +++ b/keyboards/winry/winry315/keyboard.json @@ -82,6 +82,16 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "direct": [ ["F4", "C7", "D4", "D5", "D1", "F5", "C6", "D6", "D3", "D2", "F6", "B6", "D7", "B4", "B5", "B2", "D0", "E6", null, null, null, null, null, null] diff --git a/keyboards/winry/winry315/rules.mk b/keyboards/winry/winry315/rules.mk deleted file mode 100644 index 0f932779f59..00000000000 --- a/keyboards/winry/winry315/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/woodkeys/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/keyboard.json similarity index 83% rename from keyboards/woodkeys/bigseries/1key/info.json rename to keyboards/woodkeys/bigseries/1key/keyboard.json index 43d7b0f536c..2440b1974b3 100644 --- a/keyboards/woodkeys/bigseries/1key/info.json +++ b/keyboards/woodkeys/bigseries/1key/keyboard.json @@ -27,6 +27,15 @@ "twinkle": true } }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B4"], "rows": ["B0"] diff --git a/keyboards/woodkeys/bigseries/1key/rules.mk b/keyboards/woodkeys/bigseries/1key/rules.mk deleted file mode 100755 index 4465ace1727..00000000000 --- a/keyboards/woodkeys/bigseries/1key/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/woodkeys/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/keyboard.json similarity index 84% rename from keyboards/woodkeys/bigseries/2key/info.json rename to keyboards/woodkeys/bigseries/2key/keyboard.json index 98cbeab77d1..9c8c34914ac 100644 --- a/keyboards/woodkeys/bigseries/2key/info.json +++ b/keyboards/woodkeys/bigseries/2key/keyboard.json @@ -27,6 +27,15 @@ "twinkle": true } }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "B3"], "rows": ["B0"] diff --git a/keyboards/woodkeys/bigseries/2key/rules.mk b/keyboards/woodkeys/bigseries/2key/rules.mk deleted file mode 100755 index 4465ace1727..00000000000 --- a/keyboards/woodkeys/bigseries/2key/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/woodkeys/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/keyboard.json similarity index 85% rename from keyboards/woodkeys/bigseries/3key/info.json rename to keyboards/woodkeys/bigseries/3key/keyboard.json index 8c24efb09df..17870d98ad7 100644 --- a/keyboards/woodkeys/bigseries/3key/info.json +++ b/keyboards/woodkeys/bigseries/3key/keyboard.json @@ -27,6 +27,15 @@ "twinkle": true } }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "B3", "B5"], "rows": ["B0"] diff --git a/keyboards/woodkeys/bigseries/3key/rules.mk b/keyboards/woodkeys/bigseries/3key/rules.mk deleted file mode 100755 index 4465ace1727..00000000000 --- a/keyboards/woodkeys/bigseries/3key/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/woodkeys/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/keyboard.json similarity index 86% rename from keyboards/woodkeys/bigseries/4key/info.json rename to keyboards/woodkeys/bigseries/4key/keyboard.json index 789eb9ecbbb..1e44fc23756 100644 --- a/keyboards/woodkeys/bigseries/4key/info.json +++ b/keyboards/woodkeys/bigseries/4key/keyboard.json @@ -27,6 +27,15 @@ "twinkle": true } }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "B3"], "rows": ["B0", "B5"] diff --git a/keyboards/woodkeys/bigseries/4key/rules.mk b/keyboards/woodkeys/bigseries/4key/rules.mk deleted file mode 100755 index 4465ace1727..00000000000 --- a/keyboards/woodkeys/bigseries/4key/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/wsk/alpha9/info.json b/keyboards/wsk/alpha9/keyboard.json similarity index 93% rename from keyboards/wsk/alpha9/info.json rename to keyboards/wsk/alpha9/keyboard.json index 5b9a3094604..517e22238a3 100644 --- a/keyboards/wsk/alpha9/info.json +++ b/keyboards/wsk/alpha9/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x692A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "D1", "D0", "D2"], "rows": ["D4", "B4", "B5"] diff --git a/keyboards/wsk/alpha9/rules.mk b/keyboards/wsk/alpha9/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/wsk/alpha9/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 = 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/wsk/g4m3ralpha/info.json b/keyboards/wsk/g4m3ralpha/keyboard.json similarity index 93% rename from keyboards/wsk/g4m3ralpha/info.json rename to keyboards/wsk/g4m3ralpha/keyboard.json index a6ecaccb059..312e207a2f3 100644 --- a/keyboards/wsk/g4m3ralpha/info.json +++ b/keyboards/wsk/g4m3ralpha/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "F4" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], "rows": ["D4", "B4", "B5", "D1"] diff --git a/keyboards/wsk/g4m3ralpha/rules.mk b/keyboards/wsk/g4m3ralpha/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/wsk/g4m3ralpha/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 = 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/wsk/gothic50/info.json b/keyboards/wsk/gothic50/keyboard.json similarity index 95% rename from keyboards/wsk/gothic50/info.json rename to keyboards/wsk/gothic50/keyboard.json index 2dd4ae8296b..c40390315e5 100644 --- a/keyboards/wsk/gothic50/info.json +++ b/keyboards/wsk/gothic50/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "F7" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "C7", "C6", "B6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B0"], "rows": ["B5", "B4", "D7", "D6"] diff --git a/keyboards/wsk/gothic50/rules.mk b/keyboards/wsk/gothic50/rules.mk deleted file mode 100644 index 4465ace1727..00000000000 --- a/keyboards/wsk/gothic50/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/wsk/gothic70/info.json b/keyboards/wsk/gothic70/keyboard.json similarity index 96% rename from keyboards/wsk/gothic70/info.json rename to keyboards/wsk/gothic70/keyboard.json index 0912ade63f7..a3de1e274c3 100644 --- a/keyboards/wsk/gothic70/info.json +++ b/keyboards/wsk/gothic70/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "F4" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/wsk/gothic70/rules.mk b/keyboards/wsk/gothic70/rules.mk deleted file mode 100644 index 4465ace1727..00000000000 --- a/keyboards/wsk/gothic70/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/wsk/houndstooth/info.json b/keyboards/wsk/houndstooth/keyboard.json similarity index 94% rename from keyboards/wsk/houndstooth/info.json rename to keyboards/wsk/houndstooth/keyboard.json index c3b7751e6bf..682aa68e5c9 100644 --- a/keyboards/wsk/houndstooth/info.json +++ b/keyboards/wsk/houndstooth/keyboard.json @@ -11,6 +11,14 @@ "ws2812": { "pin": "F1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D1", "F4", "D0", "F5", "D4", "F6"], "rows": ["C6", "F7", "D7", "B1", "B4", "B2", "B5", "B6"] diff --git a/keyboards/wsk/houndstooth/rules.mk b/keyboards/wsk/houndstooth/rules.mk deleted file mode 100644 index 21a60b878fe..00000000000 --- a/keyboards/wsk/houndstooth/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 = 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 -RGBLIGHT_ENABLE = no diff --git a/keyboards/wsk/jerkin/info.json b/keyboards/wsk/jerkin/keyboard.json similarity index 93% rename from keyboards/wsk/jerkin/info.json rename to keyboards/wsk/jerkin/keyboard.json index 73894c66198..3e105f317f1 100644 --- a/keyboards/wsk/jerkin/info.json +++ b/keyboards/wsk/jerkin/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x79AE", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "B1", "F7", "F6", "F5", "F4", "E6", "D7"], "rows": ["B3", "B4", "B5"] diff --git a/keyboards/wsk/jerkin/rules.mk b/keyboards/wsk/jerkin/rules.mk deleted file mode 100644 index 430e25d06d2..00000000000 --- a/keyboards/wsk/jerkin/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 = 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 keyboard RGB underglow diff --git a/keyboards/wsk/kodachi50/info.json b/keyboards/wsk/kodachi50/keyboard.json similarity index 95% rename from keyboards/wsk/kodachi50/info.json rename to keyboards/wsk/kodachi50/keyboard.json index a1950145951..4580e548e33 100644 --- a/keyboards/wsk/kodachi50/info.json +++ b/keyboards/wsk/kodachi50/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"], "rows": ["D2", "B5", "B6", "B2", "B3", "B1", "F7", "F6"] diff --git a/keyboards/wsk/kodachi50/rules.mk b/keyboards/wsk/kodachi50/rules.mk deleted file mode 100644 index c4a40815c6d..00000000000 --- a/keyboards/wsk/kodachi50/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 = 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 -RGBLIGHT_ENABLE = yes diff --git a/keyboards/wsk/pain27/info.json b/keyboards/wsk/pain27/keyboard.json similarity index 92% rename from keyboards/wsk/pain27/info.json rename to keyboards/wsk/pain27/keyboard.json index 813bde3d027..b2ac95d9c5c 100644 --- a/keyboards/wsk/pain27/info.json +++ b/keyboards/wsk/pain27/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "D1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D2", "B3", "F6", "B1", "B2", "B6", "D4", "C6", "D7", "E6"], "rows": ["F4", "F5", "D0"] diff --git a/keyboards/wsk/pain27/rules.mk b/keyboards/wsk/pain27/rules.mk deleted file mode 100644 index 21fd8f40ee0..00000000000 --- a/keyboards/wsk/pain27/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 = 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 -RGBLIGHT_ENABLE = yes diff --git a/keyboards/wsk/sl40/info.json b/keyboards/wsk/sl40/keyboard.json similarity index 97% rename from keyboards/wsk/sl40/info.json rename to keyboards/wsk/sl40/keyboard.json index 262e0fb9bb2..cfb0d7d86ac 100644 --- a/keyboards/wsk/sl40/info.json +++ b/keyboards/wsk/sl40/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "F1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D3", "D1", "F6", "F7", "B6", "B2", "B3", "B1", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "D2", "D0"] diff --git a/keyboards/wsk/sl40/rules.mk b/keyboards/wsk/sl40/rules.mk deleted file mode 100644 index c4a40815c6d..00000000000 --- a/keyboards/wsk/sl40/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 = 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 -RGBLIGHT_ENABLE = yes diff --git a/keyboards/wsk/tkl30/info.json b/keyboards/wsk/tkl30/keyboard.json similarity index 95% rename from keyboards/wsk/tkl30/info.json rename to keyboards/wsk/tkl30/keyboard.json index 0dcbab7d724..2c222d9781b 100644 --- a/keyboards/wsk/tkl30/info.json +++ b/keyboards/wsk/tkl30/keyboard.json @@ -28,6 +28,14 @@ "ws2812": { "pin": "B1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D1", "D0", "D4", "F7", "C6", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "F6", "E5"], "rows": ["D2", "B5", "F4"] diff --git a/keyboards/wsk/tkl30/rules.mk b/keyboards/wsk/tkl30/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/wsk/tkl30/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 = 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/wuque/ikki68/info.json b/keyboards/wuque/ikki68/keyboard.json similarity index 96% rename from keyboards/wuque/ikki68/info.json rename to keyboards/wuque/ikki68/keyboard.json index 86d1de3d4a9..c1ed459238b 100644 --- a/keyboards/wuque/ikki68/info.json +++ b/keyboards/wuque/ikki68/keyboard.json @@ -30,6 +30,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/wuque/ikki68/rules.mk b/keyboards/wuque/ikki68/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/wuque/ikki68/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 = 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/wuque/mammoth20x/info.json b/keyboards/wuque/mammoth20x/keyboard.json similarity index 90% rename from keyboards/wuque/mammoth20x/info.json rename to keyboards/wuque/mammoth20x/keyboard.json index f7917ae26d8..24b1715a0f7 100644 --- a/keyboards/wuque/mammoth20x/info.json +++ b/keyboards/wuque/mammoth20x/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B1", "E6", "F7"], "rows": ["D5", "F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/wuque/mammoth20x/rules.mk b/keyboards/wuque/mammoth20x/rules.mk deleted file mode 100644 index 1f4cf80a4d5..00000000000 --- a/keyboards/wuque/mammoth20x/rules.mk +++ /dev/null @@ -1,14 +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 = 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 - -ENCODER_ENABLE = yes # Enable Encoder diff --git a/keyboards/wuque/mammoth75x/info.json b/keyboards/wuque/mammoth75x/keyboard.json similarity index 99% rename from keyboards/wuque/mammoth75x/info.json rename to keyboards/wuque/mammoth75x/keyboard.json index 9b9bc1abb66..486a0422d53 100644 --- a/keyboards/wuque/mammoth75x/info.json +++ b/keyboards/wuque/mammoth75x/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "E6", "F0", "F1", "F4", "F5", "F6", "C6", "B7", "B3"], "rows": ["B0", "C7", "D2", "F7", "D1", "D0"] diff --git a/keyboards/wuque/mammoth75x/rules.mk b/keyboards/wuque/mammoth75x/rules.mk deleted file mode 100644 index fe9d55b10fd..00000000000 --- a/keyboards/wuque/mammoth75x/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 -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 -ENCODER_ENABLE = yes # Enable Encoder diff --git a/keyboards/wuque/promise87/ansi/info.json b/keyboards/wuque/promise87/ansi/keyboard.json similarity index 99% rename from keyboards/wuque/promise87/ansi/info.json rename to keyboards/wuque/promise87/ansi/keyboard.json index e7e0a0b46ee..2c7008b6469 100644 --- a/keyboards/wuque/promise87/ansi/info.json +++ b/keyboards/wuque/promise87/ansi/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"], "rows": ["B3", "B7", "B2", "F0", "D3", "D0"] diff --git a/keyboards/wuque/promise87/ansi/rules.mk b/keyboards/wuque/promise87/ansi/rules.mk deleted file mode 100644 index 9f087183c5e..00000000000 --- a/keyboards/wuque/promise87/ansi/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 = 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/wuque/promise87/wkl/info.json b/keyboards/wuque/promise87/wkl/keyboard.json similarity index 99% rename from keyboards/wuque/promise87/wkl/info.json rename to keyboards/wuque/promise87/wkl/keyboard.json index 29809d2a153..4849b238e1c 100644 --- a/keyboards/wuque/promise87/wkl/info.json +++ b/keyboards/wuque/promise87/wkl/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"], "rows": ["B3", "B7", "B2", "F0", "D3", "D0"] diff --git a/keyboards/wuque/promise87/wkl/rules.mk b/keyboards/wuque/promise87/wkl/rules.mk deleted file mode 100644 index 9f087183c5e..00000000000 --- a/keyboards/wuque/promise87/wkl/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 = 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/wuque/tata80/wk/info.json b/keyboards/wuque/tata80/wk/keyboard.json similarity index 97% rename from keyboards/wuque/tata80/wk/info.json rename to keyboards/wuque/tata80/wk/keyboard.json index ce532c92696..0fb1230c3fe 100644 --- a/keyboards/wuque/tata80/wk/info.json +++ b/keyboards/wuque/tata80/wk/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/wuque/tata80/wk/rules.mk b/keyboards/wuque/tata80/wk/rules.mk deleted file mode 100644 index 93c8ae6d48d..00000000000 --- a/keyboards/wuque/tata80/wk/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/wuque/tata80/wkl/info.json b/keyboards/wuque/tata80/wkl/keyboard.json similarity index 97% rename from keyboards/wuque/tata80/wkl/info.json rename to keyboards/wuque/tata80/wkl/keyboard.json index ba0774a5b70..f11fa34acc6 100644 --- a/keyboards/wuque/tata80/wkl/info.json +++ b/keyboards/wuque/tata80/wkl/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/wuque/tata80/wkl/rules.mk b/keyboards/wuque/tata80/wkl/rules.mk deleted file mode 100644 index 93c8ae6d48d..00000000000 --- a/keyboards/wuque/tata80/wkl/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/x16/info.json b/keyboards/x16/keyboard.json similarity index 87% rename from keyboards/x16/info.json rename to keyboards/x16/keyboard.json index 7a7c8ae022c..faf90df99a5 100644 --- a/keyboards/x16/info.json +++ b/keyboards/x16/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x016A", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C7", "C6", "B4", "D7"], "rows": ["E6", "F7", "D6", "B6"] diff --git a/keyboards/x16/rules.mk b/keyboards/x16/rules.mk deleted file mode 100644 index b325f3f0c79..00000000000 --- a/keyboards/x16/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 = 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/xbows/knight/info.json b/keyboards/xbows/knight/keyboard.json similarity index 97% rename from keyboards/xbows/knight/info.json rename to keyboards/xbows/knight/keyboard.json index b110bc6e496..b675ee19468 100644 --- a/keyboards/xbows/knight/info.json +++ b/keyboards/xbows/knight/keyboard.json @@ -33,6 +33,15 @@ "max_brightness": 200, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6"], "rows": ["F7", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/xbows/knight/rules.mk b/keyboards/xbows/knight/rules.mk deleted file mode 100644 index 4a443969ff6..00000000000 --- a/keyboards/xbows/knight/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 -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 = yes diff --git a/keyboards/xbows/knight_plus/info.json b/keyboards/xbows/knight_plus/keyboard.json similarity index 97% rename from keyboards/xbows/knight_plus/info.json rename to keyboards/xbows/knight_plus/keyboard.json index d524aed93ea..0d1600c6147 100644 --- a/keyboards/xbows/knight_plus/info.json +++ b/keyboards/xbows/knight_plus/keyboard.json @@ -33,6 +33,15 @@ "max_brightness": 200, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6"], "rows": ["F7", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/xbows/knight_plus/rules.mk b/keyboards/xbows/knight_plus/rules.mk deleted file mode 100644 index 4a443969ff6..00000000000 --- a/keyboards/xbows/knight_plus/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 -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 = yes diff --git a/keyboards/xbows/nature/info.json b/keyboards/xbows/nature/keyboard.json similarity index 97% rename from keyboards/xbows/nature/info.json rename to keyboards/xbows/nature/keyboard.json index af496e6e36b..6e28c9de30b 100644 --- a/keyboards/xbows/nature/info.json +++ b/keyboards/xbows/nature/keyboard.json @@ -33,6 +33,15 @@ "max_brightness": 200, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6"], "rows": ["F7", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/xbows/nature/rules.mk b/keyboards/xbows/nature/rules.mk deleted file mode 100644 index 4a443969ff6..00000000000 --- a/keyboards/xbows/nature/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 -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 = yes diff --git a/keyboards/xbows/numpad/info.json b/keyboards/xbows/numpad/keyboard.json similarity index 92% rename from keyboards/xbows/numpad/info.json rename to keyboards/xbows/numpad/keyboard.json index 6ccb05e1b95..070cc3a288f 100644 --- a/keyboards/xbows/numpad/info.json +++ b/keyboards/xbows/numpad/keyboard.json @@ -33,6 +33,15 @@ "max_brightness": 200, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D4", "D6", "B2", "B1"], "rows": ["B5", "B4", "C6", "B6", "D7", "B3"] diff --git a/keyboards/xbows/numpad/rules.mk b/keyboards/xbows/numpad/rules.mk deleted file mode 100644 index 4a443969ff6..00000000000 --- a/keyboards/xbows/numpad/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 -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 = yes diff --git a/keyboards/xbows/ranger/info.json b/keyboards/xbows/ranger/keyboard.json similarity index 96% rename from keyboards/xbows/ranger/info.json rename to keyboards/xbows/ranger/keyboard.json index f51d400ee4f..945eaafcba2 100644 --- a/keyboards/xbows/ranger/info.json +++ b/keyboards/xbows/ranger/keyboard.json @@ -33,6 +33,15 @@ "max_brightness": 200, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "D7", "F6", "F7", "D4", "D5", "D3"], "rows": ["C7", "B6", "B4", "C6", "B5", "D6"] diff --git a/keyboards/xbows/ranger/rules.mk b/keyboards/xbows/ranger/rules.mk deleted file mode 100644 index 4a443969ff6..00000000000 --- a/keyboards/xbows/ranger/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 -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 = yes diff --git a/keyboards/xelus/dharma/info.json b/keyboards/xelus/dharma/keyboard.json similarity index 99% rename from keyboards/xelus/dharma/info.json rename to keyboards/xelus/dharma/keyboard.json index 5d00ceb7a37..84ef6045588 100644 --- a/keyboards/xelus/dharma/info.json +++ b/keyboards/xelus/dharma/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "D5", "D4", "E6", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], "rows": ["D0", "D1", "D2", "D3", "B0"] diff --git a/keyboards/xelus/dharma/rules.mk b/keyboards/xelus/dharma/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/xelus/dharma/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 = 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/xelus/kangaroo/rev1/info.json b/keyboards/xelus/kangaroo/rev1/keyboard.json similarity index 72% rename from keyboards/xelus/kangaroo/rev1/info.json rename to keyboards/xelus/kangaroo/rev1/keyboard.json index f40d455b9f0..12d72f43737 100644 --- a/keyboards/xelus/kangaroo/rev1/info.json +++ b/keyboards/xelus/kangaroo/rev1/keyboard.json @@ -3,6 +3,14 @@ "usb": { "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B10", "B2", "B11", "A10", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["A9", "A8", "B15", "B14", "B13", "B12", "A4", "A5", "A6", "A7", "B0", "B1"] diff --git a/keyboards/xelus/kangaroo/rev1/rules.mk b/keyboards/xelus/kangaroo/rev1/rules.mk deleted file mode 100644 index 80aff9822db..00000000000 --- a/keyboards/xelus/kangaroo/rev1/rules.mk +++ /dev/null @@ -1,11 +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 = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/xelus/kangaroo/rev2/info.json b/keyboards/xelus/kangaroo/rev2/keyboard.json similarity index 73% rename from keyboards/xelus/kangaroo/rev2/info.json rename to keyboards/xelus/kangaroo/rev2/keyboard.json index 9e639df034e..1d6794cfa32 100644 --- a/keyboards/xelus/kangaroo/rev2/info.json +++ b/keyboards/xelus/kangaroo/rev2/keyboard.json @@ -3,6 +3,14 @@ "usb": { "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B10", "B2", "B11", "A10", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["A9", "A8", "B15", "B14", "B13", "B12", "A4", "A5", "A6", "A7", "B0", "B1"] diff --git a/keyboards/xelus/kangaroo/rev2/rules.mk b/keyboards/xelus/kangaroo/rev2/rules.mk deleted file mode 100644 index 80aff9822db..00000000000 --- a/keyboards/xelus/kangaroo/rev2/rules.mk +++ /dev/null @@ -1,11 +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 = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/xelus/ninjin/info.json b/keyboards/xelus/ninjin/keyboard.json similarity index 96% rename from keyboards/xelus/ninjin/info.json rename to keyboards/xelus/ninjin/keyboard.json index ae315956238..36e6a390339 100644 --- a/keyboards/xelus/ninjin/info.json +++ b/keyboards/xelus/ninjin/keyboard.json @@ -28,6 +28,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "B6", "B5"], "rows": ["B4", "B3", "A15", "A3", "B9", "B8"] diff --git a/keyboards/xelus/ninjin/rules.mk b/keyboards/xelus/ninjin/rules.mk deleted file mode 100644 index e59fc84570d..00000000000 --- a/keyboards/xelus/ninjin/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 -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 - diff --git a/keyboards/xelus/pachi/mini_32u4/info.json b/keyboards/xelus/pachi/mini_32u4/keyboard.json similarity index 99% rename from keyboards/xelus/pachi/mini_32u4/info.json rename to keyboards/xelus/pachi/mini_32u4/keyboard.json index f7c29dfcde9..e5058d0f088 100644 --- a/keyboards/xelus/pachi/mini_32u4/info.json +++ b/keyboards/xelus/pachi/mini_32u4/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5041", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "E6", "B7", "D0"], "rows": ["B0", "B1", "B2", "F0", "D2", "D1"] diff --git a/keyboards/xelus/pachi/mini_32u4/rules.mk b/keyboards/xelus/pachi/mini_32u4/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/xelus/pachi/mini_32u4/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 = 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/xelus/pachi/rev1/info.json b/keyboards/xelus/pachi/rev1/keyboard.json similarity index 99% rename from keyboards/xelus/pachi/rev1/info.json rename to keyboards/xelus/pachi/rev1/keyboard.json index 8d4d1b140aa..1afdfe11935 100644 --- a/keyboards/xelus/pachi/rev1/info.json +++ b/keyboards/xelus/pachi/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5041", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A2", "A1", "A0", "A3", "B6", "B5"], "rows": ["B4", "B3", "A15", "B15", "B9", "B8"] diff --git a/keyboards/xelus/pachi/rev1/rules.mk b/keyboards/xelus/pachi/rev1/rules.mk deleted file mode 100644 index d3ca7b060e1..00000000000 --- a/keyboards/xelus/pachi/rev1/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 -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/xelus/rs60/rev1/info.json b/keyboards/xelus/rs60/rev1/keyboard.json similarity index 98% rename from keyboards/xelus/rs60/rev1/info.json rename to keyboards/xelus/rs60/rev1/keyboard.json index 69f8d6e5b0e..df872967fb4 100644 --- a/keyboards/xelus/rs60/rev1/info.json +++ b/keyboards/xelus/rs60/rev1/keyboard.json @@ -3,6 +3,14 @@ "device_version": "0.1.0", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["E6", "D5", "D3", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B3", "B7", "F0", "F4", "F1"] diff --git a/keyboards/xelus/rs60/rev1/rules.mk b/keyboards/xelus/rs60/rev1/rules.mk deleted file mode 100644 index cfea96a79b0..00000000000 --- a/keyboards/xelus/rs60/rev1/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 = 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/xelus/snap96/info.json b/keyboards/xelus/snap96/keyboard.json similarity index 97% rename from keyboards/xelus/snap96/info.json rename to keyboards/xelus/snap96/keyboard.json index 4ad81e1d0da..c4c806d8e8b 100644 --- a/keyboards/xelus/snap96/info.json +++ b/keyboards/xelus/snap96/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5396", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["E6", "D5", "B7", "D0", "F5", "D3", "B4", "B5", "D4", "D6"], "rows": ["B2", "B1", "B0", "C7", "F6", "F7", "B3", "D1", "D2", "D7", "B6", "C6"] diff --git a/keyboards/xelus/snap96/rules.mk b/keyboards/xelus/snap96/rules.mk deleted file mode 100644 index 8ced3c4cfc8..00000000000 --- a/keyboards/xelus/snap96/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 = 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. - We have custom RGB underglow diff --git a/keyboards/xelus/valor_frl_tkl/rev1/info.json b/keyboards/xelus/valor_frl_tkl/rev1/keyboard.json similarity index 71% rename from keyboards/xelus/valor_frl_tkl/rev1/info.json rename to keyboards/xelus/valor_frl_tkl/rev1/keyboard.json index 4816a9a3a54..929c1d93604 100644 --- a/keyboards/xelus/valor_frl_tkl/rev1/info.json +++ b/keyboards/xelus/valor_frl_tkl/rev1/keyboard.json @@ -3,6 +3,14 @@ "usb": { "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "A0", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"], "rows": ["A15", "A14", "A1", "B3", "B4"] diff --git a/keyboards/xelus/valor_frl_tkl/rev1/rules.mk b/keyboards/xelus/valor_frl_tkl/rev1/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/xelus/valor_frl_tkl/rev1/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 = 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/xelus/xs108/info.json b/keyboards/xelus/xs108/keyboard.json similarity index 97% rename from keyboards/xelus/xs108/info.json rename to keyboards/xelus/xs108/keyboard.json index c9c65f7f8bb..e80292365a6 100644 --- a/keyboards/xelus/xs108/info.json +++ b/keyboards/xelus/xs108/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0108", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["C14", "C13", "A10", "A3", "A1", "A0"] diff --git a/keyboards/xelus/xs108/rules.mk b/keyboards/xelus/xs108/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/xelus/xs108/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 = 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/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/keyboard.json similarity index 80% rename from keyboards/xiudi/xd60/rev2/info.json rename to keyboards/xiudi/xd60/rev2/keyboard.json index 2f994ac2e45..639c2dda9e0 100644 --- a/keyboards/xiudi/xd60/rev2/info.json +++ b/keyboards/xiudi/xd60/rev2/keyboard.json @@ -3,6 +3,16 @@ "usb": { "pid": "0x6060" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/xiudi/xd60/rev2/rules.mk b/keyboards/xiudi/xd60/rev2/rules.mk deleted file mode 100644 index 7dfcc1d898d..00000000000 --- a/keyboards/xiudi/xd60/rev2/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 = 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 # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/keyboard.json similarity index 80% rename from keyboards/xiudi/xd60/rev3/info.json rename to keyboards/xiudi/xd60/rev3/keyboard.json index 89a0983bf4f..5b12c38f8ec 100644 --- a/keyboards/xiudi/xd60/rev3/info.json +++ b/keyboards/xiudi/xd60/rev3/keyboard.json @@ -3,6 +3,16 @@ "usb": { "pid": "0x6363" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/xiudi/xd60/rev3/rules.mk b/keyboards/xiudi/xd60/rev3/rules.mk deleted file mode 100644 index 7dfcc1d898d..00000000000 --- a/keyboards/xiudi/xd60/rev3/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 = 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 # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/keyboard.json similarity index 98% rename from keyboards/xiudi/xd68/info.json rename to keyboards/xiudi/xd68/keyboard.json index d55a8535c6f..1836feb49d5 100644 --- a/keyboards/xiudi/xd68/info.json +++ b/keyboards/xiudi/xd68/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6868", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F7"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/xiudi/xd68/rules.mk b/keyboards/xiudi/xd68/rules.mk deleted file mode 100644 index 45377383806..00000000000 --- a/keyboards/xiudi/xd68/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 = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/xiudi/xd75/info.json b/keyboards/xiudi/xd75/keyboard.json similarity index 96% rename from keyboards/xiudi/xd75/info.json rename to keyboards/xiudi/xd75/keyboard.json index 58af00e9724..a928b43f9b7 100644 --- a/keyboards/xiudi/xd75/info.json +++ b/keyboards/xiudi/xd75/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x7575", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "B0"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/xiudi/xd75/rules.mk b/keyboards/xiudi/xd75/rules.mk deleted file mode 100644 index ffa61ba8c5a..00000000000 --- a/keyboards/xiudi/xd75/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/keyboard.json similarity index 98% rename from keyboards/xiudi/xd84pro/info.json rename to keyboards/xiudi/xd84pro/keyboard.json index bcdc0d2cf10..23bad3fcab1 100644 --- a/keyboards/xiudi/xd84pro/info.json +++ b/keyboards/xiudi/xd84pro/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x8450", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F7"], "rows": ["F4", "D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/xiudi/xd84pro/rules.mk b/keyboards/xiudi/xd84pro/rules.mk deleted file mode 100644 index 1955f1d315b..00000000000 --- a/keyboards/xiudi/xd84pro/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/xiudi/xd87/info.json b/keyboards/xiudi/xd87/keyboard.json similarity index 98% rename from keyboards/xiudi/xd87/info.json rename to keyboards/xiudi/xd87/keyboard.json index 3c30f69ba9a..a84c5660a8a 100644 --- a/keyboards/xiudi/xd87/info.json +++ b/keyboards/xiudi/xd87/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x8787", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5", "B6", "C6", "D4", "D6", "D7", "B4", "B2", "B3", "D2"], "rows": ["D1", "B0", "B1", "C7", "D3", "D5"] diff --git a/keyboards/xiudi/xd87/rules.mk b/keyboards/xiudi/xd87/rules.mk deleted file mode 100644 index a2444417d6c..00000000000 --- a/keyboards/xiudi/xd87/rules.mk +++ /dev/null @@ -1,12 +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 = yes # Console for debug -COMMAND_ENABLE = yes # 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/xmmx/info.json b/keyboards/xmmx/keyboard.json similarity index 99% rename from keyboards/xmmx/info.json rename to keyboards/xmmx/keyboard.json index 8cccc925ff4..c0687ca1b7b 100644 --- a/keyboards/xmmx/info.json +++ b/keyboards/xmmx/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6776", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "E6", "B7", "C7", "C6", "D4", "D6", "D7", "B4", "D0", "D1", "F7", "D2", "D3", "D5"], "rows": ["B0", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/xmmx/rules.mk b/keyboards/xmmx/rules.mk deleted file mode 100644 index 51c80ed6cf1..00000000000 --- a/keyboards/xmmx/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 = 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 -RGBLIGHT_ENABLE = no diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/keyboard.json similarity index 96% rename from keyboards/yandrstudio/nz64/info.json rename to keyboards/yandrstudio/nz64/keyboard.json index 27515bebbc7..8169449a107 100644 --- a/keyboards/yandrstudio/nz64/info.json +++ b/keyboards/yandrstudio/nz64/keyboard.json @@ -62,6 +62,15 @@ "max_brightness": 180, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A15", "B3", "B4", "B6", "B7", "B5", "C13", "A5", "A4", "B14", "B15", "A8", "A9", "A10"], "rows": ["C14", "B13", "B12", "C15", "A3"] diff --git a/keyboards/yandrstudio/nz64/rules.mk b/keyboards/yandrstudio/nz64/rules.mk deleted file mode 100644 index e4a82c46db7..00000000000 --- a/keyboards/yandrstudio/nz64/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 -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 = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/keyboard.json similarity index 96% rename from keyboards/yandrstudio/zhou65/info.json rename to keyboards/yandrstudio/zhou65/keyboard.json index aa34d3864ff..f15cdfb0a2e 100644 --- a/keyboards/yandrstudio/zhou65/info.json +++ b/keyboards/yandrstudio/zhou65/keyboard.json @@ -5,6 +5,14 @@ "device_version": "1.0.0", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B9", "B6", "B5", "B4", "B3", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14"], "rows": ["A2", "A1", "B8", "B7", "C15"] diff --git a/keyboards/yandrstudio/zhou65/rules.mk b/keyboards/yandrstudio/zhou65/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/yandrstudio/zhou65/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 = 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/yatara/drink_me/info.json b/keyboards/yatara/drink_me/keyboard.json similarity index 79% rename from keyboards/yatara/drink_me/info.json rename to keyboards/yatara/drink_me/keyboard.json index 78838f143ab..970aa4f5d34 100644 --- a/keyboards/yatara/drink_me/info.json +++ b/keyboards/yatara/drink_me/keyboard.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u2", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "direct": [ ["B4", "B5", "B6", "B7"] diff --git a/keyboards/yatara/drink_me/rules.mk b/keyboards/yatara/drink_me/rules.mk deleted file mode 100644 index 29f6808ed5d..00000000000 --- a/keyboards/yatara/drink_me/rules.mk +++ /dev/null @@ -1,12 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ydkb/chili/info.json b/keyboards/ydkb/chili/keyboard.json similarity index 99% rename from keyboards/ydkb/chili/info.json rename to keyboards/ydkb/chili/keyboard.json index 0b6b8cfebc5..78dd6318fe8 100644 --- a/keyboards/ydkb/chili/info.json +++ b/keyboards/ydkb/chili/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F5", "F4", "F1", "F0", "E6", "B0", "D5", "D3", "D2", "D1", "D0"] diff --git a/keyboards/ydkb/chili/rules.mk b/keyboards/ydkb/chili/rules.mk deleted file mode 100644 index a48cbdc0dea..00000000000 --- a/keyboards/ydkb/chili/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 = 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 WS2812 RGB underlight -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ydkb/yd68/info.json b/keyboards/ydkb/yd68/keyboard.json similarity index 96% rename from keyboards/ydkb/yd68/info.json rename to keyboards/ydkb/yd68/keyboard.json index f805369f8dd..a3542e72c20 100644 --- a/keyboards/ydkb/yd68/info.json +++ b/keyboards/ydkb/yd68/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B6", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3", "D5"], "rows": ["B5", "C6", "C7", "D7", "B4"] diff --git a/keyboards/ydkb/yd68/rules.mk b/keyboards/ydkb/yd68/rules.mk deleted file mode 100644 index aa4c817d2a2..00000000000 --- a/keyboards/ydkb/yd68/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yeehaw/info.json b/keyboards/yeehaw/keyboard.json similarity index 89% rename from keyboards/yeehaw/info.json rename to keyboards/yeehaw/keyboard.json index fce21045822..aa20239c9d3 100644 --- a/keyboards/yeehaw/info.json +++ b/keyboards/yeehaw/keyboard.json @@ -36,6 +36,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "direct": [ ["D2", "D4", "C6", "E6", "F5", "B1", "D3", "D7", "B4", "F6", "B3", "B5", "F7", "F4"] diff --git a/keyboards/yeehaw/rules.mk b/keyboards/yeehaw/rules.mk deleted file mode 100644 index be11c03df95..00000000000 --- a/keyboards/yeehaw/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -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 -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -ENCODER_ENABLE = yes diff --git a/keyboards/ymdk/bface/info.json b/keyboards/ymdk/bface/keyboard.json similarity index 98% rename from keyboards/ymdk/bface/info.json rename to keyboards/ymdk/bface/keyboard.json index f6646db9206..8a0025c01a7 100644 --- a/keyboards/ymdk/bface/info.json +++ b/keyboards/ymdk/bface/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x4266", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B7", "B6", "B5", "B4", "B3"] diff --git a/keyboards/ymdk/bface/rules.mk b/keyboards/ymdk/bface/rules.mk deleted file mode 100644 index 166b3d3ec8d..00000000000 --- a/keyboards/ymdk/bface/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/ymdk/np21/info.json b/keyboards/ymdk/np21/keyboard.json similarity index 95% rename from keyboards/ymdk/np21/info.json rename to keyboards/ymdk/np21/keyboard.json index f420023deef..14a075042b5 100644 --- a/keyboards/ymdk/np21/info.json +++ b/keyboards/ymdk/np21/keyboard.json @@ -8,6 +8,16 @@ "device_version": "2.0.0", "max_power": 100 }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/ymdk/np21/rules.mk b/keyboards/ymdk/np21/rules.mk deleted file mode 100644 index e9c8472d0bc..00000000000 --- a/keyboards/ymdk/np21/rules.mk +++ /dev/null @@ -1,10 +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 -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/keyboard.json similarity index 96% rename from keyboards/ymdk/np24/u4rgb6/info.json rename to keyboards/ymdk/np24/u4rgb6/keyboard.json index b804473300a..3dcd9d63b3e 100644 --- a/keyboards/ymdk/np24/u4rgb6/info.json +++ b/keyboards/ymdk/np24/u4rgb6/keyboard.json @@ -7,6 +7,16 @@ "pid": "0x5024", "device_version": "4.0.6" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F4", "D3", "D2"], "rows": ["B3", "B6", "B2", "B1", "D7", "B4"] diff --git a/keyboards/ymdk/np24/u4rgb6/rules.mk b/keyboards/ymdk/np24/u4rgb6/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/ymdk/np24/u4rgb6/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/keyboard.json similarity index 98% rename from keyboards/ymdk/wings/info.json rename to keyboards/ymdk/wings/keyboard.json index 1e0a1995b65..30c8439b45e 100644 --- a/keyboards/ymdk/wings/info.json +++ b/keyboards/ymdk/wings/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x2975", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/ymdk/wings/rules.mk b/keyboards/ymdk/wings/rules.mk deleted file mode 100644 index 6962e5ba56a..00000000000 --- a/keyboards/ymdk/wings/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/keyboard.json similarity index 96% rename from keyboards/ymdk/wingshs/info.json rename to keyboards/ymdk/wingshs/keyboard.json index 4843e2d4c06..487d61cc2e1 100644 --- a/keyboards/ymdk/wingshs/info.json +++ b/keyboards/ymdk/wingshs/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x4975", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/ymdk/wingshs/rules.mk b/keyboards/ymdk/wingshs/rules.mk deleted file mode 100644 index 6962e5ba56a..00000000000 --- a/keyboards/ymdk/wingshs/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ymdk/ym68/info.json b/keyboards/ymdk/ym68/keyboard.json similarity index 99% rename from keyboards/ymdk/ym68/info.json rename to keyboards/ymdk/ym68/keyboard.json index 132d431adb8..5bea9b2e482 100644 --- a/keyboards/ymdk/ym68/info.json +++ b/keyboards/ymdk/ym68/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xD896", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/ymdk/ym68/rules.mk b/keyboards/ymdk/ym68/rules.mk deleted file mode 100644 index 85830d31150..00000000000 --- a/keyboards/ymdk/ym68/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 = 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 diff --git a/keyboards/ymdk/ymd21/v2/info.json b/keyboards/ymdk/ymd21/v2/keyboard.json similarity index 91% rename from keyboards/ymdk/ymd21/v2/info.json rename to keyboards/ymdk/ymd21/v2/keyboard.json index 9bd8d6e3708..3e2e992ccc6 100644 --- a/keyboards/ymdk/ymd21/v2/info.json +++ b/keyboards/ymdk/ymd21/v2/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0110", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F4", "D3", "D2"], "rows": ["B3", "B6", "B2", "B1", "D7", "B4"] diff --git a/keyboards/ymdk/ymd21/v2/rules.mk b/keyboards/ymdk/ymd21/v2/rules.mk deleted file mode 100644 index 85830d31150..00000000000 --- a/keyboards/ymdk/ymd21/v2/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 = 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 diff --git a/keyboards/ymdk/ymd67/info.json b/keyboards/ymdk/ymd67/keyboard.json similarity index 95% rename from keyboards/ymdk/ymd67/info.json rename to keyboards/ymdk/ymd67/keyboard.json index 65da379035f..5e470553d5f 100644 --- a/keyboards/ymdk/ymd67/info.json +++ b/keyboards/ymdk/ymd67/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/ymdk/ymd67/rules.mk b/keyboards/ymdk/ymd67/rules.mk deleted file mode 100644 index 3a3b26188fc..00000000000 --- a/keyboards/ymdk/ymd67/rules.mk +++ /dev/null @@ -1,12 +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 # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes diff --git a/keyboards/ymdk/ymd75/rev1/info.json b/keyboards/ymdk/ymd75/rev1/keyboard.json similarity index 98% rename from keyboards/ymdk/ymd75/rev1/info.json rename to keyboards/ymdk/ymd75/rev1/keyboard.json index fb214285c15..f2b664c67f6 100644 --- a/keyboards/ymdk/ymd75/rev1/info.json +++ b/keyboards/ymdk/ymd75/rev1/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x422D", "device_version": "1.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "key_lock": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/ymdk/ymd75/rev1/rules.mk b/keyboards/ymdk/ymd75/rev1/rules.mk deleted file mode 100644 index d9e34145c4d..00000000000 --- a/keyboards/ymdk/ymd75/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -NKRO_ENABLE = no # Enable N-Key Rollover - -KEY_LOCK_ENABLE = yes diff --git a/keyboards/ymdk/ymd75/rev2/info.json b/keyboards/ymdk/ymd75/rev2/keyboard.json similarity index 98% rename from keyboards/ymdk/ymd75/rev2/info.json rename to keyboards/ymdk/ymd75/rev2/keyboard.json index 2e2e38ce44d..272140fd820 100644 --- a/keyboards/ymdk/ymd75/rev2/info.json +++ b/keyboards/ymdk/ymd75/rev2/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "key_lock": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B7", "B6", "B5", "B4", "B3", "B0"] diff --git a/keyboards/ymdk/ymd75/rev2/rules.mk b/keyboards/ymdk/ymd75/rev2/rules.mk deleted file mode 100644 index d9e34145c4d..00000000000 --- a/keyboards/ymdk/ymd75/rev2/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -NKRO_ENABLE = no # Enable N-Key Rollover - -KEY_LOCK_ENABLE = yes diff --git a/keyboards/ymdk/ymd75/rev3/info.json b/keyboards/ymdk/ymd75/rev3/keyboard.json similarity index 98% rename from keyboards/ymdk/ymd75/rev3/info.json rename to keyboards/ymdk/ymd75/rev3/keyboard.json index f3ee46edbd4..ae8c20990b4 100644 --- a/keyboards/ymdk/ymd75/rev3/info.json +++ b/keyboards/ymdk/ymd75/rev3/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x422D", "device_version": "3.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "key_lock": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/ymdk/ymd75/rev3/rules.mk b/keyboards/ymdk/ymd75/rev3/rules.mk deleted file mode 100644 index 58ad1837e0a..00000000000 --- a/keyboards/ymdk/ymd75/rev3/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # 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 - -KEY_LOCK_ENABLE = yes diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/keyboard.json similarity index 98% rename from keyboards/ymdk/ymd96/info.json rename to keyboards/ymdk/ymd96/keyboard.json index d947050f3da..ed7edd490a8 100644 --- a/keyboards/ymdk/ymd96/info.json +++ b/keyboards/ymdk/ymd96/keyboard.json @@ -9,6 +9,17 @@ "device_version": "2.0.0", "max_power": 100 }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "key_lock": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/ymdk/ymd96/rules.mk b/keyboards/ymdk/ymd96/rules.mk deleted file mode 100644 index 17b4d5b2515..00000000000 --- a/keyboards/ymdk/ymd96/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = no - -BACKLIGHT_ENABLE = yes - -RGBLIGHT_ENABLE = yes - -KEY_LOCK_ENABLE = yes diff --git a/keyboards/yncognito/batpad/info.json b/keyboards/yncognito/batpad/keyboard.json similarity index 93% rename from keyboards/yncognito/batpad/info.json rename to keyboards/yncognito/batpad/keyboard.json index 0335608cfb1..06a1f9b090a 100644 --- a/keyboards/yncognito/batpad/info.json +++ b/keyboards/yncognito/batpad/keyboard.json @@ -63,6 +63,15 @@ "driver": "ws2812", "react_on_keyup": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F1", "F0", "D5", "D3"], "rows": ["F4", "C7"] diff --git a/keyboards/yncognito/batpad/rules.mk b/keyboards/yncognito/batpad/rules.mk deleted file mode 100644 index a72bbe128bc..00000000000 --- a/keyboards/yncognito/batpad/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 = 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 -RGB_MATRIX_ENABLE = yes -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yoichiro/lunakey_macro/info.json b/keyboards/yoichiro/lunakey_macro/keyboard.json similarity index 90% rename from keyboards/yoichiro/lunakey_macro/info.json rename to keyboards/yoichiro/lunakey_macro/keyboard.json index 46b7ca26f45..7268dd31438 100644 --- a/keyboards/yoichiro/lunakey_macro/info.json +++ b/keyboards/yoichiro/lunakey_macro/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1"], "rows": ["E6", "B4", "B5"] diff --git a/keyboards/yoichiro/lunakey_macro/rules.mk b/keyboards/yoichiro/lunakey_macro/rules.mk deleted file mode 100644 index 29f6808ed5d..00000000000 --- a/keyboards/yoichiro/lunakey_macro/rules.mk +++ /dev/null @@ -1,12 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yushakobo/quick7/info.json b/keyboards/yushakobo/quick7/keyboard.json similarity index 86% rename from keyboards/yushakobo/quick7/info.json rename to keyboards/yushakobo/quick7/keyboard.json index 54d365d0775..14d65945ce9 100644 --- a/keyboards/yushakobo/quick7/info.json +++ b/keyboards/yushakobo/quick7/keyboard.json @@ -31,6 +31,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "direct": [ ["D2", "D4", "F4"], diff --git a/keyboards/yushakobo/quick7/rules.mk b/keyboards/yushakobo/quick7/rules.mk deleted file mode 100644 index 2bec6222a29..00000000000 --- a/keyboards/yushakobo/quick7/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes # Enable support for Rotary Encoder diff --git a/keyboards/yynmt/dozen0/info.json b/keyboards/yynmt/dozen0/keyboard.json similarity index 89% rename from keyboards/yynmt/dozen0/info.json rename to keyboards/yynmt/dozen0/keyboard.json index a4f3800f889..cdd55389f3c 100644 --- a/keyboards/yynmt/dozen0/info.json +++ b/keyboards/yynmt/dozen0/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "B5", "B4", "E6", "D7", "C6", "D4"], "rows": ["F4"] diff --git a/keyboards/yynmt/dozen0/rules.mk b/keyboards/yynmt/dozen0/rules.mk deleted file mode 100644 index aa4c817d2a2..00000000000 --- a/keyboards/yynmt/dozen0/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yynmt/kagamidget/info.json b/keyboards/yynmt/kagamidget/keyboard.json similarity index 94% rename from keyboards/yynmt/kagamidget/info.json rename to keyboards/yynmt/kagamidget/keyboard.json index e9bc92dea33..15e48da7dd3 100644 --- a/keyboards/yynmt/kagamidget/info.json +++ b/keyboards/yynmt/kagamidget/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"], "rows": ["D1", "D0", "F4", "F5"] diff --git a/keyboards/yynmt/kagamidget/rules.mk b/keyboards/yynmt/kagamidget/rules.mk deleted file mode 100644 index 898f9b50add..00000000000 --- a/keyboards/yynmt/kagamidget/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -RGBLIGHT_ENABLE = yes diff --git a/keyboards/zfrontier/big_switch/info.json b/keyboards/zfrontier/big_switch/keyboard.json similarity index 84% rename from keyboards/zfrontier/big_switch/info.json rename to keyboards/zfrontier/big_switch/keyboard.json index 9f19a030d16..2b2ceec094c 100644 --- a/keyboards/zfrontier/big_switch/info.json +++ b/keyboards/zfrontier/big_switch/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0A01", "device_version": "0.0.5" }, + "features": { + "bootmagic": false, + "command": false, + "console": true, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F1"], "rows": ["F0"] diff --git a/keyboards/zfrontier/big_switch/rules.mk b/keyboards/zfrontier/big_switch/rules.mk deleted file mode 100644 index ead69ec32ec..00000000000 --- a/keyboards/zfrontier/big_switch/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ziggurat/info.json b/keyboards/ziggurat/keyboard.json similarity index 99% rename from keyboards/ziggurat/info.json rename to keyboards/ziggurat/keyboard.json index 4defa3f4f0d..11ae657256b 100644 --- a/keyboards/ziggurat/info.json +++ b/keyboards/ziggurat/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5258", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F3", "F2", "F1", "B5", "B6", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"], "rows": ["A2", "A1", "A0", "F7", "A3"] diff --git a/keyboards/ziggurat/rules.mk b/keyboards/ziggurat/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/ziggurat/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 = 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/zj68/info.json b/keyboards/zj68/keyboard.json similarity index 98% rename from keyboards/zj68/info.json rename to keyboards/zj68/keyboard.json index e2916ce4e22..3adf890df90 100644 --- a/keyboards/zj68/info.json +++ b/keyboards/zj68/keyboard.json @@ -7,6 +7,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/zj68/rules.mk b/keyboards/zj68/rules.mk deleted file mode 100644 index 5c84ca0a179..00000000000 --- a/keyboards/zj68/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -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 -AUDIO_ENABLE = no - -RGBLIGHT_ENABLE = no diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/keyboard.json similarity index 97% rename from keyboards/zoo/wampus/info.json rename to keyboards/zoo/wampus/keyboard.json index 6478e67a80c..fdc10ae2108 100644 --- a/keyboards/zoo/wampus/info.json +++ b/keyboards/zoo/wampus/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xE600", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B12", "A15", "A13", "A7", "A2", "A1", "A0", "F1", "F0", "B3", "B4", "B5"], "rows": ["C13", "C14", "A5", "A4", "A3"] diff --git a/keyboards/zoo/wampus/rules.mk b/keyboards/zoo/wampus/rules.mk deleted file mode 100644 index fe3c88063d2..00000000000 --- a/keyboards/zoo/wampus/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = no # Enables the use of OLED displays - diff --git a/keyboards/ztboards/after/info.json b/keyboards/ztboards/after/keyboard.json similarity index 98% rename from keyboards/ztboards/after/info.json rename to keyboards/ztboards/after/keyboard.json index 4304a3cd511..08fcdb3625f 100644 --- a/keyboards/ztboards/after/info.json +++ b/keyboards/ztboards/after/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D7", "D6", "D4", "C7", "C6", "B6", "B5", "B4", "F7", "F0", "F4", "F1"], "rows": ["B3", "F6", "F5", "D5", "B2"] diff --git a/keyboards/ztboards/after/rules.mk b/keyboards/ztboards/after/rules.mk deleted file mode 100644 index 15dbc98f883..00000000000 --- a/keyboards/ztboards/after/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 -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 -ENCODER_ENABLE = yes # Rotary Encoder use diff --git a/keyboards/ztboards/noon/info.json b/keyboards/ztboards/noon/keyboard.json similarity index 98% rename from keyboards/ztboards/noon/info.json rename to keyboards/ztboards/noon/keyboard.json index 298aa5e179d..0f965963cfc 100644 --- a/keyboards/ztboards/noon/info.json +++ b/keyboards/ztboards/noon/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D2", "D1", "D0", "D4", "D6", "B2", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], "rows": ["B5", "D5", "D3", "B1", "F0"] diff --git a/keyboards/ztboards/noon/rules.mk b/keyboards/ztboards/noon/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/ztboards/noon/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 = 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 From 1a903372846f24028431d20bc25e64b4da69da27 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 15 Mar 2024 22:24:00 +0000 Subject: [PATCH 036/333] Migrate features from rules.mk to data driven - OPQR (#23285) --- .../ocean/addon/{info.json => keyboard.json} | 8 +++++++ keyboards/ocean/addon/rules.mk | 12 ----------- .../ocean/gin_v2/{info.json => keyboard.json} | 8 +++++++ keyboards/ocean/gin_v2/rules.mk | 12 ----------- .../ocean/slamz/{info.json => keyboard.json} | 8 +++++++ keyboards/ocean/slamz/rules.mk | 12 ----------- .../stealth/{info.json => keyboard.json} | 8 +++++++ keyboards/ocean/stealth/rules.mk | 12 ----------- .../ocean/sus/{info.json => keyboard.json} | 8 +++++++ keyboards/ocean/sus/rules.mk | 12 ----------- .../wang_ergo/{info.json => keyboard.json} | 8 +++++++ keyboards/ocean/wang_ergo/rules.mk | 12 ----------- .../wang_v2/{info.json => keyboard.json} | 8 +++++++ keyboards/ocean/wang_v2/rules.mk | 12 ----------- .../ocean/yuri/{info.json => keyboard.json} | 8 +++++++ keyboards/ocean/yuri/rules.mk | 12 ----------- keyboards/odelia/{info.json => keyboard.json} | 8 +++++++ keyboards/odelia/rules.mk | 12 ----------- keyboards/ok60/{info.json => keyboard.json} | 10 +++++++++ keyboards/ok60/rules.mk | 11 ---------- .../dango40/{info.json => keyboard.json} | 9 ++++++++ keyboards/onekeyco/dango40/rules.mk | 13 ------------ .../orange75/{info.json => keyboard.json} | 9 ++++++++ keyboards/orange75/rules.mk | 12 ----------- keyboards/org60/{info.json => keyboard.json} | 10 +++++++++ keyboards/org60/rules.mk | 12 ----------- .../ortho5by12/{info.json => keyboard.json} | 8 +++++++ keyboards/ortho5by12/rules.mk | 12 ----------- .../hotswap/{info.json => keyboard.json} | 9 ++++++++ keyboards/owlab/jelly_epoch/hotswap/rules.mk | 12 ----------- .../soldered/{info.json => keyboard.json} | 9 ++++++++ keyboards/owlab/jelly_epoch/soldered/rules.mk | 12 ----------- .../owlab/spring/{info.json => keyboard.json} | 9 ++++++++ keyboards/owlab/spring/rules.mk | 12 ----------- .../suit80/ansi/{info.json => keyboard.json} | 8 +++++++ keyboards/owlab/suit80/ansi/rules.mk | 12 ----------- .../suit80/iso/{info.json => keyboard.json} | 8 +++++++ keyboards/owlab/suit80/iso/rules.mk | 12 ----------- .../hotswap/{info.json => keyboard.json} | 11 ++++++++++ keyboards/owlab/voice65/hotswap/rules.mk | 15 ------------- .../soldered/{info.json => keyboard.json} | 11 ++++++++++ keyboards/owlab/voice65/soldered/rules.mk | 15 ------------- .../eu_isolation/{info.json => keyboard.json} | 8 +++++++ keyboards/p3d/eu_isolation/rules.mk | 12 ----------- .../p3d/glitch/{info.json => keyboard.json} | 11 ++++++++++ keyboards/p3d/glitch/rules.mk | 14 ------------- .../p3d/q4z/{info.json => keyboard.json} | 8 +++++++ keyboards/p3d/q4z/rules.mk | 12 ----------- .../p3d/spacey/{info.json => keyboard.json} | 9 ++++++++ keyboards/p3d/spacey/rules.mk | 13 ------------ .../p3d/synapse/{info.json => keyboard.json} | 9 ++++++++ keyboards/p3d/synapse/rules.mk | 13 ------------ .../p3d/tw40/{info.json => keyboard.json} | 9 ++++++++ keyboards/p3d/tw40/rules.mk | 12 ----------- .../pabile/p18/{info.json => keyboard.json} | 10 +++++++++ keyboards/pabile/p18/rules.mk | 15 ------------- .../p20/ver1/{info.json => keyboard.json} | 10 +++++++++ keyboards/pabile/p20/ver1/rules.mk | 16 -------------- .../p20/ver2/{info.json => keyboard.json} | 9 ++++++++ keyboards/pabile/p20/ver2/rules.mk | 16 -------------- .../pabile/p40/{info.json => keyboard.json} | 9 ++++++++ keyboards/pabile/p40/rules.mk | 14 ------------- .../p40_ortho/{info.json => keyboard.json} | 9 ++++++++ keyboards/pabile/p40_ortho/rules.mk | 14 ------------- .../pabile/p42/{info.json => keyboard.json} | 9 ++++++++ keyboards/pabile/p42/rules.mk | 14 ------------- keyboards/panc40/{info.json => keyboard.json} | 9 ++++++++ keyboards/panc40/rules.mk | 12 ----------- keyboards/panc60/{info.json => keyboard.json} | 10 +++++++++ keyboards/panc60/rules.mk | 10 --------- .../gerald65/{info.json => keyboard.json} | 8 +++++++ .../papercranekeyboards/gerald65/rules.mk | 12 ----------- .../hotswap/{info.json => keyboard.json} | 8 +++++++ .../parallel/parallel_65/hotswap/rules.mk | 12 ----------- .../soldered/{info.json => keyboard.json} | 8 +++++++ .../parallel/parallel_65/soldered/rules.mk | 12 ----------- keyboards/pdxkbc/{info.json => keyboard.json} | 8 +++++++ keyboards/pdxkbc/rules.mk | 12 ----------- keyboards/pearl/{info.json => keyboard.json} | 10 +++++++++ keyboards/pearl/rules.mk | 10 --------- .../lumberjack/{info.json => keyboard.json} | 8 +++++++ keyboards/peej/lumberjack/rules.mk | 12 ----------- .../pegasus/{info.json => keyboard.json} | 9 ++++++++ keyboards/pegasus/rules.mk | 13 ------------ .../canoe/{info.json => keyboard.json} | 10 +++++++++ keyboards/percent/canoe/rules.mk | 10 --------- .../percent/skog/{info.json => keyboard.json} | 10 +++++++++ keyboards/percent/skog/rules.mk | 10 --------- .../skog_lite/{info.json => keyboard.json} | 10 +++++++++ keyboards/percent/skog_lite/rules.mk | 10 --------- .../phantom/{info.json => keyboard.json} | 8 +++++++ keyboards/phantom/rules.mk | 12 ----------- .../ph100/{info.json => keyboard.json} | 8 +++++++ keyboards/phrygian/ph100/rules.mk | 14 ------------- .../{info.json => keyboard.json} | 9 ++++++++ keyboards/picolab/frusta_fundamental/rules.mk | 12 ----------- .../rev1/{info.json => keyboard.json} | 8 +++++++ keyboards/pimentoso/paddino02/rev1/rules.mk | 14 ------------- .../rev2/left/{info.json => keyboard.json} | 8 +++++++ .../pimentoso/paddino02/rev2/left/rules.mk | 14 ------------- .../rev2/right/{info.json => keyboard.json} | 8 +++++++ .../pimentoso/paddino02/rev2/right/rules.mk | 14 ------------- .../touhoupad/{info.json => keyboard.json} | 9 ++++++++ keyboards/pimentoso/touhoupad/rules.mk | 12 ----------- .../capsule65i/{info.json => keyboard.json} | 9 ++++++++ keyboards/pixelspace/capsule65i/rules.mk | 12 ----------- .../pizza65/{info.json => keyboard.json} | 8 +++++++ keyboards/pizzakeyboards/pizza65/rules.mk | 12 ----------- .../pjb/eros/{info.json => keyboard.json} | 8 +++++++ keyboards/pjb/eros/rules.mk | 11 ---------- keyboards/pkb65/{info.json => keyboard.json} | 8 +++++++ keyboards/pkb65/rules.mk | 12 ----------- .../planck/light/{info.json => keyboard.json} | 11 ++++++++++ keyboards/planck/light/rules.mk | 14 ------------- .../planck/rev1/{info.json => keyboard.json} | 8 +++++++ keyboards/planck/rev1/rules.mk | 12 ----------- .../planck/rev2/{info.json => keyboard.json} | 8 +++++++ keyboards/planck/rev2/rules.mk | 12 ----------- .../planck/rev3/{info.json => keyboard.json} | 8 +++++++ keyboards/planck/rev3/rules.mk | 12 ----------- .../planck/rev4/{info.json => keyboard.json} | 9 ++++++++ keyboards/planck/rev4/rules.mk | 12 ----------- .../planck/rev5/{info.json => keyboard.json} | 9 ++++++++ keyboards/planck/rev5/rules.mk | 12 ----------- .../planck/rev6/{info.json => keyboard.json} | 12 +++++++++++ keyboards/planck/rev6/rules.mk | 16 -------------- .../ca66/{info.json => keyboard.json} | 10 +++++++++ keyboards/playkbtw/ca66/rules.mk | 12 ----------- .../pk60/{info.json => keyboard.json} | 10 +++++++++ keyboards/playkbtw/pk60/rules.mk | 12 ----------- .../plume65/{info.json => keyboard.json} | 9 ++++++++ keyboards/plume/plume65/rules.mk | 12 ----------- keyboards/plx/{info.json => keyboard.json} | 8 +++++++ keyboards/plx/rules.mk | 12 ----------- .../ahgase/{info.json => keyboard.json} | 8 +++++++ keyboards/plywrks/ahgase/rules.mk | 12 ----------- .../plywrks/lune/{info.json => keyboard.json} | 10 +++++++++ keyboards/plywrks/lune/rules.mk | 13 ------------ .../louhi/{info.json => keyboard.json} | 9 ++++++++ keyboards/pohjolaworks/louhi/rules.mk | 13 ------------ .../poker87c/{info.json => keyboard.json} | 10 +++++++++ keyboards/poker87c/rules.mk | 12 ----------- .../poker87d/{info.json => keyboard.json} | 10 +++++++++ keyboards/poker87d/rules.mk | 12 ----------- .../s20/{info.json => keyboard.json} | 10 +++++++++ keyboards/polycarbdiet/s20/rules.mk | 12 ----------- .../hotswap/{info.json => keyboard.json} | 8 +++++++ keyboards/portal_66/hotswap/rules.mk | 12 ----------- .../soldered/{info.json => keyboard.json} | 8 +++++++ keyboards/portal_66/soldered/rules.mk | 12 ----------- keyboards/pos78/{info.json => keyboard.json} | 8 +++++++ keyboards/pos78/rules.mk | 12 ----------- .../preonic/rev3/{info.json => keyboard.json} | 12 +++++++++++ keyboards/preonic/rev3/rules.mk | 18 ---------------- .../meridian_rgb/{info.json => keyboard.json} | 9 ++++++++ keyboards/primekb/meridian_rgb/rules.mk | 12 ----------- .../prime_m/{info.json => keyboard.json} | 9 ++++++++ keyboards/primekb/prime_m/rules.mk | 12 ----------- .../prime_o/{info.json => keyboard.json} | 9 ++++++++ keyboards/primekb/prime_o/rules.mk | 12 ----------- .../prime_r/{info.json => keyboard.json} | 9 ++++++++ keyboards/primekb/prime_r/rules.mk | 12 ----------- .../relic/{info.json => keyboard.json} | 8 +++++++ keyboards/projectcain/relic/rules.mk | 12 ----------- .../vault45/{info.json => keyboard.json} | 9 ++++++++ keyboards/projectcain/vault45/rules.mk | 13 ------------ .../signature65/{info.json => keyboard.json} | 8 +++++++ keyboards/projectkb/signature65/rules.mk | 14 ------------- .../signature87/{info.json => keyboard.json} | 8 +++++++ keyboards/projectkb/signature87/rules.mk | 11 ---------- .../allison/{info.json => keyboard.json} | 9 ++++++++ keyboards/prototypist/allison/rules.mk | 12 ----------- .../{info.json => keyboard.json} | 9 ++++++++ keyboards/prototypist/allison_numpad/rules.mk | 12 ----------- .../pluto12/{info.json => keyboard.json} | 9 ++++++++ keyboards/psuieee/pluto12/rules.mk | 13 ------------ keyboards/puck/{info.json => keyboard.json} | 8 +++++++ keyboards/puck/rules.mk | 12 ----------- .../eggman/{info.json => keyboard.json} | 9 ++++++++ keyboards/qpockets/eggman/rules.mk | 14 ------------- .../wanten/{info.json => keyboard.json} | 9 ++++++++ keyboards/qpockets/wanten/rules.mk | 13 ------------ .../quad_h/lb75/{info.json => keyboard.json} | 10 +++++++++ keyboards/quad_h/lb75/rules.mk | 12 ----------- .../kyuu/{info.json => keyboard.json} | 8 +++++++ keyboards/quantrik/kyuu/rules.mk | 12 ----------- .../quarkeys/z40/{info.json => keyboard.json} | 9 ++++++++ keyboards/quarkeys/z40/rules.mk | 16 -------------- .../z60/hotswap/{info.json => keyboard.json} | 9 ++++++++ keyboards/quarkeys/z60/hotswap/rules.mk | 10 --------- .../z60/solder/{info.json => keyboard.json} | 9 ++++++++ keyboards/quarkeys/z60/solder/rules.mk | 10 --------- .../z67/hotswap/{info.json => keyboard.json} | 9 ++++++++ keyboards/quarkeys/z67/hotswap/rules.mk | 12 ----------- .../z67/solder/{info.json => keyboard.json} | 9 ++++++++ keyboards/quarkeys/z67/solder/rules.mk | 12 ----------- .../qvex/lynepad/{info.json => keyboard.json} | 10 +++++++++ keyboards/qvex/lynepad/rules.mk | 12 ----------- .../calice/{info.json => keyboard.json} | 9 ++++++++ keyboards/qwertlekeys/calice/rules.mk | 13 ------------ .../qk65/hotswap/{info.json => keyboard.json} | 8 +++++++ keyboards/qwertykeys/qk65/hotswap/rules.mk | 12 ----------- .../qk65/solder/{info.json => keyboard.json} | 8 +++++++ keyboards/qwertykeys/qk65/solder/rules.mk | 12 ----------- .../rabbit68/{info.json => keyboard.json} | 8 +++++++ keyboards/rabbit/rabbit68/rules.mk | 12 ----------- keyboards/rad/{info.json => keyboard.json} | 8 +++++++ keyboards/rad/rules.mk | 12 ----------- .../delilah/{info.json => keyboard.json} | 9 ++++++++ keyboards/rainkeebs/delilah/rules.mk | 12 ----------- .../rainkeeb/{info.json => keyboard.json} | 11 ++++++++++ keyboards/rainkeebs/rainkeeb/rules.mk | 21 ------------------- .../yasui/{info.json => keyboard.json} | 9 ++++++++ keyboards/rainkeebs/yasui/rules.mk | 13 ------------ .../rart/rart45/{info.json => keyboard.json} | 8 +++++++ keyboards/rart/rart45/rules.mk | 12 ----------- .../rart/rart4x4/{info.json => keyboard.json} | 10 +++++++++ keyboards/rart/rart4x4/rules.mk | 13 ------------ .../rart/rart67/{info.json => keyboard.json} | 9 ++++++++ keyboards/rart/rart67/rules.mk | 12 ----------- .../rart/rart67m/{info.json => keyboard.json} | 10 +++++++++ keyboards/rart/rart67m/rules.mk | 14 ------------- .../rart/rart75/{info.json => keyboard.json} | 9 ++++++++ keyboards/rart/rart75/rules.mk | 13 ------------ .../rart/rart75m/{info.json => keyboard.json} | 11 ++++++++++ keyboards/rart/rart75m/rules.mk | 15 ------------- .../rart/rartand/{info.json => keyboard.json} | 9 ++++++++ keyboards/rart/rartand/rules.mk | 13 ------------ .../rartlice/{info.json => keyboard.json} | 11 ++++++++++ keyboards/rart/rartlice/rules.mk | 14 ------------- .../rartlite/{info.json => keyboard.json} | 8 +++++++ keyboards/rart/rartlite/rules.mk | 12 ----------- .../rart/rartpad/{info.json => keyboard.json} | 10 +++++++++ keyboards/rart/rartpad/rules.mk | 13 ------------ .../pistachio_mp/{info.json => keyboard.json} | 10 +++++++++ keyboards/rate/pistachio_mp/rules.mk | 13 ------------ .../rev_a/{info.json => keyboard.json} | 9 ++++++++ .../ratio65_hotswap/rev_a/rules.mk | 12 ----------- .../rev_a/{info.json => keyboard.json} | 9 ++++++++ .../rationalist/ratio65_solder/rev_a/rules.mk | 12 ----------- .../mio/{info.json => keyboard.json} | 9 ++++++++ keyboards/recompile_keys/mio/rules.mk | 12 ----------- keyboards/rect44/{info.json => keyboard.json} | 9 ++++++++ keyboards/rect44/rules.mk | 12 ----------- .../redscarf_i/{info.json => keyboard.json} | 9 ++++++++ keyboards/redscarf_i/rules.mk | 11 ---------- .../retro_75/{info.json => keyboard.json} | 9 ++++++++ keyboards/retro_75/rules.mk | 12 ----------- .../decadepad/{info.json => keyboard.json} | 10 +++++++++ keyboards/reversestudio/decadepad/rules.mk | 13 ------------ .../reviung33/{info.json => keyboard.json} | 9 ++++++++ keyboards/reviung/reviung33/rules.mk | 12 ----------- .../reviung34/{info.json => keyboard.json} | 8 +++++++ keyboards/reviung/reviung34/rules.mk | 12 ----------- .../reviung39/{info.json => keyboard.json} | 8 +++++++ keyboards/reviung/reviung39/rules.mk | 12 ----------- .../reviung41/{info.json => keyboard.json} | 9 ++++++++ keyboards/reviung/reviung41/rules.mk | 12 ----------- .../reviung5/{info.json => keyboard.json} | 10 +++++++++ keyboards/reviung/reviung5/rules.mk | 13 ------------ .../reviung53/{info.json => keyboard.json} | 9 ++++++++ keyboards/reviung/reviung53/rules.mk | 12 ----------- .../squishy65/{info.json => keyboard.json} | 9 ++++++++ keyboards/rmi_kb/squishy65/rules.mk | 13 ------------ .../squishyfrl/{info.json => keyboard.json} | 9 ++++++++ keyboards/rmi_kb/squishyfrl/rules.mk | 13 ------------ .../squishytkl/{info.json => keyboard.json} | 10 +++++++++ keyboards/rmi_kb/squishytkl/rules.mk | 13 ------------ .../rm_numpad/{info.json => keyboard.json} | 9 ++++++++ keyboards/rmkeebs/rm_numpad/rules.mk | 13 ------------ .../rev1/{info.json => keyboard.json} | 8 +++++++ keyboards/rominronin/katana60/rev1/rules.mk | 12 ----------- .../rev2/{info.json => keyboard.json} | 8 +++++++ keyboards/rominronin/katana60/rev2/rules.mk | 12 ----------- .../roseslite/{info.json => keyboard.json} | 8 +++++++ keyboards/roseslite/rules.mk | 12 ----------- keyboards/rotor/{info.json => keyboard.json} | 8 +++++++ keyboards/rotor/rules.mk | 12 ----------- keyboards/rotr/{info.json => keyboard.json} | 9 ++++++++ keyboards/rotr/rules.mk | 13 ------------ .../skjoldr/{info.json => keyboard.json} | 8 +++++++ keyboards/runes/skjoldr/rules.mk | 12 ----------- .../runes/vaengr/{info.json => keyboard.json} | 9 ++++++++ keyboards/runes/vaengr/rules.mk | 12 ----------- .../rb1/{info.json => keyboard.json} | 8 +++++++ keyboards/ryanbaekr/rb1/rules.mk | 12 ----------- .../rb18/{info.json => keyboard.json} | 9 ++++++++ keyboards/ryanbaekr/rb18/rules.mk | 12 ----------- .../rb69/{info.json => keyboard.json} | 9 ++++++++ keyboards/ryanbaekr/rb69/rules.mk | 12 ----------- .../rb86/{info.json => keyboard.json} | 8 +++++++ keyboards/ryanbaekr/rb86/rules.mk | 12 ----------- .../rb87/{info.json => keyboard.json} | 9 ++++++++ keyboards/ryanbaekr/rb87/rules.mk | 12 ----------- .../m0110/{info.json => keyboard.json} | 10 +++++++++ keyboards/ryloo_studio/m0110/rules.mk | 12 ----------- 296 files changed, 1322 insertions(+), 1850 deletions(-) rename keyboards/ocean/addon/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/ocean/addon/rules.mk rename keyboards/ocean/gin_v2/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/ocean/gin_v2/rules.mk rename keyboards/ocean/slamz/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/ocean/slamz/rules.mk rename keyboards/ocean/stealth/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/ocean/stealth/rules.mk rename keyboards/ocean/sus/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/ocean/sus/rules.mk rename keyboards/ocean/wang_ergo/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ocean/wang_ergo/rules.mk rename keyboards/ocean/wang_v2/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/ocean/wang_v2/rules.mk rename keyboards/ocean/yuri/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/ocean/yuri/rules.mk rename keyboards/odelia/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/odelia/rules.mk rename keyboards/ok60/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ok60/rules.mk rename keyboards/onekeyco/dango40/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/onekeyco/dango40/rules.mk rename keyboards/orange75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/orange75/rules.mk rename keyboards/org60/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/org60/rules.mk rename keyboards/ortho5by12/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/ortho5by12/rules.mk rename keyboards/owlab/jelly_epoch/hotswap/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/owlab/jelly_epoch/hotswap/rules.mk rename keyboards/owlab/jelly_epoch/soldered/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/owlab/jelly_epoch/soldered/rules.mk rename keyboards/owlab/spring/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/owlab/spring/rules.mk rename keyboards/owlab/suit80/ansi/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/owlab/suit80/ansi/rules.mk rename keyboards/owlab/suit80/iso/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/owlab/suit80/iso/rules.mk rename keyboards/owlab/voice65/hotswap/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/owlab/voice65/hotswap/rules.mk rename keyboards/owlab/voice65/soldered/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/owlab/voice65/soldered/rules.mk rename keyboards/p3d/eu_isolation/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/p3d/eu_isolation/rules.mk rename keyboards/p3d/glitch/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/p3d/glitch/rules.mk rename keyboards/p3d/q4z/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/p3d/q4z/rules.mk rename keyboards/p3d/spacey/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/p3d/spacey/rules.mk rename keyboards/p3d/synapse/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/p3d/synapse/rules.mk rename keyboards/p3d/tw40/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/p3d/tw40/rules.mk rename keyboards/pabile/p18/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/pabile/p18/rules.mk rename keyboards/pabile/p20/ver1/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/pabile/p20/ver1/rules.mk rename keyboards/pabile/p20/ver2/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/pabile/p20/ver2/rules.mk rename keyboards/pabile/p40/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/pabile/p40/rules.mk rename keyboards/pabile/p40_ortho/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/pabile/p40_ortho/rules.mk rename keyboards/pabile/p42/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/pabile/p42/rules.mk rename keyboards/panc40/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/panc40/rules.mk rename keyboards/panc60/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/panc60/rules.mk rename keyboards/papercranekeyboards/gerald65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/papercranekeyboards/gerald65/rules.mk rename keyboards/parallel/parallel_65/hotswap/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/parallel/parallel_65/hotswap/rules.mk rename keyboards/parallel/parallel_65/soldered/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/parallel/parallel_65/soldered/rules.mk rename keyboards/pdxkbc/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/pdxkbc/rules.mk rename keyboards/pearl/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/pearl/rules.mk rename keyboards/peej/lumberjack/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/peej/lumberjack/rules.mk rename keyboards/pegasus/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/pegasus/rules.mk rename keyboards/percent/canoe/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/percent/canoe/rules.mk rename keyboards/percent/skog/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/percent/skog/rules.mk rename keyboards/percent/skog_lite/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/percent/skog_lite/rules.mk rename keyboards/phantom/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/phantom/rules.mk rename keyboards/phrygian/ph100/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/phrygian/ph100/rules.mk rename keyboards/picolab/frusta_fundamental/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/picolab/frusta_fundamental/rules.mk rename keyboards/pimentoso/paddino02/rev1/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/pimentoso/paddino02/rev1/rules.mk rename keyboards/pimentoso/paddino02/rev2/left/{info.json => keyboard.json} (85%) delete mode 100755 keyboards/pimentoso/paddino02/rev2/left/rules.mk rename keyboards/pimentoso/paddino02/rev2/right/{info.json => keyboard.json} (85%) delete mode 100755 keyboards/pimentoso/paddino02/rev2/right/rules.mk rename keyboards/pimentoso/touhoupad/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/pimentoso/touhoupad/rules.mk rename keyboards/pixelspace/capsule65i/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/pixelspace/capsule65i/rules.mk rename keyboards/pizzakeyboards/pizza65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/pizzakeyboards/pizza65/rules.mk rename keyboards/pjb/eros/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/pjb/eros/rules.mk rename keyboards/pkb65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/pkb65/rules.mk rename keyboards/planck/light/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/planck/light/rules.mk rename keyboards/planck/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/planck/rev1/rules.mk rename keyboards/planck/rev2/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/planck/rev2/rules.mk rename keyboards/planck/rev3/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/planck/rev3/rules.mk rename keyboards/planck/rev4/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/planck/rev4/rules.mk rename keyboards/planck/rev5/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/planck/rev5/rules.mk rename keyboards/planck/rev6/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/planck/rev6/rules.mk rename keyboards/playkbtw/ca66/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/playkbtw/ca66/rules.mk rename keyboards/playkbtw/pk60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/playkbtw/pk60/rules.mk rename keyboards/plume/plume65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/plume/plume65/rules.mk rename keyboards/plx/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/plx/rules.mk rename keyboards/plywrks/ahgase/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/plywrks/ahgase/rules.mk rename keyboards/plywrks/lune/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/plywrks/lune/rules.mk rename keyboards/pohjolaworks/louhi/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/pohjolaworks/louhi/rules.mk rename keyboards/poker87c/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/poker87c/rules.mk rename keyboards/poker87d/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/poker87d/rules.mk rename keyboards/polycarbdiet/s20/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/polycarbdiet/s20/rules.mk rename keyboards/portal_66/hotswap/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/portal_66/hotswap/rules.mk rename keyboards/portal_66/soldered/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/portal_66/soldered/rules.mk rename keyboards/pos78/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/pos78/rules.mk rename keyboards/preonic/rev3/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/preonic/rev3/rules.mk rename keyboards/primekb/meridian_rgb/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/primekb/meridian_rgb/rules.mk rename keyboards/primekb/prime_m/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/primekb/prime_m/rules.mk rename keyboards/primekb/prime_o/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/primekb/prime_o/rules.mk rename keyboards/primekb/prime_r/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/primekb/prime_r/rules.mk rename keyboards/projectcain/relic/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/projectcain/relic/rules.mk rename keyboards/projectcain/vault45/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/projectcain/vault45/rules.mk rename keyboards/projectkb/signature65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/projectkb/signature65/rules.mk rename keyboards/projectkb/signature87/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/projectkb/signature87/rules.mk rename keyboards/prototypist/allison/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/prototypist/allison/rules.mk rename keyboards/prototypist/allison_numpad/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/prototypist/allison_numpad/rules.mk rename keyboards/psuieee/pluto12/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/psuieee/pluto12/rules.mk rename keyboards/puck/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/puck/rules.mk rename keyboards/qpockets/eggman/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/qpockets/eggman/rules.mk rename keyboards/qpockets/wanten/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/qpockets/wanten/rules.mk rename keyboards/quad_h/lb75/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/quad_h/lb75/rules.mk rename keyboards/quantrik/kyuu/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/quantrik/kyuu/rules.mk rename keyboards/quarkeys/z40/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/quarkeys/z40/rules.mk rename keyboards/quarkeys/z60/hotswap/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/quarkeys/z60/hotswap/rules.mk rename keyboards/quarkeys/z60/solder/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/quarkeys/z60/solder/rules.mk rename keyboards/quarkeys/z67/hotswap/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/quarkeys/z67/hotswap/rules.mk rename keyboards/quarkeys/z67/solder/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/quarkeys/z67/solder/rules.mk rename keyboards/qvex/lynepad/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/qvex/lynepad/rules.mk rename keyboards/qwertlekeys/calice/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/qwertlekeys/calice/rules.mk rename keyboards/qwertykeys/qk65/hotswap/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/qwertykeys/qk65/hotswap/rules.mk rename keyboards/qwertykeys/qk65/solder/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/qwertykeys/qk65/solder/rules.mk rename keyboards/rabbit/rabbit68/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/rabbit/rabbit68/rules.mk rename keyboards/rad/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/rad/rules.mk rename keyboards/rainkeebs/delilah/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/rainkeebs/delilah/rules.mk rename keyboards/rainkeebs/rainkeeb/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/rainkeebs/rainkeeb/rules.mk rename keyboards/rainkeebs/yasui/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/rainkeebs/yasui/rules.mk rename keyboards/rart/rart45/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/rart/rart45/rules.mk rename keyboards/rart/rart4x4/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/rart/rart4x4/rules.mk rename keyboards/rart/rart67/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/rart/rart67/rules.mk rename keyboards/rart/rart67m/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/rart/rart67m/rules.mk rename keyboards/rart/rart75/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/rart/rart75/rules.mk rename keyboards/rart/rart75m/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/rart/rart75m/rules.mk rename keyboards/rart/rartand/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/rart/rartand/rules.mk rename keyboards/rart/rartlice/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/rart/rartlice/rules.mk rename keyboards/rart/rartlite/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/rart/rartlite/rules.mk rename keyboards/rart/rartpad/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/rart/rartpad/rules.mk rename keyboards/rate/pistachio_mp/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/rate/pistachio_mp/rules.mk rename keyboards/rationalist/ratio65_hotswap/rev_a/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/rationalist/ratio65_hotswap/rev_a/rules.mk rename keyboards/rationalist/ratio65_solder/rev_a/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/rationalist/ratio65_solder/rev_a/rules.mk rename keyboards/recompile_keys/mio/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/recompile_keys/mio/rules.mk rename keyboards/rect44/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/rect44/rules.mk rename keyboards/redscarf_i/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/redscarf_i/rules.mk rename keyboards/retro_75/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/retro_75/rules.mk rename keyboards/reversestudio/decadepad/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/reversestudio/decadepad/rules.mk rename keyboards/reviung/reviung33/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/reviung/reviung33/rules.mk rename keyboards/reviung/reviung34/{info.json => keyboard.json} (96%) delete mode 100755 keyboards/reviung/reviung34/rules.mk rename keyboards/reviung/reviung39/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/reviung/reviung39/rules.mk rename keyboards/reviung/reviung41/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/reviung/reviung41/rules.mk rename keyboards/reviung/reviung5/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/reviung/reviung5/rules.mk rename keyboards/reviung/reviung53/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/reviung/reviung53/rules.mk rename keyboards/rmi_kb/squishy65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/rmi_kb/squishy65/rules.mk rename keyboards/rmi_kb/squishyfrl/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/rmi_kb/squishyfrl/rules.mk rename keyboards/rmi_kb/squishytkl/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/rmi_kb/squishytkl/rules.mk rename keyboards/rmkeebs/rm_numpad/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/rmkeebs/rm_numpad/rules.mk rename keyboards/rominronin/katana60/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/rominronin/katana60/rev1/rules.mk rename keyboards/rominronin/katana60/rev2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/rominronin/katana60/rev2/rules.mk rename keyboards/roseslite/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/roseslite/rules.mk rename keyboards/rotor/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/rotor/rules.mk rename keyboards/rotr/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/rotr/rules.mk rename keyboards/runes/skjoldr/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/runes/skjoldr/rules.mk rename keyboards/runes/vaengr/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/runes/vaengr/rules.mk rename keyboards/ryanbaekr/rb1/{info.json => keyboard.json} (73%) delete mode 100644 keyboards/ryanbaekr/rb1/rules.mk rename keyboards/ryanbaekr/rb18/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/ryanbaekr/rb18/rules.mk rename keyboards/ryanbaekr/rb69/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/ryanbaekr/rb69/rules.mk rename keyboards/ryanbaekr/rb86/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ryanbaekr/rb86/rules.mk rename keyboards/ryanbaekr/rb87/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ryanbaekr/rb87/rules.mk rename keyboards/ryloo_studio/m0110/{info.json => keyboard.json} (98%) delete mode 100755 keyboards/ryloo_studio/m0110/rules.mk diff --git a/keyboards/ocean/addon/info.json b/keyboards/ocean/addon/keyboard.json similarity index 93% rename from keyboards/ocean/addon/info.json rename to keyboards/ocean/addon/keyboard.json index 6fbd4c1b074..b7502a28b69 100644 --- a/keyboards/ocean/addon/info.json +++ b/keyboards/ocean/addon/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/ocean/addon/rules.mk b/keyboards/ocean/addon/rules.mk deleted file mode 100644 index fd62cad1658..00000000000 --- a/keyboards/ocean/addon/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 = 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/ocean/gin_v2/info.json b/keyboards/ocean/gin_v2/keyboard.json similarity index 95% rename from keyboards/ocean/gin_v2/info.json rename to keyboards/ocean/gin_v2/keyboard.json index b5e7cdddd7d..b6f22b813b3 100644 --- a/keyboards/ocean/gin_v2/info.json +++ b/keyboards/ocean/gin_v2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/ocean/gin_v2/rules.mk b/keyboards/ocean/gin_v2/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/ocean/gin_v2/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 = 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/ocean/slamz/info.json b/keyboards/ocean/slamz/keyboard.json similarity index 93% rename from keyboards/ocean/slamz/info.json rename to keyboards/ocean/slamz/keyboard.json index a1a95aca60e..67120777632 100644 --- a/keyboards/ocean/slamz/info.json +++ b/keyboards/ocean/slamz/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7"], "rows": ["D2", "D1", "D0", "D4"] diff --git a/keyboards/ocean/slamz/rules.mk b/keyboards/ocean/slamz/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/ocean/slamz/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 = 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/ocean/stealth/info.json b/keyboards/ocean/stealth/keyboard.json similarity index 78% rename from keyboards/ocean/stealth/info.json rename to keyboards/ocean/stealth/keyboard.json index fcb08b0ca61..b094a5f4bf3 100644 --- a/keyboards/ocean/stealth/info.json +++ b/keyboards/ocean/stealth/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D4", "C6"], "rows": ["D1"] diff --git a/keyboards/ocean/stealth/rules.mk b/keyboards/ocean/stealth/rules.mk deleted file mode 100644 index d65d32df0aa..00000000000 --- a/keyboards/ocean/stealth/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 = 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 \ No newline at end of file diff --git a/keyboards/ocean/sus/info.json b/keyboards/ocean/sus/keyboard.json similarity index 85% rename from keyboards/ocean/sus/info.json rename to keyboards/ocean/sus/keyboard.json index bb9b8c501c4..ea2b1e326a1 100644 --- a/keyboards/ocean/sus/info.json +++ b/keyboards/ocean/sus/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "D4", "D0"], "rows": ["B5", "B4", "E6", "D7"] diff --git a/keyboards/ocean/sus/rules.mk b/keyboards/ocean/sus/rules.mk deleted file mode 100644 index 75b0df17a21..00000000000 --- a/keyboards/ocean/sus/rules.mk +++ /dev/null @@ -1,12 +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 -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 \ No newline at end of file diff --git a/keyboards/ocean/wang_ergo/info.json b/keyboards/ocean/wang_ergo/keyboard.json similarity index 96% rename from keyboards/ocean/wang_ergo/info.json rename to keyboards/ocean/wang_ergo/keyboard.json index c09340a92f0..5debc4396dd 100644 --- a/keyboards/ocean/wang_ergo/info.json +++ b/keyboards/ocean/wang_ergo/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/ocean/wang_ergo/rules.mk b/keyboards/ocean/wang_ergo/rules.mk deleted file mode 100644 index d65d32df0aa..00000000000 --- a/keyboards/ocean/wang_ergo/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 = 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 \ No newline at end of file diff --git a/keyboards/ocean/wang_v2/info.json b/keyboards/ocean/wang_v2/keyboard.json similarity index 94% rename from keyboards/ocean/wang_v2/info.json rename to keyboards/ocean/wang_v2/keyboard.json index 93591d28c3e..6e80932ce2e 100644 --- a/keyboards/ocean/wang_v2/info.json +++ b/keyboards/ocean/wang_v2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "D3"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/ocean/wang_v2/rules.mk b/keyboards/ocean/wang_v2/rules.mk deleted file mode 100644 index 75b0df17a21..00000000000 --- a/keyboards/ocean/wang_v2/rules.mk +++ /dev/null @@ -1,12 +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 -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 \ No newline at end of file diff --git a/keyboards/ocean/yuri/info.json b/keyboards/ocean/yuri/keyboard.json similarity index 95% rename from keyboards/ocean/yuri/info.json rename to keyboards/ocean/yuri/keyboard.json index 3ed5df87460..6542de2cdae 100644 --- a/keyboards/ocean/yuri/info.json +++ b/keyboards/ocean/yuri/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/ocean/yuri/rules.mk b/keyboards/ocean/yuri/rules.mk deleted file mode 100644 index fd62cad1658..00000000000 --- a/keyboards/ocean/yuri/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 = 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/odelia/info.json b/keyboards/odelia/keyboard.json similarity index 97% rename from keyboards/odelia/info.json rename to keyboards/odelia/keyboard.json index 6208e2da1ea..3c187b5c18d 100644 --- a/keyboards/odelia/info.json +++ b/keyboards/odelia/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xA129", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B5", "B4", "D7", "D6", "E6", "D0", "D1", "D2", "D3", "D5"], "rows": ["B3", "B7", "B1", "B2", "B0", "F4", "F0", "F1", "D4", "B6"] diff --git a/keyboards/odelia/rules.mk b/keyboards/odelia/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/odelia/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 = 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/ok60/info.json b/keyboards/ok60/keyboard.json similarity index 98% rename from keyboards/ok60/info.json rename to keyboards/ok60/keyboard.json index a8a345824ce..f6459907bea 100644 --- a/keyboards/ok60/info.json +++ b/keyboards/ok60/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "B6", "C6", "C7", "F1", "F0", "E6", "B3", "B2", "B1", "B0"], "rows": ["B5", "B4", "D7", "D6", "D4"] diff --git a/keyboards/ok60/rules.mk b/keyboards/ok60/rules.mk deleted file mode 100644 index ed7a8ea0312..00000000000 --- a/keyboards/ok60/rules.mk +++ /dev/null @@ -1,11 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable the RGB backlight diff --git a/keyboards/onekeyco/dango40/info.json b/keyboards/onekeyco/dango40/keyboard.json similarity index 97% rename from keyboards/onekeyco/dango40/info.json rename to keyboards/onekeyco/dango40/keyboard.json index c9087c630a2..8a41f253253 100644 --- a/keyboards/onekeyco/dango40/info.json +++ b/keyboards/onekeyco/dango40/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xE9B9", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C7", "B0"], "rows": ["F4", "F1", "F0", "C6"] diff --git a/keyboards/onekeyco/dango40/rules.mk b/keyboards/onekeyco/dango40/rules.mk deleted file mode 100644 index 614384dd3c7..00000000000 --- a/keyboards/onekeyco/dango40/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable encoder \ No newline at end of file diff --git a/keyboards/orange75/info.json b/keyboards/orange75/keyboard.json similarity index 96% rename from keyboards/orange75/info.json rename to keyboards/orange75/keyboard.json index 59665c2cb0f..4208cc0f586 100644 --- a/keyboards/orange75/info.json +++ b/keyboards/orange75/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "B7", "B3"], "rows": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B4", "D7", "D4", "D5", "D6"] diff --git a/keyboards/orange75/rules.mk b/keyboards/orange75/rules.mk deleted file mode 100644 index e0fca34fa1e..00000000000 --- a/keyboards/orange75/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 = 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 diff --git a/keyboards/org60/info.json b/keyboards/org60/keyboard.json similarity index 97% rename from keyboards/org60/info.json rename to keyboards/org60/keyboard.json index 2e459975249..d4994346af2 100644 --- a/keyboards/org60/info.json +++ b/keyboards/org60/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/org60/rules.mk b/keyboards/org60/rules.mk deleted file mode 100644 index d22d1cd2f42..00000000000 --- a/keyboards/org60/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -AUDIO_ENABLE = no # Audio output -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -COMMAND_ENABLE = no # Commands for debug and configuration -CONSOLE_ENABLE = no # Console for debug -EXTRAKEY_ENABLE = yes # Audio control and System control -MOUSEKEY_ENABLE = yes # Mouse keys -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/ortho5by12/info.json b/keyboards/ortho5by12/keyboard.json similarity index 97% rename from keyboards/ortho5by12/info.json rename to keyboards/ortho5by12/keyboard.json index a107275b18c..c45788ba2fe 100644 --- a/keyboards/ortho5by12/info.json +++ b/keyboards/ortho5by12/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x27DB", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C2", "D0", "D1", "D4", "C3", "C1"], "rows": ["B5", "B1", "B2", "B3", "B4", "C0", "D5", "D6", "D7", "B0"] diff --git a/keyboards/ortho5by12/rules.mk b/keyboards/ortho5by12/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/ortho5by12/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/owlab/jelly_epoch/hotswap/info.json b/keyboards/owlab/jelly_epoch/hotswap/keyboard.json similarity index 96% rename from keyboards/owlab/jelly_epoch/hotswap/info.json rename to keyboards/owlab/jelly_epoch/hotswap/keyboard.json index 0cf09660cab..38db4c965b3 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/info.json +++ b/keyboards/owlab/jelly_epoch/hotswap/keyboard.json @@ -9,6 +9,15 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "B11", "B8", "B9", "C13"], "rows": ["B0", "B1", "B2", "B3", "A15", "B10"] diff --git a/keyboards/owlab/jelly_epoch/hotswap/rules.mk b/keyboards/owlab/jelly_epoch/hotswap/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/owlab/jelly_epoch/hotswap/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/owlab/jelly_epoch/soldered/info.json b/keyboards/owlab/jelly_epoch/soldered/keyboard.json similarity index 98% rename from keyboards/owlab/jelly_epoch/soldered/info.json rename to keyboards/owlab/jelly_epoch/soldered/keyboard.json index 4337922ee05..5a12cdf0e9e 100644 --- a/keyboards/owlab/jelly_epoch/soldered/info.json +++ b/keyboards/owlab/jelly_epoch/soldered/keyboard.json @@ -9,6 +9,15 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "B11", "B8", "B9", "C13"], "rows": ["B0", "B1", "B2", "B3", "A15", "B10"] diff --git a/keyboards/owlab/jelly_epoch/soldered/rules.mk b/keyboards/owlab/jelly_epoch/soldered/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/owlab/jelly_epoch/soldered/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/keyboard.json similarity index 96% rename from keyboards/owlab/spring/info.json rename to keyboards/owlab/spring/keyboard.json index f55f08addc5..7dcb6ec717b 100644 --- a/keyboards/owlab/spring/info.json +++ b/keyboards/owlab/spring/keyboard.json @@ -9,6 +9,15 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F4", "F7", "F6", "F5", "F1", "F0"], "rows": ["B0", "B7", "D0", "D1", "D2"] diff --git a/keyboards/owlab/spring/rules.mk b/keyboards/owlab/spring/rules.mk deleted file mode 100644 index bc48e6b5bb1..00000000000 --- a/keyboards/owlab/spring/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 = 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 \ No newline at end of file diff --git a/keyboards/owlab/suit80/ansi/info.json b/keyboards/owlab/suit80/ansi/keyboard.json similarity index 97% rename from keyboards/owlab/suit80/ansi/info.json rename to keyboards/owlab/suit80/ansi/keyboard.json index fcce6c6fb60..22bf9f78cd2 100644 --- a/keyboards/owlab/suit80/ansi/info.json +++ b/keyboards/owlab/suit80/ansi/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F4", "F7", "F6", "F5", "F1", "F0"], "rows": ["E6", "B0", "B7", "D0", "D1", "D2"] diff --git a/keyboards/owlab/suit80/ansi/rules.mk b/keyboards/owlab/suit80/ansi/rules.mk deleted file mode 100644 index d65d32df0aa..00000000000 --- a/keyboards/owlab/suit80/ansi/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 = 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 \ No newline at end of file diff --git a/keyboards/owlab/suit80/iso/info.json b/keyboards/owlab/suit80/iso/keyboard.json similarity index 98% rename from keyboards/owlab/suit80/iso/info.json rename to keyboards/owlab/suit80/iso/keyboard.json index dc571071671..87e95e9beed 100644 --- a/keyboards/owlab/suit80/iso/info.json +++ b/keyboards/owlab/suit80/iso/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F4", "F7", "F6", "F5", "F1", "F0"], "rows": ["E6", "B0", "B7", "D0", "D1", "D2"] diff --git a/keyboards/owlab/suit80/iso/rules.mk b/keyboards/owlab/suit80/iso/rules.mk deleted file mode 100644 index d65d32df0aa..00000000000 --- a/keyboards/owlab/suit80/iso/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 = 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 \ No newline at end of file diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/keyboard.json similarity index 96% rename from keyboards/owlab/voice65/hotswap/info.json rename to keyboards/owlab/voice65/hotswap/keyboard.json index d32b74cfcbf..088cde40016 100644 --- a/keyboards/owlab/voice65/hotswap/info.json +++ b/keyboards/owlab/voice65/hotswap/keyboard.json @@ -64,6 +64,17 @@ "max_brightness": 200, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A15", "B8", "B9", "B12", "B13"], "rows": ["B0", "B1", "B2", "B10", "B11"] diff --git a/keyboards/owlab/voice65/hotswap/rules.mk b/keyboards/owlab/voice65/hotswap/rules.mk deleted file mode 100644 index aa5f4750337..00000000000 --- a/keyboards/owlab/voice65/hotswap/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Rotary encoder - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/keyboard.json similarity index 99% rename from keyboards/owlab/voice65/soldered/info.json rename to keyboards/owlab/voice65/soldered/keyboard.json index 4cae769a947..7aab520f761 100644 --- a/keyboards/owlab/voice65/soldered/info.json +++ b/keyboards/owlab/voice65/soldered/keyboard.json @@ -64,6 +64,17 @@ "max_brightness": 200, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A15", "B8", "B9", "B12", "B13"], "rows": ["B0", "B1", "B2", "B10", "B11"] diff --git a/keyboards/owlab/voice65/soldered/rules.mk b/keyboards/owlab/voice65/soldered/rules.mk deleted file mode 100644 index aa5f4750337..00000000000 --- a/keyboards/owlab/voice65/soldered/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Rotary encoder - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/p3d/eu_isolation/info.json b/keyboards/p3d/eu_isolation/keyboard.json similarity index 97% rename from keyboards/p3d/eu_isolation/info.json rename to keyboards/p3d/eu_isolation/keyboard.json index f181418cf0e..a94ee990ad2 100644 --- a/keyboards/p3d/eu_isolation/info.json +++ b/keyboards/p3d/eu_isolation/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4373", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], "rows": ["D2", "D3", "F1", "F0"] diff --git a/keyboards/p3d/eu_isolation/rules.mk b/keyboards/p3d/eu_isolation/rules.mk deleted file mode 100644 index 20825c8cfa6..00000000000 --- a/keyboards/p3d/eu_isolation/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/p3d/glitch/info.json b/keyboards/p3d/glitch/keyboard.json similarity index 97% rename from keyboards/p3d/glitch/info.json rename to keyboards/p3d/glitch/keyboard.json index e7858124e2f..366707f807d 100644 --- a/keyboards/p3d/glitch/info.json +++ b/keyboards/p3d/glitch/keyboard.json @@ -9,6 +9,17 @@ "device_version": "0.0.1", "max_power": 400 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B2", "D2", "B3", "B7", "F5", "F4", "F1", "F0"], "rows": ["D5", "D6", "B6", "D7", "C7", "B4", "B5", "D3", "D4", "C6"] diff --git a/keyboards/p3d/glitch/rules.mk b/keyboards/p3d/glitch/rules.mk deleted file mode 100644 index 65ecff135b0..00000000000 --- a/keyboards/p3d/glitch/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/p3d/q4z/info.json b/keyboards/p3d/q4z/keyboard.json similarity index 94% rename from keyboards/p3d/q4z/info.json rename to keyboards/p3d/q4z/keyboard.json index dc02296131b..0b71df61b3a 100644 --- a/keyboards/p3d/q4z/info.json +++ b/keyboards/p3d/q4z/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], "rows": ["F4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/p3d/q4z/rules.mk b/keyboards/p3d/q4z/rules.mk deleted file mode 100644 index 6d3709762d5..00000000000 --- a/keyboards/p3d/q4z/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 = 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/p3d/spacey/info.json b/keyboards/p3d/spacey/keyboard.json similarity index 95% rename from keyboards/p3d/spacey/info.json rename to keyboards/p3d/spacey/keyboard.json index 289eff730ff..d51e1dc32ca 100644 --- a/keyboards/p3d/spacey/info.json +++ b/keyboards/p3d/spacey/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x2045", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D5", "B7", "B5", "B4", "E6", "D7", "C7", "B3", "B2", "B6", "F0", "F1", "B1", "F7"], "rows": ["D4", "C6", "F6", "F5", "F4"] diff --git a/keyboards/p3d/spacey/rules.mk b/keyboards/p3d/spacey/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/p3d/spacey/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/p3d/synapse/info.json b/keyboards/p3d/synapse/keyboard.json similarity index 96% rename from keyboards/p3d/synapse/info.json rename to keyboards/p3d/synapse/keyboard.json index 85659dc8a5b..277be632a5a 100644 --- a/keyboards/p3d/synapse/info.json +++ b/keyboards/p3d/synapse/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x5359", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "D4", "F5", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "B6"], "rows": ["E6", "B0", "F4", "F1"] diff --git a/keyboards/p3d/synapse/rules.mk b/keyboards/p3d/synapse/rules.mk deleted file mode 100644 index ebe0d0e0e32..00000000000 --- a/keyboards/p3d/synapse/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/p3d/tw40/info.json b/keyboards/p3d/tw40/keyboard.json similarity index 99% rename from keyboards/p3d/tw40/info.json rename to keyboards/p3d/tw40/keyboard.json index 79f3d7fbaaf..356b610b2a5 100644 --- a/keyboards/p3d/tw40/info.json +++ b/keyboards/p3d/tw40/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "E6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B0", "D5", "D3", "D2"] diff --git a/keyboards/p3d/tw40/rules.mk b/keyboards/p3d/tw40/rules.mk deleted file mode 100644 index 2eba275490a..00000000000 --- a/keyboards/p3d/tw40/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/pabile/p18/info.json b/keyboards/pabile/p18/keyboard.json similarity index 88% rename from keyboards/pabile/p18/info.json rename to keyboards/pabile/p18/keyboard.json index 3e8a2b68640..4bc6047ec06 100644 --- a/keyboards/pabile/p18/info.json +++ b/keyboards/pabile/p18/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6668", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "unicode": true + }, "matrix_pins": { "cols": ["D2", "D7", "E6", "B4", "B5"], "rows": ["D1", "D0", "D4", "C6"] diff --git a/keyboards/pabile/p18/rules.mk b/keyboards/pabile/p18/rules.mk deleted file mode 100644 index 9d58ddf3057..00000000000 --- a/keyboards/pabile/p18/rules.mk +++ /dev/null @@ -1,15 +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 -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 # Unicode -IOS_DEVICE_ENABLE = no # connect to IOS Device -ENCODER_ENABLE = yes diff --git a/keyboards/pabile/p20/ver1/info.json b/keyboards/pabile/p20/ver1/keyboard.json similarity index 91% rename from keyboards/pabile/p20/ver1/info.json rename to keyboards/pabile/p20/ver1/keyboard.json index 07fce7c5f5d..e909617faa7 100644 --- a/keyboards/pabile/p20/ver1/info.json +++ b/keyboards/pabile/p20/ver1/keyboard.json @@ -3,6 +3,16 @@ "usb": { "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "unicode": true + }, "matrix_pins": { "cols": ["D0", "B2", "D4", "B6"], "rows": ["B3", "B4", "B5", "D7", "E6"] diff --git a/keyboards/pabile/p20/ver1/rules.mk b/keyboards/pabile/p20/ver1/rules.mk deleted file mode 100644 index 8341cf19a2a..00000000000 --- a/keyboards/pabile/p20/ver1/rules.mk +++ /dev/null @@ -1,16 +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 -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 # Unicode -IOS_DEVICE_ENABLE = no # connect to IOS Device -ENCODER_ENABLE = yes diff --git a/keyboards/pabile/p20/ver2/info.json b/keyboards/pabile/p20/ver2/keyboard.json similarity index 92% rename from keyboards/pabile/p20/ver2/info.json rename to keyboards/pabile/p20/ver2/keyboard.json index 35a0dc8ec2c..b6688d870eb 100644 --- a/keyboards/pabile/p20/ver2/info.json +++ b/keyboards/pabile/p20/ver2/keyboard.json @@ -3,6 +3,15 @@ "usb": { "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "unicode": true + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "B2"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/pabile/p20/ver2/rules.mk b/keyboards/pabile/p20/ver2/rules.mk deleted file mode 100644 index 58a67089140..00000000000 --- a/keyboards/pabile/p20/ver2/rules.mk +++ /dev/null @@ -1,16 +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 -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 # Unicode -IOS_DEVICE_ENABLE = no # connect to IOS Device -ENCODER_ENABLE = no diff --git a/keyboards/pabile/p40/info.json b/keyboards/pabile/p40/keyboard.json similarity index 93% rename from keyboards/pabile/p40/info.json rename to keyboards/pabile/p40/keyboard.json index 4087cb2ef2b..980da54a06a 100644 --- a/keyboards/pabile/p40/info.json +++ b/keyboards/pabile/p40/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6666", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["F6", "B3", "B2", "B6"] diff --git a/keyboards/pabile/p40/rules.mk b/keyboards/pabile/p40/rules.mk deleted file mode 100644 index 9871ad5be73..00000000000 --- a/keyboards/pabile/p40/rules.mk +++ /dev/null @@ -1,14 +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 -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 -UNICODE_ENABLE = yes # Unicode -IOS_DEVICE_ENABLE = no # connect to IOS Device diff --git a/keyboards/pabile/p40_ortho/info.json b/keyboards/pabile/p40_ortho/keyboard.json similarity index 95% rename from keyboards/pabile/p40_ortho/info.json rename to keyboards/pabile/p40_ortho/keyboard.json index 30c1a0f508e..305c0ad3312 100644 --- a/keyboards/pabile/p40_ortho/info.json +++ b/keyboards/pabile/p40_ortho/keyboard.json @@ -7,6 +7,15 @@ "pid": "0x6669", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B2", "B3", "B1", "F7", "F6"], "rows": ["D1", "D0", "F4", "F5"] diff --git a/keyboards/pabile/p40_ortho/rules.mk b/keyboards/pabile/p40_ortho/rules.mk deleted file mode 100644 index 9871ad5be73..00000000000 --- a/keyboards/pabile/p40_ortho/rules.mk +++ /dev/null @@ -1,14 +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 -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 -UNICODE_ENABLE = yes # Unicode -IOS_DEVICE_ENABLE = no # connect to IOS Device diff --git a/keyboards/pabile/p42/info.json b/keyboards/pabile/p42/keyboard.json similarity index 93% rename from keyboards/pabile/p42/info.json rename to keyboards/pabile/p42/keyboard.json index de6df45e90c..70dcb097444 100644 --- a/keyboards/pabile/p42/info.json +++ b/keyboards/pabile/p42/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6670", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5", "D2", "D3", "F7", "B1", "B3", "B2", "B6"], "rows": ["D1", "D0", "D4", "C6"] diff --git a/keyboards/pabile/p42/rules.mk b/keyboards/pabile/p42/rules.mk deleted file mode 100644 index 9871ad5be73..00000000000 --- a/keyboards/pabile/p42/rules.mk +++ /dev/null @@ -1,14 +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 -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 -UNICODE_ENABLE = yes # Unicode -IOS_DEVICE_ENABLE = no # connect to IOS Device diff --git a/keyboards/panc40/info.json b/keyboards/panc40/keyboard.json similarity index 97% rename from keyboards/panc40/info.json rename to keyboards/panc40/keyboard.json index c5f50057b69..c1867903f9a 100644 --- a/keyboards/panc40/info.json +++ b/keyboards/panc40/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "D2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D0", "D1"], "rows": ["F0", "F1", "F4", "F5"] diff --git a/keyboards/panc40/rules.mk b/keyboards/panc40/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/panc40/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 = 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/panc60/info.json b/keyboards/panc60/keyboard.json similarity index 98% rename from keyboards/panc60/info.json rename to keyboards/panc60/keyboard.json index 1a967727cef..e0f3a491c89 100644 --- a/keyboards/panc60/info.json +++ b/keyboards/panc60/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/panc60/rules.mk b/keyboards/panc60/rules.mk deleted file mode 100644 index 4a44d3a5476..00000000000 --- a/keyboards/panc60/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = no -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/papercranekeyboards/gerald65/info.json b/keyboards/papercranekeyboards/gerald65/keyboard.json similarity index 96% rename from keyboards/papercranekeyboards/gerald65/info.json rename to keyboards/papercranekeyboards/gerald65/keyboard.json index 533c50a76c3..1d2c8d40ae2 100644 --- a/keyboards/papercranekeyboards/gerald65/info.json +++ b/keyboards/papercranekeyboards/gerald65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1501", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D7", "D4", "D3", "D2", "D1", "D0", "B6", "C6", "C7"], "rows": ["B7", "D6", "E6", "B4", "B5"] diff --git a/keyboards/papercranekeyboards/gerald65/rules.mk b/keyboards/papercranekeyboards/gerald65/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/papercranekeyboards/gerald65/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 = 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/parallel/parallel_65/hotswap/info.json b/keyboards/parallel/parallel_65/hotswap/keyboard.json similarity index 97% rename from keyboards/parallel/parallel_65/hotswap/info.json rename to keyboards/parallel/parallel_65/hotswap/keyboard.json index e3159e61867..1f59cd5734c 100644 --- a/keyboards/parallel/parallel_65/hotswap/info.json +++ b/keyboards/parallel/parallel_65/hotswap/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x5069", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/parallel/parallel_65/hotswap/rules.mk b/keyboards/parallel/parallel_65/hotswap/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/parallel/parallel_65/hotswap/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 = 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/parallel/parallel_65/soldered/info.json b/keyboards/parallel/parallel_65/soldered/keyboard.json similarity index 99% rename from keyboards/parallel/parallel_65/soldered/info.json rename to keyboards/parallel/parallel_65/soldered/keyboard.json index 2b82c13819c..fe87fb84449 100644 --- a/keyboards/parallel/parallel_65/soldered/info.json +++ b/keyboards/parallel/parallel_65/soldered/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x5068", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/parallel/parallel_65/soldered/rules.mk b/keyboards/parallel/parallel_65/soldered/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/parallel/parallel_65/soldered/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 = 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/pdxkbc/info.json b/keyboards/pdxkbc/keyboard.json similarity index 82% rename from keyboards/pdxkbc/info.json rename to keyboards/pdxkbc/keyboard.json index 8fe7db4c23a..2585c7ab389 100644 --- a/keyboards/pdxkbc/info.json +++ b/keyboards/pdxkbc/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "E6"], "rows": ["F7", "B6", "F4"] diff --git a/keyboards/pdxkbc/rules.mk b/keyboards/pdxkbc/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/pdxkbc/rules.mk +++ /dev/null @@ -1,12 +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 -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/pearl/info.json b/keyboards/pearl/keyboard.json similarity index 97% rename from keyboards/pearl/info.json rename to keyboards/pearl/keyboard.json index cf090b95872..60c5bb3a375 100644 --- a/keyboards/pearl/info.json +++ b/keyboards/pearl/keyboard.json @@ -7,6 +7,16 @@ "pid": "0x0348", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/pearl/rules.mk b/keyboards/pearl/rules.mk deleted file mode 100644 index 51df0b642e1..00000000000 --- a/keyboards/pearl/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/peej/lumberjack/info.json b/keyboards/peej/lumberjack/keyboard.json similarity index 95% rename from keyboards/peej/lumberjack/info.json rename to keyboards/peej/lumberjack/keyboard.json index 83b4a6e6c22..c94cb008be8 100644 --- a/keyboards/peej/lumberjack/info.json +++ b/keyboards/peej/lumberjack/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "D7", "D6", "D5", "D4", "D1", "D0", "C1", "C2", "C3"], "rows": ["C0", "B5", "B4", "B3", "B2", "B1"] diff --git a/keyboards/peej/lumberjack/rules.mk b/keyboards/peej/lumberjack/rules.mk deleted file mode 100644 index 59c896dbff6..00000000000 --- a/keyboards/peej/lumberjack/rules.mk +++ /dev/null @@ -1,12 +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 -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/pegasus/info.json b/keyboards/pegasus/keyboard.json similarity index 96% rename from keyboards/pegasus/info.json rename to keyboards/pegasus/keyboard.json index 29b99c8e25c..d5d2172ee0d 100644 --- a/keyboards/pegasus/info.json +++ b/keyboards/pegasus/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D2", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5"], "rows": ["F0", "F1", "F4", "E6"] diff --git a/keyboards/pegasus/rules.mk b/keyboards/pegasus/rules.mk deleted file mode 100644 index 0334a51bb5b..00000000000 --- a/keyboards/pegasus/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/percent/canoe/info.json b/keyboards/percent/canoe/keyboard.json similarity index 98% rename from keyboards/percent/canoe/info.json rename to keyboards/percent/canoe/keyboard.json index a1fc705561c..656f73f904b 100644 --- a/keyboards/percent/canoe/info.json +++ b/keyboards/percent/canoe/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x434E", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/percent/canoe/rules.mk b/keyboards/percent/canoe/rules.mk deleted file mode 100644 index 6b0cec85a44..00000000000 --- a/keyboards/percent/canoe/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/percent/skog/info.json b/keyboards/percent/skog/keyboard.json similarity index 96% rename from keyboards/percent/skog/info.json rename to keyboards/percent/skog/keyboard.json index 4ba43d6c04c..823c1638acd 100644 --- a/keyboards/percent/skog/info.json +++ b/keyboards/percent/skog/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2"], "rows": ["B0", "B1", "B2", "B3", "B5", "B6", "B7"] diff --git a/keyboards/percent/skog/rules.mk b/keyboards/percent/skog/rules.mk deleted file mode 100644 index 6b0cec85a44..00000000000 --- a/keyboards/percent/skog/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/percent/skog_lite/info.json b/keyboards/percent/skog_lite/keyboard.json similarity index 98% rename from keyboards/percent/skog_lite/info.json rename to keyboards/percent/skog_lite/keyboard.json index ed75e8ae2b8..e52d910845a 100644 --- a/keyboards/percent/skog_lite/info.json +++ b/keyboards/percent/skog_lite/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C4", "C2", "D7", "C7", "C6", "A0", "A1", "A2", "A3", "A7", "A6", "A4", "A5", "C5", "C3"], "rows": ["B0", "B1", "B2", "B3", "B4", "B6", "B5"] diff --git a/keyboards/percent/skog_lite/rules.mk b/keyboards/percent/skog_lite/rules.mk deleted file mode 100644 index 747ea2aae3c..00000000000 --- a/keyboards/percent/skog_lite/rules.mk +++ /dev/null @@ -1,10 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/phantom/info.json b/keyboards/phantom/keyboard.json similarity index 99% rename from keyboards/phantom/info.json rename to keyboards/phantom/keyboard.json index 0d52fb38d06..ab794b40f09 100644 --- a/keyboards/phantom/info.json +++ b/keyboards/phantom/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5B50", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"], "rows": ["B5", "B4", "B3", "B2", "B1", "B0"] diff --git a/keyboards/phantom/rules.mk b/keyboards/phantom/rules.mk deleted file mode 100644 index ab9ede17169..00000000000 --- a/keyboards/phantom/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 = 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/phrygian/ph100/info.json b/keyboards/phrygian/ph100/keyboard.json similarity index 97% rename from keyboards/phrygian/ph100/info.json rename to keyboards/phrygian/ph100/keyboard.json index f33081284ef..3d0c611862c 100644 --- a/keyboards/phrygian/ph100/info.json +++ b/keyboards/phrygian/ph100/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0C61", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9"] diff --git a/keyboards/phrygian/ph100/rules.mk b/keyboards/phrygian/ph100/rules.mk deleted file mode 100644 index 5fb302d01f1..00000000000 --- a/keyboards/phrygian/ph100/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/picolab/frusta_fundamental/info.json b/keyboards/picolab/frusta_fundamental/keyboard.json similarity index 96% rename from keyboards/picolab/frusta_fundamental/info.json rename to keyboards/picolab/frusta_fundamental/keyboard.json index bd73d2b77fe..6a47fb13272 100644 --- a/keyboards/picolab/frusta_fundamental/info.json +++ b/keyboards/picolab/frusta_fundamental/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "B0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7", "D5", "D3", "D2", "D1", "D0"], "rows": ["D4", "D6", "D7", "B4", "B5"] diff --git a/keyboards/picolab/frusta_fundamental/rules.mk b/keyboards/picolab/frusta_fundamental/rules.mk deleted file mode 100644 index 866703c96e3..00000000000 --- a/keyboards/picolab/frusta_fundamental/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 = 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 \ No newline at end of file diff --git a/keyboards/pimentoso/paddino02/rev1/info.json b/keyboards/pimentoso/paddino02/rev1/keyboard.json similarity index 85% rename from keyboards/pimentoso/paddino02/rev1/info.json rename to keyboards/pimentoso/paddino02/rev1/keyboard.json index 1ee1a11399f..681cbff9261 100644 --- a/keyboards/pimentoso/paddino02/rev1/info.json +++ b/keyboards/pimentoso/paddino02/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0020", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["D1", "D0", "D4"] diff --git a/keyboards/pimentoso/paddino02/rev1/rules.mk b/keyboards/pimentoso/paddino02/rev1/rules.mk deleted file mode 100644 index 21bcb26f658..00000000000 --- a/keyboards/pimentoso/paddino02/rev1/rules.mk +++ /dev/null @@ -1,14 +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 -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 - -KEY_LOCK_ENABLE = no # Allows locking any key. diff --git a/keyboards/pimentoso/paddino02/rev2/left/info.json b/keyboards/pimentoso/paddino02/rev2/left/keyboard.json similarity index 85% rename from keyboards/pimentoso/paddino02/rev2/left/info.json rename to keyboards/pimentoso/paddino02/rev2/left/keyboard.json index f297903f680..30be3a3836e 100644 --- a/keyboards/pimentoso/paddino02/rev2/left/info.json +++ b/keyboards/pimentoso/paddino02/rev2/left/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0021", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["D0", "D4", "D1"] diff --git a/keyboards/pimentoso/paddino02/rev2/left/rules.mk b/keyboards/pimentoso/paddino02/rev2/left/rules.mk deleted file mode 100755 index 21bcb26f658..00000000000 --- a/keyboards/pimentoso/paddino02/rev2/left/rules.mk +++ /dev/null @@ -1,14 +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 -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 - -KEY_LOCK_ENABLE = no # Allows locking any key. diff --git a/keyboards/pimentoso/paddino02/rev2/right/info.json b/keyboards/pimentoso/paddino02/rev2/right/keyboard.json similarity index 85% rename from keyboards/pimentoso/paddino02/rev2/right/info.json rename to keyboards/pimentoso/paddino02/rev2/right/keyboard.json index 385ee96af91..b4021c076de 100644 --- a/keyboards/pimentoso/paddino02/rev2/right/info.json +++ b/keyboards/pimentoso/paddino02/rev2/right/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0022", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1"], "rows": ["F4", "F6", "F5"] diff --git a/keyboards/pimentoso/paddino02/rev2/right/rules.mk b/keyboards/pimentoso/paddino02/rev2/right/rules.mk deleted file mode 100755 index 21bcb26f658..00000000000 --- a/keyboards/pimentoso/paddino02/rev2/right/rules.mk +++ /dev/null @@ -1,14 +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 -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 - -KEY_LOCK_ENABLE = no # Allows locking any key. diff --git a/keyboards/pimentoso/touhoupad/info.json b/keyboards/pimentoso/touhoupad/keyboard.json similarity index 87% rename from keyboards/pimentoso/touhoupad/info.json rename to keyboards/pimentoso/touhoupad/keyboard.json index 8baff8f78ed..3e4655abfb9 100644 --- a/keyboards/pimentoso/touhoupad/info.json +++ b/keyboards/pimentoso/touhoupad/keyboard.json @@ -23,6 +23,15 @@ "ws2812": { "pin": "F4" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6"], "rows": ["D4"] diff --git a/keyboards/pimentoso/touhoupad/rules.mk b/keyboards/pimentoso/touhoupad/rules.mk deleted file mode 100644 index aa4c817d2a2..00000000000 --- a/keyboards/pimentoso/touhoupad/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/pixelspace/capsule65i/info.json b/keyboards/pixelspace/capsule65i/keyboard.json similarity index 99% rename from keyboards/pixelspace/capsule65i/info.json rename to keyboards/pixelspace/capsule65i/keyboard.json index d38155349be..d08fd2e355e 100644 --- a/keyboards/pixelspace/capsule65i/info.json +++ b/keyboards/pixelspace/capsule65i/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xE66E", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D5", "D2", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "B3", "B1", "B0", "B2"], "rows": ["F4", "D1", "B7", "D0", "F5"] diff --git a/keyboards/pixelspace/capsule65i/rules.mk b/keyboards/pixelspace/capsule65i/rules.mk deleted file mode 100644 index b5cde0eb87a..00000000000 --- a/keyboards/pixelspace/capsule65i/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/pizzakeyboards/pizza65/info.json b/keyboards/pizzakeyboards/pizza65/keyboard.json similarity index 98% rename from keyboards/pizzakeyboards/pizza65/info.json rename to keyboards/pizzakeyboards/pizza65/keyboard.json index 76ad8fda507..735cae4ac3f 100644 --- a/keyboards/pizzakeyboards/pizza65/info.json +++ b/keyboards/pizzakeyboards/pizza65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x707A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A9", "A8", "F0", "A2", "A3", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A13"], "rows": ["B15", "A10", "F1", "A0", "A1"] diff --git a/keyboards/pizzakeyboards/pizza65/rules.mk b/keyboards/pizzakeyboards/pizza65/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/pizzakeyboards/pizza65/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 = 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/pjb/eros/info.json b/keyboards/pjb/eros/keyboard.json similarity index 99% rename from keyboards/pjb/eros/info.json rename to keyboards/pjb/eros/keyboard.json index e336b9e2f4d..888a6aa02c0 100644 --- a/keyboards/pjb/eros/info.json +++ b/keyboards/pjb/eros/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4552", "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "D4", "D5", "B4", "D3", "D2", "E6", "B3"], "rows": ["B2", "B1", "B0", "D7", "B7", "D1"] diff --git a/keyboards/pjb/eros/rules.mk b/keyboards/pjb/eros/rules.mk deleted file mode 100644 index 12dca933d74..00000000000 --- a/keyboards/pjb/eros/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Enable audio output diff --git a/keyboards/pkb65/info.json b/keyboards/pkb65/keyboard.json similarity index 96% rename from keyboards/pkb65/info.json rename to keyboards/pkb65/keyboard.json index 325970dac8e..7aea7615650 100644 --- a/keyboards/pkb65/info.json +++ b/keyboards/pkb65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["C7", "C6", "B6", "B7", "F0"] diff --git a/keyboards/pkb65/rules.mk b/keyboards/pkb65/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/pkb65/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 = 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/planck/light/info.json b/keyboards/planck/light/keyboard.json similarity index 96% rename from keyboards/planck/light/info.json rename to keyboards/planck/light/keyboard.json index 8fc112664b4..33801562e56 100644 --- a/keyboards/planck/light/info.json +++ b/keyboards/planck/light/keyboard.json @@ -56,6 +56,17 @@ }, "driver": "is31fl3731" }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "midi": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["E6", "E3", "E4", "D3", "D4", "D5", "C0", "A7", "A6", "E1", "E0", "D7"], "rows": ["B0", "E7", "F0", "F1"] diff --git a/keyboards/planck/light/rules.mk b/keyboards/planck/light/rules.mk deleted file mode 100644 index a8efaf98f47..00000000000 --- a/keyboards/planck/light/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 = 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 -MIDI_ENABLE = yes # MIDI support -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/planck/rev1/info.json b/keyboards/planck/rev1/keyboard.json similarity index 97% rename from keyboards/planck/rev1/info.json rename to keyboards/planck/rev1/keyboard.json index 72646ac6bf3..f737781a1c7 100644 --- a/keyboards/planck/rev1/info.json +++ b/keyboards/planck/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xAE01", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D0", "D5", "B5", "B6"] diff --git a/keyboards/planck/rev1/rules.mk b/keyboards/planck/rev1/rules.mk deleted file mode 100644 index 99b86919620..00000000000 --- a/keyboards/planck/rev1/rules.mk +++ /dev/null @@ -1,12 +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 = 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/planck/rev2/info.json b/keyboards/planck/rev2/keyboard.json similarity index 97% rename from keyboards/planck/rev2/info.json rename to keyboards/planck/rev2/keyboard.json index 2bbc5760c23..d10982f357b 100644 --- a/keyboards/planck/rev2/info.json +++ b/keyboards/planck/rev2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xAE01", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D0", "D5", "B5", "B6"] diff --git a/keyboards/planck/rev2/rules.mk b/keyboards/planck/rev2/rules.mk deleted file mode 100644 index 99b86919620..00000000000 --- a/keyboards/planck/rev2/rules.mk +++ /dev/null @@ -1,12 +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 = 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/planck/rev3/info.json b/keyboards/planck/rev3/keyboard.json similarity index 97% rename from keyboards/planck/rev3/info.json rename to keyboards/planck/rev3/keyboard.json index 17f07d58f35..16d2b59a2e7 100644 --- a/keyboards/planck/rev3/info.json +++ b/keyboards/planck/rev3/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xAE01", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D0", "D5", "B5", "B6"] diff --git a/keyboards/planck/rev3/rules.mk b/keyboards/planck/rev3/rules.mk deleted file mode 100644 index 99b86919620..00000000000 --- a/keyboards/planck/rev3/rules.mk +++ /dev/null @@ -1,12 +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 = 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/planck/rev4/info.json b/keyboards/planck/rev4/keyboard.json similarity index 96% rename from keyboards/planck/rev4/info.json rename to keyboards/planck/rev4/keyboard.json index 5eaf58e14cf..725a297b2f2 100644 --- a/keyboards/planck/rev4/info.json +++ b/keyboards/planck/rev4/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xAE01", "device_version": "0.0.4" }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D0", "D5", "B5", "B6"] diff --git a/keyboards/planck/rev4/rules.mk b/keyboards/planck/rev4/rules.mk deleted file mode 100644 index 73d6182ff40..00000000000 --- a/keyboards/planck/rev4/rules.mk +++ /dev/null @@ -1,12 +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 = 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 -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/keyboard.json similarity index 96% rename from keyboards/planck/rev5/info.json rename to keyboards/planck/rev5/keyboard.json index f9265e1409a..f816d23e9b0 100644 --- a/keyboards/planck/rev5/info.json +++ b/keyboards/planck/rev5/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xAE01", "device_version": "0.0.5" }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D0", "D5", "B5", "B6"] diff --git a/keyboards/planck/rev5/rules.mk b/keyboards/planck/rev5/rules.mk deleted file mode 100644 index 73d6182ff40..00000000000 --- a/keyboards/planck/rev5/rules.mk +++ /dev/null @@ -1,12 +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 = 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 -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/keyboard.json similarity index 98% rename from keyboards/planck/rev6/info.json rename to keyboards/planck/rev6/keyboard.json index add17963b44..b0028795fe6 100644 --- a/keyboards/planck/rev6/info.json +++ b/keyboards/planck/rev6/keyboard.json @@ -19,6 +19,18 @@ "driver": "ws2812", "sleep": true }, + "features": { + "audio": true, + "bootmagic": true, + "command": true, + "console": true, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "A7", "B0"], "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"] diff --git a/keyboards/planck/rev6/rules.mk b/keyboards/planck/rev6/rules.mk deleted file mode 100644 index ce96f940793..00000000000 --- a/keyboards/planck/rev6/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 = yes # Enable WS2812 RGB underlight. - -RGB_MATRIX_ENABLE = no -ENCODER_ENABLE = yes -DIP_SWITCH_ENABLE = yes diff --git a/keyboards/playkbtw/ca66/info.json b/keyboards/playkbtw/ca66/keyboard.json similarity index 95% rename from keyboards/playkbtw/ca66/info.json rename to keyboards/playkbtw/ca66/keyboard.json index 5711f0e742b..73a2efe1d30 100644 --- a/keyboards/playkbtw/ca66/info.json +++ b/keyboards/playkbtw/ca66/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "F6", "B7", "E6"], "rows": ["F5", "F4", "F1", "B0", "B3"] diff --git a/keyboards/playkbtw/ca66/rules.mk b/keyboards/playkbtw/ca66/rules.mk deleted file mode 100644 index 32e82925ccf..00000000000 --- a/keyboards/playkbtw/ca66/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 = 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 = yes diff --git a/keyboards/playkbtw/pk60/info.json b/keyboards/playkbtw/pk60/keyboard.json similarity index 99% rename from keyboards/playkbtw/pk60/info.json rename to keyboards/playkbtw/pk60/keyboard.json index e42854308e6..a11348d2e6c 100644 --- a/keyboards/playkbtw/pk60/info.json +++ b/keyboards/playkbtw/pk60/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/playkbtw/pk60/rules.mk b/keyboards/playkbtw/pk60/rules.mk deleted file mode 100644 index 32e82925ccf..00000000000 --- a/keyboards/playkbtw/pk60/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 = 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 = yes diff --git a/keyboards/plume/plume65/info.json b/keyboards/plume/plume65/keyboard.json similarity index 98% rename from keyboards/plume/plume65/info.json rename to keyboards/plume/plume65/keyboard.json index a149784fd7f..f0b6097a186 100644 --- a/keyboards/plume/plume65/info.json +++ b/keyboards/plume/plume65/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "B0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B7", "F7", "C7", "C6", "B6", "F0", "B5", "F1", "B4", "F4", "D7", "F5", "D6", "F6", "D4"], "rows": ["D2", "D5", "E6", "D0", "D1"] diff --git a/keyboards/plume/plume65/rules.mk b/keyboards/plume/plume65/rules.mk deleted file mode 100644 index a927de843cb..00000000000 --- a/keyboards/plume/plume65/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/plx/info.json b/keyboards/plx/keyboard.json similarity index 98% rename from keyboards/plx/info.json rename to keyboards/plx/keyboard.json index 749c8fc9da0..dd47ce70370 100644 --- a/keyboards/plx/info.json +++ b/keyboards/plx/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xE972", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/plx/rules.mk b/keyboards/plx/rules.mk deleted file mode 100644 index 29f6808ed5d..00000000000 --- a/keyboards/plx/rules.mk +++ /dev/null @@ -1,12 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/plywrks/ahgase/info.json b/keyboards/plywrks/ahgase/keyboard.json similarity index 98% rename from keyboards/plywrks/ahgase/info.json rename to keyboards/plywrks/ahgase/keyboard.json index 2949aec9c6e..b98d4f69ee9 100644 --- a/keyboards/plywrks/ahgase/info.json +++ b/keyboards/plywrks/ahgase/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x7902", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D5", "B0", "B1", "D1"], "rows": ["B2", "B3", "B7", "D6", "D3", "D2"] diff --git a/keyboards/plywrks/ahgase/rules.mk b/keyboards/plywrks/ahgase/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/plywrks/ahgase/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 = 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/plywrks/lune/info.json b/keyboards/plywrks/lune/keyboard.json similarity index 97% rename from keyboards/plywrks/lune/info.json rename to keyboards/plywrks/lune/keyboard.json index 46c789054d1..9368627e981 100644 --- a/keyboards/plywrks/lune/info.json +++ b/keyboards/plywrks/lune/keyboard.json @@ -26,6 +26,16 @@ "ws2812": { "pin": "E2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "D4", "D5", "D3", "D2"], "rows": ["F1", "F0", "B7", "B0", "B6", "B5", "D7", "B4", "D6"] diff --git a/keyboards/plywrks/lune/rules.mk b/keyboards/plywrks/lune/rules.mk deleted file mode 100644 index e557ae8ab43..00000000000 --- a/keyboards/plywrks/lune/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes # Enable OLED diff --git a/keyboards/pohjolaworks/louhi/info.json b/keyboards/pohjolaworks/louhi/keyboard.json similarity index 97% rename from keyboards/pohjolaworks/louhi/info.json rename to keyboards/pohjolaworks/louhi/keyboard.json index 618d46b9c86..7edf1535561 100644 --- a/keyboards/pohjolaworks/louhi/info.json +++ b/keyboards/pohjolaworks/louhi/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "B6", "F4", "F5", "F6", "F7", "B1"], "rows": ["D3", "D2", "D1", "D0", "D7", "C6", "B4", "E6"] diff --git a/keyboards/pohjolaworks/louhi/rules.mk b/keyboards/pohjolaworks/louhi/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/pohjolaworks/louhi/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/poker87c/info.json b/keyboards/poker87c/keyboard.json similarity index 98% rename from keyboards/poker87c/info.json rename to keyboards/poker87c/keyboard.json index b0c8befc23e..ab626c8be91 100644 --- a/keyboards/poker87c/info.json +++ b/keyboards/poker87c/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x087C", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "D0", "F7", "F6", "F5", "D5", "D3", "D2", "C7", "C6", "B5", "F4", "F1", "B4", "B0"], "rows": ["E6", "B7", "D4", "F0", "D6", "D7"] diff --git a/keyboards/poker87c/rules.mk b/keyboards/poker87c/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/poker87c/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/poker87d/info.json b/keyboards/poker87d/keyboard.json similarity index 98% rename from keyboards/poker87d/info.json rename to keyboards/poker87d/keyboard.json index 8eec7890895..61710aac2c3 100644 --- a/keyboards/poker87d/info.json +++ b/keyboards/poker87d/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x087D", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "D0", "F7", "F6", "F5", "D5", "D3", "D2", "C7", "C6", "B5", "F4", "F1", "B4", "B0"], "rows": ["E6", "B7", "D4", "F0", "D6", "D7"] diff --git a/keyboards/poker87d/rules.mk b/keyboards/poker87d/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/poker87d/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/polycarbdiet/s20/info.json b/keyboards/polycarbdiet/s20/keyboard.json similarity index 94% rename from keyboards/polycarbdiet/s20/info.json rename to keyboards/polycarbdiet/s20/keyboard.json index 0905f9240ac..e734673ffc6 100644 --- a/keyboards/polycarbdiet/s20/info.json +++ b/keyboards/polycarbdiet/s20/keyboard.json @@ -9,6 +9,16 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C6", "C7", "D4", "D6"], "rows": ["B7", "E6", "D0", "D1", "D5"] diff --git a/keyboards/polycarbdiet/s20/rules.mk b/keyboards/polycarbdiet/s20/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/polycarbdiet/s20/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/portal_66/hotswap/info.json b/keyboards/portal_66/hotswap/keyboard.json similarity index 96% rename from keyboards/portal_66/hotswap/info.json rename to keyboards/portal_66/hotswap/keyboard.json index 2d4bbb9b161..764d0f62053 100644 --- a/keyboards/portal_66/hotswap/info.json +++ b/keyboards/portal_66/hotswap/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x5067", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/portal_66/hotswap/rules.mk b/keyboards/portal_66/hotswap/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/portal_66/hotswap/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 = 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/portal_66/soldered/info.json b/keyboards/portal_66/soldered/keyboard.json similarity index 99% rename from keyboards/portal_66/soldered/info.json rename to keyboards/portal_66/soldered/keyboard.json index 89057513294..0f0ac6b1844 100644 --- a/keyboards/portal_66/soldered/info.json +++ b/keyboards/portal_66/soldered/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x5066", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/portal_66/soldered/rules.mk b/keyboards/portal_66/soldered/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/portal_66/soldered/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 = 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/pos78/info.json b/keyboards/pos78/keyboard.json similarity index 96% rename from keyboards/pos78/info.json rename to keyboards/pos78/keyboard.json index f7f56a46de6..b9902195e3f 100644 --- a/keyboards/pos78/info.json +++ b/keyboards/pos78/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x7878", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B2", "B1", "D2", "D3", "D1", "D0", "C6", "E6", "B5", "B6", "B7", "D6", "C7"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/pos78/rules.mk b/keyboards/pos78/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/pos78/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 = 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/preonic/rev3/info.json b/keyboards/preonic/rev3/keyboard.json similarity index 98% rename from keyboards/preonic/rev3/info.json rename to keyboards/preonic/rev3/keyboard.json index 6112699cfae..472229c0da7 100644 --- a/keyboards/preonic/rev3/info.json +++ b/keyboards/preonic/rev3/keyboard.json @@ -28,6 +28,18 @@ "rgb_matrix": { "driver": "ws2812" }, + "features": { + "audio": true, + "bootmagic": true, + "command": true, + "console": true, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "A7", "B0"], "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"] diff --git a/keyboards/preonic/rev3/rules.mk b/keyboards/preonic/rev3/rules.mk deleted file mode 100644 index 6836d195416..00000000000 --- a/keyboards/preonic/rev3/rules.mk +++ /dev/null @@ -1,18 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE -RGB_MATRIX_ENABLE = no - -ENCODER_ENABLE = yes -DIP_SWITCH_ENABLE = yes diff --git a/keyboards/primekb/meridian_rgb/info.json b/keyboards/primekb/meridian_rgb/keyboard.json similarity index 95% rename from keyboards/primekb/meridian_rgb/info.json rename to keyboards/primekb/meridian_rgb/keyboard.json index 767a70b6f34..49491b769ad 100644 --- a/keyboards/primekb/meridian_rgb/info.json +++ b/keyboards/primekb/meridian_rgb/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0042", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "D4", "B7", "B3", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "F0", "F6", "D7", "D6"] diff --git a/keyboards/primekb/meridian_rgb/rules.mk b/keyboards/primekb/meridian_rgb/rules.mk deleted file mode 100644 index d307363777b..00000000000 --- a/keyboards/primekb/meridian_rgb/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic -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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/primekb/prime_m/info.json b/keyboards/primekb/prime_m/keyboard.json similarity index 95% rename from keyboards/primekb/prime_m/info.json rename to keyboards/primekb/prime_m/keyboard.json index aa8e3e36680..b63b96bf702 100644 --- a/keyboards/primekb/prime_m/info.json +++ b/keyboards/primekb/prime_m/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x504D", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B3", "C7", "C6", "D2", "D1", "D0"], "rows": ["C5", "B5", "B2", "D5", "D3"] diff --git a/keyboards/primekb/prime_m/rules.mk b/keyboards/primekb/prime_m/rules.mk deleted file mode 100644 index bdc6e54bc21..00000000000 --- a/keyboards/primekb/prime_m/rules.mk +++ /dev/null @@ -1,12 +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 -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/primekb/prime_o/info.json b/keyboards/primekb/prime_o/keyboard.json similarity index 95% rename from keyboards/primekb/prime_o/info.json rename to keyboards/primekb/prime_o/keyboard.json index 2a3a59cfb63..f3b427e148a 100644 --- a/keyboards/primekb/prime_o/info.json +++ b/keyboards/primekb/prime_o/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4024", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "B5", "C7", "C6", "D2", "D1", "D0", "C2"], "rows": ["D4", "D6", "B1", "C5", "B4", "B3", "C4", "B2", "B0", "D5"] diff --git a/keyboards/primekb/prime_o/rules.mk b/keyboards/primekb/prime_o/rules.mk deleted file mode 100644 index 9ce191fd81e..00000000000 --- a/keyboards/primekb/prime_o/rules.mk +++ /dev/null @@ -1,12 +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 -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/primekb/prime_r/info.json b/keyboards/primekb/prime_r/keyboard.json similarity index 95% rename from keyboards/primekb/prime_r/info.json rename to keyboards/primekb/prime_r/keyboard.json index 86c6db9c4f1..a45db2351a6 100644 --- a/keyboards/primekb/prime_r/info.json +++ b/keyboards/primekb/prime_r/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "C7", "C6", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D1", "D0", "B7", "B3", "B2"] diff --git a/keyboards/primekb/prime_r/rules.mk b/keyboards/primekb/prime_r/rules.mk deleted file mode 100644 index e0fca34fa1e..00000000000 --- a/keyboards/primekb/prime_r/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 = 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 diff --git a/keyboards/projectcain/relic/info.json b/keyboards/projectcain/relic/keyboard.json similarity index 98% rename from keyboards/projectcain/relic/info.json rename to keyboards/projectcain/relic/keyboard.json index 1b2d44a87ed..9ebfbf72d45 100644 --- a/keyboards/projectcain/relic/info.json +++ b/keyboards/projectcain/relic/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "D5", "B0", "F0", "F1", "F4", "F5", "F6", "C7", "C6", "B4"], "rows": ["D7", "B2", "B6", "B5"] diff --git a/keyboards/projectcain/relic/rules.mk b/keyboards/projectcain/relic/rules.mk deleted file mode 100644 index c58df49ea8f..00000000000 --- a/keyboards/projectcain/relic/rules.mk +++ /dev/null @@ -1,12 +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 = 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/projectcain/vault45/info.json b/keyboards/projectcain/vault45/keyboard.json similarity index 98% rename from keyboards/projectcain/vault45/info.json rename to keyboards/projectcain/vault45/keyboard.json index 9695631cc90..d09c8be7641 100644 --- a/keyboards/projectcain/vault45/info.json +++ b/keyboards/projectcain/vault45/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "D5", "D4", "D6", "D7", "B4", "D3", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["C6", "B6", "B5", "C7"] diff --git a/keyboards/projectcain/vault45/rules.mk b/keyboards/projectcain/vault45/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/projectcain/vault45/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/projectkb/signature65/info.json b/keyboards/projectkb/signature65/keyboard.json similarity index 99% rename from keyboards/projectkb/signature65/info.json rename to keyboards/projectkb/signature65/keyboard.json index 4e6447689f2..7f865fbaaf3 100644 --- a/keyboards/projectkb/signature65/info.json +++ b/keyboards/projectkb/signature65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0165", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B14", "A2", "B9", "B8", "B5", "B4", "B3", "A15", "B11", "B10", "B2", "A3", "B1", "B0", "A4", "A5"], "rows": ["A8", "A9", "B13", "A6", "A7"] diff --git a/keyboards/projectkb/signature65/rules.mk b/keyboards/projectkb/signature65/rules.mk deleted file mode 100644 index 5fb302d01f1..00000000000 --- a/keyboards/projectkb/signature65/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/projectkb/signature87/info.json b/keyboards/projectkb/signature87/keyboard.json similarity index 99% rename from keyboards/projectkb/signature87/info.json rename to keyboards/projectkb/signature87/keyboard.json index 79ac099b449..2f8666aeb9e 100644 --- a/keyboards/projectkb/signature87/info.json +++ b/keyboards/projectkb/signature87/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0187", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A7", "A6", "A5", "A4", "A3", "A2", "A15", "B3", "B4"], "rows": ["B13", "B12", "A8", "B15", "A10", "A9", "B9", "B8", "B1", "B0", "B10", "B2"] diff --git a/keyboards/projectkb/signature87/rules.mk b/keyboards/projectkb/signature87/rules.mk deleted file mode 100644 index a09b9d3bdf2..00000000000 --- a/keyboards/projectkb/signature87/rules.mk +++ /dev/null @@ -1,11 +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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no - diff --git a/keyboards/prototypist/allison/info.json b/keyboards/prototypist/allison/keyboard.json similarity index 99% rename from keyboards/prototypist/allison/info.json rename to keyboards/prototypist/allison/keyboard.json index 0cdb65281c2..0261b204bb0 100644 --- a/keyboards/prototypist/allison/info.json +++ b/keyboards/prototypist/allison/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x414D", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "F1", "F0"], "rows": ["D2", "D1", "D0", "B1", "B2", "D3"] diff --git a/keyboards/prototypist/allison/rules.mk b/keyboards/prototypist/allison/rules.mk deleted file mode 100644 index b325f3f0c79..00000000000 --- a/keyboards/prototypist/allison/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 = 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/prototypist/allison_numpad/info.json b/keyboards/prototypist/allison_numpad/keyboard.json similarity index 94% rename from keyboards/prototypist/allison_numpad/info.json rename to keyboards/prototypist/allison_numpad/keyboard.json index 9e20788a127..974573fc64e 100644 --- a/keyboards/prototypist/allison_numpad/info.json +++ b/keyboards/prototypist/allison_numpad/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x414E", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F6", "F5", "F1", "F0"], "rows": ["F4", "C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/prototypist/allison_numpad/rules.mk b/keyboards/prototypist/allison_numpad/rules.mk deleted file mode 100644 index b325f3f0c79..00000000000 --- a/keyboards/prototypist/allison_numpad/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 = 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/psuieee/pluto12/info.json b/keyboards/psuieee/pluto12/keyboard.json similarity index 86% rename from keyboards/psuieee/pluto12/info.json rename to keyboards/psuieee/pluto12/keyboard.json index d997f60cfa3..6dcb3d33ac7 100644 --- a/keyboards/psuieee/pluto12/info.json +++ b/keyboards/psuieee/pluto12/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x7012", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["D0", "D4", "C6"] diff --git a/keyboards/psuieee/pluto12/rules.mk b/keyboards/psuieee/pluto12/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/psuieee/pluto12/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/puck/info.json b/keyboards/puck/keyboard.json similarity index 86% rename from keyboards/puck/info.json rename to keyboards/puck/keyboard.json index c32c4f8c0f9..1ee73dc4375 100644 --- a/keyboards/puck/info.json +++ b/keyboards/puck/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B4", "D7", "D6"], "rows": ["D2", "D3", "C6", "C7"] diff --git a/keyboards/puck/rules.mk b/keyboards/puck/rules.mk deleted file mode 100644 index c271aa0f069..00000000000 --- a/keyboards/puck/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 = 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. diff --git a/keyboards/qpockets/eggman/info.json b/keyboards/qpockets/eggman/keyboard.json similarity index 93% rename from keyboards/qpockets/eggman/info.json rename to keyboards/qpockets/eggman/keyboard.json index 16b0ebe42a3..32cb76fc88d 100644 --- a/keyboards/qpockets/eggman/info.json +++ b/keyboards/qpockets/eggman/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x656D", "device_version": "10.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "B4", "B3", "B2", "D3", "D2", "D1"], "rows": ["C4", "C5", "C2", "D0", "B5", "B6", "D6"] diff --git a/keyboards/qpockets/eggman/rules.mk b/keyboards/qpockets/eggman/rules.mk deleted file mode 100644 index c473e6a78e4..00000000000 --- a/keyboards/qpockets/eggman/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - diff --git a/keyboards/qpockets/wanten/info.json b/keyboards/qpockets/wanten/keyboard.json similarity index 97% rename from keyboards/qpockets/wanten/info.json rename to keyboards/qpockets/wanten/keyboard.json index df1798db249..86bfe023003 100644 --- a/keyboards/qpockets/wanten/info.json +++ b/keyboards/qpockets/wanten/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x7774", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F1", "B5", "B6", "C6", "C7", "D4", "E6", "D2", "B1", "B2", "D3"], "rows": ["F0", "F7", "B3", "D5"] diff --git a/keyboards/qpockets/wanten/rules.mk b/keyboards/qpockets/wanten/rules.mk deleted file mode 100644 index f0a88209b69..00000000000 --- a/keyboards/qpockets/wanten/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 -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 -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/quad_h/lb75/info.json b/keyboards/quad_h/lb75/keyboard.json similarity index 98% rename from keyboards/quad_h/lb75/info.json rename to keyboards/quad_h/lb75/keyboard.json index 16701a5e99c..98bcde60ccb 100644 --- a/keyboards/quad_h/lb75/info.json +++ b/keyboards/quad_h/lb75/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D2", "D1", "D0", "F1", "F4", "F5", "F6", "F7"], "rows": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D3", "D5", "F0", "E6"] diff --git a/keyboards/quad_h/lb75/rules.mk b/keyboards/quad_h/lb75/rules.mk deleted file mode 100644 index 45377383806..00000000000 --- a/keyboards/quad_h/lb75/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 = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/quantrik/kyuu/info.json b/keyboards/quantrik/kyuu/keyboard.json similarity index 96% rename from keyboards/quantrik/kyuu/info.json rename to keyboards/quantrik/kyuu/keyboard.json index e741eeb04a1..6e3fe5b74cd 100644 --- a/keyboards/quantrik/kyuu/info.json +++ b/keyboards/quantrik/kyuu/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "C6", "F0", "B7", "D0", "D5", "D3", "D2", "D1", "B3"], "rows": ["B6", "B5", "B4", "D7", "D6"] diff --git a/keyboards/quantrik/kyuu/rules.mk b/keyboards/quantrik/kyuu/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/quantrik/kyuu/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/quarkeys/z40/info.json b/keyboards/quarkeys/z40/keyboard.json similarity index 95% rename from keyboards/quarkeys/z40/info.json rename to keyboards/quarkeys/z40/keyboard.json index 6e7d213614d..fb945dba5a5 100644 --- a/keyboards/quarkeys/z40/info.json +++ b/keyboards/quarkeys/z40/keyboard.json @@ -52,6 +52,15 @@ "alternating": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D0", "B1", "B0"], "rows": ["E6", "B3", "C7", "C6"] diff --git a/keyboards/quarkeys/z40/rules.mk b/keyboards/quarkeys/z40/rules.mk deleted file mode 100644 index 4554ab2970a..00000000000 --- a/keyboards/quarkeys/z40/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - -# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE -RGBLIGHT_ENABLE = no # Enable this and unable RGB_MATRIX_ENABLE to use RGB light effect - -RGB_MATRIX_ENABLE = yes # Enable this and unable RGBLIGHT_ENABLE to use RGB Matrix effect diff --git a/keyboards/quarkeys/z60/hotswap/info.json b/keyboards/quarkeys/z60/hotswap/keyboard.json similarity index 95% rename from keyboards/quarkeys/z60/hotswap/info.json rename to keyboards/quarkeys/z60/hotswap/keyboard.json index d10065bbd5c..c586d62ef46 100644 --- a/keyboards/quarkeys/z60/hotswap/info.json +++ b/keyboards/quarkeys/z60/hotswap/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x3C02", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "F0", "F7", "F1", "F6", "F5", "F4", "C7", "B7", "D5", "C6", "B6", "B5", "D7", "D4"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/quarkeys/z60/hotswap/rules.mk b/keyboards/quarkeys/z60/hotswap/rules.mk deleted file mode 100644 index 36b8dd4d443..00000000000 --- a/keyboards/quarkeys/z60/hotswap/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -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 -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -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 diff --git a/keyboards/quarkeys/z60/solder/info.json b/keyboards/quarkeys/z60/solder/keyboard.json similarity index 99% rename from keyboards/quarkeys/z60/solder/info.json rename to keyboards/quarkeys/z60/solder/keyboard.json index 55e4ca33d9a..52514fc7a3a 100644 --- a/keyboards/quarkeys/z60/solder/info.json +++ b/keyboards/quarkeys/z60/solder/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x3C01", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "F0", "F7", "F1", "F6", "F5", "F4", "C7", "B7", "D5", "C6", "B6", "B5", "D7", "D4"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/quarkeys/z60/solder/rules.mk b/keyboards/quarkeys/z60/solder/rules.mk deleted file mode 100644 index 54bbea4e625..00000000000 --- a/keyboards/quarkeys/z60/solder/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -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 -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -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 diff --git a/keyboards/quarkeys/z67/hotswap/info.json b/keyboards/quarkeys/z67/hotswap/keyboard.json similarity index 96% rename from keyboards/quarkeys/z67/hotswap/info.json rename to keyboards/quarkeys/z67/hotswap/keyboard.json index 13a5cd09e28..266a9a879e0 100644 --- a/keyboards/quarkeys/z67/hotswap/info.json +++ b/keyboards/quarkeys/z67/hotswap/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4102", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"], "rows": ["B0", "B1", "B2", "B3", "F7"] diff --git a/keyboards/quarkeys/z67/hotswap/rules.mk b/keyboards/quarkeys/z67/hotswap/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/quarkeys/z67/hotswap/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 = 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/quarkeys/z67/solder/info.json b/keyboards/quarkeys/z67/solder/keyboard.json similarity index 99% rename from keyboards/quarkeys/z67/solder/info.json rename to keyboards/quarkeys/z67/solder/keyboard.json index 93ea9fa0fc9..c1e1412d217 100644 --- a/keyboards/quarkeys/z67/solder/info.json +++ b/keyboards/quarkeys/z67/solder/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4101", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B5", "B4"], "rows": ["B0", "B1", "B2", "B3", "F7"] diff --git a/keyboards/quarkeys/z67/solder/rules.mk b/keyboards/quarkeys/z67/solder/rules.mk deleted file mode 100644 index f4e87458b0d..00000000000 --- a/keyboards/quarkeys/z67/solder/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 = 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/qvex/lynepad/info.json b/keyboards/qvex/lynepad/keyboard.json similarity index 87% rename from keyboards/qvex/lynepad/info.json rename to keyboards/qvex/lynepad/keyboard.json index 1a2091dc979..65afceb26ab 100644 --- a/keyboards/qvex/lynepad/info.json +++ b/keyboards/qvex/lynepad/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x4C50", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5"], "rows": ["C7", "F7", "F6"] diff --git a/keyboards/qvex/lynepad/rules.mk b/keyboards/qvex/lynepad/rules.mk deleted file mode 100644 index fe695a8986e..00000000000 --- a/keyboards/qvex/lynepad/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 = 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 -ENCODER_ENABLE = yes # Enable the encoders diff --git a/keyboards/qwertlekeys/calice/info.json b/keyboards/qwertlekeys/calice/keyboard.json similarity index 98% rename from keyboards/qwertlekeys/calice/info.json rename to keyboards/qwertlekeys/calice/keyboard.json index c5d880f40ca..3355400ccc6 100644 --- a/keyboards/qwertlekeys/calice/info.json +++ b/keyboards/qwertlekeys/calice/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "B4", "F7", "F6", "D1", "B7", "B3", "B2"], "rows": ["F0", "F1", "F5", "F4", "C6", "C7", "B5", "B6", "D4", "D2", "D5", "D3"] diff --git a/keyboards/qwertlekeys/calice/rules.mk b/keyboards/qwertlekeys/calice/rules.mk deleted file mode 100644 index 0334a51bb5b..00000000000 --- a/keyboards/qwertlekeys/calice/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/qwertykeys/qk65/hotswap/info.json b/keyboards/qwertykeys/qk65/hotswap/keyboard.json similarity index 96% rename from keyboards/qwertykeys/qk65/hotswap/info.json rename to keyboards/qwertykeys/qk65/hotswap/keyboard.json index 01799ac0ef3..7c786a70384 100644 --- a/keyboards/qwertykeys/qk65/hotswap/info.json +++ b/keyboards/qwertykeys/qk65/hotswap/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B7", "D0", "D1", "D2"] diff --git a/keyboards/qwertykeys/qk65/hotswap/rules.mk b/keyboards/qwertykeys/qk65/hotswap/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/qwertykeys/qk65/hotswap/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 = 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/qwertykeys/qk65/solder/info.json b/keyboards/qwertykeys/qk65/solder/keyboard.json similarity index 99% rename from keyboards/qwertykeys/qk65/solder/info.json rename to keyboards/qwertykeys/qk65/solder/keyboard.json index f0de59102aa..b1795474d36 100644 --- a/keyboards/qwertykeys/qk65/solder/info.json +++ b/keyboards/qwertykeys/qk65/solder/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B7", "D0", "D1", "D2"] diff --git a/keyboards/qwertykeys/qk65/solder/rules.mk b/keyboards/qwertykeys/qk65/solder/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/qwertykeys/qk65/solder/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 = 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/rabbit/rabbit68/info.json b/keyboards/rabbit/rabbit68/keyboard.json similarity index 95% rename from keyboards/rabbit/rabbit68/info.json rename to keyboards/rabbit/rabbit68/keyboard.json index 530af17cf09..31389e06383 100644 --- a/keyboards/rabbit/rabbit68/info.json +++ b/keyboards/rabbit/rabbit68/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x68F1", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D6", "D1", "B4", "D2", "B5", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2"], "rows": ["B6", "D7", "D0", "B3", "B7"] diff --git a/keyboards/rabbit/rabbit68/rules.mk b/keyboards/rabbit/rabbit68/rules.mk deleted file mode 100644 index 7829a2753bb..00000000000 --- a/keyboards/rabbit/rabbit68/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 = 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/rad/info.json b/keyboards/rad/keyboard.json similarity index 86% rename from keyboards/rad/info.json rename to keyboards/rad/keyboard.json index a1352700fff..0d86f25275d 100644 --- a/keyboards/rad/info.json +++ b/keyboards/rad/keyboard.json @@ -6,6 +6,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "B4", "E6"], "rows": ["D7", "C6", "B6", "D0"] diff --git a/keyboards/rad/rules.mk b/keyboards/rad/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/rad/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 = 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/rainkeebs/delilah/info.json b/keyboards/rainkeebs/delilah/keyboard.json similarity index 94% rename from keyboards/rainkeebs/delilah/info.json rename to keyboards/rainkeebs/delilah/keyboard.json index 714308d4164..9abdfc583dc 100644 --- a/keyboards/rainkeebs/delilah/info.json +++ b/keyboards/rainkeebs/delilah/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "B3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F0", "E6", "D5", "D3", "D4", "D6", "D7", "B4"], "rows": ["B5", "B6", "C6", "C7"] diff --git a/keyboards/rainkeebs/delilah/rules.mk b/keyboards/rainkeebs/delilah/rules.mk deleted file mode 100644 index c4a40815c6d..00000000000 --- a/keyboards/rainkeebs/delilah/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 = 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 -RGBLIGHT_ENABLE = yes diff --git a/keyboards/rainkeebs/rainkeeb/info.json b/keyboards/rainkeebs/rainkeeb/keyboard.json similarity index 92% rename from keyboards/rainkeebs/rainkeeb/info.json rename to keyboards/rainkeebs/rainkeeb/keyboard.json index 2b05e06f4c2..742db864bd5 100644 --- a/keyboards/rainkeebs/rainkeeb/info.json +++ b/keyboards/rainkeebs/rainkeeb/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x726B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "wpm": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D3", "D2", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/rainkeebs/rainkeeb/rules.mk b/keyboards/rainkeebs/rainkeeb/rules.mk deleted file mode 100644 index 866521b4288..00000000000 --- a/keyboards/rainkeebs/rainkeeb/rules.mk +++ /dev/null @@ -1,21 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no - -# OLED enable -OLED_ENABLE = yes - -# Encoder enable -ENCODER_ENABLE = yes - -# WPM counter enable -WPM_ENABLE = yes diff --git a/keyboards/rainkeebs/yasui/info.json b/keyboards/rainkeebs/yasui/keyboard.json similarity index 94% rename from keyboards/rainkeebs/yasui/info.json rename to keyboards/rainkeebs/yasui/keyboard.json index 5e7ea06deb3..926b1084dd3 100644 --- a/keyboards/rainkeebs/yasui/info.json +++ b/keyboards/rainkeebs/yasui/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "D1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D7", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D4", "C6", "B5", "E6"] diff --git a/keyboards/rainkeebs/yasui/rules.mk b/keyboards/rainkeebs/yasui/rules.mk deleted file mode 100644 index e9c793f741b..00000000000 --- a/keyboards/rainkeebs/yasui/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 -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 -RGBLIGHT_ENABLE = yes - diff --git a/keyboards/rart/rart45/info.json b/keyboards/rart/rart45/keyboard.json similarity index 96% rename from keyboards/rart/rart45/info.json rename to keyboards/rart/rart45/keyboard.json index 27dd87197eb..fdc92b689b2 100644 --- a/keyboards/rart/rart45/info.json +++ b/keyboards/rart/rart45/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0045", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D6", "D4", "B2", "B5", "B4", "B3"], "rows": ["D1", "C2", "C1", "B1", "D0", "C3", "C0", "D7", "B0"] diff --git a/keyboards/rart/rart45/rules.mk b/keyboards/rart/rart45/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/rart/rart45/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 = 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/rart/rart4x4/info.json b/keyboards/rart/rart4x4/keyboard.json similarity index 90% rename from keyboards/rart/rart4x4/info.json rename to keyboards/rart/rart4x4/keyboard.json index aa822b8f5c0..8cd6ea5bd26 100644 --- a/keyboards/rart/rart4x4/info.json +++ b/keyboards/rart/rart4x4/keyboard.json @@ -30,6 +30,16 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "B2", "B5", "B4"], "rows": ["F4", "B6", "B3", "B1"] diff --git a/keyboards/rart/rart4x4/rules.mk b/keyboards/rart/rart4x4/rules.mk deleted file mode 100644 index 7e8534dae5a..00000000000 --- a/keyboards/rart/rart4x4/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/rart/rart67/info.json b/keyboards/rart/rart67/keyboard.json similarity index 99% rename from keyboards/rart/rart67/info.json rename to keyboards/rart/rart67/keyboard.json index a6722f4432e..6a86ec74cad 100644 --- a/keyboards/rart/rart67/info.json +++ b/keyboards/rart/rart67/keyboard.json @@ -30,6 +30,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F7", "F6", "F5", "F4", "F1", "E6"], "rows": ["D0", "D1", "D2", "D3", "B0"] diff --git a/keyboards/rart/rart67/rules.mk b/keyboards/rart/rart67/rules.mk deleted file mode 100644 index b483118606d..00000000000 --- a/keyboards/rart/rart67/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 = 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/rart/rart67m/info.json b/keyboards/rart/rart67m/keyboard.json similarity index 95% rename from keyboards/rart/rart67m/info.json rename to keyboards/rart/rart67m/keyboard.json index 00e5db27b6f..66f28e45119 100644 --- a/keyboards/rart/rart67m/info.json +++ b/keyboards/rart/rart67m/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6067", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "unicode": true + }, "matrix_pins": { "cols": ["F4", "F5", "C6", "F7", "D7", "B1", "E6", "B6"], "rows": ["D3", "D2", "D4", "F6", "B3", "B4", "B2", "B5"] diff --git a/keyboards/rart/rart67m/rules.mk b/keyboards/rart/rart67m/rules.mk deleted file mode 100644 index 5a309870d33..00000000000 --- a/keyboards/rart/rart67m/rules.mk +++ /dev/null @@ -1,14 +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 -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 -UNICODE_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/rart/rart75/info.json b/keyboards/rart/rart75/keyboard.json similarity index 99% rename from keyboards/rart/rart75/info.json rename to keyboards/rart/rart75/keyboard.json index 0bbd84cb657..2d0c1e4001d 100644 --- a/keyboards/rart/rart75/info.json +++ b/keyboards/rart/rart75/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0075", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "C6", "B6", "B5", "B4", "D7", "D6", "B3", "B1", "F7", "F5", "B2", "B7"], "rows": ["F1", "F4", "F6", "C7", "D4", "D0"] diff --git a/keyboards/rart/rart75/rules.mk b/keyboards/rart/rart75/rules.mk deleted file mode 100644 index 8feeffc98b9..00000000000 --- a/keyboards/rart/rart75/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/rart/rart75m/info.json b/keyboards/rart/rart75m/keyboard.json similarity index 96% rename from keyboards/rart/rart75m/info.json rename to keyboards/rart/rart75m/keyboard.json index a893b216b61..18e8432e70e 100644 --- a/keyboards/rart/rart75m/info.json +++ b/keyboards/rart/rart75m/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x6075", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "unicode": true + }, "matrix_pins": { "cols": ["B2", "D4", "F0", "C6", "F1", "D7", "F4", "E6", "F5", "B4", "F6", "B5", "F7", "B6"], "rows": ["C7", "B3", "B1", "B0", "D3", "D2"] diff --git a/keyboards/rart/rart75m/rules.mk b/keyboards/rart/rart75m/rules.mk deleted file mode 100644 index 5277f7c480d..00000000000 --- a/keyboards/rart/rart75m/rules.mk +++ /dev/null @@ -1,15 +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 -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 -UNICODE_ENABLE = yes -OLED_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/rart/rartand/info.json b/keyboards/rart/rartand/keyboard.json similarity index 98% rename from keyboards/rart/rartand/info.json rename to keyboards/rart/rartand/keyboard.json index 958c4c85c8a..50d94a1cc7d 100644 --- a/keyboards/rart/rartand/info.json +++ b/keyboards/rart/rartand/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x5050", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true + }, "matrix_pins": { "cols": ["D0", "D1", "B4", "B5", "B3", "D4", "D6"], "rows": ["C3", "B2", "C2", "B1", "C1", "D7", "C0", "B0"] diff --git a/keyboards/rart/rartand/rules.mk b/keyboards/rart/rartand/rules.mk deleted file mode 100644 index 7b55e77aeed..00000000000 --- a/keyboards/rart/rartand/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 -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 -OLED_ENABLE = yes diff --git a/keyboards/rart/rartlice/info.json b/keyboards/rart/rartlice/keyboard.json similarity index 96% rename from keyboards/rart/rartlice/info.json rename to keyboards/rart/rartlice/keyboard.json index d800165b53a..4d65deedefd 100644 --- a/keyboards/rart/rartlice/info.json +++ b/keyboards/rart/rartlice/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["B12", "B8", "B5", "B4", "B3", "B11", "B10", "B1", "B0", "A7", "A6", "A5", "A3", "A4", "A1"], "rows": ["B13", "A15", "B9", "A2", "A0"] diff --git a/keyboards/rart/rartlice/rules.mk b/keyboards/rart/rartlice/rules.mk deleted file mode 100644 index b3f4fc8b8a7..00000000000 --- a/keyboards/rart/rartlice/rules.mk +++ /dev/null @@ -1,14 +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 -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 -SLEEP_LED_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/rart/rartlite/info.json b/keyboards/rart/rartlite/keyboard.json similarity index 97% rename from keyboards/rart/rartlite/info.json rename to keyboards/rart/rartlite/keyboard.json index db25aae5298..e88507161df 100644 --- a/keyboards/rart/rartlite/info.json +++ b/keyboards/rart/rartlite/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4040", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B3", "F7", "D3"], "rows": ["F4", "D2", "B2", "B4", "B6", "B5", "D0", "D1"] diff --git a/keyboards/rart/rartlite/rules.mk b/keyboards/rart/rartlite/rules.mk deleted file mode 100644 index 6d3709762d5..00000000000 --- a/keyboards/rart/rartlite/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 = 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/rart/rartpad/info.json b/keyboards/rart/rartpad/keyboard.json similarity index 94% rename from keyboards/rart/rartpad/info.json rename to keyboards/rart/rartpad/keyboard.json index 8c921931a8c..06be8a5f691 100644 --- a/keyboards/rart/rartpad/info.json +++ b/keyboards/rart/rartpad/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B2", "D1", "D2", "D3"], "rows": ["B6", "F6", "D0", "D4", "C6"] diff --git a/keyboards/rart/rartpad/rules.mk b/keyboards/rart/rartpad/rules.mk deleted file mode 100644 index 8c692a7b560..00000000000 --- a/keyboards/rart/rartpad/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 -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 -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/keyboard.json similarity index 88% rename from keyboards/rate/pistachio_mp/info.json rename to keyboards/rate/pistachio_mp/keyboard.json index a37b55b6aba..613f7bb8fa5 100644 --- a/keyboards/rate/pistachio_mp/info.json +++ b/keyboards/rate/pistachio_mp/keyboard.json @@ -16,6 +16,16 @@ "ws2812": { "pin": "D2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B3", "B1", "F7", "F6"], "rows": ["B4", "E6", "D7", "C6", "D4"] diff --git a/keyboards/rate/pistachio_mp/rules.mk b/keyboards/rate/pistachio_mp/rules.mk deleted file mode 100644 index c5c4d8f35f1..00000000000 --- a/keyboards/rate/pistachio_mp/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json b/keyboards/rationalist/ratio65_hotswap/rev_a/keyboard.json similarity index 96% rename from keyboards/rationalist/ratio65_hotswap/rev_a/info.json rename to keyboards/rationalist/ratio65_hotswap/rev_a/keyboard.json index e53227ce7f0..fe40f12f460 100644 --- a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json +++ b/keyboards/rationalist/ratio65_hotswap/rev_a/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C2", "D2", "B6", "B5", "B4", "B3", "B2", "D6"], "rows": ["D1", "D0", "D5", "D4", "C7", "B7", "C6", "C5", "B0", "B1"] diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/rules.mk b/keyboards/rationalist/ratio65_hotswap/rev_a/rules.mk deleted file mode 100644 index a927de843cb..00000000000 --- a/keyboards/rationalist/ratio65_hotswap/rev_a/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/rationalist/ratio65_solder/rev_a/info.json b/keyboards/rationalist/ratio65_solder/rev_a/keyboard.json similarity index 99% rename from keyboards/rationalist/ratio65_solder/rev_a/info.json rename to keyboards/rationalist/ratio65_solder/rev_a/keyboard.json index 0ef22251029..6953636dee8 100644 --- a/keyboards/rationalist/ratio65_solder/rev_a/info.json +++ b/keyboards/rationalist/ratio65_solder/rev_a/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C2", "D2", "B6", "B5", "B4", "B3", "B2", "D6"], "rows": ["D1", "D0", "D5", "D4", "C7", "B7", "C6", "C5", "B0", "B1"] diff --git a/keyboards/rationalist/ratio65_solder/rev_a/rules.mk b/keyboards/rationalist/ratio65_solder/rev_a/rules.mk deleted file mode 100644 index a927de843cb..00000000000 --- a/keyboards/rationalist/ratio65_solder/rev_a/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/recompile_keys/mio/info.json b/keyboards/recompile_keys/mio/keyboard.json similarity index 94% rename from keyboards/recompile_keys/mio/info.json rename to keyboards/recompile_keys/mio/keyboard.json index 0456937cc5a..700bb09c071 100644 --- a/keyboards/recompile_keys/mio/info.json +++ b/keyboards/recompile_keys/mio/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "B3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F1", "F0", "F4", "F7", "F6", "F5"] diff --git a/keyboards/recompile_keys/mio/rules.mk b/keyboards/recompile_keys/mio/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/recompile_keys/mio/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/rect44/info.json b/keyboards/rect44/keyboard.json similarity index 98% rename from keyboards/rect44/info.json rename to keyboards/rect44/keyboard.json index 2a127db8315..d331e48bd95 100644 --- a/keyboards/rect44/info.json +++ b/keyboards/rect44/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "B6" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["D3", "D2", "F5", "F4"] diff --git a/keyboards/rect44/rules.mk b/keyboards/rect44/rules.mk deleted file mode 100644 index aa4c817d2a2..00000000000 --- a/keyboards/rect44/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/redscarf_i/info.json b/keyboards/redscarf_i/keyboard.json similarity index 96% rename from keyboards/redscarf_i/info.json rename to keyboards/redscarf_i/keyboard.json index 573d7dcaeaa..0a268169ef1 100644 --- a/keyboards/redscarf_i/info.json +++ b/keyboards/redscarf_i/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x5959", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7"], "rows": ["D0", "D1", "D2", "D3", "D4", "D5"] diff --git a/keyboards/redscarf_i/rules.mk b/keyboards/redscarf_i/rules.mk deleted file mode 100644 index 887d6344d73..00000000000 --- a/keyboards/redscarf_i/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# 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 -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/retro_75/info.json b/keyboards/retro_75/keyboard.json similarity index 98% rename from keyboards/retro_75/info.json rename to keyboards/retro_75/keyboard.json index 2a3e249d473..513379ff5f2 100644 --- a/keyboards/retro_75/info.json +++ b/keyboards/retro_75/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "A9" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A5", "A4", "A3", "F0", "C15", "C14", "C13", "A6", "B11", "B10", "B2", "B1", "B0", "A7", "A14", "A15"], "rows": ["A8", "B15", "B14", "B13", "B12", "B8"] diff --git a/keyboards/retro_75/rules.mk b/keyboards/retro_75/rules.mk deleted file mode 100644 index ac809dd9ede..00000000000 --- a/keyboards/retro_75/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/reversestudio/decadepad/info.json b/keyboards/reversestudio/decadepad/keyboard.json similarity index 90% rename from keyboards/reversestudio/decadepad/info.json rename to keyboards/reversestudio/decadepad/keyboard.json index 18ea68a9352..d9dc9f52533 100644 --- a/keyboards/reversestudio/decadepad/info.json +++ b/keyboards/reversestudio/decadepad/keyboard.json @@ -28,6 +28,16 @@ "ws2812": { "pin": "D5" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true, + "unicode": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/reversestudio/decadepad/rules.mk b/keyboards/reversestudio/decadepad/rules.mk deleted file mode 100644 index 6019f36e418..00000000000 --- a/keyboards/reversestudio/decadepad/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode diff --git a/keyboards/reviung/reviung33/info.json b/keyboards/reviung/reviung33/keyboard.json similarity index 93% rename from keyboards/reviung/reviung33/info.json rename to keyboards/reviung/reviung33/keyboard.json index d292748b2f7..ff0078f1970 100644 --- a/keyboards/reviung/reviung33/info.json +++ b/keyboards/reviung/reviung33/keyboard.json @@ -30,6 +30,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B1", "B3", "B2", "B6", "B5"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/reviung/reviung33/rules.mk b/keyboards/reviung/reviung33/rules.mk deleted file mode 100644 index ff287d5235b..00000000000 --- a/keyboards/reviung/reviung33/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/reviung/reviung34/info.json b/keyboards/reviung/reviung34/keyboard.json similarity index 96% rename from keyboards/reviung/reviung34/info.json rename to keyboards/reviung/reviung34/keyboard.json index e273b714ff5..99ddd28b819 100755 --- a/keyboards/reviung/reviung34/info.json +++ b/keyboards/reviung/reviung34/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4E03", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B1", "B3", "B2", "B6"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/reviung/reviung34/rules.mk b/keyboards/reviung/reviung34/rules.mk deleted file mode 100755 index 7829a2753bb..00000000000 --- a/keyboards/reviung/reviung34/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 = 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/reviung/reviung39/info.json b/keyboards/reviung/reviung39/keyboard.json similarity index 94% rename from keyboards/reviung/reviung39/info.json rename to keyboards/reviung/reviung39/keyboard.json index 5c2b3445d9a..fca69124b1b 100644 --- a/keyboards/reviung/reviung39/info.json +++ b/keyboards/reviung/reviung39/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5F10", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"] diff --git a/keyboards/reviung/reviung39/rules.mk b/keyboards/reviung/reviung39/rules.mk deleted file mode 100644 index 7829a2753bb..00000000000 --- a/keyboards/reviung/reviung39/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 = 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/reviung/reviung41/info.json b/keyboards/reviung/reviung41/keyboard.json similarity index 94% rename from keyboards/reviung/reviung41/info.json rename to keyboards/reviung/reviung41/keyboard.json index f4a434db779..cf5827935bc 100644 --- a/keyboards/reviung/reviung41/info.json +++ b/keyboards/reviung/reviung41/keyboard.json @@ -30,6 +30,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"] diff --git a/keyboards/reviung/reviung41/rules.mk b/keyboards/reviung/reviung41/rules.mk deleted file mode 100644 index 4465ace1727..00000000000 --- a/keyboards/reviung/reviung41/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/reviung/reviung5/info.json b/keyboards/reviung/reviung5/keyboard.json similarity index 86% rename from keyboards/reviung/reviung5/info.json rename to keyboards/reviung/reviung5/keyboard.json index d3503be13e7..674f044eeeb 100644 --- a/keyboards/reviung/reviung5/info.json +++ b/keyboards/reviung/reviung5/keyboard.json @@ -30,6 +30,16 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4"], "rows": ["F4"] diff --git a/keyboards/reviung/reviung5/rules.mk b/keyboards/reviung/reviung5/rules.mk deleted file mode 100644 index 5d71c286faf..00000000000 --- a/keyboards/reviung/reviung5/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/reviung/reviung53/info.json b/keyboards/reviung/reviung53/keyboard.json similarity index 95% rename from keyboards/reviung/reviung53/info.json rename to keyboards/reviung/reviung53/keyboard.json index 6f0549d374e..e5556af10b9 100644 --- a/keyboards/reviung/reviung53/info.json +++ b/keyboards/reviung/reviung53/keyboard.json @@ -30,6 +30,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/reviung/reviung53/rules.mk b/keyboards/reviung/reviung53/rules.mk deleted file mode 100644 index a927de843cb..00000000000 --- a/keyboards/reviung/reviung53/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/rmi_kb/squishy65/info.json b/keyboards/rmi_kb/squishy65/keyboard.json similarity index 98% rename from keyboards/rmi_kb/squishy65/info.json rename to keyboards/rmi_kb/squishy65/keyboard.json index 1af28e861c7..1025584b6a2 100644 --- a/keyboards/rmi_kb/squishy65/info.json +++ b/keyboards/rmi_kb/squishy65/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "B15" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A9", "B9", "B7", "B6", "B5", "B4", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A10", "A3", "A2"], "rows": ["A15", "B3", "A0", "B10", "B11"] diff --git a/keyboards/rmi_kb/squishy65/rules.mk b/keyboards/rmi_kb/squishy65/rules.mk deleted file mode 100644 index 31f4f7acad0..00000000000 --- a/keyboards/rmi_kb/squishy65/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 -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 - diff --git a/keyboards/rmi_kb/squishyfrl/info.json b/keyboards/rmi_kb/squishyfrl/keyboard.json similarity index 98% rename from keyboards/rmi_kb/squishyfrl/info.json rename to keyboards/rmi_kb/squishyfrl/keyboard.json index a19d0bde7dd..7f6943e8641 100644 --- a/keyboards/rmi_kb/squishyfrl/info.json +++ b/keyboards/rmi_kb/squishyfrl/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "C15" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A7", "C4", "C5", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "C6", "C9", "C7", "C8", "A10", "A4", "C14", "A3", "A2", "C3"], "rows": ["B9", "B8", "A0", "A1", "A9", "A8", "B11", "A6", "A5"] diff --git a/keyboards/rmi_kb/squishyfrl/rules.mk b/keyboards/rmi_kb/squishyfrl/rules.mk deleted file mode 100644 index d612de6c5f5..00000000000 --- a/keyboards/rmi_kb/squishyfrl/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/rmi_kb/squishytkl/info.json b/keyboards/rmi_kb/squishytkl/keyboard.json similarity index 99% rename from keyboards/rmi_kb/squishytkl/info.json rename to keyboards/rmi_kb/squishytkl/keyboard.json index 64b13752d9f..c9b0c276717 100644 --- a/keyboards/rmi_kb/squishytkl/info.json +++ b/keyboards/rmi_kb/squishytkl/keyboard.json @@ -26,6 +26,16 @@ "ws2812": { "pin": "C15" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A15", "C10", "C11", "C12", "D2", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "C6", "C9", "C7", "C8", "A10", "A4", "C14", "A3", "A2", "C3"], "rows": ["B3", "B4", "B5", "C13", "B9", "B8", "A0", "A1", "A9", "A8", "B11", "A6", "A5", "C0"] diff --git a/keyboards/rmi_kb/squishytkl/rules.mk b/keyboards/rmi_kb/squishytkl/rules.mk deleted file mode 100644 index a84e51ab51c..00000000000 --- a/keyboards/rmi_kb/squishytkl/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable rotary encoder fuctionality diff --git a/keyboards/rmkeebs/rm_numpad/info.json b/keyboards/rmkeebs/rm_numpad/keyboard.json similarity index 96% rename from keyboards/rmkeebs/rm_numpad/info.json rename to keyboards/rmkeebs/rm_numpad/keyboard.json index 86ab94653aa..eb3d11ca86d 100644 --- a/keyboards/rmkeebs/rm_numpad/info.json +++ b/keyboards/rmkeebs/rm_numpad/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x524E", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "B5", "B6"], "rows": ["B4", "F7", "C7", "C6", "F1", "F0"] diff --git a/keyboards/rmkeebs/rm_numpad/rules.mk b/keyboards/rmkeebs/rm_numpad/rules.mk deleted file mode 100644 index f024adf5c48..00000000000 --- a/keyboards/rmkeebs/rm_numpad/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/rominronin/katana60/rev1/info.json b/keyboards/rominronin/katana60/rev1/keyboard.json similarity index 96% rename from keyboards/rominronin/katana60/rev1/info.json rename to keyboards/rominronin/katana60/rev1/keyboard.json index f3e827cf85a..56b4709857d 100644 --- a/keyboards/rominronin/katana60/rev1/info.json +++ b/keyboards/rominronin/katana60/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0C2C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B7", "B3", "B2", "B1", "B0", "C7", "D1", "D2", "C6", "B6", "B5", "B4", "D4", "D6", "D7"], "rows": ["F5", "F6", "F4", "F1", "D0"] diff --git a/keyboards/rominronin/katana60/rev1/rules.mk b/keyboards/rominronin/katana60/rev1/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/rominronin/katana60/rev1/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/rominronin/katana60/rev2/info.json b/keyboards/rominronin/katana60/rev2/keyboard.json similarity index 99% rename from keyboards/rominronin/katana60/rev2/info.json rename to keyboards/rominronin/katana60/rev2/keyboard.json index f069e415d93..241a35d4034 100644 --- a/keyboards/rominronin/katana60/rev2/info.json +++ b/keyboards/rominronin/katana60/rev2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xF03B", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "D6", "D4", "D3", "D2", "D1", "D0"], "rows": ["B0", "E6", "D5", "B4", "B5"] diff --git a/keyboards/rominronin/katana60/rev2/rules.mk b/keyboards/rominronin/katana60/rev2/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/rominronin/katana60/rev2/rules.mk +++ /dev/null @@ -1,12 +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 -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/roseslite/info.json b/keyboards/roseslite/keyboard.json similarity index 96% rename from keyboards/roseslite/info.json rename to keyboards/roseslite/keyboard.json index 0d8931301c6..f315e21770a 100644 --- a/keyboards/roseslite/info.json +++ b/keyboards/roseslite/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/roseslite/rules.mk b/keyboards/roseslite/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/roseslite/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 = 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/rotor/info.json b/keyboards/rotor/keyboard.json similarity index 98% rename from keyboards/rotor/info.json rename to keyboards/rotor/keyboard.json index 5f129ebc7cc..19763235400 100644 --- a/keyboards/rotor/info.json +++ b/keyboards/rotor/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xE8BE", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D5", "D3"], "rows": ["B7", "B0", "B1", "B2", "B3"] diff --git a/keyboards/rotor/rules.mk b/keyboards/rotor/rules.mk deleted file mode 100644 index 6ff9b4e02ba..00000000000 --- a/keyboards/rotor/rules.mk +++ /dev/null @@ -1,12 +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 = 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/rotr/info.json b/keyboards/rotr/keyboard.json similarity index 79% rename from keyboards/rotr/info.json rename to keyboards/rotr/keyboard.json index 0b9ce15de31..24694e93f83 100644 --- a/keyboards/rotr/info.json +++ b/keyboards/rotr/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D1", "D0", "D4"], "rows": ["E6"] diff --git a/keyboards/rotr/rules.mk b/keyboards/rotr/rules.mk deleted file mode 100644 index ba4c520f3a7..00000000000 --- a/keyboards/rotr/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 -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 -ENCODER_ENABLE = yes # Enables Rotary Encoder support diff --git a/keyboards/runes/skjoldr/info.json b/keyboards/runes/skjoldr/keyboard.json similarity index 96% rename from keyboards/runes/skjoldr/info.json rename to keyboards/runes/skjoldr/keyboard.json index 69aa29b9d62..a6040dedd6b 100644 --- a/keyboards/runes/skjoldr/info.json +++ b/keyboards/runes/skjoldr/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "D0", "D1", "D2", "D3", "B3", "E6", "D5", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D6", "D7", "B4", "B5", "B0"] diff --git a/keyboards/runes/skjoldr/rules.mk b/keyboards/runes/skjoldr/rules.mk deleted file mode 100644 index 2957d6980d8..00000000000 --- a/keyboards/runes/skjoldr/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 = 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/runes/vaengr/info.json b/keyboards/runes/vaengr/keyboard.json similarity index 95% rename from keyboards/runes/vaengr/info.json rename to keyboards/runes/vaengr/keyboard.json index cf55a4093f0..42389043d4e 100644 --- a/keyboards/runes/vaengr/info.json +++ b/keyboards/runes/vaengr/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "C7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "D0", "D1", "D6", "D4", "D2", "D3", "D5"], "rows": ["B3", "B7", "B0", "F7", "C6"] diff --git a/keyboards/runes/vaengr/rules.mk b/keyboards/runes/vaengr/rules.mk deleted file mode 100644 index 4ae26a099a5..00000000000 --- a/keyboards/runes/vaengr/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 = 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/ryanbaekr/rb1/info.json b/keyboards/ryanbaekr/rb1/keyboard.json similarity index 73% rename from keyboards/ryanbaekr/rb1/info.json rename to keyboards/ryanbaekr/rb1/keyboard.json index c3452d7596d..0d14acb6bb0 100644 --- a/keyboards/ryanbaekr/rb1/info.json +++ b/keyboards/ryanbaekr/rb1/keyboard.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "direct": [ ["B1"] diff --git a/keyboards/ryanbaekr/rb1/rules.mk b/keyboards/ryanbaekr/rb1/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/ryanbaekr/rb1/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 = 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/ryanbaekr/rb18/info.json b/keyboards/ryanbaekr/rb18/keyboard.json similarity index 90% rename from keyboards/ryanbaekr/rb18/info.json rename to keyboards/ryanbaekr/rb18/keyboard.json index f03a29dfb1f..41677aa148e 100644 --- a/keyboards/ryanbaekr/rb18/info.json +++ b/keyboards/ryanbaekr/rb18/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "B0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B2", "B6", "B5", "B4"], "rows": ["B1", "F7", "F6", "F5", "F4"] diff --git a/keyboards/ryanbaekr/rb18/rules.mk b/keyboards/ryanbaekr/rb18/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/ryanbaekr/rb18/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ryanbaekr/rb69/info.json b/keyboards/ryanbaekr/rb69/keyboard.json similarity index 95% rename from keyboards/ryanbaekr/rb69/info.json rename to keyboards/ryanbaekr/rb69/keyboard.json index 8f132e6f5f0..5a50b691cb4 100644 --- a/keyboards/ryanbaekr/rb69/info.json +++ b/keyboards/ryanbaekr/rb69/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "B0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "B4", "B5", "B7", "D5", "C7", "E6"], "rows": ["D7", "C6", "D4", "D0", "D1"] diff --git a/keyboards/ryanbaekr/rb69/rules.mk b/keyboards/ryanbaekr/rb69/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/ryanbaekr/rb69/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ryanbaekr/rb86/info.json b/keyboards/ryanbaekr/rb86/keyboard.json similarity index 96% rename from keyboards/ryanbaekr/rb86/info.json rename to keyboards/ryanbaekr/rb86/keyboard.json index fb4b9a4d21c..1255864c522 100644 --- a/keyboards/ryanbaekr/rb86/info.json +++ b/keyboards/ryanbaekr/rb86/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0086", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "B5", "D5", "C7", "F1", "F0", "D3", "D2", "D1", "D0", "D4", "E6", "B7", "C6", "F4", "F5", "F6"], "rows": ["B0", "B1", "B2", "B3", "B4", "D7"] diff --git a/keyboards/ryanbaekr/rb86/rules.mk b/keyboards/ryanbaekr/rb86/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/ryanbaekr/rb86/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/ryanbaekr/rb87/info.json b/keyboards/ryanbaekr/rb87/keyboard.json similarity index 96% rename from keyboards/ryanbaekr/rb87/info.json rename to keyboards/ryanbaekr/rb87/keyboard.json index cade6f12931..ea19528cb31 100644 --- a/keyboards/ryanbaekr/rb87/info.json +++ b/keyboards/ryanbaekr/rb87/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "B0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "C7", "E6", "B4", "B5", "B7", "D5", "D3"], "rows": ["D2", "D7", "C6", "D4", "D0", "D1"] diff --git a/keyboards/ryanbaekr/rb87/rules.mk b/keyboards/ryanbaekr/rb87/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/ryanbaekr/rb87/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ryloo_studio/m0110/info.json b/keyboards/ryloo_studio/m0110/keyboard.json similarity index 98% rename from keyboards/ryloo_studio/m0110/info.json rename to keyboards/ryloo_studio/m0110/keyboard.json index 2df9f04cc7e..3f2f366cbbe 100644 --- a/keyboards/ryloo_studio/m0110/info.json +++ b/keyboards/ryloo_studio/m0110/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/ryloo_studio/m0110/rules.mk b/keyboards/ryloo_studio/m0110/rules.mk deleted file mode 100755 index 3d5cb57ad50..00000000000 --- a/keyboards/ryloo_studio/m0110/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output From 14990ca5a2d444aa8db62b8faadf11bd5b8b8d75 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 15 Mar 2024 22:24:10 +0000 Subject: [PATCH 037/333] Migrate features from rules.mk to data driven - ST (#23286) --- .../nafuda/{info.json => keyboard.json} | 9 +++++++++ keyboards/salicylic_acid3/nafuda/rules.mk | 13 ------------- keyboards/sam/s80/{info.json => keyboard.json} | 10 ++++++++++ keyboards/sam/s80/rules.mk | 12 ------------ keyboards/sam/sg81m/{info.json => keyboard.json} | 9 +++++++++ keyboards/sam/sg81m/rules.mk | 12 ------------ .../sandwich/keeb68/{info.json => keyboard.json} | 9 +++++++++ keyboards/sandwich/keeb68/rules.mk | 12 ------------ .../satt/vision/{info.json => keyboard.json} | 8 ++++++++ keyboards/satt/vision/rules.mk | 13 ------------- keyboards/sauce/mild/{info.json => keyboard.json} | 8 ++++++++ keyboards/sauce/mild/rules.mk | 13 ------------- .../amber80/solder/{info.json => keyboard.json} | 9 +++++++++ keyboards/sawnsprojects/amber80/solder/rules.mk | 12 ------------ .../krush65/hotswap/{info.json => keyboard.json} | 10 ++++++++++ .../sawnsprojects/krush/krush65/hotswap/rules.mk | 13 ------------- .../krush65/solder/{info.json => keyboard.json} | 10 ++++++++++ .../sawnsprojects/krush/krush65/solder/rules.mk | 12 ------------ .../satxri6key/{info.json => keyboard.json} | 8 ++++++++ keyboards/sawnsprojects/satxri6key/rules.mk | 11 ----------- .../vcl65/solder/{info.json => keyboard.json} | 9 +++++++++ keyboards/sawnsprojects/vcl65/solder/rules.mk | 12 ------------ keyboards/sck/gtm/{info.json => keyboard.json} | 10 ++++++++++ keyboards/sck/gtm/rules.mk | 13 ------------- keyboards/sck/m0116b/{info.json => keyboard.json} | 8 ++++++++ keyboards/sck/m0116b/rules.mk | 12 ------------ keyboards/sck/neiso/{info.json => keyboard.json} | 8 ++++++++ keyboards/sck/neiso/rules.mk | 12 ------------ keyboards/sck/osa/{info.json => keyboard.json} | 9 +++++++++ keyboards/sck/osa/rules.mk | 12 ------------ .../75pixels/{info.json => keyboard.json} | 8 ++++++++ keyboards/sendyyeah/75pixels/rules.mk | 12 ------------ .../sendyyeah/bevi/{info.json => keyboard.json} | 8 ++++++++ keyboards/sendyyeah/bevi/rules.mk | 12 ------------ .../sendyyeah/pix/{info.json => keyboard.json} | 11 +++++++++++ keyboards/sendyyeah/pix/rules.mk | 14 -------------- .../ck60/{info.json => keyboard.json} | 9 +++++++++ keyboards/senselessclay/ck60/rules.mk | 14 -------------- .../ck65/{info.json => keyboard.json} | 9 +++++++++ keyboards/senselessclay/ck65/rules.mk | 12 ------------ .../gos65/{info.json => keyboard.json} | 9 +++++++++ keyboards/senselessclay/gos65/rules.mk | 12 ------------ .../had60/{info.json => keyboard.json} | 8 ++++++++ keyboards/senselessclay/had60/rules.mk | 12 ------------ .../number_pad/{info.json => keyboard.json} | 10 ++++++++++ keyboards/sentraq/number_pad/rules.mk | 12 ------------ .../s60_x/default/{info.json => keyboard.json} | 8 ++++++++ keyboards/sentraq/s60_x/default/rules.mk | 7 ------- .../s60_x/rgb/{info.json => keyboard.json} | 10 ++++++++++ keyboards/sentraq/s60_x/rgb/rules.mk | 12 ------------ .../sentraq/s65_plus/{info.json => keyboard.json} | 10 ++++++++++ keyboards/sentraq/s65_plus/rules.mk | 10 ---------- .../sentraq/s65_x/{info.json => keyboard.json} | 10 ++++++++++ keyboards/sentraq/s65_x/rules.mk | 10 ---------- .../creator_pro/{info.json => keyboard.json} | 9 +++++++++ keyboards/sergiopoverony/creator_pro/rules.mk | 13 ------------- .../sets3n/kk980/{info.json => keyboard.json} | 9 +++++++++ keyboards/sets3n/kk980/rules.mk | 12 ------------ keyboards/shambles/{info.json => keyboard.json} | 8 ++++++++ keyboards/shambles/rules.mk | 12 ------------ .../flygone60/rev3/{info.json => keyboard.json} | 8 ++++++++ keyboards/shandoncodes/flygone60/rev3/rules.mk | 12 ------------ .../mino/hotswap/{info.json => keyboard.json} | 10 ++++++++++ keyboards/shandoncodes/mino/hotswap/rules.mk | 13 ------------- .../shapeshifter4060/{info.json => keyboard.json} | 8 ++++++++ keyboards/shapeshifter4060/rules.mk | 11 ----------- keyboards/shiro/{info.json => keyboard.json} | 8 ++++++++ keyboards/shiro/rules.mk | 12 ------------ keyboards/shk9/{info.json => keyboard.json} | 8 ++++++++ keyboards/shk9/rules.mk | 12 ------------ keyboards/shoc/{info.json => keyboard.json} | 10 ++++++++++ keyboards/shoc/rules.mk | 14 -------------- .../majbritt/rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/sidderskb/majbritt/rev1/rules.mk | 12 ------------ .../majbritt/rev2/{info.json => keyboard.json} | 9 +++++++++ keyboards/sidderskb/majbritt/rev2/rules.mk | 14 -------------- keyboards/singa/{info.json => keyboard.json} | 10 ++++++++++ keyboards/singa/rules.mk | 10 ---------- .../hotswap/{info.json => keyboard.json} | 10 ++++++++++ keyboards/skeletn87/hotswap/rules.mk | 12 ------------ .../soldered/{info.json => keyboard.json} | 10 ++++++++++ keyboards/skeletn87/soldered/rules.mk | 12 ------------ .../skeletonnumpad/{info.json => keyboard.json} | 9 +++++++++ keyboards/skeletonkbd/skeletonnumpad/rules.mk | 12 ------------ keyboards/slz40/{info.json => keyboard.json} | 8 ++++++++ keyboards/slz40/rules.mk | 12 ------------ keyboards/smk60/{info.json => keyboard.json} | 9 +++++++++ keyboards/smk60/rules.mk | 12 ------------ keyboards/snampad/{info.json => keyboard.json} | 8 ++++++++ keyboards/snampad/rules.mk | 12 ------------ .../aliceclone/{info.json => keyboard.json} | 9 +++++++++ keyboards/sneakbox/aliceclone/rules.mk | 13 ------------- .../aliceclonergb/{info.json => keyboard.json} | 10 ++++++++++ keyboards/sneakbox/aliceclonergb/rules.mk | 13 ------------- .../sneakbox/ava/{info.json => keyboard.json} | 10 ++++++++++ keyboards/sneakbox/ava/rules.mk | 13 ------------- .../disarray/ortho/{info.json => keyboard.json} | 9 +++++++++ keyboards/sneakbox/disarray/ortho/rules.mk | 13 ------------- .../staggered/{info.json => keyboard.json} | 9 +++++++++ keyboards/sneakbox/disarray/staggered/rules.mk | 13 ------------- .../sowbug/68keys/{info.json => keyboard.json} | 9 +++++++++ keyboards/sowbug/68keys/rules.mk | 14 -------------- .../sowbug/ansi_tkl/{info.json => keyboard.json} | 9 +++++++++ keyboards/sowbug/ansi_tkl/rules.mk | 14 -------------- keyboards/soy20/{info.json => keyboard.json} | 8 ++++++++ keyboards/soy20/rules.mk | 12 ------------ .../spaceman/2_milk/{info.json => keyboard.json} | 9 +++++++++ keyboards/spaceman/2_milk/rules.mk | 12 ------------ .../pancake/rev2/{info.json => keyboard.json} | 9 +++++++++ keyboards/spaceman/pancake/rev2/rules.mk | 13 ------------- .../spaceman/yun65/{info.json => keyboard.json} | 8 ++++++++ keyboards/spaceman/yun65/rules.mk | 12 ------------ keyboards/splitish/{info.json => keyboard.json} | 8 ++++++++ keyboards/splitish/rules.mk | 10 ---------- .../banime40/{info.json => keyboard.json} | 8 ++++++++ keyboards/sporewoh/banime40/rules.mk | 12 ------------ .../stello65/beta/{info.json => keyboard.json} | 9 +++++++++ keyboards/stello65/beta/rules.mk | 13 ------------- .../stello65/hs_rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/stello65/hs_rev1/rules.mk | 12 ------------ .../stello65/sl_rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/stello65/sl_rev1/rules.mk | 12 ------------ .../pro_micro/{info.json => keyboard.json} | 9 +++++++++ .../stenokeyboards/the_uni/pro_micro/rules.mk | 13 ------------- .../the_uni/rp_2040/{info.json => keyboard.json} | 9 +++++++++ keyboards/stenokeyboards/the_uni/rp_2040/rules.mk | 13 ------------- .../the_uni/usb_c/{info.json => keyboard.json} | 9 +++++++++ keyboards/stenokeyboards/the_uni/usb_c/rules.mk | 13 ------------- keyboards/stratos/{info.json => keyboard.json} | 9 +++++++++ keyboards/stratos/rules.mk | 12 ------------ .../bourgeau/{info.json => keyboard.json} | 9 +++++++++ keyboards/studiokestra/bourgeau/rules.mk | 12 ------------ .../cascade/{info.json => keyboard.json} | 9 +++++++++ keyboards/studiokestra/cascade/rules.mk | 12 ------------ .../nascent/{info.json => keyboard.json} | 8 ++++++++ keyboards/studiokestra/nascent/rules.mk | 12 ------------ .../studiokestra/nue/{info.json => keyboard.json} | 8 ++++++++ keyboards/studiokestra/nue/rules.mk | 12 ------------ .../suavity/ehan/{info.json => keyboard.json} | 8 ++++++++ keyboards/suavity/ehan/rules.mk | 13 ------------- keyboards/subatomic/{info.json => keyboard.json} | 10 ++++++++++ keyboards/subatomic/rules.mk | 13 ------------- .../subrezon/la_nc/{info.json => keyboard.json} | 8 ++++++++ keyboards/subrezon/la_nc/rules.mk | 12 ------------ .../retropad/{info.json => keyboard.json} | 10 ++++++++++ keyboards/swiftrax/retropad/rules.mk | 13 ------------- .../{info.json => keyboard.json} | 9 +++++++++ keyboards/switchplate/southpaw_fullsize/rules.mk | 12 ------------ .../switchplate910/{info.json => keyboard.json} | 9 +++++++++ keyboards/switchplate/switchplate910/rules.mk | 12 ------------ .../synthlabs/solo/{info.json => keyboard.json} | 9 +++++++++ keyboards/synthlabs/solo/rules.mk | 13 ------------- .../center_enter/{info.json => keyboard.json} | 10 ++++++++++ keyboards/takashicompany/center_enter/rules.mk | 14 -------------- .../endzone34/{info.json => keyboard.json} | 10 ++++++++++ keyboards/takashicompany/endzone34/rules.mk | 13 ------------- .../qoolee/{info.json => keyboard.json} | 10 ++++++++++ keyboards/takashicompany/qoolee/rules.mk | 14 -------------- .../radialex/{info.json => keyboard.json} | 9 +++++++++ keyboards/takashicompany/radialex/rules.mk | 12 ------------ .../taleguers75/{info.json => keyboard.json} | 10 ++++++++++ keyboards/taleguers/taleguers75/rules.mk | 13 ------------- keyboards/tanuki/{info.json => keyboard.json} | 9 +++++++++ keyboards/tanuki/rules.mk | 12 ------------ .../team0110/p1800fl/{info.json => keyboard.json} | 10 ++++++++++ keyboards/team0110/p1800fl/rules.mk | 12 ------------ keyboards/technika/{info.json => keyboard.json} | 9 +++++++++ keyboards/technika/rules.mk | 14 -------------- .../teleport/numpad/{info.json => keyboard.json} | 8 ++++++++ keyboards/teleport/numpad/rules.mk | 11 ----------- .../bradpad/{info.json => keyboard.json} | 9 +++++++++ keyboards/tempo_turtle/bradpad/rules.mk | 13 ------------- .../macrowo_pad/{info.json => keyboard.json} | 8 ++++++++ keyboards/tender/macrowo_pad/rules.mk | 11 ----------- keyboards/tenki/{info.json => keyboard.json} | 9 +++++++++ keyboards/tenki/rules.mk | 12 ------------ keyboards/terrazzo/{info.json => keyboard.json} | 11 +++++++++++ keyboards/terrazzo/rules.mk | 15 --------------- keyboards/tgr/910/{info.json => keyboard.json} | 10 ++++++++++ keyboards/tgr/910/rules.mk | 10 ---------- keyboards/tgr/910ce/{info.json => keyboard.json} | 10 ++++++++++ keyboards/tgr/910ce/rules.mk | 10 ---------- keyboards/tgr/alice/{info.json => keyboard.json} | 10 ++++++++++ keyboards/tgr/alice/rules.mk | 10 ---------- .../tgr/jane/v2/{info.json => keyboard.json} | 9 +++++++++ keyboards/tgr/jane/v2/rules.mk | 10 ---------- .../tgr/jane/v2ce/{info.json => keyboard.json} | 9 +++++++++ keyboards/tgr/jane/v2ce/rules.mk | 10 ---------- keyboards/tgr/tris/{info.json => keyboard.json} | 10 ++++++++++ keyboards/tgr/tris/rules.mk | 10 ---------- .../liminal/{info.json => keyboard.json} | 9 +++++++++ keyboards/the_royal/liminal/rules.mk | 12 ------------ .../schwann/{info.json => keyboard.json} | 9 +++++++++ keyboards/the_royal/schwann/rules.mk | 11 ----------- .../degenpad/{info.json => keyboard.json} | 9 +++++++++ keyboards/thepanduuh/degenpad/rules.mk | 13 ------------- .../bananasplit/{info.json => keyboard.json} | 9 +++++++++ keyboards/thevankeyboards/bananasplit/rules.mk | 10 ---------- .../caravan/{info.json => keyboard.json} | 8 ++++++++ keyboards/thevankeyboards/caravan/rules.mk | 11 ----------- .../jetvan/{info.json => keyboard.json} | 9 +++++++++ keyboards/thevankeyboards/jetvan/rules.mk | 12 ------------ .../minivan/{info.json => keyboard.json} | 9 +++++++++ keyboards/thevankeyboards/minivan/rules.mk | 12 ------------ .../roadkit/{info.json => keyboard.json} | 8 ++++++++ keyboards/thevankeyboards/roadkit/rules.mk | 11 ----------- .../tkc/california/{info.json => keyboard.json} | 9 +++++++++ keyboards/tkc/california/rules.mk | 12 ------------ .../tkc/godspeed75/{info.json => keyboard.json} | 9 +++++++++ keyboards/tkc/godspeed75/rules.mk | 13 ------------- keyboards/tkc/m0lly/{info.json => keyboard.json} | 11 +++++++++++ keyboards/tkc/m0lly/rules.mk | 13 ------------- .../tkc/tkc1800/{info.json => keyboard.json} | 11 +++++++++++ keyboards/tkc/tkc1800/rules.mk | 13 ------------- .../tkc/tkl_ab87/{info.json => keyboard.json} | 10 ++++++++++ keyboards/tkc/tkl_ab87/rules.mk | 12 ------------ keyboards/tmo50/{info.json => keyboard.json} | 10 ++++++++++ keyboards/tmo50/rules.mk | 12 ------------ keyboards/toad/{info.json => keyboard.json} | 8 ++++++++ keyboards/toad/rules.mk | 12 ------------ .../tokyo60/{info.json => keyboard.json} | 10 ++++++++++ keyboards/tokyokeyboard/tokyo60/rules.mk | 12 ------------ .../adalyn/{info.json => keyboard.json} | 8 ++++++++ keyboards/tominabox1/adalyn/rules.mk | 10 ---------- .../bigboy/{info.json => keyboard.json} | 9 +++++++++ keyboards/tominabox1/bigboy/rules.mk | 13 ------------- .../tominabox1/qaz/{info.json => keyboard.json} | 9 +++++++++ keyboards/tominabox1/qaz/rules.mk | 12 ------------ keyboards/tr60w/{info.json => keyboard.json} | 10 ++++++++++ keyboards/tr60w/rules.mk | 12 ------------ .../trashman/ketch/{info.json => keyboard.json} | 9 +++++++++ keyboards/trashman/ketch/rules.mk | 12 ------------ .../treasure/type9/{info.json => keyboard.json} | 9 +++++++++ keyboards/treasure/type9/rules.mk | 12 ------------ .../tunks/ergo33/{info.json => keyboard.json} | 10 ++++++++++ keyboards/tunks/ergo33/rules.mk | 14 -------------- 236 files changed, 1070 insertions(+), 1432 deletions(-) rename keyboards/salicylic_acid3/nafuda/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/salicylic_acid3/nafuda/rules.mk rename keyboards/sam/s80/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/sam/s80/rules.mk rename keyboards/sam/sg81m/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/sam/sg81m/rules.mk rename keyboards/sandwich/keeb68/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/sandwich/keeb68/rules.mk rename keyboards/satt/vision/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/satt/vision/rules.mk rename keyboards/sauce/mild/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/sauce/mild/rules.mk rename keyboards/sawnsprojects/amber80/solder/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/sawnsprojects/amber80/solder/rules.mk rename keyboards/sawnsprojects/krush/krush65/hotswap/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk rename keyboards/sawnsprojects/krush/krush65/solder/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/sawnsprojects/krush/krush65/solder/rules.mk rename keyboards/sawnsprojects/satxri6key/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/sawnsprojects/satxri6key/rules.mk rename keyboards/sawnsprojects/vcl65/solder/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/sawnsprojects/vcl65/solder/rules.mk rename keyboards/sck/gtm/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/sck/gtm/rules.mk rename keyboards/sck/m0116b/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/sck/m0116b/rules.mk rename keyboards/sck/neiso/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/sck/neiso/rules.mk rename keyboards/sck/osa/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/sck/osa/rules.mk rename keyboards/sendyyeah/75pixels/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/sendyyeah/75pixels/rules.mk rename keyboards/sendyyeah/bevi/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/sendyyeah/bevi/rules.mk rename keyboards/sendyyeah/pix/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/sendyyeah/pix/rules.mk rename keyboards/senselessclay/ck60/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/senselessclay/ck60/rules.mk rename keyboards/senselessclay/ck65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/senselessclay/ck65/rules.mk rename keyboards/senselessclay/gos65/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/senselessclay/gos65/rules.mk rename keyboards/senselessclay/had60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/senselessclay/had60/rules.mk rename keyboards/sentraq/number_pad/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/sentraq/number_pad/rules.mk rename keyboards/sentraq/s60_x/default/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/sentraq/s60_x/default/rules.mk rename keyboards/sentraq/s60_x/rgb/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/sentraq/s60_x/rgb/rules.mk rename keyboards/sentraq/s65_plus/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/sentraq/s65_plus/rules.mk rename keyboards/sentraq/s65_x/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/sentraq/s65_x/rules.mk rename keyboards/sergiopoverony/creator_pro/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/sergiopoverony/creator_pro/rules.mk rename keyboards/sets3n/kk980/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/sets3n/kk980/rules.mk rename keyboards/shambles/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/shambles/rules.mk rename keyboards/shandoncodes/flygone60/rev3/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/shandoncodes/flygone60/rev3/rules.mk rename keyboards/shandoncodes/mino/hotswap/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/shandoncodes/mino/hotswap/rules.mk rename keyboards/shapeshifter4060/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/shapeshifter4060/rules.mk rename keyboards/shiro/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/shiro/rules.mk rename keyboards/shk9/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/shk9/rules.mk rename keyboards/shoc/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/shoc/rules.mk rename keyboards/sidderskb/majbritt/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/sidderskb/majbritt/rev1/rules.mk rename keyboards/sidderskb/majbritt/rev2/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/sidderskb/majbritt/rev2/rules.mk rename keyboards/singa/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/singa/rules.mk rename keyboards/skeletn87/hotswap/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/skeletn87/hotswap/rules.mk rename keyboards/skeletn87/soldered/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/skeletn87/soldered/rules.mk rename keyboards/skeletonkbd/skeletonnumpad/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/skeletonkbd/skeletonnumpad/rules.mk rename keyboards/slz40/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/slz40/rules.mk rename keyboards/smk60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/smk60/rules.mk rename keyboards/snampad/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/snampad/rules.mk rename keyboards/sneakbox/aliceclone/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/sneakbox/aliceclone/rules.mk rename keyboards/sneakbox/aliceclonergb/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/sneakbox/aliceclonergb/rules.mk rename keyboards/sneakbox/ava/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/sneakbox/ava/rules.mk rename keyboards/sneakbox/disarray/ortho/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/sneakbox/disarray/ortho/rules.mk rename keyboards/sneakbox/disarray/staggered/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/sneakbox/disarray/staggered/rules.mk rename keyboards/sowbug/68keys/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/sowbug/68keys/rules.mk rename keyboards/sowbug/ansi_tkl/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/sowbug/ansi_tkl/rules.mk rename keyboards/soy20/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/soy20/rules.mk rename keyboards/spaceman/2_milk/{info.json => keyboard.json} (76%) delete mode 100644 keyboards/spaceman/2_milk/rules.mk rename keyboards/spaceman/pancake/rev2/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/spaceman/pancake/rev2/rules.mk rename keyboards/spaceman/yun65/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/spaceman/yun65/rules.mk rename keyboards/splitish/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/splitish/rules.mk rename keyboards/sporewoh/banime40/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/sporewoh/banime40/rules.mk rename keyboards/stello65/beta/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/stello65/beta/rules.mk rename keyboards/stello65/hs_rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/stello65/hs_rev1/rules.mk rename keyboards/stello65/sl_rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/stello65/sl_rev1/rules.mk rename keyboards/stenokeyboards/the_uni/pro_micro/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/stenokeyboards/the_uni/pro_micro/rules.mk rename keyboards/stenokeyboards/the_uni/rp_2040/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/stenokeyboards/the_uni/rp_2040/rules.mk rename keyboards/stenokeyboards/the_uni/usb_c/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/stenokeyboards/the_uni/usb_c/rules.mk rename keyboards/stratos/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/stratos/rules.mk rename keyboards/studiokestra/bourgeau/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/studiokestra/bourgeau/rules.mk rename keyboards/studiokestra/cascade/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/studiokestra/cascade/rules.mk rename keyboards/studiokestra/nascent/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/studiokestra/nascent/rules.mk rename keyboards/studiokestra/nue/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/studiokestra/nue/rules.mk rename keyboards/suavity/ehan/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/suavity/ehan/rules.mk rename keyboards/subatomic/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/subatomic/rules.mk rename keyboards/subrezon/la_nc/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/subrezon/la_nc/rules.mk rename keyboards/swiftrax/retropad/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/swiftrax/retropad/rules.mk rename keyboards/switchplate/southpaw_fullsize/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/switchplate/southpaw_fullsize/rules.mk rename keyboards/switchplate/switchplate910/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/switchplate/switchplate910/rules.mk rename keyboards/synthlabs/solo/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/synthlabs/solo/rules.mk rename keyboards/takashicompany/center_enter/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/takashicompany/center_enter/rules.mk rename keyboards/takashicompany/endzone34/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/takashicompany/endzone34/rules.mk rename keyboards/takashicompany/qoolee/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/takashicompany/qoolee/rules.mk rename keyboards/takashicompany/radialex/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/takashicompany/radialex/rules.mk rename keyboards/taleguers/taleguers75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/taleguers/taleguers75/rules.mk rename keyboards/tanuki/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/tanuki/rules.mk rename keyboards/team0110/p1800fl/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/team0110/p1800fl/rules.mk rename keyboards/technika/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/technika/rules.mk rename keyboards/teleport/numpad/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/teleport/numpad/rules.mk rename keyboards/tempo_turtle/bradpad/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/tempo_turtle/bradpad/rules.mk rename keyboards/tender/macrowo_pad/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/tender/macrowo_pad/rules.mk rename keyboards/tenki/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/tenki/rules.mk rename keyboards/terrazzo/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/terrazzo/rules.mk rename keyboards/tgr/910/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/tgr/910/rules.mk rename keyboards/tgr/910ce/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/tgr/910ce/rules.mk rename keyboards/tgr/alice/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/tgr/alice/rules.mk rename keyboards/tgr/jane/v2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/tgr/jane/v2/rules.mk rename keyboards/tgr/jane/v2ce/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/tgr/jane/v2ce/rules.mk rename keyboards/tgr/tris/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/tgr/tris/rules.mk rename keyboards/the_royal/liminal/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/the_royal/liminal/rules.mk rename keyboards/the_royal/schwann/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/the_royal/schwann/rules.mk rename keyboards/thepanduuh/degenpad/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/thepanduuh/degenpad/rules.mk rename keyboards/thevankeyboards/bananasplit/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/thevankeyboards/bananasplit/rules.mk rename keyboards/thevankeyboards/caravan/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/thevankeyboards/caravan/rules.mk rename keyboards/thevankeyboards/jetvan/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/thevankeyboards/jetvan/rules.mk rename keyboards/thevankeyboards/minivan/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/thevankeyboards/minivan/rules.mk rename keyboards/thevankeyboards/roadkit/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/thevankeyboards/roadkit/rules.mk rename keyboards/tkc/california/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/tkc/california/rules.mk rename keyboards/tkc/godspeed75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/tkc/godspeed75/rules.mk rename keyboards/tkc/m0lly/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/tkc/m0lly/rules.mk rename keyboards/tkc/tkc1800/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/tkc/tkc1800/rules.mk rename keyboards/tkc/tkl_ab87/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/tkc/tkl_ab87/rules.mk rename keyboards/tmo50/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/tmo50/rules.mk rename keyboards/toad/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/toad/rules.mk rename keyboards/tokyokeyboard/tokyo60/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/tokyokeyboard/tokyo60/rules.mk rename keyboards/tominabox1/adalyn/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/tominabox1/adalyn/rules.mk rename keyboards/tominabox1/bigboy/{info.json => keyboard.json} (89%) delete mode 100755 keyboards/tominabox1/bigboy/rules.mk rename keyboards/tominabox1/qaz/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/tominabox1/qaz/rules.mk rename keyboards/tr60w/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/tr60w/rules.mk rename keyboards/trashman/ketch/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/trashman/ketch/rules.mk rename keyboards/treasure/type9/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/treasure/type9/rules.mk rename keyboards/tunks/ergo33/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/tunks/ergo33/rules.mk diff --git a/keyboards/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/keyboard.json similarity index 87% rename from keyboards/salicylic_acid3/nafuda/info.json rename to keyboards/salicylic_acid3/nafuda/keyboard.json index b42cfeb6b4f..59e646c5b7f 100644 --- a/keyboards/salicylic_acid3/nafuda/info.json +++ b/keyboards/salicylic_acid3/nafuda/keyboard.json @@ -27,6 +27,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6"], "rows": ["D1", "D0", "D4"] diff --git a/keyboards/salicylic_acid3/nafuda/rules.mk b/keyboards/salicylic_acid3/nafuda/rules.mk deleted file mode 100644 index 84e129e63b9..00000000000 --- a/keyboards/salicylic_acid3/nafuda/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 -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -OLED_ENABLE = no diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/keyboard.json similarity index 96% rename from keyboards/sam/s80/info.json rename to keyboards/sam/s80/keyboard.json index 3949a2680ab..c721efdbd79 100644 --- a/keyboards/sam/s80/info.json +++ b/keyboards/sam/s80/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x3830", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/sam/s80/rules.mk b/keyboards/sam/s80/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/sam/s80/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/keyboard.json similarity index 98% rename from keyboards/sam/sg81m/info.json rename to keyboards/sam/sg81m/keyboard.json index ca06c38aa4c..66e0f1ab9ce 100644 --- a/keyboards/sam/sg81m/info.json +++ b/keyboards/sam/sg81m/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x3831", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B7", "B6", "B5", "B4", "C7", "C6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/sam/sg81m/rules.mk b/keyboards/sam/sg81m/rules.mk deleted file mode 100644 index 2626cca9293..00000000000 --- a/keyboards/sam/sg81m/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 = 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/sandwich/keeb68/info.json b/keyboards/sandwich/keeb68/keyboard.json similarity index 95% rename from keyboards/sandwich/keeb68/info.json rename to keyboards/sandwich/keeb68/keyboard.json index df8b91a3385..ffad82b8271 100644 --- a/keyboards/sandwich/keeb68/info.json +++ b/keyboards/sandwich/keeb68/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "C6", "F7", "E6", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B4", "B5"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/sandwich/keeb68/rules.mk b/keyboards/sandwich/keeb68/rules.mk deleted file mode 100644 index b325f3f0c79..00000000000 --- a/keyboards/sandwich/keeb68/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 = 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/satt/vision/info.json b/keyboards/satt/vision/keyboard.json similarity index 94% rename from keyboards/satt/vision/info.json rename to keyboards/satt/vision/keyboard.json index 90dad63451d..7683855f42b 100644 --- a/keyboards/satt/vision/info.json +++ b/keyboards/satt/vision/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5649", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B1", "B0", "A7", "A6", "A5", "A4", "A3", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], "rows": ["B12", "B2", "A2", "A1"] diff --git a/keyboards/satt/vision/rules.mk b/keyboards/satt/vision/rules.mk deleted file mode 100644 index 7f4f202a1b7..00000000000 --- a/keyboards/satt/vision/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 -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 - diff --git a/keyboards/sauce/mild/info.json b/keyboards/sauce/mild/keyboard.json similarity index 99% rename from keyboards/sauce/mild/info.json rename to keyboards/sauce/mild/keyboard.json index 1573e4dcf6d..48cc1c772f3 100644 --- a/keyboards/sauce/mild/info.json +++ b/keyboards/sauce/mild/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x7783", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A4", "A3", "A2", "A1", "B6", "B5", "B4"], "rows": ["C13", "C14", "C15", "A15", "F0", "F1"] diff --git a/keyboards/sauce/mild/rules.mk b/keyboards/sauce/mild/rules.mk deleted file mode 100644 index ca4d3845848..00000000000 --- a/keyboards/sauce/mild/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 -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/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/keyboard.json similarity index 99% rename from keyboards/sawnsprojects/amber80/solder/info.json rename to keyboards/sawnsprojects/amber80/solder/keyboard.json index f6c458a9b72..dc8e718fd66 100644 --- a/keyboards/sawnsprojects/amber80/solder/info.json +++ b/keyboards/sawnsprojects/amber80/solder/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xA801", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F6", "F7", "C7", "C6", "B6", "B5", "D6", "D4"], "rows": ["B1", "B2", "B3", "B7", "D0", "D1", "F1", "F0", "D7", "B4", "D5", "D3"] diff --git a/keyboards/sawnsprojects/amber80/solder/rules.mk b/keyboards/sawnsprojects/amber80/solder/rules.mk deleted file mode 100644 index 97c1694c811..00000000000 --- a/keyboards/sawnsprojects/amber80/solder/rules.mk +++ /dev/null @@ -1,12 +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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/keyboard.json similarity index 95% rename from keyboards/sawnsprojects/krush/krush65/hotswap/info.json rename to keyboards/sawnsprojects/krush/krush65/hotswap/keyboard.json index 5f8036cd3aa..ccb9165c5ba 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x5B31", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B7", "B3", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D0", "D5", "D6", "D3"], "rows": ["B1", "B2", "D4", "F1", "F0"] diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk b/keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk deleted file mode 100644 index 27132e67478..00000000000 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/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 -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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/keyboard.json similarity index 98% rename from keyboards/sawnsprojects/krush/krush65/solder/info.json rename to keyboards/sawnsprojects/krush/krush65/solder/keyboard.json index 853f95b45e2..a72c903d8c3 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush65/solder/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6B31", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3"], "rows": ["B1", "B2", "D1", "D2", "D4", "D6", "F6", "F7", "F5", "F4"] diff --git a/keyboards/sawnsprojects/krush/krush65/solder/rules.mk b/keyboards/sawnsprojects/krush/krush65/solder/rules.mk deleted file mode 100644 index cb7ca38b803..00000000000 --- a/keyboards/sawnsprojects/krush/krush65/solder/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 = 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 -ENCODER_ENABLE = yes diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/keyboard.json similarity index 94% rename from keyboards/sawnsprojects/satxri6key/info.json rename to keyboards/sawnsprojects/satxri6key/keyboard.json index e56af19c7da..7049be25cf8 100644 --- a/keyboards/sawnsprojects/satxri6key/info.json +++ b/keyboards/sawnsprojects/satxri6key/keyboard.json @@ -81,6 +81,14 @@ "ws2812": { "pin": "F0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F1", "F4", "F5"], "rows": ["F7", "F6"] diff --git a/keyboards/sawnsprojects/satxri6key/rules.mk b/keyboards/sawnsprojects/satxri6key/rules.mk deleted file mode 100644 index 1dfb86ae3c3..00000000000 --- a/keyboards/sawnsprojects/satxri6key/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/keyboard.json similarity index 99% rename from keyboards/sawnsprojects/vcl65/solder/info.json rename to keyboards/sawnsprojects/vcl65/solder/keyboard.json index a7c3975ccf0..4fc0f29766d 100644 --- a/keyboards/sawnsprojects/vcl65/solder/info.json +++ b/keyboards/sawnsprojects/vcl65/solder/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1727", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B2", "B5", "F5", "C7", "B4", "C6", "D7", "D6", "D4", "D5", "D3", "D2", "B6", "D1", "D0"], "rows": ["F6", "F7", "F0", "F4", "B1"] diff --git a/keyboards/sawnsprojects/vcl65/solder/rules.mk b/keyboards/sawnsprojects/vcl65/solder/rules.mk deleted file mode 100644 index fde71474dc9..00000000000 --- a/keyboards/sawnsprojects/vcl65/solder/rules.mk +++ /dev/null @@ -1,12 +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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/sck/gtm/info.json b/keyboards/sck/gtm/keyboard.json similarity index 87% rename from keyboards/sck/gtm/info.json rename to keyboards/sck/gtm/keyboard.json index 7925b109ece..54f6eda446b 100644 --- a/keyboards/sck/gtm/info.json +++ b/keyboards/sck/gtm/keyboard.json @@ -26,6 +26,16 @@ "ws2812": { "pin": "B0" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "encoder": true, + "extrakey": false, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "B7", "C7", "D0"], "rows": ["C4", "C5", "D1"] diff --git a/keyboards/sck/gtm/rules.mk b/keyboards/sck/gtm/rules.mk deleted file mode 100644 index 54bef062d85..00000000000 --- a/keyboards/sck/gtm/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # 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 # [Crawlpad] Custom backlighting code is used, so this should not be enabled -AUDIO_ENABLE = no # [Crawlpad] This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = yes # [Crawlpad] This can be enabled if a ws2812 strip is connected to the expansion port. -ENCODER_ENABLE = yes # [2Key2crawl] Make the knobs turn diff --git a/keyboards/sck/m0116b/info.json b/keyboards/sck/m0116b/keyboard.json similarity index 98% rename from keyboards/sck/m0116b/info.json rename to keyboards/sck/m0116b/keyboard.json index b6ebf873111..68184f340cf 100644 --- a/keyboards/sck/m0116b/info.json +++ b/keyboards/sck/m0116b/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D0", "B3", "B2", "B1", "B0", "E6", "B5", "B6", "C6", "C7", "F7", "D4", "D6", "D7", "B4"], "rows": ["D1", "F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/sck/m0116b/rules.mk b/keyboards/sck/m0116b/rules.mk deleted file mode 100644 index 5356b24d77c..00000000000 --- a/keyboards/sck/m0116b/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 = 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/sck/neiso/info.json b/keyboards/sck/neiso/keyboard.json similarity index 82% rename from keyboards/sck/neiso/info.json rename to keyboards/sck/neiso/keyboard.json index c7b75dbbc31..59132579c92 100644 --- a/keyboards/sck/neiso/info.json +++ b/keyboards/sck/neiso/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B3", "D2", "F5", "F7", "B4"], "rows": ["F4"] diff --git a/keyboards/sck/neiso/rules.mk b/keyboards/sck/neiso/rules.mk deleted file mode 100644 index d87b40c0b2c..00000000000 --- a/keyboards/sck/neiso/rules.mk +++ /dev/null @@ -1,12 +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 = 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 diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/keyboard.json similarity index 98% rename from keyboards/sck/osa/info.json rename to keyboards/sck/osa/keyboard.json index 823b94f4777..1cdd59367bf 100644 --- a/keyboards/sck/osa/info.json +++ b/keyboards/sck/osa/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "D7", "D5", "D3", "D2", "D0", "D1", "B5"], "rows": ["F0", "F1", "F4", "F5", "F6", "B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/sck/osa/rules.mk b/keyboards/sck/osa/rules.mk deleted file mode 100644 index 2b56e4df774..00000000000 --- a/keyboards/sck/osa/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 = 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/sendyyeah/75pixels/info.json b/keyboards/sendyyeah/75pixels/keyboard.json similarity index 96% rename from keyboards/sendyyeah/75pixels/info.json rename to keyboards/sendyyeah/75pixels/keyboard.json index 9ccc1a8dfbf..a9300bb19a5 100644 --- a/keyboards/sendyyeah/75pixels/info.json +++ b/keyboards/sendyyeah/75pixels/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3735", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"], "rows": ["B6", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "B5"] diff --git a/keyboards/sendyyeah/75pixels/rules.mk b/keyboards/sendyyeah/75pixels/rules.mk deleted file mode 100644 index f98db94648b..00000000000 --- a/keyboards/sendyyeah/75pixels/rules.mk +++ /dev/null @@ -1,12 +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 -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/sendyyeah/bevi/info.json b/keyboards/sendyyeah/bevi/keyboard.json similarity index 96% rename from keyboards/sendyyeah/bevi/info.json rename to keyboards/sendyyeah/bevi/keyboard.json index 401d7b42b5b..e0c54f03dbc 100644 --- a/keyboards/sendyyeah/bevi/info.json +++ b/keyboards/sendyyeah/bevi/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4256", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B6", "B4", "B5"], "rows": ["B3", "B2", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"] diff --git a/keyboards/sendyyeah/bevi/rules.mk b/keyboards/sendyyeah/bevi/rules.mk deleted file mode 100644 index f98db94648b..00000000000 --- a/keyboards/sendyyeah/bevi/rules.mk +++ /dev/null @@ -1,12 +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 -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/sendyyeah/pix/info.json b/keyboards/sendyyeah/pix/keyboard.json similarity index 84% rename from keyboards/sendyyeah/pix/info.json rename to keyboards/sendyyeah/pix/keyboard.json index 9701dffb159..40c432fb01c 100644 --- a/keyboards/sendyyeah/pix/info.json +++ b/keyboards/sendyyeah/pix/keyboard.json @@ -36,6 +36,17 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "direct": [ ["C6", "D7", "E6", "B4", "F6"] diff --git a/keyboards/sendyyeah/pix/rules.mk b/keyboards/sendyyeah/pix/rules.mk deleted file mode 100644 index 83231e1022b..00000000000 --- a/keyboards/sendyyeah/pix/rules.mk +++ /dev/null @@ -1,14 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/keyboard.json similarity index 96% rename from keyboards/senselessclay/ck60/info.json rename to keyboards/senselessclay/ck60/keyboard.json index e9971574367..0208ea24bcd 100644 --- a/keyboards/senselessclay/ck60/info.json +++ b/keyboards/senselessclay/ck60/keyboard.json @@ -39,6 +39,15 @@ "max_brightness": 160, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F0", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B3", "B2", "F1", "F4", "F5"] diff --git a/keyboards/senselessclay/ck60/rules.mk b/keyboards/senselessclay/ck60/rules.mk deleted file mode 100644 index c33aa21c4b8..00000000000 --- a/keyboards/senselessclay/ck60/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 = 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 = yes # RGB matrix lighting diff --git a/keyboards/senselessclay/ck65/info.json b/keyboards/senselessclay/ck65/keyboard.json similarity index 96% rename from keyboards/senselessclay/ck65/info.json rename to keyboards/senselessclay/ck65/keyboard.json index 129c487e19d..6ac3de4b8ae 100644 --- a/keyboards/senselessclay/ck65/info.json +++ b/keyboards/senselessclay/ck65/keyboard.json @@ -28,6 +28,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "D5", "D3", "D2", "D1", "D0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B3", "B2", "F1", "F4", "F5"] diff --git a/keyboards/senselessclay/ck65/rules.mk b/keyboards/senselessclay/ck65/rules.mk deleted file mode 100644 index 502dc1b7bdf..00000000000 --- a/keyboards/senselessclay/ck65/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/senselessclay/gos65/info.json b/keyboards/senselessclay/gos65/keyboard.json similarity index 95% rename from keyboards/senselessclay/gos65/info.json rename to keyboards/senselessclay/gos65/keyboard.json index c834b8152f1..bf79cf7fff5 100644 --- a/keyboards/senselessclay/gos65/info.json +++ b/keyboards/senselessclay/gos65/keyboard.json @@ -28,6 +28,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "D5", "D3", "D2", "D1", "D0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B1", "B2", "F1", "F6", "F5"] diff --git a/keyboards/senselessclay/gos65/rules.mk b/keyboards/senselessclay/gos65/rules.mk deleted file mode 100644 index 3c777809b4a..00000000000 --- a/keyboards/senselessclay/gos65/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/senselessclay/had60/info.json b/keyboards/senselessclay/had60/keyboard.json similarity index 99% rename from keyboards/senselessclay/had60/info.json rename to keyboards/senselessclay/had60/keyboard.json index dba08759419..4aa263fb7a9 100644 --- a/keyboards/senselessclay/had60/info.json +++ b/keyboards/senselessclay/had60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x060F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F1", "F0", "F7", "F6", "F5"] diff --git a/keyboards/senselessclay/had60/rules.mk b/keyboards/senselessclay/had60/rules.mk deleted file mode 100644 index 903797c70d9..00000000000 --- a/keyboards/senselessclay/had60/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/keyboard.json similarity index 93% rename from keyboards/sentraq/number_pad/info.json rename to keyboards/sentraq/number_pad/keyboard.json index 7852587d394..2354af3f9c8 100644 --- a/keyboards/sentraq/number_pad/info.json +++ b/keyboards/sentraq/number_pad/keyboard.json @@ -28,6 +28,16 @@ "ws2812": { "pin": "B0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "D5", "D1", "D0"], "rows": ["F5", "F0", "B5", "D6", "D4"] diff --git a/keyboards/sentraq/number_pad/rules.mk b/keyboards/sentraq/number_pad/rules.mk deleted file mode 100644 index 16be45209b4..00000000000 --- a/keyboards/sentraq/number_pad/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 = 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/sentraq/s60_x/default/info.json b/keyboards/sentraq/s60_x/default/keyboard.json similarity index 99% rename from keyboards/sentraq/s60_x/default/info.json rename to keyboards/sentraq/s60_x/default/keyboard.json index 70ec42fd9eb..262c3ae862a 100644 --- a/keyboards/sentraq/s60_x/default/info.json +++ b/keyboards/sentraq/s60_x/default/keyboard.json @@ -1,5 +1,13 @@ { "keyboard_name": "S60-X", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E6", "F1"], "rows": ["B7", "B3", "B2", "B1", "B0"] diff --git a/keyboards/sentraq/s60_x/default/rules.mk b/keyboards/sentraq/s60_x/default/rules.mk deleted file mode 100644 index 6da7eeb948a..00000000000 --- a/keyboards/sentraq/s60_x/default/rules.mk +++ /dev/null @@ -1,7 +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 -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/keyboard.json similarity index 98% rename from keyboards/sentraq/s60_x/rgb/info.json rename to keyboards/sentraq/s60_x/rgb/keyboard.json index 108eb42b3f2..20b67976c4d 100644 --- a/keyboards/sentraq/s60_x/rgb/info.json +++ b/keyboards/sentraq/s60_x/rgb/keyboard.json @@ -1,5 +1,15 @@ { "keyboard_name": "S60-X-RGB", + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "B6", "C6", "C7", "F1", "F0", "E6", "B3", "B2", "B1", "B0"], "rows": ["B5", "B4", "D7", "D6", "D4"] diff --git a/keyboards/sentraq/s60_x/rgb/rules.mk b/keyboards/sentraq/s60_x/rgb/rules.mk deleted file mode 100644 index 28fa223e99f..00000000000 --- a/keyboards/sentraq/s60_x/rgb/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 -AUDIO_ENABLE = no # Audio output -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 = yes # Enable RGB light diff --git a/keyboards/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/keyboard.json similarity index 97% rename from keyboards/sentraq/s65_plus/info.json rename to keyboards/sentraq/s65_plus/keyboard.json index bac1729ce4e..d802c88d9c5 100644 --- a/keyboards/sentraq/s65_plus/info.json +++ b/keyboards/sentraq/s65_plus/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "D5", "B2", "B3", "D0", "D1", "D2", "D4", "D6", "D7", "F7"], "rows": ["C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/sentraq/s65_plus/rules.mk b/keyboards/sentraq/s65_plus/rules.mk deleted file mode 100644 index 7b8e9cd1c4f..00000000000 --- a/keyboards/sentraq/s65_plus/rules.mk +++ /dev/null @@ -1,10 +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 -AUDIO_ENABLE = no # Audio output -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable RGB light diff --git a/keyboards/sentraq/s65_x/info.json b/keyboards/sentraq/s65_x/keyboard.json similarity index 97% rename from keyboards/sentraq/s65_x/info.json rename to keyboards/sentraq/s65_x/keyboard.json index 416baa89df3..d5b20392e3b 100644 --- a/keyboards/sentraq/s65_x/info.json +++ b/keyboards/sentraq/s65_x/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F1", "F0", "E6", "B0", "B1", "D5", "B2", "B3", "D0", "D1", "D2", "D4", "D6", "D7", "F7"], "rows": ["C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/sentraq/s65_x/rules.mk b/keyboards/sentraq/s65_x/rules.mk deleted file mode 100644 index 7b8e9cd1c4f..00000000000 --- a/keyboards/sentraq/s65_x/rules.mk +++ /dev/null @@ -1,10 +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 -AUDIO_ENABLE = no # Audio output -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable RGB light diff --git a/keyboards/sergiopoverony/creator_pro/info.json b/keyboards/sergiopoverony/creator_pro/keyboard.json similarity index 85% rename from keyboards/sergiopoverony/creator_pro/info.json rename to keyboards/sergiopoverony/creator_pro/keyboard.json index 4c9143ea078..9b3cafe1837 100644 --- a/keyboards/sergiopoverony/creator_pro/info.json +++ b/keyboards/sergiopoverony/creator_pro/keyboard.json @@ -15,6 +15,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "direct": [ ["D1", "D4", "C6", "D7", "E6", "B2", "B3", "B1", "F7"] diff --git a/keyboards/sergiopoverony/creator_pro/rules.mk b/keyboards/sergiopoverony/creator_pro/rules.mk deleted file mode 100644 index a7fd1110b21..00000000000 --- a/keyboards/sergiopoverony/creator_pro/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/sets3n/kk980/info.json b/keyboards/sets3n/kk980/keyboard.json similarity index 97% rename from keyboards/sets3n/kk980/info.json rename to keyboards/sets3n/kk980/keyboard.json index 2efdb4dafef..0a4a87d2992 100644 --- a/keyboards/sets3n/kk980/info.json +++ b/keyboards/sets3n/kk980/keyboard.json @@ -29,6 +29,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "B1", "B0", "D0", "D1"], "rows": ["B2", "B3", "D3", "D4", "D5", "D6"] diff --git a/keyboards/sets3n/kk980/rules.mk b/keyboards/sets3n/kk980/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/sets3n/kk980/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 = 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/shambles/info.json b/keyboards/shambles/keyboard.json similarity index 95% rename from keyboards/shambles/info.json rename to keyboards/shambles/keyboard.json index b49849b5c6e..7f11204be0e 100644 --- a/keyboards/shambles/info.json +++ b/keyboards/shambles/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0F42", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "F4", "F6"], "rows": ["F5", "B3", "B1", "F7"] diff --git a/keyboards/shambles/rules.mk b/keyboards/shambles/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/shambles/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 = 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/shandoncodes/flygone60/rev3/info.json b/keyboards/shandoncodes/flygone60/rev3/keyboard.json similarity index 95% rename from keyboards/shandoncodes/flygone60/rev3/info.json rename to keyboards/shandoncodes/flygone60/rev3/keyboard.json index 254f093aee7..70a57528f17 100644 --- a/keyboards/shandoncodes/flygone60/rev3/info.json +++ b/keyboards/shandoncodes/flygone60/rev3/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "E6", "B1", "B2", "B3", "B0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D2", "D3", "D5", "B7", "F1"] diff --git a/keyboards/shandoncodes/flygone60/rev3/rules.mk b/keyboards/shandoncodes/flygone60/rev3/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/shandoncodes/flygone60/rev3/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 = 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/shandoncodes/mino/hotswap/info.json b/keyboards/shandoncodes/mino/hotswap/keyboard.json similarity index 93% rename from keyboards/shandoncodes/mino/hotswap/info.json rename to keyboards/shandoncodes/mino/hotswap/keyboard.json index 9ba76179209..56bca83a926 100644 --- a/keyboards/shandoncodes/mino/hotswap/info.json +++ b/keyboards/shandoncodes/mino/hotswap/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "wpm": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7"], "rows": ["D3", "C6", "D4", "D2"] diff --git a/keyboards/shandoncodes/mino/hotswap/rules.mk b/keyboards/shandoncodes/mino/hotswap/rules.mk deleted file mode 100644 index f8a709213ce..00000000000 --- a/keyboards/shandoncodes/mino/hotswap/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 -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 -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/shapeshifter4060/info.json b/keyboards/shapeshifter4060/keyboard.json similarity index 94% rename from keyboards/shapeshifter4060/info.json rename to keyboards/shapeshifter4060/keyboard.json index 7f815832dd6..8c83153d007 100644 --- a/keyboards/shapeshifter4060/info.json +++ b/keyboards/shapeshifter4060/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xA1F1", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D0", "D1", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/shapeshifter4060/rules.mk b/keyboards/shapeshifter4060/rules.mk deleted file mode 100644 index bac8b2e5518..00000000000 --- a/keyboards/shapeshifter4060/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# 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 = no # Enable N-Key Rollover -#BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -KEY_LOCK_ENABLE = no diff --git a/keyboards/shiro/info.json b/keyboards/shiro/keyboard.json similarity index 88% rename from keyboards/shiro/info.json rename to keyboards/shiro/keyboard.json index a67261dfd2e..bd541b3e7d8 100644 --- a/keyboards/shiro/info.json +++ b/keyboards/shiro/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/shiro/rules.mk b/keyboards/shiro/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/shiro/rules.mk +++ /dev/null @@ -1,12 +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 -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/shk9/info.json b/keyboards/shk9/keyboard.json similarity index 84% rename from keyboards/shk9/info.json rename to keyboards/shk9/keyboard.json index 5974ce37032..19c30ec08dc 100644 --- a/keyboards/shk9/info.json +++ b/keyboards/shk9/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4B39", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B3", "B4", "B5"], "rows": ["B0", "B1", "B2"] diff --git a/keyboards/shk9/rules.mk b/keyboards/shk9/rules.mk deleted file mode 100644 index ab9ede17169..00000000000 --- a/keyboards/shk9/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 = 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/shoc/info.json b/keyboards/shoc/keyboard.json similarity index 94% rename from keyboards/shoc/info.json rename to keyboards/shoc/keyboard.json index 276e64adee9..f044ab1b4e8 100644 --- a/keyboards/shoc/info.json +++ b/keyboards/shoc/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6060", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "oled": true, + "wpm": true + }, "matrix_pins": { "cols": ["D3", "D2", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B6", "B2"] diff --git a/keyboards/shoc/rules.mk b/keyboards/shoc/rules.mk deleted file mode 100644 index 5d17ed9492a..00000000000 --- a/keyboards/shoc/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/sidderskb/majbritt/rev1/info.json b/keyboards/sidderskb/majbritt/rev1/keyboard.json similarity index 96% rename from keyboards/sidderskb/majbritt/rev1/info.json rename to keyboards/sidderskb/majbritt/rev1/keyboard.json index bcbac9b10cc..717b4e85a0d 100644 --- a/keyboards/sidderskb/majbritt/rev1/info.json +++ b/keyboards/sidderskb/majbritt/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/sidderskb/majbritt/rev1/rules.mk b/keyboards/sidderskb/majbritt/rev1/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/sidderskb/majbritt/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 = 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/sidderskb/majbritt/rev2/info.json b/keyboards/sidderskb/majbritt/rev2/keyboard.json similarity index 95% rename from keyboards/sidderskb/majbritt/rev2/info.json rename to keyboards/sidderskb/majbritt/rev2/keyboard.json index cced270ff80..2c71f49dfdb 100644 --- a/keyboards/sidderskb/majbritt/rev2/info.json +++ b/keyboards/sidderskb/majbritt/rev2/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "C7", "B6", "D6", "B4", "D4", "D7", "D5", "D3", "D2", "D1", "D0"], "rows": ["B0", "B1", "F7", "C6", "B5"] diff --git a/keyboards/sidderskb/majbritt/rev2/rules.mk b/keyboards/sidderskb/majbritt/rev2/rules.mk deleted file mode 100644 index d7d5ea9bff6..00000000000 --- a/keyboards/sidderskb/majbritt/rev2/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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes # Encoders diff --git a/keyboards/singa/info.json b/keyboards/singa/keyboard.json similarity index 99% rename from keyboards/singa/info.json rename to keyboards/singa/keyboard.json index 0987506b36e..ef9176211ba 100644 --- a/keyboards/singa/info.json +++ b/keyboards/singa/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x7575", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"] diff --git a/keyboards/singa/rules.mk b/keyboards/singa/rules.mk deleted file mode 100644 index 166b3d3ec8d..00000000000 --- a/keyboards/singa/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/skeletn87/hotswap/info.json b/keyboards/skeletn87/hotswap/keyboard.json similarity index 96% rename from keyboards/skeletn87/hotswap/info.json rename to keyboards/skeletn87/hotswap/keyboard.json index c7eac83fc3d..b0af2306684 100644 --- a/keyboards/skeletn87/hotswap/info.json +++ b/keyboards/skeletn87/hotswap/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xB5E9", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"], "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"] diff --git a/keyboards/skeletn87/hotswap/rules.mk b/keyboards/skeletn87/hotswap/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/skeletn87/hotswap/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/skeletn87/soldered/info.json b/keyboards/skeletn87/soldered/keyboard.json similarity index 98% rename from keyboards/skeletn87/soldered/info.json rename to keyboards/skeletn87/soldered/keyboard.json index 304fa00dc49..292914d8b41 100644 --- a/keyboards/skeletn87/soldered/info.json +++ b/keyboards/skeletn87/soldered/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xB5E8", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"], "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"] diff --git a/keyboards/skeletn87/soldered/rules.mk b/keyboards/skeletn87/soldered/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/skeletn87/soldered/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/skeletonkbd/skeletonnumpad/info.json b/keyboards/skeletonkbd/skeletonnumpad/keyboard.json similarity index 90% rename from keyboards/skeletonkbd/skeletonnumpad/info.json rename to keyboards/skeletonkbd/skeletonnumpad/keyboard.json index 7f4c72248d6..5b72e5d8ec6 100644 --- a/keyboards/skeletonkbd/skeletonnumpad/info.json +++ b/keyboards/skeletonkbd/skeletonnumpad/keyboard.json @@ -29,6 +29,15 @@ "alternating": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5"], "rows": ["B6", "C6", "C7", "F7", "F6"] diff --git a/keyboards/skeletonkbd/skeletonnumpad/rules.mk b/keyboards/skeletonkbd/skeletonnumpad/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/skeletonkbd/skeletonnumpad/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/slz40/info.json b/keyboards/slz40/keyboard.json similarity index 95% rename from keyboards/slz40/info.json rename to keyboards/slz40/keyboard.json index 952f6c74f05..97533fd939e 100644 --- a/keyboards/slz40/info.json +++ b/keyboards/slz40/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "D2", "F5", "D1", "F6", "D0", "F7", "D4", "B1", "C6", "E6", "D7"], "rows": ["B4", "B5", "B3", "B2", "B6"] diff --git a/keyboards/slz40/rules.mk b/keyboards/slz40/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/slz40/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 = 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/smk60/info.json b/keyboards/smk60/keyboard.json similarity index 99% rename from keyboards/smk60/info.json rename to keyboards/smk60/keyboard.json index 535dab67413..67265a667c2 100644 --- a/keyboards/smk60/info.json +++ b/keyboards/smk60/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "E6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "C6", "C7", "F6", "F7", "F4", "B1", "B3", "D0", "D1", "D2", "D3", "D5"], "rows": ["B0", "F0", "F1", "F5", "B2"] diff --git a/keyboards/smk60/rules.mk b/keyboards/smk60/rules.mk deleted file mode 100644 index b5524236523..00000000000 --- a/keyboards/smk60/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Use RGB bottom light diff --git a/keyboards/snampad/info.json b/keyboards/snampad/keyboard.json similarity index 90% rename from keyboards/snampad/info.json rename to keyboards/snampad/keyboard.json index e5eb0272bb3..a5ea2cda2f1 100644 --- a/keyboards/snampad/info.json +++ b/keyboards/snampad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3"] diff --git a/keyboards/snampad/rules.mk b/keyboards/snampad/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/snampad/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/sneakbox/aliceclone/info.json b/keyboards/sneakbox/aliceclone/keyboard.json similarity index 97% rename from keyboards/sneakbox/aliceclone/info.json rename to keyboards/sneakbox/aliceclone/keyboard.json index e53b80f14e8..0e134c84d48 100644 --- a/keyboards/sneakbox/aliceclone/info.json +++ b/keyboards/sneakbox/aliceclone/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"], "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "F7", "B7"] diff --git a/keyboards/sneakbox/aliceclone/rules.mk b/keyboards/sneakbox/aliceclone/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/sneakbox/aliceclone/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/keyboard.json similarity index 97% rename from keyboards/sneakbox/aliceclonergb/info.json rename to keyboards/sneakbox/aliceclonergb/keyboard.json index ecf420a10c4..be3d48fa878 100644 --- a/keyboards/sneakbox/aliceclonergb/info.json +++ b/keyboards/sneakbox/aliceclonergb/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"], "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "F7", "B7"] diff --git a/keyboards/sneakbox/aliceclonergb/rules.mk b/keyboards/sneakbox/aliceclonergb/rules.mk deleted file mode 100644 index c5c4d8f35f1..00000000000 --- a/keyboards/sneakbox/aliceclonergb/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/keyboard.json similarity index 97% rename from keyboards/sneakbox/ava/info.json rename to keyboards/sneakbox/ava/keyboard.json index 78be99ce6ca..41712f7e953 100644 --- a/keyboards/sneakbox/ava/info.json +++ b/keyboards/sneakbox/ava/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"], "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "B7"] diff --git a/keyboards/sneakbox/ava/rules.mk b/keyboards/sneakbox/ava/rules.mk deleted file mode 100644 index 12ee1bcfbd2..00000000000 --- a/keyboards/sneakbox/ava/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/sneakbox/disarray/ortho/info.json b/keyboards/sneakbox/disarray/ortho/keyboard.json similarity index 96% rename from keyboards/sneakbox/disarray/ortho/info.json rename to keyboards/sneakbox/disarray/ortho/keyboard.json index 40b2b0ed2f9..49a321a2da1 100644 --- a/keyboards/sneakbox/disarray/ortho/info.json +++ b/keyboards/sneakbox/disarray/ortho/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["B7", "D0", "D1", "D2", "D3", "B0"] diff --git a/keyboards/sneakbox/disarray/ortho/rules.mk b/keyboards/sneakbox/disarray/ortho/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/sneakbox/disarray/ortho/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/sneakbox/disarray/staggered/info.json b/keyboards/sneakbox/disarray/staggered/keyboard.json similarity index 96% rename from keyboards/sneakbox/disarray/staggered/info.json rename to keyboards/sneakbox/disarray/staggered/keyboard.json index ff79e2ada52..01334273e49 100644 --- a/keyboards/sneakbox/disarray/staggered/info.json +++ b/keyboards/sneakbox/disarray/staggered/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6"], "rows": ["B7", "D0", "D1", "D2", "D3"] diff --git a/keyboards/sneakbox/disarray/staggered/rules.mk b/keyboards/sneakbox/disarray/staggered/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/sneakbox/disarray/staggered/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/sowbug/68keys/info.json b/keyboards/sowbug/68keys/keyboard.json similarity index 96% rename from keyboards/sowbug/68keys/info.json rename to keyboards/sowbug/68keys/keyboard.json index aa22cb804a1..cfdf78efaf2 100644 --- a/keyboards/sowbug/68keys/info.json +++ b/keyboards/sowbug/68keys/keyboard.json @@ -60,6 +60,15 @@ "driver": "ws2812", "max_brightness": 128 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"], "rows": ["C14", "C15", "A0", "A1", "A2"] diff --git a/keyboards/sowbug/68keys/rules.mk b/keyboards/sowbug/68keys/rules.mk deleted file mode 100644 index c49a369dd02..00000000000 --- a/keyboards/sowbug/68keys/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes - diff --git a/keyboards/sowbug/ansi_tkl/info.json b/keyboards/sowbug/ansi_tkl/keyboard.json similarity index 97% rename from keyboards/sowbug/ansi_tkl/info.json rename to keyboards/sowbug/ansi_tkl/keyboard.json index 6c6f2346bda..e6b9d28fdcb 100644 --- a/keyboards/sowbug/ansi_tkl/info.json +++ b/keyboards/sowbug/ansi_tkl/keyboard.json @@ -60,6 +60,15 @@ "driver": "ws2812", "max_brightness": 128 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3"], "rows": ["C14", "C15", "A0", "A1", "A2", "A3"] diff --git a/keyboards/sowbug/ansi_tkl/rules.mk b/keyboards/sowbug/ansi_tkl/rules.mk deleted file mode 100644 index c49a369dd02..00000000000 --- a/keyboards/sowbug/ansi_tkl/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes - diff --git a/keyboards/soy20/info.json b/keyboards/soy20/keyboard.json similarity index 90% rename from keyboards/soy20/info.json rename to keyboards/soy20/keyboard.json index 717a3245af6..e5c4499af54 100644 --- a/keyboards/soy20/info.json +++ b/keyboards/soy20/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x534F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "B6", "B7", "C7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/soy20/rules.mk b/keyboards/soy20/rules.mk deleted file mode 100644 index ab9ede17169..00000000000 --- a/keyboards/soy20/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 = 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/spaceman/2_milk/info.json b/keyboards/spaceman/2_milk/keyboard.json similarity index 76% rename from keyboards/spaceman/2_milk/info.json rename to keyboards/spaceman/2_milk/keyboard.json index a703c8f8903..4fdef6bacec 100644 --- a/keyboards/spaceman/2_milk/info.json +++ b/keyboards/spaceman/2_milk/keyboard.json @@ -16,6 +16,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "direct": [ ["D4"], diff --git a/keyboards/spaceman/2_milk/rules.mk b/keyboards/spaceman/2_milk/rules.mk deleted file mode 100644 index 55f12300d58..00000000000 --- a/keyboards/spaceman/2_milk/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 = 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 = yes # This can be enabled if a ws2812 strip is connected to the expansion port. diff --git a/keyboards/spaceman/pancake/rev2/info.json b/keyboards/spaceman/pancake/rev2/keyboard.json similarity index 94% rename from keyboards/spaceman/pancake/rev2/info.json rename to keyboards/spaceman/pancake/rev2/keyboard.json index d92d5a88f64..88bf2a0b9f3 100644 --- a/keyboards/spaceman/pancake/rev2/info.json +++ b/keyboards/spaceman/pancake/rev2/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x5032", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "oled": true + }, "matrix_pins": { "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["C7", "C6", "B6", "B5"] diff --git a/keyboards/spaceman/pancake/rev2/rules.mk b/keyboards/spaceman/pancake/rev2/rules.mk deleted file mode 100644 index a7cc2bfee46..00000000000 --- a/keyboards/spaceman/pancake/rev2/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 -OLED_ENABLE = yes diff --git a/keyboards/spaceman/yun65/info.json b/keyboards/spaceman/yun65/keyboard.json similarity index 96% rename from keyboards/spaceman/yun65/info.json rename to keyboards/spaceman/yun65/keyboard.json index 40854c78f3b..017de06abb4 100644 --- a/keyboards/spaceman/yun65/info.json +++ b/keyboards/spaceman/yun65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x594E", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D5", "B3"], "rows": ["E6", "D3", "D2", "D1", "D0"] diff --git a/keyboards/spaceman/yun65/rules.mk b/keyboards/spaceman/yun65/rules.mk deleted file mode 100644 index e12dc198de2..00000000000 --- a/keyboards/spaceman/yun65/rules.mk +++ /dev/null @@ -1,12 +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 = 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. diff --git a/keyboards/splitish/info.json b/keyboards/splitish/keyboard.json similarity index 94% rename from keyboards/splitish/info.json rename to keyboards/splitish/keyboard.json index 7183ed66b21..08043173717 100644 --- a/keyboards/splitish/info.json +++ b/keyboards/splitish/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["B4", "B5", "B2", "B6"] diff --git a/keyboards/splitish/rules.mk b/keyboards/splitish/rules.mk deleted file mode 100644 index 363f2330b33..00000000000 --- a/keyboards/splitish/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality diff --git a/keyboards/sporewoh/banime40/info.json b/keyboards/sporewoh/banime40/keyboard.json similarity index 94% rename from keyboards/sporewoh/banime40/info.json rename to keyboards/sporewoh/banime40/keyboard.json index 857daf8ec73..dfe71070a14 100644 --- a/keyboards/sporewoh/banime40/info.json +++ b/keyboards/sporewoh/banime40/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["E6", "D7", "C6", "D4"] diff --git a/keyboards/sporewoh/banime40/rules.mk b/keyboards/sporewoh/banime40/rules.mk deleted file mode 100644 index fd62cad1658..00000000000 --- a/keyboards/sporewoh/banime40/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 = 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/stello65/beta/info.json b/keyboards/stello65/beta/keyboard.json similarity index 99% rename from keyboards/stello65/beta/info.json rename to keyboards/stello65/beta/keyboard.json index 9236d322b9f..230cc6ff007 100644 --- a/keyboards/stello65/beta/info.json +++ b/keyboards/stello65/beta/keyboard.json @@ -11,6 +11,15 @@ "build": { "debounce_type": "sym_defer_pk" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], "rows": ["F0", "E6", "D0", "D1", "C6", "F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/stello65/beta/rules.mk b/keyboards/stello65/beta/rules.mk deleted file mode 100644 index 131aa72aeb5..00000000000 --- a/keyboards/stello65/beta/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/stello65/hs_rev1/info.json b/keyboards/stello65/hs_rev1/keyboard.json similarity index 95% rename from keyboards/stello65/hs_rev1/info.json rename to keyboards/stello65/hs_rev1/keyboard.json index cccaf7ccee3..ebda63da6d0 100644 --- a/keyboards/stello65/hs_rev1/info.json +++ b/keyboards/stello65/hs_rev1/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "D0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["F1", "F0", "D1", "D2", "B6", "C6", "C7", "F7", "F6", "F5"] diff --git a/keyboards/stello65/hs_rev1/rules.mk b/keyboards/stello65/hs_rev1/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/stello65/hs_rev1/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 = 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/stello65/sl_rev1/info.json b/keyboards/stello65/sl_rev1/keyboard.json similarity index 95% rename from keyboards/stello65/sl_rev1/info.json rename to keyboards/stello65/sl_rev1/keyboard.json index e89c5a5bdf2..9204986cd1e 100644 --- a/keyboards/stello65/sl_rev1/info.json +++ b/keyboards/stello65/sl_rev1/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "B7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F0", "E6", "D0", "D1", "C6", "F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/stello65/sl_rev1/rules.mk b/keyboards/stello65/sl_rev1/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/stello65/sl_rev1/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 = 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/stenokeyboards/the_uni/pro_micro/info.json b/keyboards/stenokeyboards/the_uni/pro_micro/keyboard.json similarity index 90% rename from keyboards/stenokeyboards/the_uni/pro_micro/info.json rename to keyboards/stenokeyboards/the_uni/pro_micro/keyboard.json index 3510e076ff1..f14728b577f 100644 --- a/keyboards/stenokeyboards/the_uni/pro_micro/info.json +++ b/keyboards/stenokeyboards/the_uni/pro_micro/keyboard.json @@ -3,6 +3,15 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": true, + "steno": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B5", "B4", "E6", "D7", "C6", "D4"], "rows": ["F4", "B2", "B6"] diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/rules.mk b/keyboards/stenokeyboards/the_uni/pro_micro/rules.mk deleted file mode 100644 index 7cabc7b8731..00000000000 --- a/keyboards/stenokeyboards/the_uni/pro_micro/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = 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 -STENO_ENABLE = yes diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/info.json b/keyboards/stenokeyboards/the_uni/rp_2040/keyboard.json similarity index 90% rename from keyboards/stenokeyboards/the_uni/rp_2040/info.json rename to keyboards/stenokeyboards/the_uni/rp_2040/keyboard.json index 0fc56dff8d9..1ca94185ab5 100644 --- a/keyboards/stenokeyboards/the_uni/rp_2040/info.json +++ b/keyboards/stenokeyboards/the_uni/rp_2040/keyboard.json @@ -3,6 +3,15 @@ "device_version": "0.0.4", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "steno": true + }, "matrix_pins": { "cols": ["GP24", "GP23", "GP21", "GP20", "GP19", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], "rows": ["GP25", "GP18", "GP17"] diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/rules.mk b/keyboards/stenokeyboards/the_uni/rp_2040/rules.mk deleted file mode 100644 index 2249662c5d2..00000000000 --- a/keyboards/stenokeyboards/the_uni/rp_2040/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -STENO_ENABLE = yes diff --git a/keyboards/stenokeyboards/the_uni/usb_c/info.json b/keyboards/stenokeyboards/the_uni/usb_c/keyboard.json similarity index 90% rename from keyboards/stenokeyboards/the_uni/usb_c/info.json rename to keyboards/stenokeyboards/the_uni/usb_c/keyboard.json index fe7706357d9..5226fb0a8ee 100644 --- a/keyboards/stenokeyboards/the_uni/usb_c/info.json +++ b/keyboards/stenokeyboards/the_uni/usb_c/keyboard.json @@ -3,6 +3,15 @@ "device_version": "0.0.3", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": true, + "steno": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "D5", "D3", "D2", "D1", "D0", "D4"], "rows": ["B7", "D6", "C7"] diff --git a/keyboards/stenokeyboards/the_uni/usb_c/rules.mk b/keyboards/stenokeyboards/the_uni/usb_c/rules.mk deleted file mode 100644 index 7cabc7b8731..00000000000 --- a/keyboards/stenokeyboards/the_uni/usb_c/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = 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 -STENO_ENABLE = yes diff --git a/keyboards/stratos/info.json b/keyboards/stratos/keyboard.json similarity index 99% rename from keyboards/stratos/info.json rename to keyboards/stratos/keyboard.json index e4f6c808fd5..4d4bca34470 100644 --- a/keyboards/stratos/info.json +++ b/keyboards/stratos/keyboard.json @@ -30,6 +30,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "F0", "F1"] diff --git a/keyboards/stratos/rules.mk b/keyboards/stratos/rules.mk deleted file mode 100644 index a927de843cb..00000000000 --- a/keyboards/stratos/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/studiokestra/bourgeau/info.json b/keyboards/studiokestra/bourgeau/keyboard.json similarity index 96% rename from keyboards/studiokestra/bourgeau/info.json rename to keyboards/studiokestra/bourgeau/keyboard.json index e14cfc9fc4f..22cc6095363 100644 --- a/keyboards/studiokestra/bourgeau/info.json +++ b/keyboards/studiokestra/bourgeau/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "B7" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "B0", "D2", "D1", "D0", "D3", "B6", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B5", "B4"], "rows": ["D4", "D6", "D7", "D5", "B1", "F0"] diff --git a/keyboards/studiokestra/bourgeau/rules.mk b/keyboards/studiokestra/bourgeau/rules.mk deleted file mode 100644 index e027898b626..00000000000 --- a/keyboards/studiokestra/bourgeau/rules.mk +++ /dev/null @@ -1,12 +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 # 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/studiokestra/cascade/info.json b/keyboards/studiokestra/cascade/keyboard.json similarity index 98% rename from keyboards/studiokestra/cascade/info.json rename to keyboards/studiokestra/cascade/keyboard.json index 823eebad6e9..f6d95261ac1 100644 --- a/keyboards/studiokestra/cascade/info.json +++ b/keyboards/studiokestra/cascade/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "B0" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "D5", "D1", "D0", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D6", "D7"], "rows": ["F0", "B1", "D4", "F4", "F1"] diff --git a/keyboards/studiokestra/cascade/rules.mk b/keyboards/studiokestra/cascade/rules.mk deleted file mode 100644 index e027898b626..00000000000 --- a/keyboards/studiokestra/cascade/rules.mk +++ /dev/null @@ -1,12 +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 # 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/studiokestra/nascent/info.json b/keyboards/studiokestra/nascent/keyboard.json similarity index 99% rename from keyboards/studiokestra/nascent/info.json rename to keyboards/studiokestra/nascent/keyboard.json index 950b6836be2..c2b14a71bc4 100644 --- a/keyboards/studiokestra/nascent/info.json +++ b/keyboards/studiokestra/nascent/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0165", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D2", "D3", "D7", "D6", "D4", "D5", "B0", "E6"], "rows": ["F5", "F4", "F7", "F6", "C6", "C7", "B4", "B5", "D0", "D1"] diff --git a/keyboards/studiokestra/nascent/rules.mk b/keyboards/studiokestra/nascent/rules.mk deleted file mode 100644 index 6ff9b4e02ba..00000000000 --- a/keyboards/studiokestra/nascent/rules.mk +++ /dev/null @@ -1,12 +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 = 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/studiokestra/nue/info.json b/keyboards/studiokestra/nue/keyboard.json similarity index 99% rename from keyboards/studiokestra/nue/info.json rename to keyboards/studiokestra/nue/keyboard.json index 02ca6229883..ffd5581fee5 100644 --- a/keyboards/studiokestra/nue/info.json +++ b/keyboards/studiokestra/nue/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0701", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F6", "F7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["B0", "B7", "F1", "F5", "F4"] diff --git a/keyboards/studiokestra/nue/rules.mk b/keyboards/studiokestra/nue/rules.mk deleted file mode 100644 index c58df49ea8f..00000000000 --- a/keyboards/studiokestra/nue/rules.mk +++ /dev/null @@ -1,12 +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 = 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/suavity/ehan/info.json b/keyboards/suavity/ehan/keyboard.json similarity index 98% rename from keyboards/suavity/ehan/info.json rename to keyboards/suavity/ehan/keyboard.json index 8526992376b..a025ec4992b 100755 --- a/keyboards/suavity/ehan/info.json +++ b/keyboards/suavity/ehan/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4548", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "C14", "B7", "B6", "B5", "B4", "B3", "A15", "C13", "B9", "B8"], "rows": ["A7", "B0", "A3", "A4", "A5", "A6"] diff --git a/keyboards/suavity/ehan/rules.mk b/keyboards/suavity/ehan/rules.mk deleted file mode 100644 index 5a44d1732f8..00000000000 --- a/keyboards/suavity/ehan/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 -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 - diff --git a/keyboards/subatomic/info.json b/keyboards/subatomic/keyboard.json similarity index 98% rename from keyboards/subatomic/info.json rename to keyboards/subatomic/keyboard.json index 65b1abac268..64f254a087a 100644 --- a/keyboards/subatomic/info.json +++ b/keyboards/subatomic/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6063", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "midi": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7", "C6", "C5"], "rows": ["D2", "D5", "B5", "B6", "D3"] diff --git a/keyboards/subatomic/rules.mk b/keyboards/subatomic/rules.mk deleted file mode 100644 index 3c9bf3cc2cb..00000000000 --- a/keyboards/subatomic/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = yes # Enable keyboard backlight functionality -MIDI_ENABLE = yes # MIDI support -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/subrezon/la_nc/info.json b/keyboards/subrezon/la_nc/keyboard.json similarity index 95% rename from keyboards/subrezon/la_nc/info.json rename to keyboards/subrezon/la_nc/keyboard.json index dd9fbb30a6e..471bf090518 100644 --- a/keyboards/subrezon/la_nc/info.json +++ b/keyboards/subrezon/la_nc/keyboard.json @@ -6,6 +6,14 @@ "pid": "0x1A7C", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B3", "B1", "F7", "F6", "F5", "D4", "C6", "D7", "E6", "B4"], "rows": ["D3", "F4", "D2", "B2", "B5", "B6"] diff --git a/keyboards/subrezon/la_nc/rules.mk b/keyboards/subrezon/la_nc/rules.mk deleted file mode 100644 index 895af57980a..00000000000 --- a/keyboards/subrezon/la_nc/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 = 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/keyboard.json similarity index 86% rename from keyboards/swiftrax/retropad/info.json rename to keyboards/swiftrax/retropad/keyboard.json index 8d6431fdde0..c8dd0e33274 100644 --- a/keyboards/swiftrax/retropad/info.json +++ b/keyboards/swiftrax/retropad/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xEB0C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "D2"], "rows": ["C7", "C6", "B5"] diff --git a/keyboards/swiftrax/retropad/rules.mk b/keyboards/swiftrax/retropad/rules.mk deleted file mode 100644 index 3d49f75c87a..00000000000 --- a/keyboards/swiftrax/retropad/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/switchplate/southpaw_fullsize/info.json b/keyboards/switchplate/southpaw_fullsize/keyboard.json similarity index 98% rename from keyboards/switchplate/southpaw_fullsize/info.json rename to keyboards/switchplate/southpaw_fullsize/keyboard.json index 3397418adfe..822fc660815 100644 --- a/keyboards/switchplate/southpaw_fullsize/info.json +++ b/keyboards/switchplate/southpaw_fullsize/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0017", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["A7", "C7", "C6", "C5", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "E0", "D7", "D6"], "rows": ["E1", "C0", "C1", "C2", "C3", "C4"] diff --git a/keyboards/switchplate/southpaw_fullsize/rules.mk b/keyboards/switchplate/southpaw_fullsize/rules.mk deleted file mode 100644 index 3cd23319a29..00000000000 --- a/keyboards/switchplate/southpaw_fullsize/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 = no # Console for debug -COMMAND_ENABLE = yes # 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/switchplate/switchplate910/info.json b/keyboards/switchplate/switchplate910/keyboard.json similarity index 98% rename from keyboards/switchplate/switchplate910/info.json rename to keyboards/switchplate/switchplate910/keyboard.json index 7c9d9ba62d3..40a2a246374 100644 --- a/keyboards/switchplate/switchplate910/info.json +++ b/keyboards/switchplate/switchplate910/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x2065", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "B3", "B2", "B0", "B1"], "rows": ["F4", "F5", "F6", "F7", "D1"] diff --git a/keyboards/switchplate/switchplate910/rules.mk b/keyboards/switchplate/switchplate910/rules.mk deleted file mode 100644 index 14e80e7106b..00000000000 --- a/keyboards/switchplate/switchplate910/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/synthlabs/solo/info.json b/keyboards/synthlabs/solo/keyboard.json similarity index 94% rename from keyboards/synthlabs/solo/info.json rename to keyboards/synthlabs/solo/keyboard.json index 613ace72657..1aedf981855 100644 --- a/keyboards/synthlabs/solo/info.json +++ b/keyboards/synthlabs/solo/keyboard.json @@ -5,6 +5,15 @@ "maintainer": "hongaaronc", "bootloader": "atmel-dfu", "processor": "atmega32u4", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "direct": [ ["C6", "D6", "B5", "B4", "D7", "B6", "D4"], diff --git a/keyboards/synthlabs/solo/rules.mk b/keyboards/synthlabs/solo/rules.mk deleted file mode 100644 index 131aa72aeb5..00000000000 --- a/keyboards/synthlabs/solo/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/keyboard.json similarity index 93% rename from keyboards/takashicompany/center_enter/info.json rename to keyboards/takashicompany/center_enter/keyboard.json index 77c9410723e..41a3e450931 100644 --- a/keyboards/takashicompany/center_enter/info.json +++ b/keyboards/takashicompany/center_enter/keyboard.json @@ -28,6 +28,16 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D7", "B2", "B6", "D0", "D4", "C6"], "rows": ["E6", "B4", "B5"] diff --git a/keyboards/takashicompany/center_enter/rules.mk b/keyboards/takashicompany/center_enter/rules.mk deleted file mode 100644 index 916e9f99346..00000000000 --- a/keyboards/takashicompany/center_enter/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes diff --git a/keyboards/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/keyboard.json similarity index 92% rename from keyboards/takashicompany/endzone34/info.json rename to keyboards/takashicompany/endzone34/keyboard.json index 8e6f6c29e43..382d2f06724 100644 --- a/keyboards/takashicompany/endzone34/info.json +++ b/keyboards/takashicompany/endzone34/keyboard.json @@ -29,6 +29,16 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "D4", "C6", "D7", "E6", "B4"], "rows": ["B3", "B2", "B6", "B5"] diff --git a/keyboards/takashicompany/endzone34/rules.mk b/keyboards/takashicompany/endzone34/rules.mk deleted file mode 100644 index e6ed3b4b034..00000000000 --- a/keyboards/takashicompany/endzone34/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes diff --git a/keyboards/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/keyboard.json similarity index 93% rename from keyboards/takashicompany/qoolee/info.json rename to keyboards/takashicompany/qoolee/keyboard.json index d4068189b3c..52e6d61b803 100644 --- a/keyboards/takashicompany/qoolee/info.json +++ b/keyboards/takashicompany/qoolee/keyboard.json @@ -28,6 +28,16 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D0", "D4", "C6", "D7"], "rows": ["E6", "B4", "B5"] diff --git a/keyboards/takashicompany/qoolee/rules.mk b/keyboards/takashicompany/qoolee/rules.mk deleted file mode 100644 index 0aa58dc8619..00000000000 --- a/keyboards/takashicompany/qoolee/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/keyboard.json similarity index 94% rename from keyboards/takashicompany/radialex/info.json rename to keyboards/takashicompany/radialex/keyboard.json index e334d2c16ca..3cc94cdd913 100644 --- a/keyboards/takashicompany/radialex/info.json +++ b/keyboards/takashicompany/radialex/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["B6", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/takashicompany/radialex/rules.mk b/keyboards/takashicompany/radialex/rules.mk deleted file mode 100644 index 7800cd80750..00000000000 --- a/keyboards/takashicompany/radialex/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/taleguers/taleguers75/info.json b/keyboards/taleguers/taleguers75/keyboard.json similarity index 96% rename from keyboards/taleguers/taleguers75/info.json rename to keyboards/taleguers/taleguers75/keyboard.json index 7ebd8707b7c..5526c0b0a87 100644 --- a/keyboards/taleguers/taleguers75/info.json +++ b/keyboards/taleguers/taleguers75/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0075", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "E6", "B7", "C7", "C6", "D4", "D6", "D7", "B4", "D0", "D1", "F7"], "rows": ["B0", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/taleguers/taleguers75/rules.mk b/keyboards/taleguers/taleguers75/rules.mk deleted file mode 100644 index 7e8534dae5a..00000000000 --- a/keyboards/taleguers/taleguers75/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/tanuki/info.json b/keyboards/tanuki/keyboard.json similarity index 94% rename from keyboards/tanuki/info.json rename to keyboards/tanuki/keyboard.json index e7bb9aa8985..cebcc4404e4 100644 --- a/keyboards/tanuki/info.json +++ b/keyboards/tanuki/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "D1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "F4", "F5", "F6"], "rows": ["F7", "B1", "D4", "D0"] diff --git a/keyboards/tanuki/rules.mk b/keyboards/tanuki/rules.mk deleted file mode 100644 index 9047eadf714..00000000000 --- a/keyboards/tanuki/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 = 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 -RGBLIGHT_ENABLE =yes # Enable keyboard underlight functionality -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no diff --git a/keyboards/team0110/p1800fl/info.json b/keyboards/team0110/p1800fl/keyboard.json similarity index 96% rename from keyboards/team0110/p1800fl/info.json rename to keyboards/team0110/p1800fl/keyboard.json index d329c6de293..d5a34de0494 100644 --- a/keyboards/team0110/p1800fl/info.json +++ b/keyboards/team0110/p1800fl/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x3EAE", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2"], "rows": ["B6", "B5", "B4", "D7", "D6", "D4"] diff --git a/keyboards/team0110/p1800fl/rules.mk b/keyboards/team0110/p1800fl/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/team0110/p1800fl/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/technika/info.json b/keyboards/technika/keyboard.json similarity index 95% rename from keyboards/technika/info.json rename to keyboards/technika/keyboard.json index 1b99728481e..303983dfb41 100644 --- a/keyboards/technika/info.json +++ b/keyboards/technika/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6049", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B14", "B12", "B2", "B1", "B0", "A7", "A6", "A3", "B9", "B8", "B7"], "rows": ["B11", "B10", "A5", "A4"] diff --git a/keyboards/technika/rules.mk b/keyboards/technika/rules.mk deleted file mode 100644 index 4d4628146af..00000000000 --- a/keyboards/technika/rules.mk +++ /dev/null @@ -1,14 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no - diff --git a/keyboards/teleport/numpad/info.json b/keyboards/teleport/numpad/keyboard.json similarity index 89% rename from keyboards/teleport/numpad/info.json rename to keyboards/teleport/numpad/keyboard.json index 50ab7d0d709..ace8e949e00 100644 --- a/keyboards/teleport/numpad/info.json +++ b/keyboards/teleport/numpad/keyboard.json @@ -7,6 +7,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F6", "F5", "F7", "F4"], "rows": ["D7", "D4", "D6", "B4", "B5"] diff --git a/keyboards/teleport/numpad/rules.mk b/keyboards/teleport/numpad/rules.mk deleted file mode 100644 index 1304f503911..00000000000 --- a/keyboards/teleport/numpad/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow diff --git a/keyboards/tempo_turtle/bradpad/info.json b/keyboards/tempo_turtle/bradpad/keyboard.json similarity index 88% rename from keyboards/tempo_turtle/bradpad/info.json rename to keyboards/tempo_turtle/bradpad/keyboard.json index 7b6d03823a7..374dbeaaaf6 100644 --- a/keyboards/tempo_turtle/bradpad/info.json +++ b/keyboards/tempo_turtle/bradpad/keyboard.json @@ -4,6 +4,15 @@ "url": "https://tempoturtle.com", "maintainer": "wxyangf", "diode_direction": "ROW2COL", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "rows": ["B7", "D5", "C7", "D2", "D3"], "cols": ["D7", "E6", "B4", "F1"] diff --git a/keyboards/tempo_turtle/bradpad/rules.mk b/keyboards/tempo_turtle/bradpad/rules.mk deleted file mode 100644 index 7738ffff8b8..00000000000 --- a/keyboards/tempo_turtle/bradpad/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 -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 -UNICODE_ENABLE = yes diff --git a/keyboards/tender/macrowo_pad/info.json b/keyboards/tender/macrowo_pad/keyboard.json similarity index 90% rename from keyboards/tender/macrowo_pad/info.json rename to keyboards/tender/macrowo_pad/keyboard.json index 39a2e87ca1b..53e22289f60 100644 --- a/keyboards/tender/macrowo_pad/info.json +++ b/keyboards/tender/macrowo_pad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xE936", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["B5", "D7"] diff --git a/keyboards/tender/macrowo_pad/rules.mk b/keyboards/tender/macrowo_pad/rules.mk deleted file mode 100644 index a112ce1f160..00000000000 --- a/keyboards/tender/macrowo_pad/rules.mk +++ /dev/null @@ -1,11 +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 -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no # Enable support for EC11 Rotary Encoder diff --git a/keyboards/tenki/info.json b/keyboards/tenki/keyboard.json similarity index 91% rename from keyboards/tenki/info.json rename to keyboards/tenki/keyboard.json index 10e5a88d1c0..7c05c98ef7d 100644 --- a/keyboards/tenki/info.json +++ b/keyboards/tenki/keyboard.json @@ -30,6 +30,15 @@ "ws2812": { "pin": "D1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "D4", "D0"], "rows": ["B1", "B4", "F6", "B6", "B2"] diff --git a/keyboards/tenki/rules.mk b/keyboards/tenki/rules.mk deleted file mode 100644 index c4a40815c6d..00000000000 --- a/keyboards/tenki/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 = 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 -RGBLIGHT_ENABLE = yes diff --git a/keyboards/terrazzo/info.json b/keyboards/terrazzo/keyboard.json similarity index 97% rename from keyboards/terrazzo/info.json rename to keyboards/terrazzo/keyboard.json index 53a497cfc4e..e2cfbfcfb16 100644 --- a/keyboards/terrazzo/info.json +++ b/keyboards/terrazzo/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x545A", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "led_matrix": true, + "mousekey": false, + "nkro": false, + "wpm": true + }, "matrix_pins": { "cols": ["D3", "F4", "F5", "F6", "F7", "B1"], "rows": ["D2", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "F0"] diff --git a/keyboards/terrazzo/rules.mk b/keyboards/terrazzo/rules.mk deleted file mode 100644 index e996c29fbc9..00000000000 --- a/keyboards/terrazzo/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 = 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 -LED_MATRIX_ENABLE = yes -ENCODER_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/tgr/910/info.json b/keyboards/tgr/910/keyboard.json similarity index 98% rename from keyboards/tgr/910/info.json rename to keyboards/tgr/910/keyboard.json index 28ea383f0d2..072eb07ea1a 100644 --- a/keyboards/tgr/910/info.json +++ b/keyboards/tgr/910/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x9100", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D7", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A1", "A0"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"] diff --git a/keyboards/tgr/910/rules.mk b/keyboards/tgr/910/rules.mk deleted file mode 100644 index 51df0b642e1..00000000000 --- a/keyboards/tgr/910/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/tgr/910ce/info.json b/keyboards/tgr/910ce/keyboard.json similarity index 98% rename from keyboards/tgr/910ce/info.json rename to keyboards/tgr/910ce/keyboard.json index 63bb727570d..4d70a5b5db7 100644 --- a/keyboards/tgr/910ce/info.json +++ b/keyboards/tgr/910ce/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x910C", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B1", "B2", "B3", "B4", "B5", "B6"] diff --git a/keyboards/tgr/910ce/rules.mk b/keyboards/tgr/910ce/rules.mk deleted file mode 100644 index 7dd71d89ed7..00000000000 --- a/keyboards/tgr/910ce/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# 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 -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/tgr/alice/info.json b/keyboards/tgr/alice/keyboard.json similarity index 97% rename from keyboards/tgr/alice/info.json rename to keyboards/tgr/alice/keyboard.json index 722de6251ab..d78185106bf 100644 --- a/keyboards/tgr/alice/info.json +++ b/keyboards/tgr/alice/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x422E", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5"] diff --git a/keyboards/tgr/alice/rules.mk b/keyboards/tgr/alice/rules.mk deleted file mode 100644 index 6b0cec85a44..00000000000 --- a/keyboards/tgr/alice/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/tgr/jane/v2/info.json b/keyboards/tgr/jane/v2/keyboard.json similarity index 99% rename from keyboards/tgr/jane/v2/info.json rename to keyboards/tgr/jane/v2/keyboard.json index cd1ff1f1ac0..dc36757eb5b 100644 --- a/keyboards/tgr/jane/v2/info.json +++ b/keyboards/tgr/jane/v2/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4A4E", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/tgr/jane/v2/rules.mk b/keyboards/tgr/jane/v2/rules.mk deleted file mode 100644 index 88711b21277..00000000000 --- a/keyboards/tgr/jane/v2/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = no diff --git a/keyboards/tgr/jane/v2ce/info.json b/keyboards/tgr/jane/v2ce/keyboard.json similarity index 99% rename from keyboards/tgr/jane/v2ce/info.json rename to keyboards/tgr/jane/v2ce/keyboard.json index df82cdc6cf9..107e2dee9e0 100644 --- a/keyboards/tgr/jane/v2ce/info.json +++ b/keyboards/tgr/jane/v2ce/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4A43", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/tgr/jane/v2ce/rules.mk b/keyboards/tgr/jane/v2ce/rules.mk deleted file mode 100644 index 7663aa664fe..00000000000 --- a/keyboards/tgr/jane/v2ce/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow diff --git a/keyboards/tgr/tris/info.json b/keyboards/tgr/tris/keyboard.json similarity index 94% rename from keyboards/tgr/tris/info.json rename to keyboards/tgr/tris/keyboard.json index f7577757d95..7776c7b2c9c 100644 --- a/keyboards/tgr/tris/info.json +++ b/keyboards/tgr/tris/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x5452", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["A3", "A2", "A1", "A0"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5"] diff --git a/keyboards/tgr/tris/rules.mk b/keyboards/tgr/tris/rules.mk deleted file mode 100644 index 51df0b642e1..00000000000 --- a/keyboards/tgr/tris/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/the_royal/liminal/info.json b/keyboards/the_royal/liminal/keyboard.json similarity index 94% rename from keyboards/the_royal/liminal/info.json rename to keyboards/the_royal/liminal/keyboard.json index 046d535e4ab..c0fa5524ad0 100644 --- a/keyboards/the_royal/liminal/info.json +++ b/keyboards/the_royal/liminal/keyboard.json @@ -17,6 +17,15 @@ "ws2812": { "pin": "D4" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D6", "C4", "D3", "D2", "D1", "D0", "C2", "B0", "B1", "B2", "B3", "B4", "D5", "C5"], "rows": ["C6", "B6", "B7", "C7"] diff --git a/keyboards/the_royal/liminal/rules.mk b/keyboards/the_royal/liminal/rules.mk deleted file mode 100644 index a927de843cb..00000000000 --- a/keyboards/the_royal/liminal/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/the_royal/schwann/info.json b/keyboards/the_royal/schwann/keyboard.json similarity index 97% rename from keyboards/the_royal/schwann/info.json rename to keyboards/the_royal/schwann/keyboard.json index 5a0c4e50e58..dcb32312f95 100644 --- a/keyboards/the_royal/schwann/info.json +++ b/keyboards/the_royal/schwann/keyboard.json @@ -29,6 +29,15 @@ "ws2812": { "pin": "B3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "D5", "D3", "D2", "C6", "B6", "B5", "B4", "D7", "D6", "D1"], "rows": ["F0", "F1", "F6", "C7"] diff --git a/keyboards/the_royal/schwann/rules.mk b/keyboards/the_royal/schwann/rules.mk deleted file mode 100644 index d7bdfe544b5..00000000000 --- a/keyboards/the_royal/schwann/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/thepanduuh/degenpad/info.json b/keyboards/thepanduuh/degenpad/keyboard.json similarity index 97% rename from keyboards/thepanduuh/degenpad/info.json rename to keyboards/thepanduuh/degenpad/keyboard.json index 4a5e844b50d..7a0edc21243 100644 --- a/keyboards/thepanduuh/degenpad/info.json +++ b/keyboards/thepanduuh/degenpad/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x4447", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "B1", "D3"], "rows": ["D5", "D6", "D7", "B4", "B5", "B6"] diff --git a/keyboards/thepanduuh/degenpad/rules.mk b/keyboards/thepanduuh/degenpad/rules.mk deleted file mode 100644 index 39946d6840b..00000000000 --- a/keyboards/thepanduuh/degenpad/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Rotary Encoder support diff --git a/keyboards/thevankeyboards/bananasplit/info.json b/keyboards/thevankeyboards/bananasplit/keyboard.json similarity index 99% rename from keyboards/thevankeyboards/bananasplit/info.json rename to keyboards/thevankeyboards/bananasplit/keyboard.json index 36fcc06af22..3b1d5c846dc 100644 --- a/keyboards/thevankeyboards/bananasplit/info.json +++ b/keyboards/thevankeyboards/bananasplit/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x8870", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "B1", "F0", "F1", "F4", "B3", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B0", "B2", "B4", "B5", "B6"] diff --git a/keyboards/thevankeyboards/bananasplit/rules.mk b/keyboards/thevankeyboards/bananasplit/rules.mk deleted file mode 100644 index f5b6814e29b..00000000000 --- a/keyboards/thevankeyboards/bananasplit/rules.mk +++ /dev/null @@ -1,10 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes diff --git a/keyboards/thevankeyboards/caravan/info.json b/keyboards/thevankeyboards/caravan/keyboard.json similarity index 94% rename from keyboards/thevankeyboards/caravan/info.json rename to keyboards/thevankeyboards/caravan/keyboard.json index 781580bd866..595c7c9fc9c 100644 --- a/keyboards/thevankeyboards/caravan/info.json +++ b/keyboards/thevankeyboards/caravan/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x8844", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "B4", "B5", "B6", "B7", "D2", "D3", "D5", "D4", "D6"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/thevankeyboards/caravan/rules.mk b/keyboards/thevankeyboards/caravan/rules.mk deleted file mode 100644 index 5f2f28d2d25..00000000000 --- a/keyboards/thevankeyboards/caravan/rules.mk +++ /dev/null @@ -1,11 +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 = 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 -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/thevankeyboards/jetvan/info.json b/keyboards/thevankeyboards/jetvan/keyboard.json similarity index 94% rename from keyboards/thevankeyboards/jetvan/info.json rename to keyboards/thevankeyboards/jetvan/keyboard.json index fc04a4c013f..5e1535a8ad1 100644 --- a/keyboards/thevankeyboards/jetvan/info.json +++ b/keyboards/thevankeyboards/jetvan/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "D0" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D2", "D3", "D5", "D6", "B4", "B6", "F6", "F5", "F4", "F1", "F0", "B3"], "rows": ["D7", "B5", "F7", "D4"] diff --git a/keyboards/thevankeyboards/jetvan/rules.mk b/keyboards/thevankeyboards/jetvan/rules.mk deleted file mode 100644 index 725d8386824..00000000000 --- a/keyboards/thevankeyboards/jetvan/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 = 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/thevankeyboards/minivan/info.json b/keyboards/thevankeyboards/minivan/keyboard.json similarity index 98% rename from keyboards/thevankeyboards/minivan/info.json rename to keyboards/thevankeyboards/minivan/keyboard.json index cff65e6fed8..11684b6cf80 100644 --- a/keyboards/thevankeyboards/minivan/info.json +++ b/keyboards/thevankeyboards/minivan/keyboard.json @@ -15,6 +15,15 @@ "ws2812": { "pin": "D0" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D2", "D3", "D5", "D6", "B4", "B6", "F6", "F5", "F4", "F1", "F0", "B3"], "rows": ["D7", "B5", "F7", "D4"] diff --git a/keyboards/thevankeyboards/minivan/rules.mk b/keyboards/thevankeyboards/minivan/rules.mk deleted file mode 100644 index b983ff075df..00000000000 --- a/keyboards/thevankeyboards/minivan/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 = 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable support for RGB LEDs diff --git a/keyboards/thevankeyboards/roadkit/info.json b/keyboards/thevankeyboards/roadkit/keyboard.json similarity index 92% rename from keyboards/thevankeyboards/roadkit/info.json rename to keyboards/thevankeyboards/roadkit/keyboard.json index 9323281a321..3b8a5b21591 100644 --- a/keyboards/thevankeyboards/roadkit/info.json +++ b/keyboards/thevankeyboards/roadkit/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x8846", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F4", "D6", "D4"], "rows": ["F0", "F5", "D7", "B4"] diff --git a/keyboards/thevankeyboards/roadkit/rules.mk b/keyboards/thevankeyboards/roadkit/rules.mk deleted file mode 100644 index a75f1b96cbf..00000000000 --- a/keyboards/thevankeyboards/roadkit/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/tkc/california/info.json b/keyboards/tkc/california/keyboard.json similarity index 98% rename from keyboards/tkc/california/info.json rename to keyboards/tkc/california/keyboard.json index 731e65323ee..1d52466bbab 100644 --- a/keyboards/tkc/california/info.json +++ b/keyboards/tkc/california/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "B4", "D7", "D6", "F7", "F6", "F5", "D5", "D1", "F4"], "rows": ["C7", "C6", "B6", "D4", "D3", "D0", "E6", "B0", "B1", "B2", "D2", "B3"] diff --git a/keyboards/tkc/california/rules.mk b/keyboards/tkc/california/rules.mk deleted file mode 100644 index b325f3f0c79..00000000000 --- a/keyboards/tkc/california/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 = 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/tkc/godspeed75/info.json b/keyboards/tkc/godspeed75/keyboard.json similarity index 96% rename from keyboards/tkc/godspeed75/info.json rename to keyboards/tkc/godspeed75/keyboard.json index 4776a9bab86..48cf06f3ca5 100644 --- a/keyboards/tkc/godspeed75/info.json +++ b/keyboards/tkc/godspeed75/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "A13" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "B12", "B13", "B14", "B15", "A8"], "rows": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "A9", "A10"] diff --git a/keyboards/tkc/godspeed75/rules.mk b/keyboards/tkc/godspeed75/rules.mk deleted file mode 100644 index 0098dc473ac..00000000000 --- a/keyboards/tkc/godspeed75/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 -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/tkc/m0lly/info.json b/keyboards/tkc/m0lly/keyboard.json similarity index 99% rename from keyboards/tkc/m0lly/info.json rename to keyboards/tkc/m0lly/keyboard.json index 462bc0f27b5..e37b9e7bb2a 100644 --- a/keyboards/tkc/m0lly/info.json +++ b/keyboards/tkc/m0lly/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "F5", "F6", "F7"], "rows": ["F2", "F1", "F0", "E1", "E0"] diff --git a/keyboards/tkc/m0lly/rules.mk b/keyboards/tkc/m0lly/rules.mk deleted file mode 100644 index 6d915f6d417..00000000000 --- a/keyboards/tkc/m0lly/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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes diff --git a/keyboards/tkc/tkc1800/info.json b/keyboards/tkc/tkc1800/keyboard.json similarity index 96% rename from keyboards/tkc/tkc1800/info.json rename to keyboards/tkc/tkc1800/keyboard.json index b99d4ca60f8..bdc6aa13a75 100644 --- a/keyboards/tkc/tkc1800/info.json +++ b/keyboards/tkc/tkc1800/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0001", "device_version": "0.0.3" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "F5", "F6", "F7"], "rows": ["F4", "F3", "F2", "F1", "F0", "E1", "E0"] diff --git a/keyboards/tkc/tkc1800/rules.mk b/keyboards/tkc/tkc1800/rules.mk deleted file mode 100644 index fc74989daff..00000000000 --- a/keyboards/tkc/tkc1800/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 -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 = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes diff --git a/keyboards/tkc/tkl_ab87/info.json b/keyboards/tkc/tkl_ab87/keyboard.json similarity index 99% rename from keyboards/tkc/tkl_ab87/info.json rename to keyboards/tkc/tkl_ab87/keyboard.json index 0d464a2db9d..a3583c0d678 100644 --- a/keyboards/tkc/tkl_ab87/info.json +++ b/keyboards/tkc/tkl_ab87/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E6", "F6", "F4"], "rows": ["B1", "F5", "F7", "B0", "B2", "B3"] diff --git a/keyboards/tkc/tkl_ab87/rules.mk b/keyboards/tkc/tkl_ab87/rules.mk deleted file mode 100644 index 45377383806..00000000000 --- a/keyboards/tkc/tkl_ab87/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 = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/tmo50/info.json b/keyboards/tmo50/keyboard.json similarity index 96% rename from keyboards/tmo50/info.json rename to keyboards/tmo50/keyboard.json index ff3f95b223b..d3d4b15e63d 100644 --- a/keyboards/tmo50/info.json +++ b/keyboards/tmo50/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "D4", "F0", "F1", "F4", "F5", "F6", "F7", "D6", "D7", "B4", "B5", "B6", "C6"], "rows": ["D5", "D3", "D2", "D0"] diff --git a/keyboards/tmo50/rules.mk b/keyboards/tmo50/rules.mk deleted file mode 100644 index 1955f1d315b..00000000000 --- a/keyboards/tmo50/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/toad/info.json b/keyboards/toad/keyboard.json similarity index 99% rename from keyboards/toad/info.json rename to keyboards/toad/keyboard.json index f0dccbfe5ad..edb45794556 100644 --- a/keyboards/toad/info.json +++ b/keyboards/toad/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6776", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "E6", "B7", "C7", "C6", "D4", "D6", "D7", "B4", "D0", "D1", "F7"], "rows": ["B0", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/toad/rules.mk b/keyboards/toad/rules.mk deleted file mode 100644 index 51c80ed6cf1..00000000000 --- a/keyboards/toad/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 = 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 -RGBLIGHT_ENABLE = no diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/keyboard.json similarity index 95% rename from keyboards/tokyokeyboard/tokyo60/info.json rename to keyboards/tokyokeyboard/tokyo60/keyboard.json index e0f756121ca..78fdcae0e37 100644 --- a/keyboards/tokyokeyboard/tokyo60/info.json +++ b/keyboards/tokyokeyboard/tokyo60/keyboard.json @@ -9,6 +9,16 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B2", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/tokyokeyboard/tokyo60/rules.mk b/keyboards/tokyokeyboard/tokyo60/rules.mk deleted file mode 100644 index f3d19b1d395..00000000000 --- a/keyboards/tokyokeyboard/tokyo60/rules.mk +++ /dev/null @@ -1,12 +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 -AUDIO_ENABLE = no # Audio output -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable RGB light diff --git a/keyboards/tominabox1/adalyn/info.json b/keyboards/tominabox1/adalyn/keyboard.json similarity index 93% rename from keyboards/tominabox1/adalyn/info.json rename to keyboards/tominabox1/adalyn/keyboard.json index ae66ef50fdb..f896dd4ab1c 100644 --- a/keyboards/tominabox1/adalyn/info.json +++ b/keyboards/tominabox1/adalyn/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6164", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4", "F1"], "rows": ["C7", "D6", "B7", "B3"] diff --git a/keyboards/tominabox1/adalyn/rules.mk b/keyboards/tominabox1/adalyn/rules.mk deleted file mode 100644 index 92299c80b9c..00000000000 --- a/keyboards/tominabox1/adalyn/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover - diff --git a/keyboards/tominabox1/bigboy/info.json b/keyboards/tominabox1/bigboy/keyboard.json similarity index 89% rename from keyboards/tominabox1/bigboy/info.json rename to keyboards/tominabox1/bigboy/keyboard.json index 8d8e26dc551..a25189f35eb 100644 --- a/keyboards/tominabox1/bigboy/info.json +++ b/keyboards/tominabox1/bigboy/keyboard.json @@ -34,6 +34,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "direct": [ ["D0", "B1", "B0"], diff --git a/keyboards/tominabox1/bigboy/rules.mk b/keyboards/tominabox1/bigboy/rules.mk deleted file mode 100755 index 28fb3e866d6..00000000000 --- a/keyboards/tominabox1/bigboy/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/tominabox1/qaz/info.json b/keyboards/tominabox1/qaz/keyboard.json similarity index 96% rename from keyboards/tominabox1/qaz/info.json rename to keyboards/tominabox1/qaz/keyboard.json index 1ddb07e6212..691a1129bc7 100644 --- a/keyboards/tominabox1/qaz/info.json +++ b/keyboards/tominabox1/qaz/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "F7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "D3", "D2", "F5", "B5", "F6", "D7"], "rows": ["F4", "D4", "C6", "E6", "D1", "D0"] diff --git a/keyboards/tominabox1/qaz/rules.mk b/keyboards/tominabox1/qaz/rules.mk deleted file mode 100644 index b851d0ab392..00000000000 --- a/keyboards/tominabox1/qaz/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 = 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/tr60w/info.json b/keyboards/tr60w/keyboard.json similarity index 95% rename from keyboards/tr60w/info.json rename to keyboards/tr60w/keyboard.json index ba0ce45233c..6fa5914d6cf 100644 --- a/keyboards/tr60w/info.json +++ b/keyboards/tr60w/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x4140", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F4", "F1", "F0", "B0", "D5", "D3", "D6", "D7", "B4", "B5", "B6", "C6", "D2"], "rows": ["D0", "D1", "B1", "B2", "E6", "B3"] diff --git a/keyboards/tr60w/rules.mk b/keyboards/tr60w/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/tr60w/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/keyboard.json similarity index 98% rename from keyboards/trashman/ketch/info.json rename to keyboards/trashman/ketch/keyboard.json index a674acb2759..6e042eee0b1 100644 --- a/keyboards/trashman/ketch/info.json +++ b/keyboards/trashman/ketch/keyboard.json @@ -28,6 +28,15 @@ "ws2812": { "pin": "F4" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], "rows": ["F5", "F1", "F0", "F7", "B6", "F6"] diff --git a/keyboards/trashman/ketch/rules.mk b/keyboards/trashman/ketch/rules.mk deleted file mode 100644 index 5525d13f88b..00000000000 --- a/keyboards/trashman/ketch/rules.mk +++ /dev/null @@ -1,12 +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 -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/treasure/type9/info.json b/keyboards/treasure/type9/keyboard.json similarity index 84% rename from keyboards/treasure/type9/info.json rename to keyboards/treasure/type9/keyboard.json index cab118fc8ef..2970c012967 100644 --- a/keyboards/treasure/type9/info.json +++ b/keyboards/treasure/type9/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D0", "D4"], "rows": ["E6", "D7", "C6"] diff --git a/keyboards/treasure/type9/rules.mk b/keyboards/treasure/type9/rules.mk deleted file mode 100644 index fab0de3b945..00000000000 --- a/keyboards/treasure/type9/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # 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/tunks/ergo33/info.json b/keyboards/tunks/ergo33/keyboard.json similarity index 92% rename from keyboards/tunks/ergo33/info.json rename to keyboards/tunks/ergo33/keyboard.json index 213907999a0..2bace9cf009 100644 --- a/keyboards/tunks/ergo33/info.json +++ b/keyboards/tunks/ergo33/keyboard.json @@ -25,6 +25,16 @@ "ws2812": { "pin": "D4" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6"], "rows": ["F0", "F1", "B5", "B4", "D7"] diff --git a/keyboards/tunks/ergo33/rules.mk b/keyboards/tunks/ergo33/rules.mk deleted file mode 100644 index bff15770a8e..00000000000 --- a/keyboards/tunks/ergo33/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -EXTRAKEY_ENABLE = yes # Audio control and System control -MOUSEKEY_ENABLE = yes # Mouse keys -COMMAND_ENABLE = no # Commands for debug and configuration -CONSOLE_ENABLE = no # Console for debug -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 - -ENCODER_ENABLE = yes # Rotary encoders From 1f8f0f70a2beacdc6d085d2541fe498300b1eaab Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 15 Mar 2024 15:36:23 -0700 Subject: [PATCH 038/333] Linworks FAve 87H Keymap Refactor/Bugfix (#23292) * Refactor keymaps - use QMK-native keycode aliases - grid-align keycodes [refactor] * Correct key sequence Moves the keycode representing the right half of a split Backspace to the number row, after the left half/2u Backspace keycode. Updates the keycode grid alignment to maintain readability. [bugfix] --- .../linworks/fave87h/keymaps/default/keymap.c | 24 +++++----- .../linworks/fave87h/keymaps/via/keymap.c | 48 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/keyboards/linworks/fave87h/keymaps/default/keymap.c b/keyboards/linworks/fave87h/keymaps/default/keymap.c index 639f382cde2..f669452b2e5 100644 --- a/keyboards/linworks/fave87h/keymaps/default/keymap.c +++ b/keyboards/linworks/fave87h/keymaps/default/keymap.c @@ -22,21 +22,21 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER0] = 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_DEL, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_LAYER1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT ) }; diff --git a/keyboards/linworks/fave87h/keymaps/via/keymap.c b/keyboards/linworks/fave87h/keymaps/via/keymap.c index fe366829a73..1798170c136 100644 --- a/keyboards/linworks/fave87h/keymaps/via/keymap.c +++ b/keyboards/linworks/fave87h/keymaps/via/keymap.c @@ -24,39 +24,39 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER0] = 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_DEL, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_LAYER1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT ), [_LAYER2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [_LAYER3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; From bbe0c515f883af463f50acaad79bd62a82e68922 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 15 Mar 2024 17:30:16 -0700 Subject: [PATCH 039/333] KPRepublic JJ50 rev1 Refactor (#23294) * Move `kprepublic/jj50` to `kprepublic/jj50/rev1` [chore] * Add layout/matrix diagram [docs] * Add `LAYOUT_ortho_5x12_1x2u_c` [enhancement] * Add `LAYOUT_ortho_5x12_1x2u_l` [enhancement] * Add `LAYOUT_ortho_5x12_1x2u_r` [enhancement] * Add `LAYOUT_ortho_5x12_2x2u` [enhancement] * Convert `rules.mk` to data driven [chore] * Remove `console` and `command` from keyboard level [chore] * Rename `info.json` to `keyboard.json` Also deletes `rules.mk` as it's no longer needed. [chore] [enhancement] --- data/mappings/keyboard_aliases.hjson | 4 + keyboards/kprepublic/jj50/info.json | 118 ------ keyboards/kprepublic/jj50/rev1/keyboard.json | 396 ++++++++++++++++++ .../kprepublic/jj50/rev1/matrix_diagram.md | 21 + .../kprepublic/jj50/{ => rev1}/readme.md | 10 +- keyboards/kprepublic/jj50/rules.mk | 13 +- 6 files changed, 427 insertions(+), 135 deletions(-) delete mode 100644 keyboards/kprepublic/jj50/info.json create mode 100644 keyboards/kprepublic/jj50/rev1/keyboard.json create mode 100644 keyboards/kprepublic/jj50/rev1/matrix_diagram.md rename keyboards/kprepublic/jj50/{ => rev1}/readme.md (81%) diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 29a7a719f38..8508c87a3ba 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -1518,5 +1518,9 @@ // Moved during 2023 Q4 cycle "ymdk/melody96": { "target": "ymdk/melody96/soldered" + }, + // Moved during 2024 Q2 cycle + "kprepublic/jj50": { + "target": "kprepublic/jj50/rev1" } } diff --git a/keyboards/kprepublic/jj50/info.json b/keyboards/kprepublic/jj50/info.json deleted file mode 100644 index 492d106f21e..00000000000 --- a/keyboards/kprepublic/jj50/info.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "keyboard_name": "JJ50", - "manufacturer": "KPrepublic", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0x4B50", - "pid": "0x0050", - "device_version": "2.0.0" - }, - "matrix_pins": { - "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4"], - "rows": ["B0", "B1", "B2", "B3", "B4"] - }, - "diode_direction": "COL2ROW", - "backlight": { - "pin": "D4", - "levels": 12, - "breathing": true - }, - "rgblight": { - "hue_steps": 12, - "saturation_steps": 15, - "brightness_steps": 18, - "led_count": 12, - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } - }, - "ws2812": { - "driver": "i2c" - }, - "processor": "atmega32a", - "bootloader": "bootloadhid", - "layout_aliases": { - "LAYOUT": "LAYOUT_ortho_5x12" - }, - "community_layouts": ["ortho_5x12"], - "layouts": { - "LAYOUT_ortho_5x12": { - "layout": [ - {"matrix": [2, 11], "x": 0, "y": 0}, - {"matrix": [2, 10], "x": 1, "y": 0}, - {"matrix": [2, 9], "x": 2, "y": 0}, - {"matrix": [2, 8], "x": 3, "y": 0}, - {"matrix": [2, 4], "x": 4, "y": 0}, - {"matrix": [2, 5], "x": 5, "y": 0}, - {"matrix": [2, 6], "x": 6, "y": 0}, - {"matrix": [2, 7], "x": 7, "y": 0}, - {"matrix": [2, 3], "x": 8, "y": 0}, - {"matrix": [2, 2], "x": 9, "y": 0}, - {"matrix": [2, 1], "x": 10, "y": 0}, - {"matrix": [2, 0], "x": 11, "y": 0}, - - {"matrix": [0, 11], "x": 0, "y": 1}, - {"matrix": [0, 10], "x": 1, "y": 1}, - {"matrix": [0, 9], "x": 2, "y": 1}, - {"matrix": [0, 8], "x": 3, "y": 1}, - {"matrix": [0, 4], "x": 4, "y": 1}, - {"matrix": [0, 5], "x": 5, "y": 1}, - {"matrix": [0, 6], "x": 6, "y": 1}, - {"matrix": [0, 7], "x": 7, "y": 1}, - {"matrix": [0, 3], "x": 8, "y": 1}, - {"matrix": [0, 2], "x": 9, "y": 1}, - {"matrix": [0, 1], "x": 10, "y": 1}, - {"matrix": [0, 0], "x": 11, "y": 1}, - - {"matrix": [1, 11], "x": 0, "y": 2}, - {"matrix": [1, 10], "x": 1, "y": 2}, - {"matrix": [1, 9], "x": 2, "y": 2}, - {"matrix": [1, 8], "x": 3, "y": 2}, - {"matrix": [1, 4], "x": 4, "y": 2}, - {"matrix": [1, 5], "x": 5, "y": 2}, - {"matrix": [1, 6], "x": 6, "y": 2}, - {"matrix": [1, 7], "x": 7, "y": 2}, - {"matrix": [1, 3], "x": 8, "y": 2}, - {"matrix": [1, 2], "x": 9, "y": 2}, - {"matrix": [1, 1], "x": 10, "y": 2}, - {"matrix": [1, 0], "x": 11, "y": 2}, - - {"matrix": [3, 11], "x": 0, "y": 3}, - {"matrix": [3, 10], "x": 1, "y": 3}, - {"matrix": [3, 9], "x": 2, "y": 3}, - {"matrix": [3, 8], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, - {"matrix": [3, 6], "x": 6, "y": 3}, - {"matrix": [3, 7], "x": 7, "y": 3}, - {"matrix": [3, 3], "x": 8, "y": 3}, - {"matrix": [3, 2], "x": 9, "y": 3}, - {"matrix": [3, 1], "x": 10, "y": 3}, - {"matrix": [3, 0], "x": 11, "y": 3}, - - {"matrix": [4, 11], "x": 0, "y": 4}, - {"matrix": [4, 10], "x": 1, "y": 4}, - {"matrix": [4, 9], "x": 2, "y": 4}, - {"matrix": [4, 8], "x": 3, "y": 4}, - {"matrix": [4, 4], "x": 4, "y": 4}, - {"matrix": [4, 5], "x": 5, "y": 4}, - {"matrix": [4, 6], "x": 6, "y": 4}, - {"matrix": [4, 7], "x": 7, "y": 4}, - {"matrix": [4, 3], "x": 8, "y": 4}, - {"matrix": [4, 2], "x": 9, "y": 4}, - {"matrix": [4, 1], "x": 10, "y": 4}, - {"matrix": [4, 0], "x": 11, "y": 4} - ] - } - } -} diff --git a/keyboards/kprepublic/jj50/rev1/keyboard.json b/keyboards/kprepublic/jj50/rev1/keyboard.json new file mode 100644 index 00000000000..c9f191ef9cb --- /dev/null +++ b/keyboards/kprepublic/jj50/rev1/keyboard.json @@ -0,0 +1,396 @@ +{ + "keyboard_name": "JJ50 rev1", + "manufacturer": "KPrepublic", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4B50", + "pid": "0x0050", + "device_version": "2.0.0" + }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": false, + "backlight": true, + "rgblight": true + }, + "build": { + "lto": true + }, + "backlight": { + "pin": "D4", + "levels": 12, + "breathing": true + }, + "rgblight": { + "hue_steps": 12, + "saturation_steps": 15, + "brightness_steps": 18, + "led_count": 12, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "ws2812": { + "driver": "i2c" + }, + "processor": "atmega32a", + "bootloader": "bootloadhid", + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_5x12" + }, + "community_layouts": ["ortho_5x12"], + "layouts": { + "LAYOUT_ortho_5x12": { + "layout": [ + {"matrix": [2, 11], "x": 0, "y": 0}, + {"matrix": [2, 10], "x": 1, "y": 0}, + {"matrix": [2, 9], "x": 2, "y": 0}, + {"matrix": [2, 8], "x": 3, "y": 0}, + {"matrix": [2, 4], "x": 4, "y": 0}, + {"matrix": [2, 5], "x": 5, "y": 0}, + {"matrix": [2, 6], "x": 6, "y": 0}, + {"matrix": [2, 7], "x": 7, "y": 0}, + {"matrix": [2, 3], "x": 8, "y": 0}, + {"matrix": [2, 2], "x": 9, "y": 0}, + {"matrix": [2, 1], "x": 10, "y": 0}, + {"matrix": [2, 0], "x": 11, "y": 0}, + + {"matrix": [0, 11], "x": 0, "y": 1}, + {"matrix": [0, 10], "x": 1, "y": 1}, + {"matrix": [0, 9], "x": 2, "y": 1}, + {"matrix": [0, 8], "x": 3, "y": 1}, + {"matrix": [0, 4], "x": 4, "y": 1}, + {"matrix": [0, 5], "x": 5, "y": 1}, + {"matrix": [0, 6], "x": 6, "y": 1}, + {"matrix": [0, 7], "x": 7, "y": 1}, + {"matrix": [0, 3], "x": 8, "y": 1}, + {"matrix": [0, 2], "x": 9, "y": 1}, + {"matrix": [0, 1], "x": 10, "y": 1}, + {"matrix": [0, 0], "x": 11, "y": 1}, + + {"matrix": [1, 11], "x": 0, "y": 2}, + {"matrix": [1, 10], "x": 1, "y": 2}, + {"matrix": [1, 9], "x": 2, "y": 2}, + {"matrix": [1, 8], "x": 3, "y": 2}, + {"matrix": [1, 4], "x": 4, "y": 2}, + {"matrix": [1, 5], "x": 5, "y": 2}, + {"matrix": [1, 6], "x": 6, "y": 2}, + {"matrix": [1, 7], "x": 7, "y": 2}, + {"matrix": [1, 3], "x": 8, "y": 2}, + {"matrix": [1, 2], "x": 9, "y": 2}, + {"matrix": [1, 1], "x": 10, "y": 2}, + {"matrix": [1, 0], "x": 11, "y": 2}, + + {"matrix": [3, 11], "x": 0, "y": 3}, + {"matrix": [3, 10], "x": 1, "y": 3}, + {"matrix": [3, 9], "x": 2, "y": 3}, + {"matrix": [3, 8], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 3], "x": 8, "y": 3}, + {"matrix": [3, 2], "x": 9, "y": 3}, + {"matrix": [3, 1], "x": 10, "y": 3}, + {"matrix": [3, 0], "x": 11, "y": 3}, + + {"matrix": [4, 11], "x": 0, "y": 4}, + {"matrix": [4, 10], "x": 1, "y": 4}, + {"matrix": [4, 9], "x": 2, "y": 4}, + {"matrix": [4, 8], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 3], "x": 8, "y": 4}, + {"matrix": [4, 2], "x": 9, "y": 4}, + {"matrix": [4, 1], "x": 10, "y": 4}, + {"matrix": [4, 0], "x": 11, "y": 4} + ] + }, + "LAYOUT_ortho_5x12_1x2u_c": { + "layout": [ + {"matrix": [2, 11], "x": 0, "y": 0}, + {"matrix": [2, 10], "x": 1, "y": 0}, + {"matrix": [2, 9], "x": 2, "y": 0}, + {"matrix": [2, 8], "x": 3, "y": 0}, + {"matrix": [2, 4], "x": 4, "y": 0}, + {"matrix": [2, 5], "x": 5, "y": 0}, + {"matrix": [2, 6], "x": 6, "y": 0}, + {"matrix": [2, 7], "x": 7, "y": 0}, + {"matrix": [2, 3], "x": 8, "y": 0}, + {"matrix": [2, 2], "x": 9, "y": 0}, + {"matrix": [2, 1], "x": 10, "y": 0}, + {"matrix": [2, 0], "x": 11, "y": 0}, + + {"matrix": [0, 11], "x": 0, "y": 1}, + {"matrix": [0, 10], "x": 1, "y": 1}, + {"matrix": [0, 9], "x": 2, "y": 1}, + {"matrix": [0, 8], "x": 3, "y": 1}, + {"matrix": [0, 4], "x": 4, "y": 1}, + {"matrix": [0, 5], "x": 5, "y": 1}, + {"matrix": [0, 6], "x": 6, "y": 1}, + {"matrix": [0, 7], "x": 7, "y": 1}, + {"matrix": [0, 3], "x": 8, "y": 1}, + {"matrix": [0, 2], "x": 9, "y": 1}, + {"matrix": [0, 1], "x": 10, "y": 1}, + {"matrix": [0, 0], "x": 11, "y": 1}, + + {"matrix": [1, 11], "x": 0, "y": 2}, + {"matrix": [1, 10], "x": 1, "y": 2}, + {"matrix": [1, 9], "x": 2, "y": 2}, + {"matrix": [1, 8], "x": 3, "y": 2}, + {"matrix": [1, 4], "x": 4, "y": 2}, + {"matrix": [1, 5], "x": 5, "y": 2}, + {"matrix": [1, 6], "x": 6, "y": 2}, + {"matrix": [1, 7], "x": 7, "y": 2}, + {"matrix": [1, 3], "x": 8, "y": 2}, + {"matrix": [1, 2], "x": 9, "y": 2}, + {"matrix": [1, 1], "x": 10, "y": 2}, + {"matrix": [1, 0], "x": 11, "y": 2}, + + {"matrix": [3, 11], "x": 0, "y": 3}, + {"matrix": [3, 10], "x": 1, "y": 3}, + {"matrix": [3, 9], "x": 2, "y": 3}, + {"matrix": [3, 8], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 3], "x": 8, "y": 3}, + {"matrix": [3, 2], "x": 9, "y": 3}, + {"matrix": [3, 1], "x": 10, "y": 3}, + {"matrix": [3, 0], "x": 11, "y": 3}, + + {"matrix": [4, 11], "x": 0, "y": 4}, + {"matrix": [4, 10], "x": 1, "y": 4}, + {"matrix": [4, 9], "x": 2, "y": 4}, + {"matrix": [4, 8], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4, "w": 2}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 3], "x": 8, "y": 4}, + {"matrix": [4, 2], "x": 9, "y": 4}, + {"matrix": [4, 1], "x": 10, "y": 4}, + {"matrix": [4, 0], "x": 11, "y": 4} + ] + }, + "LAYOUT_ortho_5x12_1x2u_l": { + "layout": [ + {"matrix": [2, 11], "x": 0, "y": 0}, + {"matrix": [2, 10], "x": 1, "y": 0}, + {"matrix": [2, 9], "x": 2, "y": 0}, + {"matrix": [2, 8], "x": 3, "y": 0}, + {"matrix": [2, 4], "x": 4, "y": 0}, + {"matrix": [2, 5], "x": 5, "y": 0}, + {"matrix": [2, 6], "x": 6, "y": 0}, + {"matrix": [2, 7], "x": 7, "y": 0}, + {"matrix": [2, 3], "x": 8, "y": 0}, + {"matrix": [2, 2], "x": 9, "y": 0}, + {"matrix": [2, 1], "x": 10, "y": 0}, + {"matrix": [2, 0], "x": 11, "y": 0}, + + {"matrix": [0, 11], "x": 0, "y": 1}, + {"matrix": [0, 10], "x": 1, "y": 1}, + {"matrix": [0, 9], "x": 2, "y": 1}, + {"matrix": [0, 8], "x": 3, "y": 1}, + {"matrix": [0, 4], "x": 4, "y": 1}, + {"matrix": [0, 5], "x": 5, "y": 1}, + {"matrix": [0, 6], "x": 6, "y": 1}, + {"matrix": [0, 7], "x": 7, "y": 1}, + {"matrix": [0, 3], "x": 8, "y": 1}, + {"matrix": [0, 2], "x": 9, "y": 1}, + {"matrix": [0, 1], "x": 10, "y": 1}, + {"matrix": [0, 0], "x": 11, "y": 1}, + + {"matrix": [1, 11], "x": 0, "y": 2}, + {"matrix": [1, 10], "x": 1, "y": 2}, + {"matrix": [1, 9], "x": 2, "y": 2}, + {"matrix": [1, 8], "x": 3, "y": 2}, + {"matrix": [1, 4], "x": 4, "y": 2}, + {"matrix": [1, 5], "x": 5, "y": 2}, + {"matrix": [1, 6], "x": 6, "y": 2}, + {"matrix": [1, 7], "x": 7, "y": 2}, + {"matrix": [1, 3], "x": 8, "y": 2}, + {"matrix": [1, 2], "x": 9, "y": 2}, + {"matrix": [1, 1], "x": 10, "y": 2}, + {"matrix": [1, 0], "x": 11, "y": 2}, + + {"matrix": [3, 11], "x": 0, "y": 3}, + {"matrix": [3, 10], "x": 1, "y": 3}, + {"matrix": [3, 9], "x": 2, "y": 3}, + {"matrix": [3, 8], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 3], "x": 8, "y": 3}, + {"matrix": [3, 2], "x": 9, "y": 3}, + {"matrix": [3, 1], "x": 10, "y": 3}, + {"matrix": [3, 0], "x": 11, "y": 3}, + + {"matrix": [4, 11], "x": 0, "y": 4}, + {"matrix": [4, 10], "x": 1, "y": 4}, + {"matrix": [4, 9], "x": 2, "y": 4}, + {"matrix": [4, 8], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 3], "x": 8, "y": 4}, + {"matrix": [4, 2], "x": 9, "y": 4}, + {"matrix": [4, 1], "x": 10, "y": 4}, + {"matrix": [4, 0], "x": 11, "y": 4} + ] + }, + "LAYOUT_ortho_5x12_1x2u_r": { + "layout": [ + {"matrix": [2, 11], "x": 0, "y": 0}, + {"matrix": [2, 10], "x": 1, "y": 0}, + {"matrix": [2, 9], "x": 2, "y": 0}, + {"matrix": [2, 8], "x": 3, "y": 0}, + {"matrix": [2, 4], "x": 4, "y": 0}, + {"matrix": [2, 5], "x": 5, "y": 0}, + {"matrix": [2, 6], "x": 6, "y": 0}, + {"matrix": [2, 7], "x": 7, "y": 0}, + {"matrix": [2, 3], "x": 8, "y": 0}, + {"matrix": [2, 2], "x": 9, "y": 0}, + {"matrix": [2, 1], "x": 10, "y": 0}, + {"matrix": [2, 0], "x": 11, "y": 0}, + + {"matrix": [0, 11], "x": 0, "y": 1}, + {"matrix": [0, 10], "x": 1, "y": 1}, + {"matrix": [0, 9], "x": 2, "y": 1}, + {"matrix": [0, 8], "x": 3, "y": 1}, + {"matrix": [0, 4], "x": 4, "y": 1}, + {"matrix": [0, 5], "x": 5, "y": 1}, + {"matrix": [0, 6], "x": 6, "y": 1}, + {"matrix": [0, 7], "x": 7, "y": 1}, + {"matrix": [0, 3], "x": 8, "y": 1}, + {"matrix": [0, 2], "x": 9, "y": 1}, + {"matrix": [0, 1], "x": 10, "y": 1}, + {"matrix": [0, 0], "x": 11, "y": 1}, + + {"matrix": [1, 11], "x": 0, "y": 2}, + {"matrix": [1, 10], "x": 1, "y": 2}, + {"matrix": [1, 9], "x": 2, "y": 2}, + {"matrix": [1, 8], "x": 3, "y": 2}, + {"matrix": [1, 4], "x": 4, "y": 2}, + {"matrix": [1, 5], "x": 5, "y": 2}, + {"matrix": [1, 6], "x": 6, "y": 2}, + {"matrix": [1, 7], "x": 7, "y": 2}, + {"matrix": [1, 3], "x": 8, "y": 2}, + {"matrix": [1, 2], "x": 9, "y": 2}, + {"matrix": [1, 1], "x": 10, "y": 2}, + {"matrix": [1, 0], "x": 11, "y": 2}, + + {"matrix": [3, 11], "x": 0, "y": 3}, + {"matrix": [3, 10], "x": 1, "y": 3}, + {"matrix": [3, 9], "x": 2, "y": 3}, + {"matrix": [3, 8], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 3], "x": 8, "y": 3}, + {"matrix": [3, 2], "x": 9, "y": 3}, + {"matrix": [3, 1], "x": 10, "y": 3}, + {"matrix": [3, 0], "x": 11, "y": 3}, + + {"matrix": [4, 11], "x": 0, "y": 4}, + {"matrix": [4, 10], "x": 1, "y": 4}, + {"matrix": [4, 9], "x": 2, "y": 4}, + {"matrix": [4, 8], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 2}, + {"matrix": [4, 3], "x": 8, "y": 4}, + {"matrix": [4, 2], "x": 9, "y": 4}, + {"matrix": [4, 1], "x": 10, "y": 4}, + {"matrix": [4, 0], "x": 11, "y": 4} + ] + }, + "LAYOUT_ortho_5x12_2x2u": { + "layout": [ + {"matrix": [2, 11], "x": 0, "y": 0}, + {"matrix": [2, 10], "x": 1, "y": 0}, + {"matrix": [2, 9], "x": 2, "y": 0}, + {"matrix": [2, 8], "x": 3, "y": 0}, + {"matrix": [2, 4], "x": 4, "y": 0}, + {"matrix": [2, 5], "x": 5, "y": 0}, + {"matrix": [2, 6], "x": 6, "y": 0}, + {"matrix": [2, 7], "x": 7, "y": 0}, + {"matrix": [2, 3], "x": 8, "y": 0}, + {"matrix": [2, 2], "x": 9, "y": 0}, + {"matrix": [2, 1], "x": 10, "y": 0}, + {"matrix": [2, 0], "x": 11, "y": 0}, + + {"matrix": [0, 11], "x": 0, "y": 1}, + {"matrix": [0, 10], "x": 1, "y": 1}, + {"matrix": [0, 9], "x": 2, "y": 1}, + {"matrix": [0, 8], "x": 3, "y": 1}, + {"matrix": [0, 4], "x": 4, "y": 1}, + {"matrix": [0, 5], "x": 5, "y": 1}, + {"matrix": [0, 6], "x": 6, "y": 1}, + {"matrix": [0, 7], "x": 7, "y": 1}, + {"matrix": [0, 3], "x": 8, "y": 1}, + {"matrix": [0, 2], "x": 9, "y": 1}, + {"matrix": [0, 1], "x": 10, "y": 1}, + {"matrix": [0, 0], "x": 11, "y": 1}, + + {"matrix": [1, 11], "x": 0, "y": 2}, + {"matrix": [1, 10], "x": 1, "y": 2}, + {"matrix": [1, 9], "x": 2, "y": 2}, + {"matrix": [1, 8], "x": 3, "y": 2}, + {"matrix": [1, 4], "x": 4, "y": 2}, + {"matrix": [1, 5], "x": 5, "y": 2}, + {"matrix": [1, 6], "x": 6, "y": 2}, + {"matrix": [1, 7], "x": 7, "y": 2}, + {"matrix": [1, 3], "x": 8, "y": 2}, + {"matrix": [1, 2], "x": 9, "y": 2}, + {"matrix": [1, 1], "x": 10, "y": 2}, + {"matrix": [1, 0], "x": 11, "y": 2}, + + {"matrix": [3, 11], "x": 0, "y": 3}, + {"matrix": [3, 10], "x": 1, "y": 3}, + {"matrix": [3, 9], "x": 2, "y": 3}, + {"matrix": [3, 8], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 3], "x": 8, "y": 3}, + {"matrix": [3, 2], "x": 9, "y": 3}, + {"matrix": [3, 1], "x": 10, "y": 3}, + {"matrix": [3, 0], "x": 11, "y": 3}, + + {"matrix": [4, 11], "x": 0, "y": 4}, + {"matrix": [4, 10], "x": 1, "y": 4}, + {"matrix": [4, 9], "x": 2, "y": 4}, + {"matrix": [4, 8], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 2}, + {"matrix": [4, 3], "x": 8, "y": 4}, + {"matrix": [4, 2], "x": 9, "y": 4}, + {"matrix": [4, 1], "x": 10, "y": 4}, + {"matrix": [4, 0], "x": 11, "y": 4} + ] + } + } +} diff --git a/keyboards/kprepublic/jj50/rev1/matrix_diagram.md b/keyboards/kprepublic/jj50/rev1/matrix_diagram.md new file mode 100644 index 00000000000..c13292d3361 --- /dev/null +++ b/keyboards/kprepublic/jj50/rev1/matrix_diagram.md @@ -0,0 +1,21 @@ +# Matrix Diagram for KPrepublic JJ50 rev1 + +``` +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│2B │2A │29 │28 │24 │25 │26 │27 │23 │22 │21 │20 │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ +│0B │0A │09 │08 │04 │05 │06 │07 │03 │02 │01 │00 │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ +│1B │1A │19 │18 │14 │15 │16 │17 │13 │12 │11 │10 │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ +│3B │3A │39 │38 │34 │35 │36 │37 │33 │32 │31 │30 │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ +│4B │4A │49 │48 │44 │45 │46 │47 │43 │42 │41 │40 │ +└───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ + ┌───────┐ + │45 │ 1x2u_c (MIT) + └───────┘ + ┌───────┬───────┐ + │44 │46 │ 2x2u_c + └───────┴───────┘ +``` diff --git a/keyboards/kprepublic/jj50/readme.md b/keyboards/kprepublic/jj50/rev1/readme.md similarity index 81% rename from keyboards/kprepublic/jj50/readme.md rename to keyboards/kprepublic/jj50/rev1/readme.md index c34b5d8eeba..643dfc54da3 100644 --- a/keyboards/kprepublic/jj50/readme.md +++ b/keyboards/kprepublic/jj50/rev1/readme.md @@ -1,20 +1,20 @@ -# JJ50 +# JJ50 rev1 -![JJ50 + SA Vilebloom (w/ Sakurios) by u/rendleshift](https://i.imgur.com/SwYZ4wol.jpg) +![JJ50 rev1 + SA Vilebloom (w/ Sakurios) by u/rendleshift](https://i.imgur.com/SwYZ4wol.jpg) A compact 50% (5x12) ortholinear keyboard made and sold by KPrepublic. * Keyboard Maintainer: [QMK Community](https://github.com/qmk) -* Hardware Supported: Atmega32A +* Hardware Supported: JJ50 rev1 (ATmega32A) * Hardware Availability: [AliExpress](https://www.aliexpress.com/item/jj50-v1-0-Custom-Mechanical-Keyboard-50-PCB-programmed-50-preonic-layouts-bface-firmware-with-rgb/32848915277.html); [KPrepublic](https://kprepublic.com/collections/jj50-50/products/jj50-50-custom-keyboard-pcb-similar-with-preonic) Make example for this keyboard (after setting up your build environment): - make kprepublic/jj50:default + make kprepublic/jj50/rev1:default Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid)) - make kprepublic/jj50:default:flash + make kprepublic/jj50/rev1:default:flash **Reset Key**: Hold down the key `Backspace` (`Key below the top right key`) while plugging in the keyboard. diff --git a/keyboards/kprepublic/jj50/rules.mk b/keyboards/kprepublic/jj50/rules.mk index 2e721d00cde..8f77c68db25 100644 --- a/keyboards/kprepublic/jj50/rules.mk +++ b/keyboards/kprepublic/jj50/rules.mk @@ -1,12 +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 -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -LTO_ENABLE = yes # Enable link time optimization +DEFAULT_FOLDER = kprepublic/jj50/rev1 From 7e39635c0a76bc852169a765b2c21b52615de152 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 15 Mar 2024 20:37:40 -0700 Subject: [PATCH 040/333] Swift65 Solder Layout Name Standardization (#23289) * Rename `LAYOUT_625u_space` to `LAYOUT_ansi_blocker` [refactor] * Rename `LAYOUT_625u_space_split_bs` to `LAYOUT_ansi_blocker_split_bs` [refactor] * Rename `LAYOUT_7u_space` to `LAYOUT_ansi_blocker_tsangan` [refactor] * Rename `LAYOUT_7u_space_split_bs` to `LAYOUT_ansi_blocker_tsangan_split_bs` [refactor] * Rename `LAYOUT_iso_625u_space` to `LAYOUT_iso_blocker` [refactor] * Rename `LAYOUT_iso_625u_space_split_bs` to `LAYOUT_iso_blocker_split_bs` [refactor] * Rename `LAYOUT_iso_7u_space` to `LAYOUT_iso_blocker_tsangan` [refactor] * Rename `LAYOUT_iso_7u_space_split_bs` to `LAYOUT_iso_blocker_tsangan_split_bs` [refactor] * Refactor keymaps Updates the keycode grid alignment to better resemble the assembled board. [style] --- .../alfredslab/swift65/solder/keyboard.json | 28 +++++++---- .../swift65/solder/keymaps/default/keymap.c | 26 +++++----- .../swift65/solder/keymaps/via/keymap.c | 48 +++++++++---------- 3 files changed, 55 insertions(+), 47 deletions(-) diff --git a/keyboards/alfredslab/swift65/solder/keyboard.json b/keyboards/alfredslab/swift65/solder/keyboard.json index 3bd15e74964..cb419d4cc1f 100644 --- a/keyboards/alfredslab/swift65/solder/keyboard.json +++ b/keyboards/alfredslab/swift65/solder/keyboard.json @@ -47,11 +47,19 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { - "LAYOUT": "LAYOUT_625u_space_split_bs", - "LAYOUT_all": "LAYOUT_625u_space_split_bs" + "LAYOUT": "LAYOUT_ansi_blocker_split_bs", + "LAYOUT_all": "LAYOUT_ansi_blocker_split_bs", + "LAYOUT_625u_space": "LAYOUT_ansi_blocker", + "LAYOUT_625u_space_split_bs": "LAYOUT_ansi_blocker_split_bs", + "LAYOUT_7u_space": "LAYOUT_ansi_blocker_tsangan", + "LAYOUT_7u_space_split_bs": "LAYOUT_ansi_blocker_tsangan_split_bs", + "LAYOUT_iso_625u_space": "LAYOUT_iso_blocker", + "LAYOUT_iso_625u_space_split_bs": "LAYOUT_iso_blocker_split_bs", + "LAYOUT_iso_7u_space": "LAYOUT_iso_blocker_tsangan", + "LAYOUT_iso_7u_space_split_bs": "LAYOUT_iso_blocker_tsangan_split_bs" }, "layouts": { - "LAYOUT_625u_space": { + "LAYOUT_ansi_blocker": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -129,7 +137,7 @@ {"matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_625u_space_split_bs": { + "LAYOUT_ansi_blocker_split_bs": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -208,7 +216,7 @@ {"matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_7u_space": { + "LAYOUT_ansi_blocker_tsangan": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -285,7 +293,7 @@ {"matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_7u_space_split_bs": { + "LAYOUT_ansi_blocker_tsangan_split_bs": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -363,7 +371,7 @@ {"matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_iso_625u_space": { + "LAYOUT_iso_blocker": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -442,7 +450,7 @@ {"matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_iso_625u_space_split_bs": { + "LAYOUT_iso_blocker_split_bs": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -522,7 +530,7 @@ {"matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_iso_7u_space": { + "LAYOUT_iso_blocker_tsangan": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -600,7 +608,7 @@ {"matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_iso_7u_space_split_bs": { + "LAYOUT_iso_blocker_tsangan_split_bs": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, diff --git a/keyboards/alfredslab/swift65/solder/keymaps/default/keymap.c b/keyboards/alfredslab/swift65/solder/keymaps/default/keymap.c index 0aed2fd3c57..3dfd7ad48b2 100644 --- a/keyboards/alfredslab/swift65/solder/keymaps/default/keymap.c +++ b/keyboards/alfredslab/swift65/solder/keymaps/default/keymap.c @@ -17,19 +17,19 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_625u_space_split_bs( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + [0] = LAYOUT_ansi_blocker_split_bs( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_625u_space_split_bs( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END + [1] = LAYOUT_ansi_blocker_split_bs( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), -}; \ No newline at end of file +}; diff --git a/keyboards/alfredslab/swift65/solder/keymaps/via/keymap.c b/keyboards/alfredslab/swift65/solder/keymaps/via/keymap.c index 5e54716a93f..ba05b3340ae 100644 --- a/keyboards/alfredslab/swift65/solder/keymaps/via/keymap.c +++ b/keyboards/alfredslab/swift65/solder/keymaps/via/keymap.c @@ -17,33 +17,33 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_625u_space_split_bs( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + [0] = LAYOUT_ansi_blocker_split_bs( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_625u_space_split_bs( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END + [1] = LAYOUT_ansi_blocker_split_bs( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), - [2] = LAYOUT_625u_space_split_bs( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + [2] = LAYOUT_ansi_blocker_split_bs( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT_625u_space_split_bs( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + [3] = LAYOUT_ansi_blocker_split_bs( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; From 164065682eae63805ebe61a4c5a561c4ea2f523c Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 15 Mar 2024 20:38:01 -0700 Subject: [PATCH 041/333] Swift65 Hotswap Layout Name Standardization (#23288) * Rename `LAYOUT_7u_space` to `LAYOUT_ansi_blocker_tsangan` [refactor] * Refactor keymaps Updates the keycode grid alignment to better resemble the assembled board. [style] --- .../alfredslab/swift65/hotswap/keyboard.json | 9 ++-- .../swift65/hotswap/keymaps/default/keymap.c | 26 +++++----- .../swift65/hotswap/keymaps/via/keymap.c | 49 +++++++++---------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/keyboards/alfredslab/swift65/hotswap/keyboard.json b/keyboards/alfredslab/swift65/hotswap/keyboard.json index 7799374e7cf..d2a6e6da036 100644 --- a/keyboards/alfredslab/swift65/hotswap/keyboard.json +++ b/keyboards/alfredslab/swift65/hotswap/keyboard.json @@ -46,11 +46,12 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { - "LAYOUT": "LAYOUT_7u_space", - "LAYOUT_all": "LAYOUT_7u_space" - }, + "LAYOUT": "LAYOUT_ansi_blocker_tsangan", + "LAYOUT_all": "LAYOUT_ansi_blocker_tsangan", + "LAYOUT_7u_space": "LAYOUT_ansi_blocker_tsangan" + }, "layouts": { - "LAYOUT_7u_space": { + "LAYOUT_ansi_blocker_tsangan": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, diff --git a/keyboards/alfredslab/swift65/hotswap/keymaps/default/keymap.c b/keyboards/alfredslab/swift65/hotswap/keymaps/default/keymap.c index 53c29981dfd..27f69d27c04 100644 --- a/keyboards/alfredslab/swift65/hotswap/keymaps/default/keymap.c +++ b/keyboards/alfredslab/swift65/hotswap/keymaps/default/keymap.c @@ -18,20 +18,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_7u_space( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, _______, KC_LEFT, KC_DOWN, KC_RGHT + [0] = LAYOUT_ansi_blocker_tsangan( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, _______, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_7u_space( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, - _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END + [1] = LAYOUT_ansi_blocker_tsangan( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, + _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), -}; \ No newline at end of file +}; diff --git a/keyboards/alfredslab/swift65/hotswap/keymaps/via/keymap.c b/keyboards/alfredslab/swift65/hotswap/keymaps/via/keymap.c index 25abe67beec..828ff4ae578 100644 --- a/keyboards/alfredslab/swift65/hotswap/keymaps/via/keymap.c +++ b/keyboards/alfredslab/swift65/hotswap/keymaps/via/keymap.c @@ -17,37 +17,36 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_7u_space( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, _______, KC_LEFT, KC_DOWN, KC_RGHT + [0] = LAYOUT_ansi_blocker_tsangan( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, _______, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_7u_space( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, - _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END + [1] = LAYOUT_ansi_blocker_tsangan( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, + _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), - - [2] = LAYOUT_7u_space( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + [2] = LAYOUT_ansi_blocker_tsangan( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT_7u_space( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + [3] = LAYOUT_ansi_blocker_tsangan( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; From 47dc471bd45dc5428638fa40f95b0a3560cc09e4 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 17 Mar 2024 00:03:58 -0700 Subject: [PATCH 042/333] KPRepublic JJ40 rev1 Refactor (#23299) * Move `kprepublic/jj40` to `kprepublic/jj40/rev1` [chore] * Friendly-format `info.json` [style] * Add layout/matrix diagram [docs] * Refactor keymaps - use four-space indent - grid-align keycodes - refactor to use `LAYOUT_ortho_4x12` macro [refactor] * Rename `LAYOUT_planck_mit` to `LAYOUT_ortho_4x12_1x2u_c` [refactor] * Rename `LAYOUT_planck_1x2uR` to `LAYOUT_ortho_4x12_1x2u_r` [refactor] * Re-sort `layouts` object Places `LAYOUT_ortho_4x12` (the `LAYOUT_all` equivalent) first in sequence. [refactor] * Add `LAYOUT_ortho_4x12_1x2u_l` [enhancement] * Add `LAYOUT_ortho_4x12_2x2u` [enhancement] * Convert `rules.mk` to data driven [chore] * Remove `console` and `command` settings from keyboard level [chore] * Rename `info.json` to `keyboard.json` [chore] [enhancement] * Remove `audio` setting from keyboard level [chore] --- data/mappings/keyboard_aliases.hjson | 3 + keyboards/kprepublic/jj40/info.json | 211 ----------- .../kprepublic/jj40/keymaps/default/keymap.c | 146 ++++---- .../kprepublic/jj40/keymaps/via/keymap.c | 136 ++++---- keyboards/kprepublic/jj40/rev1/keyboard.json | 328 ++++++++++++++++++ .../kprepublic/jj40/rev1/matrix_diagram.md | 19 + .../kprepublic/jj40/{ => rev1}/readme.md | 10 +- keyboards/kprepublic/jj40/rev1/rules.mk | 2 + keyboards/kprepublic/jj40/rules.mk | 16 +- 9 files changed, 499 insertions(+), 372 deletions(-) delete mode 100644 keyboards/kprepublic/jj40/info.json create mode 100644 keyboards/kprepublic/jj40/rev1/keyboard.json create mode 100644 keyboards/kprepublic/jj40/rev1/matrix_diagram.md rename keyboards/kprepublic/jj40/{ => rev1}/readme.md (76%) create mode 100644 keyboards/kprepublic/jj40/rev1/rules.mk diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 8508c87a3ba..7421b8bfacd 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -1520,6 +1520,9 @@ "target": "ymdk/melody96/soldered" }, // Moved during 2024 Q2 cycle + "kprepublic/jj40": { + "target": "kprepublic/jj40/rev1" + }, "kprepublic/jj50": { "target": "kprepublic/jj50/rev1" } diff --git a/keyboards/kprepublic/jj40/info.json b/keyboards/kprepublic/jj40/info.json deleted file mode 100644 index 79c9d4a7591..00000000000 --- a/keyboards/kprepublic/jj40/info.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "keyboard_name": "JJ40", - "manufacturer": "KPrepublic", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0x4B50", - "pid": "0x0040", - "device_version": "2.0.0", - "max_power": 100 - }, - "matrix_pins": { - "cols": ["C4", "C5", "C6", "C7", "A4", "A5", "A6", "A7", "A3", "A2", "A1", "A0"], - "rows": ["B0", "B1", "B3", "B4"] - }, - "diode_direction": "COL2ROW", - "backlight": { - "pin": "D4", - "levels": 12, - "breathing": true - }, - "rgblight": { - "led_count": 5, - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } - }, - "ws2812": { - "driver": "i2c" - }, - "processor": "atmega32a", - "bootloader": "bootloadhid", - "community_layouts": ["ortho_4x12", "planck_mit"], - "layout_aliases": { - "LAYOUT": "LAYOUT_planck_mit" - }, - "layouts": { - "LAYOUT_planck_mit": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, - {"matrix": [1, 7], "x": 7, "y": 1}, - {"matrix": [1, 8], "x": 8, "y": 1}, - {"matrix": [1, 9], "x": 9, "y": 1}, - {"matrix": [1, 10], "x": 10, "y": 1}, - {"matrix": [1, 11], "x": 11, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [2, 6], "x": 6, "y": 2}, - {"matrix": [2, 7], "x": 7, "y": 2}, - {"matrix": [2, 8], "x": 8, "y": 2}, - {"matrix": [2, 9], "x": 9, "y": 2}, - {"matrix": [2, 10], "x": 10, "y": 2}, - {"matrix": [2, 11], "x": 11, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3, "w": 2}, - {"matrix": [3, 7], "x": 7, "y": 3}, - {"matrix": [3, 8], "x": 8, "y": 3}, - {"matrix": [3, 9], "x": 9, "y": 3}, - {"matrix": [3, 10], "x": 10, "y": 3}, - {"matrix": [3, 11], "x": 11, "y": 3} - ] - }, - "LAYOUT_ortho_4x12": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, - {"matrix": [1, 7], "x": 7, "y": 1}, - {"matrix": [1, 8], "x": 8, "y": 1}, - {"matrix": [1, 9], "x": 9, "y": 1}, - {"matrix": [1, 10], "x": 10, "y": 1}, - {"matrix": [1, 11], "x": 11, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [2, 6], "x": 6, "y": 2}, - {"matrix": [2, 7], "x": 7, "y": 2}, - {"matrix": [2, 8], "x": 8, "y": 2}, - {"matrix": [2, 9], "x": 9, "y": 2}, - {"matrix": [2, 10], "x": 10, "y": 2}, - {"matrix": [2, 11], "x": 11, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, - {"matrix": [3, 6], "x": 6, "y": 3}, - {"matrix": [3, 7], "x": 7, "y": 3}, - {"matrix": [3, 8], "x": 8, "y": 3}, - {"matrix": [3, 9], "x": 9, "y": 3}, - {"matrix": [3, 10], "x": 10, "y": 3}, - {"matrix": [3, 11], "x": 11, "y": 3} - ] - }, - "LAYOUT_planck_1x2uR": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, - {"matrix": [1, 7], "x": 7, "y": 1}, - {"matrix": [1, 8], "x": 8, "y": 1}, - {"matrix": [1, 9], "x": 9, "y": 1}, - {"matrix": [1, 10], "x": 10, "y": 1}, - {"matrix": [1, 11], "x": 11, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [2, 6], "x": 6, "y": 2}, - {"matrix": [2, 7], "x": 7, "y": 2}, - {"matrix": [2, 8], "x": 8, "y": 2}, - {"matrix": [2, 9], "x": 9, "y": 2}, - {"matrix": [2, 10], "x": 10, "y": 2}, - {"matrix": [2, 11], "x": 11, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, - {"matrix": [3, 6], "x": 6, "y": 3, "w": 2}, - {"matrix": [3, 8], "x": 8, "y": 3}, - {"matrix": [3, 9], "x": 9, "y": 3}, - {"matrix": [3, 10], "x": 10, "y": 3}, - {"matrix": [3, 11], "x": 11, "y": 3} - ] - } - } -} diff --git a/keyboards/kprepublic/jj40/keymaps/default/keymap.c b/keyboards/kprepublic/jj40/keymaps/default/keymap.c index c82106e1871..24218dddfc2 100644 --- a/keyboards/kprepublic/jj40/keymaps/default/keymap.c +++ b/keyboards/kprepublic/jj40/keymaps/default/keymap.c @@ -16,89 +16,89 @@ #include QMK_KEYBOARD_H enum layers { - _QWERTY = 0, - _LOWER, - _RAISE, - _ADJUST, + _QWERTY = 0, + _LOWER, + _RAISE, + _ADJUST, }; #define LOWER MO(_LOWER) #define RAISE MO(_RAISE) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Qwerty - * ,-----------------------------------------------------------------------------------. - * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Esc | A | S | D | F | G | H | J | K | L | ; | " | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ -[_QWERTY] = LAYOUT_planck_mit( - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , - _______, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT -), + /* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ + [_QWERTY] = LAYOUT_ortho_4x12( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + _______, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), -/* Lower - * ,-----------------------------------------------------------------------------------. - * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Next | Vol- | Vol+ | Play | - * `-----------------------------------------------------------------------------------' - */ -[_LOWER] = LAYOUT_planck_mit( - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, - KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY -), + /* Lower + * ,-----------------------------------------------------------------------------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ + [_LOWER] = LAYOUT_ortho_4x12( + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), -/* Raise - * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Next | Vol- | Vol+ | Play | - * `-----------------------------------------------------------------------------------' - */ -[_RAISE] = LAYOUT_planck_mit( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY -), + /* Raise + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ + [_RAISE] = LAYOUT_ortho_4x12( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), -/* Adjust (Lower + Raise) - * ,-----------------------------------------------------------------------------------. - * | | Reset| | | | | | | | | | Del | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, - _______, _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ -) + /* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | | Reset| | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | |BL Tog|BL Mod| | | | | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | |RGBTog|RGBMod| | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ + [_ADJUST] = LAYOUT_ortho_4x12( + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) }; layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); } diff --git a/keyboards/kprepublic/jj40/keymaps/via/keymap.c b/keyboards/kprepublic/jj40/keymaps/via/keymap.c index 84e27088497..b52e92ab7ac 100644 --- a/keyboards/kprepublic/jj40/keymaps/via/keymap.c +++ b/keyboards/kprepublic/jj40/keymaps/via/keymap.c @@ -19,75 +19,75 @@ #define RAISE TL_UPPR const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Qwerty - * ,-----------------------------------------------------------------------------------. - * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Esc | A | S | D | F | G | H | J | K | L | ; | " | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ -[0] = LAYOUT_planck_mit( - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , - _______, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT -), + /* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ + [0] = LAYOUT_ortho_4x12( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , + _______, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), -/* Lower - * ,-----------------------------------------------------------------------------------. - * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Next | Vol- | Vol+ | Play | - * `-----------------------------------------------------------------------------------' - */ -[1] = LAYOUT_planck_mit( - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, - KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY -), + /* Lower + * ,-----------------------------------------------------------------------------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ + [1] = LAYOUT_ortho_4x12( + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), -/* Raise - * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Next | Vol- | Vol+ | Play | - * `-----------------------------------------------------------------------------------' - */ -[2] = LAYOUT_planck_mit( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY -), + /* Raise + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ + [2] = LAYOUT_ortho_4x12( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), -/* Adjust (Lower + Raise) - * ,-----------------------------------------------------------------------------------. - * | | Reset| | | | | | | | | | Del | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[3] = LAYOUT_planck_mit( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, - _______, _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ -) + /* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | | Reset| | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ + [3] = LAYOUT_ortho_4x12( + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) }; diff --git a/keyboards/kprepublic/jj40/rev1/keyboard.json b/keyboards/kprepublic/jj40/rev1/keyboard.json new file mode 100644 index 00000000000..3ac3e2f02cd --- /dev/null +++ b/keyboards/kprepublic/jj40/rev1/keyboard.json @@ -0,0 +1,328 @@ +{ + "keyboard_name": "JJ40 rev1", + "manufacturer": "KPrepublic", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4B50", + "pid": "0x0040", + "device_version": "2.0.0", + "max_power": 100 + }, + "matrix_pins": { + "cols": ["C4", "C5", "C6", "C7", "A4", "A5", "A6", "A7", "A3", "A2", "A1", "A0"], + "rows": ["B0", "B1", "B3", "B4"] + }, + "diode_direction": "COL2ROW", + "backlight": { + "pin": "D4", + "levels": 12, + "breathing": true + }, + "rgblight": { + "led_count": 5, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "ws2812": { + "driver": "i2c" + }, + "processor": "atmega32a", + "bootloader": "bootloadhid", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": false, + "backlight": true, + "rgblight": true + }, + "community_layouts": ["ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12_1x2u_c", + "LAYOUT_planck_mit": "LAYOUT_ortho_4x12_1x2u_c", + "LAYOUT_planck_1x2uR": "LAYOUT_ortho_4x12_1x2u_r" + }, + "layouts": { + "LAYOUT_ortho_4x12": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} + ] + }, + "LAYOUT_ortho_4x12_1x2u_c": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} + ] + }, + "LAYOUT_ortho_4x12_1x2u_l": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3, "w": 2}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} + ] + }, + "LAYOUT_ortho_4x12_1x2u_r": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} + ] + }, + "LAYOUT_ortho_4x12_2x2u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3, "w": 2}, + {"matrix": [3, 6], "x": 6, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} + ] + } + } +} diff --git a/keyboards/kprepublic/jj40/rev1/matrix_diagram.md b/keyboards/kprepublic/jj40/rev1/matrix_diagram.md new file mode 100644 index 00000000000..33858c5714f --- /dev/null +++ b/keyboards/kprepublic/jj40/rev1/matrix_diagram.md @@ -0,0 +1,19 @@ +# Matrix Diagram for KPrepublic JJ40 rev1 + +``` +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ +│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ +│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ +│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │ +└───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ + ┌───────┐ + │35 │ 1x2u_c (MIT) + └───────┘ + ┌───────┬───────┐ + │34 │36 │ 2x2u_c + └───────┴───────┘ +``` diff --git a/keyboards/kprepublic/jj40/readme.md b/keyboards/kprepublic/jj40/rev1/readme.md similarity index 76% rename from keyboards/kprepublic/jj40/readme.md rename to keyboards/kprepublic/jj40/rev1/readme.md index 06ca2e657ee..12d65869da3 100644 --- a/keyboards/kprepublic/jj40/readme.md +++ b/keyboards/kprepublic/jj40/rev1/readme.md @@ -1,20 +1,20 @@ -# jj40 +# JJ40 rev1 -![jj40](https://ae01.alicdn.com/kf/HTB18bq6bOERMeJjSspiq6zZLFXar.jpg?size=359506&height=562&width=750&hash=663a22d0109e2416ec8f54a7658686da) +![JJ40 rev1](https://ae01.alicdn.com/kf/HTB18bq6bOERMeJjSspiq6zZLFXar.jpg?size=359506&height=562&width=750&hash=663a22d0109e2416ec8f54a7658686da) A compact 40% (12x4) ortholinear keyboard kit made and KPRepublic on AliExpress. * Keyboard Maintainer: [QMK Community](https://github.com/qmk) -* Hardware Supported: Atmega32A +* Hardware Supported: JJ40 rev1 (Atmega32A) * Hardware Availability: [AliExpress](https://www.aliexpress.com/store/product/jj40-Custom-Mechanical-Keyboard-40-PCB-programmed-40-planck-layouts-bface-firmware-gh40/3034003_32828781103.html) Make example for this keyboard (after setting up your build environment): - make kprepublic/jj40:default + make kprepublic/jj40/rev1:default Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid)) - make kprepublic/jj40:default:flash + make kprepublic/jj40/rev1:default:flash **Reset Key**: Hold down the *Top Right Key* key, commonly programmed as *Backspace* while plugging in the keyboard. diff --git a/keyboards/kprepublic/jj40/rev1/rules.mk b/keyboards/kprepublic/jj40/rev1/rules.mk new file mode 100644 index 00000000000..271780b75ec --- /dev/null +++ b/keyboards/kprepublic/jj40/rev1/rules.mk @@ -0,0 +1,2 @@ +# Disable unsupported hardware +AUDIO_SUPPORTED = no diff --git a/keyboards/kprepublic/jj40/rules.mk b/keyboards/kprepublic/jj40/rules.mk index 13588c113cc..fa09523958c 100644 --- a/keyboards/kprepublic/jj40/rules.mk +++ b/keyboards/kprepublic/jj40/rules.mk @@ -1,15 +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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# Disable unsupported hardware -AUDIO_SUPPORTED = no +DEFAULT_FOLDER = kprepublic/jj40/rev1 From 23b7a02ebe2e6df738baa624c17e821c1573b69b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 17 Mar 2024 19:23:14 +1100 Subject: [PATCH 043/333] LED drivers: add support for IS31FL3236 (#23264) --- builddefs/common_features.mk | 16 ++- data/schemas/keyboard.jsonschema | 2 + docs/reference_info_json.md | 2 +- drivers/led/issi/is31fl3236-mono.c | 168 +++++++++++++++++++++++ drivers/led/issi/is31fl3236-mono.h | 101 ++++++++++++++ drivers/led/issi/is31fl3236.c | 172 ++++++++++++++++++++++++ drivers/led/issi/is31fl3236.h | 103 ++++++++++++++ quantum/led_matrix/led_matrix_drivers.c | 8 ++ quantum/led_matrix/led_matrix_drivers.h | 2 + quantum/rgb_matrix/rgb_matrix_drivers.c | 8 ++ quantum/rgb_matrix/rgb_matrix_drivers.h | 2 + 11 files changed, 581 insertions(+), 3 deletions(-) create mode 100644 drivers/led/issi/is31fl3236-mono.c create mode 100644 drivers/led/issi/is31fl3236-mono.h create mode 100644 drivers/led/issi/is31fl3236.c create mode 100644 drivers/led/issi/is31fl3236.h diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index 7227a5558e2..49197dc91e1 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -340,7 +340,7 @@ LED_MATRIX_DRIVER := snled27351 endif LED_MATRIX_ENABLE ?= no -VALID_LED_MATRIX_TYPES := is31fl3218 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 custom +VALID_LED_MATRIX_TYPES := is31fl3218 is31fl3236 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 custom ifeq ($(strip $(LED_MATRIX_ENABLE)), yes) ifeq ($(filter $(LED_MATRIX_DRIVER),$(VALID_LED_MATRIX_TYPES)),) @@ -365,6 +365,12 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), yes) SRC += is31fl3218-mono.c endif + ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3236) + I2C_DRIVER_REQUIRED = yes + COMMON_VPATH += $(DRIVER_PATH)/led/issi + SRC += is31fl3236-mono.c + endif + ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3729) I2C_DRIVER_REQUIRED = yes COMMON_VPATH += $(DRIVER_PATH)/led/issi @@ -443,7 +449,7 @@ endif RGB_MATRIX_ENABLE ?= no -VALID_RGB_MATRIX_TYPES := aw20216s is31fl3218 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 ws2812 custom +VALID_RGB_MATRIX_TYPES := aw20216s is31fl3218 is31fl3236 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 ws2812 custom ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes) ifeq ($(filter $(RGB_MATRIX_DRIVER),$(VALID_RGB_MATRIX_TYPES)),) $(call CATASTROPHIC_ERROR,Invalid RGB_MATRIX_DRIVER,RGB_MATRIX_DRIVER="$(RGB_MATRIX_DRIVER)" is not a valid matrix type) @@ -474,6 +480,12 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes) SRC += is31fl3218.c endif + ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3236) + I2C_DRIVER_REQUIRED = yes + COMMON_VPATH += $(DRIVER_PATH)/led/issi + SRC += is31fl3236.c + endif + ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3729) I2C_DRIVER_REQUIRED = yes COMMON_VPATH += $(DRIVER_PATH)/led/issi diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 5c6788913b0..25aaabcf4a3 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -453,6 +453,7 @@ "enum": [ "custom", "is31fl3218", + "is31fl3236", "is31fl3729", "is31fl3731", "is31fl3733", @@ -535,6 +536,7 @@ "aw20216s", "custom", "is31fl3218", + "is31fl3236", "is31fl3729", "is31fl3731", "is31fl3733", diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md index b715c14041c..e6bc34e79ec 100644 --- a/docs/reference_info_json.md +++ b/docs/reference_info_json.md @@ -640,7 +640,7 @@ Configures the [RGB Matrix](feature_rgb_matrix.md) feature. * The default animation speed. * Default: `128` * `driver` (Required) - * The driver to use. Must be one of `aw20216s`, `custom`, `is31fl3218`, `is31fl3729`, `is31fl3731`, `is31fl3733`, `is31fl3736`, `is31fl3737`, `is31fl3741`, `is31fl3742a`, `is31fl3743a`, `is31fl3745`, `is31fl3746a`, `snled27351`, `ws2812`. + * The driver to use. Must be one of `aw20216s`, `custom`, `is31fl3218`, `is31fl3236`, `is31fl3729`, `is31fl3731`, `is31fl3733`, `is31fl3736`, `is31fl3737`, `is31fl3741`, `is31fl3742a`, `is31fl3743a`, `is31fl3745`, `is31fl3746a`, `snled27351`, `ws2812`. * `hue_steps` * The number of hue adjustment steps. * Default: `8` diff --git a/drivers/led/issi/is31fl3236-mono.c b/drivers/led/issi/is31fl3236-mono.c new file mode 100644 index 00000000000..b80245a1dc0 --- /dev/null +++ b/drivers/led/issi/is31fl3236-mono.c @@ -0,0 +1,168 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "is31fl3236-mono.h" +#include "i2c_master.h" +#include "gpio.h" + +#define IS31FL3236_PWM_REGISTER_COUNT 36 +#define IS31FL3236_LED_CONTROL_REGISTER_COUNT 36 + +#ifndef IS31FL3236_I2C_TIMEOUT +# define IS31FL3236_I2C_TIMEOUT 100 +#endif + +#ifndef IS31FL3236_I2C_PERSISTENCE +# define IS31FL3236_I2C_PERSISTENCE 0 +#endif + +#ifndef IS31FL3236_PWM_FREQUENCY +# define IS31FL3236_PWM_FREQUENCY IS31FL3236_PWM_FREQUENCY_3K_HZ // OFS - IS31FL3236A only +#endif + +const uint8_t i2c_addresses[IS31FL3236_DRIVER_COUNT] = { + IS31FL3236_I2C_ADDRESS_1, +#ifdef IS31FL3236_I2C_ADDRESS_2 + IS31FL3236_I2C_ADDRESS_2, +# ifdef IS31FL3236_I2C_ADDRESS_3 + IS31FL3236_I2C_ADDRESS_3, +# ifdef IS31FL3236_I2C_ADDRESS_4 + IS31FL3236_I2C_ADDRESS_4, +# endif +# endif +#endif +}; + +typedef struct is31fl3236_driver_t { + uint8_t pwm_buffer[IS31FL3236_PWM_REGISTER_COUNT]; + bool pwm_buffer_dirty; + uint8_t led_control_buffer[IS31FL3236_LED_CONTROL_REGISTER_COUNT]; + bool led_control_buffer_dirty; +} PACKED is31fl3236_driver_t; + +is31fl3236_driver_t driver_buffers[IS31FL3236_DRIVER_COUNT] = {{ + .pwm_buffer = {0}, + .pwm_buffer_dirty = false, + .led_control_buffer = {0}, + .led_control_buffer_dirty = false, +}}; + +void is31fl3236_write_register(uint8_t index, uint8_t reg, uint8_t data) { +#if IS31FL3236_I2C_PERSISTENCE > 0 + for (uint8_t i = 0; i < IS31FL3236_I2C_PERSISTENCE; i++) { + if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3236_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; + } +#else + i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3236_I2C_TIMEOUT); +#endif +} + +void is31fl3236_write_pwm_buffer(uint8_t index) { +#if IS31FL3236_I2C_PERSISTENCE > 0 + for (uint8_t i = 0; i < IS31FL3236_I2C_PERSISTENCE; i++) { + if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3236_REG_PWM, driver_buffers[index].pwm_buffer, 36, IS31FL3236_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; + } +#else + i2c_write_register(i2c_addresses[index] << 1, IS31FL3236_REG_PWM, driver_buffers[index].pwm_buffer, 36, IS31FL3236_I2C_TIMEOUT); +#endif +} + +void is31fl3236_init_drivers(void) { + i2c_init(); + +#if defined(IS31FL3236_SDB_PIN) + gpio_set_pin_output(IS31FL3236_SDB_PIN); + gpio_write_pin_high(IS31FL3236_SDB_PIN); +#endif + + for (uint8_t i = 0; i < IS31FL3236_DRIVER_COUNT; i++) { + is31fl3236_init(i); + } + + for (uint8_t i = 0; i < IS31FL3236_LED_COUNT; i++) { + is31fl3236_set_led_control_register(i, true); + } + + for (uint8_t i = 0; i < IS31FL3236_DRIVER_COUNT; i++) { + is31fl3236_update_led_control_registers(i); + } +} + +void is31fl3236_init(uint8_t index) { + // In case we ever want to reinitialize (?) + is31fl3236_write_register(index, IS31FL3236_REG_RESET, 0x00); + + // Turn off software shutdown + is31fl3236_write_register(index, IS31FL3236_REG_SHUTDOWN, 0x01); + + // Set all PWM values to zero + for (uint8_t i = 0; i < IS31FL3236_PWM_REGISTER_COUNT; i++) { + is31fl3236_write_register(index, IS31FL3236_REG_PWM + i, 0x00); + } + + // turn off all LEDs in the LED control register + for (uint8_t i = 0; i < IS31FL3236_LED_CONTROL_REGISTER_COUNT; i++) { + is31fl3236_write_register(index, IS31FL3236_REG_LED_CONTROL + i, 0x00); + } + + // Set PWM frequency (IS31FL3236A) + is31fl3236_write_register(index, IS31FL3236_REG_PWM_FREQUENCY, IS31FL3236_PWM_FREQUENCY); + + // Load PWM registers and LED Control register data + is31fl3236_write_register(index, IS31FL3236_REG_UPDATE, 0x01); +} + +void is31fl3236_set_value(int index, uint8_t value) { + is31fl3236_led_t led; + + if (index < IS31FL3236_LED_COUNT) { + memcpy_P(&led, (&g_is31fl3236_leds[index]), sizeof(led)); + + if (driver_buffers[led.driver].pwm_buffer[led.v] == value) { + return; + } + + driver_buffers[led.driver].pwm_buffer[led.v] = value; + driver_buffers[led.driver].pwm_buffer_dirty = true; + } +} + +void is31fl3236_set_value_all(uint8_t value) { + for (uint8_t i = 0; i < IS31FL3236_LED_COUNT; i++) { + is31fl3236_set_value(i, value); + } +} + +void is31fl3236_set_led_control_register(uint8_t index, bool value) { + is31fl3236_led_t led; + memcpy_P(&led, (&g_is31fl3236_leds[index]), sizeof(led)); + + driver_buffers[led.driver].led_control_buffer[led.v] = value ? 0x01 : 0x00; + driver_buffers[led.driver].led_control_buffer_dirty = true; +} + +void is31fl3236_update_pwm_buffers(uint8_t index) { + if (driver_buffers[index].pwm_buffer_dirty) { + is31fl3236_write_pwm_buffer(index); + // Load PWM registers and LED Control register data + is31fl3236_write_register(index, IS31FL3236_REG_UPDATE, 0x01); + + driver_buffers[index].pwm_buffer_dirty = false; + } +} + +void is31fl3236_update_led_control_registers(uint8_t index) { + if (driver_buffers[index].led_control_buffer_dirty) { + for (uint8_t i = 0; i < IS31FL3236_LED_CONTROL_REGISTER_COUNT; i++) { + is31fl3236_write_register(index, IS31FL3236_REG_LED_CONTROL + i, driver_buffers[index].led_control_buffer[i]); + } + + driver_buffers[index].led_control_buffer_dirty = false; + } +} + +void is31fl3236_flush(void) { + for (uint8_t i = 0; i < IS31FL3236_DRIVER_COUNT; i++) { + is31fl3236_update_pwm_buffers(i); + } +} diff --git a/drivers/led/issi/is31fl3236-mono.h b/drivers/led/issi/is31fl3236-mono.h new file mode 100644 index 00000000000..90735bb1aa7 --- /dev/null +++ b/drivers/led/issi/is31fl3236-mono.h @@ -0,0 +1,101 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include +#include "progmem.h" +#include "util.h" + +#define IS31FL3236_REG_SHUTDOWN 0x00 +#define IS31FL3236_REG_PWM 0x01 +#define IS31FL3236_REG_UPDATE 0x25 +#define IS31FL3236_REG_LED_CONTROL 0x26 +#define IS31FL3236_REG_GLOBAL_CONTROL 0x4A +#define IS31FL3236_REG_PWM_FREQUENCY 0x4B +#define IS31FL3236_REG_RESET 0x4F + +#define IS31FL3236_I2C_ADDRESS_GND 0x3C +#define IS31FL3236_I2C_ADDRESS_SCL 0x3D +#define IS31FL3236_I2C_ADDRESS_SDA 0x3E +#define IS31FL3236_I2C_ADDRESS_VCC 0x3F + +#if defined(LED_MATRIX_IS31FL3236) +# define IS31FL3236_LED_COUNT LED_MATRIX_LED_COUNT +#endif + +#if defined(IS31FL3236_I2C_ADDRESS_4) +# define IS31FL3236_DRIVER_COUNT 4 +#elif defined(IS31FL3236_I2C_ADDRESS_3) +# define IS31FL3236_DRIVER_COUNT 3 +#elif defined(IS31FL3236_I2C_ADDRESS_2) +# define IS31FL3236_DRIVER_COUNT 2 +#elif defined(IS31FL3236_I2C_ADDRESS_1) +# define IS31FL3236_DRIVER_COUNT 1 +#endif + +typedef struct is31fl3236_led_t { + uint8_t driver : 2; + uint8_t v; +} PACKED is31fl3236_led_t; + +extern const is31fl3236_led_t PROGMEM g_is31fl3236_leds[IS31FL3236_LED_COUNT]; + +void is31fl3236_init_drivers(void); + +void is31fl3236_init(uint8_t index); + +void is31fl3236_write_register(uint8_t index, uint8_t reg, uint8_t data); + +void is31fl3236_set_value(int index, uint8_t value); + +void is31fl3236_set_value_all(uint8_t value); + +void is31fl3236_set_led_control_register(uint8_t index, bool value); + +void is31fl3236_update_pwm_buffers(uint8_t index); + +void is31fl3236_update_led_control_registers(uint8_t index); + +void is31fl3236_flush(void); + +#define IS31FL3236_PWM_FREQUENCY_3K_HZ 0b0 +#define IS31FL3236_PWM_FREQUENCY_22K_HZ 0b1 + +#define OUT1 0x00 +#define OUT2 0x01 +#define OUT3 0x02 +#define OUT4 0x03 +#define OUT5 0x04 +#define OUT6 0x05 +#define OUT7 0x06 +#define OUT8 0x07 +#define OUT9 0x08 +#define OUT10 0x09 +#define OUT11 0x0A +#define OUT12 0x0B +#define OUT13 0x0C +#define OUT14 0x0D +#define OUT15 0x0E +#define OUT16 0x0F +#define OUT17 0x10 +#define OUT18 0x11 +#define OUT19 0x12 +#define OUT20 0x13 +#define OUT21 0x14 +#define OUT22 0x15 +#define OUT23 0x16 +#define OUT24 0x17 +#define OUT25 0x18 +#define OUT26 0x19 +#define OUT27 0x1A +#define OUT28 0x1B +#define OUT29 0x1C +#define OUT30 0x1D +#define OUT31 0x1E +#define OUT32 0x1F +#define OUT33 0x20 +#define OUT34 0x21 +#define OUT35 0x22 +#define OUT36 0x23 diff --git a/drivers/led/issi/is31fl3236.c b/drivers/led/issi/is31fl3236.c new file mode 100644 index 00000000000..b8aa9c34b1b --- /dev/null +++ b/drivers/led/issi/is31fl3236.c @@ -0,0 +1,172 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "is31fl3236.h" +#include "i2c_master.h" +#include "gpio.h" + +#define IS31FL3236_PWM_REGISTER_COUNT 36 +#define IS31FL3236_LED_CONTROL_REGISTER_COUNT 36 + +#ifndef IS31FL3236_I2C_TIMEOUT +# define IS31FL3236_I2C_TIMEOUT 100 +#endif + +#ifndef IS31FL3236_I2C_PERSISTENCE +# define IS31FL3236_I2C_PERSISTENCE 0 +#endif + +#ifndef IS31FL3236_PWM_FREQUENCY +# define IS31FL3236_PWM_FREQUENCY IS31FL3236_PWM_FREQUENCY_3K_HZ // OFS - IS31FL3236A only +#endif + +const uint8_t i2c_addresses[IS31FL3236_DRIVER_COUNT] = { + IS31FL3236_I2C_ADDRESS_1, +#ifdef IS31FL3236_I2C_ADDRESS_2 + IS31FL3236_I2C_ADDRESS_2, +# ifdef IS31FL3236_I2C_ADDRESS_3 + IS31FL3236_I2C_ADDRESS_3, +# ifdef IS31FL3236_I2C_ADDRESS_4 + IS31FL3236_I2C_ADDRESS_4, +# endif +# endif +#endif +}; + +typedef struct is31fl3236_driver_t { + uint8_t pwm_buffer[IS31FL3236_PWM_REGISTER_COUNT]; + bool pwm_buffer_dirty; + uint8_t led_control_buffer[IS31FL3236_LED_CONTROL_REGISTER_COUNT]; + bool led_control_buffer_dirty; +} PACKED is31fl3236_driver_t; + +is31fl3236_driver_t driver_buffers[IS31FL3236_DRIVER_COUNT] = {{ + .pwm_buffer = {0}, + .pwm_buffer_dirty = false, + .led_control_buffer = {0}, + .led_control_buffer_dirty = false, +}}; + +void is31fl3236_write_register(uint8_t index, uint8_t reg, uint8_t data) { +#if IS31FL3236_I2C_PERSISTENCE > 0 + for (uint8_t i = 0; i < IS31FL3236_I2C_PERSISTENCE; i++) { + if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3236_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; + } +#else + i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3236_I2C_TIMEOUT); +#endif +} + +void is31fl3236_write_pwm_buffer(uint8_t index) { +#if IS31FL3236_I2C_PERSISTENCE > 0 + for (uint8_t i = 0; i < IS31FL3236_I2C_PERSISTENCE; i++) { + if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3236_REG_PWM, driver_buffers[index].pwm_buffer, 36, IS31FL3236_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; + } +#else + i2c_write_register(i2c_addresses[index] << 1, IS31FL3236_REG_PWM, driver_buffers[index].pwm_buffer, 36, IS31FL3236_I2C_TIMEOUT); +#endif +} + +void is31fl3236_init_drivers(void) { + i2c_init(); + +#if defined(IS31FL3236_SDB_PIN) + gpio_set_pin_output(IS31FL3236_SDB_PIN); + gpio_write_pin_high(IS31FL3236_SDB_PIN); +#endif + + for (uint8_t i = 0; i < IS31FL3236_DRIVER_COUNT; i++) { + is31fl3236_init(i); + } + + for (uint8_t i = 0; i < IS31FL3236_LED_COUNT; i++) { + is31fl3236_set_led_control_register(i, true, true, true); + } + + for (uint8_t i = 0; i < IS31FL3236_DRIVER_COUNT; i++) { + is31fl3236_update_led_control_registers(i); + } +} + +void is31fl3236_init(uint8_t index) { + // In case we ever want to reinitialize (?) + is31fl3236_write_register(index, IS31FL3236_REG_RESET, 0x00); + + // Turn off software shutdown + is31fl3236_write_register(index, IS31FL3236_REG_SHUTDOWN, 0x01); + + // Set all PWM values to zero + for (uint8_t i = 0; i < IS31FL3236_PWM_REGISTER_COUNT; i++) { + is31fl3236_write_register(index, IS31FL3236_REG_PWM + i, 0x00); + } + + // turn off all LEDs in the LED control register + for (uint8_t i = 0; i < IS31FL3236_LED_CONTROL_REGISTER_COUNT; i++) { + is31fl3236_write_register(index, IS31FL3236_REG_LED_CONTROL + i, 0x00); + } + + // Set PWM frequency (IS31FL3236A) + is31fl3236_write_register(index, IS31FL3236_REG_PWM_FREQUENCY, IS31FL3236_PWM_FREQUENCY); + + // Load PWM registers and LED Control register data + is31fl3236_write_register(index, IS31FL3236_REG_UPDATE, 0x01); +} + +void is31fl3236_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { + is31fl3236_led_t led; + + if (index < IS31FL3236_LED_COUNT) { + memcpy_P(&led, (&g_is31fl3236_leds[index]), sizeof(led)); + + if (driver_buffers[led.driver].pwm_buffer[led.r] == red && driver_buffers[led.driver].pwm_buffer[led.g] == green && driver_buffers[led.driver].pwm_buffer[led.b] == blue) { + return; + } + + driver_buffers[led.driver].pwm_buffer[led.r] = red; + driver_buffers[led.driver].pwm_buffer[led.g] = green; + driver_buffers[led.driver].pwm_buffer[led.b] = blue; + driver_buffers[led.driver].pwm_buffer_dirty = true; + } +} + +void is31fl3236_set_color_all(uint8_t red, uint8_t green, uint8_t blue) { + for (uint8_t i = 0; i < IS31FL3236_LED_COUNT; i++) { + is31fl3236_set_color(i, red, green, blue); + } +} + +void is31fl3236_set_led_control_register(uint8_t index, bool red, bool green, bool blue) { + is31fl3236_led_t led; + memcpy_P(&led, (&g_is31fl3236_leds[index]), sizeof(led)); + + driver_buffers[led.driver].led_control_buffer[led.r] = red ? 0x01 : 0x00; + driver_buffers[led.driver].led_control_buffer[led.g] = green ? 0x01 : 0x00; + driver_buffers[led.driver].led_control_buffer[led.b] = blue ? 0x01 : 0x00; + driver_buffers[led.driver].led_control_buffer_dirty = true; +} + +void is31fl3236_update_pwm_buffers(uint8_t index) { + if (driver_buffers[index].pwm_buffer_dirty) { + is31fl3236_write_pwm_buffer(index); + // Load PWM registers and LED Control register data + is31fl3236_write_register(index, IS31FL3236_REG_UPDATE, 0x01); + + driver_buffers[index].pwm_buffer_dirty = false; + } +} + +void is31fl3236_update_led_control_registers(uint8_t index) { + if (driver_buffers[index].led_control_buffer_dirty) { + for (uint8_t i = 0; i < IS31FL3236_LED_CONTROL_REGISTER_COUNT; i++) { + is31fl3236_write_register(index, IS31FL3236_REG_LED_CONTROL + i, driver_buffers[index].led_control_buffer[i]); + } + + driver_buffers[index].led_control_buffer_dirty = false; + } +} + +void is31fl3236_flush(void) { + for (uint8_t i = 0; i < IS31FL3236_DRIVER_COUNT; i++) { + is31fl3236_update_pwm_buffers(i); + } +} diff --git a/drivers/led/issi/is31fl3236.h b/drivers/led/issi/is31fl3236.h new file mode 100644 index 00000000000..1e490796b26 --- /dev/null +++ b/drivers/led/issi/is31fl3236.h @@ -0,0 +1,103 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include +#include "progmem.h" +#include "util.h" + +#define IS31FL3236_REG_SHUTDOWN 0x00 +#define IS31FL3236_REG_PWM 0x01 +#define IS31FL3236_REG_UPDATE 0x25 +#define IS31FL3236_REG_LED_CONTROL 0x26 +#define IS31FL3236_REG_GLOBAL_CONTROL 0x4A +#define IS31FL3236_REG_PWM_FREQUENCY 0x4B +#define IS31FL3236_REG_RESET 0x4F + +#define IS31FL3236_I2C_ADDRESS_GND 0x3C +#define IS31FL3236_I2C_ADDRESS_SCL 0x3D +#define IS31FL3236_I2C_ADDRESS_SDA 0x3E +#define IS31FL3236_I2C_ADDRESS_VCC 0x3F + +#if defined(RGB_MATRIX_IS31FL3236) +# define IS31FL3236_LED_COUNT RGB_MATRIX_LED_COUNT +#endif + +#if defined(IS31FL3236_I2C_ADDRESS_4) +# define IS31FL3236_DRIVER_COUNT 4 +#elif defined(IS31FL3236_I2C_ADDRESS_3) +# define IS31FL3236_DRIVER_COUNT 3 +#elif defined(IS31FL3236_I2C_ADDRESS_2) +# define IS31FL3236_DRIVER_COUNT 2 +#elif defined(IS31FL3236_I2C_ADDRESS_1) +# define IS31FL3236_DRIVER_COUNT 1 +#endif + +typedef struct is31fl3236_led_t { + uint8_t driver : 2; + uint8_t r; + uint8_t g; + uint8_t b; +} PACKED is31fl3236_led_t; + +extern const is31fl3236_led_t PROGMEM g_is31fl3236_leds[IS31FL3236_LED_COUNT]; + +void is31fl3236_init_drivers(void); + +void is31fl3236_init(uint8_t index); + +void is31fl3236_write_register(uint8_t index, uint8_t reg, uint8_t data); + +void is31fl3236_set_color(int index, uint8_t red, uint8_t green, uint8_t blue); + +void is31fl3236_set_color_all(uint8_t red, uint8_t green, uint8_t blue); + +void is31fl3236_set_led_control_register(uint8_t index, bool red, bool green, bool blue); + +void is31fl3236_update_pwm_buffers(uint8_t index); + +void is31fl3236_update_led_control_registers(uint8_t index); + +void is31fl3236_flush(void); + +#define IS31FL3236_PWM_FREQUENCY_3K_HZ 0b0 +#define IS31FL3236_PWM_FREQUENCY_22K_HZ 0b1 + +#define OUT1 0x00 +#define OUT2 0x01 +#define OUT3 0x02 +#define OUT4 0x03 +#define OUT5 0x04 +#define OUT6 0x05 +#define OUT7 0x06 +#define OUT8 0x07 +#define OUT9 0x08 +#define OUT10 0x09 +#define OUT11 0x0A +#define OUT12 0x0B +#define OUT13 0x0C +#define OUT14 0x0D +#define OUT15 0x0E +#define OUT16 0x0F +#define OUT17 0x10 +#define OUT18 0x11 +#define OUT19 0x12 +#define OUT20 0x13 +#define OUT21 0x14 +#define OUT22 0x15 +#define OUT23 0x16 +#define OUT24 0x17 +#define OUT25 0x18 +#define OUT26 0x19 +#define OUT27 0x1A +#define OUT28 0x1B +#define OUT29 0x1C +#define OUT30 0x1D +#define OUT31 0x1E +#define OUT32 0x1F +#define OUT33 0x20 +#define OUT34 0x21 +#define OUT35 0x22 +#define OUT36 0x23 diff --git a/quantum/led_matrix/led_matrix_drivers.c b/quantum/led_matrix/led_matrix_drivers.c index 2e80bd03752..bd4852e9395 100644 --- a/quantum/led_matrix/led_matrix_drivers.c +++ b/quantum/led_matrix/led_matrix_drivers.c @@ -33,6 +33,14 @@ const led_matrix_driver_t led_matrix_driver = { .set_value_all = is31fl3218_set_value_all, }; +#elif defined(LED_MATRIX_IS31FL3236) +const led_matrix_driver_t led_matrix_driver = { + .init = is31fl3236_init_drivers, + .flush = is31fl3236_flush, + .set_value = is31fl3236_set_value, + .set_value_all = is31fl3236_set_value_all, +}; + #elif defined(LED_MATRIX_IS31FL3729) const led_matrix_driver_t led_matrix_driver = { .init = is31fl3729_init_drivers, diff --git a/quantum/led_matrix/led_matrix_drivers.h b/quantum/led_matrix/led_matrix_drivers.h index a961784a62f..60354e46779 100644 --- a/quantum/led_matrix/led_matrix_drivers.h +++ b/quantum/led_matrix/led_matrix_drivers.h @@ -7,6 +7,8 @@ #if defined(LED_MATRIX_IS31FL3218) # include "is31fl3218-mono.h" +#elif defined(LED_MATRIX_IS31FL3236) +# include "is31fl3236-mono.h" #elif defined(LED_MATRIX_IS31FL3729) # include "is31fl3729-mono.h" #elif defined(LED_MATRIX_IS31FL3731) diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c index 95d1e884f09..729dcdb4395 100644 --- a/quantum/rgb_matrix/rgb_matrix_drivers.c +++ b/quantum/rgb_matrix/rgb_matrix_drivers.c @@ -36,6 +36,14 @@ const rgb_matrix_driver_t rgb_matrix_driver = { .set_color_all = is31fl3218_set_color_all, }; +#elif defined(RGB_MATRIX_IS31FL3236) +const rgb_matrix_driver_t rgb_matrix_driver = { + .init = is31fl3236_init_drivers, + .flush = is31fl3236_flush, + .set_color = is31fl3236_set_color, + .set_color_all = is31fl3236_set_color_all, +}; + #elif defined(RGB_MATRIX_IS31FL3729) const rgb_matrix_driver_t rgb_matrix_driver = { .init = is31fl3729_init_drivers, diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.h b/quantum/rgb_matrix/rgb_matrix_drivers.h index a24cb03a185..1ea5f0817d3 100644 --- a/quantum/rgb_matrix/rgb_matrix_drivers.h +++ b/quantum/rgb_matrix/rgb_matrix_drivers.h @@ -7,6 +7,8 @@ #if defined(RGB_MATRIX_AW20216S) # include "aw20216s.h" +#elif defined(RGB_MATRIX_IS31FL3236) +# include "is31fl3236.h" #elif defined(RGB_MATRIX_IS31FL3218) # include "is31fl3218.h" #elif defined(RGB_MATRIX_IS31FL3729) From f7cf40fa77164d7be9358ce83f7f5939d71b38bc Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 18 Mar 2024 22:03:27 +1100 Subject: [PATCH 044/333] Add init function to RGBLight driver struct (#23076) --- drivers/led/apa102.c | 10 +- drivers/ws2812.h | 2 + keyboards/1k/keymaps/default/keymap.c | 1 + keyboards/1k/keymaps/default/rgblite.h | 4 + .../ergodox_ez/glow/keymaps/default/keymap.c | 200 ++++++++++++++++++ .../ergodox_ez/glow/keymaps/default/rules.mk | 2 + .../ergodox_ez/keymaps/default_glow/keymap.c | 1 - .../ergodox_ez/keymaps/default_glow/rules.mk | 4 - .../ergodox_ez/keymaps/rgb_layer/keymap.c | 37 ++-- keyboards/ergodox_ez/keymaps/testing/keymap.c | 27 +-- keyboards/ergodox_ez/rules.mk | 3 +- .../{led_i2c.c => shine/rgblight_custom.c} | 9 +- keyboards/ergodox_ez/shine/rules.mk | 1 + keyboards/handwired/promethium/rgbsps.c | 7 + keyboards/ibm/model_m/mschwingen/mschwingen.c | 1 + keyboards/kprepublic/bm60hsrgb/rev2/rev2.c | 1 + .../kprepublic/bm60hsrgb_iso/rev2/rev2.c | 1 + .../kprepublic/bm60hsrgb_poker/rev2/rev2.c | 1 + keyboards/matrix/abelx/abelx.c | 1 + keyboards/matrix/noah/noah.c | 1 + keyboards/neson_design/700e/700e.c | 1 + keyboards/neson_design/n6/n6.c | 1 + keyboards/neson_design/nico/nico.c | 1 + keyboards/oddforge/vea/ws2812_custom.c | 6 - keyboards/rgbkb/pan/pan.c | 4 +- keyboards/wilba_tech/wt_rgb_backlight.c | 3 + keyboards/work_louder/rgb_functions.c | 2 + keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c | 2 +- .../xd002/keymaps/multilayer_rgb/keymap.c | 1 + .../xd002/keymaps/multilayer_rgb/rgblite.h | 10 +- .../xiudi/xd002/keymaps/rgb_lite/keymap.c | 1 + .../xiudi/xd002/keymaps/rgb_lite/rgblite.h | 8 +- platforms/avr/drivers/ws2812_bitbang.c | 4 +- platforms/avr/drivers/ws2812_i2c.c | 6 - .../drivers/vendor/RP/RP2040/ws2812_vendor.c | 11 +- platforms/chibios/drivers/ws2812_bitbang.c | 6 - platforms/chibios/drivers/ws2812_pwm.c | 6 - platforms/chibios/drivers/ws2812_spi.c | 6 - quantum/rgb_matrix/rgb_matrix_drivers.c | 1 + quantum/rgblight/rgblight.c | 2 + quantum/rgblight/rgblight_drivers.c | 2 + quantum/rgblight/rgblight_drivers.h | 1 + 42 files changed, 306 insertions(+), 93 deletions(-) create mode 100644 keyboards/ergodox_ez/glow/keymaps/default/keymap.c create mode 100644 keyboards/ergodox_ez/glow/keymaps/default/rules.mk delete mode 100644 keyboards/ergodox_ez/keymaps/default_glow/keymap.c delete mode 100644 keyboards/ergodox_ez/keymaps/default_glow/rules.mk rename keyboards/ergodox_ez/{led_i2c.c => shine/rgblight_custom.c} (95%) diff --git a/drivers/led/apa102.c b/drivers/led/apa102.c index d6d4327495f..b171b07b12c 100644 --- a/drivers/led/apa102.c +++ b/drivers/led/apa102.c @@ -67,7 +67,9 @@ static void apa102_send_byte(uint8_t byte) { } static void apa102_start_frame(void) { - apa102_init(); + gpio_write_pin_low(APA102_DI_PIN); + gpio_write_pin_low(APA102_CI_PIN); + for (uint16_t i = 0; i < 4; i++) { apa102_send_byte(0); } @@ -103,7 +105,8 @@ static void apa102_end_frame(uint16_t num_leds) { apa102_send_byte(0); } - apa102_init(); + gpio_write_pin_low(APA102_DI_PIN); + gpio_write_pin_low(APA102_CI_PIN); } static void apa102_send_frame(uint8_t red, uint8_t green, uint8_t blue, uint8_t brightness) { @@ -116,9 +119,6 @@ static void apa102_send_frame(uint8_t red, uint8_t green, uint8_t blue, uint8_t void apa102_init(void) { gpio_set_pin_output(APA102_DI_PIN); gpio_set_pin_output(APA102_CI_PIN); - - gpio_write_pin_low(APA102_DI_PIN); - gpio_write_pin_low(APA102_CI_PIN); } void apa102_setleds(rgb_led_t *start_led, uint16_t num_leds) { diff --git a/drivers/ws2812.h b/drivers/ws2812.h index 134de51c503..993cce8ce45 100644 --- a/drivers/ws2812.h +++ b/drivers/ws2812.h @@ -62,6 +62,8 @@ # define WS2812_LED_COUNT RGB_MATRIX_LED_COUNT #endif +void ws2812_init(void); + /* User Interface * * Input: diff --git a/keyboards/1k/keymaps/default/keymap.c b/keyboards/1k/keymaps/default/keymap.c index b64d4d8c769..3261a9f922c 100644 --- a/keyboards/1k/keymaps/default/keymap.c +++ b/keyboards/1k/keymaps/default/keymap.c @@ -21,5 +21,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } void keyboard_post_init_user(void) { + rgblite_init(); rgblite_increase_hue(); } diff --git a/keyboards/1k/keymaps/default/rgblite.h b/keyboards/1k/keymaps/default/rgblite.h index 9a7761e30de..2e0b898699c 100644 --- a/keyboards/1k/keymaps/default/rgblite.h +++ b/keyboards/1k/keymaps/default/rgblite.h @@ -6,6 +6,10 @@ #include "ws2812.h" #include "color.h" +static inline void rgblite_init(void) { + ws2812_init(); +} + static inline void rgblite_setrgb(RGB rgb) { rgb_led_t leds[RGBLIGHT_LED_COUNT] = {{.r = rgb.r, .g = rgb.g, .b = rgb.b}}; ws2812_setleds(leds, RGBLIGHT_LED_COUNT); diff --git a/keyboards/ergodox_ez/glow/keymaps/default/keymap.c b/keyboards/ergodox_ez/glow/keymaps/default/keymap.c new file mode 100644 index 00000000000..94d68cb8702 --- /dev/null +++ b/keyboards/ergodox_ez/glow/keymaps/default/keymap.c @@ -0,0 +1,200 @@ +#include QMK_KEYBOARD_H +#include "version.h" + +enum layers { + BASE, // default layer + SYMB, // symbols + MDIA, // media keys +}; + +enum custom_keycodes { + VRSN = SAFE_RANGE, +}; + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | Del | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | BkSp | A | S | D | F | G |------| |------| H | J | K | L |; / L2|' / Cmd | + * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------| + * | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | App | LGui | | Alt |Ctrl/Esc| + * ,------|------|------| |------+--------+------. + * | | | Home | | PgUp | | | + * | Space|Backsp|------| |------| Tab |Enter | + * | |ace | End | | PgDn | | | + * `--------------------' `----------------------' + */ +[BASE] = LAYOUT_ergodox_pretty( + // left hand + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN), GUI_T(KC_QUOT), + KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), KC_RSFT, + LT(SYMB,KC_GRV), KC_QUOT, LALT(KC_LSFT), KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB), + ALT_T(KC_APP), KC_LGUI, KC_LALT, CTL_T(KC_ESC), + KC_HOME, KC_PGUP, + KC_SPC, KC_BSPC, KC_END, KC_PGDN, KC_TAB, KC_ENT +), +/* Keymap 1: Symbol Layer + * + * ,---------------------------------------------------. ,--------------------------------------------------. + * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | + * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| + * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 | + * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | | + * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | + * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | EPRM | | | | | | | . | 0 | = | | + * `-----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * |Animat| | |Toggle|Solid | + * ,------|------|------| |------+------+------. + * |Bright|Bright| | | |Hue- |Hue+ | + * |ness- |ness+ |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +[SYMB] = LAYOUT_ergodox_pretty( + // left hand + VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_TRNS, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, + KC_TRNS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, + KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_TRNS, KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, + EE_CLR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, + RGB_MOD, KC_TRNS, RGB_TOG, RGB_M_P, + KC_TRNS, KC_TRNS, + RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, RGB_HUD, RGB_HUI +), +/* Keymap 2: Media and mouse keys + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | MsUp | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | | | Prev | Next | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | |Brwser| + * | | |------| |------| |Back | + * | | | | | | | | + * `--------------------' `--------------------' + */ +[MDIA] = LAYOUT_ergodox_pretty( + // left hand + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, + + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WBAK +), +}; +// clang-format on + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (record->event.pressed) { + switch (keycode) { + case VRSN: + SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); + return false; + } + } + return true; +} + +// Runs just one time when the keyboard initializes. +void keyboard_post_init_user(void) { +#ifdef RGBLIGHT_COLOR_LAYER_0 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_0); +#endif +}; + +// Runs whenever there is a layer state change. +layer_state_t layer_state_set_user(layer_state_t state) { + ergodox_board_led_off(); + ergodox_right_led_1_off(); + ergodox_right_led_2_off(); + ergodox_right_led_3_off(); + + uint8_t layer = get_highest_layer(state); + switch (layer) { + case 0: +#ifdef RGBLIGHT_COLOR_LAYER_0 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_0); +#endif + break; + case 1: + ergodox_right_led_1_on(); +#ifdef RGBLIGHT_COLOR_LAYER_1 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_1); +#endif + break; + case 2: + ergodox_right_led_2_on(); +#ifdef RGBLIGHT_COLOR_LAYER_2 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_2); +#endif + break; + case 3: + ergodox_right_led_3_on(); +#ifdef RGBLIGHT_COLOR_LAYER_3 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_3); +#endif + break; + case 4: + ergodox_right_led_1_on(); + ergodox_right_led_2_on(); +#ifdef RGBLIGHT_COLOR_LAYER_4 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_4); +#endif + break; + case 5: + ergodox_right_led_1_on(); + ergodox_right_led_3_on(); +#ifdef RGBLIGHT_COLOR_LAYER_5 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_5); +#endif + break; + case 6: + ergodox_right_led_2_on(); + ergodox_right_led_3_on(); +#ifdef RGBLIGHT_COLOR_LAYER_6 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_6); +#endif + break; + case 7: + ergodox_right_led_1_on(); + ergodox_right_led_2_on(); + ergodox_right_led_3_on(); +#ifdef RGBLIGHT_COLOR_LAYER_7 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_7); +#endif + break; + default: + break; + } + + return state; +}; diff --git a/keyboards/ergodox_ez/glow/keymaps/default/rules.mk b/keyboards/ergodox_ez/glow/keymaps/default/rules.mk new file mode 100644 index 00000000000..1a840036e2a --- /dev/null +++ b/keyboards/ergodox_ez/glow/keymaps/default/rules.mk @@ -0,0 +1,2 @@ +RGBLIGHT_ENABLE = no +RGB_MATRIX_ENABLE = yes diff --git a/keyboards/ergodox_ez/keymaps/default_glow/keymap.c b/keyboards/ergodox_ez/keymaps/default_glow/keymap.c deleted file mode 100644 index 526c364029f..00000000000 --- a/keyboards/ergodox_ez/keymaps/default_glow/keymap.c +++ /dev/null @@ -1 +0,0 @@ -// Placeholder. See ../default/keymap.c for details diff --git a/keyboards/ergodox_ez/keymaps/default_glow/rules.mk b/keyboards/ergodox_ez/keymaps/default_glow/rules.mk deleted file mode 100644 index 20bac4ab9dd..00000000000 --- a/keyboards/ergodox_ez/keymaps/default_glow/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -RGBLIGHT_ENABLE = no -RGB_MATRIX_ENABLE = yes # enable later - -SRC += keymaps/default/keymap.c diff --git a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c index 6ed204a3579..b033c0ca1c5 100644 --- a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c +++ b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c @@ -151,6 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; +#ifdef RGBLIGHT_ENABLE void eeconfig_init_user(void) { rgblight_enable(); rgblight_sethsv(HSV_CYAN); @@ -158,7 +159,7 @@ void eeconfig_init_user(void) { user_config.rgb_layer_change = true; eeconfig_update_user(user_config.raw); } - +#endif bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { @@ -168,21 +169,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { eeconfig_init(); } return false; - break; case VRSN: if (record->event.pressed) { SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); } return false; - break; +#ifdef RGBLIGHT_ENABLE case RGB_SLD: if (record->event.pressed) { - #ifdef RGBLIGHT_ENABLE rgblight_mode(1); - #endif } return false; - break; case RGB_LYR: // This allows me to use underglow as layer indication, or as normal if (record->event.pressed) { user_config.rgb_layer_change ^= 1; // Toggles the status @@ -191,7 +188,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { layer_state_set(layer_state); // then immediately update the layer color } } - return false; break; + return false; case RGB_MODE_FORWARD ... RGB_MODE_GRADIENT: // For any of the RGB codes (see quantum_keycodes.h, L400 for reference) if (record->event.pressed) { //This disables layer indication, as it's assumed that if you're changing this ... you want that disabled if (user_config.rgb_layer_change) { // only if this is enabled @@ -199,11 +196,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { eeconfig_update_user(user_config.raw); // write the setings to EEPROM } } - return true; break; + return true; +#endif } return true; } +#ifdef RGBLIGHT_ENABLE void matrix_init_user(void) { // Call the keymap level matrix init. @@ -217,11 +216,7 @@ void matrix_init_user(void) { rgblight_mode_noeeprom(1); } } - -// Runs constantly in the background, in a loop. -void matrix_scan_user(void) { - -}; +#endif layer_state_t layer_state_set_user(layer_state_t state) { ergodox_board_led_off(); @@ -231,39 +226,55 @@ layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case SYMB: ergodox_right_led_1_on(); +#ifdef RGBLIGHT_ENABLE if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_RED); rgblight_mode_noeeprom(1); } +#endif break; case MDIA: ergodox_right_led_2_on(); +#ifdef RGBLIGHT_ENABLE if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_GREEN); rgblight_mode_noeeprom(1); } +#endif break; case 3: ergodox_right_led_3_on(); +#ifdef RGBLIGHT_ENABLE if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_BLUE); rgblight_mode_noeeprom(1); } +#endif break; case 4: ergodox_right_led_1_on(); ergodox_right_led_2_on(); +#ifdef RGBLIGHT_ENABLE if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_ORANGE); rgblight_mode_noeeprom(1); } +#endif break; case 5: ergodox_right_led_1_on(); ergodox_right_led_3_on(); +#ifdef RGBLIGHT_ENABLE if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_YELLOW); rgblight_mode_noeeprom(1); } +#endif break; case 6: ergodox_right_led_2_on(); ergodox_right_led_3_on(); +#ifdef RGBLIGHT_ENABLE if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_PINK); rgblight_mode_noeeprom(1); } +#endif break; case 7: ergodox_right_led_1_on(); ergodox_right_led_2_on(); ergodox_right_led_3_on(); +#ifdef RGBLIGHT_ENABLE if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_WHITE); rgblight_mode_noeeprom(1); } +#endif break; default: // for any other layers, or the default layer +#ifdef RGBLIGHT_ENABLE if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_CYAN); rgblight_mode_noeeprom(1); } +#endif break; } return state; diff --git a/keyboards/ergodox_ez/keymaps/testing/keymap.c b/keyboards/ergodox_ez/keymaps/testing/keymap.c index ef8ca63e3bb..ee07f264b9d 100644 --- a/keyboards/ergodox_ez/keymaps/testing/keymap.c +++ b/keyboards/ergodox_ez/keymaps/testing/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; void matrix_init_user(void) { -#ifdef RGBLIGHT_COLOR_LAYER_0 +#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_COLOR_LAYER_0) rgblight_setrgb(RGBLIGHT_COLOR_LAYER_0); #endif }; @@ -42,19 +42,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { eeconfig_init(); } return false; - break; case VRSN: if (record->event.pressed) { SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); } return false; - break; +#ifdef RGBLIGHT_ENABLE case RGB_SLD: if (record->event.pressed) { rgblight_mode(1); } return false; - break; +#endif } return true; @@ -70,48 +69,50 @@ layer_state_t layer_state_set_user(layer_state_t state) { ergodox_right_led_3_off(); switch (layer) { case 0: - #ifdef RGBLIGHT_COLOR_LAYER_0 + #ifdef RGBLIGHT_ENABLE + #ifdef RGBLIGHT_COLOR_LAYER_0 rgblight_setrgb(RGBLIGHT_COLOR_LAYER_0); - #else + #else rgblight_init(); + #endif #endif break; case 1: ergodox_right_led_1_on(); - #ifdef RGBLIGHT_COLOR_LAYER_1 + #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_COLOR_LAYER_1) rgblight_setrgb(RGBLIGHT_COLOR_LAYER_1); #endif break; case 2: ergodox_right_led_2_on(); - #ifdef RGBLIGHT_COLOR_LAYER_2 + #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_COLOR_LAYER_2) rgblight_setrgb(RGBLIGHT_COLOR_LAYER_2); #endif break; case 3: ergodox_right_led_3_on(); - #ifdef RGBLIGHT_COLOR_LAYER_3 + #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_COLOR_LAYER_3) rgblight_setrgb(RGBLIGHT_COLOR_LAYER_3); #endif break; case 4: ergodox_right_led_1_on(); ergodox_right_led_2_on(); - #ifdef RGBLIGHT_COLOR_LAYER_4 + #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_COLOR_LAYER_4) rgblight_setrgb(RGBLIGHT_COLOR_LAYER_4); #endif break; case 5: ergodox_right_led_1_on(); ergodox_right_led_3_on(); - #ifdef RGBLIGHT_COLOR_LAYER_5 + #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_COLOR_LAYER_5) rgblight_setrgb(RGBLIGHT_COLOR_LAYER_5); #endif break; case 6: ergodox_right_led_2_on(); ergodox_right_led_3_on(); - #ifdef RGBLIGHT_COLOR_LAYER_6 + #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_COLOR_LAYER_6) rgblight_setrgb(RGBLIGHT_COLOR_LAYER_6); #endif break; @@ -119,7 +120,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { ergodox_right_led_1_on(); ergodox_right_led_2_on(); ergodox_right_led_3_on(); - #ifdef RGBLIGHT_COLOR_LAYER_7 + #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_COLOR_LAYER_7) rgblight_setrgb(RGBLIGHT_COLOR_LAYER_6); #endif break; diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk index bba3bd86aef..68f785f3cc0 100644 --- a/keyboards/ergodox_ez/rules.mk +++ b/keyboards/ergodox_ez/rules.mk @@ -19,8 +19,7 @@ SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard RGB_MATRIX_ENABLE = no # enable later # project specific files -SRC += matrix.c \ - led_i2c.c +SRC += matrix.c I2C_DRIVER_REQUIRED = yes # Disable unsupported hardware diff --git a/keyboards/ergodox_ez/led_i2c.c b/keyboards/ergodox_ez/shine/rgblight_custom.c similarity index 95% rename from keyboards/ergodox_ez/led_i2c.c rename to keyboards/ergodox_ez/shine/rgblight_custom.c index 80dabf48150..feac50cba08 100644 --- a/keyboards/ergodox_ez/led_i2c.c +++ b/keyboards/ergodox_ez/shine/rgblight_custom.c @@ -18,10 +18,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef RGBLIGHT_ENABLE - -# include "ergodox_ez.h" -# include "ws2812.h" +#include "ergodox_ez.h" +#include "ws2812.h" void setleds_custom(rgb_led_t *led, uint16_t led_num) { uint16_t length = 0; @@ -64,7 +62,6 @@ void setleds_custom(rgb_led_t *led, uint16_t led_num) { } const rgblight_driver_t rgblight_driver = { + .init = ws2812_init, .setleds = setleds_custom, }; - -#endif // RGBLIGHT_ENABLE diff --git a/keyboards/ergodox_ez/shine/rules.mk b/keyboards/ergodox_ez/shine/rules.mk index b035c368503..4ab494d1aae 100644 --- a/keyboards/ergodox_ez/shine/rules.mk +++ b/keyboards/ergodox_ez/shine/rules.mk @@ -1,2 +1,3 @@ RGBLIGHT_ENABLE = yes WS2812_DRIVER_REQUIRED = yes +SRC += rgblight_custom.c diff --git a/keyboards/handwired/promethium/rgbsps.c b/keyboards/handwired/promethium/rgbsps.c index 957726e775b..7dc26f4a5e4 100644 --- a/keyboards/handwired/promethium/rgbsps.c +++ b/keyboards/handwired/promethium/rgbsps.c @@ -1,8 +1,15 @@ +#include "keyboard.h" #include "ws2812.h" #include "rgbsps.h" rgb_led_t led[RGBSPS_NUM]; +void keyboard_pre_init_kb(void) { + ws2812_init(); + + keyboard_pre_init_user(); +} + void rgbsps_set(uint8_t index, uint8_t r, uint8_t g, uint8_t b) { led[index].r = r; led[index].g = g; diff --git a/keyboards/ibm/model_m/mschwingen/mschwingen.c b/keyboards/ibm/model_m/mschwingen/mschwingen.c index 03dfcdc2f2c..6a8a0ec8fcd 100644 --- a/keyboards/ibm/model_m/mschwingen/mschwingen.c +++ b/keyboards/ibm/model_m/mschwingen/mschwingen.c @@ -90,6 +90,7 @@ void sleep_led_enable(void) { void keyboard_pre_init_kb(void) { #ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812 + ws2812_init(); ws2812_setleds(led, RGBLIGHT_LED_COUNT); #else /* Set status LEDs pins to output and Low (on) */ diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c index 3ee74755fad..5bd23a12b8a 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c +++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c @@ -154,6 +154,7 @@ rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_TOTAL]; static void rgb_matrix_driver_init(void) { i2c_init(); is31fl3733_init(0); + ws2812_init(); for (uint8_t index = 0; index < IS31FL3733_LED_COUNT; index++) { bool enabled = true; is31fl3733_set_led_control_register(index, enabled, enabled, enabled); diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c index e7641bf4e5e..794dea51764 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c @@ -154,6 +154,7 @@ rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_TOTAL]; static void rgb_matrix_driver_init(void) { i2c_init(); is31fl3733_init(0); + ws2812_init(); for (uint8_t index = 0; index < IS31FL3733_LED_COUNT; index++) { bool enabled = true; is31fl3733_set_led_control_register(index, enabled, enabled, enabled); diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c index 5cb6d850c9f..3586dc8e804 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c @@ -150,6 +150,7 @@ rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_TOTAL]; static void rgb_matrix_driver_init(void) { i2c_init(); is31fl3733_init(0); + ws2812_init(); for (uint8_t index = 0; index < IS31FL3733_LED_COUNT; index++) { bool enabled = true; is31fl3733_set_led_control_register(index, enabled, enabled, enabled); diff --git a/keyboards/matrix/abelx/abelx.c b/keyboards/matrix/abelx/abelx.c index 0a3071a4025..ee7ffde1346 100644 --- a/keyboards/matrix/abelx/abelx.c +++ b/keyboards/matrix/abelx/abelx.c @@ -79,6 +79,7 @@ void setleds_custom(rgb_led_t *start_led, uint16_t num_leds) } const rgblight_driver_t rgblight_driver = { + .init = ws2812_init, .setleds = setleds_custom, }; diff --git a/keyboards/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c index b5c52f9952b..a01d1b11bc1 100644 --- a/keyboards/matrix/noah/noah.c +++ b/keyboards/matrix/noah/noah.c @@ -55,6 +55,7 @@ void setleds_custom(rgb_led_t *ledarray, uint16_t num_leds) { } const rgblight_driver_t rgblight_driver = { + .init = ws2812_init, .setleds = setleds_custom, }; #endif diff --git a/keyboards/neson_design/700e/700e.c b/keyboards/neson_design/700e/700e.c index 31f88a71f9b..a9bcbee2885 100644 --- a/keyboards/neson_design/700e/700e.c +++ b/keyboards/neson_design/700e/700e.c @@ -355,6 +355,7 @@ void setleds_custom(rgb_led_t *start_led, uint16_t num_leds) } const rgblight_driver_t rgblight_driver = { + .init = ws2812_init, .setleds = setleds_custom, }; diff --git a/keyboards/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c index b878b9368dd..f257735acc8 100644 --- a/keyboards/neson_design/n6/n6.c +++ b/keyboards/neson_design/n6/n6.c @@ -350,6 +350,7 @@ void setleds_custom(rgb_led_t *start_led, uint16_t num_leds) } const rgblight_driver_t rgblight_driver = { + .init = ws2812_init, .setleds = setleds_custom, }; diff --git a/keyboards/neson_design/nico/nico.c b/keyboards/neson_design/nico/nico.c index bf8eeb87dd3..0738a3ee987 100644 --- a/keyboards/neson_design/nico/nico.c +++ b/keyboards/neson_design/nico/nico.c @@ -84,6 +84,7 @@ void setleds_custom(rgb_led_t *start_led, uint16_t num_leds) } const rgblight_driver_t rgblight_driver = { + .init = ws2812_init, .setleds = setleds_custom, }; #endif \ No newline at end of file diff --git a/keyboards/oddforge/vea/ws2812_custom.c b/keyboards/oddforge/vea/ws2812_custom.c index f52c8d06a81..a037b88b3e6 100644 --- a/keyboards/oddforge/vea/ws2812_custom.c +++ b/keyboards/oddforge/vea/ws2812_custom.c @@ -23,12 +23,6 @@ void ws2812_init(void) { // Setleds for standard RGB void ws2812_setleds(rgb_led_t *ledarray, uint16_t leds) { - static bool s_init = false; - if (!s_init) { - ws2812_init(); - s_init = true; - } - i2c_transmit(WS2812_I2C_ADDRESS, (uint8_t *)ledarray, sizeof(rgb_led_t) * (leds >> 1), WS2812_I2C_TIMEOUT); i2c_transmit(WS2812_I2C_ADDRESS_RIGHT, (uint8_t *)ledarray+(sizeof(rgb_led_t) * (leds >> 1)), sizeof(rgb_led_t) * (leds - (leds >> 1)), WS2812_I2C_TIMEOUT); } diff --git a/keyboards/rgbkb/pan/pan.c b/keyboards/rgbkb/pan/pan.c index d175be36417..191ff1ac1fb 100644 --- a/keyboards/rgbkb/pan/pan.c +++ b/keyboards/rgbkb/pan/pan.c @@ -24,8 +24,6 @@ // LED color buffer rgb_led_t rgb_matrix_ws2812_array[RGB_MATRIX_LED_COUNT]; -static void init(void) {} - static void flush(void) { ws2812_setleds(rgb_matrix_ws2812_array, RGB_MATRIX_LED_COUNT); } @@ -56,7 +54,7 @@ static void setled_all(uint8_t r, uint8_t g, uint8_t b) { } const rgb_matrix_driver_t rgb_matrix_driver = { - .init = init, + .init = ws2812_init, .flush = flush, .set_color = setled, .set_color_all = setled_all, diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c index cf36288705e..d03d189b298 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight.c +++ b/keyboards/wilba_tech/wt_rgb_backlight.c @@ -2237,6 +2237,9 @@ void backlight_init_drivers(void) is31fl3733_update_led_control_registers( 0 ); is31fl3733_update_led_control_registers( 1 ); #else +#if defined(RGB_BACKLIGHT_DAWN60) + ws2812_init(); +#endif // Init the #1 driver is31fl3731_init( 0 ); // Init the #2 driver (if used) diff --git a/keyboards/work_louder/rgb_functions.c b/keyboards/work_louder/rgb_functions.c index 9b395559714..36f9da013ec 100644 --- a/keyboards/work_louder/rgb_functions.c +++ b/keyboards/work_louder/rgb_functions.c @@ -20,11 +20,13 @@ #undef WS2812_DI_PIN #define WS2812_DI_PIN RGBLIGHT_DI_PIN +#define ws2812_init ws2812_rgb_init #define ws2812_setleds ws2812_rgb_setleds #include "ws2812_bitbang.c" const rgblight_driver_t rgblight_driver = { + .init = ws2812_init, .setleds = ws2812_setleds, }; #endif diff --git a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c index 6b8f91bc2f8..a153a7cf837 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c +++ b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c @@ -155,7 +155,7 @@ static void init(void) { is31fl3731_update_led_control_registers(1); //RGB Underglow ws2812 - + ws2812_init(); } static void flush(void) { diff --git a/keyboards/xiudi/xd002/keymaps/multilayer_rgb/keymap.c b/keyboards/xiudi/xd002/keymaps/multilayer_rgb/keymap.c index 4ae28fd91b9..d74678d76aa 100644 --- a/keyboards/xiudi/xd002/keymaps/multilayer_rgb/keymap.c +++ b/keyboards/xiudi/xd002/keymaps/multilayer_rgb/keymap.c @@ -169,5 +169,6 @@ layer_state_t layer_state_set_user(layer_state_t state) { // default color void keyboard_post_init_user(void) { + rgblite_init(); rgblite_setrgb(RGB_GREEN); } diff --git a/keyboards/xiudi/xd002/keymaps/multilayer_rgb/rgblite.h b/keyboards/xiudi/xd002/keymaps/multilayer_rgb/rgblite.h index 1fa6f899b99..103b228d33b 100644 --- a/keyboards/xiudi/xd002/keymaps/multilayer_rgb/rgblite.h +++ b/keyboards/xiudi/xd002/keymaps/multilayer_rgb/rgblite.h @@ -3,7 +3,11 @@ #include "ws2812.h" #include "color.h" -static inline void rgblite_setrgb(uint8_t _r, uint8_t _g, uint8_t _b) { - rgb_led_t leds[RGBLED_NUM] = {{.r = _r, .g = _g, .b = _b}, {.r = _r, .g = _g, .b = _b}}; - ws2812_setleds(leds, RGBLED_NUM); +static inline void rgblite_init(void) { + ws2812_init(); +} + +static inline void rgblite_setrgb(uint8_t _r, uint8_t _g, uint8_t _b) { + rgb_led_t leds[RGBLIGHT_LED_COUNT] = {{.r = _r, .g = _g, .b = _b}, {.r = _r, .g = _g, .b = _b}}; + ws2812_setleds(leds, RGBLIGHT_LED_COUNT); } diff --git a/keyboards/xiudi/xd002/keymaps/rgb_lite/keymap.c b/keyboards/xiudi/xd002/keymaps/rgb_lite/keymap.c index a795ca8a6de..aac4dc6fde1 100644 --- a/keyboards/xiudi/xd002/keymaps/rgb_lite/keymap.c +++ b/keyboards/xiudi/xd002/keymaps/rgb_lite/keymap.c @@ -27,5 +27,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } void keyboard_post_init_user(void) { + rgblite_init(); rgblite_increase_hue(); } diff --git a/keyboards/xiudi/xd002/keymaps/rgb_lite/rgblite.h b/keyboards/xiudi/xd002/keymaps/rgb_lite/rgblite.h index 15ee0c0f6b3..0bb0582415c 100644 --- a/keyboards/xiudi/xd002/keymaps/rgb_lite/rgblite.h +++ b/keyboards/xiudi/xd002/keymaps/rgb_lite/rgblite.h @@ -3,9 +3,13 @@ #include "ws2812.h" #include "color.h" +static inline void rgblite_init(void) { + ws2812_init(); +} + static inline void rgblite_setrgb(uint8_t _r, uint8_t _g, uint8_t _b) { - rgb_led_t leds[RGBLED_NUM] = {{.r = _r, .g = _g, .b = _b}, {.r = _r, .g = _g, .b = _b}}; - ws2812_setleds(leds, RGBLED_NUM); + rgb_led_t leds[RGBLIGHT_LED_COUNT] = {{.r = _r, .g = _g, .b = _b}, {.r = _r, .g = _g, .b = _b}}; + ws2812_setleds(leds, RGBLIGHT_LED_COUNT); } static void rgblite_increase_hue(void) { diff --git a/platforms/avr/drivers/ws2812_bitbang.c b/platforms/avr/drivers/ws2812_bitbang.c index 116053591fd..be127e501c9 100644 --- a/platforms/avr/drivers/ws2812_bitbang.c +++ b/platforms/avr/drivers/ws2812_bitbang.c @@ -37,9 +37,11 @@ static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t masklo, uint8_t maskhi); -void ws2812_setleds(rgb_led_t *ledarray, uint16_t number_of_leds) { +void ws2812_init(void) { DDRx_ADDRESS(WS2812_DI_PIN) |= pinmask(WS2812_DI_PIN); +} +void ws2812_setleds(rgb_led_t *ledarray, uint16_t number_of_leds) { uint8_t masklo = ~(pinmask(WS2812_DI_PIN)) & PORTx_ADDRESS(WS2812_DI_PIN); uint8_t maskhi = pinmask(WS2812_DI_PIN) | PORTx_ADDRESS(WS2812_DI_PIN); diff --git a/platforms/avr/drivers/ws2812_i2c.c b/platforms/avr/drivers/ws2812_i2c.c index f52a037b8ea..60b466c32a9 100644 --- a/platforms/avr/drivers/ws2812_i2c.c +++ b/platforms/avr/drivers/ws2812_i2c.c @@ -19,11 +19,5 @@ void ws2812_init(void) { // Setleds for standard RGB void ws2812_setleds(rgb_led_t *ledarray, uint16_t leds) { - static bool s_init = false; - if (!s_init) { - ws2812_init(); - s_init = true; - } - i2c_transmit(WS2812_I2C_ADDRESS, (uint8_t *)ledarray, sizeof(rgb_led_t) * leds, WS2812_I2C_TIMEOUT); } diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c index 799d96b3c64..95a827e4b8a 100644 --- a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c +++ b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c @@ -177,7 +177,7 @@ static void ws2812_dma_callback(void* p, uint32_t ct) { osalSysUnlockFromISR(); } -bool ws2812_init(void) { +void ws2812_init(void) { uint pio_idx = pio_get_index(pio); /* Get PIOx peripheral out of reset state. */ hal_lld_peripheral_unreset(pio_idx == 0 ? RESETS_ALLREG_PIO0 : RESETS_ALLREG_PIO1); @@ -196,7 +196,7 @@ bool ws2812_init(void) { STATE_MACHINE = pio_claim_unused_sm(pio, true); if (STATE_MACHINE < 0) { dprintln("ERROR: Failed to acquire state machine for WS2812 output!"); - return false; + return; } uint offset = pio_add_program(pio, &ws2812_program); @@ -246,8 +246,6 @@ bool ws2812_init(void) { DMA_CTRL_TRIG_TREQ_SEL(pio == pio0 ? STATE_MACHINE : STATE_MACHINE + 8) | DMA_CTRL_TRIG_PRIORITY(RP_DMA_PRIORITY_WS2812); // clang-format on - - return true; } static inline void sync_ws2812_transfer(void) { @@ -269,11 +267,6 @@ static inline void sync_ws2812_transfer(void) { } void ws2812_setleds(rgb_led_t* ledarray, uint16_t leds) { - static bool is_initialized = false; - if (unlikely(!is_initialized)) { - is_initialized = ws2812_init(); - } - sync_ws2812_transfer(); for (int i = 0; i < leds; i++) { diff --git a/platforms/chibios/drivers/ws2812_bitbang.c b/platforms/chibios/drivers/ws2812_bitbang.c index 1ed87c4381e..9ed6bacd5ad 100644 --- a/platforms/chibios/drivers/ws2812_bitbang.c +++ b/platforms/chibios/drivers/ws2812_bitbang.c @@ -82,12 +82,6 @@ void ws2812_init(void) { // Setleds for standard RGB void ws2812_setleds(rgb_led_t *ledarray, uint16_t leds) { - static bool s_init = false; - if (!s_init) { - ws2812_init(); - s_init = true; - } - // this code is very time dependent, so we need to disable interrupts chSysLock(); diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c index e0b3bfd5b55..7dc3414eade 100644 --- a/platforms/chibios/drivers/ws2812_pwm.c +++ b/platforms/chibios/drivers/ws2812_pwm.c @@ -389,12 +389,6 @@ void ws2812_write_led_rgbw(uint16_t led_number, uint8_t r, uint8_t g, uint8_t b, // Setleds for standard RGB void ws2812_setleds(rgb_led_t* ledarray, uint16_t leds) { - static bool s_init = false; - if (!s_init) { - ws2812_init(); - s_init = true; - } - for (uint16_t i = 0; i < leds; i++) { #ifdef RGBW ws2812_write_led_rgbw(i, ledarray[i].r, ledarray[i].g, ledarray[i].b, ledarray[i].w); diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c index 01162f07f40..5b990ccaa06 100644 --- a/platforms/chibios/drivers/ws2812_spi.c +++ b/platforms/chibios/drivers/ws2812_spi.c @@ -188,12 +188,6 @@ void ws2812_init(void) { } void ws2812_setleds(rgb_led_t* ledarray, uint16_t leds) { - static bool s_init = false; - if (!s_init) { - ws2812_init(); - s_init = true; - } - for (uint8_t i = 0; i < leds; i++) { set_led_color_rgb(ledarray[i], i); } diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c index 729dcdb4395..4370996d0e1 100644 --- a/quantum/rgb_matrix/rgb_matrix_drivers.c +++ b/quantum/rgb_matrix/rgb_matrix_drivers.c @@ -151,6 +151,7 @@ rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_COUNT]; bool ws2812_dirty = false; static void init(void) { + ws2812_init(); ws2812_dirty = false; } diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c index 530cb046881..28b58feea65 100644 --- a/quantum/rgblight/rgblight.c +++ b/quantum/rgblight/rgblight.c @@ -247,6 +247,8 @@ void rgblight_init(void) { rgblight_mode_noeeprom(rgblight_config.mode); } + rgblight_driver.init(); + is_rgblight_initialized = true; } diff --git a/quantum/rgblight/rgblight_drivers.c b/quantum/rgblight/rgblight_drivers.c index 45b60e1a5fc..8902b8f842e 100644 --- a/quantum/rgblight/rgblight_drivers.c +++ b/quantum/rgblight/rgblight_drivers.c @@ -7,6 +7,7 @@ # include "ws2812.h" const rgblight_driver_t rgblight_driver = { + .init = ws2812_init, .setleds = ws2812_setleds, }; @@ -14,6 +15,7 @@ const rgblight_driver_t rgblight_driver = { # include "apa102.h" const rgblight_driver_t rgblight_driver = { + .init = apa102_init, .setleds = apa102_setleds, }; diff --git a/quantum/rgblight/rgblight_drivers.h b/quantum/rgblight/rgblight_drivers.h index f7125a6f3d3..af28b918e17 100644 --- a/quantum/rgblight/rgblight_drivers.h +++ b/quantum/rgblight/rgblight_drivers.h @@ -7,6 +7,7 @@ #include "color.h" typedef struct { + void (*init)(void); void (*setleds)(rgb_led_t *ledarray, uint16_t number_of_leds); } rgblight_driver_t; From 319ac3b27bbccc4906ba0316d9cc9226af763729 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 21 Mar 2024 15:43:26 +1100 Subject: [PATCH 045/333] Remove RGBLight `led[]` references (#23311) --- .../lovelive9/keymaps/default/keymap.c | 24 ++++++------- keyboards/hineybush/hbcp/hbcp.c | 13 ++++--- .../ave/ortho/keymaps/default/keymap.c | 22 ++++++------ .../ave/staggered/keymaps/default/keymap.c | 23 ++++++------ .../manyboard/macro/keymaps/default/keymap.c | 9 ++--- .../manyboard/macro/keymaps/via/keymap.c | 9 ++--- keyboards/tetris/keymaps/default/keymap.c | 35 +++++++++---------- 7 files changed, 62 insertions(+), 73 deletions(-) diff --git a/keyboards/handwired/lovelive9/keymaps/default/keymap.c b/keyboards/handwired/lovelive9/keymaps/default/keymap.c index 6d863449fe5..4fc8e9be43e 100644 --- a/keyboards/handwired/lovelive9/keymaps/default/keymap.c +++ b/keyboards/handwired/lovelive9/keymaps/default/keymap.c @@ -154,26 +154,22 @@ int aqours_color_v[] = {255, 255, 255, 255, 255, 255, 200, 255, 255}; void LED_default_set(void) { - sethsv(aqours_color_h[2], aqours_color_s[2], aqours_color_v[2], (rgb_led_t *)&led[0]); - sethsv(aqours_color_h[7], aqours_color_s[7], aqours_color_v[7], (rgb_led_t *)&led[1]); - sethsv(aqours_color_h[1], aqours_color_s[1], aqours_color_v[1], (rgb_led_t *)&led[2]); - sethsv(aqours_color_h[5], aqours_color_s[5], aqours_color_v[5], (rgb_led_t *)&led[3]); - sethsv(aqours_color_h[8], aqours_color_s[8], aqours_color_v[8], (rgb_led_t *)&led[4]); - sethsv(aqours_color_h[6], aqours_color_s[6], aqours_color_v[6], (rgb_led_t *)&led[5]); - sethsv(aqours_color_h[0], aqours_color_s[0], aqours_color_v[0], (rgb_led_t *)&led[6]); - sethsv(aqours_color_h[4], aqours_color_s[4], aqours_color_v[4], (rgb_led_t *)&led[7]); - sethsv(aqours_color_h[3], aqours_color_s[3], aqours_color_v[3], (rgb_led_t *)&led[8]); - - rgblight_set(); - + rgblight_sethsv_at(aqours_color_h[2], aqours_color_s[2], aqours_color_v[2], 0); + rgblight_sethsv_at(aqours_color_h[7], aqours_color_s[7], aqours_color_v[7], 1); + rgblight_sethsv_at(aqours_color_h[1], aqours_color_s[1], aqours_color_v[1], 2); + rgblight_sethsv_at(aqours_color_h[5], aqours_color_s[5], aqours_color_v[5], 3); + rgblight_sethsv_at(aqours_color_h[8], aqours_color_s[8], aqours_color_v[8], 4); + rgblight_sethsv_at(aqours_color_h[6], aqours_color_s[6], aqours_color_v[6], 5); + rgblight_sethsv_at(aqours_color_h[0], aqours_color_s[0], aqours_color_v[0], 6); + rgblight_sethsv_at(aqours_color_h[4], aqours_color_s[4], aqours_color_v[4], 7); + rgblight_sethsv_at(aqours_color_h[3], aqours_color_s[3], aqours_color_v[3], 8); } void LED_layer_set(int aqours_index) { for (int c = 0; c < 9; c++) { - sethsv(aqours_color_h[aqours_index], aqours_color_s[aqours_index], aqours_color_v[aqours_index], (rgb_led_t *)&led[c]); + rgblight_sethsv_at(aqours_color_h[aqours_index], aqours_color_s[aqours_index], aqours_color_v[aqours_index], c); } - rgblight_set(); } diff --git a/keyboards/hineybush/hbcp/hbcp.c b/keyboards/hineybush/hbcp/hbcp.c index 754b63b2009..5b22c69007b 100644 --- a/keyboards/hineybush/hbcp/hbcp.c +++ b/keyboards/hineybush/hbcp/hbcp.c @@ -49,21 +49,20 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { if (led_state.caps_lock) { - sethsv_raw(HSV_CAPS, (rgb_led_t *)&led[0]); + rgblight_sethsv_at(HSV_CAPS, 0); } else { - sethsv(HSV_BLACK, (rgb_led_t *)&led[0]); + rgblight_sethsv_at(HSV_BLACK, 0); } if (led_state.num_lock) { - sethsv_raw(HSV_NLCK, (rgb_led_t *)&led[1]); + rgblight_sethsv_at(HSV_NLCK, 1); } else { - sethsv(HSV_BLACK, (rgb_led_t *)&led[1]); + rgblight_sethsv_at(HSV_BLACK, 1); } if (led_state.scroll_lock) { - sethsv_raw(HSV_SCRL, (rgb_led_t *)&led[2]); + rgblight_sethsv_at(HSV_SCRL, 2); } else { - sethsv(HSV_BLACK, (rgb_led_t *)&led[2]); + rgblight_sethsv_at(HSV_BLACK, 2); } - rgblight_set(); } return false; } diff --git a/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c b/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c index 7c0dc928123..db0dfe46f69 100644 --- a/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c +++ b/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c @@ -217,23 +217,23 @@ void keyboard_post_init_user(void) { rgblight_sethsv_noeeprom(50, 255, 100); rgblight_mode_noeeprom(RGBLIGHT_EFFECT_BREATHING + 2); // Init the second LED to a static color: - setrgb(225, 185, 0, (rgb_led_t *)&led[1]); - rgblight_set(); + rgblight_setrgb_at(225, 185, 0, 1); #endif // RGBLIGHT_ENABLE } // RGB Indicator Customization: (cont.) layer_state_t layer_state_set_user(layer_state_t state){ #ifdef RGBLIGHT_ENABLE - uint8_t led1r = 0; uint8_t led1g = 0; uint8_t led1b = 0; - if (layer_state_cmp(state, 1)) { - led1b = 255; - } - if (layer_state_cmp(state, 3)) { - led1r = 200; - } - setrgb(led1r, led1g, led1b, (rgb_led_t *)&led[1]); - rgblight_set(); + uint8_t led1r = 0; + uint8_t led1g = 0; + uint8_t led1b = 0; + if (layer_state_cmp(state, 1)) { + led1b = 255; + } + if (layer_state_cmp(state, 3)) { + led1r = 200; + } + rgblight_setrgb_at(led1r, led1g, led1b, 1); #endif //RGBLIGHT_ENABLE return state; } diff --git a/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c b/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c index 8c5033302c1..b5631ad436d 100644 --- a/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c +++ b/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c @@ -217,23 +217,24 @@ void keyboard_post_init_user(void) { rgblight_sethsv_noeeprom(50, 255, 100); rgblight_mode_noeeprom(RGBLIGHT_EFFECT_BREATHING + 2); // Init the second LED to a static color: - setrgb(225, 185, 0, (rgb_led_t *)&led[1]); - rgblight_set(); + rgblight_setrgb_at(225, 185, 0, 1); #endif // RGBLIGHT_ENABLE } // RGB Indicator Customization: (cont.) layer_state_t layer_state_set_user(layer_state_t state){ #ifdef RGBLIGHT_ENABLE - uint8_t led1r = 0; uint8_t led1g = 0; uint8_t led1b = 0; - if (layer_state_cmp(state, 1)) { - led1b = 255; - } - if (layer_state_cmp(state, 3)) { - led1r = 200; - } - setrgb(led1r, led1g, led1b, (rgb_led_t *)&led[1]); - rgblight_set(); + uint8_t led1r = 0; + uint8_t led1g = 0; + uint8_t led1b = 0; + + if (layer_state_cmp(state, 1)) { + led1b = 255; + } + if (layer_state_cmp(state, 3)) { + led1r = 200; + } + rgblight_setrgb_at(led1r, led1g, led1b, 1); #endif //RGBLIGHT_ENABLE return state; } diff --git a/keyboards/manyboard/macro/keymaps/default/keymap.c b/keyboards/manyboard/macro/keymaps/default/keymap.c index d068fa8d3d0..2e11b215aa1 100644 --- a/keyboards/manyboard/macro/keymaps/default/keymap.c +++ b/keyboards/manyboard/macro/keymaps/default/keymap.c @@ -41,16 +41,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case 0: - sethsv(HSV_WHITE, (rgb_led_t *)&led[0]); - rgblight_set(); + rgblight_sethsv_at(HSV_WHITE, 0); break; case 1: - sethsv(HSV_GREEN, (rgb_led_t *)&led[0]); - rgblight_set(); + rgblight_sethsv_at(HSV_GREEN, 0); break; case 2: - sethsv(HSV_BLUE, (rgb_led_t *)&led[0]); - rgblight_set(); + rgblight_sethsv_at(HSV_BLUE, 0); break; } return state; diff --git a/keyboards/manyboard/macro/keymaps/via/keymap.c b/keyboards/manyboard/macro/keymaps/via/keymap.c index d068fa8d3d0..2e11b215aa1 100644 --- a/keyboards/manyboard/macro/keymaps/via/keymap.c +++ b/keyboards/manyboard/macro/keymaps/via/keymap.c @@ -41,16 +41,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case 0: - sethsv(HSV_WHITE, (rgb_led_t *)&led[0]); - rgblight_set(); + rgblight_sethsv_at(HSV_WHITE, 0); break; case 1: - sethsv(HSV_GREEN, (rgb_led_t *)&led[0]); - rgblight_set(); + rgblight_sethsv_at(HSV_GREEN, 0); break; case 2: - sethsv(HSV_BLUE, (rgb_led_t *)&led[0]); - rgblight_set(); + rgblight_sethsv_at(HSV_BLUE, 0); break; } return state; diff --git a/keyboards/tetris/keymaps/default/keymap.c b/keyboards/tetris/keymaps/default/keymap.c index 057e19d9872..041d9286100 100755 --- a/keyboards/tetris/keymaps/default/keymap.c +++ b/keyboards/tetris/keymaps/default/keymap.c @@ -94,44 +94,43 @@ void matrix_scan_user(void) { uint16_t kc = keymap_key_to_keycode(layer, (keypos_t) {.row = 0, .col = i }); if (kc == KC_TRNS) { - setrgb(5, 5, 5, (rgb_led_t * ) & led[j]); /* TRNS color 0-255*/ + rgblight_setrgb_at(5, 5, 5, j); /* TRNS color 0-255*/ } else if (kc == KC_NO) { - setrgb(0, 0, 0, (rgb_led_t * ) & led[j]); /* NO color 0-255*/ + rgblight_setrgb_at(0, 0, 0, j); /* NO color 0-255*/ } else { if (layer == 1) { - setrgb(128, 64, 0, (rgb_led_t * ) & led[j]); /* 1 layer 0-255*/ + rgblight_setrgb_at(128, 64, 0, j); /* 1 layer 0-255*/ } else if (layer == 2) { - setrgb(0, 64, 128, (rgb_led_t * ) & led[j]); /* 2*/ + rgblight_setrgb_at(0, 64, 128, j); /* 2*/ } else if (layer == 3) { - setrgb(64, 128, 0, (rgb_led_t * ) & led[j]); /* 3*/ + rgblight_setrgb_at(64, 128, 0, j); /* 3*/ } else if (layer == 4) { - setrgb(0, 128, 64, (rgb_led_t * ) & led[j]); /* 4*/ + rgblight_setrgb_at(0, 128, 64, j); /* 4*/ } else if (layer == 5) { - setrgb(128, 0, 128, (rgb_led_t * ) & led[j]); /* 5*/ + rgblight_setrgb_at(128, 0, 128, j); /* 5*/ } else if (layer == 6) { - setrgb(128, 0, 128, (rgb_led_t * ) & led[j]); /* 6*/ + rgblight_setrgb_at(128, 0, 128, j); /* 6*/ } else if (layer == 7) { - setrgb(128, 128, 0, (rgb_led_t * ) & led[j]); /* 7*/ + rgblight_setrgb_at(128, 128, 0, j); /* 7*/ } else if (layer == 8) { - setrgb(0, 128, 128, (rgb_led_t * ) & led[j]); /* 8*/ + rgblight_setrgb_at(0, 128, 128, j); /* 8*/ } else if (layer == 9) { - setrgb(128, 192, 64, (rgb_led_t * ) & led[j]); /* 9*/ + rgblight_setrgb_at(128, 192, 64, j); /* 9*/ } else if (layer == 10) { - setrgb(64, 192, 128, (rgb_led_t * ) & led[j]); /* 10*/ + rgblight_setrgb_at(64, 192, 128, j); /* 10*/ } else if (layer == 11) { - setrgb(128, 64, 192, (rgb_led_t * ) & led[j]); /* 11*/ + rgblight_setrgb_at(128, 64, 192, j); /* 11*/ } else if (layer == 12) { - setrgb(64, 128, 192, (rgb_led_t * ) & led[j]); /* 12*/ + rgblight_setrgb_at(64, 128, 192, j); /* 12*/ } else if (layer == 13) { - setrgb(128, 192, 0, (rgb_led_t * ) & led[j]); /* 13*/ + rgblight_setrgb_at(128, 192, 0, j); /* 13*/ } else if (layer == 14) { - setrgb(192, 0, 128, (rgb_led_t * ) & led[j]); /* 14*/ + rgblight_setrgb_at(192, 0, 128, j); /* 14*/ } else if (layer == 15) { - setrgb(0, 192, 128, (rgb_led_t * ) & led[j]); /* 15*/ + rgblight_setrgb_at(0, 192, 128, j); /* 15*/ } } } - rgblight_set(); } has_layer_changed = false; } From ae9c5389f01c7fdcf4504f5b2e00ab3725483f38 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 21 Mar 2024 21:54:48 +0000 Subject: [PATCH 046/333] Reduce firmware size of helix/rev3 (#23324) --- .../rev3_4rows/keymaps/default/oled_display.c | 31 +++++++++++-------- .../rev3_4rows/keymaps/via/oled_display.c | 31 +++++++++++-------- .../rev3_5rows/keymaps/default/oled_display.c | 31 +++++++++++-------- .../rev3_5rows/keymaps/via/oled_display.c | 31 +++++++++++-------- 4 files changed, 72 insertions(+), 52 deletions(-) diff --git a/keyboards/helix/rev3_4rows/keymaps/default/oled_display.c b/keyboards/helix/rev3_4rows/keymaps/default/oled_display.c index ee5277a7df9..1158461e780 100644 --- a/keyboards/helix/rev3_4rows/keymaps/default/oled_display.c +++ b/keyboards/helix/rev3_4rows/keymaps/default/oled_display.c @@ -87,19 +87,24 @@ static void render_logo(void) { static void render_rgbled_status(bool full) { #ifdef RGBLIGHT_ENABLE - char buf[30]; - if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) { - if (full) { - snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ", - rgblight_get_mode(), - rgblight_get_hue()/RGBLIGHT_HUE_STEP, - rgblight_get_sat()/RGBLIGHT_SAT_STEP, - rgblight_get_val()/RGBLIGHT_VAL_STEP); - } else { - snprintf(buf, sizeof(buf), "[%2d] ", rgblight_get_mode()); - } - oled_write(buf, false); - } + if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) { + if (full) { + // " LED %d:%d,%d,%d" + oled_write_P(PSTR(" LED"), false); + oled_write(get_u8_str(rgblight_get_mode(), ' '), false); + oled_write_char(':', false); + oled_write(get_u8_str(rgblight_get_hue() / RGBLIGHT_HUE_STEP, ' '), false); + oled_write_char(',', false); + oled_write(get_u8_str(rgblight_get_sat() / RGBLIGHT_SAT_STEP, ' '), false); + oled_write_char(',', false); + oled_write(get_u8_str(rgblight_get_val() / RGBLIGHT_VAL_STEP, ' '), false); + } else { + // "[%2d]" + oled_write_char('[', false); + oled_write(get_u8_str(rgblight_get_mode(), ' '), false); + oled_write_char(']', false); + } + } #endif } diff --git a/keyboards/helix/rev3_4rows/keymaps/via/oled_display.c b/keyboards/helix/rev3_4rows/keymaps/via/oled_display.c index ee5277a7df9..1158461e780 100644 --- a/keyboards/helix/rev3_4rows/keymaps/via/oled_display.c +++ b/keyboards/helix/rev3_4rows/keymaps/via/oled_display.c @@ -87,19 +87,24 @@ static void render_logo(void) { static void render_rgbled_status(bool full) { #ifdef RGBLIGHT_ENABLE - char buf[30]; - if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) { - if (full) { - snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ", - rgblight_get_mode(), - rgblight_get_hue()/RGBLIGHT_HUE_STEP, - rgblight_get_sat()/RGBLIGHT_SAT_STEP, - rgblight_get_val()/RGBLIGHT_VAL_STEP); - } else { - snprintf(buf, sizeof(buf), "[%2d] ", rgblight_get_mode()); - } - oled_write(buf, false); - } + if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) { + if (full) { + // " LED %d:%d,%d,%d" + oled_write_P(PSTR(" LED"), false); + oled_write(get_u8_str(rgblight_get_mode(), ' '), false); + oled_write_char(':', false); + oled_write(get_u8_str(rgblight_get_hue() / RGBLIGHT_HUE_STEP, ' '), false); + oled_write_char(',', false); + oled_write(get_u8_str(rgblight_get_sat() / RGBLIGHT_SAT_STEP, ' '), false); + oled_write_char(',', false); + oled_write(get_u8_str(rgblight_get_val() / RGBLIGHT_VAL_STEP, ' '), false); + } else { + // "[%2d]" + oled_write_char('[', false); + oled_write(get_u8_str(rgblight_get_mode(), ' '), false); + oled_write_char(']', false); + } + } #endif } diff --git a/keyboards/helix/rev3_5rows/keymaps/default/oled_display.c b/keyboards/helix/rev3_5rows/keymaps/default/oled_display.c index ee5277a7df9..1158461e780 100644 --- a/keyboards/helix/rev3_5rows/keymaps/default/oled_display.c +++ b/keyboards/helix/rev3_5rows/keymaps/default/oled_display.c @@ -87,19 +87,24 @@ static void render_logo(void) { static void render_rgbled_status(bool full) { #ifdef RGBLIGHT_ENABLE - char buf[30]; - if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) { - if (full) { - snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ", - rgblight_get_mode(), - rgblight_get_hue()/RGBLIGHT_HUE_STEP, - rgblight_get_sat()/RGBLIGHT_SAT_STEP, - rgblight_get_val()/RGBLIGHT_VAL_STEP); - } else { - snprintf(buf, sizeof(buf), "[%2d] ", rgblight_get_mode()); - } - oled_write(buf, false); - } + if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) { + if (full) { + // " LED %d:%d,%d,%d" + oled_write_P(PSTR(" LED"), false); + oled_write(get_u8_str(rgblight_get_mode(), ' '), false); + oled_write_char(':', false); + oled_write(get_u8_str(rgblight_get_hue() / RGBLIGHT_HUE_STEP, ' '), false); + oled_write_char(',', false); + oled_write(get_u8_str(rgblight_get_sat() / RGBLIGHT_SAT_STEP, ' '), false); + oled_write_char(',', false); + oled_write(get_u8_str(rgblight_get_val() / RGBLIGHT_VAL_STEP, ' '), false); + } else { + // "[%2d]" + oled_write_char('[', false); + oled_write(get_u8_str(rgblight_get_mode(), ' '), false); + oled_write_char(']', false); + } + } #endif } diff --git a/keyboards/helix/rev3_5rows/keymaps/via/oled_display.c b/keyboards/helix/rev3_5rows/keymaps/via/oled_display.c index 3cfb8969f69..bc8fd200647 100644 --- a/keyboards/helix/rev3_5rows/keymaps/via/oled_display.c +++ b/keyboards/helix/rev3_5rows/keymaps/via/oled_display.c @@ -86,19 +86,24 @@ static void render_logo(void) { static void render_rgbled_status(bool full) { #ifdef RGBLIGHT_ENABLE - char buf[30]; - if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) { - if (full) { - snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ", - rgblight_get_mode(), - rgblight_get_hue()/RGBLIGHT_HUE_STEP, - rgblight_get_sat()/RGBLIGHT_SAT_STEP, - rgblight_get_val()/RGBLIGHT_VAL_STEP); - } else { - snprintf(buf, sizeof(buf), "[%2d] ", rgblight_get_mode()); - } - oled_write(buf, false); - } + if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) { + if (full) { + // " LED %d:%d,%d,%d" + oled_write_P(PSTR(" LED"), false); + oled_write(get_u8_str(rgblight_get_mode(), ' '), false); + oled_write_char(':', false); + oled_write(get_u8_str(rgblight_get_hue() / RGBLIGHT_HUE_STEP, ' '), false); + oled_write_char(',', false); + oled_write(get_u8_str(rgblight_get_sat() / RGBLIGHT_SAT_STEP, ' '), false); + oled_write_char(',', false); + oled_write(get_u8_str(rgblight_get_val() / RGBLIGHT_VAL_STEP, ' '), false); + } else { + // "[%2d]" + oled_write_char('[', false); + oled_write(get_u8_str(rgblight_get_mode(), ' '), false); + oled_write_char(']', false); + } + } #endif } From c038292c1eddfa588d26e0e4d1dff7e9e13052ad Mon Sep 17 00:00:00 2001 From: Etienne Collin Date: Thu, 21 Mar 2024 22:40:59 -0400 Subject: [PATCH 047/333] Adding standard keymap for wave keyboard to fix #22695 (#22741) --- .../wave/keymaps/default/config.h | 22 +- .../wave/keymaps/default/keymap.c | 191 ++++++++++++++++++ .../wave/keymaps/default/keymap.json | 27 --- .../wave/keymaps/default/readme.md | 13 +- .../wave/keymaps/default/rules.mk | 2 + keyboards/etiennecollin/wave/readme.md | 14 +- 6 files changed, 219 insertions(+), 50 deletions(-) create mode 100644 keyboards/etiennecollin/wave/keymaps/default/keymap.c delete mode 100644 keyboards/etiennecollin/wave/keymaps/default/keymap.json create mode 100644 keyboards/etiennecollin/wave/keymaps/default/rules.mk diff --git a/keyboards/etiennecollin/wave/keymaps/default/config.h b/keyboards/etiennecollin/wave/keymaps/default/config.h index 8d60295560f..ea3b5a5162c 100644 --- a/keyboards/etiennecollin/wave/keymaps/default/config.h +++ b/keyboards/etiennecollin/wave/keymaps/default/config.h @@ -19,16 +19,24 @@ // Activate caps word by pressing Left Shift + Right Shift #define BOTH_SHIFTS_TURNS_ON_CAPS_WORD -// Enable rapid switch from tap to hold, disables double tap hold auto-repeat -#define QUICK_TAP_TERM 0 - // Maximum time between taps of tap dances #define TAPPING_TERM 175 +// Max time between taps to prevent hold function and hold auto-repeat +#define QUICK_TAP_TERM 100 + // Perform hold action if pressing a dual-role key, tapping another key and -// releasing the dual-role key withing tapping term +// releasing the dual-role key within tapping term #define PERMISSIVE_HOLD -// Perform hold action if pressing a dual-role key, pressing another key, -// releasing the dual-role key and releasing the other key withing tapping term -#define HOLD_ON_OTHER_KEY_PRESS \ No newline at end of file +// Mouse key speed and acceleration. +#define MOUSEKEY_DELAY 0 +#define MOUSEKEY_INTERVAL 16 +#define MOUSEKEY_WHEEL_DELAY 0 +#define MOUSEKEY_MAX_SPEED 6 +#define MOUSEKEY_TIME_TO_MAX 64 + +// Thumb Combos +#define COMBO_COUNT 2 +#define COMBO_TERM 200 +#define EXTRA_SHORT_COMBOS diff --git a/keyboards/etiennecollin/wave/keymaps/default/keymap.c b/keyboards/etiennecollin/wave/keymaps/default/keymap.c new file mode 100644 index 00000000000..24bc85d5b49 --- /dev/null +++ b/keyboards/etiennecollin/wave/keymaps/default/keymap.c @@ -0,0 +1,191 @@ +/* Copyright 2023 Etienne Collin (@etiennecollin) + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +enum custom_layers { + COL, + QWE, + GAM, + MED, + NAV, + MOS, + SYM, + NUM, + FUN, + SYS, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [COL] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | q | w | f | p | b | | j | l | u | y | ' | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | a | r | s | t | g | | m | n | e | i | o | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | z | x | c | d | v | | k | h | , | . | / | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | esc | spc | tab | | ent | bsp | del | + // --------+-------+-------- --------+-------+-------- + KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, + LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), + KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, + LT(MED, KC_ESC), LT(NAV, KC_SPC), LT(MOS, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL) + ), + [QWE] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | q | w | e | r | t | | y | u | i | o | p | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | a | s | d | f | g | | h | j | k | l | ' | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | z | x | c | v | b | | n | m | , | . | / | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | esc | spc | tab | | ent | bsp | del | + // --------+-------+-------- --------+-------+-------- + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_QUOT), + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + LT(MED, KC_ESC), LT(NAV, KC_SPC), LT(MOS, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL) + ), + [GAM] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | tab | q | w | e | r | | t | y | u | i | o | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | sht | a | s | d | f | | g | h | j | k | l | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | ctl | z | x | c | v | | b | n | m | , | . | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | alt | cps | spc | | ent | bsp | esc | + // --------+-------+-------- --------+-------+-------- + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, + KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, + KC_LALT, KC_CAPS, KC_SPC, LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_ESC) + ), + [MED] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | | | | | | | | | | | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | gui | alt | ctl | sht | | | | prev | vol - | vol + | next | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | | | | | | | | | | | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | ___ | | | | stop | pause | mute | + // --------+-------+-------- --------+-------+-------- + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MRWD, XXXXXXX, XXXXXXX, KC_MFFD, + _______, XXXXXXX, XXXXXXX, KC_MSTP, KC_MPLY, KC_MUTE + ), + [NAV] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | | | | | | | | | | | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | gui | alt | ctl | sht | | | cps | ← | ↓ | ↑ | → | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | | | | | | insrt | home | pageu | paged | end | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | ___ | | | ent | bsp | del | + // --------+-------+-------- --------+-------+-------- + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, + XXXXXXX, _______, XXXXXXX, KC_ENT, KC_BSPC, KC_DEL + ), + [MOS] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | | | | | | | | acc0 | acc1 | acc2 | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | gui | alt | ctl | sht | | | | ← | ↓ | ↑ | → | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | | | | | | | w← | w↓ | w↑ | w→ | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | | ___ | | left | right | mid | + // --------+-------+-------- --------+-------+-------- + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, + KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, + XXXXXXX, XXXXXXX, _______, KC_BTN1, KC_BTN2, KC_BTN3 + ), + [SYM] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | { | & | * | ( | } | | | | | | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | : | $ | % | ^ | + | | | sht | ctl | alt | gui | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | ~ | ! | @ | # | | | | | | | | | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | ( | ) | _ | | ___ | | | + // --------+-------+-------- --------+-------+-------- + KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_COLN, KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_PIPE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LPRN, KC_RPRN, KC_UNDS, _______, XXXXXXX, XXXXXXX + ), + [NUM] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | [ { | 7 & | 8 * | 9 ( | ] } | | | | | | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | ; : | 4 $ | 5 % | 6 ^ | = + | | | sht | ctl | alt | gui | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | ` ~ | 1 ! | 2 @ | 3 # | \ | | | | | | | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | . > | 0 ) | - _ | | | ___ | | + // --------+-------+-------- --------+-------+-------- + KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, + KC_GRV, KC_1, KC_2, KC_3, KC_BSLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_DOT, KC_0, KC_MINS, XXXXXXX, _______, XXXXXXX + ), + [FUN] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | F12 | F 7 | F 8 | F 9 | PrScr | | | | | | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | F11 | F 4 | F 5 | F 6 | pause | | | sht | ctl | alt | gui | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | F10 | F 1 | F 2 | F 3 | scrlk | | | | | | | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | app | spc | tab | | | | ___ | + // --------+-------+-------- --------+-------+-------- + KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_F11, KC_F4, KC_F5, KC_F6, KC_PAUS, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, + KC_F10, KC_F1, KC_F2, KC_F3, KC_SCRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_APP, KC_SPC, KC_TAB, XXXXXXX, XXXXXXX, _______ + ), + [SYS] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | BOOT | | GAME | QWERT | COLMK | | COLMK | QWERT | GAME | | BOOT | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | | | | | | | | | | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | | | | | | | | | | | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | | | | | | | + // --------+-------+-------- --------+-------+-------- + QK_BOOT, XXXXXXX, DF(GAM), DF(QWE), DF(COL), DF(COL), DF(QWE), DF(GAM), XXXXXXX, QK_BOOT, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______ + ) +}; + +const uint16_t PROGMEM combo_sys[] = {LT(MED, KC_ESC), LT(FUN, KC_DEL), COMBO_END}; +const uint16_t PROGMEM combo_sys_gam[] = {KC_LALT, LT(FUN, KC_ESC), COMBO_END}; + +combo_t key_combos[] = { + COMBO(combo_sys, MO(SYS)), + COMBO(combo_sys_gam, MO(SYS)) +}; diff --git a/keyboards/etiennecollin/wave/keymaps/default/keymap.json b/keyboards/etiennecollin/wave/keymaps/default/keymap.json deleted file mode 100644 index 993a1b854c1..00000000000 --- a/keyboards/etiennecollin/wave/keymaps/default/keymap.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": 1, - "author": "etiennecollin", - "keyboard": "etiennecollin/wave", - "notes": "This is a keymap file for etiennecollin/wave", - "keymap": "default", - "layout": "LAYOUT_split_3x5_3", - "config": { - "features": { - "caps_word": true - } - }, - "layers": [ - [ - "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", - "LGUI_T(KC_A)", "LALT_T(KC_S)", "LCTL_T(KC_D)", "LSFT_T(KC_F)", "KC_G", "KC_H", "LSFT_T(KC_J)", "LCTL_T(KC_K)", "LALT_T(KC_L)", "LGUI_T(KC_SCLN)", - "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", - "KC_ESC", "KC_SPC", "KC_TAB", "KC_ENT", "KC_BSPC", "MO(1)" - ], - [ - "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", - "KC_EXLM", "KC_AT", "KC_HASH", "KC_DLR", "KC_PERC", "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", - "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", - "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "_______" - ] - ] -} \ No newline at end of file diff --git a/keyboards/etiennecollin/wave/keymaps/default/readme.md b/keyboards/etiennecollin/wave/keymaps/default/readme.md index 16586cc1f7e..96b9c277da1 100644 --- a/keyboards/etiennecollin/wave/keymaps/default/readme.md +++ b/keyboards/etiennecollin/wave/keymaps/default/readme.md @@ -1,6 +1,11 @@ -# Default keymap +# Default Keymap -This is a really simple QWERTY keymap with a single number/symbol layer. -It uses home row modifiers and the caps word feature because of the limited number of keys. +This keymap is heavily inspired by the [miryoku](https://github.com/manna-harbour/miryoku) layout. -For a more complete layout, see the `feature` layout. +It defaults to a [COLEMAK mod dh](https://colemakmods.github.io/mod-dh/) layer, but a QWERTY and a gaming layer are available from the `sys` layer. + +It uses the following features: + +- Home row modifiers +- Usual special layers (`media`, `navigation`, `mouse`, `symbols`, `numbers`, `functions`, `system`) +- Combos (to access the `sys` layer by pressing both external thumb keys) diff --git a/keyboards/etiennecollin/wave/keymaps/default/rules.mk b/keyboards/etiennecollin/wave/keymaps/default/rules.mk new file mode 100644 index 00000000000..96093b82013 --- /dev/null +++ b/keyboards/etiennecollin/wave/keymaps/default/rules.mk @@ -0,0 +1,2 @@ +CAPS_WORD_ENABLE = yes +COMBO_ENABLE = yes diff --git a/keyboards/etiennecollin/wave/readme.md b/keyboards/etiennecollin/wave/readme.md index a66c6f71d3c..be5fe45c932 100644 --- a/keyboards/etiennecollin/wave/readme.md +++ b/keyboards/etiennecollin/wave/readme.md @@ -1,8 +1,8 @@ # Wave -![Wave pcb](https://i.imgur.com/oWF1Fnr.png) +![Wave Keyboard](https://i.imgur.com/Lz45D3z.png) -_The Wave is a small, reversible keyboard inspired by the [Ferris](https://github.com/pierrechevalier83/ferris), the [Ferris Sweep](https://github.com/davidphilipbarr/Sweep), the [Swoop](https://github.com/jimmerricks/swoop) and the [Sweep36](https://github.com/sadekbaroudi/sweep36). It aims to solve a few issues I found with the keyboards._ +_The Wave is a small, reversible keyboard inspired by the [Ferris](https://github.com/pierrechevalier83/ferris), the [Ferris Sweep](https://github.com/davidphilipbarr/Sweep), the [Swoop](https://github.com/jimmerricks/swoop) and the [Sweep36](https://github.com/sadekbaroudi/sweep36). It aims to put together everything I like about these other models and to solve a few issues I found with them._ - Keyboard Maintainer: [Etienne Collin](https://github.com/etiennecollin) - Hardware Supported: [Wave](https://github.com/etiennecollin/wave) @@ -18,16 +18,6 @@ Flashing example for this keyboard: 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). -## Recommended Keymap - -For an everyday keyboard, it is recommended to use the `feature` keymap, as the default keymap is extremely barebone. Here is a make example: - - make etiennecollin/wave:feature - -Flashing example: - - make etiennecollin/wave:feature:flash - ## Bootloader Enter the bootloader in 3 ways: From 583cde398a28e429485b440de38a2ed9ec528830 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 22 Mar 2024 17:04:13 +1100 Subject: [PATCH 048/333] Un-`extern` RGBLight `led[]` array (#23322) --- docs/feature_rgblight.md | 15 ---- keyboards/hineybush/hbcp/hbcp.c | 5 +- .../hineybush/hbcp/keymaps/hiney/keymap.c | 50 ++--------- keyboards/neson_design/nico/info.json | 3 +- keyboards/neson_design/nico/nico.c | 90 ------------------- keyboards/neson_design/nico/rules.mk | 1 - keyboards/snes_macropad/snes_macropad.c | 16 ---- quantum/rgblight/rgblight.c | 18 ++-- quantum/rgblight/rgblight.h | 7 -- 9 files changed, 17 insertions(+), 188 deletions(-) delete mode 100644 keyboards/neson_design/nico/nico.c diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md index b7ba0757317..a6a89d1d00c 100644 --- a/docs/feature_rgblight.md +++ b/docs/feature_rgblight.md @@ -356,27 +356,12 @@ Usually lighting layers apply their configured brightness once activated. If you If you need to change your RGB lighting in code, for example in a macro to change the color whenever you switch layers, QMK provides a set of functions to assist you. See [`rgblight.h`](https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight/rgblight.h) for the full list, but the most commonly used functions include: -### Utility Functions -|Function |Description | -|--------------------------------------------|-------------------------------------------------------------------| -|`sethsv(hue, sat, val, ledbuf)` |Set ledbuf to the given HSV value | -|`sethsv_raw(hue, sat, val, ledbuf)` |Set ledbuf to the given HSV value without RGBLIGHT_LIMIT_VAL check | -|`setrgb(r, g, b, ledbuf)` |Set ledbuf to the given RGB value where `r`/`g`/`b` | - ### Low level Functions |Function |Description | |--------------------------------------------|-------------------------------------------| |`rgblight_set()` |Flush out led buffers to LEDs | |`rgblight_set_clipping_range(pos, num)` |Set clipping Range. see [Clipping Range](#clipping-range) | -Example: -```c -sethsv(HSV_WHITE, (rgb_led_t *)&led[0]); // led 0 -sethsv(HSV_RED, (rgb_led_t *)&led[1]); // led 1 -sethsv(HSV_GREEN, (rgb_led_t *)&led[2]); // led 2 -rgblight_set(); // Utility functions do not call rgblight_set() automatically, so they need to be called explicitly. -``` - ### Effects and Animations Functions #### effect range setting |Function |Description | diff --git a/keyboards/hineybush/hbcp/hbcp.c b/keyboards/hineybush/hbcp/hbcp.c index 5b22c69007b..e422b46fdcb 100644 --- a/keyboards/hineybush/hbcp/hbcp.c +++ b/keyboards/hineybush/hbcp/hbcp.c @@ -82,12 +82,9 @@ void keyboard_post_init_user(void) { __attribute__ ((weak)) void hbcp_sethsv_range(uint8_t hue, uint8_t sat, uint8_t val, uint8_t start, uint8_t end) { - rgb_led_t tmp_led; - sethsv_raw(hue, sat, val, &tmp_led); for (uint8_t i = start; i < end; i++) { - led[i] = tmp_led; + rgblight_sethsv_at(hue, sat, val, i); } - rgblight_set(); } #endif diff --git a/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c b/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c index 2311d4020f7..2d73326c9a0 100644 --- a/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c +++ b/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c @@ -15,13 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - ALTCUT, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_wkl( /* Base */ @@ -45,55 +38,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case ALTCUT: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - send_string_with_delay_P(PSTR(SS_TAP(X_TAB)SS_TAP(X_T)SS_TAP(X_V)SS_TAP(X_B)), 20); // altium macro - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} - -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} - #ifdef RGBLIGHT_ENABLE // The first three LEDs are used as indicators for CAPS_LOCK, NUM_LOCK and SCROLL_LOCK. bool led_update_user(led_t led_state) { if (led_state.caps_lock) { - sethsv_raw(HSV_SOFT_RED, (rgb_led_t *)&led[0]); + rgblight_sethsv_at(HSV_SOFT_RED, 0); } else { - sethsv(HSV_BLACK, (rgb_led_t *)&led[0]); + rgblight_sethsv_at(HSV_BLACK, 0); } if (led_state.num_lock) { - sethsv_raw(HSV_WARM_WHITE, (rgb_led_t *)&led[1]); + rgblight_sethsv_at(HSV_WARM_WHITE, 1); } else { - sethsv(HSV_BLACK, (rgb_led_t *)&led[1]); + rgblight_sethsv_at(HSV_BLACK, 1); } if (led_state.scroll_lock) { - sethsv_raw(HSV_SOFT_BLUE, (rgb_led_t *)&led[2]); + rgblight_sethsv_at(HSV_SOFT_BLUE, 2); } else { - sethsv(HSV_BLACK, (rgb_led_t *)&led[2]); + rgblight_sethsv_at(HSV_BLACK, 2); } - rgblight_set(); return false; } diff --git a/keyboards/neson_design/nico/info.json b/keyboards/neson_design/nico/info.json index 1c86d9a1ae8..477ac3ba7cb 100644 --- a/keyboards/neson_design/nico/info.json +++ b/keyboards/neson_design/nico/info.json @@ -25,8 +25,7 @@ "pin": "B0" }, "rgblight": { - "led_count": 5, - "driver": "custom" + "led_count": 5 }, "url": "", "usb": { diff --git a/keyboards/neson_design/nico/nico.c b/keyboards/neson_design/nico/nico.c deleted file mode 100644 index 0738a3ee987..00000000000 --- a/keyboards/neson_design/nico/nico.c +++ /dev/null @@ -1,90 +0,0 @@ -/** - * @file nico.c - * - Copyright 2023 astro - - 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 . - */ - -#include "quantum.h" -#include "ws2812.h" -#ifdef RGBLIGHT_ENABLE - -static bool alert = false; -static bool backup = false; -static rgb_led_t caps_led; -static uint16_t last_ticks = 0; - -#define ALERT_INTERVAL 500 -#define ALERM_LED_R 0xFF -#define ALERM_LED_G 0xA5 -#define ALERM_LED_B 0x00 -//golden 0xFF, 0xD9, 0x00 - -void housekeeping_task_kb(void) -{ - if (host_keyboard_led_state().caps_lock) { - if (!backup) { - caps_led.r = led[4].r; - caps_led.g = led[4].g; - caps_led.b = led[4].b; - backup = true; - } - if(alert) { - led[4].r = ALERM_LED_G; - led[4].g = ALERM_LED_R; - led[4].b = ALERM_LED_B; - } else { - led[4].r = 0; - led[4].g = 0; - led[4].b = 0; - } - if (timer_elapsed(last_ticks) > ALERT_INTERVAL) { - alert = !alert; - last_ticks = timer_read(); - } - ws2812_setleds(led, RGBLIGHT_LED_COUNT); - } else { - if (backup) { - led[4].r = caps_led.r; - led[4].g = caps_led.g; - led[4].b = caps_led.b; - backup = false; - ws2812_setleds(led, RGBLIGHT_LED_COUNT); - } - } - housekeeping_task_user(); -} - -void setleds_custom(rgb_led_t *start_led, uint16_t num_leds) -{ - start_led[2].r = start_led[0].r; - start_led[2].g = start_led[0].g; - start_led[2].b = start_led[0].b; - - start_led[3].r = start_led[1].r; - start_led[3].g = start_led[1].g; - start_led[3].b = start_led[1].b; - - uint8_t tmp = start_led[4].g; - start_led[4].g = start_led[4].r; - start_led[4].r = tmp; - ws2812_setleds(start_led, RGBLIGHT_LED_COUNT); -} - -const rgblight_driver_t rgblight_driver = { - .init = ws2812_init, - .setleds = setleds_custom, -}; -#endif \ No newline at end of file diff --git a/keyboards/neson_design/nico/rules.mk b/keyboards/neson_design/nico/rules.mk index 9a696492896..e69de29bb2d 100644 --- a/keyboards/neson_design/nico/rules.mk +++ b/keyboards/neson_design/nico/rules.mk @@ -1 +0,0 @@ -WS2812_DRIVER_REQUIRED = yes diff --git a/keyboards/snes_macropad/snes_macropad.c b/keyboards/snes_macropad/snes_macropad.c index 9f4f410fa3e..74fa434fb2a 100644 --- a/keyboards/snes_macropad/snes_macropad.c +++ b/keyboards/snes_macropad/snes_macropad.c @@ -86,22 +86,6 @@ static void setupForFlashing(void) { // Force data to be rendered oled_render_dirty(true); - - // Set alternating backlight colors - const uint8_t max = 20; - rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - for (size_t i = 0; i < RGBLIGHT_LED_COUNT; ++i) { - rgb_led_t *led_ = (rgb_led_t *)&led[i]; - switch (i % 2) { - case 0: - setrgb(max, 0, max, led_); - break; - case 1: - setrgb(0, max, max, led_); - break; - } - } - rgblight_set(); } bool process_record_kb(uint16_t keycode, keyrecord_t *record) { diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c index 28b58feea65..b17a501eef6 100644 --- a/quantum/rgblight/rgblight.c +++ b/quantum/rgblight/rgblight.c @@ -145,6 +145,15 @@ __attribute__((weak)) RGB rgblight_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv); } +void setrgb(uint8_t r, uint8_t g, uint8_t b, rgb_led_t *led1) { + led1->r = r; + led1->g = g; + led1->b = b; +#ifdef RGBW + led1->w = 0; +#endif +} + void sethsv_raw(uint8_t hue, uint8_t sat, uint8_t val, rgb_led_t *led1) { HSV hsv = {hue, sat, val}; RGB rgb = rgblight_hsv_to_rgb(hsv); @@ -155,15 +164,6 @@ void sethsv(uint8_t hue, uint8_t sat, uint8_t val, rgb_led_t *led1) { sethsv_raw(hue, sat, val > RGBLIGHT_LIMIT_VAL ? RGBLIGHT_LIMIT_VAL : val, led1); } -void setrgb(uint8_t r, uint8_t g, uint8_t b, rgb_led_t *led1) { - led1->r = r; - led1->g = g; - led1->b = b; -#ifdef RGBW - led1->w = 0; -#endif -} - void rgblight_check_config(void) { /* Add some out of bound checks for RGB light config */ diff --git a/quantum/rgblight/rgblight.h b/quantum/rgblight/rgblight.h index 9e2b073776c..0ed67ff6e3d 100644 --- a/quantum/rgblight/rgblight.h +++ b/quantum/rgblight/rgblight.h @@ -240,8 +240,6 @@ void rgblight_unblink_all_but_layer(uint8_t layer); #endif -extern rgb_led_t led[RGBLIGHT_LED_COUNT]; - extern const uint8_t RGBLED_BREATHING_INTERVALS[4] PROGMEM; extern const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[3] PROGMEM; extern const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[3] PROGMEM; @@ -290,11 +288,6 @@ typedef struct _rgblight_ranges_t { extern rgblight_ranges_t rgblight_ranges; -/* === Utility Functions ===*/ -void sethsv(uint8_t hue, uint8_t sat, uint8_t val, rgb_led_t *led1); -void sethsv_raw(uint8_t hue, uint8_t sat, uint8_t val, rgb_led_t *led1); // without RGBLIGHT_LIMIT_VAL check -void setrgb(uint8_t r, uint8_t g, uint8_t b, rgb_led_t *led1); - /* === Low level Functions === */ void rgblight_set(void); void rgblight_set_clipping_range(uint8_t start_pos, uint8_t num_leds); From 551489645a13f7e7c2d73b3086718016cb386df2 Mon Sep 17 00:00:00 2001 From: Moritz Plattner Date: Fri, 22 Mar 2024 13:13:07 +0100 Subject: [PATCH 049/333] Add werk.technica werk.one keyboard (#23130) * add wt one * update readme for One * Apply suggestions from code review Co-authored-by: Joel Challis * remove redundant file * reformatted info.json * Update keyboards/werk_technica/one/keymaps/via/rules.mk Co-authored-by: Danny --------- Co-authored-by: Joel Challis Co-authored-by: Danny --- keyboards/werk_technica/one/config.h | 7 + keyboards/werk_technica/one/info.json | 297 ++++++++++++++++++ .../one/keymaps/default/keymap.c | 55 ++++ .../one/keymaps/default/rules.mk | 1 + .../werk_technica/one/keymaps/via/keymap.c | 55 ++++ .../werk_technica/one/keymaps/via/rules.mk | 2 + keyboards/werk_technica/one/mcuconf.h | 21 ++ keyboards/werk_technica/one/readme.md | 26 ++ keyboards/werk_technica/one/rules.mk | 1 + 9 files changed, 465 insertions(+) create mode 100644 keyboards/werk_technica/one/config.h create mode 100644 keyboards/werk_technica/one/info.json create mode 100644 keyboards/werk_technica/one/keymaps/default/keymap.c create mode 100644 keyboards/werk_technica/one/keymaps/default/rules.mk create mode 100644 keyboards/werk_technica/one/keymaps/via/keymap.c create mode 100644 keyboards/werk_technica/one/keymaps/via/rules.mk create mode 100644 keyboards/werk_technica/one/mcuconf.h create mode 100644 keyboards/werk_technica/one/readme.md create mode 100644 keyboards/werk_technica/one/rules.mk diff --git a/keyboards/werk_technica/one/config.h b/keyboards/werk_technica/one/config.h new file mode 100644 index 00000000000..765e70851b4 --- /dev/null +++ b/keyboards/werk_technica/one/config.h @@ -0,0 +1,7 @@ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Set HSE clock since it differs from F411 default */ +#define STM32_HSECLK 16000000 \ No newline at end of file diff --git a/keyboards/werk_technica/one/info.json b/keyboards/werk_technica/one/info.json new file mode 100644 index 00000000000..4933c7fd7cd --- /dev/null +++ b/keyboards/werk_technica/one/info.json @@ -0,0 +1,297 @@ +{ + "manufacturer": "werk_technica", + "keyboard_name": "one", + "maintainer": "ebastler", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "B5", "pin_b": "A15"} + ] + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["A6", "A7", "B0", "B1", "B10", "B12", "B13", "B14", "B15", "A8", "A10", "A13", "A5", "A4", "C15"], + "rows": ["A0", "A1", "A2", "A3", "B9", "B8"] + }, + "processor": "STM32F411", + "url": "https://werktechnica.com/", + "usb": { + "device_version": "1.0.0", + "pid": "0x0001", + "vid": "0x7774" + }, + "layouts": { + "LAYOUT_75_ansi": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "PRSC", "matrix": [0, 13], "x": 14, "y": 0}, + {"label": "DIAL", "matrix": [3, 13], "x": 15.25, "y": 0}, + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "BKSP", "matrix": [0, 14], "x": 13, "y": 1.25, "w": 2}, + {"label": "HOME", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"label": "TAB", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\"", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "PG UP", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"label": "CAPS", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "ENTER", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "PG DN", "matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"label": "SHIFT", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "SHIFT", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "UP", "matrix": [4, 13], "x": 14.25, "y": 4.5}, + {"label": "CTRL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "SUPER", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "ALT", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "SPACE", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "ALT", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "FUNC", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5}, + {"label": "LEFT", "matrix": [5, 12], "x": 13.5, "y": 5.5}, + {"label": "DOWN", "matrix": [5, 13], "x": 14.5, "y": 5.5}, + {"label": "RIGHT", "matrix": [5, 14], "x": 15.5, "y": 5.5} + ] + }, + "LAYOUT_75_iso": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "PRSC", "matrix": [0, 13], "x": 14, "y": 0}, + {"label": "DIAL", "matrix": [3, 13], "x": 15.25, "y": 0}, + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "BKSP", "matrix": [0, 14], "x": 13, "y": 1.25, "w": 2}, + {"label": "HOME", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"label": "TAB", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "ENTER", "matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"label": "PG UP", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"label": "CAPS", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "NUHS", "matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"label": "PG DN", "matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"label": "SHIFT", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "NUBS", "matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "SHIFT", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "UP", "matrix": [4, 13], "x": 14.25, "y": 4.5}, + {"label": "CTRL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "SUPER", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "ALT", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "SPACE", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "ALT", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "FUNC", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5}, + {"label": "LEFT", "matrix": [5, 12], "x": 13.5, "y": 5.5}, + {"label": "DOWN", "matrix": [5, 13], "x": 14.5, "y": 5.5}, + {"label": "RIGHT", "matrix": [5, 14], "x": 15.5, "y": 5.5} + ] + }, + "LAYOUT_all": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "PRSC", "matrix": [0, 13], "x": 14, "y": 0}, + {"label": "DIAL", "matrix": [3, 13], "x": 15.25, "y": 0}, + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": " ", "matrix": [1, 13], "x": 13, "y": 1.25}, + {"label": "BKSP", "matrix": [0, 14], "x": 14, "y": 1.25}, + {"label": "HOME", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"label": "TAB", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\"", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "PG UP", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"label": "CAPS", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "ENTER", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "PG DN", "matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"label": "SHIFT", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "NUBS", "matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "SHIFT", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "UP", "matrix": [4, 13], "x": 14.25, "y": 4.5}, + {"label": "CTRL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "SUPER", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "ALT", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "SPACE", "matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2.75}, + {"label": "SPACE", "matrix": [5, 6], "x": 6.5, "y": 5.25, "w": 1.25}, + {"label": "SPACE", "matrix": [5, 8], "x": 7.75, "y": 5.25, "w": 2.25}, + {"label": "ALT", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "FUNC", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5}, + {"label": "LEFT", "matrix": [5, 12], "x": 13.5, "y": 5.5}, + {"label": "DOWN", "matrix": [5, 13], "x": 14.5, "y": 5.5}, + {"label": "RIGHT", "matrix": [5, 14], "x": 15.5, "y": 5.5} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/werk_technica/one/keymaps/default/keymap.c b/keyboards/werk_technica/one/keymaps/default/keymap.c new file mode 100644 index 00000000000..6d172db617e --- /dev/null +++ b/keyboards/werk_technica/one/keymaps/default/keymap.c @@ -0,0 +1,55 @@ +/* Copyright 2023 Moritz Plattner + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( /* keymap for layer 0 */ + 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_F12, KC_PSCR, LT(2, KC_MUTE), + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, LT(1, KC_APP), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_all( /* keymap for layer 1 */ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT_all( /* keymap for layer 2 */ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }, + [2] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) }, +}; +#endif diff --git a/keyboards/werk_technica/one/keymaps/default/rules.mk b/keyboards/werk_technica/one/keymaps/default/rules.mk new file mode 100644 index 00000000000..ee325681483 --- /dev/null +++ b/keyboards/werk_technica/one/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/werk_technica/one/keymaps/via/keymap.c b/keyboards/werk_technica/one/keymaps/via/keymap.c new file mode 100644 index 00000000000..6d172db617e --- /dev/null +++ b/keyboards/werk_technica/one/keymaps/via/keymap.c @@ -0,0 +1,55 @@ +/* Copyright 2023 Moritz Plattner + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( /* keymap for layer 0 */ + 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_F12, KC_PSCR, LT(2, KC_MUTE), + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, LT(1, KC_APP), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_all( /* keymap for layer 1 */ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT_all( /* keymap for layer 2 */ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }, + [2] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) }, +}; +#endif diff --git a/keyboards/werk_technica/one/keymaps/via/rules.mk b/keyboards/werk_technica/one/keymaps/via/rules.mk new file mode 100644 index 00000000000..9061429e54a --- /dev/null +++ b/keyboards/werk_technica/one/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/werk_technica/one/mcuconf.h b/keyboards/werk_technica/one/mcuconf.h new file mode 100644 index 00000000000..d25a2619fd1 --- /dev/null +++ b/keyboards/werk_technica/one/mcuconf.h @@ -0,0 +1,21 @@ +/* Copyright 2023 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 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 . + */ + +#include_next + +/* Set PLL M divider from 4 (F411 GENERIC default) to 8, because of 16 MHz crystal on board */ +#undef STM32_PLLM_VALUE +#define STM32_PLLM_VALUE 8 \ No newline at end of file diff --git a/keyboards/werk_technica/one/readme.md b/keyboards/werk_technica/one/readme.md new file mode 100644 index 00000000000..8870e5f6931 --- /dev/null +++ b/keyboards/werk_technica/one/readme.md @@ -0,0 +1,26 @@ +# werk.technica one + +![WT One Moloko](https://i.imgur.com/4Bvywra.png) + +From looks to sound and feel, Werk One was designed as a cost is no object flagship product. A modular 75% exploded profile keyboard kit with hybrid gasket mount array and AEK-styled classic side profile curve. + +In a world of minimalism, Werk One is our tribute to the sophistication of art deco and 70’s futurism. + +* Keyboard Maintainer: [ebastler](https://github.com/ebastler) +* Hardware Supported: Rev1 solder and hotswap PCB (both work with `default` and `via` keymaps, but not all keymap positions are available on hotswap PCBs) +* Hardware Availability: [Groupbuy](https://werktechnica.com/) + +Make example for this keyboard (after setting up your build environment): + + qmk compile -kb werk_technica/one -km default + +Flash example for this keyboard (after setting up your build environment): + + qmk flash -kb werk_technica/one -km default + +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). + +## Bootloader +Enter the bootloader in 2 ways: +* Bootmagic reset: Hold down the key at (0,0) in the matrix (Escape) and plug in the keyboard +* Physical reset button: Hold for approx. 1 second to enter Bootloader diff --git a/keyboards/werk_technica/one/rules.mk b/keyboards/werk_technica/one/rules.mk new file mode 100644 index 00000000000..7ff128fa692 --- /dev/null +++ b/keyboards/werk_technica/one/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From 4afbade6d122183920a888c8e6e1de4581e657fa Mon Sep 17 00:00:00 2001 From: JuanoD <3674588+JuanoD@users.noreply.github.com> Date: Fri, 22 Mar 2024 18:30:30 -0500 Subject: [PATCH 050/333] Add ES_GRV to latam language-specific keycodes (#23333) --- .../extras/keycodes_spanish_latin_america_0.0.1.hjson | 4 ++++ quantum/keymap_extras/keymap_spanish_latin_america.h | 1 + 2 files changed, 5 insertions(+) diff --git a/data/constants/keycodes/extras/keycodes_spanish_latin_america_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_spanish_latin_america_0.0.1.hjson index 50c49274be1..fb1de29e6ed 100644 --- a/data/constants/keycodes/extras/keycodes_spanish_latin_america_0.0.1.hjson +++ b/data/constants/keycodes/extras/keycodes_spanish_latin_america_0.0.1.hjson @@ -335,5 +335,9 @@ "key": "ES_CIRC", "label": "^", } + "ALGR(KC_NUHS)": { + "key": "ES_GRV", + "label": "`", + } } } \ No newline at end of file diff --git a/quantum/keymap_extras/keymap_spanish_latin_america.h b/quantum/keymap_extras/keymap_spanish_latin_america.h index 0ade8287937..2f11743061f 100644 --- a/quantum/keymap_extras/keymap_spanish_latin_america.h +++ b/quantum/keymap_extras/keymap_spanish_latin_america.h @@ -102,4 +102,5 @@ #define ES_AT ALGR(ES_Q) // @ #define ES_TILD ALGR(ES_PLUS) // ~ #define ES_CIRC ALGR(ES_LCBR) // ^ +#define ES_GRV ALGR(KC_NUHS) // ` From d0ee4a1cb26ef2aeb6f512c92c3f810c443e1ca4 Mon Sep 17 00:00:00 2001 From: Dasky <32983009+daskygit@users.noreply.github.com> Date: Sun, 24 Mar 2024 00:20:05 +0000 Subject: [PATCH 051/333] Fix rgblight init (#23335) --- quantum/rgblight/rgblight.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c index b17a501eef6..62137c020bd 100644 --- a/quantum/rgblight/rgblight.c +++ b/quantum/rgblight/rgblight.c @@ -243,12 +243,12 @@ void rgblight_init(void) { rgblight_timer_init(); // setup the timer + rgblight_driver.init(); + if (rgblight_config.enable) { rgblight_mode_noeeprom(rgblight_config.mode); } - rgblight_driver.init(); - is_rgblight_initialized = true; } @@ -1568,4 +1568,4 @@ uint8_t rgblight_velocikey_match_speed(uint8_t minValue, uint8_t maxValue) { return MAX(minValue, maxValue - (maxValue - minValue) * ((float)typing_speed / TYPING_SPEED_MAX_VALUE)); } -#endif \ No newline at end of file +#endif From 1d58530e7914919aceab10be2a8e8a290675541c Mon Sep 17 00:00:00 2001 From: Jacky <128167503+JackyJia73@users.noreply.github.com> Date: Wed, 27 Mar 2024 07:30:58 +0800 Subject: [PATCH 052/333] [Keyboard] Add T75 (#23344) Co-authored-by: Ryan Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/vertex/t75/info.json | 114 ++++++++++++++++++ keyboards/vertex/t75/keymaps/default/keymap.c | 42 +++++++ keyboards/vertex/t75/keymaps/via/keymap.c | 44 +++++++ keyboards/vertex/t75/keymaps/via/rules.mk | 2 + keyboards/vertex/t75/readme.md | 22 ++++ keyboards/vertex/t75/rules.mk | 1 + 6 files changed, 225 insertions(+) create mode 100644 keyboards/vertex/t75/info.json create mode 100644 keyboards/vertex/t75/keymaps/default/keymap.c create mode 100644 keyboards/vertex/t75/keymaps/via/keymap.c create mode 100644 keyboards/vertex/t75/keymaps/via/rules.mk create mode 100644 keyboards/vertex/t75/readme.md create mode 100644 keyboards/vertex/t75/rules.mk diff --git a/keyboards/vertex/t75/info.json b/keyboards/vertex/t75/info.json new file mode 100644 index 00000000000..82f7b7a5e86 --- /dev/null +++ b/keyboards/vertex/t75/info.json @@ -0,0 +1,114 @@ +{ + "manufacturer": "vertex", + "keyboard_name": "T75", + "board": "STM32_F103_STM32DUINO", + "bootloader": "stm32duino", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "indicators": { + "caps_lock": "B1" + }, + "matrix_pins": { + "cols": ["B0", "B2", "B10", "B11", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B12", "B13", "B14"], + "rows": ["A0", "A7", "A6", "A5", "A4", "A3"] + }, + "processor": "STM32F103", + "usb": { + "device_version": "0.0.1", + "force_nkro": true, + "pid": "0x3006", + "vid": "0x28E9" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 6], "x": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [0, 13], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 13], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4}, + {"matrix": [4, 2], "x": 3.25, "y": 4}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 5.25, "y": 4}, + {"matrix": [4, 5], "x": 6.25, "y": 4}, + {"matrix": [4, 6], "x": 7.25, "y": 4}, + {"matrix": [4, 7], "x": 8.25, "y": 4}, + {"matrix": [4, 8], "x": 9.25, "y": 4}, + {"matrix": [4, 9], "x": 10.25, "y": 4}, + {"matrix": [4, 10], "x": 11.25, "y": 4}, + {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 12], "x": 14, "y": 4}, + {"matrix": [4, 13], "x": 15, "y": 4}, + {"matrix": [5, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [5, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [5, 11], "x": 13, "y": 4}, + {"matrix": [5, 12], "x": 14, "y": 4}, + {"matrix": [5, 13], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/vertex/t75/keymaps/default/keymap.c b/keyboards/vertex/t75/keymaps/default/keymap.c new file mode 100644 index 00000000000..96aa2a2fee9 --- /dev/null +++ b/keyboards/vertex/t75/keymaps/default/keymap.c @@ -0,0 +1,42 @@ +/* Copyright 2022 vertex + * + * 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 . + */ + + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + + [0] = 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_F12, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT + + ), + [1] = LAYOUT( + _______, KC_MYCM, KC_WSCH, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + + ) +}; + \ No newline at end of file diff --git a/keyboards/vertex/t75/keymaps/via/keymap.c b/keyboards/vertex/t75/keymaps/via/keymap.c new file mode 100644 index 00000000000..16b129c64c9 --- /dev/null +++ b/keyboards/vertex/t75/keymaps/via/keymap.c @@ -0,0 +1,44 @@ +/* Copyright 2022 vertex + * + * 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 . + */ + + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + + [0] = 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_F12, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT + + ), + [1] = LAYOUT( + _______, KC_MYCM, KC_WSCH, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + + ) +}; + + + diff --git a/keyboards/vertex/t75/keymaps/via/rules.mk b/keyboards/vertex/t75/keymaps/via/rules.mk new file mode 100644 index 00000000000..43061db1dd4 --- /dev/null +++ b/keyboards/vertex/t75/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/vertex/t75/readme.md b/keyboards/vertex/t75/readme.md new file mode 100644 index 00000000000..e435d4db172 --- /dev/null +++ b/keyboards/vertex/t75/readme.md @@ -0,0 +1,22 @@ +# t75 + +* A customizable soldering 75% keyboard. + +* Keyboard Maintainer: [JACKY](https://github.com/JackyJia73) +* Hardware Supported: t75 +* Hardware Availability: [vertex-kb](https://github.com/Vertex-kb) + +Make example for this keyboard (after setting up your build environment): + + make vertex/t75:default + +Flashing example for this keyboard: + + make vertex/t75: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). + +## Bootloader Enter the bootloader in 3 ways: +* **Bootmagic reset**: Hold down Enter in the keyboard then replug +* **Physical reset button**: Briefly press the button on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` diff --git a/keyboards/vertex/t75/rules.mk b/keyboards/vertex/t75/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/vertex/t75/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 01be746fc41d7c0860df379849b5fa79ed6c5587 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 27 Mar 2024 23:41:53 +1100 Subject: [PATCH 053/333] Update I2C API usage in keyboard code (#23360) --- keyboards/bajjak/bajjak.c | 6 +++--- keyboards/bajjak/matrix.c | 2 +- keyboards/dc01/left/matrix.c | 2 +- keyboards/ergodox_ez/ergodox_ez.c | 6 +++--- keyboards/ergodox_ez/matrix.c | 2 +- keyboards/ferris/0_2/matrix.c | 8 ++++---- keyboards/gboards/ergotaco/ergotaco.c | 4 ++-- keyboards/gboards/ergotaco/matrix.c | 4 ++-- keyboards/gboards/georgi/georgi.c | 4 ++-- keyboards/gboards/georgi/matrix.c | 4 ++-- keyboards/gboards/gergo/gergo.c | 4 ++-- keyboards/gboards/gergo/matrix.c | 4 ++-- keyboards/gboards/gergoplex/gergoplex.c | 4 ++-- keyboards/gboards/gergoplex/matrix.c | 2 +- keyboards/handwired/frenchdev/frenchdev.c | 4 ++-- keyboards/handwired/frenchdev/matrix.c | 6 +++--- keyboards/handwired/pterodactyl/matrix.c | 10 +++++----- keyboards/hotdox/left.c | 4 ++-- keyboards/system76/launch_1/usb_mux.c | 2 +- platforms/chibios/drivers/i2c_master.c | 2 +- 20 files changed, 42 insertions(+), 42 deletions(-) diff --git a/keyboards/bajjak/bajjak.c b/keyboards/bajjak/bajjak.c index e6102e817b0..6689a6ba2c7 100644 --- a/keyboards/bajjak/bajjak.c +++ b/keyboards/bajjak/bajjak.c @@ -138,14 +138,14 @@ uint8_t init_mcp23018(void) { // - input : input : 1 // - driving : output : 0 uint8_t data[] = {0b00000000, 0b00111111}; - mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, 2, BAJJAK_EZ_I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, data, 2, BAJJAK_EZ_I2C_TIMEOUT); if (!mcp23018_status) { // set pull-up // - unused : on : 1 // - input : on : 1 // - driving : off : 0 - mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, 2, BAJJAK_EZ_I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, data, 2, BAJJAK_EZ_I2C_TIMEOUT); } #ifdef LEFT_LEDS @@ -172,7 +172,7 @@ uint8_t bajjak_left_leds_update(void) { uint8_t data[2]; data[0] = 0b11111111 & ~(bajjak_left_led_1<= 0; i++) { //assemble slave matrix in main matrix matrix[i] &= mask; //mask bits to keep diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c index 3d6272ae667..5270738f86d 100644 --- a/keyboards/ergodox_ez/ergodox_ez.c +++ b/keyboards/ergodox_ez/ergodox_ez.c @@ -156,14 +156,14 @@ uint8_t init_mcp23018(void) { // - input : input : 1 // - driving : output : 0 uint8_t data[] = {0b00000000, 0b00111111}; - mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, 2, ERGODOX_EZ_I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, data, 2, ERGODOX_EZ_I2C_TIMEOUT); if (!mcp23018_status) { // set pull-up // - unused : on : 1 // - input : on : 1 // - driving : off : 0 - mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, 2, ERGODOX_EZ_I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, GPPUA, data, 2, ERGODOX_EZ_I2C_TIMEOUT); } #ifdef LEFT_LEDS @@ -191,7 +191,7 @@ uint8_t ergodox_left_leds_update(void) { uint8_t data[2]; data[0] = 0b11111111 & ~(ergodox_left_led_3 << LEFT_LED_3_SHIFT); data[1] = 0b11111111 & ~(ergodox_left_led_2 << LEFT_LED_2_SHIFT) & ~(ergodox_left_led_1 << LEFT_LED_1_SHIFT); - mcp23018_status = i2c_writeReg(I2C_ADDR, OLATA, data, 2, ERGODOX_EZ_I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, OLATA, data, 2, ERGODOX_EZ_I2C_TIMEOUT); return mcp23018_status; } diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c index 28bee05779c..9013c0785f8 100644 --- a/keyboards/ergodox_ez/matrix.c +++ b/keyboards/ergodox_ez/matrix.c @@ -193,7 +193,7 @@ static void select_row(uint8_t row) { // set other rows hi-Z : 1 uint8_t data; data = 0xFF & ~(1 << row); - mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, ERGODOX_EZ_I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, GPIOA, &data, 1, ERGODOX_EZ_I2C_TIMEOUT); } } else { // select on teensy diff --git a/keyboards/ferris/0_2/matrix.c b/keyboards/ferris/0_2/matrix.c index cf26385f4c8..41b100b659a 100644 --- a/keyboards/ferris/0_2/matrix.c +++ b/keyboards/ferris/0_2/matrix.c @@ -77,7 +77,7 @@ uint8_t init_mcp23017(void) { // This means: we will write to the pins 0-4 on GPIOB (in select_rows) uint8_t buf[] = {0b11111111, 0b11110000}; print("before transmit\n"); - mcp23017_status = i2c_writeReg(I2C_ADDR, IODIRA, buf, sizeof(buf), MCP23017_I2C_TIMEOUT) + mcp23017_status = i2c_write_register(I2C_ADDR, IODIRA, buf, sizeof(buf), MCP23017_I2C_TIMEOUT); uprintf("after transmit %i\n", mcp23017_status); if (!mcp23017_status) { // set pull-up @@ -86,7 +86,7 @@ uint8_t init_mcp23017(void) { // - driving : off : 0 // This means: we will read all the bits on GPIOA // This means: we will write to the pins 0-4 on GPIOB (in select_rows) - mcp23017_status = i2c_writeReg(I2C_ADDR, GPPUA, buf, sizeof(buf), MCP23017_I2C_TIMEOUT) + mcp23017_status = i2c_write_register(I2C_ADDR, GPPUA, buf, sizeof(buf), MCP23017_I2C_TIMEOUT); uprintf("after transmit2 %i\n", mcp23017_status); } return mcp23017_status; @@ -191,7 +191,7 @@ static matrix_row_t read_cols(uint8_t row) { // The return value is a row as represented in the generic matrix code were the rightmost bits represent the lower columns and zeroes represent non-depressed keys while ones represent depressed keys. // Since the pins connected to eact columns are sequential, and counting from zero up (col 5 -> GPIOA0, col 6 -> GPIOA1 and so on), the only transformation needed is a bitwise not to swap all zeroes and ones. uint8_t data[] = {0}; - mcp23017_status = i2c_readReg(I2C_ADDR, MCP23017_GPIOA, data, sizeof(data), MCP23017_I2C_TIMEOUT); + mcp23017_status = i2c_read_register(I2C_ADDR, MCP23017_GPIOA, data, sizeof(data), MCP23017_I2C_TIMEOUT); return ~data[0]; } } @@ -237,7 +237,7 @@ static void select_row(uint8_t row) { // Select the desired row by writing a byte for the entire GPIOB bus where only the bit representing the row we want to select is a zero (write instruction) and every other bit is a one. // Note that the row - MATRIX_ROWS_PER_SIDE reflects the fact that being on the right hand, the columns are numbered from MATRIX_ROWS_PER_SIDE to MATRIX_ROWS, but the pins we want to write to are indexed from zero up on the GPIOB bus. uint8_t buf[] = {0xFF & ~(1 << (row - MATRIX_ROWS_PER_SIDE))}; - mcp23017_status = i2c_writeReg(I2C_ADDR, MCP23017_GPIOB, buf, sizeof(buf), MCP23017_I2C_TIMEOUT); + mcp23017_status = i2c_write_register(I2C_ADDR, MCP23017_GPIOB, buf, sizeof(buf), MCP23017_I2C_TIMEOUT); } } } diff --git a/keyboards/gboards/ergotaco/ergotaco.c b/keyboards/gboards/ergotaco/ergotaco.c index 694e07f0314..6795dfde4f2 100644 --- a/keyboards/gboards/ergotaco/ergotaco.c +++ b/keyboards/gboards/ergotaco/ergotaco.c @@ -50,14 +50,14 @@ uint8_t init_mcp23018(void) { // - input : input : 1 // - driving : output : 0 uint8_t data[] = {0b00000000, 0b00111111}; - mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, sizeof(data), ERGODOX_EZ_I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, data, sizeof(data), ERGODOX_EZ_I2C_TIMEOUT); if (!mcp23018_status) { // set pull-up // - unused : on : 1 // - input : on : 1 // - driving : off : 0 - mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, sizeof(data), ERGODOX_EZ_I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, GPPUA, data, sizeof(data), ERGODOX_EZ_I2C_TIMEOUT); } // SREG=sreg_prev; diff --git a/keyboards/gboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c index 3c49f2802ea..40299f958e6 100644 --- a/keyboards/gboards/ergotaco/matrix.c +++ b/keyboards/gboards/ergotaco/matrix.c @@ -234,7 +234,7 @@ static matrix_row_t read_cols(uint8_t row) return 0; } else { uint8_t data = 0; - mcp23018_status = i2c_readReg(I2C_ADDR, GPIOB, &data, 1, ERGODOX_EZ_I2C_TIMEOUT); + mcp23018_status = i2c_read_register(I2C_ADDR, GPIOB, &data, 1, ERGODOX_EZ_I2C_TIMEOUT); data = (~((uint8_t)data) >> 2) & 0x01 ; #ifdef DEBUG_MATRIX if (data != 0x00) xprintf("I2C: %d\n", data); @@ -268,7 +268,7 @@ static void select_row(uint8_t row) // Read using bitmask } else { // set active row low : 0 // set other rows hi-Z : 1 uint8_t data = ~(1<addr << 1), read, data_with_buffer_length, length, I2C_TIMEOUT); + status = i2c_read_register16((self->addr << 1), read, data_with_buffer_length, length, I2C_TIMEOUT); for (uint16_t i = 0; i < (length - 1) && status >= 0; i++) { data[i] = data_with_buffer_length[i+1]; diff --git a/platforms/chibios/drivers/i2c_master.c b/platforms/chibios/drivers/i2c_master.c index ad11d850dd7..0d5fb1e9853 100644 --- a/platforms/chibios/drivers/i2c_master.c +++ b/platforms/chibios/drivers/i2c_master.c @@ -206,5 +206,5 @@ __attribute__((weak)) i2c_status_t i2c_ping_address(uint8_t address, uint16_t ti // Best effort instead tries reading register 0 which will either succeed or timeout. // This approach may produce false negative results for I2C devices that do not respond to a register 0 read request. uint8_t data = 0; - return i2c_readReg(address, 0, &data, sizeof(data), timeout); + return i2c_read_register(address, 0, &data, sizeof(data), timeout); } \ No newline at end of file From c035a37249ed064edbd51379bb45057e88e7ef11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 20:55:32 +0000 Subject: [PATCH 054/333] Bump tj-actions/changed-files from 43 to 44 (#23369) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/format.yml | 2 +- .github/workflows/lint.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index a7d3d40974f..1d7577dcef2 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -35,7 +35,7 @@ jobs: - name: Get changed files id: file_changes - uses: tj-actions/changed-files@v43 + uses: tj-actions/changed-files@v44 with: use_rest_api: true diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 290f5b66ebe..22ddcaba796 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -27,7 +27,7 @@ jobs: - name: Get changed files id: file_changes - uses: tj-actions/changed-files@v43 + uses: tj-actions/changed-files@v44 with: use_rest_api: true From 4cd92cac1ca61d67318a145ea504f3c22aefd0fb Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Thu, 28 Mar 2024 21:21:49 -0400 Subject: [PATCH 055/333] [Keyboard] mechwild/bb40 (#22958) Co-authored-by: Kyle McCreery --- keyboards/mechwild/bb40/f401/info.json | 3 + keyboards/mechwild/bb40/f401/rules.mk | 1 + keyboards/mechwild/bb40/f411/info.json | 3 + keyboards/mechwild/bb40/f411/rules.mk | 1 + keyboards/mechwild/bb40/info.json | 133 ++++++++++++++++++ .../mechwild/bb40/keymaps/default/keymap.json | 42 ++++++ keyboards/mechwild/bb40/readme.md | 23 +++ 7 files changed, 206 insertions(+) create mode 100644 keyboards/mechwild/bb40/f401/info.json create mode 100644 keyboards/mechwild/bb40/f401/rules.mk create mode 100644 keyboards/mechwild/bb40/f411/info.json create mode 100644 keyboards/mechwild/bb40/f411/rules.mk create mode 100644 keyboards/mechwild/bb40/info.json create mode 100644 keyboards/mechwild/bb40/keymaps/default/keymap.json create mode 100644 keyboards/mechwild/bb40/readme.md diff --git a/keyboards/mechwild/bb40/f401/info.json b/keyboards/mechwild/bb40/f401/info.json new file mode 100644 index 00000000000..797e9900595 --- /dev/null +++ b/keyboards/mechwild/bb40/f401/info.json @@ -0,0 +1,3 @@ +{ + "development_board": "blackpill_f401" +} diff --git a/keyboards/mechwild/bb40/f401/rules.mk b/keyboards/mechwild/bb40/f401/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/mechwild/bb40/f401/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/mechwild/bb40/f411/info.json b/keyboards/mechwild/bb40/f411/info.json new file mode 100644 index 00000000000..a41c5f4dd14 --- /dev/null +++ b/keyboards/mechwild/bb40/f411/info.json @@ -0,0 +1,3 @@ +{ + "development_board": "blackpill_f411" +} diff --git a/keyboards/mechwild/bb40/f411/rules.mk b/keyboards/mechwild/bb40/f411/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/mechwild/bb40/f411/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/mechwild/bb40/info.json b/keyboards/mechwild/bb40/info.json new file mode 100644 index 00000000000..15a16fbfede --- /dev/null +++ b/keyboards/mechwild/bb40/info.json @@ -0,0 +1,133 @@ +{ + "manufacturer": "MechWild", + "keyboard_name": "BB40", + "maintainer": "kylemccreery", + "bootloader_instructions": "Hold down the BOOT button, then tap the NRST button on the BlackPill. Avoid touching the A11 and A12 pins.", + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "B4", "pin_b": "B3"} + ] + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "indicators": { + "caps_lock": "B8", + "num_lock": "B7", + "scroll_lock": "B9" + }, + "matrix_pins": { + "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15"], + "rows": ["B12", "B13", "B14", "B15"] + }, + "url": "https://mechwild.com/product/bb40/", + "usb": { + "device_version": "1.0.0", + "pid": "0x1714", + "vid": "0x6D77" + }, + "layout_aliases": { + "LAYOUT": "LAYOUT_all" + }, + "layouts": { + "LAYOUT_6u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2, "w": 1.25}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 6], "x": 3, "y": 3, "w": 6}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12.5, "y": 3, "encoder": 0} + ] + }, + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2, "w": 1.25}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 4], "x": 3, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 5.25, "y": 3}, + {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.75}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12.5, "y": 3, "encoder": 0} + ] + } + } +} diff --git a/keyboards/mechwild/bb40/keymaps/default/keymap.json b/keyboards/mechwild/bb40/keymaps/default/keymap.json new file mode 100644 index 00000000000..104e42483c2 --- /dev/null +++ b/keyboards/mechwild/bb40/keymaps/default/keymap.json @@ -0,0 +1,42 @@ +{ + "keyboard": "mechwild/bb40", + "keymap": "default", + "version": 1, + "layout": "LAYOUT_all", + "layers": [ + [ + "KC_ESC", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_BSPC", + "MO(1)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_ENT", + "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "RSFT_T(KC_COMM)", "KC_UP", "LT(2,KC_DOT)", + "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "LT(1,KC_SPC)", "KC_SPC", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_MUTE" + ], + [ + "KC_TRNS", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_TRNS", + "KC_TRNS", "KC_GRV", "KC_LBRC", "KC_RBRC", "KC_MINS", "KC_TRNS", "KC_TRNS", "KC_EQL", "KC_BSLS", "KC_SCLN", "KC_QUOT", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_SLSH", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS" + ], + [ + "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", + "KC_CAPS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS" + ] + ], + "config": { + "features": { + "encoder_map": true + } + }, + "encoders": [ + [ + {"ccw": "KC_VOLD", "cw": "KC_VOLU"} + ], + [ + {"ccw": "KC_TRNS", "cw": "KC_TRNS"} + ], + [ + {"ccw": "KC_TRNS", "cw": "KC_TRNS"} + ] + ] +} diff --git a/keyboards/mechwild/bb40/readme.md b/keyboards/mechwild/bb40/readme.md new file mode 100644 index 00000000000..aac52b072bf --- /dev/null +++ b/keyboards/mechwild/bb40/readme.md @@ -0,0 +1,23 @@ +# BB40 + +![BB40](https://i.imgur.com/iikCpBuh.png) + +A completely normal BlackPill-powered 40% DIY kit. + +The `f401` version is the standard for this kit, using an STM32F401 BlackPill. The `f411` version will not run on an STM32F401 BlackPill; if in doubt, use `f401`. + +* Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery) +* Hardware Supported: BB40 v1.0 +* Hardware Availability: [BB40 on MechWild](https://mechwild.com/product/bb40/) + +Make example for this keyboard (after setting up your build environment): + + make mechwild/bb40/f401:default + make mechwild/bb40/f411:default + +Flashing example for this keyboard: + + make mechwild/bb40/f401:default:flash + make mechwild/bb40/f411: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). From e44cbf75562243f68be2a0e5da02bd032df98b3b Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Fri, 29 Mar 2024 04:22:41 +0100 Subject: [PATCH 056/333] [Keyboard] Bartlesplit (#23114) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis Co-authored-by: Drashna Jaelre --- keyboards/minimon/bartlesplit/config.h | 20 +++ keyboards/minimon/bartlesplit/info.json | 114 ++++++++++++++ .../bartlesplit/keymaps/default/keymap.json | 33 ++++ keyboards/minimon/bartlesplit/matrix.c | 148 ++++++++++++++++++ keyboards/minimon/bartlesplit/readme.md | 31 ++++ keyboards/minimon/bartlesplit/rules.mk | 2 + keyboards/minimon/readme.md | 1 + 7 files changed, 349 insertions(+) create mode 100644 keyboards/minimon/bartlesplit/config.h create mode 100644 keyboards/minimon/bartlesplit/info.json create mode 100644 keyboards/minimon/bartlesplit/keymaps/default/keymap.json create mode 100644 keyboards/minimon/bartlesplit/matrix.c create mode 100644 keyboards/minimon/bartlesplit/readme.md create mode 100644 keyboards/minimon/bartlesplit/rules.mk diff --git a/keyboards/minimon/bartlesplit/config.h b/keyboards/minimon/bartlesplit/config.h new file mode 100644 index 00000000000..e4ca83f5e98 --- /dev/null +++ b/keyboards/minimon/bartlesplit/config.h @@ -0,0 +1,20 @@ +/* +Copyright 2019-2023 e3w2q Kyrremann + +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 + +#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD diff --git a/keyboards/minimon/bartlesplit/info.json b/keyboards/minimon/bartlesplit/info.json new file mode 100644 index 00000000000..83f93560b6e --- /dev/null +++ b/keyboards/minimon/bartlesplit/info.json @@ -0,0 +1,114 @@ +{ + "keyboard_name": "Bartlesplit", + "development_board": "promicro", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "caps_word": true + }, + "matrix_pins": { + "cols": ["B3", "B3", "B1", "B1", "F7", "F7", "E6", "E6", "D7", "D7", "C6", "C6"], + "rows": ["B5", "B4", "B2", "B6"] + }, + "pin_compatible": "promicro", + "url": "https://github.com/Kyrremann/bartlesplit", + "usb": { + "device_version": "1.0.0", + "pid": "0x1306", + "vid": "0x4B49" + }, + "community_layouts": ["split_3x6_3", "split_3x5_3"], + "layouts": { + "LAYOUT_split_3x5_3": { + "layout": [ + {"matrix": [0, 4], "x": 0, "y": 0.5}, + {"matrix": [0, 3], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 1], "x": 3, "y": 0.25}, + {"matrix": [0, 0], "x": 4, "y": 0.25}, + {"matrix": [0, 6], "x": 6.5, "y": 0.25}, + {"matrix": [0, 7], "x": 7.5, "y": 0.25}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0.25}, + {"matrix": [0, 10], "x": 10.5, "y": 0.5}, + {"matrix": [1, 4], "x": 0, "y": 1.5}, + {"matrix": [1, 3], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 1], "x": 3, "y": 1.25}, + {"matrix": [1, 0], "x": 4, "y": 1.25}, + {"matrix": [1, 6], "x": 6.5, "y": 1.25}, + {"matrix": [1, 7], "x": 7.5, "y": 1.25}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1.25}, + {"matrix": [1, 10], "x": 10.5, "y": 1.5}, + {"matrix": [2, 4], "x": 0, "y": 2.5}, + {"matrix": [2, 3], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 1], "x": 3, "y": 2.25}, + {"matrix": [2, 0], "x": 4, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [3, 1], "x": 2.5, "y": 3.25}, + {"matrix": [3, 0], "x": 3.5, "y": 3.25}, + {"matrix": [3, 3], "x": 4.5, "y": 3.5}, + {"matrix": [3, 6], "x": 6, "y": 3.5}, + {"matrix": [3, 7], "x": 7, "y": 3.25}, + {"matrix": [3, 8], "x": 8, "y": 3.25} + ] + }, + "LAYOUT_split_3x6_3": { + "layout": [ + {"matrix": [0, 5], "x": 0, "y": 0.25}, + {"matrix": [0, 4], "x": 1, "y": 0.125}, + {"matrix": [0, 3], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0.125}, + {"matrix": [0, 1], "x": 4, "y": 0.25}, + {"matrix": [0, 0], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 7, "y": 0.25}, + {"matrix": [0, 7], "x": 8, "y": 0.125}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0.125}, + {"matrix": [0, 10], "x": 11, "y": 0.25}, + {"matrix": [0, 11], "x": 12, "y": 0.25}, + {"matrix": [1, 5], "x": 0, "y": 1.25}, + {"matrix": [1, 4], "x": 1, "y": 1.125}, + {"matrix": [1, 3], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1.125}, + {"matrix": [1, 1], "x": 4, "y": 1.25}, + {"matrix": [1, 0], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 7, "y": 1.25}, + {"matrix": [1, 7], "x": 8, "y": 1.125}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1.125}, + {"matrix": [1, 10], "x": 11, "y": 1.25}, + {"matrix": [1, 11], "x": 12, "y": 1.25}, + {"matrix": [2, 5], "x": 0, "y": 2.25}, + {"matrix": [2, 4], "x": 1, "y": 2.125}, + {"matrix": [2, 3], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2.125}, + {"matrix": [2, 1], "x": 4, "y": 2.25}, + {"matrix": [2, 0], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 7, "y": 2.25}, + {"matrix": [2, 7], "x": 8, "y": 2.125}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2.125}, + {"matrix": [2, 10], "x": 11, "y": 2.25}, + {"matrix": [2, 11], "x": 12, "y": 2.25}, + {"matrix": [3, 1], "x": 3.5, "y": 3.25}, + {"matrix": [3, 0], "x": 4.5, "y": 3.5}, + {"matrix": [3, 3], "x": 5.5, "y": 3.75}, + {"matrix": [3, 6], "x": 6.5, "y": 3.75}, + {"matrix": [3, 7], "x": 7.5, "y": 3.5}, + {"matrix": [3, 8], "x": 8.5, "y": 3.25} + ] + } + } +} diff --git a/keyboards/minimon/bartlesplit/keymaps/default/keymap.json b/keyboards/minimon/bartlesplit/keymaps/default/keymap.json new file mode 100644 index 00000000000..03a5762839c --- /dev/null +++ b/keyboards/minimon/bartlesplit/keymaps/default/keymap.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "notes": "Bartlesplit default keymap", + "keyboard": "minimon/bartlesplit", + "keymap": "default", + "layout": "LAYOUT_split_3x6_3", + "layers": [ + [ + "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", + "KC_LCTL", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", + "LSFT_T(KC_ESC)", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "RSFT_T(KC_ESC)", + "KC_LALT", "KC_LGUI", "LT(2,KC_SPC)", "KC_ENT", "MO(1)", "KC_BSPC" + ], + [ + "KC_NUBS", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", + "KC_TRNS", "LSFT(KC_1)", "LSFT(KC_2)", "LSFT(KC_3)", "LSFT(KC_4)", "LSFT(KC_5)", "LSFT(KC_6)", "LSFT(KC_7)", "LSFT(KC_8)", "LSFT(KC_9)", "LSFT(KC_0)", "LSFT(KC_MINS)", + "KC_TRNS", "KC_GRV", "KC_TRNS", "LSFT(KC_EQL)", "LSFT(KC_RBRC)", "LSFT(KC_BSLS)", "KC_BSLS", "KC_RBRC", "KC_EQL", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_RALT", "KC_TRNS", "KC_ESC", "KC_TRNS", "KC_TRNS", "KC_DEL" + ], + [ + "KC_ESC", "KC_NO", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_NO", "KC_NO", "KC_UP", "KC_NO", "KC_KB_VOLUME_UP", "KC_MEDIA_PLAY_PAUSE", + "KC_TRNS", "KC_NO", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_NO", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_KB_VOLUME_DOWN", "KC_NO", + "KC_TRNS", "KC_NO", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_LCBR", "RALT(KC_8)", "RALT(KC_9)", "KC_RCBR", "KC_NO", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS" + ], + [ + "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", + "KC_LCTL", "LGUI_T(KC_A)", "LALT_T(KC_S)", "LCTL_T(KC_D)", "LSFT_T(KC_F)", "KC_G", "KC_H", "RSFT_T(KC_J)", "LCTL_T(KC_K)", "LALT_T(KC_L)", "LGUI_T(KC_SCLN)", "KC_QUOT", + "LSFT_T(KC_ESC)", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "RSFT_T(KC_ESC)", + "KC_LALT", "KC_LGUI", "LT(2,KC_SPC)", "KC_ENT", "MO(1)", "KC_BSPC" + ] + ] +} diff --git a/keyboards/minimon/bartlesplit/matrix.c b/keyboards/minimon/bartlesplit/matrix.c new file mode 100644 index 00000000000..351781f5207 --- /dev/null +++ b/keyboards/minimon/bartlesplit/matrix.c @@ -0,0 +1,148 @@ +/* +Copyright 2012-2023 Jun Wako Kyrremann +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 . + + Copied from here: https://github.com/e3w2q/qmk_firmware/blob/762fe3e0a7cbea768245a75520f06ff5a2f00b9f/keyboards/2x3test/matrix.c +*/ + +/* + * scan matrix + */ +#include +#include +#include "wait.h" +#include "util.h" +#include "matrix.h" +#include "quantum.h" + +#define ROW_SHIFTER ((uint16_t)1) + +static const pin_t row_pins[] = MATRIX_ROW_PINS; +static const pin_t col_pins[] = MATRIX_COL_PINS; + +static void select_row(uint8_t row) { + setPinOutput(row_pins[row]); + writePinLow(row_pins[row]); +} + +static void unselect_row(uint8_t row) { + setPinInputHigh(row_pins[row]); +} + +static void unselect_rows(void) { + for (uint8_t x = 0; x < MATRIX_ROWS; x++) { + setPinInputHigh(row_pins[x]); + } +} + +static void select_col(uint8_t col) { + setPinOutput(col_pins[col]); + writePinLow(col_pins[col]); +} + +static void unselect_col(uint8_t col) { + setPinInputHigh(col_pins[col]); +} + +static void unselect_cols(void) { + for (uint8_t x = 0; x < MATRIX_COLS/2; x++) { + setPinInputHigh(col_pins[x*2]); + } +} + +static void init_pins(void) { + unselect_cols(); + unselect_rows(); +} + +static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) { + // Store last value of row prior to reading + matrix_row_t last_row_value = current_matrix[current_row]; + + // Select row and wait for row selection to stabilize + select_row(current_row); + wait_us(30); + + // For each col... + for (uint8_t col_index = 0; col_index < MATRIX_COLS / 2; col_index++) { + uint16_t column_index_bitmask = ROW_SHIFTER << ((col_index * 2) + 1); + // Check row pin state + if (readPin(col_pins[col_index*2])) { + // Pin HI, clear col bit + current_matrix[current_row] &= ~column_index_bitmask; + } else { + // Pin LO, set col bit + current_matrix[current_row] |= column_index_bitmask; + } + } + + // Unselect row + unselect_row(current_row); + + return (last_row_value != current_matrix[current_row]); +} + +static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { + bool matrix_changed = false; + + // Select col and wait for col selection to stabilize + select_col(current_col*2); + wait_us(30); + + // For each row... + for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { + // Store last value of row prior to reading + matrix_row_t last_row_value = current_matrix[row_index]; + + uint16_t column_index_bitmask = ROW_SHIFTER << (current_col * 2); + // Check row pin state + if (readPin(row_pins[row_index])) { + // Pin HI, clear col bit + current_matrix[row_index] &= ~column_index_bitmask; + } else { + // Pin LO, set col bit + current_matrix[row_index] |= column_index_bitmask; + } + + // Determine if the matrix changed state + if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) { + matrix_changed = true; + } + } + + // Unselect col + unselect_col(current_col*2); + + return matrix_changed; +} + + +void matrix_init_custom(void) { + // initialize key pins + init_pins(); +} + +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + + bool changed = false; + + // Set row, read cols + for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) { + changed |= read_cols_on_row(current_matrix, current_row); + } + // Set col, read rows + for (uint8_t current_col = 0; current_col < MATRIX_COLS/2; current_col++) { + changed |= read_rows_on_col(current_matrix, current_col); + } + + return changed; +} diff --git a/keyboards/minimon/bartlesplit/readme.md b/keyboards/minimon/bartlesplit/readme.md new file mode 100644 index 00000000000..c7109ddf47b --- /dev/null +++ b/keyboards/minimon/bartlesplit/readme.md @@ -0,0 +1,31 @@ +# Bartlesplitt + +![Bartlesplit with the hub in the 3x6 setup](https://i.imgur.com/IoMpwylh.png) + +Bartlesplit is based on [Cheapino](https://github.com/tompi/cheapino) by Tompi. +The original idea was to build a Cheapino with hot swaps, but it evolved into something more! + +At the same time I was working on Bartlesplit, a friend of mine suggested that we try to make a splithub, letting us avoid having the Pro Micro directly on the board. +This is mostly a design choice, making each split less clutered. +We have called the hub [The Japanese Connection](https://github.com/Kyrremann/the-japanese-connection) since it's relying on the Japanese duplex matrix. + +One of the main feature of the board is the built-in tenting, so you don't need to make a case to get simple tenting. + + +* Keyboard Maintainer: [Kyrre Havik](https://github.com/Kyrremann) +* Hardware Supported: Rev 1, Pro Micro +* Hardware Availability: https://github.com/Kyrremann/bartlesplit + +Make example for this keyboard (after setting up your build environment): + + make minimon/bartlesplit:default + +Flashing example for this keyboard: + + make minimon/bartlesplit: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). + +## Bootloader + +Enter the bootloader in shorting the reset pin on Pro Micro on the hub. diff --git a/keyboards/minimon/bartlesplit/rules.mk b/keyboards/minimon/bartlesplit/rules.mk new file mode 100644 index 00000000000..30ce5d293b7 --- /dev/null +++ b/keyboards/minimon/bartlesplit/rules.mk @@ -0,0 +1,2 @@ +CUSTOM_MATRIX = lite +SRC += matrix.c diff --git a/keyboards/minimon/readme.md b/keyboards/minimon/readme.md index cd020a11108..807e4a7c52c 100644 --- a/keyboards/minimon/readme.md +++ b/keyboards/minimon/readme.md @@ -7,3 +7,4 @@ Maintained by [Kyrremann](https://github.com/Kyrremann). ## Keyboards * [Index Tab](index_tab/) - 13x6 ortho keyboard +* [Bartlesplit](bartlesplit/) - 42 (36) split board with Pro Micro hub From 06cb2836042b2f2338eba1a8c7fb77d287123fae Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Fri, 29 Mar 2024 11:33:00 +0800 Subject: [PATCH 057/333] [Keyboard] Add haven60 (#23062) Co-authored-by: Joel Challis Co-authored-by: Drashna Jaelre Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan Co-authored-by: Duncan Sutherland --- keyboards/ah/haven60/haven60.c | 46 ++ keyboards/ah/haven60/info.json | 699 ++++++++++++++++++ keyboards/ah/haven60/keymaps/default/keymap.c | 21 + keyboards/ah/haven60/keymaps/via/keymap.c | 21 + keyboards/ah/haven60/keymaps/via/rules.mk | 1 + keyboards/ah/haven60/readme.md | 28 + keyboards/ah/haven60/rules.mk | 1 + 7 files changed, 817 insertions(+) create mode 100644 keyboards/ah/haven60/haven60.c create mode 100644 keyboards/ah/haven60/info.json create mode 100644 keyboards/ah/haven60/keymaps/default/keymap.c create mode 100644 keyboards/ah/haven60/keymaps/via/keymap.c create mode 100644 keyboards/ah/haven60/keymaps/via/rules.mk create mode 100644 keyboards/ah/haven60/readme.md create mode 100644 keyboards/ah/haven60/rules.mk diff --git a/keyboards/ah/haven60/haven60.c b/keyboards/ah/haven60/haven60.c new file mode 100644 index 00000000000..dce612f4e4d --- /dev/null +++ b/keyboards/ah/haven60/haven60.c @@ -0,0 +1,46 @@ +/* Copyright 2023 CMM.S Freather + * + * 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 . + */ + +#include "quantum.h" + +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 13, HSV_WHITE} +); + +const rgblight_segment_t PROGMEM my_capsoff_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 1, HSV_BLACK} +); + +// Now define the array of layers. Later layers take precedence +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( + my_capslock_layer, + my_capsoff_layer +); + + +void keyboard_post_init_kb(void){ + rgblight_layers = my_rgb_layers; + keyboard_post_init_user(); +} + +bool led_update_kb(led_t led_state){ + bool res = led_update_user(led_state); + if (res) { + rgblight_set_layer_state(0, led_state.caps_lock); + rgblight_set_layer_state(1, !led_state.caps_lock); + } + return res; +} diff --git a/keyboards/ah/haven60/info.json b/keyboards/ah/haven60/info.json new file mode 100644 index 00000000000..a9c2afb0b37 --- /dev/null +++ b/keyboards/ah/haven60/info.json @@ -0,0 +1,699 @@ +{ + "manufacturer": "Freather", + "keyboard_name": "Atelier_Haven Haven60", + "maintainer": "Freather", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "matrix_pins": { + "cols": ["C7", "D4", "D6", "D7", "B4", "B5", "B6", "D5", "D3", "D2", "D1", "D0", "B1", "B0"], + "rows": ["F0", "E6", "C6", "F4", "F1"] + }, + "processor": "atmega32u4", + "url": "https://keyspensory.store/products", + "usb": { + "device_version": "1.0.0", + "pid": "0x4660", + "vid": "0x4446" + }, + "ws2812": { + "pin": "F5" + }, + "rgblight": { + "led_count": 13, + "saturation_steps": 8, + "brightness_steps": 8, + "sleep": true, + "max_brightness": 125, + "layers": { + "enabled": true + }, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, + "community_layouts": ["60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"], + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_tsangan_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_iso_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + } + } +} diff --git a/keyboards/ah/haven60/keymaps/default/keymap.c b/keyboards/ah/haven60/keymaps/default/keymap.c new file mode 100644 index 00000000000..8909239a2c8 --- /dev/null +++ b/keyboards/ah/haven60/keymaps/default/keymap.c @@ -0,0 +1,21 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL + ), + [1] = LAYOUT_all( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/ah/haven60/keymaps/via/keymap.c b/keyboards/ah/haven60/keymaps/via/keymap.c new file mode 100644 index 00000000000..8909239a2c8 --- /dev/null +++ b/keyboards/ah/haven60/keymaps/via/keymap.c @@ -0,0 +1,21 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL + ), + [1] = LAYOUT_all( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/ah/haven60/keymaps/via/rules.mk b/keyboards/ah/haven60/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/ah/haven60/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/ah/haven60/readme.md b/keyboards/ah/haven60/readme.md new file mode 100644 index 00000000000..c529ec1a73a --- /dev/null +++ b/keyboards/ah/haven60/readme.md @@ -0,0 +1,28 @@ +# haven60 + +![haven60](https://i.imgur.com/Uja750Oh.png) + +Haven60 PCB for Atelier Haven Haven60% keyboard +both hotswap and solder pcbs use same firmware + +* Keyboard Maintainer: [Freather](https://github.com/Freather) +* Hardware Supported: atmega32u4-mu +* Hardware Availability: keyspensory.store + +Make example for this keyboard (after setting up your build environment): + + make ah/haven60:default + +Flashing example for this keyboard: + + make ah/haven60: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/ah/haven60/rules.mk b/keyboards/ah/haven60/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/ah/haven60/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 42a725e355e64d170fc42738ddbb1ed1128892e9 Mon Sep 17 00:00:00 2001 From: Robin Carlier <57142648+robin-carlier@users.noreply.github.com> Date: Fri, 29 Mar 2024 04:40:41 +0100 Subject: [PATCH 058/333] Remove midi_ep_task from ChibiOS (#23162) Co-authored-by: Joel Challis --- tmk_core/protocol/chibios/chibios.c | 7 ------- tmk_core/protocol/chibios/usb_main.c | 9 --------- 2 files changed, 16 deletions(-) diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c index 360e6b4b046..a02097785f4 100644 --- a/tmk_core/protocol/chibios/chibios.c +++ b/tmk_core/protocol/chibios/chibios.c @@ -70,10 +70,6 @@ host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_nkro, send_mo void virtser_task(void); #endif -#ifdef MIDI_ENABLE -void midi_ep_task(void); -#endif - /* TESTING * Amber LED blinker thread, times are in milliseconds. */ @@ -202,9 +198,6 @@ void protocol_pre_task(void) { } void protocol_post_task(void) { -#ifdef MIDI_ENABLE - midi_ep_task(); -#endif #ifdef VIRTSER_ENABLE virtser_task(); #endif diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c index ced5fd4fc27..2024a3bc7f2 100644 --- a/tmk_core/protocol/chibios/usb_main.c +++ b/tmk_core/protocol/chibios/usb_main.c @@ -561,15 +561,6 @@ bool recv_midi_packet(MIDI_EventPacket_t *const event) { return receive_report(USB_ENDPOINT_OUT_MIDI, (uint8_t *)event, sizeof(MIDI_EventPacket_t)); } -void midi_ep_task(void) { - uint8_t buffer[MIDI_STREAM_EPSIZE]; - while (receive_report(USB_ENDPOINT_OUT_MIDI, buffer, sizeof(buffer))) { - MIDI_EventPacket_t event; - // TODO: this seems totally wrong? The midi task will never see any - // packets if we consume them here - recv_midi_packet(&event); - } -} #endif #ifdef VIRTSER_ENABLE From afafce0a5e858efbc693df4636685eccab2f4968 Mon Sep 17 00:00:00 2001 From: Veriyans <162705394+veriyaniot@users.noreply.github.com> Date: Fri, 29 Mar 2024 11:51:22 +0700 Subject: [PATCH 059/333] [Keyboard] Add Macropad 15Pad (#23257) Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis --- keyboards/zlabkeeb/15pad/info.json | 77 +++++++++++++++++++ .../zlabkeeb/15pad/keymaps/default/keymap.c | 43 +++++++++++ .../zlabkeeb/15pad/keymaps/default/rules.mk | 1 + keyboards/zlabkeeb/15pad/keymaps/via/keymap.c | 50 ++++++++++++ keyboards/zlabkeeb/15pad/keymaps/via/rules.mk | 2 + keyboards/zlabkeeb/15pad/readme.md | 28 +++++++ keyboards/zlabkeeb/15pad/rules.mk | 1 + 7 files changed, 202 insertions(+) create mode 100644 keyboards/zlabkeeb/15pad/info.json create mode 100644 keyboards/zlabkeeb/15pad/keymaps/default/keymap.c create mode 100644 keyboards/zlabkeeb/15pad/keymaps/default/rules.mk create mode 100644 keyboards/zlabkeeb/15pad/keymaps/via/keymap.c create mode 100644 keyboards/zlabkeeb/15pad/keymaps/via/rules.mk create mode 100644 keyboards/zlabkeeb/15pad/readme.md create mode 100644 keyboards/zlabkeeb/15pad/rules.mk diff --git a/keyboards/zlabkeeb/15pad/info.json b/keyboards/zlabkeeb/15pad/info.json new file mode 100644 index 00000000000..9733d0169a8 --- /dev/null +++ b/keyboards/zlabkeeb/15pad/info.json @@ -0,0 +1,77 @@ +{ + "keyboard_name": "ZLABKEEB 15PAD", + "manufacturer": "zlabkeeb", + "maintainer": "zlabkeeb", + "processor": "RP2040", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "encoder": true, + "mousekey": true, + "rgblight": true + }, + "build": { + "lto": true + }, + "url": "https://github.com/zlabkeeb", + "usb": { + "vid": "0x4154", + "pid": "0x4454", + "device_version": "1.0.0" + }, + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "led_count": 13, + "max_brightness": 180, + "saturation_steps": 8, + "sleep": true + }, + "ws2812": { + "pin": "GP15", + "driver": "vendor" + }, + "encoder": { + "rotary": [ + {"pin_a": "GP1", "pin_b": "GP2"}, + {"pin_a": "GP3", "pin_b": "GP4"}, + {"pin_a": "GP5", "pin_b": "GP6"} + ] + }, + "matrix_pins": { + "cols": ["GP11", "GP12", "GP13", "GP14"], + "rows": ["GP7", "GP8", "GP9", "GP10"] + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"x": 0, "y": 0, "matrix": [0, 0], "encoder": 0}, + {"x": 1, "y": 0, "matrix": [0, 1], "encoder": 1}, + {"x": 3, "y": 0, "matrix": [0, 3], "encoder": 2}, + {"x": 0, "y": 0, "matrix": [1, 0]}, + {"x": 1, "y": 0, "matrix": [1, 1]}, + {"x": 2, "y": 0, "matrix": [1, 2]}, + {"x": 3, "y": 0, "matrix": [1, 3]}, + {"x": 0, "y": 0, "matrix": [2, 0]}, + {"x": 1, "y": 0, "matrix": [2, 1]}, + {"x": 2, "y": 0, "matrix": [2, 2]}, + {"x": 3, "y": 0, "matrix": [2, 3]}, + {"x": 0, "y": 0, "matrix": [3, 0]}, + {"x": 1, "y": 0, "matrix": [3, 1]}, + {"x": 2, "y": 0, "matrix": [3, 2]}, + {"x": 3, "y": 0, "matrix": [3, 3]} + ] + } + } +} diff --git a/keyboards/zlabkeeb/15pad/keymaps/default/keymap.c b/keyboards/zlabkeeb/15pad/keymaps/default/keymap.c new file mode 100644 index 00000000000..fb19b67b4dc --- /dev/null +++ b/keyboards/zlabkeeb/15pad/keymaps/default/keymap.c @@ -0,0 +1,43 @@ +/* +Copyright 2024 zlabkeeb (zlabkeeb@gmail.com) + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌─────────┬─────────┐ ┌─────────┐ + * │ MUTE │ MPLY │ │ TRNS │ + * ├─────────┼─────────┼─────────┼─────────┤ + * │ 1 │ 2 │ 3 │ 4 │ + * ├─────────┼─────────┼─────────┼─────────┤ + * │ 5 │ 6 │ 7 │ 8 │ + * ├─────────┼─────────┼─────────┼─────────┤ + * │ 9 │ 0 │ ENTER │ DELL │ + * └─────────┴─────────┴─────────┴─────────┘ + */ + [0] = LAYOUT( + KC_MUTE, KC_MPLY, KC_TRNS, + KC_1, KC_2, KC_3, KC_4, + KC_5, KC_6, KC_7, KC_8, + KC_9, KC_0, KC_ENT, KC_DEL + ) +}; +#if defined (ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_DOWN, KC_UP)} +}; +#endif diff --git a/keyboards/zlabkeeb/15pad/keymaps/default/rules.mk b/keyboards/zlabkeeb/15pad/keymaps/default/rules.mk new file mode 100644 index 00000000000..ee325681483 --- /dev/null +++ b/keyboards/zlabkeeb/15pad/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/zlabkeeb/15pad/keymaps/via/keymap.c b/keyboards/zlabkeeb/15pad/keymaps/via/keymap.c new file mode 100644 index 00000000000..9ffc6db3c02 --- /dev/null +++ b/keyboards/zlabkeeb/15pad/keymaps/via/keymap.c @@ -0,0 +1,50 @@ +/* +Copyright 2024 zlabkeeb (zlabkeeb@gmail.com) + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌─────────┬─────────┐ ┌─────────┐ + * │ TO(0) │ TO(1) │ │ TO(2) │ + * ├─────────┼─────────┼─────────┼─────────┤ + * │ 1 │ 2 │ 3 │ 4 │ + * ├─────────┼─────────┼─────────┼─────────┤ + * │ 5 │ 6 │ 7 │ 8 │ + * ├─────────┼─────────┼─────────┼─────────┤ + * │ 9 │ 0 │ ENTER │ DELL │ + * └─────────┴─────────┴─────────┴─────────┘ + */ + [0] = LAYOUT( + TO(0), TO(1), TO(2), + KC_1, KC_2, KC_3, KC_4, + KC_5, KC_6, KC_7, KC_8, + KC_9, KC_0, KC_ENT, KC_DEL + ), + [1] = LAYOUT( + TO(0), TO(1), TO(2), + KC_1, KC_2, KC_3, KC_4, + KC_5, KC_6, KC_7, KC_8, + KC_LEFT, KC_RIGHT, KC_DOWN, KC_UP + ) +}; +#if defined (ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_DOWN, KC_UP)}, + [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_DOWN, KC_UP)} +}; +#endif diff --git a/keyboards/zlabkeeb/15pad/keymaps/via/rules.mk b/keyboards/zlabkeeb/15pad/keymaps/via/rules.mk new file mode 100644 index 00000000000..f1adcab005e --- /dev/null +++ b/keyboards/zlabkeeb/15pad/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/zlabkeeb/15pad/readme.md b/keyboards/zlabkeeb/15pad/readme.md new file mode 100644 index 00000000000..2587b4ab9b7 --- /dev/null +++ b/keyboards/zlabkeeb/15pad/readme.md @@ -0,0 +1,28 @@ +# 15PAD + +![15PAD](https://i.imgur.com/J7sZSnx.jpeg) + +15PAD is a Macropad With 12 Keys & 3 Rotary Encoder, Designed And Manufactured In INDONESIA. + +- Keyboard Maintainer: [zlabkeeb](https://github.com/zlabkeeb) +- Hardware Supported: 15Pad PCB, RP2040 ZERO +- Hardware Availability: (INDONESIA ONLY) [Tokopedia](https://www.tokopedia.com/zahranetid/macropad-15pad-via-compatible) + +Make example for this keyboard (after setting up your build environment): + + make zlabkeeb/15pad:default + +Flashing example for this keyboard: + + make zlabkeeb/15pad: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the top of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available + diff --git a/keyboards/zlabkeeb/15pad/rules.mk b/keyboards/zlabkeeb/15pad/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/zlabkeeb/15pad/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From eac380926655d59db7471a9085a96b10b7671ce2 Mon Sep 17 00:00:00 2001 From: DOIO2022 <116554792+DOIO2022@users.noreply.github.com> Date: Fri, 29 Mar 2024 12:53:11 +0800 Subject: [PATCH 060/333] [Keyboard] Add kb3x keyboard (#23268) Co-authored-by: Drashna Jaelre Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/doio/kb3x/info.json | 125 +++++++++++++++++++ keyboards/doio/kb3x/keymaps/default/keymap.c | 51 ++++++++ keyboards/doio/kb3x/keymaps/default/rules.mk | 1 + keyboards/doio/kb3x/keymaps/via/keymap.c | 73 +++++++++++ keyboards/doio/kb3x/keymaps/via/rules.mk | 2 + keyboards/doio/kb3x/readme.md | 26 ++++ keyboards/doio/kb3x/rules.mk | 1 + 7 files changed, 279 insertions(+) create mode 100644 keyboards/doio/kb3x/info.json create mode 100644 keyboards/doio/kb3x/keymaps/default/keymap.c create mode 100644 keyboards/doio/kb3x/keymaps/default/rules.mk create mode 100644 keyboards/doio/kb3x/keymaps/via/keymap.c create mode 100644 keyboards/doio/kb3x/keymaps/via/rules.mk create mode 100644 keyboards/doio/kb3x/readme.md create mode 100644 keyboards/doio/kb3x/rules.mk diff --git a/keyboards/doio/kb3x/info.json b/keyboards/doio/kb3x/info.json new file mode 100644 index 00000000000..be0d1384397 --- /dev/null +++ b/keyboards/doio/kb3x/info.json @@ -0,0 +1,125 @@ +{ + "manufacturer": "DOIO", + "keyboard_name": "KB3x-01", + "maintainer": "DOIO2022", + "bootloader": "stm32duino", + "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 6 + }, + "encoder": { + "rotary": [ + {"pin_a": "B5", "pin_b": "B6", "resolution": 2}, + {"pin_a": "A1", "pin_b": "A2", "resolution": 2}, + {"pin_a": "A3", "pin_b": "A4", "resolution": 2} + ] + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["B14", "B13", "B12", "B0", "A7", "A6"], + "rows": ["B3", "B4", "B9", "B8"] + }, + "processor": "STM32F103", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}, + {"matrix": [0, 1], "x": 75, "y": 0, "flags": 1}, + {"matrix": [0, 2], "x": 149, "y": 0, "flags": 1}, + {"matrix": [0, 3], "x": 224, "y": 0, "flags": 1}, + {"x": 112, "y": 64, "flags": 1}, + {"x": 112, "y": 64, "flags": 1}, + {"x": 112, "y": 64, "flags": 1}, + {"x": 112, "y": 64, "flags": 1} + ], + "max_brightness": 200, + "sleep": true + }, + "url": "", + "usb": { + "device_version": "0.0.1", + "pid": "0x3F01", + "vid": "0xD010" + }, + "ws2812": { + "pin": "A10" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [3, 0], "x": 0, "y": 0}, + {"matrix": [3, 1], "x": 1, "y": 0}, + {"matrix": [3, 2], "x": 2, "y": 0}, + {"matrix": [3, 3], "x": 6.5, "y": 0}, + {"matrix": [3, 4], "x": 7.5, "y": 0}, + {"matrix": [3, 5], "x": 8.5, "y": 0}, + {"matrix": [0, 0], "x": 1, "y": 1.25}, + {"matrix": [1, 0], "x": 4.25, "y": 1.25}, + {"matrix": [2, 0], "x": 7.5, "y": 1.25}, + {"matrix": [0, 3], "x": 0, "y": 2.25}, + {"matrix": [0, 4], "x": 1, "y": 2.25, "encoder": 0}, + {"matrix": [0, 1], "x": 2, "y": 2.25}, + {"matrix": [1, 3], "x": 3.25, "y": 2.25}, + {"matrix": [1, 4], "x": 4.25, "y": 2.25, "encoder": 1}, + {"matrix": [1, 1], "x": 5.25, "y": 2.25}, + {"matrix": [2, 3], "x": 6.5, "y": 2.25}, + {"matrix": [2, 4], "x": 7.5, "y": 2.25, "encoder": 2}, + {"matrix": [2, 1], "x": 8.5, "y": 2.25}, + {"matrix": [0, 2], "x": 1, "y": 3.25}, + {"matrix": [1, 2], "x": 4.25, "y": 3.25}, + {"matrix": [2, 2], "x": 7.5, "y": 3.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/doio/kb3x/keymaps/default/keymap.c b/keyboards/doio/kb3x/keymaps/default/keymap.c new file mode 100644 index 00000000000..934019e8cf5 --- /dev/null +++ b/keyboards/doio/kb3x/keymaps/default/keymap.c @@ -0,0 +1,51 @@ +/* Copyright 2022 DOIO + * Copyright 2022 DOIO2022 + * + * 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 . + */ + + #include QMK_KEYBOARD_H + +enum layer_names { + _LAY0, + _LAY1, + _LAY2 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_LAY0] = LAYOUT( + TO(1), RGB_MOD, RGB_TOG, RGB_HUI, RGB_VAD, RGB_VAI, + KC_MPLY, KC_UP, KC_UP, + KC_MNXT, KC_TRNS, KC_MPRV, A(KC_LEFT), KC_TRNS, A(KC_RIGHT), KC_RIGHT, KC_TRNS, KC_LEFT, + KC_MPLY, KC_DOWN, KC_DOWN), + [_LAY1] = LAYOUT( + TO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_WH_U, S(KC_RBRC), C(KC_L), + C(KC_WH_D), KC_TRNS, C(KC_WH_U), KC_DOT, KC_TRNS, KC_COMM, C(KC_B), KC_TRNS, C(KC_U), + KC_WH_D, S(KC_LBRC), C(KC_M)), + [_LAY2] = LAYOUT( + TO(0), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_B, KC_UP, S(KC_I), + KC_P, KC_TRNS, KC_H, KC_RIGHT, KC_TRNS, KC_LEFT, KC_O, KC_TRNS, KC_I, + KC_Y, KC_DOWN, S(KC_O)) +}; + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [_LAY0] = { ENCODER_CCW_CW(C(KC_DOWN), C(KC_UP)), ENCODER_CCW_CW(C(KC_PMNS), C(KC_PPLS)), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LAY1] = { ENCODER_CCW_CW(C(KC_PMNS), C(KC_PPLS)), ENCODER_CCW_CW(KC_LBRC, KC_RBRC), ENCODER_CCW_CW(C(S(KC_U)), C(KC_I)) }, + [_LAY2] = { ENCODER_CCW_CW(KC_C, KC_V), ENCODER_CCW_CW(KC_MINS, KC_EQL), ENCODER_CCW_CW(KC_J, KC_L) } +}; +#endif diff --git a/keyboards/doio/kb3x/keymaps/default/rules.mk b/keyboards/doio/kb3x/keymaps/default/rules.mk new file mode 100644 index 00000000000..ee325681483 --- /dev/null +++ b/keyboards/doio/kb3x/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/doio/kb3x/keymaps/via/keymap.c b/keyboards/doio/kb3x/keymaps/via/keymap.c new file mode 100644 index 00000000000..5ebd1066a9f --- /dev/null +++ b/keyboards/doio/kb3x/keymaps/via/keymap.c @@ -0,0 +1,73 @@ +/* Copyright 2022 DOIO + * Copyright 2022 DOIO2022 + * + * 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 . + */ + + #include QMK_KEYBOARD_H + +enum layer_names { + _LAY0, + _LAY1, + _LAY2, + _LAY3, + _LAY4, + _LAY5 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_LAY0] = LAYOUT( + TO(1), RGB_MOD, RGB_TOG, RGB_HUI, RGB_VAD, RGB_VAI, + KC_MPLY, KC_UP, KC_UP, + KC_MNXT, KC_TRNS, KC_MPRV, A(KC_LEFT), KC_TRNS, A(KC_RIGHT), KC_RIGHT, KC_TRNS, KC_LEFT, + KC_MPLY, KC_DOWN, KC_DOWN), + [_LAY1] = LAYOUT( + TO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_WH_U, S(KC_RBRC), C(KC_L), + C(KC_WH_D), KC_TRNS, C(KC_WH_U), KC_DOT, KC_TRNS, KC_COMM, C(KC_B), KC_TRNS, C(KC_U), + KC_WH_D, S(KC_LBRC), C(KC_M)), + [_LAY2] = LAYOUT( + TO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_B, KC_UP, S(KC_I), + KC_P, KC_TRNS, KC_H, KC_RIGHT, KC_TRNS, KC_LEFT, KC_O, KC_TRNS, KC_I, + KC_Y, KC_DOWN, S(KC_O)), + [_LAY3] = LAYOUT( + TO(4), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS), + [_LAY4] = LAYOUT( + TO(5), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS), + [_LAY5] = LAYOUT( + TO(0), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS), + +}; + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [_LAY0] = { ENCODER_CCW_CW(C(KC_DOWN), C(KC_UP)), ENCODER_CCW_CW(C(KC_PMNS), C(KC_PPLS)), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LAY1] = { ENCODER_CCW_CW(C(KC_PMNS), C(KC_PPLS)), ENCODER_CCW_CW(KC_LBRC, KC_RBRC), ENCODER_CCW_CW(C(S(KC_U)), C(KC_I)) }, + [_LAY2] = { ENCODER_CCW_CW(KC_C, KC_V), ENCODER_CCW_CW(KC_MINS, KC_EQL), ENCODER_CCW_CW(KC_J, KC_L) }, + [_LAY3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [_LAY4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [_LAY5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; +#endif diff --git a/keyboards/doio/kb3x/keymaps/via/rules.mk b/keyboards/doio/kb3x/keymaps/via/rules.mk new file mode 100644 index 00000000000..f1adcab005e --- /dev/null +++ b/keyboards/doio/kb3x/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/doio/kb3x/readme.md b/keyboards/doio/kb3x/readme.md new file mode 100644 index 00000000000..c27c983d496 --- /dev/null +++ b/keyboards/doio/kb3x/readme.md @@ -0,0 +1,26 @@ +# doio/kb3x + +![kb3x-01](https://i.imgur.com/6DvIu9Mh.png) + +QMK for DOIO Knob keypad . + +* Keyboard Maintainer: DOIO2022 +* Hardware Supported: DOIO Knob keypad + +Make example for this keyboard (after setting up your build environment): + + make doio/kb3x:default + +Flashing example for this keyboard: + + make doio/kb3x: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/doio/kb3x/rules.mk b/keyboards/doio/kb3x/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/doio/kb3x/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 5ef5a79fd9993747204a6ad89b206ea411c45083 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 29 Mar 2024 04:55:38 +0000 Subject: [PATCH 061/333] Remove IGNORE_MOD_TAP_INTERRUPT from keymaps (#23279) --- .../bad_wings/keymaps/jasonhazel/config.h | 17 --- .../bad_wings/keymaps/jasonhazel/keymap.c | 118 ------------------ .../bad_wings/keymaps/jasonhazel/rules.mk | 4 - .../keymaps/default_isoenter/config.h | 2 - 4 files changed, 141 deletions(-) delete mode 100644 keyboards/hazel/bad_wings/keymaps/jasonhazel/config.h delete mode 100644 keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c delete mode 100644 keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk diff --git a/keyboards/hazel/bad_wings/keymaps/jasonhazel/config.h b/keyboards/hazel/bad_wings/keymaps/jasonhazel/config.h deleted file mode 100644 index 035419eee68..00000000000 --- a/keyboards/hazel/bad_wings/keymaps/jasonhazel/config.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2023 Jason Hazel (@jasonhazel) -// SPDX-License-Identifier: GPL-3.0-or-later - -#pragma once - -#define TAPPING_TERM 200 -#define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD -#define TAPPING_TERM_PER_KEY -#define ONESHOT_TAP_TOGGLE 10 -#define ONESHOT_TIMEOUT 500 -#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD -#define CIRQUE_PINNACLE_TAP_ENABLE -#define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_ABSOLUTE_MODE - -#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE \ No newline at end of file diff --git a/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c b/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c deleted file mode 100644 index 0c3d9c70afa..00000000000 --- a/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c +++ /dev/null @@ -1,118 +0,0 @@ -// Copyright 2023 Jason Hazel (@jasonhazel) -// SPDX-License-Identifier: GPL-3.0-or-later - -#include QMK_KEYBOARD_H - -enum layers { - _ALPHA, - _SYMBOL, - _NUMBER, - _NAVIGATION, - LAYER_LENGTH -}; - - -enum tapdances { - TD_QESC, - TD_SBKT, - TD_CBKT, - TD_PARN, - TD_LTGT, - TD_ATAB, - TAPDANCE_LENGTH -}; - -enum combos { - COMBO_NAVIGATION, - COMBO_LENGTH -}; - - -// begin tapdances -#define KC_QESC TD(TD_QESC) -#define KC_SBKT TD(TD_SBKT) -#define KC_CBKT TD(TD_CBKT) -#define KC_PARN TD(TD_PARN) -#define KC_LTGT TD(TD_LTGT) -#define KC_ATAB TD(TD_ATAB) - -#define KC_GUIX LGUI_T(KC_X) -#define KC_ALTC LALT_T(KC_C) - -// oneshots -#define KC_OSFT OSM(MOD_LSFT) -#define KC_OALT OSM(MOD_LALT) - -// layer changing -#define KC_OSYM OSL(_SYMBOL) -#define KC_ONUM LT(_NUMBER, KC_BSPC) - -uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { - switch(keycode) { - case KC_GUIX: - case KC_ALTC: - return TAPPING_TERM * 2; - default: - return TAPPING_TERM; - } -} - -// tapdances -tap_dance_action_t tap_dance_actions[] = { - [TD_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), - [TD_SBKT] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), - [TD_CBKT] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR), - [TD_PARN] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN), - [TD_LTGT] = ACTION_TAP_DANCE_DOUBLE(KC_LABK, KC_RABK), - [TD_ATAB] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB) -}; -// end tapdances - -uint16_t COMBO_LEN = COMBO_LENGTH; - -const uint16_t PROGMEM combo_navigation[] = { KC_OSYM, KC_ONUM, COMBO_END }; -combo_t key_combos[] = { - [COMBO_NAVIGATION] = COMBO(combo_navigation, OSL(_NAVIGATION)), -}; - -uint16_t get_combo_term(uint16_t index, combo_t *combo) { - switch(index) { - case COMBO_NAVIGATION: // extending the combo term here helps reduce sticky layers some more. - return 250; - default: - return COMBO_TERM; - } -} -// end combos - - -// begin layers -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_ALPHA] = LAYOUT_split_3x5_3( - KC_QESC, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, - KC_Z, KC_GUIX, KC_ALTC, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, - KC_LCTL, KC_OSYM, KC_OSFT, KC_SPC, KC_ONUM, KC_ENT - ), - [_SYMBOL] = LAYOUT_split_3x5_3( - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_PIPE, KC_NO, - KC_GRV, KC_TILD, KC_UNDS, KC_EQL, KC_NO, KC_SBKT, KC_CBKT, KC_PARN, KC_LTGT, KC_BACKSLASH, - KC_NO, KC_NO, KC_PLUS, KC_MINS, KC_NO, KC_NO, KC_NO, KC_COLN, KC_DOT, KC_SCLN, - KC_LCTL, KC_OSYM, KC_OSFT, KC_SPC, KC_ONUM, KC_ENT - ), - [_NUMBER] = LAYOUT_split_3x5_3( - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DOT, KC_NO, - KC_LCTL, KC_OSYM, KC_OSFT, KC_SPC, KC_ONUM, KC_ENT - ), - [_NAVIGATION] = LAYOUT_split_3x5_3( - KC_NO, KC_F2, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_UP, KC_END, KC_BSPC, - KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_ENT, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_DEL, - KC_LCTL, KC_OSYM, KC_OSFT, KC_SPC, KC_ONUM, KC_ENT - ) -}; - - - diff --git a/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk b/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk deleted file mode 100644 index 26d76a0df6e..00000000000 --- a/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -COMBO_ENABLE = yes -TAP_DANCE_ENABLE = yes \ No newline at end of file diff --git a/keyboards/marksard/leftover30/keymaps/default_isoenter/config.h b/keyboards/marksard/leftover30/keymaps/default_isoenter/config.h index 8bffbbb3b51..5093fd1ee29 100644 --- a/keyboards/marksard/leftover30/keymaps/default_isoenter/config.h +++ b/keyboards/marksard/leftover30/keymaps/default_isoenter/config.h @@ -18,7 +18,5 @@ // place overrides here #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT - #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term #define TAPPING_TERM_PER_KEY From 742ff91cf883a636d893076df347aa5817ecfac5 Mon Sep 17 00:00:00 2001 From: Archetype <62484425+archetype-made@users.noreply.github.com> Date: Thu, 28 Mar 2024 22:04:43 -0700 Subject: [PATCH 062/333] [Keyboard] Add Minerva LX (#23291) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Álvaro A. Volpato Co-authored-by: Joel Challis Co-authored-by: Ryan --- keyboards/archetype/minervalx/config.h | 22 +++++ keyboards/archetype/minervalx/halconf.h | 21 ++++ keyboards/archetype/minervalx/info.json | 98 +++++++++++++++++++ .../minervalx/keymaps/default/keymap.c | 35 +++++++ .../archetype/minervalx/keymaps/via/keymap.c | 35 +++++++ .../archetype/minervalx/keymaps/via/rules.mk | 2 + keyboards/archetype/minervalx/mcuconf.h | 22 +++++ keyboards/archetype/minervalx/readme.md | 24 +++++ keyboards/archetype/minervalx/rules.mk | 1 + 9 files changed, 260 insertions(+) create mode 100644 keyboards/archetype/minervalx/config.h create mode 100644 keyboards/archetype/minervalx/halconf.h create mode 100644 keyboards/archetype/minervalx/info.json create mode 100644 keyboards/archetype/minervalx/keymaps/default/keymap.c create mode 100644 keyboards/archetype/minervalx/keymaps/via/keymap.c create mode 100644 keyboards/archetype/minervalx/keymaps/via/rules.mk create mode 100644 keyboards/archetype/minervalx/mcuconf.h create mode 100644 keyboards/archetype/minervalx/readme.md create mode 100644 keyboards/archetype/minervalx/rules.mk diff --git a/keyboards/archetype/minervalx/config.h b/keyboards/archetype/minervalx/config.h new file mode 100644 index 00000000000..3b5eb8e56ac --- /dev/null +++ b/keyboards/archetype/minervalx/config.h @@ -0,0 +1,22 @@ +/* Copyright 2024 Archetype Made, Inc. + * + * 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 + +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET + +#define BACKLIGHT_PWM_DRIVER PWMD5 +#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_A \ No newline at end of file diff --git a/keyboards/archetype/minervalx/halconf.h b/keyboards/archetype/minervalx/halconf.h new file mode 100644 index 00000000000..b807fe16507 --- /dev/null +++ b/keyboards/archetype/minervalx/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2024 Archetype Made, Inc. + * + * 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 + +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/archetype/minervalx/info.json b/keyboards/archetype/minervalx/info.json new file mode 100644 index 00000000000..0d01ccf485b --- /dev/null +++ b/keyboards/archetype/minervalx/info.json @@ -0,0 +1,98 @@ +{ + "manufacturer": "Archetype", + "keyboard_name": "Minerva LX", + "maintainer": "Archetype", + "backlight": { + "pin": "GP7" + }, + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true + }, + "matrix_pins": { + "cols": ["GP0", "GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16"], + "rows": ["GP11", "GP12", "GP13", "GP14", "GP15"] + }, + "processor": "RP2040", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0100", + "vid": "0x5453" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [2, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 8], "x": 8, "y": 4, "w": 3}, + {"matrix": [4, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + } + } +} diff --git a/keyboards/archetype/minervalx/keymaps/default/keymap.c b/keyboards/archetype/minervalx/keymaps/default/keymap.c new file mode 100644 index 00000000000..c52c7f4c1e1 --- /dev/null +++ b/keyboards/archetype/minervalx/keymaps/default/keymap.c @@ -0,0 +1,35 @@ +/* Copyright 2024 Archetype Made, Inc. + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL + ), + [1] = LAYOUT( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/archetype/minervalx/keymaps/via/keymap.c b/keyboards/archetype/minervalx/keymaps/via/keymap.c new file mode 100644 index 00000000000..c52c7f4c1e1 --- /dev/null +++ b/keyboards/archetype/minervalx/keymaps/via/keymap.c @@ -0,0 +1,35 @@ +/* Copyright 2024 Archetype Made, Inc. + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL + ), + [1] = LAYOUT( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/archetype/minervalx/keymaps/via/rules.mk b/keyboards/archetype/minervalx/keymaps/via/rules.mk new file mode 100644 index 00000000000..43061db1dd4 --- /dev/null +++ b/keyboards/archetype/minervalx/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/archetype/minervalx/mcuconf.h b/keyboards/archetype/minervalx/mcuconf.h new file mode 100644 index 00000000000..6bc01108d35 --- /dev/null +++ b/keyboards/archetype/minervalx/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2024 Archetype Made, Inc. + * + * 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 + +#include_next + +#undef RP_PWM_USE_PWM5 +#define RP_PWM_USE_PWM5 TRUE diff --git a/keyboards/archetype/minervalx/readme.md b/keyboards/archetype/minervalx/readme.md new file mode 100644 index 00000000000..365fd375e58 --- /dev/null +++ b/keyboards/archetype/minervalx/readme.md @@ -0,0 +1,24 @@ +# Minerva LX + +![Minerva LX](https://i.imgur.com/f97nsrx.jpg) + +The following is the QMK Firmware for the Minerva LX PCB. + +* Keyboard Maintainer: [Archetype](https://github.com/archetype-made) +* Hardware Supported: RP2040-based proprietary PCB. +* Hardware Availability: https://archetypemade.com/minerva-is-here/ + +Make example for this keyboard (after setting up your build environment): + + make archetype/minervalx:default + +Flashing example for this keyboard: + + make archetype/minervalx: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). + +## Bootloader Enter the bootloader in 3 ways: +* **Bootmagic reset**: Hold down the key ESC key and plug in the keyboard (Top Left most switch) +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if available +* **Physical Reset Button**: With the PCB unplugged, hold down the button labled `RESET` on the back of the PCB while pluggin in the USB. \ No newline at end of file diff --git a/keyboards/archetype/minervalx/rules.mk b/keyboards/archetype/minervalx/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/archetype/minervalx/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 2d8902c884deb48815fd923bc4bb9437fd148e19 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 28 Mar 2024 22:06:38 -0700 Subject: [PATCH 063/333] Kalakos Bahrnob Layout Additions (#23300) --- keyboards/kalakos/bahrnob/info.json | 1939 ++++++++++++++++- .../kalakos/bahrnob/keymaps/default/keymap.c | 4 +- .../kalakos/bahrnob/keymaps/via/keymap.c | 8 +- keyboards/kalakos/bahrnob/matrix_diagram.md | 15 +- 4 files changed, 1950 insertions(+), 16 deletions(-) diff --git a/keyboards/kalakos/bahrnob/info.json b/keyboards/kalakos/bahrnob/info.json index 6905ceb38da..2e127e555a0 100644 --- a/keyboards/kalakos/bahrnob/info.json +++ b/keyboards/kalakos/bahrnob/info.json @@ -28,8 +28,11 @@ "rows": ["D7", "B4", "B5", "B6", "C6"], "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5"] }, + "layout_aliases": { + "LAYOUT": "LAYOUT_all" + }, "layouts": { - "LAYOUT": { + "LAYOUT_all": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -47,7 +50,7 @@ {"matrix": [0, 13], "x": 13, "y": 0}, {"matrix": [1, 14], "x": 14, "y": 0}, - {"matrix": [0, 14], "x": 15.75, "y": 0}, + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, @@ -108,6 +111,1938 @@ {"matrix": [4, 11], "x": 11, "y": 4}, {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_ansi_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 14], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_ansi_lwkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 3, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_ansi_lwkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 14], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 3, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_ansi_rwkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_ansi_rwkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 14], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_ansi_rwkl_split_space": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_ansi_rwkl_split_space_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 14], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_ansi_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 3, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_ansi_wkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 14], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 3, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_ansi_split_space": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_ansi_split_space_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 14], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 4], "x": 1.25, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_iso_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 14], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 4], "x": 1.25, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_iso_lwkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 4], "x": 1.25, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 3, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_iso_lwkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 14], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 4], "x": 1.25, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 3, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_iso_rwkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 4], "x": 1.25, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_iso_rwkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 14], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 4], "x": 1.25, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_iso_rwkl_split_space": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 4], "x": 1.25, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_iso_rwkl_split_space_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 14], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 4], "x": 1.25, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_iso_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 4], "x": 1.25, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 3, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_iso_wkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 14], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 4], "x": 1.25, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 3, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_iso_split_space": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 4], "x": 1.25, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_iso_split_space_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 14], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 14], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 4], "x": 1.25, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [2, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [3, 13], "x": 13.25, "y": 4.25}, {"matrix": [4, 13], "x": 14.25, "y": 4.25}, {"matrix": [4, 14], "x": 15.25, "y": 4.25} diff --git a/keyboards/kalakos/bahrnob/keymaps/default/keymap.c b/keyboards/kalakos/bahrnob/keymaps/default/keymap.c index 08ed92c0a82..7866b4dfd30 100644 --- a/keyboards/kalakos/bahrnob/keymaps/default/keymap.c +++ b/keyboards/kalakos/bahrnob/keymaps/default/keymap.c @@ -19,7 +19,7 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_all( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_MUTE, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_END, @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT( + [1] = LAYOUT_all( QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/kalakos/bahrnob/keymaps/via/keymap.c b/keyboards/kalakos/bahrnob/keymaps/via/keymap.c index 77f5db6e23a..e71375f9f11 100644 --- a/keyboards/kalakos/bahrnob/keymaps/via/keymap.c +++ b/keyboards/kalakos/bahrnob/keymaps/via/keymap.c @@ -19,7 +19,7 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_all( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_MUTE, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_END, @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT( + [1] = LAYOUT_all( QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [2] = LAYOUT( + [2] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT( + [3] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/kalakos/bahrnob/matrix_diagram.md b/keyboards/kalakos/bahrnob/matrix_diagram.md index 30e120b75b3..316f2ad9d80 100644 --- a/keyboards/kalakos/bahrnob/matrix_diagram.md +++ b/keyboards/kalakos/bahrnob/matrix_diagram.md @@ -1,17 +1,16 @@ # Matrix Diagram for Kalakos Bahrnob65 - ``` ┌───────┐ 2u Backspace │0D │ └───────┘ -┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┐ -│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1E │ │0E │ -├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ └───┘ ┌─────┐ -│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ ┌───┐ │ │ -├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ │2E │ ┌──┴┐1D │ ISO Enter -│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │ ├───┤ │2C │ │ -├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ │3E │ └───┴────┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┐ +│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1E │ │0E │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ └───┘ ┌─────┐ +│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ ┌───┐ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ │2E │ ┌──┴┐1D │ ISO Enter +│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │ ├───┤ │2C │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ │3E │ └───┴────┘ │30 │44 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3C │┌───┐└───┘ ├────┼───┴┬──┴─┬─┴───┴───┴─┬─┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│2D │ │40 │41 │42 │43 │46 │4A │4B │4C │┌───┼───┼───┐ From 387a1aef8d55530a913440696a0e016efd3204b0 Mon Sep 17 00:00:00 2001 From: LLLKST <160975620+LLLKST@users.noreply.github.com> Date: Fri, 29 Mar 2024 06:12:09 +0100 Subject: [PATCH 064/333] Add RGB lighting for the PetruziaMini (#23305) --- keyboards/handwired/petruziamini/info.json | 21 +++++- .../petruziamini/keymaps/default/keymap.c | 66 ++++++++++++++----- keyboards/handwired/petruziamini/readme.md | 5 +- 3 files changed, 74 insertions(+), 18 deletions(-) diff --git a/keyboards/handwired/petruziamini/info.json b/keyboards/handwired/petruziamini/info.json index dcd60f2dc7a..1d864d5dbbb 100644 --- a/keyboards/handwired/petruziamini/info.json +++ b/keyboards/handwired/petruziamini/info.json @@ -10,12 +10,31 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgblight": true }, "matrix_pins": { "cols": ["D7", "C6", "D4", "D0", "D1", "F4", "F5", "F6", "F7", "B1"], "rows": ["B4", "E6", "B3", "B2"] }, + "ws2812": { + "pin": "B6" + }, + "rgblight": { + "led_count": 28, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, "usb": { "device_version": "1.0.0", "pid": "0x0000", diff --git a/keyboards/handwired/petruziamini/keymaps/default/keymap.c b/keyboards/handwired/petruziamini/keymaps/default/keymap.c index c0972785d42..b3c3cdba94e 100644 --- a/keyboards/handwired/petruziamini/keymaps/default/keymap.c +++ b/keyboards/handwired/petruziamini/keymaps/default/keymap.c @@ -6,25 +6,61 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │ + * │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │ + * │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │ A │ B │ │ D │ │ │ G │ │ I │ J │ - * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ + * │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ + * ├───┼───┼───┴───┴───┼───┴───┴───┼───┼───┤ + * │ 1 │ ' │ Backspace │ Space │ ` │ 2 │ + * └───┴───┴───────────┴───────────┴───┴───┘ */ [0] = LAYOUT( - KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, - KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, - KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, - KC_A, KC_B, KC_C, KC_D, LT(1, KC_E), KC_F + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, LT(1, KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LT(2, KC_K), KC_L, KC_SCLN, + KC_Z, LCTL_T(KC_X), LALT_T(KC_C), KC_V, KC_B, KC_N, KC_M, LALT_T(KC_COMM), LCTL_T(KC_DOT), KC_SLSH, + TG(7), LT(3, KC_QUOT), KC_BSPC, LT(5, KC_SPC), LT(4, KC_GRV), TG(6) ), [1] = LAYOUT( - KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLSH, KC_ASTR, KC_7, KC_8, KC_9, + KC_NO, KC_RALT, KC_NO, KC_LSFT, KC_NO, KC_CALC, KC_MINS, KC_4, KC_5, KC_6, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PLUS, KC_1, KC_2, KC_3, + KC_NO, KC_NO, KC_NO, KC_EQUAL, KC_0, KC_DOT +), + [2] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_NO, KC_NO, KC_NO, KC_DEL, + KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO +), + [3] = LAYOUT( + KC_NO, KC_NO, KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_MUTE, KC_VOLU, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_BTN1, KC_UP, KC_BTN2, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_LEFT, KC_DOWN, KC_RGHT, + KC_NO, KC_NO, KC_NO, KC_LGUI, KC_NO, KC_NO +), + [4] = LAYOUT( + KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO +), + [5] = LAYOUT( + KC_ESC, KC_NO, KC_NO, KC_NO, KC_MYCM, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_DEL, + KC_NO, KC_NO, KC_NO, KC_ENT, KC_TAB, KC_CAPS, KC_ENT, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO +), + [6] = LAYOUT( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_Y, KC_F1, KC_NO, LGUI(KC_G), KC_ESC, + KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_CAPS, KC_F2, KC_NO, KC_MNXT, KC_VOLU, + KC_LCTL, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_F3, KC_NO, KC_MPLY, KC_VOLD, + KC_NO, KC_NO, KC_SPC, KC_F3, KC_F2, TG(6) +), + [7] = LAYOUT( + RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_TW, KC_NO, KC_NO, RGB_VAI, RGB_SAI, RGB_HUI, RGB_TOG, + RGB_M_SW, RGB_M_SN, RGB_M_K, KC_NO, KC_NO, KC_NO, RGB_VAD, RGB_SAD, RGB_HUD, RGB_MOD, + RGB_M_X, RGB_M_G, RGB_M_T, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_RMOD, + TG(7), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO ) -}; +}; \ No newline at end of file diff --git a/keyboards/handwired/petruziamini/readme.md b/keyboards/handwired/petruziamini/readme.md index 1b303c49c63..cf5526d0df9 100644 --- a/keyboards/handwired/petruziamini/readme.md +++ b/keyboards/handwired/petruziamini/readme.md @@ -1,8 +1,9 @@ # PetruziaMini -![PetruziaMini](https://i.imgur.com/uk2BSazh.jpeg) +![PetruziaMini](https://i.imgur.com/Q9EmAJj.jpeg) + +36 key ortholinear keyboard intended to be mapped as a split keyboard, with RGB lighting support. -36 key ortholinear keyboard intended to be mapped as a split keyboard. * Keyboard Maintainer: [LLLKST](https://github.com/LLLKST) * Hardware Supported: *promicro compatible controller* From 041f60f9a9cd88275f46f2ac2140923dcbda1333 Mon Sep 17 00:00:00 2001 From: joliverMI <36174681+joliverMI@users.noreply.github.com> Date: Fri, 29 Mar 2024 01:19:14 -0400 Subject: [PATCH 065/333] [Keyboard] Add recore keyboard (#23320) Co-authored-by: joliverMI Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis Co-authored-by: Duncan Sutherland --- keyboards/pmk/recore/v3/config.h | 18 +++ keyboards/pmk/recore/v3/info.json | 141 ++++++++++++++++++ .../pmk/recore/v3/keymaps/default/keymap.c | 52 +++++++ keyboards/pmk/recore/v3/keymaps/via/keymap.c | 52 +++++++ keyboards/pmk/recore/v3/keymaps/via/rules.mk | 1 + keyboards/pmk/recore/v3/readme.md | 27 ++++ keyboards/pmk/recore/v3/rules.mk | 1 + 7 files changed, 292 insertions(+) create mode 100644 keyboards/pmk/recore/v3/config.h create mode 100644 keyboards/pmk/recore/v3/info.json create mode 100644 keyboards/pmk/recore/v3/keymaps/default/keymap.c create mode 100644 keyboards/pmk/recore/v3/keymaps/via/keymap.c create mode 100644 keyboards/pmk/recore/v3/keymaps/via/rules.mk create mode 100644 keyboards/pmk/recore/v3/readme.md create mode 100644 keyboards/pmk/recore/v3/rules.mk diff --git a/keyboards/pmk/recore/v3/config.h b/keyboards/pmk/recore/v3/config.h new file mode 100644 index 00000000000..b4089fa81e9 --- /dev/null +++ b/keyboards/pmk/recore/v3/config.h @@ -0,0 +1,18 @@ +// Copyright 2023 Javier Oliver (@joliverMI) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/*Split keyboard configuration*/ +// Hardware Settings +#define SERIAL_USART_FULL_DUPLEX +#define SERIAL_USART_TX_PIN GP1 +#define SERIAL_USART_RX_PIN GP0 + +// Communication Settings +#define FORCED_SYNC_THROTTLE_MS 1000 +#define SPLIT_MAX_CONNECTION_ERRORS 5 +#define SPLIT_CONNECTION_CHECK_TIMEOUT 2000 + +// RGB Configuration +#define RGBLIGHT_EFFECT_BREATHE_CENTER 2.0 //1.0 to 2.7 diff --git a/keyboards/pmk/recore/v3/info.json b/keyboards/pmk/recore/v3/info.json new file mode 100644 index 00000000000..6bc095daa5f --- /dev/null +++ b/keyboards/pmk/recore/v3/info.json @@ -0,0 +1,141 @@ +{ + "manufacturer": "Posey's Mechanical Keyboards", + "keyboard_name": "recorev3", + "maintainer": "joliverMI", + "bootloader": "rp2040", + "build": { + "debounce_type": "sym_defer_pk" + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "rgblight": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9"], + "rows": ["GP10", "GP11", "GP12", "GP13", "GP14"] + }, + "processor": "RP2040", + "ws2812": { + "driver": "vendor", + "pin": "GP17" + }, + "rgblight": { + "animations": { + "breathing": true + }, + "layers": { + "enabled": true, + "max": 4 + }, + "led_count": 2, + "sleep": true, + "split": true, + "split_count": [1, 1] + }, + "split": { + "enabled": true, + "handedness": { + "pin": "GP18" + } + }, + "tags": ["ortho", "split"], + "url": "poseysmechanicalkeyboards.com", + "usb": { + "device_version": "1.0.0", + "pid": "0x0001", + "vid": "0x4A4F" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0,0], "x": 0, "y": 0.75, "w": 1.25}, + {"matrix": [0,1], "x": 1.25, "y": 0.75}, + {"matrix": [0,2], "x": 2.25, "y": 0.2}, + {"matrix": [0,3], "x": 3.25, "y": 0}, + {"matrix": [0,4], "x": 4.25, "y": 0.2}, + {"matrix": [0,5], "x": 5.25, "y": 0.3}, + {"matrix": [0,6], "x": 6.25, "y": 0.55, "h": 1.25}, + {"matrix": [0,7], "x": 7.25, "y": 0.55, "h": 1.25}, + + {"matrix": [5,0], "x": 9.25, "y": 0.55, "h": 1.25}, + {"matrix": [5,1], "x": 10.25, "y": 0.55, "h": 1.25}, + {"matrix": [5,2], "x": 11.25, "y": 0.3}, + {"matrix": [5,3], "x": 12.25, "y": 0.2}, + {"matrix": [5,4], "x": 13.25, "y": 0}, + {"matrix": [5,5], "x": 14.25, "y": 0.2}, + {"matrix": [5,6], "x": 15.25, "y": 0.75}, + {"matrix": [5,7], "x": 16.25, "y": 0.75, "w": 1.25}, + + {"matrix": [1,0], "x": 0, "y": 1.75, "w": 1.25}, + {"matrix": [1,1], "x": 1.25, "y": 1.75}, + {"matrix": [1,2], "x": 2.25, "y": 1.2}, + {"matrix": [1,3], "x": 3.25, "y": 1}, + {"matrix": [1,4], "x": 4.25, "y": 1.2}, + {"matrix": [1,5], "x": 5.25, "y": 1.3}, + {"matrix": [1,6], "x": 6.25, "y": 1.8, "h": 1.25}, + {"matrix": [1,7], "x": 7.25, "y": 1.8, "h": 1.25}, + + {"matrix": [6,0], "x": 9.25, "y": 1.8, "h": 1.25}, + {"matrix": [6,1], "x": 10.25, "y": 1.8, "h": 1.25}, + {"matrix": [6,2], "x": 11.25, "y": 1.3}, + {"matrix": [6,3], "x": 12.25, "y": 1.2}, + {"matrix": [6,4], "x": 13.25, "y": 1}, + {"matrix": [6,5], "x": 14.25, "y": 1.2}, + {"matrix": [6,6], "x": 15.25, "y": 1.75}, + {"matrix": [6,7], "x": 16.25, "y": 1.75, "w": 1.25}, + + {"matrix": [2,0], "x": 0, "y": 2.75, "w": 1.25}, + {"matrix": [2,1], "x": 1.25, "y": 2.75}, + {"matrix": [2,2], "x": 2.25, "y": 2.2}, + {"matrix": [2,3], "x": 3.25, "y": 2}, + {"matrix": [2,4], "x": 4.25, "y": 2.2}, + {"matrix": [2,5], "x": 5.25, "y": 2.3}, + + {"matrix": [7,2], "x": 11.25, "y": 2.3}, + {"matrix": [7,3], "x": 12.25, "y": 2.2}, + {"matrix": [7,4], "x": 13.25, "y": 2}, + {"matrix": [7,5], "x": 14.25, "y": 2.2}, + {"matrix": [7,6], "x": 15.25, "y": 2.75}, + {"matrix": [7,7], "x": 16.25, "y": 2.75, "w": 1.25}, + + {"matrix": [3,0], "x": 0, "y": 3.75, "w": 1.25}, + {"matrix": [3,1], "x": 1.25, "y": 3.75}, + {"matrix": [3,2], "x": 2.25, "y": 3.2}, + {"matrix": [3,3], "x": 3.25, "y": 3}, + {"matrix": [3,4], "x": 4.25, "y": 3.2}, + {"matrix": [3,5], "x": 5.25, "y": 3.3}, + {"matrix": [3,6], "x": 6.25, "y": 3.05, "h": 1.25}, + {"matrix": [3,7], "x": 7.25, "y": 3.05, "h": 1.25}, + + {"matrix": [8,0], "x": 9.25, "y": 3.05, "h": 1.25}, + {"matrix": [8,1], "x": 10.25, "y": 3.05, "h": 1.25}, + {"matrix": [8,2], "x": 11.25, "y": 3.3}, + {"matrix": [8,3], "x": 12.25, "y": 3.2}, + {"matrix": [8,4], "x": 13.25, "y": 3}, + {"matrix": [8,5], "x": 14.25, "y": 3.2}, + {"matrix": [8,6], "x": 15.25, "y": 3.75}, + {"matrix": [8,7], "x": 16.25, "y": 3.75, "w": 1.25}, + + {"matrix": [4,0], "x": 0, "y": 4.75, "w": 1.25}, + {"matrix": [4,1], "x": 1.25, "y": 4.75}, + {"matrix": [4,2], "x": 2.25, "y": 4.2, "w": 1.25}, + {"matrix": [4,3], "x": 3.5, "y": 4.2, "w": 1.25}, + {"matrix": [4,5], "x": 4.75, "y": 4.3, "w": 1.25}, + {"matrix": [4,6], "x": 6, "y": 4.8, "h": 1.25}, + {"matrix": [4,7], "x": 7, "y": 5, "h": 1.25}, + + {"matrix": [9,0], "x": 9.5, "y": 5, "h": 1.25}, + {"matrix": [9,1], "x": 10.5, "y": 4.8, "h": 1.25}, + {"matrix": [9,2], "x": 11.5, "y": 4.3, "w": 1.25}, + {"matrix": [9,4], "x": 12.75, "y": 4.2, "w": 1.25}, + {"matrix": [9,5], "x": 14, "y": 4.2, "w": 1.25}, + {"matrix": [9,6], "x": 15.25, "y": 4.75}, + {"matrix": [9,7], "x": 16.25, "y": 4.75, "w": 1.25} + ] + } + } +} diff --git a/keyboards/pmk/recore/v3/keymaps/default/keymap.c b/keyboards/pmk/recore/v3/keymaps/default/keymap.c new file mode 100644 index 00000000000..a48ed4c82de --- /dev/null +++ b/keyboards/pmk/recore/v3/keymaps/default/keymap.c @@ -0,0 +1,52 @@ +// Copyright 2024 Javier Oliver (@joliverMI) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum my_layers { + _QWERTY, + _NAV, + _SYMB, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( +//┌────────┬────────┬────────┬────────┬────────┬────────┬── L1 ──┬── X1 ──┐┌── X1 ──┬── L1 ──┬────────┬────────┬────────┬────────┬────────┬────────┐ + KC_GRV ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,MO(_SYMB),MO(_NAV),MO(_NAV),MO(_SYMB),KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS , +//├────────┼────────┼────────┼────────┼────────┼────────┼── X2 ──┼── X3 ──┤├── X3 ──┼── X2 ──┼────────┼────────┼────────┼────────┼────────┼────────┤ + KC_TAB ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,KC_LBRC ,KC_MPLY, KC_PAUS ,KC_RBRC , KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_EQL , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┘└────────┴────────┼────────┼────────┼────────┼────────┴────────┴────────┤ + KC_ESC ,KC_A ,KC_S ,KC_D ,KC_F ,KC_G , KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN ,KC_QUOT , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┐┌────────┬────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + KC_LSFT ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,KC_PGUP ,KC_PGDN , KC_HOME ,KC_END , KC_N ,KC_M ,KC_COMM ,KC_DOT ,KC_SLSH ,KC_RSFT , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘└────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + KC_LGUI ,KC_PMNS ,MO(_NAV) ,KC_LALT ,KC_LCTL ,KC_BSPC ,KC_DEL , KC_ENT, KC_SPC ,MO(_NAV),KC_RALT ,KC_RCTL ,KC_LEFT ,KC_RGHT +//└────────┴────────┴── T1 ──┴── T2 ──┴── T3 ──┴── T4 ──┴── T5 ──┘ └── T5 ──┴── T4 ──┴── T3 ──┴── T2 ──┴── T1 ──┴────────┴────────┘ + ), + [_SYMB] = LAYOUT( +//┌────────┬────────┬────────┬────────┬────────┬────────┬── L1 ──┬── X1 ──┐┌── X1 ──┬── L1 ──┬────────┬────────┬────────┬────────┬────────┬────────┐ + _______ ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,_______ ,_______, _______ ,_______ ,KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,_______ , +//├────────┼────────┼────────┼────────┼────────┼────────┼── X2 ──┼── X3 ──┤├── X3 ──┼── X2 ──┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______ ,KC_EXLM ,KC_AT ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,_______, _______ ,KC_RCBR ,KC_PSLS ,KC_P7 ,KC_P8 ,KC_P9 ,KC_PMNS ,_______ , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┘└────────┴────────┼────────┼────────┼────────┼────────┴────────┴────────┤ + _______ ,KC_HASH ,KC_DLR ,KC_LBRC ,KC_RBRC ,KC_GRV , KC_PAST ,KC_P4 ,KC_P5 ,KC_P6 ,KC_PPLS ,_______ , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┐┌────────┬────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ , _______ ,_______ ,KC_P0 ,KC_P1 ,KC_P2 ,KC_P3 ,KC_PENT ,_______ , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘└────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ , KC_ENT ,_______ ,_______ ,_______ ,KC_PDOT ,KC_PENT ,_______ +//└────────┴────────┴── T1 ──┴── T2 ──┴── T3 ──┴── T4 ──┴── T5 ──┘ └── T5 ──┴── T4 ──┴── T3 ──┴── T2 ──┴── T1 ──┴────────┴────────┘ + ), + [_NAV] = LAYOUT( +//┌────────┬────────┬────────┬────────┬────────┬────────┬── L1 ──┬── X1 ──┐┌── X1 ──┬── L1 ──┬────────┬────────┬────────┬────────┬────────┬────────┐ + _______ ,XXXXXXX ,XXXXXXX ,KC_UP ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_UP ,XXXXXXX ,XXXXXXX ,QK_BOOT , +//├────────┼────────┼────────┼────────┼────────┼────────┼── X2 ──┼── X3 ──┤├── X3 ──┼── X2 ──┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______ ,XXXXXXX ,XXXXXXX ,KC_UP ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_UP ,XXXXXXX ,XXXXXXX ,XXXXXXX , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┘└────────┴────────┼────────┼────────┼────────┼────────┴────────┴────────┤ + _______ ,KC_LEFT ,KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_RGHT , KC_LEFT ,KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_RGHT ,XXXXXXX , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┐┌────────┬────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______ ,XXXXXXX ,XXXXXXX ,KC_DOWN ,XXXXXXX ,XXXXXXX ,_______ ,_______ , _______ ,_______ ,XXXXXXX ,XXXXXXX ,KC_DOWN ,XXXXXXX ,XXXXXXX ,XXXXXXX , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘└────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______ ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX ,EE_CLR +//└────────┴────────┴── T1 ──┴── T2 ──┴── T3 ──┴── T4 ──┴── T5 ──┘ └── T5 ──┴── T4 ──┴── T3 ──┴── T2 ──┴── T1 ──┴────────┴────────┘ + ) +}; diff --git a/keyboards/pmk/recore/v3/keymaps/via/keymap.c b/keyboards/pmk/recore/v3/keymaps/via/keymap.c new file mode 100644 index 00000000000..a48ed4c82de --- /dev/null +++ b/keyboards/pmk/recore/v3/keymaps/via/keymap.c @@ -0,0 +1,52 @@ +// Copyright 2024 Javier Oliver (@joliverMI) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum my_layers { + _QWERTY, + _NAV, + _SYMB, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( +//┌────────┬────────┬────────┬────────┬────────┬────────┬── L1 ──┬── X1 ──┐┌── X1 ──┬── L1 ──┬────────┬────────┬────────┬────────┬────────┬────────┐ + KC_GRV ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,MO(_SYMB),MO(_NAV),MO(_NAV),MO(_SYMB),KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS , +//├────────┼────────┼────────┼────────┼────────┼────────┼── X2 ──┼── X3 ──┤├── X3 ──┼── X2 ──┼────────┼────────┼────────┼────────┼────────┼────────┤ + KC_TAB ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,KC_LBRC ,KC_MPLY, KC_PAUS ,KC_RBRC , KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_EQL , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┘└────────┴────────┼────────┼────────┼────────┼────────┴────────┴────────┤ + KC_ESC ,KC_A ,KC_S ,KC_D ,KC_F ,KC_G , KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN ,KC_QUOT , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┐┌────────┬────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + KC_LSFT ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,KC_PGUP ,KC_PGDN , KC_HOME ,KC_END , KC_N ,KC_M ,KC_COMM ,KC_DOT ,KC_SLSH ,KC_RSFT , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘└────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + KC_LGUI ,KC_PMNS ,MO(_NAV) ,KC_LALT ,KC_LCTL ,KC_BSPC ,KC_DEL , KC_ENT, KC_SPC ,MO(_NAV),KC_RALT ,KC_RCTL ,KC_LEFT ,KC_RGHT +//└────────┴────────┴── T1 ──┴── T2 ──┴── T3 ──┴── T4 ──┴── T5 ──┘ └── T5 ──┴── T4 ──┴── T3 ──┴── T2 ──┴── T1 ──┴────────┴────────┘ + ), + [_SYMB] = LAYOUT( +//┌────────┬────────┬────────┬────────┬────────┬────────┬── L1 ──┬── X1 ──┐┌── X1 ──┬── L1 ──┬────────┬────────┬────────┬────────┬────────┬────────┐ + _______ ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,_______ ,_______, _______ ,_______ ,KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,_______ , +//├────────┼────────┼────────┼────────┼────────┼────────┼── X2 ──┼── X3 ──┤├── X3 ──┼── X2 ──┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______ ,KC_EXLM ,KC_AT ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,_______, _______ ,KC_RCBR ,KC_PSLS ,KC_P7 ,KC_P8 ,KC_P9 ,KC_PMNS ,_______ , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┘└────────┴────────┼────────┼────────┼────────┼────────┴────────┴────────┤ + _______ ,KC_HASH ,KC_DLR ,KC_LBRC ,KC_RBRC ,KC_GRV , KC_PAST ,KC_P4 ,KC_P5 ,KC_P6 ,KC_PPLS ,_______ , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┐┌────────┬────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ , _______ ,_______ ,KC_P0 ,KC_P1 ,KC_P2 ,KC_P3 ,KC_PENT ,_______ , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘└────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ , KC_ENT ,_______ ,_______ ,_______ ,KC_PDOT ,KC_PENT ,_______ +//└────────┴────────┴── T1 ──┴── T2 ──┴── T3 ──┴── T4 ──┴── T5 ──┘ └── T5 ──┴── T4 ──┴── T3 ──┴── T2 ──┴── T1 ──┴────────┴────────┘ + ), + [_NAV] = LAYOUT( +//┌────────┬────────┬────────┬────────┬────────┬────────┬── L1 ──┬── X1 ──┐┌── X1 ──┬── L1 ──┬────────┬────────┬────────┬────────┬────────┬────────┐ + _______ ,XXXXXXX ,XXXXXXX ,KC_UP ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_UP ,XXXXXXX ,XXXXXXX ,QK_BOOT , +//├────────┼────────┼────────┼────────┼────────┼────────┼── X2 ──┼── X3 ──┤├── X3 ──┼── X2 ──┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______ ,XXXXXXX ,XXXXXXX ,KC_UP ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_UP ,XXXXXXX ,XXXXXXX ,XXXXXXX , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┘└────────┴────────┼────────┼────────┼────────┼────────┴────────┴────────┤ + _______ ,KC_LEFT ,KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_RGHT , KC_LEFT ,KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_RGHT ,XXXXXXX , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┐┌────────┬────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______ ,XXXXXXX ,XXXXXXX ,KC_DOWN ,XXXXXXX ,XXXXXXX ,_______ ,_______ , _______ ,_______ ,XXXXXXX ,XXXXXXX ,KC_DOWN ,XXXXXXX ,XXXXXXX ,XXXXXXX , +//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘└────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______ ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX ,EE_CLR +//└────────┴────────┴── T1 ──┴── T2 ──┴── T3 ──┴── T4 ──┴── T5 ──┘ └── T5 ──┴── T4 ──┴── T3 ──┴── T2 ──┴── T1 ──┴────────┴────────┘ + ) +}; diff --git a/keyboards/pmk/recore/v3/keymaps/via/rules.mk b/keyboards/pmk/recore/v3/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/pmk/recore/v3/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/pmk/recore/v3/readme.md b/keyboards/pmk/recore/v3/readme.md new file mode 100644 index 00000000000..2e346263f80 --- /dev/null +++ b/keyboards/pmk/recore/v3/readme.md @@ -0,0 +1,27 @@ +# recorev3 + +![recorev3](https://i.imgur.com/28fVsP3.jpeg) + +The Posey Recore keyboard is an ortholinear keyboard designed from the gournd up for gaming. By pushing the left half of your split keyboard out of the way, you'll be able to game with better posture and increase mouse movement. The thumb cluster arc can be remapped to control and shift for use in gaming. + +* Keyboard Maintainer: [Javier Oliver](https://github.com/joliverMI) +* Hardware Supported: recore_v3 and logic_module_v1 +* Hardware Availability: [poseysmechanicalkeyboards.com](https://poseysmechanicalkeyboards.com/) + +Make example for this keyboard (after setting up your build environment): + + make pmk/recore/v3:default + +Flashing example for this keyboard: + + make pmk/recore/v3: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key Escape and plug in the keyboard +* **Physical reset button**: Hold the button on the bottom of the keyboard while you plug in the USB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/pmk/recore/v3/rules.mk b/keyboards/pmk/recore/v3/rules.mk new file mode 100644 index 00000000000..161ec22b16e --- /dev/null +++ b/keyboards/pmk/recore/v3/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = vendor From e891109c4e115a303e109b179bf9d24edbdd7ad7 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 28 Mar 2024 22:23:13 -0700 Subject: [PATCH 066/333] P3D Spacey Layout Updates (#23329) --- keyboards/p3d/spacey/keyboard.json | 354 ++++++++++++++---- keyboards/p3d/spacey/keymaps/default/keymap.c | 31 +- keyboards/p3d/spacey/keymaps/via/keymap.c | 44 +-- keyboards/p3d/spacey/matrix_diagram.md | 21 ++ keyboards/p3d/spacey/readme.md | 2 +- 5 files changed, 339 insertions(+), 113 deletions(-) create mode 100644 keyboards/p3d/spacey/matrix_diagram.md diff --git a/keyboards/p3d/spacey/keyboard.json b/keyboards/p3d/spacey/keyboard.json index d51e1dc32ca..ed23c327ade 100644 --- a/keyboards/p3d/spacey/keyboard.json +++ b/keyboards/p3d/spacey/keyboard.json @@ -30,82 +30,294 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT": { + "LAYOUT_all": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [0, 13], "x": 14.5, "y": 0, "w": 2}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [1, 6], "x": 6, "y": 1}, - {"matrix": [1, 7], "x": 7, "y": 1}, - {"matrix": [1, 8], "x": 8, "y": 1}, - {"matrix": [1, 9], "x": 9, "y": 1}, - {"matrix": [1, 10], "x": 10, "y": 1}, - {"matrix": [1, 11], "x": 11, "y": 1}, - {"matrix": [1, 12], "x": 12, "y": 1}, - {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [4, 3], "x": 17.5, "y": 0}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [2, 6], "x": 6, "y": 2}, - {"matrix": [2, 7], "x": 7, "y": 2}, - {"matrix": [2, 8], "x": 8, "y": 2}, - {"matrix": [2, 9], "x": 9, "y": 2}, - {"matrix": [2, 10], "x": 10, "y": 2}, - {"matrix": [2, 11], "x": 11, "y": 2}, - {"matrix": [2, 12], "x": 12, "y": 2}, - {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 2.5, "y": 1}, + {"matrix": [1, 2], "x": 3.5, "y": 1}, + {"matrix": [1, 3], "x": 4.5, "y": 1}, + {"matrix": [1, 4], "x": 5.5, "y": 1}, + {"matrix": [1, 5], "x": 6.5, "y": 1}, + {"matrix": [1, 6], "x": 7.5, "y": 1}, + {"matrix": [1, 7], "x": 8.5, "y": 1}, + {"matrix": [1, 8], "x": 9.5, "y": 1}, + {"matrix": [1, 9], "x": 10.5, "y": 1}, + {"matrix": [1, 10], "x": 11.5, "y": 1}, + {"matrix": [1, 11], "x": 12.5, "y": 1}, + {"matrix": [1, 12], "x": 13.5, "y": 1}, + {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 4], "x": 4, "y": 3}, - {"matrix": [3, 5], "x": 5, "y": 3}, - {"matrix": [3, 6], "x": 6, "y": 3}, - {"matrix": [3, 7], "x": 7, "y": 3}, - {"matrix": [3, 8], "x": 8, "y": 3}, - {"matrix": [3, 9], "x": 9, "y": 3}, - {"matrix": [3, 10], "x": 10, "y": 3}, - {"matrix": [3, 11], "x": 11, "y": 3}, - {"matrix": [3, 12], "x": 12, "y": 3}, - {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2.5, "y": 2}, + {"matrix": [2, 2], "x": 3.5, "y": 2}, + {"matrix": [2, 3], "x": 4.5, "y": 2}, + {"matrix": [2, 4], "x": 5.5, "y": 2}, + {"matrix": [2, 5], "x": 6.5, "y": 2}, + {"matrix": [2, 6], "x": 7.5, "y": 2}, + {"matrix": [2, 7], "x": 8.5, "y": 2}, + {"matrix": [2, 8], "x": 9.5, "y": 2}, + {"matrix": [2, 9], "x": 10.5, "y": 2}, + {"matrix": [2, 10], "x": 11.5, "y": 2}, + {"matrix": [2, 11], "x": 12.5, "y": 2}, + {"matrix": [2, 12], "x": 13.5, "y": 2, "w": 2.25}, - {"matrix": [4, 0], "x": 0, "y": 4}, - {"matrix": [4, 1], "x": 1, "y": 4}, - {"matrix": [4, 2], "x": 2, "y": 4}, - {"matrix": [4, 3], "x": 3, "y": 4}, - {"matrix": [4, 4], "x": 4, "y": 4}, - {"matrix": [4, 5], "x": 5, "y": 4}, - {"matrix": [4, 6], "x": 6, "y": 4}, - {"matrix": [4, 7], "x": 7, "y": 4}, - {"matrix": [4, 8], "x": 8, "y": 4}, - {"matrix": [4, 9], "x": 9, "y": 4}, - {"matrix": [4, 10], "x": 10, "y": 4}, - {"matrix": [4, 11], "x": 11, "y": 4}, - {"matrix": [4, 12], "x": 12, "y": 4}, - {"matrix": [4, 13], "x": 13, "y": 4} + {"matrix": [2, 13], "x": 17.5, "y": 2}, + + {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.5, "y": 3}, + {"matrix": [3, 2], "x": 3.5, "y": 3}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3}, + {"matrix": [3, 6], "x": 7.5, "y": 3}, + {"matrix": [3, 7], "x": 8.5, "y": 3}, + {"matrix": [3, 8], "x": 9.5, "y": 3}, + {"matrix": [3, 9], "x": 10.5, "y": 3}, + {"matrix": [3, 10], "x": 11.5, "y": 3}, + {"matrix": [3, 11], "x": 12.5, "y": 3, "w": 2.75}, + + {"matrix": [3, 12], "x": 16.5, "y": 3}, + {"matrix": [3, 13], "x": 17.5, "y": 3}, + {"matrix": [4, 13], "x": 18.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5, "y": 4, "w": 2.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_upper_spacebars": { + "layout": [ + {"matrix": [0, 4], "x": 1.75, "y": 0, "w": 6.25}, + {"matrix": [0, 8], "x": 8, "y": 0, "w": 6.25}, + {"matrix": [0, 13], "x": 14.25, "y": 0, "w": 2}, + + {"matrix": [4, 3], "x": 17.5, "y": 0}, + + {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 2.5, "y": 1}, + {"matrix": [1, 2], "x": 3.5, "y": 1}, + {"matrix": [1, 3], "x": 4.5, "y": 1}, + {"matrix": [1, 4], "x": 5.5, "y": 1}, + {"matrix": [1, 5], "x": 6.5, "y": 1}, + {"matrix": [1, 6], "x": 7.5, "y": 1}, + {"matrix": [1, 7], "x": 8.5, "y": 1}, + {"matrix": [1, 8], "x": 9.5, "y": 1}, + {"matrix": [1, 9], "x": 10.5, "y": 1}, + {"matrix": [1, 10], "x": 11.5, "y": 1}, + {"matrix": [1, 11], "x": 12.5, "y": 1}, + {"matrix": [1, 12], "x": 13.5, "y": 1}, + {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2.5, "y": 2}, + {"matrix": [2, 2], "x": 3.5, "y": 2}, + {"matrix": [2, 3], "x": 4.5, "y": 2}, + {"matrix": [2, 4], "x": 5.5, "y": 2}, + {"matrix": [2, 5], "x": 6.5, "y": 2}, + {"matrix": [2, 6], "x": 7.5, "y": 2}, + {"matrix": [2, 7], "x": 8.5, "y": 2}, + {"matrix": [2, 8], "x": 9.5, "y": 2}, + {"matrix": [2, 9], "x": 10.5, "y": 2}, + {"matrix": [2, 10], "x": 11.5, "y": 2}, + {"matrix": [2, 11], "x": 12.5, "y": 2}, + {"matrix": [2, 12], "x": 13.5, "y": 2, "w": 2.25}, + + {"matrix": [2, 13], "x": 17.5, "y": 2}, + + {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.5, "y": 3}, + {"matrix": [3, 2], "x": 3.5, "y": 3}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3}, + {"matrix": [3, 6], "x": 7.5, "y": 3}, + {"matrix": [3, 7], "x": 8.5, "y": 3}, + {"matrix": [3, 8], "x": 9.5, "y": 3}, + {"matrix": [3, 9], "x": 10.5, "y": 3}, + {"matrix": [3, 10], "x": 11.5, "y": 3}, + {"matrix": [3, 11], "x": 12.5, "y": 3, "w": 2.75}, + + {"matrix": [3, 12], "x": 16.5, "y": 3}, + {"matrix": [3, 13], "x": 17.5, "y": 3}, + {"matrix": [4, 13], "x": 18.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5, "y": 4, "w": 2.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_625_space": { + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [0, 13], "x": 14.5, "y": 0, "w": 2}, + + {"matrix": [4, 3], "x": 17.5, "y": 0}, + + {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 2.5, "y": 1}, + {"matrix": [1, 2], "x": 3.5, "y": 1}, + {"matrix": [1, 3], "x": 4.5, "y": 1}, + {"matrix": [1, 4], "x": 5.5, "y": 1}, + {"matrix": [1, 5], "x": 6.5, "y": 1}, + {"matrix": [1, 6], "x": 7.5, "y": 1}, + {"matrix": [1, 7], "x": 8.5, "y": 1}, + {"matrix": [1, 8], "x": 9.5, "y": 1}, + {"matrix": [1, 9], "x": 10.5, "y": 1}, + {"matrix": [1, 10], "x": 11.5, "y": 1}, + {"matrix": [1, 11], "x": 12.5, "y": 1}, + {"matrix": [1, 12], "x": 13.5, "y": 1}, + {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2.5, "y": 2}, + {"matrix": [2, 2], "x": 3.5, "y": 2}, + {"matrix": [2, 3], "x": 4.5, "y": 2}, + {"matrix": [2, 4], "x": 5.5, "y": 2}, + {"matrix": [2, 5], "x": 6.5, "y": 2}, + {"matrix": [2, 6], "x": 7.5, "y": 2}, + {"matrix": [2, 7], "x": 8.5, "y": 2}, + {"matrix": [2, 8], "x": 9.5, "y": 2}, + {"matrix": [2, 9], "x": 10.5, "y": 2}, + {"matrix": [2, 10], "x": 11.5, "y": 2}, + {"matrix": [2, 11], "x": 12.5, "y": 2}, + {"matrix": [2, 12], "x": 13.5, "y": 2, "w": 2.25}, + + {"matrix": [2, 13], "x": 17.5, "y": 2}, + + {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.5, "y": 3}, + {"matrix": [3, 2], "x": 3.5, "y": 3}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3}, + {"matrix": [3, 6], "x": 7.5, "y": 3}, + {"matrix": [3, 7], "x": 8.5, "y": 3}, + {"matrix": [3, 8], "x": 9.5, "y": 3}, + {"matrix": [3, 9], "x": 10.5, "y": 3}, + {"matrix": [3, 10], "x": 11.5, "y": 3}, + {"matrix": [3, 11], "x": 12.5, "y": 3, "w": 2.75}, + + {"matrix": [3, 12], "x": 16.5, "y": 3}, + {"matrix": [3, 13], "x": 17.5, "y": 3}, + {"matrix": [4, 13], "x": 18.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_625_space_upper_spacebars": { + "layout": [ + {"matrix": [0, 4], "x": 1.75, "y": 0, "w": 6.25}, + {"matrix": [0, 8], "x": 8, "y": 0, "w": 6.25}, + {"matrix": [0, 13], "x": 14.25, "y": 0, "w": 2}, + + {"matrix": [4, 3], "x": 17.5, "y": 0}, + + {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 2.5, "y": 1}, + {"matrix": [1, 2], "x": 3.5, "y": 1}, + {"matrix": [1, 3], "x": 4.5, "y": 1}, + {"matrix": [1, 4], "x": 5.5, "y": 1}, + {"matrix": [1, 5], "x": 6.5, "y": 1}, + {"matrix": [1, 6], "x": 7.5, "y": 1}, + {"matrix": [1, 7], "x": 8.5, "y": 1}, + {"matrix": [1, 8], "x": 9.5, "y": 1}, + {"matrix": [1, 9], "x": 10.5, "y": 1}, + {"matrix": [1, 10], "x": 11.5, "y": 1}, + {"matrix": [1, 11], "x": 12.5, "y": 1}, + {"matrix": [1, 12], "x": 13.5, "y": 1}, + {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2.5, "y": 2}, + {"matrix": [2, 2], "x": 3.5, "y": 2}, + {"matrix": [2, 3], "x": 4.5, "y": 2}, + {"matrix": [2, 4], "x": 5.5, "y": 2}, + {"matrix": [2, 5], "x": 6.5, "y": 2}, + {"matrix": [2, 6], "x": 7.5, "y": 2}, + {"matrix": [2, 7], "x": 8.5, "y": 2}, + {"matrix": [2, 8], "x": 9.5, "y": 2}, + {"matrix": [2, 9], "x": 10.5, "y": 2}, + {"matrix": [2, 10], "x": 11.5, "y": 2}, + {"matrix": [2, 11], "x": 12.5, "y": 2}, + {"matrix": [2, 12], "x": 13.5, "y": 2, "w": 2.25}, + + {"matrix": [2, 13], "x": 17.5, "y": 2}, + + {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.5, "y": 3}, + {"matrix": [3, 2], "x": 3.5, "y": 3}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3}, + {"matrix": [3, 6], "x": 7.5, "y": 3}, + {"matrix": [3, 7], "x": 8.5, "y": 3}, + {"matrix": [3, 8], "x": 9.5, "y": 3}, + {"matrix": [3, 9], "x": 10.5, "y": 3}, + {"matrix": [3, 10], "x": 11.5, "y": 3}, + {"matrix": [3, 11], "x": 12.5, "y": 3, "w": 2.75}, + + {"matrix": [3, 12], "x": 16.5, "y": 3}, + {"matrix": [3, 13], "x": 17.5, "y": 3}, + {"matrix": [4, 13], "x": 18.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/p3d/spacey/keymaps/default/keymap.c b/keyboards/p3d/spacey/keymaps/default/keymap.c index 8d0b1383901..19bc5323b86 100644 --- a/keyboards/p3d/spacey/keymaps/default/keymap.c +++ b/keyboards/p3d/spacey/keymaps/default/keymap.c @@ -14,7 +14,6 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#define FN MO(_FN) // Defines names for use in layer keycodes and the keymap enum layer_names { @@ -22,26 +21,20 @@ enum layer_names { _FN }; -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - [_BASE] = 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, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_UP, - KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT,KC_SLSH,KC_RSFT, KC_LEFT, KC_DOWN, - KC_LCTL, KC_LGUI, FN, KC_MUTE, KC_LALT, KC_SPC, KC_NO, KC_BSPC, KC_DEL, KC_NO, KC_RALT, KC_RGUI, KC_RCTL, KC_RGHT + [_BASE] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_UP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, + KC_LCTL, KC_LGUI, MO(1), KC_LALT, KC_SPC, KC_BSPC, KC_DEL, KC_RALT, KC_RGUI, KC_RCTL ), - [_FN] = LAYOUT( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, - KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT, KC_MS_U, - KC_LSFT,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_COMM,KC_DOT,KC_SLSH,KC_RSFT, KC_MS_L, KC_MS_D, - KC_LCTL, KC_LGUI, KC_NO, KC_ESC, KC_LALT, KC_SPC, KC_NO, KC_BSPC, KC_RALT, KC_NO, KC_APP, KC_RGUI, KC_RCTL, KC_MS_R + [_FN] = LAYOUT_all( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, KC_ESC, + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT, KC_MS_U, + KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_MS_L, KC_MS_D, KC_MS_R, + KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_SPC, KC_BSPC, KC_RALT, KC_APP, KC_RGUI, KC_RCTL ) }; diff --git a/keyboards/p3d/spacey/keymaps/via/keymap.c b/keyboards/p3d/spacey/keymaps/via/keymap.c index 17dec84fc74..bdd9c0972b7 100644 --- a/keyboards/p3d/spacey/keymaps/via/keymap.c +++ b/keyboards/p3d/spacey/keymaps/via/keymap.c @@ -17,32 +17,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - [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, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_UP, - KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT,KC_SLSH,KC_RSFT, KC_LEFT, KC_DOWN, - KC_LCTL, KC_LGUI, MO(1), KC_MUTE, KC_LALT, KC_SPC, KC_NO, KC_BSPC, KC_DEL, KC_NO, KC_RALT, KC_RGUI, KC_RCTL, KC_RGHT + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_UP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, + KC_LCTL, KC_LGUI, MO(1), KC_LALT, KC_SPC, KC_BSPC, KC_DEL, KC_RALT, KC_RGUI, KC_RCTL ), - [1] = LAYOUT( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, - KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT, KC_MS_U, - KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_COMM,KC_DOT,KC_SLSH,KC_RSFT, KC_MS_L, KC_MS_D, - KC_LCTL, KC_LGUI, KC_NO, KC_ESC, KC_LALT, KC_SPC, KC_NO, KC_BSPC, KC_RALT, KC_NO, KC_APP, KC_RGUI, KC_RCTL, KC_MS_R + [1] = LAYOUT_all( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, KC_ESC, + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT, KC_MS_U, + KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_MS_L, KC_MS_D, KC_MS_R, + KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_SPC, KC_BSPC, KC_RALT, KC_APP, KC_RGUI, KC_RCTL ), - [2] = LAYOUT( + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT( + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/p3d/spacey/matrix_diagram.md b/keyboards/p3d/spacey/matrix_diagram.md new file mode 100644 index 00000000000..afb8549c8f0 --- /dev/null +++ b/keyboards/p3d/spacey/matrix_diagram.md @@ -0,0 +1,21 @@ +# Matrix Diagram for vanilla spacey + +``` + ┌────────────────────────┬────────────────────────┬───────┐ + │04 │08 │0D │ Upper Spacebars + └────────────────────────┴────────────────────────┴───────┘ + ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐ + │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │ │43 │ + ┌─┴───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼─────┬─┘ └───┘ + │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ + ┌┴─────┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴────┬┘ ┌───┐ + │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │ │2D │ + ┌─┴──────┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴──────┬─┘ ┌───┼───┼───┐ + │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │ │3C │3D │4D │ +┌┴───┬────┼───┴┬──┴─┬─┴───┴──┬┴───┴───┴─┬─┴──┬┴───┼────┬────┬┘ └───┴───┴───┘ +│40 │41 │42 │44 │45 │47 │48 │4A │4B │4C │ +└────┴────┴────┴────┴────────┴──────────┴────┴────┴────┴────┘ + ┌────────────────────────┐ + │45 │ 6.25u Spacebar + └────────────────────────┘ +``` diff --git a/keyboards/p3d/spacey/readme.md b/keyboards/p3d/spacey/readme.md index 252cc39f86b..e3c5a4b5c80 100644 --- a/keyboards/p3d/spacey/readme.md +++ b/keyboards/p3d/spacey/readme.md @@ -6,7 +6,7 @@ Spacey, designed by Vanilla Keyboards is a 45/65% keyboard with a little persona * Keyboard Maintainer: [vanilla](https://github.com/vanillakeyboards) * Hardware Supported: Elite C, Spacey PCB plates and acrylic drop_in case -* Hardware Availability: [P3D Store](https://p3dstore.com/collections/ended-group-buys/products/spacey?variant=37742593147064) +* Hardware Availability: [~~P3D Store~~](https://p3dstore.com/collections/ended-group-buys/products/spacey?variant=37742593147064) (no longer available) Make example for this keyboard (after setting up your build environment): From d0cf7b85192ce4431bb4c8c57e2d7501df83ac43 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 30 Mar 2024 03:57:21 +1100 Subject: [PATCH 067/333] Update GPIO expander API naming (#23375) --- drivers/gpio/mcp23018.c | 8 ++++---- drivers/gpio/mcp23018.h | 9 +++++++-- drivers/gpio/pca9505.c | 4 ++-- drivers/gpio/pca9505.h | 6 +++++- drivers/gpio/pca9555.c | 8 ++++---- drivers/gpio/pca9555.h | 9 +++++++-- keyboards/geistmaschine/macropod/matrix.c | 2 +- keyboards/ktec/ergodone/matrix.c | 2 +- keyboards/mechwild/sugarglider/matrix.c | 2 +- keyboards/moon/matrix.c | 4 ++-- keyboards/switchplate/southpaw_65/matrix.c | 6 +++--- keyboards/viktus/sp111/matrix.c | 2 +- keyboards/xiudi/xd84/matrix.c | 6 +++--- keyboards/xiudi/xd96/matrix.c | 6 +++--- 14 files changed, 44 insertions(+), 30 deletions(-) diff --git a/drivers/gpio/mcp23018.c b/drivers/gpio/mcp23018.c index 3eca4f9d34c..0791db08dda 100644 --- a/drivers/gpio/mcp23018.c +++ b/drivers/gpio/mcp23018.c @@ -74,20 +74,20 @@ bool mcp23018_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB) { return true; } -bool mcp23018_readPins(uint8_t slave_addr, mcp23018_port_t port, uint8_t* out) { +bool mcp23018_read_pins(uint8_t slave_addr, mcp23018_port_t port, uint8_t* out) { uint8_t addr = SLAVE_TO_ADDR(slave_addr); uint8_t cmd = port ? CMD_GPIOB : CMD_GPIOA; i2c_status_t ret = i2c_read_register(addr, cmd, out, sizeof(uint8_t), TIMEOUT); if (ret != I2C_STATUS_SUCCESS) { - dprintf("mcp23018_readPins::FAILED::%u\n", ret); + dprintf("mcp23018_read_pins::FAILED::%u\n", ret); return false; } return true; } -bool mcp23018_readPins_all(uint8_t slave_addr, uint16_t* out) { +bool mcp23018_read_pins_all(uint8_t slave_addr, uint16_t* out) { uint8_t addr = SLAVE_TO_ADDR(slave_addr); typedef union { @@ -99,7 +99,7 @@ bool mcp23018_readPins_all(uint8_t slave_addr, uint16_t* out) { i2c_status_t ret = i2c_read_register(addr, CMD_GPIOA, &data.u8[0], sizeof(data), TIMEOUT); if (ret != I2C_STATUS_SUCCESS) { - dprintf("mcp23018_readPins::FAILED::%u\n", ret); + dprintf("mcp23018_read_pins_all::FAILED::%u\n", ret); return false; } diff --git a/drivers/gpio/mcp23018.h b/drivers/gpio/mcp23018.h index e7c2730dd15..98c818fb8d5 100644 --- a/drivers/gpio/mcp23018.h +++ b/drivers/gpio/mcp23018.h @@ -55,11 +55,16 @@ bool mcp23018_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB); /** * Read state of a given port */ -bool mcp23018_readPins(uint8_t slave_addr, mcp23018_port_t port, uint8_t* ret); +bool mcp23018_read_pins(uint8_t slave_addr, mcp23018_port_t port, uint8_t* ret); /** * Read state of both ports sequentially * * - slightly faster than multiple readPins */ -bool mcp23018_readPins_all(uint8_t slave_addr, uint16_t* ret); +bool mcp23018_read_pins_all(uint8_t slave_addr, uint16_t* ret); + +// DEPRECATED - DO NOT USE + +#define mcp23018_readPins mcp23018_read_pins +#define mcp23018_readPins_all mcp23018_read_pins_all diff --git a/drivers/gpio/pca9505.c b/drivers/gpio/pca9505.c index 5617a14a8b1..d1adc61a237 100644 --- a/drivers/gpio/pca9505.c +++ b/drivers/gpio/pca9505.c @@ -133,7 +133,7 @@ bool pca9505_set_output(uint8_t slave_addr, pca9505_port_t port, uint8_t conf) { return true; } -bool pca9505_readPins(uint8_t slave_addr, pca9505_port_t port, uint8_t* out) { +bool pca9505_read_pins(uint8_t slave_addr, pca9505_port_t port, uint8_t* out) { uint8_t addr = SLAVE_TO_ADDR(slave_addr); uint8_t cmd = 0; switch (port) { @@ -156,7 +156,7 @@ bool pca9505_readPins(uint8_t slave_addr, pca9505_port_t port, uint8_t* out) { i2c_status_t ret = i2c_read_register(addr, cmd, out, sizeof(uint8_t), TIMEOUT); if (ret != I2C_STATUS_SUCCESS) { - print("pca9505_readPins::FAILED\n"); + print("pca9505_read_pins::FAILED\n"); return false; } diff --git a/drivers/gpio/pca9505.h b/drivers/gpio/pca9505.h index 732ddb88ead..0cec8610d94 100644 --- a/drivers/gpio/pca9505.h +++ b/drivers/gpio/pca9505.h @@ -64,4 +64,8 @@ bool pca9505_set_output(uint8_t slave_addr, pca9505_port_t port, uint8_t conf); /** * Read state of a given port */ -bool pca9505_readPins(uint8_t slave_addr, pca9505_port_t port, uint8_t* ret); +bool pca9505_read_pins(uint8_t slave_addr, pca9505_port_t port, uint8_t* ret); + +// DEPRECATED - DO NOT USE + +#define pca9505_readPins pca9505_read_pins diff --git a/drivers/gpio/pca9555.c b/drivers/gpio/pca9555.c index 0fc30099ac3..28b74e1a700 100644 --- a/drivers/gpio/pca9555.c +++ b/drivers/gpio/pca9555.c @@ -70,20 +70,20 @@ bool pca9555_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB) { return true; } -bool pca9555_readPins(uint8_t slave_addr, pca9555_port_t port, uint8_t* out) { +bool pca9555_read_pins(uint8_t slave_addr, pca9555_port_t port, uint8_t* out) { uint8_t addr = SLAVE_TO_ADDR(slave_addr); uint8_t cmd = port ? CMD_INPUT_1 : CMD_INPUT_0; i2c_status_t ret = i2c_read_register(addr, cmd, out, sizeof(uint8_t), TIMEOUT); if (ret != I2C_STATUS_SUCCESS) { - print("pca9555_readPins::FAILED\n"); + print("pca9555_read_pins::FAILED\n"); return false; } return true; } -bool pca9555_readPins_all(uint8_t slave_addr, uint16_t* out) { +bool pca9555_read_pins_all(uint8_t slave_addr, uint16_t* out) { uint8_t addr = SLAVE_TO_ADDR(slave_addr); typedef union { @@ -95,7 +95,7 @@ bool pca9555_readPins_all(uint8_t slave_addr, uint16_t* out) { i2c_status_t ret = i2c_read_register(addr, CMD_INPUT_0, &data.u8[0], sizeof(data), TIMEOUT); if (ret != I2C_STATUS_SUCCESS) { - print("pca9555_readPins_all::FAILED\n"); + print("pca9555_read_pins_all::FAILED\n"); return false; } diff --git a/drivers/gpio/pca9555.h b/drivers/gpio/pca9555.h index 6362ab68aeb..f089022e84f 100644 --- a/drivers/gpio/pca9555.h +++ b/drivers/gpio/pca9555.h @@ -78,11 +78,16 @@ bool pca9555_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB); /** * Read state of a given port */ -bool pca9555_readPins(uint8_t slave_addr, pca9555_port_t port, uint8_t* ret); +bool pca9555_read_pins(uint8_t slave_addr, pca9555_port_t port, uint8_t* ret); /** * Read state of both ports sequentially * * - slightly faster than multiple readPins */ -bool pca9555_readPins_all(uint8_t slave_addr, uint16_t* ret); +bool pca9555_read_pins_all(uint8_t slave_addr, uint16_t* ret); + +// DEPRECATED - DO NOT USE + +#define pca9555_readPins pca9555_read_pins +#define pca9555_readPins_all pca9555_read_pins_all diff --git a/keyboards/geistmaschine/macropod/matrix.c b/keyboards/geistmaschine/macropod/matrix.c index 60b1dafe637..ebc10e2e5ad 100644 --- a/keyboards/geistmaschine/macropod/matrix.c +++ b/keyboards/geistmaschine/macropod/matrix.c @@ -55,7 +55,7 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { pca9555_setup(); } // Read the entire port into this byte, 1 = not pressed, 0 = pressed - bool ret = pca9555_readPins(IC1, PCA9555_PORT0, &pin_states); + bool ret = pca9555_read_pins(IC1, PCA9555_PORT0, &pin_states); // Update state if (ret) { diff --git a/keyboards/ktec/ergodone/matrix.c b/keyboards/ktec/ergodone/matrix.c index cb845db1bc7..a9a517f2f12 100644 --- a/keyboards/ktec/ergodone/matrix.c +++ b/keyboards/ktec/ergodone/matrix.c @@ -49,7 +49,7 @@ static matrix_row_t expander_read_row(void) { } uint8_t ret = 0xFF; - mcp23018_errors += !mcp23018_readPins(I2C_ADDR, mcp23018_PORTA, &ret); + mcp23018_errors += !mcp23018_read_pins(I2C_ADDR, mcp23018_PORTA, &ret); ret = bitrev(~ret); ret = ((ret & 0b11111000) >> 1) | (ret & 0b00000011); diff --git a/keyboards/mechwild/sugarglider/matrix.c b/keyboards/mechwild/sugarglider/matrix.c index c76a8345d3b..2fa384ed227 100644 --- a/keyboards/mechwild/sugarglider/matrix.c +++ b/keyboards/mechwild/sugarglider/matrix.c @@ -38,7 +38,7 @@ static matrix_row_t read_cols(void) { } uint8_t ret = 0xFF; // sets all to 1 - mcp23018_errors += !mcp23018_readPins(I2C_ADDR, mcp23018_PORTB, &ret); // will update with values 0 = pulled down by connection, 1 = pulled up by pullup resistors + mcp23018_errors += !mcp23018_read_pins(I2C_ADDR, mcp23018_PORTB, &ret); // will update with values 0 = pulled down by connection, 1 = pulled up by pullup resistors return (~ret) & 0b00111111; // Clears out the two row bits in the B buffer. } diff --git a/keyboards/moon/matrix.c b/keyboards/moon/matrix.c index bb46e1b576f..8c9b6214dba 100644 --- a/keyboards/moon/matrix.c +++ b/keyboards/moon/matrix.c @@ -145,8 +145,8 @@ static void select_row(uint8_t row) { static uint16_t read_cols(void) { uint8_t state_1 = 0; uint8_t state_2 = 0; - pca9555_readPins(IC2, PCA9555_PORT0, &state_1); - pca9555_readPins(IC2, PCA9555_PORT1, &state_2); + pca9555_read_pins(IC2, PCA9555_PORT0, &state_1); + pca9555_read_pins(IC2, PCA9555_PORT1, &state_2); uint16_t state = (((uint16_t)state_1 & PORT0_COLS_MASK) << 3) | (((uint16_t)state_2 & PORT1_COLS_MASK)); diff --git a/keyboards/switchplate/southpaw_65/matrix.c b/keyboards/switchplate/southpaw_65/matrix.c index e24dcef8535..a7008e9c7d0 100644 --- a/keyboards/switchplate/southpaw_65/matrix.c +++ b/keyboards/switchplate/southpaw_65/matrix.c @@ -54,9 +54,9 @@ static uint32_t read_cols(void) { uint8_t state_1 = 0; uint8_t state_2 = 0; uint8_t state_3 = 0; - pca9555_readPins(IC1, PCA9555_PORT1, &state_1); - pca9555_readPins(IC2, PCA9555_PORT0, &state_2); - pca9555_readPins(IC2, PCA9555_PORT1, &state_3); + pca9555_read_pins(IC1, PCA9555_PORT1, &state_1); + pca9555_read_pins(IC2, PCA9555_PORT0, &state_2); + pca9555_read_pins(IC2, PCA9555_PORT1, &state_3); uint32_t state = ((((uint32_t)state_3 & 0b01111111) << 12) | ((uint32_t)state_2 << 4) | (((uint32_t)state_1 & 0b11110000) >> 4)); return ~state; diff --git a/keyboards/viktus/sp111/matrix.c b/keyboards/viktus/sp111/matrix.c index 33b232dca77..a39365cef60 100644 --- a/keyboards/viktus/sp111/matrix.c +++ b/keyboards/viktus/sp111/matrix.c @@ -117,7 +117,7 @@ static void select_row_MCP23018(uint8_t row) { static uint16_t read_cols_MCP23018(void) { uint16_t tmp = 0xFFFF; - mcp23018_errors += !mcp23018_readPins_all(I2C_ADDR, &tmp); + mcp23018_errors += !mcp23018_read_pins_all(I2C_ADDR, &tmp); uint16_t state = ((tmp & 0b11111111) << 2) | ((tmp & 0b0110000000000000) >> 13); return (~state) & 0b1111111111; diff --git a/keyboards/xiudi/xd84/matrix.c b/keyboards/xiudi/xd84/matrix.c index 04128561eef..d92ac83b4a7 100644 --- a/keyboards/xiudi/xd84/matrix.c +++ b/keyboards/xiudi/xd84/matrix.c @@ -51,10 +51,10 @@ static void select_row(uint8_t row) { } static uint16_t read_cols(void) { - // uint16_t state_1 = pca9555_readPins(IC2, PCA9555_PORT0); - // uint16_t state_2 = pca9555_readPins(IC2, PCA9555_PORT1); + // uint16_t state_1 = pca9555_read_pins(IC2, PCA9555_PORT0); + // uint16_t state_2 = pca9555_read_pins(IC2, PCA9555_PORT1); uint16_t state = 0; - pca9555_readPins_all(IC2, &state); + pca9555_read_pins_all(IC2, &state); // For the XD84 all cols are on the same IC and mapped sequentially // while this technically gives 16 column reads, diff --git a/keyboards/xiudi/xd96/matrix.c b/keyboards/xiudi/xd96/matrix.c index beef7fae126..641202ca2c9 100644 --- a/keyboards/xiudi/xd96/matrix.c +++ b/keyboards/xiudi/xd96/matrix.c @@ -53,9 +53,9 @@ static uint32_t read_cols(void) { uint8_t state_1 = 0; uint8_t state_2 = 0; uint8_t state_3 = 0; - pca9555_readPins(IC2, PCA9555_PORT0, &state_1); - pca9555_readPins(IC2, PCA9555_PORT1, &state_2); - pca9555_readPins(IC1, PCA9555_PORT1, &state_3); + pca9555_read_pins(IC2, PCA9555_PORT0, &state_1); + pca9555_read_pins(IC2, PCA9555_PORT1, &state_2); + pca9555_read_pins(IC1, PCA9555_PORT1, &state_3); // For the XD96 the pins are mapped to port expanders as follows: // all 8 pins port 0 IC2, first 6 pins port 1 IC2, first 4 pins port 1 IC1 From c52ad5c38e9596e871222572cbe164e80c36d7e4 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 30 Mar 2024 00:16:17 +0000 Subject: [PATCH 068/333] tidy keymap of 60_ansi_arrow Community Layout (#23301) --- .../60_ansi_arrow/default_60_ansi_arrow/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c b/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c index 9540ce43f89..c0baf9f47a7 100644 --- a/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c +++ b/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c @@ -18,10 +18,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘ */ [0] = LAYOUT_60_ansi_arrow( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT ) }; From 696bf80375bbcf8feea6b259e5d97ecfefd49f37 Mon Sep 17 00:00:00 2001 From: Victor Camargo Date: Fri, 29 Mar 2024 22:00:41 -0300 Subject: [PATCH 069/333] Clearer text about double tapping reset only working for boot after already having QMK running in board (#23042) Co-authored-by: Drashna Jaelre --- docs/flashing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/flashing.md b/docs/flashing.md index 113d90ca38f..95b36804100 100644 --- a/docs/flashing.md +++ b/docs/flashing.md @@ -464,4 +464,4 @@ CLI Flashing sequence: 3. Flash via QMK CLI eg. `qmk flash --keyboard handwired/onekey/rpi_pico --keymap default` 4. Wait for the keyboard to become available -1: This works only if QMK was compiled with `RP2040_BOOTLOADER_DOUBLE_TAP_RESET` defined. +1: This works only if the controller has been flashed with QMK Firmware with `RP2040_BOOTLOADER_DOUBLE_TAP_RESET` defined. From 7bff385840a71ccb3144ab080424d57d63cd7156 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 30 Mar 2024 01:04:23 +0000 Subject: [PATCH 070/333] Update serial_driver.md (#23035) Co-authored-by: Drashna Jaelre --- docs/serial_driver.md | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/docs/serial_driver.md b/docs/serial_driver.md index b7e803154b3..8462e4530ff 100644 --- a/docs/serial_driver.md +++ b/docs/serial_driver.md @@ -1,6 +1,6 @@ # 'serial' Driver -The serial driver powers the [Split Keyboard](feature_split_keyboard.md) feature. Several implementations are available, depending on the platform of your split keyboard. Note that none of the drivers support split keyboards with more than two halves. +The Serial driver powers the [Split Keyboard](feature_split_keyboard.md) feature. Several implementations are available that cater to the platform and capabilites of MCU in use. Note that none of the drivers support split keyboards with more than two halves. | Driver | AVR | ARM | Connection between halves | | --------------------------------------- | ------------------ | ------------------ | --------------------------------------------------------------------------------------------- | @@ -14,7 +14,7 @@ The serial driver powers the [Split Keyboard](feature_split_keyboard.md) feature ## Bitbang -This is the Default driver, the absence of configuration assumes this driver. It works by [bit banging](https://en.wikipedia.org/wiki/Bit_banging) a GPIO pin using the CPU. It is therefore not as efficient as a dedicated hardware peripheral, which the Half-duplex and Full-duplex drivers use. +This is the Default driver, absence of configuration assumes this driver. It works by [bit banging](https://en.wikipedia.org/wiki/Bit_banging) a GPIO pin using the CPU. It is therefore not as efficient as a dedicated hardware peripheral, which the Half-duplex and Full-duplex drivers use. !> On ARM platforms the bitbang driver causes connection issues when using it together with the bitbang WS2812 driver. Choosing alternate drivers for both serial and WS2812 (instead of bitbang) is strongly recommended. @@ -31,7 +31,7 @@ This is the Default driver, the absence of configuration assumes this driver. It +-------+ +-------+ ``` -One GPIO pin is needed for the bitbang driver, as only one wire is used for receiving and transmitting data. This pin is referred to as the `SOFT_SERIAL_PIN` (SSP) in the configuration. A simple TRS or USB cable provides enough conductors for this driver to work. +One GPIO pin is needed for the bitbang driver, as only one wire is used for receiving and transmitting data. This pin is referred to as the `SOFT_SERIAL_PIN` (SSP) in the configuration. A TRS or USB cable provides enough conductors for this driver to function. ### Setup @@ -57,7 +57,7 @@ SERIAL_DRIVER = bitbang ## USART Half-duplex -Targeting ARM boards based on ChibiOS, where communication is offloaded to a USART hardware device that supports Half-duplex operation. The advantages over bitbanging are fast, accurate timings and reduced CPU usage. Therefore it is advised to choose this driver or the Full-duplex driver whenever possible. +Targeting ARM boards based on ChibiOS, where communication is offloaded to a USART hardware device that supports Half-duplex operation. The advantages over bitbanging are fast, accurate timings and reduced CPU usage. Therefore it is advised to choose Half-duplex over Bitbang if MCU is capable of utilising Half-duplex, and Full-duplex can't be used instead (e.g. lack of available GPIO pins, or imcompatible PCB design). ### Pin configuration @@ -74,11 +74,13 @@ Targeting ARM boards based on ChibiOS, where communication is offloaded to a USA +-------+ +-------+ ``` -Only one GPIO pin is needed for the Half-duplex driver, as only one wire is used for receiving and transmitting data. This pin is referred to as the `SERIAL_USART_TX_PIN` in the configuration. Take care that the pin you chose can act as the TX pin of the USART peripheral. A simple TRS or USB cable provides enough conductors for this driver to work. As the split connection is configured to work in open-drain mode, an **external pull-up resistor is needed to keep the line high**. Resistor values of 1.5kΩ to 8.2kΩ are known to work. +Only one GPIO pin is needed for the Half-duplex driver, as only one wire is used for receiving and transmitting data. This pin is referred to as the `SERIAL_USART_TX_PIN` in the configuration. Ensure that the pin chosen for split communication can operate as the TX pin of the contoller's USART peripheral. A TRS or USB cable provides enough conductors for this driver to function. As the split connection is configured to operate in open-drain mode, an **external pull-up resistor is needed to keep the line high**. Resistor values of 1.5kΩ to 8.2kΩ are known to work. + +!> ***Note:*** A pull-up resistor isn't required for RP2040 controllers configured with PIO subsystem. ### Setup -To use the Half-duplex driver follow these steps to activate it. If you target the Raspberry Pi RP2040 PIO implementation skip step 1. +To use the Half-duplex driver follow these steps to activate it. If you target the Raspberry Pi RP2040 PIO implementation, start at step 2. 1. Change the `SERIAL_DRIVER` to `usart` in your keyboards `rules.mk` file: @@ -86,7 +88,9 @@ To use the Half-duplex driver follow these steps to activate it. If you target t SERIAL_DRIVER = usart ``` -2. (RP2040 PIO only!) Change the `SERIAL_DRIVER` to `vendor` in your keyboards `rules.mk` file: +Skip to step 3. + +2. (RP2040 + PIO only!) Change the `SERIAL_DRIVER` to `vendor` in your keyboards `rules.mk` file: ```make SERIAL_DRIVER = vendor @@ -105,13 +109,13 @@ For STM32 MCUs several GPIO configuration options can be changed as well. See th #define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7 ``` -4. Decide either for `SERIAL`, `SIO` or `PIO` subsystem, see the section ["Choosing a driver subsystem"](#choosing-a-driver-subsystem). +4. Decide either for `SERIAL`, `SIO`, or `PIO` subsystem. See section ["Choosing a driver subsystem"](#choosing-a-driver-subsystem).
## USART Full-duplex -Targeting ARM boards based on ChibiOS where communication is offloaded to an USART hardware device. The advantages over bitbanging are fast, accurate timings and reduced CPU usage. Therefore it is advised to choose this driver or the Full-duplex driver whenever possible. Due to its internal design it is slightly more efficient then the Half-duplex driver, but it should be primarily chosen if Half-duplex operation is not supported by the USART peripheral. +Targeting ARM boards based on ChibiOS where communication is offloaded to an USART hardware device. The advantages over bitbanging are fast, accurate timings and reduced CPU usage; therefore it is advised to choose this driver over all others where possible. Due to its internal design Full-duplex is slightly more efficient than the Half-duplex driver, but Full-duplex should be primarily chosen if Half-duplex operation is not supported by the controller's USART peripheral. ### Pin configuration @@ -129,13 +133,13 @@ Targeting ARM boards based on ChibiOS where communication is offloaded to an USA +-------+ +-------+ ``` -Two GPIO pins are needed for the Full-duplex driver, as two distinct wires are used for receiving and transmitting data. The pin transmitting data is the `TX` pin and refereed to as the `SERIAL_USART_TX_PIN`, the pin receiving data is the `RX` pin and refereed to as the `SERIAL_USART_RX_PIN` in this configuration. Please note that `TX` pin of the master half has to be connected with the `RX` pin of the slave half and the `RX` pin of the master half has to be connected with the `TX` pin of the slave half! Usually this pin swap has to be done outside of the MCU e.g. with cables or on the PCB. Some MCUs like the STM32F303 used on the Proton-C allow this pin swap directly inside the MCU. A simple TRRS or USB cable provides enough conductors for this driver to work. +Two GPIO pins are needed for the Full-duplex driver, as two distinct wires are used for receiving and transmitting data. The pin transmitting data is the `TX` pin and refereed to as the `SERIAL_USART_TX_PIN`, the pin receiving data is the `RX` pin and refereed to as the `SERIAL_USART_RX_PIN` in this configuration. Please note that `TX` pin of the master half has to be connected with the `RX` pin of the slave half and the `RX` pin of the master half has to be connected with the `TX` pin of the slave half! Usually this pin swap has to be done outside of the MCU e.g. with cables or on the PCB. Some MCUs like the STM32F303 used on the Proton-C allow this pin swap directly inside the MCU. A TRRS or USB cable provides enough conductors for this driver to function. -To use this driver the usart peripherals `TX` and `RX` pins must be configured with the correct Alternate-functions. If you are using a Proton-C everything is already setup, same is true for STM32F103 MCUs. For MCUs which are using a modern flexible GPIO configuration you have to specify these by setting `SERIAL_USART_TX_PAL_MODE` and `SERIAL_USART_RX_PAL_MODE`. Refer to the corresponding datasheets of your MCU or find those settings in the section ["Alternate Functions for selected STM32 MCUs"](#alternate-functions-for-selected-stm32-mcus). +To use this driver the USART peripherals `TX` and `RX` pins must be configured with the correct Alternate-functions. If you are using a Proton-C development board everything is already setup, same is true for STM32F103 MCUs. For MCUs which are using a modern flexible GPIO configuration you have to specify these by setting `SERIAL_USART_TX_PAL_MODE` and `SERIAL_USART_RX_PAL_MODE`. Refer to the corresponding datasheets of your MCU or find those settings in the section ["Alternate Functions for selected STM32 MCUs"](#alternate-functions-for-selected-stm32-mcus). ### Setup -To use the Full-duplex driver follow these steps to activate it. If you target the Raspberry Pi RP2040 PIO implementation skip step 1. +To use the Full-duplex driver follow these steps to activate it. If you target the Raspberry Pi RP2040 PIO implementation, start at step 2 1. Change the `SERIAL_DRIVER` to `usart` in your keyboards `rules.mk` file: @@ -143,7 +147,9 @@ To use the Full-duplex driver follow these steps to activate it. If you target t SERIAL_DRIVER = usart ``` -2. (RP2040 PIO only!) Change the `SERIAL_DRIVER` to `vendor` in your keyboards `rules.mk` file: +Skip to step 3 + +2. (RP2040 + PIO only!) Change the `SERIAL_DRIVER` to `vendor` in your keyboards `rules.mk` file: ```make SERIAL_DRIVER = vendor @@ -165,7 +171,7 @@ For STM32 MCUs several GPIO configuration options, including the ability for `TX #define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7 ``` -1. Decide either for `SERIAL`, `SIO` or `PIO` subsystem, see the section ["Choosing a driver subsystem"](#choosing-a-driver-subsystem). +4. Decide either for `SERIAL`, `SIO`, or `PIO` subsystem. See section ["Choosing a driver subsystem"](#choosing-a-driver-subsystem).
@@ -225,7 +231,7 @@ Just below `#include_next ` add: Where 'n' matches the peripheral number of your selected USART on the MCU. -3. In you keyboards `config.h`: override the default USART `SIO` driver if you use a USART peripheral that does not belong to the default selected `SIOD1` driver. For instance, if you selected `STM32_SERIAL_USE_USART3` the matching driver would be `SIOD3`. +3. In the keyboard's `config.h` file: override the default USART `SIO` driver if you use a USART peripheral that does not belong to the default selected `SIOD1` driver. For instance, if you selected `STM32_SERIAL_USE_USART3` the matching driver would be `SIOD3`. ```c #define SERIAL_USART_DRIVER SIOD3 @@ -233,9 +239,9 @@ Where 'n' matches the peripheral number of your selected USART on the MCU. ### The `PIO` driver -The `PIO` subsystem is a Raspberry Pi RP2040 specific implementation, using the integrated PIO peripheral and is therefore only available on this MCU. Because of the flexible nature of the PIO peripherals, **any** GPIO pin can be used as a `TX` or `RX` pin. Half-duplex and Full-duplex operation is fully supported. The Half-duplex operation mode uses the built-in pull-ups and GPIO manipulation on the RP2040 to drive the line high by default. An external pull-up is therefore not necessary. +The `PIO` subsystem is a Raspberry Pi RP2040 specific implementation, using an integrated PIO peripheral and is therefore only available on this MCU. Because of the flexible nature of PIO peripherals, **any** GPIO pin can be used as a `TX` or `RX` pin. Half-duplex and Full-duplex operation modes are fully supported with this driver. Half-duplex uses the built-in pull-ups and GPIO manipulation of the RP2040 to drive the line high by default, thus an external pull-up resistor **is not required**. -You may optionally switch the PIO peripheral used with the following define in config.h: +Optionally, the PIO peripheral utilized for split communication can be changed with the following define in config.h: ```c #define SERIAL_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the Serial implementation uses the PIO0 peripheral ``` From 93737eccc9ba25773adabe1ec74257900f968b50 Mon Sep 17 00:00:00 2001 From: khchen2004 <148961563+khchen2004@users.noreply.github.com> Date: Sat, 30 Mar 2024 09:57:29 +0800 Subject: [PATCH 071/333] [Keyboard] Add scorpio rev2 (#22906) --- keyboards/kwstudio/scorpio_rev2/config.h | 22 ++ keyboards/kwstudio/scorpio_rev2/halconf.h | 21 ++ keyboards/kwstudio/scorpio_rev2/info.json | 201 ++++++++++++++++++ .../scorpio_rev2/keymaps/default/keymap.c | 34 +++ .../scorpio_rev2/keymaps/via/keymap.c | 34 +++ .../scorpio_rev2/keymaps/via/rules.mk | 1 + keyboards/kwstudio/scorpio_rev2/mcuconf.h | 21 ++ keyboards/kwstudio/scorpio_rev2/readme.md | 27 +++ keyboards/kwstudio/scorpio_rev2/rules.mk | 1 + 9 files changed, 362 insertions(+) create mode 100644 keyboards/kwstudio/scorpio_rev2/config.h create mode 100644 keyboards/kwstudio/scorpio_rev2/halconf.h create mode 100644 keyboards/kwstudio/scorpio_rev2/info.json create mode 100644 keyboards/kwstudio/scorpio_rev2/keymaps/default/keymap.c create mode 100644 keyboards/kwstudio/scorpio_rev2/keymaps/via/keymap.c create mode 100644 keyboards/kwstudio/scorpio_rev2/keymaps/via/rules.mk create mode 100644 keyboards/kwstudio/scorpio_rev2/mcuconf.h create mode 100644 keyboards/kwstudio/scorpio_rev2/readme.md create mode 100644 keyboards/kwstudio/scorpio_rev2/rules.mk diff --git a/keyboards/kwstudio/scorpio_rev2/config.h b/keyboards/kwstudio/scorpio_rev2/config.h new file mode 100644 index 00000000000..4b98552f429 --- /dev/null +++ b/keyboards/kwstudio/scorpio_rev2/config.h @@ -0,0 +1,22 @@ +/* Copyright 2024 kwstudio + * + * 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 + +#define WS2812_PWM_DRIVER PWMD1 +#define WS2812_PWM_CHANNEL 3 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_DMA_CHANNEL 5 diff --git a/keyboards/kwstudio/scorpio_rev2/halconf.h b/keyboards/kwstudio/scorpio_rev2/halconf.h new file mode 100644 index 00000000000..7212bdf2f69 --- /dev/null +++ b/keyboards/kwstudio/scorpio_rev2/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2024 kwstudio + * + * 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 + +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/kwstudio/scorpio_rev2/info.json b/keyboards/kwstudio/scorpio_rev2/info.json new file mode 100644 index 00000000000..d1b41b1d4ff --- /dev/null +++ b/keyboards/kwstudio/scorpio_rev2/info.json @@ -0,0 +1,201 @@ +{ + "manufacturer": "kwstudio", + "keyboard_name": "Scorpio Rev2", + "maintainer": "kwstudio", + "processor": "STM32F103", + "bootloader": "stm32duino", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, + "matrix_pins": { + "cols": ["A4", "A2", "A5", "A6", "A7", "A3", "B10", "B13", "B3", "B4", "B9", "B8", "B5", "B7", "B6"], + "rows": ["B11", "B0", "B14", "B12", "A1"] + }, + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "brightness_steps": 10, + "default": { + "animation": "rainbow_swirl" + }, + "layers": { + "enabled": true + }, + "led_count": 9, + "saturation_steps": 8 + }, + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0003", + "vid": "0x4B53" + }, + "ws2812": { + "driver": "pwm", + "pin": "B15" + }, + "layout_aliases": { + "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs" + }, + "layouts": { + "LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 10.75, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker_tsangan_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 10.75, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/kwstudio/scorpio_rev2/keymaps/default/keymap.c b/keyboards/kwstudio/scorpio_rev2/keymaps/default/keymap.c new file mode 100644 index 00000000000..32da3bfa7bb --- /dev/null +++ b/keyboards/kwstudio/scorpio_rev2/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2024 kwstudio + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1), + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), + +[1] = LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs( + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +}; diff --git a/keyboards/kwstudio/scorpio_rev2/keymaps/via/keymap.c b/keyboards/kwstudio/scorpio_rev2/keymaps/via/keymap.c new file mode 100644 index 00000000000..32da3bfa7bb --- /dev/null +++ b/keyboards/kwstudio/scorpio_rev2/keymaps/via/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2024 kwstudio + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1), + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), + +[1] = LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs( + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +}; diff --git a/keyboards/kwstudio/scorpio_rev2/keymaps/via/rules.mk b/keyboards/kwstudio/scorpio_rev2/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/kwstudio/scorpio_rev2/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/kwstudio/scorpio_rev2/mcuconf.h b/keyboards/kwstudio/scorpio_rev2/mcuconf.h new file mode 100644 index 00000000000..c3712e0ed47 --- /dev/null +++ b/keyboards/kwstudio/scorpio_rev2/mcuconf.h @@ -0,0 +1,21 @@ +/* Copyright 2024 kwstudio + * + * 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 +#include_next + +#undef STM32_PWM_USE_TIM1 +#define STM32_PWM_USE_TIM1 TRUE diff --git a/keyboards/kwstudio/scorpio_rev2/readme.md b/keyboards/kwstudio/scorpio_rev2/readme.md new file mode 100644 index 00000000000..aa404d671bb --- /dev/null +++ b/keyboards/kwstudio/scorpio_rev2/readme.md @@ -0,0 +1,27 @@ +# Scorpio Rev2 + +![Scorpio Rev2](https://i.imgur.com/pfSLX67h.jpeg) + +This keyboard use 8MHz HSE and STM32F103 as MCU. + +* Keyboard Maintainer: https://github.com/khchen2004 +* Hardware Supported: Scorpio Rev2 PCB +* Hardware Availibility: Private GB + +Make example for this keyboard (after setting up your build environment): + + make kwstudio/scorpio_rev2:default + +Flashing example for this keyboard: + + make kwstudio/scorpio_rev2: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file diff --git a/keyboards/kwstudio/scorpio_rev2/rules.mk b/keyboards/kwstudio/scorpio_rev2/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/kwstudio/scorpio_rev2/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From ac74d106d617dad5a3546af4a5c8054294eef29f Mon Sep 17 00:00:00 2001 From: yulei Date: Sat, 30 Mar 2024 10:00:51 +0800 Subject: [PATCH 072/333] [Keyboard] add neson design 810e keyboard (#22883) Co-authored-by: Ryan Co-authored-by: Drashna Jaelre Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/neson_design/810e/config.h | 21 ++++ keyboards/neson_design/810e/info.json | 119 ++++++++++++++++++ .../810e/keymaps/default/keymap.c | 32 +++++ .../neson_design/810e/keymaps/via/keymap.c | 33 +++++ .../neson_design/810e/keymaps/via/rules.mk | 2 + keyboards/neson_design/810e/mcuconf.h | 31 +++++ keyboards/neson_design/810e/readme.md | 23 ++++ keyboards/neson_design/810e/rules.mk | 1 + 8 files changed, 262 insertions(+) create mode 100644 keyboards/neson_design/810e/config.h create mode 100644 keyboards/neson_design/810e/info.json create mode 100644 keyboards/neson_design/810e/keymaps/default/keymap.c create mode 100644 keyboards/neson_design/810e/keymaps/via/keymap.c create mode 100644 keyboards/neson_design/810e/keymaps/via/rules.mk create mode 100644 keyboards/neson_design/810e/mcuconf.h create mode 100644 keyboards/neson_design/810e/readme.md create mode 100644 keyboards/neson_design/810e/rules.mk diff --git a/keyboards/neson_design/810e/config.h b/keyboards/neson_design/810e/config.h new file mode 100644 index 00000000000..c6409b1ecea --- /dev/null +++ b/keyboards/neson_design/810e/config.h @@ -0,0 +1,21 @@ +/** + * Copyright 2024 astro + * + * 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 + +#define BOARD_OTG_NOVBUSSENS 1 +#define STM32_HSECLK 16000000U diff --git a/keyboards/neson_design/810e/info.json b/keyboards/neson_design/810e/info.json new file mode 100644 index 00000000000..ee80a34afbd --- /dev/null +++ b/keyboards/neson_design/810e/info.json @@ -0,0 +1,119 @@ +{ + "manufacturer": "Neson Design", + "keyboard_name": "810e", + "maintainer": "yulei", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": false + }, + "indicators": { + "caps_lock": "A10", + "num_lock": "A0" + }, + "matrix_pins": { + "cols": ["B7", "B5", "B4", "B3", "A15", "A8", "B15", "B14", "B13", "B12", "B10", "B2", "B1", "B0", "A4", "A3", "A2", "A1"], + "rows": ["C13", "C14", "A6", "A7", "A5"] + }, + "processor": "STM32F411", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x810E", + "vid": "0x4E65", + "no_startup_check": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.5, "y": 0}, + {"matrix": [1, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [1, 17], "x": 19.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [1, 15], "x": 16.5, "y": 1}, + {"matrix": [2, 16], "x": 17.5, "y": 1}, + {"matrix": [2, 17], "x": 18.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 16.5, "y": 2}, + {"matrix": [2, 15], "x": 17.5, "y": 2}, + {"matrix": [3, 16], "x": 18.5, "y": 2}, + {"matrix": [3, 17], "x": 19.5, "y": 1, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"matrix": [3, 15], "x": 16.5, "y": 3}, + {"matrix": [4, 16], "x": 17.5, "y": 3}, + {"matrix": [4, 17], "x": 18.5, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 4, "y": 4.25, "w": 6.25}, + {"matrix": [4, 7], "x": 10.5, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 11.75, "y": 4}, + {"matrix": [4, 9], "x": 12.75, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 14.25, "y": 4.25}, + {"matrix": [4, 11], "x": 15.25, "y": 4.25}, + {"matrix": [4, 12], "x": 16.25, "y": 4.25}, + {"matrix": [4, 13], "x": 17.5, "y": 4}, + {"matrix": [4, 14], "x": 18.5, "y": 4}, + {"matrix": [4, 15], "x": 19.5, "y": 3, "h": 2} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/neson_design/810e/keymaps/default/keymap.c b/keyboards/neson_design/810e/keymaps/default/keymap.c new file mode 100644 index 00000000000..f4893faa357 --- /dev/null +++ b/keyboards/neson_design/810e/keymaps/default/keymap.c @@ -0,0 +1,32 @@ +/** + * keymap.c + * + Copyright 2024 astro + 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 . +*/ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0]=LAYOUT( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,MO(1),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT), + +[1]=LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_TOG, RGB_MOD, KC_F13, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,_______, _______, _______, + _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______) +}; diff --git a/keyboards/neson_design/810e/keymaps/via/keymap.c b/keyboards/neson_design/810e/keymaps/via/keymap.c new file mode 100644 index 00000000000..c5fff9823dd --- /dev/null +++ b/keyboards/neson_design/810e/keymaps/via/keymap.c @@ -0,0 +1,33 @@ +/** + * keymap.c + * + Copyright 2024 astro + 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 . +*/ +#include QMK_KEYBOARD_H + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0]=LAYOUT( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,MO(1),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT), + +[1]=LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_TOG, RGB_MOD, KC_F13, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,_______, _______, _______, + _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______) +}; diff --git a/keyboards/neson_design/810e/keymaps/via/rules.mk b/keyboards/neson_design/810e/keymaps/via/rules.mk new file mode 100644 index 00000000000..43061db1dd4 --- /dev/null +++ b/keyboards/neson_design/810e/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/neson_design/810e/mcuconf.h b/keyboards/neson_design/810e/mcuconf.h new file mode 100644 index 00000000000..d558655d9cf --- /dev/null +++ b/keyboards/neson_design/810e/mcuconf.h @@ -0,0 +1,31 @@ +/* Copyright 2023 astro + * + * 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 + +#include_next + +#undef STM32_PLLM_VALUE +#define STM32_PLLM_VALUE 16 + +#undef STM32_PLLN_VALUE +#define STM32_PLLN_VALUE 192 + +#undef STM32_PLLP_VALUE +#define STM32_PLLP_VALUE 2 + +#undef STM32_PLLQ_VALUE +#define STM32_PLLQ_VALUE 4 diff --git a/keyboards/neson_design/810e/readme.md b/keyboards/neson_design/810e/readme.md new file mode 100644 index 00000000000..100f9eca80f --- /dev/null +++ b/keyboards/neson_design/810e/readme.md @@ -0,0 +1,23 @@ +# Neson Design 810E keyboard + +* Keyboard Maintainer: [astro](https://github.com/yulei) +* Hardware Supported: Neson Design 810E keyboard +* Hardware Availability: [Public GB](https://geekhack.org/index.php?topic=120539.0) + +Make example for this keyboard (after setting up your build environment): + + make neson_design/810e:default + +Flashing example for this board: + + make neson_design/810e: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard. +* **Physical reset button**: Shortcut *BOOT0* pin and than plug in the keyboard. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. diff --git a/keyboards/neson_design/810e/rules.mk b/keyboards/neson_design/810e/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/neson_design/810e/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From abc101c122b3c44b0aecf6daed47a3f43e95ec66 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sat, 30 Mar 2024 11:03:17 +0900 Subject: [PATCH 073/333] [Keyboard] Add miniDivide MAX (#22804) Co-authored-by: Drashna Jaelre Co-authored-by: Duncan Sutherland Co-authored-by: jack <0x6a73@protonmail.com> --- .../takashicompany/minidivide_max/info.json | 129 ++++++++++++++++++ .../minidivide_max/keymaps/default/keymap.c | 56 ++++++++ .../minidivide_max/keymaps/via/keymap.c | 57 ++++++++ .../minidivide_max/keymaps/via/rules.mk | 1 + .../takashicompany/minidivide_max/readme.md | 48 +++++++ .../takashicompany/minidivide_max/rules.mk | 1 + 6 files changed, 292 insertions(+) create mode 100644 keyboards/takashicompany/minidivide_max/info.json create mode 100644 keyboards/takashicompany/minidivide_max/keymaps/default/keymap.c create mode 100644 keyboards/takashicompany/minidivide_max/keymaps/via/keymap.c create mode 100644 keyboards/takashicompany/minidivide_max/keymaps/via/rules.mk create mode 100644 keyboards/takashicompany/minidivide_max/readme.md create mode 100644 keyboards/takashicompany/minidivide_max/rules.mk diff --git a/keyboards/takashicompany/minidivide_max/info.json b/keyboards/takashicompany/minidivide_max/info.json new file mode 100644 index 00000000000..32e67e944d8 --- /dev/null +++ b/keyboards/takashicompany/minidivide_max/info.json @@ -0,0 +1,129 @@ +{ + "manufacturer": "takashicompany", + "keyboard_name": "miniDivide MAX", + "maintainer": "takashicompany", + "build": { + "lto": true + }, + "development_board": "promicro", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1"] + }, + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "led_count": 16, + "sleep": true, + "split_count": [8, 8] + }, + "split": { + "enabled": true, + "matrix_pins": { + "right": { + "cols": ["B5", "B4", "E6", "D7", "C6", "D4"], + "rows": ["F4", "F5", "F6", "F7", "B1"] + } + }, + "soft_serial_pin": "D2" + }, + "url": "", + "usb": { + "device_version": "0.0.1", + "pid": "0x0054", + "vid": "0x7463" + }, + "ws2812": { + "pin": "D3" + }, + "dynamic_keymap": { + "layer_count": 7 + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.4}, + {"matrix": [0, 1], "x": 1, "y": 0.4}, + {"matrix": [0, 2], "x": 2, "y": 0.2}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.2}, + {"matrix": [0, 5], "x": 5, "y": 0.4}, + {"matrix": [5, 0], "x": 9, "y": 0.4}, + {"matrix": [5, 1], "x": 10, "y": 0.2}, + {"matrix": [5, 2], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0.2}, + {"matrix": [5, 4], "x": 13, "y": 0.4}, + {"matrix": [5, 5], "x": 14, "y": 0.4}, + + {"matrix": [1, 0], "x": 0, "y": 1.4}, + {"matrix": [1, 1], "x": 1, "y": 1.4}, + {"matrix": [1, 2], "x": 2, "y": 1.2}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.2}, + {"matrix": [1, 5], "x": 5, "y": 1.4}, + {"matrix": [6, 0], "x": 9, "y": 1.4}, + {"matrix": [6, 1], "x": 10, "y": 1.2}, + {"matrix": [6, 2], "x": 11, "y": 1}, + {"matrix": [6, 3], "x": 12, "y": 1.2}, + {"matrix": [6, 4], "x": 13, "y": 1.4}, + {"matrix": [6, 5], "x": 14, "y": 1.4}, + + {"matrix": [2, 0], "x": 0, "y": 2.4}, + {"matrix": [2, 1], "x": 1, "y": 2.4}, + {"matrix": [2, 2], "x": 2, "y": 2.2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.2}, + {"matrix": [2, 5], "x": 5, "y": 2.4}, + {"matrix": [7, 0], "x": 9, "y": 2.4}, + {"matrix": [7, 1], "x": 10, "y": 2.2}, + {"matrix": [7, 2], "x": 11, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2.2}, + {"matrix": [7, 4], "x": 13, "y": 2.4}, + {"matrix": [7, 5], "x": 14, "y": 2.4}, + + {"matrix": [3, 0], "x": 0, "y": 3.4}, + {"matrix": [3, 1], "x": 1, "y": 3.4}, + {"matrix": [3, 2], "x": 2, "y": 3.2}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.2}, + {"matrix": [3, 5], "x": 5, "y": 3.4}, + {"matrix": [8, 0], "x": 9, "y": 3.4}, + {"matrix": [8, 1], "x": 10, "y": 3.2}, + {"matrix": [8, 2], "x": 11, "y": 3}, + {"matrix": [8, 3], "x": 12, "y": 3.2}, + {"matrix": [8, 4], "x": 13, "y": 3.4}, + {"matrix": [8, 5], "x": 14, "y": 3.4}, + + {"matrix": [4, 2], "x": 3, "y": 4.1}, + {"matrix": [4, 3], "x": 4, "y": 4.3}, + {"matrix": [4, 4], "x": 5, "y": 4.5}, + {"matrix": [4, 5], "x": 6, "y": 4.7}, + + {"matrix": [9, 0], "x": 8, "y": 4.7}, + {"matrix": [9, 1], "x": 9, "y": 4.5}, + {"matrix": [9, 2], "x": 10, "y": 4.3}, + {"matrix": [9, 3], "x": 11, "y": 4.1} + ] + } + } +} diff --git a/keyboards/takashicompany/minidivide_max/keymaps/default/keymap.c b/keyboards/takashicompany/minidivide_max/keymaps/default/keymap.c new file mode 100644 index 00000000000..2553cd6316e --- /dev/null +++ b/keyboards/takashicompany/minidivide_max/keymaps/default/keymap.c @@ -0,0 +1,56 @@ +// Copyright 2023 QMK +// 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_BSPC, + KC_TAB, LT(4, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, + KC_LCTL, KC_A, KC_S, LT(3, KC_D), KC_F, KC_G, KC_H, KC_J, LT(3, KC_K), KC_L, KC_ENT, KC_ENT, + KC_LSFT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_BSPC, + KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_RGUI, KC_RCTL + ), + + [1] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, + KC_TRNS, LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, KC_TRNS, + KC_TRNS, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT( + KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_TRNS, + KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_TRNS, + KC_TRNS, KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS, + KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_TRNS, + KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [4] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, + KC_TRNS, KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, MO(5), MO(6), KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [5] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) + +}; diff --git a/keyboards/takashicompany/minidivide_max/keymaps/via/keymap.c b/keyboards/takashicompany/minidivide_max/keymaps/via/keymap.c new file mode 100644 index 00000000000..ae19ae8dbe3 --- /dev/null +++ b/keyboards/takashicompany/minidivide_max/keymaps/via/keymap.c @@ -0,0 +1,57 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + LT(4, KC_ESC), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_TAB, LT(4, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, + KC_LCTL, KC_A, KC_S, LT(3, KC_D), KC_F, KC_G, KC_H, KC_J, LT(3, KC_K), KC_L, KC_ENT, KC_ENT, + KC_LSFT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_BSPC, + KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_RGUI, KC_RCTL + ), + + [1] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, + KC_TRNS, LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, KC_TRNS, + KC_TRNS, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT( + KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_TRNS, + KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_TRNS, + KC_TRNS, KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS, + KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_TRNS, + KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [4] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, + KC_TRNS, KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, MO(5), MO(6), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [5] = LAYOUT( + RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + +}; diff --git a/keyboards/takashicompany/minidivide_max/keymaps/via/rules.mk b/keyboards/takashicompany/minidivide_max/keymaps/via/rules.mk new file mode 100644 index 00000000000..036bd6d1c3e --- /dev/null +++ b/keyboards/takashicompany/minidivide_max/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/takashicompany/minidivide_max/readme.md b/keyboards/takashicompany/minidivide_max/readme.md new file mode 100644 index 00000000000..1360305f6b8 --- /dev/null +++ b/keyboards/takashicompany/minidivide_max/readme.md @@ -0,0 +1,48 @@ +# miniDivide MAX + +![miniDivide Max](https://i.imgur.com/5xozuXDh.jpg) + +miniDivide MAX is a 56-key segmented keyboard with 16mm spaced key layout. +The keys are 80% the size of conventional keys, making this keyboard suitable for people with small hands as well as those who want to type with minimal finger movement. +The 56-key layout makes it possible to start using this keyboard with a feel similar to a conventional keyboard. +It is also smaller and thinner than a conventional keyboard, making it suitable for carrying around and taking up minimal space when placed on a desk. +The split design allows you to type in a natural position. +In addition, it is also compatible with underglow LEDs and BLE Micro Pro, so it can be reconfigured to suit the case in which it is used. + +--- + +miniDivide MAXは16mm間隔のキー配置を採用した56キーの分割キーボードです。 + +キーが従来の80%の大きさなので、手が小さい人はもちろん最小限の指の移動で文字を打ちたい人に適したキーボードです。 + +56キー配置されているため、従来のキーボードに近い使用感で使い始めることが可能です。 + +また従来のキーボードよりも小さく薄いため持ち運びにも適していますし、デスクに置いた時にスペースが最小限で済むメリットもあります。 + +分割型なため、自然な体勢で文字を打つことができます。 + +その他、アンダーグロウLEDやBLE Micro Proなどにも対応しているため使用ケースにあわせて組み替えることが可能です。 + + + +* Keyboard Maintainer: [takashicompany](https://github.com/takashicompany) +* Hardware Supported: miniDivide MAX PCB, Pro Micro +* Hardware Availability: https://github.com/takashicompany/minidivide_max + +Make example for this keyboard (after setting up your build environment): + + make takashicompany/minidivide_max:default + +Flashing example for this keyboard: + + make takashicompany/minidivide_max: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/takashicompany/minidivide_max/rules.mk b/keyboards/takashicompany/minidivide_max/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/takashicompany/minidivide_max/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 54593975bf58fbf82b712be863aea39e87bc061f Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sat, 30 Mar 2024 12:46:15 +0900 Subject: [PATCH 074/333] Add new keyboard "Rookey" (#22483) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre --- keyboards/takashicompany/rookey/info.json | 50 +++++++++++++++++++ .../rookey/keymaps/default/keymap.c | 24 +++++++++ .../rookey/keymaps/default/rules.mk | 1 + .../rookey/keymaps/via/keymap.c | 20 ++++++++ .../rookey/keymaps/via/rules.mk | 2 + keyboards/takashicompany/rookey/readme.md | 43 ++++++++++++++++ keyboards/takashicompany/rookey/rules.mk | 1 + 7 files changed, 141 insertions(+) create mode 100644 keyboards/takashicompany/rookey/info.json create mode 100644 keyboards/takashicompany/rookey/keymaps/default/keymap.c create mode 100644 keyboards/takashicompany/rookey/keymaps/default/rules.mk create mode 100644 keyboards/takashicompany/rookey/keymaps/via/keymap.c create mode 100644 keyboards/takashicompany/rookey/keymaps/via/rules.mk create mode 100644 keyboards/takashicompany/rookey/readme.md create mode 100644 keyboards/takashicompany/rookey/rules.mk diff --git a/keyboards/takashicompany/rookey/info.json b/keyboards/takashicompany/rookey/info.json new file mode 100644 index 00000000000..94733454090 --- /dev/null +++ b/keyboards/takashicompany/rookey/info.json @@ -0,0 +1,50 @@ +{ + "manufacturer": "takashicompany", + "keyboard_name": "Rookey", + "maintainer": "takashicompany", + "development_board": "promicro", + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "B4", "pin_b": "E6"} + ] + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "direct": [ + ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"] + ] + }, + "url": "https://github.com/takashicompany/rookey", + "usb": { + "device_version": "1.0.0", + "pid": "0x0056", + "vid": "0x7463" + }, + "dynamic_keymap": { + "layer_count": 16 + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 0, "y": 1}, + {"matrix": [0, 5], "x": 1, "y": 1}, + {"matrix": [0, 6], "x": 2, "y": 1}, + {"matrix": [0, 7], "x": 3, "y": 1}, + {"matrix": [0, 8], "x": 4, "y": 2} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/takashicompany/rookey/keymaps/default/keymap.c b/keyboards/takashicompany/rookey/keymaps/default/keymap.c new file mode 100644 index 00000000000..a224aaf7ea5 --- /dev/null +++ b/keyboards/takashicompany/rookey/keymaps/default/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + LT(1, KC_Q), KC_W, KC_E, KC_R, + KC_A, KC_S, KC_D, KC_F, + KC_V + ), + [1] = LAYOUT( + _______, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_1, KC_2) }, + [1] = { ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) } +}; +#endif diff --git a/keyboards/takashicompany/rookey/keymaps/default/rules.mk b/keyboards/takashicompany/rookey/keymaps/default/rules.mk new file mode 100644 index 00000000000..a40474b4d5c --- /dev/null +++ b/keyboards/takashicompany/rookey/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/takashicompany/rookey/keymaps/via/keymap.c b/keyboards/takashicompany/rookey/keymaps/via/keymap.c new file mode 100644 index 00000000000..4e189861459 --- /dev/null +++ b/keyboards/takashicompany/rookey/keymaps/via/keymap.c @@ -0,0 +1,20 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, + KC_A, KC_S, KC_D, KC_F, + KC_V + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + + [0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) } +}; +#endif \ No newline at end of file diff --git a/keyboards/takashicompany/rookey/keymaps/via/rules.mk b/keyboards/takashicompany/rookey/keymaps/via/rules.mk new file mode 100644 index 00000000000..6ccd6d91943 --- /dev/null +++ b/keyboards/takashicompany/rookey/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +ENCODER_MAP_ENABLE = yes +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/takashicompany/rookey/readme.md b/keyboards/takashicompany/rookey/readme.md new file mode 100644 index 00000000000..f9393ca2200 --- /dev/null +++ b/keyboards/takashicompany/rookey/readme.md @@ -0,0 +1,43 @@ +# Rookey + +![takashicompany/rookey](https://i.imgur.com/kLQDeZZh.jpg) + +Rookey, as the name implies, is a DIY keyboard "Rookie" creation. + +With its small number of parts and simple structure, it can be easily completed even by first-time assemblers. + +Despite its small size, it can be used as a 9-key macro pad, and a rotary encoder can also be attached. + +It can be used not only as a first unit, but also as a long-lasting unit. + +--- + +Rookeyは名前の通り、DIYキーボードの"Rookie"のために作られた一作です。 + +部品数が少なく、構造がシンプルなため初めて組み立てる人でも容易に完成させることができます。 + +小さいながらも9キーのマクロパッドとして使用ができる上に、ロータリーエンコーダの取り付けも可能です。 + +初めての一台としてはもちろん、永く使い続ける一台としても愛用することができます。 + +* Keyboard Maintainer: [takashicompany](https://github.com/takashicompany) +* Hardware Supported: Rookey PCB, Pro Micro +* Hardware Availability: https://github.com/takashicompany/rookey + +Make example for this keyboard (after setting up your build environment): + + make takashicompany/rookey:default + +Flashing example for this keyboard: + + make takashicompany/rookey: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/takashicompany/rookey/rules.mk b/keyboards/takashicompany/rookey/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/takashicompany/rookey/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 86e7df0c2a75baa00238f5350a912d5a4f8b622d Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 30 Mar 2024 04:14:26 +0000 Subject: [PATCH 075/333] Remove "w": 1 from keyboards/ (#23367) --- keyboards/1upkeyboards/1upocarina/info.json | 10 +- keyboards/ah/haven80/hotswap/info.json | 2 +- keyboards/ah/haven80/solder/info.json | 2 +- keyboards/custommk/evo70_r2/info.json | 4 +- .../enviousdesign/delirium/rgb/info.json | 148 ++-- keyboards/enviousdesign/mcro/rev1/info.json | 24 +- keyboards/handwired/3dp660_oled/info.json | 330 +++---- keyboards/hazel/bad_wings/info.json | 72 +- keyboards/kopibeng/mnk60/info.json | 16 +- keyboards/laneware/lpad/keyboard.json | 12 +- .../latincompass/latin60rgb/keyboard.json | 6 +- keyboards/lucid/velvet_solder/info.json | 8 +- keyboards/mokey/luckycat70/info.json | 2 +- keyboards/phentech/rpk_001/info.json | 4 +- keyboards/skyloong/gk61/pro/info.json | 6 +- keyboards/skyloong/gk61/pro_48/info.json | 6 +- keyboards/skyloong/gk61/v1/info.json | 6 +- keyboards/snes_macropad/info.json | 4 +- keyboards/teahouse/ayleen/info.json | 2 +- keyboards/varanidae/info.json | 820 +++++++++--------- keyboards/viktus/minne/info.json | 486 +++++------ keyboards/viktus/minne_topre/info.json | 346 ++++---- keyboards/viktus/osav2/info.json | 632 +++++++------- keyboards/ymdk/id75/info.json | 150 ++-- 24 files changed, 1549 insertions(+), 1549 deletions(-) diff --git a/keyboards/1upkeyboards/1upocarina/info.json b/keyboards/1upkeyboards/1upocarina/info.json index 008896d40e8..1f33c048c10 100644 --- a/keyboards/1upkeyboards/1upocarina/info.json +++ b/keyboards/1upkeyboards/1upocarina/info.json @@ -126,11 +126,11 @@ "layouts": { "LAYOUT_1x5": { "layout": [ - { "label": "z", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "x", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "esc", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "c", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "v", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 } + { "label": "z", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "x", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "esc", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "c", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "v", "matrix": [0, 4], "x": 4, "y": 0 } ] } } diff --git a/keyboards/ah/haven80/hotswap/info.json b/keyboards/ah/haven80/hotswap/info.json index b73da1c5f4c..e740857bcb1 100644 --- a/keyboards/ah/haven80/hotswap/info.json +++ b/keyboards/ah/haven80/hotswap/info.json @@ -105,7 +105,7 @@ { "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "space", "matrix":[10,3],"x": 4, "y": 5.25, "w": 7 }, { "label": "ralt", "matrix":[10,5],"x": 11, "y": 5.25, "w": 1.5 }, - { "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.25, "w": 1 }, + { "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.25}, { "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.25, "w":1.5}, { "label": "left", "matrix":[9,2],"x": 15.25, "y": 5.25 }, { "label": "down", "matrix":[9,1],"x": 16.25, "y": 5.25 }, diff --git a/keyboards/ah/haven80/solder/info.json b/keyboards/ah/haven80/solder/info.json index 775908d24f0..686c091727d 100644 --- a/keyboards/ah/haven80/solder/info.json +++ b/keyboards/ah/haven80/solder/info.json @@ -108,7 +108,7 @@ { "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "space", "matrix":[10,3],"x": 4, "y": 5.25, "w": 7 }, { "label": "ralt", "matrix":[10,5],"x": 11, "y": 5.25, "w": 1.5 }, - { "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.25, "w": 1 }, + { "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.25}, { "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.25, "w":1.5}, { "label": "left", "matrix":[9,2],"x": 15.25, "y": 5.25 }, { "label": "down", "matrix":[9,1],"x": 16.25, "y": 5.25 }, diff --git a/keyboards/custommk/evo70_r2/info.json b/keyboards/custommk/evo70_r2/info.json index a11daef092d..dea56ed2570 100644 --- a/keyboards/custommk/evo70_r2/info.json +++ b/keyboards/custommk/evo70_r2/info.json @@ -121,7 +121,7 @@ {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3}, {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3}, {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, - {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3, "w": 1}, + {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3}, {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3}, {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3}, {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3}, @@ -286,7 +286,7 @@ {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3}, {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3}, {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, - {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3, "w": 1}, + {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3}, {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3}, {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3}, {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3}, diff --git a/keyboards/enviousdesign/delirium/rgb/info.json b/keyboards/enviousdesign/delirium/rgb/info.json index ad7d45d3cf7..b6e0bb0e0c5 100644 --- a/keyboards/enviousdesign/delirium/rgb/info.json +++ b/keyboards/enviousdesign/delirium/rgb/info.json @@ -145,83 +145,83 @@ "layouts": { "LAYOUT_tkl_iso": { "layout": [ - {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0, "w": 1}, - {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0, "w": 1}, - {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0, "w": 1}, - {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0, "w": 1}, - {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0, "w": 1}, - {"label": "0,7", "matrix": [0, 7], "x": 6.5, "y": 0, "w": 1}, - {"label": "0,8", "matrix": [0, 8], "x": 7.5, "y": 0, "w": 1}, - {"label": "0,9", "matrix": [0, 9], "x": 8.5, "y": 0, "w": 1}, - {"label": "0,10", "matrix": [0, 10], "x": 9.5, "y": 0, "w": 1}, - {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0, "w": 1}, - {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0, "w": 1}, - {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0, "w": 1}, - {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0, "w": 1}, - {"label": "0,15", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 1}, - {"label": "0,16", "matrix": [0, 16], "x": 16.25, "y": 0, "w": 1}, - {"label": "0,17", "matrix": [0, 17], "x": 17.25, "y": 0, "w": 1}, - {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.5, "w": 1}, - {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.5, "w": 1}, - {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.5, "w": 1}, - {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.5, "w": 1}, - {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.5, "w": 1}, - {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.5, "w": 1}, - {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.5, "w": 1}, - {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.5, "w": 1}, - {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.5, "w": 1}, - {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.5, "w": 1}, - {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.5, "w": 1}, - {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.5, "w": 1}, - {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.5, "w": 1}, + {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "0,7", "matrix": [0, 7], "x": 6.5, "y": 0}, + {"label": "0,8", "matrix": [0, 8], "x": 7.5, "y": 0}, + {"label": "0,9", "matrix": [0, 9], "x": 8.5, "y": 0}, + {"label": "0,10", "matrix": [0, 10], "x": 9.5, "y": 0}, + {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "0,15", "matrix": [0, 15], "x": 15.25, "y": 0}, + {"label": "0,16", "matrix": [0, 16], "x": 16.25, "y": 0}, + {"label": "0,17", "matrix": [0, 17], "x": 17.25, "y": 0}, + {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.5}, + {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.5}, + {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.5}, + {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.5}, + {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.5}, + {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.5}, + {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.5}, + {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.5}, + {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.5}, + {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.5}, + {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.5}, + {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.5}, + {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.5}, {"label": "1,14", "matrix": [1, 14], "x": 13, "y": 1.5, "w": 2}, - {"label": "1,15", "matrix": [1, 15], "x": 15.25, "y": 1.5, "w": 1}, - {"label": "1,16", "matrix": [1, 16], "x": 16.25, "y": 1.5, "w": 1}, - {"label": "1,17", "matrix": [1, 17], "x": 17.25, "y": 1.5, "w": 1}, + {"label": "1,15", "matrix": [1, 15], "x": 15.25, "y": 1.5}, + {"label": "1,16", "matrix": [1, 16], "x": 16.25, "y": 1.5}, + {"label": "1,17", "matrix": [1, 17], "x": 17.25, "y": 1.5}, {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, - {"label": "2,2", "matrix": [2, 2], "x": 1.5, "y": 2.5, "w": 1}, - {"label": "2,3", "matrix": [2, 3], "x": 2.5, "y": 2.5, "w": 1}, - {"label": "2,4", "matrix": [2, 4], "x": 3.5, "y": 2.5, "w": 1}, - {"label": "2,5", "matrix": [2, 5], "x": 4.5, "y": 2.5, "w": 1}, - {"label": "2,6", "matrix": [2, 6], "x": 5.5, "y": 2.5, "w": 1}, - {"label": "2,7", "matrix": [2, 7], "x": 6.5, "y": 2.5, "w": 1}, - {"label": "2,8", "matrix": [2, 8], "x": 7.5, "y": 2.5, "w": 1}, - {"label": "2,9", "matrix": [2, 9], "x": 8.5, "y": 2.5, "w": 1}, - {"label": "2,10", "matrix": [2, 10], "x": 9.5, "y": 2.5, "w": 1}, - {"label": "2,11", "matrix": [2, 11], "x": 10.5, "y": 2.5, "w": 1}, - {"label": "2,12", "matrix": [2, 12], "x": 11.5, "y": 2.5, "w": 1}, - {"label": "2,13", "matrix": [2, 13], "x": 12.5, "y": 2.5, "w": 1}, - {"label": "2,15", "matrix": [2, 15], "x": 15.25, "y": 2.5, "w": 1}, - {"label": "2,16", "matrix": [2, 16], "x": 16.25, "y": 2.5, "w": 1}, - {"label": "2,17", "matrix": [2, 17], "x": 17.25, "y": 2.5, "w": 1}, + {"label": "2,2", "matrix": [2, 2], "x": 1.5, "y": 2.5}, + {"label": "2,3", "matrix": [2, 3], "x": 2.5, "y": 2.5}, + {"label": "2,4", "matrix": [2, 4], "x": 3.5, "y": 2.5}, + {"label": "2,5", "matrix": [2, 5], "x": 4.5, "y": 2.5}, + {"label": "2,6", "matrix": [2, 6], "x": 5.5, "y": 2.5}, + {"label": "2,7", "matrix": [2, 7], "x": 6.5, "y": 2.5}, + {"label": "2,8", "matrix": [2, 8], "x": 7.5, "y": 2.5}, + {"label": "2,9", "matrix": [2, 9], "x": 8.5, "y": 2.5}, + {"label": "2,10", "matrix": [2, 10], "x": 9.5, "y": 2.5}, + {"label": "2,11", "matrix": [2, 11], "x": 10.5, "y": 2.5}, + {"label": "2,12", "matrix": [2, 12], "x": 11.5, "y": 2.5}, + {"label": "2,13", "matrix": [2, 13], "x": 12.5, "y": 2.5}, + {"label": "2,15", "matrix": [2, 15], "x": 15.25, "y": 2.5}, + {"label": "2,16", "matrix": [2, 16], "x": 16.25, "y": 2.5}, + {"label": "2,17", "matrix": [2, 17], "x": 17.25, "y": 2.5}, {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, - {"label": "3,2", "matrix": [3, 2], "x": 1.75, "y": 3.5, "w": 1}, - {"label": "3,3", "matrix": [3, 3], "x": 2.75, "y": 3.5, "w": 1}, - {"label": "3,4", "matrix": [3, 4], "x": 3.75, "y": 3.5, "w": 1}, - {"label": "3,5", "matrix": [3, 5], "x": 4.75, "y": 3.5, "w": 1}, - {"label": "3,6", "matrix": [3, 6], "x": 5.75, "y": 3.5, "w": 1}, - {"label": "3,7", "matrix": [3, 7], "x": 6.75, "y": 3.5, "w": 1}, - {"label": "3,8", "matrix": [3, 8], "x": 7.75, "y": 3.5, "w": 1}, - {"label": "3,9", "matrix": [3, 9], "x": 8.75, "y": 3.5, "w": 1}, - {"label": "3,10", "matrix": [3, 10], "x": 9.75, "y": 3.5, "w": 1}, - {"label": "3,11", "matrix": [3, 11], "x": 10.75, "y": 3.5, "w": 1}, - {"label": "3,12", "matrix": [3, 12], "x": 11.75, "y": 3.5, "w": 1}, - {"label": "3,13", "matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 1}, + {"label": "3,2", "matrix": [3, 2], "x": 1.75, "y": 3.5}, + {"label": "3,3", "matrix": [3, 3], "x": 2.75, "y": 3.5}, + {"label": "3,4", "matrix": [3, 4], "x": 3.75, "y": 3.5}, + {"label": "3,5", "matrix": [3, 5], "x": 4.75, "y": 3.5}, + {"label": "3,6", "matrix": [3, 6], "x": 5.75, "y": 3.5}, + {"label": "3,7", "matrix": [3, 7], "x": 6.75, "y": 3.5}, + {"label": "3,8", "matrix": [3, 8], "x": 7.75, "y": 3.5}, + {"label": "3,9", "matrix": [3, 9], "x": 8.75, "y": 3.5}, + {"label": "3,10", "matrix": [3, 10], "x": 9.75, "y": 3.5}, + {"label": "3,11", "matrix": [3, 11], "x": 10.75, "y": 3.5}, + {"label": "3,12", "matrix": [3, 12], "x": 11.75, "y": 3.5}, + {"label": "3,13", "matrix": [3, 13], "x": 12.75, "y": 3.5}, {"label": "3,14", "matrix": [3, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, - {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1}, - {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.5, "w": 1}, - {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.5, "w": 1}, - {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.5, "w": 1}, - {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.5, "w": 1}, - {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.5, "w": 1}, - {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.5, "w": 1}, - {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.5, "w": 1}, - {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.5, "w": 1}, - {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.5, "w": 1}, - {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.5, "w": 1}, + {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.5}, {"label": "4,13", "matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75}, - {"label": "4,16", "matrix": [4, 16], "x": 16.25, "y": 4.5, "w": 1}, + {"label": "4,16", "matrix": [4, 16], "x": 16.25, "y": 4.5}, {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, {"label": "5,1", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, {"label": "5,3", "matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25}, @@ -230,9 +230,9 @@ {"label": "5,11", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25}, {"label": "5,13", "matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25}, {"label": "5,14", "matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25}, - {"label": "5,15", "matrix": [5, 15], "x": 15.25, "y": 5.5, "w": 1}, - {"label": "5,16", "matrix": [5, 16], "x": 16.25, "y": 5.5, "w": 1}, - {"label": "5,17", "matrix": [5, 17], "x": 17.25, "y": 5.5, "w": 1} + {"label": "5,15", "matrix": [5, 15], "x": 15.25, "y": 5.5}, + {"label": "5,16", "matrix": [5, 16], "x": 16.25, "y": 5.5}, + {"label": "5,17", "matrix": [5, 17], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/enviousdesign/mcro/rev1/info.json b/keyboards/enviousdesign/mcro/rev1/info.json index fe6a4ffe77c..c7e4c38765a 100644 --- a/keyboards/enviousdesign/mcro/rev1/info.json +++ b/keyboards/enviousdesign/mcro/rev1/info.json @@ -26,18 +26,18 @@ "layouts": { "LAYOUT_ortho_3x4": { "layout": [ - {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0, "w": 1}, - {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0, "w": 1}, - {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0, "w": 1}, - {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0, "w": 1}, - {"label": "F17", "matrix": [1, 0], "x": 0, "y": 1.25, "w": 1}, - {"label": "F18", "matrix": [1, 1], "x": 1, "y": 1.25, "w": 1}, - {"label": "F19", "matrix": [1, 2], "x": 2, "y": 1.25, "w": 1}, - {"label": "F20", "matrix": [1, 3], "x": 3, "y": 1.25, "w": 1}, - {"label": "F21", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1}, - {"label": "F22", "matrix": [2, 1], "x": 1, "y": 2.5, "w": 1}, - {"label": "F23", "matrix": [2, 2], "x": 2, "y": 2.5, "w": 1}, - {"label": "F24", "matrix": [2, 3], "x": 3, "y": 2.5, "w": 1} + {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "F17", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "F18", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "F19", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "F20", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "F21", "matrix": [2, 0], "x": 0, "y": 2.5}, + {"label": "F22", "matrix": [2, 1], "x": 1, "y": 2.5}, + {"label": "F23", "matrix": [2, 2], "x": 2, "y": 2.5}, + {"label": "F24", "matrix": [2, 3], "x": 3, "y": 2.5} ] } } diff --git a/keyboards/handwired/3dp660_oled/info.json b/keyboards/handwired/3dp660_oled/info.json index a43aca34643..ef863b3b520 100644 --- a/keyboards/handwired/3dp660_oled/info.json +++ b/keyboards/handwired/3dp660_oled/info.json @@ -31,62 +31,62 @@ "layouts": { "LAYOUT_66_ansi": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 }, { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 }, - { "label": "Page Up", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "Page Up", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 }, { "label": "|", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "Page Down", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "Page Down", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 }, { "label": "Enter", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 }, - { "label": "Up", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "Up", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, @@ -94,70 +94,70 @@ { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 }, { "label": "Win", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 }, { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "Left", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "Down", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "Up", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "Left", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "Down", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "Up", "matrix": [9, 7], "x": 15.5, "y": 4 } ] }, "LAYOUT_66_iso": { "layout": [ - { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, + { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 }, { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 }, - { "label": "Insert", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "Insert", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, - { "label": "Delete", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 }, + { "label": "Delete", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, - { "label": "", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 }, + { "label": "", "matrix": [7, 4], "x": 12.75, "y": 2 }, { "h": 2, "label": "Enter", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 1 }, { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "\\", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, + { "label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 }, - { "label": "\u2191", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "\u2191", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, @@ -165,86 +165,86 @@ { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 }, { "label": "Ctrl", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 }, { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "\u2190", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "\u2193", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "\u2192", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "\u2190", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "\u2193", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "\u2192", "matrix": [9, 7], "x": 15.5, "y": 4 } ] }, "LAYOUT_all": { "layout": [ - { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "8", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "9", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 }, - { "label": "0", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "DASH", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "EQUALSIGN", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 }, - { "label": "YEN", "matrix": [5, 5], "w": 1, "x": 13, "y": 0 }, - { "label": "BACKSPACE", "matrix": [5, 6], "w": 1, "x": 14, "y": 0 }, - { "label": "PAGEUP", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 }, + { "label": "GRAVE", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "8", "matrix": [5, 0], "x": 8, "y": 0 }, + { "label": "9", "matrix": [5, 1], "x": 9, "y": 0 }, + { "label": "0", "matrix": [5, 2], "x": 10, "y": 0 }, + { "label": "DASH", "matrix": [5, 3], "x": 11, "y": 0 }, + { "label": "EQUALSIGN", "matrix": [5, 4], "x": 12, "y": 0 }, + { "label": "YEN", "matrix": [5, 5], "x": 13, "y": 0 }, + { "label": "BACKSPACE", "matrix": [5, 6], "x": 14, "y": 0 }, + { "label": "PAGEUP", "matrix": [5, 7], "x": 15.5, "y": 0 }, { "label": "TAB", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 }, - { "label": "LBRACKET", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 }, - { "label": "RBRACKET", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 }, + { "label": "LBRACKET", "matrix": [6, 3], "x": 11.5, "y": 1 }, + { "label": "RBRACKET", "matrix": [6, 4], "x": 12.5, "y": 1 }, { "label": "BACKSLASH", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "PAGEDOWN", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 }, + { "label": "PAGEDOWN", "matrix": [6, 7], "x": 15.5, "y": 1 }, { "label": "CAPSLOCK", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 }, - { "label": "SEMICOLON", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 }, - { "label": "QUOTE", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 }, - { "label": "ISOHASH", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 }, + { "label": "SEMICOLON", "matrix": [7, 2], "x": 10.75, "y": 2 }, + { "label": "QUOTE", "matrix": [7, 3], "x": 11.75, "y": 2 }, + { "label": "ISOHASH", "matrix": [7, 4], "x": 12.75, "y": 2 }, { "label": "ENTER", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 2 }, { "label": "LSHIFT", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "ISOBACKSLASH", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 }, - { "label": "COMMA", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 }, - { "label": "PERIOD", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 }, - { "label": "SLASH", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 }, - { "label": "JPBACKSLASH", "matrix": [8, 4], "w": 1, "x": 12.25, "y": 3 }, + { "label": "ISOBACKSLASH", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 }, + { "label": "COMMA", "matrix": [8, 1], "x": 9.25, "y": 3 }, + { "label": "PERIOD", "matrix": [8, 2], "x": 10.25, "y": 3 }, + { "label": "SLASH", "matrix": [8, 3], "x": 11.25, "y": 3 }, + { "label": "JPBACKSLASH", "matrix": [8, 4], "x": 12.25, "y": 3 }, { "label": "RSHIFT", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3 }, - { "label": "UP", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 }, + { "label": "UP", "matrix": [8, 6], "x": 14.5, "y": 3 }, { "label": "LCTRL", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, - { "label": "LALT", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4 }, + { "label": "LALT", "matrix": [4, 1], "x": 1.25, "y": 4 }, { "label": "LCMD", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 }, { "label": "MUHENKAN", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 }, { "label": "SPACE1", "matrix": [4, 5], "w": 2, "x": 4.75, "y": 4 }, { "label": "SPACE2", "matrix": [4, 6], "w": 2, "x": 6.75, "y": 4 }, { "label": "HENKAN", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 }, { "label": "RCMD", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 }, - { "label": "RCTRL", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 }, + { "label": "RCTRL", "matrix": [9, 3], "x": 11.25, "y": 4 }, { "label": "FN", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 }, - { "label": "LEFT", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 }, - { "label": "DOWN", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 }, - { "label": "RIGHT", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 } + { "label": "LEFT", "matrix": [9, 5], "x": 13.5, "y": 4 }, + { "label": "DOWN", "matrix": [9, 6], "x": 14.5, "y": 4 }, + { "label": "RIGHT", "matrix": [9, 7], "x": 15.5, "y": 4 } ] } } diff --git a/keyboards/hazel/bad_wings/info.json b/keyboards/hazel/bad_wings/info.json index 5cfa0b0efb8..070a69f6917 100644 --- a/keyboards/hazel/bad_wings/info.json +++ b/keyboards/hazel/bad_wings/info.json @@ -24,42 +24,42 @@ "layouts": { "LAYOUT_split_3x5_3": { "layout": [ - {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0.75}, - {"label": "K10", "matrix": [1, 0], "w": 1, "x": 1, "y": 0.5}, - {"label": "K20", "matrix": [2, 0], "w": 1, "x": 2, "y": 0}, - {"label": "K30", "matrix": [3, 0], "w": 1, "x": 3, "y": 0.25}, - {"label": "K40", "matrix": [4, 0], "w": 1, "x": 4, "y": 0.36}, - {"label": "K44", "matrix": [4, 4], "w": 1, "x": 8, "y": 0.36}, - {"label": "K34", "matrix": [3, 4], "w": 1, "x": 9, "y": 0.25}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 10, "y": 0}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 11, "y": 0.5}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 12, "y": 0.75}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 0, "y": 1.75}, - {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.5}, - {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2, "y": 1}, - {"label": "K31", "matrix": [3, 1], "w": 1, "x": 3, "y": 1.25}, - {"label": "K41", "matrix": [4, 1], "w": 1, "x": 4, "y": 1.36}, - {"label": "K45", "matrix": [4, 5], "w": 1, "x": 8, "y": 1.36}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9, "y": 1.25}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10, "y": 1}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 11, "y": 1.5}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 12, "y": 1.75}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 0, "y": 2.75}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 1, "y": 2.5}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3, "y": 2.25}, - {"label": "K42", "matrix": [4, 2], "w": 1, "x": 4, "y": 2.36}, - {"label": "K46", "matrix": [4, 6], "w": 1, "x": 8, "y": 2.36}, - {"label": "K36", "matrix": [3, 6], "w": 1, "x": 9, "y": 2.25}, - {"label": "K26", "matrix": [2, 6], "w": 1, "x": 10, "y": 2}, - {"label": "K16", "matrix": [1, 6], "w": 1, "x": 11, "y": 2.5}, - {"label": "K06", "matrix": [0, 6], "w": 1, "x": 12, "y": 2.75}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3, "y": 3.25}, - {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4, "y": 3.36}, - {"label": "K43", "matrix": [4, 3], "w": 1, "x": 5, "y": 3.47}, - {"label": "K47", "matrix": [4, 7], "w": 1, "x": 7, "y": 3.47}, - {"label": "K37", "matrix": [3, 7], "w": 1, "x": 8, "y": 3.36}, - {"label": "K27", "matrix": [2, 7], "w": 1, "x": 9, "y": 3.25} + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0.75}, + {"label": "K10", "matrix": [1, 0], "x": 1, "y": 0.5}, + {"label": "K20", "matrix": [2, 0], "x": 2, "y": 0}, + {"label": "K30", "matrix": [3, 0], "x": 3, "y": 0.25}, + {"label": "K40", "matrix": [4, 0], "x": 4, "y": 0.36}, + {"label": "K44", "matrix": [4, 4], "x": 8, "y": 0.36}, + {"label": "K34", "matrix": [3, 4], "x": 9, "y": 0.25}, + {"label": "K24", "matrix": [2, 4], "x": 10, "y": 0}, + {"label": "K14", "matrix": [1, 4], "x": 11, "y": 0.5}, + {"label": "K04", "matrix": [0, 4], "x": 12, "y": 0.75}, + {"label": "K01", "matrix": [0, 1], "x": 0, "y": 1.75}, + {"label": "K11", "matrix": [1, 1], "x": 1, "y": 1.5}, + {"label": "K21", "matrix": [2, 1], "x": 2, "y": 1}, + {"label": "K31", "matrix": [3, 1], "x": 3, "y": 1.25}, + {"label": "K41", "matrix": [4, 1], "x": 4, "y": 1.36}, + {"label": "K45", "matrix": [4, 5], "x": 8, "y": 1.36}, + {"label": "K35", "matrix": [3, 5], "x": 9, "y": 1.25}, + {"label": "K25", "matrix": [2, 5], "x": 10, "y": 1}, + {"label": "K15", "matrix": [1, 5], "x": 11, "y": 1.5}, + {"label": "K05", "matrix": [0, 5], "x": 12, "y": 1.75}, + {"label": "K02", "matrix": [0, 2], "x": 0, "y": 2.75}, + {"label": "K12", "matrix": [1, 2], "x": 1, "y": 2.5}, + {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "K32", "matrix": [3, 2], "x": 3, "y": 2.25}, + {"label": "K42", "matrix": [4, 2], "x": 4, "y": 2.36}, + {"label": "K46", "matrix": [4, 6], "x": 8, "y": 2.36}, + {"label": "K36", "matrix": [3, 6], "x": 9, "y": 2.25}, + {"label": "K26", "matrix": [2, 6], "x": 10, "y": 2}, + {"label": "K16", "matrix": [1, 6], "x": 11, "y": 2.5}, + {"label": "K06", "matrix": [0, 6], "x": 12, "y": 2.75}, + {"label": "K23", "matrix": [2, 3], "x": 3, "y": 3.25}, + {"label": "K33", "matrix": [3, 3], "x": 4, "y": 3.36}, + {"label": "K43", "matrix": [4, 3], "x": 5, "y": 3.47}, + {"label": "K47", "matrix": [4, 7], "x": 7, "y": 3.47}, + {"label": "K37", "matrix": [3, 7], "x": 8, "y": 3.36}, + {"label": "K27", "matrix": [2, 7], "x": 9, "y": 3.25} ] } } diff --git a/keyboards/kopibeng/mnk60/info.json b/keyboards/kopibeng/mnk60/info.json index 430fc66c1bc..0477ac560db 100644 --- a/keyboards/kopibeng/mnk60/info.json +++ b/keyboards/kopibeng/mnk60/info.json @@ -375,11 +375,11 @@ { "matrix": [3, 11], "x": 11.25, "y": 3 }, { "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 }, { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 }, - { "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 }, + { "matrix": [4, 1], "x": 1.5, "y": 4 }, { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 }, { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 }, { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 }, - { "matrix": [4, 12], "w": 1, "x": 12.5, "y": 4 }, + { "matrix": [4, 12], "x": 12.5, "y": 4 }, { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 } ] }, @@ -442,11 +442,11 @@ { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, { "matrix": [3, 13], "x": 14, "y": 3 }, { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 }, - { "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 }, + { "matrix": [4, 1], "x": 1.5, "y": 4 }, { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 }, { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 }, { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 }, - { "matrix": [4, 12], "w": 1, "x": 12.5, "y": 4 }, + { "matrix": [4, 12], "x": 12.5, "y": 4 }, { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 } ] }, @@ -779,11 +779,11 @@ { "matrix": [3, 11], "x": 11.25, "y": 3 }, { "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 }, { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 }, - { "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 }, + { "matrix": [4, 1], "x": 1.5, "y": 4 }, { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 }, { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 }, { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 }, - { "matrix": [4, 12], "w": 1, "x": 12.5, "y": 4 }, + { "matrix": [4, 12], "x": 12.5, "y": 4 }, { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 } ] }, @@ -846,11 +846,11 @@ { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, { "matrix": [3, 13], "x": 14, "y": 3 }, { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 }, - { "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 }, + { "matrix": [4, 1], "x": 1.5, "y": 4 }, { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 }, { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 }, { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 }, - { "matrix": [4, 12], "w": 1, "x": 12.5, "y": 4 }, + { "matrix": [4, 12], "x": 12.5, "y": 4 }, { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 } ] }, diff --git a/keyboards/laneware/lpad/keyboard.json b/keyboards/laneware/lpad/keyboard.json index 473a6552c5d..d143b363b30 100644 --- a/keyboards/laneware/lpad/keyboard.json +++ b/keyboards/laneware/lpad/keyboard.json @@ -32,12 +32,12 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "Play", "matrix": [0, 0], "w": 1, "x": 0, "y": 0}, - {"label": "Mute", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.5}, - {"label": "Next", "matrix": [1, 0], "w": 1, "x": 0, "y": 1}, - {"label": "Prev", "matrix": [2, 0], "w": 1, "x": 0, "y": 2}, - {"label": "Left", "matrix": [2, 1], "w": 1, "x": 1, "y": 2}, - {"label": "Rght", "matrix": [2, 2], "w": 1, "x": 2, "y": 2} + {"label": "Play", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Mute", "matrix": [0, 1], "x": 1.5, "y": 0.5}, + {"label": "Next", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "Prev", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "Left", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "Rght", "matrix": [2, 2], "x": 2, "y": 2} ] } } diff --git a/keyboards/latincompass/latin60rgb/keyboard.json b/keyboards/latincompass/latin60rgb/keyboard.json index 6c9bfdc47b4..3197b3979d3 100644 --- a/keyboards/latincompass/latin60rgb/keyboard.json +++ b/keyboards/latincompass/latin60rgb/keyboard.json @@ -117,9 +117,9 @@ {"matrix": [3, 8], "x": 9, "y": 3}, {"matrix": [3, 9], "x": 10, "y": 3}, {"matrix": [3, 10], "x": 11, "y": 3}, - {"matrix": [3, 11], "x": 12, "y": 3, "w": 1}, - {"matrix": [3, 12], "x": 13, "y": 3, "w": 1}, - {"matrix": [3, 13], "x": 14, "y": 3, "w": 1}, + {"matrix": [3, 11], "x": 12, "y": 3}, + {"matrix": [3, 12], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25}, {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.25}, diff --git a/keyboards/lucid/velvet_solder/info.json b/keyboards/lucid/velvet_solder/info.json index b94b4160162..569204d1a02 100644 --- a/keyboards/lucid/velvet_solder/info.json +++ b/keyboards/lucid/velvet_solder/info.json @@ -96,7 +96,7 @@ {"matrix": [3, 13], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25}, {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 1.25}, - {"matrix": [4, 1], "label": "Left Shift", "x": 1.25, "y": 4.25, "w": 1}, + {"matrix": [4, 1], "label": "Left Shift", "x": 1.25, "y": 4.25}, {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25}, {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25}, {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25}, @@ -494,7 +494,7 @@ {"matrix": [2, 13], "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 1.25}, - {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25, "w": 1}, + {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25}, {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25}, {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25}, {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25}, @@ -593,7 +593,7 @@ {"matrix": [2, 13], "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 1.25}, - {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25, "w": 1}, + {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25}, {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25}, {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25}, {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25}, @@ -693,7 +693,7 @@ {"matrix": [2, 13], "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 1.25}, - {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25, "w": 1}, + {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25}, {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25}, {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25}, {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25}, diff --git a/keyboards/mokey/luckycat70/info.json b/keyboards/mokey/luckycat70/info.json index 0f3ec996fbc..2f9ab6a1e59 100644 --- a/keyboards/mokey/luckycat70/info.json +++ b/keyboards/mokey/luckycat70/info.json @@ -76,7 +76,7 @@ {"matrix": [1, 6], "x": 10.5, "y": 1}, {"matrix": [1, 5], "x": 11.5, "y": 1}, {"matrix": [1, 4], "x": 12.5, "y": 1}, - {"matrix": [1, 3], "x": 13.5, "y": 1, "w": 1, "h": 1.5}, + {"matrix": [1, 3], "x": 13.5, "y": 1, "h": 1.5}, {"matrix": [1, 2], "x": 15.25, "y": 1}, {"matrix": [1, 1], "x": 16.25, "y": 1}, {"matrix": [1, 0], "x": 17.25, "y": 1}, diff --git a/keyboards/phentech/rpk_001/info.json b/keyboards/phentech/rpk_001/info.json index d61c83607a1..0ce29938972 100644 --- a/keyboards/phentech/rpk_001/info.json +++ b/keyboards/phentech/rpk_001/info.json @@ -229,8 +229,8 @@ { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, { "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4 }, - { "matrix": [4, 8], "w": 1, "x": 10, "y": 4 }, - { "matrix": [4, 9], "w": 1, "x": 11, "y": 4 }, + { "matrix": [4, 8], "x": 10, "y": 4 }, + { "matrix": [4, 9], "x": 11, "y": 4 }, { "matrix": [4, 10], "w": 1.25, "x": 12, "y": 4 }, { "matrix": [4, 11], "x": 13.5, "y": 4 }, { "matrix": [4, 13], "x": 14.5, "y": 4 }, diff --git a/keyboards/skyloong/gk61/pro/info.json b/keyboards/skyloong/gk61/pro/info.json index 7d507f1e8ca..5a2302a92c4 100644 --- a/keyboards/skyloong/gk61/pro/info.json +++ b/keyboards/skyloong/gk61/pro/info.json @@ -136,7 +136,7 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, {"matrix": [0, 3], "x": 3, "y": 0}, @@ -204,7 +204,7 @@ }, "LAYOUT_60_ansi": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, {"matrix": [0, 3], "x": 3, "y": 0}, @@ -269,7 +269,7 @@ }, "LAYOUT_60_ansi_split_space": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, {"matrix": [0, 3], "x": 3, "y": 0}, diff --git a/keyboards/skyloong/gk61/pro_48/info.json b/keyboards/skyloong/gk61/pro_48/info.json index 10a663f3c71..0c7065ec489 100644 --- a/keyboards/skyloong/gk61/pro_48/info.json +++ b/keyboards/skyloong/gk61/pro_48/info.json @@ -137,7 +137,7 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, {"matrix": [0, 3], "x": 3, "y": 0}, @@ -205,7 +205,7 @@ }, "LAYOUT_60_ansi": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, {"matrix": [0, 3], "x": 3, "y": 0}, @@ -270,7 +270,7 @@ }, "LAYOUT_60_ansi_split_space": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, {"matrix": [0, 3], "x": 3, "y": 0}, diff --git a/keyboards/skyloong/gk61/v1/info.json b/keyboards/skyloong/gk61/v1/info.json index d5320fa7655..0bafe1bd4ef 100644 --- a/keyboards/skyloong/gk61/v1/info.json +++ b/keyboards/skyloong/gk61/v1/info.json @@ -128,7 +128,7 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, {"matrix": [0, 3], "x": 3, "y": 0}, @@ -196,7 +196,7 @@ }, "LAYOUT_60_ansi": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, {"matrix": [0, 3], "x": 3, "y": 0}, @@ -261,7 +261,7 @@ }, "LAYOUT_60_ansi_split_space": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, {"matrix": [0, 3], "x": 3, "y": 0}, diff --git a/keyboards/snes_macropad/info.json b/keyboards/snes_macropad/info.json index 15e3c9ee678..3483fe8f539 100644 --- a/keyboards/snes_macropad/info.json +++ b/keyboards/snes_macropad/info.json @@ -47,8 +47,8 @@ {"matrix": [3, 0], "x": 5.2, "y": 0, "w": 2, "h": 0.75}, {"matrix": [3, 1], "x": 10.65, "y": 0, "w": 2, "h": 0.75}, - {"matrix": [3, 2], "x": 7.9, "y": 2.5, "w": 1, "h": 0.75}, - {"matrix": [3, 3], "x": 8.9, "y": 2.5, "w": 1, "h": 0.75}, + {"matrix": [3, 2], "x": 7.9, "y": 2.5, "h": 0.75}, + {"matrix": [3, 3], "x": 8.9, "y": 2.5, "h": 0.75}, {"matrix": [4, 0], "x": 6, "y": 1, "w": 0.85, "h": 0.85}, {"matrix": [4, 1], "x": 6, "y": 3, "w": 0.85, "h": 0.85}, {"matrix": [4, 2], "x": 5.2, "y": 2, "w": 0.85, "h": 0.85}, diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json index 04baad7d00b..4b64ba96d18 100644 --- a/keyboards/teahouse/ayleen/info.json +++ b/keyboards/teahouse/ayleen/info.json @@ -129,7 +129,7 @@ {"label": "lalt", "matrix": [10, 2], "x": 2.5, "y": 5.25, "w": 1.5}, {"label": "space", "matrix": [10, 3], "x": 4, "y": 5.25, "w": 7}, {"label": "ralt", "matrix": [10, 4], "x": 11, "y": 5.25, "w": 1.5}, - {"label": "rwin", "matrix": [10, 5], "x": 12.5, "y": 5.25, "w": 1}, + {"label": "rwin", "matrix": [10, 5], "x": 12.5, "y": 5.25}, {"label": "rctrl", "matrix": [10, 8], "x": 13.5, "y": 5.25, "w": 1.5}, {"label": "left", "matrix": [9, 3], "x": 15.25, "y": 5.25}, {"label": "down", "matrix": [9, 2], "x": 16.25, "y": 5.25}, diff --git a/keyboards/varanidae/info.json b/keyboards/varanidae/info.json index f35e061dcf0..ca6480d4da2 100644 --- a/keyboards/varanidae/info.json +++ b/keyboards/varanidae/info.json @@ -35,480 +35,480 @@ "layouts": { "LAYOUT_ansi": { "layout": [ - { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0, "w": 1 }, + { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0}, - { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0, "w": 1 }, - { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0, "w": 1 }, - { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0, "w": 1 }, - { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0, "w": 1 }, - { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0, "w": 1 }, - { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0, "w": 1 }, - { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0, "w": 1 }, - { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0, "w": 1 }, - { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0, "w": 1 }, - { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0, "w": 1 }, - { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0, "w": 1 }, - { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0, "w": 1 }, - { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0, "w": 1 }, - { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0, "w": 1 }, - { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0, "w": 1 }, - { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0, "w": 1 }, - { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0, "w": 1 }, - { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0, "w": 1 }, - { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0, "w": 1 }, + { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0}, + { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0}, + { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0}, + { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0}, + { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0}, + { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0}, + { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0}, + { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0}, + { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0}, + { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0}, + { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0}, + { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0}, + { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0}, + { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0}, + { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0}, + { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0}, + { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0}, + { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0}, + { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0}, - { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1, "w": 1 }, - { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1, "w": 1 }, - { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1, "w": 1 }, - { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1, "w": 1 }, - { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1, "w": 1 }, - { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25, "w": 1 }, - { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25, "w": 1 }, - { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25, "w": 1 }, - { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25, "w": 1 }, - { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25, "w": 1 }, - { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25, "w": 1 }, - { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25, "w": 1 }, - { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25, "w": 1 }, - { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25, "w": 1 }, - { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25, "w": 1 }, - { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25, "w": 1 }, - { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25, "w": 1 }, - { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25, "w": 1 }, + { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1}, + { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1}, + { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1}, + { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1}, + { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1}, + { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25}, + { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25}, + { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25}, + { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25}, + { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25}, + { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25}, + { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25}, + { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25}, + { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25}, + { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25}, + { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25}, + { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25}, + { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25}, { "label":"Backspace", "matrix": [7, 5], "x": 18.25, "y": 1.25, "w": 2 }, - { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25, "w": 1 }, - { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25, "w": 1 }, - { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25, "w": 1 }, - { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25, "w": 1 }, - { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25, "w": 1 }, + { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25}, + { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25}, + { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25}, + { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25}, + { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25}, { "label":"Tab", "matrix": [2, 6], "x": 5.25, "y": 2.25, "w": 1.5 }, - { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25, "w": 1 }, - { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25, "w": 1 }, - { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25, "w": 1 }, - { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25, "w": 1 }, - { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25, "w": 1 }, - { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25, "w": 1 }, - { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25, "w": 1 }, - { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25, "w": 1 }, - { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25, "w": 1 }, - { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25, "w": 1 }, - { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25, "w": 1 }, - { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25, "w": 1 }, + { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25}, + { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25}, + { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25}, + { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25}, + { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25}, + { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25}, + { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25}, + { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25}, + { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25}, + { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25}, + { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25}, + { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25}, { "label":"\\", "matrix": [10, 3], "x": 18.75, "y": 2.25, "w": 1.5 }, - { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25, "w": 1 }, - { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25, "w": 1 }, - { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25, "w": 1 }, - { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25, "w": 1 }, - { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25, "w": 1 }, + { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25}, + { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25}, + { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25}, + { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25}, + { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25}, { "label":"Alt", "matrix": [3, 6], "x": 5.25, "y": 3.25, "w": 1.75 }, - { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25, "w": 1 }, - { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25, "w": 1 }, - { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25, "w": 1 }, - { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25, "w": 1 }, - { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25, "w": 1 }, - { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25, "w": 1 }, - { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25, "w": 1 }, - { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25, "w": 1 }, - { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25, "w": 1 }, - { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25, "w": 1 }, - { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25, "w": 1 }, + { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25}, + { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25}, + { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25}, + { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25}, + { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25}, + { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25}, + { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25}, + { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25}, + { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25}, + { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25}, + { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25}, { "label":"Enter", "matrix": [9, 4], "x": 18, "y": 3.25, "w": 2.25}, - { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25, "w": 1 }, - { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25, "w": 1 }, - { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25, "w": 1 }, - { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25, "w": 1 }, - { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25, "w": 1 }, + { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25}, + { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25}, + { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25}, + { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25}, + { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25}, { "label":"Shift", "matrix": [4, 6], "x": 5.25, "y": 4.25, "w": 2.25}, - { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25, "w": 1 }, - { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25, "w": 1 }, - { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25, "w": 1 }, - { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25, "w": 1 }, - { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25, "w": 1 }, - { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25, "w": 1 }, - { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25, "w": 1 }, - { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25, "w": 1 }, - { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25, "w": 1 }, - { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25, "w": 1 }, + { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25}, + { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25}, + { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25}, + { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25}, + { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25}, + { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25}, + { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25}, + { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25}, + { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25}, + { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25}, { "label":"Shift", "matrix": [8, 5], "x": 17.5, "y": 4.25, "w": 2.75 }, - { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25, "w": 1 }, - { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25, "w": 1 }, - { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25, "w": 1 }, - { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25, "w": 1 }, - { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 1 }, - { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25, "w": 1 }, - { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25, "w": 1 }, - { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25, "w": 1 }, - { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25, "w": 1 }, + { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25}, + { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25}, + { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25}, + { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25}, + { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25}, + { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25}, + { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25}, + { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25}, + { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25}, { "label":"Space", "matrix": [6, 5], "x": 9.25, "y": 5.25, "w": 6 }, - { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25, "w": 1 }, - { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25, "w": 1 }, - { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25, "w": 1 }, - { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25, "w": 1 }, - { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25, "w": 1 } + { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25}, + { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25}, + { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25}, + { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25}, + { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25} ] }, "LAYOUT_ansi_split_bs_rshift": { "layout": [ - { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0, "w": 1 }, + { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0}, - { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0, "w": 1 }, - { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0, "w": 1 }, - { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0, "w": 1 }, - { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0, "w": 1 }, - { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0, "w": 1 }, - { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0, "w": 1 }, - { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0, "w": 1 }, - { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0, "w": 1 }, - { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0, "w": 1 }, - { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0, "w": 1 }, - { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0, "w": 1 }, - { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0, "w": 1 }, - { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0, "w": 1 }, - { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0, "w": 1 }, - { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0, "w": 1 }, - { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0, "w": 1 }, - { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0, "w": 1 }, - { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0, "w": 1 }, - { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0, "w": 1 }, + { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0}, + { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0}, + { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0}, + { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0}, + { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0}, + { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0}, + { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0}, + { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0}, + { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0}, + { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0}, + { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0}, + { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0}, + { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0}, + { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0}, + { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0}, + { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0}, + { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0}, + { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0}, + { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0}, - { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1, "w": 1 }, - { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1, "w": 1 }, - { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1, "w": 1 }, - { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1, "w": 1 }, - { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1, "w": 1 }, - { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25, "w": 1 }, - { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25, "w": 1 }, - { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25, "w": 1 }, - { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25, "w": 1 }, - { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25, "w": 1 }, - { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25, "w": 1 }, - { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25, "w": 1 }, - { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25, "w": 1 }, - { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25, "w": 1 }, - { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25, "w": 1 }, - { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25, "w": 1 }, - { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25, "w": 1 }, - { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25, "w": 1 }, - { "label":"Delete", "matrix": [8, 4], "x": 18.25, "y": 1.25, "w": 1 }, - { "label":"Backspace", "matrix": [7, 5], "x": 19.25, "y": 1.25, "w": 1 }, + { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1}, + { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1}, + { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1}, + { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1}, + { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1}, + { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25}, + { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25}, + { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25}, + { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25}, + { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25}, + { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25}, + { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25}, + { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25}, + { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25}, + { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25}, + { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25}, + { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25}, + { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25}, + { "label":"Delete", "matrix": [8, 4], "x": 18.25, "y": 1.25}, + { "label":"Backspace", "matrix": [7, 5], "x": 19.25, "y": 1.25}, - { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25, "w": 1 }, - { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25, "w": 1 }, - { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25, "w": 1 }, - { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25, "w": 1 }, - { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25, "w": 1 }, + { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25}, + { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25}, + { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25}, + { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25}, + { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25}, { "label":"Tab", "matrix": [2, 6], "x": 5.25, "y": 2.25, "w": 1.5 }, - { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25, "w": 1 }, - { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25, "w": 1 }, - { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25, "w": 1 }, - { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25, "w": 1 }, - { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25, "w": 1 }, - { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25, "w": 1 }, - { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25, "w": 1 }, - { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25, "w": 1 }, - { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25, "w": 1 }, - { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25, "w": 1 }, - { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25, "w": 1 }, - { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25, "w": 1 }, + { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25}, + { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25}, + { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25}, + { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25}, + { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25}, + { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25}, + { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25}, + { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25}, + { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25}, + { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25}, + { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25}, + { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25}, { "label":"\\", "matrix": [10, 3], "x": 18.75, "y": 2.25, "w": 1.5 }, - { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25, "w": 1 }, - { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25, "w": 1 }, - { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25, "w": 1 }, - { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25, "w": 1 }, - { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25, "w": 1 }, + { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25}, + { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25}, + { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25}, + { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25}, + { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25}, { "label":"Alt", "matrix": [3, 6], "x": 5.25, "y": 3.25, "w": 1.75 }, - { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25, "w": 1 }, - { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25, "w": 1 }, - { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25, "w": 1 }, - { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25, "w": 1 }, - { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25, "w": 1 }, - { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25, "w": 1 }, - { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25, "w": 1 }, - { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25, "w": 1 }, - { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25, "w": 1 }, - { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25, "w": 1 }, - { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25, "w": 1 }, + { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25}, + { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25}, + { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25}, + { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25}, + { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25}, + { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25}, + { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25}, + { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25}, + { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25}, + { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25}, + { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25}, { "label":"Enter", "matrix": [9, 4], "x": 18, "y": 3.25, "w": 2.25}, - { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25, "w": 1 }, - { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25, "w": 1 }, - { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25, "w": 1 }, - { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25, "w": 1 }, - { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25, "w": 1 }, + { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25}, + { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25}, + { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25}, + { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25}, + { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25}, { "label":"Shift", "matrix": [4, 6], "x": 5.25, "y": 4.25, "w": 2.25}, - { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25, "w": 1 }, - { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25, "w": 1 }, - { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25, "w": 1 }, - { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25, "w": 1 }, - { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25, "w": 1 }, - { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25, "w": 1 }, - { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25, "w": 1 }, - { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25, "w": 1 }, - { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25, "w": 1 }, - { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25, "w": 1 }, - { "label":"`", "matrix": [9, 5], "x": 17.5, "y": 4.25, "w": 1 }, + { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25}, + { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25}, + { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25}, + { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25}, + { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25}, + { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25}, + { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25}, + { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25}, + { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25}, + { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25}, + { "label":"`", "matrix": [9, 5], "x": 17.5, "y": 4.25}, { "label":"Shift", "matrix": [8, 5], "x": 18.5, "y": 4.25, "w": 1.75 }, - { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25, "w": 1 }, - { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25, "w": 1 }, - { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25, "w": 1 }, - { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25, "w": 1 }, - { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 1 }, - { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25, "w": 1 }, - { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25, "w": 1 }, - { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25, "w": 1 }, - { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25, "w": 1 }, + { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25}, + { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25}, + { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25}, + { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25}, + { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25}, + { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25}, + { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25}, + { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25}, + { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25}, { "label":"Space", "matrix": [6, 5], "x": 9.25, "y": 5.25, "w": 6 }, - { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25, "w": 1 }, - { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25, "w": 1 }, - { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25, "w": 1 }, - { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25, "w": 1 }, - { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25, "w": 1 } + { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25}, + { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25}, + { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25}, + { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25}, + { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25} ] }, "LAYOUT_iso": { "layout": [ - { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0, "w": 1 }, + { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0}, - { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0, "w": 1 }, - { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0, "w": 1 }, - { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0, "w": 1 }, - { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0, "w": 1 }, - { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0, "w": 1 }, - { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0, "w": 1 }, - { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0, "w": 1 }, - { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0, "w": 1 }, - { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0, "w": 1 }, - { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0, "w": 1 }, - { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0, "w": 1 }, - { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0, "w": 1 }, - { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0, "w": 1 }, - { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0, "w": 1 }, - { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0, "w": 1 }, - { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0, "w": 1 }, - { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0, "w": 1 }, - { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0, "w": 1 }, - { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0, "w": 1 }, + { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0}, + { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0}, + { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0}, + { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0}, + { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0}, + { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0}, + { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0}, + { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0}, + { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0}, + { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0}, + { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0}, + { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0}, + { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0}, + { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0}, + { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0}, + { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0}, + { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0}, + { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0}, + { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0}, - { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1, "w": 1 }, - { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1, "w": 1 }, - { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1, "w": 1 }, - { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1, "w": 1 }, - { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1, "w": 1 }, - { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25, "w": 1 }, - { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25, "w": 1 }, - { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25, "w": 1 }, - { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25, "w": 1 }, - { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25, "w": 1 }, - { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25, "w": 1 }, - { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25, "w": 1 }, - { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25, "w": 1 }, - { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25, "w": 1 }, - { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25, "w": 1 }, - { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25, "w": 1 }, - { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25, "w": 1 }, - { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25, "w": 1 }, + { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1}, + { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1}, + { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1}, + { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1}, + { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1}, + { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25}, + { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25}, + { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25}, + { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25}, + { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25}, + { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25}, + { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25}, + { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25}, + { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25}, + { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25}, + { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25}, + { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25}, + { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25}, { "label":"Backspace", "matrix": [7, 5], "x": 18.25, "y": 1.25, "w": 2 }, - { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25, "w": 1 }, - { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25, "w": 1 }, - { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25, "w": 1 }, - { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25, "w": 1 }, - { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25, "w": 1 }, + { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25}, + { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25}, + { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25}, + { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25}, + { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25}, { "label":"Tab", "matrix": [2, 6], "x": 5.25, "y": 2.25, "w": 1.5 }, - { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25, "w": 1 }, - { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25, "w": 1 }, - { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25, "w": 1 }, - { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25, "w": 1 }, - { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25, "w": 1 }, - { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25, "w": 1 }, - { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25, "w": 1 }, - { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25, "w": 1 }, - { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25, "w": 1 }, - { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25, "w": 1 }, - { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25, "w": 1 }, - { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25, "w": 1 }, + { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25}, + { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25}, + { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25}, + { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25}, + { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25}, + { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25}, + { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25}, + { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25}, + { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25}, + { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25}, + { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25}, + { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25}, - { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25, "w": 1 }, - { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25, "w": 1 }, - { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25, "w": 1 }, - { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25, "w": 1 }, - { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25, "w": 1 }, + { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25}, + { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25}, + { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25}, + { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25}, + { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25}, { "label":"Alt", "matrix": [3, 6], "x": 5.25, "y": 3.25, "w": 1.75 }, - { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25, "w": 1 }, - { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25, "w": 1 }, - { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25, "w": 1 }, - { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25, "w": 1 }, - { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25, "w": 1 }, - { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25, "w": 1 }, - { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25, "w": 1 }, - { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25, "w": 1 }, - { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25, "w": 1 }, - { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25, "w": 1 }, - { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25, "w": 1 }, - { "label":"\\", "matrix": [10, 3], "x": 18, "y": 3.25, "w": 1 }, + { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25}, + { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25}, + { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25}, + { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25}, + { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25}, + { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25}, + { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25}, + { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25}, + { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25}, + { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25}, + { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25}, + { "label":"\\", "matrix": [10, 3], "x": 18, "y": 3.25}, { "label":"Enter", "matrix": [9, 4], "x": 19, "y": 2.25, "w": 1.25, "h": 2 }, - { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25, "w": 1 }, - { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25, "w": 1 }, - { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25, "w": 1 }, - { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25, "w": 1 }, - { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25, "w": 1 }, + { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25}, + { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25}, + { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25}, + { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25}, + { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25}, { "label":"Shift", "matrix": [4, 6], "x": 5.25, "y": 4.25, "w": 1.25}, - { "label":"\\", "matrix": [4, 7], "x": 6.5, "y": 4.25, "w": 1 }, - { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25, "w": 1 }, - { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25, "w": 1 }, - { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25, "w": 1 }, - { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25, "w": 1 }, - { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25, "w": 1 }, - { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25, "w": 1 }, - { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25, "w": 1 }, - { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25, "w": 1 }, - { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25, "w": 1 }, - { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25, "w": 1 }, + { "label":"\\", "matrix": [4, 7], "x": 6.5, "y": 4.25}, + { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25}, + { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25}, + { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25}, + { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25}, + { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25}, + { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25}, + { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25}, + { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25}, + { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25}, + { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25}, { "label":"Shift", "matrix": [8, 5], "x": 17.5, "y": 4.25, "w": 2.75 }, - { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25, "w": 1 }, - { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25, "w": 1 }, - { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25, "w": 1 }, - { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25, "w": 1 }, - { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 1 }, - { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25, "w": 1 }, - { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25, "w": 1 }, - { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25, "w": 1 }, - { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25, "w": 1 }, + { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25}, + { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25}, + { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25}, + { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25}, + { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25}, + { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25}, + { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25}, + { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25}, + { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25}, { "label":"Space", "matrix": [6, 5], "x": 9.25, "y": 5.25, "w": 6 }, - { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25, "w": 1 }, - { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25, "w": 1 }, - { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25, "w": 1 }, - { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25, "w": 1 }, - { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25, "w": 1 } + { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25}, + { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25}, + { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25}, + { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25}, + { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25} ] }, "LAYOUT_iso_split_bs_rshift": { "layout": [ - { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0, "w": 1 }, + { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0}, - { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0, "w": 1 }, - { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0, "w": 1 }, - { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0, "w": 1 }, - { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0, "w": 1 }, - { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0, "w": 1 }, - { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0, "w": 1 }, - { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0, "w": 1 }, - { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0, "w": 1 }, - { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0, "w": 1 }, - { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0, "w": 1 }, - { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0, "w": 1 }, - { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0, "w": 1 }, - { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0, "w": 1 }, - { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0, "w": 1 }, - { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0, "w": 1 }, - { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0, "w": 1 }, - { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0, "w": 1 }, - { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0, "w": 1 }, - { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0, "w": 1 }, + { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0}, + { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0}, + { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0}, + { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0}, + { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0}, + { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0}, + { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0}, + { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0}, + { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0}, + { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0}, + { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0}, + { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0}, + { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0}, + { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0}, + { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0}, + { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0}, + { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0}, + { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0}, + { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0}, - { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1, "w": 1 }, - { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1, "w": 1 }, - { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1, "w": 1 }, - { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1, "w": 1 }, - { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1, "w": 1 }, - { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25, "w": 1 }, - { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25, "w": 1 }, - { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25, "w": 1 }, - { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25, "w": 1 }, - { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25, "w": 1 }, - { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25, "w": 1 }, - { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25, "w": 1 }, - { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25, "w": 1 }, - { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25, "w": 1 }, - { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25, "w": 1 }, - { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25, "w": 1 }, - { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25, "w": 1 }, - { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25, "w": 1 }, - { "label":"Delete", "matrix": [8, 4], "x": 18.25, "y": 1.25, "w": 1 }, - { "label":"Backspace", "matrix": [7, 5], "x": 19.25, "y": 1.25, "w": 1 }, + { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1}, + { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1}, + { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1}, + { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1}, + { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1}, + { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25}, + { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25}, + { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25}, + { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25}, + { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25}, + { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25}, + { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25}, + { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25}, + { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25}, + { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25}, + { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25}, + { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25}, + { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25}, + { "label":"Delete", "matrix": [8, 4], "x": 18.25, "y": 1.25}, + { "label":"Backspace", "matrix": [7, 5], "x": 19.25, "y": 1.25}, - { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25, "w": 1 }, - { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25, "w": 1 }, - { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25, "w": 1 }, - { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25, "w": 1 }, - { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25, "w": 1 }, + { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25}, + { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25}, + { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25}, + { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25}, + { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25}, { "label":"Tab", "matrix": [2, 6], "x": 5.25, "y": 2.25, "w": 1.5 }, - { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25, "w": 1 }, - { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25, "w": 1 }, - { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25, "w": 1 }, - { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25, "w": 1 }, - { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25, "w": 1 }, - { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25, "w": 1 }, - { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25, "w": 1 }, - { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25, "w": 1 }, - { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25, "w": 1 }, - { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25, "w": 1 }, - { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25, "w": 1 }, - { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25, "w": 1 }, + { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25}, + { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25}, + { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25}, + { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25}, + { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25}, + { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25}, + { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25}, + { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25}, + { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25}, + { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25}, + { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25}, + { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25}, - { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25, "w": 1 }, - { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25, "w": 1 }, - { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25, "w": 1 }, - { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25, "w": 1 }, - { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25, "w": 1 }, + { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25}, + { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25}, + { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25}, + { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25}, + { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25}, { "label":"Alt", "matrix": [3, 6], "x": 5.25, "y": 3.25, "w": 1.75 }, - { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25, "w": 1 }, - { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25, "w": 1 }, - { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25, "w": 1 }, - { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25, "w": 1 }, - { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25, "w": 1 }, - { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25, "w": 1 }, - { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25, "w": 1 }, - { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25, "w": 1 }, - { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25, "w": 1 }, - { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25, "w": 1 }, - { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25, "w": 1 }, - { "label":"\\", "matrix": [10, 3], "x": 18, "y": 3.25, "w": 1 }, + { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25}, + { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25}, + { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25}, + { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25}, + { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25}, + { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25}, + { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25}, + { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25}, + { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25}, + { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25}, + { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25}, + { "label":"\\", "matrix": [10, 3], "x": 18, "y": 3.25}, { "label":"Enter", "matrix": [9, 4], "x": 19, "y": 2.25, "w": 1.25, "h": 2 }, - { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25, "w": 1 }, - { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25, "w": 1 }, - { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25, "w": 1 }, - { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25, "w": 1 }, - { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25, "w": 1 }, + { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25}, + { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25}, + { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25}, + { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25}, + { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25}, { "label":"Shift", "matrix": [4, 6], "x": 5.25, "y": 4.25, "w": 1.25}, - { "label":"\\", "matrix": [4, 7], "x": 6.5, "y": 4.25, "w": 1 }, - { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25, "w": 1 }, - { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25, "w": 1 }, - { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25, "w": 1 }, - { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25, "w": 1 }, - { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25, "w": 1 }, - { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25, "w": 1 }, - { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25, "w": 1 }, - { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25, "w": 1 }, - { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25, "w": 1 }, - { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25, "w": 1 }, - { "label":"`", "matrix": [9, 5], "x": 17.5, "y": 4.25, "w": 1 }, + { "label":"\\", "matrix": [4, 7], "x": 6.5, "y": 4.25}, + { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25}, + { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25}, + { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25}, + { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25}, + { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25}, + { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25}, + { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25}, + { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25}, + { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25}, + { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25}, + { "label":"`", "matrix": [9, 5], "x": 17.5, "y": 4.25}, { "label":"Shift", "matrix": [8, 5], "x": 18.5, "y": 4.25, "w": 1.75 }, - { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25, "w": 1 }, - { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25, "w": 1 }, - { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25, "w": 1 }, - { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25, "w": 1 }, - { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 1 }, - { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25, "w": 1 }, - { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25, "w": 1 }, - { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25, "w": 1 }, - { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25, "w": 1 }, + { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25}, + { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25}, + { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25}, + { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25}, + { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25}, + { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25}, + { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25}, + { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25}, + { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25}, { "label":"Space", "matrix": [6, 5], "x": 9.25, "y": 5.25, "w": 6 }, - { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25, "w": 1 }, - { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25, "w": 1 }, - { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25, "w": 1 }, - { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25, "w": 1 }, - { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25, "w": 1 } + { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25}, + { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25}, + { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25}, + { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25}, + { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25} ] } } diff --git a/keyboards/viktus/minne/info.json b/keyboards/viktus/minne/info.json index 41efd586760..bfb3f8a8a6c 100644 --- a/keyboards/viktus/minne/info.json +++ b/keyboards/viktus/minne/info.json @@ -45,276 +45,276 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0}, - {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0}, + {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0}, + {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0}, + {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0}, + {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0}, {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0}, {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1}, - {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1}, - {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1}, - {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1}, - {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1}, + {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1}, + {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1}, + {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1}, + {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1}, + {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1}, + {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1}, + {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1}, + {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1}, + {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1}, + {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1}, {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1}, {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2}, - {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2}, - {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2}, - {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2}, - {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2}, - {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2}, - {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2}, - {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2}, - {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2}, - {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2}, - {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2}, - {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2}, - {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3}, - {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3}, + {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2}, + {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2}, + {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2}, + {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2}, + {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2}, + {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2}, + {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2}, + {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2}, + {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2}, + {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3}, + {"label": "K61", "matrix": [6, 1], "x": 2.375, "y": 3}, {"label": "K62", "matrix": [6, 2], "w": 1.25, "x": 3.375, "y": 3}, {"label": "K72", "matrix": [7, 2], "w": 1.25, "x": 4.625, "y": 3}, - {"label": "K73", "matrix": [7, 3], "w": 1, "x": 5.875, "y": 3}, + {"label": "K73", "matrix": [7, 3], "x": 5.875, "y": 3}, {"label": "K63", "matrix": [6, 3], "w": 1.25, "x": 6.875, "y": 3}, {"label": "K64", "matrix": [6, 4], "w": 1.25, "x": 8.125, "y": 3}, - {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3}, - {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3} + {"label": "K74", "matrix": [7, 4], "x": 9.375, "y": 3}, + {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3} ] }, "LAYOUT_dual175u": { "layout": [ - {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0}, - {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0}, + {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0}, + {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0}, + {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0}, + {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0}, {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0}, {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1}, - {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1}, - {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1}, - {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1}, - {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1}, + {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1}, + {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1}, + {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1}, + {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1}, + {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1}, + {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1}, + {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1}, + {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1}, + {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1}, + {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1}, {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1}, {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2}, - {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2}, - {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2}, - {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2}, - {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2}, - {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2}, - {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2}, - {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2}, - {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2}, - {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2}, - {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2}, - {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2}, - {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3}, - {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3}, + {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2}, + {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2}, + {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2}, + {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2}, + {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2}, + {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2}, + {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2}, + {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2}, + {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2}, + {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3}, + {"label": "K61", "matrix": [6, 1], "x": 2.375, "y": 3}, {"label": "K62", "matrix": [6, 2], "w": 1.25, "x": 3.375, "y": 3}, {"label": "K72", "matrix": [7, 2], "w": 1.75, "x": 4.625, "y": 3}, {"label": "K63", "matrix": [6, 3], "w": 1.75, "x": 6.375, "y": 3}, {"label": "K64", "matrix": [6, 4], "w": 1.25, "x": 8.125, "y": 3}, - {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3}, - {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3} + {"label": "K74", "matrix": [7, 4], "x": 9.375, "y": 3}, + {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3} ] }, "LAYOUT_275_225u": { "layout": [ - {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0}, - {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0}, + {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0}, + {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0}, + {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0}, + {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0}, {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0}, {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1}, - {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1}, - {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1}, - {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1}, - {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1}, + {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1}, + {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1}, + {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1}, + {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1}, + {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1}, + {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1}, + {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1}, + {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1}, + {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1}, + {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1}, {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1}, {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2}, - {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2}, - {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2}, - {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2}, - {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2}, - {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2}, - {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2}, - {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2}, - {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2}, - {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2}, - {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2}, - {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2}, - {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3}, + {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2}, + {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2}, + {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2}, + {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2}, + {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2}, + {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2}, + {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2}, + {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2}, + {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2}, + {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3}, {"label": "K61", "matrix": [6, 1], "w": 1.5, "x": 2.375, "y": 3}, {"label": "K72", "matrix": [7, 2], "w": 2.75, "x": 3.875, "y": 3}, {"label": "K63", "matrix": [6, 3], "w": 2.25, "x": 6.625, "y": 3}, {"label": "K74", "matrix": [7, 4], "w": 1.5, "x": 8.875, "y": 3}, - {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3} + {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3} ] }, "LAYOUT_dual3u": { "layout": [ - {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0}, - {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0}, + {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0}, + {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0}, + {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0}, + {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0}, {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0}, {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1}, - {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1}, - {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1}, - {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1}, - {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1}, + {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1}, + {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1}, + {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1}, + {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1}, + {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1}, + {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1}, + {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1}, + {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1}, + {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1}, + {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1}, {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1}, {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2}, - {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2}, - {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2}, - {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2}, - {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2}, - {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2}, - {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2}, - {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2}, - {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2}, - {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2}, - {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2}, - {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2}, - {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3}, - {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3}, + {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2}, + {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2}, + {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2}, + {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2}, + {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2}, + {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2}, + {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2}, + {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2}, + {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2}, + {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3}, + {"label": "K61", "matrix": [6, 1], "x": 2.375, "y": 3}, {"label": "K72", "matrix": [7, 2], "w": 3, "x": 3.375, "y": 3}, {"label": "K63", "matrix": [6, 3], "w": 3, "x": 6.375, "y": 3}, - {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3}, - {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3} + {"label": "K74", "matrix": [7, 4], "x": 9.375, "y": 3}, + {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3} ] }, "LAYOUT_6u": { "layout": [ - {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0}, - {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0}, + {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0}, + {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0}, + {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0}, + {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0}, {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0}, {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1}, - {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1}, - {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1}, - {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1}, - {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1}, + {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1}, + {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1}, + {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1}, + {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1}, + {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1}, + {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1}, + {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1}, + {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1}, + {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1}, + {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1}, {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1}, {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2}, - {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2}, - {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2}, - {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2}, - {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2}, - {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2}, - {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2}, - {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2}, - {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2}, - {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2}, - {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2}, - {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2}, - {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3}, - {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3}, + {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2}, + {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2}, + {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2}, + {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2}, + {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2}, + {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2}, + {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2}, + {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2}, + {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2}, + {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3}, + {"label": "K61", "matrix": [6, 1], "x": 2.375, "y": 3}, {"label": "K73", "matrix": [7, 3], "w": 6, "x": 3.375, "y": 3}, - {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3}, - {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3} + {"label": "K74", "matrix": [7, 4], "x": 9.375, "y": 3}, + {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3} ] }, "LAYOUT_7u": { "layout": [ - {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0}, - {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0}, + {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0}, + {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0}, + {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0}, + {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0}, {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0}, {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1}, - {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1}, - {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1}, - {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1}, - {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1}, + {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1}, + {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1}, + {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1}, + {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1}, + {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1}, + {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1}, + {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1}, + {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1}, + {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1}, + {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1}, {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1}, {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2}, - {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2}, - {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2}, - {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2}, - {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2}, - {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2}, - {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2}, - {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2}, - {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2}, - {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2}, - {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2}, - {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2}, + {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2}, + {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2}, + {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2}, + {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2}, + {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2}, + {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2}, + {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2}, + {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2}, + {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2}, {"label": "K71", "matrix": [7, 1], "w": 1.5, "x": 1.375, "y": 3}, {"label": "K73", "matrix": [7, 3], "w": 7, "x": 2.875, "y": 3}, {"label": "K75", "matrix": [7, 5], "w": 1.5, "x": 9.875, "y": 3} @@ -322,42 +322,42 @@ }, "LAYOUT_10u": { "layout": [ - {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0}, - {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0}, + {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0}, + {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0}, + {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0}, + {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0}, {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0}, {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1}, - {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1}, - {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1}, - {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1}, - {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1}, + {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1}, + {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1}, + {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1}, + {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1}, + {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1}, + {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1}, + {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1}, + {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1}, + {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1}, + {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1}, {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1}, {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2}, - {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2}, - {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2}, - {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2}, - {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2}, - {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2}, - {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2}, - {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2}, - {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2}, - {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2}, - {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2}, - {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2}, + {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2}, + {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2}, + {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2}, + {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2}, + {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2}, + {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2}, + {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2}, + {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2}, + {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2}, + {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2}, + {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2}, {"label": "K73", "matrix": [7, 3], "w": 10, "x": 1.375, "y": 3} ] } diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/info.json index 4f795e082ff..7928430015d 100644 --- a/keyboards/viktus/minne_topre/info.json +++ b/keyboards/viktus/minne_topre/info.json @@ -32,180 +32,180 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0}, - {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0}, - {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0}, - {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0}, - {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0}, - {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0}, + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0}, {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0}, {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1}, - {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1}, - {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1}, - {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1}, - {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1}, - {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1}, - {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1}, + {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1}, + {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1}, + {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1}, + {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1}, + {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1}, {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1}, {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, - {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2}, - {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2}, - {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2}, - {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2}, - {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2}, - {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2}, - {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2}, - {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3}, + {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3}, + {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3}, {"label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 5.875, "y": 3}, + {"label": "K35", "matrix": [3, 5], "x": 5.875, "y": 3}, {"label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3}, - {"label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3}, - {"label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3} + {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3}, + {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3} ] }, "LAYOUT_dual_3u": { "layout": [ - {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0}, - {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0}, - {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0}, - {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0}, - {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0}, - {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0}, + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0}, {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0}, {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1}, - {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1}, - {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1}, - {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1}, - {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1}, - {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1}, - {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1}, + {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1}, + {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1}, + {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1}, + {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1}, + {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1}, {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1}, {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, - {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2}, - {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2}, - {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2}, - {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2}, - {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2}, - {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2}, - {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2}, - {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3}, + {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3}, + {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3}, {"label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3}, {"label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3}, - {"label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3}, - {"label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3} + {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3}, + {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3} ] }, "LAYOUT_6u": { "layout": [ - {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0}, - {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0}, - {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0}, - {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0}, - {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0}, - {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0}, + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0}, {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0}, {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1}, - {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1}, - {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1}, - {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1}, - {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1}, - {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1}, - {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1}, + {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1}, + {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1}, + {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1}, + {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1}, + {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1}, {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1}, {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, - {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2}, - {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2}, - {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2}, - {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2}, - {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2}, - {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2}, - {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2}, - {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3}, + {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3}, + {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3}, {"label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3}, - {"label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3}, - {"label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3} + {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3}, + {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3} ] }, "LAYOUT_7u": { "layout": [ - {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0}, - {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0}, - {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0}, - {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0}, - {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0}, - {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0}, + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0}, {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0}, {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1}, - {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1}, - {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1}, - {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1}, - {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1}, - {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1}, - {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1}, + {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1}, + {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1}, + {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1}, + {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1}, + {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1}, {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1}, {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, - {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2}, - {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2}, - {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2}, - {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2}, - {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2}, - {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2}, - {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2}, + {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2}, {"label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3}, {"label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3}, {"label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3} @@ -213,42 +213,42 @@ }, "LAYOUT_10u": { "layout": [ - {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0}, - {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0}, - {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0}, - {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0}, - {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0}, - {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0}, + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0}, {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0}, {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1}, - {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1}, - {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1}, - {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1}, - {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1}, - {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1}, - {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1}, + {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1}, + {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1}, + {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1}, + {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1}, + {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1}, {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1}, {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, - {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2}, - {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2}, - {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2}, - {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2}, - {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2}, - {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2}, - {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2}, + {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2}, {"label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3} ] } diff --git a/keyboards/viktus/osav2/info.json b/keyboards/viktus/osav2/info.json index b528bac281f..34c20891810 100644 --- a/keyboards/viktus/osav2/info.json +++ b/keyboards/viktus/osav2/info.json @@ -57,68 +57,68 @@ "layouts": { "LAYOUT_split_normal": { "layout": [ - {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0}, - {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0}, - {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0}, - {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0}, - {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0}, - {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0}, - {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0}, - {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0}, - {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0}, - {"label": "K50", "matrix": [5, 0], "w": 1, "x": 15.75, "y": 0}, - {"label": "K57", "matrix": [5, 7], "w": 1, "x": 16.75, "y": 0}, - {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1}, + {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0}, + {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0}, + {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0}, + {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0}, + {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0}, + {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0}, + {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0}, + {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0}, + {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0}, + {"label": "K50", "matrix": [5, 0], "x": 15.75, "y": 0}, + {"label": "K57", "matrix": [5, 7], "x": 16.75, "y": 0}, + {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1}, {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1}, - {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1}, - {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1}, - {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1}, - {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1}, - {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1}, - {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1}, - {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1}, - {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1}, + {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1}, + {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1}, + {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1}, + {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1}, + {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1}, + {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1}, + {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1}, + {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1}, {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1}, - {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2}, + {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2}, {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2}, - {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2}, - {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2}, - {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2}, - {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2}, - {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2}, - {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2}, - {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2}, + {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2}, + {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2}, + {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2}, + {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2}, + {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2}, + {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2}, + {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2}, + {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2}, + {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2}, + {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2}, {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2}, {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3}, - {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3}, - {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3}, - {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3}, - {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3}, - {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3}, - {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3}, - {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3}, - {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3}, - {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3}, + {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3}, + {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3}, + {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3}, + {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3}, + {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3}, + {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3}, + {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3}, + {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3}, + {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3}, + {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3}, + {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3}, {"label": "K80", "matrix": [8, 0], "w": 2.75, "x": 15.75, "y": 3}, {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4}, {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4}, {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4}, - {"label": "K46", "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4}, + {"label": "K46", "matrix": [4, 6], "x": 7.75, "y": 4}, {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4}, {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4}, {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4} @@ -126,69 +126,69 @@ }, "LAYOUT_split_normal_split": { "layout": [ - {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0}, - {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0}, - {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0}, - {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0}, - {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0}, - {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0}, - {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0}, - {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0}, - {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0}, - {"label": "K50", "matrix": [5, 0], "w": 1, "x": 15.75, "y": 0}, - {"label": "K57", "matrix": [5, 7], "w": 1, "x": 16.75, "y": 0}, - {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1}, + {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0}, + {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0}, + {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0}, + {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0}, + {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0}, + {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0}, + {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0}, + {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0}, + {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0}, + {"label": "K50", "matrix": [5, 0], "x": 15.75, "y": 0}, + {"label": "K57", "matrix": [5, 7], "x": 16.75, "y": 0}, + {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1}, {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1}, - {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1}, - {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1}, - {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1}, - {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1}, - {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1}, - {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1}, - {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1}, - {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1}, + {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1}, + {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1}, + {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1}, + {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1}, + {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1}, + {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1}, + {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1}, + {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1}, {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1}, - {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2}, + {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2}, {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2}, - {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2}, - {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2}, - {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2}, - {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2}, - {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2}, - {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2}, - {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2}, + {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2}, + {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2}, + {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2}, + {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2}, + {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2}, + {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2}, + {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2}, + {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2}, + {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2}, + {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2}, {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2}, {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3}, - {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3}, - {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3}, - {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3}, - {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3}, - {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3}, - {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3}, - {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3}, - {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3}, - {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3}, + {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3}, + {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3}, + {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3}, + {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3}, + {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3}, + {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3}, + {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3}, + {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3}, + {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3}, + {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3}, + {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3}, {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3}, - {"label": "K87", "matrix": [8, 7], "w": 1, "x": 17.5, "y": 3}, + {"label": "K87", "matrix": [8, 7], "x": 17.5, "y": 3}, {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4}, {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4}, {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4}, - {"label": "K46", "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4}, + {"label": "K46", "matrix": [4, 6], "x": 7.75, "y": 4}, {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4}, {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4}, {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4} @@ -196,68 +196,68 @@ }, "LAYOUT_split_mirrored_split": { "layout": [ - {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0}, - {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0}, - {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0}, - {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0}, - {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0}, - {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0}, - {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0}, - {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0}, - {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0}, - {"label": "K50", "matrix": [5, 0], "w": 1, "x": 15.75, "y": 0}, - {"label": "K57", "matrix": [5, 7], "w": 1, "x": 16.75, "y": 0}, - {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1}, + {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0}, + {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0}, + {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0}, + {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0}, + {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0}, + {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0}, + {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0}, + {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0}, + {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0}, + {"label": "K50", "matrix": [5, 0], "x": 15.75, "y": 0}, + {"label": "K57", "matrix": [5, 7], "x": 16.75, "y": 0}, + {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1}, {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1}, - {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1}, - {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1}, - {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1}, - {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1}, - {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1}, - {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1}, - {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1}, - {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1}, + {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1}, + {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1}, + {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1}, + {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1}, + {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1}, + {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1}, + {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1}, + {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1}, {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1}, - {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2}, + {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2}, {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2}, - {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2}, - {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2}, - {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2}, - {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2}, - {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2}, - {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2}, - {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2}, + {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2}, + {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2}, + {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2}, + {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2}, + {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2}, + {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2}, + {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2}, + {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2}, + {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2}, + {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2}, {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2}, {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3}, - {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3}, - {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3}, - {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3}, - {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3}, - {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3}, - {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3}, - {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3}, - {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3}, - {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3}, + {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3}, + {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3}, + {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3}, + {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3}, + {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3}, + {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3}, + {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3}, + {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3}, + {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3}, + {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3}, + {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3}, {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3}, - {"label": "K87", "matrix": [8, 7], "w": 1, "x": 17.5, "y": 3}, + {"label": "K87", "matrix": [8, 7], "x": 17.5, "y": 3}, {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4}, {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4}, - {"label": "K45", "matrix": [4, 5], "w": 1, "x": 5.5, "y": 4}, + {"label": "K45", "matrix": [4, 5], "x": 5.5, "y": 4}, {"label": "K46", "matrix": [4, 6], "w": 2.25, "x": 6.5, "y": 4}, {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4}, {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4}, @@ -266,67 +266,67 @@ }, "LAYOUT_2u_normal": { "layout": [ - {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0}, - {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0}, - {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0}, - {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0}, - {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0}, - {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0}, - {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0}, - {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0}, - {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0}, + {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0}, + {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0}, + {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0}, + {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0}, + {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0}, + {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0}, + {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0}, + {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0}, {"label": "K57", "matrix": [5, 7], "w": 2, "x": 15.75, "y": 0}, - {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1}, + {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1}, {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1}, - {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1}, - {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1}, - {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1}, - {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1}, - {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1}, - {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1}, - {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1}, - {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1}, + {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1}, + {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1}, + {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1}, + {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1}, + {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1}, + {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1}, + {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1}, + {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1}, {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1}, - {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2}, + {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2}, {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2}, - {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2}, - {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2}, - {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2}, - {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2}, - {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2}, - {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2}, - {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2}, + {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2}, + {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2}, + {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2}, + {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2}, + {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2}, + {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2}, + {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2}, + {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2}, + {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2}, + {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2}, {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2}, {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3}, - {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3}, - {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3}, - {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3}, - {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3}, - {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3}, - {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3}, - {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3}, - {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3}, - {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3}, + {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3}, + {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3}, + {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3}, + {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3}, + {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3}, + {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3}, + {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3}, + {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3}, + {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3}, + {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3}, + {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3}, {"label": "K80", "matrix": [8, 0], "w": 2.75, "x": 15.75, "y": 3}, {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4}, {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4}, {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4}, - {"label": "K46", "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4}, + {"label": "K46", "matrix": [4, 6], "x": 7.75, "y": 4}, {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4}, {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4}, {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4} @@ -334,68 +334,68 @@ }, "LAYOUT_2u_normal_split": { "layout": [ - {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0}, - {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0}, - {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0}, - {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0}, - {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0}, - {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0}, - {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0}, - {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0}, - {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0}, + {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0}, + {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0}, + {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0}, + {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0}, + {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0}, + {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0}, + {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0}, + {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0}, {"label": "K57", "matrix": [5, 7], "w": 2, "x": 15.75, "y": 0}, - {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1}, + {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1}, {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1}, - {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1}, - {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1}, - {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1}, - {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1}, - {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1}, - {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1}, - {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1}, - {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1}, + {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1}, + {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1}, + {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1}, + {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1}, + {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1}, + {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1}, + {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1}, + {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1}, {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1}, - {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2}, + {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2}, {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2}, - {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2}, - {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2}, - {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2}, - {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2}, - {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2}, - {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2}, - {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2}, + {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2}, + {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2}, + {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2}, + {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2}, + {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2}, + {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2}, + {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2}, + {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2}, + {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2}, + {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2}, {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2}, {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3}, - {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3}, - {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3}, - {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3}, - {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3}, - {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3}, - {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3}, - {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3}, - {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3}, - {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3}, + {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3}, + {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3}, + {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3}, + {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3}, + {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3}, + {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3}, + {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3}, + {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3}, + {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3}, + {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3}, + {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3}, {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3}, - {"label": "K87", "matrix": [8, 7], "w": 1, "x": 17.5, "y": 3}, + {"label": "K87", "matrix": [8, 7], "x": 17.5, "y": 3}, {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4}, {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4}, {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4}, - {"label": "K46", "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4}, + {"label": "K46", "matrix": [4, 6], "x": 7.75, "y": 4}, {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4}, {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4}, {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4} @@ -403,67 +403,67 @@ }, "LAYOUT_2u_mirrored_split": { "layout": [ - {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0}, - {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0}, - {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0}, - {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0}, - {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0}, - {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0}, - {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0}, - {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0}, - {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0}, - {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0}, - {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0}, - {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0}, - {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0}, - {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0}, + {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0}, + {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0}, + {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0}, + {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0}, + {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0}, + {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0}, + {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0}, + {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0}, {"label": "K57", "matrix": [5, 7], "w": 2, "x": 15.75, "y": 0}, - {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1}, + {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1}, {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1}, - {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1}, - {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1}, - {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1}, - {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1}, - {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1}, - {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1}, - {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1}, - {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1}, - {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1}, - {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1}, - {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1}, - {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1}, + {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1}, + {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1}, + {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1}, + {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1}, + {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1}, + {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1}, + {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1}, + {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1}, {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1}, - {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2}, + {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2}, {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2}, - {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2}, - {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2}, - {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2}, - {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2}, - {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2}, - {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2}, - {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2}, - {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2}, - {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2}, - {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2}, - {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2}, + {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2}, + {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2}, + {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2}, + {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2}, + {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2}, + {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2}, + {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2}, + {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2}, + {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2}, + {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2}, {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2}, {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3}, - {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3}, - {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3}, - {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3}, - {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3}, - {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3}, - {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3}, - {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3}, - {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3}, - {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3}, - {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3}, - {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3}, + {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3}, + {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3}, + {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3}, + {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3}, + {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3}, + {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3}, + {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3}, + {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3}, + {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3}, + {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3}, + {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3}, {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3}, - {"label": "K87", "matrix": [8, 7], "w": 1, "x": 17.5, "y": 3}, + {"label": "K87", "matrix": [8, 7], "x": 17.5, "y": 3}, {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4}, {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4}, - {"label": "K45", "matrix": [4, 5], "w": 1, "x": 5.5, "y": 4}, + {"label": "K45", "matrix": [4, 5], "x": 5.5, "y": 4}, {"label": "K46", "matrix": [4, 6], "w": 2.25, "x": 6.5, "y": 4}, {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4}, {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4}, diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/info.json index 76bed29efb5..db0c1085428 100644 --- a/keyboards/ymdk/id75/info.json +++ b/keyboards/ymdk/id75/info.json @@ -170,81 +170,81 @@ "layouts": { "LAYOUT_ortho_5x15": { "layout": [ - {"label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0}, - {"label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0}, - {"label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0}, - {"label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0}, - {"label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0}, - {"label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0}, - {"label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0}, - {"label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0}, - {"label": "k08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0}, - {"label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0}, - {"label": "k0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0}, - {"label": "k0B", "matrix": [0, 11], "w": 1, "x": 11, "y": 0}, - {"label": "k0C", "matrix": [0, 12], "w": 1, "x": 12, "y": 0}, - {"label": "k0D", "matrix": [0, 13], "w": 1, "x": 13, "y": 0}, - {"label": "k0E", "matrix": [0, 14], "w": 1, "x": 14, "y": 0}, - {"label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1}, - {"label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1}, - {"label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1}, - {"label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1}, - {"label": "k14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1}, - {"label": "k15", "matrix": [1, 5], "w": 1, "x": 5, "y": 1}, - {"label": "k16", "matrix": [1, 6], "w": 1, "x": 6, "y": 1}, - {"label": "k17", "matrix": [1, 7], "w": 1, "x": 7, "y": 1}, - {"label": "k18", "matrix": [1, 8], "w": 1, "x": 8, "y": 1}, - {"label": "k19", "matrix": [1, 9], "w": 1, "x": 9, "y": 1}, - {"label": "k1A", "matrix": [1, 10], "w": 1, "x": 10, "y": 1}, - {"label": "k1B", "matrix": [1, 11], "w": 1, "x": 11, "y": 1}, - {"label": "k1C", "matrix": [1, 12], "w": 1, "x": 12, "y": 1}, - {"label": "k1D", "matrix": [1, 13], "w": 1, "x": 13, "y": 1}, - {"label": "k1E", "matrix": [1, 14], "w": 1, "x": 14, "y": 1}, - {"label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2}, - {"label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2}, - {"label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2}, - {"label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2}, - {"label": "k24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2}, - {"label": "k25", "matrix": [2, 5], "w": 1, "x": 5, "y": 2}, - {"label": "k26", "matrix": [2, 6], "w": 1, "x": 6, "y": 2}, - {"label": "k27", "matrix": [2, 7], "w": 1, "x": 7, "y": 2}, - {"label": "k28", "matrix": [2, 8], "w": 1, "x": 8, "y": 2}, - {"label": "k29", "matrix": [2, 9], "w": 1, "x": 9, "y": 2}, - {"label": "k2A", "matrix": [2, 10], "w": 1, "x": 10, "y": 2}, - {"label": "k2B", "matrix": [2, 11], "w": 1, "x": 11, "y": 2}, - {"label": "k2C", "matrix": [2, 12], "w": 1, "x": 12, "y": 2}, - {"label": "k2D", "matrix": [2, 13], "w": 1, "x": 13, "y": 2}, - {"label": "k2E", "matrix": [2, 14], "w": 1, "x": 14, "y": 2}, - {"label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3}, - {"label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3}, - {"label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3}, - {"label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3}, - {"label": "k34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3}, - {"label": "k35", "matrix": [3, 5], "w": 1, "x": 5, "y": 3}, - {"label": "k36", "matrix": [3, 6], "w": 1, "x": 6, "y": 3}, - {"label": "k37", "matrix": [3, 7], "w": 1, "x": 7, "y": 3}, - {"label": "k38", "matrix": [3, 8], "w": 1, "x": 8, "y": 3}, - {"label": "k39", "matrix": [3, 9], "w": 1, "x": 9, "y": 3}, - {"label": "k3A", "matrix": [3, 10], "w": 1, "x": 10, "y": 3}, - {"label": "k3B", "matrix": [3, 11], "w": 1, "x": 11, "y": 3}, - {"label": "k3C", "matrix": [3, 12], "w": 1, "x": 12, "y": 3}, - {"label": "k3D", "matrix": [3, 13], "w": 1, "x": 13, "y": 3}, - {"label": "k3E", "matrix": [3, 14], "w": 1, "x": 14, "y": 3}, - {"label": "k40", "matrix": [4, 0], "w": 1, "x": 0, "y": 4}, - {"label": "k41", "matrix": [4, 1], "w": 1, "x": 1, "y": 4}, - {"label": "k42", "matrix": [4, 2], "w": 1, "x": 2, "y": 4}, - {"label": "k43", "matrix": [4, 3], "w": 1, "x": 3, "y": 4}, - {"label": "k44", "matrix": [4, 4], "w": 1, "x": 4, "y": 4}, - {"label": "k45", "matrix": [4, 5], "w": 1, "x": 5, "y": 4}, - {"label": "k46", "matrix": [4, 6], "w": 1, "x": 6, "y": 4}, - {"label": "k47", "matrix": [4, 7], "w": 1, "x": 7, "y": 4}, - {"label": "k48", "matrix": [4, 8], "w": 1, "x": 8, "y": 4}, - {"label": "k49", "matrix": [4, 9], "w": 1, "x": 9, "y": 4}, - {"label": "k4A", "matrix": [4, 10], "w": 1, "x": 10, "y": 4}, - {"label": "k4B", "matrix": [4, 11], "w": 1, "x": 11, "y": 4}, - {"label": "k4C", "matrix": [4, 12], "w": 1, "x": 12, "y": 4}, - {"label": "k4D", "matrix": [4, 13], "w": 1, "x": 13, "y": 4}, - {"label": "k4E", "matrix": [4, 14], "w": 1, "x": 14, "y": 4} + {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "k06", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "k07", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "k08", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "k09", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "k0A", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "k0B", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "k0C", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "k0D", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "k0E", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "k10", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "k13", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "k14", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "k15", "matrix": [1, 5], "x": 5, "y": 1}, + {"label": "k16", "matrix": [1, 6], "x": 6, "y": 1}, + {"label": "k17", "matrix": [1, 7], "x": 7, "y": 1}, + {"label": "k18", "matrix": [1, 8], "x": 8, "y": 1}, + {"label": "k19", "matrix": [1, 9], "x": 9, "y": 1}, + {"label": "k1A", "matrix": [1, 10], "x": 10, "y": 1}, + {"label": "k1B", "matrix": [1, 11], "x": 11, "y": 1}, + {"label": "k1C", "matrix": [1, 12], "x": 12, "y": 1}, + {"label": "k1D", "matrix": [1, 13], "x": 13, "y": 1}, + {"label": "k1E", "matrix": [1, 14], "x": 14, "y": 1}, + {"label": "k20", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "k21", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "k22", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "k23", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "k24", "matrix": [2, 4], "x": 4, "y": 2}, + {"label": "k25", "matrix": [2, 5], "x": 5, "y": 2}, + {"label": "k26", "matrix": [2, 6], "x": 6, "y": 2}, + {"label": "k27", "matrix": [2, 7], "x": 7, "y": 2}, + {"label": "k28", "matrix": [2, 8], "x": 8, "y": 2}, + {"label": "k29", "matrix": [2, 9], "x": 9, "y": 2}, + {"label": "k2A", "matrix": [2, 10], "x": 10, "y": 2}, + {"label": "k2B", "matrix": [2, 11], "x": 11, "y": 2}, + {"label": "k2C", "matrix": [2, 12], "x": 12, "y": 2}, + {"label": "k2D", "matrix": [2, 13], "x": 13, "y": 2}, + {"label": "k2E", "matrix": [2, 14], "x": 14, "y": 2}, + {"label": "k30", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "k31", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "k32", "matrix": [3, 2], "x": 2, "y": 3}, + {"label": "k33", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3}, + {"label": "k35", "matrix": [3, 5], "x": 5, "y": 3}, + {"label": "k36", "matrix": [3, 6], "x": 6, "y": 3}, + {"label": "k37", "matrix": [3, 7], "x": 7, "y": 3}, + {"label": "k38", "matrix": [3, 8], "x": 8, "y": 3}, + {"label": "k39", "matrix": [3, 9], "x": 9, "y": 3}, + {"label": "k3A", "matrix": [3, 10], "x": 10, "y": 3}, + {"label": "k3B", "matrix": [3, 11], "x": 11, "y": 3}, + {"label": "k3C", "matrix": [3, 12], "x": 12, "y": 3}, + {"label": "k3D", "matrix": [3, 13], "x": 13, "y": 3}, + {"label": "k3E", "matrix": [3, 14], "x": 14, "y": 3}, + {"label": "k40", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "k41", "matrix": [4, 1], "x": 1, "y": 4}, + {"label": "k42", "matrix": [4, 2], "x": 2, "y": 4}, + {"label": "k43", "matrix": [4, 3], "x": 3, "y": 4}, + {"label": "k44", "matrix": [4, 4], "x": 4, "y": 4}, + {"label": "k45", "matrix": [4, 5], "x": 5, "y": 4}, + {"label": "k46", "matrix": [4, 6], "x": 6, "y": 4}, + {"label": "k47", "matrix": [4, 7], "x": 7, "y": 4}, + {"label": "k48", "matrix": [4, 8], "x": 8, "y": 4}, + {"label": "k49", "matrix": [4, 9], "x": 9, "y": 4}, + {"label": "k4A", "matrix": [4, 10], "x": 10, "y": 4}, + {"label": "k4B", "matrix": [4, 11], "x": 11, "y": 4}, + {"label": "k4C", "matrix": [4, 12], "x": 12, "y": 4}, + {"label": "k4D", "matrix": [4, 13], "x": 13, "y": 4}, + {"label": "k4E", "matrix": [4, 14], "x": 14, "y": 4} ] } } From 426bb9c651a292dce6ae01e7ed9d41d94dbba99f Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 30 Mar 2024 10:43:15 +0000 Subject: [PATCH 076/333] Migrate features and LTO from rules.mk to data driven (#23302) --- .../0xc7/61key/{info.json => keyboard.json} | 12 ++++++++++ keyboards/0xc7/61key/rules.mk | 15 ------------- .../0xcb/1337/{info.json => keyboard.json} | 15 +++++++++++++ keyboards/0xcb/1337/rules.mk | 16 -------------- .../0xcb/static/{info.json => keyboard.json} | 13 +++++++++++ keyboards/0xcb/static/rules.mk | 16 -------------- .../1up60hse/{info.json => keyboard.json} | 13 +++++++++++ keyboards/1upkeyboards/1up60hse/rules.mk | 13 ----------- .../1up60hte/{info.json => keyboard.json} | 13 +++++++++++ keyboards/1upkeyboards/1up60hte/rules.mk | 14 ------------ keyboards/abacus/{info.json => keyboard.json} | 14 ++++++++++++ keyboards/abacus/rules.mk | 15 ------------- .../athena/alpha/{info.json => keyboard.json} | 13 +++++++++++ keyboards/acheron/athena/alpha/rules.mk | 15 ------------- .../athena/beta/{info.json => keyboard.json} | 13 +++++++++++ keyboards/acheron/athena/beta/rules.mk | 15 ------------- .../beta/{info.json => keyboard.json} | 12 ++++++++++ keyboards/acheron/elongate/beta/rules.mk | 13 ----------- .../shark/beta/{info.json => keyboard.json} | 11 ++++++++++ keyboards/acheron/shark/beta/rules.mk | 14 ------------ .../ai03/jp60/{info.json => keyboard.json} | 11 ++++++++++ keyboards/ai03/jp60/rules.mk | 13 ----------- .../alf/x11/{info.json => keyboard.json} | 13 +++++++++++ keyboards/alf/x11/rules.mk | 13 ----------- .../ak81_ve/{info.json => keyboard.json} | 14 ++++++++++++ keyboards/atlantis/ak81_ve/rules.mk | 16 -------------- .../atxkb/1894/{info.json => keyboard.json} | 13 +++++++++++ keyboards/atxkb/1894/rules.mk | 13 ----------- .../yeti/hotswap/{info.json => keyboard.json} | 12 ++++++++++ keyboards/axolstudio/yeti/hotswap/rules.mk | 14 ------------ .../bioi/s65/{info.json => keyboard.json} | 12 ++++++++++ keyboards/bioi/s65/rules.mk | 13 ----------- .../ac980mini/{info.json => keyboard.json} | 12 ++++++++++ keyboards/blockboy/ac980mini/rules.mk | 15 ------------- .../kallos/{info.json => keyboard.json} | 12 ++++++++++ keyboards/cipulot/kallos/rules.mk | 13 ----------- .../mistress1200/{info.json => keyboard.json} | 14 ++++++++++++ .../converter/a1200/mistress1200/rules.mk | 16 -------------- .../iskar/{info.json => keyboard.json} | 11 ++++++++++ keyboards/drewkeys/iskar/rules.mk | 13 ----------- .../drhigsby/bkf/{info.json => keyboard.json} | 9 ++++++++ keyboards/drhigsby/bkf/rules.mk | 14 ------------ .../dubba175/{info.json => keyboard.json} | 8 +++++++ keyboards/drhigsby/dubba175/rules.mk | 13 ----------- .../packrat/{info.json => keyboard.json} | 9 ++++++++ keyboards/drhigsby/packrat/rules.mk | 14 ------------ .../dosa40rgb/{info.json => keyboard.json} | 13 +++++++++++ keyboards/dtisaac/dosa40rgb/rules.mk | 16 -------------- .../k320/base/{info.json => keyboard.json} | 11 ++++++++++ keyboards/durgod/k320/base/rules.mk | 13 ----------- .../getawayvan/{info.json => keyboard.json} | 12 ++++++++++ keyboards/esca/getawayvan/rules.mk | 13 ----------- .../{info.json => keyboard.json} | 12 ++++++++++ keyboards/esca/getawayvan_f042/rules.mk | 13 ----------- .../feker/ik75/{info.json => keyboard.json} | 14 ++++++++++++ keyboards/feker/ik75/rules.mk | 22 ------------------- .../ffkeebs/puca/{info.json => keyboard.json} | 14 ++++++++++++ keyboards/ffkeebs/puca/rules.mk | 16 -------------- .../lodestone/{info.json => keyboard.json} | 11 ++++++++++ keyboards/flx/lodestone/rules.mk | 12 ---------- .../flx/virgo/{info.json => keyboard.json} | 13 +++++++++++ keyboards/flx/virgo/rules.mk | 13 ----------- .../ft/mars65/{info.json => keyboard.json} | 13 +++++++++++ keyboards/ft/mars65/rules.mk | 18 --------------- .../butterstick/{info.json => keyboard.json} | 11 ++++++++++ keyboards/gboards/butterstick/rules.mk | 9 -------- .../frogmini/fmh/{info.json => keyboard.json} | 8 +++++++ keyboards/geonworks/frogmini/fmh/rules.mk | 15 ------------- .../frogmini/fms/{info.json => keyboard.json} | 9 ++++++++ keyboards/geonworks/frogmini/fms/rules.mk | 15 ------------- .../hotswap/{info.json => keyboard.json} | 12 ++++++++++ .../gray_studio/think65/hotswap/rules.mk | 17 -------------- .../solder/{info.json => keyboard.json} | 12 ++++++++++ keyboards/gray_studio/think65/solder/rules.mk | 17 -------------- .../ga150/{info.json => keyboard.json} | 12 ++++++++++ keyboards/gvalchca/ga150/rules.mk | 14 ------------ .../spaccboard/{info.json => keyboard.json} | 12 ++++++++++ keyboards/gvalchca/spaccboard/rules.mk | 14 ------------ .../3dp660/{info.json => keyboard.json} | 11 ++++++++++ keyboards/handwired/3dp660/rules.mk | 13 ----------- .../acacia/{info.json => keyboard.json} | 11 ++++++++++ keyboards/handwired/acacia/rules.mk | 7 ------ .../colorlice/{info.json => keyboard.json} | 12 ++++++++++ keyboards/handwired/colorlice/rules.mk | 14 ------------ .../18key/{info.json => keyboard.json} | 12 ++++++++++ .../handwired/consolekeyboard/18key/rules.mk | 13 ----------- .../20key/{info.json => keyboard.json} | 12 ++++++++++ .../handwired/consolekeyboard/20key/rules.mk | 13 ----------- .../27key/{info.json => keyboard.json} | 12 ++++++++++ .../handwired/consolekeyboard/27key/rules.mk | 13 ----------- .../30key/{info.json => keyboard.json} | 12 ++++++++++ .../handwired/consolekeyboard/30key/rules.mk | 13 ----------- .../curiosity/{info.json => keyboard.json} | 8 +++++++ keyboards/handwired/curiosity/rules.mk | 13 ----------- .../{info.json => keyboard.json} | 15 +++++++++++++ keyboards/handwired/frankie_macropad/rules.mk | 17 -------------- .../lemonpad/{info.json => keyboard.json} | 11 ++++++++++ keyboards/handwired/lemonpad/rules.mk | 14 ------------ .../marauder/{info.json => keyboard.json} | 12 ++++++++++ keyboards/handwired/marauder/rules.mk | 13 ----------- .../p65rgb/{info.json => keyboard.json} | 12 ++++++++++ keyboards/handwired/p65rgb/rules.mk | 14 ------------ .../2x4/{info.json => keyboard.json} | 11 ++++++++++ keyboards/handwired/stream_cheap/2x4/rules.mk | 13 ----------- .../symmetry60/{info.json => keyboard.json} | 12 ++++++++++ keyboards/handwired/symmetry60/rules.mk | 13 ----------- .../tsubasa/{info.json => keyboard.json} | 15 +++++++++++++ keyboards/handwired/tsubasa/rules.mk | 18 --------------- .../uthol/rev1/{info.json => keyboard.json} | 11 ++++++++++ keyboards/handwired/uthol/rev1/rules.mk | 7 ------ .../uthol/rev2/{info.json => keyboard.json} | 12 ++++++++++ keyboards/handwired/uthol/rev2/rules.mk | 8 ------- .../h87a/{info.json => keyboard.json} | 13 +++++++++++ keyboards/hineybush/h87a/rules.mk | 13 ----------- .../h88/{info.json => keyboard.json} | 13 +++++++++++ keyboards/hineybush/h88/rules.mk | 13 ----------- .../hnahkb/vn66/{info.json => keyboard.json} | 14 ++++++++++++ keyboards/hnahkb/vn66/rules.mk | 14 ------------ .../id75/v1/{info.json => keyboard.json} | 13 +++++++++++ keyboards/idobao/id75/v1/rules.mk | 13 ----------- .../id75/v2/{info.json => keyboard.json} | 12 ++++++++++ keyboards/idobao/id75/v2/rules.mk | 15 ------------- .../sqx/hotswap/{info.json => keyboard.json} | 13 +++++++++++ keyboards/inett_studio/sqx/hotswap/rules.mk | 15 ------------- .../universal/{info.json => keyboard.json} | 13 +++++++++++ keyboards/inett_studio/sqx/universal/rules.mk | 14 ------------ .../rev2/{info.json => keyboard.json} | 13 +++++++++++ .../jacky_studio/s7_elephant/rev2/rules.mk | 13 ----------- .../drakon/{info.json => keyboard.json} | 14 ++++++++++++ keyboards/jagdpietr/drakon/rules.mk | 17 -------------- .../kbd75rgb/{info.json => keyboard.json} | 12 ++++++++++ keyboards/kbdfans/kbd75rgb/rules.mk | 14 ------------ .../bamfk4/{info.json => keyboard.json} | 12 ++++++++++ keyboards/keebio/bamfk4/rules.mk | 16 -------------- .../keebio/wtf60/{info.json => keyboard.json} | 11 ++++++++++ keyboards/keebio/wtf60/rules.mk | 13 ----------- .../radpad/{info.json => keyboard.json} | 14 ++++++++++++ keyboards/keybage/radpad/rules.mk | 15 ------------- .../enclave/{info.json => keyboard.json} | 12 ++++++++++ keyboards/keyquest/enclave/rules.mk | 13 ----------- .../aperture/{info.json => keyboard.json} | 11 ++++++++++ keyboards/keyten/aperture/rules.mk | 13 ----------- .../kt60_m/{info.json => keyboard.json} | 11 ++++++++++ keyboards/keyten/kt60_m/rules.mk | 13 ----------- .../rev1/{info.json => keyboard.json} | 12 ++++++++++ keyboards/kprepublic/bm60hsrgb/rev1/rules.mk | 14 ------------ .../rev1/{info.json => keyboard.json} | 13 +++++++++++ .../kprepublic/bm60hsrgb_ec/rev1/rules.mk | 15 ------------- .../rev2/{info.json => keyboard.json} | 14 ++++++++++++ .../kprepublic/bm60hsrgb_ec/rev2/rules.mk | 15 ------------- .../rev1/{info.json => keyboard.json} | 12 ++++++++++ .../kprepublic/bm60hsrgb_iso/rev1/rules.mk | 14 ------------ .../rev1/{info.json => keyboard.json} | 12 ++++++++++ keyboards/kprepublic/bm65hsrgb/rev1/rules.mk | 14 ------------ .../rev1/{info.json => keyboard.json} | 12 ++++++++++ .../kprepublic/bm65hsrgb_iso/rev1/rules.mk | 14 ------------ .../rev1/{info.json => keyboard.json} | 12 ++++++++++ keyboards/kprepublic/bm68hsrgb/rev1/rules.mk | 14 ------------ .../rev2/{info.json => keyboard.json} | 13 +++++++++++ keyboards/kprepublic/bm68hsrgb/rev2/rules.mk | 14 ------------ .../bm80hsrgb/{info.json => keyboard.json} | 12 ++++++++++ keyboards/kprepublic/bm80hsrgb/rules.mk | 14 ------------ .../bm80v2/{info.json => keyboard.json} | 12 ++++++++++ keyboards/kprepublic/bm80v2/rules.mk | 14 ------------ .../bm80v2_iso/{info.json => keyboard.json} | 12 ++++++++++ keyboards/kprepublic/bm80v2_iso/rules.mk | 16 -------------- .../bm980hsrgb/{info.json => keyboard.json} | 12 ++++++++++ keyboards/kprepublic/bm980hsrgb/rules.mk | 15 ------------- .../rev1/{info.json => keyboard.json} | 11 ++++++++++ keyboards/malevolti/superlyra/rev1/rules.mk | 14 ------------ .../undead60m/{info.json => keyboard.json} | 13 +++++++++++ keyboards/mechanickeys/undead60m/rules.mk | 14 ------------ .../mb65h/{info.json => keyboard.json} | 11 ++++++++++ keyboards/mechbrewery/mb65h/rules.mk | 13 ----------- .../mb65s/{info.json => keyboard.json} | 11 ++++++++++ keyboards/mechbrewery/mb65s/rules.mk | 13 ----------- keyboards/melgeek/mach80/rev1/info.json | 7 ------ keyboards/melgeek/mach80/rev1/keyboard.json | 19 ++++++++++++++++ keyboards/melgeek/mach80/rev1/rules.mk | 14 ------------ keyboards/melgeek/mach80/rev2/info.json | 7 ------ keyboards/melgeek/mach80/rev2/keyboard.json | 19 ++++++++++++++++ keyboards/melgeek/mach80/rev2/rules.mk | 14 ------------ .../timberwolf/{info.json => keyboard.json} | 13 +++++++++++ keyboards/metamechs/timberwolf/rules.mk | 14 ------------ .../mode/m75h/{info.json => keyboard.json} | 11 ++++++++++ keyboards/mode/m75h/rules.mk | 14 ------------ .../mode/m75s/{info.json => keyboard.json} | 12 ++++++++++ keyboards/mode/m75s/rules.mk | 14 ------------ .../tap_duo/{info.json => keyboard.json} | 12 ++++++++++ keyboards/momokai/tap_duo/rules.mk | 14 ------------ .../tap_trio/{info.json => keyboard.json} | 12 ++++++++++ keyboards/momokai/tap_trio/rules.mk | 14 ------------ .../monoflex60/{info.json => keyboard.json} | 11 ++++++++++ keyboards/monoflex60/rules.mk | 13 ----------- .../mt/mt64rgb/{info.json => keyboard.json} | 13 +++++++++++ keyboards/mt/mt64rgb/rules.mk | 16 -------------- .../mt/mt84/{info.json => keyboard.json} | 13 +++++++++++ keyboards/mt/mt84/rules.mk | 14 ------------ .../adellein/{info.json => keyboard.json} | 13 +++++++++++ keyboards/nightly_boards/adellein/rules.mk | 13 ----------- .../conde60/{info.json => keyboard.json} | 12 ++++++++++ keyboards/nightly_boards/conde60/rules.mk | 12 ---------- .../n60_s/{info.json => keyboard.json} | 14 ++++++++++++ keyboards/nightly_boards/n60_s/rules.mk | 14 ------------ .../octopad/{info.json => keyboard.json} | 14 ++++++++++++ keyboards/nightly_boards/octopad/rules.mk | 14 ------------ .../paraluman/{info.json => keyboard.json} | 11 ++++++++++ keyboards/nightly_boards/paraluman/rules.mk | 12 ---------- .../oxalys80/{info.json => keyboard.json} | 13 +++++++++++ keyboards/nix_studio/oxalys80/rules.mk | 13 ----------- .../noxary/260/{info.json => keyboard.json} | 12 ++++++++++ keyboards/noxary/260/rules.mk | 13 ----------- .../albacore/{info.json => keyboard.json} | 12 ++++++++++ keyboards/paprikman/albacore/rules.mk | 16 -------------- .../pandora/{info.json => keyboard.json} | 14 ++++++++++++ keyboards/pearlboards/pandora/rules.mk | 16 -------------- .../zeuspad/{info.json => keyboard.json} | 14 ++++++++++++ keyboards/pearlboards/zeuspad/rules.mk | 16 -------------- .../booster/{info.json => keyboard.json} | 13 +++++++++++ keyboards/percent/booster/rules.mk | 13 ----------- .../helen80/{info.json => keyboard.json} | 12 ++++++++++ keyboards/playkbtw/helen80/rules.mk | 15 ------------- .../pk64rgb/{info.json => keyboard.json} | 13 +++++++++++ keyboards/playkbtw/pk64rgb/rules.mk | 16 -------------- .../0x3e/{info.json => keyboard.json} | 14 ++++++++++++ keyboards/plut0nium/0x3e/rules.mk | 13 ----------- .../tnln95/{info.json => keyboard.json} | 13 +++++++++++ keyboards/pom_keyboards/tnln95/rules.mk | 13 ----------- .../preonic/rev1/{info.json => keyboard.json} | 13 +++++++++++ keyboards/preonic/rev1/rules.mk | 14 ------------ .../preonic/rev2/{info.json => keyboard.json} | 13 +++++++++++ keyboards/preonic/rev2/rules.mk | 14 ------------ .../j01/{info.json => keyboard.json} | 12 ++++++++++ keyboards/prototypist/j01/rules.mk | 13 ----------- .../southpaw66/{info.json => keyboard.json} | 11 ++++++++++ keyboards/rpiguy9907/southpaw66/rules.mk | 13 ----------- .../s_ol/0xc_pad/{info.json => keyboard.json} | 12 ++++++++++ keyboards/s_ol/0xc_pad/rules.mk | 14 ------------ .../dystopia/{info.json => keyboard.json} | 11 ++++++++++ keyboards/sanctified/dystopia/rules.mk | 13 ----------- .../iron180/{info.json => keyboard.json} | 8 +++++++ keyboards/smithrune/iron180/rules.mk | 15 ------------- keyboards/soup10/{info.json => keyboard.json} | 11 ++++++++++ keyboards/soup10/rules.mk | 13 ----------- .../nebula12b/{info.json => keyboard.json} | 12 ++++++++++ keyboards/spaceholdings/nebula12b/rules.mk | 15 ------------- .../nebula68b/{info.json => keyboard.json} | 12 ++++++++++ keyboards/spaceholdings/nebula68b/rules.mk | 15 ------------- keyboards/star75/{info.json => keyboard.json} | 13 +++++++++++ keyboards/star75/rules.mk | 17 -------------- .../ext/{info.json => keyboard.json} | 11 ++++++++++ keyboards/superuser/ext/rules.mk | 13 ----------- .../frl/{info.json => keyboard.json} | 11 ++++++++++ keyboards/superuser/frl/rules.mk | 13 ----------- .../tkl/{info.json => keyboard.json} | 11 ++++++++++ keyboards/superuser/tkl/rules.mk | 13 ----------- keyboards/tetris/{info.json => keyboard.json} | 14 ++++++++++++ keyboards/tetris/rules.mk | 14 ------------ keyboards/tg4x/{info.json => keyboard.json} | 12 ++++++++++ keyboards/tg4x/rules.mk | 14 ------------ .../lefty/{info.json => keyboard.json} | 11 ++++++++++ keyboards/tkc/candybar/lefty/rules.mk | 15 ------------- .../lefty_r3/{info.json => keyboard.json} | 11 ++++++++++ keyboards/tkc/candybar/lefty_r3/rules.mk | 13 ----------- .../righty/{info.json => keyboard.json} | 11 ++++++++++ keyboards/tkc/candybar/righty/rules.mk | 15 ------------- .../righty_r3/{info.json => keyboard.json} | 11 ++++++++++ keyboards/tkc/candybar/righty_r3/rules.mk | 13 ----------- .../tkc/osav2/{info.json => keyboard.json} | 13 +++++++++++ keyboards/tkc/osav2/rules.mk | 13 ----------- .../portico68v2/{info.json => keyboard.json} | 12 ++++++++++ keyboards/tkc/portico68v2/rules.mk | 14 ------------ .../blueberry/{info.json => keyboard.json} | 12 ++++++++++ keyboards/toffee_studio/blueberry/rules.mk | 14 ------------ .../type9s2/{info.json => keyboard.json} | 12 ++++++++++ keyboards/treasure/type9s2/rules.mk | 13 ----------- .../ortho4exent/{info.json => keyboard.json} | 12 ++++++++++ keyboards/tszaboo/ortho4exent/rules.mk | 13 ----------- .../v60_type_r/{info.json => keyboard.json} | 12 ++++++++++ keyboards/v60_type_r/rules.mk | 14 ------------ .../viendi8l/{info.json => keyboard.json} | 10 +++++++++ keyboards/viendi8l/rules.mk | 14 ------------ .../{info.json => keyboard.json} | 13 +++++++++++ keyboards/woodkeys/scarletbandana/rules.mk | 13 ----------- .../xelus/akis/{info.json => keyboard.json} | 12 ++++++++++ keyboards/xelus/akis/rules.mk | 14 ------------ .../valor/rev1/{info.json => keyboard.json} | 12 ++++++++++ keyboards/xelus/valor/rev1/rules.mk | 13 ----------- .../zigotica/z12/{info.json => keyboard.json} | 13 +++++++++++ keyboards/zigotica/z12/rules.mk | 15 ------------- lib/python/qmk/info.py | 6 +++++ 291 files changed, 1763 insertions(+), 2023 deletions(-) rename keyboards/0xc7/61key/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/0xc7/61key/rules.mk rename keyboards/0xcb/1337/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/0xcb/1337/rules.mk rename keyboards/0xcb/static/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/0xcb/static/rules.mk rename keyboards/1upkeyboards/1up60hse/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/1upkeyboards/1up60hse/rules.mk rename keyboards/1upkeyboards/1up60hte/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/1upkeyboards/1up60hte/rules.mk rename keyboards/abacus/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/abacus/rules.mk rename keyboards/acheron/athena/alpha/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/acheron/athena/alpha/rules.mk rename keyboards/acheron/athena/beta/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/acheron/athena/beta/rules.mk rename keyboards/acheron/elongate/beta/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/acheron/elongate/beta/rules.mk rename keyboards/acheron/shark/beta/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/acheron/shark/beta/rules.mk rename keyboards/ai03/jp60/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/ai03/jp60/rules.mk rename keyboards/alf/x11/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/alf/x11/rules.mk rename keyboards/atlantis/ak81_ve/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/atlantis/ak81_ve/rules.mk rename keyboards/atxkb/1894/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/atxkb/1894/rules.mk rename keyboards/axolstudio/yeti/hotswap/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/axolstudio/yeti/hotswap/rules.mk rename keyboards/bioi/s65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/bioi/s65/rules.mk rename keyboards/blockboy/ac980mini/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/blockboy/ac980mini/rules.mk rename keyboards/cipulot/kallos/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/cipulot/kallos/rules.mk rename keyboards/converter/a1200/mistress1200/{info.json => keyboard.json} (66%) delete mode 100644 keyboards/converter/a1200/mistress1200/rules.mk rename keyboards/drewkeys/iskar/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/drewkeys/iskar/rules.mk rename keyboards/drhigsby/bkf/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/drhigsby/bkf/rules.mk rename keyboards/drhigsby/dubba175/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/drhigsby/dubba175/rules.mk rename keyboards/drhigsby/packrat/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/drhigsby/packrat/rules.mk rename keyboards/dtisaac/dosa40rgb/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/dtisaac/dosa40rgb/rules.mk rename keyboards/durgod/k320/base/{info.json => keyboard.json} (67%) delete mode 100644 keyboards/durgod/k320/base/rules.mk rename keyboards/esca/getawayvan/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/esca/getawayvan/rules.mk rename keyboards/esca/getawayvan_f042/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/esca/getawayvan_f042/rules.mk rename keyboards/feker/ik75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/feker/ik75/rules.mk rename keyboards/ffkeebs/puca/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/ffkeebs/puca/rules.mk rename keyboards/flx/lodestone/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/flx/lodestone/rules.mk rename keyboards/flx/virgo/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/flx/virgo/rules.mk rename keyboards/ft/mars65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ft/mars65/rules.mk rename keyboards/gboards/butterstick/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/gboards/butterstick/rules.mk rename keyboards/geonworks/frogmini/fmh/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/geonworks/frogmini/fmh/rules.mk rename keyboards/geonworks/frogmini/fms/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/geonworks/frogmini/fms/rules.mk rename keyboards/gray_studio/think65/hotswap/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/gray_studio/think65/hotswap/rules.mk rename keyboards/gray_studio/think65/solder/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/gray_studio/think65/solder/rules.mk rename keyboards/gvalchca/ga150/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/gvalchca/ga150/rules.mk rename keyboards/gvalchca/spaccboard/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/gvalchca/spaccboard/rules.mk rename keyboards/handwired/3dp660/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/3dp660/rules.mk rename keyboards/handwired/acacia/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/handwired/acacia/rules.mk rename keyboards/handwired/colorlice/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/colorlice/rules.mk rename keyboards/handwired/consolekeyboard/18key/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/handwired/consolekeyboard/18key/rules.mk rename keyboards/handwired/consolekeyboard/20key/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/handwired/consolekeyboard/20key/rules.mk rename keyboards/handwired/consolekeyboard/27key/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/handwired/consolekeyboard/27key/rules.mk rename keyboards/handwired/consolekeyboard/30key/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/handwired/consolekeyboard/30key/rules.mk rename keyboards/handwired/curiosity/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/curiosity/rules.mk rename keyboards/handwired/frankie_macropad/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/handwired/frankie_macropad/rules.mk rename keyboards/handwired/lemonpad/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/handwired/lemonpad/rules.mk rename keyboards/handwired/marauder/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/marauder/rules.mk rename keyboards/handwired/p65rgb/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/p65rgb/rules.mk rename keyboards/handwired/stream_cheap/2x4/{info.json => keyboard.json} (81%) delete mode 100644 keyboards/handwired/stream_cheap/2x4/rules.mk rename keyboards/handwired/symmetry60/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/symmetry60/rules.mk rename keyboards/handwired/tsubasa/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/handwired/tsubasa/rules.mk rename keyboards/handwired/uthol/rev1/{info.json => keyboard.json} (61%) delete mode 100644 keyboards/handwired/uthol/rev1/rules.mk rename keyboards/handwired/uthol/rev2/{info.json => keyboard.json} (66%) delete mode 100644 keyboards/handwired/uthol/rev2/rules.mk rename keyboards/hineybush/h87a/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/hineybush/h87a/rules.mk rename keyboards/hineybush/h88/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/hineybush/h88/rules.mk rename keyboards/hnahkb/vn66/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/hnahkb/vn66/rules.mk rename keyboards/idobao/id75/v1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/idobao/id75/v1/rules.mk rename keyboards/idobao/id75/v2/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/idobao/id75/v2/rules.mk rename keyboards/inett_studio/sqx/hotswap/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/inett_studio/sqx/hotswap/rules.mk rename keyboards/inett_studio/sqx/universal/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/inett_studio/sqx/universal/rules.mk rename keyboards/jacky_studio/s7_elephant/rev2/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/jacky_studio/s7_elephant/rev2/rules.mk rename keyboards/jagdpietr/drakon/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/jagdpietr/drakon/rules.mk rename keyboards/kbdfans/kbd75rgb/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kbdfans/kbd75rgb/rules.mk rename keyboards/keebio/bamfk4/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/keebio/bamfk4/rules.mk rename keyboards/keebio/wtf60/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/keebio/wtf60/rules.mk rename keyboards/keybage/radpad/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/keybage/radpad/rules.mk rename keyboards/keyquest/enclave/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/keyquest/enclave/rules.mk rename keyboards/keyten/aperture/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keyten/aperture/rules.mk rename keyboards/keyten/kt60_m/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keyten/kt60_m/rules.mk rename keyboards/kprepublic/bm60hsrgb/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kprepublic/bm60hsrgb/rev1/rules.mk rename keyboards/kprepublic/bm60hsrgb_ec/rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk rename keyboards/kprepublic/bm60hsrgb_ec/rev2/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk rename keyboards/kprepublic/bm60hsrgb_iso/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk rename keyboards/kprepublic/bm65hsrgb/rev1/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/kprepublic/bm65hsrgb/rev1/rules.mk rename keyboards/kprepublic/bm65hsrgb_iso/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk rename keyboards/kprepublic/bm68hsrgb/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kprepublic/bm68hsrgb/rev1/rules.mk rename keyboards/kprepublic/bm68hsrgb/rev2/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/kprepublic/bm68hsrgb/rev2/rules.mk rename keyboards/kprepublic/bm80hsrgb/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kprepublic/bm80hsrgb/rules.mk rename keyboards/kprepublic/bm80v2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kprepublic/bm80v2/rules.mk rename keyboards/kprepublic/bm80v2_iso/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kprepublic/bm80v2_iso/rules.mk rename keyboards/kprepublic/bm980hsrgb/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kprepublic/bm980hsrgb/rules.mk rename keyboards/malevolti/superlyra/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/malevolti/superlyra/rev1/rules.mk rename keyboards/mechanickeys/undead60m/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/mechanickeys/undead60m/rules.mk rename keyboards/mechbrewery/mb65h/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/mechbrewery/mb65h/rules.mk rename keyboards/mechbrewery/mb65s/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/mechbrewery/mb65s/rules.mk delete mode 100644 keyboards/melgeek/mach80/rev1/info.json create mode 100644 keyboards/melgeek/mach80/rev1/keyboard.json delete mode 100755 keyboards/melgeek/mach80/rev1/rules.mk delete mode 100644 keyboards/melgeek/mach80/rev2/info.json create mode 100644 keyboards/melgeek/mach80/rev2/keyboard.json delete mode 100755 keyboards/melgeek/mach80/rev2/rules.mk rename keyboards/metamechs/timberwolf/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/metamechs/timberwolf/rules.mk rename keyboards/mode/m75h/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mode/m75h/rules.mk rename keyboards/mode/m75s/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/mode/m75s/rules.mk rename keyboards/momokai/tap_duo/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/momokai/tap_duo/rules.mk rename keyboards/momokai/tap_trio/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/momokai/tap_trio/rules.mk rename keyboards/monoflex60/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/monoflex60/rules.mk rename keyboards/mt/mt64rgb/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/mt/mt64rgb/rules.mk rename keyboards/mt/mt84/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mt/mt84/rules.mk rename keyboards/nightly_boards/adellein/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/nightly_boards/adellein/rules.mk rename keyboards/nightly_boards/conde60/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/nightly_boards/conde60/rules.mk rename keyboards/nightly_boards/n60_s/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/nightly_boards/n60_s/rules.mk rename keyboards/nightly_boards/octopad/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/nightly_boards/octopad/rules.mk rename keyboards/nightly_boards/paraluman/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/nightly_boards/paraluman/rules.mk rename keyboards/nix_studio/oxalys80/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/nix_studio/oxalys80/rules.mk rename keyboards/noxary/260/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/noxary/260/rules.mk rename keyboards/paprikman/albacore/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/paprikman/albacore/rules.mk rename keyboards/pearlboards/pandora/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/pearlboards/pandora/rules.mk rename keyboards/pearlboards/zeuspad/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/pearlboards/zeuspad/rules.mk rename keyboards/percent/booster/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/percent/booster/rules.mk rename keyboards/playkbtw/helen80/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/playkbtw/helen80/rules.mk rename keyboards/playkbtw/pk64rgb/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/playkbtw/pk64rgb/rules.mk rename keyboards/plut0nium/0x3e/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/plut0nium/0x3e/rules.mk rename keyboards/pom_keyboards/tnln95/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/pom_keyboards/tnln95/rules.mk rename keyboards/preonic/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/preonic/rev1/rules.mk rename keyboards/preonic/rev2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/preonic/rev2/rules.mk rename keyboards/prototypist/j01/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/prototypist/j01/rules.mk rename keyboards/rpiguy9907/southpaw66/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/rpiguy9907/southpaw66/rules.mk rename keyboards/s_ol/0xc_pad/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/s_ol/0xc_pad/rules.mk rename keyboards/sanctified/dystopia/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/sanctified/dystopia/rules.mk rename keyboards/smithrune/iron180/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/smithrune/iron180/rules.mk rename keyboards/soup10/{info.json => keyboard.json} (83%) delete mode 100644 keyboards/soup10/rules.mk rename keyboards/spaceholdings/nebula12b/{info.json => keyboard.json} (92%) delete mode 100755 keyboards/spaceholdings/nebula12b/rules.mk rename keyboards/spaceholdings/nebula68b/{info.json => keyboard.json} (97%) delete mode 100755 keyboards/spaceholdings/nebula68b/rules.mk rename keyboards/star75/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/star75/rules.mk rename keyboards/superuser/ext/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/superuser/ext/rules.mk rename keyboards/superuser/frl/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/superuser/frl/rules.mk rename keyboards/superuser/tkl/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/superuser/tkl/rules.mk rename keyboards/tetris/{info.json => keyboard.json} (93%) delete mode 100755 keyboards/tetris/rules.mk rename keyboards/tg4x/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/tg4x/rules.mk rename keyboards/tkc/candybar/lefty/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/tkc/candybar/lefty/rules.mk rename keyboards/tkc/candybar/lefty_r3/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/tkc/candybar/lefty_r3/rules.mk rename keyboards/tkc/candybar/righty/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/tkc/candybar/righty/rules.mk rename keyboards/tkc/candybar/righty_r3/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/tkc/candybar/righty_r3/rules.mk rename keyboards/tkc/osav2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/tkc/osav2/rules.mk rename keyboards/tkc/portico68v2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/tkc/portico68v2/rules.mk rename keyboards/toffee_studio/blueberry/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/toffee_studio/blueberry/rules.mk rename keyboards/treasure/type9s2/{info.json => keyboard.json} (81%) delete mode 100644 keyboards/treasure/type9s2/rules.mk rename keyboards/tszaboo/ortho4exent/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/tszaboo/ortho4exent/rules.mk rename keyboards/v60_type_r/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/v60_type_r/rules.mk rename keyboards/viendi8l/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/viendi8l/rules.mk rename keyboards/woodkeys/scarletbandana/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/woodkeys/scarletbandana/rules.mk rename keyboards/xelus/akis/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/xelus/akis/rules.mk rename keyboards/xelus/valor/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/xelus/valor/rev1/rules.mk rename keyboards/zigotica/z12/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/zigotica/z12/rules.mk diff --git a/keyboards/0xc7/61key/info.json b/keyboards/0xc7/61key/keyboard.json similarity index 94% rename from keyboards/0xc7/61key/info.json rename to keyboards/0xc7/61key/keyboard.json index fe2b9ef8b48..6585b970c1e 100644 --- a/keyboards/0xc7/61key/info.json +++ b/keyboards/0xc7/61key/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x6161", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": false, + "key_lock": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/0xc7/61key/rules.mk b/keyboards/0xc7/61key/rules.mk deleted file mode 100644 index bad6a45f5f1..00000000000 --- a/keyboards/0xc7/61key/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 = no # 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 - -LTO_ENABLE = yes -KEY_LOCK_ENABLE = yes diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/keyboard.json similarity index 85% rename from keyboards/0xcb/1337/info.json rename to keyboards/0xcb/1337/keyboard.json index d492f8e3bed..5b583dc291b 100644 --- a/keyboards/0xcb/1337/info.json +++ b/keyboards/0xcb/1337/keyboard.json @@ -52,6 +52,21 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "direct": [ ["D2", "D4", "F4"], diff --git a/keyboards/0xcb/1337/rules.mk b/keyboards/0xcb/1337/rules.mk deleted file mode 100644 index 60cbfd4df60..00000000000 --- a/keyboards/0xcb/1337/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -LTO_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/keyboard.json similarity index 95% rename from keyboards/0xcb/static/info.json rename to keyboards/0xcb/static/keyboard.json index 97f5e53cadb..cd3d4928707 100644 --- a/keyboards/0xcb/static/info.json +++ b/keyboards/0xcb/static/keyboard.json @@ -8,6 +8,19 @@ "pid": "0xA455", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true + }, "matrix_pins": { "cols": ["B5", "D4", "C0", "C1", "C2", "C3"], "rows": ["D5", "D6", "D7", "B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/0xcb/static/rules.mk b/keyboards/0xcb/static/rules.mk deleted file mode 100644 index fe8dabeab7e..00000000000 --- a/keyboards/0xcb/static/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -LTO_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/keyboard.json similarity index 94% rename from keyboards/1upkeyboards/1up60hse/info.json rename to keyboards/1upkeyboards/1up60hse/keyboard.json index ffc2d4d7657..ac8d5247121 100644 --- a/keyboards/1upkeyboards/1up60hse/info.json +++ b/keyboards/1upkeyboards/1up60hse/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x6873", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7"], "rows": ["B3", "B2", "B1", "B0", "D4"] diff --git a/keyboards/1upkeyboards/1up60hse/rules.mk b/keyboards/1upkeyboards/1up60hse/rules.mk deleted file mode 100644 index 11ed55a6f87..00000000000 --- a/keyboards/1upkeyboards/1up60hse/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # 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 diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/keyboard.json similarity index 96% rename from keyboards/1upkeyboards/1up60hte/info.json rename to keyboards/1upkeyboards/1up60hte/keyboard.json index 99275bf251b..25f519bea79 100644 --- a/keyboards/1upkeyboards/1up60hte/info.json +++ b/keyboards/1upkeyboards/1up60hte/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x6874", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"], "rows": ["B3", "B2", "B1", "B0", "D4"] diff --git a/keyboards/1upkeyboards/1up60hte/rules.mk b/keyboards/1upkeyboards/1up60hte/rules.mk deleted file mode 100644 index aaea8522f64..00000000000 --- a/keyboards/1upkeyboards/1up60hte/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # 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 diff --git a/keyboards/abacus/info.json b/keyboards/abacus/keyboard.json similarity index 92% rename from keyboards/abacus/info.json rename to keyboards/abacus/keyboard.json index ad8ebcc8654..c34fb32c52f 100644 --- a/keyboards/abacus/info.json +++ b/keyboards/abacus/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "B5"], "rows": ["D3", "D2", "D4", "C6"] diff --git a/keyboards/abacus/rules.mk b/keyboards/abacus/rules.mk deleted file mode 100644 index ae582d61308..00000000000 --- a/keyboards/abacus/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -DIP_SWITCH_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/keyboard.json similarity index 99% rename from keyboards/acheron/athena/alpha/info.json rename to keyboards/acheron/athena/alpha/keyboard.json index 229fd7a8c88..8570fa12748 100644 --- a/keyboards/acheron/athena/alpha/info.json +++ b/keyboards/acheron/athena/alpha/keyboard.json @@ -4,6 +4,19 @@ "pid": "0x6584", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A8", "B14", "B12", "B10", "B1", "B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A7", "B4", "B3", "A15"], "rows": ["B9", "C13", "B8", "B5", "A14", "C14"] diff --git a/keyboards/acheron/athena/alpha/rules.mk b/keyboards/acheron/athena/alpha/rules.mk deleted file mode 100644 index 086e2474baf..00000000000 --- a/keyboards/acheron/athena/alpha/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 = no # Commands for debug and configuration -NKRO_ENABLE = yes # 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 -ENCODER_ENABLE = no - diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/keyboard.json similarity index 99% rename from keyboards/acheron/athena/beta/info.json rename to keyboards/acheron/athena/beta/keyboard.json index 0730833b9b8..21aa189470e 100644 --- a/keyboards/acheron/athena/beta/info.json +++ b/keyboards/acheron/athena/beta/keyboard.json @@ -4,6 +4,19 @@ "pid": "0x6585", "device_version": "0.0.2" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "C6", "B14", "B12", "B10", "B1", "C4", "A7", "A6", "A5", "A4", "A3", "A2", "C5", "A10", "A8", "C9"], "rows": ["C11", "C12", "C10", "A15", "C0", "A1"] diff --git a/keyboards/acheron/athena/beta/rules.mk b/keyboards/acheron/athena/beta/rules.mk deleted file mode 100644 index 086e2474baf..00000000000 --- a/keyboards/acheron/athena/beta/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 = no # Commands for debug and configuration -NKRO_ENABLE = yes # 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 -ENCODER_ENABLE = no - diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/keyboard.json similarity index 94% rename from keyboards/acheron/elongate/beta/info.json rename to keyboards/acheron/elongate/beta/keyboard.json index 2bbb214bd00..80c984caab6 100644 --- a/keyboards/acheron/elongate/beta/info.json +++ b/keyboards/acheron/elongate/beta/keyboard.json @@ -29,6 +29,18 @@ "ws2812": { "pin": "D7" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F6", "F4", "F1", "F0", "B2", "B1", "C6", "B0", "B3", "E6", "D4", "B4"], "rows": ["D3", "B7", "D5", "B5", "D6"] diff --git a/keyboards/acheron/elongate/beta/rules.mk b/keyboards/acheron/elongate/beta/rules.mk deleted file mode 100644 index 2aff52b20aa..00000000000 --- a/keyboards/acheron/elongate/beta/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/keyboard.json similarity index 93% rename from keyboards/acheron/shark/beta/info.json rename to keyboards/acheron/shark/beta/keyboard.json index 7daab0a2c0e..7f182068a0d 100644 --- a/keyboards/acheron/shark/beta/info.json +++ b/keyboards/acheron/shark/beta/keyboard.json @@ -4,6 +4,17 @@ "pid": "0x5369", "device_version": "0.0.2" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A5", "A10", "C13", "B9", "B8", "B5", "B4", "B3", "A15", "A0", "A1", "A2"], "rows": ["A8", "B14", "A4", "A3"] diff --git a/keyboards/acheron/shark/beta/rules.mk b/keyboards/acheron/shark/beta/rules.mk deleted file mode 100644 index 94335efa29f..00000000000 --- a/keyboards/acheron/shark/beta/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # 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 = no -ENCODER_ENABLE = yes diff --git a/keyboards/ai03/jp60/info.json b/keyboards/ai03/jp60/keyboard.json similarity index 95% rename from keyboards/ai03/jp60/info.json rename to keyboards/ai03/jp60/keyboard.json index 8e879d6f4b5..bc366e60e50 100644 --- a/keyboards/ai03/jp60/info.json +++ b/keyboards/ai03/jp60/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0024", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D2", "D1", "D3", "D5", "D4", "D6", "C6", "F0", "F1", "F4", "F5", "F6", "F7", "C7"], "rows": ["B6", "B5", "B4", "D7", "E6"] diff --git a/keyboards/ai03/jp60/rules.mk b/keyboards/ai03/jp60/rules.mk deleted file mode 100644 index d07172dd2d7..00000000000 --- a/keyboards/ai03/jp60/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 -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 -LTO_ENABLE = yes # Optimize firmware at link time \ No newline at end of file diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/keyboard.json similarity index 96% rename from keyboards/alf/x11/info.json rename to keyboards/alf/x11/keyboard.json index 1d1508fc11a..03abfc2dbed 100644 --- a/keyboards/alf/x11/info.json +++ b/keyboards/alf/x11/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"] diff --git a/keyboards/alf/x11/rules.mk b/keyboards/alf/x11/rules.mk deleted file mode 100644 index 2eed748d1f0..00000000000 --- a/keyboards/alf/x11/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 -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 diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/keyboard.json similarity index 95% rename from keyboards/atlantis/ak81_ve/info.json rename to keyboards/atlantis/ak81_ve/keyboard.json index a6b78bb5a8d..6b618646443 100644 --- a/keyboards/atlantis/ak81_ve/info.json +++ b/keyboards/atlantis/ak81_ve/keyboard.json @@ -60,6 +60,20 @@ "max_brightness": 130, "sleep": true }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dynamic_macro": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "B7", "D3", "D2", "D1", "D0", "B3"], "rows": ["F1", "F7", "F6", "F5", "F4", "D5"] diff --git a/keyboards/atlantis/ak81_ve/rules.mk b/keyboards/atlantis/ak81_ve/rules.mk deleted file mode 100644 index aaaf913b969..00000000000 --- a/keyboards/atlantis/ak81_ve/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Keyboard backlight functionality -RGBLIGHT_ENABLE = no # Keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes -LTO_ENABLE = yes -DYNAMIC_MACRO_ENABLE = yes -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/atxkb/1894/info.json b/keyboards/atxkb/1894/keyboard.json similarity index 98% rename from keyboards/atxkb/1894/info.json rename to keyboards/atxkb/1894/keyboard.json index aaa6d266436..0ea4918bf38 100644 --- a/keyboards/atxkb/1894/info.json +++ b/keyboards/atxkb/1894/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "F0", "F1"] diff --git a/keyboards/atxkb/1894/rules.mk b/keyboards/atxkb/1894/rules.mk deleted file mode 100644 index c84da725191..00000000000 --- a/keyboards/atxkb/1894/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # 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 diff --git a/keyboards/axolstudio/yeti/hotswap/info.json b/keyboards/axolstudio/yeti/hotswap/keyboard.json similarity index 95% rename from keyboards/axolstudio/yeti/hotswap/info.json rename to keyboards/axolstudio/yeti/hotswap/keyboard.json index d89d6903603..728c359880c 100644 --- a/keyboards/axolstudio/yeti/hotswap/info.json +++ b/keyboards/axolstudio/yeti/hotswap/keyboard.json @@ -46,6 +46,18 @@ "driver": "is31fl3733", "sleep": true }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"], "rows": ["E6", "C6", "B4", "B5", "B6"] diff --git a/keyboards/axolstudio/yeti/hotswap/rules.mk b/keyboards/axolstudio/yeti/hotswap/rules.mk deleted file mode 100644 index 154f1e53267..00000000000 --- a/keyboards/axolstudio/yeti/hotswap/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Use RGB matrix - -LTO_ENABLE = yes diff --git a/keyboards/bioi/s65/info.json b/keyboards/bioi/s65/keyboard.json similarity index 99% rename from keyboards/bioi/s65/info.json rename to keyboards/bioi/s65/keyboard.json index a2d63ae3f97..b34cd9e602c 100644 --- a/keyboards/bioi/s65/info.json +++ b/keyboards/bioi/s65/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x5365", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "B3", "F4", "F5", "F6", "E6", "C7", "B2", "B1", "C6", "B6", "B5", "B4", "D7", "D4", "D5"], "rows": ["D2", "D0", "D1", "F7", "D6"] diff --git a/keyboards/bioi/s65/rules.mk b/keyboards/bioi/s65/rules.mk deleted file mode 100644 index 332501b7748..00000000000 --- a/keyboards/bioi/s65/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 -LTO_ENABLE = yes # Reduce firmware size diff --git a/keyboards/blockboy/ac980mini/info.json b/keyboards/blockboy/ac980mini/keyboard.json similarity index 96% rename from keyboards/blockboy/ac980mini/info.json rename to keyboards/blockboy/ac980mini/keyboard.json index 4bc05236bcc..ad844102dc6 100644 --- a/keyboards/blockboy/ac980mini/info.json +++ b/keyboards/blockboy/ac980mini/keyboard.json @@ -4,6 +4,18 @@ "maintainer": "rooski15", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/blockboy/ac980mini/rules.mk b/keyboards/blockboy/ac980mini/rules.mk deleted file mode 100644 index 6111d23a8cd..00000000000 --- a/keyboards/blockboy/ac980mini/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -RGB_MATRIX_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/cipulot/kallos/info.json b/keyboards/cipulot/kallos/keyboard.json similarity index 95% rename from keyboards/cipulot/kallos/info.json rename to keyboards/cipulot/kallos/keyboard.json index b2f265c13fd..e92d634489d 100644 --- a/keyboards/cipulot/kallos/info.json +++ b/keyboards/cipulot/kallos/keyboard.json @@ -26,6 +26,18 @@ "ws2812": { "pin": "D0" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F6", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F7", "D2", "D1", "B7"], "rows": ["B3", "B2", "F0", "C7", "F4", "F1"] diff --git a/keyboards/cipulot/kallos/rules.mk b/keyboards/cipulot/kallos/rules.mk deleted file mode 100644 index f574845eef7..00000000000 --- a/keyboards/cipulot/kallos/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/converter/a1200/mistress1200/info.json b/keyboards/converter/a1200/mistress1200/keyboard.json similarity index 66% rename from keyboards/converter/a1200/mistress1200/info.json rename to keyboards/converter/a1200/mistress1200/keyboard.json index 28de092b3de..c2cf110b2ae 100644 --- a/keyboards/converter/a1200/mistress1200/info.json +++ b/keyboards/converter/a1200/mistress1200/keyboard.json @@ -6,6 +6,20 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "grave_esc": false, + "magic": false, + "mousekey": false, + "nkro": false, + "space_cadet": false + }, "matrix_pins": { "cols": ["D0", "D1", "C7", "D6", "B7", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "B2", "D5", "D3", "D2"], "rows": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B3"] diff --git a/keyboards/converter/a1200/mistress1200/rules.mk b/keyboards/converter/a1200/mistress1200/rules.mk deleted file mode 100644 index 18ddf68b03c..00000000000 --- a/keyboards/converter/a1200/mistress1200/rules.mk +++ /dev/null @@ -1,16 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes -SPACE_CADET_ENABLE = no -GRAVE_ESC_ENABLE = no -MAGIC_ENABLE = no diff --git a/keyboards/drewkeys/iskar/info.json b/keyboards/drewkeys/iskar/keyboard.json similarity index 98% rename from keyboards/drewkeys/iskar/info.json rename to keyboards/drewkeys/iskar/keyboard.json index 5aae75c86cf..c3f1aace78c 100644 --- a/keyboards/drewkeys/iskar/info.json +++ b/keyboards/drewkeys/iskar/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x1284", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "C6", "C7", "F6", "F5", "F4", "F7", "F1", "F0", "E6", "B7", "D0", "D1", "D2", "D3", "D5"], "rows": ["D6", "D7", "B4", "B5", "D4"] diff --git a/keyboards/drewkeys/iskar/rules.mk b/keyboards/drewkeys/iskar/rules.mk deleted file mode 100644 index db678d6eadf..00000000000 --- a/keyboards/drewkeys/iskar/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 -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 -LTO_ENABLE = yes diff --git a/keyboards/drhigsby/bkf/info.json b/keyboards/drhigsby/bkf/keyboard.json similarity index 96% rename from keyboards/drhigsby/bkf/info.json rename to keyboards/drhigsby/bkf/keyboard.json index 25d79416dcf..97bb5919fb7 100644 --- a/keyboards/drhigsby/bkf/info.json +++ b/keyboards/drhigsby/bkf/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "B2", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3"] diff --git a/keyboards/drhigsby/bkf/rules.mk b/keyboards/drhigsby/bkf/rules.mk deleted file mode 100644 index 89c72050b80..00000000000 --- a/keyboards/drhigsby/bkf/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = no # Use link time optimization -ENCODER_ENABLE = yes diff --git a/keyboards/drhigsby/dubba175/info.json b/keyboards/drhigsby/dubba175/keyboard.json similarity index 94% rename from keyboards/drhigsby/dubba175/info.json rename to keyboards/drhigsby/dubba175/keyboard.json index 001fa7c6e2f..ad964408063 100644 --- a/keyboards/drhigsby/dubba175/info.json +++ b/keyboards/drhigsby/dubba175/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0420", "device_version": "4.2.0" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B6"], "rows": ["B1", "B3", "B2", "B5"] diff --git a/keyboards/drhigsby/dubba175/rules.mk b/keyboards/drhigsby/dubba175/rules.mk deleted file mode 100644 index f8e989aa3cf..00000000000 --- a/keyboards/drhigsby/dubba175/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 -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 -LTO_ENABLE = no # Use link time optimization diff --git a/keyboards/drhigsby/packrat/info.json b/keyboards/drhigsby/packrat/keyboard.json similarity index 98% rename from keyboards/drhigsby/packrat/info.json rename to keyboards/drhigsby/packrat/keyboard.json index 7b74841a6ab..a1b00f835ca 100644 --- a/keyboards/drhigsby/packrat/info.json +++ b/keyboards/drhigsby/packrat/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3"], "rows": ["F7", "B1", "B6", "B2"] diff --git a/keyboards/drhigsby/packrat/rules.mk b/keyboards/drhigsby/packrat/rules.mk deleted file mode 100644 index f82f47b09ae..00000000000 --- a/keyboards/drhigsby/packrat/rules.mk +++ /dev/null @@ -1,14 +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 -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 -LTO_ENABLE = no # Use link time optimization -ENCODER_ENABLE = yes diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/keyboard.json similarity index 94% rename from keyboards/dtisaac/dosa40rgb/info.json rename to keyboards/dtisaac/dosa40rgb/keyboard.json index 557b5c3abcb..5f3654d2c57 100644 --- a/keyboards/dtisaac/dosa40rgb/info.json +++ b/keyboards/dtisaac/dosa40rgb/keyboard.json @@ -66,6 +66,19 @@ "max_brightness": 150, "react_on_keyup": true }, + "build": { + "lto": true + }, + "features": { + "bluetooth": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D1", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], "rows": ["B7", "D7", "F1", "F0"] diff --git a/keyboards/dtisaac/dosa40rgb/rules.mk b/keyboards/dtisaac/dosa40rgb/rules.mk deleted file mode 100644 index 265652de509..00000000000 --- a/keyboards/dtisaac/dosa40rgb/rules.mk +++ /dev/null @@ -1,16 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -BLUETOOTH_ENABLE = yes # Enable Bluetooth -RGB_MATRIX_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/durgod/k320/base/info.json b/keyboards/durgod/k320/base/keyboard.json similarity index 67% rename from keyboards/durgod/k320/base/info.json rename to keyboards/durgod/k320/base/keyboard.json index 134dcdbd63c..89ea273baf0 100644 --- a/keyboards/durgod/k320/base/info.json +++ b/keyboards/durgod/k320/base/keyboard.json @@ -1,4 +1,15 @@ { + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C10", "C11", "C12"], "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6"] diff --git a/keyboards/durgod/k320/base/rules.mk b/keyboards/durgod/k320/base/rules.mk deleted file mode 100644 index 92e817504f9..00000000000 --- a/keyboards/durgod/k320/base/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/esca/getawayvan/info.json b/keyboards/esca/getawayvan/keyboard.json similarity index 93% rename from keyboards/esca/getawayvan/info.json rename to keyboards/esca/getawayvan/keyboard.json index 2a473d0c11b..6105e5850d8 100644 --- a/keyboards/esca/getawayvan/info.json +++ b/keyboards/esca/getawayvan/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x0401", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A4", "A13", "A10", "C13", "C14"], "rows": ["A9", "A8", "A3", "A5"] diff --git a/keyboards/esca/getawayvan/rules.mk b/keyboards/esca/getawayvan/rules.mk deleted file mode 100644 index f574845eef7..00000000000 --- a/keyboards/esca/getawayvan/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/esca/getawayvan_f042/info.json b/keyboards/esca/getawayvan_f042/keyboard.json similarity index 93% rename from keyboards/esca/getawayvan_f042/info.json rename to keyboards/esca/getawayvan_f042/keyboard.json index 08a18b5f0a1..6b934e16c70 100644 --- a/keyboards/esca/getawayvan_f042/info.json +++ b/keyboards/esca/getawayvan_f042/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x0401", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A4", "A13", "A10", "C13", "C14"], "rows": ["A9", "A8", "A3", "A5"] diff --git a/keyboards/esca/getawayvan_f042/rules.mk b/keyboards/esca/getawayvan_f042/rules.mk deleted file mode 100644 index 4d4b05c6745..00000000000 --- a/keyboards/esca/getawayvan_f042/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 -LTO_ENABLE = yes diff --git a/keyboards/feker/ik75/info.json b/keyboards/feker/ik75/keyboard.json similarity index 96% rename from keyboards/feker/ik75/info.json rename to keyboards/feker/ik75/keyboard.json index 4b7e4915198..8f5614098ce 100644 --- a/keyboards/feker/ik75/info.json +++ b/keyboards/feker/ik75/keyboard.json @@ -57,6 +57,20 @@ "driver": "is31fl3733", "max_brightness": 200 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true, + "space_cadet": false + }, "matrix_pins": { "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "E2"], "rows": ["F7", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/feker/ik75/rules.mk b/keyboards/feker/ik75/rules.mk deleted file mode 100644 index e086b6aaf84..00000000000 --- a/keyboards/feker/ik75/rules.mk +++ /dev/null @@ -1,22 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# Additional thing to reduce compiled size -LTO_ENABLE = yes -SPACE_CADET_ENABLE = no - -# RGB Matrix enabled -RGB_MATRIX_ENABLE = yes - -# Encoder enabled -ENCODER_ENABLE = yes diff --git a/keyboards/ffkeebs/puca/info.json b/keyboards/ffkeebs/puca/keyboard.json similarity index 94% rename from keyboards/ffkeebs/puca/info.json rename to keyboards/ffkeebs/puca/keyboard.json index dbfc2f43206..04f444869d7 100644 --- a/keyboards/ffkeebs/puca/info.json +++ b/keyboards/ffkeebs/puca/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "B1", "B3", "B2", "B6"], "rows": ["B4", "E6", "D7", "B5", "C6", "F6"] diff --git a/keyboards/ffkeebs/puca/rules.mk b/keyboards/ffkeebs/puca/rules.mk deleted file mode 100644 index 3e5ac0433fe..00000000000 --- a/keyboards/ffkeebs/puca/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow - -ENCODER_ENABLE = yes # Enable rotary encoder support -OLED_ENABLE = yes # Enable OLED support - -LTO_ENABLE = yes # Enable Link Time Optimization to reduce firmware size diff --git a/keyboards/flx/lodestone/info.json b/keyboards/flx/lodestone/keyboard.json similarity index 98% rename from keyboards/flx/lodestone/info.json rename to keyboards/flx/lodestone/keyboard.json index a7d6a18e864..c6dd4197da8 100644 --- a/keyboards/flx/lodestone/info.json +++ b/keyboards/flx/lodestone/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x4C53", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B2", "F5", "F6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["B3", "B7", "F0", "F1", "F4"] diff --git a/keyboards/flx/lodestone/rules.mk b/keyboards/flx/lodestone/rules.mk deleted file mode 100644 index dcdd2221bc1..00000000000 --- a/keyboards/flx/lodestone/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 = 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 -LTO_ENABLE = yes diff --git a/keyboards/flx/virgo/info.json b/keyboards/flx/virgo/keyboard.json similarity index 95% rename from keyboards/flx/virgo/info.json rename to keyboards/flx/virgo/keyboard.json index d1e40b9ecec..8396ce51daa 100644 --- a/keyboards/flx/virgo/info.json +++ b/keyboards/flx/virgo/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x5647", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"], "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"] diff --git a/keyboards/flx/virgo/rules.mk b/keyboards/flx/virgo/rules.mk deleted file mode 100644 index cafe30d9293..00000000000 --- a/keyboards/flx/virgo/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 -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 diff --git a/keyboards/ft/mars65/info.json b/keyboards/ft/mars65/keyboard.json similarity index 98% rename from keyboards/ft/mars65/info.json rename to keyboards/ft/mars65/keyboard.json index 4e3b3b8ee9d..3b6f5ec8a91 100644 --- a/keyboards/ft/mars65/info.json +++ b/keyboards/ft/mars65/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x422F", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C6", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/ft/mars65/rules.mk b/keyboards/ft/mars65/rules.mk deleted file mode 100644 index 9e327f9e3c8..00000000000 --- a/keyboards/ft/mars65/rules.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes # Reduce firmware size - -# generated by KBFirmware JSON to QMK Parser -# https://noroadsleft.github.io/kbf_qmk_converter/ - diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/keyboard.json similarity index 88% rename from keyboards/gboards/butterstick/info.json rename to keyboards/gboards/butterstick/keyboard.json index 1695ca0e234..59d703925be 100644 --- a/keyboards/gboards/butterstick/info.json +++ b/keyboards/gboards/butterstick/keyboard.json @@ -9,6 +9,17 @@ "device_version": "0.0.1", "force_nkro": true }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7"], "rows": ["F4", "F5"] diff --git a/keyboards/gboards/butterstick/rules.mk b/keyboards/gboards/butterstick/rules.mk deleted file mode 100644 index b4de1a53932..00000000000 --- a/keyboards/gboards/butterstick/rules.mk +++ /dev/null @@ -1,9 +0,0 @@ -# Build Options -# change yes to no to disable -# -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 = yes # Enable N-Key Rollover -LTO_ENABLE = yes diff --git a/keyboards/geonworks/frogmini/fmh/info.json b/keyboards/geonworks/frogmini/fmh/keyboard.json similarity index 99% rename from keyboards/geonworks/frogmini/fmh/info.json rename to keyboards/geonworks/frogmini/fmh/keyboard.json index 7b381bc5875..899f5084d19 100644 --- a/keyboards/geonworks/frogmini/fmh/info.json +++ b/keyboards/geonworks/frogmini/fmh/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x2D28", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C4", "C5", "B0", "C13", "C14", "C15", "B9", "C1", "C2", "C3", "A6", "A5", "A4", "A0"], "rows": ["A3", "A2", "A1", "B8", "A7", "C0"] diff --git a/keyboards/geonworks/frogmini/fmh/rules.mk b/keyboards/geonworks/frogmini/fmh/rules.mk deleted file mode 100644 index 1775ec5c41f..00000000000 --- a/keyboards/geonworks/frogmini/fmh/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 = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = no -ENCODER_ENABLE = no - -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality diff --git a/keyboards/geonworks/frogmini/fms/info.json b/keyboards/geonworks/frogmini/fms/keyboard.json similarity index 99% rename from keyboards/geonworks/frogmini/fms/info.json rename to keyboards/geonworks/frogmini/fms/keyboard.json index ada9188e37c..66a28805856 100644 --- a/keyboards/geonworks/frogmini/fms/info.json +++ b/keyboards/geonworks/frogmini/fms/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x2D33", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C4", "C5", "B0", "C13", "C14", "C15", "B9", "C1", "C2", "C3", "A6", "A5", "A4", "A0"], "rows": ["A3", "A2", "A1", "B8", "A7", "C0"] diff --git a/keyboards/geonworks/frogmini/fms/rules.mk b/keyboards/geonworks/frogmini/fms/rules.mk deleted file mode 100644 index 19b80485899..00000000000 --- a/keyboards/geonworks/frogmini/fms/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 = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = no -ENCODER_ENABLE = no - -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality diff --git a/keyboards/gray_studio/think65/hotswap/info.json b/keyboards/gray_studio/think65/hotswap/keyboard.json similarity index 95% rename from keyboards/gray_studio/think65/hotswap/info.json rename to keyboards/gray_studio/think65/hotswap/keyboard.json index 382ef80517b..c2dba581908 100644 --- a/keyboards/gray_studio/think65/hotswap/info.json +++ b/keyboards/gray_studio/think65/hotswap/keyboard.json @@ -29,6 +29,18 @@ "ws2812": { "pin": "E2" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/gray_studio/think65/hotswap/rules.mk b/keyboards/gray_studio/think65/hotswap/rules.mk deleted file mode 100644 index 582545a8ce4..00000000000 --- a/keyboards/gray_studio/think65/hotswap/rules.mk +++ /dev/null @@ -1,17 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LTO_ENABLE = yes - -# generated by KBFirmware JSON to QMK Parser -# https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/gray_studio/think65/solder/info.json b/keyboards/gray_studio/think65/solder/keyboard.json similarity index 98% rename from keyboards/gray_studio/think65/solder/info.json rename to keyboards/gray_studio/think65/solder/keyboard.json index e6c0b972b85..9706e8b4b49 100644 --- a/keyboards/gray_studio/think65/solder/info.json +++ b/keyboards/gray_studio/think65/solder/keyboard.json @@ -29,6 +29,18 @@ "ws2812": { "pin": "E2" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/gray_studio/think65/solder/rules.mk b/keyboards/gray_studio/think65/solder/rules.mk deleted file mode 100644 index 582545a8ce4..00000000000 --- a/keyboards/gray_studio/think65/solder/rules.mk +++ /dev/null @@ -1,17 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LTO_ENABLE = yes - -# generated by KBFirmware JSON to QMK Parser -# https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/gvalchca/ga150/info.json b/keyboards/gvalchca/ga150/keyboard.json similarity index 94% rename from keyboards/gvalchca/ga150/info.json rename to keyboards/gvalchca/ga150/keyboard.json index e7df866444a..38028799fa3 100644 --- a/keyboards/gvalchca/ga150/info.json +++ b/keyboards/gvalchca/ga150/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x6135", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["E6", "B7", "D5", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "D3"], "rows": ["B1", "B2", "B3", "F1", "F0"] diff --git a/keyboards/gvalchca/ga150/rules.mk b/keyboards/gvalchca/ga150/rules.mk deleted file mode 100644 index 96682fe5ccd..00000000000 --- a/keyboards/gvalchca/ga150/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 -LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/gvalchca/spaccboard/info.json b/keyboards/gvalchca/spaccboard/keyboard.json similarity index 97% rename from keyboards/gvalchca/spaccboard/info.json rename to keyboards/gvalchca/spaccboard/keyboard.json index 1ce128b5966..ad03737fd59 100644 --- a/keyboards/gvalchca/spaccboard/info.json +++ b/keyboards/gvalchca/spaccboard/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x5342", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["E6", "B7", "D5", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4", "F1", "D3"], "rows": ["B1", "B2", "B3", "C7", "F0"] diff --git a/keyboards/gvalchca/spaccboard/rules.mk b/keyboards/gvalchca/spaccboard/rules.mk deleted file mode 100644 index b4f292ed8d7..00000000000 --- a/keyboards/gvalchca/spaccboard/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 -LTO_ENABLE = yes diff --git a/keyboards/handwired/3dp660/info.json b/keyboards/handwired/3dp660/keyboard.json similarity index 95% rename from keyboards/handwired/3dp660/info.json rename to keyboards/handwired/3dp660/keyboard.json index 82132e44733..e01ff4610c6 100644 --- a/keyboards/handwired/3dp660/info.json +++ b/keyboards/handwired/3dp660/keyboard.json @@ -11,6 +11,17 @@ "tapping": { "term": 400 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D2", "D3", "C6", "C7", "D5", "D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/handwired/3dp660/rules.mk b/keyboards/handwired/3dp660/rules.mk deleted file mode 100644 index f5b61e673cf..00000000000 --- a/keyboards/handwired/3dp660/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/handwired/acacia/info.json b/keyboards/handwired/acacia/keyboard.json similarity index 93% rename from keyboards/handwired/acacia/info.json rename to keyboards/handwired/acacia/keyboard.json index 65a4b49a696..d761764727a 100644 --- a/keyboards/handwired/acacia/info.json +++ b/keyboards/handwired/acacia/keyboard.json @@ -7,6 +7,17 @@ "bootloader": "atmel-dfu", "bootloader_instructions": "Enter the bootloader by using the small buttons on the PCB: press the RESET button while connected to QMK Toolbox.", "diode_direction": "COL2ROW", + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B4", "B3", "B2", "B1", "B0", "D2", "B6", "B7", "C7", "C6"], "rows": ["B5", "D3", "D4", "D5", "D6"] diff --git a/keyboards/handwired/acacia/rules.mk b/keyboards/handwired/acacia/rules.mk deleted file mode 100644 index c70b7f10c74..00000000000 --- a/keyboards/handwired/acacia/rules.mk +++ /dev/null @@ -1,7 +0,0 @@ -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -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 # N-Key Rollover -LTO_ENABLE = yes # Link-time optimisation for smaller code diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/keyboard.json similarity index 96% rename from keyboards/handwired/colorlice/info.json rename to keyboards/handwired/colorlice/keyboard.json index d81cd849ade..1a9549d8632 100644 --- a/keyboards/handwired/colorlice/info.json +++ b/keyboards/handwired/colorlice/keyboard.json @@ -62,6 +62,18 @@ "led_process_limit": 4, "sleep": true }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/handwired/colorlice/rules.mk b/keyboards/handwired/colorlice/rules.mk deleted file mode 100644 index 16e007dd340..00000000000 --- a/keyboards/handwired/colorlice/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes # Use link time optimization -RGB_MATRIX_ENABLE = yes -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/keyboard.json similarity index 87% rename from keyboards/handwired/consolekeyboard/18key/info.json rename to keyboards/handwired/consolekeyboard/18key/keyboard.json index a49ce18c4b6..c75e324cf30 100644 --- a/keyboards/handwired/consolekeyboard/18key/info.json +++ b/keyboards/handwired/consolekeyboard/18key/keyboard.json @@ -20,6 +20,18 @@ "ws2812": { "pin": "F4" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"], "rows": ["D1", "D0"] diff --git a/keyboards/handwired/consolekeyboard/18key/rules.mk b/keyboards/handwired/consolekeyboard/18key/rules.mk deleted file mode 100644 index d4b9c78d5e7..00000000000 --- a/keyboards/handwired/consolekeyboard/18key/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 -LTO_ENABLE = yes # Link time optimize diff --git a/keyboards/handwired/consolekeyboard/20key/info.json b/keyboards/handwired/consolekeyboard/20key/keyboard.json similarity index 88% rename from keyboards/handwired/consolekeyboard/20key/info.json rename to keyboards/handwired/consolekeyboard/20key/keyboard.json index c076b50fa3d..87449fc21e6 100644 --- a/keyboards/handwired/consolekeyboard/20key/info.json +++ b/keyboards/handwired/consolekeyboard/20key/keyboard.json @@ -20,6 +20,18 @@ "ws2812": { "pin": "F4" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"], "rows": ["D1", "D0"] diff --git a/keyboards/handwired/consolekeyboard/20key/rules.mk b/keyboards/handwired/consolekeyboard/20key/rules.mk deleted file mode 100644 index d4b9c78d5e7..00000000000 --- a/keyboards/handwired/consolekeyboard/20key/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 -LTO_ENABLE = yes # Link time optimize diff --git a/keyboards/handwired/consolekeyboard/27key/info.json b/keyboards/handwired/consolekeyboard/27key/keyboard.json similarity index 90% rename from keyboards/handwired/consolekeyboard/27key/info.json rename to keyboards/handwired/consolekeyboard/27key/keyboard.json index 6f9c3a7d2d0..21a894d5e40 100644 --- a/keyboards/handwired/consolekeyboard/27key/info.json +++ b/keyboards/handwired/consolekeyboard/27key/keyboard.json @@ -20,6 +20,18 @@ "ws2812": { "pin": "F4" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"], "rows": ["D1", "D0", "F7"] diff --git a/keyboards/handwired/consolekeyboard/27key/rules.mk b/keyboards/handwired/consolekeyboard/27key/rules.mk deleted file mode 100644 index d4b9c78d5e7..00000000000 --- a/keyboards/handwired/consolekeyboard/27key/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 -LTO_ENABLE = yes # Link time optimize diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/keyboard.json similarity index 90% rename from keyboards/handwired/consolekeyboard/30key/info.json rename to keyboards/handwired/consolekeyboard/30key/keyboard.json index d0b726a1ff8..159558e3556 100644 --- a/keyboards/handwired/consolekeyboard/30key/info.json +++ b/keyboards/handwired/consolekeyboard/30key/keyboard.json @@ -20,6 +20,18 @@ "ws2812": { "pin": "F4" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"], "rows": ["D1", "D0", "F7"] diff --git a/keyboards/handwired/consolekeyboard/30key/rules.mk b/keyboards/handwired/consolekeyboard/30key/rules.mk deleted file mode 100644 index d4b9c78d5e7..00000000000 --- a/keyboards/handwired/consolekeyboard/30key/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 -LTO_ENABLE = yes # Link time optimize diff --git a/keyboards/handwired/curiosity/info.json b/keyboards/handwired/curiosity/keyboard.json similarity index 97% rename from keyboards/handwired/curiosity/info.json rename to keyboards/handwired/curiosity/keyboard.json index 37f66a80298..1a1024fb18b 100644 --- a/keyboards/handwired/curiosity/info.json +++ b/keyboards/handwired/curiosity/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4355", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D4", "F4", "C6", "D7", "E6", "B5", "B4", "B1", "B3", "B2", "B6"], "rows": ["D0", "F7", "F6", "F5"] diff --git a/keyboards/handwired/curiosity/rules.mk b/keyboards/handwired/curiosity/rules.mk deleted file mode 100644 index 40f895a51bc..00000000000 --- a/keyboards/handwired/curiosity/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 -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 -LTO_ENABLE = no # Use link time optimization diff --git a/keyboards/handwired/frankie_macropad/info.json b/keyboards/handwired/frankie_macropad/keyboard.json similarity index 79% rename from keyboards/handwired/frankie_macropad/info.json rename to keyboards/handwired/frankie_macropad/keyboard.json index 24da71eb8dd..f994b1fa484 100644 --- a/keyboards/handwired/frankie_macropad/info.json +++ b/keyboards/handwired/frankie_macropad/keyboard.json @@ -8,6 +8,21 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "grave_esc": false, + "magic": false, + "mousekey": false, + "nkro": false, + "space_cadet": false + }, "matrix_pins": { "cols": ["B3", "B4", "B5", "B6"], "rows": ["B0", "B1", "B2"] diff --git a/keyboards/handwired/frankie_macropad/rules.mk b/keyboards/handwired/frankie_macropad/rules.mk deleted file mode 100644 index 6587f1f6983..00000000000 --- a/keyboards/handwired/frankie_macropad/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes -SPACE_CADET_ENABLE = no -MAGIC_ENABLE = no -GRAVE_ESC_ENABLE = no diff --git a/keyboards/handwired/lemonpad/info.json b/keyboards/handwired/lemonpad/keyboard.json similarity index 78% rename from keyboards/handwired/lemonpad/info.json rename to keyboards/handwired/lemonpad/keyboard.json index 4655cde341e..ba40689125e 100644 --- a/keyboards/handwired/lemonpad/info.json +++ b/keyboards/handwired/lemonpad/keyboard.json @@ -10,6 +10,17 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "direct": [ ["E6", "D7", "C6"], diff --git a/keyboards/handwired/lemonpad/rules.mk b/keyboards/handwired/lemonpad/rules.mk deleted file mode 100644 index 1b7b1b36a45..00000000000 --- a/keyboards/handwired/lemonpad/rules.mk +++ /dev/null @@ -1,14 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LTO_ENABLE = yes diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/keyboard.json similarity index 96% rename from keyboards/handwired/marauder/info.json rename to keyboards/handwired/marauder/keyboard.json index 5c17825a634..aa612c1ff00 100644 --- a/keyboards/handwired/marauder/info.json +++ b/keyboards/handwired/marauder/keyboard.json @@ -17,6 +17,18 @@ "ws2812": { "pin": "D3" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B0"], "rows": ["D2", "D4", "C6", "D7", "E6", "B4", "B5", "B7", "D5", "C7", "F1", "F0"] diff --git a/keyboards/handwired/marauder/rules.mk b/keyboards/handwired/marauder/rules.mk deleted file mode 100644 index a14973e3ef4..00000000000 --- a/keyboards/handwired/marauder/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes # Link Time Optimization, shrinks the output slightly diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/keyboard.json similarity index 96% rename from keyboards/handwired/p65rgb/info.json rename to keyboards/handwired/p65rgb/keyboard.json index 3d8e02cf402..184d7b323c2 100644 --- a/keyboards/handwired/p65rgb/info.json +++ b/keyboards/handwired/p65rgb/keyboard.json @@ -65,6 +65,18 @@ "rgblight": { "max_brightness": 180 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D7"], "rows": ["C7", "C6", "B6", "B5", "D5"] diff --git a/keyboards/handwired/p65rgb/rules.mk b/keyboards/handwired/p65rgb/rules.mk deleted file mode 100644 index 5e57c341f16..00000000000 --- a/keyboards/handwired/p65rgb/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/handwired/stream_cheap/2x4/info.json b/keyboards/handwired/stream_cheap/2x4/keyboard.json similarity index 81% rename from keyboards/handwired/stream_cheap/2x4/info.json rename to keyboards/handwired/stream_cheap/2x4/keyboard.json index 8bd5ca4fcc4..72e5e1814c0 100644 --- a/keyboards/handwired/stream_cheap/2x4/info.json +++ b/keyboards/handwired/stream_cheap/2x4/keyboard.json @@ -10,6 +10,17 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "direct": [ ["D1", "D0", "D4", "C6"], diff --git a/keyboards/handwired/stream_cheap/2x4/rules.mk b/keyboards/handwired/stream_cheap/2x4/rules.mk deleted file mode 100644 index 3ced86d55c4..00000000000 --- a/keyboards/handwired/stream_cheap/2x4/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 -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 -LTO_ENABLE = yes # Enable optimizations diff --git a/keyboards/handwired/symmetry60/info.json b/keyboards/handwired/symmetry60/keyboard.json similarity index 95% rename from keyboards/handwired/symmetry60/info.json rename to keyboards/handwired/symmetry60/keyboard.json index 3f8427f3c88..e8cbe495b1f 100644 --- a/keyboards/handwired/symmetry60/info.json +++ b/keyboards/handwired/symmetry60/keyboard.json @@ -28,6 +28,18 @@ "ws2812": { "pin": "B1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/handwired/symmetry60/rules.mk b/keyboards/handwired/symmetry60/rules.mk deleted file mode 100644 index a44795bae04..00000000000 --- a/keyboards/handwired/symmetry60/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 -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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes # Use link time optimization diff --git a/keyboards/handwired/tsubasa/info.json b/keyboards/handwired/tsubasa/keyboard.json similarity index 93% rename from keyboards/handwired/tsubasa/info.json rename to keyboards/handwired/tsubasa/keyboard.json index 62c418c9956..05fd05968a4 100644 --- a/keyboards/handwired/tsubasa/info.json +++ b/keyboards/handwired/tsubasa/keyboard.json @@ -22,6 +22,21 @@ "ws2812": { "pin": "D2" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true, + "wpm": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/tsubasa/rules.mk b/keyboards/handwired/tsubasa/rules.mk deleted file mode 100644 index 5838d93ad55..00000000000 --- a/keyboards/handwired/tsubasa/rules.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - -ENCODER_ENABLE = yes - -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/handwired/uthol/rev1/info.json b/keyboards/handwired/uthol/rev1/keyboard.json similarity index 61% rename from keyboards/handwired/uthol/rev1/info.json rename to keyboards/handwired/uthol/rev1/keyboard.json index 02802966b2d..dd5746e884d 100644 --- a/keyboards/handwired/uthol/rev1/info.json +++ b/keyboards/handwired/uthol/rev1/keyboard.json @@ -3,6 +3,17 @@ "usb": { "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B5", "B4", "D2"], "rows": ["D1", "D0", "D4", "C6", "D7"] diff --git a/keyboards/handwired/uthol/rev1/rules.mk b/keyboards/handwired/uthol/rev1/rules.mk deleted file mode 100644 index c06a99e1e4a..00000000000 --- a/keyboards/handwired/uthol/rev1/rules.mk +++ /dev/null @@ -1,7 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes -EXTRAKEY_ENABLE = yes -NKRO_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/keyboard.json similarity index 66% rename from keyboards/handwired/uthol/rev2/info.json rename to keyboards/handwired/uthol/rev2/keyboard.json index 9185e97c432..95ca5946a99 100644 --- a/keyboards/handwired/uthol/rev2/info.json +++ b/keyboards/handwired/uthol/rev2/keyboard.json @@ -12,6 +12,18 @@ "ws2812": { "pin": "E6" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "B5", "B4", "B6", "B2", "B3"], "rows": ["B1", "F7", "F6", "F5", "F4"] diff --git a/keyboards/handwired/uthol/rev2/rules.mk b/keyboards/handwired/uthol/rev2/rules.mk deleted file mode 100644 index c6e22b8dd29..00000000000 --- a/keyboards/handwired/uthol/rev2/rules.mk +++ /dev/null @@ -1,8 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes -EXTRAKEY_ENABLE = yes -NKRO_ENABLE = yes -LTO_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/hineybush/h87a/info.json b/keyboards/hineybush/h87a/keyboard.json similarity index 98% rename from keyboards/hineybush/h87a/info.json rename to keyboards/hineybush/h87a/keyboard.json index 9b2eb97e7c9..196a3aa8fe5 100644 --- a/keyboards/hineybush/h87a/info.json +++ b/keyboards/hineybush/h87a/keyboard.json @@ -8,6 +8,19 @@ "pid": "0xECE9", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D2"], "rows": ["B0", "B1", "B2", "B3", "D0", "D1", "B5", "B6", "D7", "B4", "D6", "D4"] diff --git a/keyboards/hineybush/h87a/rules.mk b/keyboards/hineybush/h87a/rules.mk deleted file mode 100644 index 9748c083e3d..00000000000 --- a/keyboards/hineybush/h87a/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 -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 RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/hineybush/h88/info.json b/keyboards/hineybush/h88/keyboard.json similarity index 98% rename from keyboards/hineybush/h88/info.json rename to keyboards/hineybush/h88/keyboard.json index dfd7e8211c8..2adb661273f 100644 --- a/keyboards/hineybush/h88/info.json +++ b/keyboards/hineybush/h88/keyboard.json @@ -8,6 +8,19 @@ "pid": "0xECA2", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D2"], "rows": ["B0", "B1", "B2", "B3", "D0", "D1", "B5", "B6", "D7", "B4", "D6", "D4"] diff --git a/keyboards/hineybush/h88/rules.mk b/keyboards/hineybush/h88/rules.mk deleted file mode 100644 index 9748c083e3d..00000000000 --- a/keyboards/hineybush/h88/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 -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 RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/hnahkb/vn66/info.json b/keyboards/hnahkb/vn66/keyboard.json similarity index 97% rename from keyboards/hnahkb/vn66/info.json rename to keyboards/hnahkb/vn66/keyboard.json index cef3127be95..6934fd1f8fa 100644 --- a/keyboards/hnahkb/vn66/info.json +++ b/keyboards/hnahkb/vn66/keyboard.json @@ -8,6 +8,20 @@ "pid": "0xCA2C", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "F0", "C6", "C7", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "D2", "F7"] diff --git a/keyboards/hnahkb/vn66/rules.mk b/keyboards/hnahkb/vn66/rules.mk deleted file mode 100644 index 4f5a4635de4..00000000000 --- a/keyboards/hnahkb/vn66/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 = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/keyboard.json similarity index 95% rename from keyboards/idobao/id75/v1/info.json rename to keyboards/idobao/id75/v1/keyboard.json index 545709475d3..99b7f6e2b31 100644 --- a/keyboards/idobao/id75/v1/info.json +++ b/keyboards/idobao/id75/v1/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0075", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B3", "C7", "B6", "C6"] diff --git a/keyboards/idobao/id75/v1/rules.mk b/keyboards/idobao/id75/v1/rules.mk deleted file mode 100644 index 4b4bc45417f..00000000000 --- a/keyboards/idobao/id75/v1/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 -CONSOLE_ENABLE = yes # 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 # Use link time optimization diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/keyboard.json similarity index 95% rename from keyboards/idobao/id75/v2/info.json rename to keyboards/idobao/id75/v2/keyboard.json index f24145b9180..b33e7b69074 100644 --- a/keyboards/idobao/id75/v2/info.json +++ b/keyboards/idobao/id75/v2/keyboard.json @@ -47,6 +47,18 @@ }, "driver": "ws2812" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B3", "C7", "B6", "C6"] diff --git a/keyboards/idobao/id75/v2/rules.mk b/keyboards/idobao/id75/v2/rules.mk deleted file mode 100644 index 38f5eb554ba..00000000000 --- a/keyboards/idobao/id75/v2/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes # Use link time optimization - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/inett_studio/sqx/hotswap/info.json b/keyboards/inett_studio/sqx/hotswap/keyboard.json similarity index 95% rename from keyboards/inett_studio/sqx/hotswap/info.json rename to keyboards/inett_studio/sqx/hotswap/keyboard.json index f1526594f95..071b38d992a 100644 --- a/keyboards/inett_studio/sqx/hotswap/info.json +++ b/keyboards/inett_studio/sqx/hotswap/keyboard.json @@ -61,6 +61,19 @@ "twinkle": true } }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "F6", "F5", "E6", "B0", "D2", "D4", "D5", "D3"], "rows": ["F0", "F1", "F4", "B7", "D6"] diff --git a/keyboards/inett_studio/sqx/hotswap/rules.mk b/keyboards/inett_studio/sqx/hotswap/rules.mk deleted file mode 100644 index 9495ef556ab..00000000000 --- a/keyboards/inett_studio/sqx/hotswap/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 = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix -AUDIO_ENABLE = no # Audio output - -LTO_ENABLE = yes # Reducing firmware size diff --git a/keyboards/inett_studio/sqx/universal/info.json b/keyboards/inett_studio/sqx/universal/keyboard.json similarity index 98% rename from keyboards/inett_studio/sqx/universal/info.json rename to keyboards/inett_studio/sqx/universal/keyboard.json index d84ad5fc631..d201f391fab 100644 --- a/keyboards/inett_studio/sqx/universal/info.json +++ b/keyboards/inett_studio/sqx/universal/keyboard.json @@ -61,6 +61,19 @@ "twinkle": true } }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "F6", "F5", "E6", "B0", "D2", "D4", "D5", "D3"], "rows": ["F0", "F1", "F4", "B7", "D6"] diff --git a/keyboards/inett_studio/sqx/universal/rules.mk b/keyboards/inett_studio/sqx/universal/rules.mk deleted file mode 100644 index 0b204134803..00000000000 --- a/keyboards/inett_studio/sqx/universal/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 = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix - -LTO_ENABLE = yes # Reducing firmware size diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/keyboard.json similarity index 97% rename from keyboards/jacky_studio/s7_elephant/rev2/info.json rename to keyboards/jacky_studio/s7_elephant/rev2/keyboard.json index e98923fb45b..1a32d95c778 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev2/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0008", "device_version": "0.0.2" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/jacky_studio/s7_elephant/rev2/rules.mk b/keyboards/jacky_studio/s7_elephant/rev2/rules.mk deleted file mode 100644 index cafe30d9293..00000000000 --- a/keyboards/jacky_studio/s7_elephant/rev2/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 -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 diff --git a/keyboards/jagdpietr/drakon/info.json b/keyboards/jagdpietr/drakon/keyboard.json similarity index 96% rename from keyboards/jagdpietr/drakon/info.json rename to keyboards/jagdpietr/drakon/keyboard.json index 0c90ef30c60..bbb945aadf2 100644 --- a/keyboards/jagdpietr/drakon/info.json +++ b/keyboards/jagdpietr/drakon/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x7776", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "oled": true, + "wpm": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C6", "B2", "B3", "B7", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["C7", "B5", "B6", "B0", "B1", "F1"] diff --git a/keyboards/jagdpietr/drakon/rules.mk b/keyboards/jagdpietr/drakon/rules.mk deleted file mode 100644 index d670d935a0d..00000000000 --- a/keyboards/jagdpietr/drakon/rules.mk +++ /dev/null @@ -1,17 +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 = 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 - -LTO_ENABLE = yes -WPM_ENABLE = yes -OLED_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/keyboard.json similarity index 96% rename from keyboards/kbdfans/kbd75rgb/info.json rename to keyboards/kbdfans/kbd75rgb/keyboard.json index ee8d20a90f9..9a5f7a6908e 100644 --- a/keyboards/kbdfans/kbd75rgb/info.json +++ b/keyboards/kbdfans/kbd75rgb/keyboard.json @@ -65,6 +65,18 @@ "max_brightness": 150, "sleep": true }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"], "rows": ["F0", "F1", "B0", "B1", "B2", "C6"] diff --git a/keyboards/kbdfans/kbd75rgb/rules.mk b/keyboards/kbdfans/kbd75rgb/rules.mk deleted file mode 100644 index bc6cd404ccd..00000000000 --- a/keyboards/kbdfans/kbd75rgb/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 = 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 = yes # Use RGB matrix -LTO_ENABLE = yes diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/keyboard.json similarity index 91% rename from keyboards/keebio/bamfk4/info.json rename to keyboards/keebio/bamfk4/keyboard.json index 769f288c512..a132a4bd46f 100644 --- a/keyboards/keebio/bamfk4/info.json +++ b/keyboards/keebio/bamfk4/keyboard.json @@ -75,6 +75,18 @@ "val": 120 } }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["E6", "D5", "B6", "B7"], "rows": ["F0"] diff --git a/keyboards/keebio/bamfk4/rules.mk b/keyboards/keebio/bamfk4/rules.mk deleted file mode 100644 index 73f76344df1..00000000000 --- a/keyboards/keebio/bamfk4/rules.mk +++ /dev/null @@ -1,16 +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 = 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 -ENCODER_ENABLE = no -RGB_MATRIX_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/keebio/wtf60/info.json b/keyboards/keebio/wtf60/keyboard.json similarity index 97% rename from keyboards/keebio/wtf60/info.json rename to keyboards/keebio/wtf60/keyboard.json index 1542c478b20..5ce22cc42e8 100644 --- a/keyboards/keebio/wtf60/info.json +++ b/keyboards/keebio/wtf60/keyboard.json @@ -29,6 +29,17 @@ "ws2812": { "pin": "E6" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "C7", "F7", "B1", "B2", "B3", "D2", "D3", "D5", "D4", "D6", "D7"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/keebio/wtf60/rules.mk b/keyboards/keebio/wtf60/rules.mk deleted file mode 100644 index d34a5e4685a..00000000000 --- a/keyboards/keebio/wtf60/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/keyboard.json similarity index 93% rename from keyboards/keybage/radpad/info.json rename to keyboards/keybage/radpad/keyboard.json index 4ee89e9b184..84407a93103 100644 --- a/keyboards/keybage/radpad/info.json +++ b/keyboards/keybage/radpad/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x5250", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "B4", "D7", "B1"], "rows": ["F5", "B5", "B6", "B2", "B3"] diff --git a/keyboards/keybage/radpad/rules.mk b/keyboards/keybage/radpad/rules.mk deleted file mode 100644 index f1e31ddbdcc..00000000000 --- a/keyboards/keybage/radpad/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/keyquest/enclave/info.json b/keyboards/keyquest/enclave/keyboard.json similarity index 86% rename from keyboards/keyquest/enclave/info.json rename to keyboards/keyquest/enclave/keyboard.json index 6a5ab097fe6..9b2dbb65191 100644 --- a/keyboards/keyquest/enclave/info.json +++ b/keyboards/keyquest/enclave/keyboard.json @@ -28,6 +28,18 @@ "twinkle": true } }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "B7", "C7"], "rows": ["D6", "B6", "F5"] diff --git a/keyboards/keyquest/enclave/rules.mk b/keyboards/keyquest/enclave/rules.mk deleted file mode 100644 index 420c346b6b4..00000000000 --- a/keyboards/keyquest/enclave/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 -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 -LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/keyten/aperture/info.json b/keyboards/keyten/aperture/keyboard.json similarity index 95% rename from keyboards/keyten/aperture/info.json rename to keyboards/keyten/aperture/keyboard.json index 4068d852cde..7648e46cc0c 100644 --- a/keyboards/keyten/aperture/info.json +++ b/keyboards/keyten/aperture/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x6501", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "F0", "F1", "F4", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["D1", "D0", "F7", "F5", "F6"] diff --git a/keyboards/keyten/aperture/rules.mk b/keyboards/keyten/aperture/rules.mk deleted file mode 100644 index d1d32f35d0f..00000000000 --- a/keyboards/keyten/aperture/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 -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 -LTO_ENABLE = yes diff --git a/keyboards/keyten/kt60_m/info.json b/keyboards/keyten/kt60_m/keyboard.json similarity index 95% rename from keyboards/keyten/kt60_m/info.json rename to keyboards/keyten/kt60_m/keyboard.json index ada36466fff..3c3061f0174 100644 --- a/keyboards/keyten/kt60_m/info.json +++ b/keyboards/keyten/kt60_m/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x6001", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "F0", "F1", "F4", "F5", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["C7", "C6", "B6", "F7", "F6"] diff --git a/keyboards/keyten/kt60_m/rules.mk b/keyboards/keyten/kt60_m/rules.mk deleted file mode 100644 index d1d32f35d0f..00000000000 --- a/keyboards/keyten/kt60_m/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 -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 -LTO_ENABLE = yes diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/keyboard.json similarity index 96% rename from keyboards/kprepublic/bm60hsrgb/rev1/info.json rename to keyboards/kprepublic/bm60hsrgb/rev1/keyboard.json index 31527a79fa6..5fe5d210143 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb/rev1/keyboard.json @@ -63,6 +63,18 @@ "rgblight": { "max_brightness": 180 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk deleted file mode 100644 index 4e7e766ddad..00000000000 --- a/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/keyboard.json similarity index 95% rename from keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json rename to keyboards/kprepublic/bm60hsrgb_ec/rev1/keyboard.json index 675d148604c..0a9b283131d 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/keyboard.json @@ -54,6 +54,19 @@ "driver": "ws2812", "max_brightness": 140 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk deleted file mode 100644 index 6cd530668c3..00000000000 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes -LTO_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/keyboard.json similarity index 95% rename from keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json rename to keyboards/kprepublic/bm60hsrgb_ec/rev2/keyboard.json index 3b97f904ab7..09124e03a9f 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/keyboard.json @@ -61,6 +61,20 @@ "animation": "rainbow_mood" } }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["E6", "D2", "D3", "D5", "F6"] diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk deleted file mode 100644 index a4b968313cb..00000000000 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix -ENCODER_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/keyboard.json similarity index 96% rename from keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json rename to keyboards/kprepublic/bm60hsrgb_iso/rev1/keyboard.json index 297c2dc48f0..4cd2c484402 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/keyboard.json @@ -60,6 +60,18 @@ "driver": "ws2812", "max_brightness": 180 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk deleted file mode 100644 index bb8155a9b84..00000000000 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/info.json b/keyboards/kprepublic/bm65hsrgb/rev1/keyboard.json similarity index 94% rename from keyboards/kprepublic/bm65hsrgb/rev1/info.json rename to keyboards/kprepublic/bm65hsrgb/rev1/keyboard.json index 563d90ce32a..fcc2101b01e 100644 --- a/keyboards/kprepublic/bm65hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm65hsrgb/rev1/keyboard.json @@ -14,6 +14,18 @@ "rgb_matrix": { "driver": "ws2812" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk deleted file mode 100644 index 5bdc9f5d4aa..00000000000 --- a/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes -LTO_ENABLE = yes diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keyboard.json similarity index 96% rename from keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/keyboard.json index 8e20dcdbd56..53b132713c9 100644 --- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json +++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keyboard.json @@ -81,6 +81,18 @@ "driver": "ws2812", "max_brightness": 140 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk deleted file mode 100644 index 5bdc9f5d4aa..00000000000 --- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes -LTO_ENABLE = yes diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/keyboard.json similarity index 96% rename from keyboards/kprepublic/bm68hsrgb/rev1/info.json rename to keyboards/kprepublic/bm68hsrgb/rev1/keyboard.json index 838df92b9e3..ca68c78756c 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm68hsrgb/rev1/keyboard.json @@ -60,6 +60,18 @@ "driver": "ws2812", "max_brightness": 180 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk deleted file mode 100644 index 5bdc9f5d4aa..00000000000 --- a/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes -LTO_ENABLE = yes diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/keyboard.json similarity index 95% rename from keyboards/kprepublic/bm68hsrgb/rev2/info.json rename to keyboards/kprepublic/bm68hsrgb/rev2/keyboard.json index 41cb0fc4ee2..7df1af5902e 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev2/info.json +++ b/keyboards/kprepublic/bm68hsrgb/rev2/keyboard.json @@ -67,6 +67,19 @@ "animation": "rainbow_mood" } }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F0", "F1", "B0", "B1", "B2", "B3", "E6", "B7", "D2", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D6", "D4", "D5", "D3", "F6"] diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk deleted file mode 100644 index 0dba15144c3..00000000000 --- a/keyboards/kprepublic/bm68hsrgb/rev2/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 = 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 -RGB_MATRIX_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/kprepublic/bm80hsrgb/info.json b/keyboards/kprepublic/bm80hsrgb/keyboard.json similarity index 96% rename from keyboards/kprepublic/bm80hsrgb/info.json rename to keyboards/kprepublic/bm80hsrgb/keyboard.json index 91fa89ec3bb..5a4d65fbcd5 100644 --- a/keyboards/kprepublic/bm80hsrgb/info.json +++ b/keyboards/kprepublic/bm80hsrgb/keyboard.json @@ -58,6 +58,18 @@ }, "driver": "ws2812" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "D7", "D6", "D4", "D5", "D3", "D2", "F5", "F6", "F7", "D1", "D0", "B4", "B5", "B6"], "rows": ["B3", "B2", "B1", "B0", "C6", "C7"] diff --git a/keyboards/kprepublic/bm80hsrgb/rules.mk b/keyboards/kprepublic/bm80hsrgb/rules.mk deleted file mode 100644 index 5bdc9f5d4aa..00000000000 --- a/keyboards/kprepublic/bm80hsrgb/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes -LTO_ENABLE = yes diff --git a/keyboards/kprepublic/bm80v2/info.json b/keyboards/kprepublic/bm80v2/keyboard.json similarity index 96% rename from keyboards/kprepublic/bm80v2/info.json rename to keyboards/kprepublic/bm80v2/keyboard.json index a8b5f3fd8a2..dd985550bba 100644 --- a/keyboards/kprepublic/bm80v2/info.json +++ b/keyboards/kprepublic/bm80v2/keyboard.json @@ -49,6 +49,18 @@ "max_brightness": 180, "sleep": true }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "D7", "D6", "B7", "B1", "B0", "B2", "B3", "D3", "D5", "D4", "D2", "B4", "B5"], "rows": ["C7", "C6", "B6", "F5", "F7", "F6"] diff --git a/keyboards/kprepublic/bm80v2/rules.mk b/keyboards/kprepublic/bm80v2/rules.mk deleted file mode 100644 index ab9a06f5b25..00000000000 --- a/keyboards/kprepublic/bm80v2/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Light -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 keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix -LTO_ENABLE = yes diff --git a/keyboards/kprepublic/bm80v2_iso/info.json b/keyboards/kprepublic/bm80v2_iso/keyboard.json similarity index 96% rename from keyboards/kprepublic/bm80v2_iso/info.json rename to keyboards/kprepublic/bm80v2_iso/keyboard.json index 3ff78b6c891..46ab7a5e8b9 100644 --- a/keyboards/kprepublic/bm80v2_iso/info.json +++ b/keyboards/kprepublic/bm80v2_iso/keyboard.json @@ -49,6 +49,18 @@ "max_brightness": 180, "sleep": true }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "D7", "D6", "B7", "B1", "B0", "B2", "B3", "D3", "D5", "D4", "D2", "B4", "B5"], "rows": ["C7", "C6", "B6", "F5", "F7", "F6"] diff --git a/keyboards/kprepublic/bm80v2_iso/rules.mk b/keyboards/kprepublic/bm80v2_iso/rules.mk deleted file mode 100644 index e74a388dc0e..00000000000 --- a/keyboards/kprepublic/bm80v2_iso/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes # Use RGB matrix - -LTO_ENABLE = yes diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/keyboard.json similarity index 96% rename from keyboards/kprepublic/bm980hsrgb/info.json rename to keyboards/kprepublic/bm980hsrgb/keyboard.json index 29944ba4743..717a514fe87 100644 --- a/keyboards/kprepublic/bm980hsrgb/info.json +++ b/keyboards/kprepublic/bm980hsrgb/keyboard.json @@ -11,6 +11,18 @@ "rgb_matrix": { "driver": "ws2812" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "E6", "F0", "F1", "F4", "F5", "D6"], "rows": ["D4", "B6", "B5", "B4", "F7", "F6", "D7"] diff --git a/keyboards/kprepublic/bm980hsrgb/rules.mk b/keyboards/kprepublic/bm980hsrgb/rules.mk deleted file mode 100644 index 84a2d5cbe6d..00000000000 --- a/keyboards/kprepublic/bm980hsrgb/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/malevolti/superlyra/rev1/info.json b/keyboards/malevolti/superlyra/rev1/keyboard.json similarity index 96% rename from keyboards/malevolti/superlyra/rev1/info.json rename to keyboards/malevolti/superlyra/rev1/keyboard.json index 989e6baaa75..61ef7c605d9 100644 --- a/keyboards/malevolti/superlyra/rev1/info.json +++ b/keyboards/malevolti/superlyra/rev1/keyboard.json @@ -11,6 +11,17 @@ "tapping": { "term": 100 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], "rows": ["B7", "B3", "B2", "B1", "B0"] diff --git a/keyboards/malevolti/superlyra/rev1/rules.mk b/keyboards/malevolti/superlyra/rev1/rules.mk deleted file mode 100644 index 7087b97cf14..00000000000 --- a/keyboards/malevolti/superlyra/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LTO_ENABLE = yes diff --git a/keyboards/mechanickeys/undead60m/info.json b/keyboards/mechanickeys/undead60m/keyboard.json similarity index 95% rename from keyboards/mechanickeys/undead60m/info.json rename to keyboards/mechanickeys/undead60m/keyboard.json index 4c186431614..7dc27c29ed4 100644 --- a/keyboards/mechanickeys/undead60m/info.json +++ b/keyboards/mechanickeys/undead60m/keyboard.json @@ -27,6 +27,19 @@ "ws2812": { "pin": "F7" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3", "B2"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/mechanickeys/undead60m/rules.mk b/keyboards/mechanickeys/undead60m/rules.mk deleted file mode 100644 index 8af9f7024aa..00000000000 --- a/keyboards/mechanickeys/undead60m/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/mechbrewery/mb65h/info.json b/keyboards/mechbrewery/mb65h/keyboard.json similarity index 95% rename from keyboards/mechbrewery/mb65h/info.json rename to keyboards/mechbrewery/mb65h/keyboard.json index be731e3b0a5..8b4049be4d3 100644 --- a/keyboards/mechbrewery/mb65h/info.json +++ b/keyboards/mechbrewery/mb65h/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D1", "D2", "D3", "D6", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5"], "rows": ["B7", "D0", "F0", "F1", "F4"] diff --git a/keyboards/mechbrewery/mb65h/rules.mk b/keyboards/mechbrewery/mb65h/rules.mk deleted file mode 100644 index ec422af51da..00000000000 --- a/keyboards/mechbrewery/mb65h/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 -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 -LTO_ENABLE = yes diff --git a/keyboards/mechbrewery/mb65s/info.json b/keyboards/mechbrewery/mb65s/keyboard.json similarity index 99% rename from keyboards/mechbrewery/mb65s/info.json rename to keyboards/mechbrewery/mb65s/keyboard.json index b81ce87b211..e043d95860e 100644 --- a/keyboards/mechbrewery/mb65s/info.json +++ b/keyboards/mechbrewery/mb65s/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x3635", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D1", "D2", "D3", "D6", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5"], "rows": ["B7", "D0", "F0", "F1", "F4"] diff --git a/keyboards/mechbrewery/mb65s/rules.mk b/keyboards/mechbrewery/mb65s/rules.mk deleted file mode 100644 index ec422af51da..00000000000 --- a/keyboards/mechbrewery/mb65s/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 -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 -LTO_ENABLE = yes diff --git a/keyboards/melgeek/mach80/rev1/info.json b/keyboards/melgeek/mach80/rev1/info.json deleted file mode 100644 index af9f7c2669b..00000000000 --- a/keyboards/melgeek/mach80/rev1/info.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "matrix_pins": { - "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"], - "rows": ["F0", "F1", "F4", "F5", "F6", "E6"] - }, - "diode_direction": "ROW2COL" -} diff --git a/keyboards/melgeek/mach80/rev1/keyboard.json b/keyboards/melgeek/mach80/rev1/keyboard.json new file mode 100644 index 00000000000..5cb145793db --- /dev/null +++ b/keyboards/melgeek/mach80/rev1/keyboard.json @@ -0,0 +1,19 @@ +{ + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"], + "rows": ["F0", "F1", "F4", "F5", "F6", "E6"] + }, + "diode_direction": "ROW2COL" +} diff --git a/keyboards/melgeek/mach80/rev1/rules.mk b/keyboards/melgeek/mach80/rev1/rules.mk deleted file mode 100755 index e0955f157a1..00000000000 --- a/keyboards/melgeek/mach80/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Use RGB matrix - -LTO_ENABLE = yes diff --git a/keyboards/melgeek/mach80/rev2/info.json b/keyboards/melgeek/mach80/rev2/info.json deleted file mode 100644 index af9f7c2669b..00000000000 --- a/keyboards/melgeek/mach80/rev2/info.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "matrix_pins": { - "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"], - "rows": ["F0", "F1", "F4", "F5", "F6", "E6"] - }, - "diode_direction": "ROW2COL" -} diff --git a/keyboards/melgeek/mach80/rev2/keyboard.json b/keyboards/melgeek/mach80/rev2/keyboard.json new file mode 100644 index 00000000000..5cb145793db --- /dev/null +++ b/keyboards/melgeek/mach80/rev2/keyboard.json @@ -0,0 +1,19 @@ +{ + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"], + "rows": ["F0", "F1", "F4", "F5", "F6", "E6"] + }, + "diode_direction": "ROW2COL" +} diff --git a/keyboards/melgeek/mach80/rev2/rules.mk b/keyboards/melgeek/mach80/rev2/rules.mk deleted file mode 100755 index e0955f157a1..00000000000 --- a/keyboards/melgeek/mach80/rev2/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Use RGB matrix - -LTO_ENABLE = yes diff --git a/keyboards/metamechs/timberwolf/info.json b/keyboards/metamechs/timberwolf/keyboard.json similarity index 99% rename from keyboards/metamechs/timberwolf/info.json rename to keyboards/metamechs/timberwolf/keyboard.json index cb3af4b2096..262022d2d65 100644 --- a/keyboards/metamechs/timberwolf/info.json +++ b/keyboards/metamechs/timberwolf/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x5754", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B2", "D1", "D2", "C7", "F5", "F6", "F7", "F0", "E6"], "rows": ["B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F4", "F1", "B1", "B0"] diff --git a/keyboards/metamechs/timberwolf/rules.mk b/keyboards/metamechs/timberwolf/rules.mk deleted file mode 100644 index 247b4e978a7..00000000000 --- a/keyboards/metamechs/timberwolf/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 = 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 -ENCODER_ENABLE = yes # Enable encoder support -LTO_ENABLE = yes diff --git a/keyboards/mode/m75h/info.json b/keyboards/mode/m75h/keyboard.json similarity index 98% rename from keyboards/mode/m75h/info.json rename to keyboards/mode/m75h/keyboard.json index 8314dbf99d3..5d4d8249e67 100644 --- a/keyboards/mode/m75h/info.json +++ b/keyboards/mode/m75h/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x7572", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C8", "C7", "A10", "B13", "B12", "B10", "B1", "C10", "C11", "D2", "C12", "B3", "B4", "B5", "B8", "B9"], "rows": ["C5", "B0", "B14", "B15", "A8", "C9", "A15"] diff --git a/keyboards/mode/m75h/rules.mk b/keyboards/mode/m75h/rules.mk deleted file mode 100644 index 328eece1f91..00000000000 --- a/keyboards/mode/m75h/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 = 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 -LTO_ENABLE = yes - diff --git a/keyboards/mode/m75s/info.json b/keyboards/mode/m75s/keyboard.json similarity index 99% rename from keyboards/mode/m75s/info.json rename to keyboards/mode/m75s/keyboard.json index df4d1ab451e..aff38dc6224 100644 --- a/keyboards/mode/m75s/info.json +++ b/keyboards/mode/m75s/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x7583", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C8", "A8", "A10", "B13", "B12", "B10", "B1", "C10", "C11", "D2", "C12", "B3", "B4", "B5", "B8", "B9"], "rows": ["C5", "B0", "B14", "B15", "C7", "C9", "A15"] diff --git a/keyboards/mode/m75s/rules.mk b/keyboards/mode/m75s/rules.mk deleted file mode 100644 index 760b9cb9e61..00000000000 --- a/keyboards/mode/m75s/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 = 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 -LTO_ENABLE = yes - diff --git a/keyboards/momokai/tap_duo/info.json b/keyboards/momokai/tap_duo/keyboard.json similarity index 89% rename from keyboards/momokai/tap_duo/info.json rename to keyboards/momokai/tap_duo/keyboard.json index cbf5ce94d7d..f5351dd031f 100644 --- a/keyboards/momokai/tap_duo/info.json +++ b/keyboards/momokai/tap_duo/keyboard.json @@ -47,6 +47,18 @@ "max_brightness": 200, "sleep": true }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["E6", "B2", "D1", "D2", "D3"], "rows": ["E0"] diff --git a/keyboards/momokai/tap_duo/rules.mk b/keyboards/momokai/tap_duo/rules.mk deleted file mode 100644 index bb8155a9b84..00000000000 --- a/keyboards/momokai/tap_duo/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/momokai/tap_trio/info.json b/keyboards/momokai/tap_trio/keyboard.json similarity index 89% rename from keyboards/momokai/tap_trio/info.json rename to keyboards/momokai/tap_trio/keyboard.json index c2ff9a5ff78..f61de25c10e 100644 --- a/keyboards/momokai/tap_trio/info.json +++ b/keyboards/momokai/tap_trio/keyboard.json @@ -47,6 +47,18 @@ "max_brightness": 200, "sleep": true }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["E6", "B2", "B7", "D1", "D2", "D3"], "rows": ["E0"] diff --git a/keyboards/momokai/tap_trio/rules.mk b/keyboards/momokai/tap_trio/rules.mk deleted file mode 100644 index bb8155a9b84..00000000000 --- a/keyboards/momokai/tap_trio/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/monoflex60/info.json b/keyboards/monoflex60/keyboard.json similarity index 98% rename from keyboards/monoflex60/info.json rename to keyboards/monoflex60/keyboard.json index 39c2546bba9..25c19865a61 100644 --- a/keyboards/monoflex60/info.json +++ b/keyboards/monoflex60/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x60EB", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D1", "D0", "D3", "D2", "D5"] diff --git a/keyboards/monoflex60/rules.mk b/keyboards/monoflex60/rules.mk deleted file mode 100644 index d1d32f35d0f..00000000000 --- a/keyboards/monoflex60/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 -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 -LTO_ENABLE = yes diff --git a/keyboards/mt/mt64rgb/info.json b/keyboards/mt/mt64rgb/keyboard.json similarity index 95% rename from keyboards/mt/mt64rgb/info.json rename to keyboards/mt/mt64rgb/keyboard.json index b311502eefe..5dbcf309697 100644 --- a/keyboards/mt/mt64rgb/info.json +++ b/keyboards/mt/mt64rgb/keyboard.json @@ -64,6 +64,19 @@ "led_process_limit": 20, "max_brightness": 160 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"], "rows": ["D7", "D6", "D5", "D3", "D2"] diff --git a/keyboards/mt/mt64rgb/rules.mk b/keyboards/mt/mt64rgb/rules.mk deleted file mode 100644 index f72e92e8a81..00000000000 --- a/keyboards/mt/mt64rgb/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Use RGB matrix - -AUDIO_ENABLE = no # Audio output - -LTO_ENABLE = yes diff --git a/keyboards/mt/mt84/info.json b/keyboards/mt/mt84/keyboard.json similarity index 96% rename from keyboards/mt/mt84/info.json rename to keyboards/mt/mt84/keyboard.json index 7b41b09b57a..8833f77ed98 100644 --- a/keyboards/mt/mt84/info.json +++ b/keyboards/mt/mt84/keyboard.json @@ -61,6 +61,19 @@ "led_process_limit": 20, "max_brightness": 200 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7", "E6"], "rows": ["D7", "D6", "D5", "D3", "D2", "D4"] diff --git a/keyboards/mt/mt84/rules.mk b/keyboards/mt/mt84/rules.mk deleted file mode 100644 index 03f1dd89860..00000000000 --- a/keyboards/mt/mt84/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGB_MATRIX_ENABLE = yes # Use RGB Matrix -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/nightly_boards/adellein/info.json b/keyboards/nightly_boards/adellein/keyboard.json similarity index 93% rename from keyboards/nightly_boards/adellein/info.json rename to keyboards/nightly_boards/adellein/keyboard.json index 192f8005c3c..1a6c7d8a5ca 100644 --- a/keyboards/nightly_boards/adellein/info.json +++ b/keyboards/nightly_boards/adellein/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B7", "B3", "B2", "D0", "D1", "D2", "D3"], "rows": ["B1", "B0", "B5", "B6"] diff --git a/keyboards/nightly_boards/adellein/rules.mk b/keyboards/nightly_boards/adellein/rules.mk deleted file mode 100644 index aa619121b98..00000000000 --- a/keyboards/nightly_boards/adellein/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 -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 -ENCODER_ENABLE = yes # Enable Rotary Encoders -LTO_ENABLE = yes diff --git a/keyboards/nightly_boards/conde60/info.json b/keyboards/nightly_boards/conde60/keyboard.json similarity index 95% rename from keyboards/nightly_boards/conde60/info.json rename to keyboards/nightly_boards/conde60/keyboard.json index acc375ea358..f26c400712b 100644 --- a/keyboards/nightly_boards/conde60/info.json +++ b/keyboards/nightly_boards/conde60/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x0015", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B0", "B3", "B7", "B6", "C6", "C7", "F7", "F6", "F5", "D4", "D6", "D7", "B4", "B5"], "rows": ["B1", "B2", "F0", "F1", "F4"] diff --git a/keyboards/nightly_boards/conde60/rules.mk b/keyboards/nightly_boards/conde60/rules.mk deleted file mode 100644 index 4bbc6892bcb..00000000000 --- a/keyboards/nightly_boards/conde60/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -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 # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/nightly_boards/n60_s/info.json b/keyboards/nightly_boards/n60_s/keyboard.json similarity index 96% rename from keyboards/nightly_boards/n60_s/info.json rename to keyboards/nightly_boards/n60_s/keyboard.json index 46da18996b4..8370ce93b3a 100644 --- a/keyboards/nightly_boards/n60_s/info.json +++ b/keyboards/nightly_boards/n60_s/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "B5", "B6", "C6", "C7"], "rows": ["B4", "D7", "D6", "D0", "E6"] diff --git a/keyboards/nightly_boards/n60_s/rules.mk b/keyboards/nightly_boards/n60_s/rules.mk deleted file mode 100644 index f404ad01632..00000000000 --- a/keyboards/nightly_boards/n60_s/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # 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 # Enable Rotary Encoders -LTO_ENABLE = yes diff --git a/keyboards/nightly_boards/octopad/info.json b/keyboards/nightly_boards/octopad/keyboard.json similarity index 85% rename from keyboards/nightly_boards/octopad/info.json rename to keyboards/nightly_boards/octopad/keyboard.json index 4e7affe4dd4..7649dbefdfa 100644 --- a/keyboards/nightly_boards/octopad/info.json +++ b/keyboards/nightly_boards/octopad/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F0", "D0", "D1", "B1"], "rows": ["B2", "B3"] diff --git a/keyboards/nightly_boards/octopad/rules.mk b/keyboards/nightly_boards/octopad/rules.mk deleted file mode 100644 index 660f9344997..00000000000 --- a/keyboards/nightly_boards/octopad/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -LTO_ENABLE = yes # Link Time Optimization, makes the firmware smaller but some features may not work -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 # Enable Rotary Encoders diff --git a/keyboards/nightly_boards/paraluman/info.json b/keyboards/nightly_boards/paraluman/keyboard.json similarity index 97% rename from keyboards/nightly_boards/paraluman/info.json rename to keyboards/nightly_boards/paraluman/keyboard.json index 10f8514275c..eb5b4014285 100644 --- a/keyboards/nightly_boards/paraluman/info.json +++ b/keyboards/nightly_boards/paraluman/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B2", "F6", "F5", "F4", "F1", "F0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D0", "F7", "B1", "B0", "E6"] diff --git a/keyboards/nightly_boards/paraluman/rules.mk b/keyboards/nightly_boards/paraluman/rules.mk deleted file mode 100644 index 1e3ad1484c6..00000000000 --- a/keyboards/nightly_boards/paraluman/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -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 # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/nix_studio/oxalys80/info.json b/keyboards/nix_studio/oxalys80/keyboard.json similarity index 99% rename from keyboards/nix_studio/oxalys80/info.json rename to keyboards/nix_studio/oxalys80/keyboard.json index fdbabe4991e..9f41d0a210b 100644 --- a/keyboards/nix_studio/oxalys80/info.json +++ b/keyboards/nix_studio/oxalys80/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x3830", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"], "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"] diff --git a/keyboards/nix_studio/oxalys80/rules.mk b/keyboards/nix_studio/oxalys80/rules.mk deleted file mode 100644 index c23f6dab30e..00000000000 --- a/keyboards/nix_studio/oxalys80/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 -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 RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/noxary/260/info.json b/keyboards/noxary/260/keyboard.json similarity index 98% rename from keyboards/noxary/260/info.json rename to keyboards/noxary/260/keyboard.json index d9b1aed2802..bcf1db37041 100644 --- a/keyboards/noxary/260/info.json +++ b/keyboards/noxary/260/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x0A29", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "F4", "E6", "D0", "B4", "D1", "D2", "D3", "D7", "D6", "D4", "F1", "D5"], "rows": ["F7", "F6", "F5", "F0", "B5"] diff --git a/keyboards/noxary/260/rules.mk b/keyboards/noxary/260/rules.mk deleted file mode 100644 index 9aa342e19d3..00000000000 --- a/keyboards/noxary/260/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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # 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 -LTO_ENABLE = yes diff --git a/keyboards/paprikman/albacore/info.json b/keyboards/paprikman/albacore/keyboard.json similarity index 82% rename from keyboards/paprikman/albacore/info.json rename to keyboards/paprikman/albacore/keyboard.json index bee94e84b1e..1ee4b998f7a 100644 --- a/keyboards/paprikman/albacore/info.json +++ b/keyboards/paprikman/albacore/keyboard.json @@ -13,6 +13,18 @@ "max_brightness": 220, "sleep": true }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4"], "rows": ["D5", "C7"] diff --git a/keyboards/paprikman/albacore/rules.mk b/keyboards/paprikman/albacore/rules.mk deleted file mode 100644 index bfe55f19410..00000000000 --- a/keyboards/paprikman/albacore/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -RGB_MATRIX_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/pearlboards/pandora/info.json b/keyboards/pearlboards/pandora/keyboard.json similarity index 99% rename from keyboards/pearlboards/pandora/info.json rename to keyboards/pearlboards/pandora/keyboard.json index 7dbcdf6ff2c..944e696edec 100644 --- a/keyboards/pearlboards/pandora/info.json +++ b/keyboards/pearlboards/pandora/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x6963", "device_version": "0.0.2" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D2", "D1", "D0", "D3", "D5", "B5", "B6", "B7", "D4", "C6", "C7", "F0", "F1", "F4", "F7"], "rows": ["B4", "D7", "D6", "B3", "B0"] diff --git a/keyboards/pearlboards/pandora/rules.mk b/keyboards/pearlboards/pandora/rules.mk deleted file mode 100644 index 2c92da8fedd..00000000000 --- a/keyboards/pearlboards/pandora/rules.mk +++ /dev/null @@ -1,16 +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 -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 -DIP_SWITCH_ENABLE = yes # Enable dip switches -ENCODER_ENABLE = yes # Rotary encoder - -LTO_ENABLE = yes # Link time optimization diff --git a/keyboards/pearlboards/zeuspad/info.json b/keyboards/pearlboards/zeuspad/keyboard.json similarity index 89% rename from keyboards/pearlboards/zeuspad/info.json rename to keyboards/pearlboards/zeuspad/keyboard.json index 9d43e932bf7..641840e4e55 100644 --- a/keyboards/pearlboards/zeuspad/info.json +++ b/keyboards/pearlboards/zeuspad/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x6967", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B0", "F0", "F5", "F6"], "rows": ["D2", "D3", "D5", "F7", "F4", "F1"] diff --git a/keyboards/pearlboards/zeuspad/rules.mk b/keyboards/pearlboards/zeuspad/rules.mk deleted file mode 100644 index a560cb2ea2c..00000000000 --- a/keyboards/pearlboards/zeuspad/rules.mk +++ /dev/null @@ -1,16 +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 -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 -ENCODER_ENABLE = yes # Rotary encoder -OLED_ENABLE = yes # Enable oled - -LTO_ENABLE = yes # Link time optimization diff --git a/keyboards/percent/booster/info.json b/keyboards/percent/booster/keyboard.json similarity index 88% rename from keyboards/percent/booster/info.json rename to keyboards/percent/booster/keyboard.json index 5718cb81c4f..edd9afd18d2 100644 --- a/keyboards/percent/booster/info.json +++ b/keyboards/percent/booster/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x4253", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "D4", "D2", "D0"], "rows": ["D1", "D6", "D7", "B4", "B5"] diff --git a/keyboards/percent/booster/rules.mk b/keyboards/percent/booster/rules.mk deleted file mode 100644 index 74db606881a..00000000000 --- a/keyboards/percent/booster/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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # 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 diff --git a/keyboards/playkbtw/helen80/info.json b/keyboards/playkbtw/helen80/keyboard.json similarity index 96% rename from keyboards/playkbtw/helen80/info.json rename to keyboards/playkbtw/helen80/keyboard.json index 95cbde60106..47f7e48ef69 100644 --- a/keyboards/playkbtw/helen80/info.json +++ b/keyboards/playkbtw/helen80/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x4845", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "D0", "F7", "F6", "F5", "D5", "D3", "D2", "C7", "C6", "B5", "F4", "F1", "B4", "B0"], "rows": ["E6", "B7", "D4", "F0", "D6", "D7"] diff --git a/keyboards/playkbtw/helen80/rules.mk b/keyboards/playkbtw/helen80/rules.mk deleted file mode 100644 index 86bda7a9c00..00000000000 --- a/keyboards/playkbtw/helen80/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - -KEY_LOCK_ENABLE = no diff --git a/keyboards/playkbtw/pk64rgb/info.json b/keyboards/playkbtw/pk64rgb/keyboard.json similarity index 94% rename from keyboards/playkbtw/pk64rgb/info.json rename to keyboards/playkbtw/pk64rgb/keyboard.json index ee2849f14fe..d3a757d714b 100644 --- a/keyboards/playkbtw/pk64rgb/info.json +++ b/keyboards/playkbtw/pk64rgb/keyboard.json @@ -14,6 +14,19 @@ "led_process_limit": 20, "max_brightness": 160 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"], "rows": ["D7", "D6", "D5", "D3", "D2"] diff --git a/keyboards/playkbtw/pk64rgb/rules.mk b/keyboards/playkbtw/pk64rgb/rules.mk deleted file mode 100644 index f199d19d31a..00000000000 --- a/keyboards/playkbtw/pk64rgb/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Use RGB matrix - -AUDIO_ENABLE = no # Audio output - -LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/plut0nium/0x3e/info.json b/keyboards/plut0nium/0x3e/keyboard.json similarity index 93% rename from keyboards/plut0nium/0x3e/info.json rename to keyboards/plut0nium/0x3e/keyboard.json index 97c448f3a73..eb0a4fbe553 100644 --- a/keyboards/plut0nium/0x3e/info.json +++ b/keyboards/plut0nium/0x3e/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x3E01", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D5", "D4", "D6", "D7", "B4", "B5", "B6"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/plut0nium/0x3e/rules.mk b/keyboards/plut0nium/0x3e/rules.mk deleted file mode 100644 index 22590b0ae02..00000000000 --- a/keyboards/plut0nium/0x3e/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -OLED_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/pom_keyboards/tnln95/info.json b/keyboards/pom_keyboards/tnln95/keyboard.json similarity index 97% rename from keyboards/pom_keyboards/tnln95/info.json rename to keyboards/pom_keyboards/tnln95/keyboard.json index 7e055181bd8..8e8de4403df 100644 --- a/keyboards/pom_keyboards/tnln95/info.json +++ b/keyboards/pom_keyboards/tnln95/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x3931", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F1", "F0", "F6", "F7", "D0", "D1", "D2", "D3", "D5"], "rows": ["B6", "B4", "B0", "D7", "E6", "D4", "F5", "D6", "C6", "B5"] diff --git a/keyboards/pom_keyboards/tnln95/rules.mk b/keyboards/pom_keyboards/tnln95/rules.mk deleted file mode 100644 index 96c87dcb1b3..00000000000 --- a/keyboards/pom_keyboards/tnln95/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/preonic/rev1/info.json b/keyboards/preonic/rev1/keyboard.json similarity index 96% rename from keyboards/preonic/rev1/info.json rename to keyboards/preonic/rev1/keyboard.json index e25c41d9b04..aa43fe2c474 100644 --- a/keyboards/preonic/rev1/info.json +++ b/keyboards/preonic/rev1/keyboard.json @@ -6,6 +6,19 @@ "pid": "0x67F3", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D2", "D5", "B5", "B6", "D3"] diff --git a/keyboards/preonic/rev1/rules.mk b/keyboards/preonic/rev1/rules.mk deleted file mode 100644 index 5700acd66cc..00000000000 --- a/keyboards/preonic/rev1/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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -LTO_ENABLE = yes diff --git a/keyboards/preonic/rev2/info.json b/keyboards/preonic/rev2/keyboard.json similarity index 96% rename from keyboards/preonic/rev2/info.json rename to keyboards/preonic/rev2/keyboard.json index 8f644f8f6c3..3a6cab1e17b 100644 --- a/keyboards/preonic/rev2/info.json +++ b/keyboards/preonic/rev2/keyboard.json @@ -6,6 +6,19 @@ "pid": "0x67F3", "device_version": "0.0.2" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "backlight": true, + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D2", "D5", "B5", "B6", "D3"] diff --git a/keyboards/preonic/rev2/rules.mk b/keyboards/preonic/rev2/rules.mk deleted file mode 100644 index 0404fb325ab..00000000000 --- a/keyboards/preonic/rev2/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 = yes # 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 -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -LTO_ENABLE = yes diff --git a/keyboards/prototypist/j01/info.json b/keyboards/prototypist/j01/keyboard.json similarity index 99% rename from keyboards/prototypist/j01/info.json rename to keyboards/prototypist/j01/keyboard.json index 47e3b12bb5f..d6e24dc9e59 100644 --- a/keyboards/prototypist/j01/info.json +++ b/keyboards/prototypist/j01/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x6A31", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B1", "F0", "F7", "F1", "F4", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B3", "B2", "B0", "F6", "F5"] diff --git a/keyboards/prototypist/j01/rules.mk b/keyboards/prototypist/j01/rules.mk deleted file mode 100644 index dc51cbd545d..00000000000 --- a/keyboards/prototypist/j01/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 -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 -LTO_ENABLE = yes diff --git a/keyboards/rpiguy9907/southpaw66/info.json b/keyboards/rpiguy9907/southpaw66/keyboard.json similarity index 95% rename from keyboards/rpiguy9907/southpaw66/info.json rename to keyboards/rpiguy9907/southpaw66/keyboard.json index 6c90980e7c5..78a513e3677 100644 --- a/keyboards/rpiguy9907/southpaw66/info.json +++ b/keyboards/rpiguy9907/southpaw66/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x5366", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D7", "C6", "D4", "D0", "D1", "D2", "D3"] diff --git a/keyboards/rpiguy9907/southpaw66/rules.mk b/keyboards/rpiguy9907/southpaw66/rules.mk deleted file mode 100644 index f5b61e673cf..00000000000 --- a/keyboards/rpiguy9907/southpaw66/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/s_ol/0xc_pad/info.json b/keyboards/s_ol/0xc_pad/keyboard.json similarity index 88% rename from keyboards/s_ol/0xc_pad/info.json rename to keyboards/s_ol/0xc_pad/keyboard.json index a4809b9c7cf..4eb4bd9055c 100644 --- a/keyboards/s_ol/0xc_pad/info.json +++ b/keyboards/s_ol/0xc_pad/keyboard.json @@ -2,6 +2,18 @@ "keyboard_name": "0xC.pad", "url": "https://s-ol.nu/0xC.pad", "diode_direction": "ROW2COL", + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "rows": ["B7", "B6", "B5", "B4"], "cols": ["D4", "D3", "D2", "D1"] diff --git a/keyboards/s_ol/0xc_pad/rules.mk b/keyboards/s_ol/0xc_pad/rules.mk deleted file mode 100644 index 972d696cecf..00000000000 --- a/keyboards/s_ol/0xc_pad/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/sanctified/dystopia/info.json b/keyboards/sanctified/dystopia/keyboard.json similarity index 95% rename from keyboards/sanctified/dystopia/info.json rename to keyboards/sanctified/dystopia/keyboard.json index 1c6fa25e0c4..1911081fc2c 100644 --- a/keyboards/sanctified/dystopia/info.json +++ b/keyboards/sanctified/dystopia/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "D4", "D6", "D7", "B4"], "rows": ["B2", "B3", "E6", "D5", "D3"] diff --git a/keyboards/sanctified/dystopia/rules.mk b/keyboards/sanctified/dystopia/rules.mk deleted file mode 100644 index 8b4206fb269..00000000000 --- a/keyboards/sanctified/dystopia/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes # Enable link time optimization diff --git a/keyboards/smithrune/iron180/info.json b/keyboards/smithrune/iron180/keyboard.json similarity index 99% rename from keyboards/smithrune/iron180/info.json rename to keyboards/smithrune/iron180/keyboard.json index 4707f326646..0a7367649a1 100644 --- a/keyboards/smithrune/iron180/info.json +++ b/keyboards/smithrune/iron180/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1180", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "B6", "B5", "B4", "B3", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B2", "A4", "B1", "A3"], "rows": ["B9", "B8", "A15", "B0", "A7", "A5"] diff --git a/keyboards/smithrune/iron180/rules.mk b/keyboards/smithrune/iron180/rules.mk deleted file mode 100644 index bfb4a63764f..00000000000 --- a/keyboards/smithrune/iron180/rules.mk +++ /dev/null @@ -1,15 +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 = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no -LTO_ENABLE = no - diff --git a/keyboards/soup10/info.json b/keyboards/soup10/keyboard.json similarity index 83% rename from keyboards/soup10/info.json rename to keyboards/soup10/keyboard.json index 7c22c087daa..b2ec4968e09 100644 --- a/keyboards/soup10/info.json +++ b/keyboards/soup10/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "E6", "B4"], "rows": ["D1", "D0", "D4", "C6"] diff --git a/keyboards/soup10/rules.mk b/keyboards/soup10/rules.mk deleted file mode 100644 index c8f5447c696..00000000000 --- a/keyboards/soup10/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/spaceholdings/nebula12b/info.json b/keyboards/spaceholdings/nebula12b/keyboard.json similarity index 92% rename from keyboards/spaceholdings/nebula12b/info.json rename to keyboards/spaceholdings/nebula12b/keyboard.json index d6e02d1b973..961e971885a 100755 --- a/keyboards/spaceholdings/nebula12b/info.json +++ b/keyboards/spaceholdings/nebula12b/keyboard.json @@ -60,6 +60,18 @@ "driver": "ws2812", "sleep": true }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F4", "F5", "D7"], "rows": ["B7", "B4", "F7", "F6"] diff --git a/keyboards/spaceholdings/nebula12b/rules.mk b/keyboards/spaceholdings/nebula12b/rules.mk deleted file mode 100755 index f89d2a5f9bb..00000000000 --- a/keyboards/spaceholdings/nebula12b/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes # Enable Per-key RGB - -LTO_ENABLE = yes diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/keyboard.json similarity index 97% rename from keyboards/spaceholdings/nebula68b/info.json rename to keyboards/spaceholdings/nebula68b/keyboard.json index 61514668948..3be1f806391 100755 --- a/keyboards/spaceholdings/nebula68b/info.json +++ b/keyboards/spaceholdings/nebula68b/keyboard.json @@ -61,6 +61,18 @@ "max_brightness": 130, "sleep": true }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D4", "D6", "D7", "B4", "E6"] diff --git a/keyboards/spaceholdings/nebula68b/rules.mk b/keyboards/spaceholdings/nebula68b/rules.mk deleted file mode 100755 index f89d2a5f9bb..00000000000 --- a/keyboards/spaceholdings/nebula68b/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes # Enable Per-key RGB - -LTO_ENABLE = yes diff --git a/keyboards/star75/info.json b/keyboards/star75/keyboard.json similarity index 95% rename from keyboards/star75/info.json rename to keyboards/star75/keyboard.json index b42341ad30c..5abd5a57b93 100644 --- a/keyboards/star75/info.json +++ b/keyboards/star75/keyboard.json @@ -29,6 +29,19 @@ "twinkle": true } }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["B7", "D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/star75/rules.mk b/keyboards/star75/rules.mk deleted file mode 100644 index ca8435743ff..00000000000 --- a/keyboards/star75/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -LTO_ENABLE = yes - - diff --git a/keyboards/superuser/ext/info.json b/keyboards/superuser/ext/keyboard.json similarity index 99% rename from keyboards/superuser/ext/info.json rename to keyboards/superuser/ext/keyboard.json index fd932a92d4d..c08213a13f1 100644 --- a/keyboards/superuser/ext/info.json +++ b/keyboards/superuser/ext/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x4558", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B2", "B1", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/superuser/ext/rules.mk b/keyboards/superuser/ext/rules.mk deleted file mode 100644 index 58cb1ddd550..00000000000 --- a/keyboards/superuser/ext/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 -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 -LTO_ENABLE = yes diff --git a/keyboards/superuser/frl/info.json b/keyboards/superuser/frl/keyboard.json similarity index 95% rename from keyboards/superuser/frl/info.json rename to keyboards/superuser/frl/keyboard.json index b4b31d04d8b..4ede02d20de 100644 --- a/keyboards/superuser/frl/info.json +++ b/keyboards/superuser/frl/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x4652", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/superuser/frl/rules.mk b/keyboards/superuser/frl/rules.mk deleted file mode 100644 index 58cb1ddd550..00000000000 --- a/keyboards/superuser/frl/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 -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 -LTO_ENABLE = yes diff --git a/keyboards/superuser/tkl/info.json b/keyboards/superuser/tkl/keyboard.json similarity index 99% rename from keyboards/superuser/tkl/info.json rename to keyboards/superuser/tkl/keyboard.json index d4bbcf2bf7c..79df5bac092 100644 --- a/keyboards/superuser/tkl/info.json +++ b/keyboards/superuser/tkl/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x544B", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"], "rows": ["B2", "D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/superuser/tkl/rules.mk b/keyboards/superuser/tkl/rules.mk deleted file mode 100644 index 58cb1ddd550..00000000000 --- a/keyboards/superuser/tkl/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 -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 -LTO_ENABLE = yes diff --git a/keyboards/tetris/info.json b/keyboards/tetris/keyboard.json similarity index 93% rename from keyboards/tetris/info.json rename to keyboards/tetris/keyboard.json index 16e9369996d..01df052ba60 100644 --- a/keyboards/tetris/info.json +++ b/keyboards/tetris/keyboard.json @@ -29,6 +29,20 @@ "ws2812": { "pin": "F5" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D7", "B4", "B6", "C6", "C7", "F6", "F7", "D4", "D2", "D3", "D5", "D6"], "rows": ["B3", "B2", "B1", "B0", "E6"] diff --git a/keyboards/tetris/rules.mk b/keyboards/tetris/rules.mk deleted file mode 100755 index 60057f2aa70..00000000000 --- a/keyboards/tetris/rules.mk +++ /dev/null @@ -1,14 +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 -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 = yes -RGBLIGHT_ENABLE = yes -LTO_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/tg4x/info.json b/keyboards/tg4x/keyboard.json similarity index 93% rename from keyboards/tg4x/info.json rename to keyboards/tg4x/keyboard.json index 6931f3565f4..d108774dfd3 100644 --- a/keyboards/tg4x/info.json +++ b/keyboards/tg4x/keyboard.json @@ -29,6 +29,18 @@ "ws2812": { "pin": "D2" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D3", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"] diff --git a/keyboards/tg4x/rules.mk b/keyboards/tg4x/rules.mk deleted file mode 100644 index dcad20d05ad..00000000000 --- a/keyboards/tg4x/rules.mk +++ /dev/null @@ -1,14 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LTO_ENABLE = yes diff --git a/keyboards/tkc/candybar/lefty/info.json b/keyboards/tkc/candybar/lefty/keyboard.json similarity index 94% rename from keyboards/tkc/candybar/lefty/info.json rename to keyboards/tkc/candybar/lefty/keyboard.json index d1258fafad2..fe8814e54bb 100644 --- a/keyboards/tkc/candybar/lefty/info.json +++ b/keyboards/tkc/candybar/lefty/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0003", "device_version": "0.0.6" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15"], "rows": ["A8", "A9", "A10", "A13"] diff --git a/keyboards/tkc/candybar/lefty/rules.mk b/keyboards/tkc/candybar/lefty/rules.mk deleted file mode 100644 index 51c822797aa..00000000000 --- a/keyboards/tkc/candybar/lefty/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -LTO_ENABLE = yes -BACKLIGHT_ENABLE = no -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 -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no - - diff --git a/keyboards/tkc/candybar/lefty_r3/info.json b/keyboards/tkc/candybar/lefty_r3/keyboard.json similarity index 94% rename from keyboards/tkc/candybar/lefty_r3/info.json rename to keyboards/tkc/candybar/lefty_r3/keyboard.json index 77b991a8dc6..b09412ffc9d 100644 --- a/keyboards/tkc/candybar/lefty_r3/info.json +++ b/keyboards/tkc/candybar/lefty_r3/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0003", "device_version": "0.0.6" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "D5", "B3", "B0", "B1", "B2", "D4", "D6", "D7", "B4"], "rows": ["F1", "F0", "D0", "D2"] diff --git a/keyboards/tkc/candybar/lefty_r3/rules.mk b/keyboards/tkc/candybar/lefty_r3/rules.mk deleted file mode 100644 index 92e817504f9..00000000000 --- a/keyboards/tkc/candybar/lefty_r3/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/tkc/candybar/righty/info.json b/keyboards/tkc/candybar/righty/keyboard.json similarity index 94% rename from keyboards/tkc/candybar/righty/info.json rename to keyboards/tkc/candybar/righty/keyboard.json index 9cfb7d884b1..f529ac936f2 100644 --- a/keyboards/tkc/candybar/righty/info.json +++ b/keyboards/tkc/candybar/righty/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0002", "device_version": "0.0.6" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15"], "rows": ["A8", "A9", "A10", "A13"] diff --git a/keyboards/tkc/candybar/righty/rules.mk b/keyboards/tkc/candybar/righty/rules.mk deleted file mode 100644 index 51c822797aa..00000000000 --- a/keyboards/tkc/candybar/righty/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -LTO_ENABLE = yes -BACKLIGHT_ENABLE = no -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 -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no - - diff --git a/keyboards/tkc/candybar/righty_r3/info.json b/keyboards/tkc/candybar/righty_r3/keyboard.json similarity index 94% rename from keyboards/tkc/candybar/righty_r3/info.json rename to keyboards/tkc/candybar/righty_r3/keyboard.json index 8fb72e16351..80646725839 100644 --- a/keyboards/tkc/candybar/righty_r3/info.json +++ b/keyboards/tkc/candybar/righty_r3/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0002", "device_version": "0.0.6" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D5", "B1", "B3", "B2", "B0", "F0", "F1", "F4", "F5"], "rows": ["F6", "F7", "D0", "D2"] diff --git a/keyboards/tkc/candybar/righty_r3/rules.mk b/keyboards/tkc/candybar/righty_r3/rules.mk deleted file mode 100644 index 92e817504f9..00000000000 --- a/keyboards/tkc/candybar/righty_r3/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/tkc/osav2/info.json b/keyboards/tkc/osav2/keyboard.json similarity index 98% rename from keyboards/tkc/osav2/info.json rename to keyboards/tkc/osav2/keyboard.json index cc878e14f48..118eedfc850 100644 --- a/keyboards/tkc/osav2/info.json +++ b/keyboards/tkc/osav2/keyboard.json @@ -27,6 +27,19 @@ "ws2812": { "pin": "D4" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "D7", "D5", "D3", "D2", "D0", "D1", "B5"], "rows": ["F0", "F1", "F4", "F5", "F6", "B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/tkc/osav2/rules.mk b/keyboards/tkc/osav2/rules.mk deleted file mode 100644 index e98264035d1..00000000000 --- a/keyboards/tkc/osav2/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # 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 # Reduces compile size diff --git a/keyboards/tkc/portico68v2/info.json b/keyboards/tkc/portico68v2/keyboard.json similarity index 96% rename from keyboards/tkc/portico68v2/info.json rename to keyboards/tkc/portico68v2/keyboard.json index 38a94c2c9d0..914dee8760a 100644 --- a/keyboards/tkc/portico68v2/info.json +++ b/keyboards/tkc/portico68v2/keyboard.json @@ -57,6 +57,18 @@ "max_brightness": 175, "sleep": true }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"], "rows": ["B6", "C6", "C7", "F7", "D2"] diff --git a/keyboards/tkc/portico68v2/rules.mk b/keyboards/tkc/portico68v2/rules.mk deleted file mode 100644 index 82b94419c12..00000000000 --- a/keyboards/tkc/portico68v2/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 -LTO_ENABLE = yes # Compile-time optimizations -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/toffee_studio/blueberry/info.json b/keyboards/toffee_studio/blueberry/keyboard.json similarity index 95% rename from keyboards/toffee_studio/blueberry/info.json rename to keyboards/toffee_studio/blueberry/keyboard.json index 3f94299b783..45dda172b63 100644 --- a/keyboards/toffee_studio/blueberry/info.json +++ b/keyboards/toffee_studio/blueberry/keyboard.json @@ -26,6 +26,18 @@ "alternating": true } }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B6", "D4", "D6", "D7", "B4", "B5", "C6", "C7"], "rows": ["E6", "B0", "B1", "F6", "F5", "F1", "F7", "F0", "F4"] diff --git a/keyboards/toffee_studio/blueberry/rules.mk b/keyboards/toffee_studio/blueberry/rules.mk deleted file mode 100644 index c68e70d5bac..00000000000 --- a/keyboards/toffee_studio/blueberry/rules.mk +++ /dev/null @@ -1,14 +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 -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 - -LTO_ENABLE = yes diff --git a/keyboards/treasure/type9s2/info.json b/keyboards/treasure/type9s2/keyboard.json similarity index 81% rename from keyboards/treasure/type9s2/info.json rename to keyboards/treasure/type9s2/keyboard.json index 71264940d0b..94cc0dec958 100644 --- a/keyboards/treasure/type9s2/info.json +++ b/keyboards/treasure/type9s2/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x5492", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B2", "B3", "C5"], "rows": ["B4", "B5", "D2"] diff --git a/keyboards/treasure/type9s2/rules.mk b/keyboards/treasure/type9s2/rules.mk deleted file mode 100644 index 7dc6feef9d7..00000000000 --- a/keyboards/treasure/type9s2/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/tszaboo/ortho4exent/info.json b/keyboards/tszaboo/ortho4exent/keyboard.json similarity index 95% rename from keyboards/tszaboo/ortho4exent/info.json rename to keyboards/tszaboo/ortho4exent/keyboard.json index 492ae6516fa..8aa0a34cd7a 100644 --- a/keyboards/tszaboo/ortho4exent/info.json +++ b/keyboards/tszaboo/ortho4exent/keyboard.json @@ -29,6 +29,18 @@ "ws2812": { "pin": "B6" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D6", "D5", "D3", "D2", "D1", "B7", "B3", "B2"], "rows": ["B0", "B1", "D4", "D7", "B4"] diff --git a/keyboards/tszaboo/ortho4exent/rules.mk b/keyboards/tszaboo/ortho4exent/rules.mk deleted file mode 100644 index e7aeda848fe..00000000000 --- a/keyboards/tszaboo/ortho4exent/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 -LTO_ENABLE = yes diff --git a/keyboards/v60_type_r/info.json b/keyboards/v60_type_r/keyboard.json similarity index 97% rename from keyboards/v60_type_r/info.json rename to keyboards/v60_type_r/keyboard.json index 43a3d9472c3..a9c01dc7501 100644 --- a/keyboards/v60_type_r/info.json +++ b/keyboards/v60_type_r/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x0658", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/v60_type_r/rules.mk b/keyboards/v60_type_r/rules.mk deleted file mode 100644 index a7f2bc70267..00000000000 --- a/keyboards/v60_type_r/rules.mk +++ /dev/null @@ -1,14 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable the RGB Underglow -AUDIO_ENABLE = no # Audio output - -LTO_ENABLE = yes diff --git a/keyboards/viendi8l/info.json b/keyboards/viendi8l/keyboard.json similarity index 99% rename from keyboards/viendi8l/info.json rename to keyboards/viendi8l/keyboard.json index 29dbd5b25aa..4a7ac1b5acb 100644 --- a/keyboards/viendi8l/info.json +++ b/keyboards/viendi8l/keyboard.json @@ -18,6 +18,16 @@ "pin": "B15", "driver": "pwm" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C6", "C7", "C8", "C9", "A8", "B3", "B4", "A10", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"], "rows": ["C3", "C2", "C1", "C0", "B14", "A7"] diff --git a/keyboards/viendi8l/rules.mk b/keyboards/viendi8l/rules.mk deleted file mode 100644 index b269d5da350..00000000000 --- a/keyboards/viendi8l/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = no diff --git a/keyboards/woodkeys/scarletbandana/info.json b/keyboards/woodkeys/scarletbandana/keyboard.json similarity index 98% rename from keyboards/woodkeys/scarletbandana/info.json rename to keyboards/woodkeys/scarletbandana/keyboard.json index b3197a7c1b9..f6c4342efaf 100644 --- a/keyboards/woodkeys/scarletbandana/info.json +++ b/keyboards/woodkeys/scarletbandana/keyboard.json @@ -26,6 +26,19 @@ "ws2812": { "pin": "D3" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B2", "B3", "B7", "B1", "F5", "F4", "F6", "F7", "B0", "F0", "F1", "D0", "D1", "D2", "D5", "B6", "C7"], "rows": ["D4", "D6", "D7", "B4", "B5"] diff --git a/keyboards/woodkeys/scarletbandana/rules.mk b/keyboards/woodkeys/scarletbandana/rules.mk deleted file mode 100644 index 3e736b56e5c..00000000000 --- a/keyboards/woodkeys/scarletbandana/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -LTO_ENABLE = yes diff --git a/keyboards/xelus/akis/info.json b/keyboards/xelus/akis/keyboard.json similarity index 99% rename from keyboards/xelus/akis/info.json rename to keyboards/xelus/akis/keyboard.json index b5b082a37ac..5163b414c41 100644 --- a/keyboards/xelus/akis/info.json +++ b/keyboards/xelus/akis/keyboard.json @@ -26,6 +26,18 @@ "ws2812": { "pin": "B0" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "F6", "F7", "C7", "C6", "B6", "B5"], "rows": ["F5", "F4", "F1", "F0", "E6"] diff --git a/keyboards/xelus/akis/rules.mk b/keyboards/xelus/akis/rules.mk deleted file mode 100644 index 6160e71935c..00000000000 --- a/keyboards/xelus/akis/rules.mk +++ /dev/null @@ -1,14 +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 = 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 - -LTO_ENABLE = yes diff --git a/keyboards/xelus/valor/rev1/info.json b/keyboards/xelus/valor/rev1/keyboard.json similarity index 97% rename from keyboards/xelus/valor/rev1/info.json rename to keyboards/xelus/valor/rev1/keyboard.json index a07e426978e..5b5695f34b5 100644 --- a/keyboards/xelus/valor/rev1/info.json +++ b/keyboards/xelus/valor/rev1/keyboard.json @@ -27,6 +27,18 @@ "twinkle": true } }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["B1", "B2", "C7", "C6", "B6"] diff --git a/keyboards/xelus/valor/rev1/rules.mk b/keyboards/xelus/valor/rev1/rules.mk deleted file mode 100644 index 2617d3d629c..00000000000 --- a/keyboards/xelus/valor/rev1/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 -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 -LTO_ENABLE = yes diff --git a/keyboards/zigotica/z12/info.json b/keyboards/zigotica/z12/keyboard.json similarity index 84% rename from keyboards/zigotica/z12/info.json rename to keyboards/zigotica/z12/keyboard.json index 8a88206df8b..d9791d9c5ef 100644 --- a/keyboards/zigotica/z12/info.json +++ b/keyboards/zigotica/z12/keyboard.json @@ -16,6 +16,19 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true + }, "matrix_pins": { "direct": [ [null, "E6", "C6", null], diff --git a/keyboards/zigotica/z12/rules.mk b/keyboards/zigotica/z12/rules.mk deleted file mode 100644 index 102b2e62a3c..00000000000 --- a/keyboards/zigotica/z12/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# 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 -ENCODER_ENABLE = yes # Enables the use of encoders -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 -LTO_ENABLE = yes # Enables Link Time Optimization (LTO) which reduces the compiled size -OLED_ENABLE = yes # Enables the use of OLED displays diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 99ac254e27c..71bb6e9454c 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -384,6 +384,12 @@ def _extract_encoders(info_data, config_c): info_data['encoder']['rotary'] = encoders + # TODO: some logic still assumes ENCODER_ENABLED would partially create encoder dict + if info_data.get('features', {}).get('encoder', False): + if 'encoder' not in info_data: + info_data['encoder'] = {} + info_data['encoder']['enabled'] = True + def _extract_split_encoders(info_data, config_c): """Populate data about split encoder pins From 1c8e99ca451a9f0acac07b64da80cf11baedf6a6 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 30 Mar 2024 10:57:30 +0000 Subject: [PATCH 077/333] Migrate features and LTO from rules.mk to data driven (#23307) --- keyboards/1upkeyboards/sweet16/info.json | 8 ++++++++ keyboards/1upkeyboards/sweet16/rules.mk | 10 ---------- keyboards/40percentclub/i75/info.json | 8 ++++++++ keyboards/40percentclub/i75/rules.mk | 13 ------------- keyboards/40percentclub/polyandry/info.json | 8 ++++++++ keyboards/40percentclub/polyandry/rules.mk | 13 ------------- keyboards/8pack/info.json | 10 ++++++++++ keyboards/8pack/rules.mk | 14 -------------- keyboards/atreus/info.json | 9 +++++++++ keyboards/atreus/rules.mk | 14 -------------- keyboards/bear_face/info.json | 9 +++++++++ keyboards/bear_face/rules.mk | 13 ------------- keyboards/bpiphany/pegasushoof/info.json | 8 ++++++++ keyboards/bpiphany/pegasushoof/rules.mk | 13 ------------- keyboards/bt66tech/bt66tech60/info.json | 11 +++++++++++ keyboards/bt66tech/bt66tech60/rules.mk | 15 --------------- keyboards/cannonkeys/practice60/info.json | 11 +++++++++++ keyboards/cannonkeys/practice60/rules.mk | 15 --------------- keyboards/dailycraft/bat43/info.json | 8 ++++++++ keyboards/dailycraft/bat43/rules.mk | 13 ------------- keyboards/delikeeb/vanana/info.json | 9 +++++++++ keyboards/delikeeb/vanana/rules.mk | 16 ---------------- keyboards/delikeeb/waaffle/rev3/info.json | 8 ++++++++ keyboards/delikeeb/waaffle/rev3/rules.mk | 13 ------------- keyboards/drhigsby/ogurec/info.json | 8 ++++++++ keyboards/drhigsby/ogurec/rules.mk | 12 ------------ keyboards/eco/info.json | 10 ++++++++++ keyboards/eco/rules.mk | 14 -------------- keyboards/eek/info.json | 8 ++++++++ keyboards/eek/rules.mk | 12 ------------ keyboards/handwired/ck4x4/info.json | 8 ++++++++ keyboards/handwired/ck4x4/rules.mk | 12 ------------ keyboards/handwired/ms_sculpt_mobile/info.json | 8 ++++++++ keyboards/handwired/ms_sculpt_mobile/rules.mk | 13 ------------- keyboards/handwired/pill60/info.json | 10 ++++++++++ keyboards/handwired/pill60/rules.mk | 15 --------------- keyboards/handwired/sono1/info.json | 8 ++++++++ keyboards/handwired/sono1/rules.mk | 13 ------------- keyboards/input_club/infinity60/info.json | 8 ++++++++ keyboards/input_club/infinity60/rules.mk | 14 -------------- keyboards/jadookb/jkb65/info.json | 12 ++++++++++++ keyboards/jadookb/jkb65/rules.mk | 15 --------------- keyboards/kakunpc/angel17/info.json | 8 ++++++++ keyboards/kakunpc/angel17/rules.mk | 13 ------------- keyboards/kapcave/paladinpad/info.json | 9 +++++++++ keyboards/kapcave/paladinpad/rules.mk | 13 ------------- keyboards/keycapsss/plaid_pad/info.json | 8 ++++++++ keyboards/keycapsss/plaid_pad/rules.mk | 13 ------------- keyboards/kin80/info.json | 8 ++++++++ keyboards/kin80/rules.mk | 13 ------------- keyboards/kumaokobo/kudox_game/info.json | 8 ++++++++ keyboards/kumaokobo/kudox_game/rules.mk | 13 ------------- keyboards/lfkeyboards/lfk87/info.json | 9 +++++++++ keyboards/lfkeyboards/lfk87/rules.mk | 13 ------------- keyboards/lfkeyboards/smk65/info.json | 8 ++++++++ keyboards/lfkeyboards/smk65/rules.mk | 13 ------------- .../maple_computing/christmas_tree/info.json | 9 +++++++++ .../maple_computing/christmas_tree/rules.mk | 13 ------------- keyboards/marksard/treadstone32/info.json | 8 ++++++++ keyboards/marksard/treadstone32/rules.mk | 14 -------------- keyboards/maxipad/info.json | 8 ++++++++ keyboards/maxipad/rules.mk | 13 ------------- keyboards/mechllama/g35/info.json | 10 ++++++++++ keyboards/mechllama/g35/rules.mk | 4 ---- keyboards/mechlovin/adelais/info.json | 8 ++++++++ keyboards/mechlovin/adelais/rules.mk | 11 ----------- .../adelais/standard_led/arm/rev4/info.json | 9 +++++++++ .../adelais/standard_led/arm/rev4/rules.mk | 2 -- keyboards/mechlovin/delphine/info.json | 8 ++++++++ keyboards/mechlovin/delphine/rules.mk | 13 ------------- keyboards/mechlovin/hannah65/info.json | 9 +++++++++ keyboards/mechlovin/hannah65/rules.mk | 13 ------------- keyboards/mechlovin/infinity87/rev1/info.json | 9 +++++++++ keyboards/mechlovin/infinity87/rev1/rules.mk | 2 -- keyboards/mechlovin/mechlovin9/info.json | 8 ++++++++ keyboards/mechlovin/mechlovin9/rules.mk | 14 +------------- keyboards/mechwild/obe/info.json | 10 ++++++++++ keyboards/mechwild/obe/rules.mk | 14 -------------- keyboards/mechwild/waka60/info.json | 10 ++++++++++ keyboards/mechwild/waka60/rules.mk | 14 -------------- keyboards/peej/tripel/info.json | 8 ++++++++ keyboards/peej/tripel/rules.mk | 13 ------------- keyboards/primekb/meridian/info.json | 9 +++++++++ keyboards/primekb/meridian/rules.mk | 13 ------------- keyboards/primekb/prime_e/info.json | 8 ++++++++ keyboards/primekb/prime_e/rules.mk | 11 ----------- keyboards/primekb/prime_l/info.json | 8 ++++++++ keyboards/primekb/prime_l/rules.mk | 13 ------------- keyboards/rmi_kb/tkl_ff/info.json | 8 ++++++++ keyboards/rmi_kb/tkl_ff/rules.mk | 13 ------------- keyboards/smoll/lefty/info.json | 12 ++++++++++++ keyboards/smoll/lefty/rules.mk | 16 ---------------- keyboards/takashiski/namecard2x4/info.json | 8 ++++++++ keyboards/takashiski/namecard2x4/rules.mk | 14 -------------- keyboards/vertex/arc60/info.json | 9 +++++++++ keyboards/vertex/arc60/rules.mk | 18 ------------------ keyboards/vitamins_included/info.json | 13 +++++++++++++ keyboards/vitamins_included/rules.mk | 16 ---------------- keyboards/ymdk/yd60mq/info.json | 10 ++++++++++ keyboards/ymdk/yd60mq/rules.mk | 13 ------------- 100 files changed, 445 insertions(+), 639 deletions(-) diff --git a/keyboards/1upkeyboards/sweet16/info.json b/keyboards/1upkeyboards/sweet16/info.json index ac9d944969c..5fb70bb8e9c 100644 --- a/keyboards/1upkeyboards/sweet16/info.json +++ b/keyboards/1upkeyboards/sweet16/info.json @@ -3,6 +3,14 @@ "manufacturer": "1up Keyboards", "url": "", "maintainer": "skullydazed", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "usb": { "vid": "0x6F75" }, diff --git a/keyboards/1upkeyboards/sweet16/rules.mk b/keyboards/1upkeyboards/sweet16/rules.mk index e5e771f0516..7d269ac93f5 100644 --- a/keyboards/1upkeyboards/sweet16/rules.mk +++ b/keyboards/1upkeyboards/sweet16/rules.mk @@ -1,11 +1 @@ -# Build Options -# DEFAULT_FOLDER = 1upkeyboards/sweet16/v1 -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 = yes # Enable N-Key Rollover -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no diff --git a/keyboards/40percentclub/i75/info.json b/keyboards/40percentclub/i75/info.json index 8661257d6b7..f91b054f296 100644 --- a/keyboards/40percentclub/i75/info.json +++ b/keyboards/40percentclub/i75/info.json @@ -3,6 +3,14 @@ "manufacturer": "di0ib", "url": "", "maintainer": "qmk", + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "usb": { "vid": "0x4025", "pid": "0x0A0C", diff --git a/keyboards/40percentclub/i75/rules.mk b/keyboards/40percentclub/i75/rules.mk index fc3d70f756f..48b04275501 100644 --- a/keyboards/40percentclub/i75/rules.mk +++ b/keyboards/40percentclub/i75/rules.mk @@ -1,14 +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 = 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 - DEFAULT_FOLDER = 40percentclub/i75/promicro diff --git a/keyboards/40percentclub/polyandry/info.json b/keyboards/40percentclub/polyandry/info.json index 63420adf868..b04b0500450 100644 --- a/keyboards/40percentclub/polyandry/info.json +++ b/keyboards/40percentclub/polyandry/info.json @@ -3,6 +3,14 @@ "manufacturer": "di0ib", "url": "", "maintainer": "QMK", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "usb": { "vid": "0x4025", "pid": "0x6060", diff --git a/keyboards/40percentclub/polyandry/rules.mk b/keyboards/40percentclub/polyandry/rules.mk index 039076f59e3..3064c8202cb 100644 --- a/keyboards/40percentclub/polyandry/rules.mk +++ b/keyboards/40percentclub/polyandry/rules.mk @@ -1,14 +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 - DEFAULT_FOLDER = 40percentclub/polyandry/promicro diff --git a/keyboards/8pack/info.json b/keyboards/8pack/info.json index 0145eef5e3a..cf55db98153 100644 --- a/keyboards/8pack/info.json +++ b/keyboards/8pack/info.json @@ -32,6 +32,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "direct": [ ["F4", "F5", "F6", "F7"], diff --git a/keyboards/8pack/rules.mk b/keyboards/8pack/rules.mk index ee446482598..81024a71199 100644 --- a/keyboards/8pack/rules.mk +++ b/keyboards/8pack/rules.mk @@ -1,15 +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 = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes -OLED_ENABLE = no - DEFAULT_FOLDER = 8pack/rev12 diff --git a/keyboards/atreus/info.json b/keyboards/atreus/info.json index f348e40aeea..ff1a77579ca 100644 --- a/keyboards/atreus/info.json +++ b/keyboards/atreus/info.json @@ -3,6 +3,15 @@ "manufacturer": "Technomancy", "url": "", "maintainer": "qmk", + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "usb": { "vid": "0x1209", "pid": "0xA1E5", diff --git a/keyboards/atreus/rules.mk b/keyboards/atreus/rules.mk index 9e5565ea49b..d933cb327d6 100644 --- a/keyboards/atreus/rules.mk +++ b/keyboards/atreus/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -UNICODE_ENABLE = yes # Unicode -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = atreus/astar diff --git a/keyboards/bear_face/info.json b/keyboards/bear_face/info.json index e0df316093d..24dd696e9b4 100644 --- a/keyboards/bear_face/info.json +++ b/keyboards/bear_face/info.json @@ -9,6 +9,15 @@ "pid": "0x09F5", "force_nkro": true }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "C7", "C6", "F0", "E6", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["F5", "F6", "F4", "F1", "B0", "B6"] diff --git a/keyboards/bear_face/rules.mk b/keyboards/bear_face/rules.mk index 3c6f2691442..f11303978e8 100644 --- a/keyboards/bear_face/rules.mk +++ b/keyboards/bear_face/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 = 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 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = bear_face/v1 diff --git a/keyboards/bpiphany/pegasushoof/info.json b/keyboards/bpiphany/pegasushoof/info.json index 5e096015cbb..1e9e9db3063 100644 --- a/keyboards/bpiphany/pegasushoof/info.json +++ b/keyboards/bpiphany/pegasushoof/info.json @@ -2,6 +2,14 @@ "manufacturer": "Filco", "url": "", "maintainer": "qmk", + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "usb": { "vid": "0x4245", "pid": "0x6050", diff --git a/keyboards/bpiphany/pegasushoof/rules.mk b/keyboards/bpiphany/pegasushoof/rules.mk index df85bc03755..20adecaa08a 100644 --- a/keyboards/bpiphany/pegasushoof/rules.mk +++ b/keyboards/bpiphany/pegasushoof/rules.mk @@ -1,14 +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 = 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 -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER=bpiphany/pegasushoof/2013 diff --git a/keyboards/bt66tech/bt66tech60/info.json b/keyboards/bt66tech/bt66tech60/info.json index adb45b95f31..f89440f6955 100644 --- a/keyboards/bt66tech/bt66tech60/info.json +++ b/keyboards/bt66tech/bt66tech60/info.json @@ -9,6 +9,17 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12"], "rows": ["B10", "B1", "B0", "A7", "A6"] diff --git a/keyboards/bt66tech/bt66tech60/rules.mk b/keyboards/bt66tech/bt66tech60/rules.mk index 0f238804a19..cb9c90456cc 100644 --- a/keyboards/bt66tech/bt66tech60/rules.mk +++ b/keyboards/bt66tech/bt66tech60/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SLEEP_LED_ENABLE = yes - DEFAULT_FOLDER = bt66tech/bt66tech60 - diff --git a/keyboards/cannonkeys/practice60/info.json b/keyboards/cannonkeys/practice60/info.json index ae57bfbf06f..3254b1702fa 100644 --- a/keyboards/cannonkeys/practice60/info.json +++ b/keyboards/cannonkeys/practice60/info.json @@ -8,6 +8,17 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], "rows": ["B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/cannonkeys/practice60/rules.mk b/keyboards/cannonkeys/practice60/rules.mk index 544fe68a886..5f7d5fe26d3 100644 --- a/keyboards/cannonkeys/practice60/rules.mk +++ b/keyboards/cannonkeys/practice60/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -SLEEP_LED_ENABLE = yes - DEFAULT_FOLDER = cannonkeys/practice60 - - diff --git a/keyboards/dailycraft/bat43/info.json b/keyboards/dailycraft/bat43/info.json index 2850b273d27..19aaa540ddb 100644 --- a/keyboards/dailycraft/bat43/info.json +++ b/keyboards/dailycraft/bat43/info.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "B5", "B4"], "rows": ["E6", "D7", "C6", "D4", "F7", "F6", "F5", "F4"] diff --git a/keyboards/dailycraft/bat43/rules.mk b/keyboards/dailycraft/bat43/rules.mk index 87c069dd2eb..b1528519482 100644 --- a/keyboards/dailycraft/bat43/rules.mk +++ b/keyboards/dailycraft/bat43/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 = 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 - DEFAULT_FOLDER = dailycraft/bat43/rev2 diff --git a/keyboards/delikeeb/vanana/info.json b/keyboards/delikeeb/vanana/info.json index 520cd92b09c..67bec439f13 100644 --- a/keyboards/delikeeb/vanana/info.json +++ b/keyboards/delikeeb/vanana/info.json @@ -2,6 +2,15 @@ "manufacturer": "dELIKEEb", "url": "", "maintainer": "noclew", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "usb": { "vid": "0x9906", "pid": "0x0013" diff --git a/keyboards/delikeeb/vanana/rules.mk b/keyboards/delikeeb/vanana/rules.mk index b2dedaeb01d..ff3dc1df615 100644 --- a/keyboards/delikeeb/vanana/rules.mk +++ b/keyboards/delikeeb/vanana/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 -ENCODER_ENABLE = yes # Enable Rotary Encoder - -# additional features for ELITE-C -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = delikeeb/vanana/rev2 diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json index 1201411d46b..1f9a8124a96 100644 --- a/keyboards/delikeeb/waaffle/rev3/info.json +++ b/keyboards/delikeeb/waaffle/rev3/info.json @@ -22,6 +22,14 @@ "ws2812": { "pin": "C7" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "D2", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["F4", "B6", "B2", "B3", "B1", "F5", "F6", "F7"] diff --git a/keyboards/delikeeb/waaffle/rev3/rules.mk b/keyboards/delikeeb/waaffle/rev3/rules.mk index f00d165fbfb..dbd58ca5bfa 100644 --- a/keyboards/delikeeb/waaffle/rev3/rules.mk +++ b/keyboards/delikeeb/waaffle/rev3/rules.mk @@ -1,14 +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 - DEFAULT_FOLDER = delikeeb/waaffle/rev3/pro_micro diff --git a/keyboards/drhigsby/ogurec/info.json b/keyboards/drhigsby/ogurec/info.json index 05dba8b9676..bddd3359d9e 100644 --- a/keyboards/drhigsby/ogurec/info.json +++ b/keyboards/drhigsby/ogurec/info.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"], "rows": ["F6", "B6", "B2"] diff --git a/keyboards/drhigsby/ogurec/rules.mk b/keyboards/drhigsby/ogurec/rules.mk index 9c26313b5be..ed83fb63868 100644 --- a/keyboards/drhigsby/ogurec/rules.mk +++ b/keyboards/drhigsby/ogurec/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 = 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 DEFAULT_FOLDER = drhigsby/ogurec/left_pm diff --git a/keyboards/eco/info.json b/keyboards/eco/info.json index 6a1b2adda1b..74c66fdcb91 100644 --- a/keyboards/eco/info.json +++ b/keyboards/eco/info.json @@ -3,6 +3,16 @@ "manufacturer": "Bishop Keyboards", "url": "", "maintainer": "qmk", + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "midi": true, + "mousekey": false, + "nkro": false + }, "usb": { "vid": "0x1337", "pid": "0x6006" diff --git a/keyboards/eco/rules.mk b/keyboards/eco/rules.mk index 6e28ce6bbb2..a3d419658b8 100644 --- a/keyboards/eco/rules.mk +++ b/keyboards/eco/rules.mk @@ -1,15 +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 = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -MIDI_ENABLE = yes # MIDI support -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = eco/rev2 diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json index 4d179a805bb..0caca6df3bd 100644 --- a/keyboards/eek/info.json +++ b/keyboards/eek/info.json @@ -16,6 +16,14 @@ "led_flush_limit": 16, "max_brightness": 200 }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/eek/rules.mk b/keyboards/eek/rules.mk index 74ca560427e..65b8265b530 100644 --- a/keyboards/eek/rules.mk +++ b/keyboards/eek/rules.mk @@ -1,13 +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 = 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 DEFAULT_FOLDER = eek/silk_down diff --git a/keyboards/handwired/ck4x4/info.json b/keyboards/handwired/ck4x4/info.json index 8caf00aefdb..4b8284ab71f 100644 --- a/keyboards/handwired/ck4x4/info.json +++ b/keyboards/handwired/ck4x4/info.json @@ -8,6 +8,14 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "B8", "B9", "B10"], "rows": ["B3", "B4", "B5", "B6"] diff --git a/keyboards/handwired/ck4x4/rules.mk b/keyboards/handwired/ck4x4/rules.mk index 91a488483f8..216aa810fd3 100644 --- a/keyboards/handwired/ck4x4/rules.mk +++ b/keyboards/handwired/ck4x4/rules.mk @@ -1,13 +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 = yes # Enable N-Key Rollover - DEFAULT_FOLDER = handwired/ck4x4 - - diff --git a/keyboards/handwired/ms_sculpt_mobile/info.json b/keyboards/handwired/ms_sculpt_mobile/info.json index 8ef1cb0a84d..918f166c61b 100644 --- a/keyboards/handwired/ms_sculpt_mobile/info.json +++ b/keyboards/handwired/ms_sculpt_mobile/info.json @@ -2,6 +2,14 @@ "manufacturer": "Microsoftplus", "url": "", "maintainer": "qmk", + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "usb": { "vid": "0xFEED", "pid": "0x6060", diff --git a/keyboards/handwired/ms_sculpt_mobile/rules.mk b/keyboards/handwired/ms_sculpt_mobile/rules.mk index 6fd84c8244b..8a3cc6858c2 100644 --- a/keyboards/handwired/ms_sculpt_mobile/rules.mk +++ b/keyboards/handwired/ms_sculpt_mobile/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 = 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 - DEFAULT_FOLDER = handwired/ms_sculpt_mobile/teensy2pp diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json index ac8c9013ba9..7812956177a 100644 --- a/keyboards/handwired/pill60/info.json +++ b/keyboards/handwired/pill60/info.json @@ -3,6 +3,16 @@ "manufacturer": "IktaS", "url": "https://github.com/IktaS/Pill60", "maintainer": "IktaS ", + "features": { + "bootmagic": false, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true + }, "usb": { "vid": "0x4454", "pid": "0x5444", diff --git a/keyboards/handwired/pill60/rules.mk b/keyboards/handwired/pill60/rules.mk index 6bb5fa15810..9299a64d612 100644 --- a/keyboards/handwired/pill60/rules.mk +++ b/keyboards/handwired/pill60/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -ENCODER_ENABLE = yes - DEFAULT_FOLDER = handwired/pill60/bluepill diff --git a/keyboards/handwired/sono1/info.json b/keyboards/handwired/sono1/info.json index 57b78c81bfe..85a698d2f4c 100644 --- a/keyboards/handwired/sono1/info.json +++ b/keyboards/handwired/sono1/info.json @@ -3,6 +3,14 @@ "manufacturer": "ASKeyboard", "url": "", "maintainer": "DmNosachev", + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "usb": { "vid": "0x515A", "pid": "0x5331" diff --git a/keyboards/handwired/sono1/rules.mk b/keyboards/handwired/sono1/rules.mk index e2e79966be1..9b472f28f2b 100644 --- a/keyboards/handwired/sono1/rules.mk +++ b/keyboards/handwired/sono1/rules.mk @@ -1,14 +1 @@ DEFAULT_FOLDER = handwired/sono1/t2pp - -# 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 diff --git a/keyboards/input_club/infinity60/info.json b/keyboards/input_club/infinity60/info.json index 423ac2a9370..f99ab93ca86 100644 --- a/keyboards/input_club/infinity60/info.json +++ b/keyboards/input_club/infinity60/info.json @@ -3,6 +3,14 @@ "manufacturer": "Input:Club", "url": "https://input.club/devices/infinity-keyboard/", "maintainer": "qmk", + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "usb": { "vid": "0x1C11", "pid": "0xB04D", diff --git a/keyboards/input_club/infinity60/rules.mk b/keyboards/input_club/infinity60/rules.mk index 5f885e11943..9c4b1e74c2e 100644 --- a/keyboards/input_club/infinity60/rules.mk +++ b/keyboards/input_club/infinity60/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 = yes # 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 = input_club/infinity60/led - diff --git a/keyboards/jadookb/jkb65/info.json b/keyboards/jadookb/jkb65/info.json index 1f5d79032e8..99460a30024 100644 --- a/keyboards/jadookb/jkb65/info.json +++ b/keyboards/jadookb/jkb65/info.json @@ -2,6 +2,18 @@ "manufacturer": "JadooKB", "url": "https://jadookb.com/", "maintainer": "Wizard-GG", + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "usb": { "vid": "0x4A4B", "pid": "0xEF6A" diff --git a/keyboards/jadookb/jkb65/rules.mk b/keyboards/jadookb/jkb65/rules.mk index 9098dae1caf..2bbb2a41cea 100644 --- a/keyboards/jadookb/jkb65/rules.mk +++ b/keyboards/jadookb/jkb65/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 = 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 = yes -LTO_ENABLE = yes - DEFAULT_FOLDER = jadookb/jkb65/r1 diff --git a/keyboards/kakunpc/angel17/info.json b/keyboards/kakunpc/angel17/info.json index a8a4f2c1480..c50e1b6e7ff 100644 --- a/keyboards/kakunpc/angel17/info.json +++ b/keyboards/kakunpc/angel17/info.json @@ -3,6 +3,14 @@ "manufacturer": "kakunpc", "url": "https://kakunpc.booth.pm/", "maintainer": "kakunpc", + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/kakunpc/angel17/rules.mk b/keyboards/kakunpc/angel17/rules.mk index 15778ab1d4b..48095d37e61 100644 --- a/keyboards/kakunpc/angel17/rules.mk +++ b/keyboards/kakunpc/angel17/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 = 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 - DEFAULT_FOLDER = kakunpc/angel17/rev1 diff --git a/keyboards/kapcave/paladinpad/info.json b/keyboards/kapcave/paladinpad/info.json index da14ebbd01e..1a639180d01 100644 --- a/keyboards/kapcave/paladinpad/info.json +++ b/keyboards/kapcave/paladinpad/info.json @@ -3,6 +3,15 @@ "manufacturer": "KapCave", "url": "https://kapcave.com/products/paladinpad-pcb", "maintainer": "nachie", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "usb": { "vid": "0x4B43", "pid": "0x5050" diff --git a/keyboards/kapcave/paladinpad/rules.mk b/keyboards/kapcave/paladinpad/rules.mk index 257c83aee0e..02685414e3b 100644 --- a/keyboards/kapcave/paladinpad/rules.mk +++ b/keyboards/kapcave/paladinpad/rules.mk @@ -1,14 +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 -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 - DEFAULT_FOLDER = kapcave/paladinpad/rev2 diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json index c66bd05f1bc..0d8de8a1d90 100644 --- a/keyboards/keycapsss/plaid_pad/info.json +++ b/keyboards/keycapsss/plaid_pad/info.json @@ -10,6 +10,14 @@ "qmk": { "tap_keycode_delay": 60 }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "D7", "D6", "D5"], "rows": ["C0", "C1", "C2", "C3"] diff --git a/keyboards/keycapsss/plaid_pad/rules.mk b/keyboards/keycapsss/plaid_pad/rules.mk index 1172f98f888..0ab7cc3141a 100644 --- a/keyboards/keycapsss/plaid_pad/rules.mk +++ b/keyboards/keycapsss/plaid_pad/rules.mk @@ -1,14 +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 - DEFAULT_FOLDER = keycapsss/plaid_pad/rev1 diff --git a/keyboards/kin80/info.json b/keyboards/kin80/info.json index 4a90872f789..395742d88b4 100644 --- a/keyboards/kin80/info.json +++ b/keyboards/kin80/info.json @@ -2,6 +2,14 @@ "keyboard_name": "Kin80", "url": "https://github.com/DmNosachev/kinesis80", "maintainer": "DmNosachev", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "usb": { "vid": "0xFEED", "pid": "0x4B4E" diff --git a/keyboards/kin80/rules.mk b/keyboards/kin80/rules.mk index 2dad32f8efa..b264c9cfc5c 100644 --- a/keyboards/kin80/rules.mk +++ b/keyboards/kin80/rules.mk @@ -1,14 +1 @@ DEFAULT_FOLDER = kin80/blackpill401 - -# 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 \ No newline at end of file diff --git a/keyboards/kumaokobo/kudox_game/info.json b/keyboards/kumaokobo/kudox_game/info.json index 6968b5e427e..0c38991bbb0 100644 --- a/keyboards/kumaokobo/kudox_game/info.json +++ b/keyboards/kumaokobo/kudox_game/info.json @@ -3,6 +3,14 @@ "manufacturer": "Kumao Kobo", "url": "", "maintainer": "Kumao Kobo", + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "usb": { "vid": "0xABBA", "pid": "0x9696" diff --git a/keyboards/kumaokobo/kudox_game/rules.mk b/keyboards/kumaokobo/kudox_game/rules.mk index 569f262b383..28918ca489f 100644 --- a/keyboards/kumaokobo/kudox_game/rules.mk +++ b/keyboards/kumaokobo/kudox_game/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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = kumaokobo/kudox_game/rev2 diff --git a/keyboards/lfkeyboards/lfk87/info.json b/keyboards/lfkeyboards/lfk87/info.json index 0b53928421b..9b10936df81 100644 --- a/keyboards/lfkeyboards/lfk87/info.json +++ b/keyboards/lfkeyboards/lfk87/info.json @@ -3,6 +3,15 @@ "manufacturer": "LFKeyboards", "url": "", "maintainer": "qmk", + "features": { + "audio": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "usb": { "vid": "0xFEED", "pid": "0x6060", diff --git a/keyboards/lfkeyboards/lfk87/rules.mk b/keyboards/lfkeyboards/lfk87/rules.mk index 3a1399d6930..05b80ac74ad 100644 --- a/keyboards/lfkeyboards/lfk87/rules.mk +++ b/keyboards/lfkeyboards/lfk87/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 = 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 = yes # Audio output -WATCHDOG_ENABLE = no # Resets keyboard if matrix_scan isn't run every 250ms - DEFAULT_FOLDER = lfkeyboards/lfk78/revc diff --git a/keyboards/lfkeyboards/smk65/info.json b/keyboards/lfkeyboards/smk65/info.json index fa21398129d..0ecbf2ab952 100644 --- a/keyboards/lfkeyboards/smk65/info.json +++ b/keyboards/lfkeyboards/smk65/info.json @@ -3,6 +3,14 @@ "manufacturer": "LFKeyboards", "url": "", "maintainer": "qmk", + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "usb": { "vid": "0x4C46", "device_version": "0.0.6" diff --git a/keyboards/lfkeyboards/smk65/rules.mk b/keyboards/lfkeyboards/smk65/rules.mk index 278378a421d..b2d74976632 100644 --- a/keyboards/lfkeyboards/smk65/rules.mk +++ b/keyboards/lfkeyboards/smk65/rules.mk @@ -1,14 +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 = 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 - DEFAULT_FOLDER = lfkeyboards/smk65/revb diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json index e675f2f9327..ced352ccaa1 100644 --- a/keyboards/maple_computing/christmas_tree/info.json +++ b/keyboards/maple_computing/christmas_tree/info.json @@ -7,6 +7,15 @@ "vid": "0xFEED", "pid": "0x3070" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D1"], "rows": ["D3", "F4", "D0", "F6", "F5", "D4"] diff --git a/keyboards/maple_computing/christmas_tree/rules.mk b/keyboards/maple_computing/christmas_tree/rules.mk index 54ee8484372..3a6633cf568 100644 --- a/keyboards/maple_computing/christmas_tree/rules.mk +++ b/keyboards/maple_computing/christmas_tree/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 = 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = maple_computing/christmas_tree/v2017 diff --git a/keyboards/marksard/treadstone32/info.json b/keyboards/marksard/treadstone32/info.json index 098427b0a3f..d93277472cb 100644 --- a/keyboards/marksard/treadstone32/info.json +++ b/keyboards/marksard/treadstone32/info.json @@ -2,6 +2,14 @@ "manufacturer": "marksard", "url": "https://github.com/marksard/Keyboards", "maintainer": "marksard", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": true, + "nkro": false + }, "usb": { "vid": "0xFEED", "pid": "0xDFA5" diff --git a/keyboards/marksard/treadstone32/rules.mk b/keyboards/marksard/treadstone32/rules.mk index 43e13475d32..2d7ca16d86c 100644 --- a/keyboards/marksard/treadstone32/rules.mk +++ b/keyboards/marksard/treadstone32/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 = 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 # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -LEADER_ENABLE = no - DEFAULT_FOLDER = marksard/treadstone32/rev1 diff --git a/keyboards/maxipad/info.json b/keyboards/maxipad/info.json index 4b8e3fa0a09..00cc16e887f 100644 --- a/keyboards/maxipad/info.json +++ b/keyboards/maxipad/info.json @@ -3,6 +3,14 @@ "manufacturer": "wootpatoot", "url": "", "maintainer": "qmk", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "usb": { "vid": "0xFEED", "pid": "0x6060", diff --git a/keyboards/maxipad/rules.mk b/keyboards/maxipad/rules.mk index c21aaab8519..98a712a7b88 100644 --- a/keyboards/maxipad/rules.mk +++ b/keyboards/maxipad/rules.mk @@ -1,14 +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 = yes # 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 = maxipad/promicro diff --git a/keyboards/mechllama/g35/info.json b/keyboards/mechllama/g35/info.json index dbcdef1e94b..2fa38714051 100644 --- a/keyboards/mechllama/g35/info.json +++ b/keyboards/mechllama/g35/info.json @@ -3,6 +3,16 @@ "manufacturer": "kaylynb", "url": "https://github.com/kaylynb/MechLlama-G35", "maintainer": "kaylynb", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": true, + "oled": true, + "rgblight": true + }, "usb": { "vid": "0xCEEB", "pid": "0x0035", diff --git a/keyboards/mechllama/g35/rules.mk b/keyboards/mechllama/g35/rules.mk index be2e71f9036..36acf8d17f8 100644 --- a/keyboards/mechllama/g35/rules.mk +++ b/keyboards/mechllama/g35/rules.mk @@ -1,5 +1 @@ -NKRO_ENABLE = yes # Enable N-Key Rollover -OLED_ENABLE = yes -RGBLIGHT_ENABLE = yes - DEFAULT_FOLDER = mechllama/g35/v2 diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json index 42b16d63984..d8aae5a8da7 100644 --- a/keyboards/mechlovin/adelais/info.json +++ b/keyboards/mechlovin/adelais/info.json @@ -2,6 +2,14 @@ "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "mechlovin", + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "usb": { "vid": "0x4D4C", "device_version": "0.0.1" diff --git a/keyboards/mechlovin/adelais/rules.mk b/keyboards/mechlovin/adelais/rules.mk index 264ea933223..a1d2ba038de 100644 --- a/keyboards/mechlovin/adelais/rules.mk +++ b/keyboards/mechlovin/adelais/rules.mk @@ -1,12 +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 = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev2 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json index f0d10942adc..17cf63fecf3 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "usb": { "pid": "0xAD03" }, diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk index 257dd3bf571..d348ae660f7 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk @@ -1,3 +1 @@ -ENCODER_ENABLE = yes - DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev4/stm32f303 diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json index baeeab6f186..e8f39b8d6d1 100644 --- a/keyboards/mechlovin/delphine/info.json +++ b/keyboards/mechlovin/delphine/info.json @@ -6,6 +6,14 @@ "usb": { "vid": "0x4D4C" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F7", "D7", "D6", "D2"], "rows": ["F0", "F1", "F4", "F5", "F6", "D3"] diff --git a/keyboards/mechlovin/delphine/rules.mk b/keyboards/mechlovin/delphine/rules.mk index ef29542a937..819bce1cd3d 100644 --- a/keyboards/mechlovin/delphine/rules.mk +++ b/keyboards/mechlovin/delphine/rules.mk @@ -1,14 +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 = yes # 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 = mechlovin/delphine/mono_led diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json index 88a3f397192..f9adc729660 100644 --- a/keyboards/mechlovin/hannah65/info.json +++ b/keyboards/mechlovin/hannah65/info.json @@ -3,6 +3,15 @@ "pin": "B8", "breathing": true }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"], "rows": ["A4", "A5", "A3", "A2", "A1"] diff --git a/keyboards/mechlovin/hannah65/rules.mk b/keyboards/mechlovin/hannah65/rules.mk index e01e6c73dad..ae9bc176a4c 100644 --- a/keyboards/mechlovin/hannah65/rules.mk +++ b/keyboards/mechlovin/hannah65/rules.mk @@ -1,14 +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 = yes # Console for debug -COMMAND_ENABLE = yes # 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 - DEFAULT_FOLDER = mechlovin/hannah65/rev1/haus diff --git a/keyboards/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json index dbe7cb83f99..249bbd5cb47 100644 --- a/keyboards/mechlovin/infinity87/rev1/info.json +++ b/keyboards/mechlovin/infinity87/rev1/info.json @@ -1,4 +1,13 @@ { + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"], "rows": ["A10", "B13", "B12", "B11", "C14", "C15"] diff --git a/keyboards/mechlovin/infinity87/rev1/rules.mk b/keyboards/mechlovin/infinity87/rev1/rules.mk index 53a9137b2f9..101153f240d 100644 --- a/keyboards/mechlovin/infinity87/rev1/rules.mk +++ b/keyboards/mechlovin/infinity87/rev1/rules.mk @@ -1,3 +1 @@ -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality - DEFAULT_FOLDER = mechlovin/infinity87/rev1/standard diff --git a/keyboards/mechlovin/mechlovin9/info.json b/keyboards/mechlovin/mechlovin9/info.json index 41133813ef7..a5439f56a9d 100644 --- a/keyboards/mechlovin/mechlovin9/info.json +++ b/keyboards/mechlovin/mechlovin9/info.json @@ -2,6 +2,14 @@ "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Team Mechlovin", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "usb": { "vid": "0x4D4C" }, diff --git a/keyboards/mechlovin/mechlovin9/rules.mk b/keyboards/mechlovin/mechlovin9/rules.mk index 3c4e38888c4..79de7c7d316 100644 --- a/keyboards/mechlovin/mechlovin9/rules.mk +++ b/keyboards/mechlovin/mechlovin9/rules.mk @@ -1,13 +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 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -DEFAULT_FOLDER = mechlovin/mechlovin9/rev1 \ No newline at end of file +DEFAULT_FOLDER = mechlovin/mechlovin9/rev1 diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json index 98c70bef08a..2baf5422f04 100644 --- a/keyboards/mechwild/obe/info.json +++ b/keyboards/mechwild/obe/info.json @@ -8,6 +8,16 @@ "pid": "0x1707", "device_version": "2.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"], "rows": ["A8", "B15", "B14", "B13", "B12", "A15", "B3"] diff --git a/keyboards/mechwild/obe/rules.mk b/keyboards/mechwild/obe/rules.mk index bdcc7d903bf..8fb92c3a6b6 100644 --- a/keyboards/mechwild/obe/rules.mk +++ b/keyboards/mechwild/obe/rules.mk @@ -1,15 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Encoder Enabled - DEFAULT_FOLDER = mechwild/obe/f401 diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json index 0d50b0f261b..f7a0300a6a9 100644 --- a/keyboards/mechwild/waka60/info.json +++ b/keyboards/mechwild/waka60/info.json @@ -29,6 +29,16 @@ "ws2812": { "pin": "A1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4"], "rows": ["B8", "B4", "B3", "B9", "A15", "B12", "B13", "B14", "B15", "A8"] diff --git a/keyboards/mechwild/waka60/rules.mk b/keyboards/mechwild/waka60/rules.mk index 06e0fbc7c59..d3be506b167 100644 --- a/keyboards/mechwild/waka60/rules.mk +++ b/keyboards/mechwild/waka60/rules.mk @@ -1,15 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Encoder Enabled - DEFAULT_FOLDER = mechwild/waka60/f401 diff --git a/keyboards/peej/tripel/info.json b/keyboards/peej/tripel/info.json index 15980f254a1..8e357205f96 100644 --- a/keyboards/peej/tripel/info.json +++ b/keyboards/peej/tripel/info.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], "rows": ["C6", "D4", "D0", "B4", "E6", "D7", "D1", "D2", "D3"] diff --git a/keyboards/peej/tripel/rules.mk b/keyboards/peej/tripel/rules.mk index 4d1c7e3e33f..8d897004565 100644 --- a/keyboards/peej/tripel/rules.mk +++ b/keyboards/peej/tripel/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 = 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = peej/tripel/left diff --git a/keyboards/primekb/meridian/info.json b/keyboards/primekb/meridian/info.json index e5192d6c498..1e624892119 100644 --- a/keyboards/primekb/meridian/info.json +++ b/keyboards/primekb/meridian/info.json @@ -8,6 +8,15 @@ "pid": "0x004D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], "rows": ["A6", "A5", "A4", "A3", "A2"] diff --git a/keyboards/primekb/meridian/rules.mk b/keyboards/primekb/meridian/rules.mk index 6d34cadbf7d..585a04ad287 100644 --- a/keyboards/primekb/meridian/rules.mk +++ b/keyboards/primekb/meridian/rules.mk @@ -1,14 +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 = 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 - DEFAULT_FOLDER = primekb/meridian/ktr1010 diff --git a/keyboards/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json index dee7a23e027..44b8227fb64 100644 --- a/keyboards/primekb/prime_e/info.json +++ b/keyboards/primekb/prime_e/info.json @@ -5,6 +5,14 @@ "usb": { "vid": "0x5052" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "C7", "B5", "B4"] diff --git a/keyboards/primekb/prime_e/rules.mk b/keyboards/primekb/prime_e/rules.mk index 64b21fa0a25..debb966e0d1 100644 --- a/keyboards/primekb/prime_e/rules.mk +++ b/keyboards/primekb/prime_e/rules.mk @@ -1,12 +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 -NKRO_ENABLE = yes # Enable N-Key Rollover -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = primekb/prime_e/std diff --git a/keyboards/primekb/prime_l/info.json b/keyboards/primekb/prime_l/info.json index 93bb4432e2d..52d67139142 100644 --- a/keyboards/primekb/prime_l/info.json +++ b/keyboards/primekb/prime_l/info.json @@ -2,6 +2,14 @@ "manufacturer": "PrimeKB", "url": "https://www.primekb.com", "maintainer": "MxBlu", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "usb": { "vid": "0x5052" }, diff --git a/keyboards/primekb/prime_l/rules.mk b/keyboards/primekb/prime_l/rules.mk index b94eff91169..235bfea9259 100644 --- a/keyboards/primekb/prime_l/rules.mk +++ b/keyboards/primekb/prime_l/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 = 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 - DEFAULT_FOLDER = primekb/prime_l/v1 diff --git a/keyboards/rmi_kb/tkl_ff/info.json b/keyboards/rmi_kb/tkl_ff/info.json index 739135decff..b09e0e888ec 100644 --- a/keyboards/rmi_kb/tkl_ff/info.json +++ b/keyboards/rmi_kb/tkl_ff/info.json @@ -7,6 +7,14 @@ "vid": "0xB16B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D5", "B0", "B1", "D1"], "rows": ["B2", "B3", "B7", "D6", "D3", "D2"] diff --git a/keyboards/rmi_kb/tkl_ff/rules.mk b/keyboards/rmi_kb/tkl_ff/rules.mk index 6e2fbcde2e2..c8847cc266c 100644 --- a/keyboards/rmi_kb/tkl_ff/rules.mk +++ b/keyboards/rmi_kb/tkl_ff/rules.mk @@ -1,14 +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 - DEFAULT_FOLDER = rmi_kb/tkl_ff/v1 diff --git a/keyboards/smoll/lefty/info.json b/keyboards/smoll/lefty/info.json index c7113e4c267..28fa865888c 100644 --- a/keyboards/smoll/lefty/info.json +++ b/keyboards/smoll/lefty/info.json @@ -3,6 +3,18 @@ "manufacturer": "SmollChungus", "url": "https://github.com/smollchungus", "maintainer": "smollchungus", + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true + }, "usb": { "vid": "0x5363", "pid": "0x0001", diff --git a/keyboards/smoll/lefty/rules.mk b/keyboards/smoll/lefty/rules.mk index d8d08e502c8..6bc5abbdc55 100644 --- a/keyboards/smoll/lefty/rules.mk +++ b/keyboards/smoll/lefty/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 -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 -LTO_ENABLE = yes - -OLED_ENABLE = yes - DEFAULT_FOLDER = smoll/lefty/rev2 diff --git a/keyboards/takashiski/namecard2x4/info.json b/keyboards/takashiski/namecard2x4/info.json index f94a98fd226..895f3e4c4b0 100644 --- a/keyboards/takashiski/namecard2x4/info.json +++ b/keyboards/takashiski/namecard2x4/info.json @@ -3,6 +3,14 @@ "manufacturer": "takashiski", "url": "https://skyhigh-works.hatenablog.com/", "maintainer": "takashiski", + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/takashiski/namecard2x4/rules.mk b/keyboards/takashiski/namecard2x4/rules.mk index dbe601b71f2..f93cfc823d9 100644 --- a/keyboards/takashiski/namecard2x4/rules.mk +++ b/keyboards/takashiski/namecard2x4/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 - -#RGBLIGHT_ENABLE = yes # uncomment if you want addressable led strips - DEFAULT_FOLDER = takashiski/namecard2x4/rev2 diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/info.json index 7f9f5fdb3c4..c6e9f6500af 100644 --- a/keyboards/vertex/arc60/info.json +++ b/keyboards/vertex/arc60/info.json @@ -9,6 +9,15 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"], "rows": ["B10", "B1", "B0", "A7", "A6"] diff --git a/keyboards/vertex/arc60/rules.mk b/keyboards/vertex/arc60/rules.mk index 0c92de19187..dd76c3f2cec 100644 --- a/keyboards/vertex/arc60/rules.mk +++ b/keyboards/vertex/arc60/rules.mk @@ -1,19 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SLEEP_LED_ENABLE = no - - DEFAULT_FOLDER = vertex/arc60 - - - diff --git a/keyboards/vitamins_included/info.json b/keyboards/vitamins_included/info.json index 8199aca23a9..60907cdba37 100644 --- a/keyboards/vitamins_included/info.json +++ b/keyboards/vitamins_included/info.json @@ -3,6 +3,19 @@ "manufacturer": "Duckle29", "url": "", "maintainer": "Duckle29", + "build": { + "lto": true + }, + "features": { + "audio": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "usb": { "vid": "0x1209", "pid": "0xBEE5" diff --git a/keyboards/vitamins_included/rules.mk b/keyboards/vitamins_included/rules.mk index 3ca1a5cf70e..e3452d41db9 100644 --- a/keyboards/vitamins_included/rules.mk +++ b/keyboards/vitamins_included/rules.mk @@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -AUDIO_ENABLE = yes # Audio output -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -COMMAND_ENABLE = no # Commands for debug and configuration -CONSOLE_ENABLE = no # Console for debug -DEBUG_ENABLE = no # Enable more debug info -EXTRAKEY_ENABLE = yes # Audio control and System control -MOUSEKEY_ENABLE = no # Mouse keys -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = vitamins_included/rev2 - -LTO_ENABLE = yes diff --git a/keyboards/ymdk/yd60mq/info.json b/keyboards/ymdk/yd60mq/info.json index 1501113646a..a1c4bc8f760 100644 --- a/keyboards/ymdk/yd60mq/info.json +++ b/keyboards/ymdk/yd60mq/info.json @@ -7,6 +7,16 @@ "vid": "0x594D", "pid": "0x604D" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/ymdk/yd60mq/rules.mk b/keyboards/ymdk/yd60mq/rules.mk index 119cc37130e..c37722c8bb8 100644 --- a/keyboards/ymdk/yd60mq/rules.mk +++ b/keyboards/ymdk/yd60mq/rules.mk @@ -1,14 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = ymdk/yd60mq/12led From 831deac212fa0342b9fad9d419b7f15890abfa02 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 30 Mar 2024 11:31:50 +0000 Subject: [PATCH 078/333] Migrate build target markers to keyboard.json (#23293) --- .../0_sixty/base/{info.json => keyboard.json} | 0 keyboards/0_sixty/base/rules.mk | 0 .../underglow/{info.json => keyboard.json} | 0 keyboards/0_sixty/underglow/rules.mk | 0 .../1upocarina/{info.json => keyboard.json} | 0 keyboards/1upkeyboards/1upocarina/rules.mk | 1 - .../1upsuper16v3/{info.json => keyboard.json} | 0 keyboards/1upkeyboards/1upsuper16v3/rules.mk | 0 .../pi40/grid_v1_1/{info.json => keyboard.json} | 0 keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk | 0 .../pi40/mit_v1_0/{info.json => keyboard.json} | 0 keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk | 0 .../pi40/mit_v1_1/{info.json => keyboard.json} | 0 keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk | 0 .../pi50/grid/{info.json => keyboard.json} | 0 keyboards/1upkeyboards/pi50/grid/rules.mk | 0 .../pi50/mit/{info.json => keyboard.json} | 0 keyboards/1upkeyboards/pi50/mit/rules.mk | 0 .../pi60/{info.json => keyboard.json} | 0 keyboards/1upkeyboards/pi60/rules.mk | 0 .../pi60_hse/{info.json => keyboard.json} | 0 keyboards/1upkeyboards/pi60_hse/rules.mk | 0 .../pi60_rgb/{info.json => keyboard.json} | 0 keyboards/1upkeyboards/pi60_rgb/rules.mk | 0 .../pi60_rgb_v2/{info.json => keyboard.json} | 0 keyboards/1upkeyboards/pi60_rgb_v2/rules.mk | 0 .../kb2040/{info.json => keyboard.json} | 0 .../1upkeyboards/sweet16v2/kb2040/rules.mk | 0 .../pro_micro/{info.json => keyboard.json} | 0 .../1upkeyboards/sweet16v2/pro_micro/rules.mk | 0 .../i75/promicro/{info.json => keyboard.json} | 0 keyboards/40percentclub/i75/promicro/rules.mk | 0 .../i75/teensy2/{info.json => keyboard.json} | 0 keyboards/40percentclub/i75/teensy2/rules.mk | 0 .../promicro/{info.json => keyboard.json} | 0 .../40percentclub/polyandry/promicro/rules.mk | 0 .../teensy2/{info.json => keyboard.json} | 0 .../40percentclub/polyandry/teensy2/rules.mk | 0 .../8pack/rev11/{info.json => keyboard.json} | 0 keyboards/8pack/rev11/rules.mk | 0 .../8pack/rev12/{info.json => keyboard.json} | 0 keyboards/8pack/rev12/rules.mk | 0 keyboards/a_dux/{info.json => keyboard.json} | 0 keyboards/a_dux/rules.mk | 1 - .../nayeon/{info.json => keyboard.json} | 0 keyboards/abatskeyboardclub/nayeon/rules.mk | 1 - .../abko/ak84bt/{info.json => keyboard.json} | 0 keyboards/abko/ak84bt/rules.mk | 1 - .../themis/87h/{info.json => keyboard.json} | 0 keyboards/acheron/themis/87h/rules.mk | 0 .../themis/87htsc/{info.json => keyboard.json} | 0 keyboards/acheron/themis/87htsc/rules.mk | 0 .../themis/88htsc/{info.json => keyboard.json} | 0 keyboards/acheron/themis/88htsc/rules.mk | 0 .../adm42/rev4/{info.json => keyboard.json} | 0 keyboards/adm42/rev4/rules.mk | 1 - .../ah/haven60/{info.json => keyboard.json} | 0 keyboards/ah/haven60/rules.mk | 1 - .../ah/haven65/{info.json => keyboard.json} | 0 keyboards/ah/haven65/rules.mk | 1 - .../hotswap/{info.json => keyboard.json} | 0 keyboards/ah/haven80/hotswap/rules.mk | 1 - .../haven80/solder/{info.json => keyboard.json} | 0 keyboards/ah/haven80/solder/rules.mk | 1 - keyboards/ai/{info.json => keyboard.json} | 0 keyboards/ai/rules.mk | 1 - .../ai03/duet/{info.json => keyboard.json} | 0 keyboards/ai03/duet/rules.mk | 1 - .../fine40/{info.json => keyboard.json} | 0 keyboards/aidansmithdotdev/fine40/rules.mk | 0 keyboards/akb/ogr/{info.json => keyboard.json} | 0 keyboards/akb/ogr/rules.mk | 1 - keyboards/akb/ogrn/{info.json => keyboard.json} | 0 keyboards/akb/ogrn/rules.mk | 1 - keyboards/akb/vero/{info.json => keyboard.json} | 0 keyboards/akb/vero/rules.mk | 1 - .../akko/5087/{info.json => keyboard.json} | 0 keyboards/akko/5087/rules.mk | 1 - .../akko/5108/{info.json => keyboard.json} | 0 keyboards/akko/5108/rules.mk | 1 - .../akko/acr87/{info.json => keyboard.json} | 0 keyboards/akko/acr87/rules.mk | 1 - .../akko/top40/{info.json => keyboard.json} | 0 keyboards/akko/top40/rules.mk | 1 - .../macropad5x4/{info.json => keyboard.json} | 0 keyboards/alhenkb/macropad5x4/rules.mk | 1 - .../wfeclipse/{info.json => keyboard.json} | 0 keyboards/alpaca/wfeclipse/rules.mk | 1 - .../tetromino/{info.json => keyboard.json} | 0 keyboards/an_achronism/tetromino/rules.mk | 0 .../anavi/arrows/{info.json => keyboard.json} | 0 keyboards/anavi/arrows/rules.mk | 1 - .../macropad10/{info.json => keyboard.json} | 0 keyboards/anavi/macropad10/rules.mk | 0 .../macropad12/{info.json => keyboard.json} | 0 keyboards/anavi/macropad12/rules.mk | 1 - .../andean_condor/{info.json => keyboard.json} | 0 keyboards/andean_condor/rules.mk | 1 - .../minervalx/{info.json => keyboard.json} | 0 keyboards/archetype/minervalx/rules.mk | 1 - .../80/mk0_avr/{info.json => keyboard.json} | 0 keyboards/argo_works/ishi/80/mk0_avr/rules.mk | 1 - .../hotswap/{info.json => keyboard.json} | 0 keyboards/artemis/paragon/hotswap/rules.mk | 1 - .../soldered/{info.json => keyboard.json} | 0 keyboards/artemis/paragon/soldered/rules.mk | 1 - keyboards/ask55/{info.json => keyboard.json} | 0 keyboards/ask55/rules.mk | 1 - .../atreus/astar/{info.json => keyboard.json} | 0 keyboards/atreus/astar/rules.mk | 0 .../astar_mirrored/{info.json => keyboard.json} | 0 keyboards/atreus/astar_mirrored/rules.mk | 0 .../promicro/{info.json => keyboard.json} | 0 keyboards/atreus/promicro/rules.mk | 0 .../atreus/teensy2/{info.json => keyboard.json} | 0 keyboards/atreus/teensy2/rules.mk | 0 .../atreyu/rev1/{info.json => keyboard.json} | 0 keyboards/atreyu/rev1/rules.mk | 0 .../atreyu/rev2/{info.json => keyboard.json} | 0 keyboards/atreyu/rev2/rules.mk | 1 - .../alisaie/{info.json => keyboard.json} | 0 keyboards/automata02/alisaie/rules.mk | 1 - .../aster_ergo/{info.json => keyboard.json} | 0 keyboards/bahm/aster_ergo/rules.mk | 1 - .../tr90/{info.json => keyboard.json} | 0 keyboards/balloondogcaps/tr90/rules.mk | 0 .../tr90pm/{info.json => keyboard.json} | 0 keyboards/balloondogcaps/tr90pm/rules.mk | 1 - .../bear_face/v1/{info.json => keyboard.json} | 0 keyboards/bear_face/v1/rules.mk | 0 .../bear_face/v2/{info.json => keyboard.json} | 0 keyboards/bear_face/v2/rules.mk | 0 keyboards/bestway/{info.json => keyboard.json} | 0 keyboards/bestway/rules.mk | 1 - .../binepad/bn006/{info.json => keyboard.json} | 0 keyboards/binepad/bn006/rules.mk | 1 - .../bn009/r2/{info.json => keyboard.json} | 0 keyboards/binepad/bn009/r2/rules.mk | 1 - .../binepad/bnk9/{info.json => keyboard.json} | 0 keyboards/binepad/bnk9/rules.mk | 1 - .../bnr1/v2/{info.json => keyboard.json} | 0 keyboards/binepad/bnr1/v2/rules.mk | 1 - .../binepad/pixie/{info.json => keyboard.json} | 0 keyboards/binepad/pixie/rules.mk | 1 - .../{info.json => keyboard.json} | 0 keyboards/black_hellebore/rules.mk | 0 .../blu/vimclutch/{info.json => keyboard.json} | 0 keyboards/blu/vimclutch/rules.mk | 1 - .../3x4/{info.json => keyboard.json} | 0 keyboards/boardsource/3x4/rules.mk | 1 - .../4x12/{info.json => keyboard.json} | 0 keyboards/boardsource/4x12/rules.mk | 1 - .../5x12/{info.json => keyboard.json} | 0 keyboards/boardsource/5x12/rules.mk | 1 - .../beiwagon/{info.json => keyboard.json} | 0 keyboards/boardsource/beiwagon/rules.mk | 0 .../equals/avr/{info.json => keyboard.json} | 0 keyboards/boardsource/equals/avr/rules.mk | 1 - .../holiday/spooky/{info.json => keyboard.json} | 0 keyboards/boardsource/holiday/spooky/rules.mk | 1 - .../lulu/avr/{info.json => keyboard.json} | 0 keyboards/boardsource/lulu/avr/rules.mk | 1 - .../microdox/v1/{info.json => keyboard.json} | 0 keyboards/boardsource/microdox/v1/rules.mk | 1 - .../microdox/v2/{info.json => keyboard.json} | 0 keyboards/boardsource/microdox/v2/rules.mk | 0 .../technik_o/{info.json => keyboard.json} | 0 keyboards/boardsource/technik_o/rules.mk | 0 .../technik_s/{info.json => keyboard.json} | 0 keyboards/boardsource/technik_s/rules.mk | 0 .../the_mark/{info.json => keyboard.json} | 0 keyboards/boardsource/the_mark/rules.mk | 0 .../wyvern_hs/{info.json => keyboard.json} | 0 keyboards/bredworks/wyvern_hs/rules.mk | 1 - .../key_ripper/{info.json => keyboard.json} | 0 keyboards/bschwind/key_ripper/rules.mk | 1 - .../buildakb/mw60/{info.json => keyboard.json} | 0 keyboards/buildakb/mw60/rules.mk | 1 - .../pocketpad/{info.json => keyboard.json} | 0 keyboards/butterkeebs/pocketpad/rules.mk | 1 - .../bastion60/{info.json => keyboard.json} | 0 keyboards/cannonkeys/bastion60/rules.mk | 1 - .../bastion65/{info.json => keyboard.json} | 0 keyboards/cannonkeys/bastion65/rules.mk | 1 - .../bastion75/{info.json => keyboard.json} | 0 keyboards/cannonkeys/bastion75/rules.mk | 1 - .../bastiontkl/{info.json => keyboard.json} | 0 keyboards/cannonkeys/bastiontkl/rules.mk | 1 - .../brutalv2_1800/{info.json => keyboard.json} | 0 keyboards/cannonkeys/brutalv2_1800/rules.mk | 1 - .../brutalv2_60/{info.json => keyboard.json} | 0 keyboards/cannonkeys/brutalv2_60/rules.mk | 1 - .../caerdroia/{info.json => keyboard.json} | 0 keyboards/cannonkeys/caerdroia/rules.mk | 1 - .../db60/hotswap/{info.json => keyboard.json} | 0 keyboards/cannonkeys/db60/hotswap/rules.mk | 0 .../db60/j02/{info.json => keyboard.json} | 0 keyboards/cannonkeys/db60/j02/rules.mk | 0 .../db60/rev2/{info.json => keyboard.json} | 0 keyboards/cannonkeys/db60/rev2/rules.mk | 0 .../ortho48v2/{info.json => keyboard.json} | 0 keyboards/cannonkeys/ortho48v2/rules.mk | 1 - .../ortho60v2/{info.json => keyboard.json} | 0 keyboards/cannonkeys/ortho60v2/rules.mk | 1 - .../prototype/{info.json => keyboard.json} | 0 .../satisfaction75/prototype/rules.mk | 1 - .../rev1/{info.json => keyboard.json} | 0 .../cannonkeys/satisfaction75/rev1/rules.mk | 1 - .../rev2/{info.json => keyboard.json} | 0 .../cannonkeys/satisfaction75/rev2/rules.mk | 1 - .../typeb/{info.json => keyboard.json} | 0 keyboards/cannonkeys/typeb/rules.mk | 1 - .../cu75/{info.json => keyboard.json} | 0 keyboards/capsunlocked/cu75/rules.mk | 0 .../cu80/v2/ansi/{info.json => keyboard.json} | 0 keyboards/capsunlocked/cu80/v2/ansi/rules.mk | 1 - .../cu80/v2/iso/{info.json => keyboard.json} | 0 keyboards/capsunlocked/cu80/v2/iso/rules.mk | 1 - .../ciel65/{info.json => keyboard.json} | 0 keyboards/chickenman/ciel65/rules.mk | 1 - .../ppr_merro60/{info.json => keyboard.json} | 0 keyboards/chlx/ppr_merro60/rules.mk | 1 - .../chord/zero/{info.json => keyboard.json} | 0 keyboards/chord/zero/rules.mk | 1 - .../chosfox/cf81/{info.json => keyboard.json} | 0 keyboards/chosfox/cf81/rules.mk | 1 - keyboards/chouchou/{info.json => keyboard.json} | 0 keyboards/chouchou/rules.mk | 0 .../chromatonemini/{info.json => keyboard.json} | 0 keyboards/chromatonemini/rules.mk | 0 .../deck8/noleds/{info.json => keyboard.json} | 0 keyboards/churrosoft/deck8/noleds/rules.mk | 1 - .../deck8/rgb/{info.json => keyboard.json} | 0 keyboards/churrosoft/deck8/rgb/rules.mk | 1 - .../cipulot/60xt/{info.json => keyboard.json} | 0 keyboards/cipulot/60xt/rules.mk | 0 .../erdnuss65/{info.json => keyboard.json} | 0 keyboards/citrus/erdnuss65/rules.mk | 0 .../leeloo/rev1/{info.json => keyboard.json} | 0 keyboards/clickety_split/leeloo/rev1/rules.mk | 1 - .../leeloo/rev2/{info.json => keyboard.json} | 0 keyboards/clickety_split/leeloo/rev2/rules.mk | 1 - .../leeloo/rev3/{info.json => keyboard.json} | 0 keyboards/clickety_split/leeloo/rev3/rules.mk | 1 - .../clueboard/17/{info.json => keyboard.json} | 0 keyboards/clueboard/17/rules.mk | 0 .../2x1800/2018/{info.json => keyboard.json} | 0 keyboards/clueboard/2x1800/2018/rules.mk | 1 - .../2x1800/2019/{info.json => keyboard.json} | 0 keyboards/clueboard/2x1800/2019/rules.mk | 1 - .../66/rev1/{info.json => keyboard.json} | 0 keyboards/clueboard/66/rev1/rules.mk | 1 - .../66/rev2/{info.json => keyboard.json} | 0 keyboards/clueboard/66/rev2/rules.mk | 0 .../66/rev3/{info.json => keyboard.json} | 0 keyboards/clueboard/66/rev3/rules.mk | 0 .../66/rev4/{info.json => keyboard.json} | 0 keyboards/clueboard/66/rev4/rules.mk | 1 - .../gen1/{info.json => keyboard.json} | 0 keyboards/clueboard/66_hotswap/gen1/rules.mk | 0 .../california/{info.json => keyboard.json} | 0 keyboards/clueboard/california/rules.mk | 1 - .../clueboard/card/{info.json => keyboard.json} | 0 keyboards/clueboard/card/rules.mk | 0 .../coban/pad9a/{info.json => keyboard.json} | 0 keyboards/coban/pad9a/rules.mk | 0 .../compensator/{info.json => keyboard.json} | 0 keyboards/compensator/rules.mk | 1 - keyboards/contra/{info.json => keyboard.json} | 0 keyboards/contra/rules.mk | 1 - .../adb_usb/rev1/{info.json => keyboard.json} | 0 keyboards/converter/adb_usb/rev1/rules.mk | 0 .../adb_usb/rev2/{info.json => keyboard.json} | 0 keyboards/converter/adb_usb/rev2/rules.mk | 0 .../stowaway/{info.json => keyboard.json} | 0 keyboards/converter/palm_usb/stowaway/rules.mk | 0 .../sun_usb/type3/{info.json => keyboard.json} | 0 keyboards/converter/sun_usb/type3/rules.mk | 0 .../sun_usb/type5/{info.json => keyboard.json} | 0 keyboards/converter/sun_usb/type5/rules.mk | 0 .../usb_usb/hasu/{info.json => keyboard.json} | 0 keyboards/converter/usb_usb/hasu/rules.mk | 1 - .../leonardo/{info.json => keyboard.json} | 0 keyboards/converter/usb_usb/leonardo/rules.mk | 1 - keyboards/cradio/{info.json => keyboard.json} | 0 keyboards/cradio/rules.mk | 1 - .../crkbd/r2g/{info.json => keyboard.json} | 0 keyboards/crkbd/r2g/rules.mk | 0 .../crkbd/rev1/{info.json => keyboard.json} | 0 keyboards/crkbd/rev1/rules.mk | 0 .../crowboard/{info.json => keyboard.json} | 0 keyboards/crowboard/rules.mk | 1 - .../custommk/evo70/{info.json => keyboard.json} | 0 keyboards/custommk/evo70/rules.mk | 1 - .../genesis/rev1/{info.json => keyboard.json} | 0 keyboards/custommk/genesis/rev1/rules.mk | 0 .../fidelity/{info.json => keyboard.json} | 0 keyboards/cutie_club/fidelity/rules.mk | 1 - .../cxt_studio/{info.json => keyboard.json} | 0 keyboards/cxt_studio/rules.mk | 1 - .../bat43/rev1/{info.json => keyboard.json} | 0 keyboards/dailycraft/bat43/rev1/rules.mk | 1 - .../bat43/rev2/{info.json => keyboard.json} | 0 keyboards/dailycraft/bat43/rev2/rules.mk | 1 - .../sandbox/rev1/{info.json => keyboard.json} | 0 keyboards/dailycraft/sandbox/rev1/rules.mk | 0 .../wings42/rev1/{info.json => keyboard.json} | 0 keyboards/dailycraft/wings42/rev1/rules.mk | 0 .../rev1_extkeys/{info.json => keyboard.json} | 0 .../dailycraft/wings42/rev1_extkeys/rules.mk | 0 .../wings42/rev2/{info.json => keyboard.json} | 0 keyboards/dailycraft/wings42/rev2/rules.mk | 0 .../magnum_ergo_1/{info.json => keyboard.json} | 0 keyboards/dark/magnum_ergo_1/rules.mk | 0 .../{info.json => keyboard.json} | 0 .../darkproject/kd83a_bfg_edition/rules.mk | 1 - .../{info.json => keyboard.json} | 0 .../darkproject/kd87a_bfg_edition/rules.mk | 1 - .../darmoshark/k3/{info.json => keyboard.json} | 0 keyboards/darmoshark/k3/rules.mk | 1 - .../de60fs/{info.json => keyboard.json} | 0 keyboards/deemen17/de60fs/rules.mk | 1 - .../duckypad/{info.json => keyboard.json} | 0 keyboards/dekunukem/duckypad/rules.mk | 1 - .../alveus/mx/{info.json => keyboard.json} | 0 keyboards/densus/alveus/mx/rules.mk | 1 - .../dnworks/9973/{info.json => keyboard.json} | 0 keyboards/dnworks/9973/rules.mk | 1 - .../dnworks/frltkl/{info.json => keyboard.json} | 0 keyboards/dnworks/frltkl/rules.mk | 1 - .../dnworks/numpad/{info.json => keyboard.json} | 0 keyboards/dnworks/numpad/rules.mk | 1 - .../dnworks/sbl/{info.json => keyboard.json} | 0 keyboards/dnworks/sbl/rules.mk | 1 - .../doio/kb04/{info.json => keyboard.json} | 0 keyboards/doio/kb04/rules.mk | 1 - .../doio/kb12/{info.json => keyboard.json} | 0 keyboards/doio/kb12/rules.mk | 1 - .../doio/kb19/{info.json => keyboard.json} | 0 keyboards/doio/kb19/rules.mk | 1 - .../doio/kb3x/{info.json => keyboard.json} | 0 keyboards/doio/kb3x/rules.mk | 1 - .../dymium65/{info.json => keyboard.json} | 0 keyboards/dotmod/dymium65/rules.mk | 1 - .../dp3000/rev1/{info.json => keyboard.json} | 0 keyboards/dp3000/rev1/rules.mk | 1 - .../dp3000/rev2/{info.json => keyboard.json} | 0 keyboards/dp3000/rev2/rules.mk | 1 - .../mercury65/{info.json => keyboard.json} | 0 keyboards/drewkeys/mercury65/rules.mk | 1 - .../ogurec/left_pm/{info.json => keyboard.json} | 0 keyboards/drhigsby/ogurec/left_pm/rules.mk | 0 .../right_pm/{info.json => keyboard.json} | 0 keyboards/drhigsby/ogurec/right_pm/rules.mk | 0 .../drop/thekey/v1/{info.json => keyboard.json} | 0 keyboards/drop/thekey/v1/rules.mk | 1 - .../drop/thekey/v2/{info.json => keyboard.json} | 0 keyboards/drop/thekey/v2/rules.mk | 1 - .../dgk6x/galaxy/{info.json => keyboard.json} | 0 keyboards/durgod/dgk6x/galaxy/rules.mk | 0 .../hades_ansi/{info.json => keyboard.json} | 0 keyboards/durgod/dgk6x/hades_ansi/rules.mk | 0 .../hades_iso/{info.json => keyboard.json} | 0 keyboards/durgod/dgk6x/hades_iso/rules.mk | 1 - .../dgk6x/venus/{info.json => keyboard.json} | 0 keyboards/durgod/dgk6x/venus/rules.mk | 0 .../dztech/dz60v2/{info.json => keyboard.json} | 0 keyboards/dztech/dz60v2/rules.mk | 1 - .../dztech/pluto/{info.json => keyboard.json} | 0 keyboards/dztech/pluto/rules.mk | 1 - .../tofu/ii/v1/{info.json => keyboard.json} | 0 keyboards/dztech/tofu/ii/v1/rules.mk | 0 .../tofu/jr/v1/{info.json => keyboard.json} | 0 keyboards/dztech/tofu/jr/v1/rules.mk | 0 .../tofu/jr/v2/{info.json => keyboard.json} | 0 keyboards/dztech/tofu/jr/v2/rules.mk | 1 - .../dztech/tofu60/{info.json => keyboard.json} | 0 keyboards/dztech/tofu60/rules.mk | 0 .../e80_1800/{info.json => keyboard.json} | 0 keyboards/ebastler/e80_1800/rules.mk | 1 - .../eek/silk_down/{info.json => keyboard.json} | 0 keyboards/eek/silk_down/rules.mk | 0 .../eek/silk_up/{info.json => keyboard.json} | 0 keyboards/eek/silk_up/rules.mk | 0 .../egg58/{info.json => keyboard.json} | 0 keyboards/eggsworks/egg58/rules.mk | 1 - .../ekow/akira/{info.json => keyboard.json} | 0 keyboards/ekow/akira/rules.mk | 1 - .../60f/{info.json => keyboard.json} | 0 keyboards/enviousdesign/60f/rules.mk | 1 - .../65m/{info.json => keyboard.json} | 0 keyboards/enviousdesign/65m/rules.mk | 1 - .../mini1800/{info.json => keyboard.json} | 0 .../enviousdesign/commissions/mini1800/rules.mk | 1 - .../delirium/rev0/{info.json => keyboard.json} | 0 keyboards/enviousdesign/delirium/rev0/rules.mk | 1 - .../delirium/rev1/{info.json => keyboard.json} | 0 keyboards/enviousdesign/delirium/rev1/rules.mk | 1 - .../delirium/rgb/{info.json => keyboard.json} | 0 keyboards/enviousdesign/delirium/rgb/rules.mk | 1 - .../mcro/rev1/{info.json => keyboard.json} | 0 keyboards/enviousdesign/mcro/rev1/rules.mk | 1 - .../era/divine/{info.json => keyboard.json} | 0 keyboards/era/divine/rules.mk | 1 - .../era/era65/{info.json => keyboard.json} | 0 keyboards/era/era65/rules.mk | 0 .../sirind/brick65/{info.json => keyboard.json} | 0 keyboards/era/sirind/brick65/rules.mk | 1 - .../klein_hs/{info.json => keyboard.json} | 0 keyboards/era/sirind/klein_hs/rules.mk | 0 .../klein_sd/{info.json => keyboard.json} | 0 keyboards/era/sirind/klein_sd/rules.mk | 1 - .../base/{info.json => keyboard.json} | 0 keyboards/ergodox_ez/base/rules.mk | 0 .../ergoslab/rev1/{info.json => keyboard.json} | 0 keyboards/ergoslab/rev1/rules.mk | 3 --- .../wave/{info.json => keyboard.json} | 0 keyboards/etiennecollin/wave/rules.mk | 1 - .../evyd13/fin_pad/{info.json => keyboard.json} | 0 keyboards/evyd13/fin_pad/rules.mk | 1 - .../evyd13/nt210/{info.json => keyboard.json} | 0 keyboards/evyd13/nt210/rules.mk | 1 - .../evyd13/nt650/{info.json => keyboard.json} | 0 keyboards/evyd13/nt650/rules.mk | 1 - .../e85/hotswap/{info.json => keyboard.json} | 0 keyboards/exclusive/e85/hotswap/rules.mk | 0 .../e85/soldered/{info.json => keyboard.json} | 0 keyboards/exclusive/e85/soldered/rules.mk | 0 .../humble40/{info.json => keyboard.json} | 0 keyboards/eyeohdesigns/humble40/rules.mk | 1 - .../promicro/{info.json => keyboard.json} | 0 keyboards/ez_maker/directpins/promicro/rules.mk | 1 - .../proton_c/{info.json => keyboard.json} | 0 keyboards/ez_maker/directpins/proton_c/rules.mk | 1 - .../rp2040/{info.json => keyboard.json} | 0 keyboards/ez_maker/directpins/rp2040/rules.mk | 1 - .../teensy_2/{info.json => keyboard.json} | 0 keyboards/ez_maker/directpins/teensy_2/rules.mk | 1 - .../teensy_2pp/{info.json => keyboard.json} | 0 .../ez_maker/directpins/teensy_2pp/rules.mk | 1 - .../fancyalice66/{info.json => keyboard.json} | 0 keyboards/fancytech/fancyalice66/rules.mk | 1 - .../0_2/base/{info.json => keyboard.json} | 0 keyboards/ferris/0_2/base/rules.mk | 0 .../0_2/compact/{info.json => keyboard.json} | 0 keyboards/ferris/0_2/compact/rules.mk | 0 .../0_2/high/{info.json => keyboard.json} | 0 keyboards/ferris/0_2/high/rules.mk | 0 .../0_2/mini/{info.json => keyboard.json} | 0 keyboards/ferris/0_2/mini/rules.mk | 0 .../ferris/sweep/{info.json => keyboard.json} | 0 keyboards/ferris/sweep/rules.mk | 1 - .../horizon_z/{info.json => keyboard.json} | 0 keyboards/flashquark/horizon_z/rules.mk | 0 .../for_science/{info.json => keyboard.json} | 0 keyboards/for_science/rules.mk | 1 - .../forever65/{info.json => keyboard.json} | 0 keyboards/forever65/rules.mk | 1 - .../rev1/{info.json => keyboard.json} | 0 keyboards/fortitude60/rev1/rules.mk | 3 --- .../blackflat/{info.json => keyboard.json} | 0 keyboards/frobiac/blackflat/rules.mk | 1 - .../hypernano/{info.json => keyboard.json} | 0 keyboards/frobiac/hypernano/rules.mk | 1 - .../redtilt/{info.json => keyboard.json} | 0 keyboards/frobiac/redtilt/rules.mk | 1 - .../r1/elite_c/{info.json => keyboard.json} | 0 .../fruitykeeb/fruitbar/r1/elite_c/rules.mk | 1 - .../r1/promicro/{info.json => keyboard.json} | 0 .../fruitykeeb/fruitbar/r1/promicro/rules.mk | 1 - .../fruitbar/r2/{info.json => keyboard.json} | 0 keyboards/fruitykeeb/fruitbar/r2/rules.mk | 1 - .../fs_streampad/{info.json => keyboard.json} | 0 keyboards/fs_streampad/rules.mk | 1 - .../glyphkbd_v2/{info.json => keyboard.json} | 0 keyboards/galile0/glyphkbd_v2/rules.mk | 1 - .../geist/{info.json => keyboard.json} | 0 keyboards/geistmaschine/geist/rules.mk | 1 - .../hotswap_ansi/{info.json => keyboard.json} | 0 keyboards/ghs/jem/hotswap_ansi/rules.mk | 1 - .../jem/soldered/{info.json => keyboard.json} | 0 keyboards/ghs/jem/soldered/rules.mk | 1 - keyboards/ghs/xls/{info.json => keyboard.json} | 0 keyboards/ghs/xls/rules.mk | 1 - .../gpad8_2r/{info.json => keyboard.json} | 0 keyboards/gkeyboard/gpad8_2r/rules.mk | 0 .../greatpad/{info.json => keyboard.json} | 0 keyboards/gkeyboard/greatpad/rules.mk | 1 - .../gl516/xr63gl/{info.json => keyboard.json} | 0 keyboards/gl516/xr63gl/rules.mk | 1 - .../think65v3/{info.json => keyboard.json} | 0 keyboards/gray_studio/think65v3/rules.mk | 1 - keyboards/hackpad/{info.json => keyboard.json} | 0 keyboards/hackpad/rules.mk | 1 - .../rev1/{info.json => keyboard.json} | 0 keyboards/handwired/3dortho14u/rev1/rules.mk | 1 - .../rev2/{info.json => keyboard.json} | 0 keyboards/handwired/3dortho14u/rev2/rules.mk | 1 - .../3dp660_oled/{info.json => keyboard.json} | 0 keyboards/handwired/3dp660_oled/rules.mk | 1 - .../baredev/rev1/{info.json => keyboard.json} | 0 keyboards/handwired/baredev/rev1/rules.mk | 0 .../dactyl_cc/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_cc/rules.mk | 0 .../dactyl_kinesis/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_kinesis/rules.mk | 1 - .../{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_lightcycle/rules.mk | 0 .../4x6_4_3/{info.json => keyboard.json} | 0 .../handwired/dactyl_manuform/4x6_4_3/rules.mk | 1 - .../5x6_68/{info.json => keyboard.json} | 0 .../handwired/dactyl_manuform/5x6_68/rules.mk | 1 - .../6x6/promicro/{info.json => keyboard.json} | 0 .../dactyl_manuform/6x6/promicro/rules.mk | 0 .../6x7/{info.json => keyboard.json} | 0 .../handwired/dactyl_manuform/6x7/rules.mk | 0 .../dactyl_maximus/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_maximus/rules.mk | 1 - .../dactyl_minidox/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_minidox/rules.mk | 1 - .../dactyl_tracer/{info.json => keyboard.json} | 0 keyboards/handwired/dactyl_tracer/rules.mk | 1 - .../dactylmacropad/{info.json => keyboard.json} | 0 keyboards/handwired/dactylmacropad/rules.mk | 1 - .../daskeyboard4/{info.json => keyboard.json} | 0 .../handwired/daskeyboard/daskeyboard4/rules.mk | 1 - .../dmote/{info.json => keyboard.json} | 0 keyboards/handwired/dmote/rules.mk | 1 - .../raise/ansi/{info.json => keyboard.json} | 0 keyboards/handwired/dygma/raise/ansi/rules.mk | 0 .../raise/iso/{info.json => keyboard.json} | 0 keyboards/handwired/dygma/raise/iso/rules.mk | 0 .../iso85k/{info.json => keyboard.json} | 0 keyboards/handwired/iso85k/rules.mk | 1 - .../promicro/{info.json => keyboard.json} | 0 keyboards/handwired/itstleo9/promicro/rules.mk | 1 - .../rp2040/{info.json => keyboard.json} | 0 keyboards/handwired/itstleo9/rp2040/rules.mk | 1 - .../jotanck/{info.json => keyboard.json} | 0 keyboards/handwired/jotanck/rules.mk | 1 - .../jotlily60/{info.json => keyboard.json} | 0 keyboards/handwired/jotlily60/rules.mk | 1 - .../macro3/{info.json => keyboard.json} | 0 keyboards/handwired/macro3/rules.mk | 1 - .../ergosplit44/{info.json => keyboard.json} | 0 .../handwired/marek128b/ergosplit44/rules.mk | 1 - .../keydeck8/{info.json => keyboard.json} | 0 .../handwired/maverick0197/keydeck8/rules.mk | 1 - .../astar/{info.json => keyboard.json} | 0 .../handwired/ms_sculpt_mobile/astar/rules.mk | 0 .../teensy2pp/{info.json => keyboard.json} | 0 .../ms_sculpt_mobile/teensy2pp/rules.mk | 0 .../nortontechpad/{info.json => keyboard.json} | 0 keyboards/handwired/nortontechpad/rules.mk | 1 - .../bluepill/{info.json => keyboard.json} | 0 keyboards/handwired/onekey/bluepill/rules.mk | 1 - .../{info.json => keyboard.json} | 0 .../handwired/onekey/bluepill_uf2boot/rules.mk | 1 - .../onekey/elite_c/{info.json => keyboard.json} | 0 keyboards/handwired/onekey/elite_c/rules.mk | 0 .../nucleo_f446re/{info.json => keyboard.json} | 0 .../handwired/onekey/nucleo_f446re/rules.mk | 0 .../nucleo_g431rb/{info.json => keyboard.json} | 0 .../handwired/onekey/nucleo_g431rb/rules.mk | 0 .../nucleo_g474re/{info.json => keyboard.json} | 0 .../handwired/onekey/nucleo_g474re/rules.mk | 0 .../nucleo_h723zg/{info.json => keyboard.json} | 0 .../handwired/onekey/nucleo_h723zg/rules.mk | 0 .../nucleo_l432kc/{info.json => keyboard.json} | 0 .../handwired/onekey/nucleo_l432kc/rules.mk | 0 .../promicro/{info.json => keyboard.json} | 0 keyboards/handwired/onekey/promicro/rules.mk | 0 .../proton_c/{info.json => keyboard.json} | 0 keyboards/handwired/onekey/proton_c/rules.mk | 0 .../onekey/rp2040/{info.json => keyboard.json} | 0 keyboards/handwired/onekey/rp2040/rules.mk | 0 .../stm32f0_disco/{info.json => keyboard.json} | 0 .../handwired/onekey/stm32f0_disco/rules.mk | 1 - .../stm32f3_disco/{info.json => keyboard.json} | 0 .../handwired/onekey/stm32f3_disco/rules.mk | 0 .../{info.json => keyboard.json} | 0 .../handwired/onekey/stm32f405_feather/rules.mk | 1 - .../teensy_2/{info.json => keyboard.json} | 0 keyboards/handwired/onekey/teensy_2/rules.mk | 0 .../teensy_2pp/{info.json => keyboard.json} | 0 keyboards/handwired/onekey/teensy_2pp/rules.mk | 0 .../teensy_32/{info.json => keyboard.json} | 0 keyboards/handwired/onekey/teensy_32/rules.mk | 1 - .../teensy_35/{info.json => keyboard.json} | 0 keyboards/handwired/onekey/teensy_35/rules.mk | 1 - .../petruziamini/{info.json => keyboard.json} | 0 keyboards/handwired/petruziamini/rules.mk | 1 - .../baragon/{info.json => keyboard.json} | 0 keyboards/handwired/phantagom/baragon/rules.mk | 1 - .../varan/{info.json => keyboard.json} | 0 keyboards/handwired/phantagom/varan/rules.mk | 1 - .../bluepill/{info.json => keyboard.json} | 0 keyboards/handwired/pill60/bluepill/rules.mk | 1 - .../polly40/{info.json => keyboard.json} | 0 keyboards/handwired/polly40/rules.mk | 1 - .../pytest/basic/{info.json => keyboard.json} | 0 keyboards/handwired/pytest/basic/rules.mk | 0 .../has_community/{info.json => keyboard.json} | 0 .../handwired/pytest/has_community/rules.mk | 0 .../pytest/macro/{info.json => keyboard.json} | 0 keyboards/handwired/pytest/macro/rules.mk | 0 .../rotary_numpad/{info.json => keyboard.json} | 0 .../handwired/rabijl/rotary_numpad/rules.mk | 1 - .../rd_61_qmk/{info.json => keyboard.json} | 0 keyboards/handwired/rd_61_qmk/rules.mk | 1 - .../reclined/{info.json => keyboard.json} | 0 keyboards/handwired/reclined/rules.mk | 1 - .../scotto108/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scotto108/rules.mk | 1 - .../scotto34/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scotto34/rules.mk | 0 .../scotto36/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scotto36/rules.mk | 1 - .../scotto40/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scotto40/rules.mk | 1 - .../scotto61/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scotto61/rules.mk | 1 - .../scotto9/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scotto9/rules.mk | 1 - .../scottoalp/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scottoalp/rules.mk | 1 - .../scottocmd/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scottocmd/rules.mk | 1 - .../scottodeck/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scottodeck/rules.mk | 1 - .../scottoergo/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scottoergo/rules.mk | 1 - .../scottofly/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scottofly/rules.mk | 1 - .../scottofrog/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scottofrog/rules.mk | 1 - .../scottogame/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scottogame/rules.mk | 1 - .../scottoinvader/{info.json => keyboard.json} | 0 .../scottokeebs/scottoinvader/rules.mk | 1 - .../scottokatana/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scottokatana/rules.mk | 1 - .../scottolong/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scottolong/rules.mk | 1 - .../{info.json => keyboard.json} | 0 .../scottokeebs/scottomacrodeck/rules.mk | 0 .../scottomouse/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scottomouse/rules.mk | 1 - .../scottonum/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scottonum/rules.mk | 1 - .../scottosplit/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scottosplit/rules.mk | 1 - .../scottostarter/{info.json => keyboard.json} | 0 .../scottokeebs/scottostarter/rules.mk | 1 - .../scottowing/{info.json => keyboard.json} | 0 .../handwired/scottokeebs/scottowing/rules.mk | 1 - .../{info.json => keyboard.json} | 0 keyboards/handwired/sejin_eat1010r2/rules.mk | 1 - .../stm32f103/{info.json => keyboard.json} | 0 keyboards/handwired/sono1/stm32f103/rules.mk | 1 - .../sono1/t2pp/{info.json => keyboard.json} | 0 keyboards/handwired/sono1/t2pp/rules.mk | 0 .../split_cloud/{info.json => keyboard.json} | 0 keyboards/handwired/split_cloud/rules.mk | 0 .../bluepill/{info.json => keyboard.json} | 0 keyboards/handwired/splittest/bluepill/rules.mk | 1 - .../promicro/{info.json => keyboard.json} | 0 keyboards/handwired/splittest/promicro/rules.mk | 0 .../teensy_2/{info.json => keyboard.json} | 0 keyboards/handwired/splittest/teensy_2/rules.mk | 0 .../dude09/{info.json => keyboard.json} | 0 keyboards/handwired/starrykeebs/dude09/rules.mk | 1 - .../technicpad/{info.json => keyboard.json} | 0 keyboards/handwired/technicpad/rules.mk | 1 - .../handwired/tkk/{info.json => keyboard.json} | 0 keyboards/handwired/tkk/rules.mk | 1 - .../arduinomicro/{info.json => keyboard.json} | 0 .../5x6_right/arduinomicro/rules.mk | 0 .../teensy2pp/{info.json => keyboard.json} | 0 .../5x6_right/teensy2pp/rules.mk | 0 .../unk/rev1/{info.json => keyboard.json} | 0 keyboards/handwired/unk/rev1/rules.mk | 0 .../wakizashi40/{info.json => keyboard.json} | 0 keyboards/handwired/wakizashi40/rules.mk | 1 - .../wwa/helios/{info.json => keyboard.json} | 0 keyboards/handwired/wwa/helios/rules.mk | 1 - .../wwa/kepler/{info.json => keyboard.json} | 0 keyboards/handwired/wwa/kepler/rules.mk | 1 - .../wwa/mercury/{info.json => keyboard.json} | 0 keyboards/handwired/wwa/mercury/rules.mk | 1 - .../wwa/soyuz/{info.json => keyboard.json} | 0 keyboards/handwired/wwa/soyuz/rules.mk | 0 .../wwa/soyuzxl/{info.json => keyboard.json} | 0 keyboards/handwired/wwa/soyuzxl/rules.mk | 0 .../xealous/rev1/{info.json => keyboard.json} | 0 keyboards/handwired/xealous/rev1/rules.mk | 0 .../{info.json => keyboard.json} | 0 keyboards/handwired/ziyoulang_k3_mod/rules.mk | 1 - .../heliotrope/{info.json => keyboard.json} | 0 keyboards/heliotrope/rules.mk | 2 -- .../hhkb/ansi/32u4/{info.json => keyboard.json} | 0 keyboards/hhkb/ansi/32u4/rules.mk | 0 .../hineybush/h101/{info.json => keyboard.json} | 0 keyboards/hineybush/h101/rules.mk | 1 - .../h87_g2/{info.json => keyboard.json} | 0 keyboards/hineybush/h87_g2/rules.mk | 1 - .../hineybush/ibis/{info.json => keyboard.json} | 0 keyboards/hineybush/ibis/rules.mk | 1 - .../lightweight65/{info.json => keyboard.json} | 0 keyboards/holyswitch/lightweight65/rules.mk | 1 - .../rev1/hotswap/{info.json => keyboard.json} | 0 .../horrortroll/caticorn/rev1/hotswap/rules.mk | 1 - .../rev1/solder/{info.json => keyboard.json} | 0 .../horrortroll/caticorn/rev1/solder/rules.mk | 1 - .../hotdox76v2/{info.json => keyboard.json} | 0 keyboards/hotdox76v2/rules.mk | 0 keyboards/hubble/{info.json => keyboard.json} | 0 keyboards/hubble/rules.mk | 1 - .../model_m/modelh/{info.json => keyboard.json} | 0 keyboards/ibm/model_m/modelh/rules.mk | 0 .../bluepill/{info.json => keyboard.json} | 0 .../ibm/model_m_122/m122_3270/bluepill/rules.mk | 0 .../idank/spankbd/{info.json => keyboard.json} | 0 keyboards/idank/spankbd/rules.mk | 1 - .../idank/sweeq/{info.json => keyboard.json} | 0 keyboards/idank/sweeq/rules.mk | 1 - .../id80/v2/ansi/{info.json => keyboard.json} | 0 keyboards/idobao/id80/v2/ansi/rules.mk | 2 -- .../id80/v2/iso/{info.json => keyboard.json} | 0 keyboards/idobao/id80/v2/iso/rules.mk | 2 -- .../tinny50_rgb/{info.json => keyboard.json} | 0 keyboards/idyllic/tinny50_rgb/rules.mk | 0 keyboards/igloo/{info.json => keyboard.json} | 0 keyboards/igloo/rules.mk | 1 - .../{info.json => keyboard.json} | 0 .../inett_studio/sq80/hotswap_layout_i/rules.mk | 1 - .../inland/mk47/{info.json => keyboard.json} | 0 keyboards/inland/mk47/rules.mk | 1 - .../inland/v83p/{info.json => keyboard.json} | 0 keyboards/inland/v83p/rules.mk | 1 - .../infinity60/led/{info.json => keyboard.json} | 0 keyboards/input_club/infinity60/led/rules.mk | 0 .../rev1/{info.json => keyboard.json} | 0 keyboards/input_club/infinity60/rev1/rules.mk | 0 .../itstleo40/{info.json => keyboard.json} | 0 keyboards/itstleo/itstleo40/rules.mk | 1 - .../rev1/hotswap/{info.json => keyboard.json} | 0 .../jacky_studio/piggy60/rev1/hotswap/rules.mk | 1 - .../rev1/solder/{info.json => keyboard.json} | 0 .../jacky_studio/piggy60/rev1/solder/rules.mk | 1 - .../jkb65/r1/{info.json => keyboard.json} | 0 keyboards/jadookb/jkb65/r1/rules.mk | 0 .../jkb65/r2/{info.json => keyboard.json} | 0 keyboards/jadookb/jkb65/r2/rules.mk | 0 .../jaykeeb/orba/{info.json => keyboard.json} | 0 keyboards/jaykeeb/orba/rules.mk | 1 - .../sebelas/{info.json => keyboard.json} | 0 keyboards/jaykeeb/sebelas/rules.mk | 1 - .../skyline/{info.json => keyboard.json} | 0 keyboards/jaykeeb/skyline/rules.mk | 1 - .../sriwedari70/{info.json => keyboard.json} | 0 keyboards/jaykeeb/sriwedari70/rules.mk | 1 - .../jaykeeb/tokki/{info.json => keyboard.json} | 0 keyboards/jaykeeb/tokki/rules.mk | 1 - .../jels/boaty/{info.json => keyboard.json} | 0 keyboards/jels/boaty/rules.mk | 1 - .../jels/jels60/v1/{info.json => keyboard.json} | 0 keyboards/jels/jels60/v1/rules.mk | 1 - .../jels/jels60/v2/{info.json => keyboard.json} | 0 keyboards/jels/jels60/v2/rules.mk | 1 - .../jidohun/km113/{info.json => keyboard.json} | 0 keyboards/jidohun/km113/rules.mk | 1 - .../jukaie/jk01/{info.json => keyboard.json} | 0 keyboards/jukaie/jk01/rules.mk | 1 - .../angel64/alpha/{info.json => keyboard.json} | 0 keyboards/kakunpc/angel64/alpha/rules.mk | 0 .../angel64/rev1/{info.json => keyboard.json} | 0 keyboards/kakunpc/angel64/rev1/rules.mk | 0 .../bahrnob/{info.json => keyboard.json} | 0 keyboards/kalakos/bahrnob/rules.mk | 1 - .../rev1/{info.json => keyboard.json} | 0 keyboards/kapcave/paladinpad/rev1/rules.mk | 0 .../rev2/{info.json => keyboard.json} | 0 keyboards/kapcave/paladinpad/rev2/rules.mk | 0 .../kb_elmo/bm42/{info.json => keyboard.json} | 0 keyboards/kb_elmo/bm42/rules.mk | 1 - .../dizzy40/{info.json => keyboard.json} | 0 keyboards/kb_elmo/dizzy40/rules.mk | 1 - .../kb_elmo/eliza/{info.json => keyboard.json} | 0 keyboards/kb_elmo/eliza/rules.mk | 1 - .../gamehand/{info.json => keyboard.json} | 0 keyboards/kb_elmo/gamehand/rules.mk | 1 - .../adam64/{info.json => keyboard.json} | 0 keyboards/kbdcraft/adam64/rules.mk | 1 - .../kbdfans/d45/v2/{info.json => keyboard.json} | 0 keyboards/kbdfans/d45/v2/rules.mk | 1 - .../kbd67/rev1/{info.json => keyboard.json} | 0 keyboards/kbdfans/kbd67/rev1/rules.mk | 1 - .../kbdpad/mk3/{info.json => keyboard.json} | 0 keyboards/kbdfans/kbdpad/mk3/rules.mk | 1 - .../odinmini/{info.json => keyboard.json} | 0 keyboards/kbdfans/odinmini/rules.mk | 0 .../tiger80/{info.json => keyboard.json} | 0 keyboards/kbdfans/tiger80/rules.mk | 0 .../keebio/bamfk1/{info.json => keyboard.json} | 0 keyboards/keebio/bamfk1/rules.mk | 1 - .../chocopad/rev1/{info.json => keyboard.json} | 0 keyboards/keebio/chocopad/rev1/rules.mk | 1 - .../chocopad/rev2/{info.json => keyboard.json} | 0 keyboards/keebio/chocopad/rev2/rules.mk | 1 - .../rev1/{info.json => keyboard.json} | 0 keyboards/keebio/convolution/rev1/rules.mk | 0 .../nyquistpad/{info.json => keyboard.json} | 0 keyboards/keebio/nyquistpad/rules.mk | 1 - .../sinc/rev1/{info.json => keyboard.json} | 0 keyboards/keebio/sinc/rev1/rules.mk | 1 - .../sinc/rev2/{info.json => keyboard.json} | 0 keyboards/keebio/sinc/rev2/rules.mk | 1 - .../freebird75/{info.json => keyboard.json} | 0 keyboards/keebsforall/freebird75/rules.mk | 1 - .../utopia88/{info.json => keyboard.json} | 0 keyboards/kelwin/utopia88/rules.mk | 1 - .../proto/{info.json => keyboard.json} | 0 keyboards/kepler_33/proto/rules.mk | 0 .../kimiko/rev1/{info.json => keyboard.json} | 0 keyboards/keycapsss/kimiko/rev1/rules.mk | 1 - .../kimiko/rev2/{info.json => keyboard.json} | 0 keyboards/keycapsss/kimiko/rev2/rules.mk | 1 - .../ansi/rgb/{info.json => keyboard.json} | 0 keyboards/keychron/c1_pro/ansi/rgb/rules.mk | 1 - .../ansi/white/{info.json => keyboard.json} | 0 keyboards/keychron/c1_pro/ansi/white/rules.mk | 1 - .../q0/base/{info.json => keyboard.json} | 0 keyboards/keychron/q0/base/rules.mk | 1 - .../q0/plus/{info.json => keyboard.json} | 0 keyboards/keychron/q0/plus/rules.mk | 1 - .../q1v1/ansi/{info.json => keyboard.json} | 0 keyboards/keychron/q1v1/ansi/rules.mk | 1 - .../ansi_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q1v1/ansi_encoder/rules.mk | 1 - .../q1v1/iso/{info.json => keyboard.json} | 0 keyboards/keychron/q1v1/iso/rules.mk | 1 - .../iso_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q1v1/iso_encoder/rules.mk | 2 -- .../q2/ansi/{info.json => keyboard.json} | 0 keyboards/keychron/q2/ansi/rules.mk | 1 - .../ansi_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q2/ansi_encoder/rules.mk | 1 - .../q2/iso/{info.json => keyboard.json} | 0 keyboards/keychron/q2/iso/rules.mk | 1 - .../q2/iso_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q2/iso_encoder/rules.mk | 1 - .../q2/jis/{info.json => keyboard.json} | 0 keyboards/keychron/q2/jis/rules.mk | 1 - .../q2/jis_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q2/jis_encoder/rules.mk | 1 - .../q3/ansi/{info.json => keyboard.json} | 0 keyboards/keychron/q3/ansi/rules.mk | 1 - .../q3/iso/{info.json => keyboard.json} | 0 keyboards/keychron/q3/iso/rules.mk | 1 - .../q3/jis/{info.json => keyboard.json} | 0 keyboards/keychron/q3/jis/rules.mk | 1 - .../q4/iso/{info.json => keyboard.json} | 0 keyboards/keychron/q4/iso/rules.mk | 1 - .../q7/ansi/{info.json => keyboard.json} | 0 keyboards/keychron/q7/ansi/rules.mk | 1 - .../q7/iso/{info.json => keyboard.json} | 0 keyboards/keychron/q7/iso/rules.mk | 1 - .../q8/ansi/{info.json => keyboard.json} | 0 keyboards/keychron/q8/ansi/rules.mk | 1 - .../ansi_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q8/ansi_encoder/rules.mk | 1 - .../q8/iso/{info.json => keyboard.json} | 0 keyboards/keychron/q8/iso/rules.mk | 1 - .../q8/iso_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q8/iso_encoder/rules.mk | 1 - .../q9/ansi/{info.json => keyboard.json} | 0 keyboards/keychron/q9/ansi/rules.mk | 1 - .../ansi_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q9/ansi_encoder/rules.mk | 1 - .../q9/iso/{info.json => keyboard.json} | 0 keyboards/keychron/q9/iso/rules.mk | 1 - .../q9/iso_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q9/iso_encoder/rules.mk | 1 - .../ansi_encoder/{info.json => keyboard.json} | 0 .../keychron/q9_plus/ansi_encoder/rules.mk | 0 .../kp60/{info.json => keyboard.json} | 0 keyboards/keyspensory/kp60/rules.mk | 1 - .../keyten/diablo/{info.json => keyboard.json} | 0 keyboards/keyten/diablo/rules.mk | 0 .../kt60hs_t/{info.json => keyboard.json} | 0 keyboards/keyten/kt60hs_t/rules.mk | 0 .../kezewa/enter67/{info.json => keyboard.json} | 0 keyboards/kezewa/enter67/rules.mk | 1 - .../kezewa/enter80/{info.json => keyboard.json} | 0 keyboards/kezewa/enter80/rules.mk | 1 - .../kibou/fukuro/{info.json => keyboard.json} | 0 keyboards/kibou/fukuro/rules.mk | 1 - .../kibou/harbour/{info.json => keyboard.json} | 0 keyboards/kibou/harbour/rules.mk | 1 - .../kibou/suisei/{info.json => keyboard.json} | 0 keyboards/kibou/suisei/rules.mk | 1 - .../kibou/wendy/{info.json => keyboard.json} | 0 keyboards/kibou/wendy/rules.mk | 1 - .../kibou/winter/{info.json => keyboard.json} | 0 keyboards/kibou/winter/rules.mk | 1 - .../blackpill103/{info.json => keyboard.json} | 0 keyboards/kin80/blackpill103/rules.mk | 1 - .../kin80/micro/{info.json => keyboard.json} | 0 keyboards/kin80/micro/rules.mk | 0 .../kint2pp/{info.json => keyboard.json} | 0 keyboards/kinesis/kint2pp/rules.mk | 0 .../kinesis/kint36/{info.json => keyboard.json} | 0 keyboards/kinesis/kint36/rules.mk | 0 .../kintwin/{info.json => keyboard.json} | 0 keyboards/kinesis/kintwin/rules.mk | 1 - .../stapelberg/{info.json => keyboard.json} | 0 keyboards/kinesis/stapelberg/rules.mk | 0 .../qtz/{info.json => keyboard.json} | 0 keyboards/kisakeyluxury/qtz/rules.mk | 1 - .../madeline/{info.json => keyboard.json} | 0 keyboards/kiserdesigns/madeline/rules.mk | 1 - .../kj_modify/rs40/{info.json => keyboard.json} | 0 keyboards/kj_modify/rs40/rules.mk | 1 - keyboards/kk/65/{info.json => keyboard.json} | 0 keyboards/kk/65/rules.mk | 1 - .../kopibeng/mnk60/{info.json => keyboard.json} | 0 keyboards/kopibeng/mnk60/rules.mk | 1 - .../mnk60_stm32/{info.json => keyboard.json} | 0 keyboards/kopibeng/mnk60_stm32/rules.mk | 1 - .../tgr_lena/{info.json => keyboard.json} | 0 keyboards/kopibeng/tgr_lena/rules.mk | 1 - .../bm16a/v1/{info.json => keyboard.json} | 0 keyboards/kprepublic/bm16a/v1/rules.mk | 1 - .../bm16a/v2/{info.json => keyboard.json} | 0 keyboards/kprepublic/bm16a/v2/rules.mk | 0 .../bm40hsrgb/rev2/{info.json => keyboard.json} | 0 keyboards/kprepublic/bm40hsrgb/rev2/rules.mk | 0 .../daughterboard/{info.json => keyboard.json} | 0 .../kprepublic/cstc40/daughterboard/rules.mk | 1 - .../single_pcb/{info.json => keyboard.json} | 0 keyboards/kprepublic/cstc40/single_pcb/rules.mk | 1 - .../kousa/{info.json => keyboard.json} | 0 keyboards/kradoindustries/kousa/rules.mk | 1 - .../krado66/{info.json => keyboard.json} | 0 keyboards/kradoindustries/krado66/rules.mk | 1 - .../promenade/{info.json => keyboard.json} | 0 keyboards/kradoindustries/promenade/rules.mk | 1 - .../pteron56/{info.json => keyboard.json} | 0 keyboards/kraken_jones/pteron56/rules.mk | 1 - .../kudox/columner/{info.json => keyboard.json} | 0 keyboards/kumaokobo/kudox/columner/rules.mk | 0 .../kudox/rev1/{info.json => keyboard.json} | 0 keyboards/kumaokobo/kudox/rev1/rules.mk | 0 .../kudox/rev2/{info.json => keyboard.json} | 0 keyboards/kumaokobo/kudox/rev2/rules.mk | 0 .../kudox/rev3/{info.json => keyboard.json} | 0 keyboards/kumaokobo/kudox/rev3/rules.mk | 0 .../rev1/{info.json => keyboard.json} | 0 keyboards/kumaokobo/kudox_game/rev1/rules.mk | 0 .../pico/65keys/{info.json => keyboard.json} | 0 keyboards/kumaokobo/pico/65keys/rules.mk | 0 .../pico/70keys/{info.json => keyboard.json} | 0 keyboards/kumaokobo/pico/70keys/rules.mk | 0 .../kuro/kuro65/{info.json => keyboard.json} | 0 keyboards/kuro/kuro65/rules.mk | 1 - .../pisces/{info.json => keyboard.json} | 0 keyboards/kwstudio/pisces/rules.mk | 1 - .../scorpio/{info.json => keyboard.json} | 0 keyboards/kwstudio/scorpio/rules.mk | 1 - .../scorpio_rev2/{info.json => keyboard.json} | 0 keyboards/kwstudio/scorpio_rev2/rules.mk | 1 - .../raindrop/{info.json => keyboard.json} | 0 keyboards/laneware/raindrop/rules.mk | 0 .../pumpkinpad/{info.json => keyboard.json} | 0 keyboards/laser_ninja/pumpkinpad/rules.mk | 1 - .../rpneko65/rev1/{info.json => keyboard.json} | 0 keyboards/lendunistus/rpneko65/rev1/rules.mk | 1 - .../rev1/{info.json => keyboard.json} | 0 keyboards/lets_split/rev1/rules.mk | 0 .../lfk65_hs/{info.json => keyboard.json} | 0 keyboards/lfkeyboards/lfk65_hs/rules.mk | 0 .../lfk78/revb/{info.json => keyboard.json} | 0 keyboards/lfkeyboards/lfk78/revb/rules.mk | 0 .../lfk78/revc/{info.json => keyboard.json} | 0 keyboards/lfkeyboards/lfk78/revc/rules.mk | 0 .../lfk87/reva/{info.json => keyboard.json} | 0 keyboards/lfkeyboards/lfk87/reva/rules.mk | 0 .../lfk87/revc/{info.json => keyboard.json} | 0 keyboards/lfkeyboards/lfk87/revc/rules.mk | 0 .../smk65/revb/{info.json => keyboard.json} | 0 keyboards/lfkeyboards/smk65/revb/rules.mk | 0 .../smk65/revf/{info.json => keyboard.json} | 0 keyboards/lfkeyboards/smk65/revf/rules.mk | 0 keyboards/lgbtkl/{info.json => keyboard.json} | 0 keyboards/lgbtkl/rules.mk | 1 - .../lily58/rev1/{info.json => keyboard.json} | 0 keyboards/lily58/rev1/rules.mk | 0 .../linworks/em8/{info.json => keyboard.json} | 0 keyboards/linworks/em8/rules.mk | 1 - .../fave60/{info.json => keyboard.json} | 0 keyboards/linworks/fave60/rules.mk | 0 .../fave60a/{info.json => keyboard.json} | 0 keyboards/linworks/fave60a/rules.mk | 0 .../favepada/{info.json => keyboard.json} | 0 keyboards/linworks/favepada/rules.mk | 0 keyboards/macrocat/{info.json => keyboard.json} | 0 keyboards/macrocat/rules.mk | 1 - .../mf17/{info.json => keyboard.json} | 0 keyboards/magic_force/mf17/rules.mk | 1 - .../omega/omega4/{info.json => keyboard.json} | 0 keyboards/makenova/omega/omega4/rules.mk | 1 - .../ivy/rev1/{info.json => keyboard.json} | 0 keyboards/maple_computing/ivy/rev1/rules.mk | 0 .../launchpad/rev1/{info.json => keyboard.json} | 0 .../maple_computing/launchpad/rev1/rules.mk | 0 .../prod/{info.json => keyboard.json} | 0 keyboards/mariorion_v25/prod/rules.mk | 1 - .../proto/{info.json => keyboard.json} | 0 keyboards/mariorion_v25/proto/rules.mk | 1 - .../rev1/{info.json => keyboard.json} | 0 keyboards/marksard/rhymestone/rev1/rules.mk | 0 .../lite/{info.json => keyboard.json} | 0 keyboards/marksard/treadstone32/lite/rules.mk | 0 .../rev1/{info.json => keyboard.json} | 0 keyboards/marksard/treadstone32/rev1/rules.mk | 0 .../rev1/{info.json => keyboard.json} | 0 keyboards/marksard/treadstone48/rev1/rules.mk | 3 --- .../flowerpad/{info.json => keyboard.json} | 0 keyboards/marshkeys/flowerpad/rules.mk | 1 - .../southpad/rev1/{info.json => keyboard.json} | 0 .../matchstickworks/southpad/rev1/rules.mk | 0 .../southpad/rev2/{info.json => keyboard.json} | 0 .../matchstickworks/southpad/rev2/rules.mk | 0 .../promicro/{info.json => keyboard.json} | 0 keyboards/maxipad/promicro/rules.mk | 0 .../teensy2/{info.json => keyboard.json} | 0 keyboards/maxipad/teensy2/rules.mk | 0 .../phoebe/{info.json => keyboard.json} | 0 keyboards/maxr1998/phoebe/rules.mk | 0 .../jocker/{info.json => keyboard.json} | 0 keyboards/mazestudio/jocker/rules.mk | 1 - .../g35/v1/{info.json => keyboard.json} | 0 keyboards/mechllama/g35/v1/rules.mk | 0 .../g35/v2/{info.json => keyboard.json} | 0 keyboards/mechllama/g35/v2/rules.mk | 0 .../arm/rev2/{info.json => keyboard.json} | 0 .../adelais/standard_led/arm/rev2/rules.mk | 0 .../rev4/apm32f103/{info.json => keyboard.json} | 0 .../standard_led/arm/rev4/apm32f103/rules.mk | 0 .../rev4/stm32f303/{info.json => keyboard.json} | 0 .../standard_led/arm/rev4/stm32f303/rules.mk | 0 .../rev1/haus/{info.json => keyboard.json} | 0 keyboards/mechlovin/hannah65/rev1/haus/rules.mk | 0 .../rev1/rogue87/{info.json => keyboard.json} | 0 .../mechlovin/infinity87/rev1/rogue87/rules.mk | 1 - .../rev1/rouge87/{info.json => keyboard.json} | 0 .../mechlovin/infinity87/rev1/rouge87/rules.mk | 1 - .../rev3/{info.json => keyboard.json} | 0 keyboards/mechlovin/mechlovin9/rev3/rules.mk | 0 .../olly/jf/rev2/{info.json => keyboard.json} | 0 keyboards/mechlovin/olly/jf/rev2/rules.mk | 1 - .../olly/octagon/{info.json => keyboard.json} | 0 keyboards/mechlovin/olly/octagon/rules.mk | 1 - .../zed1800/oreum/{info.json => keyboard.json} | 0 keyboards/mechlovin/zed1800/oreum/rules.mk | 0 .../zed1800/saber/{info.json => keyboard.json} | 0 keyboards/mechlovin/zed1800/saber/rules.mk | 0 .../zepsody/{info.json => keyboard.json} | 0 keyboards/mechlovin/zed1800/zepsody/rules.mk | 0 .../zed65/910/{info.json => keyboard.json} | 0 keyboards/mechlovin/zed65/910/rules.mk | 1 - .../cor65/{info.json => keyboard.json} | 0 .../mechlovin/zed65/no_backlight/cor65/rules.mk | 0 .../zed65/rev1/{info.json => keyboard.json} | 0 keyboards/mechlovin/zed65/rev1/rules.mk | 1 - .../bb40/f401/{info.json => keyboard.json} | 0 keyboards/mechwild/bb40/f401/rules.mk | 1 - .../bb40/f411/{info.json => keyboard.json} | 0 keyboards/mechwild/bb40/f411/rules.mk | 1 - .../bde/lefty/{info.json => keyboard.json} | 0 keyboards/mechwild/bde/lefty/rules.mk | 1 - .../bde/righty/{info.json => keyboard.json} | 0 keyboards/mechwild/bde/righty/rules.mk | 1 - .../obe/f401/{info.json => keyboard.json} | 0 keyboards/mechwild/obe/f401/rules.mk | 0 .../obe/f411/{info.json => keyboard.json} | 0 keyboards/mechwild/obe/f411/rules.mk | 0 .../waka60/f401/{info.json => keyboard.json} | 0 keyboards/mechwild/waka60/f401/rules.mk | 0 .../waka60/f411/{info.json => keyboard.json} | 0 keyboards/mechwild/waka60/f411/rules.mk | 0 .../kafka60/{info.json => keyboard.json} | 0 keyboards/meetlab/kafka60/rules.mk | 1 - .../kafka68/{info.json => keyboard.json} | 0 keyboards/meetlab/kafka68/rules.mk | 1 - .../meetlab/kalice/{info.json => keyboard.json} | 0 keyboards/meetlab/kalice/rules.mk | 1 - .../meetlab/rena/{info.json => keyboard.json} | 0 keyboards/meetlab/rena/rules.mk | 1 - .../zoom75/{info.json => keyboard.json} | 0 keyboards/meletrix/zoom75/rules.mk | 1 - .../zoom98/{info.json => keyboard.json} | 0 keyboards/meletrix/zoom98/rules.mk | 1 - .../millet/doksin/{info.json => keyboard.json} | 0 keyboards/millet/doksin/rules.mk | 0 .../ecila/{info.json => keyboard.json} | 0 keyboards/mincedshon/ecila/rules.mk | 1 - keyboards/mk65/{info.json => keyboard.json} | 0 keyboards/mk65/rules.mk | 1 - .../mlego/m65/rev1/{info.json => keyboard.json} | 0 keyboards/mlego/m65/rev1/rules.mk | 1 - .../mlego/m65/rev2/{info.json => keyboard.json} | 0 keyboards/mlego/m65/rev2/rules.mk | 1 - .../mlego/m65/rev3/{info.json => keyboard.json} | 0 keyboards/mlego/m65/rev3/rules.mk | 1 - .../mlego/m65/rev4/{info.json => keyboard.json} | 0 keyboards/mlego/m65/rev4/rules.mk | 0 keyboards/mntre_v3/{info.json => keyboard.json} | 0 keyboards/mntre_v3/rules.mk | 1 - .../mode/m256wh/{info.json => keyboard.json} | 0 keyboards/mode/m256wh/rules.mk | 0 .../mode/m256ws/{info.json => keyboard.json} | 0 keyboards/mode/m256ws/rules.mk | 0 .../mode/m60h/{info.json => keyboard.json} | 0 keyboards/mode/m60h/rules.mk | 1 - .../mode/m60h_f/{info.json => keyboard.json} | 0 keyboards/mode/m60h_f/rules.mk | 1 - .../mode/m60s/{info.json => keyboard.json} | 0 keyboards/mode/m60s/rules.mk | 1 - .../luckycat70/{info.json => keyboard.json} | 0 keyboards/mokey/luckycat70/rules.mk | 1 - .../mokey12x2/{info.json => keyboard.json} | 0 keyboards/mokey/mokey12x2/rules.mk | 1 - .../moky/moky88/{info.json => keyboard.json} | 0 keyboards/moky/moky88/rules.mk | 1 - .../momokai/aurora/{info.json => keyboard.json} | 0 keyboards/momokai/aurora/rules.mk | 1 - .../monsgeek/m1/{info.json => keyboard.json} | 0 keyboards/monsgeek/m1/rules.mk | 1 - .../monsgeek/m3/{info.json => keyboard.json} | 0 keyboards/monsgeek/m3/rules.mk | 1 - .../monsgeek/m5/{info.json => keyboard.json} | 0 keyboards/monsgeek/m5/rules.mk | 1 - .../monsgeek/m6/{info.json => keyboard.json} | 0 keyboards/monsgeek/m6/rules.mk | 1 - .../palmetto/{info.json => keyboard.json} | 0 keyboards/montsinger/palmetto/rules.mk | 1 - .../dash75/r1/{info.json => keyboard.json} | 0 keyboards/moondrop/dash75/r1/rules.mk | 2 -- keyboards/mothwing/{info.json => keyboard.json} | 0 keyboards/mothwing/rules.mk | 0 .../ms_sculpt/{info.json => keyboard.json} | 0 keyboards/ms_sculpt/rules.mk | 1 - .../mwstudio/mmk_3/{info.json => keyboard.json} | 0 keyboards/mwstudio/mmk_3/rules.mk | 1 - .../mwstudio/mw660/{info.json => keyboard.json} | 0 keyboards/mwstudio/mw660/rules.mk | 1 - .../mwstudio/mw80/{info.json => keyboard.json} | 0 keyboards/mwstudio/mw80/rules.mk | 0 keyboards/mxss/{info.json => keyboard.json} | 0 keyboards/mxss/rules.mk | 1 - .../bigsmoothknob/{info.json => keyboard.json} | 0 keyboards/nacly/bigsmoothknob/rules.mk | 1 - keyboards/navi60/{info.json => keyboard.json} | 0 keyboards/navi60/rules.mk | 1 - .../810e/{info.json => keyboard.json} | 0 keyboards/neson_design/810e/rules.mk | 1 - .../nico/{info.json => keyboard.json} | 0 keyboards/neson_design/nico/rules.mk | 0 .../n40_o/{info.json => keyboard.json} | 0 keyboards/nightly_boards/n40_o/rules.mk | 1 - .../tb16_rgb/{info.json => keyboard.json} | 0 keyboards/ning/tiny_board/tb16_rgb/rules.mk | 0 .../lilith/{info.json => keyboard.json} | 0 keyboards/nix_studio/lilith/rules.mk | 1 - .../nk65/base/{info.json => keyboard.json} | 0 keyboards/novelkeys/nk65/base/rules.mk | 0 .../nk65/v1_4/{info.json => keyboard.json} | 0 keyboards/novelkeys/nk65/v1_4/rules.mk | 1 - .../valhalla_v2/{info.json => keyboard.json} | 0 keyboards/noxary/valhalla_v2/rules.mk | 1 - .../null/st110r2/{info.json => keyboard.json} | 0 keyboards/null/st110r2/rules.mk | 1 - .../oddball/v1/{info.json => keyboard.json} | 0 keyboards/oddball/v1/rules.mk | 0 .../oddball/v2/{info.json => keyboard.json} | 0 keyboards/oddball/v2/rules.mk | 0 .../oddball/v2_1/{info.json => keyboard.json} | 0 keyboards/oddball/v2_1/rules.mk | 0 .../runner3680/3x6/{info.json => keyboard.json} | 0 keyboards/omkbd/runner3680/3x6/rules.mk | 0 .../runner3680/3x7/{info.json => keyboard.json} | 0 keyboards/omkbd/runner3680/3x7/rules.mk | 0 .../runner3680/3x8/{info.json => keyboard.json} | 0 keyboards/omkbd/runner3680/3x8/rules.mk | 0 .../runner3680/4x6/{info.json => keyboard.json} | 0 keyboards/omkbd/runner3680/4x6/rules.mk | 0 .../runner3680/4x7/{info.json => keyboard.json} | 0 keyboards/omkbd/runner3680/4x7/rules.mk | 0 .../runner3680/4x8/{info.json => keyboard.json} | 0 keyboards/omkbd/runner3680/4x8/rules.mk | 0 .../runner3680/5x6/{info.json => keyboard.json} | 0 keyboards/omkbd/runner3680/5x6/rules.mk | 0 .../5x6_5x8/{info.json => keyboard.json} | 0 keyboards/omkbd/runner3680/5x6_5x8/rules.mk | 0 .../runner3680/5x7/{info.json => keyboard.json} | 0 keyboards/omkbd/runner3680/5x7/rules.mk | 0 .../runner3680/5x8/{info.json => keyboard.json} | 0 keyboards/omkbd/runner3680/5x8/rules.mk | 0 .../orthograph/{info.json => keyboard.json} | 0 keyboards/orthograph/rules.mk | 1 - .../pangorin/tan67/{info.json => keyboard.json} | 0 keyboards/pangorin/tan67/rules.mk | 1 - .../brick/{info.json => keyboard.json} | 0 keyboards/pauperboards/brick/rules.mk | 1 - .../tripel/left/{info.json => keyboard.json} | 0 keyboards/peej/tripel/left/rules.mk | 1 - .../tripel/middle/{info.json => keyboard.json} | 0 keyboards/peej/tripel/middle/rules.mk | 1 - .../tripel/right/{info.json => keyboard.json} | 0 keyboards/peej/tripel/right/rules.mk | 1 - .../rpk_001/{info.json => keyboard.json} | 0 keyboards/phentech/rpk_001/rules.mk | 1 - .../pica40/rev1/{info.json => keyboard.json} | 0 keyboards/pica40/rev1/rules.mk | 0 keyboards/pinky/3/{info.json => keyboard.json} | 0 keyboards/pinky/3/rules.mk | 0 keyboards/pinky/4/{info.json => keyboard.json} | 0 keyboards/pinky/4/rules.mk | 0 .../shadow80/{info.json => keyboard.json} | 0 keyboards/pixelspace/shadow80/rules.mk | 1 - .../planck/ez/base/{info.json => keyboard.json} | 0 keyboards/planck/ez/base/rules.mk | 0 .../rev1_001/{info.json => keyboard.json} | 0 keyboards/ploopyco/madromys/rev1_001/rules.mk | 0 .../trackball/rev1/{info.json => keyboard.json} | 0 keyboards/ploopyco/trackball/rev1/rules.mk | 0 .../rev1_005/{info.json => keyboard.json} | 0 keyboards/ploopyco/trackball/rev1_005/rules.mk | 0 .../rev1_001/{info.json => keyboard.json} | 0 .../ploopyco/trackball_mini/rev1_001/rules.mk | 0 .../rev1_002/{info.json => keyboard.json} | 0 .../ploopyco/trackball_mini/rev1_002/rules.mk | 0 .../rev1_001/{info.json => keyboard.json} | 0 .../ploopyco/trackball_nano/rev1_001/rules.mk | 0 .../rev1_001/{info.json => keyboard.json} | 0 .../ploopyco/trackball_thumb/rev1_001/rules.mk | 0 keyboards/plum47/{info.json => keyboard.json} | 0 keyboards/plum47/rules.mk | 1 - .../plywrks/allaro/{info.json => keyboard.json} | 0 keyboards/plywrks/allaro/rules.mk | 1 - .../plywrks/ji_eun/{info.json => keyboard.json} | 0 keyboards/plywrks/ji_eun/rules.mk | 1 - .../plywrks/ply8x/{info.json => keyboard.json} | 0 keyboards/plywrks/ply8x/rules.mk | 1 - .../ktr1010/{info.json => keyboard.json} | 0 keyboards/primekb/meridian/ktr1010/rules.mk | 0 .../ws2812/{info.json => keyboard.json} | 0 keyboards/primekb/meridian/ws2812/rules.mk | 0 .../ortho/{info.json => keyboard.json} | 0 keyboards/program_yoink/ortho/rules.mk | 0 .../staggered/{info.json => keyboard.json} | 0 keyboards/program_yoink/staggered/rules.mk | 0 .../atmega32u4/{info.json => keyboard.json} | 0 .../projectcain/vault35/atmega32u4/rules.mk | 1 - .../{info.json => keyboard.json} | 0 keyboards/projectd/65/projectd_65_ansi/rules.mk | 1 - .../75/ansi/{info.json => keyboard.json} | 0 keyboards/projectd/75/ansi/rules.mk | 1 - .../proteus67/{info.json => keyboard.json} | 0 keyboards/proteus67/rules.mk | 1 - .../pt60/{info.json => keyboard.json} | 0 keyboards/prototypist/pt60/rules.mk | 3 --- .../pt80/{info.json => keyboard.json} | 0 keyboards/prototypist/pt80/rules.mk | 1 - keyboards/pteropus/{info.json => keyboard.json} | 0 keyboards/pteropus/rules.mk | 1 - keyboards/purin/{info.json => keyboard.json} | 0 keyboards/purin/rules.mk | 1 - keyboards/qck75/v1/{info.json => keyboard.json} | 0 keyboards/qck75/v1/rules.mk | 0 .../quadrum/delta/{info.json => keyboard.json} | 0 keyboards/quadrum/delta/rules.mk | 2 -- .../qk100/ansi/{info.json => keyboard.json} | 0 keyboards/qwertykeys/qk100/ansi/rules.mk | 1 - .../qk100/solder/{info.json => keyboard.json} | 0 keyboards/qwertykeys/qk100/solder/rules.mk | 1 - .../trailmix/{info.json => keyboard.json} | 0 keyboards/rainkeebs/trailmix/rules.mk | 1 - .../ramlord/witf/{info.json => keyboard.json} | 0 keyboards/ramlord/witf/rules.mk | 1 - .../rart/rart60/{info.json => keyboard.json} | 0 keyboards/rart/rart60/rules.mk | 1 - .../minitkl/{info.json => keyboard.json} | 0 keyboards/rastersoft/minitkl/rules.mk | 1 - .../rev1/base/{info.json => keyboard.json} | 0 keyboards/redox/rev1/base/rules.mk | 1 - .../redragon/k667/{info.json => keyboard.json} | 0 keyboards/redragon/k667/rules.mk | 1 - .../alish40/{info.json => keyboard.json} | 0 keyboards/reedskeebs/alish40/rules.mk | 1 - .../relapsekb/or87/{info.json => keyboard.json} | 0 keyboards/relapsekb/or87/rules.mk | 1 - .../rgbkb/mun/rev1/{info.json => keyboard.json} | 0 keyboards/rgbkb/mun/rev1/rules.mk | 0 .../rev1/proton_c/{info.json => keyboard.json} | 0 keyboards/rgbkb/pan/rev1/proton_c/rules.mk | 0 .../sol3/rev1/{info.json => keyboard.json} | 0 keyboards/rgbkb/sol3/rev1/rules.mk | 0 .../rgbkb/zen/rev1/{info.json => keyboard.json} | 0 keyboards/rgbkb/zen/rev1/rules.mk | 0 .../zygomorph/rev1/{info.json => keyboard.json} | 0 keyboards/rgbkb/zygomorph/rev1/rules.mk | 0 .../{info.json => keyboard.json} | 0 keyboards/rico/phoenix_project_no1/rules.mk | 1 - keyboards/rkg68/{info.json => keyboard.json} | 0 keyboards/rkg68/rules.mk | 1 - .../rmi_kb/equator/{info.json => keyboard.json} | 0 keyboards/rmi_kb/equator/rules.mk | 1 - .../tkl_ff/v1/{info.json => keyboard.json} | 0 keyboards/rmi_kb/tkl_ff/v1/rules.mk | 0 .../rm_fullsize/{info.json => keyboard.json} | 0 keyboards/rmkeebs/rm_fullsize/rules.mk | 1 - .../late9/rev1/{info.json => keyboard.json} | 0 keyboards/rookiebwoy/late9/rev1/rules.mk | 1 - .../rotc0n/{info.json => keyboard.json} | 0 keyboards/rot13labs/rotc0n/rules.mk | 1 - .../saevus/cor/{info.json => keyboard.json} | 0 keyboards/saevus/cor/rules.mk | 1 - .../saevus/cor_tkl/{info.json => keyboard.json} | 0 keyboards/saevus/cor_tkl/rules.mk | 0 .../fuji75/hotswap/{info.json => keyboard.json} | 0 .../sakura_workshop/fuji75/hotswap/rules.mk | 1 - .../fuji75/solder/{info.json => keyboard.json} | 0 .../sakura_workshop/fuji75/solder/rules.mk | 1 - .../7skb/rev1/{info.json => keyboard.json} | 0 keyboards/salicylic_acid3/7skb/rev1/rules.mk | 0 .../getta25/rev1/{info.json => keyboard.json} | 0 keyboards/salicylic_acid3/getta25/rev1/rules.mk | 3 --- .../guide68/{info.json => keyboard.json} | 0 keyboards/salicylic_acid3/guide68/rules.mk | 1 - .../jisplit89/rev1/{info.json => keyboard.json} | 0 .../salicylic_acid3/jisplit89/rev1/rules.mk | 0 .../naked48/rev1/{info.json => keyboard.json} | 0 keyboards/salicylic_acid3/naked48/rev1/rules.mk | 0 .../naked60/rev1/{info.json => keyboard.json} | 0 keyboards/salicylic_acid3/naked60/rev1/rules.mk | 0 .../naked64/rev1/{info.json => keyboard.json} | 0 keyboards/salicylic_acid3/naked64/rev1/rules.mk | 0 .../setta21/rev1/{info.json => keyboard.json} | 0 keyboards/salicylic_acid3/setta21/rev1/rules.mk | 0 .../macropad12/{info.json => keyboard.json} | 0 keyboards/sapuseven/macropad12/rules.mk | 1 - .../eclipse60/{info.json => keyboard.json} | 0 .../sawnsprojects/eclipse/eclipse60/rules.mk | 1 - .../tinyneko/{info.json => keyboard.json} | 0 .../sawnsprojects/eclipse/tinyneko/rules.mk | 1 - .../krush60/solder/{info.json => keyboard.json} | 0 .../sawnsprojects/krush/krush60/solder/rules.mk | 1 - .../stm32f072/{info.json => keyboard.json} | 0 .../sawnsprojects/okayu/stm32f072/rules.mk | 0 .../stm32f103/{info.json => keyboard.json} | 0 .../sawnsprojects/okayu/stm32f103/rules.mk | 0 .../stm32f303/{info.json => keyboard.json} | 0 .../sawnsprojects/okayu/stm32f303/rules.mk | 0 .../plaque80/{info.json => keyboard.json} | 0 keyboards/sawnsprojects/plaque80/rules.mk | 1 - .../re65/{info.json => keyboard.json} | 0 keyboards/sawnsprojects/re65/rules.mk | 1 - .../scotto34/{info.json => keyboard.json} | 0 keyboards/scottokeebs/scotto34/rules.mk | 1 - keyboards/sf2040/{info.json => keyboard.json} | 0 keyboards/sf2040/rules.mk | 1 - keyboards/sha/{info.json => keyboard.json} | 0 keyboards/sha/rules.mk | 1 - .../riot_pad/{info.json => keyboard.json} | 0 keyboards/shandoncodes/riot_pad/rules.mk | 1 - .../{info.json => keyboard.json} | 0 keyboards/sharkoon/skiller_sgk50_s3/rules.mk | 1 - .../shostudio/arc/{info.json => keyboard.json} | 0 keyboards/shostudio/arc/rules.mk | 1 - .../rev2/ansi/{info.json => keyboard.json} | 0 keyboards/sirius/uni660/rev2/ansi/rules.mk | 0 .../rev2/iso/{info.json => keyboard.json} | 0 keyboards/sirius/uni660/rev2/iso/rules.mk | 0 .../frost68/{info.json => keyboard.json} | 0 keyboards/skeletonkbd/frost68/rules.mk | 0 .../skme/zeno/{info.json => keyboard.json} | 0 keyboards/skme/zeno/rules.mk | 1 - .../skyloong/dt40/{info.json => keyboard.json} | 0 keyboards/skyloong/dt40/rules.mk | 1 - .../gk61/pro/{info.json => keyboard.json} | 0 keyboards/skyloong/gk61/pro/rules.mk | 1 - .../gk61/pro_48/{info.json => keyboard.json} | 0 keyboards/skyloong/gk61/pro_48/rules.mk | 1 - .../gk61/v1/{info.json => keyboard.json} | 0 keyboards/skyloong/gk61/v1/rules.mk | 1 - .../qk21/v1/{info.json => keyboard.json} | 0 keyboards/skyloong/qk21/v1/rules.mk | 1 - .../iron180v2/v2h/{info.json => keyboard.json} | 0 keyboards/smithrune/iron180v2/v2h/rules.mk | 1 - .../iron180v2/v2s/{info.json => keyboard.json} | 0 keyboards/smithrune/iron180v2/v2s/rules.mk | 1 - .../magnus/m75h/{info.json => keyboard.json} | 0 keyboards/smithrune/magnus/m75h/rules.mk | 1 - .../magnus/m75s/{info.json => keyboard.json} | 0 keyboards/smithrune/magnus/m75s/rules.mk | 1 - .../lefty/rev1/{info.json => keyboard.json} | 0 keyboards/smoll/lefty/rev1/rules.mk | 0 .../lefty/rev2/{info.json => keyboard.json} | 0 keyboards/smoll/lefty/rev2/rules.mk | 0 .../smoll/pw88/{info.json => keyboard.json} | 0 keyboards/smoll/pw88/rules.mk | 1 - .../sofle/keyhive/{info.json => keyboard.json} | 0 keyboards/sofle/keyhive/rules.mk | 1 - .../sofle/rev1/{info.json => keyboard.json} | 0 keyboards/sofle/rev1/rules.mk | 1 - .../sofle_choc/{info.json => keyboard.json} | 0 keyboards/sofle_choc/rules.mk | 0 keyboards/split67/{info.json => keyboard.json} | 0 keyboards/split67/rules.mk | 1 - .../corne/rev1/{info.json => keyboard.json} | 0 keyboards/splitkb/aurora/corne/rev1/rules.mk | 17 ----------------- .../helix/rev1/{info.json => keyboard.json} | 0 keyboards/splitkb/aurora/helix/rev1/rules.mk | 0 .../lily58/rev1/{info.json => keyboard.json} | 0 keyboards/splitkb/aurora/lily58/rev1/rules.mk | 17 ----------------- .../sofle_v2/rev1/{info.json => keyboard.json} | 0 keyboards/splitkb/aurora/sofle_v2/rev1/rules.mk | 0 .../sweep/rev1/{info.json => keyboard.json} | 0 keyboards/splitkb/aurora/sweep/rev1/rules.mk | 17 ----------------- .../rev1/base/{info.json => keyboard.json} | 0 keyboards/splitkb/kyria/rev1/base/rules.mk | 0 .../rev2/base/{info.json => keyboard.json} | 0 keyboards/splitkb/kyria/rev2/base/rules.mk | 0 .../kyria/rev3/{info.json => keyboard.json} | 0 keyboards/splitkb/kyria/rev3/rules.mk | 2 -- .../splitography/{info.json => keyboard.json} | 0 keyboards/splitography/rules.mk | 0 .../sthlmkb/litl/{info.json => keyboard.json} | 0 keyboards/sthlmkb/litl/rules.mk | 1 - .../soulstone/{info.json => keyboard.json} | 0 keyboards/strech/soulstone/rules.mk | 1 - .../frl84/{info.json => keyboard.json} | 0 keyboards/studiokestra/frl84/rules.mk | 1 - .../galatea/rev1/{info.json => keyboard.json} | 0 keyboards/studiokestra/galatea/rev1/rules.mk | 1 - .../galatea/rev2/{info.json => keyboard.json} | 0 keyboards/studiokestra/galatea/rev2/rules.mk | 1 - .../galatea/rev3/{info.json => keyboard.json} | 0 keyboards/studiokestra/galatea/rev3/rules.mk | 1 - .../{info.json => keyboard.json} | 0 .../studiokestra/line_friends_tkl/rules.mk | 1 - .../lancer/{info.json => keyboard.json} | 0 keyboards/subrezon/lancer/rules.mk | 1 - keyboards/swiss/{info.json => keyboard.json} | 0 keyboards/swiss/rules.mk | 1 - .../aswagata/{info.json => keyboard.json} | 0 keyboards/syenakeyboards/aswagata/rules.mk | 1 - .../bento_box/{info.json => keyboard.json} | 0 keyboards/synthandkeys/bento_box/rules.mk | 1 - .../the_debit_card/{info.json => keyboard.json} | 0 keyboards/synthandkeys/the_debit_card/rules.mk | 1 - .../synthlabs/060/{info.json => keyboard.json} | 0 keyboards/synthlabs/060/rules.mk | 0 .../synthlabs/065/{info.json => keyboard.json} | 0 keyboards/synthlabs/065/rules.mk | 0 .../tac_k1/{info.json => keyboard.json} | 0 keyboards/tacworks/tac_k1/rules.mk | 1 - .../baumkuchen/{info.json => keyboard.json} | 0 keyboards/takashicompany/baumkuchen/rules.mk | 1 - .../dogtag/{info.json => keyboard.json} | 0 keyboards/takashicompany/dogtag/rules.mk | 1 - .../ejectix/{info.json => keyboard.json} | 0 keyboards/takashicompany/ejectix/rules.mk | 1 - .../ergomirage/{info.json => keyboard.json} | 0 keyboards/takashicompany/ergomirage/rules.mk | 1 - .../goat51/{info.json => keyboard.json} | 0 keyboards/takashicompany/goat51/rules.mk | 1 - .../heavy_left/{info.json => keyboard.json} | 0 keyboards/takashicompany/heavy_left/rules.mk | 1 - .../minidivide/{info.json => keyboard.json} | 0 keyboards/takashicompany/minidivide/rules.mk | 1 - .../minidivide_max/{info.json => keyboard.json} | 0 .../takashicompany/minidivide_max/rules.mk | 1 - .../minizone/{info.json => keyboard.json} | 0 keyboards/takashicompany/minizone/rules.mk | 1 - .../rookey/{info.json => keyboard.json} | 0 keyboards/takashicompany/rookey/rules.mk | 1 - .../tightwriter/{info.json => keyboard.json} | 0 keyboards/takashicompany/tightwriter/rules.mk | 1 - .../rev1/{info.json => keyboard.json} | 0 keyboards/takashiski/namecard2x4/rev1/rules.mk | 0 .../rev2/{info.json => keyboard.json} | 0 keyboards/takashiski/namecard2x4/rev2/rules.mk | 0 keyboards/tau4/{info.json => keyboard.json} | 0 keyboards/tau4/rules.mk | 2 -- .../ayleen/{info.json => keyboard.json} | 0 keyboards/teahouse/ayleen/rules.mk | 1 - .../native/ansi/{info.json => keyboard.json} | 0 keyboards/teleport/native/ansi/rules.mk | 1 - .../native/iso/{info.json => keyboard.json} | 0 keyboards/teleport/native/iso/rules.mk | 1 - .../teleport/tkl/{info.json => keyboard.json} | 0 keyboards/teleport/tkl/rules.mk | 1 - keyboards/tg67/{info.json => keyboard.json} | 0 keyboards/tg67/rules.mk | 1 - .../ncc1701kb/v2/{info.json => keyboard.json} | 0 keyboards/themadnoodle/ncc1701kb/v2/rules.mk | 1 - .../noodlepad/v1/{info.json => keyboard.json} | 0 keyboards/themadnoodle/noodlepad/v1/rules.mk | 1 - .../noodlepad/v2/{info.json => keyboard.json} | 0 keyboards/themadnoodle/noodlepad/v2/rules.mk | 1 - .../{info.json => keyboard.json} | 0 keyboards/themadnoodle/noodlepad_micro/rules.mk | 2 -- .../udon13/{info.json => keyboard.json} | 0 keyboards/themadnoodle/udon13/rules.mk | 1 - keyboards/theone/{info.json => keyboard.json} | 0 keyboards/theone/rules.mk | 1 - .../rev1/{info.json => keyboard.json} | 0 keyboards/tkw/grandiceps/rev1/rules.mk | 0 .../v2/f411/{info.json => keyboard.json} | 0 keyboards/tkw/stoutgat/v2/f411/rules.mk | 0 .../le_chiffre/he/{info.json => keyboard.json} | 0 keyboards/tominabox1/le_chiffre/he/rules.mk | 1 - .../rev1/{info.json => keyboard.json} | 0 keyboards/tominabox1/le_chiffre/rev1/rules.mk | 1 - .../rev2/{info.json => keyboard.json} | 0 keyboards/tominabox1/le_chiffre/rev2/rules.mk | 1 - keyboards/trainpad/{info.json => keyboard.json} | 0 keyboards/trainpad/rules.mk | 1 - .../type9s3/{info.json => keyboard.json} | 0 keyboards/treasure/type9s3/rules.mk | 1 - .../chameleon/{info.json => keyboard.json} | 0 keyboards/tweetydabird/chameleon/rules.mk | 1 - .../lbs4/{info.json => keyboard.json} | 0 keyboards/tweetydabird/lbs4/rules.mk | 1 - .../lbs6/{info.json => keyboard.json} | 0 keyboards/tweetydabird/lbs6/rules.mk | 1 - .../elite_c/{info.json => keyboard.json} | 0 keyboards/tweetydabird/lotus58/elite_c/rules.mk | 1 - .../promicro/{info.json => keyboard.json} | 0 .../tweetydabird/lotus58/promicro/rules.mk | 1 - .../djinn/rev1/{info.json => keyboard.json} | 0 keyboards/tzarc/djinn/rev1/rules.mk | 1 - .../djinn/rev2/{info.json => keyboard.json} | 0 keyboards/tzarc/djinn/rev2/rules.mk | 1 - .../rev1/rp2040/{info.json => keyboard.json} | 0 keyboards/tzarc/ghoul/rev1/rp2040/rules.mk | 0 .../rev1/stm32/{info.json => keyboard.json} | 0 keyboards/tzarc/ghoul/rev1/stm32/rules.mk | 0 .../varanidae/{info.json => keyboard.json} | 0 keyboards/varanidae/rules.mk | 1 - .../vertex/cycle8/{info.json => keyboard.json} | 0 keyboards/vertex/cycle8/rules.mk | 1 - .../vertex/t75/{info.json => keyboard.json} | 0 keyboards/vertex/t75/rules.mk | 1 - .../viktus/minne/{info.json => keyboard.json} | 0 keyboards/viktus/minne/rules.mk | 1 - .../viktus/osav2/{info.json => keyboard.json} | 0 keyboards/viktus/osav2/rules.mk | 1 - .../osav2_numpad/{info.json => keyboard.json} | 0 keyboards/viktus/osav2_numpad/rules.mk | 1 - .../sp111_v2/{info.json => keyboard.json} | 0 keyboards/viktus/sp111_v2/rules.mk | 1 - .../one/{info.json => keyboard.json} | 0 keyboards/werk_technica/one/rules.mk | 1 - .../westm68/rev1/{info.json => keyboard.json} | 0 keyboards/westm/westm68/rev1/rules.mk | 0 .../westm68/rev2/{info.json => keyboard.json} | 0 keyboards/westm/westm68/rev2/rules.mk | 0 .../westm9/rev1/{info.json => keyboard.json} | 0 keyboards/westm/westm9/rev1/rules.mk | 0 .../westm9/rev2/{info.json => keyboard.json} | 0 keyboards/westm/westm9/rev2/rules.mk | 0 .../wt20_h1/{info.json => keyboard.json} | 0 keyboards/wilba_tech/wt20_h1/rules.mk | 1 - .../wt60_d/{info.json => keyboard.json} | 0 keyboards/wilba_tech/wt60_d/rules.mk | 1 - .../wt65_g3/{info.json => keyboard.json} | 0 keyboards/wilba_tech/wt65_g3/rules.mk | 1 - .../wt65_h2/{info.json => keyboard.json} | 0 keyboards/wilba_tech/wt65_h2/rules.mk | 1 - .../wt65_h3/{info.json => keyboard.json} | 0 keyboards/wilba_tech/wt65_h3/rules.mk | 1 - .../keypad/{info.json => keyboard.json} | 0 keyboards/willoucom/keypad/rules.mk | 1 - .../silhouette/{info.json => keyboard.json} | 0 keyboards/wolf/silhouette/rules.mk | 0 .../wolf/twilight/{info.json => keyboard.json} | 0 keyboards/wolf/twilight/rules.mk | 1 - .../wolf/ziggurat/{info.json => keyboard.json} | 0 keyboards/wolf/ziggurat/rules.mk | 1 - .../loop/rev1/{info.json => keyboard.json} | 0 keyboards/work_louder/loop/rev1/rules.mk | 0 .../loop/rev3/{info.json => keyboard.json} | 0 keyboards/work_louder/loop/rev3/rules.mk | 0 .../rev1/{info.json => keyboard.json} | 0 keyboards/work_louder/work_board/rev1/rules.mk | 0 .../rev3/{info.json => keyboard.json} | 0 keyboards/work_louder/work_board/rev3/rules.mk | 0 .../wuque/nemui65/{info.json => keyboard.json} | 0 keyboards/wuque/nemui65/rules.mk | 1 - .../transition80/{info.json => keyboard.json} | 0 keyboards/yandrstudio/transition80/rules.mk | 1 - .../unicorne/f411/{info.json => keyboard.json} | 0 keyboards/yanghu/unicorne/f411/rules.mk | 0 .../ydkb/ydpm40/{info.json => keyboard.json} | 0 keyboards/ydkb/ydpm40/rules.mk | 1 - .../hotswap/{info.json => keyboard.json} | 0 keyboards/ymdk/melody96/hotswap/rules.mk | 1 - .../yd60mq/12led/{info.json => keyboard.json} | 0 keyboards/ymdk/yd60mq/12led/rules.mk | 0 .../yd60mq/16led/{info.json => keyboard.json} | 0 keyboards/ymdk/yd60mq/16led/rules.mk | 0 .../ymdk/ymd09/{info.json => keyboard.json} | 0 keyboards/ymdk/ymd09/rules.mk | 1 - .../ymd75/rev4/iso/{info.json => keyboard.json} | 0 keyboards/ymdk/ymd75/rev4/iso/rules.mk | 1 - .../ergo68/{info.json => keyboard.json} | 0 keyboards/yushakobo/ergo68/rules.mk | 1 - .../navpad/10/rev0/{info.json => keyboard.json} | 0 keyboards/yushakobo/navpad/10/rev0/rules.mk | 0 .../navpad/10/rev1/{info.json => keyboard.json} | 0 keyboards/yushakobo/navpad/10/rev1/rules.mk | 0 .../rev1/{info.json => keyboard.json} | 0 keyboards/yynmt/acperience12/rev1/rules.mk | 0 .../zeix/eden/{info.json => keyboard.json} | 0 keyboards/zeix/eden/rules.mk | 1 - .../qwertyqop60hs/{info.json => keyboard.json} | 0 keyboards/zeix/qwertyqop60hs/rules.mk | 1 - .../tklfrlnrlmlao/{info.json => keyboard.json} | 0 keyboards/zicodia/tklfrlnrlmlao/rules.mk | 1 - .../zlabkeeb/15pad/{info.json => keyboard.json} | 0 keyboards/zlabkeeb/15pad/rules.mk | 1 - .../zlabkeeb/6pad/{info.json => keyboard.json} | 0 keyboards/zlabkeeb/6pad/rules.mk | 1 - keyboards/zos/65s/{info.json => keyboard.json} | 0 keyboards/zos/65s/rules.mk | 1 - .../zv48/f411/{info.json => keyboard.json} | 0 keyboards/zvecr/zv48/f411/rules.mk | 0 .../zwag/zwag75/{info.json => keyboard.json} | 0 keyboards/zwag/zwag75/rules.mk | 1 - .../zykrah/fuyu/{info.json => keyboard.json} | 0 keyboards/zykrah/fuyu/rules.mk | 0 .../zykrah/slime88/{info.json => keyboard.json} | 0 keyboards/zykrah/slime88/rules.mk | 1 - 1648 files changed, 606 deletions(-) rename keyboards/0_sixty/base/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/0_sixty/base/rules.mk rename keyboards/0_sixty/underglow/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/0_sixty/underglow/rules.mk rename keyboards/1upkeyboards/1upocarina/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/1upkeyboards/1upocarina/rules.mk rename keyboards/1upkeyboards/1upsuper16v3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/1upkeyboards/1upsuper16v3/rules.mk rename keyboards/1upkeyboards/pi40/grid_v1_1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk rename keyboards/1upkeyboards/pi40/mit_v1_0/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk rename keyboards/1upkeyboards/pi40/mit_v1_1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk rename keyboards/1upkeyboards/pi50/grid/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/1upkeyboards/pi50/grid/rules.mk rename keyboards/1upkeyboards/pi50/mit/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/1upkeyboards/pi50/mit/rules.mk rename keyboards/1upkeyboards/pi60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/1upkeyboards/pi60/rules.mk rename keyboards/1upkeyboards/pi60_hse/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/1upkeyboards/pi60_hse/rules.mk rename keyboards/1upkeyboards/pi60_rgb/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/1upkeyboards/pi60_rgb/rules.mk rename keyboards/1upkeyboards/pi60_rgb_v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/1upkeyboards/pi60_rgb_v2/rules.mk rename keyboards/1upkeyboards/sweet16v2/kb2040/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk rename keyboards/1upkeyboards/sweet16v2/pro_micro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk rename keyboards/40percentclub/i75/promicro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/40percentclub/i75/promicro/rules.mk rename keyboards/40percentclub/i75/teensy2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/40percentclub/i75/teensy2/rules.mk rename keyboards/40percentclub/polyandry/promicro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/40percentclub/polyandry/promicro/rules.mk rename keyboards/40percentclub/polyandry/teensy2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/40percentclub/polyandry/teensy2/rules.mk rename keyboards/8pack/rev11/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/8pack/rev11/rules.mk rename keyboards/8pack/rev12/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/8pack/rev12/rules.mk rename keyboards/a_dux/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/a_dux/rules.mk rename keyboards/abatskeyboardclub/nayeon/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/abatskeyboardclub/nayeon/rules.mk rename keyboards/abko/ak84bt/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/abko/ak84bt/rules.mk rename keyboards/acheron/themis/87h/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/acheron/themis/87h/rules.mk rename keyboards/acheron/themis/87htsc/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/acheron/themis/87htsc/rules.mk rename keyboards/acheron/themis/88htsc/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/acheron/themis/88htsc/rules.mk rename keyboards/adm42/rev4/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/adm42/rev4/rules.mk rename keyboards/ah/haven60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ah/haven60/rules.mk rename keyboards/ah/haven65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ah/haven65/rules.mk rename keyboards/ah/haven80/hotswap/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ah/haven80/hotswap/rules.mk rename keyboards/ah/haven80/solder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ah/haven80/solder/rules.mk rename keyboards/ai/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ai/rules.mk rename keyboards/ai03/duet/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ai03/duet/rules.mk rename keyboards/aidansmithdotdev/fine40/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/aidansmithdotdev/fine40/rules.mk rename keyboards/akb/ogr/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/akb/ogr/rules.mk rename keyboards/akb/ogrn/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/akb/ogrn/rules.mk rename keyboards/akb/vero/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/akb/vero/rules.mk rename keyboards/akko/5087/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/akko/5087/rules.mk rename keyboards/akko/5108/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/akko/5108/rules.mk rename keyboards/akko/acr87/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/akko/acr87/rules.mk rename keyboards/akko/top40/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/akko/top40/rules.mk rename keyboards/alhenkb/macropad5x4/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/alhenkb/macropad5x4/rules.mk rename keyboards/alpaca/wfeclipse/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/alpaca/wfeclipse/rules.mk rename keyboards/an_achronism/tetromino/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/an_achronism/tetromino/rules.mk rename keyboards/anavi/arrows/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/anavi/arrows/rules.mk rename keyboards/anavi/macropad10/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/anavi/macropad10/rules.mk rename keyboards/anavi/macropad12/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/anavi/macropad12/rules.mk rename keyboards/andean_condor/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/andean_condor/rules.mk rename keyboards/archetype/minervalx/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/archetype/minervalx/rules.mk rename keyboards/argo_works/ishi/80/mk0_avr/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/argo_works/ishi/80/mk0_avr/rules.mk rename keyboards/artemis/paragon/hotswap/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/artemis/paragon/hotswap/rules.mk rename keyboards/artemis/paragon/soldered/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/artemis/paragon/soldered/rules.mk rename keyboards/ask55/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ask55/rules.mk rename keyboards/atreus/astar/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/atreus/astar/rules.mk rename keyboards/atreus/astar_mirrored/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/atreus/astar_mirrored/rules.mk rename keyboards/atreus/promicro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/atreus/promicro/rules.mk rename keyboards/atreus/teensy2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/atreus/teensy2/rules.mk rename keyboards/atreyu/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/atreyu/rev1/rules.mk rename keyboards/atreyu/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/atreyu/rev2/rules.mk rename keyboards/automata02/alisaie/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/automata02/alisaie/rules.mk rename keyboards/bahm/aster_ergo/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/bahm/aster_ergo/rules.mk rename keyboards/balloondogcaps/tr90/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/balloondogcaps/tr90/rules.mk rename keyboards/balloondogcaps/tr90pm/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/balloondogcaps/tr90pm/rules.mk rename keyboards/bear_face/v1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/bear_face/v1/rules.mk rename keyboards/bear_face/v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/bear_face/v2/rules.mk rename keyboards/bestway/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/bestway/rules.mk rename keyboards/binepad/bn006/{info.json => keyboard.json} (100%) delete mode 100755 keyboards/binepad/bn006/rules.mk rename keyboards/binepad/bn009/r2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/binepad/bn009/r2/rules.mk rename keyboards/binepad/bnk9/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/binepad/bnk9/rules.mk rename keyboards/binepad/bnr1/v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/binepad/bnr1/v2/rules.mk rename keyboards/binepad/pixie/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/binepad/pixie/rules.mk rename keyboards/black_hellebore/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/black_hellebore/rules.mk rename keyboards/blu/vimclutch/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/blu/vimclutch/rules.mk rename keyboards/boardsource/3x4/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/boardsource/3x4/rules.mk rename keyboards/boardsource/4x12/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/boardsource/4x12/rules.mk rename keyboards/boardsource/5x12/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/boardsource/5x12/rules.mk rename keyboards/boardsource/beiwagon/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/boardsource/beiwagon/rules.mk rename keyboards/boardsource/equals/avr/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/boardsource/equals/avr/rules.mk rename keyboards/boardsource/holiday/spooky/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/boardsource/holiday/spooky/rules.mk rename keyboards/boardsource/lulu/avr/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/boardsource/lulu/avr/rules.mk rename keyboards/boardsource/microdox/v1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/boardsource/microdox/v1/rules.mk rename keyboards/boardsource/microdox/v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/boardsource/microdox/v2/rules.mk rename keyboards/boardsource/technik_o/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/boardsource/technik_o/rules.mk rename keyboards/boardsource/technik_s/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/boardsource/technik_s/rules.mk rename keyboards/boardsource/the_mark/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/boardsource/the_mark/rules.mk rename keyboards/bredworks/wyvern_hs/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/bredworks/wyvern_hs/rules.mk rename keyboards/bschwind/key_ripper/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/bschwind/key_ripper/rules.mk rename keyboards/buildakb/mw60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/buildakb/mw60/rules.mk rename keyboards/butterkeebs/pocketpad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/butterkeebs/pocketpad/rules.mk rename keyboards/cannonkeys/bastion60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/bastion60/rules.mk rename keyboards/cannonkeys/bastion65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/bastion65/rules.mk rename keyboards/cannonkeys/bastion75/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/bastion75/rules.mk rename keyboards/cannonkeys/bastiontkl/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/bastiontkl/rules.mk rename keyboards/cannonkeys/brutalv2_1800/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/brutalv2_1800/rules.mk rename keyboards/cannonkeys/brutalv2_60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/brutalv2_60/rules.mk rename keyboards/cannonkeys/caerdroia/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/caerdroia/rules.mk rename keyboards/cannonkeys/db60/hotswap/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/db60/hotswap/rules.mk rename keyboards/cannonkeys/db60/j02/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/db60/j02/rules.mk rename keyboards/cannonkeys/db60/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/db60/rev2/rules.mk rename keyboards/cannonkeys/ortho48v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/ortho48v2/rules.mk rename keyboards/cannonkeys/ortho60v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/ortho60v2/rules.mk rename keyboards/cannonkeys/satisfaction75/prototype/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/satisfaction75/prototype/rules.mk rename keyboards/cannonkeys/satisfaction75/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/satisfaction75/rev1/rules.mk rename keyboards/cannonkeys/satisfaction75/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/satisfaction75/rev2/rules.mk rename keyboards/cannonkeys/typeb/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/typeb/rules.mk rename keyboards/capsunlocked/cu75/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/capsunlocked/cu75/rules.mk rename keyboards/capsunlocked/cu80/v2/ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/capsunlocked/cu80/v2/ansi/rules.mk rename keyboards/capsunlocked/cu80/v2/iso/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/capsunlocked/cu80/v2/iso/rules.mk rename keyboards/chickenman/ciel65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/chickenman/ciel65/rules.mk rename keyboards/chlx/ppr_merro60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/chlx/ppr_merro60/rules.mk rename keyboards/chord/zero/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/chord/zero/rules.mk rename keyboards/chosfox/cf81/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/chosfox/cf81/rules.mk rename keyboards/chouchou/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/chouchou/rules.mk rename keyboards/chromatonemini/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/chromatonemini/rules.mk rename keyboards/churrosoft/deck8/noleds/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/churrosoft/deck8/noleds/rules.mk rename keyboards/churrosoft/deck8/rgb/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/churrosoft/deck8/rgb/rules.mk rename keyboards/cipulot/60xt/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cipulot/60xt/rules.mk rename keyboards/citrus/erdnuss65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/citrus/erdnuss65/rules.mk rename keyboards/clickety_split/leeloo/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/clickety_split/leeloo/rev1/rules.mk rename keyboards/clickety_split/leeloo/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/clickety_split/leeloo/rev2/rules.mk rename keyboards/clickety_split/leeloo/rev3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/clickety_split/leeloo/rev3/rules.mk rename keyboards/clueboard/17/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/clueboard/17/rules.mk rename keyboards/clueboard/2x1800/2018/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/clueboard/2x1800/2018/rules.mk rename keyboards/clueboard/2x1800/2019/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/clueboard/2x1800/2019/rules.mk rename keyboards/clueboard/66/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/clueboard/66/rev1/rules.mk rename keyboards/clueboard/66/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/clueboard/66/rev2/rules.mk rename keyboards/clueboard/66/rev3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/clueboard/66/rev3/rules.mk rename keyboards/clueboard/66/rev4/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/clueboard/66/rev4/rules.mk rename keyboards/clueboard/66_hotswap/gen1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/clueboard/66_hotswap/gen1/rules.mk rename keyboards/clueboard/california/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/clueboard/california/rules.mk rename keyboards/clueboard/card/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/clueboard/card/rules.mk rename keyboards/coban/pad9a/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/coban/pad9a/rules.mk rename keyboards/compensator/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/compensator/rules.mk rename keyboards/contra/{info.json => keyboard.json} (100%) delete mode 100755 keyboards/contra/rules.mk rename keyboards/converter/adb_usb/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/converter/adb_usb/rev1/rules.mk rename keyboards/converter/adb_usb/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/converter/adb_usb/rev2/rules.mk rename keyboards/converter/palm_usb/stowaway/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/converter/palm_usb/stowaway/rules.mk rename keyboards/converter/sun_usb/type3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/converter/sun_usb/type3/rules.mk rename keyboards/converter/sun_usb/type5/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/converter/sun_usb/type5/rules.mk rename keyboards/converter/usb_usb/hasu/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/converter/usb_usb/hasu/rules.mk rename keyboards/converter/usb_usb/leonardo/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/converter/usb_usb/leonardo/rules.mk rename keyboards/cradio/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cradio/rules.mk rename keyboards/crkbd/r2g/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/crkbd/r2g/rules.mk rename keyboards/crkbd/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/crkbd/rev1/rules.mk rename keyboards/crowboard/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/crowboard/rules.mk rename keyboards/custommk/evo70/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/custommk/evo70/rules.mk rename keyboards/custommk/genesis/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/custommk/genesis/rev1/rules.mk rename keyboards/cutie_club/fidelity/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cutie_club/fidelity/rules.mk rename keyboards/cxt_studio/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cxt_studio/rules.mk rename keyboards/dailycraft/bat43/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dailycraft/bat43/rev1/rules.mk rename keyboards/dailycraft/bat43/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dailycraft/bat43/rev2/rules.mk rename keyboards/dailycraft/sandbox/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dailycraft/sandbox/rev1/rules.mk rename keyboards/dailycraft/wings42/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dailycraft/wings42/rev1/rules.mk rename keyboards/dailycraft/wings42/rev1_extkeys/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dailycraft/wings42/rev1_extkeys/rules.mk rename keyboards/dailycraft/wings42/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dailycraft/wings42/rev2/rules.mk rename keyboards/dark/magnum_ergo_1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dark/magnum_ergo_1/rules.mk rename keyboards/darkproject/kd83a_bfg_edition/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/darkproject/kd83a_bfg_edition/rules.mk rename keyboards/darkproject/kd87a_bfg_edition/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/darkproject/kd87a_bfg_edition/rules.mk rename keyboards/darmoshark/k3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/darmoshark/k3/rules.mk rename keyboards/deemen17/de60fs/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/deemen17/de60fs/rules.mk rename keyboards/dekunukem/duckypad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dekunukem/duckypad/rules.mk rename keyboards/densus/alveus/mx/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/densus/alveus/mx/rules.mk rename keyboards/dnworks/9973/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dnworks/9973/rules.mk rename keyboards/dnworks/frltkl/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dnworks/frltkl/rules.mk rename keyboards/dnworks/numpad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dnworks/numpad/rules.mk rename keyboards/dnworks/sbl/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dnworks/sbl/rules.mk rename keyboards/doio/kb04/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/doio/kb04/rules.mk rename keyboards/doio/kb12/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/doio/kb12/rules.mk rename keyboards/doio/kb19/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/doio/kb19/rules.mk rename keyboards/doio/kb3x/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/doio/kb3x/rules.mk rename keyboards/dotmod/dymium65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dotmod/dymium65/rules.mk rename keyboards/dp3000/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dp3000/rev1/rules.mk rename keyboards/dp3000/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dp3000/rev2/rules.mk rename keyboards/drewkeys/mercury65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/drewkeys/mercury65/rules.mk rename keyboards/drhigsby/ogurec/left_pm/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/drhigsby/ogurec/left_pm/rules.mk rename keyboards/drhigsby/ogurec/right_pm/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/drhigsby/ogurec/right_pm/rules.mk rename keyboards/drop/thekey/v1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/drop/thekey/v1/rules.mk rename keyboards/drop/thekey/v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/drop/thekey/v2/rules.mk rename keyboards/durgod/dgk6x/galaxy/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/durgod/dgk6x/galaxy/rules.mk rename keyboards/durgod/dgk6x/hades_ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/durgod/dgk6x/hades_ansi/rules.mk rename keyboards/durgod/dgk6x/hades_iso/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/durgod/dgk6x/hades_iso/rules.mk rename keyboards/durgod/dgk6x/venus/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/durgod/dgk6x/venus/rules.mk rename keyboards/dztech/dz60v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dztech/dz60v2/rules.mk rename keyboards/dztech/pluto/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dztech/pluto/rules.mk rename keyboards/dztech/tofu/ii/v1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dztech/tofu/ii/v1/rules.mk rename keyboards/dztech/tofu/jr/v1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dztech/tofu/jr/v1/rules.mk rename keyboards/dztech/tofu/jr/v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dztech/tofu/jr/v2/rules.mk rename keyboards/dztech/tofu60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dztech/tofu60/rules.mk rename keyboards/ebastler/e80_1800/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ebastler/e80_1800/rules.mk rename keyboards/eek/silk_down/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/eek/silk_down/rules.mk rename keyboards/eek/silk_up/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/eek/silk_up/rules.mk rename keyboards/eggsworks/egg58/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/eggsworks/egg58/rules.mk rename keyboards/ekow/akira/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ekow/akira/rules.mk rename keyboards/enviousdesign/60f/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/enviousdesign/60f/rules.mk rename keyboards/enviousdesign/65m/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/enviousdesign/65m/rules.mk rename keyboards/enviousdesign/commissions/mini1800/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/enviousdesign/commissions/mini1800/rules.mk rename keyboards/enviousdesign/delirium/rev0/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/enviousdesign/delirium/rev0/rules.mk rename keyboards/enviousdesign/delirium/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/enviousdesign/delirium/rev1/rules.mk rename keyboards/enviousdesign/delirium/rgb/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/enviousdesign/delirium/rgb/rules.mk rename keyboards/enviousdesign/mcro/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/enviousdesign/mcro/rev1/rules.mk rename keyboards/era/divine/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/era/divine/rules.mk rename keyboards/era/era65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/era/era65/rules.mk rename keyboards/era/sirind/brick65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/era/sirind/brick65/rules.mk rename keyboards/era/sirind/klein_hs/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/era/sirind/klein_hs/rules.mk rename keyboards/era/sirind/klein_sd/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/era/sirind/klein_sd/rules.mk rename keyboards/ergodox_ez/base/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ergodox_ez/base/rules.mk rename keyboards/ergoslab/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ergoslab/rev1/rules.mk rename keyboards/etiennecollin/wave/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/etiennecollin/wave/rules.mk rename keyboards/evyd13/fin_pad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/evyd13/fin_pad/rules.mk rename keyboards/evyd13/nt210/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/evyd13/nt210/rules.mk rename keyboards/evyd13/nt650/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/evyd13/nt650/rules.mk rename keyboards/exclusive/e85/hotswap/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/exclusive/e85/hotswap/rules.mk rename keyboards/exclusive/e85/soldered/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/exclusive/e85/soldered/rules.mk rename keyboards/eyeohdesigns/humble40/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/eyeohdesigns/humble40/rules.mk rename keyboards/ez_maker/directpins/promicro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ez_maker/directpins/promicro/rules.mk rename keyboards/ez_maker/directpins/proton_c/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ez_maker/directpins/proton_c/rules.mk rename keyboards/ez_maker/directpins/rp2040/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ez_maker/directpins/rp2040/rules.mk rename keyboards/ez_maker/directpins/teensy_2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ez_maker/directpins/teensy_2/rules.mk rename keyboards/ez_maker/directpins/teensy_2pp/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ez_maker/directpins/teensy_2pp/rules.mk rename keyboards/fancytech/fancyalice66/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/fancytech/fancyalice66/rules.mk rename keyboards/ferris/0_2/base/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ferris/0_2/base/rules.mk rename keyboards/ferris/0_2/compact/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ferris/0_2/compact/rules.mk rename keyboards/ferris/0_2/high/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ferris/0_2/high/rules.mk rename keyboards/ferris/0_2/mini/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ferris/0_2/mini/rules.mk rename keyboards/ferris/sweep/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ferris/sweep/rules.mk rename keyboards/flashquark/horizon_z/{info.json => keyboard.json} (100%) delete mode 100755 keyboards/flashquark/horizon_z/rules.mk rename keyboards/for_science/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/for_science/rules.mk rename keyboards/forever65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/forever65/rules.mk rename keyboards/fortitude60/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/fortitude60/rev1/rules.mk rename keyboards/frobiac/blackflat/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/frobiac/blackflat/rules.mk rename keyboards/frobiac/hypernano/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/frobiac/hypernano/rules.mk rename keyboards/frobiac/redtilt/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/frobiac/redtilt/rules.mk rename keyboards/fruitykeeb/fruitbar/r1/elite_c/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/fruitykeeb/fruitbar/r1/elite_c/rules.mk rename keyboards/fruitykeeb/fruitbar/r1/promicro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/fruitykeeb/fruitbar/r1/promicro/rules.mk rename keyboards/fruitykeeb/fruitbar/r2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/fruitykeeb/fruitbar/r2/rules.mk rename keyboards/fs_streampad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/fs_streampad/rules.mk rename keyboards/galile0/glyphkbd_v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/galile0/glyphkbd_v2/rules.mk rename keyboards/geistmaschine/geist/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/geistmaschine/geist/rules.mk rename keyboards/ghs/jem/hotswap_ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ghs/jem/hotswap_ansi/rules.mk rename keyboards/ghs/jem/soldered/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ghs/jem/soldered/rules.mk rename keyboards/ghs/xls/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ghs/xls/rules.mk rename keyboards/gkeyboard/gpad8_2r/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/gkeyboard/gpad8_2r/rules.mk rename keyboards/gkeyboard/greatpad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/gkeyboard/greatpad/rules.mk rename keyboards/gl516/xr63gl/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/gl516/xr63gl/rules.mk rename keyboards/gray_studio/think65v3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/gray_studio/think65v3/rules.mk rename keyboards/hackpad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hackpad/rules.mk rename keyboards/handwired/3dortho14u/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/3dortho14u/rev1/rules.mk rename keyboards/handwired/3dortho14u/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/3dortho14u/rev2/rules.mk rename keyboards/handwired/3dp660_oled/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/3dp660_oled/rules.mk rename keyboards/handwired/baredev/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/baredev/rev1/rules.mk rename keyboards/handwired/dactyl_cc/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_cc/rules.mk rename keyboards/handwired/dactyl_kinesis/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_kinesis/rules.mk rename keyboards/handwired/dactyl_lightcycle/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_lightcycle/rules.mk rename keyboards/handwired/dactyl_manuform/4x6_4_3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk rename keyboards/handwired/dactyl_manuform/5x6_68/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_68/rules.mk rename keyboards/handwired/dactyl_manuform/6x6/promicro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk rename keyboards/handwired/dactyl_manuform/6x7/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_manuform/6x7/rules.mk rename keyboards/handwired/dactyl_maximus/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_maximus/rules.mk rename keyboards/handwired/dactyl_minidox/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_minidox/rules.mk rename keyboards/handwired/dactyl_tracer/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactyl_tracer/rules.mk rename keyboards/handwired/dactylmacropad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dactylmacropad/rules.mk rename keyboards/handwired/daskeyboard/daskeyboard4/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/daskeyboard/daskeyboard4/rules.mk rename keyboards/handwired/dmote/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dmote/rules.mk rename keyboards/handwired/dygma/raise/ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dygma/raise/ansi/rules.mk rename keyboards/handwired/dygma/raise/iso/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/dygma/raise/iso/rules.mk rename keyboards/handwired/iso85k/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/iso85k/rules.mk rename keyboards/handwired/itstleo9/promicro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/itstleo9/promicro/rules.mk rename keyboards/handwired/itstleo9/rp2040/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/itstleo9/rp2040/rules.mk rename keyboards/handwired/jotanck/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/jotanck/rules.mk rename keyboards/handwired/jotlily60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/jotlily60/rules.mk rename keyboards/handwired/macro3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/macro3/rules.mk rename keyboards/handwired/marek128b/ergosplit44/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/marek128b/ergosplit44/rules.mk rename keyboards/handwired/maverick0197/keydeck8/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/maverick0197/keydeck8/rules.mk rename keyboards/handwired/ms_sculpt_mobile/astar/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/ms_sculpt_mobile/astar/rules.mk rename keyboards/handwired/ms_sculpt_mobile/teensy2pp/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk rename keyboards/handwired/nortontechpad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/nortontechpad/rules.mk rename keyboards/handwired/onekey/bluepill/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/bluepill/rules.mk rename keyboards/handwired/onekey/bluepill_uf2boot/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/bluepill_uf2boot/rules.mk rename keyboards/handwired/onekey/elite_c/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/elite_c/rules.mk rename keyboards/handwired/onekey/nucleo_f446re/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/nucleo_f446re/rules.mk rename keyboards/handwired/onekey/nucleo_g431rb/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/nucleo_g431rb/rules.mk rename keyboards/handwired/onekey/nucleo_g474re/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/nucleo_g474re/rules.mk rename keyboards/handwired/onekey/nucleo_h723zg/{info.json => keyboard.json} (100%) delete mode 100755 keyboards/handwired/onekey/nucleo_h723zg/rules.mk rename keyboards/handwired/onekey/nucleo_l432kc/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/nucleo_l432kc/rules.mk rename keyboards/handwired/onekey/promicro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/promicro/rules.mk rename keyboards/handwired/onekey/proton_c/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/proton_c/rules.mk rename keyboards/handwired/onekey/rp2040/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/rp2040/rules.mk rename keyboards/handwired/onekey/stm32f0_disco/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/stm32f0_disco/rules.mk rename keyboards/handwired/onekey/stm32f3_disco/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/stm32f3_disco/rules.mk rename keyboards/handwired/onekey/stm32f405_feather/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/stm32f405_feather/rules.mk rename keyboards/handwired/onekey/teensy_2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/teensy_2/rules.mk rename keyboards/handwired/onekey/teensy_2pp/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/teensy_2pp/rules.mk rename keyboards/handwired/onekey/teensy_32/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/teensy_32/rules.mk rename keyboards/handwired/onekey/teensy_35/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/onekey/teensy_35/rules.mk rename keyboards/handwired/petruziamini/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/petruziamini/rules.mk rename keyboards/handwired/phantagom/baragon/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/phantagom/baragon/rules.mk rename keyboards/handwired/phantagom/varan/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/phantagom/varan/rules.mk rename keyboards/handwired/pill60/bluepill/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/pill60/bluepill/rules.mk rename keyboards/handwired/polly40/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/polly40/rules.mk rename keyboards/handwired/pytest/basic/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/pytest/basic/rules.mk rename keyboards/handwired/pytest/has_community/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/pytest/has_community/rules.mk rename keyboards/handwired/pytest/macro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/pytest/macro/rules.mk rename keyboards/handwired/rabijl/rotary_numpad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/rabijl/rotary_numpad/rules.mk rename keyboards/handwired/rd_61_qmk/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/rd_61_qmk/rules.mk rename keyboards/handwired/reclined/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/reclined/rules.mk rename keyboards/handwired/scottokeebs/scotto108/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scotto108/rules.mk rename keyboards/handwired/scottokeebs/scotto34/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scotto34/rules.mk rename keyboards/handwired/scottokeebs/scotto36/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scotto36/rules.mk rename keyboards/handwired/scottokeebs/scotto40/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scotto40/rules.mk rename keyboards/handwired/scottokeebs/scotto61/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scotto61/rules.mk rename keyboards/handwired/scottokeebs/scotto9/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scotto9/rules.mk rename keyboards/handwired/scottokeebs/scottoalp/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottoalp/rules.mk rename keyboards/handwired/scottokeebs/scottocmd/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottocmd/rules.mk rename keyboards/handwired/scottokeebs/scottodeck/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottodeck/rules.mk rename keyboards/handwired/scottokeebs/scottoergo/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottoergo/rules.mk rename keyboards/handwired/scottokeebs/scottofly/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottofly/rules.mk rename keyboards/handwired/scottokeebs/scottofrog/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottofrog/rules.mk rename keyboards/handwired/scottokeebs/scottogame/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottogame/rules.mk rename keyboards/handwired/scottokeebs/scottoinvader/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottoinvader/rules.mk rename keyboards/handwired/scottokeebs/scottokatana/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottokatana/rules.mk rename keyboards/handwired/scottokeebs/scottolong/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottolong/rules.mk rename keyboards/handwired/scottokeebs/scottomacrodeck/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk rename keyboards/handwired/scottokeebs/scottomouse/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottomouse/rules.mk rename keyboards/handwired/scottokeebs/scottonum/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottonum/rules.mk rename keyboards/handwired/scottokeebs/scottosplit/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottosplit/rules.mk rename keyboards/handwired/scottokeebs/scottostarter/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottostarter/rules.mk rename keyboards/handwired/scottokeebs/scottowing/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/scottokeebs/scottowing/rules.mk rename keyboards/handwired/sejin_eat1010r2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/sejin_eat1010r2/rules.mk rename keyboards/handwired/sono1/stm32f103/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/sono1/stm32f103/rules.mk rename keyboards/handwired/sono1/t2pp/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/sono1/t2pp/rules.mk rename keyboards/handwired/split_cloud/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/split_cloud/rules.mk rename keyboards/handwired/splittest/bluepill/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/splittest/bluepill/rules.mk rename keyboards/handwired/splittest/promicro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/splittest/promicro/rules.mk rename keyboards/handwired/splittest/teensy_2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/splittest/teensy_2/rules.mk rename keyboards/handwired/starrykeebs/dude09/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/starrykeebs/dude09/rules.mk rename keyboards/handwired/technicpad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/technicpad/rules.mk rename keyboards/handwired/tkk/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/tkk/rules.mk rename keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk rename keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk rename keyboards/handwired/unk/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/unk/rev1/rules.mk rename keyboards/handwired/wakizashi40/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/wakizashi40/rules.mk rename keyboards/handwired/wwa/helios/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/wwa/helios/rules.mk rename keyboards/handwired/wwa/kepler/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/wwa/kepler/rules.mk rename keyboards/handwired/wwa/mercury/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/wwa/mercury/rules.mk rename keyboards/handwired/wwa/soyuz/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/wwa/soyuz/rules.mk rename keyboards/handwired/wwa/soyuzxl/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/wwa/soyuzxl/rules.mk rename keyboards/handwired/xealous/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/xealous/rev1/rules.mk rename keyboards/handwired/ziyoulang_k3_mod/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/ziyoulang_k3_mod/rules.mk rename keyboards/heliotrope/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/heliotrope/rules.mk rename keyboards/hhkb/ansi/32u4/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hhkb/ansi/32u4/rules.mk rename keyboards/hineybush/h101/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hineybush/h101/rules.mk rename keyboards/hineybush/h87_g2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hineybush/h87_g2/rules.mk rename keyboards/hineybush/ibis/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hineybush/ibis/rules.mk rename keyboards/holyswitch/lightweight65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/holyswitch/lightweight65/rules.mk rename keyboards/horrortroll/caticorn/rev1/hotswap/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk rename keyboards/horrortroll/caticorn/rev1/solder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/horrortroll/caticorn/rev1/solder/rules.mk rename keyboards/hotdox76v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hotdox76v2/rules.mk rename keyboards/hubble/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hubble/rules.mk rename keyboards/ibm/model_m/modelh/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ibm/model_m/modelh/rules.mk rename keyboards/ibm/model_m_122/m122_3270/bluepill/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ibm/model_m_122/m122_3270/bluepill/rules.mk rename keyboards/idank/spankbd/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/idank/spankbd/rules.mk rename keyboards/idank/sweeq/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/idank/sweeq/rules.mk rename keyboards/idobao/id80/v2/ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/idobao/id80/v2/ansi/rules.mk rename keyboards/idobao/id80/v2/iso/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/idobao/id80/v2/iso/rules.mk rename keyboards/idyllic/tinny50_rgb/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/idyllic/tinny50_rgb/rules.mk rename keyboards/igloo/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/igloo/rules.mk rename keyboards/inett_studio/sq80/hotswap_layout_i/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk rename keyboards/inland/mk47/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/inland/mk47/rules.mk rename keyboards/inland/v83p/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/inland/v83p/rules.mk rename keyboards/input_club/infinity60/led/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/input_club/infinity60/led/rules.mk rename keyboards/input_club/infinity60/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/input_club/infinity60/rev1/rules.mk rename keyboards/itstleo/itstleo40/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/itstleo/itstleo40/rules.mk rename keyboards/jacky_studio/piggy60/rev1/hotswap/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk rename keyboards/jacky_studio/piggy60/rev1/solder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jacky_studio/piggy60/rev1/solder/rules.mk rename keyboards/jadookb/jkb65/r1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jadookb/jkb65/r1/rules.mk rename keyboards/jadookb/jkb65/r2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jadookb/jkb65/r2/rules.mk rename keyboards/jaykeeb/orba/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jaykeeb/orba/rules.mk rename keyboards/jaykeeb/sebelas/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jaykeeb/sebelas/rules.mk rename keyboards/jaykeeb/skyline/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jaykeeb/skyline/rules.mk rename keyboards/jaykeeb/sriwedari70/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jaykeeb/sriwedari70/rules.mk rename keyboards/jaykeeb/tokki/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jaykeeb/tokki/rules.mk rename keyboards/jels/boaty/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jels/boaty/rules.mk rename keyboards/jels/jels60/v1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jels/jels60/v1/rules.mk rename keyboards/jels/jels60/v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jels/jels60/v2/rules.mk rename keyboards/jidohun/km113/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jidohun/km113/rules.mk rename keyboards/jukaie/jk01/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jukaie/jk01/rules.mk rename keyboards/kakunpc/angel64/alpha/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kakunpc/angel64/alpha/rules.mk rename keyboards/kakunpc/angel64/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kakunpc/angel64/rev1/rules.mk rename keyboards/kalakos/bahrnob/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kalakos/bahrnob/rules.mk rename keyboards/kapcave/paladinpad/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kapcave/paladinpad/rev1/rules.mk rename keyboards/kapcave/paladinpad/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kapcave/paladinpad/rev2/rules.mk rename keyboards/kb_elmo/bm42/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kb_elmo/bm42/rules.mk rename keyboards/kb_elmo/dizzy40/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kb_elmo/dizzy40/rules.mk rename keyboards/kb_elmo/eliza/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kb_elmo/eliza/rules.mk rename keyboards/kb_elmo/gamehand/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kb_elmo/gamehand/rules.mk rename keyboards/kbdcraft/adam64/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kbdcraft/adam64/rules.mk rename keyboards/kbdfans/d45/v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kbdfans/d45/v2/rules.mk rename keyboards/kbdfans/kbd67/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kbdfans/kbd67/rev1/rules.mk rename keyboards/kbdfans/kbdpad/mk3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kbdfans/kbdpad/mk3/rules.mk rename keyboards/kbdfans/odinmini/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kbdfans/odinmini/rules.mk rename keyboards/kbdfans/tiger80/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kbdfans/tiger80/rules.mk rename keyboards/keebio/bamfk1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keebio/bamfk1/rules.mk rename keyboards/keebio/chocopad/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keebio/chocopad/rev1/rules.mk rename keyboards/keebio/chocopad/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keebio/chocopad/rev2/rules.mk rename keyboards/keebio/convolution/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keebio/convolution/rev1/rules.mk rename keyboards/keebio/nyquistpad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keebio/nyquistpad/rules.mk rename keyboards/keebio/sinc/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keebio/sinc/rev1/rules.mk rename keyboards/keebio/sinc/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keebio/sinc/rev2/rules.mk rename keyboards/keebsforall/freebird75/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keebsforall/freebird75/rules.mk rename keyboards/kelwin/utopia88/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kelwin/utopia88/rules.mk rename keyboards/kepler_33/proto/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kepler_33/proto/rules.mk rename keyboards/keycapsss/kimiko/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keycapsss/kimiko/rev1/rules.mk rename keyboards/keycapsss/kimiko/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keycapsss/kimiko/rev2/rules.mk rename keyboards/keychron/c1_pro/ansi/rgb/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/c1_pro/ansi/rgb/rules.mk rename keyboards/keychron/c1_pro/ansi/white/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/c1_pro/ansi/white/rules.mk rename keyboards/keychron/q0/base/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q0/base/rules.mk rename keyboards/keychron/q0/plus/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q0/plus/rules.mk rename keyboards/keychron/q1v1/ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q1v1/ansi/rules.mk rename keyboards/keychron/q1v1/ansi_encoder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q1v1/ansi_encoder/rules.mk rename keyboards/keychron/q1v1/iso/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q1v1/iso/rules.mk rename keyboards/keychron/q1v1/iso_encoder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q1v1/iso_encoder/rules.mk rename keyboards/keychron/q2/ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q2/ansi/rules.mk rename keyboards/keychron/q2/ansi_encoder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q2/ansi_encoder/rules.mk rename keyboards/keychron/q2/iso/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q2/iso/rules.mk rename keyboards/keychron/q2/iso_encoder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q2/iso_encoder/rules.mk rename keyboards/keychron/q2/jis/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q2/jis/rules.mk rename keyboards/keychron/q2/jis_encoder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q2/jis_encoder/rules.mk rename keyboards/keychron/q3/ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q3/ansi/rules.mk rename keyboards/keychron/q3/iso/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q3/iso/rules.mk rename keyboards/keychron/q3/jis/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q3/jis/rules.mk rename keyboards/keychron/q4/iso/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q4/iso/rules.mk rename keyboards/keychron/q7/ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q7/ansi/rules.mk rename keyboards/keychron/q7/iso/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q7/iso/rules.mk rename keyboards/keychron/q8/ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q8/ansi/rules.mk rename keyboards/keychron/q8/ansi_encoder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q8/ansi_encoder/rules.mk rename keyboards/keychron/q8/iso/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q8/iso/rules.mk rename keyboards/keychron/q8/iso_encoder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q8/iso_encoder/rules.mk rename keyboards/keychron/q9/ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q9/ansi/rules.mk rename keyboards/keychron/q9/ansi_encoder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q9/ansi_encoder/rules.mk rename keyboards/keychron/q9/iso/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q9/iso/rules.mk rename keyboards/keychron/q9/iso_encoder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keychron/q9/iso_encoder/rules.mk rename keyboards/keychron/q9_plus/ansi_encoder/{info.json => keyboard.json} (100%) delete mode 100755 keyboards/keychron/q9_plus/ansi_encoder/rules.mk rename keyboards/keyspensory/kp60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keyspensory/kp60/rules.mk rename keyboards/keyten/diablo/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keyten/diablo/rules.mk rename keyboards/keyten/kt60hs_t/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keyten/kt60hs_t/rules.mk rename keyboards/kezewa/enter67/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kezewa/enter67/rules.mk rename keyboards/kezewa/enter80/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kezewa/enter80/rules.mk rename keyboards/kibou/fukuro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kibou/fukuro/rules.mk rename keyboards/kibou/harbour/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kibou/harbour/rules.mk rename keyboards/kibou/suisei/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kibou/suisei/rules.mk rename keyboards/kibou/wendy/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kibou/wendy/rules.mk rename keyboards/kibou/winter/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kibou/winter/rules.mk rename keyboards/kin80/blackpill103/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kin80/blackpill103/rules.mk rename keyboards/kin80/micro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kin80/micro/rules.mk rename keyboards/kinesis/kint2pp/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kinesis/kint2pp/rules.mk rename keyboards/kinesis/kint36/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kinesis/kint36/rules.mk rename keyboards/kinesis/kintwin/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kinesis/kintwin/rules.mk rename keyboards/kinesis/stapelberg/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kinesis/stapelberg/rules.mk rename keyboards/kisakeyluxury/qtz/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kisakeyluxury/qtz/rules.mk rename keyboards/kiserdesigns/madeline/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kiserdesigns/madeline/rules.mk rename keyboards/kj_modify/rs40/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kj_modify/rs40/rules.mk rename keyboards/kk/65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kk/65/rules.mk rename keyboards/kopibeng/mnk60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kopibeng/mnk60/rules.mk rename keyboards/kopibeng/mnk60_stm32/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kopibeng/mnk60_stm32/rules.mk rename keyboards/kopibeng/tgr_lena/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kopibeng/tgr_lena/rules.mk rename keyboards/kprepublic/bm16a/v1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kprepublic/bm16a/v1/rules.mk rename keyboards/kprepublic/bm16a/v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kprepublic/bm16a/v2/rules.mk rename keyboards/kprepublic/bm40hsrgb/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kprepublic/bm40hsrgb/rev2/rules.mk rename keyboards/kprepublic/cstc40/daughterboard/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kprepublic/cstc40/daughterboard/rules.mk rename keyboards/kprepublic/cstc40/single_pcb/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kprepublic/cstc40/single_pcb/rules.mk rename keyboards/kradoindustries/kousa/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kradoindustries/kousa/rules.mk rename keyboards/kradoindustries/krado66/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kradoindustries/krado66/rules.mk rename keyboards/kradoindustries/promenade/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kradoindustries/promenade/rules.mk rename keyboards/kraken_jones/pteron56/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kraken_jones/pteron56/rules.mk rename keyboards/kumaokobo/kudox/columner/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kumaokobo/kudox/columner/rules.mk rename keyboards/kumaokobo/kudox/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kumaokobo/kudox/rev1/rules.mk rename keyboards/kumaokobo/kudox/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kumaokobo/kudox/rev2/rules.mk rename keyboards/kumaokobo/kudox/rev3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kumaokobo/kudox/rev3/rules.mk rename keyboards/kumaokobo/kudox_game/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kumaokobo/kudox_game/rev1/rules.mk rename keyboards/kumaokobo/pico/65keys/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kumaokobo/pico/65keys/rules.mk rename keyboards/kumaokobo/pico/70keys/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kumaokobo/pico/70keys/rules.mk rename keyboards/kuro/kuro65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kuro/kuro65/rules.mk rename keyboards/kwstudio/pisces/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kwstudio/pisces/rules.mk rename keyboards/kwstudio/scorpio/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kwstudio/scorpio/rules.mk rename keyboards/kwstudio/scorpio_rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kwstudio/scorpio_rev2/rules.mk rename keyboards/laneware/raindrop/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/laneware/raindrop/rules.mk rename keyboards/laser_ninja/pumpkinpad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/laser_ninja/pumpkinpad/rules.mk rename keyboards/lendunistus/rpneko65/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/lendunistus/rpneko65/rev1/rules.mk rename keyboards/lets_split/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/lets_split/rev1/rules.mk rename keyboards/lfkeyboards/lfk65_hs/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/lfkeyboards/lfk65_hs/rules.mk rename keyboards/lfkeyboards/lfk78/revb/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/lfkeyboards/lfk78/revb/rules.mk rename keyboards/lfkeyboards/lfk78/revc/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/lfkeyboards/lfk78/revc/rules.mk rename keyboards/lfkeyboards/lfk87/reva/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/lfkeyboards/lfk87/reva/rules.mk rename keyboards/lfkeyboards/lfk87/revc/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/lfkeyboards/lfk87/revc/rules.mk rename keyboards/lfkeyboards/smk65/revb/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/lfkeyboards/smk65/revb/rules.mk rename keyboards/lfkeyboards/smk65/revf/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/lfkeyboards/smk65/revf/rules.mk rename keyboards/lgbtkl/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/lgbtkl/rules.mk rename keyboards/lily58/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/lily58/rev1/rules.mk rename keyboards/linworks/em8/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/linworks/em8/rules.mk rename keyboards/linworks/fave60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/linworks/fave60/rules.mk rename keyboards/linworks/fave60a/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/linworks/fave60a/rules.mk rename keyboards/linworks/favepada/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/linworks/favepada/rules.mk rename keyboards/macrocat/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/macrocat/rules.mk rename keyboards/magic_force/mf17/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/magic_force/mf17/rules.mk rename keyboards/makenova/omega/omega4/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/makenova/omega/omega4/rules.mk rename keyboards/maple_computing/ivy/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/maple_computing/ivy/rev1/rules.mk rename keyboards/maple_computing/launchpad/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/maple_computing/launchpad/rev1/rules.mk rename keyboards/mariorion_v25/prod/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mariorion_v25/prod/rules.mk rename keyboards/mariorion_v25/proto/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mariorion_v25/proto/rules.mk rename keyboards/marksard/rhymestone/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/marksard/rhymestone/rev1/rules.mk rename keyboards/marksard/treadstone32/lite/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/marksard/treadstone32/lite/rules.mk rename keyboards/marksard/treadstone32/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/marksard/treadstone32/rev1/rules.mk rename keyboards/marksard/treadstone48/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/marksard/treadstone48/rev1/rules.mk rename keyboards/marshkeys/flowerpad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/marshkeys/flowerpad/rules.mk rename keyboards/matchstickworks/southpad/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/matchstickworks/southpad/rev1/rules.mk rename keyboards/matchstickworks/southpad/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/matchstickworks/southpad/rev2/rules.mk rename keyboards/maxipad/promicro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/maxipad/promicro/rules.mk rename keyboards/maxipad/teensy2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/maxipad/teensy2/rules.mk rename keyboards/maxr1998/phoebe/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/maxr1998/phoebe/rules.mk rename keyboards/mazestudio/jocker/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mazestudio/jocker/rules.mk rename keyboards/mechllama/g35/v1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechllama/g35/v1/rules.mk rename keyboards/mechllama/g35/v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechllama/g35/v2/rules.mk rename keyboards/mechlovin/adelais/standard_led/arm/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk rename keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk rename keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk rename keyboards/mechlovin/hannah65/rev1/haus/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/hannah65/rev1/haus/rules.mk rename keyboards/mechlovin/infinity87/rev1/rogue87/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/infinity87/rev1/rogue87/rules.mk rename keyboards/mechlovin/infinity87/rev1/rouge87/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/infinity87/rev1/rouge87/rules.mk rename keyboards/mechlovin/mechlovin9/rev3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/mechlovin9/rev3/rules.mk rename keyboards/mechlovin/olly/jf/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/olly/jf/rev2/rules.mk rename keyboards/mechlovin/olly/octagon/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/olly/octagon/rules.mk rename keyboards/mechlovin/zed1800/oreum/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/zed1800/oreum/rules.mk rename keyboards/mechlovin/zed1800/saber/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/zed1800/saber/rules.mk rename keyboards/mechlovin/zed1800/zepsody/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/zed1800/zepsody/rules.mk rename keyboards/mechlovin/zed65/910/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/zed65/910/rules.mk rename keyboards/mechlovin/zed65/no_backlight/cor65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/zed65/no_backlight/cor65/rules.mk rename keyboards/mechlovin/zed65/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechlovin/zed65/rev1/rules.mk rename keyboards/mechwild/bb40/f401/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechwild/bb40/f401/rules.mk rename keyboards/mechwild/bb40/f411/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechwild/bb40/f411/rules.mk rename keyboards/mechwild/bde/lefty/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechwild/bde/lefty/rules.mk rename keyboards/mechwild/bde/righty/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechwild/bde/righty/rules.mk rename keyboards/mechwild/obe/f401/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechwild/obe/f401/rules.mk rename keyboards/mechwild/obe/f411/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechwild/obe/f411/rules.mk rename keyboards/mechwild/waka60/f401/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechwild/waka60/f401/rules.mk rename keyboards/mechwild/waka60/f411/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechwild/waka60/f411/rules.mk rename keyboards/meetlab/kafka60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/meetlab/kafka60/rules.mk rename keyboards/meetlab/kafka68/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/meetlab/kafka68/rules.mk rename keyboards/meetlab/kalice/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/meetlab/kalice/rules.mk rename keyboards/meetlab/rena/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/meetlab/rena/rules.mk rename keyboards/meletrix/zoom75/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/meletrix/zoom75/rules.mk rename keyboards/meletrix/zoom98/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/meletrix/zoom98/rules.mk rename keyboards/millet/doksin/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/millet/doksin/rules.mk rename keyboards/mincedshon/ecila/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mincedshon/ecila/rules.mk rename keyboards/mk65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mk65/rules.mk rename keyboards/mlego/m65/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mlego/m65/rev1/rules.mk rename keyboards/mlego/m65/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mlego/m65/rev2/rules.mk rename keyboards/mlego/m65/rev3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mlego/m65/rev3/rules.mk rename keyboards/mlego/m65/rev4/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mlego/m65/rev4/rules.mk rename keyboards/mntre_v3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mntre_v3/rules.mk rename keyboards/mode/m256wh/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mode/m256wh/rules.mk rename keyboards/mode/m256ws/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mode/m256ws/rules.mk rename keyboards/mode/m60h/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mode/m60h/rules.mk rename keyboards/mode/m60h_f/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mode/m60h_f/rules.mk rename keyboards/mode/m60s/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mode/m60s/rules.mk rename keyboards/mokey/luckycat70/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mokey/luckycat70/rules.mk rename keyboards/mokey/mokey12x2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mokey/mokey12x2/rules.mk rename keyboards/moky/moky88/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/moky/moky88/rules.mk rename keyboards/momokai/aurora/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/momokai/aurora/rules.mk rename keyboards/monsgeek/m1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/monsgeek/m1/rules.mk rename keyboards/monsgeek/m3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/monsgeek/m3/rules.mk rename keyboards/monsgeek/m5/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/monsgeek/m5/rules.mk rename keyboards/monsgeek/m6/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/monsgeek/m6/rules.mk rename keyboards/montsinger/palmetto/{info.json => keyboard.json} (100%) delete mode 100755 keyboards/montsinger/palmetto/rules.mk rename keyboards/moondrop/dash75/r1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/moondrop/dash75/r1/rules.mk rename keyboards/mothwing/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mothwing/rules.mk rename keyboards/ms_sculpt/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ms_sculpt/rules.mk rename keyboards/mwstudio/mmk_3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mwstudio/mmk_3/rules.mk rename keyboards/mwstudio/mw660/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mwstudio/mw660/rules.mk rename keyboards/mwstudio/mw80/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mwstudio/mw80/rules.mk rename keyboards/mxss/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mxss/rules.mk rename keyboards/nacly/bigsmoothknob/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/nacly/bigsmoothknob/rules.mk rename keyboards/navi60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/navi60/rules.mk rename keyboards/neson_design/810e/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/neson_design/810e/rules.mk rename keyboards/neson_design/nico/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/neson_design/nico/rules.mk rename keyboards/nightly_boards/n40_o/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/nightly_boards/n40_o/rules.mk rename keyboards/ning/tiny_board/tb16_rgb/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ning/tiny_board/tb16_rgb/rules.mk rename keyboards/nix_studio/lilith/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/nix_studio/lilith/rules.mk rename keyboards/novelkeys/nk65/base/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/novelkeys/nk65/base/rules.mk rename keyboards/novelkeys/nk65/v1_4/{info.json => keyboard.json} (100%) delete mode 100755 keyboards/novelkeys/nk65/v1_4/rules.mk rename keyboards/noxary/valhalla_v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/noxary/valhalla_v2/rules.mk rename keyboards/null/st110r2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/null/st110r2/rules.mk rename keyboards/oddball/v1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/oddball/v1/rules.mk rename keyboards/oddball/v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/oddball/v2/rules.mk rename keyboards/oddball/v2_1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/oddball/v2_1/rules.mk rename keyboards/omkbd/runner3680/3x6/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/omkbd/runner3680/3x6/rules.mk rename keyboards/omkbd/runner3680/3x7/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/omkbd/runner3680/3x7/rules.mk rename keyboards/omkbd/runner3680/3x8/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/omkbd/runner3680/3x8/rules.mk rename keyboards/omkbd/runner3680/4x6/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/omkbd/runner3680/4x6/rules.mk rename keyboards/omkbd/runner3680/4x7/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/omkbd/runner3680/4x7/rules.mk rename keyboards/omkbd/runner3680/4x8/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/omkbd/runner3680/4x8/rules.mk rename keyboards/omkbd/runner3680/5x6/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/omkbd/runner3680/5x6/rules.mk rename keyboards/omkbd/runner3680/5x6_5x8/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/omkbd/runner3680/5x6_5x8/rules.mk rename keyboards/omkbd/runner3680/5x7/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/omkbd/runner3680/5x7/rules.mk rename keyboards/omkbd/runner3680/5x8/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/omkbd/runner3680/5x8/rules.mk rename keyboards/orthograph/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/orthograph/rules.mk rename keyboards/pangorin/tan67/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/pangorin/tan67/rules.mk rename keyboards/pauperboards/brick/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/pauperboards/brick/rules.mk rename keyboards/peej/tripel/left/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/peej/tripel/left/rules.mk rename keyboards/peej/tripel/middle/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/peej/tripel/middle/rules.mk rename keyboards/peej/tripel/right/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/peej/tripel/right/rules.mk rename keyboards/phentech/rpk_001/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/phentech/rpk_001/rules.mk rename keyboards/pica40/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/pica40/rev1/rules.mk rename keyboards/pinky/3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/pinky/3/rules.mk rename keyboards/pinky/4/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/pinky/4/rules.mk rename keyboards/pixelspace/shadow80/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/pixelspace/shadow80/rules.mk rename keyboards/planck/ez/base/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/planck/ez/base/rules.mk rename keyboards/ploopyco/madromys/rev1_001/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ploopyco/madromys/rev1_001/rules.mk rename keyboards/ploopyco/trackball/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ploopyco/trackball/rev1/rules.mk rename keyboards/ploopyco/trackball/rev1_005/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ploopyco/trackball/rev1_005/rules.mk rename keyboards/ploopyco/trackball_mini/rev1_001/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ploopyco/trackball_mini/rev1_001/rules.mk rename keyboards/ploopyco/trackball_mini/rev1_002/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ploopyco/trackball_mini/rev1_002/rules.mk rename keyboards/ploopyco/trackball_nano/rev1_001/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ploopyco/trackball_nano/rev1_001/rules.mk rename keyboards/ploopyco/trackball_thumb/rev1_001/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ploopyco/trackball_thumb/rev1_001/rules.mk rename keyboards/plum47/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/plum47/rules.mk rename keyboards/plywrks/allaro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/plywrks/allaro/rules.mk rename keyboards/plywrks/ji_eun/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/plywrks/ji_eun/rules.mk rename keyboards/plywrks/ply8x/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/plywrks/ply8x/rules.mk rename keyboards/primekb/meridian/ktr1010/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/primekb/meridian/ktr1010/rules.mk rename keyboards/primekb/meridian/ws2812/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/primekb/meridian/ws2812/rules.mk rename keyboards/program_yoink/ortho/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/program_yoink/ortho/rules.mk rename keyboards/program_yoink/staggered/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/program_yoink/staggered/rules.mk rename keyboards/projectcain/vault35/atmega32u4/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/projectcain/vault35/atmega32u4/rules.mk rename keyboards/projectd/65/projectd_65_ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/projectd/65/projectd_65_ansi/rules.mk rename keyboards/projectd/75/ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/projectd/75/ansi/rules.mk rename keyboards/proteus67/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/proteus67/rules.mk rename keyboards/prototypist/pt60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/prototypist/pt60/rules.mk rename keyboards/prototypist/pt80/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/prototypist/pt80/rules.mk rename keyboards/pteropus/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/pteropus/rules.mk rename keyboards/purin/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/purin/rules.mk rename keyboards/qck75/v1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/qck75/v1/rules.mk rename keyboards/quadrum/delta/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/quadrum/delta/rules.mk rename keyboards/qwertykeys/qk100/ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/qwertykeys/qk100/ansi/rules.mk rename keyboards/qwertykeys/qk100/solder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/qwertykeys/qk100/solder/rules.mk rename keyboards/rainkeebs/trailmix/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rainkeebs/trailmix/rules.mk rename keyboards/ramlord/witf/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ramlord/witf/rules.mk rename keyboards/rart/rart60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rart/rart60/rules.mk rename keyboards/rastersoft/minitkl/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rastersoft/minitkl/rules.mk rename keyboards/redox/rev1/base/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/redox/rev1/base/rules.mk rename keyboards/redragon/k667/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/redragon/k667/rules.mk rename keyboards/reedskeebs/alish40/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/reedskeebs/alish40/rules.mk rename keyboards/relapsekb/or87/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/relapsekb/or87/rules.mk rename keyboards/rgbkb/mun/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rgbkb/mun/rev1/rules.mk rename keyboards/rgbkb/pan/rev1/proton_c/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rgbkb/pan/rev1/proton_c/rules.mk rename keyboards/rgbkb/sol3/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rgbkb/sol3/rev1/rules.mk rename keyboards/rgbkb/zen/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rgbkb/zen/rev1/rules.mk rename keyboards/rgbkb/zygomorph/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rgbkb/zygomorph/rev1/rules.mk rename keyboards/rico/phoenix_project_no1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rico/phoenix_project_no1/rules.mk rename keyboards/rkg68/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rkg68/rules.mk rename keyboards/rmi_kb/equator/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rmi_kb/equator/rules.mk rename keyboards/rmi_kb/tkl_ff/v1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rmi_kb/tkl_ff/v1/rules.mk rename keyboards/rmkeebs/rm_fullsize/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rmkeebs/rm_fullsize/rules.mk rename keyboards/rookiebwoy/late9/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rookiebwoy/late9/rev1/rules.mk rename keyboards/rot13labs/rotc0n/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rot13labs/rotc0n/rules.mk rename keyboards/saevus/cor/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/saevus/cor/rules.mk rename keyboards/saevus/cor_tkl/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/saevus/cor_tkl/rules.mk rename keyboards/sakura_workshop/fuji75/hotswap/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sakura_workshop/fuji75/hotswap/rules.mk rename keyboards/sakura_workshop/fuji75/solder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sakura_workshop/fuji75/solder/rules.mk rename keyboards/salicylic_acid3/7skb/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/salicylic_acid3/7skb/rev1/rules.mk rename keyboards/salicylic_acid3/getta25/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/salicylic_acid3/getta25/rev1/rules.mk rename keyboards/salicylic_acid3/guide68/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/salicylic_acid3/guide68/rules.mk rename keyboards/salicylic_acid3/jisplit89/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/salicylic_acid3/jisplit89/rev1/rules.mk rename keyboards/salicylic_acid3/naked48/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/salicylic_acid3/naked48/rev1/rules.mk rename keyboards/salicylic_acid3/naked60/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/salicylic_acid3/naked60/rev1/rules.mk rename keyboards/salicylic_acid3/naked64/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/salicylic_acid3/naked64/rev1/rules.mk rename keyboards/salicylic_acid3/setta21/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/salicylic_acid3/setta21/rev1/rules.mk rename keyboards/sapuseven/macropad12/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sapuseven/macropad12/rules.mk rename keyboards/sawnsprojects/eclipse/eclipse60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sawnsprojects/eclipse/eclipse60/rules.mk rename keyboards/sawnsprojects/eclipse/tinyneko/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sawnsprojects/eclipse/tinyneko/rules.mk rename keyboards/sawnsprojects/krush/krush60/solder/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/rules.mk rename keyboards/sawnsprojects/okayu/stm32f072/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sawnsprojects/okayu/stm32f072/rules.mk rename keyboards/sawnsprojects/okayu/stm32f103/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sawnsprojects/okayu/stm32f103/rules.mk rename keyboards/sawnsprojects/okayu/stm32f303/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sawnsprojects/okayu/stm32f303/rules.mk rename keyboards/sawnsprojects/plaque80/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sawnsprojects/plaque80/rules.mk rename keyboards/sawnsprojects/re65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sawnsprojects/re65/rules.mk rename keyboards/scottokeebs/scotto34/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/scottokeebs/scotto34/rules.mk rename keyboards/sf2040/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sf2040/rules.mk rename keyboards/sha/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sha/rules.mk rename keyboards/shandoncodes/riot_pad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/shandoncodes/riot_pad/rules.mk rename keyboards/sharkoon/skiller_sgk50_s3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sharkoon/skiller_sgk50_s3/rules.mk rename keyboards/shostudio/arc/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/shostudio/arc/rules.mk rename keyboards/sirius/uni660/rev2/ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sirius/uni660/rev2/ansi/rules.mk rename keyboards/sirius/uni660/rev2/iso/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sirius/uni660/rev2/iso/rules.mk rename keyboards/skeletonkbd/frost68/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/skeletonkbd/frost68/rules.mk rename keyboards/skme/zeno/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/skme/zeno/rules.mk rename keyboards/skyloong/dt40/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/skyloong/dt40/rules.mk rename keyboards/skyloong/gk61/pro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/skyloong/gk61/pro/rules.mk rename keyboards/skyloong/gk61/pro_48/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/skyloong/gk61/pro_48/rules.mk rename keyboards/skyloong/gk61/v1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/skyloong/gk61/v1/rules.mk rename keyboards/skyloong/qk21/v1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/skyloong/qk21/v1/rules.mk rename keyboards/smithrune/iron180v2/v2h/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/smithrune/iron180v2/v2h/rules.mk rename keyboards/smithrune/iron180v2/v2s/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/smithrune/iron180v2/v2s/rules.mk rename keyboards/smithrune/magnus/m75h/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/smithrune/magnus/m75h/rules.mk rename keyboards/smithrune/magnus/m75s/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/smithrune/magnus/m75s/rules.mk rename keyboards/smoll/lefty/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/smoll/lefty/rev1/rules.mk rename keyboards/smoll/lefty/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/smoll/lefty/rev2/rules.mk rename keyboards/smoll/pw88/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/smoll/pw88/rules.mk rename keyboards/sofle/keyhive/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sofle/keyhive/rules.mk rename keyboards/sofle/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sofle/rev1/rules.mk rename keyboards/sofle_choc/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sofle_choc/rules.mk rename keyboards/split67/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/split67/rules.mk rename keyboards/splitkb/aurora/corne/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/splitkb/aurora/corne/rev1/rules.mk rename keyboards/splitkb/aurora/helix/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/splitkb/aurora/helix/rev1/rules.mk rename keyboards/splitkb/aurora/lily58/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/splitkb/aurora/lily58/rev1/rules.mk rename keyboards/splitkb/aurora/sofle_v2/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/splitkb/aurora/sofle_v2/rev1/rules.mk rename keyboards/splitkb/aurora/sweep/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/splitkb/aurora/sweep/rev1/rules.mk rename keyboards/splitkb/kyria/rev1/base/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/splitkb/kyria/rev1/base/rules.mk rename keyboards/splitkb/kyria/rev2/base/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/splitkb/kyria/rev2/base/rules.mk rename keyboards/splitkb/kyria/rev3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/splitkb/kyria/rev3/rules.mk rename keyboards/splitography/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/splitography/rules.mk rename keyboards/sthlmkb/litl/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sthlmkb/litl/rules.mk rename keyboards/strech/soulstone/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/strech/soulstone/rules.mk rename keyboards/studiokestra/frl84/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/studiokestra/frl84/rules.mk rename keyboards/studiokestra/galatea/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/studiokestra/galatea/rev1/rules.mk rename keyboards/studiokestra/galatea/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/studiokestra/galatea/rev2/rules.mk rename keyboards/studiokestra/galatea/rev3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/studiokestra/galatea/rev3/rules.mk rename keyboards/studiokestra/line_friends_tkl/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/studiokestra/line_friends_tkl/rules.mk rename keyboards/subrezon/lancer/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/subrezon/lancer/rules.mk rename keyboards/swiss/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/swiss/rules.mk rename keyboards/syenakeyboards/aswagata/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/syenakeyboards/aswagata/rules.mk rename keyboards/synthandkeys/bento_box/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/synthandkeys/bento_box/rules.mk rename keyboards/synthandkeys/the_debit_card/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/synthandkeys/the_debit_card/rules.mk rename keyboards/synthlabs/060/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/synthlabs/060/rules.mk rename keyboards/synthlabs/065/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/synthlabs/065/rules.mk rename keyboards/tacworks/tac_k1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tacworks/tac_k1/rules.mk rename keyboards/takashicompany/baumkuchen/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/takashicompany/baumkuchen/rules.mk rename keyboards/takashicompany/dogtag/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/takashicompany/dogtag/rules.mk rename keyboards/takashicompany/ejectix/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/takashicompany/ejectix/rules.mk rename keyboards/takashicompany/ergomirage/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/takashicompany/ergomirage/rules.mk rename keyboards/takashicompany/goat51/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/takashicompany/goat51/rules.mk rename keyboards/takashicompany/heavy_left/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/takashicompany/heavy_left/rules.mk rename keyboards/takashicompany/minidivide/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/takashicompany/minidivide/rules.mk rename keyboards/takashicompany/minidivide_max/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/takashicompany/minidivide_max/rules.mk rename keyboards/takashicompany/minizone/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/takashicompany/minizone/rules.mk rename keyboards/takashicompany/rookey/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/takashicompany/rookey/rules.mk rename keyboards/takashicompany/tightwriter/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/takashicompany/tightwriter/rules.mk rename keyboards/takashiski/namecard2x4/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/takashiski/namecard2x4/rev1/rules.mk rename keyboards/takashiski/namecard2x4/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/takashiski/namecard2x4/rev2/rules.mk rename keyboards/tau4/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tau4/rules.mk rename keyboards/teahouse/ayleen/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/teahouse/ayleen/rules.mk rename keyboards/teleport/native/ansi/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/teleport/native/ansi/rules.mk rename keyboards/teleport/native/iso/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/teleport/native/iso/rules.mk rename keyboards/teleport/tkl/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/teleport/tkl/rules.mk rename keyboards/tg67/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tg67/rules.mk rename keyboards/themadnoodle/ncc1701kb/v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/themadnoodle/ncc1701kb/v2/rules.mk rename keyboards/themadnoodle/noodlepad/v1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/themadnoodle/noodlepad/v1/rules.mk rename keyboards/themadnoodle/noodlepad/v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/themadnoodle/noodlepad/v2/rules.mk rename keyboards/themadnoodle/noodlepad_micro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/themadnoodle/noodlepad_micro/rules.mk rename keyboards/themadnoodle/udon13/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/themadnoodle/udon13/rules.mk rename keyboards/theone/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/theone/rules.mk rename keyboards/tkw/grandiceps/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tkw/grandiceps/rev1/rules.mk rename keyboards/tkw/stoutgat/v2/f411/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tkw/stoutgat/v2/f411/rules.mk rename keyboards/tominabox1/le_chiffre/he/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tominabox1/le_chiffre/he/rules.mk rename keyboards/tominabox1/le_chiffre/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tominabox1/le_chiffre/rev1/rules.mk rename keyboards/tominabox1/le_chiffre/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tominabox1/le_chiffre/rev2/rules.mk rename keyboards/trainpad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/trainpad/rules.mk rename keyboards/treasure/type9s3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/treasure/type9s3/rules.mk rename keyboards/tweetydabird/chameleon/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tweetydabird/chameleon/rules.mk rename keyboards/tweetydabird/lbs4/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tweetydabird/lbs4/rules.mk rename keyboards/tweetydabird/lbs6/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tweetydabird/lbs6/rules.mk rename keyboards/tweetydabird/lotus58/elite_c/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tweetydabird/lotus58/elite_c/rules.mk rename keyboards/tweetydabird/lotus58/promicro/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tweetydabird/lotus58/promicro/rules.mk rename keyboards/tzarc/djinn/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tzarc/djinn/rev1/rules.mk rename keyboards/tzarc/djinn/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tzarc/djinn/rev2/rules.mk rename keyboards/tzarc/ghoul/rev1/rp2040/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tzarc/ghoul/rev1/rp2040/rules.mk rename keyboards/tzarc/ghoul/rev1/stm32/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/tzarc/ghoul/rev1/stm32/rules.mk rename keyboards/varanidae/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/varanidae/rules.mk rename keyboards/vertex/cycle8/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/vertex/cycle8/rules.mk rename keyboards/vertex/t75/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/vertex/t75/rules.mk rename keyboards/viktus/minne/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/viktus/minne/rules.mk rename keyboards/viktus/osav2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/viktus/osav2/rules.mk rename keyboards/viktus/osav2_numpad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/viktus/osav2_numpad/rules.mk rename keyboards/viktus/sp111_v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/viktus/sp111_v2/rules.mk rename keyboards/werk_technica/one/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/werk_technica/one/rules.mk rename keyboards/westm/westm68/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/westm/westm68/rev1/rules.mk rename keyboards/westm/westm68/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/westm/westm68/rev2/rules.mk rename keyboards/westm/westm9/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/westm/westm9/rev1/rules.mk rename keyboards/westm/westm9/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/westm/westm9/rev2/rules.mk rename keyboards/wilba_tech/wt20_h1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/wilba_tech/wt20_h1/rules.mk rename keyboards/wilba_tech/wt60_d/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/wilba_tech/wt60_d/rules.mk rename keyboards/wilba_tech/wt65_g3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/wilba_tech/wt65_g3/rules.mk rename keyboards/wilba_tech/wt65_h2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/wilba_tech/wt65_h2/rules.mk rename keyboards/wilba_tech/wt65_h3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/wilba_tech/wt65_h3/rules.mk rename keyboards/willoucom/keypad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/willoucom/keypad/rules.mk rename keyboards/wolf/silhouette/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/wolf/silhouette/rules.mk rename keyboards/wolf/twilight/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/wolf/twilight/rules.mk rename keyboards/wolf/ziggurat/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/wolf/ziggurat/rules.mk rename keyboards/work_louder/loop/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/work_louder/loop/rev1/rules.mk rename keyboards/work_louder/loop/rev3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/work_louder/loop/rev3/rules.mk rename keyboards/work_louder/work_board/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/work_louder/work_board/rev1/rules.mk rename keyboards/work_louder/work_board/rev3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/work_louder/work_board/rev3/rules.mk rename keyboards/wuque/nemui65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/wuque/nemui65/rules.mk rename keyboards/yandrstudio/transition80/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/yandrstudio/transition80/rules.mk rename keyboards/yanghu/unicorne/f411/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/yanghu/unicorne/f411/rules.mk rename keyboards/ydkb/ydpm40/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ydkb/ydpm40/rules.mk rename keyboards/ymdk/melody96/hotswap/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ymdk/melody96/hotswap/rules.mk rename keyboards/ymdk/yd60mq/12led/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ymdk/yd60mq/12led/rules.mk rename keyboards/ymdk/yd60mq/16led/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ymdk/yd60mq/16led/rules.mk rename keyboards/ymdk/ymd09/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ymdk/ymd09/rules.mk rename keyboards/ymdk/ymd75/rev4/iso/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ymdk/ymd75/rev4/iso/rules.mk rename keyboards/yushakobo/ergo68/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/yushakobo/ergo68/rules.mk rename keyboards/yushakobo/navpad/10/rev0/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/yushakobo/navpad/10/rev0/rules.mk rename keyboards/yushakobo/navpad/10/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/yushakobo/navpad/10/rev1/rules.mk rename keyboards/yynmt/acperience12/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/yynmt/acperience12/rev1/rules.mk rename keyboards/zeix/eden/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/zeix/eden/rules.mk rename keyboards/zeix/qwertyqop60hs/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/zeix/qwertyqop60hs/rules.mk rename keyboards/zicodia/tklfrlnrlmlao/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/zicodia/tklfrlnrlmlao/rules.mk rename keyboards/zlabkeeb/15pad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/zlabkeeb/15pad/rules.mk rename keyboards/zlabkeeb/6pad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/zlabkeeb/6pad/rules.mk rename keyboards/zos/65s/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/zos/65s/rules.mk rename keyboards/zvecr/zv48/f411/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/zvecr/zv48/f411/rules.mk rename keyboards/zwag/zwag75/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/zwag/zwag75/rules.mk rename keyboards/zykrah/fuyu/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/zykrah/fuyu/rules.mk rename keyboards/zykrah/slime88/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/zykrah/slime88/rules.mk diff --git a/keyboards/0_sixty/base/info.json b/keyboards/0_sixty/base/keyboard.json similarity index 100% rename from keyboards/0_sixty/base/info.json rename to keyboards/0_sixty/base/keyboard.json diff --git a/keyboards/0_sixty/base/rules.mk b/keyboards/0_sixty/base/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/0_sixty/underglow/info.json b/keyboards/0_sixty/underglow/keyboard.json similarity index 100% rename from keyboards/0_sixty/underglow/info.json rename to keyboards/0_sixty/underglow/keyboard.json diff --git a/keyboards/0_sixty/underglow/rules.mk b/keyboards/0_sixty/underglow/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/1upkeyboards/1upocarina/info.json b/keyboards/1upkeyboards/1upocarina/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/1upocarina/info.json rename to keyboards/1upkeyboards/1upocarina/keyboard.json diff --git a/keyboards/1upkeyboards/1upocarina/rules.mk b/keyboards/1upkeyboards/1upocarina/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/1upkeyboards/1upocarina/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/1upkeyboards/1upsuper16v3/info.json b/keyboards/1upkeyboards/1upsuper16v3/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/1upsuper16v3/info.json rename to keyboards/1upkeyboards/1upsuper16v3/keyboard.json diff --git a/keyboards/1upkeyboards/1upsuper16v3/rules.mk b/keyboards/1upkeyboards/1upsuper16v3/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/pi40/grid_v1_1/info.json rename to keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk b/keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/pi40/mit_v1_0/info.json rename to keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk b/keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/pi40/mit_v1_1/info.json rename to keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk b/keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/1upkeyboards/pi50/grid/info.json b/keyboards/1upkeyboards/pi50/grid/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/pi50/grid/info.json rename to keyboards/1upkeyboards/pi50/grid/keyboard.json diff --git a/keyboards/1upkeyboards/pi50/grid/rules.mk b/keyboards/1upkeyboards/pi50/grid/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/1upkeyboards/pi50/mit/info.json b/keyboards/1upkeyboards/pi50/mit/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/pi50/mit/info.json rename to keyboards/1upkeyboards/pi50/mit/keyboard.json diff --git a/keyboards/1upkeyboards/pi50/mit/rules.mk b/keyboards/1upkeyboards/pi50/mit/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/pi60/info.json rename to keyboards/1upkeyboards/pi60/keyboard.json diff --git a/keyboards/1upkeyboards/pi60/rules.mk b/keyboards/1upkeyboards/pi60/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/pi60_hse/info.json rename to keyboards/1upkeyboards/pi60_hse/keyboard.json diff --git a/keyboards/1upkeyboards/pi60_hse/rules.mk b/keyboards/1upkeyboards/pi60_hse/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/pi60_rgb/info.json rename to keyboards/1upkeyboards/pi60_rgb/keyboard.json diff --git a/keyboards/1upkeyboards/pi60_rgb/rules.mk b/keyboards/1upkeyboards/pi60_rgb/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/1upkeyboards/pi60_rgb_v2/info.json b/keyboards/1upkeyboards/pi60_rgb_v2/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/pi60_rgb_v2/info.json rename to keyboards/1upkeyboards/pi60_rgb_v2/keyboard.json diff --git a/keyboards/1upkeyboards/pi60_rgb_v2/rules.mk b/keyboards/1upkeyboards/pi60_rgb_v2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/sweet16v2/kb2040/info.json rename to keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/sweet16v2/pro_micro/info.json rename to keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk b/keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/40percentclub/i75/promicro/info.json b/keyboards/40percentclub/i75/promicro/keyboard.json similarity index 100% rename from keyboards/40percentclub/i75/promicro/info.json rename to keyboards/40percentclub/i75/promicro/keyboard.json diff --git a/keyboards/40percentclub/i75/promicro/rules.mk b/keyboards/40percentclub/i75/promicro/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/40percentclub/i75/teensy2/info.json b/keyboards/40percentclub/i75/teensy2/keyboard.json similarity index 100% rename from keyboards/40percentclub/i75/teensy2/info.json rename to keyboards/40percentclub/i75/teensy2/keyboard.json diff --git a/keyboards/40percentclub/i75/teensy2/rules.mk b/keyboards/40percentclub/i75/teensy2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/40percentclub/polyandry/promicro/info.json b/keyboards/40percentclub/polyandry/promicro/keyboard.json similarity index 100% rename from keyboards/40percentclub/polyandry/promicro/info.json rename to keyboards/40percentclub/polyandry/promicro/keyboard.json diff --git a/keyboards/40percentclub/polyandry/promicro/rules.mk b/keyboards/40percentclub/polyandry/promicro/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/40percentclub/polyandry/teensy2/info.json b/keyboards/40percentclub/polyandry/teensy2/keyboard.json similarity index 100% rename from keyboards/40percentclub/polyandry/teensy2/info.json rename to keyboards/40percentclub/polyandry/teensy2/keyboard.json diff --git a/keyboards/40percentclub/polyandry/teensy2/rules.mk b/keyboards/40percentclub/polyandry/teensy2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/8pack/rev11/info.json b/keyboards/8pack/rev11/keyboard.json similarity index 100% rename from keyboards/8pack/rev11/info.json rename to keyboards/8pack/rev11/keyboard.json diff --git a/keyboards/8pack/rev11/rules.mk b/keyboards/8pack/rev11/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/8pack/rev12/info.json b/keyboards/8pack/rev12/keyboard.json similarity index 100% rename from keyboards/8pack/rev12/info.json rename to keyboards/8pack/rev12/keyboard.json diff --git a/keyboards/8pack/rev12/rules.mk b/keyboards/8pack/rev12/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/keyboard.json similarity index 100% rename from keyboards/a_dux/info.json rename to keyboards/a_dux/keyboard.json diff --git a/keyboards/a_dux/rules.mk b/keyboards/a_dux/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/a_dux/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/abatskeyboardclub/nayeon/info.json b/keyboards/abatskeyboardclub/nayeon/keyboard.json similarity index 100% rename from keyboards/abatskeyboardclub/nayeon/info.json rename to keyboards/abatskeyboardclub/nayeon/keyboard.json diff --git a/keyboards/abatskeyboardclub/nayeon/rules.mk b/keyboards/abatskeyboardclub/nayeon/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/abatskeyboardclub/nayeon/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/abko/ak84bt/info.json b/keyboards/abko/ak84bt/keyboard.json similarity index 100% rename from keyboards/abko/ak84bt/info.json rename to keyboards/abko/ak84bt/keyboard.json diff --git a/keyboards/abko/ak84bt/rules.mk b/keyboards/abko/ak84bt/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/abko/ak84bt/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/acheron/themis/87h/info.json b/keyboards/acheron/themis/87h/keyboard.json similarity index 100% rename from keyboards/acheron/themis/87h/info.json rename to keyboards/acheron/themis/87h/keyboard.json diff --git a/keyboards/acheron/themis/87h/rules.mk b/keyboards/acheron/themis/87h/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/acheron/themis/87htsc/info.json b/keyboards/acheron/themis/87htsc/keyboard.json similarity index 100% rename from keyboards/acheron/themis/87htsc/info.json rename to keyboards/acheron/themis/87htsc/keyboard.json diff --git a/keyboards/acheron/themis/87htsc/rules.mk b/keyboards/acheron/themis/87htsc/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/acheron/themis/88htsc/info.json b/keyboards/acheron/themis/88htsc/keyboard.json similarity index 100% rename from keyboards/acheron/themis/88htsc/info.json rename to keyboards/acheron/themis/88htsc/keyboard.json diff --git a/keyboards/acheron/themis/88htsc/rules.mk b/keyboards/acheron/themis/88htsc/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/adm42/rev4/info.json b/keyboards/adm42/rev4/keyboard.json similarity index 100% rename from keyboards/adm42/rev4/info.json rename to keyboards/adm42/rev4/keyboard.json diff --git a/keyboards/adm42/rev4/rules.mk b/keyboards/adm42/rev4/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/adm42/rev4/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ah/haven60/info.json b/keyboards/ah/haven60/keyboard.json similarity index 100% rename from keyboards/ah/haven60/info.json rename to keyboards/ah/haven60/keyboard.json diff --git a/keyboards/ah/haven60/rules.mk b/keyboards/ah/haven60/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ah/haven60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ah/haven65/info.json b/keyboards/ah/haven65/keyboard.json similarity index 100% rename from keyboards/ah/haven65/info.json rename to keyboards/ah/haven65/keyboard.json diff --git a/keyboards/ah/haven65/rules.mk b/keyboards/ah/haven65/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ah/haven65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ah/haven80/hotswap/info.json b/keyboards/ah/haven80/hotswap/keyboard.json similarity index 100% rename from keyboards/ah/haven80/hotswap/info.json rename to keyboards/ah/haven80/hotswap/keyboard.json diff --git a/keyboards/ah/haven80/hotswap/rules.mk b/keyboards/ah/haven80/hotswap/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ah/haven80/hotswap/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ah/haven80/solder/info.json b/keyboards/ah/haven80/solder/keyboard.json similarity index 100% rename from keyboards/ah/haven80/solder/info.json rename to keyboards/ah/haven80/solder/keyboard.json diff --git a/keyboards/ah/haven80/solder/rules.mk b/keyboards/ah/haven80/solder/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ah/haven80/solder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ai/info.json b/keyboards/ai/keyboard.json similarity index 100% rename from keyboards/ai/info.json rename to keyboards/ai/keyboard.json diff --git a/keyboards/ai/rules.mk b/keyboards/ai/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ai/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ai03/duet/info.json b/keyboards/ai03/duet/keyboard.json similarity index 100% rename from keyboards/ai03/duet/info.json rename to keyboards/ai03/duet/keyboard.json diff --git a/keyboards/ai03/duet/rules.mk b/keyboards/ai03/duet/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ai03/duet/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/aidansmithdotdev/fine40/info.json b/keyboards/aidansmithdotdev/fine40/keyboard.json similarity index 100% rename from keyboards/aidansmithdotdev/fine40/info.json rename to keyboards/aidansmithdotdev/fine40/keyboard.json diff --git a/keyboards/aidansmithdotdev/fine40/rules.mk b/keyboards/aidansmithdotdev/fine40/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/akb/ogr/info.json b/keyboards/akb/ogr/keyboard.json similarity index 100% rename from keyboards/akb/ogr/info.json rename to keyboards/akb/ogr/keyboard.json diff --git a/keyboards/akb/ogr/rules.mk b/keyboards/akb/ogr/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/akb/ogr/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/akb/ogrn/info.json b/keyboards/akb/ogrn/keyboard.json similarity index 100% rename from keyboards/akb/ogrn/info.json rename to keyboards/akb/ogrn/keyboard.json diff --git a/keyboards/akb/ogrn/rules.mk b/keyboards/akb/ogrn/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/akb/ogrn/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/akb/vero/info.json b/keyboards/akb/vero/keyboard.json similarity index 100% rename from keyboards/akb/vero/info.json rename to keyboards/akb/vero/keyboard.json diff --git a/keyboards/akb/vero/rules.mk b/keyboards/akb/vero/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/akb/vero/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/akko/5087/info.json b/keyboards/akko/5087/keyboard.json similarity index 100% rename from keyboards/akko/5087/info.json rename to keyboards/akko/5087/keyboard.json diff --git a/keyboards/akko/5087/rules.mk b/keyboards/akko/5087/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/akko/5087/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/akko/5108/info.json b/keyboards/akko/5108/keyboard.json similarity index 100% rename from keyboards/akko/5108/info.json rename to keyboards/akko/5108/keyboard.json diff --git a/keyboards/akko/5108/rules.mk b/keyboards/akko/5108/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/akko/5108/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/akko/acr87/info.json b/keyboards/akko/acr87/keyboard.json similarity index 100% rename from keyboards/akko/acr87/info.json rename to keyboards/akko/acr87/keyboard.json diff --git a/keyboards/akko/acr87/rules.mk b/keyboards/akko/acr87/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/akko/acr87/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/akko/top40/info.json b/keyboards/akko/top40/keyboard.json similarity index 100% rename from keyboards/akko/top40/info.json rename to keyboards/akko/top40/keyboard.json diff --git a/keyboards/akko/top40/rules.mk b/keyboards/akko/top40/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/akko/top40/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/alhenkb/macropad5x4/info.json b/keyboards/alhenkb/macropad5x4/keyboard.json similarity index 100% rename from keyboards/alhenkb/macropad5x4/info.json rename to keyboards/alhenkb/macropad5x4/keyboard.json diff --git a/keyboards/alhenkb/macropad5x4/rules.mk b/keyboards/alhenkb/macropad5x4/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/alhenkb/macropad5x4/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/alpaca/wfeclipse/info.json b/keyboards/alpaca/wfeclipse/keyboard.json similarity index 100% rename from keyboards/alpaca/wfeclipse/info.json rename to keyboards/alpaca/wfeclipse/keyboard.json diff --git a/keyboards/alpaca/wfeclipse/rules.mk b/keyboards/alpaca/wfeclipse/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/alpaca/wfeclipse/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/an_achronism/tetromino/info.json b/keyboards/an_achronism/tetromino/keyboard.json similarity index 100% rename from keyboards/an_achronism/tetromino/info.json rename to keyboards/an_achronism/tetromino/keyboard.json diff --git a/keyboards/an_achronism/tetromino/rules.mk b/keyboards/an_achronism/tetromino/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/anavi/arrows/info.json b/keyboards/anavi/arrows/keyboard.json similarity index 100% rename from keyboards/anavi/arrows/info.json rename to keyboards/anavi/arrows/keyboard.json diff --git a/keyboards/anavi/arrows/rules.mk b/keyboards/anavi/arrows/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/anavi/arrows/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/anavi/macropad10/info.json b/keyboards/anavi/macropad10/keyboard.json similarity index 100% rename from keyboards/anavi/macropad10/info.json rename to keyboards/anavi/macropad10/keyboard.json diff --git a/keyboards/anavi/macropad10/rules.mk b/keyboards/anavi/macropad10/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/anavi/macropad12/info.json b/keyboards/anavi/macropad12/keyboard.json similarity index 100% rename from keyboards/anavi/macropad12/info.json rename to keyboards/anavi/macropad12/keyboard.json diff --git a/keyboards/anavi/macropad12/rules.mk b/keyboards/anavi/macropad12/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/anavi/macropad12/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/andean_condor/info.json b/keyboards/andean_condor/keyboard.json similarity index 100% rename from keyboards/andean_condor/info.json rename to keyboards/andean_condor/keyboard.json diff --git a/keyboards/andean_condor/rules.mk b/keyboards/andean_condor/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/andean_condor/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/archetype/minervalx/info.json b/keyboards/archetype/minervalx/keyboard.json similarity index 100% rename from keyboards/archetype/minervalx/info.json rename to keyboards/archetype/minervalx/keyboard.json diff --git a/keyboards/archetype/minervalx/rules.mk b/keyboards/archetype/minervalx/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/archetype/minervalx/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/argo_works/ishi/80/mk0_avr/info.json b/keyboards/argo_works/ishi/80/mk0_avr/keyboard.json similarity index 100% rename from keyboards/argo_works/ishi/80/mk0_avr/info.json rename to keyboards/argo_works/ishi/80/mk0_avr/keyboard.json diff --git a/keyboards/argo_works/ishi/80/mk0_avr/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/argo_works/ishi/80/mk0_avr/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/artemis/paragon/hotswap/info.json b/keyboards/artemis/paragon/hotswap/keyboard.json similarity index 100% rename from keyboards/artemis/paragon/hotswap/info.json rename to keyboards/artemis/paragon/hotswap/keyboard.json diff --git a/keyboards/artemis/paragon/hotswap/rules.mk b/keyboards/artemis/paragon/hotswap/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/artemis/paragon/hotswap/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/artemis/paragon/soldered/info.json b/keyboards/artemis/paragon/soldered/keyboard.json similarity index 100% rename from keyboards/artemis/paragon/soldered/info.json rename to keyboards/artemis/paragon/soldered/keyboard.json diff --git a/keyboards/artemis/paragon/soldered/rules.mk b/keyboards/artemis/paragon/soldered/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/artemis/paragon/soldered/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ask55/info.json b/keyboards/ask55/keyboard.json similarity index 100% rename from keyboards/ask55/info.json rename to keyboards/ask55/keyboard.json diff --git a/keyboards/ask55/rules.mk b/keyboards/ask55/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/ask55/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/atreus/astar/info.json b/keyboards/atreus/astar/keyboard.json similarity index 100% rename from keyboards/atreus/astar/info.json rename to keyboards/atreus/astar/keyboard.json diff --git a/keyboards/atreus/astar/rules.mk b/keyboards/atreus/astar/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/atreus/astar_mirrored/info.json b/keyboards/atreus/astar_mirrored/keyboard.json similarity index 100% rename from keyboards/atreus/astar_mirrored/info.json rename to keyboards/atreus/astar_mirrored/keyboard.json diff --git a/keyboards/atreus/astar_mirrored/rules.mk b/keyboards/atreus/astar_mirrored/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/atreus/promicro/info.json b/keyboards/atreus/promicro/keyboard.json similarity index 100% rename from keyboards/atreus/promicro/info.json rename to keyboards/atreus/promicro/keyboard.json diff --git a/keyboards/atreus/promicro/rules.mk b/keyboards/atreus/promicro/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/atreus/teensy2/info.json b/keyboards/atreus/teensy2/keyboard.json similarity index 100% rename from keyboards/atreus/teensy2/info.json rename to keyboards/atreus/teensy2/keyboard.json diff --git a/keyboards/atreus/teensy2/rules.mk b/keyboards/atreus/teensy2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/atreyu/rev1/info.json b/keyboards/atreyu/rev1/keyboard.json similarity index 100% rename from keyboards/atreyu/rev1/info.json rename to keyboards/atreyu/rev1/keyboard.json diff --git a/keyboards/atreyu/rev1/rules.mk b/keyboards/atreyu/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/atreyu/rev2/info.json b/keyboards/atreyu/rev2/keyboard.json similarity index 100% rename from keyboards/atreyu/rev2/info.json rename to keyboards/atreyu/rev2/keyboard.json diff --git a/keyboards/atreyu/rev2/rules.mk b/keyboards/atreyu/rev2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/atreyu/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/automata02/alisaie/info.json b/keyboards/automata02/alisaie/keyboard.json similarity index 100% rename from keyboards/automata02/alisaie/info.json rename to keyboards/automata02/alisaie/keyboard.json diff --git a/keyboards/automata02/alisaie/rules.mk b/keyboards/automata02/alisaie/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/automata02/alisaie/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/bahm/aster_ergo/info.json b/keyboards/bahm/aster_ergo/keyboard.json similarity index 100% rename from keyboards/bahm/aster_ergo/info.json rename to keyboards/bahm/aster_ergo/keyboard.json diff --git a/keyboards/bahm/aster_ergo/rules.mk b/keyboards/bahm/aster_ergo/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/bahm/aster_ergo/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/balloondogcaps/tr90/info.json b/keyboards/balloondogcaps/tr90/keyboard.json similarity index 100% rename from keyboards/balloondogcaps/tr90/info.json rename to keyboards/balloondogcaps/tr90/keyboard.json diff --git a/keyboards/balloondogcaps/tr90/rules.mk b/keyboards/balloondogcaps/tr90/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/balloondogcaps/tr90pm/info.json b/keyboards/balloondogcaps/tr90pm/keyboard.json similarity index 100% rename from keyboards/balloondogcaps/tr90pm/info.json rename to keyboards/balloondogcaps/tr90pm/keyboard.json diff --git a/keyboards/balloondogcaps/tr90pm/rules.mk b/keyboards/balloondogcaps/tr90pm/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/balloondogcaps/tr90pm/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/bear_face/v1/info.json b/keyboards/bear_face/v1/keyboard.json similarity index 100% rename from keyboards/bear_face/v1/info.json rename to keyboards/bear_face/v1/keyboard.json diff --git a/keyboards/bear_face/v1/rules.mk b/keyboards/bear_face/v1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/bear_face/v2/info.json b/keyboards/bear_face/v2/keyboard.json similarity index 100% rename from keyboards/bear_face/v2/info.json rename to keyboards/bear_face/v2/keyboard.json diff --git a/keyboards/bear_face/v2/rules.mk b/keyboards/bear_face/v2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/bestway/info.json b/keyboards/bestway/keyboard.json similarity index 100% rename from keyboards/bestway/info.json rename to keyboards/bestway/keyboard.json diff --git a/keyboards/bestway/rules.mk b/keyboards/bestway/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/bestway/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/binepad/bn006/info.json b/keyboards/binepad/bn006/keyboard.json similarity index 100% rename from keyboards/binepad/bn006/info.json rename to keyboards/binepad/bn006/keyboard.json diff --git a/keyboards/binepad/bn006/rules.mk b/keyboards/binepad/bn006/rules.mk deleted file mode 100755 index 7ff128fa692..00000000000 --- a/keyboards/binepad/bn006/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/binepad/bn009/r2/info.json b/keyboards/binepad/bn009/r2/keyboard.json similarity index 100% rename from keyboards/binepad/bn009/r2/info.json rename to keyboards/binepad/bn009/r2/keyboard.json diff --git a/keyboards/binepad/bn009/r2/rules.mk b/keyboards/binepad/bn009/r2/rules.mk deleted file mode 100644 index 837f4bffb53..00000000000 --- a/keyboards/binepad/bn009/r2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally left blank diff --git a/keyboards/binepad/bnk9/info.json b/keyboards/binepad/bnk9/keyboard.json similarity index 100% rename from keyboards/binepad/bnk9/info.json rename to keyboards/binepad/bnk9/keyboard.json diff --git a/keyboards/binepad/bnk9/rules.mk b/keyboards/binepad/bnk9/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/binepad/bnk9/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/binepad/bnr1/v2/info.json b/keyboards/binepad/bnr1/v2/keyboard.json similarity index 100% rename from keyboards/binepad/bnr1/v2/info.json rename to keyboards/binepad/bnr1/v2/keyboard.json diff --git a/keyboards/binepad/bnr1/v2/rules.mk b/keyboards/binepad/bnr1/v2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/binepad/bnr1/v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/binepad/pixie/info.json b/keyboards/binepad/pixie/keyboard.json similarity index 100% rename from keyboards/binepad/pixie/info.json rename to keyboards/binepad/pixie/keyboard.json diff --git a/keyboards/binepad/pixie/rules.mk b/keyboards/binepad/pixie/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/binepad/pixie/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/black_hellebore/info.json b/keyboards/black_hellebore/keyboard.json similarity index 100% rename from keyboards/black_hellebore/info.json rename to keyboards/black_hellebore/keyboard.json diff --git a/keyboards/black_hellebore/rules.mk b/keyboards/black_hellebore/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/blu/vimclutch/info.json b/keyboards/blu/vimclutch/keyboard.json similarity index 100% rename from keyboards/blu/vimclutch/info.json rename to keyboards/blu/vimclutch/keyboard.json diff --git a/keyboards/blu/vimclutch/rules.mk b/keyboards/blu/vimclutch/rules.mk deleted file mode 100644 index 837f4bffb53..00000000000 --- a/keyboards/blu/vimclutch/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally left blank diff --git a/keyboards/boardsource/3x4/info.json b/keyboards/boardsource/3x4/keyboard.json similarity index 100% rename from keyboards/boardsource/3x4/info.json rename to keyboards/boardsource/3x4/keyboard.json diff --git a/keyboards/boardsource/3x4/rules.mk b/keyboards/boardsource/3x4/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/boardsource/3x4/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/boardsource/4x12/info.json b/keyboards/boardsource/4x12/keyboard.json similarity index 100% rename from keyboards/boardsource/4x12/info.json rename to keyboards/boardsource/4x12/keyboard.json diff --git a/keyboards/boardsource/4x12/rules.mk b/keyboards/boardsource/4x12/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/boardsource/4x12/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/boardsource/5x12/info.json b/keyboards/boardsource/5x12/keyboard.json similarity index 100% rename from keyboards/boardsource/5x12/info.json rename to keyboards/boardsource/5x12/keyboard.json diff --git a/keyboards/boardsource/5x12/rules.mk b/keyboards/boardsource/5x12/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/boardsource/5x12/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/boardsource/beiwagon/info.json b/keyboards/boardsource/beiwagon/keyboard.json similarity index 100% rename from keyboards/boardsource/beiwagon/info.json rename to keyboards/boardsource/beiwagon/keyboard.json diff --git a/keyboards/boardsource/beiwagon/rules.mk b/keyboards/boardsource/beiwagon/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/boardsource/equals/avr/info.json b/keyboards/boardsource/equals/avr/keyboard.json similarity index 100% rename from keyboards/boardsource/equals/avr/info.json rename to keyboards/boardsource/equals/avr/keyboard.json diff --git a/keyboards/boardsource/equals/avr/rules.mk b/keyboards/boardsource/equals/avr/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/boardsource/equals/avr/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/boardsource/holiday/spooky/info.json b/keyboards/boardsource/holiday/spooky/keyboard.json similarity index 100% rename from keyboards/boardsource/holiday/spooky/info.json rename to keyboards/boardsource/holiday/spooky/keyboard.json diff --git a/keyboards/boardsource/holiday/spooky/rules.mk b/keyboards/boardsource/holiday/spooky/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/boardsource/holiday/spooky/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/boardsource/lulu/avr/info.json b/keyboards/boardsource/lulu/avr/keyboard.json similarity index 100% rename from keyboards/boardsource/lulu/avr/info.json rename to keyboards/boardsource/lulu/avr/keyboard.json diff --git a/keyboards/boardsource/lulu/avr/rules.mk b/keyboards/boardsource/lulu/avr/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/boardsource/lulu/avr/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/boardsource/microdox/v1/info.json b/keyboards/boardsource/microdox/v1/keyboard.json similarity index 100% rename from keyboards/boardsource/microdox/v1/info.json rename to keyboards/boardsource/microdox/v1/keyboard.json diff --git a/keyboards/boardsource/microdox/v1/rules.mk b/keyboards/boardsource/microdox/v1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/boardsource/microdox/v1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/boardsource/microdox/v2/info.json b/keyboards/boardsource/microdox/v2/keyboard.json similarity index 100% rename from keyboards/boardsource/microdox/v2/info.json rename to keyboards/boardsource/microdox/v2/keyboard.json diff --git a/keyboards/boardsource/microdox/v2/rules.mk b/keyboards/boardsource/microdox/v2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/boardsource/technik_o/info.json b/keyboards/boardsource/technik_o/keyboard.json similarity index 100% rename from keyboards/boardsource/technik_o/info.json rename to keyboards/boardsource/technik_o/keyboard.json diff --git a/keyboards/boardsource/technik_o/rules.mk b/keyboards/boardsource/technik_o/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/boardsource/technik_s/info.json b/keyboards/boardsource/technik_s/keyboard.json similarity index 100% rename from keyboards/boardsource/technik_s/info.json rename to keyboards/boardsource/technik_s/keyboard.json diff --git a/keyboards/boardsource/technik_s/rules.mk b/keyboards/boardsource/technik_s/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/keyboard.json similarity index 100% rename from keyboards/boardsource/the_mark/info.json rename to keyboards/boardsource/the_mark/keyboard.json diff --git a/keyboards/boardsource/the_mark/rules.mk b/keyboards/boardsource/the_mark/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/bredworks/wyvern_hs/info.json b/keyboards/bredworks/wyvern_hs/keyboard.json similarity index 100% rename from keyboards/bredworks/wyvern_hs/info.json rename to keyboards/bredworks/wyvern_hs/keyboard.json diff --git a/keyboards/bredworks/wyvern_hs/rules.mk b/keyboards/bredworks/wyvern_hs/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/bredworks/wyvern_hs/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/bschwind/key_ripper/info.json b/keyboards/bschwind/key_ripper/keyboard.json similarity index 100% rename from keyboards/bschwind/key_ripper/info.json rename to keyboards/bschwind/key_ripper/keyboard.json diff --git a/keyboards/bschwind/key_ripper/rules.mk b/keyboards/bschwind/key_ripper/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/bschwind/key_ripper/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/buildakb/mw60/info.json b/keyboards/buildakb/mw60/keyboard.json similarity index 100% rename from keyboards/buildakb/mw60/info.json rename to keyboards/buildakb/mw60/keyboard.json diff --git a/keyboards/buildakb/mw60/rules.mk b/keyboards/buildakb/mw60/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/buildakb/mw60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/butterkeebs/pocketpad/info.json b/keyboards/butterkeebs/pocketpad/keyboard.json similarity index 100% rename from keyboards/butterkeebs/pocketpad/info.json rename to keyboards/butterkeebs/pocketpad/keyboard.json diff --git a/keyboards/butterkeebs/pocketpad/rules.mk b/keyboards/butterkeebs/pocketpad/rules.mk deleted file mode 100644 index f886ea2e8ec..00000000000 --- a/keyboards/butterkeebs/pocketpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally blank \ No newline at end of file diff --git a/keyboards/cannonkeys/bastion60/info.json b/keyboards/cannonkeys/bastion60/keyboard.json similarity index 100% rename from keyboards/cannonkeys/bastion60/info.json rename to keyboards/cannonkeys/bastion60/keyboard.json diff --git a/keyboards/cannonkeys/bastion60/rules.mk b/keyboards/cannonkeys/bastion60/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/cannonkeys/bastion60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/cannonkeys/bastion65/info.json b/keyboards/cannonkeys/bastion65/keyboard.json similarity index 100% rename from keyboards/cannonkeys/bastion65/info.json rename to keyboards/cannonkeys/bastion65/keyboard.json diff --git a/keyboards/cannonkeys/bastion65/rules.mk b/keyboards/cannonkeys/bastion65/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/cannonkeys/bastion65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/cannonkeys/bastion75/info.json b/keyboards/cannonkeys/bastion75/keyboard.json similarity index 100% rename from keyboards/cannonkeys/bastion75/info.json rename to keyboards/cannonkeys/bastion75/keyboard.json diff --git a/keyboards/cannonkeys/bastion75/rules.mk b/keyboards/cannonkeys/bastion75/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/cannonkeys/bastion75/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/cannonkeys/bastiontkl/info.json b/keyboards/cannonkeys/bastiontkl/keyboard.json similarity index 100% rename from keyboards/cannonkeys/bastiontkl/info.json rename to keyboards/cannonkeys/bastiontkl/keyboard.json diff --git a/keyboards/cannonkeys/bastiontkl/rules.mk b/keyboards/cannonkeys/bastiontkl/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/cannonkeys/bastiontkl/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/cannonkeys/brutalv2_1800/info.json b/keyboards/cannonkeys/brutalv2_1800/keyboard.json similarity index 100% rename from keyboards/cannonkeys/brutalv2_1800/info.json rename to keyboards/cannonkeys/brutalv2_1800/keyboard.json diff --git a/keyboards/cannonkeys/brutalv2_1800/rules.mk b/keyboards/cannonkeys/brutalv2_1800/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/cannonkeys/brutalv2_1800/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/cannonkeys/brutalv2_60/info.json b/keyboards/cannonkeys/brutalv2_60/keyboard.json similarity index 100% rename from keyboards/cannonkeys/brutalv2_60/info.json rename to keyboards/cannonkeys/brutalv2_60/keyboard.json diff --git a/keyboards/cannonkeys/brutalv2_60/rules.mk b/keyboards/cannonkeys/brutalv2_60/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/cannonkeys/brutalv2_60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/cannonkeys/caerdroia/info.json b/keyboards/cannonkeys/caerdroia/keyboard.json similarity index 100% rename from keyboards/cannonkeys/caerdroia/info.json rename to keyboards/cannonkeys/caerdroia/keyboard.json diff --git a/keyboards/cannonkeys/caerdroia/rules.mk b/keyboards/cannonkeys/caerdroia/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/cannonkeys/caerdroia/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/cannonkeys/db60/hotswap/info.json b/keyboards/cannonkeys/db60/hotswap/keyboard.json similarity index 100% rename from keyboards/cannonkeys/db60/hotswap/info.json rename to keyboards/cannonkeys/db60/hotswap/keyboard.json diff --git a/keyboards/cannonkeys/db60/hotswap/rules.mk b/keyboards/cannonkeys/db60/hotswap/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/cannonkeys/db60/j02/info.json b/keyboards/cannonkeys/db60/j02/keyboard.json similarity index 100% rename from keyboards/cannonkeys/db60/j02/info.json rename to keyboards/cannonkeys/db60/j02/keyboard.json diff --git a/keyboards/cannonkeys/db60/j02/rules.mk b/keyboards/cannonkeys/db60/j02/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/cannonkeys/db60/rev2/info.json b/keyboards/cannonkeys/db60/rev2/keyboard.json similarity index 100% rename from keyboards/cannonkeys/db60/rev2/info.json rename to keyboards/cannonkeys/db60/rev2/keyboard.json diff --git a/keyboards/cannonkeys/db60/rev2/rules.mk b/keyboards/cannonkeys/db60/rev2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/cannonkeys/ortho48v2/info.json b/keyboards/cannonkeys/ortho48v2/keyboard.json similarity index 100% rename from keyboards/cannonkeys/ortho48v2/info.json rename to keyboards/cannonkeys/ortho48v2/keyboard.json diff --git a/keyboards/cannonkeys/ortho48v2/rules.mk b/keyboards/cannonkeys/ortho48v2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/cannonkeys/ortho48v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/cannonkeys/ortho60v2/info.json b/keyboards/cannonkeys/ortho60v2/keyboard.json similarity index 100% rename from keyboards/cannonkeys/ortho60v2/info.json rename to keyboards/cannonkeys/ortho60v2/keyboard.json diff --git a/keyboards/cannonkeys/ortho60v2/rules.mk b/keyboards/cannonkeys/ortho60v2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/cannonkeys/ortho60v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/cannonkeys/satisfaction75/prototype/info.json b/keyboards/cannonkeys/satisfaction75/prototype/keyboard.json similarity index 100% rename from keyboards/cannonkeys/satisfaction75/prototype/info.json rename to keyboards/cannonkeys/satisfaction75/prototype/keyboard.json diff --git a/keyboards/cannonkeys/satisfaction75/prototype/rules.mk b/keyboards/cannonkeys/satisfaction75/prototype/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/cannonkeys/satisfaction75/prototype/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/cannonkeys/satisfaction75/rev1/info.json b/keyboards/cannonkeys/satisfaction75/rev1/keyboard.json similarity index 100% rename from keyboards/cannonkeys/satisfaction75/rev1/info.json rename to keyboards/cannonkeys/satisfaction75/rev1/keyboard.json diff --git a/keyboards/cannonkeys/satisfaction75/rev1/rules.mk b/keyboards/cannonkeys/satisfaction75/rev1/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/cannonkeys/satisfaction75/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/cannonkeys/satisfaction75/rev2/info.json b/keyboards/cannonkeys/satisfaction75/rev2/keyboard.json similarity index 100% rename from keyboards/cannonkeys/satisfaction75/rev2/info.json rename to keyboards/cannonkeys/satisfaction75/rev2/keyboard.json diff --git a/keyboards/cannonkeys/satisfaction75/rev2/rules.mk b/keyboards/cannonkeys/satisfaction75/rev2/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/cannonkeys/satisfaction75/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/cannonkeys/typeb/info.json b/keyboards/cannonkeys/typeb/keyboard.json similarity index 100% rename from keyboards/cannonkeys/typeb/info.json rename to keyboards/cannonkeys/typeb/keyboard.json diff --git a/keyboards/cannonkeys/typeb/rules.mk b/keyboards/cannonkeys/typeb/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/cannonkeys/typeb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/capsunlocked/cu75/info.json b/keyboards/capsunlocked/cu75/keyboard.json similarity index 100% rename from keyboards/capsunlocked/cu75/info.json rename to keyboards/capsunlocked/cu75/keyboard.json diff --git a/keyboards/capsunlocked/cu75/rules.mk b/keyboards/capsunlocked/cu75/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/capsunlocked/cu80/v2/ansi/info.json b/keyboards/capsunlocked/cu80/v2/ansi/keyboard.json similarity index 100% rename from keyboards/capsunlocked/cu80/v2/ansi/info.json rename to keyboards/capsunlocked/cu80/v2/ansi/keyboard.json diff --git a/keyboards/capsunlocked/cu80/v2/ansi/rules.mk b/keyboards/capsunlocked/cu80/v2/ansi/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/capsunlocked/cu80/v2/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/capsunlocked/cu80/v2/iso/info.json b/keyboards/capsunlocked/cu80/v2/iso/keyboard.json similarity index 100% rename from keyboards/capsunlocked/cu80/v2/iso/info.json rename to keyboards/capsunlocked/cu80/v2/iso/keyboard.json diff --git a/keyboards/capsunlocked/cu80/v2/iso/rules.mk b/keyboards/capsunlocked/cu80/v2/iso/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/capsunlocked/cu80/v2/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/chickenman/ciel65/info.json b/keyboards/chickenman/ciel65/keyboard.json similarity index 100% rename from keyboards/chickenman/ciel65/info.json rename to keyboards/chickenman/ciel65/keyboard.json diff --git a/keyboards/chickenman/ciel65/rules.mk b/keyboards/chickenman/ciel65/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/chickenman/ciel65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/keyboard.json similarity index 100% rename from keyboards/chlx/ppr_merro60/info.json rename to keyboards/chlx/ppr_merro60/keyboard.json diff --git a/keyboards/chlx/ppr_merro60/rules.mk b/keyboards/chlx/ppr_merro60/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/chlx/ppr_merro60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/chord/zero/info.json b/keyboards/chord/zero/keyboard.json similarity index 100% rename from keyboards/chord/zero/info.json rename to keyboards/chord/zero/keyboard.json diff --git a/keyboards/chord/zero/rules.mk b/keyboards/chord/zero/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/chord/zero/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/chosfox/cf81/info.json b/keyboards/chosfox/cf81/keyboard.json similarity index 100% rename from keyboards/chosfox/cf81/info.json rename to keyboards/chosfox/cf81/keyboard.json diff --git a/keyboards/chosfox/cf81/rules.mk b/keyboards/chosfox/cf81/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/chosfox/cf81/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/chouchou/info.json b/keyboards/chouchou/keyboard.json similarity index 100% rename from keyboards/chouchou/info.json rename to keyboards/chouchou/keyboard.json diff --git a/keyboards/chouchou/rules.mk b/keyboards/chouchou/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/chromatonemini/info.json b/keyboards/chromatonemini/keyboard.json similarity index 100% rename from keyboards/chromatonemini/info.json rename to keyboards/chromatonemini/keyboard.json diff --git a/keyboards/chromatonemini/rules.mk b/keyboards/chromatonemini/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/churrosoft/deck8/noleds/info.json b/keyboards/churrosoft/deck8/noleds/keyboard.json similarity index 100% rename from keyboards/churrosoft/deck8/noleds/info.json rename to keyboards/churrosoft/deck8/noleds/keyboard.json diff --git a/keyboards/churrosoft/deck8/noleds/rules.mk b/keyboards/churrosoft/deck8/noleds/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/churrosoft/deck8/noleds/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/churrosoft/deck8/rgb/info.json b/keyboards/churrosoft/deck8/rgb/keyboard.json similarity index 100% rename from keyboards/churrosoft/deck8/rgb/info.json rename to keyboards/churrosoft/deck8/rgb/keyboard.json diff --git a/keyboards/churrosoft/deck8/rgb/rules.mk b/keyboards/churrosoft/deck8/rgb/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/churrosoft/deck8/rgb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/cipulot/60xt/info.json b/keyboards/cipulot/60xt/keyboard.json similarity index 100% rename from keyboards/cipulot/60xt/info.json rename to keyboards/cipulot/60xt/keyboard.json diff --git a/keyboards/cipulot/60xt/rules.mk b/keyboards/cipulot/60xt/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/citrus/erdnuss65/info.json b/keyboards/citrus/erdnuss65/keyboard.json similarity index 100% rename from keyboards/citrus/erdnuss65/info.json rename to keyboards/citrus/erdnuss65/keyboard.json diff --git a/keyboards/citrus/erdnuss65/rules.mk b/keyboards/citrus/erdnuss65/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/clickety_split/leeloo/rev1/info.json b/keyboards/clickety_split/leeloo/rev1/keyboard.json similarity index 100% rename from keyboards/clickety_split/leeloo/rev1/info.json rename to keyboards/clickety_split/leeloo/rev1/keyboard.json diff --git a/keyboards/clickety_split/leeloo/rev1/rules.mk b/keyboards/clickety_split/leeloo/rev1/rules.mk deleted file mode 100644 index 5713c150766..00000000000 --- a/keyboards/clickety_split/leeloo/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# Intentionally left blank. \ No newline at end of file diff --git a/keyboards/clickety_split/leeloo/rev2/info.json b/keyboards/clickety_split/leeloo/rev2/keyboard.json similarity index 100% rename from keyboards/clickety_split/leeloo/rev2/info.json rename to keyboards/clickety_split/leeloo/rev2/keyboard.json diff --git a/keyboards/clickety_split/leeloo/rev2/rules.mk b/keyboards/clickety_split/leeloo/rev2/rules.mk deleted file mode 100644 index 80a6663b9c6..00000000000 --- a/keyboards/clickety_split/leeloo/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# Intentionally left blank. diff --git a/keyboards/clickety_split/leeloo/rev3/info.json b/keyboards/clickety_split/leeloo/rev3/keyboard.json similarity index 100% rename from keyboards/clickety_split/leeloo/rev3/info.json rename to keyboards/clickety_split/leeloo/rev3/keyboard.json diff --git a/keyboards/clickety_split/leeloo/rev3/rules.mk b/keyboards/clickety_split/leeloo/rev3/rules.mk deleted file mode 100644 index 80a6663b9c6..00000000000 --- a/keyboards/clickety_split/leeloo/rev3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# Intentionally left blank. diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/keyboard.json similarity index 100% rename from keyboards/clueboard/17/info.json rename to keyboards/clueboard/17/keyboard.json diff --git a/keyboards/clueboard/17/rules.mk b/keyboards/clueboard/17/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/keyboard.json similarity index 100% rename from keyboards/clueboard/2x1800/2018/info.json rename to keyboards/clueboard/2x1800/2018/keyboard.json diff --git a/keyboards/clueboard/2x1800/2018/rules.mk b/keyboards/clueboard/2x1800/2018/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/clueboard/2x1800/2018/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/keyboard.json similarity index 100% rename from keyboards/clueboard/2x1800/2019/info.json rename to keyboards/clueboard/2x1800/2019/keyboard.json diff --git a/keyboards/clueboard/2x1800/2019/rules.mk b/keyboards/clueboard/2x1800/2019/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/clueboard/2x1800/2019/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/keyboard.json similarity index 100% rename from keyboards/clueboard/66/rev1/info.json rename to keyboards/clueboard/66/rev1/keyboard.json diff --git a/keyboards/clueboard/66/rev1/rules.mk b/keyboards/clueboard/66/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/clueboard/66/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/keyboard.json similarity index 100% rename from keyboards/clueboard/66/rev2/info.json rename to keyboards/clueboard/66/rev2/keyboard.json diff --git a/keyboards/clueboard/66/rev2/rules.mk b/keyboards/clueboard/66/rev2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/keyboard.json similarity index 100% rename from keyboards/clueboard/66/rev3/info.json rename to keyboards/clueboard/66/rev3/keyboard.json diff --git a/keyboards/clueboard/66/rev3/rules.mk b/keyboards/clueboard/66/rev3/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/keyboard.json similarity index 100% rename from keyboards/clueboard/66/rev4/info.json rename to keyboards/clueboard/66/rev4/keyboard.json diff --git a/keyboards/clueboard/66/rev4/rules.mk b/keyboards/clueboard/66/rev4/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/clueboard/66/rev4/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/keyboard.json similarity index 100% rename from keyboards/clueboard/66_hotswap/gen1/info.json rename to keyboards/clueboard/66_hotswap/gen1/keyboard.json diff --git a/keyboards/clueboard/66_hotswap/gen1/rules.mk b/keyboards/clueboard/66_hotswap/gen1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/clueboard/california/info.json b/keyboards/clueboard/california/keyboard.json similarity index 100% rename from keyboards/clueboard/california/info.json rename to keyboards/clueboard/california/keyboard.json diff --git a/keyboards/clueboard/california/rules.mk b/keyboards/clueboard/california/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/clueboard/california/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/keyboard.json similarity index 100% rename from keyboards/clueboard/card/info.json rename to keyboards/clueboard/card/keyboard.json diff --git a/keyboards/clueboard/card/rules.mk b/keyboards/clueboard/card/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/coban/pad9a/info.json b/keyboards/coban/pad9a/keyboard.json similarity index 100% rename from keyboards/coban/pad9a/info.json rename to keyboards/coban/pad9a/keyboard.json diff --git a/keyboards/coban/pad9a/rules.mk b/keyboards/coban/pad9a/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/compensator/info.json b/keyboards/compensator/keyboard.json similarity index 100% rename from keyboards/compensator/info.json rename to keyboards/compensator/keyboard.json diff --git a/keyboards/compensator/rules.mk b/keyboards/compensator/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/compensator/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/contra/info.json b/keyboards/contra/keyboard.json similarity index 100% rename from keyboards/contra/info.json rename to keyboards/contra/keyboard.json diff --git a/keyboards/contra/rules.mk b/keyboards/contra/rules.mk deleted file mode 100755 index 6e7633bfe01..00000000000 --- a/keyboards/contra/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/converter/adb_usb/rev1/info.json b/keyboards/converter/adb_usb/rev1/keyboard.json similarity index 100% rename from keyboards/converter/adb_usb/rev1/info.json rename to keyboards/converter/adb_usb/rev1/keyboard.json diff --git a/keyboards/converter/adb_usb/rev1/rules.mk b/keyboards/converter/adb_usb/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/converter/adb_usb/rev2/info.json b/keyboards/converter/adb_usb/rev2/keyboard.json similarity index 100% rename from keyboards/converter/adb_usb/rev2/info.json rename to keyboards/converter/adb_usb/rev2/keyboard.json diff --git a/keyboards/converter/adb_usb/rev2/rules.mk b/keyboards/converter/adb_usb/rev2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/converter/palm_usb/stowaway/info.json b/keyboards/converter/palm_usb/stowaway/keyboard.json similarity index 100% rename from keyboards/converter/palm_usb/stowaway/info.json rename to keyboards/converter/palm_usb/stowaway/keyboard.json diff --git a/keyboards/converter/palm_usb/stowaway/rules.mk b/keyboards/converter/palm_usb/stowaway/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/converter/sun_usb/type3/info.json b/keyboards/converter/sun_usb/type3/keyboard.json similarity index 100% rename from keyboards/converter/sun_usb/type3/info.json rename to keyboards/converter/sun_usb/type3/keyboard.json diff --git a/keyboards/converter/sun_usb/type3/rules.mk b/keyboards/converter/sun_usb/type3/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/converter/sun_usb/type5/info.json b/keyboards/converter/sun_usb/type5/keyboard.json similarity index 100% rename from keyboards/converter/sun_usb/type5/info.json rename to keyboards/converter/sun_usb/type5/keyboard.json diff --git a/keyboards/converter/sun_usb/type5/rules.mk b/keyboards/converter/sun_usb/type5/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/converter/usb_usb/hasu/info.json b/keyboards/converter/usb_usb/hasu/keyboard.json similarity index 100% rename from keyboards/converter/usb_usb/hasu/info.json rename to keyboards/converter/usb_usb/hasu/keyboard.json diff --git a/keyboards/converter/usb_usb/hasu/rules.mk b/keyboards/converter/usb_usb/hasu/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/converter/usb_usb/hasu/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/converter/usb_usb/leonardo/info.json b/keyboards/converter/usb_usb/leonardo/keyboard.json similarity index 100% rename from keyboards/converter/usb_usb/leonardo/info.json rename to keyboards/converter/usb_usb/leonardo/keyboard.json diff --git a/keyboards/converter/usb_usb/leonardo/rules.mk b/keyboards/converter/usb_usb/leonardo/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/converter/usb_usb/leonardo/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/cradio/info.json b/keyboards/cradio/keyboard.json similarity index 100% rename from keyboards/cradio/info.json rename to keyboards/cradio/keyboard.json diff --git a/keyboards/cradio/rules.mk b/keyboards/cradio/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/cradio/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/crkbd/r2g/info.json b/keyboards/crkbd/r2g/keyboard.json similarity index 100% rename from keyboards/crkbd/r2g/info.json rename to keyboards/crkbd/r2g/keyboard.json diff --git a/keyboards/crkbd/r2g/rules.mk b/keyboards/crkbd/r2g/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/keyboard.json similarity index 100% rename from keyboards/crkbd/rev1/info.json rename to keyboards/crkbd/rev1/keyboard.json diff --git a/keyboards/crkbd/rev1/rules.mk b/keyboards/crkbd/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/crowboard/info.json b/keyboards/crowboard/keyboard.json similarity index 100% rename from keyboards/crowboard/info.json rename to keyboards/crowboard/keyboard.json diff --git a/keyboards/crowboard/rules.mk b/keyboards/crowboard/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/crowboard/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/keyboard.json similarity index 100% rename from keyboards/custommk/evo70/info.json rename to keyboards/custommk/evo70/keyboard.json diff --git a/keyboards/custommk/evo70/rules.mk b/keyboards/custommk/evo70/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/custommk/evo70/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/keyboard.json similarity index 100% rename from keyboards/custommk/genesis/rev1/info.json rename to keyboards/custommk/genesis/rev1/keyboard.json diff --git a/keyboards/custommk/genesis/rev1/rules.mk b/keyboards/custommk/genesis/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/cutie_club/fidelity/info.json b/keyboards/cutie_club/fidelity/keyboard.json similarity index 100% rename from keyboards/cutie_club/fidelity/info.json rename to keyboards/cutie_club/fidelity/keyboard.json diff --git a/keyboards/cutie_club/fidelity/rules.mk b/keyboards/cutie_club/fidelity/rules.mk deleted file mode 100644 index 79986c3cede..00000000000 --- a/keyboards/cutie_club/fidelity/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# Intentionally left blank, please see info.json diff --git a/keyboards/cxt_studio/info.json b/keyboards/cxt_studio/keyboard.json similarity index 100% rename from keyboards/cxt_studio/info.json rename to keyboards/cxt_studio/keyboard.json diff --git a/keyboards/cxt_studio/rules.mk b/keyboards/cxt_studio/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/cxt_studio/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/dailycraft/bat43/rev1/info.json b/keyboards/dailycraft/bat43/rev1/keyboard.json similarity index 100% rename from keyboards/dailycraft/bat43/rev1/info.json rename to keyboards/dailycraft/bat43/rev1/keyboard.json diff --git a/keyboards/dailycraft/bat43/rev1/rules.mk b/keyboards/dailycraft/bat43/rev1/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/dailycraft/bat43/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/dailycraft/bat43/rev2/info.json b/keyboards/dailycraft/bat43/rev2/keyboard.json similarity index 100% rename from keyboards/dailycraft/bat43/rev2/info.json rename to keyboards/dailycraft/bat43/rev2/keyboard.json diff --git a/keyboards/dailycraft/bat43/rev2/rules.mk b/keyboards/dailycraft/bat43/rev2/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/dailycraft/bat43/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/dailycraft/sandbox/rev1/info.json b/keyboards/dailycraft/sandbox/rev1/keyboard.json similarity index 100% rename from keyboards/dailycraft/sandbox/rev1/info.json rename to keyboards/dailycraft/sandbox/rev1/keyboard.json diff --git a/keyboards/dailycraft/sandbox/rev1/rules.mk b/keyboards/dailycraft/sandbox/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/dailycraft/wings42/rev1/info.json b/keyboards/dailycraft/wings42/rev1/keyboard.json similarity index 100% rename from keyboards/dailycraft/wings42/rev1/info.json rename to keyboards/dailycraft/wings42/rev1/keyboard.json diff --git a/keyboards/dailycraft/wings42/rev1/rules.mk b/keyboards/dailycraft/wings42/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/info.json b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json similarity index 100% rename from keyboards/dailycraft/wings42/rev1_extkeys/info.json rename to keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/rules.mk b/keyboards/dailycraft/wings42/rev1_extkeys/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/keyboard.json similarity index 100% rename from keyboards/dailycraft/wings42/rev2/info.json rename to keyboards/dailycraft/wings42/rev2/keyboard.json diff --git a/keyboards/dailycraft/wings42/rev2/rules.mk b/keyboards/dailycraft/wings42/rev2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/dark/magnum_ergo_1/info.json b/keyboards/dark/magnum_ergo_1/keyboard.json similarity index 100% rename from keyboards/dark/magnum_ergo_1/info.json rename to keyboards/dark/magnum_ergo_1/keyboard.json diff --git a/keyboards/dark/magnum_ergo_1/rules.mk b/keyboards/dark/magnum_ergo_1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/darkproject/kd83a_bfg_edition/info.json b/keyboards/darkproject/kd83a_bfg_edition/keyboard.json similarity index 100% rename from keyboards/darkproject/kd83a_bfg_edition/info.json rename to keyboards/darkproject/kd83a_bfg_edition/keyboard.json diff --git a/keyboards/darkproject/kd83a_bfg_edition/rules.mk b/keyboards/darkproject/kd83a_bfg_edition/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/darkproject/kd83a_bfg_edition/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/darkproject/kd87a_bfg_edition/info.json b/keyboards/darkproject/kd87a_bfg_edition/keyboard.json similarity index 100% rename from keyboards/darkproject/kd87a_bfg_edition/info.json rename to keyboards/darkproject/kd87a_bfg_edition/keyboard.json diff --git a/keyboards/darkproject/kd87a_bfg_edition/rules.mk b/keyboards/darkproject/kd87a_bfg_edition/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/darkproject/kd87a_bfg_edition/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/darmoshark/k3/info.json b/keyboards/darmoshark/k3/keyboard.json similarity index 100% rename from keyboards/darmoshark/k3/info.json rename to keyboards/darmoshark/k3/keyboard.json diff --git a/keyboards/darmoshark/k3/rules.mk b/keyboards/darmoshark/k3/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/darmoshark/k3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/deemen17/de60fs/info.json b/keyboards/deemen17/de60fs/keyboard.json similarity index 100% rename from keyboards/deemen17/de60fs/info.json rename to keyboards/deemen17/de60fs/keyboard.json diff --git a/keyboards/deemen17/de60fs/rules.mk b/keyboards/deemen17/de60fs/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/deemen17/de60fs/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/dekunukem/duckypad/info.json b/keyboards/dekunukem/duckypad/keyboard.json similarity index 100% rename from keyboards/dekunukem/duckypad/info.json rename to keyboards/dekunukem/duckypad/keyboard.json diff --git a/keyboards/dekunukem/duckypad/rules.mk b/keyboards/dekunukem/duckypad/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/dekunukem/duckypad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/densus/alveus/mx/info.json b/keyboards/densus/alveus/mx/keyboard.json similarity index 100% rename from keyboards/densus/alveus/mx/info.json rename to keyboards/densus/alveus/mx/keyboard.json diff --git a/keyboards/densus/alveus/mx/rules.mk b/keyboards/densus/alveus/mx/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/densus/alveus/mx/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/dnworks/9973/info.json b/keyboards/dnworks/9973/keyboard.json similarity index 100% rename from keyboards/dnworks/9973/info.json rename to keyboards/dnworks/9973/keyboard.json diff --git a/keyboards/dnworks/9973/rules.mk b/keyboards/dnworks/9973/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/dnworks/9973/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/dnworks/frltkl/info.json b/keyboards/dnworks/frltkl/keyboard.json similarity index 100% rename from keyboards/dnworks/frltkl/info.json rename to keyboards/dnworks/frltkl/keyboard.json diff --git a/keyboards/dnworks/frltkl/rules.mk b/keyboards/dnworks/frltkl/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/dnworks/frltkl/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/dnworks/numpad/info.json b/keyboards/dnworks/numpad/keyboard.json similarity index 100% rename from keyboards/dnworks/numpad/info.json rename to keyboards/dnworks/numpad/keyboard.json diff --git a/keyboards/dnworks/numpad/rules.mk b/keyboards/dnworks/numpad/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/dnworks/numpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/dnworks/sbl/info.json b/keyboards/dnworks/sbl/keyboard.json similarity index 100% rename from keyboards/dnworks/sbl/info.json rename to keyboards/dnworks/sbl/keyboard.json diff --git a/keyboards/dnworks/sbl/rules.mk b/keyboards/dnworks/sbl/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/dnworks/sbl/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/doio/kb04/info.json b/keyboards/doio/kb04/keyboard.json similarity index 100% rename from keyboards/doio/kb04/info.json rename to keyboards/doio/kb04/keyboard.json diff --git a/keyboards/doio/kb04/rules.mk b/keyboards/doio/kb04/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/doio/kb04/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/doio/kb12/info.json b/keyboards/doio/kb12/keyboard.json similarity index 100% rename from keyboards/doio/kb12/info.json rename to keyboards/doio/kb12/keyboard.json diff --git a/keyboards/doio/kb12/rules.mk b/keyboards/doio/kb12/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/doio/kb12/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/doio/kb19/info.json b/keyboards/doio/kb19/keyboard.json similarity index 100% rename from keyboards/doio/kb19/info.json rename to keyboards/doio/kb19/keyboard.json diff --git a/keyboards/doio/kb19/rules.mk b/keyboards/doio/kb19/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/doio/kb19/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/doio/kb3x/info.json b/keyboards/doio/kb3x/keyboard.json similarity index 100% rename from keyboards/doio/kb3x/info.json rename to keyboards/doio/kb3x/keyboard.json diff --git a/keyboards/doio/kb3x/rules.mk b/keyboards/doio/kb3x/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/doio/kb3x/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/dotmod/dymium65/info.json b/keyboards/dotmod/dymium65/keyboard.json similarity index 100% rename from keyboards/dotmod/dymium65/info.json rename to keyboards/dotmod/dymium65/keyboard.json diff --git a/keyboards/dotmod/dymium65/rules.mk b/keyboards/dotmod/dymium65/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/dotmod/dymium65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/dp3000/rev1/info.json b/keyboards/dp3000/rev1/keyboard.json similarity index 100% rename from keyboards/dp3000/rev1/info.json rename to keyboards/dp3000/rev1/keyboard.json diff --git a/keyboards/dp3000/rev1/rules.mk b/keyboards/dp3000/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/dp3000/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/dp3000/rev2/info.json b/keyboards/dp3000/rev2/keyboard.json similarity index 100% rename from keyboards/dp3000/rev2/info.json rename to keyboards/dp3000/rev2/keyboard.json diff --git a/keyboards/dp3000/rev2/rules.mk b/keyboards/dp3000/rev2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/dp3000/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/drewkeys/mercury65/info.json b/keyboards/drewkeys/mercury65/keyboard.json similarity index 100% rename from keyboards/drewkeys/mercury65/info.json rename to keyboards/drewkeys/mercury65/keyboard.json diff --git a/keyboards/drewkeys/mercury65/rules.mk b/keyboards/drewkeys/mercury65/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/drewkeys/mercury65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/drhigsby/ogurec/left_pm/info.json b/keyboards/drhigsby/ogurec/left_pm/keyboard.json similarity index 100% rename from keyboards/drhigsby/ogurec/left_pm/info.json rename to keyboards/drhigsby/ogurec/left_pm/keyboard.json diff --git a/keyboards/drhigsby/ogurec/left_pm/rules.mk b/keyboards/drhigsby/ogurec/left_pm/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/drhigsby/ogurec/right_pm/info.json b/keyboards/drhigsby/ogurec/right_pm/keyboard.json similarity index 100% rename from keyboards/drhigsby/ogurec/right_pm/info.json rename to keyboards/drhigsby/ogurec/right_pm/keyboard.json diff --git a/keyboards/drhigsby/ogurec/right_pm/rules.mk b/keyboards/drhigsby/ogurec/right_pm/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/drop/thekey/v1/info.json b/keyboards/drop/thekey/v1/keyboard.json similarity index 100% rename from keyboards/drop/thekey/v1/info.json rename to keyboards/drop/thekey/v1/keyboard.json diff --git a/keyboards/drop/thekey/v1/rules.mk b/keyboards/drop/thekey/v1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/drop/thekey/v1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/drop/thekey/v2/info.json b/keyboards/drop/thekey/v2/keyboard.json similarity index 100% rename from keyboards/drop/thekey/v2/info.json rename to keyboards/drop/thekey/v2/keyboard.json diff --git a/keyboards/drop/thekey/v2/rules.mk b/keyboards/drop/thekey/v2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/drop/thekey/v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/durgod/dgk6x/galaxy/info.json b/keyboards/durgod/dgk6x/galaxy/keyboard.json similarity index 100% rename from keyboards/durgod/dgk6x/galaxy/info.json rename to keyboards/durgod/dgk6x/galaxy/keyboard.json diff --git a/keyboards/durgod/dgk6x/galaxy/rules.mk b/keyboards/durgod/dgk6x/galaxy/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/durgod/dgk6x/hades_ansi/info.json b/keyboards/durgod/dgk6x/hades_ansi/keyboard.json similarity index 100% rename from keyboards/durgod/dgk6x/hades_ansi/info.json rename to keyboards/durgod/dgk6x/hades_ansi/keyboard.json diff --git a/keyboards/durgod/dgk6x/hades_ansi/rules.mk b/keyboards/durgod/dgk6x/hades_ansi/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/durgod/dgk6x/hades_iso/info.json b/keyboards/durgod/dgk6x/hades_iso/keyboard.json similarity index 100% rename from keyboards/durgod/dgk6x/hades_iso/info.json rename to keyboards/durgod/dgk6x/hades_iso/keyboard.json diff --git a/keyboards/durgod/dgk6x/hades_iso/rules.mk b/keyboards/durgod/dgk6x/hades_iso/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/durgod/dgk6x/hades_iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/durgod/dgk6x/venus/info.json b/keyboards/durgod/dgk6x/venus/keyboard.json similarity index 100% rename from keyboards/durgod/dgk6x/venus/info.json rename to keyboards/durgod/dgk6x/venus/keyboard.json diff --git a/keyboards/durgod/dgk6x/venus/rules.mk b/keyboards/durgod/dgk6x/venus/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/dztech/dz60v2/info.json b/keyboards/dztech/dz60v2/keyboard.json similarity index 100% rename from keyboards/dztech/dz60v2/info.json rename to keyboards/dztech/dz60v2/keyboard.json diff --git a/keyboards/dztech/dz60v2/rules.mk b/keyboards/dztech/dz60v2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/dztech/dz60v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/dztech/pluto/info.json b/keyboards/dztech/pluto/keyboard.json similarity index 100% rename from keyboards/dztech/pluto/info.json rename to keyboards/dztech/pluto/keyboard.json diff --git a/keyboards/dztech/pluto/rules.mk b/keyboards/dztech/pluto/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/dztech/pluto/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/keyboard.json similarity index 100% rename from keyboards/dztech/tofu/ii/v1/info.json rename to keyboards/dztech/tofu/ii/v1/keyboard.json diff --git a/keyboards/dztech/tofu/ii/v1/rules.mk b/keyboards/dztech/tofu/ii/v1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/dztech/tofu/jr/v1/info.json b/keyboards/dztech/tofu/jr/v1/keyboard.json similarity index 100% rename from keyboards/dztech/tofu/jr/v1/info.json rename to keyboards/dztech/tofu/jr/v1/keyboard.json diff --git a/keyboards/dztech/tofu/jr/v1/rules.mk b/keyboards/dztech/tofu/jr/v1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/dztech/tofu/jr/v2/info.json b/keyboards/dztech/tofu/jr/v2/keyboard.json similarity index 100% rename from keyboards/dztech/tofu/jr/v2/info.json rename to keyboards/dztech/tofu/jr/v2/keyboard.json diff --git a/keyboards/dztech/tofu/jr/v2/rules.mk b/keyboards/dztech/tofu/jr/v2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/dztech/tofu/jr/v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/dztech/tofu60/info.json b/keyboards/dztech/tofu60/keyboard.json similarity index 100% rename from keyboards/dztech/tofu60/info.json rename to keyboards/dztech/tofu60/keyboard.json diff --git a/keyboards/dztech/tofu60/rules.mk b/keyboards/dztech/tofu60/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ebastler/e80_1800/info.json b/keyboards/ebastler/e80_1800/keyboard.json similarity index 100% rename from keyboards/ebastler/e80_1800/info.json rename to keyboards/ebastler/e80_1800/keyboard.json diff --git a/keyboards/ebastler/e80_1800/rules.mk b/keyboards/ebastler/e80_1800/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/ebastler/e80_1800/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/eek/silk_down/info.json b/keyboards/eek/silk_down/keyboard.json similarity index 100% rename from keyboards/eek/silk_down/info.json rename to keyboards/eek/silk_down/keyboard.json diff --git a/keyboards/eek/silk_down/rules.mk b/keyboards/eek/silk_down/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/eek/silk_up/info.json b/keyboards/eek/silk_up/keyboard.json similarity index 100% rename from keyboards/eek/silk_up/info.json rename to keyboards/eek/silk_up/keyboard.json diff --git a/keyboards/eek/silk_up/rules.mk b/keyboards/eek/silk_up/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/eggsworks/egg58/info.json b/keyboards/eggsworks/egg58/keyboard.json similarity index 100% rename from keyboards/eggsworks/egg58/info.json rename to keyboards/eggsworks/egg58/keyboard.json diff --git a/keyboards/eggsworks/egg58/rules.mk b/keyboards/eggsworks/egg58/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/eggsworks/egg58/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ekow/akira/info.json b/keyboards/ekow/akira/keyboard.json similarity index 100% rename from keyboards/ekow/akira/info.json rename to keyboards/ekow/akira/keyboard.json diff --git a/keyboards/ekow/akira/rules.mk b/keyboards/ekow/akira/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ekow/akira/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/enviousdesign/60f/info.json b/keyboards/enviousdesign/60f/keyboard.json similarity index 100% rename from keyboards/enviousdesign/60f/info.json rename to keyboards/enviousdesign/60f/keyboard.json diff --git a/keyboards/enviousdesign/60f/rules.mk b/keyboards/enviousdesign/60f/rules.mk deleted file mode 100644 index 837f4bffb53..00000000000 --- a/keyboards/enviousdesign/60f/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally left blank diff --git a/keyboards/enviousdesign/65m/info.json b/keyboards/enviousdesign/65m/keyboard.json similarity index 100% rename from keyboards/enviousdesign/65m/info.json rename to keyboards/enviousdesign/65m/keyboard.json diff --git a/keyboards/enviousdesign/65m/rules.mk b/keyboards/enviousdesign/65m/rules.mk deleted file mode 100644 index 837f4bffb53..00000000000 --- a/keyboards/enviousdesign/65m/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally left blank diff --git a/keyboards/enviousdesign/commissions/mini1800/info.json b/keyboards/enviousdesign/commissions/mini1800/keyboard.json similarity index 100% rename from keyboards/enviousdesign/commissions/mini1800/info.json rename to keyboards/enviousdesign/commissions/mini1800/keyboard.json diff --git a/keyboards/enviousdesign/commissions/mini1800/rules.mk b/keyboards/enviousdesign/commissions/mini1800/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/enviousdesign/commissions/mini1800/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/enviousdesign/delirium/rev0/info.json b/keyboards/enviousdesign/delirium/rev0/keyboard.json similarity index 100% rename from keyboards/enviousdesign/delirium/rev0/info.json rename to keyboards/enviousdesign/delirium/rev0/keyboard.json diff --git a/keyboards/enviousdesign/delirium/rev0/rules.mk b/keyboards/enviousdesign/delirium/rev0/rules.mk deleted file mode 100644 index 837f4bffb53..00000000000 --- a/keyboards/enviousdesign/delirium/rev0/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally left blank diff --git a/keyboards/enviousdesign/delirium/rev1/info.json b/keyboards/enviousdesign/delirium/rev1/keyboard.json similarity index 100% rename from keyboards/enviousdesign/delirium/rev1/info.json rename to keyboards/enviousdesign/delirium/rev1/keyboard.json diff --git a/keyboards/enviousdesign/delirium/rev1/rules.mk b/keyboards/enviousdesign/delirium/rev1/rules.mk deleted file mode 100644 index 837f4bffb53..00000000000 --- a/keyboards/enviousdesign/delirium/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally left blank diff --git a/keyboards/enviousdesign/delirium/rgb/info.json b/keyboards/enviousdesign/delirium/rgb/keyboard.json similarity index 100% rename from keyboards/enviousdesign/delirium/rgb/info.json rename to keyboards/enviousdesign/delirium/rgb/keyboard.json diff --git a/keyboards/enviousdesign/delirium/rgb/rules.mk b/keyboards/enviousdesign/delirium/rgb/rules.mk deleted file mode 100644 index 837f4bffb53..00000000000 --- a/keyboards/enviousdesign/delirium/rgb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally left blank diff --git a/keyboards/enviousdesign/mcro/rev1/info.json b/keyboards/enviousdesign/mcro/rev1/keyboard.json similarity index 100% rename from keyboards/enviousdesign/mcro/rev1/info.json rename to keyboards/enviousdesign/mcro/rev1/keyboard.json diff --git a/keyboards/enviousdesign/mcro/rev1/rules.mk b/keyboards/enviousdesign/mcro/rev1/rules.mk deleted file mode 100644 index 837f4bffb53..00000000000 --- a/keyboards/enviousdesign/mcro/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally left blank diff --git a/keyboards/era/divine/info.json b/keyboards/era/divine/keyboard.json similarity index 100% rename from keyboards/era/divine/info.json rename to keyboards/era/divine/keyboard.json diff --git a/keyboards/era/divine/rules.mk b/keyboards/era/divine/rules.mk deleted file mode 100644 index 3922c569c4e..00000000000 --- a/keyboards/era/divine/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionally blank \ No newline at end of file diff --git a/keyboards/era/era65/info.json b/keyboards/era/era65/keyboard.json similarity index 100% rename from keyboards/era/era65/info.json rename to keyboards/era/era65/keyboard.json diff --git a/keyboards/era/era65/rules.mk b/keyboards/era/era65/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/era/sirind/brick65/info.json b/keyboards/era/sirind/brick65/keyboard.json similarity index 100% rename from keyboards/era/sirind/brick65/info.json rename to keyboards/era/sirind/brick65/keyboard.json diff --git a/keyboards/era/sirind/brick65/rules.mk b/keyboards/era/sirind/brick65/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/era/sirind/brick65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/era/sirind/klein_hs/info.json b/keyboards/era/sirind/klein_hs/keyboard.json similarity index 100% rename from keyboards/era/sirind/klein_hs/info.json rename to keyboards/era/sirind/klein_hs/keyboard.json diff --git a/keyboards/era/sirind/klein_hs/rules.mk b/keyboards/era/sirind/klein_hs/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/era/sirind/klein_sd/info.json b/keyboards/era/sirind/klein_sd/keyboard.json similarity index 100% rename from keyboards/era/sirind/klein_sd/info.json rename to keyboards/era/sirind/klein_sd/keyboard.json diff --git a/keyboards/era/sirind/klein_sd/rules.mk b/keyboards/era/sirind/klein_sd/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/era/sirind/klein_sd/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/ergodox_ez/base/info.json b/keyboards/ergodox_ez/base/keyboard.json similarity index 100% rename from keyboards/ergodox_ez/base/info.json rename to keyboards/ergodox_ez/base/keyboard.json diff --git a/keyboards/ergodox_ez/base/rules.mk b/keyboards/ergodox_ez/base/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ergoslab/rev1/info.json b/keyboards/ergoslab/rev1/keyboard.json similarity index 100% rename from keyboards/ergoslab/rev1/info.json rename to keyboards/ergoslab/rev1/keyboard.json diff --git a/keyboards/ergoslab/rev1/rules.mk b/keyboards/ergoslab/rev1/rules.mk deleted file mode 100644 index fff00a1b511..00000000000 --- a/keyboards/ergoslab/rev1/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# Revision Specific Build Options -# change yes to no to disable -# diff --git a/keyboards/etiennecollin/wave/info.json b/keyboards/etiennecollin/wave/keyboard.json similarity index 100% rename from keyboards/etiennecollin/wave/info.json rename to keyboards/etiennecollin/wave/keyboard.json diff --git a/keyboards/etiennecollin/wave/rules.mk b/keyboards/etiennecollin/wave/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/etiennecollin/wave/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/evyd13/fin_pad/info.json b/keyboards/evyd13/fin_pad/keyboard.json similarity index 100% rename from keyboards/evyd13/fin_pad/info.json rename to keyboards/evyd13/fin_pad/keyboard.json diff --git a/keyboards/evyd13/fin_pad/rules.mk b/keyboards/evyd13/fin_pad/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/evyd13/fin_pad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/evyd13/nt210/info.json b/keyboards/evyd13/nt210/keyboard.json similarity index 100% rename from keyboards/evyd13/nt210/info.json rename to keyboards/evyd13/nt210/keyboard.json diff --git a/keyboards/evyd13/nt210/rules.mk b/keyboards/evyd13/nt210/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/evyd13/nt210/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/evyd13/nt650/info.json b/keyboards/evyd13/nt650/keyboard.json similarity index 100% rename from keyboards/evyd13/nt650/info.json rename to keyboards/evyd13/nt650/keyboard.json diff --git a/keyboards/evyd13/nt650/rules.mk b/keyboards/evyd13/nt650/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/evyd13/nt650/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/exclusive/e85/hotswap/info.json b/keyboards/exclusive/e85/hotswap/keyboard.json similarity index 100% rename from keyboards/exclusive/e85/hotswap/info.json rename to keyboards/exclusive/e85/hotswap/keyboard.json diff --git a/keyboards/exclusive/e85/hotswap/rules.mk b/keyboards/exclusive/e85/hotswap/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/exclusive/e85/soldered/info.json b/keyboards/exclusive/e85/soldered/keyboard.json similarity index 100% rename from keyboards/exclusive/e85/soldered/info.json rename to keyboards/exclusive/e85/soldered/keyboard.json diff --git a/keyboards/exclusive/e85/soldered/rules.mk b/keyboards/exclusive/e85/soldered/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/eyeohdesigns/humble40/info.json b/keyboards/eyeohdesigns/humble40/keyboard.json similarity index 100% rename from keyboards/eyeohdesigns/humble40/info.json rename to keyboards/eyeohdesigns/humble40/keyboard.json diff --git a/keyboards/eyeohdesigns/humble40/rules.mk b/keyboards/eyeohdesigns/humble40/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/eyeohdesigns/humble40/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ez_maker/directpins/promicro/info.json b/keyboards/ez_maker/directpins/promicro/keyboard.json similarity index 100% rename from keyboards/ez_maker/directpins/promicro/info.json rename to keyboards/ez_maker/directpins/promicro/keyboard.json diff --git a/keyboards/ez_maker/directpins/promicro/rules.mk b/keyboards/ez_maker/directpins/promicro/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ez_maker/directpins/promicro/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ez_maker/directpins/proton_c/info.json b/keyboards/ez_maker/directpins/proton_c/keyboard.json similarity index 100% rename from keyboards/ez_maker/directpins/proton_c/info.json rename to keyboards/ez_maker/directpins/proton_c/keyboard.json diff --git a/keyboards/ez_maker/directpins/proton_c/rules.mk b/keyboards/ez_maker/directpins/proton_c/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ez_maker/directpins/proton_c/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ez_maker/directpins/rp2040/info.json b/keyboards/ez_maker/directpins/rp2040/keyboard.json similarity index 100% rename from keyboards/ez_maker/directpins/rp2040/info.json rename to keyboards/ez_maker/directpins/rp2040/keyboard.json diff --git a/keyboards/ez_maker/directpins/rp2040/rules.mk b/keyboards/ez_maker/directpins/rp2040/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ez_maker/directpins/rp2040/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ez_maker/directpins/teensy_2/info.json b/keyboards/ez_maker/directpins/teensy_2/keyboard.json similarity index 100% rename from keyboards/ez_maker/directpins/teensy_2/info.json rename to keyboards/ez_maker/directpins/teensy_2/keyboard.json diff --git a/keyboards/ez_maker/directpins/teensy_2/rules.mk b/keyboards/ez_maker/directpins/teensy_2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ez_maker/directpins/teensy_2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ez_maker/directpins/teensy_2pp/info.json b/keyboards/ez_maker/directpins/teensy_2pp/keyboard.json similarity index 100% rename from keyboards/ez_maker/directpins/teensy_2pp/info.json rename to keyboards/ez_maker/directpins/teensy_2pp/keyboard.json diff --git a/keyboards/ez_maker/directpins/teensy_2pp/rules.mk b/keyboards/ez_maker/directpins/teensy_2pp/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ez_maker/directpins/teensy_2pp/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/keyboard.json similarity index 100% rename from keyboards/fancytech/fancyalice66/info.json rename to keyboards/fancytech/fancyalice66/keyboard.json diff --git a/keyboards/fancytech/fancyalice66/rules.mk b/keyboards/fancytech/fancyalice66/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/fancytech/fancyalice66/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/ferris/0_2/base/info.json b/keyboards/ferris/0_2/base/keyboard.json similarity index 100% rename from keyboards/ferris/0_2/base/info.json rename to keyboards/ferris/0_2/base/keyboard.json diff --git a/keyboards/ferris/0_2/base/rules.mk b/keyboards/ferris/0_2/base/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ferris/0_2/compact/info.json b/keyboards/ferris/0_2/compact/keyboard.json similarity index 100% rename from keyboards/ferris/0_2/compact/info.json rename to keyboards/ferris/0_2/compact/keyboard.json diff --git a/keyboards/ferris/0_2/compact/rules.mk b/keyboards/ferris/0_2/compact/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ferris/0_2/high/info.json b/keyboards/ferris/0_2/high/keyboard.json similarity index 100% rename from keyboards/ferris/0_2/high/info.json rename to keyboards/ferris/0_2/high/keyboard.json diff --git a/keyboards/ferris/0_2/high/rules.mk b/keyboards/ferris/0_2/high/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ferris/0_2/mini/info.json b/keyboards/ferris/0_2/mini/keyboard.json similarity index 100% rename from keyboards/ferris/0_2/mini/info.json rename to keyboards/ferris/0_2/mini/keyboard.json diff --git a/keyboards/ferris/0_2/mini/rules.mk b/keyboards/ferris/0_2/mini/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ferris/sweep/info.json b/keyboards/ferris/sweep/keyboard.json similarity index 100% rename from keyboards/ferris/sweep/info.json rename to keyboards/ferris/sweep/keyboard.json diff --git a/keyboards/ferris/sweep/rules.mk b/keyboards/ferris/sweep/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ferris/sweep/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/flashquark/horizon_z/info.json b/keyboards/flashquark/horizon_z/keyboard.json similarity index 100% rename from keyboards/flashquark/horizon_z/info.json rename to keyboards/flashquark/horizon_z/keyboard.json diff --git a/keyboards/flashquark/horizon_z/rules.mk b/keyboards/flashquark/horizon_z/rules.mk deleted file mode 100755 index e69de29bb2d..00000000000 diff --git a/keyboards/for_science/info.json b/keyboards/for_science/keyboard.json similarity index 100% rename from keyboards/for_science/info.json rename to keyboards/for_science/keyboard.json diff --git a/keyboards/for_science/rules.mk b/keyboards/for_science/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/for_science/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/forever65/info.json b/keyboards/forever65/keyboard.json similarity index 100% rename from keyboards/forever65/info.json rename to keyboards/forever65/keyboard.json diff --git a/keyboards/forever65/rules.mk b/keyboards/forever65/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/forever65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/fortitude60/rev1/info.json b/keyboards/fortitude60/rev1/keyboard.json similarity index 100% rename from keyboards/fortitude60/rev1/info.json rename to keyboards/fortitude60/rev1/keyboard.json diff --git a/keyboards/fortitude60/rev1/rules.mk b/keyboards/fortitude60/rev1/rules.mk deleted file mode 100644 index fff00a1b511..00000000000 --- a/keyboards/fortitude60/rev1/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# Revision Specific Build Options -# change yes to no to disable -# diff --git a/keyboards/frobiac/blackflat/info.json b/keyboards/frobiac/blackflat/keyboard.json similarity index 100% rename from keyboards/frobiac/blackflat/info.json rename to keyboards/frobiac/blackflat/keyboard.json diff --git a/keyboards/frobiac/blackflat/rules.mk b/keyboards/frobiac/blackflat/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/frobiac/blackflat/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/frobiac/hypernano/info.json b/keyboards/frobiac/hypernano/keyboard.json similarity index 100% rename from keyboards/frobiac/hypernano/info.json rename to keyboards/frobiac/hypernano/keyboard.json diff --git a/keyboards/frobiac/hypernano/rules.mk b/keyboards/frobiac/hypernano/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/frobiac/hypernano/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/frobiac/redtilt/info.json b/keyboards/frobiac/redtilt/keyboard.json similarity index 100% rename from keyboards/frobiac/redtilt/info.json rename to keyboards/frobiac/redtilt/keyboard.json diff --git a/keyboards/frobiac/redtilt/rules.mk b/keyboards/frobiac/redtilt/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/frobiac/redtilt/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/fruitykeeb/fruitbar/r1/elite_c/info.json b/keyboards/fruitykeeb/fruitbar/r1/elite_c/keyboard.json similarity index 100% rename from keyboards/fruitykeeb/fruitbar/r1/elite_c/info.json rename to keyboards/fruitykeeb/fruitbar/r1/elite_c/keyboard.json diff --git a/keyboards/fruitykeeb/fruitbar/r1/elite_c/rules.mk b/keyboards/fruitykeeb/fruitbar/r1/elite_c/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/fruitykeeb/fruitbar/r1/elite_c/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/fruitykeeb/fruitbar/r1/promicro/info.json b/keyboards/fruitykeeb/fruitbar/r1/promicro/keyboard.json similarity index 100% rename from keyboards/fruitykeeb/fruitbar/r1/promicro/info.json rename to keyboards/fruitykeeb/fruitbar/r1/promicro/keyboard.json diff --git a/keyboards/fruitykeeb/fruitbar/r1/promicro/rules.mk b/keyboards/fruitykeeb/fruitbar/r1/promicro/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/fruitykeeb/fruitbar/r1/promicro/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/fruitykeeb/fruitbar/r2/info.json b/keyboards/fruitykeeb/fruitbar/r2/keyboard.json similarity index 100% rename from keyboards/fruitykeeb/fruitbar/r2/info.json rename to keyboards/fruitykeeb/fruitbar/r2/keyboard.json diff --git a/keyboards/fruitykeeb/fruitbar/r2/rules.mk b/keyboards/fruitykeeb/fruitbar/r2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/fruitykeeb/fruitbar/r2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/fs_streampad/info.json b/keyboards/fs_streampad/keyboard.json similarity index 100% rename from keyboards/fs_streampad/info.json rename to keyboards/fs_streampad/keyboard.json diff --git a/keyboards/fs_streampad/rules.mk b/keyboards/fs_streampad/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/fs_streampad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/galile0/glyphkbd_v2/info.json b/keyboards/galile0/glyphkbd_v2/keyboard.json similarity index 100% rename from keyboards/galile0/glyphkbd_v2/info.json rename to keyboards/galile0/glyphkbd_v2/keyboard.json diff --git a/keyboards/galile0/glyphkbd_v2/rules.mk b/keyboards/galile0/glyphkbd_v2/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/galile0/glyphkbd_v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/geistmaschine/geist/info.json b/keyboards/geistmaschine/geist/keyboard.json similarity index 100% rename from keyboards/geistmaschine/geist/info.json rename to keyboards/geistmaschine/geist/keyboard.json diff --git a/keyboards/geistmaschine/geist/rules.mk b/keyboards/geistmaschine/geist/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/geistmaschine/geist/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/ghs/jem/hotswap_ansi/info.json b/keyboards/ghs/jem/hotswap_ansi/keyboard.json similarity index 100% rename from keyboards/ghs/jem/hotswap_ansi/info.json rename to keyboards/ghs/jem/hotswap_ansi/keyboard.json diff --git a/keyboards/ghs/jem/hotswap_ansi/rules.mk b/keyboards/ghs/jem/hotswap_ansi/rules.mk deleted file mode 100644 index 17f0d87b7f4..00000000000 --- a/keyboards/ghs/jem/hotswap_ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file left intentionally blank diff --git a/keyboards/ghs/jem/soldered/info.json b/keyboards/ghs/jem/soldered/keyboard.json similarity index 100% rename from keyboards/ghs/jem/soldered/info.json rename to keyboards/ghs/jem/soldered/keyboard.json diff --git a/keyboards/ghs/jem/soldered/rules.mk b/keyboards/ghs/jem/soldered/rules.mk deleted file mode 100644 index 218d8921e51..00000000000 --- a/keyboards/ghs/jem/soldered/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank. diff --git a/keyboards/ghs/xls/info.json b/keyboards/ghs/xls/keyboard.json similarity index 100% rename from keyboards/ghs/xls/info.json rename to keyboards/ghs/xls/keyboard.json diff --git a/keyboards/ghs/xls/rules.mk b/keyboards/ghs/xls/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/ghs/xls/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/gkeyboard/gpad8_2r/info.json b/keyboards/gkeyboard/gpad8_2r/keyboard.json similarity index 100% rename from keyboards/gkeyboard/gpad8_2r/info.json rename to keyboards/gkeyboard/gpad8_2r/keyboard.json diff --git a/keyboards/gkeyboard/gpad8_2r/rules.mk b/keyboards/gkeyboard/gpad8_2r/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/gkeyboard/greatpad/info.json b/keyboards/gkeyboard/greatpad/keyboard.json similarity index 100% rename from keyboards/gkeyboard/greatpad/info.json rename to keyboards/gkeyboard/greatpad/keyboard.json diff --git a/keyboards/gkeyboard/greatpad/rules.mk b/keyboards/gkeyboard/greatpad/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/gkeyboard/greatpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/gl516/xr63gl/info.json b/keyboards/gl516/xr63gl/keyboard.json similarity index 100% rename from keyboards/gl516/xr63gl/info.json rename to keyboards/gl516/xr63gl/keyboard.json diff --git a/keyboards/gl516/xr63gl/rules.mk b/keyboards/gl516/xr63gl/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/gl516/xr63gl/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/gray_studio/think65v3/info.json b/keyboards/gray_studio/think65v3/keyboard.json similarity index 100% rename from keyboards/gray_studio/think65v3/info.json rename to keyboards/gray_studio/think65v3/keyboard.json diff --git a/keyboards/gray_studio/think65v3/rules.mk b/keyboards/gray_studio/think65v3/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/gray_studio/think65v3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/hackpad/info.json b/keyboards/hackpad/keyboard.json similarity index 100% rename from keyboards/hackpad/info.json rename to keyboards/hackpad/keyboard.json diff --git a/keyboards/hackpad/rules.mk b/keyboards/hackpad/rules.mk deleted file mode 100644 index 7114cc32958..00000000000 --- a/keyboards/hackpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# this file is intentionally left blank diff --git a/keyboards/handwired/3dortho14u/rev1/info.json b/keyboards/handwired/3dortho14u/rev1/keyboard.json similarity index 100% rename from keyboards/handwired/3dortho14u/rev1/info.json rename to keyboards/handwired/3dortho14u/rev1/keyboard.json diff --git a/keyboards/handwired/3dortho14u/rev1/rules.mk b/keyboards/handwired/3dortho14u/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/3dortho14u/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/3dortho14u/rev2/info.json b/keyboards/handwired/3dortho14u/rev2/keyboard.json similarity index 100% rename from keyboards/handwired/3dortho14u/rev2/info.json rename to keyboards/handwired/3dortho14u/rev2/keyboard.json diff --git a/keyboards/handwired/3dortho14u/rev2/rules.mk b/keyboards/handwired/3dortho14u/rev2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/3dortho14u/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/3dp660_oled/info.json b/keyboards/handwired/3dp660_oled/keyboard.json similarity index 100% rename from keyboards/handwired/3dp660_oled/info.json rename to keyboards/handwired/3dp660_oled/keyboard.json diff --git a/keyboards/handwired/3dp660_oled/rules.mk b/keyboards/handwired/3dp660_oled/rules.mk deleted file mode 100644 index c80812f6e0a..00000000000 --- a/keyboards/handwired/3dp660_oled/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally blank diff --git a/keyboards/handwired/baredev/rev1/info.json b/keyboards/handwired/baredev/rev1/keyboard.json similarity index 100% rename from keyboards/handwired/baredev/rev1/info.json rename to keyboards/handwired/baredev/rev1/keyboard.json diff --git a/keyboards/handwired/baredev/rev1/rules.mk b/keyboards/handwired/baredev/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/dactyl_cc/info.json b/keyboards/handwired/dactyl_cc/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_cc/info.json rename to keyboards/handwired/dactyl_cc/keyboard.json diff --git a/keyboards/handwired/dactyl_cc/rules.mk b/keyboards/handwired/dactyl_cc/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/dactyl_kinesis/info.json b/keyboards/handwired/dactyl_kinesis/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_kinesis/info.json rename to keyboards/handwired/dactyl_kinesis/keyboard.json diff --git a/keyboards/handwired/dactyl_kinesis/rules.mk b/keyboards/handwired/dactyl_kinesis/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/dactyl_kinesis/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/dactyl_lightcycle/info.json b/keyboards/handwired/dactyl_lightcycle/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_lightcycle/info.json rename to keyboards/handwired/dactyl_lightcycle/keyboard.json diff --git a/keyboards/handwired/dactyl_lightcycle/rules.mk b/keyboards/handwired/dactyl_lightcycle/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/info.json b/keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform/4x6_4_3/info.json rename to keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk b/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk deleted file mode 100644 index 3bbd2614291..00000000000 --- a/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionally blank diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/info.json b/keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform/5x6_68/info.json rename to keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform/6x6/promicro/info.json rename to keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform/6x7/info.json rename to keyboards/handwired/dactyl_manuform/6x7/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform/6x7/rules.mk b/keyboards/handwired/dactyl_manuform/6x7/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/dactyl_maximus/info.json b/keyboards/handwired/dactyl_maximus/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_maximus/info.json rename to keyboards/handwired/dactyl_maximus/keyboard.json diff --git a/keyboards/handwired/dactyl_maximus/rules.mk b/keyboards/handwired/dactyl_maximus/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/dactyl_maximus/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/dactyl_minidox/info.json b/keyboards/handwired/dactyl_minidox/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_minidox/info.json rename to keyboards/handwired/dactyl_minidox/keyboard.json diff --git a/keyboards/handwired/dactyl_minidox/rules.mk b/keyboards/handwired/dactyl_minidox/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/dactyl_minidox/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/dactyl_tracer/info.json b/keyboards/handwired/dactyl_tracer/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_tracer/info.json rename to keyboards/handwired/dactyl_tracer/keyboard.json diff --git a/keyboards/handwired/dactyl_tracer/rules.mk b/keyboards/handwired/dactyl_tracer/rules.mk deleted file mode 100644 index 3bbd2614291..00000000000 --- a/keyboards/handwired/dactyl_tracer/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionally blank diff --git a/keyboards/handwired/dactylmacropad/info.json b/keyboards/handwired/dactylmacropad/keyboard.json similarity index 100% rename from keyboards/handwired/dactylmacropad/info.json rename to keyboards/handwired/dactylmacropad/keyboard.json diff --git a/keyboards/handwired/dactylmacropad/rules.mk b/keyboards/handwired/dactylmacropad/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/dactylmacropad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/info.json b/keyboards/handwired/daskeyboard/daskeyboard4/keyboard.json similarity index 100% rename from keyboards/handwired/daskeyboard/daskeyboard4/info.json rename to keyboards/handwired/daskeyboard/daskeyboard4/keyboard.json diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/rules.mk b/keyboards/handwired/daskeyboard/daskeyboard4/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/daskeyboard/daskeyboard4/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/dmote/info.json b/keyboards/handwired/dmote/keyboard.json similarity index 100% rename from keyboards/handwired/dmote/info.json rename to keyboards/handwired/dmote/keyboard.json diff --git a/keyboards/handwired/dmote/rules.mk b/keyboards/handwired/dmote/rules.mk deleted file mode 100644 index 876618b9d13..00000000000 --- a/keyboards/handwired/dmote/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File is intentionally blank diff --git a/keyboards/handwired/dygma/raise/ansi/info.json b/keyboards/handwired/dygma/raise/ansi/keyboard.json similarity index 100% rename from keyboards/handwired/dygma/raise/ansi/info.json rename to keyboards/handwired/dygma/raise/ansi/keyboard.json diff --git a/keyboards/handwired/dygma/raise/ansi/rules.mk b/keyboards/handwired/dygma/raise/ansi/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/dygma/raise/iso/info.json b/keyboards/handwired/dygma/raise/iso/keyboard.json similarity index 100% rename from keyboards/handwired/dygma/raise/iso/info.json rename to keyboards/handwired/dygma/raise/iso/keyboard.json diff --git a/keyboards/handwired/dygma/raise/iso/rules.mk b/keyboards/handwired/dygma/raise/iso/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/iso85k/info.json b/keyboards/handwired/iso85k/keyboard.json similarity index 100% rename from keyboards/handwired/iso85k/info.json rename to keyboards/handwired/iso85k/keyboard.json diff --git a/keyboards/handwired/iso85k/rules.mk b/keyboards/handwired/iso85k/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/iso85k/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/itstleo9/promicro/info.json b/keyboards/handwired/itstleo9/promicro/keyboard.json similarity index 100% rename from keyboards/handwired/itstleo9/promicro/info.json rename to keyboards/handwired/itstleo9/promicro/keyboard.json diff --git a/keyboards/handwired/itstleo9/promicro/rules.mk b/keyboards/handwired/itstleo9/promicro/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/itstleo9/promicro/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/itstleo9/rp2040/info.json b/keyboards/handwired/itstleo9/rp2040/keyboard.json similarity index 100% rename from keyboards/handwired/itstleo9/rp2040/info.json rename to keyboards/handwired/itstleo9/rp2040/keyboard.json diff --git a/keyboards/handwired/itstleo9/rp2040/rules.mk b/keyboards/handwired/itstleo9/rp2040/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/itstleo9/rp2040/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/jotanck/info.json b/keyboards/handwired/jotanck/keyboard.json similarity index 100% rename from keyboards/handwired/jotanck/info.json rename to keyboards/handwired/jotanck/keyboard.json diff --git a/keyboards/handwired/jotanck/rules.mk b/keyboards/handwired/jotanck/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/jotanck/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/jotlily60/info.json b/keyboards/handwired/jotlily60/keyboard.json similarity index 100% rename from keyboards/handwired/jotlily60/info.json rename to keyboards/handwired/jotlily60/keyboard.json diff --git a/keyboards/handwired/jotlily60/rules.mk b/keyboards/handwired/jotlily60/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/jotlily60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/macro3/info.json b/keyboards/handwired/macro3/keyboard.json similarity index 100% rename from keyboards/handwired/macro3/info.json rename to keyboards/handwired/macro3/keyboard.json diff --git a/keyboards/handwired/macro3/rules.mk b/keyboards/handwired/macro3/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/macro3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/marek128b/ergosplit44/info.json b/keyboards/handwired/marek128b/ergosplit44/keyboard.json similarity index 100% rename from keyboards/handwired/marek128b/ergosplit44/info.json rename to keyboards/handwired/marek128b/ergosplit44/keyboard.json diff --git a/keyboards/handwired/marek128b/ergosplit44/rules.mk b/keyboards/handwired/marek128b/ergosplit44/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/marek128b/ergosplit44/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/keyboard.json similarity index 100% rename from keyboards/handwired/maverick0197/keydeck8/info.json rename to keyboards/handwired/maverick0197/keydeck8/keyboard.json diff --git a/keyboards/handwired/maverick0197/keydeck8/rules.mk b/keyboards/handwired/maverick0197/keydeck8/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/maverick0197/keydeck8/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/info.json b/keyboards/handwired/ms_sculpt_mobile/astar/keyboard.json similarity index 100% rename from keyboards/handwired/ms_sculpt_mobile/astar/info.json rename to keyboards/handwired/ms_sculpt_mobile/astar/keyboard.json diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/rules.mk b/keyboards/handwired/ms_sculpt_mobile/astar/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/keyboard.json similarity index 100% rename from keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json rename to keyboards/handwired/ms_sculpt_mobile/teensy2pp/keyboard.json diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/nortontechpad/info.json b/keyboards/handwired/nortontechpad/keyboard.json similarity index 100% rename from keyboards/handwired/nortontechpad/info.json rename to keyboards/handwired/nortontechpad/keyboard.json diff --git a/keyboards/handwired/nortontechpad/rules.mk b/keyboards/handwired/nortontechpad/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/nortontechpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/onekey/bluepill/info.json b/keyboards/handwired/onekey/bluepill/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/bluepill/info.json rename to keyboards/handwired/onekey/bluepill/keyboard.json diff --git a/keyboards/handwired/onekey/bluepill/rules.mk b/keyboards/handwired/onekey/bluepill/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/handwired/onekey/bluepill/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/info.json b/keyboards/handwired/onekey/bluepill_uf2boot/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/bluepill_uf2boot/info.json rename to keyboards/handwired/onekey/bluepill_uf2boot/keyboard.json diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk b/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/handwired/onekey/elite_c/info.json b/keyboards/handwired/onekey/elite_c/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/elite_c/info.json rename to keyboards/handwired/onekey/elite_c/keyboard.json diff --git a/keyboards/handwired/onekey/elite_c/rules.mk b/keyboards/handwired/onekey/elite_c/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/onekey/nucleo_f446re/info.json b/keyboards/handwired/onekey/nucleo_f446re/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/nucleo_f446re/info.json rename to keyboards/handwired/onekey/nucleo_f446re/keyboard.json diff --git a/keyboards/handwired/onekey/nucleo_f446re/rules.mk b/keyboards/handwired/onekey/nucleo_f446re/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/onekey/nucleo_g431rb/info.json b/keyboards/handwired/onekey/nucleo_g431rb/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/nucleo_g431rb/info.json rename to keyboards/handwired/onekey/nucleo_g431rb/keyboard.json diff --git a/keyboards/handwired/onekey/nucleo_g431rb/rules.mk b/keyboards/handwired/onekey/nucleo_g431rb/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/onekey/nucleo_g474re/info.json b/keyboards/handwired/onekey/nucleo_g474re/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/nucleo_g474re/info.json rename to keyboards/handwired/onekey/nucleo_g474re/keyboard.json diff --git a/keyboards/handwired/onekey/nucleo_g474re/rules.mk b/keyboards/handwired/onekey/nucleo_g474re/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/onekey/nucleo_h723zg/info.json b/keyboards/handwired/onekey/nucleo_h723zg/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/nucleo_h723zg/info.json rename to keyboards/handwired/onekey/nucleo_h723zg/keyboard.json diff --git a/keyboards/handwired/onekey/nucleo_h723zg/rules.mk b/keyboards/handwired/onekey/nucleo_h723zg/rules.mk deleted file mode 100755 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/onekey/nucleo_l432kc/info.json b/keyboards/handwired/onekey/nucleo_l432kc/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/nucleo_l432kc/info.json rename to keyboards/handwired/onekey/nucleo_l432kc/keyboard.json diff --git a/keyboards/handwired/onekey/nucleo_l432kc/rules.mk b/keyboards/handwired/onekey/nucleo_l432kc/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/onekey/promicro/info.json b/keyboards/handwired/onekey/promicro/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/promicro/info.json rename to keyboards/handwired/onekey/promicro/keyboard.json diff --git a/keyboards/handwired/onekey/promicro/rules.mk b/keyboards/handwired/onekey/promicro/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/onekey/proton_c/info.json b/keyboards/handwired/onekey/proton_c/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/proton_c/info.json rename to keyboards/handwired/onekey/proton_c/keyboard.json diff --git a/keyboards/handwired/onekey/proton_c/rules.mk b/keyboards/handwired/onekey/proton_c/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/onekey/rp2040/info.json b/keyboards/handwired/onekey/rp2040/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/rp2040/info.json rename to keyboards/handwired/onekey/rp2040/keyboard.json diff --git a/keyboards/handwired/onekey/rp2040/rules.mk b/keyboards/handwired/onekey/rp2040/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/onekey/stm32f0_disco/info.json b/keyboards/handwired/onekey/stm32f0_disco/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/stm32f0_disco/info.json rename to keyboards/handwired/onekey/stm32f0_disco/keyboard.json diff --git a/keyboards/handwired/onekey/stm32f0_disco/rules.mk b/keyboards/handwired/onekey/stm32f0_disco/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/handwired/onekey/stm32f0_disco/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/handwired/onekey/stm32f3_disco/info.json b/keyboards/handwired/onekey/stm32f3_disco/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/stm32f3_disco/info.json rename to keyboards/handwired/onekey/stm32f3_disco/keyboard.json diff --git a/keyboards/handwired/onekey/stm32f3_disco/rules.mk b/keyboards/handwired/onekey/stm32f3_disco/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/onekey/stm32f405_feather/info.json b/keyboards/handwired/onekey/stm32f405_feather/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/stm32f405_feather/info.json rename to keyboards/handwired/onekey/stm32f405_feather/keyboard.json diff --git a/keyboards/handwired/onekey/stm32f405_feather/rules.mk b/keyboards/handwired/onekey/stm32f405_feather/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/handwired/onekey/stm32f405_feather/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/handwired/onekey/teensy_2/info.json b/keyboards/handwired/onekey/teensy_2/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/teensy_2/info.json rename to keyboards/handwired/onekey/teensy_2/keyboard.json diff --git a/keyboards/handwired/onekey/teensy_2/rules.mk b/keyboards/handwired/onekey/teensy_2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/onekey/teensy_2pp/info.json b/keyboards/handwired/onekey/teensy_2pp/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/teensy_2pp/info.json rename to keyboards/handwired/onekey/teensy_2pp/keyboard.json diff --git a/keyboards/handwired/onekey/teensy_2pp/rules.mk b/keyboards/handwired/onekey/teensy_2pp/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/onekey/teensy_32/info.json b/keyboards/handwired/onekey/teensy_32/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/teensy_32/info.json rename to keyboards/handwired/onekey/teensy_32/keyboard.json diff --git a/keyboards/handwired/onekey/teensy_32/rules.mk b/keyboards/handwired/onekey/teensy_32/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/handwired/onekey/teensy_32/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/handwired/onekey/teensy_35/info.json b/keyboards/handwired/onekey/teensy_35/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/teensy_35/info.json rename to keyboards/handwired/onekey/teensy_35/keyboard.json diff --git a/keyboards/handwired/onekey/teensy_35/rules.mk b/keyboards/handwired/onekey/teensy_35/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/handwired/onekey/teensy_35/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/handwired/petruziamini/info.json b/keyboards/handwired/petruziamini/keyboard.json similarity index 100% rename from keyboards/handwired/petruziamini/info.json rename to keyboards/handwired/petruziamini/keyboard.json diff --git a/keyboards/handwired/petruziamini/rules.mk b/keyboards/handwired/petruziamini/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/petruziamini/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/phantagom/baragon/info.json b/keyboards/handwired/phantagom/baragon/keyboard.json similarity index 100% rename from keyboards/handwired/phantagom/baragon/info.json rename to keyboards/handwired/phantagom/baragon/keyboard.json diff --git a/keyboards/handwired/phantagom/baragon/rules.mk b/keyboards/handwired/phantagom/baragon/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/phantagom/baragon/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/phantagom/varan/info.json b/keyboards/handwired/phantagom/varan/keyboard.json similarity index 100% rename from keyboards/handwired/phantagom/varan/info.json rename to keyboards/handwired/phantagom/varan/keyboard.json diff --git a/keyboards/handwired/phantagom/varan/rules.mk b/keyboards/handwired/phantagom/varan/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/phantagom/varan/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/pill60/bluepill/info.json b/keyboards/handwired/pill60/bluepill/keyboard.json similarity index 100% rename from keyboards/handwired/pill60/bluepill/info.json rename to keyboards/handwired/pill60/bluepill/keyboard.json diff --git a/keyboards/handwired/pill60/bluepill/rules.mk b/keyboards/handwired/pill60/bluepill/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/handwired/pill60/bluepill/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/handwired/polly40/info.json b/keyboards/handwired/polly40/keyboard.json similarity index 100% rename from keyboards/handwired/polly40/info.json rename to keyboards/handwired/polly40/keyboard.json diff --git a/keyboards/handwired/polly40/rules.mk b/keyboards/handwired/polly40/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/handwired/polly40/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/handwired/pytest/basic/info.json b/keyboards/handwired/pytest/basic/keyboard.json similarity index 100% rename from keyboards/handwired/pytest/basic/info.json rename to keyboards/handwired/pytest/basic/keyboard.json diff --git a/keyboards/handwired/pytest/basic/rules.mk b/keyboards/handwired/pytest/basic/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/pytest/has_community/info.json b/keyboards/handwired/pytest/has_community/keyboard.json similarity index 100% rename from keyboards/handwired/pytest/has_community/info.json rename to keyboards/handwired/pytest/has_community/keyboard.json diff --git a/keyboards/handwired/pytest/has_community/rules.mk b/keyboards/handwired/pytest/has_community/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/pytest/macro/info.json b/keyboards/handwired/pytest/macro/keyboard.json similarity index 100% rename from keyboards/handwired/pytest/macro/info.json rename to keyboards/handwired/pytest/macro/keyboard.json diff --git a/keyboards/handwired/pytest/macro/rules.mk b/keyboards/handwired/pytest/macro/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/rabijl/rotary_numpad/info.json b/keyboards/handwired/rabijl/rotary_numpad/keyboard.json similarity index 100% rename from keyboards/handwired/rabijl/rotary_numpad/info.json rename to keyboards/handwired/rabijl/rotary_numpad/keyboard.json diff --git a/keyboards/handwired/rabijl/rotary_numpad/rules.mk b/keyboards/handwired/rabijl/rotary_numpad/rules.mk deleted file mode 100644 index 1287472e49e..00000000000 --- a/keyboards/handwired/rabijl/rotary_numpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# file intentionally left blank diff --git a/keyboards/handwired/rd_61_qmk/info.json b/keyboards/handwired/rd_61_qmk/keyboard.json similarity index 100% rename from keyboards/handwired/rd_61_qmk/info.json rename to keyboards/handwired/rd_61_qmk/keyboard.json diff --git a/keyboards/handwired/rd_61_qmk/rules.mk b/keyboards/handwired/rd_61_qmk/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/rd_61_qmk/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/keyboard.json similarity index 100% rename from keyboards/handwired/reclined/info.json rename to keyboards/handwired/reclined/keyboard.json diff --git a/keyboards/handwired/reclined/rules.mk b/keyboards/handwired/reclined/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/reclined/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scotto108/info.json b/keyboards/handwired/scottokeebs/scotto108/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scotto108/info.json rename to keyboards/handwired/scottokeebs/scotto108/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scotto108/rules.mk b/keyboards/handwired/scottokeebs/scotto108/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scotto108/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scotto34/info.json b/keyboards/handwired/scottokeebs/scotto34/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scotto34/info.json rename to keyboards/handwired/scottokeebs/scotto34/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scotto34/rules.mk b/keyboards/handwired/scottokeebs/scotto34/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/scottokeebs/scotto36/info.json b/keyboards/handwired/scottokeebs/scotto36/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scotto36/info.json rename to keyboards/handwired/scottokeebs/scotto36/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scotto36/rules.mk b/keyboards/handwired/scottokeebs/scotto36/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scotto36/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scotto40/info.json b/keyboards/handwired/scottokeebs/scotto40/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scotto40/info.json rename to keyboards/handwired/scottokeebs/scotto40/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scotto40/rules.mk b/keyboards/handwired/scottokeebs/scotto40/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scotto40/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scotto61/info.json b/keyboards/handwired/scottokeebs/scotto61/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scotto61/info.json rename to keyboards/handwired/scottokeebs/scotto61/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scotto61/rules.mk b/keyboards/handwired/scottokeebs/scotto61/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scotto61/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scotto9/info.json b/keyboards/handwired/scottokeebs/scotto9/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scotto9/info.json rename to keyboards/handwired/scottokeebs/scotto9/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scotto9/rules.mk b/keyboards/handwired/scottokeebs/scotto9/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scotto9/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scottoalp/info.json b/keyboards/handwired/scottokeebs/scottoalp/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottoalp/info.json rename to keyboards/handwired/scottokeebs/scottoalp/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottoalp/rules.mk b/keyboards/handwired/scottokeebs/scottoalp/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scottoalp/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scottocmd/info.json b/keyboards/handwired/scottokeebs/scottocmd/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottocmd/info.json rename to keyboards/handwired/scottokeebs/scottocmd/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottocmd/rules.mk b/keyboards/handwired/scottokeebs/scottocmd/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scottocmd/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scottodeck/info.json b/keyboards/handwired/scottokeebs/scottodeck/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottodeck/info.json rename to keyboards/handwired/scottokeebs/scottodeck/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottodeck/rules.mk b/keyboards/handwired/scottokeebs/scottodeck/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scottodeck/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scottoergo/info.json b/keyboards/handwired/scottokeebs/scottoergo/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottoergo/info.json rename to keyboards/handwired/scottokeebs/scottoergo/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottoergo/rules.mk b/keyboards/handwired/scottokeebs/scottoergo/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scottoergo/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scottofly/info.json b/keyboards/handwired/scottokeebs/scottofly/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottofly/info.json rename to keyboards/handwired/scottokeebs/scottofly/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottofly/rules.mk b/keyboards/handwired/scottokeebs/scottofly/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scottofly/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scottofrog/info.json b/keyboards/handwired/scottokeebs/scottofrog/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottofrog/info.json rename to keyboards/handwired/scottokeebs/scottofrog/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottofrog/rules.mk b/keyboards/handwired/scottokeebs/scottofrog/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scottofrog/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scottogame/info.json b/keyboards/handwired/scottokeebs/scottogame/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottogame/info.json rename to keyboards/handwired/scottokeebs/scottogame/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottogame/rules.mk b/keyboards/handwired/scottokeebs/scottogame/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/handwired/scottokeebs/scottogame/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/handwired/scottokeebs/scottoinvader/info.json b/keyboards/handwired/scottokeebs/scottoinvader/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottoinvader/info.json rename to keyboards/handwired/scottokeebs/scottoinvader/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottoinvader/rules.mk b/keyboards/handwired/scottokeebs/scottoinvader/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scottoinvader/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scottokatana/info.json b/keyboards/handwired/scottokeebs/scottokatana/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottokatana/info.json rename to keyboards/handwired/scottokeebs/scottokatana/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottokatana/rules.mk b/keyboards/handwired/scottokeebs/scottokatana/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scottokatana/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scottolong/info.json b/keyboards/handwired/scottokeebs/scottolong/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottolong/info.json rename to keyboards/handwired/scottokeebs/scottolong/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottolong/rules.mk b/keyboards/handwired/scottokeebs/scottolong/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scottolong/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json b/keyboards/handwired/scottokeebs/scottomacrodeck/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottomacrodeck/info.json rename to keyboards/handwired/scottokeebs/scottomacrodeck/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk b/keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/scottokeebs/scottomouse/info.json b/keyboards/handwired/scottokeebs/scottomouse/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottomouse/info.json rename to keyboards/handwired/scottokeebs/scottomouse/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottomouse/rules.mk b/keyboards/handwired/scottokeebs/scottomouse/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scottomouse/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scottonum/info.json b/keyboards/handwired/scottokeebs/scottonum/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottonum/info.json rename to keyboards/handwired/scottokeebs/scottonum/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottonum/rules.mk b/keyboards/handwired/scottokeebs/scottonum/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scottonum/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scottosplit/info.json b/keyboards/handwired/scottokeebs/scottosplit/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottosplit/info.json rename to keyboards/handwired/scottokeebs/scottosplit/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottosplit/rules.mk b/keyboards/handwired/scottokeebs/scottosplit/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scottosplit/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/scottokeebs/scottostarter/info.json b/keyboards/handwired/scottokeebs/scottostarter/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottostarter/info.json rename to keyboards/handwired/scottokeebs/scottostarter/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottostarter/rules.mk b/keyboards/handwired/scottokeebs/scottostarter/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/handwired/scottokeebs/scottostarter/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/handwired/scottokeebs/scottowing/info.json b/keyboards/handwired/scottokeebs/scottowing/keyboard.json similarity index 100% rename from keyboards/handwired/scottokeebs/scottowing/info.json rename to keyboards/handwired/scottokeebs/scottowing/keyboard.json diff --git a/keyboards/handwired/scottokeebs/scottowing/rules.mk b/keyboards/handwired/scottokeebs/scottowing/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/scottokeebs/scottowing/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/sejin_eat1010r2/info.json b/keyboards/handwired/sejin_eat1010r2/keyboard.json similarity index 100% rename from keyboards/handwired/sejin_eat1010r2/info.json rename to keyboards/handwired/sejin_eat1010r2/keyboard.json diff --git a/keyboards/handwired/sejin_eat1010r2/rules.mk b/keyboards/handwired/sejin_eat1010r2/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/handwired/sejin_eat1010r2/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/handwired/sono1/stm32f103/info.json b/keyboards/handwired/sono1/stm32f103/keyboard.json similarity index 100% rename from keyboards/handwired/sono1/stm32f103/info.json rename to keyboards/handwired/sono1/stm32f103/keyboard.json diff --git a/keyboards/handwired/sono1/stm32f103/rules.mk b/keyboards/handwired/sono1/stm32f103/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/handwired/sono1/stm32f103/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/handwired/sono1/t2pp/info.json b/keyboards/handwired/sono1/t2pp/keyboard.json similarity index 100% rename from keyboards/handwired/sono1/t2pp/info.json rename to keyboards/handwired/sono1/t2pp/keyboard.json diff --git a/keyboards/handwired/sono1/t2pp/rules.mk b/keyboards/handwired/sono1/t2pp/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/split_cloud/info.json b/keyboards/handwired/split_cloud/keyboard.json similarity index 100% rename from keyboards/handwired/split_cloud/info.json rename to keyboards/handwired/split_cloud/keyboard.json diff --git a/keyboards/handwired/split_cloud/rules.mk b/keyboards/handwired/split_cloud/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/splittest/bluepill/info.json b/keyboards/handwired/splittest/bluepill/keyboard.json similarity index 100% rename from keyboards/handwired/splittest/bluepill/info.json rename to keyboards/handwired/splittest/bluepill/keyboard.json diff --git a/keyboards/handwired/splittest/bluepill/rules.mk b/keyboards/handwired/splittest/bluepill/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/handwired/splittest/bluepill/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/handwired/splittest/promicro/info.json b/keyboards/handwired/splittest/promicro/keyboard.json similarity index 100% rename from keyboards/handwired/splittest/promicro/info.json rename to keyboards/handwired/splittest/promicro/keyboard.json diff --git a/keyboards/handwired/splittest/promicro/rules.mk b/keyboards/handwired/splittest/promicro/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/splittest/teensy_2/info.json b/keyboards/handwired/splittest/teensy_2/keyboard.json similarity index 100% rename from keyboards/handwired/splittest/teensy_2/info.json rename to keyboards/handwired/splittest/teensy_2/keyboard.json diff --git a/keyboards/handwired/splittest/teensy_2/rules.mk b/keyboards/handwired/splittest/teensy_2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/starrykeebs/dude09/info.json b/keyboards/handwired/starrykeebs/dude09/keyboard.json similarity index 100% rename from keyboards/handwired/starrykeebs/dude09/info.json rename to keyboards/handwired/starrykeebs/dude09/keyboard.json diff --git a/keyboards/handwired/starrykeebs/dude09/rules.mk b/keyboards/handwired/starrykeebs/dude09/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/starrykeebs/dude09/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/technicpad/info.json b/keyboards/handwired/technicpad/keyboard.json similarity index 100% rename from keyboards/handwired/technicpad/info.json rename to keyboards/handwired/technicpad/keyboard.json diff --git a/keyboards/handwired/technicpad/rules.mk b/keyboards/handwired/technicpad/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/technicpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/tkk/info.json b/keyboards/handwired/tkk/keyboard.json similarity index 100% rename from keyboards/handwired/tkk/info.json rename to keyboards/handwired/tkk/keyboard.json diff --git a/keyboards/handwired/tkk/rules.mk b/keyboards/handwired/tkk/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/tkk/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json similarity index 100% rename from keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json rename to keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/keyboard.json similarity index 100% rename from keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json rename to keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/keyboard.json diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/keyboard.json similarity index 100% rename from keyboards/handwired/unk/rev1/info.json rename to keyboards/handwired/unk/rev1/keyboard.json diff --git a/keyboards/handwired/unk/rev1/rules.mk b/keyboards/handwired/unk/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/wakizashi40/info.json b/keyboards/handwired/wakizashi40/keyboard.json similarity index 100% rename from keyboards/handwired/wakizashi40/info.json rename to keyboards/handwired/wakizashi40/keyboard.json diff --git a/keyboards/handwired/wakizashi40/rules.mk b/keyboards/handwired/wakizashi40/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/wakizashi40/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/wwa/helios/info.json b/keyboards/handwired/wwa/helios/keyboard.json similarity index 100% rename from keyboards/handwired/wwa/helios/info.json rename to keyboards/handwired/wwa/helios/keyboard.json diff --git a/keyboards/handwired/wwa/helios/rules.mk b/keyboards/handwired/wwa/helios/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/wwa/helios/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/wwa/kepler/info.json b/keyboards/handwired/wwa/kepler/keyboard.json similarity index 100% rename from keyboards/handwired/wwa/kepler/info.json rename to keyboards/handwired/wwa/kepler/keyboard.json diff --git a/keyboards/handwired/wwa/kepler/rules.mk b/keyboards/handwired/wwa/kepler/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/wwa/kepler/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/wwa/mercury/info.json b/keyboards/handwired/wwa/mercury/keyboard.json similarity index 100% rename from keyboards/handwired/wwa/mercury/info.json rename to keyboards/handwired/wwa/mercury/keyboard.json diff --git a/keyboards/handwired/wwa/mercury/rules.mk b/keyboards/handwired/wwa/mercury/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/wwa/mercury/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/wwa/soyuz/info.json b/keyboards/handwired/wwa/soyuz/keyboard.json similarity index 100% rename from keyboards/handwired/wwa/soyuz/info.json rename to keyboards/handwired/wwa/soyuz/keyboard.json diff --git a/keyboards/handwired/wwa/soyuz/rules.mk b/keyboards/handwired/wwa/soyuz/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/wwa/soyuzxl/info.json b/keyboards/handwired/wwa/soyuzxl/keyboard.json similarity index 100% rename from keyboards/handwired/wwa/soyuzxl/info.json rename to keyboards/handwired/wwa/soyuzxl/keyboard.json diff --git a/keyboards/handwired/wwa/soyuzxl/rules.mk b/keyboards/handwired/wwa/soyuzxl/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/xealous/rev1/info.json b/keyboards/handwired/xealous/rev1/keyboard.json similarity index 100% rename from keyboards/handwired/xealous/rev1/info.json rename to keyboards/handwired/xealous/rev1/keyboard.json diff --git a/keyboards/handwired/xealous/rev1/rules.mk b/keyboards/handwired/xealous/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/handwired/ziyoulang_k3_mod/info.json b/keyboards/handwired/ziyoulang_k3_mod/keyboard.json similarity index 100% rename from keyboards/handwired/ziyoulang_k3_mod/info.json rename to keyboards/handwired/ziyoulang_k3_mod/keyboard.json diff --git a/keyboards/handwired/ziyoulang_k3_mod/rules.mk b/keyboards/handwired/ziyoulang_k3_mod/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/ziyoulang_k3_mod/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/heliotrope/info.json b/keyboards/heliotrope/keyboard.json similarity index 100% rename from keyboards/heliotrope/info.json rename to keyboards/heliotrope/keyboard.json diff --git a/keyboards/heliotrope/rules.mk b/keyboards/heliotrope/rules.mk deleted file mode 100644 index 6968c523355..00000000000 --- a/keyboards/heliotrope/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# This file intentionally left blank - diff --git a/keyboards/hhkb/ansi/32u4/info.json b/keyboards/hhkb/ansi/32u4/keyboard.json similarity index 100% rename from keyboards/hhkb/ansi/32u4/info.json rename to keyboards/hhkb/ansi/32u4/keyboard.json diff --git a/keyboards/hhkb/ansi/32u4/rules.mk b/keyboards/hhkb/ansi/32u4/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/hineybush/h101/info.json b/keyboards/hineybush/h101/keyboard.json similarity index 100% rename from keyboards/hineybush/h101/info.json rename to keyboards/hineybush/h101/keyboard.json diff --git a/keyboards/hineybush/h101/rules.mk b/keyboards/hineybush/h101/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/hineybush/h101/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/hineybush/h87_g2/info.json b/keyboards/hineybush/h87_g2/keyboard.json similarity index 100% rename from keyboards/hineybush/h87_g2/info.json rename to keyboards/hineybush/h87_g2/keyboard.json diff --git a/keyboards/hineybush/h87_g2/rules.mk b/keyboards/hineybush/h87_g2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/hineybush/h87_g2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/hineybush/ibis/info.json b/keyboards/hineybush/ibis/keyboard.json similarity index 100% rename from keyboards/hineybush/ibis/info.json rename to keyboards/hineybush/ibis/keyboard.json diff --git a/keyboards/hineybush/ibis/rules.mk b/keyboards/hineybush/ibis/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/hineybush/ibis/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/holyswitch/lightweight65/info.json b/keyboards/holyswitch/lightweight65/keyboard.json similarity index 100% rename from keyboards/holyswitch/lightweight65/info.json rename to keyboards/holyswitch/lightweight65/keyboard.json diff --git a/keyboards/holyswitch/lightweight65/rules.mk b/keyboards/holyswitch/lightweight65/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/holyswitch/lightweight65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json b/keyboards/horrortroll/caticorn/rev1/hotswap/keyboard.json similarity index 100% rename from keyboards/horrortroll/caticorn/rev1/hotswap/info.json rename to keyboards/horrortroll/caticorn/rev1/hotswap/keyboard.json diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk b/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/horrortroll/caticorn/rev1/solder/info.json b/keyboards/horrortroll/caticorn/rev1/solder/keyboard.json similarity index 100% rename from keyboards/horrortroll/caticorn/rev1/solder/info.json rename to keyboards/horrortroll/caticorn/rev1/solder/keyboard.json diff --git a/keyboards/horrortroll/caticorn/rev1/solder/rules.mk b/keyboards/horrortroll/caticorn/rev1/solder/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/horrortroll/caticorn/rev1/solder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/hotdox76v2/info.json b/keyboards/hotdox76v2/keyboard.json similarity index 100% rename from keyboards/hotdox76v2/info.json rename to keyboards/hotdox76v2/keyboard.json diff --git a/keyboards/hotdox76v2/rules.mk b/keyboards/hotdox76v2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/hubble/info.json b/keyboards/hubble/keyboard.json similarity index 100% rename from keyboards/hubble/info.json rename to keyboards/hubble/keyboard.json diff --git a/keyboards/hubble/rules.mk b/keyboards/hubble/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/hubble/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/ibm/model_m/modelh/info.json b/keyboards/ibm/model_m/modelh/keyboard.json similarity index 100% rename from keyboards/ibm/model_m/modelh/info.json rename to keyboards/ibm/model_m/modelh/keyboard.json diff --git a/keyboards/ibm/model_m/modelh/rules.mk b/keyboards/ibm/model_m/modelh/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ibm/model_m_122/m122_3270/bluepill/info.json b/keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json similarity index 100% rename from keyboards/ibm/model_m_122/m122_3270/bluepill/info.json rename to keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json diff --git a/keyboards/ibm/model_m_122/m122_3270/bluepill/rules.mk b/keyboards/ibm/model_m_122/m122_3270/bluepill/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/idank/spankbd/info.json b/keyboards/idank/spankbd/keyboard.json similarity index 100% rename from keyboards/idank/spankbd/info.json rename to keyboards/idank/spankbd/keyboard.json diff --git a/keyboards/idank/spankbd/rules.mk b/keyboards/idank/spankbd/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/idank/spankbd/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/idank/sweeq/info.json b/keyboards/idank/sweeq/keyboard.json similarity index 100% rename from keyboards/idank/sweeq/info.json rename to keyboards/idank/sweeq/keyboard.json diff --git a/keyboards/idank/sweeq/rules.mk b/keyboards/idank/sweeq/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/idank/sweeq/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/idobao/id80/v2/ansi/info.json b/keyboards/idobao/id80/v2/ansi/keyboard.json similarity index 100% rename from keyboards/idobao/id80/v2/ansi/info.json rename to keyboards/idobao/id80/v2/ansi/keyboard.json diff --git a/keyboards/idobao/id80/v2/ansi/rules.mk b/keyboards/idobao/id80/v2/ansi/rules.mk deleted file mode 100644 index 5fa6d2f3d01..00000000000 --- a/keyboards/idobao/id80/v2/ansi/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# This file intentionally left blank -# see common info.json diff --git a/keyboards/idobao/id80/v2/iso/info.json b/keyboards/idobao/id80/v2/iso/keyboard.json similarity index 100% rename from keyboards/idobao/id80/v2/iso/info.json rename to keyboards/idobao/id80/v2/iso/keyboard.json diff --git a/keyboards/idobao/id80/v2/iso/rules.mk b/keyboards/idobao/id80/v2/iso/rules.mk deleted file mode 100644 index 5fa6d2f3d01..00000000000 --- a/keyboards/idobao/id80/v2/iso/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# This file intentionally left blank -# see common info.json diff --git a/keyboards/idyllic/tinny50_rgb/info.json b/keyboards/idyllic/tinny50_rgb/keyboard.json similarity index 100% rename from keyboards/idyllic/tinny50_rgb/info.json rename to keyboards/idyllic/tinny50_rgb/keyboard.json diff --git a/keyboards/idyllic/tinny50_rgb/rules.mk b/keyboards/idyllic/tinny50_rgb/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/igloo/info.json b/keyboards/igloo/keyboard.json similarity index 100% rename from keyboards/igloo/info.json rename to keyboards/igloo/keyboard.json diff --git a/keyboards/igloo/rules.mk b/keyboards/igloo/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/igloo/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/info.json b/keyboards/inett_studio/sq80/hotswap_layout_i/keyboard.json similarity index 100% rename from keyboards/inett_studio/sq80/hotswap_layout_i/info.json rename to keyboards/inett_studio/sq80/hotswap_layout_i/keyboard.json diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk b/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/inland/mk47/info.json b/keyboards/inland/mk47/keyboard.json similarity index 100% rename from keyboards/inland/mk47/info.json rename to keyboards/inland/mk47/keyboard.json diff --git a/keyboards/inland/mk47/rules.mk b/keyboards/inland/mk47/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/inland/mk47/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/inland/v83p/info.json b/keyboards/inland/v83p/keyboard.json similarity index 100% rename from keyboards/inland/v83p/info.json rename to keyboards/inland/v83p/keyboard.json diff --git a/keyboards/inland/v83p/rules.mk b/keyboards/inland/v83p/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/inland/v83p/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/input_club/infinity60/led/info.json b/keyboards/input_club/infinity60/led/keyboard.json similarity index 100% rename from keyboards/input_club/infinity60/led/info.json rename to keyboards/input_club/infinity60/led/keyboard.json diff --git a/keyboards/input_club/infinity60/led/rules.mk b/keyboards/input_club/infinity60/led/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/input_club/infinity60/rev1/info.json b/keyboards/input_club/infinity60/rev1/keyboard.json similarity index 100% rename from keyboards/input_club/infinity60/rev1/info.json rename to keyboards/input_club/infinity60/rev1/keyboard.json diff --git a/keyboards/input_club/infinity60/rev1/rules.mk b/keyboards/input_club/infinity60/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/itstleo/itstleo40/info.json b/keyboards/itstleo/itstleo40/keyboard.json similarity index 100% rename from keyboards/itstleo/itstleo40/info.json rename to keyboards/itstleo/itstleo40/keyboard.json diff --git a/keyboards/itstleo/itstleo40/rules.mk b/keyboards/itstleo/itstleo40/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/itstleo/itstleo40/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/jacky_studio/piggy60/rev1/hotswap/info.json b/keyboards/jacky_studio/piggy60/rev1/hotswap/keyboard.json similarity index 100% rename from keyboards/jacky_studio/piggy60/rev1/hotswap/info.json rename to keyboards/jacky_studio/piggy60/rev1/hotswap/keyboard.json diff --git a/keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk b/keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/jacky_studio/piggy60/rev1/solder/info.json b/keyboards/jacky_studio/piggy60/rev1/solder/keyboard.json similarity index 100% rename from keyboards/jacky_studio/piggy60/rev1/solder/info.json rename to keyboards/jacky_studio/piggy60/rev1/solder/keyboard.json diff --git a/keyboards/jacky_studio/piggy60/rev1/solder/rules.mk b/keyboards/jacky_studio/piggy60/rev1/solder/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/jacky_studio/piggy60/rev1/solder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/jadookb/jkb65/r1/info.json b/keyboards/jadookb/jkb65/r1/keyboard.json similarity index 100% rename from keyboards/jadookb/jkb65/r1/info.json rename to keyboards/jadookb/jkb65/r1/keyboard.json diff --git a/keyboards/jadookb/jkb65/r1/rules.mk b/keyboards/jadookb/jkb65/r1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/jadookb/jkb65/r2/info.json b/keyboards/jadookb/jkb65/r2/keyboard.json similarity index 100% rename from keyboards/jadookb/jkb65/r2/info.json rename to keyboards/jadookb/jkb65/r2/keyboard.json diff --git a/keyboards/jadookb/jkb65/r2/rules.mk b/keyboards/jadookb/jkb65/r2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/jaykeeb/orba/info.json b/keyboards/jaykeeb/orba/keyboard.json similarity index 100% rename from keyboards/jaykeeb/orba/info.json rename to keyboards/jaykeeb/orba/keyboard.json diff --git a/keyboards/jaykeeb/orba/rules.mk b/keyboards/jaykeeb/orba/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/jaykeeb/orba/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/jaykeeb/sebelas/info.json b/keyboards/jaykeeb/sebelas/keyboard.json similarity index 100% rename from keyboards/jaykeeb/sebelas/info.json rename to keyboards/jaykeeb/sebelas/keyboard.json diff --git a/keyboards/jaykeeb/sebelas/rules.mk b/keyboards/jaykeeb/sebelas/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/jaykeeb/sebelas/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/jaykeeb/skyline/info.json b/keyboards/jaykeeb/skyline/keyboard.json similarity index 100% rename from keyboards/jaykeeb/skyline/info.json rename to keyboards/jaykeeb/skyline/keyboard.json diff --git a/keyboards/jaykeeb/skyline/rules.mk b/keyboards/jaykeeb/skyline/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/jaykeeb/skyline/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/jaykeeb/sriwedari70/info.json b/keyboards/jaykeeb/sriwedari70/keyboard.json similarity index 100% rename from keyboards/jaykeeb/sriwedari70/info.json rename to keyboards/jaykeeb/sriwedari70/keyboard.json diff --git a/keyboards/jaykeeb/sriwedari70/rules.mk b/keyboards/jaykeeb/sriwedari70/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/jaykeeb/sriwedari70/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/jaykeeb/tokki/info.json b/keyboards/jaykeeb/tokki/keyboard.json similarity index 100% rename from keyboards/jaykeeb/tokki/info.json rename to keyboards/jaykeeb/tokki/keyboard.json diff --git a/keyboards/jaykeeb/tokki/rules.mk b/keyboards/jaykeeb/tokki/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/jaykeeb/tokki/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/jels/boaty/info.json b/keyboards/jels/boaty/keyboard.json similarity index 100% rename from keyboards/jels/boaty/info.json rename to keyboards/jels/boaty/keyboard.json diff --git a/keyboards/jels/boaty/rules.mk b/keyboards/jels/boaty/rules.mk deleted file mode 100644 index 837f4bffb53..00000000000 --- a/keyboards/jels/boaty/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally left blank diff --git a/keyboards/jels/jels60/v1/info.json b/keyboards/jels/jels60/v1/keyboard.json similarity index 100% rename from keyboards/jels/jels60/v1/info.json rename to keyboards/jels/jels60/v1/keyboard.json diff --git a/keyboards/jels/jels60/v1/rules.mk b/keyboards/jels/jels60/v1/rules.mk deleted file mode 100644 index 5566e1323fa..00000000000 --- a/keyboards/jels/jels60/v1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# left blank intentionally diff --git a/keyboards/jels/jels60/v2/info.json b/keyboards/jels/jels60/v2/keyboard.json similarity index 100% rename from keyboards/jels/jels60/v2/info.json rename to keyboards/jels/jels60/v2/keyboard.json diff --git a/keyboards/jels/jels60/v2/rules.mk b/keyboards/jels/jels60/v2/rules.mk deleted file mode 100644 index e0b4f1030fb..00000000000 --- a/keyboards/jels/jels60/v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# left blank intentionally \ No newline at end of file diff --git a/keyboards/jidohun/km113/info.json b/keyboards/jidohun/km113/keyboard.json similarity index 100% rename from keyboards/jidohun/km113/info.json rename to keyboards/jidohun/km113/keyboard.json diff --git a/keyboards/jidohun/km113/rules.mk b/keyboards/jidohun/km113/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/jidohun/km113/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/jukaie/jk01/info.json b/keyboards/jukaie/jk01/keyboard.json similarity index 100% rename from keyboards/jukaie/jk01/info.json rename to keyboards/jukaie/jk01/keyboard.json diff --git a/keyboards/jukaie/jk01/rules.mk b/keyboards/jukaie/jk01/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/jukaie/jk01/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kakunpc/angel64/alpha/info.json b/keyboards/kakunpc/angel64/alpha/keyboard.json similarity index 100% rename from keyboards/kakunpc/angel64/alpha/info.json rename to keyboards/kakunpc/angel64/alpha/keyboard.json diff --git a/keyboards/kakunpc/angel64/alpha/rules.mk b/keyboards/kakunpc/angel64/alpha/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kakunpc/angel64/rev1/info.json b/keyboards/kakunpc/angel64/rev1/keyboard.json similarity index 100% rename from keyboards/kakunpc/angel64/rev1/info.json rename to keyboards/kakunpc/angel64/rev1/keyboard.json diff --git a/keyboards/kakunpc/angel64/rev1/rules.mk b/keyboards/kakunpc/angel64/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kalakos/bahrnob/info.json b/keyboards/kalakos/bahrnob/keyboard.json similarity index 100% rename from keyboards/kalakos/bahrnob/info.json rename to keyboards/kalakos/bahrnob/keyboard.json diff --git a/keyboards/kalakos/bahrnob/rules.mk b/keyboards/kalakos/bahrnob/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kalakos/bahrnob/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kapcave/paladinpad/rev1/info.json b/keyboards/kapcave/paladinpad/rev1/keyboard.json similarity index 100% rename from keyboards/kapcave/paladinpad/rev1/info.json rename to keyboards/kapcave/paladinpad/rev1/keyboard.json diff --git a/keyboards/kapcave/paladinpad/rev1/rules.mk b/keyboards/kapcave/paladinpad/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kapcave/paladinpad/rev2/info.json b/keyboards/kapcave/paladinpad/rev2/keyboard.json similarity index 100% rename from keyboards/kapcave/paladinpad/rev2/info.json rename to keyboards/kapcave/paladinpad/rev2/keyboard.json diff --git a/keyboards/kapcave/paladinpad/rev2/rules.mk b/keyboards/kapcave/paladinpad/rev2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kb_elmo/bm42/info.json b/keyboards/kb_elmo/bm42/keyboard.json similarity index 100% rename from keyboards/kb_elmo/bm42/info.json rename to keyboards/kb_elmo/bm42/keyboard.json diff --git a/keyboards/kb_elmo/bm42/rules.mk b/keyboards/kb_elmo/bm42/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kb_elmo/bm42/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kb_elmo/dizzy40/info.json b/keyboards/kb_elmo/dizzy40/keyboard.json similarity index 100% rename from keyboards/kb_elmo/dizzy40/info.json rename to keyboards/kb_elmo/dizzy40/keyboard.json diff --git a/keyboards/kb_elmo/dizzy40/rules.mk b/keyboards/kb_elmo/dizzy40/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kb_elmo/dizzy40/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kb_elmo/eliza/info.json b/keyboards/kb_elmo/eliza/keyboard.json similarity index 100% rename from keyboards/kb_elmo/eliza/info.json rename to keyboards/kb_elmo/eliza/keyboard.json diff --git a/keyboards/kb_elmo/eliza/rules.mk b/keyboards/kb_elmo/eliza/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kb_elmo/eliza/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kb_elmo/gamehand/info.json b/keyboards/kb_elmo/gamehand/keyboard.json similarity index 100% rename from keyboards/kb_elmo/gamehand/info.json rename to keyboards/kb_elmo/gamehand/keyboard.json diff --git a/keyboards/kb_elmo/gamehand/rules.mk b/keyboards/kb_elmo/gamehand/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kb_elmo/gamehand/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/keyboard.json similarity index 100% rename from keyboards/kbdcraft/adam64/info.json rename to keyboards/kbdcraft/adam64/keyboard.json diff --git a/keyboards/kbdcraft/adam64/rules.mk b/keyboards/kbdcraft/adam64/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/kbdcraft/adam64/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/kbdfans/d45/v2/info.json b/keyboards/kbdfans/d45/v2/keyboard.json similarity index 100% rename from keyboards/kbdfans/d45/v2/info.json rename to keyboards/kbdfans/d45/v2/keyboard.json diff --git a/keyboards/kbdfans/d45/v2/rules.mk b/keyboards/kbdfans/d45/v2/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/kbdfans/d45/v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/keyboard.json similarity index 100% rename from keyboards/kbdfans/kbd67/rev1/info.json rename to keyboards/kbdfans/kbd67/rev1/keyboard.json diff --git a/keyboards/kbdfans/kbd67/rev1/rules.mk b/keyboards/kbdfans/kbd67/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kbdfans/kbd67/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kbdfans/kbdpad/mk3/info.json b/keyboards/kbdfans/kbdpad/mk3/keyboard.json similarity index 100% rename from keyboards/kbdfans/kbdpad/mk3/info.json rename to keyboards/kbdfans/kbdpad/mk3/keyboard.json diff --git a/keyboards/kbdfans/kbdpad/mk3/rules.mk b/keyboards/kbdfans/kbdpad/mk3/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kbdfans/kbdpad/mk3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kbdfans/odinmini/info.json b/keyboards/kbdfans/odinmini/keyboard.json similarity index 100% rename from keyboards/kbdfans/odinmini/info.json rename to keyboards/kbdfans/odinmini/keyboard.json diff --git a/keyboards/kbdfans/odinmini/rules.mk b/keyboards/kbdfans/odinmini/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/keyboard.json similarity index 100% rename from keyboards/kbdfans/tiger80/info.json rename to keyboards/kbdfans/tiger80/keyboard.json diff --git a/keyboards/kbdfans/tiger80/rules.mk b/keyboards/kbdfans/tiger80/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/keyboard.json similarity index 100% rename from keyboards/keebio/bamfk1/info.json rename to keyboards/keebio/bamfk1/keyboard.json diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keebio/bamfk1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/chocopad/rev1/info.json b/keyboards/keebio/chocopad/rev1/keyboard.json similarity index 100% rename from keyboards/keebio/chocopad/rev1/info.json rename to keyboards/keebio/chocopad/rev1/keyboard.json diff --git a/keyboards/keebio/chocopad/rev1/rules.mk b/keyboards/keebio/chocopad/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keebio/chocopad/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/chocopad/rev2/info.json b/keyboards/keebio/chocopad/rev2/keyboard.json similarity index 100% rename from keyboards/keebio/chocopad/rev2/info.json rename to keyboards/keebio/chocopad/rev2/keyboard.json diff --git a/keyboards/keebio/chocopad/rev2/rules.mk b/keyboards/keebio/chocopad/rev2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keebio/chocopad/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/convolution/rev1/info.json b/keyboards/keebio/convolution/rev1/keyboard.json similarity index 100% rename from keyboards/keebio/convolution/rev1/info.json rename to keyboards/keebio/convolution/rev1/keyboard.json diff --git a/keyboards/keebio/convolution/rev1/rules.mk b/keyboards/keebio/convolution/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/keebio/nyquistpad/info.json b/keyboards/keebio/nyquistpad/keyboard.json similarity index 100% rename from keyboards/keebio/nyquistpad/info.json rename to keyboards/keebio/nyquistpad/keyboard.json diff --git a/keyboards/keebio/nyquistpad/rules.mk b/keyboards/keebio/nyquistpad/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keebio/nyquistpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/keyboard.json similarity index 100% rename from keyboards/keebio/sinc/rev1/info.json rename to keyboards/keebio/sinc/rev1/keyboard.json diff --git a/keyboards/keebio/sinc/rev1/rules.mk b/keyboards/keebio/sinc/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keebio/sinc/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/keyboard.json similarity index 100% rename from keyboards/keebio/sinc/rev2/info.json rename to keyboards/keebio/sinc/rev2/keyboard.json diff --git a/keyboards/keebio/sinc/rev2/rules.mk b/keyboards/keebio/sinc/rev2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keebio/sinc/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebsforall/freebird75/info.json b/keyboards/keebsforall/freebird75/keyboard.json similarity index 100% rename from keyboards/keebsforall/freebird75/info.json rename to keyboards/keebsforall/freebird75/keyboard.json diff --git a/keyboards/keebsforall/freebird75/rules.mk b/keyboards/keebsforall/freebird75/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keebsforall/freebird75/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kelwin/utopia88/info.json b/keyboards/kelwin/utopia88/keyboard.json similarity index 100% rename from keyboards/kelwin/utopia88/info.json rename to keyboards/kelwin/utopia88/keyboard.json diff --git a/keyboards/kelwin/utopia88/rules.mk b/keyboards/kelwin/utopia88/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kelwin/utopia88/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kepler_33/proto/info.json b/keyboards/kepler_33/proto/keyboard.json similarity index 100% rename from keyboards/kepler_33/proto/info.json rename to keyboards/kepler_33/proto/keyboard.json diff --git a/keyboards/kepler_33/proto/rules.mk b/keyboards/kepler_33/proto/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/keyboard.json similarity index 100% rename from keyboards/keycapsss/kimiko/rev1/info.json rename to keyboards/keycapsss/kimiko/rev1/keyboard.json diff --git a/keyboards/keycapsss/kimiko/rev1/rules.mk b/keyboards/keycapsss/kimiko/rev1/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/keycapsss/kimiko/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/keycapsss/kimiko/rev2/info.json b/keyboards/keycapsss/kimiko/rev2/keyboard.json similarity index 100% rename from keyboards/keycapsss/kimiko/rev2/info.json rename to keyboards/keycapsss/kimiko/rev2/keyboard.json diff --git a/keyboards/keycapsss/kimiko/rev2/rules.mk b/keyboards/keycapsss/kimiko/rev2/rules.mk deleted file mode 100644 index 7d895c7f4df..00000000000 --- a/keyboards/keycapsss/kimiko/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File is left intentionally blank diff --git a/keyboards/keychron/c1_pro/ansi/rgb/info.json b/keyboards/keychron/c1_pro/ansi/rgb/keyboard.json similarity index 100% rename from keyboards/keychron/c1_pro/ansi/rgb/info.json rename to keyboards/keychron/c1_pro/ansi/rgb/keyboard.json diff --git a/keyboards/keychron/c1_pro/ansi/rgb/rules.mk b/keyboards/keychron/c1_pro/ansi/rgb/rules.mk deleted file mode 100644 index 7307f9f9e79..00000000000 --- a/keyboards/keychron/c1_pro/ansi/rgb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# Build Options diff --git a/keyboards/keychron/c1_pro/ansi/white/info.json b/keyboards/keychron/c1_pro/ansi/white/keyboard.json similarity index 100% rename from keyboards/keychron/c1_pro/ansi/white/info.json rename to keyboards/keychron/c1_pro/ansi/white/keyboard.json diff --git a/keyboards/keychron/c1_pro/ansi/white/rules.mk b/keyboards/keychron/c1_pro/ansi/white/rules.mk deleted file mode 100644 index 7307f9f9e79..00000000000 --- a/keyboards/keychron/c1_pro/ansi/white/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# Build Options diff --git a/keyboards/keychron/q0/base/info.json b/keyboards/keychron/q0/base/keyboard.json similarity index 100% rename from keyboards/keychron/q0/base/info.json rename to keyboards/keychron/q0/base/keyboard.json diff --git a/keyboards/keychron/q0/base/rules.mk b/keyboards/keychron/q0/base/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q0/base/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q0/plus/info.json b/keyboards/keychron/q0/plus/keyboard.json similarity index 100% rename from keyboards/keychron/q0/plus/info.json rename to keyboards/keychron/q0/plus/keyboard.json diff --git a/keyboards/keychron/q0/plus/rules.mk b/keyboards/keychron/q0/plus/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q0/plus/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q1v1/ansi/info.json b/keyboards/keychron/q1v1/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/q1v1/ansi/info.json rename to keyboards/keychron/q1v1/ansi/keyboard.json diff --git a/keyboards/keychron/q1v1/ansi/rules.mk b/keyboards/keychron/q1v1/ansi/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q1v1/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q1v1/ansi_encoder/info.json b/keyboards/keychron/q1v1/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q1v1/ansi_encoder/info.json rename to keyboards/keychron/q1v1/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q1v1/ansi_encoder/rules.mk b/keyboards/keychron/q1v1/ansi_encoder/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keychron/q1v1/ansi_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q1v1/iso/info.json b/keyboards/keychron/q1v1/iso/keyboard.json similarity index 100% rename from keyboards/keychron/q1v1/iso/info.json rename to keyboards/keychron/q1v1/iso/keyboard.json diff --git a/keyboards/keychron/q1v1/iso/rules.mk b/keyboards/keychron/q1v1/iso/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q1v1/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q1v1/iso_encoder/info.json b/keyboards/keychron/q1v1/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q1v1/iso_encoder/info.json rename to keyboards/keychron/q1v1/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q1v1/iso_encoder/rules.mk b/keyboards/keychron/q1v1/iso_encoder/rules.mk deleted file mode 100644 index 6968c523355..00000000000 --- a/keyboards/keychron/q1v1/iso_encoder/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# This file intentionally left blank - diff --git a/keyboards/keychron/q2/ansi/info.json b/keyboards/keychron/q2/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/q2/ansi/info.json rename to keyboards/keychron/q2/ansi/keyboard.json diff --git a/keyboards/keychron/q2/ansi/rules.mk b/keyboards/keychron/q2/ansi/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q2/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q2/ansi_encoder/info.json b/keyboards/keychron/q2/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q2/ansi_encoder/info.json rename to keyboards/keychron/q2/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q2/ansi_encoder/rules.mk b/keyboards/keychron/q2/ansi_encoder/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q2/ansi_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q2/iso/info.json b/keyboards/keychron/q2/iso/keyboard.json similarity index 100% rename from keyboards/keychron/q2/iso/info.json rename to keyboards/keychron/q2/iso/keyboard.json diff --git a/keyboards/keychron/q2/iso/rules.mk b/keyboards/keychron/q2/iso/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q2/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q2/iso_encoder/info.json b/keyboards/keychron/q2/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q2/iso_encoder/info.json rename to keyboards/keychron/q2/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q2/iso_encoder/rules.mk b/keyboards/keychron/q2/iso_encoder/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q2/iso_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q2/jis/info.json b/keyboards/keychron/q2/jis/keyboard.json similarity index 100% rename from keyboards/keychron/q2/jis/info.json rename to keyboards/keychron/q2/jis/keyboard.json diff --git a/keyboards/keychron/q2/jis/rules.mk b/keyboards/keychron/q2/jis/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keychron/q2/jis/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q2/jis_encoder/info.json b/keyboards/keychron/q2/jis_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q2/jis_encoder/info.json rename to keyboards/keychron/q2/jis_encoder/keyboard.json diff --git a/keyboards/keychron/q2/jis_encoder/rules.mk b/keyboards/keychron/q2/jis_encoder/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keychron/q2/jis_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q3/ansi/info.json b/keyboards/keychron/q3/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/q3/ansi/info.json rename to keyboards/keychron/q3/ansi/keyboard.json diff --git a/keyboards/keychron/q3/ansi/rules.mk b/keyboards/keychron/q3/ansi/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q3/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q3/iso/info.json b/keyboards/keychron/q3/iso/keyboard.json similarity index 100% rename from keyboards/keychron/q3/iso/info.json rename to keyboards/keychron/q3/iso/keyboard.json diff --git a/keyboards/keychron/q3/iso/rules.mk b/keyboards/keychron/q3/iso/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q3/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q3/jis/info.json b/keyboards/keychron/q3/jis/keyboard.json similarity index 100% rename from keyboards/keychron/q3/jis/info.json rename to keyboards/keychron/q3/jis/keyboard.json diff --git a/keyboards/keychron/q3/jis/rules.mk b/keyboards/keychron/q3/jis/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q3/jis/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q4/iso/info.json b/keyboards/keychron/q4/iso/keyboard.json similarity index 100% rename from keyboards/keychron/q4/iso/info.json rename to keyboards/keychron/q4/iso/keyboard.json diff --git a/keyboards/keychron/q4/iso/rules.mk b/keyboards/keychron/q4/iso/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q4/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q7/ansi/info.json b/keyboards/keychron/q7/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/q7/ansi/info.json rename to keyboards/keychron/q7/ansi/keyboard.json diff --git a/keyboards/keychron/q7/ansi/rules.mk b/keyboards/keychron/q7/ansi/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keychron/q7/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q7/iso/info.json b/keyboards/keychron/q7/iso/keyboard.json similarity index 100% rename from keyboards/keychron/q7/iso/info.json rename to keyboards/keychron/q7/iso/keyboard.json diff --git a/keyboards/keychron/q7/iso/rules.mk b/keyboards/keychron/q7/iso/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keychron/q7/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/q8/ansi/info.json rename to keyboards/keychron/q8/ansi/keyboard.json diff --git a/keyboards/keychron/q8/ansi/rules.mk b/keyboards/keychron/q8/ansi/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q8/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q8/ansi_encoder/info.json rename to keyboards/keychron/q8/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q8/ansi_encoder/rules.mk b/keyboards/keychron/q8/ansi_encoder/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keychron/q8/ansi_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/keyboard.json similarity index 100% rename from keyboards/keychron/q8/iso/info.json rename to keyboards/keychron/q8/iso/keyboard.json diff --git a/keyboards/keychron/q8/iso/rules.mk b/keyboards/keychron/q8/iso/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q8/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q8/iso_encoder/info.json rename to keyboards/keychron/q8/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q8/iso_encoder/rules.mk b/keyboards/keychron/q8/iso_encoder/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keychron/q8/iso_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q9/ansi/info.json b/keyboards/keychron/q9/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/q9/ansi/info.json rename to keyboards/keychron/q9/ansi/keyboard.json diff --git a/keyboards/keychron/q9/ansi/rules.mk b/keyboards/keychron/q9/ansi/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keychron/q9/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q9/ansi_encoder/info.json b/keyboards/keychron/q9/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q9/ansi_encoder/info.json rename to keyboards/keychron/q9/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q9/ansi_encoder/rules.mk b/keyboards/keychron/q9/ansi_encoder/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keychron/q9/ansi_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q9/iso/info.json b/keyboards/keychron/q9/iso/keyboard.json similarity index 100% rename from keyboards/keychron/q9/iso/info.json rename to keyboards/keychron/q9/iso/keyboard.json diff --git a/keyboards/keychron/q9/iso/rules.mk b/keyboards/keychron/q9/iso/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keychron/q9/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q9/iso_encoder/info.json b/keyboards/keychron/q9/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q9/iso_encoder/info.json rename to keyboards/keychron/q9/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q9/iso_encoder/rules.mk b/keyboards/keychron/q9/iso_encoder/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q9/iso_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q9_plus/ansi_encoder/info.json b/keyboards/keychron/q9_plus/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q9_plus/ansi_encoder/info.json rename to keyboards/keychron/q9_plus/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q9_plus/ansi_encoder/rules.mk b/keyboards/keychron/q9_plus/ansi_encoder/rules.mk deleted file mode 100755 index e69de29bb2d..00000000000 diff --git a/keyboards/keyspensory/kp60/info.json b/keyboards/keyspensory/kp60/keyboard.json similarity index 100% rename from keyboards/keyspensory/kp60/info.json rename to keyboards/keyspensory/kp60/keyboard.json diff --git a/keyboards/keyspensory/kp60/rules.mk b/keyboards/keyspensory/kp60/rules.mk deleted file mode 100644 index 2c49b41d7a0..00000000000 --- a/keyboards/keyspensory/kp60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally left blank \ No newline at end of file diff --git a/keyboards/keyten/diablo/info.json b/keyboards/keyten/diablo/keyboard.json similarity index 100% rename from keyboards/keyten/diablo/info.json rename to keyboards/keyten/diablo/keyboard.json diff --git a/keyboards/keyten/diablo/rules.mk b/keyboards/keyten/diablo/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/keyten/kt60hs_t/info.json b/keyboards/keyten/kt60hs_t/keyboard.json similarity index 100% rename from keyboards/keyten/kt60hs_t/info.json rename to keyboards/keyten/kt60hs_t/keyboard.json diff --git a/keyboards/keyten/kt60hs_t/rules.mk b/keyboards/keyten/kt60hs_t/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kezewa/enter67/info.json b/keyboards/kezewa/enter67/keyboard.json similarity index 100% rename from keyboards/kezewa/enter67/info.json rename to keyboards/kezewa/enter67/keyboard.json diff --git a/keyboards/kezewa/enter67/rules.mk b/keyboards/kezewa/enter67/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/kezewa/enter67/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/kezewa/enter80/info.json b/keyboards/kezewa/enter80/keyboard.json similarity index 100% rename from keyboards/kezewa/enter80/info.json rename to keyboards/kezewa/enter80/keyboard.json diff --git a/keyboards/kezewa/enter80/rules.mk b/keyboards/kezewa/enter80/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/kezewa/enter80/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/kibou/fukuro/info.json b/keyboards/kibou/fukuro/keyboard.json similarity index 100% rename from keyboards/kibou/fukuro/info.json rename to keyboards/kibou/fukuro/keyboard.json diff --git a/keyboards/kibou/fukuro/rules.mk b/keyboards/kibou/fukuro/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/kibou/fukuro/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/kibou/harbour/info.json b/keyboards/kibou/harbour/keyboard.json similarity index 100% rename from keyboards/kibou/harbour/info.json rename to keyboards/kibou/harbour/keyboard.json diff --git a/keyboards/kibou/harbour/rules.mk b/keyboards/kibou/harbour/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kibou/harbour/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kibou/suisei/info.json b/keyboards/kibou/suisei/keyboard.json similarity index 100% rename from keyboards/kibou/suisei/info.json rename to keyboards/kibou/suisei/keyboard.json diff --git a/keyboards/kibou/suisei/rules.mk b/keyboards/kibou/suisei/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kibou/suisei/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kibou/wendy/info.json b/keyboards/kibou/wendy/keyboard.json similarity index 100% rename from keyboards/kibou/wendy/info.json rename to keyboards/kibou/wendy/keyboard.json diff --git a/keyboards/kibou/wendy/rules.mk b/keyboards/kibou/wendy/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kibou/wendy/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kibou/winter/info.json b/keyboards/kibou/winter/keyboard.json similarity index 100% rename from keyboards/kibou/winter/info.json rename to keyboards/kibou/winter/keyboard.json diff --git a/keyboards/kibou/winter/rules.mk b/keyboards/kibou/winter/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/kibou/winter/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/kin80/blackpill103/info.json b/keyboards/kin80/blackpill103/keyboard.json similarity index 100% rename from keyboards/kin80/blackpill103/info.json rename to keyboards/kin80/blackpill103/keyboard.json diff --git a/keyboards/kin80/blackpill103/rules.mk b/keyboards/kin80/blackpill103/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/kin80/blackpill103/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/kin80/micro/info.json b/keyboards/kin80/micro/keyboard.json similarity index 100% rename from keyboards/kin80/micro/info.json rename to keyboards/kin80/micro/keyboard.json diff --git a/keyboards/kin80/micro/rules.mk b/keyboards/kin80/micro/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/keyboard.json similarity index 100% rename from keyboards/kinesis/kint2pp/info.json rename to keyboards/kinesis/kint2pp/keyboard.json diff --git a/keyboards/kinesis/kint2pp/rules.mk b/keyboards/kinesis/kint2pp/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/keyboard.json similarity index 100% rename from keyboards/kinesis/kint36/info.json rename to keyboards/kinesis/kint36/keyboard.json diff --git a/keyboards/kinesis/kint36/rules.mk b/keyboards/kinesis/kint36/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kinesis/kintwin/info.json b/keyboards/kinesis/kintwin/keyboard.json similarity index 100% rename from keyboards/kinesis/kintwin/info.json rename to keyboards/kinesis/kintwin/keyboard.json diff --git a/keyboards/kinesis/kintwin/rules.mk b/keyboards/kinesis/kintwin/rules.mk deleted file mode 100644 index 3922c569c4e..00000000000 --- a/keyboards/kinesis/kintwin/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionally blank \ No newline at end of file diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/keyboard.json similarity index 100% rename from keyboards/kinesis/stapelberg/info.json rename to keyboards/kinesis/stapelberg/keyboard.json diff --git a/keyboards/kinesis/stapelberg/rules.mk b/keyboards/kinesis/stapelberg/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kisakeyluxury/qtz/info.json b/keyboards/kisakeyluxury/qtz/keyboard.json similarity index 100% rename from keyboards/kisakeyluxury/qtz/info.json rename to keyboards/kisakeyluxury/qtz/keyboard.json diff --git a/keyboards/kisakeyluxury/qtz/rules.mk b/keyboards/kisakeyluxury/qtz/rules.mk deleted file mode 100644 index 0d24fc28579..00000000000 --- a/keyboards/kisakeyluxury/qtz/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# intentionally left blank \ No newline at end of file diff --git a/keyboards/kiserdesigns/madeline/info.json b/keyboards/kiserdesigns/madeline/keyboard.json similarity index 100% rename from keyboards/kiserdesigns/madeline/info.json rename to keyboards/kiserdesigns/madeline/keyboard.json diff --git a/keyboards/kiserdesigns/madeline/rules.mk b/keyboards/kiserdesigns/madeline/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kiserdesigns/madeline/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kj_modify/rs40/info.json b/keyboards/kj_modify/rs40/keyboard.json similarity index 100% rename from keyboards/kj_modify/rs40/info.json rename to keyboards/kj_modify/rs40/keyboard.json diff --git a/keyboards/kj_modify/rs40/rules.mk b/keyboards/kj_modify/rs40/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kj_modify/rs40/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kk/65/info.json b/keyboards/kk/65/keyboard.json similarity index 100% rename from keyboards/kk/65/info.json rename to keyboards/kk/65/keyboard.json diff --git a/keyboards/kk/65/rules.mk b/keyboards/kk/65/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kk/65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kopibeng/mnk60/info.json b/keyboards/kopibeng/mnk60/keyboard.json similarity index 100% rename from keyboards/kopibeng/mnk60/info.json rename to keyboards/kopibeng/mnk60/keyboard.json diff --git a/keyboards/kopibeng/mnk60/rules.mk b/keyboards/kopibeng/mnk60/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/kopibeng/mnk60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/kopibeng/mnk60_stm32/info.json b/keyboards/kopibeng/mnk60_stm32/keyboard.json similarity index 100% rename from keyboards/kopibeng/mnk60_stm32/info.json rename to keyboards/kopibeng/mnk60_stm32/keyboard.json diff --git a/keyboards/kopibeng/mnk60_stm32/rules.mk b/keyboards/kopibeng/mnk60_stm32/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kopibeng/mnk60_stm32/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kopibeng/tgr_lena/info.json b/keyboards/kopibeng/tgr_lena/keyboard.json similarity index 100% rename from keyboards/kopibeng/tgr_lena/info.json rename to keyboards/kopibeng/tgr_lena/keyboard.json diff --git a/keyboards/kopibeng/tgr_lena/rules.mk b/keyboards/kopibeng/tgr_lena/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kopibeng/tgr_lena/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kprepublic/bm16a/v1/info.json b/keyboards/kprepublic/bm16a/v1/keyboard.json similarity index 100% rename from keyboards/kprepublic/bm16a/v1/info.json rename to keyboards/kprepublic/bm16a/v1/keyboard.json diff --git a/keyboards/kprepublic/bm16a/v1/rules.mk b/keyboards/kprepublic/bm16a/v1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kprepublic/bm16a/v1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kprepublic/bm16a/v2/info.json b/keyboards/kprepublic/bm16a/v2/keyboard.json similarity index 100% rename from keyboards/kprepublic/bm16a/v2/info.json rename to keyboards/kprepublic/bm16a/v2/keyboard.json diff --git a/keyboards/kprepublic/bm16a/v2/rules.mk b/keyboards/kprepublic/bm16a/v2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/info.json b/keyboards/kprepublic/bm40hsrgb/rev2/keyboard.json similarity index 100% rename from keyboards/kprepublic/bm40hsrgb/rev2/info.json rename to keyboards/kprepublic/bm40hsrgb/rev2/keyboard.json diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm40hsrgb/rev2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kprepublic/cstc40/daughterboard/info.json b/keyboards/kprepublic/cstc40/daughterboard/keyboard.json similarity index 100% rename from keyboards/kprepublic/cstc40/daughterboard/info.json rename to keyboards/kprepublic/cstc40/daughterboard/keyboard.json diff --git a/keyboards/kprepublic/cstc40/daughterboard/rules.mk b/keyboards/kprepublic/cstc40/daughterboard/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/kprepublic/cstc40/daughterboard/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/kprepublic/cstc40/single_pcb/info.json b/keyboards/kprepublic/cstc40/single_pcb/keyboard.json similarity index 100% rename from keyboards/kprepublic/cstc40/single_pcb/info.json rename to keyboards/kprepublic/cstc40/single_pcb/keyboard.json diff --git a/keyboards/kprepublic/cstc40/single_pcb/rules.mk b/keyboards/kprepublic/cstc40/single_pcb/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/kprepublic/cstc40/single_pcb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/kradoindustries/kousa/info.json b/keyboards/kradoindustries/kousa/keyboard.json similarity index 100% rename from keyboards/kradoindustries/kousa/info.json rename to keyboards/kradoindustries/kousa/keyboard.json diff --git a/keyboards/kradoindustries/kousa/rules.mk b/keyboards/kradoindustries/kousa/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kradoindustries/kousa/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kradoindustries/krado66/info.json b/keyboards/kradoindustries/krado66/keyboard.json similarity index 100% rename from keyboards/kradoindustries/krado66/info.json rename to keyboards/kradoindustries/krado66/keyboard.json diff --git a/keyboards/kradoindustries/krado66/rules.mk b/keyboards/kradoindustries/krado66/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/kradoindustries/krado66/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/kradoindustries/promenade/info.json b/keyboards/kradoindustries/promenade/keyboard.json similarity index 100% rename from keyboards/kradoindustries/promenade/info.json rename to keyboards/kradoindustries/promenade/keyboard.json diff --git a/keyboards/kradoindustries/promenade/rules.mk b/keyboards/kradoindustries/promenade/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kradoindustries/promenade/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kraken_jones/pteron56/info.json b/keyboards/kraken_jones/pteron56/keyboard.json similarity index 100% rename from keyboards/kraken_jones/pteron56/info.json rename to keyboards/kraken_jones/pteron56/keyboard.json diff --git a/keyboards/kraken_jones/pteron56/rules.mk b/keyboards/kraken_jones/pteron56/rules.mk deleted file mode 100644 index 876618b9d13..00000000000 --- a/keyboards/kraken_jones/pteron56/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File is intentionally blank diff --git a/keyboards/kumaokobo/kudox/columner/info.json b/keyboards/kumaokobo/kudox/columner/keyboard.json similarity index 100% rename from keyboards/kumaokobo/kudox/columner/info.json rename to keyboards/kumaokobo/kudox/columner/keyboard.json diff --git a/keyboards/kumaokobo/kudox/columner/rules.mk b/keyboards/kumaokobo/kudox/columner/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kumaokobo/kudox/rev1/info.json b/keyboards/kumaokobo/kudox/rev1/keyboard.json similarity index 100% rename from keyboards/kumaokobo/kudox/rev1/info.json rename to keyboards/kumaokobo/kudox/rev1/keyboard.json diff --git a/keyboards/kumaokobo/kudox/rev1/rules.mk b/keyboards/kumaokobo/kudox/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kumaokobo/kudox/rev2/info.json b/keyboards/kumaokobo/kudox/rev2/keyboard.json similarity index 100% rename from keyboards/kumaokobo/kudox/rev2/info.json rename to keyboards/kumaokobo/kudox/rev2/keyboard.json diff --git a/keyboards/kumaokobo/kudox/rev2/rules.mk b/keyboards/kumaokobo/kudox/rev2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kumaokobo/kudox/rev3/info.json b/keyboards/kumaokobo/kudox/rev3/keyboard.json similarity index 100% rename from keyboards/kumaokobo/kudox/rev3/info.json rename to keyboards/kumaokobo/kudox/rev3/keyboard.json diff --git a/keyboards/kumaokobo/kudox/rev3/rules.mk b/keyboards/kumaokobo/kudox/rev3/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kumaokobo/kudox_game/rev1/info.json b/keyboards/kumaokobo/kudox_game/rev1/keyboard.json similarity index 100% rename from keyboards/kumaokobo/kudox_game/rev1/info.json rename to keyboards/kumaokobo/kudox_game/rev1/keyboard.json diff --git a/keyboards/kumaokobo/kudox_game/rev1/rules.mk b/keyboards/kumaokobo/kudox_game/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kumaokobo/pico/65keys/info.json b/keyboards/kumaokobo/pico/65keys/keyboard.json similarity index 100% rename from keyboards/kumaokobo/pico/65keys/info.json rename to keyboards/kumaokobo/pico/65keys/keyboard.json diff --git a/keyboards/kumaokobo/pico/65keys/rules.mk b/keyboards/kumaokobo/pico/65keys/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kumaokobo/pico/70keys/info.json b/keyboards/kumaokobo/pico/70keys/keyboard.json similarity index 100% rename from keyboards/kumaokobo/pico/70keys/info.json rename to keyboards/kumaokobo/pico/70keys/keyboard.json diff --git a/keyboards/kumaokobo/pico/70keys/rules.mk b/keyboards/kumaokobo/pico/70keys/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/keyboard.json similarity index 100% rename from keyboards/kuro/kuro65/info.json rename to keyboards/kuro/kuro65/keyboard.json diff --git a/keyboards/kuro/kuro65/rules.mk b/keyboards/kuro/kuro65/rules.mk deleted file mode 100644 index d6b023bddce..00000000000 --- a/keyboards/kuro/kuro65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is left blank intentionally. See info.json for config. \ No newline at end of file diff --git a/keyboards/kwstudio/pisces/info.json b/keyboards/kwstudio/pisces/keyboard.json similarity index 100% rename from keyboards/kwstudio/pisces/info.json rename to keyboards/kwstudio/pisces/keyboard.json diff --git a/keyboards/kwstudio/pisces/rules.mk b/keyboards/kwstudio/pisces/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kwstudio/pisces/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kwstudio/scorpio/info.json b/keyboards/kwstudio/scorpio/keyboard.json similarity index 100% rename from keyboards/kwstudio/scorpio/info.json rename to keyboards/kwstudio/scorpio/keyboard.json diff --git a/keyboards/kwstudio/scorpio/rules.mk b/keyboards/kwstudio/scorpio/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kwstudio/scorpio/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/kwstudio/scorpio_rev2/info.json b/keyboards/kwstudio/scorpio_rev2/keyboard.json similarity index 100% rename from keyboards/kwstudio/scorpio_rev2/info.json rename to keyboards/kwstudio/scorpio_rev2/keyboard.json diff --git a/keyboards/kwstudio/scorpio_rev2/rules.mk b/keyboards/kwstudio/scorpio_rev2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/kwstudio/scorpio_rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/laneware/raindrop/info.json b/keyboards/laneware/raindrop/keyboard.json similarity index 100% rename from keyboards/laneware/raindrop/info.json rename to keyboards/laneware/raindrop/keyboard.json diff --git a/keyboards/laneware/raindrop/rules.mk b/keyboards/laneware/raindrop/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/laser_ninja/pumpkinpad/info.json b/keyboards/laser_ninja/pumpkinpad/keyboard.json similarity index 100% rename from keyboards/laser_ninja/pumpkinpad/info.json rename to keyboards/laser_ninja/pumpkinpad/keyboard.json diff --git a/keyboards/laser_ninja/pumpkinpad/rules.mk b/keyboards/laser_ninja/pumpkinpad/rules.mk deleted file mode 100644 index 08a1c1568c9..00000000000 --- a/keyboards/laser_ninja/pumpkinpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally left blank. diff --git a/keyboards/lendunistus/rpneko65/rev1/info.json b/keyboards/lendunistus/rpneko65/rev1/keyboard.json similarity index 100% rename from keyboards/lendunistus/rpneko65/rev1/info.json rename to keyboards/lendunistus/rpneko65/rev1/keyboard.json diff --git a/keyboards/lendunistus/rpneko65/rev1/rules.mk b/keyboards/lendunistus/rpneko65/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/lendunistus/rpneko65/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/lets_split/rev1/info.json b/keyboards/lets_split/rev1/keyboard.json similarity index 100% rename from keyboards/lets_split/rev1/info.json rename to keyboards/lets_split/rev1/keyboard.json diff --git a/keyboards/lets_split/rev1/rules.mk b/keyboards/lets_split/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/lfkeyboards/lfk65_hs/info.json b/keyboards/lfkeyboards/lfk65_hs/keyboard.json similarity index 100% rename from keyboards/lfkeyboards/lfk65_hs/info.json rename to keyboards/lfkeyboards/lfk65_hs/keyboard.json diff --git a/keyboards/lfkeyboards/lfk65_hs/rules.mk b/keyboards/lfkeyboards/lfk65_hs/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/lfkeyboards/lfk78/revb/info.json b/keyboards/lfkeyboards/lfk78/revb/keyboard.json similarity index 100% rename from keyboards/lfkeyboards/lfk78/revb/info.json rename to keyboards/lfkeyboards/lfk78/revb/keyboard.json diff --git a/keyboards/lfkeyboards/lfk78/revb/rules.mk b/keyboards/lfkeyboards/lfk78/revb/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/lfkeyboards/lfk78/revc/info.json b/keyboards/lfkeyboards/lfk78/revc/keyboard.json similarity index 100% rename from keyboards/lfkeyboards/lfk78/revc/info.json rename to keyboards/lfkeyboards/lfk78/revc/keyboard.json diff --git a/keyboards/lfkeyboards/lfk78/revc/rules.mk b/keyboards/lfkeyboards/lfk78/revc/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/lfkeyboards/lfk87/reva/info.json b/keyboards/lfkeyboards/lfk87/reva/keyboard.json similarity index 100% rename from keyboards/lfkeyboards/lfk87/reva/info.json rename to keyboards/lfkeyboards/lfk87/reva/keyboard.json diff --git a/keyboards/lfkeyboards/lfk87/reva/rules.mk b/keyboards/lfkeyboards/lfk87/reva/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/lfkeyboards/lfk87/revc/info.json b/keyboards/lfkeyboards/lfk87/revc/keyboard.json similarity index 100% rename from keyboards/lfkeyboards/lfk87/revc/info.json rename to keyboards/lfkeyboards/lfk87/revc/keyboard.json diff --git a/keyboards/lfkeyboards/lfk87/revc/rules.mk b/keyboards/lfkeyboards/lfk87/revc/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/lfkeyboards/smk65/revb/info.json b/keyboards/lfkeyboards/smk65/revb/keyboard.json similarity index 100% rename from keyboards/lfkeyboards/smk65/revb/info.json rename to keyboards/lfkeyboards/smk65/revb/keyboard.json diff --git a/keyboards/lfkeyboards/smk65/revb/rules.mk b/keyboards/lfkeyboards/smk65/revb/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/lfkeyboards/smk65/revf/info.json b/keyboards/lfkeyboards/smk65/revf/keyboard.json similarity index 100% rename from keyboards/lfkeyboards/smk65/revf/info.json rename to keyboards/lfkeyboards/smk65/revf/keyboard.json diff --git a/keyboards/lfkeyboards/smk65/revf/rules.mk b/keyboards/lfkeyboards/smk65/revf/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/lgbtkl/info.json b/keyboards/lgbtkl/keyboard.json similarity index 100% rename from keyboards/lgbtkl/info.json rename to keyboards/lgbtkl/keyboard.json diff --git a/keyboards/lgbtkl/rules.mk b/keyboards/lgbtkl/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/lgbtkl/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/lily58/rev1/info.json b/keyboards/lily58/rev1/keyboard.json similarity index 100% rename from keyboards/lily58/rev1/info.json rename to keyboards/lily58/rev1/keyboard.json diff --git a/keyboards/lily58/rev1/rules.mk b/keyboards/lily58/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/linworks/em8/info.json b/keyboards/linworks/em8/keyboard.json similarity index 100% rename from keyboards/linworks/em8/info.json rename to keyboards/linworks/em8/keyboard.json diff --git a/keyboards/linworks/em8/rules.mk b/keyboards/linworks/em8/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/linworks/em8/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/keyboard.json similarity index 100% rename from keyboards/linworks/fave60/info.json rename to keyboards/linworks/fave60/keyboard.json diff --git a/keyboards/linworks/fave60/rules.mk b/keyboards/linworks/fave60/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/linworks/fave60a/info.json b/keyboards/linworks/fave60a/keyboard.json similarity index 100% rename from keyboards/linworks/fave60a/info.json rename to keyboards/linworks/fave60a/keyboard.json diff --git a/keyboards/linworks/fave60a/rules.mk b/keyboards/linworks/fave60a/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/linworks/favepada/info.json b/keyboards/linworks/favepada/keyboard.json similarity index 100% rename from keyboards/linworks/favepada/info.json rename to keyboards/linworks/favepada/keyboard.json diff --git a/keyboards/linworks/favepada/rules.mk b/keyboards/linworks/favepada/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/macrocat/info.json b/keyboards/macrocat/keyboard.json similarity index 100% rename from keyboards/macrocat/info.json rename to keyboards/macrocat/keyboard.json diff --git a/keyboards/macrocat/rules.mk b/keyboards/macrocat/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/macrocat/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/magic_force/mf17/info.json b/keyboards/magic_force/mf17/keyboard.json similarity index 100% rename from keyboards/magic_force/mf17/info.json rename to keyboards/magic_force/mf17/keyboard.json diff --git a/keyboards/magic_force/mf17/rules.mk b/keyboards/magic_force/mf17/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/magic_force/mf17/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/makenova/omega/omega4/info.json b/keyboards/makenova/omega/omega4/keyboard.json similarity index 100% rename from keyboards/makenova/omega/omega4/info.json rename to keyboards/makenova/omega/omega4/keyboard.json diff --git a/keyboards/makenova/omega/omega4/rules.mk b/keyboards/makenova/omega/omega4/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/makenova/omega/omega4/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/keyboard.json similarity index 100% rename from keyboards/maple_computing/ivy/rev1/info.json rename to keyboards/maple_computing/ivy/rev1/keyboard.json diff --git a/keyboards/maple_computing/ivy/rev1/rules.mk b/keyboards/maple_computing/ivy/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/keyboard.json similarity index 100% rename from keyboards/maple_computing/launchpad/rev1/info.json rename to keyboards/maple_computing/launchpad/rev1/keyboard.json diff --git a/keyboards/maple_computing/launchpad/rev1/rules.mk b/keyboards/maple_computing/launchpad/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mariorion_v25/prod/info.json b/keyboards/mariorion_v25/prod/keyboard.json similarity index 100% rename from keyboards/mariorion_v25/prod/info.json rename to keyboards/mariorion_v25/prod/keyboard.json diff --git a/keyboards/mariorion_v25/prod/rules.mk b/keyboards/mariorion_v25/prod/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mariorion_v25/prod/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mariorion_v25/proto/info.json b/keyboards/mariorion_v25/proto/keyboard.json similarity index 100% rename from keyboards/mariorion_v25/proto/info.json rename to keyboards/mariorion_v25/proto/keyboard.json diff --git a/keyboards/mariorion_v25/proto/rules.mk b/keyboards/mariorion_v25/proto/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mariorion_v25/proto/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/keyboard.json similarity index 100% rename from keyboards/marksard/rhymestone/rev1/info.json rename to keyboards/marksard/rhymestone/rev1/keyboard.json diff --git a/keyboards/marksard/rhymestone/rev1/rules.mk b/keyboards/marksard/rhymestone/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/keyboard.json similarity index 100% rename from keyboards/marksard/treadstone32/lite/info.json rename to keyboards/marksard/treadstone32/lite/keyboard.json diff --git a/keyboards/marksard/treadstone32/lite/rules.mk b/keyboards/marksard/treadstone32/lite/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/keyboard.json similarity index 100% rename from keyboards/marksard/treadstone32/rev1/info.json rename to keyboards/marksard/treadstone32/rev1/keyboard.json diff --git a/keyboards/marksard/treadstone32/rev1/rules.mk b/keyboards/marksard/treadstone32/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/marksard/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/keyboard.json similarity index 100% rename from keyboards/marksard/treadstone48/rev1/info.json rename to keyboards/marksard/treadstone48/rev1/keyboard.json diff --git a/keyboards/marksard/treadstone48/rev1/rules.mk b/keyboards/marksard/treadstone48/rev1/rules.mk deleted file mode 100644 index fff00a1b511..00000000000 --- a/keyboards/marksard/treadstone48/rev1/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# Revision Specific Build Options -# change yes to no to disable -# diff --git a/keyboards/marshkeys/flowerpad/info.json b/keyboards/marshkeys/flowerpad/keyboard.json similarity index 100% rename from keyboards/marshkeys/flowerpad/info.json rename to keyboards/marshkeys/flowerpad/keyboard.json diff --git a/keyboards/marshkeys/flowerpad/rules.mk b/keyboards/marshkeys/flowerpad/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/marshkeys/flowerpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/matchstickworks/southpad/rev1/info.json b/keyboards/matchstickworks/southpad/rev1/keyboard.json similarity index 100% rename from keyboards/matchstickworks/southpad/rev1/info.json rename to keyboards/matchstickworks/southpad/rev1/keyboard.json diff --git a/keyboards/matchstickworks/southpad/rev1/rules.mk b/keyboards/matchstickworks/southpad/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/matchstickworks/southpad/rev2/info.json b/keyboards/matchstickworks/southpad/rev2/keyboard.json similarity index 100% rename from keyboards/matchstickworks/southpad/rev2/info.json rename to keyboards/matchstickworks/southpad/rev2/keyboard.json diff --git a/keyboards/matchstickworks/southpad/rev2/rules.mk b/keyboards/matchstickworks/southpad/rev2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/maxipad/promicro/info.json b/keyboards/maxipad/promicro/keyboard.json similarity index 100% rename from keyboards/maxipad/promicro/info.json rename to keyboards/maxipad/promicro/keyboard.json diff --git a/keyboards/maxipad/promicro/rules.mk b/keyboards/maxipad/promicro/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/maxipad/teensy2/info.json b/keyboards/maxipad/teensy2/keyboard.json similarity index 100% rename from keyboards/maxipad/teensy2/info.json rename to keyboards/maxipad/teensy2/keyboard.json diff --git a/keyboards/maxipad/teensy2/rules.mk b/keyboards/maxipad/teensy2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/maxr1998/phoebe/info.json b/keyboards/maxr1998/phoebe/keyboard.json similarity index 100% rename from keyboards/maxr1998/phoebe/info.json rename to keyboards/maxr1998/phoebe/keyboard.json diff --git a/keyboards/maxr1998/phoebe/rules.mk b/keyboards/maxr1998/phoebe/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mazestudio/jocker/info.json b/keyboards/mazestudio/jocker/keyboard.json similarity index 100% rename from keyboards/mazestudio/jocker/info.json rename to keyboards/mazestudio/jocker/keyboard.json diff --git a/keyboards/mazestudio/jocker/rules.mk b/keyboards/mazestudio/jocker/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/mazestudio/jocker/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/mechllama/g35/v1/info.json b/keyboards/mechllama/g35/v1/keyboard.json similarity index 100% rename from keyboards/mechllama/g35/v1/info.json rename to keyboards/mechllama/g35/v1/keyboard.json diff --git a/keyboards/mechllama/g35/v1/rules.mk b/keyboards/mechllama/g35/v1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechllama/g35/v2/info.json b/keyboards/mechllama/g35/v2/keyboard.json similarity index 100% rename from keyboards/mechllama/g35/v2/info.json rename to keyboards/mechllama/g35/v2/keyboard.json diff --git a/keyboards/mechllama/g35/v2/rules.mk b/keyboards/mechllama/g35/v2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json similarity index 100% rename from keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json rename to keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json similarity index 100% rename from keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json rename to keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json similarity index 100% rename from keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json rename to keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechlovin/hannah65/rev1/haus/info.json b/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json similarity index 100% rename from keyboards/mechlovin/hannah65/rev1/haus/info.json rename to keyboards/mechlovin/hannah65/rev1/haus/keyboard.json diff --git a/keyboards/mechlovin/hannah65/rev1/haus/rules.mk b/keyboards/mechlovin/hannah65/rev1/haus/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json b/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json similarity index 100% rename from keyboards/mechlovin/infinity87/rev1/rogue87/info.json rename to keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/rules.mk b/keyboards/mechlovin/infinity87/rev1/rogue87/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/mechlovin/infinity87/rev1/rogue87/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json b/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json similarity index 100% rename from keyboards/mechlovin/infinity87/rev1/rouge87/info.json rename to keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/rules.mk b/keyboards/mechlovin/infinity87/rev1/rouge87/rules.mk deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/mechlovin/infinity87/rev1/rouge87/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/mechlovin/mechlovin9/rev3/info.json b/keyboards/mechlovin/mechlovin9/rev3/keyboard.json similarity index 100% rename from keyboards/mechlovin/mechlovin9/rev3/info.json rename to keyboards/mechlovin/mechlovin9/rev3/keyboard.json diff --git a/keyboards/mechlovin/mechlovin9/rev3/rules.mk b/keyboards/mechlovin/mechlovin9/rev3/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechlovin/olly/jf/rev2/info.json b/keyboards/mechlovin/olly/jf/rev2/keyboard.json similarity index 100% rename from keyboards/mechlovin/olly/jf/rev2/info.json rename to keyboards/mechlovin/olly/jf/rev2/keyboard.json diff --git a/keyboards/mechlovin/olly/jf/rev2/rules.mk b/keyboards/mechlovin/olly/jf/rev2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mechlovin/olly/jf/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/keyboard.json similarity index 100% rename from keyboards/mechlovin/olly/octagon/info.json rename to keyboards/mechlovin/olly/octagon/keyboard.json diff --git a/keyboards/mechlovin/olly/octagon/rules.mk b/keyboards/mechlovin/olly/octagon/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mechlovin/olly/octagon/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mechlovin/zed1800/oreum/info.json b/keyboards/mechlovin/zed1800/oreum/keyboard.json similarity index 100% rename from keyboards/mechlovin/zed1800/oreum/info.json rename to keyboards/mechlovin/zed1800/oreum/keyboard.json diff --git a/keyboards/mechlovin/zed1800/oreum/rules.mk b/keyboards/mechlovin/zed1800/oreum/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechlovin/zed1800/saber/info.json b/keyboards/mechlovin/zed1800/saber/keyboard.json similarity index 100% rename from keyboards/mechlovin/zed1800/saber/info.json rename to keyboards/mechlovin/zed1800/saber/keyboard.json diff --git a/keyboards/mechlovin/zed1800/saber/rules.mk b/keyboards/mechlovin/zed1800/saber/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechlovin/zed1800/zepsody/info.json b/keyboards/mechlovin/zed1800/zepsody/keyboard.json similarity index 100% rename from keyboards/mechlovin/zed1800/zepsody/info.json rename to keyboards/mechlovin/zed1800/zepsody/keyboard.json diff --git a/keyboards/mechlovin/zed1800/zepsody/rules.mk b/keyboards/mechlovin/zed1800/zepsody/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechlovin/zed65/910/info.json b/keyboards/mechlovin/zed65/910/keyboard.json similarity index 100% rename from keyboards/mechlovin/zed65/910/info.json rename to keyboards/mechlovin/zed65/910/keyboard.json diff --git a/keyboards/mechlovin/zed65/910/rules.mk b/keyboards/mechlovin/zed65/910/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/mechlovin/zed65/910/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json b/keyboards/mechlovin/zed65/no_backlight/cor65/keyboard.json similarity index 100% rename from keyboards/mechlovin/zed65/no_backlight/cor65/info.json rename to keyboards/mechlovin/zed65/no_backlight/cor65/keyboard.json diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/rules.mk b/keyboards/mechlovin/zed65/no_backlight/cor65/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechlovin/zed65/rev1/info.json b/keyboards/mechlovin/zed65/rev1/keyboard.json similarity index 100% rename from keyboards/mechlovin/zed65/rev1/info.json rename to keyboards/mechlovin/zed65/rev1/keyboard.json diff --git a/keyboards/mechlovin/zed65/rev1/rules.mk b/keyboards/mechlovin/zed65/rev1/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/mechlovin/zed65/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/mechwild/bb40/f401/info.json b/keyboards/mechwild/bb40/f401/keyboard.json similarity index 100% rename from keyboards/mechwild/bb40/f401/info.json rename to keyboards/mechwild/bb40/f401/keyboard.json diff --git a/keyboards/mechwild/bb40/f401/rules.mk b/keyboards/mechwild/bb40/f401/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mechwild/bb40/f401/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mechwild/bb40/f411/info.json b/keyboards/mechwild/bb40/f411/keyboard.json similarity index 100% rename from keyboards/mechwild/bb40/f411/info.json rename to keyboards/mechwild/bb40/f411/keyboard.json diff --git a/keyboards/mechwild/bb40/f411/rules.mk b/keyboards/mechwild/bb40/f411/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mechwild/bb40/f411/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mechwild/bde/lefty/info.json b/keyboards/mechwild/bde/lefty/keyboard.json similarity index 100% rename from keyboards/mechwild/bde/lefty/info.json rename to keyboards/mechwild/bde/lefty/keyboard.json diff --git a/keyboards/mechwild/bde/lefty/rules.mk b/keyboards/mechwild/bde/lefty/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mechwild/bde/lefty/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mechwild/bde/righty/info.json b/keyboards/mechwild/bde/righty/keyboard.json similarity index 100% rename from keyboards/mechwild/bde/righty/info.json rename to keyboards/mechwild/bde/righty/keyboard.json diff --git a/keyboards/mechwild/bde/righty/rules.mk b/keyboards/mechwild/bde/righty/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mechwild/bde/righty/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mechwild/obe/f401/info.json b/keyboards/mechwild/obe/f401/keyboard.json similarity index 100% rename from keyboards/mechwild/obe/f401/info.json rename to keyboards/mechwild/obe/f401/keyboard.json diff --git a/keyboards/mechwild/obe/f401/rules.mk b/keyboards/mechwild/obe/f401/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechwild/obe/f411/info.json b/keyboards/mechwild/obe/f411/keyboard.json similarity index 100% rename from keyboards/mechwild/obe/f411/info.json rename to keyboards/mechwild/obe/f411/keyboard.json diff --git a/keyboards/mechwild/obe/f411/rules.mk b/keyboards/mechwild/obe/f411/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechwild/waka60/f401/info.json b/keyboards/mechwild/waka60/f401/keyboard.json similarity index 100% rename from keyboards/mechwild/waka60/f401/info.json rename to keyboards/mechwild/waka60/f401/keyboard.json diff --git a/keyboards/mechwild/waka60/f401/rules.mk b/keyboards/mechwild/waka60/f401/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechwild/waka60/f411/info.json b/keyboards/mechwild/waka60/f411/keyboard.json similarity index 100% rename from keyboards/mechwild/waka60/f411/info.json rename to keyboards/mechwild/waka60/f411/keyboard.json diff --git a/keyboards/mechwild/waka60/f411/rules.mk b/keyboards/mechwild/waka60/f411/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/meetlab/kafka60/info.json b/keyboards/meetlab/kafka60/keyboard.json similarity index 100% rename from keyboards/meetlab/kafka60/info.json rename to keyboards/meetlab/kafka60/keyboard.json diff --git a/keyboards/meetlab/kafka60/rules.mk b/keyboards/meetlab/kafka60/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/meetlab/kafka60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/meetlab/kafka68/info.json b/keyboards/meetlab/kafka68/keyboard.json similarity index 100% rename from keyboards/meetlab/kafka68/info.json rename to keyboards/meetlab/kafka68/keyboard.json diff --git a/keyboards/meetlab/kafka68/rules.mk b/keyboards/meetlab/kafka68/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/meetlab/kafka68/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/meetlab/kalice/info.json b/keyboards/meetlab/kalice/keyboard.json similarity index 100% rename from keyboards/meetlab/kalice/info.json rename to keyboards/meetlab/kalice/keyboard.json diff --git a/keyboards/meetlab/kalice/rules.mk b/keyboards/meetlab/kalice/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/meetlab/kalice/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/meetlab/rena/info.json b/keyboards/meetlab/rena/keyboard.json similarity index 100% rename from keyboards/meetlab/rena/info.json rename to keyboards/meetlab/rena/keyboard.json diff --git a/keyboards/meetlab/rena/rules.mk b/keyboards/meetlab/rena/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/meetlab/rena/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/meletrix/zoom75/info.json b/keyboards/meletrix/zoom75/keyboard.json similarity index 100% rename from keyboards/meletrix/zoom75/info.json rename to keyboards/meletrix/zoom75/keyboard.json diff --git a/keyboards/meletrix/zoom75/rules.mk b/keyboards/meletrix/zoom75/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/meletrix/zoom75/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/meletrix/zoom98/info.json b/keyboards/meletrix/zoom98/keyboard.json similarity index 100% rename from keyboards/meletrix/zoom98/info.json rename to keyboards/meletrix/zoom98/keyboard.json diff --git a/keyboards/meletrix/zoom98/rules.mk b/keyboards/meletrix/zoom98/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/meletrix/zoom98/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/millet/doksin/info.json b/keyboards/millet/doksin/keyboard.json similarity index 100% rename from keyboards/millet/doksin/info.json rename to keyboards/millet/doksin/keyboard.json diff --git a/keyboards/millet/doksin/rules.mk b/keyboards/millet/doksin/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mincedshon/ecila/info.json b/keyboards/mincedshon/ecila/keyboard.json similarity index 100% rename from keyboards/mincedshon/ecila/info.json rename to keyboards/mincedshon/ecila/keyboard.json diff --git a/keyboards/mincedshon/ecila/rules.mk b/keyboards/mincedshon/ecila/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mincedshon/ecila/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mk65/info.json b/keyboards/mk65/keyboard.json similarity index 100% rename from keyboards/mk65/info.json rename to keyboards/mk65/keyboard.json diff --git a/keyboards/mk65/rules.mk b/keyboards/mk65/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/mk65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/keyboard.json similarity index 100% rename from keyboards/mlego/m65/rev1/info.json rename to keyboards/mlego/m65/rev1/keyboard.json diff --git a/keyboards/mlego/m65/rev1/rules.mk b/keyboards/mlego/m65/rev1/rules.mk deleted file mode 100644 index 48c755b14e9..00000000000 --- a/keyboards/mlego/m65/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -#intentionally blanck diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/keyboard.json similarity index 100% rename from keyboards/mlego/m65/rev2/info.json rename to keyboards/mlego/m65/rev2/keyboard.json diff --git a/keyboards/mlego/m65/rev2/rules.mk b/keyboards/mlego/m65/rev2/rules.mk deleted file mode 100644 index 9a795b953e4..00000000000 --- a/keyboards/mlego/m65/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -#blank purpose diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/keyboard.json similarity index 100% rename from keyboards/mlego/m65/rev3/info.json rename to keyboards/mlego/m65/rev3/keyboard.json diff --git a/keyboards/mlego/m65/rev3/rules.mk b/keyboards/mlego/m65/rev3/rules.mk deleted file mode 100644 index 8b4c9539892..00000000000 --- a/keyboards/mlego/m65/rev3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -#blank on purpose diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/keyboard.json similarity index 100% rename from keyboards/mlego/m65/rev4/info.json rename to keyboards/mlego/m65/rev4/keyboard.json diff --git a/keyboards/mlego/m65/rev4/rules.mk b/keyboards/mlego/m65/rev4/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mntre_v3/info.json b/keyboards/mntre_v3/keyboard.json similarity index 100% rename from keyboards/mntre_v3/info.json rename to keyboards/mntre_v3/keyboard.json diff --git a/keyboards/mntre_v3/rules.mk b/keyboards/mntre_v3/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mntre_v3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mode/m256wh/info.json b/keyboards/mode/m256wh/keyboard.json similarity index 100% rename from keyboards/mode/m256wh/info.json rename to keyboards/mode/m256wh/keyboard.json diff --git a/keyboards/mode/m256wh/rules.mk b/keyboards/mode/m256wh/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mode/m256ws/info.json b/keyboards/mode/m256ws/keyboard.json similarity index 100% rename from keyboards/mode/m256ws/info.json rename to keyboards/mode/m256ws/keyboard.json diff --git a/keyboards/mode/m256ws/rules.mk b/keyboards/mode/m256ws/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mode/m60h/info.json b/keyboards/mode/m60h/keyboard.json similarity index 100% rename from keyboards/mode/m60h/info.json rename to keyboards/mode/m60h/keyboard.json diff --git a/keyboards/mode/m60h/rules.mk b/keyboards/mode/m60h/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mode/m60h/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mode/m60h_f/info.json b/keyboards/mode/m60h_f/keyboard.json similarity index 100% rename from keyboards/mode/m60h_f/info.json rename to keyboards/mode/m60h_f/keyboard.json diff --git a/keyboards/mode/m60h_f/rules.mk b/keyboards/mode/m60h_f/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mode/m60h_f/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mode/m60s/info.json b/keyboards/mode/m60s/keyboard.json similarity index 100% rename from keyboards/mode/m60s/info.json rename to keyboards/mode/m60s/keyboard.json diff --git a/keyboards/mode/m60s/rules.mk b/keyboards/mode/m60s/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mode/m60s/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mokey/luckycat70/info.json b/keyboards/mokey/luckycat70/keyboard.json similarity index 100% rename from keyboards/mokey/luckycat70/info.json rename to keyboards/mokey/luckycat70/keyboard.json diff --git a/keyboards/mokey/luckycat70/rules.mk b/keyboards/mokey/luckycat70/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mokey/luckycat70/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mokey/mokey12x2/info.json b/keyboards/mokey/mokey12x2/keyboard.json similarity index 100% rename from keyboards/mokey/mokey12x2/info.json rename to keyboards/mokey/mokey12x2/keyboard.json diff --git a/keyboards/mokey/mokey12x2/rules.mk b/keyboards/mokey/mokey12x2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mokey/mokey12x2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/moky/moky88/info.json b/keyboards/moky/moky88/keyboard.json similarity index 100% rename from keyboards/moky/moky88/info.json rename to keyboards/moky/moky88/keyboard.json diff --git a/keyboards/moky/moky88/rules.mk b/keyboards/moky/moky88/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/moky/moky88/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/momokai/aurora/info.json b/keyboards/momokai/aurora/keyboard.json similarity index 100% rename from keyboards/momokai/aurora/info.json rename to keyboards/momokai/aurora/keyboard.json diff --git a/keyboards/momokai/aurora/rules.mk b/keyboards/momokai/aurora/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/momokai/aurora/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/monsgeek/m1/info.json b/keyboards/monsgeek/m1/keyboard.json similarity index 100% rename from keyboards/monsgeek/m1/info.json rename to keyboards/monsgeek/m1/keyboard.json diff --git a/keyboards/monsgeek/m1/rules.mk b/keyboards/monsgeek/m1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/monsgeek/m1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/monsgeek/m3/info.json b/keyboards/monsgeek/m3/keyboard.json similarity index 100% rename from keyboards/monsgeek/m3/info.json rename to keyboards/monsgeek/m3/keyboard.json diff --git a/keyboards/monsgeek/m3/rules.mk b/keyboards/monsgeek/m3/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/monsgeek/m3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/monsgeek/m5/info.json b/keyboards/monsgeek/m5/keyboard.json similarity index 100% rename from keyboards/monsgeek/m5/info.json rename to keyboards/monsgeek/m5/keyboard.json diff --git a/keyboards/monsgeek/m5/rules.mk b/keyboards/monsgeek/m5/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/monsgeek/m5/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/monsgeek/m6/info.json b/keyboards/monsgeek/m6/keyboard.json similarity index 100% rename from keyboards/monsgeek/m6/info.json rename to keyboards/monsgeek/m6/keyboard.json diff --git a/keyboards/monsgeek/m6/rules.mk b/keyboards/monsgeek/m6/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/monsgeek/m6/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/montsinger/palmetto/info.json b/keyboards/montsinger/palmetto/keyboard.json similarity index 100% rename from keyboards/montsinger/palmetto/info.json rename to keyboards/montsinger/palmetto/keyboard.json diff --git a/keyboards/montsinger/palmetto/rules.mk b/keyboards/montsinger/palmetto/rules.mk deleted file mode 100755 index 8b137891791..00000000000 --- a/keyboards/montsinger/palmetto/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/moondrop/dash75/r1/info.json b/keyboards/moondrop/dash75/r1/keyboard.json similarity index 100% rename from keyboards/moondrop/dash75/r1/info.json rename to keyboards/moondrop/dash75/r1/keyboard.json diff --git a/keyboards/moondrop/dash75/r1/rules.mk b/keyboards/moondrop/dash75/r1/rules.mk deleted file mode 100644 index 6441046fb6a..00000000000 --- a/keyboards/moondrop/dash75/r1/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# This file intentionally left blank -# ** Settings are Data Driven and reside in `info.json` ** diff --git a/keyboards/mothwing/info.json b/keyboards/mothwing/keyboard.json similarity index 100% rename from keyboards/mothwing/info.json rename to keyboards/mothwing/keyboard.json diff --git a/keyboards/mothwing/rules.mk b/keyboards/mothwing/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ms_sculpt/info.json b/keyboards/ms_sculpt/keyboard.json similarity index 100% rename from keyboards/ms_sculpt/info.json rename to keyboards/ms_sculpt/keyboard.json diff --git a/keyboards/ms_sculpt/rules.mk b/keyboards/ms_sculpt/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ms_sculpt/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/keyboard.json similarity index 100% rename from keyboards/mwstudio/mmk_3/info.json rename to keyboards/mwstudio/mmk_3/keyboard.json diff --git a/keyboards/mwstudio/mmk_3/rules.mk b/keyboards/mwstudio/mmk_3/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/mwstudio/mmk_3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/mwstudio/mw660/info.json b/keyboards/mwstudio/mw660/keyboard.json similarity index 100% rename from keyboards/mwstudio/mw660/info.json rename to keyboards/mwstudio/mw660/keyboard.json diff --git a/keyboards/mwstudio/mw660/rules.mk b/keyboards/mwstudio/mw660/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mwstudio/mw660/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mwstudio/mw80/info.json b/keyboards/mwstudio/mw80/keyboard.json similarity index 100% rename from keyboards/mwstudio/mw80/info.json rename to keyboards/mwstudio/mw80/keyboard.json diff --git a/keyboards/mwstudio/mw80/rules.mk b/keyboards/mwstudio/mw80/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mxss/info.json b/keyboards/mxss/keyboard.json similarity index 100% rename from keyboards/mxss/info.json rename to keyboards/mxss/keyboard.json diff --git a/keyboards/mxss/rules.mk b/keyboards/mxss/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mxss/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/nacly/bigsmoothknob/info.json b/keyboards/nacly/bigsmoothknob/keyboard.json similarity index 100% rename from keyboards/nacly/bigsmoothknob/info.json rename to keyboards/nacly/bigsmoothknob/keyboard.json diff --git a/keyboards/nacly/bigsmoothknob/rules.mk b/keyboards/nacly/bigsmoothknob/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/nacly/bigsmoothknob/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/navi60/info.json b/keyboards/navi60/keyboard.json similarity index 100% rename from keyboards/navi60/info.json rename to keyboards/navi60/keyboard.json diff --git a/keyboards/navi60/rules.mk b/keyboards/navi60/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/navi60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/neson_design/810e/info.json b/keyboards/neson_design/810e/keyboard.json similarity index 100% rename from keyboards/neson_design/810e/info.json rename to keyboards/neson_design/810e/keyboard.json diff --git a/keyboards/neson_design/810e/rules.mk b/keyboards/neson_design/810e/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/neson_design/810e/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/neson_design/nico/info.json b/keyboards/neson_design/nico/keyboard.json similarity index 100% rename from keyboards/neson_design/nico/info.json rename to keyboards/neson_design/nico/keyboard.json diff --git a/keyboards/neson_design/nico/rules.mk b/keyboards/neson_design/nico/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/nightly_boards/n40_o/info.json b/keyboards/nightly_boards/n40_o/keyboard.json similarity index 100% rename from keyboards/nightly_boards/n40_o/info.json rename to keyboards/nightly_boards/n40_o/keyboard.json diff --git a/keyboards/nightly_boards/n40_o/rules.mk b/keyboards/nightly_boards/n40_o/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/nightly_boards/n40_o/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ning/tiny_board/tb16_rgb/info.json b/keyboards/ning/tiny_board/tb16_rgb/keyboard.json similarity index 100% rename from keyboards/ning/tiny_board/tb16_rgb/info.json rename to keyboards/ning/tiny_board/tb16_rgb/keyboard.json diff --git a/keyboards/ning/tiny_board/tb16_rgb/rules.mk b/keyboards/ning/tiny_board/tb16_rgb/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/nix_studio/lilith/info.json b/keyboards/nix_studio/lilith/keyboard.json similarity index 100% rename from keyboards/nix_studio/lilith/info.json rename to keyboards/nix_studio/lilith/keyboard.json diff --git a/keyboards/nix_studio/lilith/rules.mk b/keyboards/nix_studio/lilith/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/nix_studio/lilith/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/novelkeys/nk65/base/info.json b/keyboards/novelkeys/nk65/base/keyboard.json similarity index 100% rename from keyboards/novelkeys/nk65/base/info.json rename to keyboards/novelkeys/nk65/base/keyboard.json diff --git a/keyboards/novelkeys/nk65/base/rules.mk b/keyboards/novelkeys/nk65/base/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/novelkeys/nk65/v1_4/info.json b/keyboards/novelkeys/nk65/v1_4/keyboard.json similarity index 100% rename from keyboards/novelkeys/nk65/v1_4/info.json rename to keyboards/novelkeys/nk65/v1_4/keyboard.json diff --git a/keyboards/novelkeys/nk65/v1_4/rules.mk b/keyboards/novelkeys/nk65/v1_4/rules.mk deleted file mode 100755 index 8b137891791..00000000000 --- a/keyboards/novelkeys/nk65/v1_4/rules.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/keyboards/noxary/valhalla_v2/info.json b/keyboards/noxary/valhalla_v2/keyboard.json similarity index 100% rename from keyboards/noxary/valhalla_v2/info.json rename to keyboards/noxary/valhalla_v2/keyboard.json diff --git a/keyboards/noxary/valhalla_v2/rules.mk b/keyboards/noxary/valhalla_v2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/noxary/valhalla_v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/null/st110r2/info.json b/keyboards/null/st110r2/keyboard.json similarity index 100% rename from keyboards/null/st110r2/info.json rename to keyboards/null/st110r2/keyboard.json diff --git a/keyboards/null/st110r2/rules.mk b/keyboards/null/st110r2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/null/st110r2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/oddball/v1/info.json b/keyboards/oddball/v1/keyboard.json similarity index 100% rename from keyboards/oddball/v1/info.json rename to keyboards/oddball/v1/keyboard.json diff --git a/keyboards/oddball/v1/rules.mk b/keyboards/oddball/v1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/oddball/v2/info.json b/keyboards/oddball/v2/keyboard.json similarity index 100% rename from keyboards/oddball/v2/info.json rename to keyboards/oddball/v2/keyboard.json diff --git a/keyboards/oddball/v2/rules.mk b/keyboards/oddball/v2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/oddball/v2_1/info.json b/keyboards/oddball/v2_1/keyboard.json similarity index 100% rename from keyboards/oddball/v2_1/info.json rename to keyboards/oddball/v2_1/keyboard.json diff --git a/keyboards/oddball/v2_1/rules.mk b/keyboards/oddball/v2_1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/keyboard.json similarity index 100% rename from keyboards/omkbd/runner3680/3x6/info.json rename to keyboards/omkbd/runner3680/3x6/keyboard.json diff --git a/keyboards/omkbd/runner3680/3x6/rules.mk b/keyboards/omkbd/runner3680/3x6/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/keyboard.json similarity index 100% rename from keyboards/omkbd/runner3680/3x7/info.json rename to keyboards/omkbd/runner3680/3x7/keyboard.json diff --git a/keyboards/omkbd/runner3680/3x7/rules.mk b/keyboards/omkbd/runner3680/3x7/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/keyboard.json similarity index 100% rename from keyboards/omkbd/runner3680/3x8/info.json rename to keyboards/omkbd/runner3680/3x8/keyboard.json diff --git a/keyboards/omkbd/runner3680/3x8/rules.mk b/keyboards/omkbd/runner3680/3x8/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/keyboard.json similarity index 100% rename from keyboards/omkbd/runner3680/4x6/info.json rename to keyboards/omkbd/runner3680/4x6/keyboard.json diff --git a/keyboards/omkbd/runner3680/4x6/rules.mk b/keyboards/omkbd/runner3680/4x6/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/keyboard.json similarity index 100% rename from keyboards/omkbd/runner3680/4x7/info.json rename to keyboards/omkbd/runner3680/4x7/keyboard.json diff --git a/keyboards/omkbd/runner3680/4x7/rules.mk b/keyboards/omkbd/runner3680/4x7/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/keyboard.json similarity index 100% rename from keyboards/omkbd/runner3680/4x8/info.json rename to keyboards/omkbd/runner3680/4x8/keyboard.json diff --git a/keyboards/omkbd/runner3680/4x8/rules.mk b/keyboards/omkbd/runner3680/4x8/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/keyboard.json similarity index 100% rename from keyboards/omkbd/runner3680/5x6/info.json rename to keyboards/omkbd/runner3680/5x6/keyboard.json diff --git a/keyboards/omkbd/runner3680/5x6/rules.mk b/keyboards/omkbd/runner3680/5x6/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json similarity index 100% rename from keyboards/omkbd/runner3680/5x6_5x8/info.json rename to keyboards/omkbd/runner3680/5x6_5x8/keyboard.json diff --git a/keyboards/omkbd/runner3680/5x6_5x8/rules.mk b/keyboards/omkbd/runner3680/5x6_5x8/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/keyboard.json similarity index 100% rename from keyboards/omkbd/runner3680/5x7/info.json rename to keyboards/omkbd/runner3680/5x7/keyboard.json diff --git a/keyboards/omkbd/runner3680/5x7/rules.mk b/keyboards/omkbd/runner3680/5x7/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/keyboard.json similarity index 100% rename from keyboards/omkbd/runner3680/5x8/info.json rename to keyboards/omkbd/runner3680/5x8/keyboard.json diff --git a/keyboards/omkbd/runner3680/5x8/rules.mk b/keyboards/omkbd/runner3680/5x8/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/orthograph/info.json b/keyboards/orthograph/keyboard.json similarity index 100% rename from keyboards/orthograph/info.json rename to keyboards/orthograph/keyboard.json diff --git a/keyboards/orthograph/rules.mk b/keyboards/orthograph/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/orthograph/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/pangorin/tan67/info.json b/keyboards/pangorin/tan67/keyboard.json similarity index 100% rename from keyboards/pangorin/tan67/info.json rename to keyboards/pangorin/tan67/keyboard.json diff --git a/keyboards/pangorin/tan67/rules.mk b/keyboards/pangorin/tan67/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/pangorin/tan67/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/pauperboards/brick/info.json b/keyboards/pauperboards/brick/keyboard.json similarity index 100% rename from keyboards/pauperboards/brick/info.json rename to keyboards/pauperboards/brick/keyboard.json diff --git a/keyboards/pauperboards/brick/rules.mk b/keyboards/pauperboards/brick/rules.mk deleted file mode 100644 index 333c4e59739..00000000000 --- a/keyboards/pauperboards/brick/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intenionally left blank diff --git a/keyboards/peej/tripel/left/info.json b/keyboards/peej/tripel/left/keyboard.json similarity index 100% rename from keyboards/peej/tripel/left/info.json rename to keyboards/peej/tripel/left/keyboard.json diff --git a/keyboards/peej/tripel/left/rules.mk b/keyboards/peej/tripel/left/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/peej/tripel/left/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/peej/tripel/middle/info.json b/keyboards/peej/tripel/middle/keyboard.json similarity index 100% rename from keyboards/peej/tripel/middle/info.json rename to keyboards/peej/tripel/middle/keyboard.json diff --git a/keyboards/peej/tripel/middle/rules.mk b/keyboards/peej/tripel/middle/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/peej/tripel/middle/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/peej/tripel/right/info.json b/keyboards/peej/tripel/right/keyboard.json similarity index 100% rename from keyboards/peej/tripel/right/info.json rename to keyboards/peej/tripel/right/keyboard.json diff --git a/keyboards/peej/tripel/right/rules.mk b/keyboards/peej/tripel/right/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/peej/tripel/right/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/phentech/rpk_001/info.json b/keyboards/phentech/rpk_001/keyboard.json similarity index 100% rename from keyboards/phentech/rpk_001/info.json rename to keyboards/phentech/rpk_001/keyboard.json diff --git a/keyboards/phentech/rpk_001/rules.mk b/keyboards/phentech/rpk_001/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/phentech/rpk_001/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/pica40/rev1/info.json b/keyboards/pica40/rev1/keyboard.json similarity index 100% rename from keyboards/pica40/rev1/info.json rename to keyboards/pica40/rev1/keyboard.json diff --git a/keyboards/pica40/rev1/rules.mk b/keyboards/pica40/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/pinky/3/info.json b/keyboards/pinky/3/keyboard.json similarity index 100% rename from keyboards/pinky/3/info.json rename to keyboards/pinky/3/keyboard.json diff --git a/keyboards/pinky/3/rules.mk b/keyboards/pinky/3/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/pinky/4/info.json b/keyboards/pinky/4/keyboard.json similarity index 100% rename from keyboards/pinky/4/info.json rename to keyboards/pinky/4/keyboard.json diff --git a/keyboards/pinky/4/rules.mk b/keyboards/pinky/4/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/pixelspace/shadow80/info.json b/keyboards/pixelspace/shadow80/keyboard.json similarity index 100% rename from keyboards/pixelspace/shadow80/info.json rename to keyboards/pixelspace/shadow80/keyboard.json diff --git a/keyboards/pixelspace/shadow80/rules.mk b/keyboards/pixelspace/shadow80/rules.mk deleted file mode 100644 index c80812f6e0a..00000000000 --- a/keyboards/pixelspace/shadow80/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally blank diff --git a/keyboards/planck/ez/base/info.json b/keyboards/planck/ez/base/keyboard.json similarity index 100% rename from keyboards/planck/ez/base/info.json rename to keyboards/planck/ez/base/keyboard.json diff --git a/keyboards/planck/ez/base/rules.mk b/keyboards/planck/ez/base/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ploopyco/madromys/rev1_001/info.json b/keyboards/ploopyco/madromys/rev1_001/keyboard.json similarity index 100% rename from keyboards/ploopyco/madromys/rev1_001/info.json rename to keyboards/ploopyco/madromys/rev1_001/keyboard.json diff --git a/keyboards/ploopyco/madromys/rev1_001/rules.mk b/keyboards/ploopyco/madromys/rev1_001/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ploopyco/trackball/rev1/info.json b/keyboards/ploopyco/trackball/rev1/keyboard.json similarity index 100% rename from keyboards/ploopyco/trackball/rev1/info.json rename to keyboards/ploopyco/trackball/rev1/keyboard.json diff --git a/keyboards/ploopyco/trackball/rev1/rules.mk b/keyboards/ploopyco/trackball/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ploopyco/trackball/rev1_005/info.json b/keyboards/ploopyco/trackball/rev1_005/keyboard.json similarity index 100% rename from keyboards/ploopyco/trackball/rev1_005/info.json rename to keyboards/ploopyco/trackball/rev1_005/keyboard.json diff --git a/keyboards/ploopyco/trackball/rev1_005/rules.mk b/keyboards/ploopyco/trackball/rev1_005/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ploopyco/trackball_mini/rev1_001/info.json b/keyboards/ploopyco/trackball_mini/rev1_001/keyboard.json similarity index 100% rename from keyboards/ploopyco/trackball_mini/rev1_001/info.json rename to keyboards/ploopyco/trackball_mini/rev1_001/keyboard.json diff --git a/keyboards/ploopyco/trackball_mini/rev1_001/rules.mk b/keyboards/ploopyco/trackball_mini/rev1_001/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ploopyco/trackball_mini/rev1_002/info.json b/keyboards/ploopyco/trackball_mini/rev1_002/keyboard.json similarity index 100% rename from keyboards/ploopyco/trackball_mini/rev1_002/info.json rename to keyboards/ploopyco/trackball_mini/rev1_002/keyboard.json diff --git a/keyboards/ploopyco/trackball_mini/rev1_002/rules.mk b/keyboards/ploopyco/trackball_mini/rev1_002/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ploopyco/trackball_nano/rev1_001/info.json b/keyboards/ploopyco/trackball_nano/rev1_001/keyboard.json similarity index 100% rename from keyboards/ploopyco/trackball_nano/rev1_001/info.json rename to keyboards/ploopyco/trackball_nano/rev1_001/keyboard.json diff --git a/keyboards/ploopyco/trackball_nano/rev1_001/rules.mk b/keyboards/ploopyco/trackball_nano/rev1_001/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/info.json b/keyboards/ploopyco/trackball_thumb/rev1_001/keyboard.json similarity index 100% rename from keyboards/ploopyco/trackball_thumb/rev1_001/info.json rename to keyboards/ploopyco/trackball_thumb/rev1_001/keyboard.json diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/rules.mk b/keyboards/ploopyco/trackball_thumb/rev1_001/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/plum47/info.json b/keyboards/plum47/keyboard.json similarity index 100% rename from keyboards/plum47/info.json rename to keyboards/plum47/keyboard.json diff --git a/keyboards/plum47/rules.mk b/keyboards/plum47/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/plum47/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/plywrks/allaro/info.json b/keyboards/plywrks/allaro/keyboard.json similarity index 100% rename from keyboards/plywrks/allaro/info.json rename to keyboards/plywrks/allaro/keyboard.json diff --git a/keyboards/plywrks/allaro/rules.mk b/keyboards/plywrks/allaro/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/plywrks/allaro/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/plywrks/ji_eun/info.json b/keyboards/plywrks/ji_eun/keyboard.json similarity index 100% rename from keyboards/plywrks/ji_eun/info.json rename to keyboards/plywrks/ji_eun/keyboard.json diff --git a/keyboards/plywrks/ji_eun/rules.mk b/keyboards/plywrks/ji_eun/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/plywrks/ji_eun/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/plywrks/ply8x/info.json b/keyboards/plywrks/ply8x/keyboard.json similarity index 100% rename from keyboards/plywrks/ply8x/info.json rename to keyboards/plywrks/ply8x/keyboard.json diff --git a/keyboards/plywrks/ply8x/rules.mk b/keyboards/plywrks/ply8x/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/plywrks/ply8x/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/primekb/meridian/ktr1010/info.json b/keyboards/primekb/meridian/ktr1010/keyboard.json similarity index 100% rename from keyboards/primekb/meridian/ktr1010/info.json rename to keyboards/primekb/meridian/ktr1010/keyboard.json diff --git a/keyboards/primekb/meridian/ktr1010/rules.mk b/keyboards/primekb/meridian/ktr1010/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/primekb/meridian/ws2812/info.json b/keyboards/primekb/meridian/ws2812/keyboard.json similarity index 100% rename from keyboards/primekb/meridian/ws2812/info.json rename to keyboards/primekb/meridian/ws2812/keyboard.json diff --git a/keyboards/primekb/meridian/ws2812/rules.mk b/keyboards/primekb/meridian/ws2812/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/program_yoink/ortho/info.json b/keyboards/program_yoink/ortho/keyboard.json similarity index 100% rename from keyboards/program_yoink/ortho/info.json rename to keyboards/program_yoink/ortho/keyboard.json diff --git a/keyboards/program_yoink/ortho/rules.mk b/keyboards/program_yoink/ortho/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/program_yoink/staggered/info.json b/keyboards/program_yoink/staggered/keyboard.json similarity index 100% rename from keyboards/program_yoink/staggered/info.json rename to keyboards/program_yoink/staggered/keyboard.json diff --git a/keyboards/program_yoink/staggered/rules.mk b/keyboards/program_yoink/staggered/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/projectcain/vault35/atmega32u4/info.json b/keyboards/projectcain/vault35/atmega32u4/keyboard.json similarity index 100% rename from keyboards/projectcain/vault35/atmega32u4/info.json rename to keyboards/projectcain/vault35/atmega32u4/keyboard.json diff --git a/keyboards/projectcain/vault35/atmega32u4/rules.mk b/keyboards/projectcain/vault35/atmega32u4/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/projectcain/vault35/atmega32u4/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/projectd/65/projectd_65_ansi/info.json b/keyboards/projectd/65/projectd_65_ansi/keyboard.json similarity index 100% rename from keyboards/projectd/65/projectd_65_ansi/info.json rename to keyboards/projectd/65/projectd_65_ansi/keyboard.json diff --git a/keyboards/projectd/65/projectd_65_ansi/rules.mk b/keyboards/projectd/65/projectd_65_ansi/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/projectd/65/projectd_65_ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/projectd/75/ansi/info.json b/keyboards/projectd/75/ansi/keyboard.json similarity index 100% rename from keyboards/projectd/75/ansi/info.json rename to keyboards/projectd/75/ansi/keyboard.json diff --git a/keyboards/projectd/75/ansi/rules.mk b/keyboards/projectd/75/ansi/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/projectd/75/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/proteus67/info.json b/keyboards/proteus67/keyboard.json similarity index 100% rename from keyboards/proteus67/info.json rename to keyboards/proteus67/keyboard.json diff --git a/keyboards/proteus67/rules.mk b/keyboards/proteus67/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/proteus67/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/keyboard.json similarity index 100% rename from keyboards/prototypist/pt60/info.json rename to keyboards/prototypist/pt60/keyboard.json diff --git a/keyboards/prototypist/pt60/rules.mk b/keyboards/prototypist/pt60/rules.mk deleted file mode 100644 index d469a478286..00000000000 --- a/keyboards/prototypist/pt60/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# This file intentionally left blank. - - diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/keyboard.json similarity index 100% rename from keyboards/prototypist/pt80/info.json rename to keyboards/prototypist/pt80/keyboard.json diff --git a/keyboards/prototypist/pt80/rules.mk b/keyboards/prototypist/pt80/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/prototypist/pt80/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/pteropus/info.json b/keyboards/pteropus/keyboard.json similarity index 100% rename from keyboards/pteropus/info.json rename to keyboards/pteropus/keyboard.json diff --git a/keyboards/pteropus/rules.mk b/keyboards/pteropus/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/pteropus/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/purin/info.json b/keyboards/purin/keyboard.json similarity index 100% rename from keyboards/purin/info.json rename to keyboards/purin/keyboard.json diff --git a/keyboards/purin/rules.mk b/keyboards/purin/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/purin/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/qck75/v1/info.json b/keyboards/qck75/v1/keyboard.json similarity index 100% rename from keyboards/qck75/v1/info.json rename to keyboards/qck75/v1/keyboard.json diff --git a/keyboards/qck75/v1/rules.mk b/keyboards/qck75/v1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/quadrum/delta/info.json b/keyboards/quadrum/delta/keyboard.json similarity index 100% rename from keyboards/quadrum/delta/info.json rename to keyboards/quadrum/delta/keyboard.json diff --git a/keyboards/quadrum/delta/rules.mk b/keyboards/quadrum/delta/rules.mk deleted file mode 100644 index 6968c523355..00000000000 --- a/keyboards/quadrum/delta/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# This file intentionally left blank - diff --git a/keyboards/qwertykeys/qk100/ansi/info.json b/keyboards/qwertykeys/qk100/ansi/keyboard.json similarity index 100% rename from keyboards/qwertykeys/qk100/ansi/info.json rename to keyboards/qwertykeys/qk100/ansi/keyboard.json diff --git a/keyboards/qwertykeys/qk100/ansi/rules.mk b/keyboards/qwertykeys/qk100/ansi/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/qwertykeys/qk100/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/qwertykeys/qk100/solder/info.json b/keyboards/qwertykeys/qk100/solder/keyboard.json similarity index 100% rename from keyboards/qwertykeys/qk100/solder/info.json rename to keyboards/qwertykeys/qk100/solder/keyboard.json diff --git a/keyboards/qwertykeys/qk100/solder/rules.mk b/keyboards/qwertykeys/qk100/solder/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/qwertykeys/qk100/solder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/rainkeebs/trailmix/info.json b/keyboards/rainkeebs/trailmix/keyboard.json similarity index 100% rename from keyboards/rainkeebs/trailmix/info.json rename to keyboards/rainkeebs/trailmix/keyboard.json diff --git a/keyboards/rainkeebs/trailmix/rules.mk b/keyboards/rainkeebs/trailmix/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/rainkeebs/trailmix/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ramlord/witf/info.json b/keyboards/ramlord/witf/keyboard.json similarity index 100% rename from keyboards/ramlord/witf/info.json rename to keyboards/ramlord/witf/keyboard.json diff --git a/keyboards/ramlord/witf/rules.mk b/keyboards/ramlord/witf/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ramlord/witf/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/rart/rart60/info.json b/keyboards/rart/rart60/keyboard.json similarity index 100% rename from keyboards/rart/rart60/info.json rename to keyboards/rart/rart60/keyboard.json diff --git a/keyboards/rart/rart60/rules.mk b/keyboards/rart/rart60/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/rart/rart60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/rastersoft/minitkl/info.json b/keyboards/rastersoft/minitkl/keyboard.json similarity index 100% rename from keyboards/rastersoft/minitkl/info.json rename to keyboards/rastersoft/minitkl/keyboard.json diff --git a/keyboards/rastersoft/minitkl/rules.mk b/keyboards/rastersoft/minitkl/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/rastersoft/minitkl/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/keyboard.json similarity index 100% rename from keyboards/redox/rev1/base/info.json rename to keyboards/redox/rev1/base/keyboard.json diff --git a/keyboards/redox/rev1/base/rules.mk b/keyboards/redox/rev1/base/rules.mk deleted file mode 100644 index 3bbd2614291..00000000000 --- a/keyboards/redox/rev1/base/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionally blank diff --git a/keyboards/redragon/k667/info.json b/keyboards/redragon/k667/keyboard.json similarity index 100% rename from keyboards/redragon/k667/info.json rename to keyboards/redragon/k667/keyboard.json diff --git a/keyboards/redragon/k667/rules.mk b/keyboards/redragon/k667/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/redragon/k667/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/reedskeebs/alish40/info.json b/keyboards/reedskeebs/alish40/keyboard.json similarity index 100% rename from keyboards/reedskeebs/alish40/info.json rename to keyboards/reedskeebs/alish40/keyboard.json diff --git a/keyboards/reedskeebs/alish40/rules.mk b/keyboards/reedskeebs/alish40/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/reedskeebs/alish40/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/relapsekb/or87/info.json b/keyboards/relapsekb/or87/keyboard.json similarity index 100% rename from keyboards/relapsekb/or87/info.json rename to keyboards/relapsekb/or87/keyboard.json diff --git a/keyboards/relapsekb/or87/rules.mk b/keyboards/relapsekb/or87/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/relapsekb/or87/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/keyboard.json similarity index 100% rename from keyboards/rgbkb/mun/rev1/info.json rename to keyboards/rgbkb/mun/rev1/keyboard.json diff --git a/keyboards/rgbkb/mun/rev1/rules.mk b/keyboards/rgbkb/mun/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/rgbkb/pan/rev1/proton_c/info.json b/keyboards/rgbkb/pan/rev1/proton_c/keyboard.json similarity index 100% rename from keyboards/rgbkb/pan/rev1/proton_c/info.json rename to keyboards/rgbkb/pan/rev1/proton_c/keyboard.json diff --git a/keyboards/rgbkb/pan/rev1/proton_c/rules.mk b/keyboards/rgbkb/pan/rev1/proton_c/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/keyboard.json similarity index 100% rename from keyboards/rgbkb/sol3/rev1/info.json rename to keyboards/rgbkb/sol3/rev1/keyboard.json diff --git a/keyboards/rgbkb/sol3/rev1/rules.mk b/keyboards/rgbkb/sol3/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/keyboard.json similarity index 100% rename from keyboards/rgbkb/zen/rev1/info.json rename to keyboards/rgbkb/zen/rev1/keyboard.json diff --git a/keyboards/rgbkb/zen/rev1/rules.mk b/keyboards/rgbkb/zen/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/keyboard.json similarity index 100% rename from keyboards/rgbkb/zygomorph/rev1/info.json rename to keyboards/rgbkb/zygomorph/rev1/keyboard.json diff --git a/keyboards/rgbkb/zygomorph/rev1/rules.mk b/keyboards/rgbkb/zygomorph/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/keyboard.json similarity index 100% rename from keyboards/rico/phoenix_project_no1/info.json rename to keyboards/rico/phoenix_project_no1/keyboard.json diff --git a/keyboards/rico/phoenix_project_no1/rules.mk b/keyboards/rico/phoenix_project_no1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/rico/phoenix_project_no1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/rkg68/info.json b/keyboards/rkg68/keyboard.json similarity index 100% rename from keyboards/rkg68/info.json rename to keyboards/rkg68/keyboard.json diff --git a/keyboards/rkg68/rules.mk b/keyboards/rkg68/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/rkg68/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/rmi_kb/equator/info.json b/keyboards/rmi_kb/equator/keyboard.json similarity index 100% rename from keyboards/rmi_kb/equator/info.json rename to keyboards/rmi_kb/equator/keyboard.json diff --git a/keyboards/rmi_kb/equator/rules.mk b/keyboards/rmi_kb/equator/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/rmi_kb/equator/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/rmi_kb/tkl_ff/v1/info.json b/keyboards/rmi_kb/tkl_ff/v1/keyboard.json similarity index 100% rename from keyboards/rmi_kb/tkl_ff/v1/info.json rename to keyboards/rmi_kb/tkl_ff/v1/keyboard.json diff --git a/keyboards/rmi_kb/tkl_ff/v1/rules.mk b/keyboards/rmi_kb/tkl_ff/v1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/rmkeebs/rm_fullsize/info.json b/keyboards/rmkeebs/rm_fullsize/keyboard.json similarity index 100% rename from keyboards/rmkeebs/rm_fullsize/info.json rename to keyboards/rmkeebs/rm_fullsize/keyboard.json diff --git a/keyboards/rmkeebs/rm_fullsize/rules.mk b/keyboards/rmkeebs/rm_fullsize/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/rmkeebs/rm_fullsize/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/rookiebwoy/late9/rev1/info.json b/keyboards/rookiebwoy/late9/rev1/keyboard.json similarity index 100% rename from keyboards/rookiebwoy/late9/rev1/info.json rename to keyboards/rookiebwoy/late9/rev1/keyboard.json diff --git a/keyboards/rookiebwoy/late9/rev1/rules.mk b/keyboards/rookiebwoy/late9/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/rookiebwoy/late9/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/rot13labs/rotc0n/info.json b/keyboards/rot13labs/rotc0n/keyboard.json similarity index 100% rename from keyboards/rot13labs/rotc0n/info.json rename to keyboards/rot13labs/rotc0n/keyboard.json diff --git a/keyboards/rot13labs/rotc0n/rules.mk b/keyboards/rot13labs/rotc0n/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/rot13labs/rotc0n/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/saevus/cor/info.json b/keyboards/saevus/cor/keyboard.json similarity index 100% rename from keyboards/saevus/cor/info.json rename to keyboards/saevus/cor/keyboard.json diff --git a/keyboards/saevus/cor/rules.mk b/keyboards/saevus/cor/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/saevus/cor/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/saevus/cor_tkl/info.json b/keyboards/saevus/cor_tkl/keyboard.json similarity index 100% rename from keyboards/saevus/cor_tkl/info.json rename to keyboards/saevus/cor_tkl/keyboard.json diff --git a/keyboards/saevus/cor_tkl/rules.mk b/keyboards/saevus/cor_tkl/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/sakura_workshop/fuji75/hotswap/info.json b/keyboards/sakura_workshop/fuji75/hotswap/keyboard.json similarity index 100% rename from keyboards/sakura_workshop/fuji75/hotswap/info.json rename to keyboards/sakura_workshop/fuji75/hotswap/keyboard.json diff --git a/keyboards/sakura_workshop/fuji75/hotswap/rules.mk b/keyboards/sakura_workshop/fuji75/hotswap/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/sakura_workshop/fuji75/hotswap/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/sakura_workshop/fuji75/solder/info.json b/keyboards/sakura_workshop/fuji75/solder/keyboard.json similarity index 100% rename from keyboards/sakura_workshop/fuji75/solder/info.json rename to keyboards/sakura_workshop/fuji75/solder/keyboard.json diff --git a/keyboards/sakura_workshop/fuji75/solder/rules.mk b/keyboards/sakura_workshop/fuji75/solder/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/sakura_workshop/fuji75/solder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json similarity index 100% rename from keyboards/salicylic_acid3/7skb/rev1/info.json rename to keyboards/salicylic_acid3/7skb/rev1/keyboard.json diff --git a/keyboards/salicylic_acid3/7skb/rev1/rules.mk b/keyboards/salicylic_acid3/7skb/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/keyboard.json similarity index 100% rename from keyboards/salicylic_acid3/getta25/rev1/info.json rename to keyboards/salicylic_acid3/getta25/rev1/keyboard.json diff --git a/keyboards/salicylic_acid3/getta25/rev1/rules.mk b/keyboards/salicylic_acid3/getta25/rev1/rules.mk deleted file mode 100644 index fff00a1b511..00000000000 --- a/keyboards/salicylic_acid3/getta25/rev1/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# Revision Specific Build Options -# change yes to no to disable -# diff --git a/keyboards/salicylic_acid3/guide68/info.json b/keyboards/salicylic_acid3/guide68/keyboard.json similarity index 100% rename from keyboards/salicylic_acid3/guide68/info.json rename to keyboards/salicylic_acid3/guide68/keyboard.json diff --git a/keyboards/salicylic_acid3/guide68/rules.mk b/keyboards/salicylic_acid3/guide68/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/salicylic_acid3/guide68/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json similarity index 100% rename from keyboards/salicylic_acid3/jisplit89/rev1/info.json rename to keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/rules.mk b/keyboards/salicylic_acid3/jisplit89/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json similarity index 100% rename from keyboards/salicylic_acid3/naked48/rev1/info.json rename to keyboards/salicylic_acid3/naked48/rev1/keyboard.json diff --git a/keyboards/salicylic_acid3/naked48/rev1/rules.mk b/keyboards/salicylic_acid3/naked48/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/salicylic_acid3/naked60/rev1/info.json b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json similarity index 100% rename from keyboards/salicylic_acid3/naked60/rev1/info.json rename to keyboards/salicylic_acid3/naked60/rev1/keyboard.json diff --git a/keyboards/salicylic_acid3/naked60/rev1/rules.mk b/keyboards/salicylic_acid3/naked60/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json similarity index 100% rename from keyboards/salicylic_acid3/naked64/rev1/info.json rename to keyboards/salicylic_acid3/naked64/rev1/keyboard.json diff --git a/keyboards/salicylic_acid3/naked64/rev1/rules.mk b/keyboards/salicylic_acid3/naked64/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/keyboard.json similarity index 100% rename from keyboards/salicylic_acid3/setta21/rev1/info.json rename to keyboards/salicylic_acid3/setta21/rev1/keyboard.json diff --git a/keyboards/salicylic_acid3/setta21/rev1/rules.mk b/keyboards/salicylic_acid3/setta21/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/sapuseven/macropad12/info.json b/keyboards/sapuseven/macropad12/keyboard.json similarity index 100% rename from keyboards/sapuseven/macropad12/info.json rename to keyboards/sapuseven/macropad12/keyboard.json diff --git a/keyboards/sapuseven/macropad12/rules.mk b/keyboards/sapuseven/macropad12/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/sapuseven/macropad12/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/sawnsprojects/eclipse/eclipse60/info.json b/keyboards/sawnsprojects/eclipse/eclipse60/keyboard.json similarity index 100% rename from keyboards/sawnsprojects/eclipse/eclipse60/info.json rename to keyboards/sawnsprojects/eclipse/eclipse60/keyboard.json diff --git a/keyboards/sawnsprojects/eclipse/eclipse60/rules.mk b/keyboards/sawnsprojects/eclipse/eclipse60/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/sawnsprojects/eclipse/eclipse60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/sawnsprojects/eclipse/tinyneko/info.json b/keyboards/sawnsprojects/eclipse/tinyneko/keyboard.json similarity index 100% rename from keyboards/sawnsprojects/eclipse/tinyneko/info.json rename to keyboards/sawnsprojects/eclipse/tinyneko/keyboard.json diff --git a/keyboards/sawnsprojects/eclipse/tinyneko/rules.mk b/keyboards/sawnsprojects/eclipse/tinyneko/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/sawnsprojects/eclipse/tinyneko/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/keyboard.json similarity index 100% rename from keyboards/sawnsprojects/krush/krush60/solder/info.json rename to keyboards/sawnsprojects/krush/krush60/solder/keyboard.json diff --git a/keyboards/sawnsprojects/krush/krush60/solder/rules.mk b/keyboards/sawnsprojects/krush/krush60/solder/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/sawnsprojects/okayu/stm32f072/info.json b/keyboards/sawnsprojects/okayu/stm32f072/keyboard.json similarity index 100% rename from keyboards/sawnsprojects/okayu/stm32f072/info.json rename to keyboards/sawnsprojects/okayu/stm32f072/keyboard.json diff --git a/keyboards/sawnsprojects/okayu/stm32f072/rules.mk b/keyboards/sawnsprojects/okayu/stm32f072/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/sawnsprojects/okayu/stm32f103/info.json b/keyboards/sawnsprojects/okayu/stm32f103/keyboard.json similarity index 100% rename from keyboards/sawnsprojects/okayu/stm32f103/info.json rename to keyboards/sawnsprojects/okayu/stm32f103/keyboard.json diff --git a/keyboards/sawnsprojects/okayu/stm32f103/rules.mk b/keyboards/sawnsprojects/okayu/stm32f103/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/sawnsprojects/okayu/stm32f303/info.json b/keyboards/sawnsprojects/okayu/stm32f303/keyboard.json similarity index 100% rename from keyboards/sawnsprojects/okayu/stm32f303/info.json rename to keyboards/sawnsprojects/okayu/stm32f303/keyboard.json diff --git a/keyboards/sawnsprojects/okayu/stm32f303/rules.mk b/keyboards/sawnsprojects/okayu/stm32f303/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/sawnsprojects/plaque80/info.json b/keyboards/sawnsprojects/plaque80/keyboard.json similarity index 100% rename from keyboards/sawnsprojects/plaque80/info.json rename to keyboards/sawnsprojects/plaque80/keyboard.json diff --git a/keyboards/sawnsprojects/plaque80/rules.mk b/keyboards/sawnsprojects/plaque80/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/sawnsprojects/plaque80/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/sawnsprojects/re65/info.json b/keyboards/sawnsprojects/re65/keyboard.json similarity index 100% rename from keyboards/sawnsprojects/re65/info.json rename to keyboards/sawnsprojects/re65/keyboard.json diff --git a/keyboards/sawnsprojects/re65/rules.mk b/keyboards/sawnsprojects/re65/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/sawnsprojects/re65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/scottokeebs/scotto34/info.json b/keyboards/scottokeebs/scotto34/keyboard.json similarity index 100% rename from keyboards/scottokeebs/scotto34/info.json rename to keyboards/scottokeebs/scotto34/keyboard.json diff --git a/keyboards/scottokeebs/scotto34/rules.mk b/keyboards/scottokeebs/scotto34/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/scottokeebs/scotto34/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/sf2040/info.json b/keyboards/sf2040/keyboard.json similarity index 100% rename from keyboards/sf2040/info.json rename to keyboards/sf2040/keyboard.json diff --git a/keyboards/sf2040/rules.mk b/keyboards/sf2040/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/sf2040/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/sha/info.json b/keyboards/sha/keyboard.json similarity index 100% rename from keyboards/sha/info.json rename to keyboards/sha/keyboard.json diff --git a/keyboards/sha/rules.mk b/keyboards/sha/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/sha/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/shandoncodes/riot_pad/info.json b/keyboards/shandoncodes/riot_pad/keyboard.json similarity index 100% rename from keyboards/shandoncodes/riot_pad/info.json rename to keyboards/shandoncodes/riot_pad/keyboard.json diff --git a/keyboards/shandoncodes/riot_pad/rules.mk b/keyboards/shandoncodes/riot_pad/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/shandoncodes/riot_pad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/sharkoon/skiller_sgk50_s3/info.json b/keyboards/sharkoon/skiller_sgk50_s3/keyboard.json similarity index 100% rename from keyboards/sharkoon/skiller_sgk50_s3/info.json rename to keyboards/sharkoon/skiller_sgk50_s3/keyboard.json diff --git a/keyboards/sharkoon/skiller_sgk50_s3/rules.mk b/keyboards/sharkoon/skiller_sgk50_s3/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/sharkoon/skiller_sgk50_s3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/shostudio/arc/info.json b/keyboards/shostudio/arc/keyboard.json similarity index 100% rename from keyboards/shostudio/arc/info.json rename to keyboards/shostudio/arc/keyboard.json diff --git a/keyboards/shostudio/arc/rules.mk b/keyboards/shostudio/arc/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/shostudio/arc/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/sirius/uni660/rev2/ansi/info.json b/keyboards/sirius/uni660/rev2/ansi/keyboard.json similarity index 100% rename from keyboards/sirius/uni660/rev2/ansi/info.json rename to keyboards/sirius/uni660/rev2/ansi/keyboard.json diff --git a/keyboards/sirius/uni660/rev2/ansi/rules.mk b/keyboards/sirius/uni660/rev2/ansi/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/sirius/uni660/rev2/iso/info.json b/keyboards/sirius/uni660/rev2/iso/keyboard.json similarity index 100% rename from keyboards/sirius/uni660/rev2/iso/info.json rename to keyboards/sirius/uni660/rev2/iso/keyboard.json diff --git a/keyboards/sirius/uni660/rev2/iso/rules.mk b/keyboards/sirius/uni660/rev2/iso/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/skeletonkbd/frost68/info.json b/keyboards/skeletonkbd/frost68/keyboard.json similarity index 100% rename from keyboards/skeletonkbd/frost68/info.json rename to keyboards/skeletonkbd/frost68/keyboard.json diff --git a/keyboards/skeletonkbd/frost68/rules.mk b/keyboards/skeletonkbd/frost68/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/skme/zeno/info.json b/keyboards/skme/zeno/keyboard.json similarity index 100% rename from keyboards/skme/zeno/info.json rename to keyboards/skme/zeno/keyboard.json diff --git a/keyboards/skme/zeno/rules.mk b/keyboards/skme/zeno/rules.mk deleted file mode 100644 index aa06a6088fc..00000000000 --- a/keyboards/skme/zeno/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# left blank intentionally, moved to info.json diff --git a/keyboards/skyloong/dt40/info.json b/keyboards/skyloong/dt40/keyboard.json similarity index 100% rename from keyboards/skyloong/dt40/info.json rename to keyboards/skyloong/dt40/keyboard.json diff --git a/keyboards/skyloong/dt40/rules.mk b/keyboards/skyloong/dt40/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/skyloong/dt40/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/skyloong/gk61/pro/info.json b/keyboards/skyloong/gk61/pro/keyboard.json similarity index 100% rename from keyboards/skyloong/gk61/pro/info.json rename to keyboards/skyloong/gk61/pro/keyboard.json diff --git a/keyboards/skyloong/gk61/pro/rules.mk b/keyboards/skyloong/gk61/pro/rules.mk deleted file mode 100644 index 3bbd2614291..00000000000 --- a/keyboards/skyloong/gk61/pro/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionally blank diff --git a/keyboards/skyloong/gk61/pro_48/info.json b/keyboards/skyloong/gk61/pro_48/keyboard.json similarity index 100% rename from keyboards/skyloong/gk61/pro_48/info.json rename to keyboards/skyloong/gk61/pro_48/keyboard.json diff --git a/keyboards/skyloong/gk61/pro_48/rules.mk b/keyboards/skyloong/gk61/pro_48/rules.mk deleted file mode 100644 index 3bbd2614291..00000000000 --- a/keyboards/skyloong/gk61/pro_48/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionally blank diff --git a/keyboards/skyloong/gk61/v1/info.json b/keyboards/skyloong/gk61/v1/keyboard.json similarity index 100% rename from keyboards/skyloong/gk61/v1/info.json rename to keyboards/skyloong/gk61/v1/keyboard.json diff --git a/keyboards/skyloong/gk61/v1/rules.mk b/keyboards/skyloong/gk61/v1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/skyloong/gk61/v1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/skyloong/qk21/v1/info.json b/keyboards/skyloong/qk21/v1/keyboard.json similarity index 100% rename from keyboards/skyloong/qk21/v1/info.json rename to keyboards/skyloong/qk21/v1/keyboard.json diff --git a/keyboards/skyloong/qk21/v1/rules.mk b/keyboards/skyloong/qk21/v1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/skyloong/qk21/v1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/smithrune/iron180v2/v2h/info.json b/keyboards/smithrune/iron180v2/v2h/keyboard.json similarity index 100% rename from keyboards/smithrune/iron180v2/v2h/info.json rename to keyboards/smithrune/iron180v2/v2h/keyboard.json diff --git a/keyboards/smithrune/iron180v2/v2h/rules.mk b/keyboards/smithrune/iron180v2/v2h/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/smithrune/iron180v2/v2h/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/smithrune/iron180v2/v2s/info.json b/keyboards/smithrune/iron180v2/v2s/keyboard.json similarity index 100% rename from keyboards/smithrune/iron180v2/v2s/info.json rename to keyboards/smithrune/iron180v2/v2s/keyboard.json diff --git a/keyboards/smithrune/iron180v2/v2s/rules.mk b/keyboards/smithrune/iron180v2/v2s/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/smithrune/iron180v2/v2s/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/smithrune/magnus/m75h/info.json b/keyboards/smithrune/magnus/m75h/keyboard.json similarity index 100% rename from keyboards/smithrune/magnus/m75h/info.json rename to keyboards/smithrune/magnus/m75h/keyboard.json diff --git a/keyboards/smithrune/magnus/m75h/rules.mk b/keyboards/smithrune/magnus/m75h/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/smithrune/magnus/m75h/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/smithrune/magnus/m75s/info.json b/keyboards/smithrune/magnus/m75s/keyboard.json similarity index 100% rename from keyboards/smithrune/magnus/m75s/info.json rename to keyboards/smithrune/magnus/m75s/keyboard.json diff --git a/keyboards/smithrune/magnus/m75s/rules.mk b/keyboards/smithrune/magnus/m75s/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/smithrune/magnus/m75s/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/smoll/lefty/rev1/info.json b/keyboards/smoll/lefty/rev1/keyboard.json similarity index 100% rename from keyboards/smoll/lefty/rev1/info.json rename to keyboards/smoll/lefty/rev1/keyboard.json diff --git a/keyboards/smoll/lefty/rev1/rules.mk b/keyboards/smoll/lefty/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/smoll/lefty/rev2/info.json b/keyboards/smoll/lefty/rev2/keyboard.json similarity index 100% rename from keyboards/smoll/lefty/rev2/info.json rename to keyboards/smoll/lefty/rev2/keyboard.json diff --git a/keyboards/smoll/lefty/rev2/rules.mk b/keyboards/smoll/lefty/rev2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/smoll/pw88/info.json b/keyboards/smoll/pw88/keyboard.json similarity index 100% rename from keyboards/smoll/pw88/info.json rename to keyboards/smoll/pw88/keyboard.json diff --git a/keyboards/smoll/pw88/rules.mk b/keyboards/smoll/pw88/rules.mk deleted file mode 100644 index c628fc7d0fe..00000000000 --- a/keyboards/smoll/pw88/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally blank diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/keyboard.json similarity index 100% rename from keyboards/sofle/keyhive/info.json rename to keyboards/sofle/keyhive/keyboard.json diff --git a/keyboards/sofle/keyhive/rules.mk b/keyboards/sofle/keyhive/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/sofle/keyhive/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/sofle/rev1/info.json b/keyboards/sofle/rev1/keyboard.json similarity index 100% rename from keyboards/sofle/rev1/info.json rename to keyboards/sofle/rev1/keyboard.json diff --git a/keyboards/sofle/rev1/rules.mk b/keyboards/sofle/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/sofle/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/sofle_choc/info.json b/keyboards/sofle_choc/keyboard.json similarity index 100% rename from keyboards/sofle_choc/info.json rename to keyboards/sofle_choc/keyboard.json diff --git a/keyboards/sofle_choc/rules.mk b/keyboards/sofle_choc/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/split67/info.json b/keyboards/split67/keyboard.json similarity index 100% rename from keyboards/split67/info.json rename to keyboards/split67/keyboard.json diff --git a/keyboards/split67/rules.mk b/keyboards/split67/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/split67/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/splitkb/aurora/corne/rev1/info.json b/keyboards/splitkb/aurora/corne/rev1/keyboard.json similarity index 100% rename from keyboards/splitkb/aurora/corne/rev1/info.json rename to keyboards/splitkb/aurora/corne/rev1/keyboard.json diff --git a/keyboards/splitkb/aurora/corne/rev1/rules.mk b/keyboards/splitkb/aurora/corne/rev1/rules.mk deleted file mode 100644 index dd523382835..00000000000 --- a/keyboards/splitkb/aurora/corne/rev1/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2022 splitkb.com -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Although no rules are defined, -# presence of this file is required for QMK to compile it. diff --git a/keyboards/splitkb/aurora/helix/rev1/info.json b/keyboards/splitkb/aurora/helix/rev1/keyboard.json similarity index 100% rename from keyboards/splitkb/aurora/helix/rev1/info.json rename to keyboards/splitkb/aurora/helix/rev1/keyboard.json diff --git a/keyboards/splitkb/aurora/helix/rev1/rules.mk b/keyboards/splitkb/aurora/helix/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/splitkb/aurora/lily58/rev1/info.json b/keyboards/splitkb/aurora/lily58/rev1/keyboard.json similarity index 100% rename from keyboards/splitkb/aurora/lily58/rev1/info.json rename to keyboards/splitkb/aurora/lily58/rev1/keyboard.json diff --git a/keyboards/splitkb/aurora/lily58/rev1/rules.mk b/keyboards/splitkb/aurora/lily58/rev1/rules.mk deleted file mode 100644 index dd523382835..00000000000 --- a/keyboards/splitkb/aurora/lily58/rev1/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2022 splitkb.com -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Although no rules are defined, -# presence of this file is required for QMK to compile it. diff --git a/keyboards/splitkb/aurora/sofle_v2/rev1/info.json b/keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json similarity index 100% rename from keyboards/splitkb/aurora/sofle_v2/rev1/info.json rename to keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json diff --git a/keyboards/splitkb/aurora/sofle_v2/rev1/rules.mk b/keyboards/splitkb/aurora/sofle_v2/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/splitkb/aurora/sweep/rev1/info.json b/keyboards/splitkb/aurora/sweep/rev1/keyboard.json similarity index 100% rename from keyboards/splitkb/aurora/sweep/rev1/info.json rename to keyboards/splitkb/aurora/sweep/rev1/keyboard.json diff --git a/keyboards/splitkb/aurora/sweep/rev1/rules.mk b/keyboards/splitkb/aurora/sweep/rev1/rules.mk deleted file mode 100644 index c4275031caf..00000000000 --- a/keyboards/splitkb/aurora/sweep/rev1/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2022 splitkb.com -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Although no rules are defined, -# presence of this file is required for QMK to compile it. \ No newline at end of file diff --git a/keyboards/splitkb/kyria/rev1/base/info.json b/keyboards/splitkb/kyria/rev1/base/keyboard.json similarity index 100% rename from keyboards/splitkb/kyria/rev1/base/info.json rename to keyboards/splitkb/kyria/rev1/base/keyboard.json diff --git a/keyboards/splitkb/kyria/rev1/base/rules.mk b/keyboards/splitkb/kyria/rev1/base/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/splitkb/kyria/rev2/base/info.json b/keyboards/splitkb/kyria/rev2/base/keyboard.json similarity index 100% rename from keyboards/splitkb/kyria/rev2/base/info.json rename to keyboards/splitkb/kyria/rev2/base/keyboard.json diff --git a/keyboards/splitkb/kyria/rev2/base/rules.mk b/keyboards/splitkb/kyria/rev2/base/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/splitkb/kyria/rev3/info.json b/keyboards/splitkb/kyria/rev3/keyboard.json similarity index 100% rename from keyboards/splitkb/kyria/rev3/info.json rename to keyboards/splitkb/kyria/rev3/keyboard.json diff --git a/keyboards/splitkb/kyria/rev3/rules.mk b/keyboards/splitkb/kyria/rev3/rules.mk deleted file mode 100644 index 55e87248482..00000000000 --- a/keyboards/splitkb/kyria/rev3/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# Although no rules are defined, -# presence of this file is required for QMK to compile it. diff --git a/keyboards/splitography/info.json b/keyboards/splitography/keyboard.json similarity index 100% rename from keyboards/splitography/info.json rename to keyboards/splitography/keyboard.json diff --git a/keyboards/splitography/rules.mk b/keyboards/splitography/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/sthlmkb/litl/info.json b/keyboards/sthlmkb/litl/keyboard.json similarity index 100% rename from keyboards/sthlmkb/litl/info.json rename to keyboards/sthlmkb/litl/keyboard.json diff --git a/keyboards/sthlmkb/litl/rules.mk b/keyboards/sthlmkb/litl/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/sthlmkb/litl/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/strech/soulstone/info.json b/keyboards/strech/soulstone/keyboard.json similarity index 100% rename from keyboards/strech/soulstone/info.json rename to keyboards/strech/soulstone/keyboard.json diff --git a/keyboards/strech/soulstone/rules.mk b/keyboards/strech/soulstone/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/strech/soulstone/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/studiokestra/frl84/info.json b/keyboards/studiokestra/frl84/keyboard.json similarity index 100% rename from keyboards/studiokestra/frl84/info.json rename to keyboards/studiokestra/frl84/keyboard.json diff --git a/keyboards/studiokestra/frl84/rules.mk b/keyboards/studiokestra/frl84/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/studiokestra/frl84/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/keyboard.json similarity index 100% rename from keyboards/studiokestra/galatea/rev1/info.json rename to keyboards/studiokestra/galatea/rev1/keyboard.json diff --git a/keyboards/studiokestra/galatea/rev1/rules.mk b/keyboards/studiokestra/galatea/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/studiokestra/galatea/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/keyboard.json similarity index 100% rename from keyboards/studiokestra/galatea/rev2/info.json rename to keyboards/studiokestra/galatea/rev2/keyboard.json diff --git a/keyboards/studiokestra/galatea/rev2/rules.mk b/keyboards/studiokestra/galatea/rev2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/studiokestra/galatea/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/studiokestra/galatea/rev3/info.json b/keyboards/studiokestra/galatea/rev3/keyboard.json similarity index 100% rename from keyboards/studiokestra/galatea/rev3/info.json rename to keyboards/studiokestra/galatea/rev3/keyboard.json diff --git a/keyboards/studiokestra/galatea/rev3/rules.mk b/keyboards/studiokestra/galatea/rev3/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/studiokestra/galatea/rev3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/studiokestra/line_friends_tkl/info.json b/keyboards/studiokestra/line_friends_tkl/keyboard.json similarity index 100% rename from keyboards/studiokestra/line_friends_tkl/info.json rename to keyboards/studiokestra/line_friends_tkl/keyboard.json diff --git a/keyboards/studiokestra/line_friends_tkl/rules.mk b/keyboards/studiokestra/line_friends_tkl/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/studiokestra/line_friends_tkl/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/subrezon/lancer/info.json b/keyboards/subrezon/lancer/keyboard.json similarity index 100% rename from keyboards/subrezon/lancer/info.json rename to keyboards/subrezon/lancer/keyboard.json diff --git a/keyboards/subrezon/lancer/rules.mk b/keyboards/subrezon/lancer/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/subrezon/lancer/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/swiss/info.json b/keyboards/swiss/keyboard.json similarity index 100% rename from keyboards/swiss/info.json rename to keyboards/swiss/keyboard.json diff --git a/keyboards/swiss/rules.mk b/keyboards/swiss/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/swiss/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/syenakeyboards/aswagata/info.json b/keyboards/syenakeyboards/aswagata/keyboard.json similarity index 100% rename from keyboards/syenakeyboards/aswagata/info.json rename to keyboards/syenakeyboards/aswagata/keyboard.json diff --git a/keyboards/syenakeyboards/aswagata/rules.mk b/keyboards/syenakeyboards/aswagata/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/syenakeyboards/aswagata/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/synthandkeys/bento_box/info.json b/keyboards/synthandkeys/bento_box/keyboard.json similarity index 100% rename from keyboards/synthandkeys/bento_box/info.json rename to keyboards/synthandkeys/bento_box/keyboard.json diff --git a/keyboards/synthandkeys/bento_box/rules.mk b/keyboards/synthandkeys/bento_box/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/synthandkeys/bento_box/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/synthandkeys/the_debit_card/info.json b/keyboards/synthandkeys/the_debit_card/keyboard.json similarity index 100% rename from keyboards/synthandkeys/the_debit_card/info.json rename to keyboards/synthandkeys/the_debit_card/keyboard.json diff --git a/keyboards/synthandkeys/the_debit_card/rules.mk b/keyboards/synthandkeys/the_debit_card/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/synthandkeys/the_debit_card/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/synthlabs/060/info.json b/keyboards/synthlabs/060/keyboard.json similarity index 100% rename from keyboards/synthlabs/060/info.json rename to keyboards/synthlabs/060/keyboard.json diff --git a/keyboards/synthlabs/060/rules.mk b/keyboards/synthlabs/060/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/synthlabs/065/info.json b/keyboards/synthlabs/065/keyboard.json similarity index 100% rename from keyboards/synthlabs/065/info.json rename to keyboards/synthlabs/065/keyboard.json diff --git a/keyboards/synthlabs/065/rules.mk b/keyboards/synthlabs/065/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/tacworks/tac_k1/info.json b/keyboards/tacworks/tac_k1/keyboard.json similarity index 100% rename from keyboards/tacworks/tac_k1/info.json rename to keyboards/tacworks/tac_k1/keyboard.json diff --git a/keyboards/tacworks/tac_k1/rules.mk b/keyboards/tacworks/tac_k1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/tacworks/tac_k1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/takashicompany/baumkuchen/info.json b/keyboards/takashicompany/baumkuchen/keyboard.json similarity index 100% rename from keyboards/takashicompany/baumkuchen/info.json rename to keyboards/takashicompany/baumkuchen/keyboard.json diff --git a/keyboards/takashicompany/baumkuchen/rules.mk b/keyboards/takashicompany/baumkuchen/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/takashicompany/baumkuchen/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/keyboard.json similarity index 100% rename from keyboards/takashicompany/dogtag/info.json rename to keyboards/takashicompany/dogtag/keyboard.json diff --git a/keyboards/takashicompany/dogtag/rules.mk b/keyboards/takashicompany/dogtag/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/takashicompany/dogtag/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/takashicompany/ejectix/info.json b/keyboards/takashicompany/ejectix/keyboard.json similarity index 100% rename from keyboards/takashicompany/ejectix/info.json rename to keyboards/takashicompany/ejectix/keyboard.json diff --git a/keyboards/takashicompany/ejectix/rules.mk b/keyboards/takashicompany/ejectix/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/takashicompany/ejectix/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/takashicompany/ergomirage/info.json b/keyboards/takashicompany/ergomirage/keyboard.json similarity index 100% rename from keyboards/takashicompany/ergomirage/info.json rename to keyboards/takashicompany/ergomirage/keyboard.json diff --git a/keyboards/takashicompany/ergomirage/rules.mk b/keyboards/takashicompany/ergomirage/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/takashicompany/ergomirage/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/takashicompany/goat51/info.json b/keyboards/takashicompany/goat51/keyboard.json similarity index 100% rename from keyboards/takashicompany/goat51/info.json rename to keyboards/takashicompany/goat51/keyboard.json diff --git a/keyboards/takashicompany/goat51/rules.mk b/keyboards/takashicompany/goat51/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/takashicompany/goat51/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/keyboard.json similarity index 100% rename from keyboards/takashicompany/heavy_left/info.json rename to keyboards/takashicompany/heavy_left/keyboard.json diff --git a/keyboards/takashicompany/heavy_left/rules.mk b/keyboards/takashicompany/heavy_left/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/takashicompany/heavy_left/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/keyboard.json similarity index 100% rename from keyboards/takashicompany/minidivide/info.json rename to keyboards/takashicompany/minidivide/keyboard.json diff --git a/keyboards/takashicompany/minidivide/rules.mk b/keyboards/takashicompany/minidivide/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/takashicompany/minidivide/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/takashicompany/minidivide_max/info.json b/keyboards/takashicompany/minidivide_max/keyboard.json similarity index 100% rename from keyboards/takashicompany/minidivide_max/info.json rename to keyboards/takashicompany/minidivide_max/keyboard.json diff --git a/keyboards/takashicompany/minidivide_max/rules.mk b/keyboards/takashicompany/minidivide_max/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/takashicompany/minidivide_max/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/keyboard.json similarity index 100% rename from keyboards/takashicompany/minizone/info.json rename to keyboards/takashicompany/minizone/keyboard.json diff --git a/keyboards/takashicompany/minizone/rules.mk b/keyboards/takashicompany/minizone/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/takashicompany/minizone/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/takashicompany/rookey/info.json b/keyboards/takashicompany/rookey/keyboard.json similarity index 100% rename from keyboards/takashicompany/rookey/info.json rename to keyboards/takashicompany/rookey/keyboard.json diff --git a/keyboards/takashicompany/rookey/rules.mk b/keyboards/takashicompany/rookey/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/takashicompany/rookey/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/takashicompany/tightwriter/info.json b/keyboards/takashicompany/tightwriter/keyboard.json similarity index 100% rename from keyboards/takashicompany/tightwriter/info.json rename to keyboards/takashicompany/tightwriter/keyboard.json diff --git a/keyboards/takashicompany/tightwriter/rules.mk b/keyboards/takashicompany/tightwriter/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/takashicompany/tightwriter/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/takashiski/namecard2x4/rev1/info.json b/keyboards/takashiski/namecard2x4/rev1/keyboard.json similarity index 100% rename from keyboards/takashiski/namecard2x4/rev1/info.json rename to keyboards/takashiski/namecard2x4/rev1/keyboard.json diff --git a/keyboards/takashiski/namecard2x4/rev1/rules.mk b/keyboards/takashiski/namecard2x4/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/takashiski/namecard2x4/rev2/info.json b/keyboards/takashiski/namecard2x4/rev2/keyboard.json similarity index 100% rename from keyboards/takashiski/namecard2x4/rev2/info.json rename to keyboards/takashiski/namecard2x4/rev2/keyboard.json diff --git a/keyboards/takashiski/namecard2x4/rev2/rules.mk b/keyboards/takashiski/namecard2x4/rev2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/tau4/info.json b/keyboards/tau4/keyboard.json similarity index 100% rename from keyboards/tau4/info.json rename to keyboards/tau4/keyboard.json diff --git a/keyboards/tau4/rules.mk b/keyboards/tau4/rules.mk deleted file mode 100644 index 0001ae06b81..00000000000 --- a/keyboards/tau4/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# EEPROM_DRIVER ?= i2c # Driver for external EEPROM chip -# This is currently not working due to QMK not officially supporting the chip used on the Tau4, I am working on a fix. diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/keyboard.json similarity index 100% rename from keyboards/teahouse/ayleen/info.json rename to keyboards/teahouse/ayleen/keyboard.json diff --git a/keyboards/teahouse/ayleen/rules.mk b/keyboards/teahouse/ayleen/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/teahouse/ayleen/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/teleport/native/ansi/info.json b/keyboards/teleport/native/ansi/keyboard.json similarity index 100% rename from keyboards/teleport/native/ansi/info.json rename to keyboards/teleport/native/ansi/keyboard.json diff --git a/keyboards/teleport/native/ansi/rules.mk b/keyboards/teleport/native/ansi/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/teleport/native/ansi/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/teleport/native/iso/info.json b/keyboards/teleport/native/iso/keyboard.json similarity index 100% rename from keyboards/teleport/native/iso/info.json rename to keyboards/teleport/native/iso/keyboard.json diff --git a/keyboards/teleport/native/iso/rules.mk b/keyboards/teleport/native/iso/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/teleport/native/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/teleport/tkl/info.json b/keyboards/teleport/tkl/keyboard.json similarity index 100% rename from keyboards/teleport/tkl/info.json rename to keyboards/teleport/tkl/keyboard.json diff --git a/keyboards/teleport/tkl/rules.mk b/keyboards/teleport/tkl/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/teleport/tkl/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/tg67/info.json b/keyboards/tg67/keyboard.json similarity index 100% rename from keyboards/tg67/info.json rename to keyboards/tg67/keyboard.json diff --git a/keyboards/tg67/rules.mk b/keyboards/tg67/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/tg67/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/themadnoodle/ncc1701kb/v2/info.json b/keyboards/themadnoodle/ncc1701kb/v2/keyboard.json similarity index 100% rename from keyboards/themadnoodle/ncc1701kb/v2/info.json rename to keyboards/themadnoodle/ncc1701kb/v2/keyboard.json diff --git a/keyboards/themadnoodle/ncc1701kb/v2/rules.mk b/keyboards/themadnoodle/ncc1701kb/v2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/themadnoodle/ncc1701kb/v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/themadnoodle/noodlepad/v1/info.json b/keyboards/themadnoodle/noodlepad/v1/keyboard.json similarity index 100% rename from keyboards/themadnoodle/noodlepad/v1/info.json rename to keyboards/themadnoodle/noodlepad/v1/keyboard.json diff --git a/keyboards/themadnoodle/noodlepad/v1/rules.mk b/keyboards/themadnoodle/noodlepad/v1/rules.mk deleted file mode 100644 index bd924561489..00000000000 --- a/keyboards/themadnoodle/noodlepad/v1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -#this file was left intentionally blank diff --git a/keyboards/themadnoodle/noodlepad/v2/info.json b/keyboards/themadnoodle/noodlepad/v2/keyboard.json similarity index 100% rename from keyboards/themadnoodle/noodlepad/v2/info.json rename to keyboards/themadnoodle/noodlepad/v2/keyboard.json diff --git a/keyboards/themadnoodle/noodlepad/v2/rules.mk b/keyboards/themadnoodle/noodlepad/v2/rules.mk deleted file mode 100644 index bd924561489..00000000000 --- a/keyboards/themadnoodle/noodlepad/v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -#this file was left intentionally blank diff --git a/keyboards/themadnoodle/noodlepad_micro/info.json b/keyboards/themadnoodle/noodlepad_micro/keyboard.json similarity index 100% rename from keyboards/themadnoodle/noodlepad_micro/info.json rename to keyboards/themadnoodle/noodlepad_micro/keyboard.json diff --git a/keyboards/themadnoodle/noodlepad_micro/rules.mk b/keyboards/themadnoodle/noodlepad_micro/rules.mk deleted file mode 100644 index 6968c523355..00000000000 --- a/keyboards/themadnoodle/noodlepad_micro/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# This file intentionally left blank - diff --git a/keyboards/themadnoodle/udon13/info.json b/keyboards/themadnoodle/udon13/keyboard.json similarity index 100% rename from keyboards/themadnoodle/udon13/info.json rename to keyboards/themadnoodle/udon13/keyboard.json diff --git a/keyboards/themadnoodle/udon13/rules.mk b/keyboards/themadnoodle/udon13/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/themadnoodle/udon13/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/theone/info.json b/keyboards/theone/keyboard.json similarity index 100% rename from keyboards/theone/info.json rename to keyboards/theone/keyboard.json diff --git a/keyboards/theone/rules.mk b/keyboards/theone/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/theone/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/tkw/grandiceps/rev1/info.json b/keyboards/tkw/grandiceps/rev1/keyboard.json similarity index 100% rename from keyboards/tkw/grandiceps/rev1/info.json rename to keyboards/tkw/grandiceps/rev1/keyboard.json diff --git a/keyboards/tkw/grandiceps/rev1/rules.mk b/keyboards/tkw/grandiceps/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/tkw/stoutgat/v2/f411/info.json b/keyboards/tkw/stoutgat/v2/f411/keyboard.json similarity index 100% rename from keyboards/tkw/stoutgat/v2/f411/info.json rename to keyboards/tkw/stoutgat/v2/f411/keyboard.json diff --git a/keyboards/tkw/stoutgat/v2/f411/rules.mk b/keyboards/tkw/stoutgat/v2/f411/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/tominabox1/le_chiffre/he/info.json b/keyboards/tominabox1/le_chiffre/he/keyboard.json similarity index 100% rename from keyboards/tominabox1/le_chiffre/he/info.json rename to keyboards/tominabox1/le_chiffre/he/keyboard.json diff --git a/keyboards/tominabox1/le_chiffre/he/rules.mk b/keyboards/tominabox1/le_chiffre/he/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/tominabox1/le_chiffre/he/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/tominabox1/le_chiffre/rev1/info.json b/keyboards/tominabox1/le_chiffre/rev1/keyboard.json similarity index 100% rename from keyboards/tominabox1/le_chiffre/rev1/info.json rename to keyboards/tominabox1/le_chiffre/rev1/keyboard.json diff --git a/keyboards/tominabox1/le_chiffre/rev1/rules.mk b/keyboards/tominabox1/le_chiffre/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/tominabox1/le_chiffre/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/tominabox1/le_chiffre/rev2/info.json b/keyboards/tominabox1/le_chiffre/rev2/keyboard.json similarity index 100% rename from keyboards/tominabox1/le_chiffre/rev2/info.json rename to keyboards/tominabox1/le_chiffre/rev2/keyboard.json diff --git a/keyboards/tominabox1/le_chiffre/rev2/rules.mk b/keyboards/tominabox1/le_chiffre/rev2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/tominabox1/le_chiffre/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/trainpad/info.json b/keyboards/trainpad/keyboard.json similarity index 100% rename from keyboards/trainpad/info.json rename to keyboards/trainpad/keyboard.json diff --git a/keyboards/trainpad/rules.mk b/keyboards/trainpad/rules.mk deleted file mode 100644 index 2c49b41d7a0..00000000000 --- a/keyboards/trainpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally left blank \ No newline at end of file diff --git a/keyboards/treasure/type9s3/info.json b/keyboards/treasure/type9s3/keyboard.json similarity index 100% rename from keyboards/treasure/type9s3/info.json rename to keyboards/treasure/type9s3/keyboard.json diff --git a/keyboards/treasure/type9s3/rules.mk b/keyboards/treasure/type9s3/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/treasure/type9s3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/keyboard.json similarity index 100% rename from keyboards/tweetydabird/chameleon/info.json rename to keyboards/tweetydabird/chameleon/keyboard.json diff --git a/keyboards/tweetydabird/chameleon/rules.mk b/keyboards/tweetydabird/chameleon/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/tweetydabird/chameleon/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/tweetydabird/lbs4/info.json b/keyboards/tweetydabird/lbs4/keyboard.json similarity index 100% rename from keyboards/tweetydabird/lbs4/info.json rename to keyboards/tweetydabird/lbs4/keyboard.json diff --git a/keyboards/tweetydabird/lbs4/rules.mk b/keyboards/tweetydabird/lbs4/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/tweetydabird/lbs4/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/tweetydabird/lbs6/info.json b/keyboards/tweetydabird/lbs6/keyboard.json similarity index 100% rename from keyboards/tweetydabird/lbs6/info.json rename to keyboards/tweetydabird/lbs6/keyboard.json diff --git a/keyboards/tweetydabird/lbs6/rules.mk b/keyboards/tweetydabird/lbs6/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/tweetydabird/lbs6/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/tweetydabird/lotus58/elite_c/info.json b/keyboards/tweetydabird/lotus58/elite_c/keyboard.json similarity index 100% rename from keyboards/tweetydabird/lotus58/elite_c/info.json rename to keyboards/tweetydabird/lotus58/elite_c/keyboard.json diff --git a/keyboards/tweetydabird/lotus58/elite_c/rules.mk b/keyboards/tweetydabird/lotus58/elite_c/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/tweetydabird/lotus58/elite_c/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/tweetydabird/lotus58/promicro/info.json b/keyboards/tweetydabird/lotus58/promicro/keyboard.json similarity index 100% rename from keyboards/tweetydabird/lotus58/promicro/info.json rename to keyboards/tweetydabird/lotus58/promicro/keyboard.json diff --git a/keyboards/tweetydabird/lotus58/promicro/rules.mk b/keyboards/tweetydabird/lotus58/promicro/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/tweetydabird/lotus58/promicro/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/tzarc/djinn/rev1/info.json b/keyboards/tzarc/djinn/rev1/keyboard.json similarity index 100% rename from keyboards/tzarc/djinn/rev1/info.json rename to keyboards/tzarc/djinn/rev1/keyboard.json diff --git a/keyboards/tzarc/djinn/rev1/rules.mk b/keyboards/tzarc/djinn/rev1/rules.mk deleted file mode 100644 index f4688728490..00000000000 --- a/keyboards/tzarc/djinn/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# Placeholder to make the build system work. diff --git a/keyboards/tzarc/djinn/rev2/info.json b/keyboards/tzarc/djinn/rev2/keyboard.json similarity index 100% rename from keyboards/tzarc/djinn/rev2/info.json rename to keyboards/tzarc/djinn/rev2/keyboard.json diff --git a/keyboards/tzarc/djinn/rev2/rules.mk b/keyboards/tzarc/djinn/rev2/rules.mk deleted file mode 100644 index f4688728490..00000000000 --- a/keyboards/tzarc/djinn/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# Placeholder to make the build system work. diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/info.json b/keyboards/tzarc/ghoul/rev1/rp2040/keyboard.json similarity index 100% rename from keyboards/tzarc/ghoul/rev1/rp2040/info.json rename to keyboards/tzarc/ghoul/rev1/rp2040/keyboard.json diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk b/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/tzarc/ghoul/rev1/stm32/info.json b/keyboards/tzarc/ghoul/rev1/stm32/keyboard.json similarity index 100% rename from keyboards/tzarc/ghoul/rev1/stm32/info.json rename to keyboards/tzarc/ghoul/rev1/stm32/keyboard.json diff --git a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/varanidae/info.json b/keyboards/varanidae/keyboard.json similarity index 100% rename from keyboards/varanidae/info.json rename to keyboards/varanidae/keyboard.json diff --git a/keyboards/varanidae/rules.mk b/keyboards/varanidae/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/varanidae/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/vertex/cycle8/info.json b/keyboards/vertex/cycle8/keyboard.json similarity index 100% rename from keyboards/vertex/cycle8/info.json rename to keyboards/vertex/cycle8/keyboard.json diff --git a/keyboards/vertex/cycle8/rules.mk b/keyboards/vertex/cycle8/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/vertex/cycle8/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/vertex/t75/info.json b/keyboards/vertex/t75/keyboard.json similarity index 100% rename from keyboards/vertex/t75/info.json rename to keyboards/vertex/t75/keyboard.json diff --git a/keyboards/vertex/t75/rules.mk b/keyboards/vertex/t75/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/vertex/t75/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/viktus/minne/info.json b/keyboards/viktus/minne/keyboard.json similarity index 100% rename from keyboards/viktus/minne/info.json rename to keyboards/viktus/minne/keyboard.json diff --git a/keyboards/viktus/minne/rules.mk b/keyboards/viktus/minne/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/viktus/minne/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/viktus/osav2/info.json b/keyboards/viktus/osav2/keyboard.json similarity index 100% rename from keyboards/viktus/osav2/info.json rename to keyboards/viktus/osav2/keyboard.json diff --git a/keyboards/viktus/osav2/rules.mk b/keyboards/viktus/osav2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/viktus/osav2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/viktus/osav2_numpad/info.json b/keyboards/viktus/osav2_numpad/keyboard.json similarity index 100% rename from keyboards/viktus/osav2_numpad/info.json rename to keyboards/viktus/osav2_numpad/keyboard.json diff --git a/keyboards/viktus/osav2_numpad/rules.mk b/keyboards/viktus/osav2_numpad/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/viktus/osav2_numpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/viktus/sp111_v2/info.json b/keyboards/viktus/sp111_v2/keyboard.json similarity index 100% rename from keyboards/viktus/sp111_v2/info.json rename to keyboards/viktus/sp111_v2/keyboard.json diff --git a/keyboards/viktus/sp111_v2/rules.mk b/keyboards/viktus/sp111_v2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/viktus/sp111_v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/werk_technica/one/info.json b/keyboards/werk_technica/one/keyboard.json similarity index 100% rename from keyboards/werk_technica/one/info.json rename to keyboards/werk_technica/one/keyboard.json diff --git a/keyboards/werk_technica/one/rules.mk b/keyboards/werk_technica/one/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/werk_technica/one/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/westm/westm68/rev1/info.json b/keyboards/westm/westm68/rev1/keyboard.json similarity index 100% rename from keyboards/westm/westm68/rev1/info.json rename to keyboards/westm/westm68/rev1/keyboard.json diff --git a/keyboards/westm/westm68/rev1/rules.mk b/keyboards/westm/westm68/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/westm/westm68/rev2/info.json b/keyboards/westm/westm68/rev2/keyboard.json similarity index 100% rename from keyboards/westm/westm68/rev2/info.json rename to keyboards/westm/westm68/rev2/keyboard.json diff --git a/keyboards/westm/westm68/rev2/rules.mk b/keyboards/westm/westm68/rev2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/westm/westm9/rev1/info.json b/keyboards/westm/westm9/rev1/keyboard.json similarity index 100% rename from keyboards/westm/westm9/rev1/info.json rename to keyboards/westm/westm9/rev1/keyboard.json diff --git a/keyboards/westm/westm9/rev1/rules.mk b/keyboards/westm/westm9/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/westm/westm9/rev2/info.json b/keyboards/westm/westm9/rev2/keyboard.json similarity index 100% rename from keyboards/westm/westm9/rev2/info.json rename to keyboards/westm/westm9/rev2/keyboard.json diff --git a/keyboards/westm/westm9/rev2/rules.mk b/keyboards/westm/westm9/rev2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/wilba_tech/wt20_h1/info.json b/keyboards/wilba_tech/wt20_h1/keyboard.json similarity index 100% rename from keyboards/wilba_tech/wt20_h1/info.json rename to keyboards/wilba_tech/wt20_h1/keyboard.json diff --git a/keyboards/wilba_tech/wt20_h1/rules.mk b/keyboards/wilba_tech/wt20_h1/rules.mk deleted file mode 100644 index c80812f6e0a..00000000000 --- a/keyboards/wilba_tech/wt20_h1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally blank diff --git a/keyboards/wilba_tech/wt60_d/info.json b/keyboards/wilba_tech/wt60_d/keyboard.json similarity index 100% rename from keyboards/wilba_tech/wt60_d/info.json rename to keyboards/wilba_tech/wt60_d/keyboard.json diff --git a/keyboards/wilba_tech/wt60_d/rules.mk b/keyboards/wilba_tech/wt60_d/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/wilba_tech/wt60_d/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/wilba_tech/wt65_g3/info.json b/keyboards/wilba_tech/wt65_g3/keyboard.json similarity index 100% rename from keyboards/wilba_tech/wt65_g3/info.json rename to keyboards/wilba_tech/wt65_g3/keyboard.json diff --git a/keyboards/wilba_tech/wt65_g3/rules.mk b/keyboards/wilba_tech/wt65_g3/rules.mk deleted file mode 100644 index c80812f6e0a..00000000000 --- a/keyboards/wilba_tech/wt65_g3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally blank diff --git a/keyboards/wilba_tech/wt65_h2/info.json b/keyboards/wilba_tech/wt65_h2/keyboard.json similarity index 100% rename from keyboards/wilba_tech/wt65_h2/info.json rename to keyboards/wilba_tech/wt65_h2/keyboard.json diff --git a/keyboards/wilba_tech/wt65_h2/rules.mk b/keyboards/wilba_tech/wt65_h2/rules.mk deleted file mode 100644 index c80812f6e0a..00000000000 --- a/keyboards/wilba_tech/wt65_h2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally blank diff --git a/keyboards/wilba_tech/wt65_h3/info.json b/keyboards/wilba_tech/wt65_h3/keyboard.json similarity index 100% rename from keyboards/wilba_tech/wt65_h3/info.json rename to keyboards/wilba_tech/wt65_h3/keyboard.json diff --git a/keyboards/wilba_tech/wt65_h3/rules.mk b/keyboards/wilba_tech/wt65_h3/rules.mk deleted file mode 100644 index c80812f6e0a..00000000000 --- a/keyboards/wilba_tech/wt65_h3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally blank diff --git a/keyboards/willoucom/keypad/info.json b/keyboards/willoucom/keypad/keyboard.json similarity index 100% rename from keyboards/willoucom/keypad/info.json rename to keyboards/willoucom/keypad/keyboard.json diff --git a/keyboards/willoucom/keypad/rules.mk b/keyboards/willoucom/keypad/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/willoucom/keypad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/wolf/silhouette/info.json b/keyboards/wolf/silhouette/keyboard.json similarity index 100% rename from keyboards/wolf/silhouette/info.json rename to keyboards/wolf/silhouette/keyboard.json diff --git a/keyboards/wolf/silhouette/rules.mk b/keyboards/wolf/silhouette/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/wolf/twilight/info.json b/keyboards/wolf/twilight/keyboard.json similarity index 100% rename from keyboards/wolf/twilight/info.json rename to keyboards/wolf/twilight/keyboard.json diff --git a/keyboards/wolf/twilight/rules.mk b/keyboards/wolf/twilight/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/wolf/twilight/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/wolf/ziggurat/info.json b/keyboards/wolf/ziggurat/keyboard.json similarity index 100% rename from keyboards/wolf/ziggurat/info.json rename to keyboards/wolf/ziggurat/keyboard.json diff --git a/keyboards/wolf/ziggurat/rules.mk b/keyboards/wolf/ziggurat/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/wolf/ziggurat/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/work_louder/loop/rev1/info.json b/keyboards/work_louder/loop/rev1/keyboard.json similarity index 100% rename from keyboards/work_louder/loop/rev1/info.json rename to keyboards/work_louder/loop/rev1/keyboard.json diff --git a/keyboards/work_louder/loop/rev1/rules.mk b/keyboards/work_louder/loop/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/work_louder/loop/rev3/info.json b/keyboards/work_louder/loop/rev3/keyboard.json similarity index 100% rename from keyboards/work_louder/loop/rev3/info.json rename to keyboards/work_louder/loop/rev3/keyboard.json diff --git a/keyboards/work_louder/loop/rev3/rules.mk b/keyboards/work_louder/loop/rev3/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/work_louder/work_board/rev1/info.json b/keyboards/work_louder/work_board/rev1/keyboard.json similarity index 100% rename from keyboards/work_louder/work_board/rev1/info.json rename to keyboards/work_louder/work_board/rev1/keyboard.json diff --git a/keyboards/work_louder/work_board/rev1/rules.mk b/keyboards/work_louder/work_board/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/work_louder/work_board/rev3/info.json b/keyboards/work_louder/work_board/rev3/keyboard.json similarity index 100% rename from keyboards/work_louder/work_board/rev3/info.json rename to keyboards/work_louder/work_board/rev3/keyboard.json diff --git a/keyboards/work_louder/work_board/rev3/rules.mk b/keyboards/work_louder/work_board/rev3/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/wuque/nemui65/info.json b/keyboards/wuque/nemui65/keyboard.json similarity index 100% rename from keyboards/wuque/nemui65/info.json rename to keyboards/wuque/nemui65/keyboard.json diff --git a/keyboards/wuque/nemui65/rules.mk b/keyboards/wuque/nemui65/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/wuque/nemui65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/yandrstudio/transition80/info.json b/keyboards/yandrstudio/transition80/keyboard.json similarity index 100% rename from keyboards/yandrstudio/transition80/info.json rename to keyboards/yandrstudio/transition80/keyboard.json diff --git a/keyboards/yandrstudio/transition80/rules.mk b/keyboards/yandrstudio/transition80/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/yandrstudio/transition80/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/yanghu/unicorne/f411/info.json b/keyboards/yanghu/unicorne/f411/keyboard.json similarity index 100% rename from keyboards/yanghu/unicorne/f411/info.json rename to keyboards/yanghu/unicorne/f411/keyboard.json diff --git a/keyboards/yanghu/unicorne/f411/rules.mk b/keyboards/yanghu/unicorne/f411/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ydkb/ydpm40/info.json b/keyboards/ydkb/ydpm40/keyboard.json similarity index 100% rename from keyboards/ydkb/ydpm40/info.json rename to keyboards/ydkb/ydpm40/keyboard.json diff --git a/keyboards/ydkb/ydpm40/rules.mk b/keyboards/ydkb/ydpm40/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ydkb/ydpm40/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ymdk/melody96/hotswap/info.json b/keyboards/ymdk/melody96/hotswap/keyboard.json similarity index 100% rename from keyboards/ymdk/melody96/hotswap/info.json rename to keyboards/ymdk/melody96/hotswap/keyboard.json diff --git a/keyboards/ymdk/melody96/hotswap/rules.mk b/keyboards/ymdk/melody96/hotswap/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ymdk/melody96/hotswap/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ymdk/yd60mq/12led/info.json b/keyboards/ymdk/yd60mq/12led/keyboard.json similarity index 100% rename from keyboards/ymdk/yd60mq/12led/info.json rename to keyboards/ymdk/yd60mq/12led/keyboard.json diff --git a/keyboards/ymdk/yd60mq/12led/rules.mk b/keyboards/ymdk/yd60mq/12led/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ymdk/yd60mq/16led/info.json b/keyboards/ymdk/yd60mq/16led/keyboard.json similarity index 100% rename from keyboards/ymdk/yd60mq/16led/info.json rename to keyboards/ymdk/yd60mq/16led/keyboard.json diff --git a/keyboards/ymdk/yd60mq/16led/rules.mk b/keyboards/ymdk/yd60mq/16led/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/ymdk/ymd09/info.json b/keyboards/ymdk/ymd09/keyboard.json similarity index 100% rename from keyboards/ymdk/ymd09/info.json rename to keyboards/ymdk/ymd09/keyboard.json diff --git a/keyboards/ymdk/ymd09/rules.mk b/keyboards/ymdk/ymd09/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ymdk/ymd09/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ymdk/ymd75/rev4/iso/info.json b/keyboards/ymdk/ymd75/rev4/iso/keyboard.json similarity index 100% rename from keyboards/ymdk/ymd75/rev4/iso/info.json rename to keyboards/ymdk/ymd75/rev4/iso/keyboard.json diff --git a/keyboards/ymdk/ymd75/rev4/iso/rules.mk b/keyboards/ymdk/ymd75/rev4/iso/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ymdk/ymd75/rev4/iso/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/yushakobo/ergo68/info.json b/keyboards/yushakobo/ergo68/keyboard.json similarity index 100% rename from keyboards/yushakobo/ergo68/info.json rename to keyboards/yushakobo/ergo68/keyboard.json diff --git a/keyboards/yushakobo/ergo68/rules.mk b/keyboards/yushakobo/ergo68/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/yushakobo/ergo68/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/yushakobo/navpad/10/rev0/info.json b/keyboards/yushakobo/navpad/10/rev0/keyboard.json similarity index 100% rename from keyboards/yushakobo/navpad/10/rev0/info.json rename to keyboards/yushakobo/navpad/10/rev0/keyboard.json diff --git a/keyboards/yushakobo/navpad/10/rev0/rules.mk b/keyboards/yushakobo/navpad/10/rev0/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/yushakobo/navpad/10/rev1/info.json b/keyboards/yushakobo/navpad/10/rev1/keyboard.json similarity index 100% rename from keyboards/yushakobo/navpad/10/rev1/info.json rename to keyboards/yushakobo/navpad/10/rev1/keyboard.json diff --git a/keyboards/yushakobo/navpad/10/rev1/rules.mk b/keyboards/yushakobo/navpad/10/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/yynmt/acperience12/rev1/info.json b/keyboards/yynmt/acperience12/rev1/keyboard.json similarity index 100% rename from keyboards/yynmt/acperience12/rev1/info.json rename to keyboards/yynmt/acperience12/rev1/keyboard.json diff --git a/keyboards/yynmt/acperience12/rev1/rules.mk b/keyboards/yynmt/acperience12/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/zeix/eden/info.json b/keyboards/zeix/eden/keyboard.json similarity index 100% rename from keyboards/zeix/eden/info.json rename to keyboards/zeix/eden/keyboard.json diff --git a/keyboards/zeix/eden/rules.mk b/keyboards/zeix/eden/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/zeix/eden/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/zeix/qwertyqop60hs/info.json b/keyboards/zeix/qwertyqop60hs/keyboard.json similarity index 100% rename from keyboards/zeix/qwertyqop60hs/info.json rename to keyboards/zeix/qwertyqop60hs/keyboard.json diff --git a/keyboards/zeix/qwertyqop60hs/rules.mk b/keyboards/zeix/qwertyqop60hs/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/zeix/qwertyqop60hs/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/zicodia/tklfrlnrlmlao/info.json b/keyboards/zicodia/tklfrlnrlmlao/keyboard.json similarity index 100% rename from keyboards/zicodia/tklfrlnrlmlao/info.json rename to keyboards/zicodia/tklfrlnrlmlao/keyboard.json diff --git a/keyboards/zicodia/tklfrlnrlmlao/rules.mk b/keyboards/zicodia/tklfrlnrlmlao/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/zicodia/tklfrlnrlmlao/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/zlabkeeb/15pad/info.json b/keyboards/zlabkeeb/15pad/keyboard.json similarity index 100% rename from keyboards/zlabkeeb/15pad/info.json rename to keyboards/zlabkeeb/15pad/keyboard.json diff --git a/keyboards/zlabkeeb/15pad/rules.mk b/keyboards/zlabkeeb/15pad/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/zlabkeeb/15pad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/zlabkeeb/6pad/info.json b/keyboards/zlabkeeb/6pad/keyboard.json similarity index 100% rename from keyboards/zlabkeeb/6pad/info.json rename to keyboards/zlabkeeb/6pad/keyboard.json diff --git a/keyboards/zlabkeeb/6pad/rules.mk b/keyboards/zlabkeeb/6pad/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/zlabkeeb/6pad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/zos/65s/info.json b/keyboards/zos/65s/keyboard.json similarity index 100% rename from keyboards/zos/65s/info.json rename to keyboards/zos/65s/keyboard.json diff --git a/keyboards/zos/65s/rules.mk b/keyboards/zos/65s/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/zos/65s/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/zvecr/zv48/f411/info.json b/keyboards/zvecr/zv48/f411/keyboard.json similarity index 100% rename from keyboards/zvecr/zv48/f411/info.json rename to keyboards/zvecr/zv48/f411/keyboard.json diff --git a/keyboards/zvecr/zv48/f411/rules.mk b/keyboards/zvecr/zv48/f411/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/zwag/zwag75/info.json b/keyboards/zwag/zwag75/keyboard.json similarity index 100% rename from keyboards/zwag/zwag75/info.json rename to keyboards/zwag/zwag75/keyboard.json diff --git a/keyboards/zwag/zwag75/rules.mk b/keyboards/zwag/zwag75/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/zwag/zwag75/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/zykrah/fuyu/info.json b/keyboards/zykrah/fuyu/keyboard.json similarity index 100% rename from keyboards/zykrah/fuyu/info.json rename to keyboards/zykrah/fuyu/keyboard.json diff --git a/keyboards/zykrah/fuyu/rules.mk b/keyboards/zykrah/fuyu/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/zykrah/slime88/info.json b/keyboards/zykrah/slime88/keyboard.json similarity index 100% rename from keyboards/zykrah/slime88/info.json rename to keyboards/zykrah/slime88/keyboard.json diff --git a/keyboards/zykrah/slime88/rules.mk b/keyboards/zykrah/slime88/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/zykrah/slime88/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank From 76bd5142cfed1fb8e07b9f32fb0b010fbc068fa4 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 30 Mar 2024 06:51:57 -0700 Subject: [PATCH 079/333] Data-Driven Keyboard Conversions: 0-9 (#23357) --- keyboards/0xc7/61key/config.h | 39 ------ keyboards/0xc7/61key/keyboard.json | 6 + keyboards/0xcb/1337/config.h | 4 - keyboards/0xcb/1337/keyboard.json | 6 + keyboards/0xcb/static/config.h | 5 - keyboards/0xcb/static/keyboard.json | 4 + keyboards/1upkeyboards/1up60hse/config.h | 39 ------ keyboards/1upkeyboards/1up60hse/keyboard.json | 6 + keyboards/1upkeyboards/1up60hte/config.h | 25 ---- keyboards/1upkeyboards/1up60hte/keyboard.json | 6 + keyboards/1upkeyboards/1up60rgb/config.h | 7 - keyboards/1upkeyboards/1up60rgb/keyboard.json | 6 + keyboards/1upkeyboards/pi60/config.h | 9 -- keyboards/1upkeyboards/pi60/keyboard.json | 6 + keyboards/1upkeyboards/pi60_hse/config.h | 9 -- keyboards/1upkeyboards/pi60_hse/keyboard.json | 6 + keyboards/1upkeyboards/pi60_rgb/config.h | 9 -- keyboards/1upkeyboards/pi60_rgb/keyboard.json | 6 + keyboards/1upkeyboards/super16/config.h | 40 ------ keyboards/1upkeyboards/super16/keyboard.json | 6 + keyboards/1upkeyboards/super16v2/config.h | 5 - .../1upkeyboards/super16v2/keyboard.json | 6 + keyboards/1upkeyboards/sweet16/config.h | 7 - keyboards/1upkeyboards/sweet16/v1/info.json | 33 ----- .../1upkeyboards/sweet16/v1/keyboard.json | 99 ++++++++++++++ keyboards/1upkeyboards/sweet16/v1/rules.mk | 4 - .../1upkeyboards/sweet16v2/kb2040/config.h | 22 --- .../sweet16v2/kb2040/keyboard.json | 6 + .../1upkeyboards/sweet16v2/pro_micro/config.h | 22 --- .../sweet16v2/pro_micro/keyboard.json | 6 + keyboards/25keys/aleth42/info.json | 10 -- keyboards/25keys/aleth42/rev0/config.h | 23 ---- .../aleth42/rev0/{info.json => keyboard.json} | 20 +++ keyboards/25keys/aleth42/rev0/rules.mk | 12 -- keyboards/25keys/aleth42/rev1/config.h | 23 ---- .../aleth42/rev1/{info.json => keyboard.json} | 21 +++ keyboards/25keys/aleth42/rev1/rules.mk | 12 -- .../cassette42/{info.json => keyboard.json} | 8 ++ keyboards/25keys/cassette42/rules.mk | 15 --- keyboards/25keys/zinc/info.json | 15 --- .../zinc/rev1/{info.json => keyboard.json} | 19 +++ keyboards/25keys/zinc/rev1/rules.mk | 1 - .../zinc/reva/{info.json => keyboard.json} | 19 +++ keyboards/25keys/zinc/reva/rules.mk | 1 - keyboards/25keys/zinc/rules.mk | 14 -- keyboards/2key2crawl/config.h | 7 - keyboards/2key2crawl/keyboard.json | 6 + keyboards/40percentclub/25/config.h | 5 - .../25/{info.json => keyboard.json} | 14 ++ keyboards/40percentclub/25/rules.mk | 15 --- keyboards/40percentclub/4pack/config.h | 39 ------ keyboards/40percentclub/4pack/keyboard.json | 6 + keyboards/40percentclub/4x4/config.h | 24 ---- .../4x4/{info.json => keyboard.json} | 13 ++ keyboards/40percentclub/4x4/rules.mk | 12 -- keyboards/40percentclub/5x5/config.h | 24 ---- keyboards/40percentclub/5x5/keyboard.json | 6 + keyboards/40percentclub/6lit/config.h | 5 - .../6lit/{info.json => keyboard.json} | 14 ++ keyboards/40percentclub/6lit/rules.mk | 15 --- keyboards/40percentclub/foobar/config.h | 5 - .../foobar/{info.json => keyboard.json} | 14 ++ keyboards/40percentclub/foobar/rules.mk | 15 --- keyboards/40percentclub/half_n_half/config.h | 39 ------ .../half_n_half/{info.json => keyboard.json} | 14 ++ keyboards/40percentclub/half_n_half/rules.mk | 15 --- keyboards/40percentclub/i75/config.h | 38 ------ keyboards/40percentclub/i75/info.json | 125 +++++++++++++++--- .../40percentclub/i75/promicro/keyboard.json | 88 +----------- .../40percentclub/i75/teensy2/keyboard.json | 88 +----------- keyboards/40percentclub/luddite/config.h | 7 - keyboards/40percentclub/luddite/keyboard.json | 6 + keyboards/40percentclub/mf68/config.h | 39 ------ keyboards/40percentclub/mf68/keyboard.json | 6 + keyboards/40percentclub/nein/config.h | 38 ------ keyboards/40percentclub/nein/keyboard.json | 6 + keyboards/40percentclub/nori/config.h | 38 ------ .../nori/{info.json => keyboard.json} | 15 +++ keyboards/40percentclub/nori/rules.mk | 13 -- keyboards/40percentclub/polyandry/config.h | 40 ------ keyboards/40percentclub/polyandry/info.json | 27 ++++ .../polyandry/promicro/keyboard.json | 23 +--- .../polyandry/teensy2/keyboard.json | 23 +--- keyboards/40percentclub/tomato/config.h | 7 - keyboards/40percentclub/tomato/keyboard.json | 9 ++ keyboards/40percentclub/ut47/config.h | 5 - .../ut47/{info.json => keyboard.json} | 13 ++ keyboards/40percentclub/ut47/rules.mk | 13 -- keyboards/45_ats/config.h | 25 ---- keyboards/45_ats/keyboard.json | 6 + .../rev_b/{info.json => keyboard.json} | 7 + keyboards/4pplet/aekiso60/rev_b/rules.mk | 14 -- .../4pplet/eagle_viper_rep/rev_a/config.h | 5 - .../rev_a/{info.json => keyboard.json} | 16 +++ .../4pplet/eagle_viper_rep/rev_a/rules.mk | 13 -- .../4pplet/eagle_viper_rep/rev_b/config.h | 5 - .../rev_b/{info.json => keyboard.json} | 15 +++ .../4pplet/eagle_viper_rep/rev_b/rules.mk | 13 -- .../rev_a/{info.json => keyboard.json} | 3 +- keyboards/4pplet/steezy60/rev_a/rules.mk | 4 - .../rev_b/{info.json => keyboard.json} | 3 +- keyboards/4pplet/steezy60/rev_b/rules.mk | 6 - .../rev_a/{info.json => keyboard.json} | 3 +- .../4pplet/unextended_std/rev_a/rules.mk | 6 - .../rev_d/{info.json => keyboard.json} | 7 + keyboards/4pplet/waffling60/rev_d/rules.mk | 14 -- .../rev_d_ansi/{info.json => keyboard.json} | 6 + .../4pplet/waffling60/rev_d_ansi/rules.mk | 14 -- .../rev_d_iso/{info.json => keyboard.json} | 5 + .../4pplet/waffling60/rev_d_iso/rules.mk | 14 -- .../rev_b/{info.json => keyboard.json} | 7 + keyboards/4pplet/waffling80/rev_b/rules.mk | 14 -- keyboards/4pplet/yakiimo/rev_a/config.h | 22 --- keyboards/4pplet/yakiimo/rev_a/keyboard.json | 6 + keyboards/8pack/config.h | 7 - keyboards/8pack/info.json | 6 + 116 files changed, 630 insertions(+), 1277 deletions(-) delete mode 100644 keyboards/0xc7/61key/config.h delete mode 100644 keyboards/1upkeyboards/1up60hse/config.h delete mode 100644 keyboards/1upkeyboards/1up60hte/config.h delete mode 100644 keyboards/1upkeyboards/1up60rgb/config.h delete mode 100644 keyboards/1upkeyboards/pi60/config.h delete mode 100644 keyboards/1upkeyboards/pi60_hse/config.h delete mode 100644 keyboards/1upkeyboards/pi60_rgb/config.h delete mode 100644 keyboards/1upkeyboards/super16/config.h delete mode 100644 keyboards/1upkeyboards/sweet16/config.h delete mode 100644 keyboards/1upkeyboards/sweet16/v1/info.json create mode 100644 keyboards/1upkeyboards/sweet16/v1/keyboard.json delete mode 100644 keyboards/1upkeyboards/sweet16/v1/rules.mk delete mode 100644 keyboards/1upkeyboards/sweet16v2/kb2040/config.h delete mode 100644 keyboards/1upkeyboards/sweet16v2/pro_micro/config.h delete mode 100644 keyboards/25keys/aleth42/info.json delete mode 100644 keyboards/25keys/aleth42/rev0/config.h rename keyboards/25keys/aleth42/rev0/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/25keys/aleth42/rev0/rules.mk delete mode 100644 keyboards/25keys/aleth42/rev1/config.h rename keyboards/25keys/aleth42/rev1/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/25keys/aleth42/rev1/rules.mk rename keyboards/25keys/cassette42/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/25keys/zinc/info.json rename keyboards/25keys/zinc/rev1/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/25keys/zinc/rev1/rules.mk rename keyboards/25keys/zinc/reva/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/25keys/zinc/reva/rules.mk delete mode 100644 keyboards/2key2crawl/config.h rename keyboards/40percentclub/25/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/40percentclub/25/rules.mk delete mode 100644 keyboards/40percentclub/4pack/config.h delete mode 100644 keyboards/40percentclub/4x4/config.h rename keyboards/40percentclub/4x4/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/40percentclub/5x5/config.h rename keyboards/40percentclub/6lit/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/40percentclub/6lit/rules.mk rename keyboards/40percentclub/foobar/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/40percentclub/foobar/rules.mk delete mode 100644 keyboards/40percentclub/half_n_half/config.h rename keyboards/40percentclub/half_n_half/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/40percentclub/half_n_half/rules.mk delete mode 100644 keyboards/40percentclub/i75/config.h delete mode 100644 keyboards/40percentclub/luddite/config.h delete mode 100644 keyboards/40percentclub/mf68/config.h delete mode 100644 keyboards/40percentclub/nein/config.h delete mode 100644 keyboards/40percentclub/nori/config.h rename keyboards/40percentclub/nori/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/40percentclub/polyandry/config.h delete mode 100644 keyboards/40percentclub/tomato/config.h rename keyboards/40percentclub/ut47/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/45_ats/config.h rename keyboards/4pplet/aekiso60/rev_b/{info.json => keyboard.json} (86%) rename keyboards/4pplet/eagle_viper_rep/rev_a/{info.json => keyboard.json} (99%) rename keyboards/4pplet/eagle_viper_rep/rev_b/{info.json => keyboard.json} (99%) rename keyboards/4pplet/steezy60/rev_a/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/4pplet/steezy60/rev_a/rules.mk rename keyboards/4pplet/steezy60/rev_b/{info.json => keyboard.json} (99%) rename keyboards/4pplet/unextended_std/rev_a/{info.json => keyboard.json} (99%) rename keyboards/4pplet/waffling60/rev_d/{info.json => keyboard.json} (96%) rename keyboards/4pplet/waffling60/rev_d_ansi/{info.json => keyboard.json} (97%) rename keyboards/4pplet/waffling60/rev_d_iso/{info.json => keyboard.json} (99%) rename keyboards/4pplet/waffling80/rev_b/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/8pack/config.h diff --git a/keyboards/0xc7/61key/config.h b/keyboards/0xc7/61key/config.h deleted file mode 100644 index 244a5f192df..00000000000 --- a/keyboards/0xc7/61key/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 0xC7 - -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/0xc7/61key/keyboard.json b/keyboards/0xc7/61key/keyboard.json index 6585b970c1e..ab5127db38a 100644 --- a/keyboards/0xc7/61key/keyboard.json +++ b/keyboards/0xc7/61key/keyboard.json @@ -20,6 +20,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h index 5791b324b65..5fec622271c 100644 --- a/keyboards/0xcb/1337/config.h +++ b/keyboards/0xcb/1337/config.h @@ -19,10 +19,6 @@ along with this program. If not, see . /* default setup after eeprom reset */ #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2 -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE /* Oled Size */ #define OLED_DISPLAY_128X64 #define OLED_FONT_END 255 diff --git a/keyboards/0xcb/1337/keyboard.json b/keyboards/0xcb/1337/keyboard.json index 5b583dc291b..f264d4ed065 100644 --- a/keyboards/0xcb/1337/keyboard.json +++ b/keyboards/0xcb/1337/keyboard.json @@ -19,6 +19,10 @@ ] }, "qmk": { + "locking": { + "enabled": true, + "resync": true + }, "tap_keycode_delay": 10 }, "qmk_lufa_bootloader": { @@ -80,9 +84,11 @@ {"x": 0, "y": 0, "matrix": [0, 0]}, {"x": 1, "y": 0, "matrix": [0, 1]}, {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 0, "y": 1, "matrix": [1, 0]}, {"x": 1, "y": 1, "matrix": [1, 1]}, {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 0, "y": 2, "matrix": [2, 0]}, {"x": 1, "y": 2, "matrix": [2, 1]}, {"x": 2, "y": 2, "matrix": [2, 2]} diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h index 179c84088bb..60d9ff232a9 100644 --- a/keyboards/0xcb/static/config.h +++ b/keyboards/0xcb/static/config.h @@ -16,11 +16,6 @@ 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 - /* oled custom font */ #define OLED_FONT_END 255 #define OLED_FONT_H "gfxfont.c" diff --git a/keyboards/0xcb/static/keyboard.json b/keyboards/0xcb/static/keyboard.json index cd3d4928707..73a6a802cc5 100644 --- a/keyboards/0xcb/static/keyboard.json +++ b/keyboards/0xcb/static/keyboard.json @@ -32,6 +32,10 @@ ] }, "qmk": { + "locking": { + "enabled": true, + "resync": true + }, "tap_keycode_delay": 10 }, "processor": "atmega328p", diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h deleted file mode 100644 index d876570c808..00000000000 --- a/keyboards/1upkeyboards/1up60hse/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 MechMerlin - -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/1upkeyboards/1up60hse/keyboard.json b/keyboards/1upkeyboards/1up60hse/keyboard.json index ac8d5247121..990b51c1f84 100644 --- a/keyboards/1upkeyboards/1up60hse/keyboard.json +++ b/keyboards/1upkeyboards/1up60hse/keyboard.json @@ -31,6 +31,12 @@ "levels": 5, "breathing": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h deleted file mode 100644 index eddf290b4c3..00000000000 --- a/keyboards/1upkeyboards/1up60hte/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2019 Bubnick - -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 diff --git a/keyboards/1upkeyboards/1up60hte/keyboard.json b/keyboards/1upkeyboards/1up60hte/keyboard.json index 25f519bea79..53e91017ddc 100644 --- a/keyboards/1upkeyboards/1up60hte/keyboard.json +++ b/keyboards/1upkeyboards/1up60hte/keyboard.json @@ -26,6 +26,12 @@ "rows": ["B3", "B2", "B1", "B0", "D4"] }, "diode_direction": "COL2ROW", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "B7" }, diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/1upkeyboards/1up60rgb/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/1upkeyboards/1up60rgb/keyboard.json b/keyboards/1upkeyboards/1up60rgb/keyboard.json index 2985b5ae4f7..f4ba1112511 100644 --- a/keyboards/1upkeyboards/1up60rgb/keyboard.json +++ b/keyboards/1upkeyboards/1up60rgb/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/1upkeyboards/pi60/config.h b/keyboards/1upkeyboards/pi60/config.h deleted file mode 100644 index a697e565c9b..00000000000 --- a/keyboards/1upkeyboards/pi60/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2022 ziptyze (@ziptyze) -// 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 \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi60/keyboard.json b/keyboards/1upkeyboards/pi60/keyboard.json index 71619db3605..45c3876a6b6 100644 --- a/keyboards/1upkeyboards/pi60/keyboard.json +++ b/keyboards/1upkeyboards/pi60/keyboard.json @@ -24,6 +24,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "GP17", "driver": "vendor" diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h deleted file mode 100644 index 2c04274299f..00000000000 --- a/keyboards/1upkeyboards/pi60_hse/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2022 ziptyze (@ziptyze) -// 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/1upkeyboards/pi60_hse/keyboard.json b/keyboards/1upkeyboards/pi60_hse/keyboard.json index 204e42f48c7..d5a5f861873 100644 --- a/keyboards/1upkeyboards/pi60_hse/keyboard.json +++ b/keyboards/1upkeyboards/pi60_hse/keyboard.json @@ -23,6 +23,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "GP15", "driver": "vendor" diff --git a/keyboards/1upkeyboards/pi60_rgb/config.h b/keyboards/1upkeyboards/pi60_rgb/config.h deleted file mode 100644 index 2c04274299f..00000000000 --- a/keyboards/1upkeyboards/pi60_rgb/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2022 ziptyze (@ziptyze) -// 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/1upkeyboards/pi60_rgb/keyboard.json b/keyboards/1upkeyboards/pi60_rgb/keyboard.json index b6580e616a4..21dab3f71ae 100644 --- a/keyboards/1upkeyboards/pi60_rgb/keyboard.json +++ b/keyboards/1upkeyboards/pi60_rgb/keyboard.json @@ -23,6 +23,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "GP19", "driver": "vendor" diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h deleted file mode 100644 index 043d8b154b1..00000000000 --- a/keyboards/1upkeyboards/super16/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2019 MechMerlin - -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/1upkeyboards/super16/keyboard.json b/keyboards/1upkeyboards/super16/keyboard.json index 4bc18e98f73..9da4168d471 100644 --- a/keyboards/1upkeyboards/super16/keyboard.json +++ b/keyboards/1upkeyboards/super16/keyboard.json @@ -86,6 +86,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "F6", "F7"], "rows": ["D1", "D0", "F4", "F5"] diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h index 67af6d7cab8..6abfa8f431a 100644 --- a/keyboards/1upkeyboards/super16v2/config.h +++ b/keyboards/1upkeyboards/super16v2/config.h @@ -18,11 +18,6 @@ #define MOUSEKEY_MOVE_DELTA 25 -/* 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. diff --git a/keyboards/1upkeyboards/super16v2/keyboard.json b/keyboards/1upkeyboards/super16v2/keyboard.json index 3bc7bf0e07f..652b03006e1 100644 --- a/keyboards/1upkeyboards/super16v2/keyboard.json +++ b/keyboards/1upkeyboards/super16v2/keyboard.json @@ -59,6 +59,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D6", "C2", "D0"], "rows": ["D1", "D2", "D3", "D4"] diff --git a/keyboards/1upkeyboards/sweet16/config.h b/keyboards/1upkeyboards/sweet16/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/1upkeyboards/sweet16/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json deleted file mode 100644 index bbecccae020..00000000000 --- a/keyboards/1upkeyboards/sweet16/v1/info.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "usb": { - "pid": "0x0161", - "device_version": "0.0.1" - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 1, - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } - }, - "ws2812": { - "pin": "B1" - }, - "matrix_pins": { - "cols": ["D1", "D0", "D4", "C6"], - "rows": ["F4", "F5", "F6", "F7"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "caterina" -} diff --git a/keyboards/1upkeyboards/sweet16/v1/keyboard.json b/keyboards/1upkeyboards/sweet16/v1/keyboard.json new file mode 100644 index 00000000000..3ac73ce8eb0 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v1/keyboard.json @@ -0,0 +1,99 @@ +{ + "keyboard_name": "Sweet16", + "manufacturer": "1up Keyboards", + "url": "", + "maintainer": "skullydazed", + "usb": { + "vid": "0x6F75", + "pid": "0x0161", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, + "build": { + "lto": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, + "led_count": 1, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "ws2812": { + "pin": "B1" + }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "caterina", + "layouts": { + "LAYOUT_ortho_4x4": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3} + ] + }, + "LAYOUT_numpad_4x4": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2, "h": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 2], "x": 2, "y": 3} + ] + } + } +} diff --git a/keyboards/1upkeyboards/sweet16/v1/rules.mk b/keyboards/1upkeyboards/sweet16/v1/rules.mk deleted file mode 100644 index 0912a1b4a60..00000000000 --- a/keyboards/1upkeyboards/sweet16/v1/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -RGBLIGHT_ENABLE = yes -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality - -LTO_ENABLE = yes diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h deleted file mode 100644 index 39e43b90cd3..00000000000 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2022 ziptyze - * - * 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 diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json b/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json index 0d09632a995..d8d6c5e3eae 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json @@ -21,6 +21,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "GP6", "driver": "vendor" diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h deleted file mode 100644 index 39e43b90cd3..00000000000 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2022 ziptyze - * - * 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 diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json index d23bc6633d2..d46f723a17e 100644 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json @@ -20,6 +20,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "D7" }, diff --git a/keyboards/25keys/aleth42/info.json b/keyboards/25keys/aleth42/info.json deleted file mode 100644 index 2000c037f58..00000000000 --- a/keyboards/25keys/aleth42/info.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "keyboard_name": "ALETH42", - "manufacturer": "25KEYS", - "url": "http://www.sho-k.co.uk/tech/aleth42", - "maintainer": "monksoffunk", - "usb": { - "vid": "0x04D8", - "pid": "0xEAC8" - } -} diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h deleted file mode 100644 index 0d7a5de5605..00000000000 --- a/keyboards/25keys/aleth42/rev0/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 monksoffunk - -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 diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/keyboard.json similarity index 87% rename from keyboards/25keys/aleth42/rev0/info.json rename to keyboards/25keys/aleth42/rev0/keyboard.json index 675c741bf52..bbb566d9096 100644 --- a/keyboards/25keys/aleth42/rev0/info.json +++ b/keyboards/25keys/aleth42/rev0/keyboard.json @@ -1,7 +1,27 @@ { + "keyboard_name": "ALETH42", + "manufacturer": "25KEYS", + "url": "http://www.sho-k.co.uk/tech/aleth42", + "maintainer": "monksoffunk", "usb": { + "vid": "0x04D8", + "pid": "0xEAC8", "device_version": "0.0.0" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "rgblight": true, + "encoder": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2", "C4", "C5", "C6"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/25keys/aleth42/rev0/rules.mk b/keyboards/25keys/aleth42/rev0/rules.mk deleted file mode 100644 index e0954e7355b..00000000000 --- a/keyboards/25keys/aleth42/rev0/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 = 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 = yes # Enable keyboard RGB underglow -ENCODER_ENABLE = yes diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h deleted file mode 100644 index 0d7a5de5605..00000000000 --- a/keyboards/25keys/aleth42/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 monksoffunk - -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 diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/keyboard.json similarity index 87% rename from keyboards/25keys/aleth42/rev1/info.json rename to keyboards/25keys/aleth42/rev1/keyboard.json index fd4b07fe3ee..0feab708a01 100644 --- a/keyboards/25keys/aleth42/rev1/info.json +++ b/keyboards/25keys/aleth42/rev1/keyboard.json @@ -1,7 +1,28 @@ { + "keyboard_name": "ALETH42", + "manufacturer": "25KEYS", + "url": "http://www.sho-k.co.uk/tech/aleth42", + "maintainer": "monksoffunk", "usb": { + "vid": "0x04D8", + "pid": "0xEAC8", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0", "D6", "D4", "F7", "F0", "F1", "F4"], "rows": ["B4", "B0", "B2", "B1"] diff --git a/keyboards/25keys/aleth42/rev1/rules.mk b/keyboards/25keys/aleth42/rev1/rules.mk deleted file mode 100644 index 683b2498022..00000000000 --- a/keyboards/25keys/aleth42/rev1/rules.mk +++ /dev/null @@ -1,12 +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 = yes # 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 -ENCODER_ENABLE = yes diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/keyboard.json similarity index 89% rename from keyboards/25keys/cassette42/info.json rename to keyboards/25keys/cassette42/keyboard.json index 38a73368f63..cba2e612721 100644 --- a/keyboards/25keys/cassette42/info.json +++ b/keyboards/25keys/cassette42/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xCA42", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "rgblight": true, + "encoder": true, + "oled": true + }, "encoder": { "rotary": [ {"pin_a": "B6", "pin_b": "B2"}, diff --git a/keyboards/25keys/cassette42/rules.mk b/keyboards/25keys/cassette42/rules.mk index f8febbdec8d..788ba43e591 100644 --- a/keyboards/25keys/cassette42/rules.mk +++ b/keyboards/25keys/cassette42/rules.mk @@ -1,16 +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 = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes - SRC += ./common/oled_helper.c diff --git a/keyboards/25keys/zinc/info.json b/keyboards/25keys/zinc/info.json deleted file mode 100644 index 23502423168..00000000000 --- a/keyboards/25keys/zinc/info.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "manufacturer": "25KEYS", - "url": "https://github.com/monksoffunk/zinc", - "maintainer": "monksoffunk", - "usb": { - "vid": "0x04D8", - "pid": "0xEA3B", - "device_version": "0.0.1" - }, - "rgb_matrix": { - "driver": "ws2812" - }, - "processor": "atmega32u4", - "bootloader": "caterina" -} diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/keyboard.json similarity index 86% rename from keyboards/25keys/zinc/rev1/info.json rename to keyboards/25keys/zinc/rev1/keyboard.json index 47fb1f2e98e..c1bead2d8ab 100644 --- a/keyboards/25keys/zinc/rev1/info.json +++ b/keyboards/25keys/zinc/rev1/keyboard.json @@ -1,16 +1,35 @@ { "keyboard_name": "Zinc rev.1", + "manufacturer": "25KEYS", + "url": "https://github.com/monksoffunk/zinc", + "maintainer": "monksoffunk", + "usb": { + "vid": "0x04D8", + "pid": "0xEA3B", + "device_version": "0.0.1" + }, + "processor": "atmega32u4", + "bootloader": "caterina", "matrix_pins": { "cols": ["F4", "D4", "C6", "D7", "E6", "B4"], "rows": ["F6", "F7", "B1", "B3"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "tapping": { "term": 100 }, + "rgb_matrix": { + "driver": "ws2812" + }, "rgblight": { "hue_steps": 10 }, diff --git a/keyboards/25keys/zinc/rev1/rules.mk b/keyboards/25keys/zinc/rev1/rules.mk deleted file mode 100644 index d38a6180907..00000000000 --- a/keyboards/25keys/zinc/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -SPLIT_KEYBOARD = yes diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/keyboard.json similarity index 86% rename from keyboards/25keys/zinc/reva/info.json rename to keyboards/25keys/zinc/reva/keyboard.json index 1ab2fb7e38f..01d2291c491 100644 --- a/keyboards/25keys/zinc/reva/info.json +++ b/keyboards/25keys/zinc/reva/keyboard.json @@ -1,16 +1,35 @@ { "keyboard_name": "Zinc rev.A", + "manufacturer": "25KEYS", + "url": "https://github.com/monksoffunk/zinc", + "maintainer": "monksoffunk", + "usb": { + "vid": "0x04D8", + "pid": "0xEA3B", + "device_version": "0.0.1" + }, + "processor": "atmega32u4", + "bootloader": "caterina", "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "C6", "D7", "E6"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "tapping": { "term": 100 }, + "rgb_matrix": { + "driver": "ws2812" + }, "rgblight": { "hue_steps": 10 }, diff --git a/keyboards/25keys/zinc/reva/rules.mk b/keyboards/25keys/zinc/reva/rules.mk deleted file mode 100644 index 83895bdcb87..00000000000 --- a/keyboards/25keys/zinc/reva/rules.mk +++ /dev/null @@ -1 +0,0 @@ -SPLIT_KEYBOARD = yes \ No newline at end of file diff --git a/keyboards/25keys/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk index 1e1d687ebbe..a8c773a3054 100644 --- a/keyboards/25keys/zinc/rules.mk +++ b/keyboards/25keys/zinc/rules.mk @@ -1,17 +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 # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -RGB_MATRIX_ENABLE = no - DEFAULT_FOLDER = 25keys/zinc/rev1 #SRC += i2c.c diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/2key2crawl/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/2key2crawl/keyboard.json b/keyboards/2key2crawl/keyboard.json index 4dfecbd696f..fec55c811a6 100644 --- a/keyboards/2key2crawl/keyboard.json +++ b/keyboards/2key2crawl/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "B4", "B5", "B6", "B7", "C7", "B2"], "rows": ["C4", "C5"] diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h index 20ecf947080..1710ba42ee9 100644 --- a/keyboards/40percentclub/25/config.h +++ b/keyboards/40percentclub/25/config.h @@ -21,11 +21,6 @@ //#define MASTER_RIGHT //#define EE_HANDS -/* 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. diff --git a/keyboards/40percentclub/25/info.json b/keyboards/40percentclub/25/keyboard.json similarity index 94% rename from keyboards/40percentclub/25/info.json rename to keyboards/40percentclub/25/keyboard.json index b5ab2c0cbdb..aede80ef172 100644 --- a/keyboards/40percentclub/25/info.json +++ b/keyboards/40percentclub/25/keyboard.json @@ -13,7 +13,21 @@ "rows": ["D4", "C6", "D7", "E6", "B4"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/40percentclub/25/rules.mk b/keyboards/40percentclub/25/rules.mk deleted file mode 100644 index 25d4c400516..00000000000 --- a/keyboards/40percentclub/25/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 - -# Enable generic behavior for split boards -SPLIT_KEYBOARD = yes diff --git a/keyboards/40percentclub/4pack/config.h b/keyboards/40percentclub/4pack/config.h deleted file mode 100644 index b0cf6b6f6ae..00000000000 --- a/keyboards/40percentclub/4pack/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Arda Kilicdagi - -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/40percentclub/4pack/keyboard.json b/keyboards/40percentclub/4pack/keyboard.json index edfd64ad33e..a114e97dbbd 100644 --- a/keyboards/40percentclub/4pack/keyboard.json +++ b/keyboards/40percentclub/4pack/keyboard.json @@ -23,6 +23,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["E6", "D7", "C6", "D4"] diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h deleted file mode 100644 index 7caa265c1a1..00000000000 --- a/keyboards/40percentclub/4x4/config.h +++ /dev/null @@ -1,24 +0,0 @@ - - -#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/40percentclub/4x4/info.json b/keyboards/40percentclub/4x4/keyboard.json similarity index 97% rename from keyboards/40percentclub/4x4/info.json rename to keyboards/40percentclub/4x4/keyboard.json index aa5e0396375..735a3865da3 100644 --- a/keyboards/40percentclub/4x4/info.json +++ b/keyboards/40percentclub/4x4/keyboard.json @@ -15,6 +15,19 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x4", "ortho_4x12"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/40percentclub/4x4/rules.mk b/keyboards/40percentclub/4x4/rules.mk index dfb1a682dcb..16051206467 100644 --- a/keyboards/40percentclub/4x4/rules.mk +++ b/keyboards/40percentclub/4x4/rules.mk @@ -1,15 +1,3 @@ -# 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 - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h deleted file mode 100644 index 7caa265c1a1..00000000000 --- a/keyboards/40percentclub/5x5/config.h +++ /dev/null @@ -1,24 +0,0 @@ - - -#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/40percentclub/5x5/keyboard.json b/keyboards/40percentclub/5x5/keyboard.json index 0a50d29ffe7..039d9fe47b1 100644 --- a/keyboards/40percentclub/5x5/keyboard.json +++ b/keyboards/40percentclub/5x5/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"], "rows": ["B2", "D1", "D0", "D4", "C6"] diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h index 20ecf947080..1710ba42ee9 100644 --- a/keyboards/40percentclub/6lit/config.h +++ b/keyboards/40percentclub/6lit/config.h @@ -21,11 +21,6 @@ //#define MASTER_RIGHT //#define EE_HANDS -/* 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. diff --git a/keyboards/40percentclub/6lit/info.json b/keyboards/40percentclub/6lit/keyboard.json similarity index 86% rename from keyboards/40percentclub/6lit/info.json rename to keyboards/40percentclub/6lit/keyboard.json index 00e91edb42f..06ffc890d2b 100644 --- a/keyboards/40percentclub/6lit/info.json +++ b/keyboards/40percentclub/6lit/keyboard.json @@ -13,7 +13,21 @@ "rows": ["D7", "E6"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/40percentclub/6lit/rules.mk b/keyboards/40percentclub/6lit/rules.mk deleted file mode 100644 index 25d4c400516..00000000000 --- a/keyboards/40percentclub/6lit/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 - -# Enable generic behavior for split boards -SPLIT_KEYBOARD = yes diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h index 20ecf947080..1710ba42ee9 100644 --- a/keyboards/40percentclub/foobar/config.h +++ b/keyboards/40percentclub/foobar/config.h @@ -21,11 +21,6 @@ //#define MASTER_RIGHT //#define EE_HANDS -/* 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. diff --git a/keyboards/40percentclub/foobar/info.json b/keyboards/40percentclub/foobar/keyboard.json similarity index 91% rename from keyboards/40percentclub/foobar/info.json rename to keyboards/40percentclub/foobar/keyboard.json index 89fc4d11a01..0a2769e04a6 100644 --- a/keyboards/40percentclub/foobar/info.json +++ b/keyboards/40percentclub/foobar/keyboard.json @@ -13,7 +13,21 @@ "rows": ["D7", "E6", "B4"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/40percentclub/foobar/rules.mk b/keyboards/40percentclub/foobar/rules.mk deleted file mode 100644 index 25d4c400516..00000000000 --- a/keyboards/40percentclub/foobar/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 - -# Enable generic behavior for split boards -SPLIT_KEYBOARD = yes diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h deleted file mode 100644 index 8b4ccf14793..00000000000 --- a/keyboards/40percentclub/half_n_half/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Boy_314 - -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/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/keyboard.json similarity index 91% rename from keyboards/40percentclub/half_n_half/info.json rename to keyboards/40percentclub/half_n_half/keyboard.json index 8174e639c23..3e0c646a500 100644 --- a/keyboards/40percentclub/half_n_half/info.json +++ b/keyboards/40percentclub/half_n_half/keyboard.json @@ -13,7 +13,21 @@ "rows": ["D4", "C6", "D7", "E6"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/40percentclub/half_n_half/rules.mk b/keyboards/40percentclub/half_n_half/rules.mk deleted file mode 100644 index 8ee80d039b8..00000000000 --- a/keyboards/40percentclub/half_n_half/rules.mk +++ /dev/null @@ -1,15 +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 -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 - -# Enable generic behavior for split boards -SPLIT_KEYBOARD = yes diff --git a/keyboards/40percentclub/i75/config.h b/keyboards/40percentclub/i75/config.h deleted file mode 100644 index 0fe9b9df213..00000000000 --- a/keyboards/40percentclub/i75/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2018 - * - * 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/40percentclub/i75/info.json b/keyboards/40percentclub/i75/info.json index f91b054f296..a7124adec22 100644 --- a/keyboards/40percentclub/i75/info.json +++ b/keyboards/40percentclub/i75/info.json @@ -1,19 +1,110 @@ { - "keyboard_name": "i75", - "manufacturer": "di0ib", - "url": "", - "maintainer": "qmk", - "features": { - "bootmagic": true, - "command": true, - "console": true, - "extrakey": true, - "mousekey": true, - "nkro": false - }, - "usb": { - "vid": "0x4025", - "pid": "0x0A0C", - "device_version": "1.7.5" - } + "keyboard_name": "i75", + "manufacturer": "di0ib", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4025", + "pid": "0x0A0C", + "device_version": "1.7.5" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "community_layouts": ["ortho_5x15"], + "layouts": { + "LAYOUT_ortho_5x15": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [1, 0], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 3], "x": 12, "y": 0}, + {"matrix": [1, 4], "x": 13, "y": 0}, + {"matrix": [1, 5], "x": 14, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1}, + {"matrix": [1, 7], "x": 1, "y": 1}, + {"matrix": [1, 8], "x": 2, "y": 1}, + {"matrix": [2, 0], "x": 3, "y": 1}, + {"matrix": [2, 1], "x": 4, "y": 1}, + {"matrix": [2, 2], "x": 5, "y": 1}, + {"matrix": [2, 3], "x": 6, "y": 1}, + {"matrix": [2, 4], "x": 7, "y": 1}, + {"matrix": [2, 5], "x": 8, "y": 1}, + {"matrix": [2, 6], "x": 9, "y": 1}, + {"matrix": [2, 7], "x": 10, "y": 1}, + {"matrix": [2, 8], "x": 11, "y": 1}, + {"matrix": [3, 0], "x": 12, "y": 1}, + {"matrix": [3, 1], "x": 13, "y": 1}, + {"matrix": [3, 2], "x": 14, "y": 1}, + + {"matrix": [3, 3], "x": 0, "y": 2}, + {"matrix": [3, 4], "x": 1, "y": 2}, + {"matrix": [3, 5], "x": 2, "y": 2}, + {"matrix": [3, 6], "x": 3, "y": 2}, + {"matrix": [3, 7], "x": 4, "y": 2}, + {"matrix": [3, 8], "x": 5, "y": 2}, + {"matrix": [4, 0], "x": 6, "y": 2}, + {"matrix": [4, 1], "x": 7, "y": 2}, + {"matrix": [4, 2], "x": 8, "y": 2}, + {"matrix": [4, 3], "x": 9, "y": 2}, + {"matrix": [4, 4], "x": 10, "y": 2}, + {"matrix": [4, 5], "x": 11, "y": 2}, + {"matrix": [4, 6], "x": 12, "y": 2}, + {"matrix": [4, 7], "x": 13, "y": 2}, + {"matrix": [4, 8], "x": 14, "y": 2}, + + {"matrix": [5, 0], "x": 0, "y": 3}, + {"matrix": [5, 1], "x": 1, "y": 3}, + {"matrix": [5, 2], "x": 2, "y": 3}, + {"matrix": [5, 3], "x": 3, "y": 3}, + {"matrix": [5, 4], "x": 4, "y": 3}, + {"matrix": [5, 5], "x": 5, "y": 3}, + {"matrix": [5, 6], "x": 6, "y": 3}, + {"matrix": [5, 7], "x": 7, "y": 3}, + {"matrix": [5, 8], "x": 8, "y": 3}, + {"matrix": [6, 0], "x": 9, "y": 3}, + {"matrix": [6, 1], "x": 10, "y": 3}, + {"matrix": [6, 2], "x": 11, "y": 3}, + {"matrix": [6, 3], "x": 12, "y": 3}, + {"matrix": [6, 4], "x": 13, "y": 3}, + {"matrix": [6, 5], "x": 14, "y": 3}, + + {"matrix": [6, 6], "x": 0, "y": 4}, + {"matrix": [6, 7], "x": 1, "y": 4}, + {"matrix": [6, 8], "x": 2, "y": 4}, + {"matrix": [7, 0], "x": 3, "y": 4}, + {"matrix": [7, 1], "x": 4, "y": 4}, + {"matrix": [7, 2], "x": 5, "y": 4}, + {"matrix": [7, 3], "x": 6, "y": 4}, + {"matrix": [7, 4], "x": 7, "y": 4}, + {"matrix": [7, 5], "x": 8, "y": 4}, + {"matrix": [7, 6], "x": 9, "y": 4}, + {"matrix": [7, 7], "x": 10, "y": 4}, + {"matrix": [7, 8], "x": 11, "y": 4}, + {"matrix": [8, 0], "x": 12, "y": 4}, + {"matrix": [8, 1], "x": 13, "y": 4}, + {"matrix": [8, 2], "x": 14, "y": 4} + ] + } + } } diff --git a/keyboards/40percentclub/i75/promicro/keyboard.json b/keyboards/40percentclub/i75/promicro/keyboard.json index 4c3f44469c6..933c4f8616d 100644 --- a/keyboards/40percentclub/i75/promicro/keyboard.json +++ b/keyboards/40percentclub/i75/promicro/keyboard.json @@ -5,91 +5,5 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina", - "community_layouts": ["ortho_5x15"], - "layouts": { - "LAYOUT_ortho_5x15": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [1, 0], "x": 9, "y": 0}, - {"matrix": [1, 1], "x": 10, "y": 0}, - {"matrix": [1, 2], "x": 11, "y": 0}, - {"matrix": [1, 3], "x": 12, "y": 0}, - {"matrix": [1, 4], "x": 13, "y": 0}, - {"matrix": [1, 5], "x": 14, "y": 0}, - - {"matrix": [1, 6], "x": 0, "y": 1}, - {"matrix": [1, 7], "x": 1, "y": 1}, - {"matrix": [1, 8], "x": 2, "y": 1}, - {"matrix": [2, 0], "x": 3, "y": 1}, - {"matrix": [2, 1], "x": 4, "y": 1}, - {"matrix": [2, 2], "x": 5, "y": 1}, - {"matrix": [2, 3], "x": 6, "y": 1}, - {"matrix": [2, 4], "x": 7, "y": 1}, - {"matrix": [2, 5], "x": 8, "y": 1}, - {"matrix": [2, 6], "x": 9, "y": 1}, - {"matrix": [2, 7], "x": 10, "y": 1}, - {"matrix": [2, 8], "x": 11, "y": 1}, - {"matrix": [3, 0], "x": 12, "y": 1}, - {"matrix": [3, 1], "x": 13, "y": 1}, - {"matrix": [3, 2], "x": 14, "y": 1}, - - {"matrix": [3, 3], "x": 0, "y": 2}, - {"matrix": [3, 4], "x": 1, "y": 2}, - {"matrix": [3, 5], "x": 2, "y": 2}, - {"matrix": [3, 6], "x": 3, "y": 2}, - {"matrix": [3, 7], "x": 4, "y": 2}, - {"matrix": [3, 8], "x": 5, "y": 2}, - {"matrix": [4, 0], "x": 6, "y": 2}, - {"matrix": [4, 1], "x": 7, "y": 2}, - {"matrix": [4, 2], "x": 8, "y": 2}, - {"matrix": [4, 3], "x": 9, "y": 2}, - {"matrix": [4, 4], "x": 10, "y": 2}, - {"matrix": [4, 5], "x": 11, "y": 2}, - {"matrix": [4, 6], "x": 12, "y": 2}, - {"matrix": [4, 7], "x": 13, "y": 2}, - {"matrix": [4, 8], "x": 14, "y": 2}, - - {"matrix": [5, 0], "x": 0, "y": 3}, - {"matrix": [5, 1], "x": 1, "y": 3}, - {"matrix": [5, 2], "x": 2, "y": 3}, - {"matrix": [5, 3], "x": 3, "y": 3}, - {"matrix": [5, 4], "x": 4, "y": 3}, - {"matrix": [5, 5], "x": 5, "y": 3}, - {"matrix": [5, 6], "x": 6, "y": 3}, - {"matrix": [5, 7], "x": 7, "y": 3}, - {"matrix": [5, 8], "x": 8, "y": 3}, - {"matrix": [6, 0], "x": 9, "y": 3}, - {"matrix": [6, 1], "x": 10, "y": 3}, - {"matrix": [6, 2], "x": 11, "y": 3}, - {"matrix": [6, 3], "x": 12, "y": 3}, - {"matrix": [6, 4], "x": 13, "y": 3}, - {"matrix": [6, 5], "x": 14, "y": 3}, - - {"matrix": [6, 6], "x": 0, "y": 4}, - {"matrix": [6, 7], "x": 1, "y": 4}, - {"matrix": [6, 8], "x": 2, "y": 4}, - {"matrix": [7, 0], "x": 3, "y": 4}, - {"matrix": [7, 1], "x": 4, "y": 4}, - {"matrix": [7, 2], "x": 5, "y": 4}, - {"matrix": [7, 3], "x": 6, "y": 4}, - {"matrix": [7, 4], "x": 7, "y": 4}, - {"matrix": [7, 5], "x": 8, "y": 4}, - {"matrix": [7, 6], "x": 9, "y": 4}, - {"matrix": [7, 7], "x": 10, "y": 4}, - {"matrix": [7, 8], "x": 11, "y": 4}, - {"matrix": [8, 0], "x": 12, "y": 4}, - {"matrix": [8, 1], "x": 13, "y": 4}, - {"matrix": [8, 2], "x": 14, "y": 4} - ] - } - } + "bootloader": "caterina" } diff --git a/keyboards/40percentclub/i75/teensy2/keyboard.json b/keyboards/40percentclub/i75/teensy2/keyboard.json index cc441a10961..2296a578289 100644 --- a/keyboards/40percentclub/i75/teensy2/keyboard.json +++ b/keyboards/40percentclub/i75/teensy2/keyboard.json @@ -5,91 +5,5 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "halfkay", - "community_layouts": ["ortho_5x15"], - "layouts": { - "LAYOUT_ortho_5x15": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [1, 0], "x": 9, "y": 0}, - {"matrix": [1, 1], "x": 10, "y": 0}, - {"matrix": [1, 2], "x": 11, "y": 0}, - {"matrix": [1, 3], "x": 12, "y": 0}, - {"matrix": [1, 4], "x": 13, "y": 0}, - {"matrix": [1, 5], "x": 14, "y": 0}, - - {"matrix": [1, 6], "x": 0, "y": 1}, - {"matrix": [1, 7], "x": 1, "y": 1}, - {"matrix": [1, 8], "x": 2, "y": 1}, - {"matrix": [2, 0], "x": 3, "y": 1}, - {"matrix": [2, 1], "x": 4, "y": 1}, - {"matrix": [2, 2], "x": 5, "y": 1}, - {"matrix": [2, 3], "x": 6, "y": 1}, - {"matrix": [2, 4], "x": 7, "y": 1}, - {"matrix": [2, 5], "x": 8, "y": 1}, - {"matrix": [2, 6], "x": 9, "y": 1}, - {"matrix": [2, 7], "x": 10, "y": 1}, - {"matrix": [2, 8], "x": 11, "y": 1}, - {"matrix": [3, 0], "x": 12, "y": 1}, - {"matrix": [3, 1], "x": 13, "y": 1}, - {"matrix": [3, 2], "x": 14, "y": 1}, - - {"matrix": [3, 3], "x": 0, "y": 2}, - {"matrix": [3, 4], "x": 1, "y": 2}, - {"matrix": [3, 5], "x": 2, "y": 2}, - {"matrix": [3, 6], "x": 3, "y": 2}, - {"matrix": [3, 7], "x": 4, "y": 2}, - {"matrix": [3, 8], "x": 5, "y": 2}, - {"matrix": [4, 0], "x": 6, "y": 2}, - {"matrix": [4, 1], "x": 7, "y": 2}, - {"matrix": [4, 2], "x": 8, "y": 2}, - {"matrix": [4, 3], "x": 9, "y": 2}, - {"matrix": [4, 4], "x": 10, "y": 2}, - {"matrix": [4, 5], "x": 11, "y": 2}, - {"matrix": [4, 6], "x": 12, "y": 2}, - {"matrix": [4, 7], "x": 13, "y": 2}, - {"matrix": [4, 8], "x": 14, "y": 2}, - - {"matrix": [5, 0], "x": 0, "y": 3}, - {"matrix": [5, 1], "x": 1, "y": 3}, - {"matrix": [5, 2], "x": 2, "y": 3}, - {"matrix": [5, 3], "x": 3, "y": 3}, - {"matrix": [5, 4], "x": 4, "y": 3}, - {"matrix": [5, 5], "x": 5, "y": 3}, - {"matrix": [5, 6], "x": 6, "y": 3}, - {"matrix": [5, 7], "x": 7, "y": 3}, - {"matrix": [5, 8], "x": 8, "y": 3}, - {"matrix": [6, 0], "x": 9, "y": 3}, - {"matrix": [6, 1], "x": 10, "y": 3}, - {"matrix": [6, 2], "x": 11, "y": 3}, - {"matrix": [6, 3], "x": 12, "y": 3}, - {"matrix": [6, 4], "x": 13, "y": 3}, - {"matrix": [6, 5], "x": 14, "y": 3}, - - {"matrix": [6, 6], "x": 0, "y": 4}, - {"matrix": [6, 7], "x": 1, "y": 4}, - {"matrix": [6, 8], "x": 2, "y": 4}, - {"matrix": [7, 0], "x": 3, "y": 4}, - {"matrix": [7, 1], "x": 4, "y": 4}, - {"matrix": [7, 2], "x": 5, "y": 4}, - {"matrix": [7, 3], "x": 6, "y": 4}, - {"matrix": [7, 4], "x": 7, "y": 4}, - {"matrix": [7, 5], "x": 8, "y": 4}, - {"matrix": [7, 6], "x": 9, "y": 4}, - {"matrix": [7, 7], "x": 10, "y": 4}, - {"matrix": [7, 8], "x": 11, "y": 4}, - {"matrix": [8, 0], "x": 12, "y": 4}, - {"matrix": [8, 1], "x": 13, "y": 4}, - {"matrix": [8, 2], "x": 14, "y": 4} - ] - } - } + "bootloader": "halfkay" } diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/40percentclub/luddite/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/40percentclub/luddite/keyboard.json b/keyboards/40percentclub/luddite/keyboard.json index 8a0b5d5913b..a9f79d73695 100644 --- a/keyboards/40percentclub/luddite/keyboard.json +++ b/keyboards/40percentclub/luddite/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"] diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/40percentclub/mf68/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/40percentclub/mf68/keyboard.json b/keyboards/40percentclub/mf68/keyboard.json index 47259ac23f9..45585d5e479 100644 --- a/keyboards/40percentclub/mf68/keyboard.json +++ b/keyboards/40percentclub/mf68/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"], "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"] diff --git a/keyboards/40percentclub/nein/config.h b/keyboards/40percentclub/nein/config.h deleted file mode 100644 index c30966d9d2f..00000000000 --- a/keyboards/40percentclub/nein/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 - * - * 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/40percentclub/nein/keyboard.json b/keyboards/40percentclub/nein/keyboard.json index 53a3a7639b8..9e1711f71e7 100644 --- a/keyboards/40percentclub/nein/keyboard.json +++ b/keyboards/40percentclub/nein/keyboard.json @@ -18,6 +18,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["F4", "F5", "F6"], diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h deleted file mode 100644 index 0fe9b9df213..00000000000 --- a/keyboards/40percentclub/nori/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2018 - * - * 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/40percentclub/nori/info.json b/keyboards/40percentclub/nori/keyboard.json similarity index 95% rename from keyboards/40percentclub/nori/info.json rename to keyboards/40percentclub/nori/keyboard.json index 214d1da2a09..968e74e19e1 100644 --- a/keyboards/40percentclub/nori/info.json +++ b/keyboards/40percentclub/nori/keyboard.json @@ -13,6 +13,21 @@ "rows": ["D3", "D2", "D1", "D0"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "B5" }, diff --git a/keyboards/40percentclub/nori/rules.mk b/keyboards/40percentclub/nori/rules.mk index 926fffda128..271780b75ec 100644 --- a/keyboards/40percentclub/nori/rules.mk +++ b/keyboards/40percentclub/nori/rules.mk @@ -1,15 +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 # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware AUDIO_SUPPORTED = no diff --git a/keyboards/40percentclub/polyandry/config.h b/keyboards/40percentclub/polyandry/config.h deleted file mode 100644 index e3cac2cbfac..00000000000 --- a/keyboards/40percentclub/polyandry/config.h +++ /dev/null @@ -1,40 +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 - -//more detailed config options start below: - -/* 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/40percentclub/polyandry/info.json b/keyboards/40percentclub/polyandry/info.json index b04b0500450..49b8bedbe32 100644 --- a/keyboards/40percentclub/polyandry/info.json +++ b/keyboards/40percentclub/polyandry/info.json @@ -11,9 +11,36 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "usb": { "vid": "0x4025", "pid": "0x6060", "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT_ortho_4x3": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [0, 3], "x": 0, "y": 1}, + {"matrix": [0, 4], "x": 1, "y": 1}, + {"matrix": [0, 5], "x": 2, "y": 1}, + + {"matrix": [0, 6], "x": 0, "y": 2}, + {"matrix": [0, 7], "x": 1, "y": 2}, + {"matrix": [0, 8], "x": 2, "y": 2}, + + {"matrix": [0, 9], "x": 0, "y": 3}, + {"matrix": [0, 10], "x": 1, "y": 3}, + {"matrix": [0, 11], "x": 2, "y": 3} + ] + } } } diff --git a/keyboards/40percentclub/polyandry/promicro/keyboard.json b/keyboards/40percentclub/polyandry/promicro/keyboard.json index 8a8cd987942..a8169c93dd6 100644 --- a/keyboards/40percentclub/polyandry/promicro/keyboard.json +++ b/keyboards/40percentclub/polyandry/promicro/keyboard.json @@ -5,26 +5,5 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT_ortho_4x3": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - - {"matrix": [0, 3], "x": 0, "y": 1}, - {"matrix": [0, 4], "x": 1, "y": 1}, - {"matrix": [0, 5], "x": 2, "y": 1}, - - {"matrix": [0, 6], "x": 0, "y": 2}, - {"matrix": [0, 7], "x": 1, "y": 2}, - {"matrix": [0, 8], "x": 2, "y": 2}, - - {"matrix": [0, 9], "x": 0, "y": 3}, - {"matrix": [0, 10], "x": 1, "y": 3}, - {"matrix": [0, 11], "x": 2, "y": 3} - ] - } - } + "bootloader": "caterina" } diff --git a/keyboards/40percentclub/polyandry/teensy2/keyboard.json b/keyboards/40percentclub/polyandry/teensy2/keyboard.json index 33fd1d71dfe..0a870332b2b 100644 --- a/keyboards/40percentclub/polyandry/teensy2/keyboard.json +++ b/keyboards/40percentclub/polyandry/teensy2/keyboard.json @@ -5,26 +5,5 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "halfkay", - "layouts": { - "LAYOUT_ortho_4x3": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - - {"matrix": [0, 3], "x": 0, "y": 1}, - {"matrix": [0, 4], "x": 1, "y": 1}, - {"matrix": [0, 5], "x": 2, "y": 1}, - - {"matrix": [0, 6], "x": 0, "y": 2}, - {"matrix": [0, 7], "x": 1, "y": 2}, - {"matrix": [0, 8], "x": 2, "y": 2}, - - {"matrix": [0, 9], "x": 0, "y": 3}, - {"matrix": [0, 10], "x": 1, "y": 3}, - {"matrix": [0, 11], "x": 2, "y": 3} - ] - } - } + "bootloader": "halfkay" } diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h deleted file mode 100644 index b46d357dd04..00000000000 --- a/keyboards/40percentclub/tomato/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* eliminate lag on space cadet mods */ -#define PERMISSIVE_HOLD diff --git a/keyboards/40percentclub/tomato/keyboard.json b/keyboards/40percentclub/tomato/keyboard.json index a44946d3725..c0b526cbc6b 100644 --- a/keyboards/40percentclub/tomato/keyboard.json +++ b/keyboards/40percentclub/tomato/keyboard.json @@ -37,6 +37,15 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": false, + "resync": true + } + }, + "tapping": { + "permissive_hold": true + }, "matrix_pins": { "cols": ["B4", "E6", "D7", "C6", "D4", "D0"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/40percentclub/ut47/config.h b/keyboards/40percentclub/ut47/config.h index 8f5756d1506..f0182a59f81 100644 --- a/keyboards/40percentclub/ut47/config.h +++ b/keyboards/40percentclub/ut47/config.h @@ -28,10 +28,5 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* 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 - /* Enable GNAP matrix serial output */ #define GNAP_ENABLE diff --git a/keyboards/40percentclub/ut47/info.json b/keyboards/40percentclub/ut47/keyboard.json similarity index 92% rename from keyboards/40percentclub/ut47/info.json rename to keyboards/40percentclub/ut47/keyboard.json index 668f277f404..62e4a940a18 100644 --- a/keyboards/40percentclub/ut47/info.json +++ b/keyboards/40percentclub/ut47/keyboard.json @@ -10,6 +10,19 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/40percentclub/ut47/rules.mk b/keyboards/40percentclub/ut47/rules.mk index 6ba6aa5f6fa..5480f61b9b4 100644 --- a/keyboards/40percentclub/ut47/rules.mk +++ b/keyboards/40percentclub/ut47/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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - -# custom matrix setup CUSTOM_MATRIX = yes SRC += matrix.c UART_DRIVER_REQUIRED = yes diff --git a/keyboards/45_ats/config.h b/keyboards/45_ats/config.h deleted file mode 100644 index 1d951890cd1..00000000000 --- a/keyboards/45_ats/config.h +++ /dev/null @@ -1,25 +0,0 @@ - /* - Copyright 2020 Alec Penland - Copyright 2020 Garret Gartner - - 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 diff --git a/keyboards/45_ats/keyboard.json b/keyboards/45_ats/keyboard.json index 7c873f21ede..5e5465f2643 100644 --- a/keyboards/45_ats/keyboard.json +++ b/keyboards/45_ats/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "F6", "F5", "F4", "C7", "F7", "C6", "B6", "D4"], "rows": ["D3", "D5", "D7", "D6"] diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/keyboard.json similarity index 86% rename from keyboards/4pplet/aekiso60/rev_b/info.json rename to keyboards/4pplet/aekiso60/rev_b/keyboard.json index b5ad58bc11d..2bbf1851253 100644 --- a/keyboards/4pplet/aekiso60/rev_b/info.json +++ b/keyboards/4pplet/aekiso60/rev_b/keyboard.json @@ -4,6 +4,13 @@ "pid": "0x0011", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/4pplet/aekiso60/rev_b/rules.mk b/keyboards/4pplet/aekiso60/rev_b/rules.mk index e539634d589..04fe1eba2ac 100644 --- a/keyboards/4pplet/aekiso60/rev_b/rules.mk +++ b/keyboards/4pplet/aekiso60/rev_b/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 = 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 - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h index 350b9abad7f..80a093147eb 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h @@ -25,11 +25,6 @@ along with this program. If not, see . #define WS2812_SPI_SCK_PIN A5 #define WS2812_SPI_SCK_PAL_MODE 0 -/* 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 - /* Indicator leds */ #define LOCK_LIGHTS TRUE #define DISPLAY_LAYERS TRUE diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json similarity index 99% rename from keyboards/4pplet/eagle_viper_rep/rev_a/info.json rename to keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json index baafb58153b..18d8ba5d8aa 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json @@ -13,6 +13,22 @@ "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "dynamic_keymap": { "layer_count": 5 }, diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk index 30a36865b96..04fe1eba2ac 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk @@ -1,15 +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 = yes -RGBLIGHT_ENABLE = yes - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h index b5957e6f30c..73182129a57 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h @@ -23,11 +23,6 @@ along with this program. If not, see . /* Underglow */ #define WS2812_EXTERNAL_PULLUP -/* 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 - /* Indicator leds */ #define LAYER_1 B14 #define LAYER_2 B15 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json similarity index 99% rename from keyboards/4pplet/eagle_viper_rep/rev_b/info.json rename to keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json index 2ebb2606869..e0356d5dad5 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json @@ -13,6 +13,21 @@ "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "dynamic_keymap": { "layer_count": 5 }, diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk index 428a48c4649..04fe1eba2ac 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk @@ -1,15 +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 # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/keyboard.json similarity index 99% rename from keyboards/4pplet/steezy60/rev_a/info.json rename to keyboards/4pplet/steezy60/rev_a/keyboard.json index d64779bec3f..ffd44642230 100644 --- a/keyboards/4pplet/steezy60/rev_a/info.json +++ b/keyboards/4pplet/steezy60/rev_a/keyboard.json @@ -36,7 +36,8 @@ "extrakey": true, "mousekey": false, "nkro": true, - "rgblight": true + "rgblight": true, + "key_lock": true }, "rgblight": { "led_count": 12, diff --git a/keyboards/4pplet/steezy60/rev_a/rules.mk b/keyboards/4pplet/steezy60/rev_a/rules.mk deleted file mode 100644 index 96c9ff2cbbe..00000000000 --- a/keyboards/4pplet/steezy60/rev_a/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# -KEY_LOCK_ENABLE = yes diff --git a/keyboards/4pplet/steezy60/rev_b/info.json b/keyboards/4pplet/steezy60/rev_b/keyboard.json similarity index 99% rename from keyboards/4pplet/steezy60/rev_b/info.json rename to keyboards/4pplet/steezy60/rev_b/keyboard.json index e087ff8d1bb..8ff41bd1561 100644 --- a/keyboards/4pplet/steezy60/rev_b/info.json +++ b/keyboards/4pplet/steezy60/rev_b/keyboard.json @@ -32,7 +32,8 @@ "extrakey": true, "mousekey": false, "nkro": true, - "rgblight": true + "rgblight": true, + "key_lock": true }, "rgblight": { "led_count": 12, diff --git a/keyboards/4pplet/steezy60/rev_b/rules.mk b/keyboards/4pplet/steezy60/rev_b/rules.mk index 3787d8c241b..04fe1eba2ac 100644 --- a/keyboards/4pplet/steezy60/rev_b/rules.mk +++ b/keyboards/4pplet/steezy60/rev_b/rules.mk @@ -1,8 +1,2 @@ -# Build Options -# change yes to no to disable -# -KEY_LOCK_ENABLE = yes - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - diff --git a/keyboards/4pplet/unextended_std/rev_a/info.json b/keyboards/4pplet/unextended_std/rev_a/keyboard.json similarity index 99% rename from keyboards/4pplet/unextended_std/rev_a/info.json rename to keyboards/4pplet/unextended_std/rev_a/keyboard.json index 5aba94b50ab..1b1909854ac 100644 --- a/keyboards/4pplet/unextended_std/rev_a/info.json +++ b/keyboards/4pplet/unextended_std/rev_a/keyboard.json @@ -22,7 +22,8 @@ "console": false, "command": false, "nkro": true, - "rgblight": true + "rgblight": true, + "key_lock": true }, "ws2812": { "pin": "A8" diff --git a/keyboards/4pplet/unextended_std/rev_a/rules.mk b/keyboards/4pplet/unextended_std/rev_a/rules.mk index 3787d8c241b..04fe1eba2ac 100644 --- a/keyboards/4pplet/unextended_std/rev_a/rules.mk +++ b/keyboards/4pplet/unextended_std/rev_a/rules.mk @@ -1,8 +1,2 @@ -# Build Options -# change yes to no to disable -# -KEY_LOCK_ENABLE = yes - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/keyboard.json similarity index 96% rename from keyboards/4pplet/waffling60/rev_d/info.json rename to keyboards/4pplet/waffling60/rev_d/keyboard.json index 692f9956052..90f049ee293 100644 --- a/keyboards/4pplet/waffling60/rev_d/info.json +++ b/keyboards/4pplet/waffling60/rev_d/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x000E", "device_version": "0.0.4" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/4pplet/waffling60/rev_d/rules.mk b/keyboards/4pplet/waffling60/rev_d/rules.mk index e539634d589..04fe1eba2ac 100644 --- a/keyboards/4pplet/waffling60/rev_d/rules.mk +++ b/keyboards/4pplet/waffling60/rev_d/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 = 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 - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/info.json b/keyboards/4pplet/waffling60/rev_d_ansi/keyboard.json similarity index 97% rename from keyboards/4pplet/waffling60/rev_d_ansi/info.json rename to keyboards/4pplet/waffling60/rev_d_ansi/keyboard.json index 3969d98c424..f471d27e14b 100644 --- a/keyboards/4pplet/waffling60/rev_d_ansi/info.json +++ b/keyboards/4pplet/waffling60/rev_d_ansi/keyboard.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk b/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk index a64bf928ebb..04fe1eba2ac 100644 --- a/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk +++ b/keyboards/4pplet/waffling60/rev_d_ansi/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 = 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 - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - diff --git a/keyboards/4pplet/waffling60/rev_d_iso/info.json b/keyboards/4pplet/waffling60/rev_d_iso/keyboard.json similarity index 99% rename from keyboards/4pplet/waffling60/rev_d_iso/info.json rename to keyboards/4pplet/waffling60/rev_d_iso/keyboard.json index fdcf9d0bdee..757de46e6b9 100644 --- a/keyboards/4pplet/waffling60/rev_d_iso/info.json +++ b/keyboards/4pplet/waffling60/rev_d_iso/keyboard.json @@ -15,6 +15,11 @@ "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rules.mk b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk index e11c916b4fd..04fe1eba2ac 100644 --- a/keyboards/4pplet/waffling60/rev_d_iso/rules.mk +++ b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk @@ -1,16 +1,2 @@ -# 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 - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - diff --git a/keyboards/4pplet/waffling80/rev_b/info.json b/keyboards/4pplet/waffling80/rev_b/keyboard.json similarity index 78% rename from keyboards/4pplet/waffling80/rev_b/info.json rename to keyboards/4pplet/waffling80/rev_b/keyboard.json index 47d3d5d662f..2c33caa4044 100644 --- a/keyboards/4pplet/waffling80/rev_b/info.json +++ b/keyboards/4pplet/waffling80/rev_b/keyboard.json @@ -4,6 +4,13 @@ "pid": "0x000F", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/4pplet/waffling80/rev_b/rules.mk b/keyboards/4pplet/waffling80/rev_b/rules.mk index e539634d589..04fe1eba2ac 100644 --- a/keyboards/4pplet/waffling80/rev_b/rules.mk +++ b/keyboards/4pplet/waffling80/rev_b/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 = 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 - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - diff --git a/keyboards/4pplet/yakiimo/rev_a/config.h b/keyboards/4pplet/yakiimo/rev_a/config.h index b9a17d41287..e69de29bb2d 100644 --- a/keyboards/4pplet/yakiimo/rev_a/config.h +++ b/keyboards/4pplet/yakiimo/rev_a/config.h @@ -1,22 +0,0 @@ -/* -Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ -#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/4pplet/yakiimo/rev_a/keyboard.json b/keyboards/4pplet/yakiimo/rev_a/keyboard.json index ec5addd8501..f22f67ac6a4 100644 --- a/keyboards/4pplet/yakiimo/rev_a/keyboard.json +++ b/keyboards/4pplet/yakiimo/rev_a/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A8"], "rows": ["B10", "B1", "C13", "C14", "B14", "B12", "B9", "B8", "B5", "B4", "A15", "B3"] diff --git a/keyboards/8pack/config.h b/keyboards/8pack/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/8pack/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/8pack/info.json b/keyboards/8pack/info.json index cf55db98153..84d81c11d39 100644 --- a/keyboards/8pack/info.json +++ b/keyboards/8pack/info.json @@ -7,6 +7,12 @@ "vid": "0xFEED", "pid": "0x2171" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "driver": "timer", "pins": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], From 2dd406f08fc5d9877c8fd2642e94975eae37e86f Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 31 Mar 2024 01:07:19 +1100 Subject: [PATCH 080/333] Remove `quantum.h` includes from keyboard custom `matrix.c`s (#23371) --- keyboards/barleycorn_smd/matrix.c | 4 +--- keyboards/bpiphany/ghost_squid/matrix.c | 1 - keyboards/centromere/matrix.c | 1 - keyboards/converter/siemens_tastatur/matrix.c | 3 --- keyboards/custommk/evo70_r2/matrix.c | 3 ++- keyboards/dc01/right/matrix.c | 3 --- keyboards/dp60/matrix.c | 5 ++++- keyboards/duck/orion/v3/matrix.c | 5 ++++- keyboards/evyd13/wasdat/matrix.c | 3 --- keyboards/evyd13/wasdat_code/matrix.c | 3 --- keyboards/geistmaschine/macropod/matrix.c | 3 ++- keyboards/gl516/a52gl/matrix.c | 1 - keyboards/gl516/j73gl/matrix.c | 1 - keyboards/gl516/n51gl/matrix.c | 1 - keyboards/glenpickle/chimera_ergo/matrix.c | 1 - keyboards/glenpickle/chimera_ls/matrix.c | 1 - keyboards/glenpickle/chimera_ortho/matrix.c | 1 - .../glenpickle/chimera_ortho_plus/matrix.c | 1 - keyboards/gmmk/numpad/matrix.c | 9 +++------ keyboards/halfcliff/matrix.c | 9 +++------ keyboards/handwired/dqz11n1g/matrix.c | 7 ------- keyboards/handwired/dygma/raise/matrix.c | 3 ++- .../symmetric70_proto/matrix_debug/matrix.c | 3 --- .../symmetric70_proto/matrix_fast/matrix.c | 4 ---- keyboards/hazel/bad_wings/matrix.c | 9 ++++----- keyboards/hhkb/yang/matrix.c | 7 ++++++- keyboards/hineybush/hbcp/matrix.c | 3 --- keyboards/ibm/model_m/mschwingen/matrix.c | 3 --- keyboards/jones/v03/matrix.c | 3 --- keyboards/jones/v03_1/matrix.c | 3 --- keyboards/joshajohnson/hub16/matrix.c | 3 --- keyboards/kagizaraya/chidori/matrix.c | 1 - keyboards/kakunpc/angel64/alpha/matrix.c | 3 --- keyboards/kakunpc/angel64/rev1/matrix.c | 3 --- keyboards/kakunpc/choc_taro/matrix.c | 3 --- keyboards/kakunpc/thedogkeyboard/matrix.c | 3 --- keyboards/kbdmania/kmac/matrix.c | 3 --- keyboards/kbdmania/kmac_pad/matrix.c | 1 - keyboards/keyboardio/model01/matrix.c | 2 +- keyboards/keychron/c2_pro/matrix.c | 4 +++- keyboards/keychron/q10/matrix.c | 3 ++- keyboards/keychron/q12/matrix.c | 3 ++- keyboards/keychron/q1v2/matrix.c | 4 +++- keyboards/keychron/q3/matrix.c | 3 ++- keyboards/keychron/q5/matrix.c | 3 ++- keyboards/keychron/q6/matrix.c | 3 ++- keyboards/keychron/q65/matrix.c | 3 ++- keyboards/keychron/v1/matrix.c | 3 ++- keyboards/keychron/v10/matrix.c | 3 ++- keyboards/keychron/v3/matrix.c | 3 ++- keyboards/keychron/v5/matrix.c | 3 ++- keyboards/keychron/v6/matrix.c | 3 ++- keyboards/kinesis/nguyenvietyen/matrix.c | 2 -- keyboards/matrix/abelx/matrix.c | 4 ---- keyboards/matrix/m12og/rev1/matrix.c | 3 --- keyboards/matrix/m20add/matrix.c | 4 ---- keyboards/matrix/noah/matrix.c | 18 ++++++------------ .../adelais/standard_led/avr/rev1/matrix.c | 3 --- keyboards/mechlovin/infinity87/rev2/matrix.c | 3 --- keyboards/mechlovin/infinity875/matrix.c | 3 --- keyboards/mechlovin/olly/jf/rev1/matrix.c | 3 --- keyboards/mechlovin/serratus/matrix.c | 3 --- keyboards/mexsistor/ludmila/matrix.c | 3 --- keyboards/miiiw/blackio83/matrix.c | 2 +- keyboards/mitosis/matrix.c | 1 - keyboards/moon/matrix.c | 3 --- keyboards/mt/split75/matrix.c | 4 +--- keyboards/nullbitsco/nibble/matrix.c | 3 ++- keyboards/nullbitsco/snap/matrix.c | 7 ++----- keyboards/oddforge/vea/matrix.c | 4 +--- keyboards/om60/matrix.c | 3 ++- keyboards/pierce/matrix.c | 2 +- keyboards/planck/rev6_drop/matrix.c | 3 ++- keyboards/planck/rev7/matrix.c | 7 +++---- keyboards/preonic/rev3_drop/matrix.c | 5 ++++- keyboards/qvex/lynepad2/matrix.c | 7 +------ keyboards/rate/pistachio_pro/matrix.c | 4 +--- keyboards/redox/wireless/matrix.c | 1 - keyboards/redscarf_iiplus/verb/matrix.c | 3 --- keyboards/redscarf_iiplus/verc/matrix.c | 3 --- keyboards/redscarf_iiplus/verd/matrix.c | 3 --- keyboards/ryanskidmore/rskeys100/matrix.c | 2 -- keyboards/satt/comet46/matrix.c | 1 - keyboards/sirius/uni660/rev1/matrix.c | 1 - keyboards/sirius/uni660/rev2/matrix.c | 1 - keyboards/spiderisland/split78/matrix.c | 4 +--- keyboards/sthlmkb/lagom/matrix.c | 3 ++- keyboards/switchplate/southpaw_65/matrix.c | 7 ------- keyboards/telophase/matrix.c | 1 - keyboards/touchpad/matrix.c | 13 +++++++------ keyboards/viktus/sp111/matrix.c | 4 +++- keyboards/xiudi/xd84/matrix.c | 7 ------- keyboards/xiudi/xd96/matrix.c | 8 +------- keyboards/ydkb/grape/matrix.c | 3 --- keyboards/yiancardesigns/barleycorn/matrix.c | 4 +--- keyboards/yiancardesigns/gingham/matrix.c | 4 +--- keyboards/yiancardesigns/seigaiha/matrix.c | 4 +--- 97 files changed, 104 insertions(+), 244 deletions(-) diff --git a/keyboards/barleycorn_smd/matrix.c b/keyboards/barleycorn_smd/matrix.c index 315093c8a98..d8880364b66 100644 --- a/keyboards/barleycorn_smd/matrix.c +++ b/keyboards/barleycorn_smd/matrix.c @@ -14,10 +14,8 @@ 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 . */ -#include -#include +#include "matrix.h" #include "wait.h" -#include "quantum.h" #include "i2c_master.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; diff --git a/keyboards/bpiphany/ghost_squid/matrix.c b/keyboards/bpiphany/ghost_squid/matrix.c index b0ad6075554..802d365cb89 100644 --- a/keyboards/bpiphany/ghost_squid/matrix.c +++ b/keyboards/bpiphany/ghost_squid/matrix.c @@ -17,7 +17,6 @@ */ #include "matrix.h" -#include "quantum.h" matrix_row_t read_rows(void) { return diff --git a/keyboards/centromere/matrix.c b/keyboards/centromere/matrix.c index 0218adf39b4..387d31ee076 100644 --- a/keyboards/centromere/matrix.c +++ b/keyboards/centromere/matrix.c @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" #include "matrix.h" #include "uart.h" diff --git a/keyboards/converter/siemens_tastatur/matrix.c b/keyboards/converter/siemens_tastatur/matrix.c index ea1aa2287e0..78054ee0fac 100644 --- a/keyboards/converter/siemens_tastatur/matrix.c +++ b/keyboards/converter/siemens_tastatur/matrix.c @@ -14,10 +14,7 @@ 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 . */ -#include -#include #include -#include "quantum.h" #include "timer.h" #include "wait.h" #include "print.h" diff --git a/keyboards/custommk/evo70_r2/matrix.c b/keyboards/custommk/evo70_r2/matrix.c index 99a23a4542e..99c3428d802 100644 --- a/keyboards/custommk/evo70_r2/matrix.c +++ b/keyboards/custommk/evo70_r2/matrix.c @@ -1,6 +1,7 @@ // Copyright 2023 David Hoelscher (@customMK) // SPDX-License-Identifier: GPL-2.0-or-later -#include "quantum.h" +#include "matrix.h" +#include // Pin definitions static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c index 04a6d03804e..f9b67381455 100644 --- a/keyboards/dc01/right/matrix.c +++ b/keyboards/dc01/right/matrix.c @@ -15,8 +15,6 @@ 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 . */ -#include -#include #if defined(__AVR__) #include #include @@ -31,7 +29,6 @@ along with this program. If not, see . #include "timer.h" #include "i2c_slave.h" #include "lufa.h" -#include "quantum.h" #define SLAVE_I2C_ADDRESS 0x32 diff --git a/keyboards/dp60/matrix.c b/keyboards/dp60/matrix.c index e32c9a58f94..22156745f17 100644 --- a/keyboards/dp60/matrix.c +++ b/keyboards/dp60/matrix.c @@ -13,7 +13,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" +#include "matrix.h" +#include "print.h" +#include "bitwise.h" +#include "wait.h" #ifndef DEBOUNCE # define DEBOUNCE 5 diff --git a/keyboards/duck/orion/v3/matrix.c b/keyboards/duck/orion/v3/matrix.c index c82d5dd9994..f392b9b1909 100644 --- a/keyboards/duck/orion/v3/matrix.c +++ b/keyboards/duck/orion/v3/matrix.c @@ -14,7 +14,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" +#include "matrix.h" +#include "debug.h" +#include "bitwise.h" +#include "wait.h" #ifndef DEBOUNCE # define DEBOUNCE 5 diff --git a/keyboards/evyd13/wasdat/matrix.c b/keyboards/evyd13/wasdat/matrix.c index 60a1ea235a8..ae4bb6cb3a3 100644 --- a/keyboards/evyd13/wasdat/matrix.c +++ b/keyboards/evyd13/wasdat/matrix.c @@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include -#include #include "matrix.h" -#include "quantum.h" #include "sn74x138.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; diff --git a/keyboards/evyd13/wasdat_code/matrix.c b/keyboards/evyd13/wasdat_code/matrix.c index f30ea3355a1..d392a31d7c7 100644 --- a/keyboards/evyd13/wasdat_code/matrix.c +++ b/keyboards/evyd13/wasdat_code/matrix.c @@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include -#include #include "matrix.h" -#include "quantum.h" #include "sn74x138.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; diff --git a/keyboards/geistmaschine/macropod/matrix.c b/keyboards/geistmaschine/macropod/matrix.c index ebc10e2e5ad..98796133f12 100644 --- a/keyboards/geistmaschine/macropod/matrix.c +++ b/keyboards/geistmaschine/macropod/matrix.c @@ -14,8 +14,9 @@ * along with this program. If not, see . */ +#include "matrix.h" #include "pca9555.h" -#include "quantum.h" +#include "timer.h" // PCA9555 i2c address, 0x20: A0 = 0, A1 = 0, A2 = 0 #define IC1 0x20 diff --git a/keyboards/gl516/a52gl/matrix.c b/keyboards/gl516/a52gl/matrix.c index 1a97fdfd614..af13768b08e 100644 --- a/keyboards/gl516/a52gl/matrix.c +++ b/keyboards/gl516/a52gl/matrix.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include "matrix.h" -#include "quantum.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; diff --git a/keyboards/gl516/j73gl/matrix.c b/keyboards/gl516/j73gl/matrix.c index 1a97fdfd614..af13768b08e 100644 --- a/keyboards/gl516/j73gl/matrix.c +++ b/keyboards/gl516/j73gl/matrix.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include "matrix.h" -#include "quantum.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; diff --git a/keyboards/gl516/n51gl/matrix.c b/keyboards/gl516/n51gl/matrix.c index 1a97fdfd614..af13768b08e 100644 --- a/keyboards/gl516/n51gl/matrix.c +++ b/keyboards/gl516/n51gl/matrix.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include "matrix.h" -#include "quantum.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; diff --git a/keyboards/glenpickle/chimera_ergo/matrix.c b/keyboards/glenpickle/chimera_ergo/matrix.c index 32d7b09310a..47c3c61e27f 100644 --- a/keyboards/glenpickle/chimera_ergo/matrix.c +++ b/keyboards/glenpickle/chimera_ergo/matrix.c @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" #include "matrix.h" #include "uart.h" diff --git a/keyboards/glenpickle/chimera_ls/matrix.c b/keyboards/glenpickle/chimera_ls/matrix.c index 9a69724eb78..15a29c5a865 100644 --- a/keyboards/glenpickle/chimera_ls/matrix.c +++ b/keyboards/glenpickle/chimera_ls/matrix.c @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" #include "matrix.h" #include "uart.h" diff --git a/keyboards/glenpickle/chimera_ortho/matrix.c b/keyboards/glenpickle/chimera_ortho/matrix.c index 9a69724eb78..15a29c5a865 100644 --- a/keyboards/glenpickle/chimera_ortho/matrix.c +++ b/keyboards/glenpickle/chimera_ortho/matrix.c @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" #include "matrix.h" #include "uart.h" diff --git a/keyboards/glenpickle/chimera_ortho_plus/matrix.c b/keyboards/glenpickle/chimera_ortho_plus/matrix.c index 32d7b09310a..47c3c61e27f 100644 --- a/keyboards/glenpickle/chimera_ortho_plus/matrix.c +++ b/keyboards/glenpickle/chimera_ortho_plus/matrix.c @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" #include "matrix.h" #include "uart.h" diff --git a/keyboards/gmmk/numpad/matrix.c b/keyboards/gmmk/numpad/matrix.c index 99adb38f184..68d4ab65242 100644 --- a/keyboards/gmmk/numpad/matrix.c +++ b/keyboards/gmmk/numpad/matrix.c @@ -4,15 +4,12 @@ /* * scan matrix */ -#include -#include +#include "matrix.h" +#include +#include "atomic_util.h" #include "wait.h" #include "print.h" #include "debug.h" -#include "util.h" -#include "matrix.h" -#include "debounce.h" -#include "quantum.h" /* matrix state(1:on, 0:off) */ extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values diff --git a/keyboards/halfcliff/matrix.c b/keyboards/halfcliff/matrix.c index fd18fd27bda..99598dc1b78 100644 --- a/keyboards/halfcliff/matrix.c +++ b/keyboards/halfcliff/matrix.c @@ -14,15 +14,12 @@ 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 . */ -#include -#include -#include "util.h" #include "matrix.h" -#include "debounce.h" -#include "quantum.h" +#include "atomic_util.h" #include "split_util.h" -#include "config.h" #include "transport.h" +#include "debounce.h" +#include "wait.h" #define ERROR_DISCONNECT_COUNT 5 diff --git a/keyboards/handwired/dqz11n1g/matrix.c b/keyboards/handwired/dqz11n1g/matrix.c index d93dd853b6a..398f961aa5f 100644 --- a/keyboards/handwired/dqz11n1g/matrix.c +++ b/keyboards/handwired/dqz11n1g/matrix.c @@ -15,14 +15,7 @@ along with this program. If not, see . */ -#include -#include -#include - -#include - #include "spi_master.h" -#include "quantum.h" #include "matrix.h" static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; diff --git a/keyboards/handwired/dygma/raise/matrix.c b/keyboards/handwired/dygma/raise/matrix.c index bbcf697a594..3f241e8973d 100644 --- a/keyboards/handwired/dygma/raise/matrix.c +++ b/keyboards/handwired/dygma/raise/matrix.c @@ -13,8 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "quantum.h" +#include "matrix.h" #include "i2c_master.h" +#include "wait.h" #include #include "wire-protocol-constants.h" diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c index 8a303714cf0..22d92dd99a1 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c +++ b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c @@ -14,12 +14,9 @@ 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 . */ -#include -#include #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #ifndef readPort # include "gpio_extr.h" #endif diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c index 2bc97bd9e81..3acbdfbeda6 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c @@ -15,9 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ // clang-format off -#include -#include -#include #ifndef readPort # include "gpio_extr.h" #endif @@ -25,7 +22,6 @@ along with this program. If not, see . #include "matrix.h" #include "matrix_extr.h" #include "debounce.h" -#include "quantum.h" #define ALWAYS_INLINE inline __attribute__((always_inline)) #define NO_INLINE __attribute__((noinline)) diff --git a/keyboards/hazel/bad_wings/matrix.c b/keyboards/hazel/bad_wings/matrix.c index 496bebd58f9..8a56a927c15 100644 --- a/keyboards/hazel/bad_wings/matrix.c +++ b/keyboards/hazel/bad_wings/matrix.c @@ -2,12 +2,11 @@ // Copyright 2023 @jasonhazel (Jason Hazel) // SPDX-License-Identifier: GPL-3.0-or-later -#include "quantum.h" -#include "spi_master.h" -#include /* memset */ -#include /* close */ -#include "quantum.h" #include "matrix.h" +#include +#include "spi_master.h" +#include "debug.h" +#include "wait.h" #if (!defined(SHIFTREG_MATRIX_COL_CS)) # error Missing shift register I/O pin definitions diff --git a/keyboards/hhkb/yang/matrix.c b/keyboards/hhkb/yang/matrix.c index f0eccc899dc..c82c77bed34 100644 --- a/keyboards/hhkb/yang/matrix.c +++ b/keyboards/hhkb/yang/matrix.c @@ -16,7 +16,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" +#include "matrix.h" +#include "debug.h" +#include "timer.h" +#include "wait.h" +#include "suspend.h" +#include #ifdef BLUETOOTH_ENABLE # include "adafruit_ble.h" diff --git a/keyboards/hineybush/hbcp/matrix.c b/keyboards/hineybush/hbcp/matrix.c index d493a7e9ef6..69ae6ab7b78 100644 --- a/keyboards/hineybush/hbcp/matrix.c +++ b/keyboards/hineybush/hbcp/matrix.c @@ -14,12 +14,9 @@ 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 . */ -#include -#include #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" static const pin_t row_pins[] = MATRIX_ROW_PINS; static const pin_t col_pins[] = MATRIX_COL_PINS; diff --git a/keyboards/ibm/model_m/mschwingen/matrix.c b/keyboards/ibm/model_m/mschwingen/matrix.c index 361803edec4..85df5e5d6fa 100644 --- a/keyboards/ibm/model_m/mschwingen/matrix.c +++ b/keyboards/ibm/model_m/mschwingen/matrix.c @@ -14,12 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include -#include #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #include "spi_master.h" #include "print.h" #include "mschwingen.h" diff --git a/keyboards/jones/v03/matrix.c b/keyboards/jones/v03/matrix.c index efcd7043e64..445c1acdc07 100644 --- a/keyboards/jones/v03/matrix.c +++ b/keyboards/jones/v03/matrix.c @@ -14,10 +14,7 @@ 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 . */ -#include -#include #include "matrix.h" -#include "quantum.h" #define ROW_SHIFTER ((uint16_t)1) diff --git a/keyboards/jones/v03_1/matrix.c b/keyboards/jones/v03_1/matrix.c index efcd7043e64..445c1acdc07 100644 --- a/keyboards/jones/v03_1/matrix.c +++ b/keyboards/jones/v03_1/matrix.c @@ -14,10 +14,7 @@ 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 . */ -#include -#include #include "matrix.h" -#include "quantum.h" #define ROW_SHIFTER ((uint16_t)1) diff --git a/keyboards/joshajohnson/hub16/matrix.c b/keyboards/joshajohnson/hub16/matrix.c index 4f32070e66e..0fe1d41dad8 100644 --- a/keyboards/joshajohnson/hub16/matrix.c +++ b/keyboards/joshajohnson/hub16/matrix.c @@ -14,12 +14,9 @@ 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 . */ -#include -#include #include "wait.h" #include "util.h" #include "matrix.h" -#include "quantum.h" // Encoder things #define SWITCH_1 F7 diff --git a/keyboards/kagizaraya/chidori/matrix.c b/keyboards/kagizaraya/chidori/matrix.c index 6228125d923..e506916f389 100644 --- a/keyboards/kagizaraya/chidori/matrix.c +++ b/keyboards/kagizaraya/chidori/matrix.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" #include "matrix.h" #include "board.h" diff --git a/keyboards/kakunpc/angel64/alpha/matrix.c b/keyboards/kakunpc/angel64/alpha/matrix.c index 7abc50005b6..5d731b10683 100644 --- a/keyboards/kakunpc/angel64/alpha/matrix.c +++ b/keyboards/kakunpc/angel64/alpha/matrix.c @@ -14,15 +14,12 @@ 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 . */ -#include -#include #include "wait.h" #include "print.h" #include "debug.h" #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #if (MATRIX_COLS <= 8) # define print_matrix_header() print("\nr/c 01234567\n") diff --git a/keyboards/kakunpc/angel64/rev1/matrix.c b/keyboards/kakunpc/angel64/rev1/matrix.c index 7abc50005b6..5d731b10683 100644 --- a/keyboards/kakunpc/angel64/rev1/matrix.c +++ b/keyboards/kakunpc/angel64/rev1/matrix.c @@ -14,15 +14,12 @@ 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 . */ -#include -#include #include "wait.h" #include "print.h" #include "debug.h" #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #if (MATRIX_COLS <= 8) # define print_matrix_header() print("\nr/c 01234567\n") diff --git a/keyboards/kakunpc/choc_taro/matrix.c b/keyboards/kakunpc/choc_taro/matrix.c index 02421551da5..4547f1a0479 100644 --- a/keyboards/kakunpc/choc_taro/matrix.c +++ b/keyboards/kakunpc/choc_taro/matrix.c @@ -14,10 +14,7 @@ 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 . */ -#include -#include #include "matrix.h" -#include "quantum.h" #if (MATRIX_COLS <= 8) # define ROW_SHIFTER ((uint8_t)1) diff --git a/keyboards/kakunpc/thedogkeyboard/matrix.c b/keyboards/kakunpc/thedogkeyboard/matrix.c index 7abc50005b6..5d731b10683 100644 --- a/keyboards/kakunpc/thedogkeyboard/matrix.c +++ b/keyboards/kakunpc/thedogkeyboard/matrix.c @@ -14,15 +14,12 @@ 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 . */ -#include -#include #include "wait.h" #include "print.h" #include "debug.h" #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #if (MATRIX_COLS <= 8) # define print_matrix_header() print("\nr/c 01234567\n") diff --git a/keyboards/kbdmania/kmac/matrix.c b/keyboards/kbdmania/kmac/matrix.c index 65698670325..1843d19fd29 100644 --- a/keyboards/kbdmania/kmac/matrix.c +++ b/keyboards/kbdmania/kmac/matrix.c @@ -14,15 +14,12 @@ 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 . */ -#include -#include #include "wait.h" #include "print.h" #include "debug.h" #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #if (MATRIX_COLS <= 8) # define print_matrix_header() print("\nr/c 01234567\n") diff --git a/keyboards/kbdmania/kmac_pad/matrix.c b/keyboards/kbdmania/kmac_pad/matrix.c index 476e40f5144..ad7919e33cf 100644 --- a/keyboards/kbdmania/kmac_pad/matrix.c +++ b/keyboards/kbdmania/kmac_pad/matrix.c @@ -17,7 +17,6 @@ along with this program. If not, see . #include "wait.h" #include "matrix.h" -#include "quantum.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; diff --git a/keyboards/keyboardio/model01/matrix.c b/keyboards/keyboardio/model01/matrix.c index 4b788d28128..20359ca9718 100644 --- a/keyboards/keyboardio/model01/matrix.c +++ b/keyboards/keyboardio/model01/matrix.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "quantum.h" +#include "matrix.h" #include "i2c_master.h" #include #include "model01.h" diff --git a/keyboards/keychron/c2_pro/matrix.c b/keyboards/keychron/c2_pro/matrix.c index 5065f97aa7d..8c954c73d08 100644 --- a/keyboards/keychron/c2_pro/matrix.c +++ b/keyboards/keychron/c2_pro/matrix.c @@ -14,7 +14,9 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "matrix.h" +#include "atomic_util.h" +#include #ifndef SHIFT_COL_START # define SHIFT_COL_START 8 diff --git a/keyboards/keychron/q10/matrix.c b/keyboards/keychron/q10/matrix.c index 5c035b0e42e..2c2d2ccc378 100644 --- a/keyboards/keychron/q10/matrix.c +++ b/keyboards/keychron/q10/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include // Pin connected to DS of 74HC595 #define DATA_PIN A7 diff --git a/keyboards/keychron/q12/matrix.c b/keyboards/keychron/q12/matrix.c index 8229517fd9c..cf8361bd23e 100644 --- a/keyboards/keychron/q12/matrix.c +++ b/keyboards/keychron/q12/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include // Pin connected to DS of 74HC595 #define DATA_PIN C15 diff --git a/keyboards/keychron/q1v2/matrix.c b/keyboards/keychron/q1v2/matrix.c index d008a793841..2bdf4bdec7b 100644 --- a/keyboards/keychron/q1v2/matrix.c +++ b/keyboards/keychron/q1v2/matrix.c @@ -14,7 +14,9 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "matrix.h" +#include "atomic_util.h" +#include // Pin connected to DS of 74HC595 #define DATA_PIN A7 diff --git a/keyboards/keychron/q3/matrix.c b/keyboards/keychron/q3/matrix.c index 26830780ffe..188156789b3 100644 --- a/keyboards/keychron/q3/matrix.c +++ b/keyboards/keychron/q3/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include // Pin connected to DS of 74HC595 #define DATA_PIN A7 diff --git a/keyboards/keychron/q5/matrix.c b/keyboards/keychron/q5/matrix.c index 28ef877504a..4809b20677c 100644 --- a/keyboards/keychron/q5/matrix.c +++ b/keyboards/keychron/q5/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include // Pin connected to DS of 74HC595 #define DATA_PIN C15 diff --git a/keyboards/keychron/q6/matrix.c b/keyboards/keychron/q6/matrix.c index 11f3432e6b1..c59b229cfa6 100644 --- a/keyboards/keychron/q6/matrix.c +++ b/keyboards/keychron/q6/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include // Pin connected to DS of 74HC595 #define DATA_PIN C15 diff --git a/keyboards/keychron/q65/matrix.c b/keyboards/keychron/q65/matrix.c index 5785f5d5709..206e3012267 100644 --- a/keyboards/keychron/q65/matrix.c +++ b/keyboards/keychron/q65/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include // Pin connected to DS of 74HC595 #define DATA_PIN C15 diff --git a/keyboards/keychron/v1/matrix.c b/keyboards/keychron/v1/matrix.c index 82a883834f8..7b9136d4904 100644 --- a/keyboards/keychron/v1/matrix.c +++ b/keyboards/keychron/v1/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include // Pin connected to DS of 74HC595 #define DATA_PIN A7 diff --git a/keyboards/keychron/v10/matrix.c b/keyboards/keychron/v10/matrix.c index 9269fed8d66..87cda1774ad 100644 --- a/keyboards/keychron/v10/matrix.c +++ b/keyboards/keychron/v10/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include #ifndef PIN_USED_74HC595 # define PIN_USED_74HC595 8 diff --git a/keyboards/keychron/v3/matrix.c b/keyboards/keychron/v3/matrix.c index 44a1676afa9..c0c39d5b5fd 100644 --- a/keyboards/keychron/v3/matrix.c +++ b/keyboards/keychron/v3/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include // Pin connected to DS of 74HC595 #define DATA_PIN A7 diff --git a/keyboards/keychron/v5/matrix.c b/keyboards/keychron/v5/matrix.c index ced84428818..fc3a1c4c2c4 100644 --- a/keyboards/keychron/v5/matrix.c +++ b/keyboards/keychron/v5/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include // Pin connected to DS of 74HC595 #define DATA_PIN C15 diff --git a/keyboards/keychron/v6/matrix.c b/keyboards/keychron/v6/matrix.c index 9269fed8d66..87cda1774ad 100644 --- a/keyboards/keychron/v6/matrix.c +++ b/keyboards/keychron/v6/matrix.c @@ -15,7 +15,8 @@ */ #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" +#include #ifndef PIN_USED_74HC595 # define PIN_USED_74HC595 8 diff --git a/keyboards/kinesis/nguyenvietyen/matrix.c b/keyboards/kinesis/nguyenvietyen/matrix.c index d6ea67da681..4e4ca6f55cc 100644 --- a/keyboards/kinesis/nguyenvietyen/matrix.c +++ b/keyboards/kinesis/nguyenvietyen/matrix.c @@ -3,8 +3,6 @@ #include "matrix.h" -#include "quantum.h" - static matrix_row_t read_row(uint8_t row) { matrix_io_delay(); // without this wait read unstable value. diff --git a/keyboards/matrix/abelx/matrix.c b/keyboards/matrix/abelx/matrix.c index d8d87b7d895..d74ed957751 100644 --- a/keyboards/matrix/abelx/matrix.c +++ b/keyboards/matrix/abelx/matrix.c @@ -17,10 +17,6 @@ * along with this program. If not, see . */ -#include -#include -#include -#include "quantum.h" #include "matrix.h" #include "tca6424.h" #include "abelx.h" diff --git a/keyboards/matrix/m12og/rev1/matrix.c b/keyboards/matrix/m12og/rev1/matrix.c index 9c36153da10..c127aa35b90 100644 --- a/keyboards/matrix/m12og/rev1/matrix.c +++ b/keyboards/matrix/m12og/rev1/matrix.c @@ -14,12 +14,9 @@ * along with this program. If not, see . */ -#include -#include #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; diff --git a/keyboards/matrix/m20add/matrix.c b/keyboards/matrix/m20add/matrix.c index e9ddbdff62b..85f5863725b 100644 --- a/keyboards/matrix/m20add/matrix.c +++ b/keyboards/matrix/m20add/matrix.c @@ -2,10 +2,6 @@ * matrix.c */ -#include -#include -#include -#include "quantum.h" #include "matrix.h" #include "tca6424.h" #include "m20add.h" diff --git a/keyboards/matrix/noah/matrix.c b/keyboards/matrix/noah/matrix.c index 90e7006b785..14e8188cb58 100644 --- a/keyboards/matrix/noah/matrix.c +++ b/keyboards/matrix/noah/matrix.c @@ -2,16 +2,10 @@ * matrix.c */ -#include -#include -#include -#include -#include -#include "quantum.h" +#include "matrix.h" #include "timer.h" #include "wait.h" #include "print.h" -#include "matrix.h" #ifndef DEBOUNCE # define DEBOUNCE 5 @@ -167,16 +161,16 @@ matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; } void matrix_print(void) { - printf("\nr/c 01234567\n"); + xprintf("\nr/c 01234567\n"); for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - printf("%X0: ", row); + xprintf("%X0: ", row); matrix_row_t data = matrix_get_row(row); for (int col = 0; col < MATRIX_COLS; col++) { if (data & (1<. */ -#include -#include #include "wait.h" #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #ifdef DIRECT_PINS static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS; diff --git a/keyboards/mechlovin/infinity87/rev2/matrix.c b/keyboards/mechlovin/infinity87/rev2/matrix.c index b1b0d20654c..62a56f687cb 100644 --- a/keyboards/mechlovin/infinity87/rev2/matrix.c +++ b/keyboards/mechlovin/infinity87/rev2/matrix.c @@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include -#include #include "wait.h" #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #ifdef DIRECT_PINS static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS; diff --git a/keyboards/mechlovin/infinity875/matrix.c b/keyboards/mechlovin/infinity875/matrix.c index b1b0d20654c..62a56f687cb 100644 --- a/keyboards/mechlovin/infinity875/matrix.c +++ b/keyboards/mechlovin/infinity875/matrix.c @@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include -#include #include "wait.h" #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #ifdef DIRECT_PINS static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS; diff --git a/keyboards/mechlovin/olly/jf/rev1/matrix.c b/keyboards/mechlovin/olly/jf/rev1/matrix.c index c01879c9a54..2abda55d0e8 100644 --- a/keyboards/mechlovin/olly/jf/rev1/matrix.c +++ b/keyboards/mechlovin/olly/jf/rev1/matrix.c @@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include -#include #include "wait.h" #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #ifdef DIRECT_PINS static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS; diff --git a/keyboards/mechlovin/serratus/matrix.c b/keyboards/mechlovin/serratus/matrix.c index b1b0d20654c..62a56f687cb 100644 --- a/keyboards/mechlovin/serratus/matrix.c +++ b/keyboards/mechlovin/serratus/matrix.c @@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include -#include #include "wait.h" #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #ifdef DIRECT_PINS static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS; diff --git a/keyboards/mexsistor/ludmila/matrix.c b/keyboards/mexsistor/ludmila/matrix.c index 338286a7db6..5d27ec683fa 100644 --- a/keyboards/mexsistor/ludmila/matrix.c +++ b/keyboards/mexsistor/ludmila/matrix.c @@ -14,12 +14,9 @@ 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 . */ -#include -#include #include "wait.h" #include "util.h" #include "matrix.h" -#include "quantum.h" // Encoder things #define ENC_SW F7 diff --git a/keyboards/miiiw/blackio83/matrix.c b/keyboards/miiiw/blackio83/matrix.c index 841ff3c16e6..ab252f919b2 100644 --- a/keyboards/miiiw/blackio83/matrix.c +++ b/keyboards/miiiw/blackio83/matrix.c @@ -14,8 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "matrix.h" +#include "wait.h" #include "common/shift_register.h" static uint8_t read_rows(void); diff --git a/keyboards/mitosis/matrix.c b/keyboards/mitosis/matrix.c index e5389bb113d..f122b989570 100644 --- a/keyboards/mitosis/matrix.c +++ b/keyboards/mitosis/matrix.c @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" #include "matrix.h" #include "uart.h" diff --git a/keyboards/moon/matrix.c b/keyboards/moon/matrix.c index 8c9b6214dba..1cb9590e9f9 100644 --- a/keyboards/moon/matrix.c +++ b/keyboards/moon/matrix.c @@ -14,15 +14,12 @@ 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 . */ -#include -#include #include "wait.h" #include "print.h" #include "debug.h" #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #include "pca9555.h" /* diff --git a/keyboards/mt/split75/matrix.c b/keyboards/mt/split75/matrix.c index 196a543faaf..df5e9c056b5 100644 --- a/keyboards/mt/split75/matrix.c +++ b/keyboards/mt/split75/matrix.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include -#include -#include "quantum.h" +#include "matrix.h" #include "i2c_master.h" #define RIGHT_HALF diff --git a/keyboards/nullbitsco/nibble/matrix.c b/keyboards/nullbitsco/nibble/matrix.c index 496c5dbe322..6508b704e9c 100644 --- a/keyboards/nullbitsco/nibble/matrix.c +++ b/keyboards/nullbitsco/nibble/matrix.c @@ -13,7 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "quantum.h" +#include "matrix.h" +#include "wait.h" #define COL_SHIFTER ((uint32_t)1) diff --git a/keyboards/nullbitsco/snap/matrix.c b/keyboards/nullbitsco/snap/matrix.c index ceb9cd89841..3cd3f5c37e3 100644 --- a/keyboards/nullbitsco/snap/matrix.c +++ b/keyboards/nullbitsco/snap/matrix.c @@ -13,13 +13,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include -#include -#include -#include "util.h" #include "matrix.h" +#include #include "split_util.h" -#include "quantum.h" +#include "wait.h" #define VIRT_COLS_PER_HAND 1 #define PHYS_COLS_PER_HAND (MATRIX_COLS - VIRT_COLS_PER_HAND) diff --git a/keyboards/oddforge/vea/matrix.c b/keyboards/oddforge/vea/matrix.c index 8b054ccbe04..36d4d3d353a 100644 --- a/keyboards/oddforge/vea/matrix.c +++ b/keyboards/oddforge/vea/matrix.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include -#include -#include "quantum.h" +#include "matrix.h" #include "i2c_master.h" #define RIGHT_HALF diff --git a/keyboards/om60/matrix.c b/keyboards/om60/matrix.c index 36867804689..b0e252ec458 100644 --- a/keyboards/om60/matrix.c +++ b/keyboards/om60/matrix.c @@ -15,7 +15,8 @@ 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 . */ -#include "quantum.h" +#include "matrix.h" +#include "wait.h" #if (MATRIX_COLS <= 8) # define ROW_SHIFTER ((uint8_t)1) diff --git a/keyboards/pierce/matrix.c b/keyboards/pierce/matrix.c index 5023024b8b5..bcc88f7aa99 100644 --- a/keyboards/pierce/matrix.c +++ b/keyboards/pierce/matrix.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "matrix.h" #include "i2c_slave.h" #define MY_I2C_ADDRESS (0x20U << 1) diff --git a/keyboards/planck/rev6_drop/matrix.c b/keyboards/planck/rev6_drop/matrix.c index e31e473ae25..d1403567388 100644 --- a/keyboards/planck/rev6_drop/matrix.c +++ b/keyboards/planck/rev6_drop/matrix.c @@ -15,7 +15,8 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "matrix.h" +#include "wait.h" /* matrix state(1:on, 0:off) */ static pin_t matrix_row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; diff --git a/keyboards/planck/rev7/matrix.c b/keyboards/planck/rev7/matrix.c index 350ce93ce04..8cadfa5e8d5 100644 --- a/keyboards/planck/rev7/matrix.c +++ b/keyboards/planck/rev7/matrix.c @@ -15,11 +15,10 @@ * along with this program. If not, see . */ -#include "gpio.h" -#include "hal_pal.h" -#include "hal_pal_lld.h" -#include "quantum.h" +#include "matrix.h" +#include #include +#include "wait.h" // STM32-specific watchdog config calculations // timeout = 31.25us * PR * (RL + 1) diff --git a/keyboards/preonic/rev3_drop/matrix.c b/keyboards/preonic/rev3_drop/matrix.c index 60718caaba8..1d9ab5e8118 100644 --- a/keyboards/preonic/rev3_drop/matrix.c +++ b/keyboards/preonic/rev3_drop/matrix.c @@ -15,7 +15,10 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "matrix.h" +#include "debug.h" +#include "timer.h" +#include "wait.h" #ifndef DEBOUNCE # define DEBOUNCE 5 diff --git a/keyboards/qvex/lynepad2/matrix.c b/keyboards/qvex/lynepad2/matrix.c index 878ee6e2f72..89c56b8d406 100644 --- a/keyboards/qvex/lynepad2/matrix.c +++ b/keyboards/qvex/lynepad2/matrix.c @@ -14,13 +14,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include -#include -#include -#include "util.h" #include "matrix.h" -#include "debounce.h" -#include "quantum.h" +#include "wait.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; diff --git a/keyboards/rate/pistachio_pro/matrix.c b/keyboards/rate/pistachio_pro/matrix.c index 6cbfb6dfea1..bb962c76e22 100644 --- a/keyboards/rate/pistachio_pro/matrix.c +++ b/keyboards/rate/pistachio_pro/matrix.c @@ -14,10 +14,8 @@ 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 . */ -#include -#include #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; diff --git a/keyboards/redox/wireless/matrix.c b/keyboards/redox/wireless/matrix.c index 9c50c9cecea..92960b916df 100644 --- a/keyboards/redox/wireless/matrix.c +++ b/keyboards/redox/wireless/matrix.c @@ -14,7 +14,6 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "matrix.h" #include "uart.h" diff --git a/keyboards/redscarf_iiplus/verb/matrix.c b/keyboards/redscarf_iiplus/verb/matrix.c index aa2cd8e5107..391a923f165 100755 --- a/keyboards/redscarf_iiplus/verb/matrix.c +++ b/keyboards/redscarf_iiplus/verb/matrix.c @@ -14,15 +14,12 @@ 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 . */ -#include -#include #include "wait.h" #include "print.h" #include "debug.h" #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #if (MATRIX_COLS <= 8) # define print_matrix_header() print("\nr/c 01234567\n") diff --git a/keyboards/redscarf_iiplus/verc/matrix.c b/keyboards/redscarf_iiplus/verc/matrix.c index aa2cd8e5107..391a923f165 100755 --- a/keyboards/redscarf_iiplus/verc/matrix.c +++ b/keyboards/redscarf_iiplus/verc/matrix.c @@ -14,15 +14,12 @@ 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 . */ -#include -#include #include "wait.h" #include "print.h" #include "debug.h" #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #if (MATRIX_COLS <= 8) # define print_matrix_header() print("\nr/c 01234567\n") diff --git a/keyboards/redscarf_iiplus/verd/matrix.c b/keyboards/redscarf_iiplus/verd/matrix.c index 382847e9419..b2046db2cef 100644 --- a/keyboards/redscarf_iiplus/verd/matrix.c +++ b/keyboards/redscarf_iiplus/verd/matrix.c @@ -14,15 +14,12 @@ 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 . */ -#include -#include #include "wait.h" #include "print.h" #include "debug.h" #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" #if (MATRIX_COLS <= 8) # define print_matrix_header() print("\nr/c 01234567\n") diff --git a/keyboards/ryanskidmore/rskeys100/matrix.c b/keyboards/ryanskidmore/rskeys100/matrix.c index faefb29c84e..2ab9eafd7f5 100644 --- a/keyboards/ryanskidmore/rskeys100/matrix.c +++ b/keyboards/ryanskidmore/rskeys100/matrix.c @@ -17,10 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include #include "matrix.h" #include -#include "quantum.h" static const uint32_t col_values[24] = SHR_COLS; diff --git a/keyboards/satt/comet46/matrix.c b/keyboards/satt/comet46/matrix.c index 9a69724eb78..15a29c5a865 100644 --- a/keyboards/satt/comet46/matrix.c +++ b/keyboards/satt/comet46/matrix.c @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" #include "matrix.h" #include "uart.h" diff --git a/keyboards/sirius/uni660/rev1/matrix.c b/keyboards/sirius/uni660/rev1/matrix.c index f65bf0f26a0..3fe3563c211 100644 --- a/keyboards/sirius/uni660/rev1/matrix.c +++ b/keyboards/sirius/uni660/rev1/matrix.c @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" #include "matrix.h" #include "uart.h" diff --git a/keyboards/sirius/uni660/rev2/matrix.c b/keyboards/sirius/uni660/rev2/matrix.c index f65bf0f26a0..3fe3563c211 100644 --- a/keyboards/sirius/uni660/rev2/matrix.c +++ b/keyboards/sirius/uni660/rev2/matrix.c @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" #include "matrix.h" #include "uart.h" diff --git a/keyboards/spiderisland/split78/matrix.c b/keyboards/spiderisland/split78/matrix.c index 31ee29eaab6..23b37453517 100644 --- a/keyboards/spiderisland/split78/matrix.c +++ b/keyboards/spiderisland/split78/matrix.c @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include -#include -#include "quantum.h" +#include "matrix.h" #include "i2c_master.h" #define RIGHT_HALF diff --git a/keyboards/sthlmkb/lagom/matrix.c b/keyboards/sthlmkb/lagom/matrix.c index d3dc0cb12aa..6a16722ad08 100644 --- a/keyboards/sthlmkb/lagom/matrix.c +++ b/keyboards/sthlmkb/lagom/matrix.c @@ -13,7 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "quantum.h" +#include "matrix.h" +#include "wait.h" #define COL_SHIFTER ((uint32_t)1) diff --git a/keyboards/switchplate/southpaw_65/matrix.c b/keyboards/switchplate/southpaw_65/matrix.c index a7008e9c7d0..059934bf441 100644 --- a/keyboards/switchplate/southpaw_65/matrix.c +++ b/keyboards/switchplate/southpaw_65/matrix.c @@ -13,15 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include -#include -#include -#include #include "matrix.h" #include "pca9555.h" -#include "quantum.h" - -#include "debug.h" // PCA9555 slave addresses #define IC1 0x20 diff --git a/keyboards/telophase/matrix.c b/keyboards/telophase/matrix.c index a18a2b20edd..c74ba0d7c70 100644 --- a/keyboards/telophase/matrix.c +++ b/keyboards/telophase/matrix.c @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" #include "matrix.h" #include "uart.h" diff --git a/keyboards/touchpad/matrix.c b/keyboards/touchpad/matrix.c index 87944cb7cc6..7929e0969b5 100644 --- a/keyboards/touchpad/matrix.c +++ b/keyboards/touchpad/matrix.c @@ -23,7 +23,8 @@ SOFTWARE. #include "matrix.h" #include "i2c_master.h" -#include "quantum.h" +#include "print.h" +#include #define VIBRATE_LENGTH 50 //Defines number of interrupts motor will vibrate for, must be bigger than 8 for correct operation volatile uint8_t vibrate = 0; //Trigger vibration in interrupt @@ -276,16 +277,16 @@ matrix_row_t matrix_get_row(uint8_t row) { } void matrix_print(void) { - printf("\nr/c 01234567\n"); + xprintf("\nr/c 01234567\n"); for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - printf("%X0: ", row); + xprintf("%X0: ", row); matrix_row_t data = matrix_get_row(row); for (int col = 0; col < MATRIX_COLS; col++) { if (data & (1<. */ +#include "matrix.h" #include "mcp23018.h" -#include "quantum.h" +#include "print.h" +#include "wait.h" // Optimize scanning code for speed as a slight mitigation for the port expander #pragma GCC push_options diff --git a/keyboards/xiudi/xd84/matrix.c b/keyboards/xiudi/xd84/matrix.c index d92ac83b4a7..ea1b4f55b40 100644 --- a/keyboards/xiudi/xd84/matrix.c +++ b/keyboards/xiudi/xd84/matrix.c @@ -13,15 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include -#include -#include -#include #include "matrix.h" #include "pca9555.h" -#include "quantum.h" - -#include "debug.h" // PCA9555 slave addresses #define IC1 0x20 diff --git a/keyboards/xiudi/xd96/matrix.c b/keyboards/xiudi/xd96/matrix.c index 641202ca2c9..2c433f02b8a 100644 --- a/keyboards/xiudi/xd96/matrix.c +++ b/keyboards/xiudi/xd96/matrix.c @@ -13,15 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include -#include -#include -#include #include "matrix.h" #include "pca9555.h" -#include "quantum.h" - -#include "debug.h" +#include "wait.h" // PCA9555 slave addresses #define IC1 0x20 diff --git a/keyboards/ydkb/grape/matrix.c b/keyboards/ydkb/grape/matrix.c index 700761fa448..3e070f8d7d5 100644 --- a/keyboards/ydkb/grape/matrix.c +++ b/keyboards/ydkb/grape/matrix.c @@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include -#include #include "matrix.h" -#include "quantum.h" #include "sn74x138.h" static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; diff --git a/keyboards/yiancardesigns/barleycorn/matrix.c b/keyboards/yiancardesigns/barleycorn/matrix.c index 9ef29265662..008f096266d 100644 --- a/keyboards/yiancardesigns/barleycorn/matrix.c +++ b/keyboards/yiancardesigns/barleycorn/matrix.c @@ -14,10 +14,8 @@ 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 . */ -#include -#include +#include "matrix.h" #include "wait.h" -#include "quantum.h" #include "i2c_master.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; diff --git a/keyboards/yiancardesigns/gingham/matrix.c b/keyboards/yiancardesigns/gingham/matrix.c index d17518b4940..4e6319b52bc 100644 --- a/keyboards/yiancardesigns/gingham/matrix.c +++ b/keyboards/yiancardesigns/gingham/matrix.c @@ -14,10 +14,8 @@ 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 . */ -#include -#include +#include "matrix.h" #include "wait.h" -#include "quantum.h" #include "i2c_master.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; diff --git a/keyboards/yiancardesigns/seigaiha/matrix.c b/keyboards/yiancardesigns/seigaiha/matrix.c index 55ee239db4c..dc80c4becf9 100644 --- a/keyboards/yiancardesigns/seigaiha/matrix.c +++ b/keyboards/yiancardesigns/seigaiha/matrix.c @@ -14,10 +14,8 @@ 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 . */ -#include -#include +#include "matrix.h" #include "wait.h" -#include "quantum.h" #include "i2c_master.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; From 04d6803b34d80a6992f649d77f7a52209407312e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 30 Mar 2024 17:19:03 +0000 Subject: [PATCH 081/333] Remove 'NO_USB_STARTUP_CHECK = no' from keyboards (#23376) --- keyboards/akegata_denki/device_one/rules.mk | 2 -- keyboards/coarse/ixora/rules.mk | 3 --- keyboards/coarse/vinta/rules.mk | 2 -- keyboards/dztech/dz60rgb/v1/rules.mk | 1 - keyboards/dztech/dz60rgb/v2/rules.mk | 1 - keyboards/dztech/dz60rgb/v2_1/rules.mk | 1 - keyboards/dztech/dz60rgb_ansi/v1/rules.mk | 1 - keyboards/dztech/dz60rgb_ansi/v2/rules.mk | 1 - keyboards/dztech/dz60rgb_wkl/v1/rules.mk | 1 - keyboards/dztech/dz60rgb_wkl/v2/rules.mk | 1 - keyboards/hand88/rules.mk | 1 - keyboards/hs60/v2/ansi/rules.mk | 1 - keyboards/hs60/v2/hhkb/rules.mk | 1 - keyboards/hs60/v2/iso/rules.mk | 1 - keyboards/kbdfans/bella/rgb/rules.mk | 1 - keyboards/kbdfans/bella/rgb_iso/rules.mk | 1 - keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk | 1 - keyboards/kbdfans/maja/rules.mk | 1 - keyboards/kbdfans/maja_soldered/rules.mk | 1 - keyboards/keebwerk/mega/ansi/rules.mk | 1 - keyboards/kprepublic/bm60hsrgb/rev2/rules.mk | 1 - keyboards/latincompass/latin17rgb/rules.mk | 1 - keyboards/latincompass/latin6rgb/rules.mk | 1 - keyboards/melgeek/mj61/rev1/rules.mk | 1 - keyboards/melgeek/mj61/rev2/rules.mk | 1 - keyboards/melgeek/mj63/rev1/rules.mk | 1 - keyboards/melgeek/mj63/rev2/rules.mk | 1 - keyboards/melgeek/mj64/rev1/rules.mk | 1 - keyboards/melgeek/mj64/rev2/rules.mk | 1 - keyboards/melgeek/mj64/rev3/rules.mk | 1 - keyboards/melgeek/mj65/rev3/rules.mk | 2 +- keyboards/miller/gm862/rules.mk | 1 - keyboards/novelkeys/nk65/rules.mk | 1 - keyboards/spaceholdings/nebula12/rules.mk | 1 - keyboards/spaceholdings/nebula68/rules.mk | 1 - keyboards/xbows/woody/rules.mk | 1 - 36 files changed, 1 insertion(+), 40 deletions(-) diff --git a/keyboards/akegata_denki/device_one/rules.mk b/keyboards/akegata_denki/device_one/rules.mk index 26de1138e5f..ecb62658826 100644 --- a/keyboards/akegata_denki/device_one/rules.mk +++ b/keyboards/akegata_denki/device_one/rules.mk @@ -8,5 +8,3 @@ 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 -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in - diff --git a/keyboards/coarse/ixora/rules.mk b/keyboards/coarse/ixora/rules.mk index af1134ce298..285aeb82028 100644 --- a/keyboards/coarse/ixora/rules.mk +++ b/keyboards/coarse/ixora/rules.mk @@ -8,6 +8,3 @@ 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 -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in - - diff --git a/keyboards/coarse/vinta/rules.mk b/keyboards/coarse/vinta/rules.mk index cedbfeb321f..285aeb82028 100644 --- a/keyboards/coarse/vinta/rules.mk +++ b/keyboards/coarse/vinta/rules.mk @@ -8,5 +8,3 @@ 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 -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in - diff --git a/keyboards/dztech/dz60rgb/v1/rules.mk b/keyboards/dztech/dz60rgb/v1/rules.mk index 9f3770f0f40..ea646d3d939 100644 --- a/keyboards/dztech/dz60rgb/v1/rules.mk +++ b/keyboards/dztech/dz60rgb/v1/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/dztech/dz60rgb/v2/rules.mk b/keyboards/dztech/dz60rgb/v2/rules.mk index 9f3770f0f40..ea646d3d939 100644 --- a/keyboards/dztech/dz60rgb/v2/rules.mk +++ b/keyboards/dztech/dz60rgb/v2/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/dztech/dz60rgb/v2_1/rules.mk b/keyboards/dztech/dz60rgb/v2_1/rules.mk index 832eb95f50f..5c51de83766 100644 --- a/keyboards/dztech/dz60rgb/v2_1/rules.mk +++ b/keyboards/dztech/dz60rgb/v2_1/rules.mk @@ -13,7 +13,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in LTO_ENABLE = yes SPACE_CADET_ENABLE = no diff --git a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk index 9f3770f0f40..ea646d3d939 100644 --- a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk +++ b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk index 17e0aea48d8..f478792adbc 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk +++ b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in LTO_ENABLE = yes diff --git a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v1/rules.mk index 9f3770f0f40..ea646d3d939 100644 --- a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk +++ b/keyboards/dztech/dz60rgb_wkl/v1/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2/rules.mk index 9f3770f0f40..ea646d3d939 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk +++ b/keyboards/dztech/dz60rgb_wkl/v2/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/hand88/rules.mk b/keyboards/hand88/rules.mk index 475da662628..d3ca7b060e1 100644 --- a/keyboards/hand88/rules.mk +++ b/keyboards/hand88/rules.mk @@ -11,4 +11,3 @@ 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 -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/hs60/v2/ansi/rules.mk b/keyboards/hs60/v2/ansi/rules.mk index bc8cb00131d..96e559f742e 100644 --- a/keyboards/hs60/v2/ansi/rules.mk +++ b/keyboards/hs60/v2/ansi/rules.mk @@ -14,7 +14,6 @@ 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 -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in CIE1931_CURVE = yes diff --git a/keyboards/hs60/v2/hhkb/rules.mk b/keyboards/hs60/v2/hhkb/rules.mk index bc8cb00131d..96e559f742e 100644 --- a/keyboards/hs60/v2/hhkb/rules.mk +++ b/keyboards/hs60/v2/hhkb/rules.mk @@ -14,7 +14,6 @@ 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 -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in CIE1931_CURVE = yes diff --git a/keyboards/hs60/v2/iso/rules.mk b/keyboards/hs60/v2/iso/rules.mk index bc8cb00131d..96e559f742e 100644 --- a/keyboards/hs60/v2/iso/rules.mk +++ b/keyboards/hs60/v2/iso/rules.mk @@ -14,7 +14,6 @@ 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 -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in CIE1931_CURVE = yes diff --git a/keyboards/kbdfans/bella/rgb/rules.mk b/keyboards/kbdfans/bella/rgb/rules.mk index d4493d25e0e..3d0767ea6d8 100644 --- a/keyboards/kbdfans/bella/rgb/rules.mk +++ b/keyboards/kbdfans/bella/rgb/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in LTO_ENABLE = yes diff --git a/keyboards/kbdfans/bella/rgb_iso/rules.mk b/keyboards/kbdfans/bella/rgb_iso/rules.mk index d4493d25e0e..3d0767ea6d8 100644 --- a/keyboards/kbdfans/bella/rgb_iso/rules.mk +++ b/keyboards/kbdfans/bella/rgb_iso/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in LTO_ENABLE = yes diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk index 05b460b165b..502113e3b85 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/kbdfans/maja/rules.mk b/keyboards/kbdfans/maja/rules.mk index d0606ec4ddd..a59c9aa4cf9 100755 --- a/keyboards/kbdfans/maja/rules.mk +++ b/keyboards/kbdfans/maja/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/kbdfans/maja_soldered/rules.mk b/keyboards/kbdfans/maja_soldered/rules.mk index ea875031b1f..901d395d65a 100755 --- a/keyboards/kbdfans/maja_soldered/rules.mk +++ b/keyboards/kbdfans/maja_soldered/rules.mk @@ -9,4 +9,3 @@ 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 # Audio output -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/keebwerk/mega/ansi/rules.mk b/keyboards/keebwerk/mega/ansi/rules.mk index e257f3063ff..82d4a940ede 100755 --- a/keyboards/keebwerk/mega/ansi/rules.mk +++ b/keyboards/keebwerk/mega/ansi/rules.mk @@ -15,7 +15,6 @@ 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 -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in CIE1931_CURVE = yes diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk index 805593ed5be..cbe283378da 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk @@ -10,7 +10,6 @@ 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 -NO_USB_STARTUP_CHECK = no LTO_ENABLE = yes RGB_MATRIX_ENABLE = yes WS2812_DRIVER_REQUIRED = yes diff --git a/keyboards/latincompass/latin17rgb/rules.mk b/keyboards/latincompass/latin17rgb/rules.mk index 53e01e55d24..0af5f68e5e1 100644 --- a/keyboards/latincompass/latin17rgb/rules.mk +++ b/keyboards/latincompass/latin17rgb/rules.mk @@ -10,5 +10,4 @@ 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 -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in RGB_MATRIX_ENABLE = yes diff --git a/keyboards/latincompass/latin6rgb/rules.mk b/keyboards/latincompass/latin6rgb/rules.mk index f3108efe8b2..c05a204a403 100644 --- a/keyboards/latincompass/latin6rgb/rules.mk +++ b/keyboards/latincompass/latin6rgb/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in RGB_MATRIX_ENABLE = yes RGB_MATRIX_SUPPORTED = yes diff --git a/keyboards/melgeek/mj61/rev1/rules.mk b/keyboards/melgeek/mj61/rev1/rules.mk index 30e3240a944..c66b1abcd45 100644 --- a/keyboards/melgeek/mj61/rev1/rules.mk +++ b/keyboards/melgeek/mj61/rev1/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/melgeek/mj61/rev2/rules.mk b/keyboards/melgeek/mj61/rev2/rules.mk index 30e3240a944..c66b1abcd45 100644 --- a/keyboards/melgeek/mj61/rev2/rules.mk +++ b/keyboards/melgeek/mj61/rev2/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/melgeek/mj63/rev1/rules.mk b/keyboards/melgeek/mj63/rev1/rules.mk index 30e3240a944..c66b1abcd45 100644 --- a/keyboards/melgeek/mj63/rev1/rules.mk +++ b/keyboards/melgeek/mj63/rev1/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/melgeek/mj63/rev2/rules.mk b/keyboards/melgeek/mj63/rev2/rules.mk index 30e3240a944..c66b1abcd45 100644 --- a/keyboards/melgeek/mj63/rev2/rules.mk +++ b/keyboards/melgeek/mj63/rev2/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/melgeek/mj64/rev1/rules.mk b/keyboards/melgeek/mj64/rev1/rules.mk index 30e3240a944..c66b1abcd45 100644 --- a/keyboards/melgeek/mj64/rev1/rules.mk +++ b/keyboards/melgeek/mj64/rev1/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/melgeek/mj64/rev2/rules.mk b/keyboards/melgeek/mj64/rev2/rules.mk index 30e3240a944..c66b1abcd45 100644 --- a/keyboards/melgeek/mj64/rev2/rules.mk +++ b/keyboards/melgeek/mj64/rev2/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/melgeek/mj64/rev3/rules.mk b/keyboards/melgeek/mj64/rev3/rules.mk index 30e3240a944..c66b1abcd45 100644 --- a/keyboards/melgeek/mj64/rev3/rules.mk +++ b/keyboards/melgeek/mj64/rev3/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/melgeek/mj65/rev3/rules.mk b/keyboards/melgeek/mj65/rev3/rules.mk index b3984d93c02..7a3d7020d90 100644 --- a/keyboards/melgeek/mj65/rev3/rules.mk +++ b/keyboards/melgeek/mj65/rev3/rules.mk @@ -10,7 +10,7 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in + RGB_MATRIX_SUPPORTED = yes RGBLIGHT_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/miller/gm862/rules.mk b/keyboards/miller/gm862/rules.mk index 9f3770f0f40..ea646d3d939 100644 --- a/keyboards/miller/gm862/rules.mk +++ b/keyboards/miller/gm862/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/novelkeys/nk65/rules.mk b/keyboards/novelkeys/nk65/rules.mk index d71d9a6c4e8..5827e557b95 100755 --- a/keyboards/novelkeys/nk65/rules.mk +++ b/keyboards/novelkeys/nk65/rules.mk @@ -14,7 +14,6 @@ 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 -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in CIE1931_CURVE = yes diff --git a/keyboards/spaceholdings/nebula12/rules.mk b/keyboards/spaceholdings/nebula12/rules.mk index 191a1c0a1b5..a0b1795cee0 100755 --- a/keyboards/spaceholdings/nebula12/rules.mk +++ b/keyboards/spaceholdings/nebula12/rules.mk @@ -14,7 +14,6 @@ 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 -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in RGBLIGHT_ENABLE = yes # Underglow RGB CIE1931_CURVE = yes diff --git a/keyboards/spaceholdings/nebula68/rules.mk b/keyboards/spaceholdings/nebula68/rules.mk index 627f82784eb..d2484b627c3 100755 --- a/keyboards/spaceholdings/nebula68/rules.mk +++ b/keyboards/spaceholdings/nebula68/rules.mk @@ -14,7 +14,6 @@ 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 -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in RGBLIGHT_ENABLE = yes # Underglow RGB CIE1931_CURVE = yes diff --git a/keyboards/xbows/woody/rules.mk b/keyboards/xbows/woody/rules.mk index 90dd66d7722..d9a69f35bb6 100644 --- a/keyboards/xbows/woody/rules.mk +++ b/keyboards/xbows/woody/rules.mk @@ -10,4 +10,3 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover AUDIO_ENABLE = no RGB_MATRIX_ENABLE = yes # Use RGB matrix -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in From 6dbc1b800fdcdc3af508886660808f0a7623e41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Strza=C5=82ka?= <32881628+philvec@users.noreply.github.com> Date: Sat, 30 Mar 2024 18:48:50 +0100 Subject: [PATCH 082/333] [Keyboard] add arrowmechanics/wings (#23328) Co-authored-by: Arrow Mechanics Co-authored-by: Joel Challis Co-authored-by: Drashna Jaelre --- keyboards/arrowmechanics/wings/config.h | 11 + keyboards/arrowmechanics/wings/halconf.h | 9 + keyboards/arrowmechanics/wings/info.json | 320 ++++++++++++++++++ .../wings/keymaps/default/keymap.c | 25 ++ .../wings/keymaps/default/rules.mk | 1 + keyboards/arrowmechanics/wings/mcuconf.h | 9 + keyboards/arrowmechanics/wings/readme.md | 29 ++ keyboards/arrowmechanics/wings/rules.mk | 2 + 8 files changed, 406 insertions(+) create mode 100644 keyboards/arrowmechanics/wings/config.h create mode 100644 keyboards/arrowmechanics/wings/halconf.h create mode 100644 keyboards/arrowmechanics/wings/info.json create mode 100644 keyboards/arrowmechanics/wings/keymaps/default/keymap.c create mode 100644 keyboards/arrowmechanics/wings/keymaps/default/rules.mk create mode 100644 keyboards/arrowmechanics/wings/mcuconf.h create mode 100644 keyboards/arrowmechanics/wings/readme.md create mode 100644 keyboards/arrowmechanics/wings/rules.mk diff --git a/keyboards/arrowmechanics/wings/config.h b/keyboards/arrowmechanics/wings/config.h new file mode 100644 index 00000000000..bd58c470034 --- /dev/null +++ b/keyboards/arrowmechanics/wings/config.h @@ -0,0 +1,11 @@ +// Copyright 2024 Filip Strzałka (@philvec) +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#define SERIAL_USART_FULL_DUPLEX + +#define AUDIO_PIN GP4 +#define AUDIO_PWM_DRIVER PWMD2 +#define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_A +#define AUDIO_INIT_DELAY diff --git a/keyboards/arrowmechanics/wings/halconf.h b/keyboards/arrowmechanics/wings/halconf.h new file mode 100644 index 00000000000..772f7982164 --- /dev/null +++ b/keyboards/arrowmechanics/wings/halconf.h @@ -0,0 +1,9 @@ +// Copyright 2024 Filip Strzałka (@philvec) +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include_next + +#undef HAL_USE_PWM +#define HAL_USE_PWM TRUE diff --git a/keyboards/arrowmechanics/wings/info.json b/keyboards/arrowmechanics/wings/info.json new file mode 100644 index 00000000000..fca38314c9b --- /dev/null +++ b/keyboards/arrowmechanics/wings/info.json @@ -0,0 +1,320 @@ +{ + "manufacturer": "Arrow Mechanics", + "keyboard_name": "WINGS Mark 1", + "maintainer": "arrowmechanics", + "bootloader": "rp2040", + "diode_direction": "ROW2COL", + "encoder": { + "rotary": [ + {"pin_a": "GP6", "pin_b": "GP7", "resolution": 2} + ] + }, + "features": { + "audio": true, + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16"], + "rows": ["GP22", "GP21", "GP20", "GP19", "GP18", "GP17"] + }, + "processor": "RP2040", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "default": { + "animation": "breathing", + "hue": 192 + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 7], "x": 93, "y": 2, "flags": 4}, + {"matrix": [0, 6], "x": 80, "y": 1, "flags": 4}, + {"matrix": [0, 5], "x": 67, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 54, "y": 1, "flags": 4}, + {"matrix": [0, 3], "x": 42, "y": 3, "flags": 4}, + {"matrix": [0, 2], "x": 29, "y": 5, "flags": 4}, + {"matrix": [0, 1], "x": 16, "y": 5, "flags": 4}, + {"matrix": [0, 0], "x": 3, "y": 5, "flags": 4}, + + {"matrix": [1, 0], "x": 3, "y": 17, "flags": 4}, + {"matrix": [1, 1], "x": 16, "y": 17, "flags": 4}, + {"matrix": [1, 2], "x": 29, "y": 17, "flags": 4}, + {"matrix": [1, 3], "x": 42, "y": 15, "flags": 4}, + {"matrix": [1, 4], "x": 54, "y": 13, "flags": 4}, + {"matrix": [1, 5], "x": 67, "y": 12, "flags": 4}, + {"matrix": [1, 6], "x": 80, "y": 13, "flags": 4}, + {"matrix": [1, 7], "x": 93, "y": 14, "flags": 4}, + + {"matrix": [2, 8], "x": 106, "y": 25, "flags": 4}, + {"matrix": [2, 7], "x": 93, "y": 25, "flags": 4}, + {"matrix": [2, 6], "x": 80, "y": 25, "flags": 4}, + {"matrix": [2, 5], "x": 67, "y": 24, "flags": 4}, + {"matrix": [2, 4], "x": 54, "y": 25, "flags": 4}, + {"matrix": [2, 3], "x": 42, "y": 27, "flags": 4}, + {"matrix": [2, 2], "x": 26, "y": 29, "flags": 4}, + {"matrix": [2, 0], "x": 6, "y": 29, "flags": 4}, + + {"matrix": [3, 0], "x": 3, "y": 40, "flags": 4}, + {"matrix": [3, 2], "x": 22, "y": 40, "flags": 4}, + {"matrix": [3, 3], "x": 42, "y": 38, "flags": 4}, + {"matrix": [3, 4], "x": 54, "y": 36, "flags": 4}, + {"matrix": [3, 5], "x": 67, "y": 35, "flags": 4}, + {"matrix": [3, 6], "x": 80, "y": 36, "flags": 4}, + {"matrix": [3, 7], "x": 93, "y": 37, "flags": 4}, + {"matrix": [3, 8], "x": 106, "y": 37, "flags": 4}, + + {"matrix": [4, 8], "x": 106, "y": 49, "flags": 4}, + {"matrix": [4, 7], "x": 93, "y": 49, "flags": 4}, + {"matrix": [4, 6], "x": 80, "y": 48, "flags": 4}, + {"matrix": [4, 5], "x": 67, "y": 47, "flags": 4}, + {"matrix": [4, 4], "x": 54, "y": 48, "flags": 4}, + {"matrix": [4, 3], "x": 42, "y": 50, "flags": 4}, + {"matrix": [4, 1], "x": 21, "y": 52, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 52, "flags": 4}, + + {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [5, 1], "x": 13, "y": 64, "flags": 4}, + {"matrix": [5, 2], "x": 26, "y": 64, "flags": 4}, + {"matrix": [5, 3], "x": 43, "y": 62, "flags": 4}, + {"matrix": [5, 4], "x": 59, "y": 60, "flags": 4}, + {"matrix": [5, 6], "x": 75, "y": 60, "flags": 4}, + {"matrix": [5, 7], "x": 98, "y": 61, "flags": 4}, + + {"matrix": [6, 1], "x": 131, "y": 2, "flags": 4}, + {"matrix": [6, 2], "x": 144, "y": 1, "flags": 4}, + {"matrix": [6, 3], "x": 157, "y": 0, "flags": 4}, + {"matrix": [6, 4], "x": 170, "y": 1, "flags": 4}, + {"matrix": [6, 5], "x": 182, "y": 3, "flags": 4}, + {"matrix": [6, 6], "x": 195, "y": 5, "flags": 4}, + {"matrix": [6, 7], "x": 208, "y": 5, "flags": 4}, + {"matrix": [6, 8], "x": 221, "y": 5, "flags": 4}, + + {"matrix": [7, 8], "x": 214, "y": 17, "flags": 4}, + {"matrix": [7, 6], "x": 195, "y": 17, "flags": 4}, + {"matrix": [7, 5], "x": 182, "y": 15, "flags": 4}, + {"matrix": [7, 4], "x": 170, "y": 13, "flags": 4}, + {"matrix": [7, 3], "x": 157, "y": 12, "flags": 4}, + {"matrix": [7, 2], "x": 144, "y": 13, "flags": 4}, + {"matrix": [7, 1], "x": 131, "y": 14, "flags": 4}, + + {"matrix": [8, 0], "x": 118, "y": 25, "flags": 4}, + {"matrix": [8, 1], "x": 131, "y": 25, "flags": 4}, + {"matrix": [8, 2], "x": 144, "y": 25, "flags": 4}, + {"matrix": [8, 3], "x": 157, "y": 24, "flags": 4}, + {"matrix": [8, 4], "x": 170, "y": 25, "flags": 4}, + {"matrix": [8, 5], "x": 182, "y": 27, "flags": 4}, + {"matrix": [8, 6], "x": 195, "y": 29, "flags": 4}, + {"matrix": [8, 7], "x": 208, "y": 29, "flags": 4}, + {"matrix": [8, 8], "x": 221, "y": 29, "flags": 4}, + + {"matrix": [9, 8], "x": 216, "y": 40, "flags": 4}, + {"matrix": [9, 6], "x": 195, "y": 40, "flags": 4}, + {"matrix": [9, 5], "x": 182, "y": 38, "flags": 4}, + {"matrix": [9, 4], "x": 170, "y": 36, "flags": 4}, + {"matrix": [9, 3], "x": 157, "y": 35, "flags": 4}, + {"matrix": [9, 2], "x": 144, "y": 36, "flags": 4}, + {"matrix": [9, 1], "x": 131, "y": 37, "flags": 4}, + {"matrix": [9, 0], "x": 118, "y": 37, "flags": 4}, + + {"matrix": [10, 0], "x": 118, "y": 49, "flags": 4}, + {"matrix": [10, 1], "x": 131, "y": 49, "flags": 4}, + {"matrix": [10, 2], "x": 144, "y": 48, "flags": 4}, + {"matrix": [10, 3], "x": 157, "y": 47, "flags": 4}, + {"matrix": [10, 4], "x": 170, "y": 48, "flags": 4}, + {"matrix": [10, 5], "x": 182, "y": 50, "flags": 4}, + {"matrix": [10, 6], "x": 197, "y": 52, "flags": 4}, + {"matrix": [10, 7], "x": 211, "y": 52, "flags": 4}, + {"matrix": [10, 8], "x": 224, "y": 52, "flags": 4}, + + {"matrix": [11, 8], "x": 224, "y": 64, "flags": 4}, + {"matrix": [11, 7], "x": 211, "y": 64, "flags": 4}, + {"matrix": [11, 6], "x": 198, "y": 64, "flags": 4}, + {"matrix": [11, 5], "x": 181, "y": 62, "flags": 4}, + {"matrix": [11, 4], "x": 165, "y": 60, "flags": 4}, + {"matrix": [11, 2], "x": 149, "y": 60, "flags": 4}, + {"matrix": [11, 1], "x": 126, "y": 61, "flags": 4} + ], + "split_count": [47, 48] + }, + "split": { + "enabled": true, + "transport": { + "sync": { + "layer_state": true, + "matrix_state": true + } + } + }, + "tags": ["columnar", "split", "rgb", "hotswap", "encoder"], + "url": "https://arrowmechanics.com", + "usb": { + "device_version": "1.0.0", + "pid": "0x3134", + "vid": "0xA880" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP26" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0.25, "y": 0.43}, + {"matrix": [0, 1], "x": 1.25, "y": 0.43}, + {"matrix": [0, 2], "x": 2.25, "y": 0.43}, + {"matrix": [0, 3], "x": 3.25, "y": 0.25}, + {"matrix": [0, 4], "x": 4.25, "y": 0.08}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0.08}, + {"matrix": [0, 7], "x": 7.25, "y": 0.15}, + + {"matrix": [6, 1], "x": 10.45, "y": 0.15}, + {"matrix": [6, 2], "x": 11.45, "y": 0.08}, + {"matrix": [6, 3], "x": 12.45, "y": 0}, + {"matrix": [6, 4], "x": 13.45, "y": 0.08}, + {"matrix": [6, 5], "x": 14.45, "y": 0.25}, + {"matrix": [6, 6], "x": 15.45, "y": 0.43}, + {"matrix": [6, 7], "x": 16.45, "y": 0.43}, + {"matrix": [6, 8], "x": 17.45, "y": 0.43}, + + {"matrix": [1, 0], "x": 0.25, "y": 1.43}, + {"matrix": [1, 1], "x": 1.25, "y": 1.43}, + {"matrix": [1, 2], "x": 2.25, "y": 1.43}, + {"matrix": [1, 3], "x": 3.25, "y": 1.25}, + {"matrix": [1, 4], "x": 4.25, "y": 1.08}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1.08}, + {"matrix": [1, 7], "x": 7.25, "y": 1.15}, + {"matrix": [1, 8], "x": 8.25, "y": 1.15, "encoder": 0}, + + {"matrix": [7, 0], "x": 9.45, "y": 1.15}, + {"matrix": [7, 1], "x": 10.45, "y": 1.15}, + {"matrix": [7, 2], "x": 11.45, "y": 1.08}, + {"matrix": [7, 3], "x": 12.45, "y": 1}, + {"matrix": [7, 4], "x": 13.45, "y": 1.08}, + {"matrix": [7, 5], "x": 14.45, "y": 1.25}, + {"matrix": [7, 6], "x": 15.45, "y": 1.43}, + {"matrix": [7, 8], "x": 16.45, "y": 1.43, "w": 2}, + + {"matrix": [2, 0], "x": 0.25, "y": 2.43, "w": 1.5}, + {"matrix": [2, 2], "x": 1.75, "y": 2.43, "w": 1.5}, + {"matrix": [2, 3], "x": 3.25, "y": 2.25}, + {"matrix": [2, 4], "x": 4.25, "y": 2.08}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2.08}, + {"matrix": [2, 7], "x": 7.25, "y": 2.15}, + {"matrix": [2, 8], "x": 8.25, "y": 2.15}, + + {"matrix": [8, 0], "x": 9.45, "y": 2.15}, + {"matrix": [8, 1], "x": 10.45, "y": 2.15}, + {"matrix": [8, 2], "x": 11.45, "y": 2.08}, + {"matrix": [8, 3], "x": 12.45, "y": 2}, + {"matrix": [8, 4], "x": 13.45, "y": 2.08}, + {"matrix": [8, 5], "x": 14.45, "y": 2.25}, + {"matrix": [8, 6], "x": 15.45, "y": 2.43}, + {"matrix": [8, 7], "x": 16.45, "y": 2.43}, + {"matrix": [8, 8], "x": 17.45, "y": 2.43}, + + {"matrix": [3, 0], "x": 0, "y": 3.43, "w": 1.5}, + {"matrix": [3, 2], "x": 1.5, "y": 3.43, "w": 1.75}, + {"matrix": [3, 3], "x": 3.25, "y": 3.25}, + {"matrix": [3, 4], "x": 4.25, "y": 3.08}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3.08}, + {"matrix": [3, 7], "x": 7.25, "y": 3.15}, + {"matrix": [3, 8], "x": 8.25, "y": 3.15}, + + {"matrix": [9, 0], "x": 9.45, "y": 3.15}, + {"matrix": [9, 1], "x": 10.45, "y": 3.15}, + {"matrix": [9, 2], "x": 11.45, "y": 3.08}, + {"matrix": [9, 3], "x": 12.45, "y": 3}, + {"matrix": [9, 4], "x": 13.45, "y": 3.08}, + {"matrix": [9, 5], "x": 14.45, "y": 3.25}, + {"matrix": [9, 6], "x": 15.45, "y": 3.43}, + {"matrix": [9, 8], "x": 16.45, "y": 3.43, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.43}, + {"matrix": [4, 1], "x": 1, "y": 4.43, "w": 2.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.08}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4.08}, + {"matrix": [4, 7], "x": 7.25, "y": 4.15}, + {"matrix": [4, 8], "x": 8.25, "y": 4.15}, + + {"matrix": [10, 0], "x": 9.45, "y": 4.15}, + {"matrix": [10, 1], "x": 10.45, "y": 4.15}, + {"matrix": [10, 2], "x": 11.45, "y": 4.08}, + {"matrix": [10, 3], "x": 12.45, "y": 4}, + {"matrix": [10, 4], "x": 13.45, "y": 4.08}, + {"matrix": [10, 5], "x": 14.45, "y": 4.25}, + {"matrix": [10, 6], "x": 15.45, "y": 4.43, "w": 1.25}, + {"matrix": [10, 7], "x": 16.7, "y": 4.43}, + {"matrix": [10, 8], "x": 17.7, "y": 4.43}, + + {"matrix": [5, 0], "x": 0, "y": 5.43}, + {"matrix": [5, 1], "x": 1, "y": 5.43}, + {"matrix": [5, 2], "x": 2, "y": 5.43}, + {"matrix": [5, 3], "x": 3.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 4], "x": 4.5, "y": 5.08, "w": 1.25}, + {"matrix": [5, 6], "x": 5.75, "y": 5.08, "w": 1.25}, + {"matrix": [5, 7], "x": 7, "y": 5.15, "w": 2.25}, + + {"matrix": [11, 1], "x": 9.45, "y": 5.15, "w": 2.25}, + {"matrix": [11, 2], "x": 11.7, "y": 5.08, "w": 1.25}, + {"matrix": [11, 4], "x": 12.95, "y": 5.08, "w": 1.25}, + {"matrix": [11, 5], "x": 14.2, "y": 5.25, "w": 1.25}, + {"matrix": [11, 6], "x": 15.7, "y": 5.43}, + {"matrix": [11, 7], "x": 16.7, "y": 5.43}, + {"matrix": [11, 8], "x": 17.7, "y": 5.43} + ] + } + } +} diff --git a/keyboards/arrowmechanics/wings/keymaps/default/keymap.c b/keyboards/arrowmechanics/wings/keymaps/default/keymap.c new file mode 100644 index 00000000000..949219b820b --- /dev/null +++ b/keyboards/arrowmechanics/wings/keymaps/default/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2024 Filip Strzałka (@philvec) +// SPDX-License-Identifier: GPL-3.0-or-later + +#include QMK_KEYBOARD_H + +enum layers { + BASE, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [BASE] = LAYOUT( + KC_VOLU, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_EQL, KC_PSCR, KC_DEL, + KC_VOLD, KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, RGB_MOD, KC_BTN1, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC, + KC_MPLY, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, C(KC_C), C(KC_V), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_MNXT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, C(KC_Z), C(KC_Y), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_MPRV, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_HOME, + KC_LCTL, KC_NO, KC_NO, KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCMD, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [BASE] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) }, +}; +#endif diff --git a/keyboards/arrowmechanics/wings/keymaps/default/rules.mk b/keyboards/arrowmechanics/wings/keymaps/default/rules.mk new file mode 100644 index 00000000000..ee325681483 --- /dev/null +++ b/keyboards/arrowmechanics/wings/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/arrowmechanics/wings/mcuconf.h b/keyboards/arrowmechanics/wings/mcuconf.h new file mode 100644 index 00000000000..80214c1bbd8 --- /dev/null +++ b/keyboards/arrowmechanics/wings/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2024 Filip Strzałka (@philvec) +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include_next + +#undef RP_PWM_USE_PWM2 +#define RP_PWM_USE_PWM2 TRUE diff --git a/keyboards/arrowmechanics/wings/readme.md b/keyboards/arrowmechanics/wings/readme.md new file mode 100644 index 00000000000..8f167174e3d --- /dev/null +++ b/keyboards/arrowmechanics/wings/readme.md @@ -0,0 +1,29 @@ +# Arrow Mechanics WINGS Mark 1 + +![Arrow Mechanics WINGS Mark 1](https://i.imgur.com/oQkDmSu.png) + +ErgoDox-inspired SPLIT keyboard by [Arrow Mechanics](https://www.arrowmechanics.com/) + +* 94 GATERON Low Profile 2.0 hotswap sockets +* RGB diode under each key for WS2812-driven lighting with [RGB Matrix](https://docs.qmk.fm/#/feature_rgb_matrix) +* 2 rotary encoders, one per half, with push-switches +* Buzzers for sound effects and/or [Music Mode](https://docs.qmk.fm/#/feature_audio?id=music-mode) +* Handy magnetic connectors for joining the halves together or splitting with the use of dedicated cable +* Anti-slip pads with magnetic expanding-legs for conveniently adjusting height/lean +* RP2040 Chip + 16MB Flash memory - Dual-core Cortex M0+ +--- +* Keyboard Maintainer: [arrowmechanics](https://github.com/arrowmechanics/) +* Hardware Supported: [Arrow Mechanics WINGS Keyboard set](https://www.arrowmechanics.com/produkty?view=product&id=8) +* Hardware Availability: [Official Arrow Mechanics E-SHOP](https://www.arrowmechanics.com/produkty?view=product&id=8) + +Flashing example for this keyboard: + + qmk flash -kb arrowmechanics/wings -km default + +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). + +## Bootloader + +Enter the bootloader in 2 ways: +* **Bootmagic reset**: Hold down the top-left corner key on power-up. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/arrowmechanics/wings/rules.mk b/keyboards/arrowmechanics/wings/rules.mk new file mode 100644 index 00000000000..22ce54190c8 --- /dev/null +++ b/keyboards/arrowmechanics/wings/rules.mk @@ -0,0 +1,2 @@ +SERIAL_DRIVER = vendor +AUDIO_DRIVER = pwm_hardware From 72ec742d2c35b364d8756109e552abaf62298b08 Mon Sep 17 00:00:00 2001 From: c0ldbru Date: Sat, 30 Mar 2024 13:52:40 -0400 Subject: [PATCH 083/333] [Keyboard] Add rot13labs hackboard (#23218) Co-authored-by: c0ldbru Co-authored-by: Duncan Sutherland --- keyboards/rot13labs/hackboard/info.json | 132 ++++++++++++++++++ .../hackboard/keymaps/default/keymap.c | 36 +++++ keyboards/rot13labs/hackboard/readme.md | 22 +++ keyboards/rot13labs/hackboard/rules.mk | 2 + 4 files changed, 192 insertions(+) create mode 100644 keyboards/rot13labs/hackboard/info.json create mode 100644 keyboards/rot13labs/hackboard/keymaps/default/keymap.c create mode 100644 keyboards/rot13labs/hackboard/readme.md create mode 100644 keyboards/rot13labs/hackboard/rules.mk diff --git a/keyboards/rot13labs/hackboard/info.json b/keyboards/rot13labs/hackboard/info.json new file mode 100644 index 00000000000..7ed0b5bd97a --- /dev/null +++ b/keyboards/rot13labs/hackboard/info.json @@ -0,0 +1,132 @@ +{ + "keyboard_name": "HACKBOARD", + "manufacturer": "rot13labs", + "url": "https://rot13labs.com", + "maintainer": "c0ldbru", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, + "usb": { + "vid": "0xBEEF", + "pid": "0xCAFE", + "device_version": "1.0.0" + }, + "matrix_pins": { + "cols": ["A0", "B0", "A1", "B1", "A2", "B2", "A3", "B3", "A4", "B4", "A5", "A6", "A7", "D6", "D5", "D1", "D0", "D7"], + "rows": ["C2", "C3", "C7", "C4", "C6", "C5"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32a", + "bootloader": "usbasploader", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 1], "x": 6, "y": 0, "w": 0.75, "h": 0.75}, + + {"matrix": [0, 0], "x": 0, "y": 1}, + + {"matrix": [0, 2], "x": 2, "y": 1}, + {"matrix": [0, 3], "x": 3, "y": 1}, + {"matrix": [0, 4], "x": 4, "y": 1}, + {"matrix": [0, 5], "x": 5, "y": 1}, + + {"matrix": [0, 6], "x": 6.5, "y": 1}, + {"matrix": [0, 7], "x": 7.5, "y": 1}, + {"matrix": [0, 8], "x": 8.5, "y": 1}, + {"matrix": [0, 9], "x": 9.5, "y": 1}, + + {"matrix": [0, 11], "x": 11, "y": 1}, + {"matrix": [0, 12], "x": 12, "y": 1}, + {"matrix": [0, 13], "x": 13, "y": 1}, + {"matrix": [0, 14], "x": 14, "y": 1}, + + {"matrix": [0, 15], "x": 15.25, "y": 1}, + {"matrix": [0, 16], "x": 16.25, "y": 1}, + {"matrix": [0, 17], "x": 17.25, "y": 1}, + + {"matrix": [1, 0], "x": 0, "y": 2.25}, + {"matrix": [1, 1], "x": 1, "y": 2.25}, + {"matrix": [1, 2], "x": 2, "y": 2.25}, + {"matrix": [1, 3], "x": 3, "y": 2.25}, + {"matrix": [1, 4], "x": 4, "y": 2.25}, + {"matrix": [1, 5], "x": 5, "y": 2.25}, + {"matrix": [1, 6], "x": 6, "y": 2.25}, + {"matrix": [1, 7], "x": 7, "y": 2.25}, + {"matrix": [1, 8], "x": 8, "y": 2.25}, + {"matrix": [1, 9], "x": 9, "y": 2.25}, + {"matrix": [1, 10], "x": 10, "y": 2.25}, + {"matrix": [1, 11], "x": 11, "y": 2.25}, + {"matrix": [1, 12], "x": 12, "y": 2.25}, + {"matrix": [1, 13], "x": 13, "y": 2.25, "w": 2}, + + {"matrix": [1, 15], "x": 15.25, "y": 2.25}, + {"matrix": [1, 16], "x": 16.25, "y": 2.25}, + {"matrix": [1, 17], "x": 17.25, "y": 2.25}, + + {"matrix": [2, 0], "x": 0, "y": 3.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 3.25}, + {"matrix": [2, 2], "x": 2.5, "y": 3.25}, + {"matrix": [2, 3], "x": 3.5, "y": 3.25}, + {"matrix": [2, 4], "x": 4.5, "y": 3.25}, + {"matrix": [2, 5], "x": 5.5, "y": 3.25}, + {"matrix": [2, 6], "x": 6.5, "y": 3.25}, + {"matrix": [2, 7], "x": 7.5, "y": 3.25}, + {"matrix": [2, 8], "x": 8.5, "y": 3.25}, + {"matrix": [2, 9], "x": 9.5, "y": 3.25}, + {"matrix": [2, 10], "x": 10.5, "y": 3.25}, + {"matrix": [2, 11], "x": 11.5, "y": 3.25}, + {"matrix": [2, 12], "x": 12.5, "y": 3.25}, + {"matrix": [2, 13], "x": 13.5, "y": 3.25, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 3.25}, + {"matrix": [2, 16], "x": 16.25, "y": 3.25}, + {"matrix": [2, 17], "x": 17.25, "y": 3.25}, + + {"matrix": [3, 0], "x": 0, "y": 4.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 4.25}, + {"matrix": [3, 2], "x": 2.75, "y": 4.25}, + {"matrix": [3, 3], "x": 3.75, "y": 4.25}, + {"matrix": [3, 4], "x": 4.75, "y": 4.25}, + {"matrix": [3, 5], "x": 5.75, "y": 4.25}, + {"matrix": [3, 6], "x": 6.75, "y": 4.25}, + {"matrix": [3, 7], "x": 7.75, "y": 4.25}, + {"matrix": [3, 8], "x": 8.75, "y": 4.25}, + {"matrix": [3, 9], "x": 9.75, "y": 4.25}, + {"matrix": [3, 10], "x": 10.75, "y": 4.25}, + {"matrix": [3, 11], "x": 11.75, "y": 4.25}, + {"matrix": [3, 13], "x": 12.75, "y": 4.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 5.25}, + {"matrix": [4, 2], "x": 3.25, "y": 5.25}, + {"matrix": [4, 3], "x": 4.25, "y": 5.25}, + {"matrix": [4, 4], "x": 5.25, "y": 5.25}, + {"matrix": [4, 5], "x": 6.25, "y": 5.25}, + {"matrix": [4, 6], "x": 7.25, "y": 5.25}, + {"matrix": [4, 7], "x": 8.25, "y": 5.25}, + {"matrix": [4, 8], "x": 9.25, "y": 5.25}, + {"matrix": [4, 9], "x": 10.25, "y": 5.25}, + {"matrix": [4, 10], "x": 11.25, "y": 5.25}, + {"matrix": [4, 13], "x": 12.25, "y": 5.25, "w": 2.75}, + + {"matrix": [4, 16], "x": 16.25, "y": 5.25}, + + {"matrix": [5, 0], "x": 0, "y": 6.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 6.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 6.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 6.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 6.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 6.25, "w": 1.25}, + {"matrix": [5, 12], "x": 12.5, "y": 6.25, "w": 1.25}, + {"matrix": [5, 14], "x": 13.75, "y": 6.25, "w": 1.25}, + + {"matrix": [5, 15], "x": 15.25, "y": 6.25}, + {"matrix": [5, 16], "x": 16.25, "y": 6.25}, + {"matrix": [5, 17], "x": 17.25, "y": 6.25} + ] + } + } +} diff --git a/keyboards/rot13labs/hackboard/keymaps/default/keymap.c b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c new file mode 100644 index 00000000000..542d541bf31 --- /dev/null +++ b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c @@ -0,0 +1,36 @@ +/* Copyright 2023 rot13labs + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_NO, + 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + + [1] = LAYOUT( + KC_NO, + _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______, + _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______) +}; diff --git a/keyboards/rot13labs/hackboard/readme.md b/keyboards/rot13labs/hackboard/readme.md new file mode 100644 index 00000000000..c14b742326c --- /dev/null +++ b/keyboards/rot13labs/hackboard/readme.md @@ -0,0 +1,22 @@ +# HACKBOARD + +![hackboard](https://i.imgur.com/te8feiB.png) + +A TKL keyboard for hackers based on the mysterium platform by coseyfannitutti + +* Keyboard Maintainer: [c0ldbru](https://github.com/c0ldbru) +* Hardware Supported: HACKBOARD // atmega32a +* Hardware Availability: [rot13labs](https://rot13labs.com) + +Make example for this keyboard (after setting up your build environment): + + make rot13labs/hackboard:default + +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). + +## Bootloader + +You can enter the bootloader to flash on new firmware in one of two ways: + +* **Bootmagic**: Hold the ESC key (top left key) and hit reset +* **Boot button**: Hold the boot button on the top of the PCB and hit reset \ No newline at end of file diff --git a/keyboards/rot13labs/hackboard/rules.mk b/keyboards/rot13labs/hackboard/rules.mk new file mode 100644 index 00000000000..c2ee0bc86f9 --- /dev/null +++ b/keyboards/rot13labs/hackboard/rules.mk @@ -0,0 +1,2 @@ +# Processor frequency +F_CPU = 16000000 From 83625da36b06b95dea266680dfb81164d9a6edc1 Mon Sep 17 00:00:00 2001 From: Arthur <37627147+ArthurCyy@users.noreply.github.com> Date: Sun, 31 Mar 2024 01:59:51 +0800 Subject: [PATCH 084/333] Add solid_reactive effects for MIIIW BlackIO83 (#22251) --- keyboards/miiiw/blackio83/info.json | 122 ++++++++++++++++------------ 1 file changed, 69 insertions(+), 53 deletions(-) diff --git a/keyboards/miiiw/blackio83/info.json b/keyboards/miiiw/blackio83/info.json index 24dc644405f..d3fb31d109f 100644 --- a/keyboards/miiiw/blackio83/info.json +++ b/keyboards/miiiw/blackio83/info.json @@ -30,34 +30,48 @@ "processor": "STM32F072", "rgb_matrix": { "animations": { - "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_sat": true, "band_spiral_sat": true, "band_spiral_val": true, + "band_val": true, + "breathing": true, "cycle_all": true, "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, "cycle_out_in": true, "cycle_out_in_dual": true, "cycle_pinwheel": true, "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": true, - "raindrops": true, - "jellybean_raindrops": true, + "gradient_left_right": true, + "gradient_up_down": true, "hue_breathing": true, "hue_pendulum": true, "hue_wave": true, - "pixel_rain": true, + "jellybean_raindrops": true, + "multisplash": true, "pixel_flow": true, - "pixel_fractal": true + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true }, "center_point": [62, 42], "default": { @@ -80,21 +94,21 @@ {"matrix": [0, 13], "x": 102, "y": 0, "flags": 4}, {"matrix": [0, 14], "x": 112, "y": 0, "flags": 4}, {"matrix": [0, 15], "x": 124, "y": 0, "flags": 4}, - {"matrix": [1, 0], "x": 124, "y": 20, "flags": 4}, - {"matrix": [1, 1], "x": 108, "y": 20, "flags": 4}, - {"matrix": [1, 2], "x": 96, "y": 20, "flags": 4}, - {"matrix": [1, 3], "x": 88, "y": 20, "flags": 4}, - {"matrix": [1, 4], "x": 80, "y": 20, "flags": 4}, - {"matrix": [1, 5], "x": 72, "y": 20, "flags": 4}, - {"matrix": [1, 6], "x": 64, "y": 20, "flags": 4}, + {"matrix": [1, 15], "x": 124, "y": 20, "flags": 4}, + {"matrix": [1, 13], "x": 108, "y": 20, "flags": 4}, + {"matrix": [1, 12], "x": 96, "y": 20, "flags": 4}, + {"matrix": [1, 11], "x": 88, "y": 20, "flags": 4}, + {"matrix": [1, 10], "x": 80, "y": 20, "flags": 4}, + {"matrix": [1, 9], "x": 72, "y": 20, "flags": 4}, + {"matrix": [1, 8], "x": 64, "y": 20, "flags": 4}, {"matrix": [1, 7], "x": 56, "y": 20, "flags": 4}, - {"matrix": [1, 8], "x": 48, "y": 20, "flags": 4}, - {"matrix": [1, 9], "x": 40, "y": 20, "flags": 4}, - {"matrix": [1, 10], "x": 32, "y": 20, "flags": 4}, - {"matrix": [1, 11], "x": 24, "y": 20, "flags": 4}, - {"matrix": [1, 12], "x": 16, "y": 20, "flags": 4}, - {"matrix": [1, 13], "x": 8, "y": 20, "flags": 4}, - {"matrix": [1, 15], "x": 0, "y": 20, "flags": 4}, + {"matrix": [1, 6], "x": 48, "y": 20, "flags": 4}, + {"matrix": [1, 5], "x": 40, "y": 20, "flags": 4}, + {"matrix": [1, 4], "x": 32, "y": 20, "flags": 4}, + {"matrix": [1, 3], "x": 24, "y": 20, "flags": 4}, + {"matrix": [1, 2], "x": 16, "y": 20, "flags": 4}, + {"matrix": [1, 1], "x": 8, "y": 20, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 20, "flags": 4}, {"matrix": [2, 0], "x": 2, "y": 36, "flags": 4}, {"matrix": [2, 1], "x": 12, "y": 36, "flags": 4}, {"matrix": [2, 2], "x": 20, "y": 36, "flags": 4}, @@ -110,20 +124,20 @@ {"matrix": [2, 12], "x": 100, "y": 36, "flags": 4}, {"matrix": [2, 13], "x": 110, "y": 36, "flags": 4}, {"matrix": [2, 15], "x": 124, "y": 36, "flags": 4}, - {"matrix": [3, 0], "x": 124, "y": 52, "flags": 4}, - {"matrix": [3, 1], "x": 107, "y": 52, "flags": 4}, - {"matrix": [3, 2], "x": 94, "y": 52, "flags": 4}, - {"matrix": [3, 3], "x": 86, "y": 52, "flags": 4}, - {"matrix": [3, 4], "x": 78, "y": 52, "flags": 4}, - {"matrix": [3, 5], "x": 70, "y": 52, "flags": 4}, - {"matrix": [3, 6], "x": 62, "y": 52, "flags": 4}, - {"matrix": [3, 7], "x": 54, "y": 52, "flags": 4}, - {"matrix": [3, 8], "x": 46, "y": 52, "flags": 4}, - {"matrix": [3, 9], "x": 38, "y": 52, "flags": 4}, - {"matrix": [3, 10], "x": 30, "y": 52, "flags": 4}, - {"matrix": [3, 11], "x": 22, "y": 52, "flags": 4}, - {"matrix": [3, 12], "x": 14, "y": 52, "flags": 4}, - {"matrix": [3, 15], "x": 3, "y": 52, "flags": 4}, + {"matrix": [3, 15], "x": 124, "y": 52, "flags": 4}, + {"matrix": [3, 12], "x": 107, "y": 52, "flags": 4}, + {"matrix": [3, 11], "x": 94, "y": 52, "flags": 4}, + {"matrix": [3, 10], "x": 86, "y": 52, "flags": 4}, + {"matrix": [3, 9], "x": 78, "y": 52, "flags": 4}, + {"matrix": [3, 8], "x": 70, "y": 52, "flags": 4}, + {"matrix": [3, 7], "x": 62, "y": 52, "flags": 4}, + {"matrix": [3, 6], "x": 54, "y": 52, "flags": 4}, + {"matrix": [3, 5], "x": 46, "y": 52, "flags": 4}, + {"matrix": [3, 4], "x": 38, "y": 52, "flags": 4}, + {"matrix": [3, 3], "x": 30, "y": 52, "flags": 4}, + {"matrix": [3, 2], "x": 22, "y": 52, "flags": 4}, + {"matrix": [3, 1], "x": 14, "y": 52, "flags": 4}, + {"matrix": [3, 0], "x": 3, "y": 52, "flags": 4}, {"matrix": [4, 0], "x": 5, "y": 68, "flags": 4}, {"matrix": [4, 1], "x": 18, "y": 68, "flags": 4}, {"matrix": [4, 2], "x": 26, "y": 68, "flags": 4}, @@ -138,21 +152,23 @@ {"matrix": [4, 11], "x": 104, "y": 68, "flags": 4}, {"matrix": [4, 13], "x": 114, "y": 68, "flags": 4}, {"matrix": [4, 15], "x": 124, "y": 68, "flags": 4}, - {"matrix": [5, 0], "x": 122, "y": 84, "flags": 4}, - {"matrix": [5, 1], "x": 114, "y": 84, "flags": 4}, - {"matrix": [5, 2], "x": 106, "y": 84, "flags": 4}, - {"matrix": [5, 5], "x": 96, "y": 84, "flags": 4}, - {"matrix": [5, 8], "x": 88, "y": 84, "flags": 4}, - {"matrix": [5, 9], "x": 80, "y": 84, "flags": 4}, - {"matrix": [5, 10], "x": 50, "y": 84, "flags": 4}, - {"matrix": [5, 12], "x": 20, "y": 88, "flags": 4}, - {"matrix": [5, 13], "x": 10, "y": 88, "flags": 4}, - {"matrix": [5, 14], "x": 1, "y": 88, "flags": 4} - ] + {"matrix": [5, 14], "x": 122, "y": 84, "flags": 4}, + {"matrix": [5, 13], "x": 114, "y": 84, "flags": 4}, + {"matrix": [5, 12], "x": 106, "y": 84, "flags": 4}, + {"matrix": [5, 10], "x": 96, "y": 84, "flags": 4}, + {"matrix": [5, 9], "x": 88, "y": 84, "flags": 4}, + {"matrix": [5, 8], "x": 80, "y": 84, "flags": 4}, + {"matrix": [5, 5], "x": 50, "y": 84, "flags": 4}, + {"matrix": [5, 2], "x": 20, "y": 88, "flags": 4}, + {"matrix": [5, 1], "x": 10, "y": 88, "flags": 4}, + {"matrix": [5, 0], "x": 1, "y": 88, "flags": 4} + ], + "max_brightness": 160 }, "url": "https://github.com/ArthurCyy", "usb": { "device_version": "0.0.1", + "force_nkro": true, "pid": "0x83A1", "vid": "0x3044" }, @@ -248,4 +264,4 @@ ] } } -} \ No newline at end of file +} From e9f187f612840d687ddfe070c2a1fef470676aed Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Sun, 31 Mar 2024 09:07:03 +0800 Subject: [PATCH 085/333] [Keyboard] Add skiller_skg50_s2 (#23364) Co-authored-by: wb Co-authored-by: Duncan Sutherland Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/sharkoon/skiller_sgk50_s2/config.h | 13 + keyboards/sharkoon/skiller_sgk50_s2/halconf.h | 10 + keyboards/sharkoon/skiller_sgk50_s2/info.json | 515 ++++++++++++++++++ .../skiller_sgk50_s2/keymaps/default/keymap.c | 25 + .../skiller_sgk50_s2/keymaps/via/keymap.c | 25 + .../skiller_sgk50_s2/keymaps/via/rules.mk | 1 + keyboards/sharkoon/skiller_sgk50_s2/mcuconf.h | 9 + keyboards/sharkoon/skiller_sgk50_s2/readme.md | 24 + keyboards/sharkoon/skiller_sgk50_s2/rules.mk | 1 + 9 files changed, 623 insertions(+) create mode 100644 keyboards/sharkoon/skiller_sgk50_s2/config.h create mode 100644 keyboards/sharkoon/skiller_sgk50_s2/halconf.h create mode 100644 keyboards/sharkoon/skiller_sgk50_s2/info.json create mode 100644 keyboards/sharkoon/skiller_sgk50_s2/keymaps/default/keymap.c create mode 100644 keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/keymap.c create mode 100644 keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/rules.mk create mode 100644 keyboards/sharkoon/skiller_sgk50_s2/mcuconf.h create mode 100644 keyboards/sharkoon/skiller_sgk50_s2/readme.md create mode 100644 keyboards/sharkoon/skiller_sgk50_s2/rules.mk diff --git a/keyboards/sharkoon/skiller_sgk50_s2/config.h b/keyboards/sharkoon/skiller_sgk50_s2/config.h new file mode 100644 index 00000000000..1d0f8f9a901 --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s2/config.h @@ -0,0 +1,13 @@ +// Copyright 2024 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* SPI Config for spi flash*/ +#define SPI_DRIVER SPIDQ +#define SPI_SCK_PIN B3 +#define SPI_MOSI_PIN B5 +#define SPI_MISO_PIN B4 +#define SPI_MOSI_PAL_MODE 5 + +#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 diff --git a/keyboards/sharkoon/skiller_sgk50_s2/halconf.h b/keyboards/sharkoon/skiller_sgk50_s2/halconf.h new file mode 100644 index 00000000000..9d456a5106f --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s2/halconf.h @@ -0,0 +1,10 @@ +// Copyright 2024 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_SPI TRUE +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD + +#include_next diff --git a/keyboards/sharkoon/skiller_sgk50_s2/info.json b/keyboards/sharkoon/skiller_sgk50_s2/info.json new file mode 100644 index 00000000000..39d59ffa55a --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s2/info.json @@ -0,0 +1,515 @@ +{ + "manufacturer": "Sharkoon Technologies GmbH", + "keyboard_name": "SKILLER SGK50 S2", + "maintainer": "JoyLee", + "bootloader": "wb32-dfu", + "diode_direction": "ROW2COL", + "eeprom": { + "driver": "wear_leveling", + "wear_leveling": { + "backing_size": 4096, + "driver": "spi_flash" + } + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "A6", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "C4", "C5", "B0"], + "rows": ["A0", "A1", "A2", "A3", "A4", "C13"] + }, + "processor": "WB32FQ95", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "default": { + "val": 80 + }, + "driver": "ws2812", + "layout": [ + {"matrix": [5, 6], "x": 75, "y": 64, "flags": 4}, + {"matrix": [5, 10], "x": 124, "y": 64, "flags": 1}, + {"matrix": [5, 11], "x": 137, "y": 64, "flags": 1}, + {"matrix": [5, 12], "x": 149, "y": 64, "flags": 1}, + {"matrix": [5, 13], "x": 162, "y": 64, "flags": 4}, + {"matrix": [5, 14], "x": 174, "y": 64, "flags": 4}, + {"matrix": [5, 15], "x": 187, "y": 64, "flags": 4}, + {"matrix": [5, 16], "x": 199, "y": 64, "flags": 4}, + {"matrix": [5, 17], "x": 212, "y": 64, "flags": 4}, + {"matrix": [4, 18], "x": 224, "y": 51, "flags": 4}, + {"matrix": [4, 17], "x": 212, "y": 51, "flags": 4}, + {"matrix": [4, 16], "x": 199, "y": 51, "flags": 4}, + {"matrix": [4, 15], "x": 187, "y": 51, "flags": 4}, + {"matrix": [4, 14], "x": 174, "y": 51, "flags": 4}, + {"matrix": [4, 12], "x": 149, "y": 51, "flags": 4}, + {"matrix": [4, 11], "x": 137, "y": 51, "flags": 4}, + {"matrix": [4, 10], "x": 124, "y": 51, "flags": 4}, + {"matrix": [4, 9], "x": 112, "y": 51, "flags": 4}, + {"matrix": [4, 8], "x": 100, "y": 51, "flags": 4}, + {"matrix": [4, 7], "x": 87, "y": 51, "flags": 4}, + {"matrix": [4, 6], "x": 75, "y": 51, "flags": 4}, + {"matrix": [4, 5], "x": 62, "y": 51, "flags": 4}, + {"matrix": [4, 4], "x": 50, "y": 51, "flags": 4}, + {"matrix": [4, 3], "x": 37, "y": 51, "flags": 4}, + {"matrix": [4, 2], "x": 25, "y": 51, "flags": 4}, + {"matrix": [3, 2], "x": 25, "y": 38, "flags": 4}, + {"matrix": [3, 3], "x": 37, "y": 38, "flags": 4}, + {"matrix": [3, 4], "x": 50, "y": 38, "flags": 4}, + {"matrix": [3, 5], "x": 62, "y": 38, "flags": 4}, + {"matrix": [3, 6], "x": 75, "y": 38, "flags": 4}, + {"matrix": [3, 7], "x": 87, "y": 38, "flags": 4}, + {"matrix": [3, 8], "x": 100, "y": 38, "flags": 4}, + {"matrix": [3, 9], "x": 112, "y": 38, "flags": 4}, + {"matrix": [3, 10], "x": 124, "y": 38, "flags": 4}, + {"matrix": [3, 11], "x": 137, "y": 38, "flags": 4}, + {"matrix": [3, 12], "x": 149, "y": 38, "flags": 4}, + {"matrix": [2, 13], "x": 162, "y": 38, "flags": 4}, + {"x": 162, "y": 38, "flags": 4}, + {"matrix": [3, 15], "x": 187, "y": 38, "flags": 4}, + {"matrix": [3, 16], "x": 199, "y": 38, "flags": 4}, + {"matrix": [3, 17], "x": 212, "y": 38, "flags": 4}, + {"matrix": [2, 18], "x": 224, "y": 26, "flags": 4}, + {"matrix": [2, 17], "x": 212, "y": 26, "flags": 4}, + {"matrix": [2, 16], "x": 199, "y": 26, "flags": 4}, + {"matrix": [2, 15], "x": 187, "y": 26, "flags": 4}, + {"x": 162, "y": 26, "flags": 4}, + {"matrix": [3, 13], "x": 162, "y": 26, "flags": 4}, + {"matrix": [2, 12], "x": 149, "y": 26, "flags": 4}, + {"matrix": [2, 11], "x": 137, "y": 26, "flags": 4}, + {"matrix": [2, 10], "x": 124, "y": 26, "flags": 4}, + {"matrix": [2, 9], "x": 112, "y": 26, "flags": 4}, + {"matrix": [2, 8], "x": 100, "y": 26, "flags": 4}, + {"matrix": [2, 7], "x": 87, "y": 26, "flags": 4}, + {"matrix": [2, 6], "x": 75, "y": 26, "flags": 4}, + {"matrix": [2, 5], "x": 62, "y": 26, "flags": 4}, + {"matrix": [2, 4], "x": 50, "y": 26, "flags": 4}, + {"matrix": [2, 3], "x": 37, "y": 26, "flags": 4}, + {"matrix": [2, 2], "x": 25, "y": 26, "flags": 4}, + {"matrix": [2, 1], "x": 12, "y": 26, "flags": 4}, + {"matrix": [1, 1], "x": 12, "y": 13, "flags": 4}, + {"matrix": [1, 2], "x": 25, "y": 13, "flags": 4}, + {"matrix": [1, 3], "x": 37, "y": 13, "flags": 4}, + {"matrix": [1, 4], "x": 50, "y": 13, "flags": 4}, + {"matrix": [1, 5], "x": 62, "y": 13, "flags": 4}, + {"matrix": [1, 6], "x": 75, "y": 13, "flags": 4}, + {"matrix": [1, 7], "x": 87, "y": 13, "flags": 4}, + {"matrix": [1, 8], "x": 100, "y": 13, "flags": 4}, + {"matrix": [1, 9], "x": 112, "y": 13, "flags": 4}, + {"matrix": [1, 10], "x": 124, "y": 13, "flags": 4}, + {"matrix": [1, 11], "x": 137, "y": 13, "flags": 4}, + {"matrix": [1, 12], "x": 149, "y": 13, "flags": 4}, + {"matrix": [1, 13], "x": 162, "y": 13, "flags": 4}, + {"matrix": [1, 15], "x": 187, "y": 13, "flags": 4}, + {"matrix": [1, 16], "x": 199, "y": 13, "flags": 4}, + {"matrix": [1, 17], "x": 212, "y": 13, "flags": 4}, + {"matrix": [1, 18], "x": 224, "y": 13, "flags": 4}, + {"matrix": [0, 18], "x": 224, "y": 0, "flags": 4}, + {"matrix": [0, 17], "x": 212, "y": 0, "flags": 4}, + {"matrix": [0, 16], "x": 199, "y": 0, "flags": 4}, + {"matrix": [0, 15], "x": 187, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 174, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 162, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 149, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 137, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 124, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 112, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 100, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 87, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 75, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 62, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 50, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 37, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 25, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 12, "y": 0, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 26, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 38, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 51, "flags": 1}, + {"matrix": [4, 0], "x": 0, "y": 51, "flags": 1}, + {"matrix": [5, 0], "x": 0, "y": 64, "flags": 1}, + {"matrix": [5, 1], "x": 12, "y": 64, "flags": 1}, + {"matrix": [5, 2], "x": 25, "y": 64, "flags": 1}, + {"matrix": [4, 1], "x": 12, "y": 51, "flags": 4} + ], + "max_brightness": 110, + "val_steps": 28, + "sleep": true + }, + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x3662", + "suspend_wakeup_delay": 1000, + "vid": "0x6332" + }, + "ws2812": { + "pin": "A8" + }, + "community_layouts": ["96_ansi", "96_iso"], + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + {"matrix": [0, 16], "x": 16, "y": 0}, + {"matrix": [0, 17], "x": 17, "y": 0}, + {"matrix": [0, 18], "x": 18, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + {"matrix": [1, 16], "x": 16, "y": 1}, + {"matrix": [1, 17], "x": 17, "y": 1}, + {"matrix": [1, 18], "x": 18, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 15], "x": 15, "y": 2}, + {"matrix": [2, 16], "x": 16, "y": 2}, + {"matrix": [2, 17], "x": 17, "y": 2}, + {"matrix": [2, 18], "x": 18, "y": 2, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 15], "x": 15, "y": 3}, + {"matrix": [3, 16], "x": 16, "y": 3}, + {"matrix": [3, 17], "x": 17, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + {"matrix": [4, 16], "x": 16, "y": 4}, + {"matrix": [4, 17], "x": 17, "y": 4}, + {"matrix": [4, 18], "x": 18, "y": 4, "h": 2}, + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5}, + {"matrix": [5, 11], "x": 11, "y": 5}, + {"matrix": [5, 12], "x": 12, "y": 5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5}, + {"matrix": [5, 16], "x": 16, "y": 5}, + {"matrix": [5, 17], "x": 17, "y": 5} + ] + }, + "LAYOUT_96_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + {"matrix": [0, 16], "x": 16, "y": 0}, + {"matrix": [0, 17], "x": 17, "y": 0}, + {"matrix": [0, 18], "x": 18, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + {"matrix": [1, 16], "x": 16, "y": 1}, + {"matrix": [1, 17], "x": 17, "y": 1}, + {"matrix": [1, 18], "x": 18, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 15], "x": 15, "y": 2}, + {"matrix": [2, 16], "x": 16, "y": 2}, + {"matrix": [2, 17], "x": 17, "y": 2}, + {"matrix": [2, 18], "x": 18, "y": 2, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 15], "x": 15, "y": 3}, + {"matrix": [3, 16], "x": 16, "y": 3}, + {"matrix": [3, 17], "x": 17, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + {"matrix": [4, 16], "x": 16, "y": 4}, + {"matrix": [4, 17], "x": 17, "y": 4}, + {"matrix": [4, 18], "x": 18, "y": 4, "h": 2}, + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5}, + {"matrix": [5, 11], "x": 11, "y": 5}, + {"matrix": [5, 12], "x": 12, "y": 5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5}, + {"matrix": [5, 16], "x": 16, "y": 5}, + {"matrix": [5, 17], "x": 17, "y": 5} + ] + }, + "LAYOUT_96_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + {"matrix": [0, 16], "x": 16, "y": 0}, + {"matrix": [0, 17], "x": 17, "y": 0}, + {"matrix": [0, 18], "x": 18, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + {"matrix": [1, 16], "x": 16, "y": 1}, + {"matrix": [1, 17], "x": 17, "y": 1}, + {"matrix": [1, 18], "x": 18, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + {"matrix": [2, 16], "x": 16, "y": 2}, + {"matrix": [2, 17], "x": 17, "y": 2}, + {"matrix": [2, 18], "x": 18, "y": 2, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [2, 13], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [3, 15], "x": 15, "y": 3}, + {"matrix": [3, 16], "x": 16, "y": 3}, + {"matrix": [3, 17], "x": 17, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + {"matrix": [4, 16], "x": 16, "y": 4}, + {"matrix": [4, 17], "x": 17, "y": 4}, + {"matrix": [4, 18], "x": 18, "y": 4, "h": 2}, + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5}, + {"matrix": [5, 11], "x": 11, "y": 5}, + {"matrix": [5, 12], "x": 12, "y": 5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5}, + {"matrix": [5, 16], "x": 16, "y": 5}, + {"matrix": [5, 17], "x": 17, "y": 5} + ] + } + } +} diff --git a/keyboards/sharkoon/skiller_sgk50_s2/keymaps/default/keymap.c b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/default/keymap.c new file mode 100644 index 00000000000..01e78f31240 --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/default/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2024 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + 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_F12, KC_PAUS, KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT + ), + + [1] = LAYOUT_all( + EE_CLR, KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_SPD, RGB_SPI, _______, _______, KC_PSCR, KC_SCRL, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_HUI, RGB_VAD, RGB_MOD, _______, _______ + ), +}; diff --git a/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/keymap.c b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/keymap.c new file mode 100644 index 00000000000..01e78f31240 --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2024 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + 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_F12, KC_PAUS, KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT + ), + + [1] = LAYOUT_all( + EE_CLR, KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_SPD, RGB_SPI, _______, _______, KC_PSCR, KC_SCRL, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, RGB_HUI, RGB_VAD, RGB_MOD, _______, _______ + ), +}; diff --git a/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/rules.mk b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/sharkoon/skiller_sgk50_s2/mcuconf.h b/keyboards/sharkoon/skiller_sgk50_s2/mcuconf.h new file mode 100644 index 00000000000..ae7ee58001a --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s2/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2024 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef WB32_SPI_USE_QSPI +#define WB32_SPI_USE_QSPI TRUE diff --git a/keyboards/sharkoon/skiller_sgk50_s2/readme.md b/keyboards/sharkoon/skiller_sgk50_s2/readme.md new file mode 100644 index 00000000000..7be331eac5b --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s2/readme.md @@ -0,0 +1,24 @@ +# SHARKOON SKILLER SGK50 S2 + +![ISO](https://i.imgur.com/itgy5Bk.png) + +* Keyboard Maintainer: [JoyLee](https://github.com/itarze) +* Hardware Supported: [SHARKOON SKILLER SGK50 S2 PCB](https://zh-hant.sharkoon.com/) + +Make example for this keyboard (after setting up your build environment): + + make sharkoon/skiller_sgk50_s2:default + +Flashing example for this keyboard: + + make sharkoon/skiller_sgk50_s2: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/sharkoon/skiller_sgk50_s2/rules.mk b/keyboards/sharkoon/skiller_sgk50_s2/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s2/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 5db6f7967ef9ca72fbd6cfd1164783e88399bfa7 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 31 Mar 2024 08:49:47 +0100 Subject: [PATCH 086/333] Remove redundant DEFAULT_FOLDER from keyboards (#23377) --- keyboards/bt66tech/bt66tech60/{info.json => keyboard.json} | 0 keyboards/bt66tech/bt66tech60/rules.mk | 1 - keyboards/cannonkeys/practice60/{info.json => keyboard.json} | 0 keyboards/cannonkeys/practice60/rules.mk | 1 - keyboards/handwired/ck4x4/{info.json => keyboard.json} | 0 keyboards/handwired/ck4x4/rules.mk | 1 - keyboards/vertex/arc60/{info.json => keyboard.json} | 0 keyboards/vertex/arc60/rules.mk | 1 - 8 files changed, 4 deletions(-) rename keyboards/bt66tech/bt66tech60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/bt66tech/bt66tech60/rules.mk rename keyboards/cannonkeys/practice60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/practice60/rules.mk rename keyboards/handwired/ck4x4/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/ck4x4/rules.mk rename keyboards/vertex/arc60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/vertex/arc60/rules.mk diff --git a/keyboards/bt66tech/bt66tech60/info.json b/keyboards/bt66tech/bt66tech60/keyboard.json similarity index 100% rename from keyboards/bt66tech/bt66tech60/info.json rename to keyboards/bt66tech/bt66tech60/keyboard.json diff --git a/keyboards/bt66tech/bt66tech60/rules.mk b/keyboards/bt66tech/bt66tech60/rules.mk deleted file mode 100644 index cb9c90456cc..00000000000 --- a/keyboards/bt66tech/bt66tech60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -DEFAULT_FOLDER = bt66tech/bt66tech60 diff --git a/keyboards/cannonkeys/practice60/info.json b/keyboards/cannonkeys/practice60/keyboard.json similarity index 100% rename from keyboards/cannonkeys/practice60/info.json rename to keyboards/cannonkeys/practice60/keyboard.json diff --git a/keyboards/cannonkeys/practice60/rules.mk b/keyboards/cannonkeys/practice60/rules.mk deleted file mode 100644 index 5f7d5fe26d3..00000000000 --- a/keyboards/cannonkeys/practice60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -DEFAULT_FOLDER = cannonkeys/practice60 diff --git a/keyboards/handwired/ck4x4/info.json b/keyboards/handwired/ck4x4/keyboard.json similarity index 100% rename from keyboards/handwired/ck4x4/info.json rename to keyboards/handwired/ck4x4/keyboard.json diff --git a/keyboards/handwired/ck4x4/rules.mk b/keyboards/handwired/ck4x4/rules.mk deleted file mode 100644 index 216aa810fd3..00000000000 --- a/keyboards/handwired/ck4x4/rules.mk +++ /dev/null @@ -1 +0,0 @@ -DEFAULT_FOLDER = handwired/ck4x4 diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/keyboard.json similarity index 100% rename from keyboards/vertex/arc60/info.json rename to keyboards/vertex/arc60/keyboard.json diff --git a/keyboards/vertex/arc60/rules.mk b/keyboards/vertex/arc60/rules.mk deleted file mode 100644 index dd76c3f2cec..00000000000 --- a/keyboards/vertex/arc60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -DEFAULT_FOLDER = vertex/arc60 From 319d9aa7b94daba050a7d207caf2dd607b04298c Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 31 Mar 2024 12:23:40 +0100 Subject: [PATCH 087/333] Fix 'qmk compile' mass_compile execution (#23296) --- lib/python/qmk/cli/compile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/python/qmk/cli/compile.py b/lib/python/qmk/cli/compile.py index 4c36dec3e79..8d1195bc8f0 100755 --- a/lib/python/qmk/cli/compile.py +++ b/lib/python/qmk/cli/compile.py @@ -41,17 +41,17 @@ def compile(cli): cli.args.filter = [] cli.config.mass_compile.keymap = cli.config.compile.keymap cli.config.mass_compile.parallel = cli.config.compile.parallel - cli.config.mass_compile.no_temp = False + cli.args.no_temp = False return mass_compile(cli) # If we've received `-km all`, reroute it to mass-compile. if cli.args.keymap == 'all': from .mass_compile import mass_compile - cli.args.builds = [f'{cli.args.keyboard}:all'] + cli.args.builds = [f'{cli.config.compile.keyboard}:all'] cli.args.filter = [] cli.config.mass_compile.keymap = None cli.config.mass_compile.parallel = cli.config.compile.parallel - cli.config.mass_compile.no_temp = False + cli.args.no_temp = False return mass_compile(cli) # Build the environment vars From ea7194544187c89c0c69dd035d5cd1860ce6813c Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 31 Mar 2024 21:38:58 +0100 Subject: [PATCH 088/333] Align encoder layout validation with encoder.h logic (#23330) --- keyboards/zvecr/zv48/info.json | 4 ++-- lib/python/qmk/info.py | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json index e58651499a9..cd81109ed14 100644 --- a/keyboards/zvecr/zv48/info.json +++ b/keyboards/zvecr/zv48/info.json @@ -56,7 +56,7 @@ "layouts": { "LAYOUT_ortho_4x12": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0, "encoder": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, {"matrix": [0, 3], "x": 3, "y": 0}, @@ -67,7 +67,7 @@ {"matrix": [4, 3], "x": 8, "y": 0}, {"matrix": [4, 2], "x": 9, "y": 0}, {"matrix": [4, 1], "x": 10, "y": 0}, - {"matrix": [4, 0], "x": 11, "y": 0}, + {"matrix": [4, 0], "x": 11, "y": 0, "encoder": 1}, {"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 1], "x": 1, "y": 1}, diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 71bb6e9454c..e463ac8ce74 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -58,8 +58,13 @@ def _get_key_left_position(key): def _find_invalid_encoder_index(info_data): """Perform additional validation of encoders """ - enc_count = len(info_data.get('encoder', {}).get('rotary', [])) - enc_count += len(info_data.get('split', {}).get('encoder', {}).get('right', {}).get('rotary', [])) + enc_left = info_data.get('encoder', {}).get('rotary', []) + enc_right = [] + + if info_data.get('split', {}).get('enabled', False): + enc_right = info_data.get('split', {}).get('encoder', {}).get('right', {}).get('rotary', enc_left) + + enc_count = len(enc_left) + len(enc_right) ret = [] layouts = info_data.get('layouts', {}) From a9226273191a3fc4b16995c1ba74285d77f1cd62 Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Mon, 1 Apr 2024 12:33:50 -0400 Subject: [PATCH 089/333] refactor: flehrad/bigswitch (#23384) --- keyboards/flehrad/bigswitch/bigswitch.c | 37 ----------- keyboards/flehrad/bigswitch/config.h | 23 ------- keyboards/flehrad/bigswitch/keyboard.json | 64 ++++++++++--------- .../bigswitch/keymaps/default/keymap.c | 7 +- .../flehrad/bigswitch/keymaps/via/keymap.c | 9 +-- 5 files changed, 35 insertions(+), 105 deletions(-) delete mode 100644 keyboards/flehrad/bigswitch/bigswitch.c delete mode 100644 keyboards/flehrad/bigswitch/config.h diff --git a/keyboards/flehrad/bigswitch/bigswitch.c b/keyboards/flehrad/bigswitch/bigswitch.c deleted file mode 100644 index 987e816ee9b..00000000000 --- a/keyboards/flehrad/bigswitch/bigswitch.c +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2018 QMK Contributors - -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 . -*/ -#include "quantum.h" - -volatile uint8_t runonce = true; -static uint16_t my_timer; - -__attribute__ ((weak)) -void matrix_init_user(void) { - my_timer = timer_read(); -} - -__attribute__ ((weak)) -void matrix_scan_user(void) { -#if defined(RGBLIGHT_ENABLE) - if (runonce && timer_elapsed(my_timer) > 1000) { - runonce = false; - rgblight_sethsv_noeeprom(0x0, 0xff, 0x80); - rgblight_mode_noeeprom(9); - rgblight_enable_noeeprom(); - } -#endif -} diff --git a/keyboards/flehrad/bigswitch/config.h b/keyboards/flehrad/bigswitch/config.h deleted file mode 100644 index 44163932472..00000000000 --- a/keyboards/flehrad/bigswitch/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2018 QMK Contributors - -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 - -/* key combination for command */ -#define IS_COMMAND() ( \ - false \ -) diff --git a/keyboards/flehrad/bigswitch/keyboard.json b/keyboards/flehrad/bigswitch/keyboard.json index a56c0b1e9ef..ac68db1a358 100644 --- a/keyboards/flehrad/bigswitch/keyboard.json +++ b/keyboards/flehrad/bigswitch/keyboard.json @@ -1,36 +1,15 @@ { - "keyboard_name": "BigSwitch PCB", "manufacturer": "flehrad", + "keyboard_name": "BigSwitch PCB", "maintainer": "qmk", - "usb": { - "vid": "0x1209", - "pid": "0xB195", - "device_version": "0.0.1" - }, - "rgblight": { - "led_count": 8, - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } - }, - "ws2812": { - "pin": "D3" - }, + "debounce": 50, + "development_board": "promicro", + "diode_direction": "ROW2COL", "features": { "bootmagic": false, - "command": true, "console": true, - "extrakey": false, - "mousekey": false, + "extrakey": true, + "mousekey": true, "nkro": false, "rgblight": true }, @@ -38,10 +17,33 @@ "cols": ["B6"], "rows": ["B5"] }, - "diode_direction": "ROW2COL", - "processor": "atmega32u4", - "bootloader": "caterina", - "debounce": 50, + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "default": { + "animation": "rainbow_swirl", + "val": 127 + }, + "led_count": 8 + }, + "usb": { + "device_version": "0.0.1", + "pid": "0xB195", + "vid": "0x1209" + }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/flehrad/bigswitch/keymaps/default/keymap.c b/keyboards/flehrad/bigswitch/keymaps/default/keymap.c index 210d001236c..f5d99b656ba 100644 --- a/keyboards/flehrad/bigswitch/keymaps/default/keymap.c +++ b/keyboards/flehrad/bigswitch/keymaps/default/keymap.c @@ -16,12 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#define KC_OSX_EJECT 0x66 -#define LOCK_OSX LSFT(LCTL(KC_OSX_EJECT)) -#define SLEEP_OSX LALT(LGUI(KC_OSX_EJECT)) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -LAYOUT(SLEEP_OSX), - + [0] = LAYOUT(LALT(LGUI(KC_KB_POWER))) // OSX Sleep }; diff --git a/keyboards/flehrad/bigswitch/keymaps/via/keymap.c b/keyboards/flehrad/bigswitch/keymaps/via/keymap.c index f253f4b12e0..621b38605ce 100644 --- a/keyboards/flehrad/bigswitch/keymaps/via/keymap.c +++ b/keyboards/flehrad/bigswitch/keymaps/via/keymap.c @@ -18,12 +18,5 @@ along with this program. If not, see . #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT(KC_TRNS), - - [1] = LAYOUT(KC_TRNS), - - [2] = LAYOUT(KC_TRNS), - - [3] = LAYOUT(KC_TRNS) + [0] = LAYOUT(LALT(LGUI(KC_KB_POWER))) // OSX Sleep }; From 73e3053e255f83c3cbaeee454aa6b8233e9581a9 Mon Sep 17 00:00:00 2001 From: SmollChungus <38044391+SmollChungus@users.noreply.github.com> Date: Mon, 1 Apr 2024 21:32:21 +0200 Subject: [PATCH 090/333] [Keyboard] Add rose75 (#22968) Co-authored-by: Joel Challis Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre --- keyboards/rose75/info.json | 128 ++++++++++++++++++++++ keyboards/rose75/keymaps/default/keymap.c | 16 +++ keyboards/rose75/keymaps/via/keymap.c | 16 +++ keyboards/rose75/keymaps/via/rules.mk | 1 + keyboards/rose75/readme.md | 24 ++++ keyboards/rose75/rose75.c | 20 ++++ keyboards/rose75/rules.mk | 1 + 7 files changed, 206 insertions(+) create mode 100644 keyboards/rose75/info.json create mode 100644 keyboards/rose75/keymaps/default/keymap.c create mode 100644 keyboards/rose75/keymaps/via/keymap.c create mode 100644 keyboards/rose75/keymaps/via/rules.mk create mode 100644 keyboards/rose75/readme.md create mode 100644 keyboards/rose75/rose75.c create mode 100644 keyboards/rose75/rules.mk diff --git a/keyboards/rose75/info.json b/keyboards/rose75/info.json new file mode 100644 index 00000000000..9306cb211b6 --- /dev/null +++ b/keyboards/rose75/info.json @@ -0,0 +1,128 @@ +{ + "manufacturer": "Matthijs Muller", + "keyboard_name": "ROSE75", + "maintainer": "Matthijs Muller", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["GP23", "GP21", "GP20", "GP19", "GP28", "GP12", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP10"], + "rows": ["GP27", "GP26", "GP25", "GP24", "GP18", "GP22"] + }, + "processor": "RP2040", + "rgb_matrix": { + "driver": "ws2812", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 8}, + {"matrix": [0, 1], "x": 15, "y": 15, "flags": 8} + ], + "max_brightness": 210, + "sleep": true + }, + "url": "https://github.com/Smollchungus", + "usb": { + "device_version": "0.0.1", + "force_nkro": true, + "pid": "0x7503", + "vid": "0x5363" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP29" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "F7", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "F8", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "F9", "matrix": [0, 10], "x": 10.5, "y": 0}, + {"label": "F10", "matrix": [0, 11], "x": 11.5, "y": 0}, + {"label": "F11", "matrix": [0, 12], "x": 12.5, "y": 0}, + {"label": "F12", "matrix": [0, 13], "x": 13.5, "y": 0}, + {"label": "Del", "matrix": [0, 14], "x": 15, "y": 0}, + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.5}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5}, + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"label": "LB", "matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"label": "RB", "matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"label": "Pipe", "matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2.5}, + {"label": "Capslock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"label": "Quote", "matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25}, + {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3.5}, + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"label": "Up", "matrix": [4, 13], "x": 14, "y": 4.5}, + {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5}, + {"label": "Control", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25}, + {"label": "Fn", "matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25}, + {"label": "Left", "matrix": [5, 12], "x": 13, "y": 5.5}, + {"label": "Down", "matrix": [5, 13], "x": 14, "y": 5.5}, + {"label": "Right", "matrix": [5, 14], "x": 15, "y": 5.5} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/rose75/keymaps/default/keymap.c b/keyboards/rose75/keymaps/default/keymap.c new file mode 100644 index 00000000000..043edaecbc1 --- /dev/null +++ b/keyboards/rose75/keymaps/default/keymap.c @@ -0,0 +1,16 @@ +// Copyright 2023 Matthijs Muller (@Smollchungus) +// 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_END, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/rose75/keymaps/via/keymap.c b/keyboards/rose75/keymaps/via/keymap.c new file mode 100644 index 00000000000..043edaecbc1 --- /dev/null +++ b/keyboards/rose75/keymaps/via/keymap.c @@ -0,0 +1,16 @@ +// Copyright 2023 Matthijs Muller (@Smollchungus) +// 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_END, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/rose75/keymaps/via/rules.mk b/keyboards/rose75/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/rose75/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rose75/readme.md b/keyboards/rose75/readme.md new file mode 100644 index 00000000000..85d4763d9b4 --- /dev/null +++ b/keyboards/rose75/readme.md @@ -0,0 +1,24 @@ +# rose75 + +![rose75](https://i.imgur.com/f64Ttib.png) + +* Keyboard Maintainer: [Matthijs Muller](https://github.com/Smollchungus) +* Hardware Supported: Rose75 Keyboard + +Make example for this keyboard (after setting up your build environment): + + make rose75:default + +Flashing example for this keyboard: + + make rose75: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/rose75/rose75.c b/keyboards/rose75/rose75.c new file mode 100644 index 00000000000..d84f3da1d43 --- /dev/null +++ b/keyboards/rose75/rose75.c @@ -0,0 +1,20 @@ +// Copyright 2023 Matthijs Muller (@Smollchungus) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "quantum.h" + +#ifdef RGB_MATRIX_ENABLE +bool rgb_matrix_indicators_kb(void) { + if (!rgb_matrix_indicators_user()) { + return false; + } + if (host_keyboard_led_state().caps_lock) { + rgb_matrix_set_color(0, 200, 0, 0); + rgb_matrix_set_color(1, 200, 0, 0); + } else { + rgb_matrix_set_color(0, 0, 0, 0); + rgb_matrix_set_color(1, 0, 0, 0); + } + return true; +} +#endif diff --git a/keyboards/rose75/rules.mk b/keyboards/rose75/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/rose75/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 81b5ae9bdda30b798035d4ae6c25243efbaa6a2b Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Mon, 1 Apr 2024 23:42:21 +0200 Subject: [PATCH 091/333] Add MNK 60 EC (#23167) Co-authored-by: Duncan Sutherland --- keyboards/cipulot/mnk_60_ec/config.h | 66 +++++ keyboards/cipulot/mnk_60_ec/halconf.h | 21 ++ keyboards/cipulot/mnk_60_ec/info.json | 225 ++++++++++++++++++ .../mnk_60_ec/keymaps/60_hhkb/keymap.c | 42 ++++ .../mnk_60_ec/keymaps/default/keymap.c | 42 ++++ .../cipulot/mnk_60_ec/keymaps/via/keymap.c | 42 ++++ .../cipulot/mnk_60_ec/keymaps/via/rules.mk | 1 + keyboards/cipulot/mnk_60_ec/mcuconf.h | 22 ++ keyboards/cipulot/mnk_60_ec/post_rules.mk | 3 + keyboards/cipulot/mnk_60_ec/readme.md | 26 ++ keyboards/cipulot/mnk_60_ec/rules.mk | 5 + 11 files changed, 495 insertions(+) create mode 100644 keyboards/cipulot/mnk_60_ec/config.h create mode 100644 keyboards/cipulot/mnk_60_ec/halconf.h create mode 100644 keyboards/cipulot/mnk_60_ec/info.json create mode 100644 keyboards/cipulot/mnk_60_ec/keymaps/60_hhkb/keymap.c create mode 100644 keyboards/cipulot/mnk_60_ec/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/mnk_60_ec/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/mnk_60_ec/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/mnk_60_ec/mcuconf.h create mode 100644 keyboards/cipulot/mnk_60_ec/post_rules.mk create mode 100644 keyboards/cipulot/mnk_60_ec/readme.md create mode 100644 keyboards/cipulot/mnk_60_ec/rules.mk diff --git a/keyboards/cipulot/mnk_60_ec/config.h b/keyboards/cipulot/mnk_60_ec/config.h new file mode 100644 index 00000000000..1a7df486572 --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/config.h @@ -0,0 +1,66 @@ +/* Copyright 2023 Cipulot + * + * 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 MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +#define MATRIX_ROW_PINS \ + { B13, B14, B15, A8, A15 } + +#define AMUX_COUNT 2 +#define AMUX_MAX_COLS_COUNT 8 + +#define AMUX_EN_PINS \ + { B7, B3 } + +#define AMUX_SEL_PINS \ + { B6, B5, B4 } + +#define AMUX_COL_CHANNELS_SIZES \ + { 8, 6 } + +#define AMUX_0_COL_CHANNELS \ + { 0, 3, 1, 2, 4, 5, 6, 7 } + +#define AMUX_1_COL_CHANNELS \ + { 0, 3, 1, 2, 4, 5 } + +#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS + +#define DISCHARGE_PIN A3 +#define ANALOG_PORT A2 + +#define DEFAULT_ACTUATION_MODE 0 +#define DEFAULT_MODE_0_ACTUATION_LEVEL 550 +#define DEFAULT_MODE_0_RELEASE_LEVEL 500 +#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL +#define DEFAULT_MODE_1_ACTUATION_OFFSET 70 +#define DEFAULT_MODE_1_RELEASE_OFFSET 70 +#define DEFAULT_EXTREMUM 1023 +#define EXPECTED_NOISE_FLOOR 0 +#define NOISE_FLOOR_THRESHOLD 50 +#define BOTTOMING_CALIBRATION_THRESHOLD 100 +#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30 +#define DEFAULT_BOTTOMING_READING 1023 +#define DEFAULT_CALIBRATION_STARTER true + +#define DISCHARGE_TIME 10 + +// #define DEBUG_MATRIX_SCAN_RATE + +#define EECONFIG_KB_DATA_SIZE 149 diff --git a/keyboards/cipulot/mnk_60_ec/halconf.h b/keyboards/cipulot/mnk_60_ec/halconf.h new file mode 100644 index 00000000000..835d43b6a0a --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2023 Cipulot + * + * 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_ADC TRUE + +#include_next diff --git a/keyboards/cipulot/mnk_60_ec/info.json b/keyboards/cipulot/mnk_60_ec/info.json new file mode 100644 index 00000000000..802e216f672 --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/info.json @@ -0,0 +1,225 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "MNK 60 EC", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "processor": "STM32F401", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6BB6", + "vid": "0x6369" + }, + "community_layouts": ["60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb"], + "layouts": { + "LAYOUT_60_ansi_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 13], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 13], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_tsangan_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 13], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 12.5, "y": 4}, + {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5} + ] + } + } +} diff --git a/keyboards/cipulot/mnk_60_ec/keymaps/60_hhkb/keymap.c b/keyboards/cipulot/mnk_60_ec/keymaps/60_hhkb/keymap.c new file mode 100644 index 00000000000..6e2678d4f73 --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/keymaps/60_hhkb/keymap.c @@ -0,0 +1,42 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_hhkb( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT), + + [1] = LAYOUT_60_hhkb( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, KC_BSPC, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, + _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, MO(2)), + + [2] = LAYOUT_60_hhkb( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/mnk_60_ec/keymaps/default/keymap.c b/keyboards/cipulot/mnk_60_ec/keymaps/default/keymap.c new file mode 100644 index 00000000000..08599b93d3a --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/keymaps/default/keymap.c @@ -0,0 +1,42 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_tsangan_hhkb( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, KC_RGUI, KC_RALT), + + [1] = LAYOUT_60_tsangan_hhkb( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, + _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______, MO(2), _______), + + [2] = LAYOUT_60_tsangan_hhkb( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/mnk_60_ec/keymaps/via/keymap.c b/keyboards/cipulot/mnk_60_ec/keymaps/via/keymap.c new file mode 100644 index 00000000000..08599b93d3a --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/keymaps/via/keymap.c @@ -0,0 +1,42 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_tsangan_hhkb( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, KC_RGUI, KC_RALT), + + [1] = LAYOUT_60_tsangan_hhkb( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, + _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______, MO(2), _______), + + [2] = LAYOUT_60_tsangan_hhkb( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/mnk_60_ec/keymaps/via/rules.mk b/keyboards/cipulot/mnk_60_ec/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cipulot/mnk_60_ec/mcuconf.h b/keyboards/cipulot/mnk_60_ec/mcuconf.h new file mode 100644 index 00000000000..fa3c955e0d8 --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2023 Cipulot + * + * 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 + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/cipulot/mnk_60_ec/post_rules.mk b/keyboards/cipulot/mnk_60_ec/post_rules.mk new file mode 100644 index 00000000000..d726a112a8c --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(VIA_ENABLE)), yes) + SRC += keyboards/cipulot/common/via_ec.c +endif diff --git a/keyboards/cipulot/mnk_60_ec/readme.md b/keyboards/cipulot/mnk_60_ec/readme.md new file mode 100644 index 00000000000..85a770f1518 --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/readme.md @@ -0,0 +1,26 @@ +# MNK 60 EC + +![MNK 60 EC PCB](https://i.imgur.com/UpkCUKFh.jpeg) + +EC version of the Monokei MNK 66. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: MNK 60 EC PCB +* Hardware Availability: [Monokei](https://monokei.co/) + +Make example for this keyboard (after setting up your build environment): + + make cipulot/mnk_60_ec:default + +Flashing example for this keyboard: + + make cipulot/mnk_60_ec: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). + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical reset**: Long short the exposed pads on the top of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/cipulot/mnk_60_ec/rules.mk b/keyboards/cipulot/mnk_60_ec/rules.mk new file mode 100644 index 00000000000..ce525670a68 --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/rules.mk @@ -0,0 +1,5 @@ +CUSTOM_MATRIX = lite +ANALOG_DRIVER_REQUIRED = yes +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c +OPT = 3 From 5fc4e331bda7025ebef63260f0085be5b5be9f9f Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Mon, 1 Apr 2024 23:44:16 +0200 Subject: [PATCH 092/333] Add MNK 65 EC (#23168) --- keyboards/cipulot/mnk_65_ec/config.h | 66 ++++++++++++ keyboards/cipulot/mnk_65_ec/halconf.h | 21 ++++ keyboards/cipulot/mnk_65_ec/info.json | 100 ++++++++++++++++++ .../mnk_65_ec/keymaps/default/keymap.c | 43 ++++++++ .../cipulot/mnk_65_ec/keymaps/via/keymap.c | 43 ++++++++ .../cipulot/mnk_65_ec/keymaps/via/rules.mk | 1 + keyboards/cipulot/mnk_65_ec/mcuconf.h | 22 ++++ keyboards/cipulot/mnk_65_ec/post_rules.mk | 3 + keyboards/cipulot/mnk_65_ec/readme.md | 26 +++++ keyboards/cipulot/mnk_65_ec/rules.mk | 5 + 10 files changed, 330 insertions(+) create mode 100644 keyboards/cipulot/mnk_65_ec/config.h create mode 100644 keyboards/cipulot/mnk_65_ec/halconf.h create mode 100644 keyboards/cipulot/mnk_65_ec/info.json create mode 100644 keyboards/cipulot/mnk_65_ec/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/mnk_65_ec/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/mnk_65_ec/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/mnk_65_ec/mcuconf.h create mode 100644 keyboards/cipulot/mnk_65_ec/post_rules.mk create mode 100644 keyboards/cipulot/mnk_65_ec/readme.md create mode 100644 keyboards/cipulot/mnk_65_ec/rules.mk diff --git a/keyboards/cipulot/mnk_65_ec/config.h b/keyboards/cipulot/mnk_65_ec/config.h new file mode 100644 index 00000000000..01d1248c436 --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/config.h @@ -0,0 +1,66 @@ +/* Copyright 2023 Cipulot + * + * 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 MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define MATRIX_ROW_PINS \ + { B14, B15, A8, B12, A15 } + +#define AMUX_COUNT 2 +#define AMUX_MAX_COLS_COUNT 8 + +#define AMUX_EN_PINS \ + { B7, B3 } + +#define AMUX_SEL_PINS \ + { B6, B5, B4 } + +#define AMUX_COL_CHANNELS_SIZES \ + { 8, 7 } + +#define AMUX_0_COL_CHANNELS \ + { 0, 3, 1, 2, 4, 5, 6, 7 } + +#define AMUX_1_COL_CHANNELS \ + { 0, 3, 1, 2, 4, 5, 6 } + +#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS + +#define DISCHARGE_PIN A3 +#define ANALOG_PORT A2 + +#define DEFAULT_ACTUATION_MODE 0 +#define DEFAULT_MODE_0_ACTUATION_LEVEL 550 +#define DEFAULT_MODE_0_RELEASE_LEVEL 500 +#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL +#define DEFAULT_MODE_1_ACTUATION_OFFSET 70 +#define DEFAULT_MODE_1_RELEASE_OFFSET 70 +#define DEFAULT_EXTREMUM 1023 +#define EXPECTED_NOISE_FLOOR 0 +#define NOISE_FLOOR_THRESHOLD 50 +#define BOTTOMING_CALIBRATION_THRESHOLD 100 +#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30 +#define DEFAULT_BOTTOMING_READING 1023 +#define DEFAULT_CALIBRATION_STARTER true + +#define DISCHARGE_TIME 10 + +// #define DEBUG_MATRIX_SCAN_RATE + +#define EECONFIG_KB_DATA_SIZE 159 diff --git a/keyboards/cipulot/mnk_65_ec/halconf.h b/keyboards/cipulot/mnk_65_ec/halconf.h new file mode 100644 index 00000000000..835d43b6a0a --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2023 Cipulot + * + * 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_ADC TRUE + +#include_next diff --git a/keyboards/cipulot/mnk_65_ec/info.json b/keyboards/cipulot/mnk_65_ec/info.json new file mode 100644 index 00000000000..5427601f760 --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/info.json @@ -0,0 +1,100 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "MNK 65 EC", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "processor": "STM32F401", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6BB5", + "vid": "0x6369" + }, + "layouts": { + "LAYOUT_65_ansi_blocker_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 12], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/cipulot/mnk_65_ec/keymaps/default/keymap.c b/keyboards/cipulot/mnk_65_ec/keymaps/default/keymap.c new file mode 100644 index 00000000000..03b9c3de33e --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/keymaps/default/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_65_ansi_blocker_tsangan( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_65_ansi_blocker_tsangan( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_65_ansi_blocker_tsangan( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/mnk_65_ec/keymaps/via/keymap.c b/keyboards/cipulot/mnk_65_ec/keymaps/via/keymap.c new file mode 100644 index 00000000000..03b9c3de33e --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/keymaps/via/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_65_ansi_blocker_tsangan( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_65_ansi_blocker_tsangan( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_65_ansi_blocker_tsangan( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/mnk_65_ec/keymaps/via/rules.mk b/keyboards/cipulot/mnk_65_ec/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cipulot/mnk_65_ec/mcuconf.h b/keyboards/cipulot/mnk_65_ec/mcuconf.h new file mode 100644 index 00000000000..fa3c955e0d8 --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2023 Cipulot + * + * 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 + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/cipulot/mnk_65_ec/post_rules.mk b/keyboards/cipulot/mnk_65_ec/post_rules.mk new file mode 100644 index 00000000000..d726a112a8c --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(VIA_ENABLE)), yes) + SRC += keyboards/cipulot/common/via_ec.c +endif diff --git a/keyboards/cipulot/mnk_65_ec/readme.md b/keyboards/cipulot/mnk_65_ec/readme.md new file mode 100644 index 00000000000..aeedcc51c7e --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/readme.md @@ -0,0 +1,26 @@ +# Monokei MNK 65 EC + +![MNK 65 EC PCB](https://i.imgur.com/k5ZvGhth.jpeg) + +EC version of the Monokei MNK 65. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: Monokei MNK 65 EC +* Hardware Availability: [Monokei](https://monokei.co/) + +Make example for this keyboard (after setting up your build environment): + + make cipulot/mnk_65_ec:default + +Flashing example for this keyboard: + + make cipulot/mnk_65_ec: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). + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical reset**: Long short the exposed pads on the top of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/cipulot/mnk_65_ec/rules.mk b/keyboards/cipulot/mnk_65_ec/rules.mk new file mode 100644 index 00000000000..ce525670a68 --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/rules.mk @@ -0,0 +1,5 @@ +CUSTOM_MATRIX = lite +ANALOG_DRIVER_REQUIRED = yes +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c +OPT = 3 From 8757a19375b4fdc65b4dd471b11cb4378c3e7177 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Mon, 1 Apr 2024 23:45:09 +0200 Subject: [PATCH 093/333] Fix in 60_iso_wkl_split_bs_rshift diagram (#22654) --- .../default_60_iso_wkl_split_bs_rshift/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c b/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c index b07d56ea206..228522f1b67 100644 --- a/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c +++ b/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c @@ -11,9 +11,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ - * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Sft│ - * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ + * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Sft│ + * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ * │Ctrl │ │ Alt │ │ Alt │ │ Ctrl│ * └─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ */ From d4d8b0c6d32845c8a765afd615b8e2e2670f85fd Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Mon, 1 Apr 2024 23:49:46 +0200 Subject: [PATCH 094/333] Add EC Type-K (#23193) --- keyboards/cipulot/ec_typek/config.h | 81 +++ keyboards/cipulot/ec_typek/ec_switch_matrix.c | 318 +++++++++++ keyboards/cipulot/ec_typek/ec_switch_matrix.h | 84 +++ keyboards/cipulot/ec_typek/ec_typek.c | 119 +++++ keyboards/cipulot/ec_typek/halconf.h | 23 + keyboards/cipulot/ec_typek/info.json | 133 +++++ .../cipulot/ec_typek/keymaps/default/keymap.c | 41 ++ .../cipulot/ec_typek/keymaps/via/keymap.c | 41 ++ .../cipulot/ec_typek/keymaps/via/rules.mk | 3 + .../ec_typek/keymaps/via/via_ec_indicators.c | 502 ++++++++++++++++++ keyboards/cipulot/ec_typek/matrix.c | 42 ++ keyboards/cipulot/ec_typek/mcuconf.h | 28 + keyboards/cipulot/ec_typek/readme.md | 26 + keyboards/cipulot/ec_typek/rules.mk | 4 + 14 files changed, 1445 insertions(+) create mode 100644 keyboards/cipulot/ec_typek/config.h create mode 100644 keyboards/cipulot/ec_typek/ec_switch_matrix.c create mode 100644 keyboards/cipulot/ec_typek/ec_switch_matrix.h create mode 100644 keyboards/cipulot/ec_typek/ec_typek.c create mode 100644 keyboards/cipulot/ec_typek/halconf.h create mode 100644 keyboards/cipulot/ec_typek/info.json create mode 100644 keyboards/cipulot/ec_typek/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/ec_typek/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/ec_typek/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/ec_typek/keymaps/via/via_ec_indicators.c create mode 100644 keyboards/cipulot/ec_typek/matrix.c create mode 100644 keyboards/cipulot/ec_typek/mcuconf.h create mode 100644 keyboards/cipulot/ec_typek/readme.md create mode 100644 keyboards/cipulot/ec_typek/rules.mk diff --git a/keyboards/cipulot/ec_typek/config.h b/keyboards/cipulot/ec_typek/config.h new file mode 100644 index 00000000000..a6619c600c8 --- /dev/null +++ b/keyboards/cipulot/ec_typek/config.h @@ -0,0 +1,81 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define MATRIX_ROW_PINS \ + { B14, B13, B12, A6, A7 } + +#define AMUX_COUNT 2 +#define AMUX_MAX_COLS_COUNT 8 + +#define AMUX_EN_PINS \ + { B9, B8 } + +#define AMUX_SEL_PINS \ + { B7, B6, B5 } + +#define AMUX_COL_CHANNELS_SIZES \ + { 7, 8 } + +#define AMUX_0_COL_CHANNELS \ + { 3, 0, 1, 2, 4, 6, 7 } + +#define AMUX_1_COL_CHANNELS \ + { 3, 0, 1, 2, 4, 6, 7, 5 } + +#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS + +#define DISCHARGE_PIN A1 +#define ANALOG_PORT A2 + +#define DEFAULT_ACTUATION_MODE 0 +#define DEFAULT_MODE_0_ACTUATION_LEVEL 550 +#define DEFAULT_MODE_0_RELEASE_LEVEL 500 +#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL +#define DEFAULT_MODE_1_ACTUATION_OFFSET 70 +#define DEFAULT_MODE_1_RELEASE_OFFSET 70 +#define DEFAULT_EXTREMUM 1023 +#define EXPECTED_NOISE_FLOOR 0 +#define NOISE_FLOOR_THRESHOLD 50 +#define BOTTOMING_CALIBRATION_THRESHOLD 100 +#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30 +#define DEFAULT_BOTTOMING_READING 1023 +#define DEFAULT_CALIBRATION_STARTER true + +#define DISCHARGE_TIME 10 + +// #define DEBUG_MATRIX_SCAN_RATE + +#define EECONFIG_KB_DATA_SIZE 171 + +// RGB & Indicators +// PWM driver with direct memory access (DMA) support +#define WS2812_PWM_COMPLEMENTARY_OUTPUT +#define WS2812_PWM_DRIVER PWMD1 +#define WS2812_PWM_CHANNEL 3 +#define WS2812_PWM_PAL_MODE 1 +#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_DMA_CHANNEL 6 +#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM1_UP + +#define RGBLIGHT_DEFAULT_VAL 200 +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5) + +#define NUM_INDICATOR_INDEX 2 +#define CAPS_INDICATOR_INDEX 1 +#define SCROLL_INDICATOR_INDEX 0 diff --git a/keyboards/cipulot/ec_typek/ec_switch_matrix.c b/keyboards/cipulot/ec_typek/ec_switch_matrix.c new file mode 100644 index 00000000000..da58a75bbcf --- /dev/null +++ b/keyboards/cipulot/ec_typek/ec_switch_matrix.c @@ -0,0 +1,318 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include "ec_switch_matrix.h" +#include "analog.h" +#include "atomic_util.h" +#include "math.h" +#include "print.h" +#include "wait.h" + +#if defined(__AVR__) +# error "AVR platforms not supported due to a variety of reasons. Among them there are limited memory, limited number of pins and ADC not being able to give satisfactory results." +#endif + +#define OPEN_DRAIN_SUPPORT defined(PAL_MODE_OUTPUT_OPENDRAIN) + +eeprom_ec_config_t eeprom_ec_config; +ec_config_t ec_config; + +// Pin and port array +const pin_t row_pins[] = MATRIX_ROW_PINS; +const pin_t amux_sel_pins[] = AMUX_SEL_PINS; +const pin_t amux_en_pins[] = AMUX_EN_PINS; +const pin_t amux_n_col_sizes[] = AMUX_COL_CHANNELS_SIZES; +const pin_t amux_n_col_channels[][AMUX_MAX_COLS_COUNT] = {AMUX_COL_CHANNELS}; + +#define AMUX_SEL_PINS_COUNT ARRAY_SIZE(amux_sel_pins) +#define EXPECTED_AMUX_SEL_PINS_COUNT ceil(log2(AMUX_MAX_COLS_COUNT) +// Checks for the correctness of the configuration +_Static_assert(ARRAY_SIZE(amux_en_pins) == AMUX_COUNT, "AMUX_EN_PINS doesn't have the minimum number of bits required to enable all the multiplexers available"); +// Check that number of select pins is enough to select all the channels +_Static_assert(AMUX_SEL_PINS_COUNT == EXPECTED_AMUX_SEL_PINS_COUNT), "AMUX_SEL_PINS doesn't have the minimum number of bits required address all the channels"); +// Check that number of elements in AMUX_COL_CHANNELS_SIZES is enough to specify the number of channels for all the multiplexers available +_Static_assert(ARRAY_SIZE(amux_n_col_sizes) == AMUX_COUNT, "AMUX_COL_CHANNELS_SIZES doesn't have the minimum number of elements required to specify the number of channels for all the multiplexers available"); +// static ec_config_t config; +static uint16_t sw_value[MATRIX_ROWS][MATRIX_COLS]; + +static adc_mux adcMux; + +// Initialize the row pins +void init_row(void) { + // Set all row pins as output and low + for (uint8_t idx = 0; idx < MATRIX_ROWS; idx++) { + gpio_set_pin_output(row_pins[idx]); + gpio_write_pin_low(row_pins[idx]); + } +} + +// Initialize the multiplexers +void init_amux(void) { + for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) { + gpio_set_pin_output(amux_en_pins[idx]); + gpio_write_pin_low(amux_en_pins[idx]); + } + for (uint8_t idx = 0; idx < AMUX_SEL_PINS_COUNT; idx++) { + gpio_set_pin_output(amux_sel_pins[idx]); + } +} + +// Select the multiplexer channel of the specified multiplexer +void select_amux_channel(uint8_t channel, uint8_t col) { + // Get the channel for the specified multiplexer + uint8_t ch = amux_n_col_channels[channel][col]; + // momentarily disable specified multiplexer + gpio_write_pin_high(amux_en_pins[channel]); + // Select the multiplexer channel + for (uint8_t i = 0; i < AMUX_SEL_PINS_COUNT; i++) { + gpio_write_pin(amux_sel_pins[i], ch & (1 << i)); + } + // re enable specified multiplexer + gpio_write_pin_low(amux_en_pins[channel]); +} + +// Disable all the unused multiplexers +void disable_unused_amux(uint8_t channel) { + // disable all the other multiplexers apart from the current selected one + for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) { + if (idx != channel) { + gpio_write_pin_high(amux_en_pins[idx]); + } + } +} +// Discharge the peak hold capacitor +void discharge_capacitor(void) { +#ifdef OPEN_DRAIN_SUPPORT + gpio_write_pin_low(DISCHARGE_PIN); +#else + gpio_write_pin_low(DISCHARGE_PIN); + gpio_set_pin_output(DISCHARGE_PIN); +#endif +} + +// Charge the peak hold capacitor +void charge_capacitor(uint8_t row) { +#ifdef OPEN_DRAIN_SUPPORT + gpio_write_pin_high(DISCHARGE_PIN); +#else + gpio_set_pin_input(DISCHARGE_PIN); +#endif + gpio_write_pin_high(row_pins[row]); +} + +// Initialize the peripherals pins +int ec_init(void) { + // Initialize ADC + palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG); + adcMux = pinToMux(ANALOG_PORT); + + // Dummy call to make sure that adcStart() has been called in the appropriate state + adc_read(adcMux); + + // Initialize discharge pin as discharge mode + gpio_write_pin_low(DISCHARGE_PIN); +#ifdef OPEN_DRAIN_SUPPORT + gpio_set_pin_output_open_drain(DISCHARGE_PIN); +#else + gpio_set_pin_output(DISCHARGE_PIN); +#endif + + // Initialize drive lines + init_row(); + + // Initialize AMUXs + init_amux(); + + return 0; +} + +// Get the noise floor +void ec_noise_floor(void) { + // Initialize the noise floor + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.noise_floor[row][col] = 0; + } + } + + // Sample the noise floor + for (uint8_t i = 0; i < DEFAULT_NOISE_FLOOR_SAMPLING_COUNT; i++) { + for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) { + disable_unused_amux(amux); + for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) { + uint8_t sum = 0; + for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++) + sum += amux_n_col_sizes[i]; + uint8_t adjusted_col = col + sum; + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + ec_config.noise_floor[row][adjusted_col] += ec_readkey_raw(amux, row, col); + } + } + } + wait_ms(5); + } + + // Average the noise floor + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.noise_floor[row][col] /= DEFAULT_NOISE_FLOOR_SAMPLING_COUNT; + } + } +} + +// Scan key values and update matrix state +bool ec_matrix_scan(matrix_row_t current_matrix[]) { + bool updated = false; + + for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) { + disable_unused_amux(amux); + for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) { + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + uint8_t sum = 0; + for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++) + sum += amux_n_col_sizes[i]; + uint8_t adjusted_col = col + sum; + sw_value[row][adjusted_col] = ec_readkey_raw(amux, row, col); + + if (ec_config.bottoming_calibration) { + if (ec_config.bottoming_calibration_starter[row][adjusted_col]) { + ec_config.bottoming_reading[row][adjusted_col] = sw_value[row][adjusted_col]; + ec_config.bottoming_calibration_starter[row][adjusted_col] = false; + } else if (sw_value[row][adjusted_col] > ec_config.bottoming_reading[row][adjusted_col]) { + ec_config.bottoming_reading[row][adjusted_col] = sw_value[row][adjusted_col]; + } + } else { + updated |= ec_update_key(¤t_matrix[row], row, adjusted_col, sw_value[row][adjusted_col]); + } + } + } + } + + return ec_config.bottoming_calibration ? false : updated; +} + +// Read the capacitive sensor value +uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) { + uint16_t sw_value = 0; + + // Select the multiplexer + select_amux_channel(channel, col); + + // Set the row pin to low state to avoid ghosting + gpio_write_pin_low(row_pins[row]); + + ATOMIC_BLOCK_FORCEON { + // Set the row pin to high state and have capacitor charge + charge_capacitor(row); + // Read the ADC value + sw_value = adc_read(adcMux); + } + // Discharge peak hold capacitor + discharge_capacitor(); + // Waiting for the ghost capacitor to discharge fully + wait_us(DISCHARGE_TIME); + + return sw_value; +} + +// Update press/release state of key +bool ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) { + bool current_state = (*current_row >> col) & 1; + + // Real Time Noise Floor Calibration + if (sw_value < (ec_config.noise_floor[row][col] - NOISE_FLOOR_THRESHOLD)) { + uprintf("Noise Floor Change: %d, %d, %d\n", row, col, sw_value); + ec_config.noise_floor[row][col] = sw_value; + ec_config.rescaled_mode_0_actuation_threshold[row][col] = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + ec_config.rescaled_mode_0_release_threshold[row][col] = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + + // Normal board-wide APC + if (ec_config.actuation_mode == 0) { + if (current_state && sw_value < ec_config.rescaled_mode_0_release_threshold[row][col]) { + *current_row &= ~(1 << col); + uprintf("Key released: %d, %d, %d\n", row, col, sw_value); + return true; + } + if ((!current_state) && sw_value > ec_config.rescaled_mode_0_actuation_threshold[row][col]) { + *current_row |= (1 << col); + uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value); + return true; + } + } + // Rapid Trigger + else if (ec_config.actuation_mode == 1) { + // Is key in active zone? + if (sw_value > ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]) { + // Is key pressed while in active zone? + if (current_state) { + // Is the key still moving down? + if (sw_value > ec_config.extremum[row][col]) { + ec_config.extremum[row][col] = sw_value; + uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value); + } + // Has key moved up enough to be released? + else if (sw_value < ec_config.extremum[row][col] - ec_config.mode_1_release_offset) { + ec_config.extremum[row][col] = sw_value; + *current_row &= ~(1 << col); + uprintf("Key released: %d, %d, %d\n", row, col, sw_value); + return true; + } + } + // Key is not pressed while in active zone + else { + // Is the key still moving up? + if (sw_value < ec_config.extremum[row][col]) { + ec_config.extremum[row][col] = sw_value; + } + // Has key moved down enough to be pressed? + else if (sw_value > ec_config.extremum[row][col] + ec_config.mode_1_actuation_offset) { + ec_config.extremum[row][col] = sw_value; + *current_row |= (1 << col); + uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value); + return true; + } + } + } + // Key is not in active zone + else { + // Check to avoid key being stuck in pressed state near the active zone threshold + if (sw_value < ec_config.extremum[row][col]) { + ec_config.extremum[row][col] = sw_value; + *current_row &= ~(1 << col); + return true; + } + } + } + return false; +} + +// Print the matrix values +void ec_print_matrix(void) { + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", sw_value[row][col]); + } + uprintf("%4d\n", sw_value[row][MATRIX_COLS - 1]); + } + print("\n"); +} + +// Rescale the value to a different range +uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max) { + return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; +} diff --git a/keyboards/cipulot/ec_typek/ec_switch_matrix.h b/keyboards/cipulot/ec_typek/ec_switch_matrix.h new file mode 100644 index 00000000000..fad20360bc7 --- /dev/null +++ b/keyboards/cipulot/ec_typek/ec_switch_matrix.h @@ -0,0 +1,84 @@ +/* Copyright 2023 Cipulot + * + * 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 +#include +#include "matrix.h" +#include "eeconfig.h" +#include "util.h" + +typedef struct _indicator_config_t { + uint8_t h; + uint8_t s; + uint8_t v; + bool enabled; +} indicator_config; + +typedef struct PACKED { + indicator_config num; + indicator_config caps; + indicator_config scroll; + uint8_t actuation_mode; // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point, 2: Rapid trigger from resting point + uint16_t mode_0_actuation_threshold; // threshold for key press in mode 0 + uint16_t mode_0_release_threshold; // threshold for key release in mode 0 + uint16_t mode_1_initial_deadzone_offset; // threshold for key press in mode 1 + uint8_t mode_1_actuation_offset; // offset for key press in mode 1 and 2 (1-255) + uint8_t mode_1_release_offset; // offset for key release in mode 1 and 2 (1-255) + uint16_t bottoming_reading[MATRIX_ROWS][MATRIX_COLS]; // bottoming reading +} eeprom_ec_config_t; + +typedef struct { + uint8_t actuation_mode; // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point (it can be very near that baseline noise and be "full travel") + uint16_t mode_0_actuation_threshold; // threshold for key press in mode 0 + uint16_t mode_0_release_threshold; // threshold for key release in mode 0 + uint16_t mode_1_initial_deadzone_offset; // threshold for key press in mode 1 (initial deadzone) + uint16_t rescaled_mode_0_actuation_threshold[MATRIX_ROWS][MATRIX_COLS]; // threshold for key press in mode 0 rescaled to actual scale + uint16_t rescaled_mode_0_release_threshold[MATRIX_ROWS][MATRIX_COLS]; // threshold for key release in mode 0 rescaled to actual scale + uint16_t rescaled_mode_1_initial_deadzone_offset[MATRIX_ROWS][MATRIX_COLS]; // threshold for key press in mode 1 (initial deadzone) rescaled to actual scale + uint8_t mode_1_actuation_offset; // offset for key press in mode 1 (1-255) + uint8_t mode_1_release_offset; // offset for key release in mode 1 (1-255) + uint16_t extremum[MATRIX_ROWS][MATRIX_COLS]; // extremum values for mode 1 + uint16_t noise_floor[MATRIX_ROWS][MATRIX_COLS]; // noise floor detected during startup + bool bottoming_calibration; // calibration mode for bottoming out values (true: calibration mode, false: normal mode) + bool bottoming_calibration_starter[MATRIX_ROWS][MATRIX_COLS]; // calibration mode for bottoming out values (true: calibration mode, false: normal mode) + uint16_t bottoming_reading[MATRIX_ROWS][MATRIX_COLS]; // bottoming reading +} ec_config_t; + +// Check if the size of the reserved persistent memory is the same as the size of struct eeprom_ec_config_t +_Static_assert(sizeof(eeprom_ec_config_t) == EECONFIG_KB_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); + +extern eeprom_ec_config_t eeprom_ec_config; + +extern ec_config_t ec_config; + +void init_row(void); +void init_amux(void); +void select_amux_channel(uint8_t channel, uint8_t col); +void disable_unused_amux(uint8_t channel); +void discharge_capacitor(void); +void charge_capacitor(uint8_t row); + +int ec_init(void); +void ec_noise_floor(void); +bool ec_matrix_scan(matrix_row_t current_matrix[]); +uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col); +bool ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value); +void ec_print_matrix(void); + +uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max); +bool indicators_callback(void); diff --git a/keyboards/cipulot/ec_typek/ec_typek.c b/keyboards/cipulot/ec_typek/ec_typek.c new file mode 100644 index 00000000000..035c90303ca --- /dev/null +++ b/keyboards/cipulot/ec_typek/ec_typek.c @@ -0,0 +1,119 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include "ec_switch_matrix.h" +#include "quantum.h" + +void eeconfig_init_kb(void) { + // Default values + eeprom_ec_config.num.h = 0; + eeprom_ec_config.num.s = 0; + eeprom_ec_config.num.v = 60; + eeprom_ec_config.num.enabled = true; + eeprom_ec_config.caps.h = 0; + eeprom_ec_config.caps.s = 0; + eeprom_ec_config.caps.v = 60; + eeprom_ec_config.caps.enabled = true; + eeprom_ec_config.scroll.h = 0; + eeprom_ec_config.scroll.s = 0; + eeprom_ec_config.scroll.v = 60; + eeprom_ec_config.scroll.enabled = true; + eeprom_ec_config.actuation_mode = DEFAULT_ACTUATION_MODE; + eeprom_ec_config.mode_0_actuation_threshold = DEFAULT_MODE_0_ACTUATION_LEVEL; + eeprom_ec_config.mode_0_release_threshold = DEFAULT_MODE_0_RELEASE_LEVEL; + eeprom_ec_config.mode_1_initial_deadzone_offset = DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET; + eeprom_ec_config.mode_1_actuation_offset = DEFAULT_MODE_1_ACTUATION_OFFSET; + eeprom_ec_config.mode_1_release_offset = DEFAULT_MODE_1_RELEASE_OFFSET; + + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + eeprom_ec_config.bottoming_reading[row][col] = DEFAULT_BOTTOMING_READING; + } + } + // Write default value to EEPROM now + eeconfig_update_kb_datablock(&eeprom_ec_config); + + eeconfig_init_user(); +} + +// On Keyboard startup +void keyboard_post_init_kb(void) { + // Read custom menu variables from memory + eeconfig_read_kb_datablock(&eeprom_ec_config); + + // Set runtime values to EEPROM values + ec_config.actuation_mode = eeprom_ec_config.actuation_mode; + ec_config.mode_0_actuation_threshold = eeprom_ec_config.mode_0_actuation_threshold; + ec_config.mode_0_release_threshold = eeprom_ec_config.mode_0_release_threshold; + ec_config.mode_1_initial_deadzone_offset = eeprom_ec_config.mode_1_initial_deadzone_offset; + ec_config.mode_1_actuation_offset = eeprom_ec_config.mode_1_actuation_offset; + ec_config.mode_1_release_offset = eeprom_ec_config.mode_1_release_offset; + ec_config.bottoming_calibration = false; + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.bottoming_calibration_starter[row][col] = true; + ec_config.bottoming_reading[row][col] = eeprom_ec_config.bottoming_reading[row][col]; + ec_config.rescaled_mode_0_actuation_threshold[row][col] = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + ec_config.rescaled_mode_0_release_threshold[row][col] = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + } + + // Set the RGB LEDs range that will be used for the effects + rgblight_set_effect_range(3, 66); + // Call the indicator callback to set the indicator color + indicators_callback(); + + keyboard_post_init_user(); +} + +// This function gets called when caps, num, scroll change +bool led_update_kb(led_t led_state) { + indicators_callback(); + return true; +} + +// This function is called when layers change +layer_state_t layer_state_set_user(layer_state_t state) { + indicators_callback(); + return state; +} + +// INDICATOR CALLBACK ------------------------------------------------------------------------------ +/* LED index to physical position + * + * LED2 | LED1 | LED0 + * -----+------+-------- + * Num | Caps | Scroll | + */ +bool indicators_callback(void) { + if ((eeprom_ec_config.num.enabled) && (host_keyboard_led_state().num_lock)) + sethsv(eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]); + else + sethsv(0, 0, 0, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]); + + if ((eeprom_ec_config.caps.enabled) && (host_keyboard_led_state().caps_lock)) + sethsv(eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]); + else + sethsv(0, 0, 0, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]); + + if ((eeprom_ec_config.scroll.enabled) && (host_keyboard_led_state().scroll_lock)) + sethsv(eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]); + else + sethsv(0, 0, 0, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]); + + return true; +} diff --git a/keyboards/cipulot/ec_typek/halconf.h b/keyboards/cipulot/ec_typek/halconf.h new file mode 100644 index 00000000000..24de0954858 --- /dev/null +++ b/keyboards/cipulot/ec_typek/halconf.h @@ -0,0 +1,23 @@ +/* Copyright 2023 Cipulot + * + * 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_ADC TRUE +#define HAL_USE_PWM TRUE +#define HAL_USE_PAL TRUE + +#include_next diff --git a/keyboards/cipulot/ec_typek/info.json b/keyboards/cipulot/ec_typek/info.json new file mode 100644 index 00000000000..e4642ee5553 --- /dev/null +++ b/keyboards/cipulot/ec_typek/info.json @@ -0,0 +1,133 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "EC Type-K", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "eeprom": { + "wear_leveling": { + "backing_size": 4096 + } + }, + "features": { + "bootmagic": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "processor": "STM32F411", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "led_count": 69, + "led_map": [0, 1, 2, 3, 4, 5, 66, 67, 68, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65], + "max_brightness": 200 + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6BB4", + "shared_endpoint": { + "keyboard": true + }, + "vid": "0x6369" + }, + "ws2812": { + "driver": "pwm", + "pin": "B15" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [1, 0], "x": 0.75, "y": 0}, + {"matrix": [0, 0], "x": 2.5, "y": 0}, + {"matrix": [0, 1], "x": 3.5, "y": 0}, + {"matrix": [0, 2], "x": 4.5, "y": 0}, + {"matrix": [0, 3], "x": 5.5, "y": 0}, + {"matrix": [0, 4], "x": 6.5, "y": 0}, + {"matrix": [0, 5], "x": 7.5, "y": 0}, + {"matrix": [0, 6], "x": 8.5, "y": 0}, + {"matrix": [0, 7], "x": 10.5, "y": 0}, + {"matrix": [0, 8], "x": 11.5, "y": 0}, + {"matrix": [0, 9], "x": 12.5, "y": 0}, + {"matrix": [0, 10], "x": 13.5, "y": 0}, + {"matrix": [0, 11], "x": 14.5, "y": 0}, + {"matrix": [0, 12], "x": 15.5, "y": 0}, + {"matrix": [0, 13], "x": 16.5, "y": 0}, + {"matrix": [0, 14], "x": 17.5, "y": 0}, + {"matrix": [2, 0], "x": 0.5, "y": 1}, + {"matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 3.75, "y": 1}, + {"matrix": [1, 3], "x": 4.75, "y": 1}, + {"matrix": [1, 4], "x": 5.75, "y": 1}, + {"matrix": [1, 5], "x": 6.75, "y": 1}, + {"matrix": [1, 6], "x": 7.75, "y": 1}, + {"matrix": [1, 7], "x": 10.25, "y": 1}, + {"matrix": [1, 8], "x": 11.25, "y": 1}, + {"matrix": [1, 9], "x": 12.25, "y": 1}, + {"matrix": [1, 10], "x": 13.25, "y": 1}, + {"matrix": [1, 11], "x": 14.25, "y": 1}, + {"matrix": [1, 12], "x": 15.25, "y": 1}, + {"matrix": [1, 13], "x": 16.25, "y": 1}, + {"matrix": [1, 14], "x": 17.25, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 0.25, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 3.75, "y": 2}, + {"matrix": [2, 3], "x": 4.75, "y": 2}, + {"matrix": [2, 4], "x": 5.75, "y": 2}, + {"matrix": [2, 5], "x": 6.75, "y": 2}, + {"matrix": [2, 6], "x": 7.75, "y": 2}, + {"matrix": [2, 7], "x": 10.75, "y": 2}, + {"matrix": [2, 8], "x": 11.75, "y": 2}, + {"matrix": [2, 9], "x": 12.75, "y": 2}, + {"matrix": [2, 10], "x": 13.75, "y": 2}, + {"matrix": [2, 11], "x": 14.75, "y": 2}, + {"matrix": [2, 12], "x": 15.75, "y": 2}, + {"matrix": [2, 14], "x": 16.75, "y": 2, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1.75, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 3], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 6, "y": 3}, + {"matrix": [3, 5], "x": 7, "y": 3}, + {"matrix": [3, 6], "x": 8, "y": 3}, + {"matrix": [3, 7], "x": 10.5, "y": 3}, + {"matrix": [3, 8], "x": 11.5, "y": 3}, + {"matrix": [3, 9], "x": 12.5, "y": 3}, + {"matrix": [3, 10], "x": 13.5, "y": 3}, + {"matrix": [3, 11], "x": 14.5, "y": 3}, + {"matrix": [3, 12], "x": 15.5, "y": 3}, + {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.25}, + {"matrix": [3, 14], "x": 17.75, "y": 3}, + {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 8.5, "y": 4}, + {"matrix": [4, 7], "x": 10, "y": 4}, + {"matrix": [4, 8], "x": 11, "y": 4, "w": 2}, + {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5} + ] + } + } +} diff --git a/keyboards/cipulot/ec_typek/keymaps/default/keymap.c b/keyboards/cipulot/ec_typek/keymaps/default/keymap.c new file mode 100644 index 00000000000..e47e50680e0 --- /dev/null +++ b/keyboards/cipulot/ec_typek/keymaps/default/keymap.c @@ -0,0 +1,41 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT( + KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, + KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, + KC_LGUI, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_RGUI, KC_SPC, KC_RALT, MO(1) + ), + [1] = LAYOUT( + _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + KC_HOME, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______, + KC_END, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, MO(2), _______ + ), + [2] = LAYOUT( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/cipulot/ec_typek/keymaps/via/keymap.c b/keyboards/cipulot/ec_typek/keymaps/via/keymap.c new file mode 100644 index 00000000000..e47e50680e0 --- /dev/null +++ b/keyboards/cipulot/ec_typek/keymaps/via/keymap.c @@ -0,0 +1,41 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT( + KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, + KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, + KC_LGUI, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_RGUI, KC_SPC, KC_RALT, MO(1) + ), + [1] = LAYOUT( + _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + KC_HOME, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______, + KC_END, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, MO(2), _______ + ), + [2] = LAYOUT( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/cipulot/ec_typek/keymaps/via/rules.mk b/keyboards/cipulot/ec_typek/keymaps/via/rules.mk new file mode 100644 index 00000000000..b870b6349c0 --- /dev/null +++ b/keyboards/cipulot/ec_typek/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes + +SRC += via_ec_indicators.c diff --git a/keyboards/cipulot/ec_typek/keymaps/via/via_ec_indicators.c b/keyboards/cipulot/ec_typek/keymaps/via/via_ec_indicators.c new file mode 100644 index 00000000000..742dac0e6f1 --- /dev/null +++ b/keyboards/cipulot/ec_typek/keymaps/via/via_ec_indicators.c @@ -0,0 +1,502 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include "keyboards/cipulot/common/eeprom_tools.h" +#include "ec_switch_matrix.h" +#include "action.h" +#include "print.h" +#include "via.h" + +#ifdef VIA_ENABLE + +void ec_rescale_values(uint8_t item); +void ec_save_threshold_data(uint8_t option); +void ec_save_bottoming_reading(void); +void ec_show_calibration_data(void); +void ec_clear_bottoming_calibration_data(void); + +// Declaring enums for VIA config menu +enum via_enums { + // clang-format off + id_num_indicator_enabled = 1, + id_num_indicator_brightness = 2, + id_num_indicator_color = 3, + id_caps_indicator_enabled = 4, + id_caps_indicator_brightness = 5, + id_caps_indicator_color = 6, + id_scroll_indicator_enabled = 7, + id_scroll_indicator_brightness = 8, + id_scroll_indicator_color = 9, + id_actuation_mode = 10, + id_mode_0_actuation_threshold = 11, + id_mode_0_release_threshold = 12, + id_save_threshold_data = 13, + id_mode_1_initial_deadzone_offset = 14, + id_mode_1_actuation_offset = 15, + id_mode_1_release_offset = 16, + id_bottoming_calibration = 17, + id_noise_floor_calibration = 18, + id_show_calibration_data = 19, + id_clear_bottoming_calibration_data = 20 + // clang-format on +}; + +// Handle the data received by the keyboard from the VIA menus +void via_config_set_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_num_indicator_enabled: { + if (value_data[0] == 1) { + eeprom_ec_config.num.enabled = true; + uprintf("#########################\n"); + uprintf("# Num indicator enabled #\n"); + uprintf("#########################\n"); + } else { + eeprom_ec_config.num.enabled = false; + uprintf("##########################\n"); + uprintf("# Num indicator disabled #\n"); + uprintf("##########################\n"); + } + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.enabled); + break; + } + case id_num_indicator_brightness: { + eeprom_ec_config.num.v = value_data[0]; + uprintf("Num indicator brightness: %d\n", eeprom_ec_config.num.v); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.v); + break; + } + case id_num_indicator_color: { + eeprom_ec_config.num.h = value_data[0]; + eeprom_ec_config.num.s = value_data[1]; + uprintf("Num indicator color: %d, %d\n", eeprom_ec_config.num.h, eeprom_ec_config.num.s); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.h); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.s); + break; + } + case id_caps_indicator_enabled: { + if (value_data[0] == 1) { + eeprom_ec_config.caps.enabled = true; + uprintf("##########################\n"); + uprintf("# Caps indicator enabled #\n"); + uprintf("##########################\n"); + } else { + eeprom_ec_config.caps.enabled = false; + uprintf("###########################\n"); + uprintf("# Caps indicator disabled #\n"); + uprintf("###########################\n"); + } + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.enabled); + break; + } + case id_caps_indicator_brightness: { + eeprom_ec_config.caps.v = value_data[0]; + uprintf("Caps indicator brightness: %d\n", eeprom_ec_config.caps.v); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.v); + break; + } + case id_caps_indicator_color: { + eeprom_ec_config.caps.h = value_data[0]; + eeprom_ec_config.caps.s = value_data[1]; + uprintf("Caps indicator color: %d, %d\n", eeprom_ec_config.caps.h, eeprom_ec_config.caps.s); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.h); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.s); + break; + } + case id_scroll_indicator_enabled: { + if (value_data[0] == 1) { + eeprom_ec_config.scroll.enabled = true; + uprintf("############################\n"); + uprintf("# Scroll indicator enabled #\n"); + uprintf("############################\n"); + } else { + eeprom_ec_config.scroll.enabled = false; + uprintf("#############################\n"); + uprintf("# Scroll indicator disabled #\n"); + uprintf("#############################\n"); + } + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.enabled); + break; + } + case id_scroll_indicator_brightness: { + eeprom_ec_config.scroll.v = value_data[0]; + uprintf("Scroll indicator brightness: %d\n", eeprom_ec_config.scroll.v); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.v); + break; + } + case id_scroll_indicator_color: { + eeprom_ec_config.scroll.h = value_data[0]; + eeprom_ec_config.scroll.s = value_data[1]; + uprintf("Scroll indicator color: %d, %d\n", eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.h); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.s); + break; + } + case id_actuation_mode: { + eeprom_ec_config.actuation_mode = value_data[0]; + ec_config.actuation_mode = eeprom_ec_config.actuation_mode; + if (ec_config.actuation_mode == 0) { + uprintf("#########################\n"); + uprintf("# Actuation Mode: APC #\n"); + uprintf("#########################\n"); + } else if (ec_config.actuation_mode == 1) { + uprintf("#################################\n"); + uprintf("# Actuation Mode: Rapid Trigger #\n"); + uprintf("#################################\n"); + } + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, actuation_mode); + break; + } + case id_mode_0_actuation_threshold: { + ec_config.mode_0_actuation_threshold = value_data[1] | (value_data[0] << 8); + uprintf("APC Mode Actuation Threshold: %d\n", ec_config.mode_0_actuation_threshold); + break; + } + case id_mode_0_release_threshold: { + eeprom_ec_config.mode_0_release_threshold = value_data[1] | (value_data[0] << 8); + ec_config.mode_0_release_threshold = eeprom_ec_config.mode_0_release_threshold; + uprintf("APC Mode Release Threshold: %d\n", ec_config.mode_0_release_threshold); + break; + } + case id_mode_1_initial_deadzone_offset: { + ec_config.mode_1_initial_deadzone_offset = value_data[1] | (value_data[0] << 8); + uprintf("Rapid Trigger Mode Initial Deadzone Offset: %d\n", ec_config.mode_1_initial_deadzone_offset); + break; + } + case id_mode_1_actuation_offset: { + ec_config.mode_1_actuation_offset = value_data[0]; + uprintf("Rapid Trigger Mode Actuation Sensitivity: %d\n", ec_config.mode_1_actuation_offset); + break; + } + case id_mode_1_release_offset: { + ec_config.mode_1_release_offset = value_data[0]; + uprintf("Rapid Trigger Mode Release Sensitivity: %d\n", ec_config.mode_1_release_offset); + break; + } + case id_bottoming_calibration: { + if (value_data[0] == 1) { + ec_config.bottoming_calibration = true; + uprintf("##############################\n"); + uprintf("# Bottoming calibration mode #\n"); + uprintf("##############################\n"); + } else { + ec_config.bottoming_calibration = false; + ec_save_bottoming_reading(); + uprintf("## Bottoming calibration done ##\n"); + ec_show_calibration_data(); + } + break; + } + case id_save_threshold_data: { + ec_save_threshold_data(value_data[0]); + break; + } + case id_noise_floor_calibration: { + if (value_data[0] == 0) { + ec_noise_floor(); + ec_rescale_values(0); + ec_rescale_values(1); + ec_rescale_values(2); + uprintf("#############################\n"); + uprintf("# Noise floor data acquired #\n"); + uprintf("#############################\n"); + break; + } + } + case id_show_calibration_data: { + // Show calibration data once if the user toggle the switch + if (value_data[0] == 0) { + ec_show_calibration_data(); + break; + } + } + case id_clear_bottoming_calibration_data: { + if (value_data[0] == 0) { + ec_clear_bottoming_calibration_data(); + } + } + default: { + // Unhandled value. + break; + } + } + + // Call the indicator callback to set the indicator color + indicators_callback(); +} + +// Handle the data sent by the keyboard to the VIA menus +void via_config_get_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_num_indicator_enabled: { + value_data[0] = eeprom_ec_config.num.enabled; + break; + } + case id_num_indicator_brightness: { + value_data[0] = eeprom_ec_config.num.v; + break; + } + case id_num_indicator_color: { + value_data[0] = eeprom_ec_config.num.h; + value_data[1] = eeprom_ec_config.num.s; + break; + } + case id_caps_indicator_enabled: { + value_data[0] = eeprom_ec_config.caps.enabled; + break; + } + case id_caps_indicator_brightness: { + value_data[0] = eeprom_ec_config.caps.v; + break; + } + case id_caps_indicator_color: { + value_data[0] = eeprom_ec_config.caps.h; + value_data[1] = eeprom_ec_config.caps.s; + break; + } + case id_scroll_indicator_enabled: { + value_data[0] = eeprom_ec_config.scroll.enabled; + break; + } + case id_scroll_indicator_brightness: { + value_data[0] = eeprom_ec_config.scroll.v; + break; + } + case id_scroll_indicator_color: { + value_data[0] = eeprom_ec_config.scroll.h; + value_data[1] = eeprom_ec_config.scroll.s; + break; + } + case id_actuation_mode: { + value_data[0] = eeprom_ec_config.actuation_mode; + break; + } + case id_mode_0_actuation_threshold: { + value_data[0] = eeprom_ec_config.mode_0_actuation_threshold >> 8; + value_data[1] = eeprom_ec_config.mode_0_actuation_threshold & 0xFF; + break; + } + case id_mode_0_release_threshold: { + value_data[0] = eeprom_ec_config.mode_0_release_threshold >> 8; + value_data[1] = eeprom_ec_config.mode_0_release_threshold & 0xFF; + break; + } + case id_mode_1_initial_deadzone_offset: { + value_data[0] = eeprom_ec_config.mode_1_initial_deadzone_offset >> 8; + value_data[1] = eeprom_ec_config.mode_1_initial_deadzone_offset & 0xFF; + break; + } + case id_mode_1_actuation_offset: { + value_data[0] = eeprom_ec_config.mode_1_actuation_offset; + break; + } + case id_mode_1_release_offset: { + value_data[0] = eeprom_ec_config.mode_1_release_offset; + break; + } + default: { + // Unhandled value. + break; + } + } +} + +// Handle the commands sent and received by the keyboard with VIA +void via_custom_value_command_kb(uint8_t *data, uint8_t length) { + // data = [ command_id, channel_id, value_id, value_data ] + uint8_t *command_id = &(data[0]); + uint8_t *channel_id = &(data[1]); + uint8_t *value_id_and_data = &(data[2]); + + if (*channel_id == id_custom_channel) { + switch (*command_id) { + case id_custom_set_value: { + via_config_set_value(value_id_and_data); + break; + } + case id_custom_get_value: { + via_config_get_value(value_id_and_data); + break; + } + case id_custom_save: { + // Bypass the save function in favor of pinpointed saves + break; + } + default: { + // Unhandled message. + *command_id = id_unhandled; + break; + } + } + return; + } + + *command_id = id_unhandled; +} + +// Rescale the values received by VIA to fit the new range +void ec_rescale_values(uint8_t item) { + switch (item) { + // Rescale the APC mode actuation thresholds + case 0: + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.rescaled_mode_0_actuation_threshold[row][col] = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + } + break; + // Rescale the APC mode release thresholds + case 1: + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.rescaled_mode_0_release_threshold[row][col] = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + } + break; + // Rescale the Rapid Trigger mode initial deadzone offsets + case 2: + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + } + break; + + default: + // Unhandled item. + break; + } +} + +void ec_save_threshold_data(uint8_t option) { + // Save APC mode thresholds and rescale them for runtime usage + if (option == 0) { + eeprom_ec_config.mode_0_actuation_threshold = ec_config.mode_0_actuation_threshold; + eeprom_ec_config.mode_0_release_threshold = ec_config.mode_0_release_threshold; + ec_rescale_values(0); + ec_rescale_values(1); + } + // Save Rapid Trigger mode thresholds and rescale them for runtime usage + else if (option == 1) { + eeprom_ec_config.mode_1_initial_deadzone_offset = ec_config.mode_1_initial_deadzone_offset; + ec_rescale_values(2); + } + eeconfig_update_kb_datablock(&eeprom_ec_config); + uprintf("####################################\n"); + uprintf("# New thresholds applied and saved #\n"); + uprintf("####################################\n"); +} + +// Save the bottoming reading +void ec_save_bottoming_reading(void) { + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + // If the bottom reading doesn't go over the noise floor by 100, it is likely that: + // 1. The key is not actually in the matrix + // 2. The key is on an alternative layout, therefore not being pressed + // 3. The key in in the current layout but not being pressed + if (ec_config.bottoming_reading[row][col] < (ec_config.noise_floor[row][col] + 100)) { + eeprom_ec_config.bottoming_reading[row][col] = 1023; + } else { + eeprom_ec_config.bottoming_reading[row][col] = ec_config.bottoming_reading[row][col]; + } + } + } + // Rescale the values to fit the new range for runtime usage + ec_rescale_values(0); + ec_rescale_values(1); + ec_rescale_values(2); + eeconfig_update_kb_datablock(&eeprom_ec_config); +} + +// Show the calibration data +void ec_show_calibration_data(void) { + uprintf("\n###############\n"); + uprintf("# Noise Floor #\n"); + uprintf("###############\n"); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", ec_config.noise_floor[row][col]); + } + uprintf("%4d\n", ec_config.noise_floor[row][MATRIX_COLS - 1]); + } + + uprintf("\n######################\n"); + uprintf("# Bottoming Readings #\n"); + uprintf("######################\n"); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", eeprom_ec_config.bottoming_reading[row][col]); + } + uprintf("%4d\n", eeprom_ec_config.bottoming_reading[row][MATRIX_COLS - 1]); + } + + uprintf("\n######################################\n"); + uprintf("# Rescaled APC Mode Actuation Points #\n"); + uprintf("######################################\n"); + uprintf("Original APC Mode Actuation Point: %4d\n", ec_config.mode_0_actuation_threshold); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", ec_config.rescaled_mode_0_actuation_threshold[row][col]); + } + uprintf("%4d\n", ec_config.rescaled_mode_0_actuation_threshold[row][MATRIX_COLS - 1]); + } + + uprintf("\n######################################\n"); + uprintf("# Rescaled APC Mode Release Points #\n"); + uprintf("######################################\n"); + uprintf("Original APC Mode Release Point: %4d\n", ec_config.mode_0_release_threshold); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", ec_config.rescaled_mode_0_release_threshold[row][col]); + } + uprintf("%4d\n", ec_config.rescaled_mode_0_release_threshold[row][MATRIX_COLS - 1]); + } + + uprintf("\n#######################################################\n"); + uprintf("# Rescaled Rapid Trigger Mode Initial Deadzone Offset #\n"); + uprintf("#######################################################\n"); + uprintf("Original Rapid Trigger Mode Initial Deadzone Offset: %4d\n", ec_config.mode_1_initial_deadzone_offset); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]); + } + uprintf("%4d\n", ec_config.rescaled_mode_1_initial_deadzone_offset[row][MATRIX_COLS - 1]); + } + print("\n"); +} + +// Clear the calibration data +void ec_clear_bottoming_calibration_data(void) { + // Clear the EEPROM data + eeconfig_init_kb(); + + // Reset the runtime values to the EEPROM values + keyboard_post_init_kb(); + + uprintf("######################################\n"); + uprintf("# Bottoming calibration data cleared #\n"); + uprintf("######################################\n"); +} + +#endif // VIA_ENABLE diff --git a/keyboards/cipulot/ec_typek/matrix.c b/keyboards/cipulot/ec_typek/matrix.c new file mode 100644 index 00000000000..cfa2efe0506 --- /dev/null +++ b/keyboards/cipulot/ec_typek/matrix.c @@ -0,0 +1,42 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include "ec_switch_matrix.h" +#include "matrix.h" + +extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values +extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values + +// Custom matrix init function +void matrix_init_custom(void) { + // Initialize EC + ec_init(); + + // Get the noise floor at boot + ec_noise_floor(); +} + +// Custom matrix scan function +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + bool updated = ec_matrix_scan(current_matrix); + + return updated; +} + +// Bootmagic overriden to avoid conflicts with EC +void bootmagic_scan(void) { + ; +} diff --git a/keyboards/cipulot/ec_typek/mcuconf.h b/keyboards/cipulot/ec_typek/mcuconf.h new file mode 100644 index 00000000000..5f9ecca48dd --- /dev/null +++ b/keyboards/cipulot/ec_typek/mcuconf.h @@ -0,0 +1,28 @@ +/* Copyright 2023 Cipulot + * + * 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 + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE + +#undef STM32_PWM_USE_ADVANCED +#define STM32_PWM_USE_ADVANCED TRUE + +#undef STM32_PWM_USE_TIM1 +#define STM32_PWM_USE_TIM1 TRUE diff --git a/keyboards/cipulot/ec_typek/readme.md b/keyboards/cipulot/ec_typek/readme.md new file mode 100644 index 00000000000..44f6fd89440 --- /dev/null +++ b/keyboards/cipulot/ec_typek/readme.md @@ -0,0 +1,26 @@ +# EC Type-K + +![EC Type-K](https://i.imgur.com/hFQ0qCfh.png) + +EC Type-K Keyboard by gok. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: EC Type-K +* Hardware Availability: [gok](https://www.gok.design/) + +Make example for this keyboard (after setting up your build environment): + + make cipulot/ec_typek:default + +Flashing example for this keyboard: + + make cipulot/ec_typek: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). + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/cipulot/ec_typek/rules.mk b/keyboards/cipulot/ec_typek/rules.mk new file mode 100644 index 00000000000..1ff311f102d --- /dev/null +++ b/keyboards/cipulot/ec_typek/rules.mk @@ -0,0 +1,4 @@ +CUSTOM_MATRIX = lite +ANALOG_DRIVER_REQUIRED = yes +SRC += matrix.c ec_switch_matrix.c +OPT = 2 From 573db7a0eeddea94e692af85b90219d637567fc3 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 2 Apr 2024 00:48:30 +0100 Subject: [PATCH 095/333] Produce warning if keyboard is not configured via `keyboard.json` (#23321) --- lib/python/qmk/info.py | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index e463ac8ce74..ffc9d57d682 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -83,6 +83,25 @@ def _find_invalid_encoder_index(info_data): return ret +def _validate_build_target(keyboard, info_data): + """Non schema checks + """ + keyboard_json_path = Path('keyboards') / keyboard / 'keyboard.json' + config_files = find_info_json(keyboard) + + # keyboard.json can only exist at the deepest part of the tree + keyboard_json_count = 0 + for info_file in config_files: + if info_file.name == 'keyboard.json': + keyboard_json_count += 1 + if info_file != keyboard_json_path: + _log_error(info_data, f'Invalid keyboard.json location detected: {info_file}.') + + # Moving forward keyboard.json should be used as a build target + if keyboard_json_count == 0: + _log_warning(info_data, 'Build marker "keyboard.json" not found.') + + def _validate_layouts(keyboard, info_data): # noqa C901 """Non schema checks """ @@ -181,6 +200,7 @@ def _validate(keyboard, info_data): validate(info_data, 'qmk.api.keyboard.v1') # Additional validation + _validate_build_target(keyboard, info_data) _validate_layouts(keyboard, info_data) _validate_keycodes(keyboard, info_data) _validate_encoders(keyboard, info_data) @@ -890,14 +910,6 @@ def merge_info_jsons(keyboard, info_data): """ config_files = find_info_json(keyboard) - # keyboard.json can only exist at the deepest part of the tree - keyboard_json_count = 0 - for index, info_file in enumerate(config_files): - if Path(info_file).name == 'keyboard.json': - keyboard_json_count += 1 - if index != 0 or keyboard_json_count > 1: - _log_error(info_data, f'Invalid keyboard.json location detected: {info_file}.') - for info_file in config_files: # Load and validate the JSON data new_info_data = json_load(info_file) From 1bea8b9d31fff260c55d515dd221f5572d85b8ff Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Apr 2024 01:32:48 +1100 Subject: [PATCH 096/333] 40percentclub/gherkin: remove `CONVERT_TO` at keyboard level (#23396) --- keyboards/40percentclub/gherkin/info.json | 15 +++++------- .../gherkin/kb2040/keyboard.json | 12 ++++++++++ .../40percentclub/gherkin/kb2040/rules.mk | 1 - .../gherkin/keymaps/default/keymap.c | 23 ------------------- .../gherkin/pro_micro/keyboard.json | 16 +++++++++++++ keyboards/40percentclub/gherkin/rules.mk | 16 ------------- 6 files changed, 34 insertions(+), 49 deletions(-) create mode 100644 keyboards/40percentclub/gherkin/kb2040/keyboard.json delete mode 100644 keyboards/40percentclub/gherkin/kb2040/rules.mk create mode 100644 keyboards/40percentclub/gherkin/pro_micro/keyboard.json delete mode 100644 keyboards/40percentclub/gherkin/rules.mk diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json index 808a82d4cea..d531c9408c1 100644 --- a/keyboards/40percentclub/gherkin/info.json +++ b/keyboards/40percentclub/gherkin/info.json @@ -8,16 +8,13 @@ "pid": "0x6060", "device_version": "0.0.1" }, - "matrix_pins": { - "cols": ["B4", "E6", "D7", "C6", "D4", "D0"], - "rows": ["F7", "B1", "B3", "B2", "B6"] + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true }, - "diode_direction": "COL2ROW", - "backlight": { - "pin": "B5" - }, - "processor": "atmega32u4", - "bootloader": "caterina", "community_layouts": ["ortho_3x10"], "layouts": { "LAYOUT_ortho_3x10": { diff --git a/keyboards/40percentclub/gherkin/kb2040/keyboard.json b/keyboards/40percentclub/gherkin/kb2040/keyboard.json new file mode 100644 index 00000000000..431ac371eeb --- /dev/null +++ b/keyboards/40percentclub/gherkin/kb2040/keyboard.json @@ -0,0 +1,12 @@ +{ + "development_board": "kb2040", + "matrix_pins": { + "cols": ["GP8", "GP7", "GP6", "GP5", "GP4", "GP3"], + "rows": ["GP26", "GP18", "GP20", "GP19", "GP10"] + }, + "diode_direction": "COL2ROW", + "backlight": { + "pin": "GP9", + "driver": "software" + } +} diff --git a/keyboards/40percentclub/gherkin/kb2040/rules.mk b/keyboards/40percentclub/gherkin/kb2040/rules.mk deleted file mode 100644 index 982c5817025..00000000000 --- a/keyboards/40percentclub/gherkin/kb2040/rules.mk +++ /dev/null @@ -1 +0,0 @@ -CONVERT_TO = kb2040 diff --git a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c index f4d3032857c..420890a1083 100644 --- a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c +++ b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c @@ -50,26 +50,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -void keyboard_pre_init_user(void) { - // Call the keyboard pre init code. - - // Set our LED pins as output - setPinOutput(D5); - setPinOutput(B0); -} - -bool led_update_user(led_t led_state) { - if (led_state.num_lock) { - writePinLow(D5); - } else { - writePinHigh(D5); - } - - if (led_state.caps_lock) { - writePinLow(B0); - } else { - writePinHigh(B0); - } - return false; -} diff --git a/keyboards/40percentclub/gherkin/pro_micro/keyboard.json b/keyboards/40percentclub/gherkin/pro_micro/keyboard.json new file mode 100644 index 00000000000..882ea8f72b2 --- /dev/null +++ b/keyboards/40percentclub/gherkin/pro_micro/keyboard.json @@ -0,0 +1,16 @@ +{ + "development_board": "promicro", + "matrix_pins": { + "cols": ["B4", "E6", "D7", "C6", "D4", "D0"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "indicators": { + "num_lock": "D5", + "caps_lock": "B0", + "on_state": 0 + }, + "backlight": { + "pin": "B5" + } +} diff --git a/keyboards/40percentclub/gherkin/rules.mk b/keyboards/40percentclub/gherkin/rules.mk deleted file mode 100644 index e47c1c65726..00000000000 --- a/keyboards/40percentclub/gherkin/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no - -# Disable unsupported hardware -RGBLIGHT_SUPPORTED = no -AUDIO_SUPPORTED = no From 05731202a2e26682b3601ae0812e18b4e2c9d694 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Apr 2024 01:37:11 +1100 Subject: [PATCH 097/333] 0xcb/splaytoraid: remove `CONVERT_TO` at keyboard level (#23395) --- keyboards/0xcb/splaytoraid/32u4/keyboard.json | 27 +++++++++++++ keyboards/0xcb/splaytoraid/32u4/rules.mk | 0 keyboards/0xcb/splaytoraid/info.json | 27 +------------ .../rp2040_ce/{info.json => keyboard.json} | 40 ++++++++++++++----- keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk | 1 - 5 files changed, 58 insertions(+), 37 deletions(-) create mode 100644 keyboards/0xcb/splaytoraid/32u4/keyboard.json delete mode 100644 keyboards/0xcb/splaytoraid/32u4/rules.mk rename keyboards/0xcb/splaytoraid/rp2040_ce/{info.json => keyboard.json} (50%) delete mode 100644 keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk diff --git a/keyboards/0xcb/splaytoraid/32u4/keyboard.json b/keyboards/0xcb/splaytoraid/32u4/keyboard.json new file mode 100644 index 00000000000..7c3f0590a6f --- /dev/null +++ b/keyboards/0xcb/splaytoraid/32u4/keyboard.json @@ -0,0 +1,27 @@ +{ + "development_board": "promicro", + "bootloader": "qmk-dfu", + "matrix_pins": { + "cols": ["F5", "F6", "F7", "F4", "B3", "B1", "B2"], + "rows": ["D3", "D2", "D1", "D4", "D7", "E6", "B4", "C6"] + }, + "diode_direction": "COL2ROW", + "rgb_matrix": { + "animations": { + "band_sat": true, + "band_spiral_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "raindrops": true + } + }, + "encoder": { + "rotary": [ + {"pin_a": "B5", "pin_b": "B6"} + ] + }, + "ws2812": { + "pin": "D0" + } +} diff --git a/keyboards/0xcb/splaytoraid/32u4/rules.mk b/keyboards/0xcb/splaytoraid/32u4/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/0xcb/splaytoraid/info.json b/keyboards/0xcb/splaytoraid/info.json index 1d47f7d77ca..8c32b0dc115 100644 --- a/keyboards/0xcb/splaytoraid/info.json +++ b/keyboards/0xcb/splaytoraid/info.json @@ -3,13 +3,6 @@ "keyboard_name": "splaytoraid", "maintainer": "freya-irl", "url": "https://github.com/freya-irl/splaytoraid40", - "development_board": "promicro", - "bootloader": "qmk-dfu", - "diode_direction": "COL2ROW", - "matrix_pins": { - "cols": ["F5", "F6", "F7", "F4", "B3", "B1", "B2"], - "rows": ["D3", "D2", "D1", "D4", "D7", "E6", "B4", "C6"] - }, "usb": { "device_version": "1.0.0", "pid": "0xCB00", @@ -21,7 +14,8 @@ "bootmagic": true, "console": true, "mousekey": true, - "nkro": true + "nkro": true, + "encoder": true }, "bootmagic": { "matrix": [1, 0] @@ -29,21 +23,7 @@ "build": { "lto": true }, - "encoder": { - "enabled": true, - "rotary": [ - {"pin_a": "B5", "pin_b": "B6", "resolution": 4} - ] - }, "rgb_matrix": { - "animations": { - "breathing": true, - "band_sat": true, - "band_spiral_val": true, - "cycle_all": true, - "raindrops": true, - "cycle_left_right": true - }, "default": { "animation": "breathing", "hue": 152, @@ -73,9 +53,6 @@ ], "max_brightness": 200 }, - "ws2812": { - "pin": "D0" - }, "layouts": { "LAYOUT_36": { "layout": [ diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json b/keyboards/0xcb/splaytoraid/rp2040_ce/keyboard.json similarity index 50% rename from keyboards/0xcb/splaytoraid/rp2040_ce/info.json rename to keyboards/0xcb/splaytoraid/rp2040_ce/keyboard.json index 49256b64827..b5a4f95c692 100644 --- a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json +++ b/keyboards/0xcb/splaytoraid/rp2040_ce/keyboard.json @@ -1,26 +1,44 @@ { + "development_board": "promicro_rp2040", + "matrix_pins": { + "cols": ["GP28", "GP27", "GP26", "GP29", "GP20", "GP22", "GP23"], + "rows": ["GP0", "GP1", "GP2", "GP4", "GP6", "GP7", "GP8", "GP5"] + }, + "diode_direction": "COL2ROW", "rgb_matrix": { "animations": { - "cycle_up_down": true, - "jellybean_raindrops": true, + "band_sat": true, + "band_spiral_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, "cycle_out_in": true, "cycle_out_in_dual": true, - "pixel_fractal": true, - "rainbow_moving_chevron": true, "cycle_pinwheel": true, - "pixel_rain": true, + "cycle_up_down": true, + "digital_rain": true, "dual_beacon": true, "hue_breathing": true, - "typing_heatmap": true, - "digital_rain": true, - "solid_reactive_simple": true, - "solid_reactive": true, - "splash": true, + "jellybean_raindrops": true, "multisplash": true, - "solid_splash": true + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_moving_chevron": true, + "raindrops": true, + "solid_reactive": true, + "solid_reactive_simple": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true } }, + "encoder": { + "rotary": [ + {"pin_a": "GP9", "pin_b": "GP21"} + ] + }, "ws2812": { + "pin": "GP3", "driver": "vendor" } } diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk b/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk deleted file mode 100644 index 9617c1460ea..00000000000 --- a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk +++ /dev/null @@ -1 +0,0 @@ -CONVERT_TO = rp2040_ce From b108524314047b947031d1cb688e2a378cf586c7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Apr 2024 02:05:32 +1100 Subject: [PATCH 098/333] merge/um80: remove pointless empty layers (#23398) --- keyboards/merge/um80/keymaps/default/keymap.c | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/keyboards/merge/um80/keymaps/default/keymap.c b/keyboards/merge/um80/keymaps/default/keymap.c index 04dea2c1be2..cfd628e300d 100644 --- a/keyboards/merge/um80/keymaps/default/keymap.c +++ b/keyboards/merge/um80/keymaps/default/keymap.c @@ -41,31 +41,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_1, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_2, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_3, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_4, KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT -), - -[1] = LAYOUT_rspace_split_bksp( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -), -[2] = LAYOUT_rspace_split_bksp( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -), -[3] = LAYOUT_rspace_split_bksp( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_4, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), }; From 63bc7b63a650c4da63611900437e06ea7d051f14 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:45:44 -0700 Subject: [PATCH 099/333] Data-Driven Keyboard Conversions: A (#23379) --- keyboards/abacus/config.h | 39 ------------------ keyboards/abacus/keyboard.json | 6 +++ keyboards/abstract/ellipse/rev1/config.h | 39 ------------------ keyboards/abstract/ellipse/rev1/keyboard.json | 6 +++ keyboards/acekeyboard/titan60/config.h | 23 ----------- keyboards/acekeyboard/titan60/keyboard.json | 6 +++ keyboards/acheron/apollo/87h/delta/config.h | 5 --- .../acheron/apollo/87h/delta/keyboard.json | 6 +++ keyboards/acheron/apollo/87h/gamma/config.h | 5 --- .../87h/gamma/{info.json => keyboard.json} | 17 +++++++- keyboards/acheron/apollo/87h/gamma/rules.mk | 15 ------- keyboards/acheron/apollo/87htsc/config.h | 5 --- keyboards/acheron/apollo/87htsc/keyboard.json | 6 +++ keyboards/acheron/apollo/88htsc/config.h | 5 --- keyboards/acheron/apollo/88htsc/keyboard.json | 6 +++ keyboards/acheron/arctic/config.h | 39 ------------------ keyboards/acheron/arctic/keyboard.json | 6 +++ keyboards/acheron/athena/alpha/config.h | 3 -- keyboards/acheron/athena/alpha/keyboard.json | 6 +++ keyboards/acheron/athena/beta/config.h | 3 -- keyboards/acheron/athena/beta/keyboard.json | 6 +++ keyboards/acheron/austin/config.h | 5 --- keyboards/acheron/austin/keyboard.json | 6 +++ keyboards/acheron/elongate/beta/config.h | 39 ------------------ keyboards/acheron/elongate/beta/keyboard.json | 6 +++ keyboards/acheron/elongate/delta/config.h | 5 --- .../acheron/elongate/delta/keyboard.json | 6 +++ keyboards/acheron/keebspcb/config.h | 39 ------------------ keyboards/acheron/keebspcb/keyboard.json | 6 +++ keyboards/acheron/lasgweloth/config.h | 39 ------------------ keyboards/acheron/lasgweloth/keyboard.json | 6 +++ keyboards/acheron/shark/alpha/config.h | 5 --- keyboards/acheron/shark/alpha/info.json | 14 +++++++ keyboards/acheron/shark/alpha/rules.mk | 14 ------- keyboards/acheron/shark/beta/config.h | 3 -- keyboards/acheron/shark/beta/keyboard.json | 6 +++ keyboards/acheron/themis/87h/config.h | 3 -- keyboards/acheron/themis/87h/keyboard.json | 6 +++ keyboards/acheron/themis/87htsc/config.h | 3 -- keyboards/acheron/themis/87htsc/keyboard.json | 6 +++ keyboards/acheron/themis/88htsc/config.h | 3 -- keyboards/acheron/themis/88htsc/keyboard.json | 6 +++ keyboards/ada/infinity81/config.h | 25 ------------ keyboards/ada/infinity81/keyboard.json | 6 +++ keyboards/adafruit/macropad/info.json | 10 +++++ keyboards/adafruit/macropad/rules.mk | 15 ------- keyboards/adelheid/config.h | 39 ------------------ keyboards/adelheid/keyboard.json | 6 +++ keyboards/adkb96/rev1/config.h | 40 ------------------- .../adkb96/{info.json => rev1/keyboard.json} | 14 +++++++ keyboards/adkb96/rev1/rules.mk | 0 keyboards/adkb96/rules.mk | 15 ------- keyboards/aeboards/aegis/config.h | 23 ----------- keyboards/aeboards/aegis/keyboard.json | 6 +++ .../aeboards/constellation/rev1/config.h | 24 ----------- .../rev1/{info.json => keyboard.json} | 17 ++++++++ .../aeboards/constellation/rev1/rules.mk | 12 ------ .../aeboards/constellation/rev2/config.h | 6 --- .../rev2/{info.json => keyboard.json} | 13 ++++++ .../aeboards/constellation/rev2/rules.mk | 11 ----- .../aeboards/constellation/rev3/config.h | 24 ----------- .../rev3/{info.json => keyboard.json} | 17 ++++++++ .../aeboards/constellation/rev3/rules.mk | 12 ------ .../ext65/rev1/{info.json => keyboard.json} | 6 +++ keyboards/aeboards/ext65/rev1/rules.mk | 11 ----- .../ext65/rev2/{info.json => keyboard.json} | 10 +++++ keyboards/aeboards/ext65/rev2/rules.mk | 14 ------- keyboards/aeboards/ext65/rev3/info.json | 9 +++++ keyboards/aeboards/ext65/rev3/rules.mk | 12 ------ keyboards/aeboards/satellite/rev1/info.json | 10 +++++ keyboards/aeboards/satellite/rev1/rules.mk | 15 ------- .../breeze/rev0/{info.json => keyboard.json} | 7 ++++ keyboards/afternoonlabs/breeze/rev0/rules.mk | 13 ------ .../breeze/rev1/{info.json => keyboard.json} | 7 ++++ keyboards/afternoonlabs/breeze/rev1/rules.mk | 13 ------ .../rev1/{info.json => keyboard.json} | 7 ++++ .../afternoonlabs/oceanbreeze/rev1/rules.mk | 13 ------ .../rev1/{info.json => keyboard.json} | 7 ++++ .../southern_breeze/rev1/rules.mk | 13 ------ .../rev1/{info.json => keyboard.json} | 7 ++++ .../afternoonlabs/summer_breeze/rev1/rules.mk | 13 ------ keyboards/ai03/andromeda/config.h | 23 ----------- keyboards/ai03/andromeda/keyboard.json | 6 +++ keyboards/ai03/equinox/config.h | 39 ------------------ keyboards/ai03/equinox/info.json | 6 +++ keyboards/ai03/jp60/config.h | 39 ------------------ keyboards/ai03/jp60/keyboard.json | 6 +++ keyboards/ai03/lunar/config.h | 39 ------------------ keyboards/ai03/lunar/keyboard.json | 6 +++ keyboards/ai03/lunar_ii/config.h | 5 --- keyboards/ai03/lunar_ii/info.json | 14 +++++++ keyboards/ai03/lunar_ii/rules.mk | 14 ------- keyboards/ai03/orbit/config.h | 5 --- .../ai03/orbit/{info.json => keyboard.json} | 14 +++++++ keyboards/ai03/orbit/rules.mk | 13 ------ keyboards/ai03/orbit_x/config.h | 5 --- .../ai03/orbit_x/{info.json => keyboard.json} | 14 +++++++ keyboards/ai03/orbit_x/rules.mk | 13 ------ keyboards/ai03/polaris/config.h | 39 ------------------ keyboards/ai03/polaris/keyboard.json | 6 +++ keyboards/ai03/quasar/config.h | 39 ------------------ keyboards/ai03/quasar/keyboard.json | 6 +++ keyboards/ai03/soyuz/config.h | 39 ------------------ keyboards/ai03/soyuz/keyboard.json | 6 +++ keyboards/ai03/vega/config.h | 40 ------------------- keyboards/ai03/vega/keyboard.json | 6 +++ keyboards/akb/raine/config.h | 22 ---------- keyboards/akb/raine/keyboard.json | 6 +++ .../device_one/{info.json => keyboard.json} | 6 +++ keyboards/akegata_denki/device_one/rules.mk | 10 ----- keyboards/akko/5087/config.h | 5 --- keyboards/akko/5087/keyboard.json | 6 +++ keyboards/akko/5108/config.h | 5 --- keyboards/akko/5108/keyboard.json | 6 +++ keyboards/akko/acr87/config.h | 5 --- keyboards/akko/acr87/keyboard.json | 6 +++ keyboards/akko/top40/config.h | 5 --- keyboards/akko/top40/keyboard.json | 6 +++ keyboards/al1/config.h | 5 --- keyboards/al1/info.json | 14 +++++++ keyboards/al1/rules.mk | 13 ------ keyboards/alas/info.json | 7 ++++ keyboards/alas/rules.mk | 15 ------- .../zodiark/{info.json => keyboard.json} | 11 +++++ keyboards/aleblazer/zodiark/rules.mk | 16 -------- keyboards/alf/dc60/config.h | 39 ------------------ keyboards/alf/dc60/keyboard.json | 6 +++ keyboards/alf/x11/config.h | 39 ------------------ keyboards/alf/x11/keyboard.json | 6 +++ keyboards/alf/x2/config.h | 23 ----------- keyboards/alf/x2/keyboard.json | 6 +++ keyboards/aliceh66/pianoforte/config.h | 23 ----------- keyboards/aliceh66/pianoforte/info.json | 15 +++++++ keyboards/aliceh66/pianoforte/rules.mk | 14 ------- keyboards/aliceh66/pianoforte_hs/config.h | 23 ----------- keyboards/aliceh66/pianoforte_hs/info.json | 15 +++++++ keyboards/aliceh66/pianoforte_hs/rules.mk | 14 ------- keyboards/alpha/config.h | 7 ---- keyboards/alpha/keyboard.json | 6 +++ keyboards/alpine65/config.h | 39 ------------------ keyboards/alpine65/keyboard.json | 6 +++ keyboards/alps64/config.h | 39 ------------------ keyboards/alps64/keyboard.json | 6 +++ keyboards/alt34/rev1/config.h | 5 --- .../alt34/rev1/{info.json => keyboard.json} | 14 +++++++ keyboards/alt34/rev1/rules.mk | 14 ------- keyboards/amag23/config.h | 21 ---------- keyboards/amag23/keyboard.json | 6 +++ keyboards/amjkeyboard/amj40/config.h | 39 ------------------ keyboards/amjkeyboard/amj40/keyboard.json | 6 +++ keyboards/amjkeyboard/amj60/config.h | 39 ------------------ keyboards/amjkeyboard/amj60/keyboard.json | 6 +++ keyboards/amjkeyboard/amj66/config.h | 24 ----------- keyboards/amjkeyboard/amj66/info.json | 14 +++++++ keyboards/amjkeyboard/amj66/rules.mk | 12 ------ keyboards/amjkeyboard/amj84/config.h | 25 ------------ keyboards/amjkeyboard/amj84/keyboard.json | 6 +++ keyboards/amjkeyboard/amj96/config.h | 5 --- keyboards/amjkeyboard/amj96/info.json | 14 +++++++ keyboards/amjkeyboard/amj96/rules.mk | 13 ------ keyboards/amjkeyboard/amjpad/config.h | 39 ------------------ keyboards/amjkeyboard/amjpad/keyboard.json | 6 +++ .../anavi/knob1/{info.json => keyboard.json} | 3 +- keyboards/anavi/knob1/rules.mk | 1 - .../anavi/knobs3/{info.json => keyboard.json} | 3 +- keyboards/anavi/knobs3/rules.mk | 1 - keyboards/ano/config.h | 38 ------------------ keyboards/ano/keyboard.json | 6 ++- keyboards/anomalykb/a65i/config.h | 24 ----------- keyboards/anomalykb/a65i/keyboard.json | 6 +++ keyboards/aos/tkl/config.h | 22 ---------- keyboards/aos/tkl/keyboard.json | 6 +++ .../rev1/{info.json => keyboard.json} | 7 ++++ keyboards/arabica37/rev1/rules.mk | 14 ------- .../{info.json => keyboard.json} | 4 +- .../argo_works/ishi/80/mk0_avr_extra/rules.mk | 2 - keyboards/arisu/config.h | 39 ------------------ keyboards/arisu/keyboard.json | 6 +++ keyboards/ash1800/config.h | 39 ------------------ keyboards/ash1800/keyboard.json | 6 +++ keyboards/ash_xiix/config.h | 19 --------- keyboards/ash_xiix/keyboard.json | 6 +++ keyboards/ask55/config.h | 23 ----------- keyboards/ask55/keyboard.json | 6 +++ keyboards/at_at/660m/config.h | 6 --- .../at_at/660m/{info.json => keyboard.json} | 17 +++++++- keyboards/at_at/660m/rules.mk | 14 ------- keyboards/atlantis/ak81_ve/config.h | 6 --- keyboards/atlantis/ak81_ve/keyboard.json | 6 +++ .../ps17/{info.json => keyboard.json} | 3 ++ keyboards/atlantis/ps17/rules.mk | 1 - keyboards/atlas_65/config.h | 38 ------------------ keyboards/atlas_65/keyboard.json | 6 +++ keyboards/atomic/config.h | 39 ------------------ keyboards/atomic/keyboard.json | 6 +++ .../atreus/f103/{info.json => keyboard.json} | 5 ++- keyboards/atreus/f103/rules.mk | 2 - keyboards/atreus/feather/info.json | 4 ++ keyboards/atreus/feather/rules.mk | 6 --- keyboards/atreus62/config.h | 39 ------------------ keyboards/atreus62/keyboard.json | 6 +++ keyboards/atreyu/info.json | 8 ++++ keyboards/atreyu/rev1/config.h | 38 ------------------ keyboards/atreyu/rev1/keyboard.json | 6 +++ keyboards/atreyu/rev2/config.h | 38 ------------------ keyboards/atreyu/rev2/keyboard.json | 6 +++ keyboards/atreyu/rules.mk | 15 ------- keyboards/atset/at1/config.h | 21 ---------- keyboards/atset/at1/keyboard.json | 6 +++ keyboards/atset/at12/config.h | 21 ---------- keyboards/atset/at12/keyboard.json | 6 +++ keyboards/atset/at16/config.h | 21 ---------- keyboards/atset/at16/keyboard.json | 6 +++ keyboards/atset/at3/config.h | 21 ---------- keyboards/atset/at3/keyboard.json | 6 +++ keyboards/atset/at6/config.h | 21 ---------- keyboards/atset/at6/keyboard.json | 6 +++ keyboards/atset/at9/config.h | 21 ---------- keyboards/atset/at9/keyboard.json | 6 +++ keyboards/atxkb/1894/config.h | 39 ------------------ keyboards/atxkb/1894/keyboard.json | 6 +++ keyboards/aurora65/info.json | 7 ++++ keyboards/aurora65/rules.mk | 13 ------ .../avalanche/v1/{info.json => keyboard.json} | 7 ++++ keyboards/avalanche/v1/rules.mk | 14 ------- .../avalanche/v2/{info.json => keyboard.json} | 9 +++++ keyboards/avalanche/v2/rules.mk | 15 ------- .../avalanche/v3/{info.json => keyboard.json} | 8 ++++ keyboards/avalanche/v3/rules.mk | 15 ------- .../avalanche/v4/{info.json => keyboard.json} | 9 +++++ keyboards/avalanche/v4/rules.mk | 16 -------- keyboards/aves60/config.h | 25 ------------ keyboards/aves60/keyboard.json | 6 +++ keyboards/aves65/config.h | 23 ----------- keyboards/aves65/keyboard.json | 6 +++ keyboards/axolstudio/helpo/info.json | 5 +++ keyboards/axolstudio/helpo/rules.mk | 13 ------ keyboards/aya/{info.json => keyboard.json} | 9 +++++ keyboards/aya/rules.mk | 13 ------ 239 files changed, 827 insertions(+), 2434 deletions(-) delete mode 100644 keyboards/abacus/config.h delete mode 100644 keyboards/abstract/ellipse/rev1/config.h delete mode 100644 keyboards/acekeyboard/titan60/config.h rename keyboards/acheron/apollo/87h/gamma/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/acheron/apollo/87h/gamma/rules.mk delete mode 100644 keyboards/acheron/arctic/config.h delete mode 100644 keyboards/acheron/elongate/beta/config.h delete mode 100644 keyboards/acheron/keebspcb/config.h delete mode 100644 keyboards/acheron/lasgweloth/config.h delete mode 100644 keyboards/ada/infinity81/config.h delete mode 100644 keyboards/adelheid/config.h delete mode 100644 keyboards/adkb96/rev1/config.h rename keyboards/adkb96/{info.json => rev1/keyboard.json} (95%) delete mode 100644 keyboards/adkb96/rev1/rules.mk delete mode 100644 keyboards/aeboards/aegis/config.h delete mode 100755 keyboards/aeboards/constellation/rev1/config.h rename keyboards/aeboards/constellation/rev1/{info.json => keyboard.json} (96%) delete mode 100755 keyboards/aeboards/constellation/rev1/rules.mk rename keyboards/aeboards/constellation/rev2/{info.json => keyboard.json} (97%) delete mode 100755 keyboards/aeboards/constellation/rev2/rules.mk delete mode 100755 keyboards/aeboards/constellation/rev3/config.h rename keyboards/aeboards/constellation/rev3/{info.json => keyboard.json} (96%) delete mode 100755 keyboards/aeboards/constellation/rev3/rules.mk rename keyboards/aeboards/ext65/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/aeboards/ext65/rev1/rules.mk rename keyboards/aeboards/ext65/rev2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/aeboards/ext65/rev2/rules.mk rename keyboards/afternoonlabs/breeze/rev0/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/afternoonlabs/breeze/rev0/rules.mk rename keyboards/afternoonlabs/breeze/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/afternoonlabs/breeze/rev1/rules.mk rename keyboards/afternoonlabs/oceanbreeze/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk rename keyboards/afternoonlabs/southern_breeze/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/afternoonlabs/southern_breeze/rev1/rules.mk rename keyboards/afternoonlabs/summer_breeze/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/afternoonlabs/summer_breeze/rev1/rules.mk delete mode 100644 keyboards/ai03/andromeda/config.h delete mode 100644 keyboards/ai03/equinox/config.h delete mode 100644 keyboards/ai03/jp60/config.h delete mode 100644 keyboards/ai03/lunar/config.h rename keyboards/ai03/orbit/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/ai03/orbit/rules.mk rename keyboards/ai03/orbit_x/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/ai03/orbit_x/rules.mk delete mode 100644 keyboards/ai03/polaris/config.h delete mode 100644 keyboards/ai03/quasar/config.h delete mode 100644 keyboards/ai03/soyuz/config.h delete mode 100644 keyboards/ai03/vega/config.h delete mode 100644 keyboards/akb/raine/config.h rename keyboards/akegata_denki/device_one/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/akegata_denki/device_one/rules.mk rename keyboards/aleblazer/zodiark/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/aleblazer/zodiark/rules.mk delete mode 100644 keyboards/alf/dc60/config.h delete mode 100644 keyboards/alf/x11/config.h delete mode 100644 keyboards/alf/x2/config.h delete mode 100644 keyboards/aliceh66/pianoforte/config.h delete mode 100644 keyboards/aliceh66/pianoforte_hs/config.h delete mode 100755 keyboards/alpha/config.h delete mode 100644 keyboards/alpine65/config.h delete mode 100644 keyboards/alps64/config.h rename keyboards/alt34/rev1/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/alt34/rev1/rules.mk delete mode 100644 keyboards/amag23/config.h delete mode 100755 keyboards/amjkeyboard/amj40/config.h delete mode 100644 keyboards/amjkeyboard/amj60/config.h delete mode 100644 keyboards/amjkeyboard/amj66/config.h delete mode 100644 keyboards/amjkeyboard/amj84/config.h delete mode 100644 keyboards/amjkeyboard/amjpad/config.h rename keyboards/anavi/knob1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/anavi/knob1/rules.mk rename keyboards/anavi/knobs3/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/anavi/knobs3/rules.mk delete mode 100644 keyboards/ano/config.h delete mode 100644 keyboards/anomalykb/a65i/config.h delete mode 100644 keyboards/aos/tkl/config.h rename keyboards/arabica37/rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/arabica37/rev1/rules.mk rename keyboards/argo_works/ishi/80/mk0_avr_extra/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk delete mode 100644 keyboards/arisu/config.h delete mode 100644 keyboards/ash1800/config.h delete mode 100644 keyboards/ash_xiix/config.h delete mode 100644 keyboards/ask55/config.h rename keyboards/at_at/660m/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/at_at/660m/rules.mk rename keyboards/atlantis/ps17/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/atlantis/ps17/rules.mk delete mode 100644 keyboards/atlas_65/config.h delete mode 100644 keyboards/atomic/config.h rename keyboards/atreus/f103/{info.json => keyboard.json} (73%) delete mode 100644 keyboards/atreus/f103/rules.mk delete mode 100644 keyboards/atreus62/config.h create mode 100644 keyboards/atreyu/info.json delete mode 100644 keyboards/atreyu/rev1/config.h delete mode 100644 keyboards/atreyu/rev2/config.h delete mode 100644 keyboards/atset/at1/config.h delete mode 100644 keyboards/atset/at12/config.h delete mode 100644 keyboards/atset/at16/config.h delete mode 100644 keyboards/atset/at3/config.h delete mode 100644 keyboards/atset/at6/config.h delete mode 100644 keyboards/atset/at9/config.h delete mode 100644 keyboards/atxkb/1894/config.h rename keyboards/avalanche/v1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/avalanche/v1/rules.mk rename keyboards/avalanche/v2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/avalanche/v2/rules.mk rename keyboards/avalanche/v3/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/avalanche/v3/rules.mk rename keyboards/avalanche/v4/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/avalanche/v4/rules.mk delete mode 100644 keyboards/aves60/config.h delete mode 100644 keyboards/aves65/config.h rename keyboards/aya/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/aya/rules.mk diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h deleted file mode 100644 index 84e1acbb3c7..00000000000 --- a/keyboards/abacus/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 nickolaij - -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/abacus/keyboard.json b/keyboards/abacus/keyboard.json index c34fb32c52f..9622089bbfb 100644 --- a/keyboards/abacus/keyboard.json +++ b/keyboards/abacus/keyboard.json @@ -22,6 +22,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "B5"], "rows": ["D3", "D2", "D4", "C6"] diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h deleted file mode 100644 index 81349657efa..00000000000 --- a/keyboards/abstract/ellipse/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 AbstractKB - -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/abstract/ellipse/rev1/keyboard.json b/keyboards/abstract/ellipse/rev1/keyboard.json index 31a17301a7a..8e38f29d56c 100644 --- a/keyboards/abstract/ellipse/rev1/keyboard.json +++ b/keyboards/abstract/ellipse/rev1/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "B6", "B5"], "rows": ["D3", "C7"] diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h deleted file mode 100644 index 2bcc184a309..00000000000 --- a/keyboards/acekeyboard/titan60/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 MechMerlin - -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 diff --git a/keyboards/acekeyboard/titan60/keyboard.json b/keyboards/acekeyboard/titan60/keyboard.json index 3111e1e9d7f..4446927ab8a 100644 --- a/keyboards/acekeyboard/titan60/keyboard.json +++ b/keyboards/acekeyboard/titan60/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "F0", "F1"] diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h index 17c09f0f576..cda883bd631 100644 --- a/keyboards/acheron/apollo/87h/delta/config.h +++ b/keyboards/acheron/apollo/87h/delta/config.h @@ -17,11 +17,6 @@ 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 EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE #define WS2812_PWM_COMPLEMENTARY_OUTPUT diff --git a/keyboards/acheron/apollo/87h/delta/keyboard.json b/keyboards/acheron/apollo/87h/delta/keyboard.json index c2d5e206923..5d01c1b8f77 100644 --- a/keyboards/acheron/apollo/87h/delta/keyboard.json +++ b/keyboards/acheron/apollo/87h/delta/keyboard.json @@ -68,6 +68,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h index 42b27d55ba9..8870c3c9c99 100644 --- a/keyboards/acheron/apollo/87h/gamma/config.h +++ b/keyboards/acheron/apollo/87h/gamma/config.h @@ -17,11 +17,6 @@ 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 EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE // RGB Matrix defines diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/keyboard.json similarity index 95% rename from keyboards/acheron/apollo/87h/gamma/info.json rename to keyboards/acheron/apollo/87h/gamma/keyboard.json index 150f838c89b..5c2087c968c 100644 --- a/keyboards/acheron/apollo/87h/gamma/info.json +++ b/keyboards/acheron/apollo/87h/gamma/keyboard.json @@ -2,7 +2,10 @@ "keyboard_name": "Apollo87H rev. Gamma", "usb": { "pid": "0x8774", - "device_version": "0.0.3" + "device_version": "0.0.3", + "shared_endpoint": { + "keyboard": true + } }, "rgb_matrix": { "animations": { @@ -57,6 +60,18 @@ "driver": "is31fl3741", "sleep": true }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "A15", "A10", "A8", "B14", "B12", "B10", "B1", "B0", "A7", "A4", "A5", "A6", "C15", "A0", "A1"], "rows": ["C14", "C13", "B9", "B4", "A3", "A2"] diff --git a/keyboards/acheron/apollo/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk deleted file mode 100644 index 4af646ec021..00000000000 --- a/keyboards/acheron/apollo/87h/gamma/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes -KEYBOARD_SHARED_EP = yes - diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h index 17c09f0f576..cda883bd631 100644 --- a/keyboards/acheron/apollo/87htsc/config.h +++ b/keyboards/acheron/apollo/87htsc/config.h @@ -17,11 +17,6 @@ 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 EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE #define WS2812_PWM_COMPLEMENTARY_OUTPUT diff --git a/keyboards/acheron/apollo/87htsc/keyboard.json b/keyboards/acheron/apollo/87htsc/keyboard.json index 5f7d30e65a3..55229706b1d 100644 --- a/keyboards/acheron/apollo/87htsc/keyboard.json +++ b/keyboards/acheron/apollo/87htsc/keyboard.json @@ -72,6 +72,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h index 17c09f0f576..cda883bd631 100644 --- a/keyboards/acheron/apollo/88htsc/config.h +++ b/keyboards/acheron/apollo/88htsc/config.h @@ -17,11 +17,6 @@ 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 EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE #define WS2812_PWM_COMPLEMENTARY_OUTPUT diff --git a/keyboards/acheron/apollo/88htsc/keyboard.json b/keyboards/acheron/apollo/88htsc/keyboard.json index e29300019ca..9b9482874f6 100644 --- a/keyboards/acheron/apollo/88htsc/keyboard.json +++ b/keyboards/acheron/apollo/88htsc/keyboard.json @@ -72,6 +72,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h deleted file mode 100644 index f608132b5af..00000000000 --- a/keyboards/acheron/arctic/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/acheron/arctic/keyboard.json b/keyboards/acheron/arctic/keyboard.json index e8c9e92f61c..cc686be5fa2 100644 --- a/keyboards/acheron/arctic/keyboard.json +++ b/keyboards/acheron/arctic/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8"], "rows": ["B7", "B6", "A6", "A7", "B1"] diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index c9f1d29f24b..b1264c3fa54 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 diff --git a/keyboards/acheron/athena/alpha/keyboard.json b/keyboards/acheron/athena/alpha/keyboard.json index 8570fa12748..7e29cdc0372 100644 --- a/keyboards/acheron/athena/alpha/keyboard.json +++ b/keyboards/acheron/athena/alpha/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A8", "B14", "B12", "B10", "B1", "B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A7", "B4", "B3", "A15"], "rows": ["B9", "C13", "B8", "B5", "A14", "C14"] diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index b2a8d2edf89..79add9aedcb 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define BACKLIGHT_PWM_DRIVER PWMD3 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+5 diff --git a/keyboards/acheron/athena/beta/keyboard.json b/keyboards/acheron/athena/beta/keyboard.json index 21aa189470e..ba96b201515 100644 --- a/keyboards/acheron/athena/beta/keyboard.json +++ b/keyboards/acheron/athena/beta/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "C6", "B14", "B12", "B10", "B1", "C4", "A7", "A6", "A5", "A4", "A3", "A2", "C5", "A10", "A8", "C9"], "rows": ["C11", "C12", "C10", "A15", "C0", "A1"] diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h index a47b76953a2..974ecf1c6c0 100644 --- a/keyboards/acheron/austin/config.h +++ b/keyboards/acheron/austin/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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. diff --git a/keyboards/acheron/austin/keyboard.json b/keyboards/acheron/austin/keyboard.json index 6c467a7da05..bee675472c9 100755 --- a/keyboards/acheron/austin/keyboard.json +++ b/keyboards/acheron/austin/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A5", "A15", "B3", "B4", "B5", "B8", "A3", "C15", "C14", "F1"], "rows": ["C13", "A4", "A7", "B0", "B1", "B2"] diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h deleted file mode 100644 index 62093e37b23..00000000000 --- a/keyboards/acheron/elongate/beta/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Gondolindrim - -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/acheron/elongate/beta/keyboard.json b/keyboards/acheron/elongate/beta/keyboard.json index 80c984caab6..d15f1789911 100644 --- a/keyboards/acheron/elongate/beta/keyboard.json +++ b/keyboards/acheron/elongate/beta/keyboard.json @@ -41,6 +41,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F4", "F1", "F0", "B2", "B1", "C6", "B0", "B3", "E6", "D4", "B4"], "rows": ["D3", "B7", "D5", "B5", "D6"] diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h index 81342ef26dc..09ccd741640 100755 --- a/keyboards/acheron/elongate/delta/config.h +++ b/keyboards/acheron/elongate/delta/config.h @@ -23,11 +23,6 @@ along with this program. If not, see . #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5) -/* 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 - // Elongate has six indicator LEDs. These def's are the indicator pin defs. The LEDs are distributed in two clusters: one next to the numpad and another between spacebars; LEDs are numbered top-to-bottom. #define LED1_PIN A2 diff --git a/keyboards/acheron/elongate/delta/keyboard.json b/keyboards/acheron/elongate/delta/keyboard.json index 33fc5b55ddd..1c6d0927d63 100644 --- a/keyboards/acheron/elongate/delta/keyboard.json +++ b/keyboards/acheron/elongate/delta/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B14", "B12", "B11", "B10", "B2", "B1", "A7", "A5", "B9", "B8", "B7", "B6"], "rows": ["B3", "A15", "B0", "B4", "B5"] diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h deleted file mode 100644 index 4b007cf387e..00000000000 --- a/keyboards/acheron/keebspcb/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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/acheron/keebspcb/keyboard.json b/keyboards/acheron/keebspcb/keyboard.json index 1017cf47ecf..a4815e10143 100644 --- a/keyboards/acheron/keebspcb/keyboard.json +++ b/keyboards/acheron/keebspcb/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B12", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B6", "B5"], "rows": ["B4", "B3", "A2", "A3", "A4"] diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h deleted file mode 100644 index f608132b5af..00000000000 --- a/keyboards/acheron/lasgweloth/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/acheron/lasgweloth/keyboard.json b/keyboards/acheron/lasgweloth/keyboard.json index ccdf9d6f302..35d30e89b26 100644 --- a/keyboards/acheron/lasgweloth/keyboard.json +++ b/keyboards/acheron/lasgweloth/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B12", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5", "A4", "B7"], "rows": ["B9", "B8", "A3", "B0", "B1"] diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index a34ea41cffb..0786a3ac0e6 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD3 -/* 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. diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json index 5250da47276..f88c312a255 100644 --- a/keyboards/acheron/shark/alpha/info.json +++ b/keyboards/acheron/shark/alpha/info.json @@ -6,6 +6,20 @@ "pid": "0x5368", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "encoder": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "B12", "A1", "A7", "A5", "A4", "A3", "A2", "A0", "C15", "C14", "C13"], "rows": ["B4", "A15", "B10", "B2"] diff --git a/keyboards/acheron/shark/alpha/rules.mk b/keyboards/acheron/shark/alpha/rules.mk index 27db06a0448..16051206467 100644 --- a/keyboards/acheron/shark/alpha/rules.mk +++ b/keyboards/acheron/shark/alpha/rules.mk @@ -1,17 +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 = 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 -ENCODER_ENABLE = yes - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index 1182d39d3b5..4e1b46d085c 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 diff --git a/keyboards/acheron/shark/beta/keyboard.json b/keyboards/acheron/shark/beta/keyboard.json index 7f182068a0d..2433f61fecf 100644 --- a/keyboards/acheron/shark/beta/keyboard.json +++ b/keyboards/acheron/shark/beta/keyboard.json @@ -15,6 +15,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A5", "A10", "C13", "B9", "B8", "B5", "B4", "B3", "A15", "A0", "A1", "A2"], "rows": ["A8", "B14", "A4", "A3"] diff --git a/keyboards/acheron/themis/87h/config.h b/keyboards/acheron/themis/87h/config.h index fb2a5e1ed7f..ebe7e5398a5 100644 --- a/keyboards/acheron/themis/87h/config.h +++ b/keyboards/acheron/themis/87h/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define WS2812_PWM_COMPLEMENTARY_OUTPUT #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 diff --git a/keyboards/acheron/themis/87h/keyboard.json b/keyboards/acheron/themis/87h/keyboard.json index ce2037bfade..488cb324c16 100644 --- a/keyboards/acheron/themis/87h/keyboard.json +++ b/keyboards/acheron/themis/87h/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "eeprom": { "wear_leveling": { diff --git a/keyboards/acheron/themis/87htsc/config.h b/keyboards/acheron/themis/87htsc/config.h index fb2a5e1ed7f..ebe7e5398a5 100644 --- a/keyboards/acheron/themis/87htsc/config.h +++ b/keyboards/acheron/themis/87htsc/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define WS2812_PWM_COMPLEMENTARY_OUTPUT #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 diff --git a/keyboards/acheron/themis/87htsc/keyboard.json b/keyboards/acheron/themis/87htsc/keyboard.json index eaf8a323abb..46cdb092475 100644 --- a/keyboards/acheron/themis/87htsc/keyboard.json +++ b/keyboards/acheron/themis/87htsc/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "eeprom": { "wear_leveling": { diff --git a/keyboards/acheron/themis/88htsc/config.h b/keyboards/acheron/themis/88htsc/config.h index fb2a5e1ed7f..ebe7e5398a5 100644 --- a/keyboards/acheron/themis/88htsc/config.h +++ b/keyboards/acheron/themis/88htsc/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define WS2812_PWM_COMPLEMENTARY_OUTPUT #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 diff --git a/keyboards/acheron/themis/88htsc/keyboard.json b/keyboards/acheron/themis/88htsc/keyboard.json index f8e65afbade..1e193d2661b 100644 --- a/keyboards/acheron/themis/88htsc/keyboard.json +++ b/keyboards/acheron/themis/88htsc/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "eeprom": { "wear_leveling": { diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h deleted file mode 100644 index 86415b251a0..00000000000 --- a/keyboards/ada/infinity81/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2022 peepeetee (@peepeetee) -// 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 - -/* - * 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/ada/infinity81/keyboard.json b/keyboards/ada/infinity81/keyboard.json index 934bd6fca2c..40c5bd2f180 100644 --- a/keyboards/ada/infinity81/keyboard.json +++ b/keyboards/ada/infinity81/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F1", "F4"], "rows": ["B3", "B2", "B1", "B0", "F6", "B7"] diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json index 295af783398..86601c0167f 100644 --- a/keyboards/adafruit/macropad/info.json +++ b/keyboards/adafruit/macropad/info.json @@ -8,6 +8,16 @@ "pid": "0x0108", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "audio": true, + "encoder": true, + "rgb_matrix": true, + "oled": true + }, "audio": { "power_control": { "pin": "GP14" diff --git a/keyboards/adafruit/macropad/rules.mk b/keyboards/adafruit/macropad/rules.mk index a84e29da3d1..1630b74ceae 100644 --- a/keyboards/adafruit/macropad/rules.mk +++ b/keyboards/adafruit/macropad/rules.mk @@ -1,17 +1,2 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output AUDIO_DRIVER = pwm_hardware -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes -OLED_ENABLE = yes OLED_TRANSPORT = spi diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/config.h deleted file mode 100644 index db23a531199..00000000000 --- a/keyboards/adelheid/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 floookay - -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/adelheid/keyboard.json b/keyboards/adelheid/keyboard.json index e066e5d5f18..7766a44a8d5 100644 --- a/keyboards/adelheid/keyboard.json +++ b/keyboards/adelheid/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "F6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "F4", "D1", "D2", "D3", "D5", "F7"] diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h deleted file mode 100644 index 0b8941e7760..00000000000 --- a/keyboards/adkb96/rev1/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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/adkb96/info.json b/keyboards/adkb96/rev1/keyboard.json similarity index 95% rename from keyboards/adkb96/info.json rename to keyboards/adkb96/rev1/keyboard.json index aa7e5a6921e..77f9177555a 100644 --- a/keyboards/adkb96/info.json +++ b/keyboards/adkb96/rev1/keyboard.json @@ -8,12 +8,26 @@ "pid": "0xAD96", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "tapping": { diff --git a/keyboards/adkb96/rev1/rules.mk b/keyboards/adkb96/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/adkb96/rules.mk b/keyboards/adkb96/rules.mk index 2b74eb41834..ac7561b21dd 100644 --- a/keyboards/adkb96/rules.mk +++ b/keyboards/adkb96/rules.mk @@ -1,16 +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 = yes # 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. - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = adkb96/rev1 diff --git a/keyboards/aeboards/aegis/config.h b/keyboards/aeboards/aegis/config.h deleted file mode 100644 index 8606067a4cf..00000000000 --- a/keyboards/aeboards/aegis/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/aeboards/aegis/keyboard.json b/keyboards/aeboards/aegis/keyboard.json index 26414ba55a3..26f5f2a0c1c 100644 --- a/keyboards/aeboards/aegis/keyboard.json +++ b/keyboards/aeboards/aegis/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "C6", "B7", "D2", "D3", "B3", "B2", "B1", "B0"], "rows": ["F5", "F6", "E6", "F7", "D1", "D0", "D6", "D4", "B4", "D7", "B6", "B5"] diff --git a/keyboards/aeboards/constellation/rev1/config.h b/keyboards/aeboards/constellation/rev1/config.h deleted file mode 100755 index 01155887a5e..00000000000 --- a/keyboards/aeboards/constellation/rev1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * Copyright 2021 Harrison Chan (Xelus) - * - * 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 diff --git a/keyboards/aeboards/constellation/rev1/info.json b/keyboards/aeboards/constellation/rev1/keyboard.json similarity index 96% rename from keyboards/aeboards/constellation/rev1/info.json rename to keyboards/aeboards/constellation/rev1/keyboard.json index 9001eec1c5e..5a43568d57c 100644 --- a/keyboards/aeboards/constellation/rev1/info.json +++ b/keyboards/aeboards/constellation/rev1/keyboard.json @@ -8,6 +8,23 @@ "pid": "0x065C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, + "build": { + "lto": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B0", "B1", "F0", "F1", "F4"] diff --git a/keyboards/aeboards/constellation/rev1/rules.mk b/keyboards/aeboards/constellation/rev1/rules.mk deleted file mode 100755 index bc5a3a3498a..00000000000 --- a/keyboards/aeboards/constellation/rev1/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/aeboards/constellation/rev2/config.h b/keyboards/aeboards/constellation/rev2/config.h index f4b7be6bdf7..2091bab964c 100755 --- a/keyboards/aeboards/constellation/rev2/config.h +++ b/keyboards/aeboards/constellation/rev2/config.h @@ -16,12 +16,6 @@ #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 - // I2C setup #define I2C1_SCL_PIN B8 #define I2C1_SDA_PIN B9 diff --git a/keyboards/aeboards/constellation/rev2/info.json b/keyboards/aeboards/constellation/rev2/keyboard.json similarity index 97% rename from keyboards/aeboards/constellation/rev2/info.json rename to keyboards/aeboards/constellation/rev2/keyboard.json index b8dae5f20cf..f296b523e0b 100644 --- a/keyboards/aeboards/constellation/rev2/info.json +++ b/keyboards/aeboards/constellation/rev2/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x065C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B12", "A1", "H0", "C15", "C14", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"], "rows": ["B15", "A14", "A2", "B13", "B14"] diff --git a/keyboards/aeboards/constellation/rev2/rules.mk b/keyboards/aeboards/constellation/rev2/rules.mk deleted file mode 100755 index c12086843f1..00000000000 --- a/keyboards/aeboards/constellation/rev2/rules.mk +++ /dev/null @@ -1,11 +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 = 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 diff --git a/keyboards/aeboards/constellation/rev3/config.h b/keyboards/aeboards/constellation/rev3/config.h deleted file mode 100755 index 01155887a5e..00000000000 --- a/keyboards/aeboards/constellation/rev3/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * Copyright 2021 Harrison Chan (Xelus) - * - * 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 diff --git a/keyboards/aeboards/constellation/rev3/info.json b/keyboards/aeboards/constellation/rev3/keyboard.json similarity index 96% rename from keyboards/aeboards/constellation/rev3/info.json rename to keyboards/aeboards/constellation/rev3/keyboard.json index 6e38e99fe91..ab39641b74b 100644 --- a/keyboards/aeboards/constellation/rev3/info.json +++ b/keyboards/aeboards/constellation/rev3/keyboard.json @@ -8,6 +8,23 @@ "pid": "0x065D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, + "build": { + "lto": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B0", "B1", "F0", "F1", "F4"] diff --git a/keyboards/aeboards/constellation/rev3/rules.mk b/keyboards/aeboards/constellation/rev3/rules.mk deleted file mode 100755 index bc5a3a3498a..00000000000 --- a/keyboards/aeboards/constellation/rev3/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/aeboards/ext65/rev1/info.json b/keyboards/aeboards/ext65/rev1/keyboard.json similarity index 97% rename from keyboards/aeboards/ext65/rev1/info.json rename to keyboards/aeboards/ext65/rev1/keyboard.json index 0e110e92357..c254a671421 100644 --- a/keyboards/aeboards/ext65/rev1/info.json +++ b/keyboards/aeboards/ext65/rev1/keyboard.json @@ -7,6 +7,12 @@ "pid": "0xAE65", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/aeboards/ext65/rev1/rules.mk b/keyboards/aeboards/ext65/rev1/rules.mk deleted file mode 100644 index 29eb5c8fbe8..00000000000 --- a/keyboards/aeboards/ext65/rev1/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/keyboard.json similarity index 96% rename from keyboards/aeboards/ext65/rev2/info.json rename to keyboards/aeboards/ext65/rev2/keyboard.json index ab229e19ec6..0ab50f92582 100644 --- a/keyboards/aeboards/ext65/rev2/info.json +++ b/keyboards/aeboards/ext65/rev2/keyboard.json @@ -7,6 +7,16 @@ "pid": "0xA652", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true, + "backlight": true, + "rgblight": true, + "sleep_led": true + }, "backlight": { "pin": "B5", "levels": 6, diff --git a/keyboards/aeboards/ext65/rev2/rules.mk b/keyboards/aeboards/ext65/rev2/rules.mk deleted file mode 100644 index b9637955ff7..00000000000 --- a/keyboards/aeboards/ext65/rev2/rules.mk +++ /dev/null @@ -1,14 +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 = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SLEEP_LED_ENABLE = yes - diff --git a/keyboards/aeboards/ext65/rev3/info.json b/keyboards/aeboards/ext65/rev3/info.json index 0faf6fa135a..8c8051fc444 100644 --- a/keyboards/aeboards/ext65/rev3/info.json +++ b/keyboards/aeboards/ext65/rev3/info.json @@ -7,6 +7,15 @@ "pid": "0xA653", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, + "build": { + "lto": true + }, "indicators": { "caps_lock": "F4", "num_lock": "F5", diff --git a/keyboards/aeboards/ext65/rev3/rules.mk b/keyboards/aeboards/ext65/rev3/rules.mk index f1ec6515067..1716098b3e1 100644 --- a/keyboards/aeboards/ext65/rev3/rules.mk +++ b/keyboards/aeboards/ext65/rev3/rules.mk @@ -1,13 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output OPT = 3 -LTO_ENABLE = yes diff --git a/keyboards/aeboards/satellite/rev1/info.json b/keyboards/aeboards/satellite/rev1/info.json index 68256ed8699..8b90704efa4 100644 --- a/keyboards/aeboards/satellite/rev1/info.json +++ b/keyboards/aeboards/satellite/rev1/info.json @@ -8,6 +8,16 @@ "pid": "0x6553", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/aeboards/satellite/rev1/rules.mk b/keyboards/aeboards/satellite/rev1/rules.mk index f95b0f015d7..7149ec106a1 100644 --- a/keyboards/aeboards/satellite/rev1/rules.mk +++ b/keyboards/aeboards/satellite/rev1/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 -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - -RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects. - COMMON_VPATH += $(DRIVER_PATH)/issi # project specific files diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/keyboard.json similarity index 96% rename from keyboards/afternoonlabs/breeze/rev0/info.json rename to keyboards/afternoonlabs/breeze/rev0/keyboard.json index 0afb37957fe..f20f082ec96 100644 --- a/keyboards/afternoonlabs/breeze/rev0/info.json +++ b/keyboards/afternoonlabs/breeze/rev0/keyboard.json @@ -8,12 +8,19 @@ "pid": "0x0001", "device_version": "0.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "console": true + }, "matrix_pins": { "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "bootmagic": { diff --git a/keyboards/afternoonlabs/breeze/rev0/rules.mk b/keyboards/afternoonlabs/breeze/rev0/rules.mk deleted file mode 100644 index 7b63c0c2988..00000000000 --- a/keyboards/afternoonlabs/breeze/rev0/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/keyboard.json similarity index 96% rename from keyboards/afternoonlabs/breeze/rev1/info.json rename to keyboards/afternoonlabs/breeze/rev1/keyboard.json index 21b6a7a4364..ccb13551c10 100644 --- a/keyboards/afternoonlabs/breeze/rev1/info.json +++ b/keyboards/afternoonlabs/breeze/rev1/keyboard.json @@ -8,12 +8,19 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true + }, "matrix_pins": { "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "bootmagic": { diff --git a/keyboards/afternoonlabs/breeze/rev1/rules.mk b/keyboards/afternoonlabs/breeze/rev1/rules.mk deleted file mode 100644 index 151c93f7796..00000000000 --- a/keyboards/afternoonlabs/breeze/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -SPLIT_KEYBOARD = yes -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 diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/keyboard.json similarity index 96% rename from keyboards/afternoonlabs/oceanbreeze/rev1/info.json rename to keyboards/afternoonlabs/oceanbreeze/rev1/keyboard.json index 44f7fa7006a..2a80a0bc2bd 100644 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json +++ b/keyboards/afternoonlabs/oceanbreeze/rev1/keyboard.json @@ -8,12 +8,19 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true + }, "matrix_pins": { "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1", "B6"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "bootmagic": { diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk b/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk deleted file mode 100644 index 904c6b60cbd..00000000000 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/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 -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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/keyboard.json similarity index 96% rename from keyboards/afternoonlabs/southern_breeze/rev1/info.json rename to keyboards/afternoonlabs/southern_breeze/rev1/keyboard.json index c71feef8ba0..c4d38a7a69e 100644 --- a/keyboards/afternoonlabs/southern_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/southern_breeze/rev1/keyboard.json @@ -8,12 +8,19 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "console": true + }, "matrix_pins": { "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "bootmagic": { diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk b/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk deleted file mode 100644 index 7b63c0c2988..00000000000 --- a/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/info.json b/keyboards/afternoonlabs/summer_breeze/rev1/keyboard.json similarity index 97% rename from keyboards/afternoonlabs/summer_breeze/rev1/info.json rename to keyboards/afternoonlabs/summer_breeze/rev1/keyboard.json index 4ec3db219cd..702a942a3cf 100644 --- a/keyboards/afternoonlabs/summer_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/summer_breeze/rev1/keyboard.json @@ -8,12 +8,19 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "console": true + }, "matrix_pins": { "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "bootmagic": { diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk b/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk deleted file mode 100644 index 7b63c0c2988..00000000000 --- a/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/ai03/andromeda/config.h b/keyboards/ai03/andromeda/config.h deleted file mode 100644 index 056f54d5212..00000000000 --- a/keyboards/ai03/andromeda/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Andrew Kannan - -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 diff --git a/keyboards/ai03/andromeda/keyboard.json b/keyboards/ai03/andromeda/keyboard.json index 5a9bf32ef15..d085b91ad17 100644 --- a/keyboards/ai03/andromeda/keyboard.json +++ b/keyboards/ai03/andromeda/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "B5", "B8", "B9"], "rows": ["B4", "B3", "A15", "A3", "A4", "A5"] diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/ai03/equinox/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -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/ai03/equinox/info.json b/keyboards/ai03/equinox/info.json index 2912f0c1d83..7c2cc465005 100644 --- a/keyboards/ai03/equinox/info.json +++ b/keyboards/ai03/equinox/info.json @@ -8,6 +8,12 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h deleted file mode 100644 index 9fe6627ecc1..00000000000 --- a/keyboards/ai03/jp60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 ai03 - -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/ai03/jp60/keyboard.json b/keyboards/ai03/jp60/keyboard.json index bc366e60e50..389993626d8 100644 --- a/keyboards/ai03/jp60/keyboard.json +++ b/keyboards/ai03/jp60/keyboard.json @@ -19,6 +19,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D1", "D3", "D5", "D4", "D6", "C6", "F0", "F1", "F4", "F5", "F6", "F7", "C7"], "rows": ["B6", "B5", "B4", "D7", "E6"] diff --git a/keyboards/ai03/lunar/config.h b/keyboards/ai03/lunar/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/ai03/lunar/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -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/ai03/lunar/keyboard.json b/keyboards/ai03/lunar/keyboard.json index 8a5bc145765..00ff761d3f8 100644 --- a/keyboards/ai03/lunar/keyboard.json +++ b/keyboards/ai03/lunar/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B3", "D0", "D1", "D2", "D3"] diff --git a/keyboards/ai03/lunar_ii/config.h b/keyboards/ai03/lunar_ii/config.h index 1b02059356a..07dde6cb899 100644 --- a/keyboards/ai03/lunar_ii/config.h +++ b/keyboards/ai03/lunar_ii/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -/* Mechanical lock switch support */ -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - /* Solenoid support */ #define SOLENOID_PIN B7 #define SOLENOID_DEFAULT_DWELL 15 diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/info.json index ee7f1527586..38729595a29 100644 --- a/keyboards/ai03/lunar_ii/info.json +++ b/keyboards/ai03/lunar_ii/info.json @@ -8,6 +8,20 @@ "pid": "0x0016", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true, + "haptic": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/ai03/lunar_ii/rules.mk b/keyboards/ai03/lunar_ii/rules.mk index 7ad594e1f9f..a521203b326 100644 --- a/keyboards/ai03/lunar_ii/rules.mk +++ b/keyboards/ai03/lunar_ii/rules.mk @@ -1,15 +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 = 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 - -HAPTIC_ENABLE = yes # Enable solenoid support HAPTIC_DRIVER = solenoid diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h index 53a057875f9..f3a4ae2db34 100644 --- a/keyboards/ai03/orbit/config.h +++ b/keyboards/ai03/orbit/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D5 -/* 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. diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/keyboard.json similarity index 94% rename from keyboards/ai03/orbit/info.json rename to keyboards/ai03/orbit/keyboard.json index d7ff0b786cc..ec308028120 100644 --- a/keyboards/ai03/orbit/info.json +++ b/keyboards/ai03/orbit/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0003", "device_version": "0.0.3" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "B4", "D7", "D6", "D4", "F1", "F0"], "rows": ["F7", "F6", "F5", "F4", "D3"] @@ -17,6 +30,7 @@ "pin": "B7" }, "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { diff --git a/keyboards/ai03/orbit/rules.mk b/keyboards/ai03/orbit/rules.mk deleted file mode 100644 index c95da2740d8..00000000000 --- a/keyboards/ai03/orbit/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 -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 -SPLIT_KEYBOARD = yes # Split keyboard flag disabled as manual edits had to be done to the split common files diff --git a/keyboards/ai03/orbit_x/config.h b/keyboards/ai03/orbit_x/config.h index 05d319d030a..2c63852cbeb 100644 --- a/keyboards/ai03/orbit_x/config.h +++ b/keyboards/ai03/orbit_x/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define SPLIT_USB_DETECT #define SPLIT_USB_TIMEOUT 2500 -/* 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. diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/keyboard.json similarity index 92% rename from keyboards/ai03/orbit_x/info.json rename to keyboards/ai03/orbit_x/keyboard.json index ebb11624fe2..edfbbb27969 100644 --- a/keyboards/ai03/orbit_x/info.json +++ b/keyboards/ai03/orbit_x/keyboard.json @@ -8,12 +8,26 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F6", "B1", "B0", "C7", "C6"], "rows": ["D7", "D6", "D4", "F0"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { diff --git a/keyboards/ai03/orbit_x/rules.mk b/keyboards/ai03/orbit_x/rules.mk deleted file mode 100644 index 66711e46132..00000000000 --- a/keyboards/ai03/orbit_x/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 -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 -SPLIT_KEYBOARD = yes # Split keyboard diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/ai03/polaris/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -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/ai03/polaris/keyboard.json b/keyboards/ai03/polaris/keyboard.json index 169118a0cf6..decedbab3df 100644 --- a/keyboards/ai03/polaris/keyboard.json +++ b/keyboards/ai03/polaris/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "F0", "F1"] diff --git a/keyboards/ai03/quasar/config.h b/keyboards/ai03/quasar/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/ai03/quasar/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -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/ai03/quasar/keyboard.json b/keyboards/ai03/quasar/keyboard.json index b0514f9e9aa..52902e3067a 100644 --- a/keyboards/ai03/quasar/keyboard.json +++ b/keyboards/ai03/quasar/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4"], "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"] diff --git a/keyboards/ai03/soyuz/config.h b/keyboards/ai03/soyuz/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/ai03/soyuz/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -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/ai03/soyuz/keyboard.json b/keyboards/ai03/soyuz/keyboard.json index 61e8375dd18..2abfbd5ead5 100644 --- a/keyboards/ai03/soyuz/keyboard.json +++ b/keyboards/ai03/soyuz/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "B3", "D7", "B5"], "rows": ["D4", "C6", "B6", "E6", "B4"] diff --git a/keyboards/ai03/vega/config.h b/keyboards/ai03/vega/config.h deleted file mode 100644 index b575a49f388..00000000000 --- a/keyboards/ai03/vega/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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/ai03/vega/keyboard.json b/keyboards/ai03/vega/keyboard.json index 64eaf5eadd7..a58fa4fcaef 100644 --- a/keyboards/ai03/vega/keyboard.json +++ b/keyboards/ai03/vega/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6"], "rows": ["A1", "A2", "B3", "A15", "A10"] diff --git a/keyboards/akb/raine/config.h b/keyboards/akb/raine/config.h deleted file mode 100644 index 4ffa418a091..00000000000 --- a/keyboards/akb/raine/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2019 Elliot Powell - -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 diff --git a/keyboards/akb/raine/keyboard.json b/keyboards/akb/raine/keyboard.json index f3631068fd5..a8e841637ab 100644 --- a/keyboards/akb/raine/keyboard.json +++ b/keyboards/akb/raine/keyboard.json @@ -15,6 +15,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "B1", "F1", "F0", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"], "rows": ["E6", "C6", "F7", "B2", "B0"] diff --git a/keyboards/akegata_denki/device_one/info.json b/keyboards/akegata_denki/device_one/keyboard.json similarity index 99% rename from keyboards/akegata_denki/device_one/info.json rename to keyboards/akegata_denki/device_one/keyboard.json index e1e69e2510e..b85f186ad6f 100644 --- a/keyboards/akegata_denki/device_one/info.json +++ b/keyboards/akegata_denki/device_one/keyboard.json @@ -7,6 +7,12 @@ "pid": "0xADD0", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "nkro": true + }, "matrix_pins": { "cols": ["A2", "A3", "A4", "A5", "A6", "A7", "A1", "A10", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], "rows": ["B1", "B0", "A9", "A8", "A0"] diff --git a/keyboards/akegata_denki/device_one/rules.mk b/keyboards/akegata_denki/device_one/rules.mk deleted file mode 100644 index ecb62658826..00000000000 --- a/keyboards/akegata_denki/device_one/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = no -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 diff --git a/keyboards/akko/5087/config.h b/keyboards/akko/5087/config.h index ceb98727385..888dfa6f800 100644 --- a/keyboards/akko/5087/config.h +++ b/keyboards/akko/5087/config.h @@ -20,11 +20,6 @@ #define LED_MAC_OS_PIN C10 #define LED_WIN_LOCK_PIN C11 -/* 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 - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/akko/5087/keyboard.json b/keyboards/akko/5087/keyboard.json index 67ea54c169b..a2f72351ed6 100644 --- a/keyboards/akko/5087/keyboard.json +++ b/keyboards/akko/5087/keyboard.json @@ -21,6 +21,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "dynamic_keymap": { "layer_count": 6 }, diff --git a/keyboards/akko/5108/config.h b/keyboards/akko/5108/config.h index 6a509733d6a..f3d8ed4d67a 100644 --- a/keyboards/akko/5108/config.h +++ b/keyboards/akko/5108/config.h @@ -19,11 +19,6 @@ /* LED Indicators */ #define LED_WIN_LOCK_PIN C11 -/* 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 - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/akko/5108/keyboard.json b/keyboards/akko/5108/keyboard.json index 5e97d151c34..e98e421089b 100644 --- a/keyboards/akko/5108/keyboard.json +++ b/keyboards/akko/5108/keyboard.json @@ -21,6 +21,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": [ "C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14"], "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] diff --git a/keyboards/akko/acr87/config.h b/keyboards/akko/acr87/config.h index cdc4b6011a3..dc309c4a41b 100644 --- a/keyboards/akko/acr87/config.h +++ b/keyboards/akko/acr87/config.h @@ -16,11 +16,6 @@ #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 - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/akko/acr87/keyboard.json b/keyboards/akko/acr87/keyboard.json index 2702ee79152..9f37a91b9a8 100644 --- a/keyboards/akko/acr87/keyboard.json +++ b/keyboards/akko/acr87/keyboard.json @@ -21,6 +21,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": [ "C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10"], "rows": [ "B15", "C6", "C7", "C8", "C9", "A8"] diff --git a/keyboards/akko/top40/config.h b/keyboards/akko/top40/config.h index a23cf6db922..7924ae32148 100644 --- a/keyboards/akko/top40/config.h +++ b/keyboards/akko/top40/config.h @@ -16,11 +16,6 @@ #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 - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/akko/top40/keyboard.json b/keyboards/akko/top40/keyboard.json index 183c9242f4e..fd7cf497e75 100644 --- a/keyboards/akko/top40/keyboard.json +++ b/keyboards/akko/top40/keyboard.json @@ -21,6 +21,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4"], "rows": ["C7", "C8", "C9", "A8"] diff --git a/keyboards/al1/config.h b/keyboards/al1/config.h index 32c7bcbd2a8..e864567cec7 100644 --- a/keyboards/al1/config.h +++ b/keyboards/al1/config.h @@ -27,11 +27,6 @@ along with this program. If not, see . #define SN74X154_ADDRESS_PINS { D4, D5, D6, D7 } #define SN74X154_E1_PIN D3 -/* 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. diff --git a/keyboards/al1/info.json b/keyboards/al1/info.json index 6051163dc73..7e6440560ff 100644 --- a/keyboards/al1/info.json +++ b/keyboards/al1/info.json @@ -8,6 +8,20 @@ "pid": "0x6050", "device_version": "1.0.4" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "backlight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "B6", "breathing": true diff --git a/keyboards/al1/rules.mk b/keyboards/al1/rules.mk index ca917bc5480..73713d8a3f8 100644 --- a/keyboards/al1/rules.mk +++ b/keyboards/al1/rules.mk @@ -1,16 +1,3 @@ -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite VPATH += drivers/gpio SRC += matrix.c sn74x154.c diff --git a/keyboards/alas/info.json b/keyboards/alas/info.json index 5c5e29f5956..b5617189dec 100755 --- a/keyboards/alas/info.json +++ b/keyboards/alas/info.json @@ -8,6 +8,12 @@ "pid": "0x414C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "indicators": { "caps_lock": "B6", "on_state": 0 @@ -19,6 +25,7 @@ "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_tsangan_hhkb"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/alas/rules.mk b/keyboards/alas/rules.mk index 916e1bf9bb7..0ab54aaaf71 100644 --- a/keyboards/alas/rules.mk +++ b/keyboards/alas/rules.mk @@ -1,17 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 - -LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_ansi_tsangan 60_iso 60_iso_split_bs_rshift 60_iso_tsangan 60_tsangan_hhkb diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/keyboard.json similarity index 96% rename from keyboards/aleblazer/zodiark/info.json rename to keyboards/aleblazer/zodiark/keyboard.json index a66b5188b60..9f77049dee1 100644 --- a/keyboards/aleblazer/zodiark/info.json +++ b/keyboards/aleblazer/zodiark/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xF902", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "oled": true, + "encoder": true + }, + "build": { + "lto": true + }, "ws2812": { "pin": "B5" }, @@ -49,6 +59,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D3", "encoder": { "right": { diff --git a/keyboards/aleblazer/zodiark/rules.mk b/keyboards/aleblazer/zodiark/rules.mk deleted file mode 100644 index 8fc2f2ff256..00000000000 --- a/keyboards/aleblazer/zodiark/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -ENCODER_ENABLE = yes -SPLIT_KEYBOARD = yes -LTO_ENABLE = yes diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h deleted file mode 100644 index d876570c808..00000000000 --- a/keyboards/alf/dc60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 MechMerlin - -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/alf/dc60/keyboard.json b/keyboards/alf/dc60/keyboard.json index 7fd360d726a..ea04748f847 100644 --- a/keyboards/alf/dc60/keyboard.json +++ b/keyboards/alf/dc60/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h deleted file mode 100644 index b5b661bef2a..00000000000 --- a/keyboards/alf/x11/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 MechMerlin - -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/alf/x11/keyboard.json b/keyboards/alf/x11/keyboard.json index 03abfc2dbed..c571705dc10 100644 --- a/keyboards/alf/x11/keyboard.json +++ b/keyboards/alf/x11/keyboard.json @@ -21,6 +21,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"] diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h deleted file mode 100644 index 02460e0beda..00000000000 --- a/keyboards/alf/x2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2018-2021 @fixed, MechMerlin, 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 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 diff --git a/keyboards/alf/x2/keyboard.json b/keyboards/alf/x2/keyboard.json index fe700979327..9dd011c7f1c 100644 --- a/keyboards/alf/x2/keyboard.json +++ b/keyboards/alf/x2/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/aliceh66/pianoforte/config.h b/keyboards/aliceh66/pianoforte/config.h deleted file mode 100644 index ff87862693a..00000000000 --- a/keyboards/aliceh66/pianoforte/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 AliceH - -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 diff --git a/keyboards/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/info.json index 6cc2546794c..b732b02db25 100644 --- a/keyboards/aliceh66/pianoforte/info.json +++ b/keyboards/aliceh66/pianoforte/info.json @@ -8,6 +8,21 @@ "pid": "0x7066", "vid": "0x6168" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true + }, + "build": { + "lto": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "F1", "F0", "E6", "B6"], "rows": ["D1", "D0", "D3", "D2", "D5", "B0", "C6", "C7", "F6", "F7", "F5", "F4"] diff --git a/keyboards/aliceh66/pianoforte/rules.mk b/keyboards/aliceh66/pianoforte/rules.mk index 2f9cd4eea95..4b54462335d 100644 --- a/keyboards/aliceh66/pianoforte/rules.mk +++ b/keyboards/aliceh66/pianoforte/rules.mk @@ -1,16 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/aliceh66/pianoforte_hs/config.h b/keyboards/aliceh66/pianoforte_hs/config.h deleted file mode 100644 index ff87862693a..00000000000 --- a/keyboards/aliceh66/pianoforte_hs/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 AliceH - -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 diff --git a/keyboards/aliceh66/pianoforte_hs/info.json b/keyboards/aliceh66/pianoforte_hs/info.json index 7366e961c1f..ff73a00ea85 100644 --- a/keyboards/aliceh66/pianoforte_hs/info.json +++ b/keyboards/aliceh66/pianoforte_hs/info.json @@ -8,6 +8,21 @@ "pid": "0x7068", "vid": "0x6168" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true + }, + "build": { + "lto": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5", "B6", "F6", "F5", "E6", "D4"], "rows": ["D2", "D1", "D3", "D0", "D5", "B0", "F0", "F1", "F7", "F4", "C7", "C6"] diff --git a/keyboards/aliceh66/pianoforte_hs/rules.mk b/keyboards/aliceh66/pianoforte_hs/rules.mk index 3488ea0dd24..4b54462335d 100644 --- a/keyboards/aliceh66/pianoforte_hs/rules.mk +++ b/keyboards/aliceh66/pianoforte_hs/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 = 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 keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h deleted file mode 100755 index 5f360813239..00000000000 --- a/keyboards/alpha/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/alpha/keyboard.json b/keyboards/alpha/keyboard.json index f708ad2b9f5..1cb2fe71cd2 100644 --- a/keyboards/alpha/keyboard.json +++ b/keyboards/alpha/keyboard.json @@ -36,6 +36,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], "rows": ["D4", "B4", "B5"] diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h deleted file mode 100644 index f608132b5af..00000000000 --- a/keyboards/alpine65/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/alpine65/keyboard.json b/keyboards/alpine65/keyboard.json index 4fccb3c564e..36bba880a8f 100644 --- a/keyboards/alpine65/keyboard.json +++ b/keyboards/alpine65/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A9", "A8", "B14", "B12", "A10", "A0", "A1"], "rows": ["C14", "C15", "C13", "A2", "A3"] diff --git a/keyboards/alps64/config.h b/keyboards/alps64/config.h deleted file mode 100644 index 4b007cf387e..00000000000 --- a/keyboards/alps64/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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/alps64/keyboard.json b/keyboards/alps64/keyboard.json index 72f21d0c33d..a6a60478f81 100644 --- a/keyboards/alps64/keyboard.json +++ b/keyboards/alps64/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"], "rows": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2"] diff --git a/keyboards/alt34/rev1/config.h b/keyboards/alt34/rev1/config.h index ffff9dc8c6f..9dd9e9bdde5 100644 --- a/keyboards/alt34/rev1/config.h +++ b/keyboards/alt34/rev1/config.h @@ -17,11 +17,6 @@ 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 USE_I2C /* Select hand configuration */ diff --git a/keyboards/alt34/rev1/info.json b/keyboards/alt34/rev1/keyboard.json similarity index 90% rename from keyboards/alt34/rev1/info.json rename to keyboards/alt34/rev1/keyboard.json index cf90324c142..712dd72943b 100644 --- a/keyboards/alt34/rev1/info.json +++ b/keyboards/alt34/rev1/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "split": { + "enabled": true + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/alt34/rev1/rules.mk b/keyboards/alt34/rev1/rules.mk deleted file mode 100644 index 99541b285bd..00000000000 --- a/keyboards/alt34/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change to "no" to disable the options -# -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 - -SPLIT_KEYBOARD = yes diff --git a/keyboards/amag23/config.h b/keyboards/amag23/config.h deleted file mode 100644 index cdad6969cbc..00000000000 --- a/keyboards/amag23/config.h +++ /dev/null @@ -1,21 +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 diff --git a/keyboards/amag23/keyboard.json b/keyboards/amag23/keyboard.json index ed37a36e548..e3eb16cdad5 100644 --- a/keyboards/amag23/keyboard.json +++ b/keyboards/amag23/keyboard.json @@ -37,6 +37,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B4", "B5"], "rows": ["A0", "A1", "A2", "A3"] diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h deleted file mode 100755 index b9449c4714b..00000000000 --- a/keyboards/amjkeyboard/amj40/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/amjkeyboard/amj40/keyboard.json b/keyboards/amjkeyboard/amj40/keyboard.json index 8ce166728ca..de536cb55e4 100644 --- a/keyboards/amjkeyboard/amj40/keyboard.json +++ b/keyboards/amjkeyboard/amj40/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/amjkeyboard/amj60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/amjkeyboard/amj60/keyboard.json b/keyboards/amjkeyboard/amj60/keyboard.json index 0b65c742aa4..5ab353675a7 100644 --- a/keyboards/amjkeyboard/amj60/keyboard.json +++ b/keyboards/amjkeyboard/amj60/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["F7", "F6", "F5", "F4", "D5"] diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h deleted file mode 100644 index b48aca77700..00000000000 --- a/keyboards/amjkeyboard/amj66/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2018 Alex Peters - -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 diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/info.json index 07a170a3f6a..72646e4fc71 100644 --- a/keyboards/amjkeyboard/amj66/info.json +++ b/keyboards/amjkeyboard/amj66/info.json @@ -8,6 +8,20 @@ "pid": "0xBD66", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "backlight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5", "B6"], "rows": ["F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/amjkeyboard/amj66/rules.mk b/keyboards/amjkeyboard/amj66/rules.mk index cb4a880111b..09057bea54b 100644 --- a/keyboards/amjkeyboard/amj66/rules.mk +++ b/keyboards/amjkeyboard/amj66/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 = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h deleted file mode 100644 index 86415b251a0..00000000000 --- a/keyboards/amjkeyboard/amj84/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2022 peepeetee (@peepeetee) -// 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 - -/* - * 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/amjkeyboard/amj84/keyboard.json b/keyboards/amjkeyboard/amj84/keyboard.json index 217b685391f..b544ffc8b3c 100644 --- a/keyboards/amjkeyboard/amj84/keyboard.json +++ b/keyboards/amjkeyboard/amj84/keyboard.json @@ -18,6 +18,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "D1"], "rows": ["D0", "F7", "F6", "F5", "F4", "D5"] diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h index b16c84d50eb..81cbb4a5e0b 100644 --- a/keyboards/amjkeyboard/amj96/config.h +++ b/keyboards/amjkeyboard/amj96/config.h @@ -36,11 +36,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* 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. diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json index 60cb8ee9e83..23a131c6150 100644 --- a/keyboards/amjkeyboard/amj96/info.json +++ b/keyboards/amjkeyboard/amj96/info.json @@ -8,6 +8,20 @@ "pid": "0x6074", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "led_count": 16, "animations": { diff --git a/keyboards/amjkeyboard/amj96/rules.mk b/keyboards/amjkeyboard/amj96/rules.mk index dfe1d12b556..8784813b335 100644 --- a/keyboards/amjkeyboard/amj96/rules.mk +++ b/keyboards/amjkeyboard/amj96/rules.mk @@ -1,15 +1,2 @@ -# 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 = 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 SRC += matrix.c diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/amjkeyboard/amjpad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/amjkeyboard/amjpad/keyboard.json b/keyboards/amjkeyboard/amjpad/keyboard.json index bd960d8c8ab..e331f3af191 100644 --- a/keyboards/amjkeyboard/amjpad/keyboard.json +++ b/keyboards/amjkeyboard/amjpad/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "E6", "C7"], "rows": ["F7", "F6", "F5", "F4", "D5", "D0"] diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/keyboard.json similarity index 96% rename from keyboards/anavi/knob1/info.json rename to keyboards/anavi/knob1/keyboard.json index 551d059badf..9c4c60640ee 100644 --- a/keyboards/anavi/knob1/info.json +++ b/keyboards/anavi/knob1/keyboard.json @@ -12,7 +12,8 @@ "extrakey": true, "mousekey": false, "nkro": true, - "rgblight": true + "rgblight": true, + "oled": true }, "rgblight": { "led_count": 1, diff --git a/keyboards/anavi/knob1/rules.mk b/keyboards/anavi/knob1/rules.mk deleted file mode 100644 index dd68e9d3b09..00000000000 --- a/keyboards/anavi/knob1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = yes diff --git a/keyboards/anavi/knobs3/info.json b/keyboards/anavi/knobs3/keyboard.json similarity index 97% rename from keyboards/anavi/knobs3/info.json rename to keyboards/anavi/knobs3/keyboard.json index ad51b7ce6ca..11081ee0863 100644 --- a/keyboards/anavi/knobs3/info.json +++ b/keyboards/anavi/knobs3/keyboard.json @@ -17,7 +17,8 @@ "extrakey": true, "mousekey": false, "nkro": true, - "rgblight": true + "rgblight": true, + "oled": true }, "rgblight": { "led_count": 1, diff --git a/keyboards/anavi/knobs3/rules.mk b/keyboards/anavi/knobs3/rules.mk deleted file mode 100644 index dd68e9d3b09..00000000000 --- a/keyboards/anavi/knobs3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = yes diff --git a/keyboards/ano/config.h b/keyboards/ano/config.h deleted file mode 100644 index fff04f05b3c..00000000000 --- a/keyboards/ano/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 Sebastien Sauve-Hoover (@sauvehoo) - * - * 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/ano/keyboard.json b/keyboards/ano/keyboard.json index c522f816ce5..e676ce72707 100644 --- a/keyboards/ano/keyboard.json +++ b/keyboards/ano/keyboard.json @@ -28,7 +28,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "processor": "STM32F303", "bootloader": "stm32-dfu", diff --git a/keyboards/anomalykb/a65i/config.h b/keyboards/anomalykb/a65i/config.h deleted file mode 100644 index 947f85bbb2b..00000000000 --- a/keyboards/anomalykb/a65i/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Lfgberg - -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 diff --git a/keyboards/anomalykb/a65i/keyboard.json b/keyboards/anomalykb/a65i/keyboard.json index 98015fcd72b..8fadaadadb2 100644 --- a/keyboards/anomalykb/a65i/keyboard.json +++ b/keyboards/anomalykb/a65i/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "D6", "D4", "B4", "B6", "E6", "F1", "B7", "C6", "C7", "D5", "D3", "D2", "F0", "D1", "D0"], "rows": ["B3", "B2", "B1", "B0", "B5"] diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h deleted file mode 100644 index 66790ac3d39..00000000000 --- a/keyboards/aos/tkl/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 aholland909 - -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 - -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/aos/tkl/keyboard.json b/keyboards/aos/tkl/keyboard.json index 730a262366a..8cd47a44a54 100644 --- a/keyboards/aos/tkl/keyboard.json +++ b/keyboards/aos/tkl/keyboard.json @@ -37,6 +37,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"], "rows": ["D3", "D2", "B7", "F1", "C7", "D5"] diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/keyboard.json similarity index 95% rename from keyboards/arabica37/rev1/info.json rename to keyboards/arabica37/rev1/keyboard.json index 14d0c01cb9e..710a377ab9a 100644 --- a/keyboards/arabica37/rev1/info.json +++ b/keyboards/arabica37/rev1/keyboard.json @@ -8,12 +8,19 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/arabica37/rev1/rules.mk b/keyboards/arabica37/rev1/rules.mk deleted file mode 100644 index 822a7cf01cb..00000000000 --- a/keyboards/arabica37/rev1/rules.mk +++ /dev/null @@ -1,14 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json b/keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json similarity index 98% rename from keyboards/argo_works/ishi/80/mk0_avr_extra/info.json rename to keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json index eeeb33f236f..89b9b1994f2 100644 --- a/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json +++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json @@ -21,7 +21,9 @@ "extrakey": true, "mousekey": true, "nkro": true, - "encoder": true + "encoder": true, + "oled": true, + "wpm": true }, "matrix_pins": { "cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"], diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk deleted file mode 100644 index 76e55c05f48..00000000000 --- a/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/arisu/config.h b/keyboards/arisu/config.h deleted file mode 100644 index 3cf449a32bf..00000000000 --- a/keyboards/arisu/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Fate - -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/arisu/keyboard.json b/keyboards/arisu/keyboard.json index af1cb819dc9..43bb668b990 100644 --- a/keyboards/arisu/keyboard.json +++ b/keyboards/arisu/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/ash1800/config.h b/keyboards/ash1800/config.h deleted file mode 100644 index 75e72d0e22a..00000000000 --- a/keyboards/ash1800/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 angelbirth - -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/ash1800/keyboard.json b/keyboards/ash1800/keyboard.json index 9e60de6b343..c2244a7ad70 100644 --- a/keyboards/ash1800/keyboard.json +++ b/keyboards/ash1800/keyboard.json @@ -21,6 +21,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"], "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"] diff --git a/keyboards/ash_xiix/config.h b/keyboards/ash_xiix/config.h deleted file mode 100644 index 08dd2458c88..00000000000 --- a/keyboards/ash_xiix/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2020 sh_xguitar -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 -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/ash_xiix/keyboard.json b/keyboards/ash_xiix/keyboard.json index d1e32efec13..5cb21b488e9 100644 --- a/keyboards/ash_xiix/keyboard.json +++ b/keyboards/ash_xiix/keyboard.json @@ -22,6 +22,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"], "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"] diff --git a/keyboards/ask55/config.h b/keyboards/ask55/config.h deleted file mode 100644 index f16fa8823e2..00000000000 --- a/keyboards/ask55/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 Yiancar / Keyboard-Magpie - -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 diff --git a/keyboards/ask55/keyboard.json b/keyboards/ask55/keyboard.json index d47d79612d3..66efb1749ae 100644 --- a/keyboards/ask55/keyboard.json +++ b/keyboards/ask55/keyboard.json @@ -13,6 +13,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["B0", "B1", "D1", "F6", "F5"] diff --git a/keyboards/at_at/660m/config.h b/keyboards/at_at/660m/config.h index 70ad2757b92..ff79c3f7f89 100644 --- a/keyboards/at_at/660m/config.h +++ b/keyboards/at_at/660m/config.h @@ -23,12 +23,6 @@ along with this program. If not, see . /* LSE clock */ #define STM32_LSECLK 32768 -/* 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. diff --git a/keyboards/at_at/660m/info.json b/keyboards/at_at/660m/keyboard.json similarity index 92% rename from keyboards/at_at/660m/info.json rename to keyboards/at_at/660m/keyboard.json index 97f38080dc7..a9c5af73f85 100644 --- a/keyboards/at_at/660m/info.json +++ b/keyboards/at_at/660m/keyboard.json @@ -6,7 +6,22 @@ "usb": { "vid": "0xA22A", "pid": "0x6600", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true + }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } }, "matrix_pins": { "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B9", "B8", "B7", "B6", "B5", "B3", "B4", "B0"], diff --git a/keyboards/at_at/660m/rules.mk b/keyboards/at_at/660m/rules.mk deleted file mode 100644 index e984f8dc96e..00000000000 --- a/keyboards/at_at/660m/rules.mk +++ /dev/null @@ -1,14 +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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -# BACKLIGHT_ENABLE = yes -# RGBLIGHT_ENABLE = yes -NO_USB_STARTUP_CHECK = yes # Workaround for issue 6369 - - diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h index 374119935e9..ab111a5ec5f 100644 --- a/keyboards/atlantis/ak81_ve/config.h +++ b/keyboards/atlantis/ak81_ve/config.h @@ -16,10 +16,4 @@ #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 RGB_MATRIX_LED_COUNT 96 diff --git a/keyboards/atlantis/ak81_ve/keyboard.json b/keyboards/atlantis/ak81_ve/keyboard.json index 6b618646443..a2d064295c8 100644 --- a/keyboards/atlantis/ak81_ve/keyboard.json +++ b/keyboards/atlantis/ak81_ve/keyboard.json @@ -74,6 +74,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "B7", "D3", "D2", "D1", "D0", "B3"], "rows": ["F1", "F7", "F6", "F5", "F4", "D5"] diff --git a/keyboards/atlantis/ps17/info.json b/keyboards/atlantis/ps17/keyboard.json similarity index 98% rename from keyboards/atlantis/ps17/info.json rename to keyboards/atlantis/ps17/keyboard.json index ac8f979d399..ee7255c8fa3 100644 --- a/keyboards/atlantis/ps17/info.json +++ b/keyboards/atlantis/ps17/keyboard.json @@ -11,6 +11,9 @@ "pid": "0x414B", "vid": "0x0015" }, + "build": { + "lto": true + }, "features": { "bootmagic": false, "command": false, diff --git a/keyboards/atlantis/ps17/rules.mk b/keyboards/atlantis/ps17/rules.mk deleted file mode 100644 index 4da205a168c..00000000000 --- a/keyboards/atlantis/ps17/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes diff --git a/keyboards/atlas_65/config.h b/keyboards/atlas_65/config.h deleted file mode 100644 index d0851ac1fde..00000000000 --- a/keyboards/atlas_65/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 Joshua Nguyen - -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/atlas_65/keyboard.json b/keyboards/atlas_65/keyboard.json index 896ecf6f20c..4e8db96d3af 100644 --- a/keyboards/atlas_65/keyboard.json +++ b/keyboards/atlas_65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/atomic/config.h b/keyboards/atomic/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/atomic/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/atomic/keyboard.json b/keyboards/atomic/keyboard.json index cb4bddceae5..5a269316cfa 100644 --- a/keyboards/atomic/keyboard.json +++ b/keyboards/atomic/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7", "D3", "D2", "D1"], "rows": ["D0", "D5", "B5", "B6", "C6"] diff --git a/keyboards/atreus/f103/info.json b/keyboards/atreus/f103/keyboard.json similarity index 73% rename from keyboards/atreus/f103/info.json rename to keyboards/atreus/f103/keyboard.json index 341ed4e8e64..813ef97e373 100644 --- a/keyboards/atreus/f103/info.json +++ b/keyboards/atreus/f103/keyboard.json @@ -5,5 +5,8 @@ }, "diode_direction": "COL2ROW", "processor": "STM32F103", - "bootloader": "stm32duino" + "bootloader": "stm32duino", + "features": { + "bootmagic": true + } } diff --git a/keyboards/atreus/f103/rules.mk b/keyboards/atreus/f103/rules.mk deleted file mode 100644 index 22634018d2f..00000000000 --- a/keyboards/atreus/f103/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ - -BOOTMAGIC_ENABLE = yes \ No newline at end of file diff --git a/keyboards/atreus/feather/info.json b/keyboards/atreus/feather/info.json index b0d7d554433..19e9654f127 100644 --- a/keyboards/atreus/feather/info.json +++ b/keyboards/atreus/feather/info.json @@ -6,6 +6,10 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bluetooth": true, + "console": false + }, "bluetooth": { "driver": "bluefruit_le" } diff --git a/keyboards/atreus/feather/rules.mk b/keyboards/atreus/feather/rules.mk index c93cad90807..3437a35bdf1 100644 --- a/keyboards/atreus/feather/rules.mk +++ b/keyboards/atreus/feather/rules.mk @@ -1,8 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BLUETOOTH_ENABLE = yes -CONSOLE_ENABLE = no diff --git a/keyboards/atreus62/config.h b/keyboards/atreus62/config.h deleted file mode 100644 index 9b7700e0139..00000000000 --- a/keyboards/atreus62/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/atreus62/keyboard.json b/keyboards/atreus62/keyboard.json index 5263e799df3..c24c02e71e6 100644 --- a/keyboards/atreus62/keyboard.json +++ b/keyboards/atreus62/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6"], "rows": ["D2", "D3", "D1", "D0", "D4"] diff --git a/keyboards/atreyu/info.json b/keyboards/atreyu/info.json new file mode 100644 index 00000000000..26caa20330a --- /dev/null +++ b/keyboards/atreyu/info.json @@ -0,0 +1,8 @@ +{ + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + } +} diff --git a/keyboards/atreyu/rev1/config.h b/keyboards/atreyu/rev1/config.h deleted file mode 100644 index d7c434426bc..00000000000 --- a/keyboards/atreyu/rev1/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 Jesus Climent (@climent) - * - * 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/atreyu/rev1/keyboard.json b/keyboards/atreyu/rev1/keyboard.json index 8a38baabf81..dc632a74a7b 100644 --- a/keyboards/atreyu/rev1/keyboard.json +++ b/keyboards/atreyu/rev1/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["D7", "E6", "B4", "B5", "F6", "F7", "B1", "B3", "B6", "B2"] diff --git a/keyboards/atreyu/rev2/config.h b/keyboards/atreyu/rev2/config.h deleted file mode 100644 index d7c434426bc..00000000000 --- a/keyboards/atreyu/rev2/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 Jesus Climent (@climent) - * - * 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/atreyu/rev2/keyboard.json b/keyboards/atreyu/rev2/keyboard.json index 6fcfd64d1ff..19dc8761c49 100644 --- a/keyboards/atreyu/rev2/keyboard.json +++ b/keyboards/atreyu/rev2/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "C6", "D4", "D2", "D3"], "rows": ["D7", "E6", "B4", "B5", "F6", "F7", "B1", "B3", "B6", "B2"] diff --git a/keyboards/atreyu/rules.mk b/keyboards/atreyu/rules.mk index 23ebd8ba330..4daffe6b9d4 100644 --- a/keyboards/atreyu/rules.mk +++ b/keyboards/atreyu/rules.mk @@ -1,16 +1 @@ DEFAULT_FOLDER = atreyu/rev1 - -# 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 - -ENCODER_ENABLE = no diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h deleted file mode 100644 index dc6abdcaf25..00000000000 --- a/keyboards/atset/at1/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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 diff --git a/keyboards/atset/at1/keyboard.json b/keyboards/atset/at1/keyboard.json index e8fa5f8b5fe..4c4806c40bb 100644 --- a/keyboards/atset/at1/keyboard.json +++ b/keyboards/atset/at1/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6"], "rows": ["D2"] diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h deleted file mode 100644 index dc6abdcaf25..00000000000 --- a/keyboards/atset/at12/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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 diff --git a/keyboards/atset/at12/keyboard.json b/keyboards/atset/at12/keyboard.json index c15ff3f46ea..8c7a3d4ea90 100644 --- a/keyboards/atset/at12/keyboard.json +++ b/keyboards/atset/at12/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "B4"], "rows": ["D3", "D2", "D1", "D0"] diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h deleted file mode 100644 index dc6abdcaf25..00000000000 --- a/keyboards/atset/at16/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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 diff --git a/keyboards/atset/at16/keyboard.json b/keyboards/atset/at16/keyboard.json index 0db5ad692c7..2c03c2295f7 100644 --- a/keyboards/atset/at16/keyboard.json +++ b/keyboards/atset/at16/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "B4", "B2"], "rows": ["D3", "D2", "D1", "D0"] diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h deleted file mode 100644 index dc6abdcaf25..00000000000 --- a/keyboards/atset/at3/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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 diff --git a/keyboards/atset/at3/keyboard.json b/keyboards/atset/at3/keyboard.json index 171faf984a0..e6d1d97bf0a 100644 --- a/keyboards/atset/at3/keyboard.json +++ b/keyboards/atset/at3/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "B4"], "rows": ["D2"] diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h deleted file mode 100644 index dc6abdcaf25..00000000000 --- a/keyboards/atset/at6/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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 diff --git a/keyboards/atset/at6/keyboard.json b/keyboards/atset/at6/keyboard.json index c24611f8b74..8cf2d9e9e01 100644 --- a/keyboards/atset/at6/keyboard.json +++ b/keyboards/atset/at6/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "B4"], "rows": ["D2", "D1"] diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h deleted file mode 100644 index dc6abdcaf25..00000000000 --- a/keyboards/atset/at9/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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 diff --git a/keyboards/atset/at9/keyboard.json b/keyboards/atset/at9/keyboard.json index 35bdf95550e..c531397f3aa 100644 --- a/keyboards/atset/at9/keyboard.json +++ b/keyboards/atset/at9/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "B4"], "rows": ["D2", "D1", "D0"] diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/atxkb/1894/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -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/atxkb/1894/keyboard.json b/keyboards/atxkb/1894/keyboard.json index 0ea4918bf38..5abaf88eb0b 100644 --- a/keyboards/atxkb/1894/keyboard.json +++ b/keyboards/atxkb/1894/keyboard.json @@ -21,6 +21,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "F0", "F1"] diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/info.json index 9311e0f8086..1c0dd684cb2 100644 --- a/keyboards/aurora65/info.json +++ b/keyboards/aurora65/info.json @@ -8,6 +8,13 @@ "pid": "0x4136", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/aurora65/rules.mk b/keyboards/aurora65/rules.mk index cc9d7bb3f53..0ab54aaaf71 100644 --- a/keyboards/aurora65/rules.mk +++ b/keyboards/aurora65/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/keyboard.json similarity index 96% rename from keyboards/avalanche/v1/info.json rename to keyboards/avalanche/v1/keyboard.json index 7787ae2a953..97acaf0d9f9 100644 --- a/keyboards/avalanche/v1/info.json +++ b/keyboards/avalanche/v1/keyboard.json @@ -8,12 +8,19 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/avalanche/v1/rules.mk b/keyboards/avalanche/v1/rules.mk deleted file mode 100644 index ef90e04bc1d..00000000000 --- a/keyboards/avalanche/v1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/keyboard.json similarity index 96% rename from keyboards/avalanche/v2/info.json rename to keyboards/avalanche/v2/keyboard.json index 62c284a8454..219e5bb6c6e 100644 --- a/keyboards/avalanche/v2/info.json +++ b/keyboards/avalanche/v2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "encoder": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] @@ -26,6 +34,7 @@ "pin": "D3" }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/avalanche/v2/rules.mk b/keyboards/avalanche/v2/rules.mk deleted file mode 100644 index 8e241b2dfd6..00000000000 --- a/keyboards/avalanche/v2/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - -SPLIT_KEYBOARD = yes diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/keyboard.json similarity index 96% rename from keyboards/avalanche/v3/info.json rename to keyboards/avalanche/v3/keyboard.json index 8cf8187df7f..6104dbd7939 100644 --- a/keyboards/avalanche/v3/info.json +++ b/keyboards/avalanche/v3/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0003", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "encoder": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] @@ -19,6 +26,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/avalanche/v3/rules.mk b/keyboards/avalanche/v3/rules.mk deleted file mode 100644 index 5a35722be4e..00000000000 --- a/keyboards/avalanche/v3/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - -SPLIT_KEYBOARD = yes diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/keyboard.json similarity index 96% rename from keyboards/avalanche/v4/info.json rename to keyboards/avalanche/v4/keyboard.json index 7bb047466b5..2a4909ba368 100644 --- a/keyboards/avalanche/v4/info.json +++ b/keyboards/avalanche/v4/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0004", "device_version": "0.0.4" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "encoder": true, + "oled": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] @@ -19,6 +27,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "ws2812": { diff --git a/keyboards/avalanche/v4/rules.mk b/keyboards/avalanche/v4/rules.mk deleted file mode 100644 index 513c25d04d9..00000000000 --- a/keyboards/avalanche/v4/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes - -SPLIT_KEYBOARD = yes diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h deleted file mode 100644 index 35ca2e0fc3c..00000000000 --- a/keyboards/aves60/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2021 Evelien Dekkers (@evyd13) -// 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 - -/* - * 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/aves60/keyboard.json b/keyboards/aves60/keyboard.json index fce12cd9f73..6d58d43b6a5 100644 --- a/keyboards/aves60/keyboard.json +++ b/keyboards/aves60/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B3", "D0", "D1", "D2", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F6", "F7", "F5", "F1", "F4"] diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h deleted file mode 100644 index 95af0f8e733..00000000000 --- a/keyboards/aves65/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 I/O Keyboards - -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 diff --git a/keyboards/aves65/keyboard.json b/keyboards/aves65/keyboard.json index fba7dcaf387..3ad686f83a1 100644 --- a/keyboards/aves65/keyboard.json +++ b/keyboards/aves65/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6"], "rows": ["D4", "D6", "D7", "B4", "E6"] diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/info.json index 14a3c8213e3..c90c967788e 100644 --- a/keyboards/axolstudio/helpo/info.json +++ b/keyboards/axolstudio/helpo/info.json @@ -8,6 +8,11 @@ "pid": "0xC89F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "matrix_pins": { "cols": ["A1", "B4", "B3", "B2", "B1"], "rows": ["A2", "A3", "A4", "A5"] diff --git a/keyboards/axolstudio/helpo/rules.mk b/keyboards/axolstudio/helpo/rules.mk index 1e9f9255447..c2ee0bc86f9 100644 --- a/keyboards/axolstudio/helpo/rules.mk +++ b/keyboards/axolstudio/helpo/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/aya/info.json b/keyboards/aya/keyboard.json similarity index 96% rename from keyboards/aya/info.json rename to keyboards/aya/keyboard.json index 6b65aa5521a..547f495ddd2 100644 --- a/keyboards/aya/info.json +++ b/keyboards/aya/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x2925", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + }, + "split": { + "enabled": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/aya/rules.mk b/keyboards/aya/rules.mk deleted file mode 100644 index b893863bb52..00000000000 --- a/keyboards/aya/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 -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 -SPLIT_KEYBOARD = yes From 03a3a2673d6deff5a55c14033cc8b505d22a553b Mon Sep 17 00:00:00 2001 From: zlabkeeb <160311066+zlabkeeb@users.noreply.github.com> Date: Wed, 3 Apr 2024 02:58:31 +0700 Subject: [PATCH 100/333] Update 15PAD & 6PAD (#23397) --- keyboards/zlabkeeb/15pad/keyboard.json | 24 ++++++++++++------------ keyboards/zlabkeeb/6pad/readme.md | 3 ++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/keyboards/zlabkeeb/15pad/keyboard.json b/keyboards/zlabkeeb/15pad/keyboard.json index 9733d0169a8..6e28d594f20 100644 --- a/keyboards/zlabkeeb/15pad/keyboard.json +++ b/keyboards/zlabkeeb/15pad/keyboard.json @@ -59,18 +59,18 @@ {"x": 0, "y": 0, "matrix": [0, 0], "encoder": 0}, {"x": 1, "y": 0, "matrix": [0, 1], "encoder": 1}, {"x": 3, "y": 0, "matrix": [0, 3], "encoder": 2}, - {"x": 0, "y": 0, "matrix": [1, 0]}, - {"x": 1, "y": 0, "matrix": [1, 1]}, - {"x": 2, "y": 0, "matrix": [1, 2]}, - {"x": 3, "y": 0, "matrix": [1, 3]}, - {"x": 0, "y": 0, "matrix": [2, 0]}, - {"x": 1, "y": 0, "matrix": [2, 1]}, - {"x": 2, "y": 0, "matrix": [2, 2]}, - {"x": 3, "y": 0, "matrix": [2, 3]}, - {"x": 0, "y": 0, "matrix": [3, 0]}, - {"x": 1, "y": 0, "matrix": [3, 1]}, - {"x": 2, "y": 0, "matrix": [3, 2]}, - {"x": 3, "y": 0, "matrix": [3, 3]} + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1, "matrix": [1, 3]}, + {"x": 0, "y": 2, "matrix": [2, 0]}, + {"x": 1, "y": 2, "matrix": [2, 1]}, + {"x": 2, "y": 2, "matrix": [2, 2]}, + {"x": 3, "y": 2, "matrix": [2, 3]}, + {"x": 0, "y": 3, "matrix": [3, 0]}, + {"x": 1, "y": 3, "matrix": [3, 1]}, + {"x": 2, "y": 3, "matrix": [3, 2]}, + {"x": 3, "y": 3, "matrix": [3, 3]} ] } } diff --git a/keyboards/zlabkeeb/6pad/readme.md b/keyboards/zlabkeeb/6pad/readme.md index 9470ee1d6d9..4575f69088f 100644 --- a/keyboards/zlabkeeb/6pad/readme.md +++ b/keyboards/zlabkeeb/6pad/readme.md @@ -7,7 +7,7 @@ - Support RGB light UnderGlow - Keyboard Maintainer: [zlabkeeb](https://github.com/zlabkeeb) - Hardware Supported: 6Pad PCB, Promicro -- Hardware Availability: (INDONESIA Only) Will be available at [Tokopedia](https://www.tokopedia.com/zahranetid) +- Hardware Availability: (INDONESIA ONLY) [Tokopedia](https://www.tokopedia.com/zahranetid/macropad-6pad-via-compatible-by-zlabkeeb) Make example for this keyboard (after setting up your build environment): @@ -24,3 +24,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 1 way: - **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead + From 73daecdc2373b787cafdfca930ecb65d9de285f7 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 3 Apr 2024 00:36:30 +0100 Subject: [PATCH 101/333] Fix spaceholdings/nebula68b (#23399) --- .../spaceholdings/nebula68b/hs/keyboard.json | 86 +++++++++++++++++++ .../nebula68b/hs/keymaps/via/keymap.c | 32 +++++++ .../nebula68b/{ => hs}/keymaps/via/rules.mk | 0 keyboards/spaceholdings/nebula68b/hs/rules.mk | 0 keyboards/spaceholdings/nebula68b/info.json | 82 ++++++++++++++++++ .../nebula68b/keymaps/default/keymap.c | 24 +++--- .../nebula68b/keymaps/default/readme.md | 7 -- .../nebula68b/keymaps/via/keymap.c | 46 ---------- .../nebula68b/keymaps/via/readme.md | 7 -- keyboards/spaceholdings/nebula68b/readme.md | 4 +- keyboards/spaceholdings/nebula68b/rules.mk | 1 + .../nebula68b/{ => solder}/keyboard.json | 82 +----------------- .../solder/keymaps/default_split_bs/keymap.c | 32 +++++++ .../nebula68b/solder/keymaps/via/keymap.c | 32 +++++++ .../nebula68b/solder/keymaps/via/rules.mk | 1 + .../{nebula68b.c => solder/solder.c} | 2 - 16 files changed, 282 insertions(+), 156 deletions(-) create mode 100755 keyboards/spaceholdings/nebula68b/hs/keyboard.json create mode 100755 keyboards/spaceholdings/nebula68b/hs/keymaps/via/keymap.c rename keyboards/spaceholdings/nebula68b/{ => hs}/keymaps/via/rules.mk (100%) delete mode 100644 keyboards/spaceholdings/nebula68b/hs/rules.mk create mode 100644 keyboards/spaceholdings/nebula68b/info.json mode change 100755 => 100644 keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c delete mode 100755 keyboards/spaceholdings/nebula68b/keymaps/default/readme.md delete mode 100755 keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c delete mode 100755 keyboards/spaceholdings/nebula68b/keymaps/via/readme.md create mode 100644 keyboards/spaceholdings/nebula68b/rules.mk rename keyboards/spaceholdings/nebula68b/{ => solder}/keyboard.json (76%) create mode 100755 keyboards/spaceholdings/nebula68b/solder/keymaps/default_split_bs/keymap.c create mode 100755 keyboards/spaceholdings/nebula68b/solder/keymaps/via/keymap.c create mode 100755 keyboards/spaceholdings/nebula68b/solder/keymaps/via/rules.mk rename keyboards/spaceholdings/nebula68b/{nebula68b.c => solder/solder.c} (97%) diff --git a/keyboards/spaceholdings/nebula68b/hs/keyboard.json b/keyboards/spaceholdings/nebula68b/hs/keyboard.json new file mode 100755 index 00000000000..ca41cff8e64 --- /dev/null +++ b/keyboards/spaceholdings/nebula68b/hs/keyboard.json @@ -0,0 +1,86 @@ +{ + "keyboard_name": "NEBULA68B HOTSWAP", + "community_layouts": ["68_ansi"], + "layouts": { + "LAYOUT_68_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [2, 14], "x": 16.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [3, 14], "x": 16.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [3, 13], "x": 15.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 14.25, "y": 4}, + {"matrix": [4, 13], "x": 15.25, "y": 4}, + {"matrix": [4, 14], "x": 16.25, "y": 4} + ] + } + } +} diff --git a/keyboards/spaceholdings/nebula68b/hs/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68b/hs/keymaps/via/keymap.c new file mode 100755 index 00000000000..c42ca071f3f --- /dev/null +++ b/keyboards/spaceholdings/nebula68b/hs/keymaps/via/keymap.c @@ -0,0 +1,32 @@ +/* Copyright 2021 Yiancar + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_68_ansi( /* Base */ + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + +[1] = LAYOUT_68_ansi( /* FN */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/spaceholdings/nebula68b/keymaps/via/rules.mk b/keyboards/spaceholdings/nebula68b/hs/keymaps/via/rules.mk similarity index 100% rename from keyboards/spaceholdings/nebula68b/keymaps/via/rules.mk rename to keyboards/spaceholdings/nebula68b/hs/keymaps/via/rules.mk diff --git a/keyboards/spaceholdings/nebula68b/hs/rules.mk b/keyboards/spaceholdings/nebula68b/hs/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json new file mode 100644 index 00000000000..3a7f6f9b25d --- /dev/null +++ b/keyboards/spaceholdings/nebula68b/info.json @@ -0,0 +1,82 @@ +{ + "manufacturer": "Yiancar-Designs", + "url": "", + "maintainer": "yiancar", + "usb": { + "vid": "0x8968", + "pid": "0x5338", + "device_version": "0.0.1" + }, + "ws2812": { + "pin": "B7" + }, + "rgb_matrix": { + "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, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": 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 + }, + "driver": "ws2812", + "max_brightness": 130, + "sleep": true + }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D4", "D6", "D7", "B4", "E6"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c old mode 100755 new mode 100644 index 08c433bdb1a..c42ca071f3f --- a/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c +++ b/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c @@ -16,17 +16,17 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT_68_ansi_split_bs( /* Base */ - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, KC_INS, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), +[0] = LAYOUT_68_ansi( /* Base */ + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), -[1] = LAYOUT_68_ansi_split_bs( /* FN */ - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +[1] = LAYOUT_68_ansi( /* FN */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, _______, _______) }; diff --git a/keyboards/spaceholdings/nebula68b/keymaps/default/readme.md b/keyboards/spaceholdings/nebula68b/keymaps/default/readme.md deleted file mode 100755 index a4a6c7facf7..00000000000 --- a/keyboards/spaceholdings/nebula68b/keymaps/default/readme.md +++ /dev/null @@ -1,7 +0,0 @@ -# The default keymap for Nebula68B. VIA support disabled. - -![Layer 0](https://i.imgur.com/dXyRwb1.png) - -![Layer 1](https://i.imgur.com/kxXnxVQ.png) - -Default layer is normal ANSI 68% diff --git a/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c deleted file mode 100755 index 87727200f43..00000000000 --- a/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 Yiancar - * - * 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT_68_ansi_split_bs( /* Base */ - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, KC_INS, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - -[1] = LAYOUT_68_ansi_split_bs( /* FN */ - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - -[2] = LAYOUT_68_ansi_split_bs( /* Empty for dynamic keymaps */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - -[3] = LAYOUT_68_ansi_split_bs( /* Empty for dynamic keymaps */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) -}; diff --git a/keyboards/spaceholdings/nebula68b/keymaps/via/readme.md b/keyboards/spaceholdings/nebula68b/keymaps/via/readme.md deleted file mode 100755 index 583ddc02cf8..00000000000 --- a/keyboards/spaceholdings/nebula68b/keymaps/via/readme.md +++ /dev/null @@ -1,7 +0,0 @@ -# The default keymap for Nebula68B. VIA support enabled. - -![Layer 0](https://i.imgur.com/dXyRwb1.png) - -![Layer 1](https://i.imgur.com/kxXnxVQ.png) - -Default layer is normal ANSI 68% diff --git a/keyboards/spaceholdings/nebula68b/readme.md b/keyboards/spaceholdings/nebula68b/readme.md index 4c238e2ea0a..6ff3bc2b913 100755 --- a/keyboards/spaceholdings/nebula68b/readme.md +++ b/keyboards/spaceholdings/nebula68b/readme.md @@ -12,7 +12,9 @@ This is a standard fixed layout 68% PCB. It supports VIA, full per-key RGB and u Make example for this keyboard (after setting up your build environment): - make spaceholdings/nebula68b:via + make spaceholdings/nebula68b/hs:via + make spaceholdings/nebula68b/solder:via + 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). diff --git a/keyboards/spaceholdings/nebula68b/rules.mk b/keyboards/spaceholdings/nebula68b/rules.mk new file mode 100644 index 00000000000..8fe37f83b32 --- /dev/null +++ b/keyboards/spaceholdings/nebula68b/rules.mk @@ -0,0 +1 @@ +DEFAULT_FOLDER = spaceholdings/nebula68b/solder diff --git a/keyboards/spaceholdings/nebula68b/keyboard.json b/keyboards/spaceholdings/nebula68b/solder/keyboard.json similarity index 76% rename from keyboards/spaceholdings/nebula68b/keyboard.json rename to keyboards/spaceholdings/nebula68b/solder/keyboard.json index 3be1f806391..3a50385fe33 100755 --- a/keyboards/spaceholdings/nebula68b/keyboard.json +++ b/keyboards/spaceholdings/nebula68b/solder/keyboard.json @@ -1,85 +1,5 @@ { - "keyboard_name": "NEBULA68B", - "manufacturer": "Yiancar-Designs", - "url": "", - "maintainer": "yiancar", - "usb": { - "vid": "0x8968", - "pid": "0x5338", - "device_version": "0.0.1" - }, - "ws2812": { - "pin": "B7" - }, - "rgb_matrix": { - "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, - "rainbow_moving_chevron": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": true, - "raindrops": true, - "jellybean_raindrops": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "pixel_rain": true, - "pixel_flow": true, - "pixel_fractal": 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 - }, - "driver": "ws2812", - "max_brightness": 130, - "sleep": true - }, - "build": { - "lto": true - }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true, - "rgb_matrix": true - }, - "matrix_pins": { - "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], - "rows": ["D4", "D6", "D7", "B4", "E6"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "atmel-dfu", + "keyboard_name": "NEBULA68B SOLDER", "community_layouts": ["68_ansi"], "layouts": { "LAYOUT_68_ansi": { diff --git a/keyboards/spaceholdings/nebula68b/solder/keymaps/default_split_bs/keymap.c b/keyboards/spaceholdings/nebula68b/solder/keymaps/default_split_bs/keymap.c new file mode 100755 index 00000000000..68fe5d22fd4 --- /dev/null +++ b/keyboards/spaceholdings/nebula68b/solder/keymaps/default_split_bs/keymap.c @@ -0,0 +1,32 @@ +/* Copyright 2021 Yiancar + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_68_ansi_split_bs( /* Base */ + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, KC_INS, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + +[1] = LAYOUT_68_ansi_split_bs( /* FN */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/spaceholdings/nebula68b/solder/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68b/solder/keymaps/via/keymap.c new file mode 100755 index 00000000000..68fe5d22fd4 --- /dev/null +++ b/keyboards/spaceholdings/nebula68b/solder/keymaps/via/keymap.c @@ -0,0 +1,32 @@ +/* Copyright 2021 Yiancar + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_68_ansi_split_bs( /* Base */ + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, KC_INS, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + +[1] = LAYOUT_68_ansi_split_bs( /* FN */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/spaceholdings/nebula68b/solder/keymaps/via/rules.mk b/keyboards/spaceholdings/nebula68b/solder/keymaps/via/rules.mk new file mode 100755 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/spaceholdings/nebula68b/solder/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/spaceholdings/nebula68b/nebula68b.c b/keyboards/spaceholdings/nebula68b/solder/solder.c similarity index 97% rename from keyboards/spaceholdings/nebula68b/nebula68b.c rename to keyboards/spaceholdings/nebula68b/solder/solder.c index b99777ff5be..352cee1d52b 100755 --- a/keyboards/spaceholdings/nebula68b/nebula68b.c +++ b/keyboards/spaceholdings/nebula68b/solder/solder.c @@ -16,7 +16,6 @@ #include "quantum.h" -#ifndef KEYBOARD_spaceholdings_nebula68b_hs #ifdef RGB_MATRIX_ENABLE // clang-format off led_config_t g_led_config = { { @@ -40,4 +39,3 @@ led_config_t g_led_config = { { } }; // clang-format on #endif -#endif From 408f6e43cd2522b6a4073bedcfbe2ee7df2603dd Mon Sep 17 00:00:00 2001 From: DOIO2022 <116554792+DOIO2022@users.noreply.github.com> Date: Wed, 3 Apr 2024 07:36:49 +0800 Subject: [PATCH 102/333] Change the VID and PID of the file kb38 info.json (#23393) --- keyboards/doio/kb38/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json index a89c5951e39..a1775a2b107 100644 --- a/keyboards/doio/kb38/info.json +++ b/keyboards/doio/kb38/info.json @@ -21,8 +21,8 @@ "processor": "atmega32u4", "usb": { "device_version": "1.0.0", - "pid": "0x0000", - "vid": "0xFEED" + "pid": "0x3801", + "vid": "0xD010" }, "encoder": { "rotary": [ From c635733a7fd48c6692d818ac8621571cbc5f470a Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Apr 2024 10:44:25 +1100 Subject: [PATCH 103/333] Remove `quantum.h` includes from keyboard code (#23394) --- keyboards/25keys/cassette42/common/oled_helper.c | 4 +++- .../keymaps/default_pimoroni/pimoroni_trackball.c | 4 ++++ .../keymaps/default_pimoroni/pimoroni_trackball.h | 4 +++- keyboards/annepro2/annepro2_ble.h | 1 - .../lib/satisfaction75/satisfaction_core.c | 3 +++ .../lib/satisfaction75/satisfaction_core.h | 3 ++- .../lib/satisfaction75/satisfaction_encoder.c | 1 + .../lib/satisfaction75/satisfaction_oled.c | 8 ++++++++ keyboards/clueboard/2x1800/2021/max7219.c | 4 ++++ keyboards/clueboard/2x1800/2021/max7219.h | 6 ++++-- keyboards/converter/usb_usb/custom_matrix.cpp | 4 ---- keyboards/converter/xt_usb/xt.h | 3 ++- keyboards/duck/duck_led/duck_led.c | 3 +-- keyboards/duck/jetfire/indicator_leds.c | 5 +---- keyboards/duck/jetfire/indicator_leds.h | 2 ++ keyboards/fallacy/indicators.h | 3 +-- keyboards/handwired/d48/taphold.c | 3 +++ keyboards/handwired/d48/taphold.h | 4 +++- .../dactyl_minidox/{3x5_3.c => dactyl_minidox.c} | 0 keyboards/handwired/dygma/raise/leds.c | 6 +++--- keyboards/handwired/dygma/raise/leds.h | 3 +-- keyboards/handwired/lagrange/transport.c | 4 +--- .../handwired/promethium/keymaps/default/keymap.c | 1 - keyboards/horrortroll/nyx/rev1/{nyx.c => rev1.c} | 0 keyboards/hotdox/left.c | 1 + keyboards/hotdox/left.h | 4 ---- keyboards/idobao/id61/keymaps/idobao/specialk.c | 3 +++ keyboards/idobao/id61/keymaps/idobao/specialk.h | 3 +-- keyboards/input_club/k_type/i2c_master.c | 5 +++-- keyboards/kagizaraya/chidori/board.c | 1 - keyboards/keyboardio/model01/leds.c | 3 ++- keyboards/keyboardio/model01/leds.h | 3 +-- keyboards/matrix/m20add/rgb_ring.c | 4 ++++ keyboards/miiiw/common/shift_register.c | 2 +- keyboards/miiiw/common/shift_register.h | 1 + keyboards/mntre_v3/{mntre.c => mntre_v3.c} | 0 keyboards/molecule/adns.c | 2 +- keyboards/molecule/adns.h | 2 ++ keyboards/nullbitsco/common/bitc_led.h | 3 ++- keyboards/nullbitsco/common/remote_kb.c | 3 +++ keyboards/nullbitsco/common/remote_kb.h | 3 ++- keyboards/nullbitsco/nibble/big_led.h | 3 ++- .../nibble/keymaps/oled_status/oled_display.c | 9 ++++++++- .../nibble/keymaps/oled_status/oled_display.h | 2 ++ keyboards/rocketboard_16/keycode_lookup.c | 5 ++++- keyboards/rocketboard_16/keycode_lookup.h | 2 +- keyboards/sirius/unigo66/custom_matrix.cpp | 4 ---- keyboards/stront/keymaps/hid/hid_display.h | 3 ++- keyboards/wilba_tech/via_test.c | 1 - keyboards/wilba_tech/wt_mono_backlight.c | 5 ++--- keyboards/wilba_tech/wt_mono_backlight.h | 1 + keyboards/wilba_tech/wt_rgb_backlight.c | 14 +++++--------- keyboards/wilba_tech/wt_rgb_backlight.h | 1 + keyboards/wilba_tech/wt_rgb_backlight_keycodes.h | 2 ++ keyboards/work_louder/rgb_functions.c | 5 +++++ keyboards/work_louder/rgb_functions.h | 2 +- keyboards/yushakobo/navpad/navpad_prefs.c | 5 +++++ keyboards/yushakobo/navpad/navpad_prefs.h | 2 +- keyboards/yushakobo/quick17/quick17_prefs.h | 4 +++- keyboards/yushakobo/quick17/rgb_matrix_kb.inc | 1 + 60 files changed, 123 insertions(+), 70 deletions(-) rename keyboards/handwired/dactyl_minidox/{3x5_3.c => dactyl_minidox.c} (100%) rename keyboards/horrortroll/nyx/rev1/{nyx.c => rev1.c} (100%) rename keyboards/mntre_v3/{mntre.c => mntre_v3.c} (100%) diff --git a/keyboards/25keys/cassette42/common/oled_helper.c b/keyboards/25keys/cassette42/common/oled_helper.c index 1c4148a7d9f..83832a99474 100644 --- a/keyboards/25keys/cassette42/common/oled_helper.c +++ b/keyboards/25keys/cassette42/common/oled_helper.c @@ -1,5 +1,7 @@ #include "oled_helper.h" -#include "quantum.h" +#include "progmem.h" +#include "rgblight.h" +#include "oled_driver.h" #include #include diff --git a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c index 0db58bfabd6..c32f2a04d21 100644 --- a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c +++ b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c @@ -14,8 +14,12 @@ * along with this program. If not, see . */ +#include QMK_KEYBOARD_H #include "pimoroni_trackball.h" #include "i2c_master.h" +#include "action.h" +#include "timer.h" +#include "print.h" static uint8_t scrolling = 0; static int16_t x_offset = 0; diff --git a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h index ca2559bec74..d85d4e60a9c 100644 --- a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h +++ b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h @@ -16,8 +16,10 @@ #pragma once -#include "quantum.h" +#include +#include #include "pointing_device.h" +#include "report.h" #ifndef TRACKBALL_ADDRESS # define TRACKBALL_ADDRESS (0x0A << 1) diff --git a/keyboards/annepro2/annepro2_ble.h b/keyboards/annepro2/annepro2_ble.h index 0cfb68e0716..37dd6d31a1c 100644 --- a/keyboards/annepro2/annepro2_ble.h +++ b/keyboards/annepro2/annepro2_ble.h @@ -17,7 +17,6 @@ #pragma once #include "annepro2.h" -#include "quantum.h" void annepro2_ble_bootload(void); void annepro2_ble_startup(void); diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c index e148ae468a6..6f76582e4b2 100644 --- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c +++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c @@ -4,6 +4,9 @@ #include "satisfaction_core.h" #include "print.h" #include "debug.h" +#include "matrix.h" +#include "quantum.h" +#include "encoder.h" #include #include diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h index 9c466421952..70ee2a3fdaf 100644 --- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h +++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h @@ -3,7 +3,8 @@ #pragma once -#include "quantum.h" +#include +#include #include "via.h" // only for EEPROM address #include "satisfaction_keycodes.h" diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c index 7122091ea3c..074fe262b3b 100644 --- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c +++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "satisfaction_core.h" +#include "backlight.h" #include "eeprom.h" void pre_encoder_mode_change(void){ diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c index 18ae368e535..0361453c52b 100644 --- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c +++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c @@ -2,6 +2,14 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "satisfaction_core.h" +#include "action_layer.h" +#include "action_util.h" +#include "timer.h" +#include "matrix.h" +#include "led.h" +#include "host.h" +#include "oled_driver.h" +#include "progmem.h" #include void draw_default(void); diff --git a/keyboards/clueboard/2x1800/2021/max7219.c b/keyboards/clueboard/2x1800/2021/max7219.c index 1ba22362fe4..81d26b9a518 100644 --- a/keyboards/clueboard/2x1800/2021/max7219.c +++ b/keyboards/clueboard/2x1800/2021/max7219.c @@ -40,6 +40,10 @@ */ #include "max7219.h" +#include "spi_master.h" +#include "debug.h" +#include "gpio.h" +#include "wait.h" #include "font.h" // Datastructures diff --git a/keyboards/clueboard/2x1800/2021/max7219.h b/keyboards/clueboard/2x1800/2021/max7219.h index 95d1d9389d1..6d78345d5d9 100644 --- a/keyboards/clueboard/2x1800/2021/max7219.h +++ b/keyboards/clueboard/2x1800/2021/max7219.h @@ -26,8 +26,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once -#include "quantum.h" -#include "spi_master.h" + +#include +#include +#include // Set defaults if they're not set #ifndef MAX7219_LOAD diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp index f5f751da14f..ca0855a82b9 100644 --- a/keyboards/converter/usb_usb/custom_matrix.cpp +++ b/keyboards/converter/usb_usb/custom_matrix.cpp @@ -35,10 +35,6 @@ along with this program. If not, see . #include "host.h" #include "keyboard.h" -extern "C" { -#include "quantum.h" -} - /* KEY CODE to Matrix * * HID keycode(1 byte): diff --git a/keyboards/converter/xt_usb/xt.h b/keyboards/converter/xt_usb/xt.h index 538ff0e459f..e9c1c7751d8 100644 --- a/keyboards/converter/xt_usb/xt.h +++ b/keyboards/converter/xt_usb/xt.h @@ -38,7 +38,8 @@ POSSIBILITY OF SUCH DAMAGE. #pragma once -#include "quantum.h" +#include +#include "gpio.h" #define XT_DATA_IN() \ do { \ diff --git a/keyboards/duck/duck_led/duck_led.c b/keyboards/duck/duck_led/duck_led.c index 2fa920e4b61..ce9bd0fde10 100644 --- a/keyboards/duck/duck_led/duck_led.c +++ b/keyboards/duck/duck_led/duck_led.c @@ -1,6 +1,5 @@ -#include #include "duck_led.h" -#include "quantum.h" +#include "wait.h" void show(void) { wait_us((RES / 1000UL) + 1); diff --git a/keyboards/duck/jetfire/indicator_leds.c b/keyboards/duck/jetfire/indicator_leds.c index 7dbdb1ff79b..200a9ce6ff6 100644 --- a/keyboards/duck/jetfire/indicator_leds.c +++ b/keyboards/duck/jetfire/indicator_leds.c @@ -12,13 +12,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#include "indicator_leds.h" #include #include -#include #include -#include -#include "indicator_leds.h" -#include "quantum.h" #define LED_T1H 900 #define LED_T1L 600 diff --git a/keyboards/duck/jetfire/indicator_leds.h b/keyboards/duck/jetfire/indicator_leds.h index 36dda632fbc..27dcc1535b0 100644 --- a/keyboards/duck/jetfire/indicator_leds.h +++ b/keyboards/duck/jetfire/indicator_leds.h @@ -1,5 +1,7 @@ #pragma once +#include +#include #include "duck_led/duck_led.h" void backlight_init_ports(void); diff --git a/keyboards/fallacy/indicators.h b/keyboards/fallacy/indicators.h index 6de374cda8e..838a698f7b2 100755 --- a/keyboards/fallacy/indicators.h +++ b/keyboards/fallacy/indicators.h @@ -15,8 +15,7 @@ */ #pragma once -#include "quantum.h" - +#include void init_fallacy_leds(void); void update_fallacy_leds(void); diff --git a/keyboards/handwired/d48/taphold.c b/keyboards/handwired/d48/taphold.c index 0b56a5a6a10..5360391b970 100644 --- a/keyboards/handwired/d48/taphold.c +++ b/keyboards/handwired/d48/taphold.c @@ -1,4 +1,7 @@ #include "taphold.h" +#include "action_layer.h" +#include "keyboard.h" +#include "timer.h" bool taphold_process(uint16_t keycode, keyrecord_t *record) { for (int i = 0; i < taphold_config_size; i++) { diff --git a/keyboards/handwired/d48/taphold.h b/keyboards/handwired/d48/taphold.h index 2a691aa63f6..8788c58f3d9 100644 --- a/keyboards/handwired/d48/taphold.h +++ b/keyboards/handwired/d48/taphold.h @@ -1,6 +1,8 @@ #pragma once -#include "quantum.h" +#include +#include +#include "action.h" typedef enum taphold_mode_t { TAPHOLD_LAYER, diff --git a/keyboards/handwired/dactyl_minidox/3x5_3.c b/keyboards/handwired/dactyl_minidox/dactyl_minidox.c similarity index 100% rename from keyboards/handwired/dactyl_minidox/3x5_3.c rename to keyboards/handwired/dactyl_minidox/dactyl_minidox.c diff --git a/keyboards/handwired/dygma/raise/leds.c b/keyboards/handwired/dygma/raise/leds.c index 53fa3892069..ad156445793 100644 --- a/keyboards/handwired/dygma/raise/leds.c +++ b/keyboards/handwired/dygma/raise/leds.c @@ -14,15 +14,15 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "leds.h" +#include #include "i2c_master.h" #include "led_tables.h" #include "rgb_matrix.h" -#include +#include "wait.h" #include "raise.h" #include "wire-protocol-constants.h" #include "print.h" -#include "leds.h" // Color order of LEDs is Green, Red, Blue. typedef struct PACKED { diff --git a/keyboards/handwired/dygma/raise/leds.h b/keyboards/handwired/dygma/raise/leds.h index c25a4326a90..1b7bfce2e2d 100644 --- a/keyboards/handwired/dygma/raise/leds.h +++ b/keyboards/handwired/dygma/raise/leds.h @@ -16,8 +16,7 @@ #pragma once -#include "quantum.h" -#include "rgb_matrix.h" +#include extern const uint8_t led_map[RGB_MATRIX_LED_COUNT]; diff --git a/keyboards/handwired/lagrange/transport.c b/keyboards/handwired/lagrange/transport.c index 8f6973925ff..ec91cff3068 100644 --- a/keyboards/handwired/lagrange/transport.c +++ b/keyboards/handwired/lagrange/transport.c @@ -14,9 +14,7 @@ * along with this program. If not, see . */ -#include - -#include "quantum.h" +#include "spi_master.h" #include "split_util.h" #include "transport.h" #include "timer.h" diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c index ff73e51d5eb..8af82d8297c 100644 --- a/keyboards/handwired/promethium/keymaps/default/keymap.c +++ b/keyboards/handwired/promethium/keymaps/default/keymap.c @@ -22,7 +22,6 @@ along with this program. If not, see . #endif #include "eeconfig.h" #include "process_unicode.h" -#include "quantum.h" #ifdef RGBSPS_ENABLE #include "rgbsps.h" #include "rgbtheme.h" diff --git a/keyboards/horrortroll/nyx/rev1/nyx.c b/keyboards/horrortroll/nyx/rev1/rev1.c similarity index 100% rename from keyboards/horrortroll/nyx/rev1/nyx.c rename to keyboards/horrortroll/nyx/rev1/rev1.c diff --git a/keyboards/hotdox/left.c b/keyboards/hotdox/left.c index 5196fb3115e..ac513224767 100644 --- a/keyboards/hotdox/left.c +++ b/keyboards/hotdox/left.c @@ -1,5 +1,6 @@ #include "action.h" #include "left.h" +#include "print.h" #include "wait.h" bool i2c_initialized = false; diff --git a/keyboards/hotdox/left.h b/keyboards/hotdox/left.h index 32faadba219..931d98d8e56 100644 --- a/keyboards/hotdox/left.h +++ b/keyboards/hotdox/left.h @@ -1,9 +1,7 @@ #pragma once -#include "quantum.h" #include #include "i2c_master.h" -#include #define MCP23017 #define MCP23017_A0 0 @@ -43,8 +41,6 @@ void left_scan(void); uint8_t left_read_cols(void); uint8_t left_get_col(uint8_t col); -matrix_row_t left_read_row(void); - void left_unselect_rows(void); void left_select_row(uint8_t row); diff --git a/keyboards/idobao/id61/keymaps/idobao/specialk.c b/keyboards/idobao/id61/keymaps/idobao/specialk.c index 03a31e68049..9b7e481d682 100644 --- a/keyboards/idobao/id61/keymaps/idobao/specialk.c +++ b/keyboards/idobao/id61/keymaps/idobao/specialk.c @@ -2,6 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "specialk.h" +#include "keycodes.h" +#include "action_layer.h" +#include "action_util.h" bool delkey_registered = false; uint32_t __keycode_raised = 0; diff --git a/keyboards/idobao/id61/keymaps/idobao/specialk.h b/keyboards/idobao/id61/keymaps/idobao/specialk.h index a2ec124de8a..a79cde5953f 100644 --- a/keyboards/idobao/id61/keymaps/idobao/specialk.h +++ b/keyboards/idobao/id61/keymaps/idobao/specialk.h @@ -5,8 +5,7 @@ #include #include -#include "util.h" -#include "quantum.h" +#include "action.h" bool ID61_process_special_k(uint16_t keycode, keyrecord_t *record, bool arrow_mode, uint8_t k_norm, uint8_t k_spcl, uint8_t k_altr); bool ID61_backspace_special(uint16_t keycode, keyrecord_t *record); diff --git a/keyboards/input_club/k_type/i2c_master.c b/keyboards/input_club/k_type/i2c_master.c index e25ae2ef6f1..a55b2fb38ce 100644 --- a/keyboards/input_club/k_type/i2c_master.c +++ b/keyboards/input_club/k_type/i2c_master.c @@ -27,10 +27,11 @@ #ifdef RGB_MATRIX_ENABLE - -#include "quantum.h" #include "i2c_master.h" +#include "gpio.h" +#include "chibios_config.h" #include +#include #include static uint8_t i2c_address; diff --git a/keyboards/kagizaraya/chidori/board.c b/keyboards/kagizaraya/chidori/board.c index 34e57a88741..2834f7625b8 100644 --- a/keyboards/kagizaraya/chidori/board.c +++ b/keyboards/kagizaraya/chidori/board.c @@ -19,7 +19,6 @@ #include "print.h" #include "debug.h" #include "matrix.h" -#include "quantum.h" #include "board.h" #include "i2c_master.h" diff --git a/keyboards/keyboardio/model01/leds.c b/keyboards/keyboardio/model01/leds.c index 3fb502cb27d..656e176bfad 100644 --- a/keyboards/keyboardio/model01/leds.c +++ b/keyboards/keyboardio/model01/leds.c @@ -13,7 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "quantum.h" + +#include "leds.h" #include "i2c_master.h" #include "led_tables.h" #include "rgb_matrix.h" diff --git a/keyboards/keyboardio/model01/leds.h b/keyboards/keyboardio/model01/leds.h index 4d185919b00..6f5e12a6a84 100644 --- a/keyboards/keyboardio/model01/leds.h +++ b/keyboards/keyboardio/model01/leds.h @@ -15,8 +15,7 @@ */ #pragma once -#include "quantum.h" -#include "rgb_matrix.h" +#include void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b); void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b); diff --git a/keyboards/matrix/m20add/rgb_ring.c b/keyboards/matrix/m20add/rgb_ring.c index f32875cf4f7..ecdac9130a6 100644 --- a/keyboards/matrix/m20add/rgb_ring.c +++ b/keyboards/matrix/m20add/rgb_ring.c @@ -18,9 +18,13 @@ #include "rgb_ring.h" +#include +#include #include #include "quantum.h" #include "rgblight.h" +#include "timer.h" +#include "action.h" #include "drivers/led/issi/is31fl3731.h" #include "i2c_master.h" diff --git a/keyboards/miiiw/common/shift_register.c b/keyboards/miiiw/common/shift_register.c index 1f21c124683..2c9259180ea 100644 --- a/keyboards/miiiw/common/shift_register.c +++ b/keyboards/miiiw/common/shift_register.c @@ -14,8 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "shift_register.h" +#include static void shift_out(void); diff --git a/keyboards/miiiw/common/shift_register.h b/keyboards/miiiw/common/shift_register.h index f9895e63f82..8d72149be23 100644 --- a/keyboards/miiiw/common/shift_register.h +++ b/keyboards/miiiw/common/shift_register.h @@ -16,6 +16,7 @@ #pragma once +#include #include "gpio.h" #ifndef GPIOH_BASE diff --git a/keyboards/mntre_v3/mntre.c b/keyboards/mntre_v3/mntre_v3.c similarity index 100% rename from keyboards/mntre_v3/mntre.c rename to keyboards/mntre_v3/mntre_v3.c diff --git a/keyboards/molecule/adns.c b/keyboards/molecule/adns.c index 96fc83ee0b5..0648193557e 100644 --- a/keyboards/molecule/adns.c +++ b/keyboards/molecule/adns.c @@ -16,7 +16,7 @@ #include "spi_master.h" #include "adns.h" #include "debug.h" -#include "quantum.h" +#include "wait.h" #include "pointing_device.h" #include "adns9800_srom_A6.h" diff --git a/keyboards/molecule/adns.h b/keyboards/molecule/adns.h index d684d3cbcb1..e557aeb2ece 100644 --- a/keyboards/molecule/adns.h +++ b/keyboards/molecule/adns.h @@ -15,6 +15,8 @@ */ #pragma once +#include + void adns_begin(void); void adns_end(void); diff --git a/keyboards/nullbitsco/common/bitc_led.h b/keyboards/nullbitsco/common/bitc_led.h index 14cd4f15b7d..c649f1c1dd5 100644 --- a/keyboards/nullbitsco/common/bitc_led.h +++ b/keyboards/nullbitsco/common/bitc_led.h @@ -15,7 +15,8 @@ */ #pragma once -#include "quantum.h" +#include +#include "gpio.h" #define LED_ON 2 #define LED_DIM 1 diff --git a/keyboards/nullbitsco/common/remote_kb.c b/keyboards/nullbitsco/common/remote_kb.c index 8e3f7f6766d..bd2b396e6b5 100644 --- a/keyboards/nullbitsco/common/remote_kb.c +++ b/keyboards/nullbitsco/common/remote_kb.c @@ -27,7 +27,10 @@ This will require a new communication protocol, as the current one is limited. */ #include "remote_kb.h" +#include "quantum.h" #include "uart.h" +#include "wait.h" +#include "debug.h" uint8_t msg[UART_MSG_LEN], diff --git a/keyboards/nullbitsco/common/remote_kb.h b/keyboards/nullbitsco/common/remote_kb.h index da124bf5f4e..97d299189df 100644 --- a/keyboards/nullbitsco/common/remote_kb.h +++ b/keyboards/nullbitsco/common/remote_kb.h @@ -15,7 +15,8 @@ */ #pragma once -#include "quantum.h" +#include +#include "action.h" #define SERIAL_UART_BAUD 76800 //low error rate for 32u4 @ 16MHz diff --git a/keyboards/nullbitsco/nibble/big_led.h b/keyboards/nullbitsco/nibble/big_led.h index 4ebcc35f08e..1198d3490bb 100644 --- a/keyboards/nullbitsco/nibble/big_led.h +++ b/keyboards/nullbitsco/nibble/big_led.h @@ -15,7 +15,8 @@ */ #pragma once -#include "quantum.h" +#include +#include "gpio.h" /* Optional big LED pins */ #define BIG_LED_R_PIN D7 diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c index c734e80cefe..11a0e1f11eb 100644 --- a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c +++ b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c @@ -13,8 +13,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "quantum.h" + #include "oled_display.h" +#include "keycodes.h" +#include "progmem.h" +#include "host.h" +#include "timer.h" +#include "wpm.h" +#include "rgblight.h" +#include "oled_driver.h" static const char PROGMEM oled_mode_messages[5][15] = { "", diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h index bd59d44b413..7f2b5e1e779 100644 --- a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h +++ b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h @@ -15,6 +15,8 @@ */ #pragma once +#include + typedef enum { OLED_MODE_IDLE = 0, OLED_MODE_VOLUME_UP = 1, diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c index 61b73bd0c03..cb8b0330c2f 100644 --- a/keyboards/rocketboard_16/keycode_lookup.c +++ b/keyboards/rocketboard_16/keycode_lookup.c @@ -15,8 +15,11 @@ */ #include "keycode_lookup.h" +#include "quantum_keycodes.h" +#include "keymap_us.h" #include "print.h" #include "via.h" +#include "util.h" #define num_keycodes ARRAY_SIZE(lookup_table) static char UNKNOWN_KEYCODE[] = "UNKNOWN"; @@ -289,7 +292,7 @@ lookup_table_t lookup_table[333] = {"KC_QUES", KC_QUES}, {"QK_BOOT", QK_BOOT}, {"DB_TOGG", DB_TOGG}, - {"MAGIC_TOGGLE_NKRO", MAGIC_TOGGLE_NKRO}, + {"NK_TOGG", NK_TOGG}, {"QK_GESC", QK_GESC}, {"AU_ON", AU_ON}, {"AU_OFF", AU_OFF}, diff --git a/keyboards/rocketboard_16/keycode_lookup.h b/keyboards/rocketboard_16/keycode_lookup.h index 35f0b66f25f..06f0efb53b6 100644 --- a/keyboards/rocketboard_16/keycode_lookup.h +++ b/keyboards/rocketboard_16/keycode_lookup.h @@ -16,7 +16,7 @@ #pragma once -#include "quantum.h" +#include typedef struct { diff --git a/keyboards/sirius/unigo66/custom_matrix.cpp b/keyboards/sirius/unigo66/custom_matrix.cpp index 07c6df29819..25648a5f78e 100644 --- a/keyboards/sirius/unigo66/custom_matrix.cpp +++ b/keyboards/sirius/unigo66/custom_matrix.cpp @@ -35,10 +35,6 @@ along with this program. If not, see . #include "host.h" #include "keyboard.h" -extern "C" { -#include "quantum.h" -} - /* KEY CODE to Matrix * * HID keycode(1 byte): diff --git a/keyboards/stront/keymaps/hid/hid_display.h b/keyboards/stront/keymaps/hid/hid_display.h index b93bf647169..e823d3e8a4c 100644 --- a/keyboards/stront/keymaps/hid/hid_display.h +++ b/keyboards/stront/keymaps/hid/hid_display.h @@ -1,7 +1,8 @@ // Copyright 2023 zzeneg (@zzeneg) // SPDX-License-Identifier: GPL-2.0-or-later -#include "quantum.h" +#include +#include typedef enum { _QWERTY = 0, diff --git a/keyboards/wilba_tech/via_test.c b/keyboards/wilba_tech/via_test.c index 6a74df51643..314ec4472c3 100644 --- a/keyboards/wilba_tech/via_test.c +++ b/keyboards/wilba_tech/via_test.c @@ -14,7 +14,6 @@ // - add `#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 128` to config.h // (or change to match CHANNELS*VALUES*2) -#include "quantum.h" #include "via.h" #ifdef VIA_ENABLE diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c index 1523fbdb853..1426e09fc6f 100644 --- a/keyboards/wilba_tech/wt_mono_backlight.c +++ b/keyboards/wilba_tech/wt_mono_backlight.c @@ -14,16 +14,15 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "wt_mono_backlight.h" #include "wt_rgb_backlight_api.h" // reuse these for now #include "wt_rgb_backlight_keycodes.h" // reuse these for now +#include #include #include "i2c_master.h" - +#include "host.h" #include "progmem.h" -#include "quantum/color.h" #include "eeprom.h" #include "via.h" // uses EEPROM address, lighting value IDs diff --git a/keyboards/wilba_tech/wt_mono_backlight.h b/keyboards/wilba_tech/wt_mono_backlight.h index 9bf76b44bb8..fb77ec66e19 100644 --- a/keyboards/wilba_tech/wt_mono_backlight.h +++ b/keyboards/wilba_tech/wt_mono_backlight.h @@ -19,6 +19,7 @@ #include #include +#include "action.h" #include "quantum/color.h" typedef struct PACKED diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c index d03d189b298..02bcdd610be 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight.c +++ b/keyboards/wilba_tech/wt_rgb_backlight.c @@ -40,19 +40,15 @@ #error wt_rgb_backlight.c compiled without setting configuration symbol #endif -#ifndef MAX - #define MAX(X, Y) ((X) > (Y) ? (X) : (Y)) -#endif - -#ifndef MIN - #define MIN(a,b) ((a) < (b)? (a): (b)) -#endif - -#include "quantum.h" #include "wt_rgb_backlight.h" #include "wt_rgb_backlight_api.h" #include "wt_rgb_backlight_keycodes.h" +#include +#include "quantum.h" +#include "host.h" +#include "util.h" + #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined (RGB_BACKLIGHT_KW_MEGA) #include #include "i2c_master.h" diff --git a/keyboards/wilba_tech/wt_rgb_backlight.h b/keyboards/wilba_tech/wt_rgb_backlight.h index 6fb2ee21220..56621781978 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight.h +++ b/keyboards/wilba_tech/wt_rgb_backlight.h @@ -23,6 +23,7 @@ #include #include +#include "action.h" #include "quantum/color.h" typedef struct PACKED diff --git a/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h b/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h index b8c23c4b073..79016744af9 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h +++ b/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h @@ -15,6 +15,8 @@ */ #pragma once +#include "keycodes.h" + enum wt_rgb_backlight_keycodes { BR_INC = QK_KB_0, // brightness increase BR_DEC, // brightness decrease diff --git a/keyboards/work_louder/rgb_functions.c b/keyboards/work_louder/rgb_functions.c index 36f9da013ec..bc31aab7c1f 100644 --- a/keyboards/work_louder/rgb_functions.c +++ b/keyboards/work_louder/rgb_functions.c @@ -15,6 +15,11 @@ */ #include "rgb_functions.h" +#include +#include "quantum.h" +#include "action.h" +#include "rgblight.h" +#include "rgb_matrix.h" #ifdef RGBLIGHT_ENABLE #undef WS2812_DI_PIN diff --git a/keyboards/work_louder/rgb_functions.h b/keyboards/work_louder/rgb_functions.h index 9ad7cdb19c1..eaef787a222 100644 --- a/keyboards/work_louder/rgb_functions.h +++ b/keyboards/work_louder/rgb_functions.h @@ -16,7 +16,7 @@ #pragma once -#include "quantum.h" +#include "keycodes.h" #ifndef VIA_ENABLE # ifndef RGB_MATRIX_TOGGLE diff --git a/keyboards/yushakobo/navpad/navpad_prefs.c b/keyboards/yushakobo/navpad/navpad_prefs.c index 1ffd4416744..08b7464cf95 100644 --- a/keyboards/yushakobo/navpad/navpad_prefs.c +++ b/keyboards/yushakobo/navpad/navpad_prefs.c @@ -15,6 +15,11 @@ */ #include "navpad_prefs.h" +#include "quantum.h" +#include "action.h" +#include "action_layer.h" +#include "rgblight.h" +#include "led.h" bool process_record_kb(uint16_t keycode, keyrecord_t *record) { if (!process_record_user(keycode, record)) { return false; } diff --git a/keyboards/yushakobo/navpad/navpad_prefs.h b/keyboards/yushakobo/navpad/navpad_prefs.h index d9d2286e5be..6c73e1ed07d 100644 --- a/keyboards/yushakobo/navpad/navpad_prefs.h +++ b/keyboards/yushakobo/navpad/navpad_prefs.h @@ -16,7 +16,7 @@ #pragma once -#include "quantum.h" +#include "keycodes.h" enum custom_keycodes { TAP_00 = QK_KB_0 diff --git a/keyboards/yushakobo/quick17/quick17_prefs.h b/keyboards/yushakobo/quick17/quick17_prefs.h index 25f2e1e0ae5..a498381cee5 100644 --- a/keyboards/yushakobo/quick17/quick17_prefs.h +++ b/keyboards/yushakobo/quick17/quick17_prefs.h @@ -16,7 +16,9 @@ #pragma once -#include "quantum.h" +#include +#include +#include "color.h" enum layer_names { _CONTROL, diff --git a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc index 34b410ce574..4998cce0291 100644 --- a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc +++ b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc @@ -3,6 +3,7 @@ RGB_MATRIX_EFFECT(quick17_rgbm_effect) #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS #include "quick17_prefs.h" +#include "quantum.h" #define LED_LAYOUT(\ L00, L01, L02, L03, L04, L05, \ From 62af50ceeff95a49f381130008ed03fdb0cc9362 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 3 Apr 2024 14:01:30 +0100 Subject: [PATCH 104/333] Fix failing keyboards on develop (#23406) --- .../atreus/feather/{info.json => keyboard.json} | 3 +++ .../lib/satisfaction75/satisfaction_encoder.c | 4 +++- keyboards/cipulot/ec_typek/ec_typek.c | 12 ++++++------ .../symmetric70_proto/matrix_debug/matrix.c | 2 ++ .../symmetric70_proto/matrix_fast/gpio_extr.h | 3 +++ .../handwired/symmetric70_proto/matrix_fast/matrix.c | 1 + .../matrix_fast/matrix_extension_74hc15x.c | 4 ++++ 7 files changed, 22 insertions(+), 7 deletions(-) rename keyboards/atreus/feather/{info.json => keyboard.json} (90%) diff --git a/keyboards/atreus/feather/info.json b/keyboards/atreus/feather/keyboard.json similarity index 90% rename from keyboards/atreus/feather/info.json rename to keyboards/atreus/feather/keyboard.json index 19e9654f127..7f5866e502a 100644 --- a/keyboards/atreus/feather/info.json +++ b/keyboards/atreus/feather/keyboard.json @@ -10,6 +10,9 @@ "bluetooth": true, "console": false }, + "build": { + "lto": true + }, "bluetooth": { "driver": "bluefruit_le" } diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c index 074fe262b3b..aab005ebd87 100644 --- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c +++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c @@ -2,8 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "satisfaction_core.h" -#include "backlight.h" #include "eeprom.h" +#ifdef BACKLIGHT_ENABLE +# include "backlight.h" +#endif void pre_encoder_mode_change(void){ if(encoder_mode == ENC_MODE_CLOCK_SET){ diff --git a/keyboards/cipulot/ec_typek/ec_typek.c b/keyboards/cipulot/ec_typek/ec_typek.c index 035c90303ca..7c3874d6b3f 100644 --- a/keyboards/cipulot/ec_typek/ec_typek.c +++ b/keyboards/cipulot/ec_typek/ec_typek.c @@ -101,19 +101,19 @@ layer_state_t layer_state_set_user(layer_state_t state) { */ bool indicators_callback(void) { if ((eeprom_ec_config.num.enabled) && (host_keyboard_led_state().num_lock)) - sethsv(eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]); + rgblight_sethsv_at(eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v, NUM_INDICATOR_INDEX); else - sethsv(0, 0, 0, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]); + rgblight_sethsv_at(0, 0, 0, NUM_INDICATOR_INDEX); if ((eeprom_ec_config.caps.enabled) && (host_keyboard_led_state().caps_lock)) - sethsv(eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]); + rgblight_sethsv_at(eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v, CAPS_INDICATOR_INDEX); else - sethsv(0, 0, 0, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]); + rgblight_sethsv_at(0, 0, 0, CAPS_INDICATOR_INDEX); if ((eeprom_ec_config.scroll.enabled) && (host_keyboard_led_state().scroll_lock)) - sethsv(eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]); + rgblight_sethsv_at(eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v, SCROLL_INDICATOR_INDEX); else - sethsv(0, 0, 0, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]); + rgblight_sethsv_at(0, 0, 0, SCROLL_INDICATOR_INDEX); return true; } diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c index 22d92dd99a1..d6fcb0f7939 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c +++ b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c @@ -14,7 +14,9 @@ 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 . */ +#include "atomic_util.h" #include "util.h" +#include "wait.h" #include "matrix.h" #include "debounce.h" #ifndef readPort diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h b/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h index e31cb5f3a5d..437fa93a201 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h @@ -1,4 +1,7 @@ #pragma once + +#include + // clang-format off #if defined(__AVR__) diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c index 3acbdfbeda6..842df65dbd6 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c @@ -18,6 +18,7 @@ along with this program. If not, see . #ifndef readPort # include "gpio_extr.h" #endif +#include "atomic_util.h" #include "util.h" #include "matrix.h" #include "matrix_extr.h" diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c index bca53da24c2..202454a2215 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c @@ -16,6 +16,10 @@ along with this program. If not, see . */ // clang-format off +#include "atomic_util.h" +#include "gpio.h" +#include "wait.h" + #if defined(MATRIX_EXTENSION_74HC157) # define MATRIX_DEVICES MCU_GPIOa, MCU_GPIOb # define IS_74HC15x(dev) ((dev)==MCU_GPIOa || (dev)==MCU_GPIOb) From f29daff9b6ed178d1d9c3bdb5d504ca8782f8d5a Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 3 Apr 2024 23:14:03 +0100 Subject: [PATCH 105/333] Miscellaneous keyboard.json migrations (#23378) --- .../{info.json => v1/keyboard.json} | 0 keyboards/canary/canary60rgb/v1/rules.mk | 1 - .../canary60rgb/{canary60rgb.c => v1/v1.c} | 0 .../qc60/{info.json => proto/keyboard.json} | 0 keyboards/handwired/qc60/proto/rules.mk | 1 - .../{info.json => rev1/keyboard.json} | 0 .../split_5x7/{split_5x7.c => rev1/rev1.c} | 0 .../junco/{info.json => rev1/keyboard.json} | 4 ++ keyboards/junco/rev1/rules.mk | 1 + keyboards/junco/rules.mk | 8 ---- .../{info.json => rev1/keyboard.json} | 0 keyboards/keaboard/rev1/rules.mk | 1 - keyboards/melgeek/mj65/{ => rev3}/config.h | 0 .../mj65/{info.json => rev3/keyboard.json} | 7 ++++ keyboards/melgeek/mj65/rev3/rules.mk | 13 ------- keyboards/melgeek/mojo68/rev1/config.h | 3 ++ .../mojo68/{info.json => rev1/keyboard.json} | 0 keyboards/melgeek/mojo68/rev1/rules.mk | 1 - keyboards/melgeek/mojo75/{ => rev1}/config.h | 0 .../mojo75/{info.json => rev1/keyboard.json} | 0 keyboards/melgeek/mojo75/rev1/rules.mk | 1 - keyboards/melgeek/tegic/config.h | 20 ---------- .../melgeek/{mojo68 => tegic/rev1}/config.h | 0 .../tegic/{info.json => rev1/keyboard.json} | 0 keyboards/melgeek/tegic/rev1/rules.mk | 1 - .../melgeek/z70ultra/{ => rev1}/config.h | 0 .../{info.json => rev1/keyboard.json} | 0 .../z70ultra/{z70ultra.c => rev1/rev1.c} | 0 keyboards/melgeek/z70ultra/rev1/rules.mk | 1 - keyboards/miiiw/blackio83/config.h | 20 ---------- keyboards/miiiw/blackio83/rev_0100/config.h | 3 ++ .../miiiw/blackio83/{ => rev_0100}/halconf.h | 0 .../{info.json => rev_0100/keyboard.json} | 0 .../miiiw/blackio83/{ => rev_0100}/matrix.c | 0 .../miiiw/blackio83/{ => rev_0100}/mcuconf.h | 0 .../{blackio83.c => rev_0100/rev_0100.c} | 2 +- .../{blackio83.h => rev_0100/rev_0100.h} | 0 keyboards/miiiw/blackio83/rev_0100/rules.mk | 2 - .../{info.json => rev1/keyboard.json} | 0 keyboards/murcielago/rev1/rules.mk | 1 - keyboards/polilla/{ => rev1}/chconf.h | 0 keyboards/polilla/rev1/config.h | 22 ----------- keyboards/polilla/{ => rev1}/halconf.h | 0 .../polilla/{info.json => rev1/keyboard.json} | 6 +++ keyboards/polilla/{ => rev1}/mcuconf.h | 0 keyboards/polilla/rev1/rules.mk | 1 - keyboards/qwertyydox/{ => rev1}/config.h | 5 --- .../{info.json => rev1/keyboard.json} | 10 +++++ keyboards/qwertyydox/rev1/rules.mk | 0 keyboards/qwertyydox/rules.mk | 15 ------- keyboards/spacetime/config.h | 39 ------------------- keyboards/spacetime/info.json | 6 +++ keyboards/spacetime/rev1/keyboard.json | 1 + keyboards/spacetime/rev1/rules.mk | 1 - keyboards/splitty/{ => rev1}/config.h | 0 .../splitty/{info.json => rev1/keyboard.json} | 7 ++++ keyboards/splitty/rev1/rules.mk | 0 keyboards/splitty/rules.mk | 15 ------- .../featherble/{info.json => keyboard.json} | 2 + keyboards/woodkeys/meira/info.json | 5 ++- .../woodkeys/meira/promicro/keyboard.json | 3 ++ keyboards/woodkeys/meira/rules.mk | 13 ------- 62 files changed, 57 insertions(+), 185 deletions(-) rename keyboards/canary/canary60rgb/{info.json => v1/keyboard.json} (100%) delete mode 100644 keyboards/canary/canary60rgb/v1/rules.mk rename keyboards/canary/canary60rgb/{canary60rgb.c => v1/v1.c} (100%) rename keyboards/handwired/qc60/{info.json => proto/keyboard.json} (100%) delete mode 100644 keyboards/handwired/qc60/proto/rules.mk rename keyboards/handwired/stef9998/split_5x7/{info.json => rev1/keyboard.json} (100%) rename keyboards/handwired/stef9998/split_5x7/{split_5x7.c => rev1/rev1.c} (100%) rename keyboards/junco/{info.json => rev1/keyboard.json} (98%) rename keyboards/keaboard/{info.json => rev1/keyboard.json} (100%) delete mode 100644 keyboards/keaboard/rev1/rules.mk rename keyboards/melgeek/mj65/{ => rev3}/config.h (100%) rename keyboards/melgeek/mj65/{info.json => rev3/keyboard.json} (97%) rename keyboards/melgeek/mojo68/{info.json => rev1/keyboard.json} (100%) delete mode 100755 keyboards/melgeek/mojo68/rev1/rules.mk rename keyboards/melgeek/mojo75/{ => rev1}/config.h (100%) rename keyboards/melgeek/mojo75/{info.json => rev1/keyboard.json} (100%) delete mode 100644 keyboards/melgeek/mojo75/rev1/rules.mk delete mode 100755 keyboards/melgeek/tegic/config.h rename keyboards/melgeek/{mojo68 => tegic/rev1}/config.h (100%) rename keyboards/melgeek/tegic/{info.json => rev1/keyboard.json} (100%) delete mode 100755 keyboards/melgeek/tegic/rev1/rules.mk rename keyboards/melgeek/z70ultra/{ => rev1}/config.h (100%) rename keyboards/melgeek/z70ultra/{info.json => rev1/keyboard.json} (100%) rename keyboards/melgeek/z70ultra/{z70ultra.c => rev1/rev1.c} (100%) delete mode 100644 keyboards/melgeek/z70ultra/rev1/rules.mk delete mode 100644 keyboards/miiiw/blackio83/config.h rename keyboards/miiiw/blackio83/{ => rev_0100}/halconf.h (100%) rename keyboards/miiiw/blackio83/{info.json => rev_0100/keyboard.json} (100%) rename keyboards/miiiw/blackio83/{ => rev_0100}/matrix.c (100%) rename keyboards/miiiw/blackio83/{ => rev_0100}/mcuconf.h (100%) rename keyboards/miiiw/blackio83/{blackio83.c => rev_0100/rev_0100.c} (99%) rename keyboards/miiiw/blackio83/{blackio83.h => rev_0100/rev_0100.h} (100%) rename keyboards/murcielago/{info.json => rev1/keyboard.json} (100%) delete mode 100644 keyboards/murcielago/rev1/rules.mk rename keyboards/polilla/{ => rev1}/chconf.h (100%) rename keyboards/polilla/{ => rev1}/halconf.h (100%) rename keyboards/polilla/{info.json => rev1/keyboard.json} (97%) rename keyboards/polilla/{ => rev1}/mcuconf.h (100%) delete mode 100644 keyboards/polilla/rev1/rules.mk rename keyboards/qwertyydox/{ => rev1}/config.h (87%) rename keyboards/qwertyydox/{info.json => rev1/keyboard.json} (95%) delete mode 100644 keyboards/qwertyydox/rev1/rules.mk delete mode 100644 keyboards/spacetime/config.h create mode 100644 keyboards/spacetime/rev1/keyboard.json delete mode 100644 keyboards/spacetime/rev1/rules.mk rename keyboards/splitty/{ => rev1}/config.h (100%) rename keyboards/splitty/{info.json => rev1/keyboard.json} (97%) delete mode 100644 keyboards/splitty/rev1/rules.mk rename keyboards/woodkeys/meira/featherble/{info.json => keyboard.json} (50%) create mode 100644 keyboards/woodkeys/meira/promicro/keyboard.json diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/v1/keyboard.json similarity index 100% rename from keyboards/canary/canary60rgb/info.json rename to keyboards/canary/canary60rgb/v1/keyboard.json diff --git a/keyboards/canary/canary60rgb/v1/rules.mk b/keyboards/canary/canary60rgb/v1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/canary/canary60rgb/v1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/canary/canary60rgb/canary60rgb.c b/keyboards/canary/canary60rgb/v1/v1.c similarity index 100% rename from keyboards/canary/canary60rgb/canary60rgb.c rename to keyboards/canary/canary60rgb/v1/v1.c diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/proto/keyboard.json similarity index 100% rename from keyboards/handwired/qc60/info.json rename to keyboards/handwired/qc60/proto/keyboard.json diff --git a/keyboards/handwired/qc60/proto/rules.mk b/keyboards/handwired/qc60/proto/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/qc60/proto/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json similarity index 100% rename from keyboards/handwired/stef9998/split_5x7/info.json rename to keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.c b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c similarity index 100% rename from keyboards/handwired/stef9998/split_5x7/split_5x7.c rename to keyboards/handwired/stef9998/split_5x7/rev1/rev1.c diff --git a/keyboards/junco/info.json b/keyboards/junco/rev1/keyboard.json similarity index 98% rename from keyboards/junco/info.json rename to keyboards/junco/rev1/keyboard.json index 6956ab4834b..855628d3b1c 100644 --- a/keyboards/junco/info.json +++ b/keyboards/junco/rev1/keyboard.json @@ -8,6 +8,9 @@ "pid": "0x4A13", "device_version": "1.0.0" }, + "features": { + "bootmagic": true + }, "matrix_pins": { "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7"], "rows": ["GP8", "GP9", "GP10", "GP11", "GP12"] @@ -28,6 +31,7 @@ ] }, "split": { + "enabled": true, "encoder": { "right": { "rotary": [ diff --git a/keyboards/junco/rev1/rules.mk b/keyboards/junco/rev1/rules.mk index e69de29bb2d..161ec22b16e 100644 --- a/keyboards/junco/rev1/rules.mk +++ b/keyboards/junco/rev1/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = vendor diff --git a/keyboards/junco/rules.mk b/keyboards/junco/rules.mk index a04c7822f91..bb94741e5ad 100644 --- a/keyboards/junco/rules.mk +++ b/keyboards/junco/rules.mk @@ -1,9 +1 @@ -# Split Keyboard Stuff -SPLIT_KEYBOARD = yes -SERIAL_DRIVER = vendor - -# Enable Bootmagic Lite -BOOTMAGIC_ENABLE = yes - -# Default Folder DEFAULT_FOLDER = junco/rev1 diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/rev1/keyboard.json similarity index 100% rename from keyboards/keaboard/info.json rename to keyboards/keaboard/rev1/keyboard.json diff --git a/keyboards/keaboard/rev1/rules.mk b/keyboards/keaboard/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keaboard/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/mj65/config.h b/keyboards/melgeek/mj65/rev3/config.h similarity index 100% rename from keyboards/melgeek/mj65/config.h rename to keyboards/melgeek/mj65/rev3/config.h diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/rev3/keyboard.json similarity index 97% rename from keyboards/melgeek/mj65/info.json rename to keyboards/melgeek/mj65/rev3/keyboard.json index 773c9a31984..adf0ef94bc6 100644 --- a/keyboards/melgeek/mj65/info.json +++ b/keyboards/melgeek/mj65/rev3/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/melgeek/mj65/rev3/rules.mk b/keyboards/melgeek/mj65/rev3/rules.mk index 7a3d7020d90..8b7f40c50b5 100644 --- a/keyboards/melgeek/mj65/rev3/rules.mk +++ b/keyboards/melgeek/mj65/rev3/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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix - RGB_MATRIX_SUPPORTED = yes RGBLIGHT_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/melgeek/mojo68/rev1/config.h b/keyboards/melgeek/mojo68/rev1/config.h index 960bf58c52f..829eb63fe6b 100755 --- a/keyboards/melgeek/mojo68/rev1/config.h +++ b/keyboards/melgeek/mojo68/rev1/config.h @@ -16,4 +16,7 @@ #pragma once +#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND +#define IS31FL3741_SDB_PIN B7 + #define DRIVER_INDICATOR_LED_TOTAL 3 diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/rev1/keyboard.json similarity index 100% rename from keyboards/melgeek/mojo68/info.json rename to keyboards/melgeek/mojo68/rev1/keyboard.json diff --git a/keyboards/melgeek/mojo68/rev1/rules.mk b/keyboards/melgeek/mojo68/rev1/rules.mk deleted file mode 100755 index 6e7633bfe01..00000000000 --- a/keyboards/melgeek/mojo68/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/mojo75/config.h b/keyboards/melgeek/mojo75/rev1/config.h similarity index 100% rename from keyboards/melgeek/mojo75/config.h rename to keyboards/melgeek/mojo75/rev1/config.h diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/rev1/keyboard.json similarity index 100% rename from keyboards/melgeek/mojo75/info.json rename to keyboards/melgeek/mojo75/rev1/keyboard.json diff --git a/keyboards/melgeek/mojo75/rev1/rules.mk b/keyboards/melgeek/mojo75/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/melgeek/mojo75/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/tegic/config.h b/keyboards/melgeek/tegic/config.h deleted file mode 100755 index 68088ba7453..00000000000 --- a/keyboards/melgeek/tegic/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek - * - * 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 - -#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND -#define IS31FL3741_SDB_PIN B7 diff --git a/keyboards/melgeek/mojo68/config.h b/keyboards/melgeek/tegic/rev1/config.h similarity index 100% rename from keyboards/melgeek/mojo68/config.h rename to keyboards/melgeek/tegic/rev1/config.h diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/rev1/keyboard.json similarity index 100% rename from keyboards/melgeek/tegic/info.json rename to keyboards/melgeek/tegic/rev1/keyboard.json diff --git a/keyboards/melgeek/tegic/rev1/rules.mk b/keyboards/melgeek/tegic/rev1/rules.mk deleted file mode 100755 index 6e7633bfe01..00000000000 --- a/keyboards/melgeek/tegic/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/rev1/config.h similarity index 100% rename from keyboards/melgeek/z70ultra/config.h rename to keyboards/melgeek/z70ultra/rev1/config.h diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/rev1/keyboard.json similarity index 100% rename from keyboards/melgeek/z70ultra/info.json rename to keyboards/melgeek/z70ultra/rev1/keyboard.json diff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/rev1/rev1.c similarity index 100% rename from keyboards/melgeek/z70ultra/z70ultra.c rename to keyboards/melgeek/z70ultra/rev1/rev1.c diff --git a/keyboards/melgeek/z70ultra/rev1/rules.mk b/keyboards/melgeek/z70ultra/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/melgeek/z70ultra/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/miiiw/blackio83/config.h b/keyboards/miiiw/blackio83/config.h deleted file mode 100644 index 055e8e35794..00000000000 --- a/keyboards/miiiw/blackio83/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2023 ArthurCyy - * - * 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 - -// EEPROM i2c chip -#define EEPROM_I2C_24LC256 diff --git a/keyboards/miiiw/blackio83/rev_0100/config.h b/keyboards/miiiw/blackio83/rev_0100/config.h index b1eec364edf..008d1448f2e 100644 --- a/keyboards/miiiw/blackio83/rev_0100/config.h +++ b/keyboards/miiiw/blackio83/rev_0100/config.h @@ -16,6 +16,9 @@ #pragma once +// EEPROM i2c chip +#define EEPROM_I2C_24LC256 + #define POWER_SWITCH_PIN B0 /* 16 with dummy columns for shift registers */ diff --git a/keyboards/miiiw/blackio83/halconf.h b/keyboards/miiiw/blackio83/rev_0100/halconf.h similarity index 100% rename from keyboards/miiiw/blackio83/halconf.h rename to keyboards/miiiw/blackio83/rev_0100/halconf.h diff --git a/keyboards/miiiw/blackio83/info.json b/keyboards/miiiw/blackio83/rev_0100/keyboard.json similarity index 100% rename from keyboards/miiiw/blackio83/info.json rename to keyboards/miiiw/blackio83/rev_0100/keyboard.json diff --git a/keyboards/miiiw/blackio83/matrix.c b/keyboards/miiiw/blackio83/rev_0100/matrix.c similarity index 100% rename from keyboards/miiiw/blackio83/matrix.c rename to keyboards/miiiw/blackio83/rev_0100/matrix.c diff --git a/keyboards/miiiw/blackio83/mcuconf.h b/keyboards/miiiw/blackio83/rev_0100/mcuconf.h similarity index 100% rename from keyboards/miiiw/blackio83/mcuconf.h rename to keyboards/miiiw/blackio83/rev_0100/mcuconf.h diff --git a/keyboards/miiiw/blackio83/blackio83.c b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c similarity index 99% rename from keyboards/miiiw/blackio83/blackio83.c rename to keyboards/miiiw/blackio83/rev_0100/rev_0100.c index 8c80ebd73c7..7af6861f535 100644 --- a/keyboards/miiiw/blackio83/blackio83.c +++ b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "blackio83.h" +#include "rev_0100.h" #include "usb_main.h" #include "usb_util.h" diff --git a/keyboards/miiiw/blackio83/blackio83.h b/keyboards/miiiw/blackio83/rev_0100/rev_0100.h similarity index 100% rename from keyboards/miiiw/blackio83/blackio83.h rename to keyboards/miiiw/blackio83/rev_0100/rev_0100.h diff --git a/keyboards/miiiw/blackio83/rev_0100/rules.mk b/keyboards/miiiw/blackio83/rev_0100/rules.mk index 5558efa95d7..7a361addb34 100644 --- a/keyboards/miiiw/blackio83/rev_0100/rules.mk +++ b/keyboards/miiiw/blackio83/rev_0100/rules.mk @@ -1,7 +1,5 @@ CUSTOM_MATRIX = lite -WS2812_DRIVER_REQUIRED := yes - # Project specific files SRC += matrix.c \ common/shift_register.c diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/rev1/keyboard.json similarity index 100% rename from keyboards/murcielago/info.json rename to keyboards/murcielago/rev1/keyboard.json diff --git a/keyboards/murcielago/rev1/rules.mk b/keyboards/murcielago/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/murcielago/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/polilla/chconf.h b/keyboards/polilla/rev1/chconf.h similarity index 100% rename from keyboards/polilla/chconf.h rename to keyboards/polilla/rev1/chconf.h diff --git a/keyboards/polilla/rev1/config.h b/keyboards/polilla/rev1/config.h index 3b3b9b0fb79..c2b8d7aff92 100644 --- a/keyboards/polilla/rev1/config.h +++ b/keyboards/polilla/rev1/config.h @@ -16,26 +16,4 @@ along with this program. If not, see . */ #pragma once - #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE - -/* 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/polilla/halconf.h b/keyboards/polilla/rev1/halconf.h similarity index 100% rename from keyboards/polilla/halconf.h rename to keyboards/polilla/rev1/halconf.h diff --git a/keyboards/polilla/info.json b/keyboards/polilla/rev1/keyboard.json similarity index 97% rename from keyboards/polilla/info.json rename to keyboards/polilla/rev1/keyboard.json index ea6c5aafa89..746f47963e2 100644 --- a/keyboards/polilla/info.json +++ b/keyboards/polilla/rev1/keyboard.json @@ -23,6 +23,12 @@ "diode_direction": "ROW2COL", "processor": "STM32F042", "bootloader": "stm32-dfu", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/polilla/mcuconf.h b/keyboards/polilla/rev1/mcuconf.h similarity index 100% rename from keyboards/polilla/mcuconf.h rename to keyboards/polilla/rev1/mcuconf.h diff --git a/keyboards/polilla/rev1/rules.mk b/keyboards/polilla/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/polilla/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/rev1/config.h similarity index 87% rename from keyboards/qwertyydox/config.h rename to keyboards/qwertyydox/rev1/config.h index 8e59e903ac0..e5dc39eb775 100644 --- a/keyboards/qwertyydox/config.h +++ b/keyboards/qwertyydox/rev1/config.h @@ -17,11 +17,6 @@ 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 MOUSEKEY_DELAY 150 #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_MAX_SPEED 10 diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/rev1/keyboard.json similarity index 95% rename from keyboards/qwertyydox/info.json rename to keyboards/qwertyydox/rev1/keyboard.json index 5f1eb80da84..f2a335aa027 100644 --- a/keyboards/qwertyydox/info.json +++ b/keyboards/qwertyydox/rev1/keyboard.json @@ -9,6 +9,9 @@ "pid": "0x1256", "device_version": "1.0.0" }, + "features": { + "mousekey": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"], "rows": ["B6", "B2", "B3", "B1"] @@ -36,8 +39,15 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "bootloader": "caterina", "processor": "atmega32u4", "layouts": { diff --git a/keyboards/qwertyydox/rev1/rules.mk b/keyboards/qwertyydox/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/qwertyydox/rules.mk b/keyboards/qwertyydox/rules.mk index 9bcd2f0741f..688444b5663 100644 --- a/keyboards/qwertyydox/rules.mk +++ b/keyboards/qwertyydox/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 = 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 # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = qwertyydox/rev1 diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h deleted file mode 100644 index b7ece10f6c7..00000000000 --- a/keyboards/spacetime/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Kyle Terry - -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/spacetime/info.json b/keyboards/spacetime/info.json index a55223b653a..1e04608349b 100644 --- a/keyboards/spacetime/info.json +++ b/keyboards/spacetime/info.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/spacetime/rev1/keyboard.json b/keyboards/spacetime/rev1/keyboard.json new file mode 100644 index 00000000000..0967ef424bc --- /dev/null +++ b/keyboards/spacetime/rev1/keyboard.json @@ -0,0 +1 @@ +{} diff --git a/keyboards/spacetime/rev1/rules.mk b/keyboards/spacetime/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/spacetime/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/splitty/config.h b/keyboards/splitty/rev1/config.h similarity index 100% rename from keyboards/splitty/config.h rename to keyboards/splitty/rev1/config.h diff --git a/keyboards/splitty/info.json b/keyboards/splitty/rev1/keyboard.json similarity index 97% rename from keyboards/splitty/info.json rename to keyboards/splitty/rev1/keyboard.json index 06e9c6a099f..d820993dbc5 100644 --- a/keyboards/splitty/info.json +++ b/keyboards/splitty/rev1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x6052", "device_version": "0.0.1" }, + "features": { + "mousekey": true, + "extrakey": true + }, + "split": { + "enabled": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"], "rows": ["F0", "F1", "D4", "D5", "D6"] diff --git a/keyboards/splitty/rev1/rules.mk b/keyboards/splitty/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/splitty/rules.mk b/keyboards/splitty/rules.mk index 2389937b0b8..68b3198bfba 100644 --- a/keyboards/splitty/rules.mk +++ b/keyboards/splitty/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 = 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 - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = splitty/rev1 diff --git a/keyboards/woodkeys/meira/featherble/info.json b/keyboards/woodkeys/meira/featherble/keyboard.json similarity index 50% rename from keyboards/woodkeys/meira/featherble/info.json rename to keyboards/woodkeys/meira/featherble/keyboard.json index 2ce28918df5..8dc946dd571 100644 --- a/keyboards/woodkeys/meira/featherble/info.json +++ b/keyboards/woodkeys/meira/featherble/keyboard.json @@ -1,4 +1,6 @@ { + "processor": "atmega32u4", + "bootloader": "caterina", "bluetooth": { "driver": "bluefruit_le" } diff --git a/keyboards/woodkeys/meira/info.json b/keyboards/woodkeys/meira/info.json index 5fbcc9deafc..3ad2918d8e6 100644 --- a/keyboards/woodkeys/meira/info.json +++ b/keyboards/woodkeys/meira/info.json @@ -8,8 +8,9 @@ "pid": "0x6061", "device_version": "0.0.1" }, - "processor": "atmega32u4", - "bootloader": "caterina", + "features": { + "extrakey": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/woodkeys/meira/promicro/keyboard.json b/keyboards/woodkeys/meira/promicro/keyboard.json new file mode 100644 index 00000000000..4c44b1c5bf9 --- /dev/null +++ b/keyboards/woodkeys/meira/promicro/keyboard.json @@ -0,0 +1,3 @@ +{ + "development_board": "promicro" +} diff --git a/keyboards/woodkeys/meira/rules.mk b/keyboards/woodkeys/meira/rules.mk index bad7949ec0d..423c14cfb73 100644 --- a/keyboards/woodkeys/meira/rules.mk +++ b/keyboards/woodkeys/meira/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 = 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 = yes SRC += matrix.c From 2a4c746718cf60ccf15f758a97ce51ea407432c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 Apr 2024 10:11:45 +1100 Subject: [PATCH 106/333] handwired/technicpad: fix `keyboard` in keymaps (#23408) --- keyboards/handwired/technicpad/keymaps/default/keymap.json | 2 +- keyboards/handwired/technicpad/keymaps/via/keymap.json | 2 +- keyboards/mechwild/bb40/keymaps/default/keymap.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/technicpad/keymaps/default/keymap.json b/keyboards/handwired/technicpad/keymaps/default/keymap.json index 6d544a59466..5d662bf780c 100644 --- a/keyboards/handwired/technicpad/keymaps/default/keymap.json +++ b/keyboards/handwired/technicpad/keymaps/default/keymap.json @@ -1,5 +1,5 @@ { - "keyboard": "technicpad", + "keyboard": "handwired/technicpad", "keymap": "default", "layers": [ ["KC_A", "KC_B", "KC_C", "KC_D"] diff --git a/keyboards/handwired/technicpad/keymaps/via/keymap.json b/keyboards/handwired/technicpad/keymaps/via/keymap.json index 845fff0dfba..040881546c1 100644 --- a/keyboards/handwired/technicpad/keymaps/via/keymap.json +++ b/keyboards/handwired/technicpad/keymaps/via/keymap.json @@ -1,5 +1,5 @@ { - "keyboard": "technicpad", + "keyboard": "handwired/technicpad", "keymap": "via", "config": { "features": { diff --git a/keyboards/mechwild/bb40/keymaps/default/keymap.json b/keyboards/mechwild/bb40/keymaps/default/keymap.json index 104e42483c2..7ab58982586 100644 --- a/keyboards/mechwild/bb40/keymaps/default/keymap.json +++ b/keyboards/mechwild/bb40/keymaps/default/keymap.json @@ -1,5 +1,5 @@ { - "keyboard": "mechwild/bb40", + "keyboard": "mechwild/bb40/f401", "keymap": "default", "version": 1, "layout": "LAYOUT_all", From c70ebd4a0e27009a9baf4c8f74379dae6c55b461 Mon Sep 17 00:00:00 2001 From: Taro Hayashi <87086895+Taro-Hayashi@users.noreply.github.com> Date: Thu, 4 Apr 2024 12:39:02 +0900 Subject: [PATCH 107/333] Fix pointing_device_set_cpi_on_side() (#23391) Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- quantum/pointing_device/pointing_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c index bcced166c0d..4682aceb14d 100644 --- a/quantum/pointing_device/pointing_device.c +++ b/quantum/pointing_device/pointing_device.c @@ -368,7 +368,7 @@ void pointing_device_set_cpi(uint16_t cpi) { * @param[in] cpi uint16_t value. */ void pointing_device_set_cpi_on_side(bool left, uint16_t cpi) { - bool local = (is_keyboard_left() & left) ? true : false; + bool local = (is_keyboard_left() == left); if (local) { pointing_device_driver.set_cpi(cpi); } else { From b9b8ff830276c9d6a323c55a16334601f5c9b7db Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 3 Apr 2024 23:44:20 -0700 Subject: [PATCH 108/333] Fix malformed JSON in `layouts/default/ortho_5x10/info.json` (#23414) --- layouts/default/ortho_5x10/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/default/ortho_5x10/info.json b/layouts/default/ortho_5x10/info.json index 0c4cb9bb498..cf02fd618ae 100644 --- a/layouts/default/ortho_5x10/info.json +++ b/layouts/default/ortho_5x10/info.json @@ -58,7 +58,7 @@ {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, - {"x":9, "y":4}, + {"x":9, "y":4} ] } } From 2a25e79760a7c760e1fbda0ad21f1c9b6f7ec0b1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 5 Apr 2024 01:16:27 +1100 Subject: [PATCH 109/333] Remove deprecated quantum keycodes (#23407) --- docs/feature_sequencer.md | 2 +- .../ghost_squid/keymaps/default/keymap.c | 2 +- .../keymaps/default/keymap.c | 2 +- .../kd83a_bfg_edition/keymaps/via/keymap.c | 2 +- .../keymaps/default/keymap.c | 2 +- .../kd87a_bfg_edition/keymaps/via/keymap.c | 2 +- keyboards/durgod/dgk6x/dgk6x.c | 2 +- .../dgk6x/galaxy/keymaps/default/keymap.json | 2 +- .../dgk6x/galaxy/keymaps/via/keymap.json | 2 +- .../hades_ansi/keymaps/default/keymap.json | 2 +- .../dgk6x/hades_ansi/keymaps/via/keymap.json | 2 +- .../hades_iso/keymaps/default/keymap.json | 2 +- .../dgk6x/hades_iso/keymaps/via/keymap.json | 2 +- .../dgk6x/venus/keymaps/default/keymap.json | 2 +- .../dgk6x/venus/keymaps/via/keymap.json | 2 +- keyboards/durgod/k310/k310.c | 2 +- .../durgod/k310/keymaps/default/keymap.json | 2 +- keyboards/durgod/k310/keymaps/via/keymap.c | 2 +- keyboards/durgod/k320/k320.c | 2 +- .../durgod/k320/keymaps/default/keymap.json | 2 +- keyboards/durgod/k320/keymaps/via/keymap.c | 2 +- keyboards/feker/ik75/keymaps/default/keymap.c | 2 +- keyboards/feker/ik75/keymaps/via/keymap.c | 2 +- .../horizon_z/keymaps/default/keymap.c | 2 +- .../flashquark/horizon_z/keymaps/via/keymap.c | 2 +- .../for_science/keymaps/default/keymap.c | 2 +- .../walnut/keymaps/default/keymap.c | 2 +- .../walnut/keymaps/default_ansi/keymap.c | 2 +- .../walnut/keymaps/default_iso/keymap.c | 2 +- .../frooastboard/walnut/keymaps/via/keymap.c | 2 +- .../polly40/keymaps/default/keymap.c | 2 +- .../riblee_f401/keymaps/default/keymap.c | 2 +- .../riblee_f411/keymaps/default/keymap.c | 2 +- .../jadookb/jkb65/keymaps/default/keymap.c | 2 +- keyboards/jadookb/jkb65/keymaps/via/keymap.c | 2 +- .../jukaie/jk01/keymaps/default/keymap.c | 2 +- keyboards/jukaie/jk01/keymaps/via/keymap.c | 2 +- .../kiwikeebs/macro/keymaps/default/keymap.c | 2 +- .../kiwikeebs/macro/keymaps/via/keymap.c | 2 +- .../macro_v2/keymaps/default/keymap.c | 2 +- .../kiwikeebs/macro_v2/keymaps/via/keymap.c | 2 +- .../longnald/corin/keymaps/default/keymap.c | 4 +- .../miller/gm862/keymaps/default/keymap.c | 2 +- keyboards/miller/gm862/keymaps/via/keymap.c | 2 +- .../monsgeek/m5/keymaps/default/keymap.c | 2 +- .../had60/keymaps/default/keymap.c | 4 +- .../senselessclay/had60/keymaps/iso/keymap.c | 4 +- .../senselessclay/had60/keymaps/via/keymap.c | 4 +- .../native/ansi/keymaps/default/keymap.c | 2 +- .../native/ansi/keymaps/perfmode/keymap.c | 2 +- .../teleport/native/ansi/keymaps/via/keymap.c | 2 +- .../native/iso/keymaps/default/keymap.c | 2 +- .../native/iso/keymaps/perfmode/keymap.c | 2 +- .../teleport/native/iso/keymaps/via/keymap.c | 2 +- keyboards/teleport/tkl/keymaps/ansi/keymap.c | 2 +- .../teleport/tkl/keymaps/default/keymap.c | 2 +- keyboards/teleport/tkl/keymaps/iso/keymap.c | 2 +- keyboards/teleport/tkl/keymaps/via/keymap.c | 2 +- keyboards/viendi8l/keymaps/default/keymap.c | 2 +- keyboards/viendi8l/keymaps/via/keymap.c | 2 +- .../keymaps/default/keymap.c | 7 +-- .../buff67v3/keymaps/default/keymap.c | 2 +- .../yandrstudio/buff67v3/keymaps/via/keymap.c | 2 +- .../yandrstudio/nz64/keymaps/default/keymap.c | 2 +- .../yandrstudio/nz64/keymaps/via/keymap.c | 2 +- .../nz67v2/keymaps/default/keymap.c | 2 +- .../yandrstudio/nz67v2/keymaps/via/keymap.c | 2 +- .../wave75/keymaps/default/keymap.c | 2 +- .../yandrstudio/wave75/keymaps/via/keymap.c | 2 +- .../yr6095/keymaps/default/keymap.c | 2 +- .../yandrstudio/yr6095/keymaps/via/keymap.c | 2 +- .../quick17/keymaps/default/keymap.c | 2 +- .../yushakobo/quick17/keymaps/via/keymap.c | 2 +- quantum/quantum_keycodes_legacy.h | 53 ------------------- 74 files changed, 78 insertions(+), 134 deletions(-) diff --git a/docs/feature_sequencer.md b/docs/feature_sequencer.md index 87a277400a2..3af55197c54 100644 --- a/docs/feature_sequencer.md +++ b/docs/feature_sequencer.md @@ -44,7 +44,7 @@ While the tempo defines the absolute speed at which the sequencer goes through t |-------------------------------|---------|---------------------------------------------------| |`QK_SEQUENCER_ON` |`SQ_ON` |Start the step sequencer | |`QK_SEQUENCER_OFF` |`SQ_OFF` |Stop the step sequencer | -|`QK_SEQUENCER_TOGGLE` |`SQ_TOG` |Toggle the step sequencer playback | +|`QK_SEQUENCER_TOGGLE` |`SQ_TOGG`|Toggle the step sequencer playback | |`QK_SEQUENCER_STEPS_ALL` |`SQ_SALL`|Enable all the steps | |`QK_SEQUENCER_STEPS_CLEAR` |`SQ_SCLR`|Disable all the steps | |`QK_SEQUENCER_TEMPO_DOWN` |`SQ_TMPD`|Decrease the tempo | diff --git a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c index f53bdd83377..52305bba744 100644 --- a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c +++ b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer 1: Function layer */ [_MD] = LAYOUT_fullsize_iso( - _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, GUI_TOG, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, QK_BOOT, + _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, GU_TOGG, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c b/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c index 78324c69426..0d426d3c9ac 100644 --- a/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c +++ b/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, TO(Win), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(Mac), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), [Macfn] = LAYOUT( QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RGB_MOD, diff --git a/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c b/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c index 78324c69426..0d426d3c9ac 100644 --- a/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c +++ b/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, TO(Win), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(Mac), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), [Macfn] = LAYOUT( QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RGB_MOD, diff --git a/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c b/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c index 4abb1bdc915..5f475caa1b6 100644 --- a/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c +++ b/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, TO(Win), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(Mac), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), [Macfn] = LAYOUT_tkl_ansi( QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c index 71fbfa4ff20..300855c452f 100644 --- a/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c +++ b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, TO(Win), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(Mac), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), [Macfn] = LAYOUT_tkl_ansi( QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/durgod/dgk6x/dgk6x.c b/keyboards/durgod/dgk6x/dgk6x.c index 649821c5f23..b7f1da778d9 100644 --- a/keyboards/durgod/dgk6x/dgk6x.c +++ b/keyboards/durgod/dgk6x/dgk6x.c @@ -41,7 +41,7 @@ void led_init_ports(void) { #ifndef WINLOCK_DISABLED bool process_record_kb(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case GUI_TOG: + case GU_TOGG: if (record->event.pressed) { // Toggle LED on key press togglePin(LED_WIN_LOCK_PIN); diff --git a/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json index c40cfac3030..83b285786d6 100644 --- a/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json +++ b/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json @@ -17,7 +17,7 @@ "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_TRNS", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_TRNS", "KC_TRNS" ], [ "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_RMOD","RGB_MOD", "RGB_TOG", diff --git a/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json index e8073ff800d..7cd7bd3d325 100644 --- a/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json +++ b/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json @@ -17,7 +17,7 @@ "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_TRNS", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_TRNS", "KC_TRNS" ], [ "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_RMOD","RGB_MOD", "RGB_TOG", diff --git a/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json index e3b969149ac..fc2a11b35cd 100644 --- a/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json +++ b/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json @@ -15,7 +15,7 @@ "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" ], [ "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS", diff --git a/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json index 7c25f6efb07..82c3d528327 100644 --- a/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json +++ b/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json @@ -15,7 +15,7 @@ "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" ], [ "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS", diff --git a/keyboards/durgod/dgk6x/hades_iso/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/hades_iso/keymaps/default/keymap.json index 774c010206a..f3ecd2cc9b6 100644 --- a/keyboards/durgod/dgk6x/hades_iso/keymaps/default/keymap.json +++ b/keyboards/durgod/dgk6x/hades_iso/keymaps/default/keymap.json @@ -15,7 +15,7 @@ "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" ], [ "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS", diff --git a/keyboards/durgod/dgk6x/hades_iso/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/hades_iso/keymaps/via/keymap.json index c9d5e7b843d..cffa5affd91 100644 --- a/keyboards/durgod/dgk6x/hades_iso/keymaps/via/keymap.json +++ b/keyboards/durgod/dgk6x/hades_iso/keymaps/via/keymap.json @@ -15,7 +15,7 @@ "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" ], [ "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS", diff --git a/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json index e7ef2e9d4bf..ff3f85d9e48 100644 --- a/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json +++ b/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json @@ -15,7 +15,7 @@ "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_INS", "KC_HOME", "KC_END", "KC_DEL", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT","KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_PGDN", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS" ], [ "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", diff --git a/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json index fd456255341..0243dc33ddb 100644 --- a/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json +++ b/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json @@ -15,7 +15,7 @@ "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_INS", "KC_HOME", "KC_END", "KC_DEL", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT","KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_PGDN", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS" ], [ "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", diff --git a/keyboards/durgod/k310/k310.c b/keyboards/durgod/k310/k310.c index cf2b618158f..a88100be20b 100644 --- a/keyboards/durgod/k310/k310.c +++ b/keyboards/durgod/k310/k310.c @@ -55,7 +55,7 @@ void led_init_ports(void) { #ifndef WINLOCK_DISABLED bool process_record_kb(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case GUI_TOG: + case GU_TOGG: if (record->event.pressed) { // Toggle LED on key press togglePin(LED_WIN_LOCK_PIN); diff --git a/keyboards/durgod/k310/keymaps/default/keymap.json b/keyboards/durgod/k310/keymaps/default/keymap.json index 7b9c0e7efbe..1731eca6ede 100644 --- a/keyboards/durgod/k310/keymaps/default/keymap.json +++ b/keyboards/durgod/k310/keymaps/default/keymap.json @@ -17,7 +17,7 @@ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "GUI_TOG", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" + "_______", "GU_TOGG", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" ] ], "author": "tylert", diff --git a/keyboards/durgod/k310/keymaps/via/keymap.c b/keyboards/durgod/k310/keymaps/via/keymap.c index c2f0ebd65f3..11d50c93823 100644 --- a/keyboards/durgod/k310/keymaps/via/keymap.c +++ b/keyboards/durgod/k310/keymaps/via/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, GUI_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_LAYER3] = LAYOUT_all( /* Layer 3 */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/durgod/k320/k320.c b/keyboards/durgod/k320/k320.c index 98527ba1b58..c1b9701d7b7 100644 --- a/keyboards/durgod/k320/k320.c +++ b/keyboards/durgod/k320/k320.c @@ -55,7 +55,7 @@ void led_init_ports(void) { #ifndef WINLOCK_DISABLED bool process_record_kb(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case GUI_TOG: + case GU_TOGG: if (record->event.pressed) { // Toggle LED on key press togglePin(LED_WIN_LOCK_PIN); diff --git a/keyboards/durgod/k320/keymaps/default/keymap.json b/keyboards/durgod/k320/keymaps/default/keymap.json index f3bc38a49b1..ba474f40443 100644 --- a/keyboards/durgod/k320/keymaps/default/keymap.json +++ b/keyboards/durgod/k320/keymaps/default/keymap.json @@ -17,7 +17,7 @@ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "GUI_TOG", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" + "_______", "GU_TOGG", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" ] ], "author": "tylert", diff --git a/keyboards/durgod/k320/keymaps/via/keymap.c b/keyboards/durgod/k320/keymaps/via/keymap.c index f91e752a292..7597089d0cb 100644 --- a/keyboards/durgod/k320/keymaps/via/keymap.c +++ b/keyboards/durgod/k320/keymaps/via/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, GUI_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_LAYER3] = LAYOUT_all( /* Layer 3 */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/feker/ik75/keymaps/default/keymap.c b/keyboards/feker/ik75/keymaps/default/keymap.c index f6ca00552ec..0ba5c774db0 100644 --- a/keyboards/feker/ik75/keymaps/default/keymap.c +++ b/keyboards/feker/ik75/keymaps/default/keymap.c @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, RGB_HUI, _______, _______, KC_SCRL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, _______, _______, _______, _______, _______, _______, KC_NUM, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, - _______, GUI_TOG, _______, _______, _______, _______, _______, _______, RGB_VAD, _______ + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_VAD, _______ ), }; diff --git a/keyboards/feker/ik75/keymaps/via/keymap.c b/keyboards/feker/ik75/keymaps/via/keymap.c index e9a221cb3f9..71c82c2e2d7 100644 --- a/keyboards/feker/ik75/keymaps/via/keymap.c +++ b/keyboards/feker/ik75/keymaps/via/keymap.c @@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, RGB_HUI, _______, _______, KC_SCRL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, _______, _______, _______, _______, _______, _______, KC_NUM, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, - _______, GUI_TOG, _______, _______, _______, _______, _______, _______, RGB_VAD, _______ + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_VAD, _______ ), /* diff --git a/keyboards/flashquark/horizon_z/keymaps/default/keymap.c b/keyboards/flashquark/horizon_z/keymaps/default/keymap.c index 1ab95c54a56..5b8838c3b2a 100755 --- a/keyboards/flashquark/horizon_z/keymaps/default/keymap.c +++ b/keyboards/flashquark/horizon_z/keymaps/default/keymap.c @@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL , KC_TRNS, RGB_TOG, KC_UP, RGB_MOD, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT , KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, - KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, + KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; \ No newline at end of file diff --git a/keyboards/flashquark/horizon_z/keymaps/via/keymap.c b/keyboards/flashquark/horizon_z/keymaps/via/keymap.c index 1ab95c54a56..5b8838c3b2a 100755 --- a/keyboards/flashquark/horizon_z/keymaps/via/keymap.c +++ b/keyboards/flashquark/horizon_z/keymaps/via/keymap.c @@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL , KC_TRNS, RGB_TOG, KC_UP, RGB_MOD, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT , KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, - KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, + KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; \ No newline at end of file diff --git a/keyboards/for_science/keymaps/default/keymap.c b/keyboards/for_science/keymaps/default/keymap.c index 7da986a0292..15b1a01d474 100644 --- a/keyboards/for_science/keymaps/default/keymap.c +++ b/keyboards/for_science/keymaps/default/keymap.c @@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FUNCT] = LAYOUT_split_4x5_3( - QK_BOOT, _______, _______, _______, LOCK, MAC_LCK, _______, _______, _______, MAGIC_SWAP_LALT_LGUI, + QK_BOOT, _______, _______, _______, LOCK, MAC_LCK, _______, _______, _______, AG_LSWP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/frooastboard/walnut/keymaps/default/keymap.c b/keyboards/frooastboard/walnut/keymaps/default/keymap.c index 195b3c150bb..57058d5de72 100644 --- a/keyboards/frooastboard/walnut/keymaps/default/keymap.c +++ b/keyboards/frooastboard/walnut/keymaps/default/keymap.c @@ -16,5 +16,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) }; diff --git a/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c b/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c index f28645cf2f2..b9abd07d7d3 100644 --- a/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c +++ b/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c @@ -16,5 +16,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) }; diff --git a/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c b/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c index f42b67db2db..e6dd393f15c 100644 --- a/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c +++ b/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c @@ -16,5 +16,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) }; diff --git a/keyboards/frooastboard/walnut/keymaps/via/keymap.c b/keyboards/frooastboard/walnut/keymaps/via/keymap.c index f5022057612..1fdc5a100df 100644 --- a/keyboards/frooastboard/walnut/keymaps/via/keymap.c +++ b/keyboards/frooastboard/walnut/keymaps/via/keymap.c @@ -16,5 +16,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) }; \ No newline at end of file diff --git a/keyboards/handwired/polly40/keymaps/default/keymap.c b/keyboards/handwired/polly40/keymaps/default/keymap.c index a89e438ae8b..b1ef23bc289 100644 --- a/keyboards/handwired/polly40/keymaps/default/keymap.c +++ b/keyboards/handwired/polly40/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_ENT, - KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, LSG(KC_S), MAGIC_TOGGLE_NKRO, KC_COMM, KC_DOT, KC_SLSH, KC_PGUP, _______, + KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, LSG(KC_S), NK_TOGG, KC_COMM, KC_DOT, KC_SLSH, KC_PGUP, _______, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_PGDN, _______ ), diff --git a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c index d3fadcace20..f39f439c50e 100644 --- a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c +++ b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c @@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, - _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, _______, _______, _______, + _______, _______, _______, _______, _______, _______, NK_TOGG, CG_LSWP, CG_LNRM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c index c1ff5682fcb..74308a1c19f 100644 --- a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c +++ b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c @@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, - _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, _______, _______, _______, + _______, _______, _______, _______, _______, _______, NK_TOGG, CG_LSWP, CG_LNRM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/jadookb/jkb65/keymaps/default/keymap.c b/keyboards/jadookb/jkb65/keymaps/default/keymap.c index 22016cea763..14055736cdb 100644 --- a/keyboards/jadookb/jkb65/keymaps/default/keymap.c +++ b/keyboards/jadookb/jkb65/keymaps/default/keymap.c @@ -32,6 +32,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_RMOD, RGB_HUI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - MAGIC_UNNO_GUI,MAGIC_NO_GUI, _______, RGB_TOG, _______, MO(2), RGB_SPD, RGB_VAD, RGB_SPI + GU_ON, GU_OFF, _______, RGB_TOG, _______, MO(2), RGB_SPD, RGB_VAD, RGB_SPI ) }; diff --git a/keyboards/jadookb/jkb65/keymaps/via/keymap.c b/keyboards/jadookb/jkb65/keymaps/via/keymap.c index 950410d1aff..d96f2bbce3d 100644 --- a/keyboards/jadookb/jkb65/keymaps/via/keymap.c +++ b/keyboards/jadookb/jkb65/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_RMOD, RGB_HUI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - MAGIC_UNNO_GUI,MAGIC_NO_GUI, _______, RGB_TOG, _______, MO(2), RGB_SPD, RGB_VAD, RGB_SPI + GU_ON, GU_OFF, _______, RGB_TOG, _______, MO(2), RGB_SPD, RGB_VAD, RGB_SPI ), [2] = LAYOUT_65_ansi_blocker( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/jukaie/jk01/keymaps/default/keymap.c b/keyboards/jukaie/jk01/keymaps/default/keymap.c index bdf509a8e89..156fb77d697 100644 --- a/keyboards/jukaie/jk01/keymaps/default/keymap.c +++ b/keyboards/jukaie/jk01/keymaps/default/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, TO(Win), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(Mac), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), [Macfn] = LAYOUT( QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RGB_MOD, diff --git a/keyboards/jukaie/jk01/keymaps/via/keymap.c b/keyboards/jukaie/jk01/keymaps/via/keymap.c index bdf509a8e89..156fb77d697 100644 --- a/keyboards/jukaie/jk01/keymaps/via/keymap.c +++ b/keyboards/jukaie/jk01/keymaps/via/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, TO(Win), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(Mac), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), [Macfn] = LAYOUT( QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RGB_MOD, diff --git a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c index b7f98c68caf..77c3603f8a5 100644 --- a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c +++ b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT( QK_BOOT, KC_UP, _______, - KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO + KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG ), [_FN2] = LAYOUT( _______, _______, _______, diff --git a/keyboards/kiwikeebs/macro/keymaps/via/keymap.c b/keyboards/kiwikeebs/macro/keymaps/via/keymap.c index 0641efab59b..4aa89cab951 100644 --- a/keyboards/kiwikeebs/macro/keymaps/via/keymap.c +++ b/keyboards/kiwikeebs/macro/keymaps/via/keymap.c @@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT( QK_BOOT, KC_UP, _______, - KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO + KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG ) }; diff --git a/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c index bfe8208a8b4..0c66b20c915 100644 --- a/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c +++ b/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT( QK_BOOT, KC_UP, _______, - KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO + KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG ), [_FN2] = LAYOUT( _______, _______, _______, diff --git a/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c b/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c index 0641efab59b..4aa89cab951 100644 --- a/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c +++ b/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c @@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT( QK_BOOT, KC_UP, _______, - KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO + KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG ) }; diff --git a/keyboards/longnald/corin/keymaps/default/keymap.c b/keyboards/longnald/corin/keymaps/default/keymap.c index a16bfde7c25..9fcdaa222fb 100644 --- a/keyboards/longnald/corin/keymaps/default/keymap.c +++ b/keyboards/longnald/corin/keymaps/default/keymap.c @@ -34,9 +34,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [2] = LAYOUT_64_ansi( KC_NO, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_G, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, KC_NO, - KC_NO, KC_NO, LAG_NRM, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, AG_LNRM, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LAG_SWP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, AG_LSWP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO ), [3] = LAYOUT_64_ansi( diff --git a/keyboards/miller/gm862/keymaps/default/keymap.c b/keyboards/miller/gm862/keymaps/default/keymap.c index 07b3acee9b9..2eb134f53da 100644 --- a/keyboards/miller/gm862/keymaps/default/keymap.c +++ b/keyboards/miller/gm862/keymaps/default/keymap.c @@ -12,6 +12,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL , KC_TRNS, RGB_TOG, KC_UP, RGB_MOD, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT , KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, - KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, + KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; \ No newline at end of file diff --git a/keyboards/miller/gm862/keymaps/via/keymap.c b/keyboards/miller/gm862/keymaps/via/keymap.c index 07b3acee9b9..2eb134f53da 100644 --- a/keyboards/miller/gm862/keymaps/via/keymap.c +++ b/keyboards/miller/gm862/keymaps/via/keymap.c @@ -12,6 +12,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL , KC_TRNS, RGB_TOG, KC_UP, RGB_MOD, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT , KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, - KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, + KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; \ No newline at end of file diff --git a/keyboards/monsgeek/m5/keymaps/default/keymap.c b/keyboards/monsgeek/m5/keymaps/default/keymap.c index 28c433736cc..6fe98a89d6c 100644 --- a/keyboards/monsgeek/m5/keymaps/default/keymap.c +++ b/keyboards/monsgeek/m5/keymaps/default/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______,TG(WIN_WASD),_______,_______,_______,_______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______, - _______, GUI_TOG, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI, _______, _______), + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI, _______, _______), [MAC_B] = LAYOUT( /* Base */ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PSCR, KC_SCRL, KC_PAUS, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, diff --git a/keyboards/senselessclay/had60/keymaps/default/keymap.c b/keyboards/senselessclay/had60/keymaps/default/keymap.c index 5f9d5247660..9c70873acf1 100644 --- a/keyboards/senselessclay/had60/keymaps/default/keymap.c +++ b/keyboards/senselessclay/had60/keymaps/default/keymap.c @@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT_all( - MAGIC_NO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, - MAGIC_UNNO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, + GU_OFF, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, + GU_ON, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/senselessclay/had60/keymaps/iso/keymap.c b/keyboards/senselessclay/had60/keymaps/iso/keymap.c index 3c1323050ed..0324df5e87a 100644 --- a/keyboards/senselessclay/had60/keymaps/iso/keymap.c +++ b/keyboards/senselessclay/had60/keymaps/iso/keymap.c @@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT_all( - MAGIC_NO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, - MAGIC_UNNO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, + GU_OFF, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, + GU_ON, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/senselessclay/had60/keymaps/via/keymap.c b/keyboards/senselessclay/had60/keymaps/via/keymap.c index ed21d8bad5a..11ec292b6c3 100644 --- a/keyboards/senselessclay/had60/keymaps/via/keymap.c +++ b/keyboards/senselessclay/had60/keymaps/via/keymap.c @@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [_2] = LAYOUT_all( - MAGIC_NO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, - MAGIC_UNNO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, + GU_OFF, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, + GU_ON, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/teleport/native/ansi/keymaps/default/keymap.c b/keyboards/teleport/native/ansi/keymaps/default/keymap.c index 2780fdda7dd..60983df4351 100644 --- a/keyboards/teleport/native/ansi/keymaps/default/keymap.c +++ b/keyboards/teleport/native/ansi/keymaps/default/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c b/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c index e34f0f9d164..aa5c7a0f993 100644 --- a/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c +++ b/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c @@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, RGB_M_P, RGB_M_2, RGB_M_3, RGB_M_4, RGB_M_5, RGB_M_6, RGB_M_7, RGB_M_8, RGB_M_9, RGB_M_0, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME),KC_TRNS, TO(PERF), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/teleport/native/ansi/keymaps/via/keymap.c b/keyboards/teleport/native/ansi/keymaps/via/keymap.c index 95a5bc58b13..17c566d47c2 100644 --- a/keyboards/teleport/native/ansi/keymaps/via/keymap.c +++ b/keyboards/teleport/native/ansi/keymaps/via/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/teleport/native/iso/keymaps/default/keymap.c b/keyboards/teleport/native/iso/keymaps/default/keymap.c index b6f2e7ab82f..68105f0a021 100644 --- a/keyboards/teleport/native/iso/keymaps/default/keymap.c +++ b/keyboards/teleport/native/iso/keymaps/default/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c b/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c index ca311edf5e1..96018a2fb82 100644 --- a/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c +++ b/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c @@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, RGB_M_P, RGB_M_2, RGB_M_3, RGB_M_4, RGB_M_5, RGB_M_6, RGB_M_7, RGB_M_8, RGB_M_9, RGB_M_0, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME),KC_TRNS, TO(PERF), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/teleport/native/iso/keymaps/via/keymap.c b/keyboards/teleport/native/iso/keymaps/via/keymap.c index b6f2e7ab82f..68105f0a021 100644 --- a/keyboards/teleport/native/iso/keymaps/via/keymap.c +++ b/keyboards/teleport/native/iso/keymaps/via/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/teleport/tkl/keymaps/ansi/keymap.c b/keyboards/teleport/tkl/keymaps/ansi/keymap.c index ed8255aaf25..735270fb0b2 100644 --- a/keyboards/teleport/tkl/keymaps/ansi/keymap.c +++ b/keyboards/teleport/tkl/keymaps/ansi/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/teleport/tkl/keymaps/default/keymap.c b/keyboards/teleport/tkl/keymaps/default/keymap.c index 76a4fc7aa6d..0568b79c771 100644 --- a/keyboards/teleport/tkl/keymaps/default/keymap.c +++ b/keyboards/teleport/tkl/keymaps/default/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/teleport/tkl/keymaps/iso/keymap.c b/keyboards/teleport/tkl/keymaps/iso/keymap.c index fdadd4ea24a..d5de75f130a 100644 --- a/keyboards/teleport/tkl/keymaps/iso/keymap.c +++ b/keyboards/teleport/tkl/keymaps/iso/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/teleport/tkl/keymaps/via/keymap.c b/keyboards/teleport/tkl/keymaps/via/keymap.c index 76a4fc7aa6d..0568b79c771 100644 --- a/keyboards/teleport/tkl/keymaps/via/keymap.c +++ b/keyboards/teleport/tkl/keymaps/via/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/viendi8l/keymaps/default/keymap.c b/keyboards/viendi8l/keymaps/default/keymap.c index 0a2f96c20be..40ac1fb8986 100755 --- a/keyboards/viendi8l/keymaps/default/keymap.c +++ b/keyboards/viendi8l/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MINS, KC_F7, KC_F8, KC_F9, KC_TAB, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, KC_DEL, KC_EQL, KC_F4, KC_F5, KC_F6, _______, KC_HOME, KC_PGDN, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, - XXXXXXX, KC_CALC, KC_CALC, KC_DEL, XXXXXXX, GUI_TOG, KC_SLEP, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX + XXXXXXX, KC_CALC, KC_CALC, KC_DEL, XXXXXXX, GU_TOGG, KC_SLEP, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX ) }; diff --git a/keyboards/viendi8l/keymaps/via/keymap.c b/keyboards/viendi8l/keymaps/via/keymap.c index 59adaa62417..4989ba89db4 100755 --- a/keyboards/viendi8l/keymaps/via/keymap.c +++ b/keyboards/viendi8l/keymaps/via/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MINS, KC_F7, KC_F8, KC_F9, KC_TAB, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, KC_DEL, KC_EQL, KC_F4, KC_F5, KC_F6, _______, KC_HOME, KC_PGDN, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, - XXXXXXX, KC_CALC, KC_CALC, KC_DEL, XXXXXXX, GUI_TOG, KC_SLEP, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX + XXXXXXX, KC_CALC, KC_CALC, KC_DEL, XXXXXXX, GU_TOGG, KC_SLEP, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX ), [3] = LAYOUT_all( diff --git a/keyboards/vitamins_included/keymaps/default/keymap.c b/keyboards/vitamins_included/keymaps/default/keymap.c index 59903b1a6f7..0f90fe22bdb 100644 --- a/keyboards/vitamins_included/keymaps/default/keymap.c +++ b/keyboards/vitamins_included/keymaps/default/keymap.c @@ -1,8 +1,5 @@ #include QMK_KEYBOARD_H -#define TG_NKRO MAGIC_TOGGLE_NKRO - - // Layer names enum layer_names { @@ -94,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, QK_BOOT, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______, - TG_NKRO, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + NK_TOGG, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), /* Raise @@ -111,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT_ortho_4x12( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, TG_NKRO, QK_BOOT, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, NK_TOGG, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), diff --git a/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c b/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c index 276c0738895..d802dd3c05b 100644 --- a/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c b/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c index 7ee3017117f..2d60e61302a 100644 --- a/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, GUI_TOG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS, GU_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/yandrstudio/nz64/keymaps/default/keymap.c b/keyboards/yandrstudio/nz64/keymaps/default/keymap.c index 3ecbcf83621..9283a3f9751 100644 --- a/keyboards/yandrstudio/nz64/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/nz64/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_GRV , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/nz64/keymaps/via/keymap.c b/keyboards/yandrstudio/nz64/keymaps/via/keymap.c index 284a06cacd6..c9817118187 100644 --- a/keyboards/yandrstudio/nz64/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/nz64/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_GRV , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT( diff --git a/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c index f1069c37db6..522b8d1043d 100644 --- a/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c index 52e0d15c8e5..d417fdb8ba8 100644 --- a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT_all( diff --git a/keyboards/yandrstudio/wave75/keymaps/default/keymap.c b/keyboards/yandrstudio/wave75/keymaps/default/keymap.c index d9201d06cf6..766d1421e11 100644 --- a/keyboards/yandrstudio/wave75/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/wave75/keymaps/default/keymap.c @@ -30,5 +30,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/wave75/keymaps/via/keymap.c b/keyboards/yandrstudio/wave75/keymaps/via/keymap.c index 47b133af1e2..56f2c6229d5 100644 --- a/keyboards/yandrstudio/wave75/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/wave75/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c b/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c index 3347731f2bb..812270b13bd 100644 --- a/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c @@ -27,5 +27,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c b/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c index 7bb2ef62657..50b4ed8d353 100644 --- a/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index d1b27cd94e2..134f48965d0 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_VOLU, KC_CAPS,KC_NUM, KC_NO, RGB_MOD,KC_MPRV,KC_VOLD, - CG_NORM,LCG_SWP,EE_CLR, QK_BOOT, TO(0), KC_MUTE + CG_NORM,CG_LSWP,EE_CLR, QK_BOOT, TO(0), KC_MUTE ) }; diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c index d1b27cd94e2..134f48965d0 100644 --- a/keyboards/yushakobo/quick17/keymaps/via/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_VOLU, KC_CAPS,KC_NUM, KC_NO, RGB_MOD,KC_MPRV,KC_VOLD, - CG_NORM,LCG_SWP,EE_CLR, QK_BOOT, TO(0), KC_MUTE + CG_NORM,CG_LSWP,EE_CLR, QK_BOOT, TO(0), KC_MUTE ) }; diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h index 260ac1c8a44..51ec77bae0f 100644 --- a/quantum/quantum_keycodes_legacy.h +++ b/quantum/quantum_keycodes_legacy.h @@ -3,56 +3,3 @@ // clang-format off // Deprecated Quantum keycodes -#define SH_TG QK_SWAP_HANDS_TOGGLE -#define SQ_TOG QK_SEQUENCER_TOGGLE - -#define MAGIC_SWAP_CONTROL_CAPSLOCK QK_MAGIC_SWAP_CONTROL_CAPS_LOCK -#define MAGIC_UNSWAP_CONTROL_CAPSLOCK QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK -#define MAGIC_TOGGLE_CONTROL_CAPSLOCK QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK -#define MAGIC_UNCAPSLOCK_TO_CONTROL QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF -#define MAGIC_CAPSLOCK_TO_CONTROL QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON -#define MAGIC_SWAP_LALT_LGUI QK_MAGIC_SWAP_LALT_LGUI -#define MAGIC_UNSWAP_LALT_LGUI QK_MAGIC_UNSWAP_LALT_LGUI -#define MAGIC_SWAP_RALT_RGUI QK_MAGIC_SWAP_RALT_RGUI -#define MAGIC_UNSWAP_RALT_RGUI QK_MAGIC_UNSWAP_RALT_RGUI -#define MAGIC_UNNO_GUI QK_MAGIC_GUI_ON -#define MAGIC_NO_GUI QK_MAGIC_GUI_OFF -#define MAGIC_TOGGLE_GUI QK_MAGIC_TOGGLE_GUI -#define MAGIC_SWAP_GRAVE_ESC QK_MAGIC_SWAP_GRAVE_ESC -#define MAGIC_UNSWAP_GRAVE_ESC QK_MAGIC_UNSWAP_GRAVE_ESC -#define MAGIC_SWAP_BACKSLASH_BACKSPACE QK_MAGIC_SWAP_BACKSLASH_BACKSPACE -#define MAGIC_UNSWAP_BACKSLASH_BACKSPACE QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE -#define MAGIC_TOGGLE_BACKSLASH_BACKSPACE QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE -#define MAGIC_HOST_NKRO QK_MAGIC_NKRO_ON -#define MAGIC_UNHOST_NKRO QK_MAGIC_NKRO_OFF -#define MAGIC_TOGGLE_NKRO QK_MAGIC_TOGGLE_NKRO -#define MAGIC_SWAP_ALT_GUI QK_MAGIC_SWAP_ALT_GUI -#define MAGIC_UNSWAP_ALT_GUI QK_MAGIC_UNSWAP_ALT_GUI -#define MAGIC_TOGGLE_ALT_GUI QK_MAGIC_TOGGLE_ALT_GUI -#define MAGIC_SWAP_LCTL_LGUI QK_MAGIC_SWAP_LCTL_LGUI -#define MAGIC_UNSWAP_LCTL_LGUI QK_MAGIC_UNSWAP_LCTL_LGUI -#define MAGIC_SWAP_RCTL_RGUI QK_MAGIC_SWAP_RCTL_RGUI -#define MAGIC_UNSWAP_RCTL_RGUI QK_MAGIC_UNSWAP_RCTL_RGUI -#define MAGIC_SWAP_CTL_GUI QK_MAGIC_SWAP_CTL_GUI -#define MAGIC_UNSWAP_CTL_GUI QK_MAGIC_UNSWAP_CTL_GUI -#define MAGIC_TOGGLE_CTL_GUI QK_MAGIC_TOGGLE_CTL_GUI -#define MAGIC_EE_HANDS_LEFT QK_MAGIC_EE_HANDS_LEFT -#define MAGIC_EE_HANDS_RIGHT QK_MAGIC_EE_HANDS_RIGHT -#define MAGIC_SWAP_ESCAPE_CAPSLOCK QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK -#define MAGIC_UNSWAP_ESCAPE_CAPSLOCK QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK -#define MAGIC_TOGGLE_ESCAPE_CAPSLOCK QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK - -#define LCG_SWP QK_MAGIC_SWAP_LCTL_LGUI -#define LCG_NRM QK_MAGIC_UNSWAP_LCTL_LGUI -#define RCG_SWP QK_MAGIC_SWAP_RCTL_RGUI -#define RCG_NRM QK_MAGIC_UNSWAP_RCTL_RGUI -#define LAG_SWP QK_MAGIC_SWAP_LALT_LGUI -#define LAG_NRM QK_MAGIC_UNSWAP_LALT_LGUI -#define RAG_SWP QK_MAGIC_SWAP_RALT_RGUI -#define RAG_NRM QK_MAGIC_UNSWAP_RALT_RGUI -#define GUI_ON QK_MAGIC_GUI_ON -#define GUI_OFF QK_MAGIC_GUI_OFF -#define GUI_TOG QK_MAGIC_TOGGLE_GUI - -#define X(i) UM(i) -#define XP(i, j) UP(i, j) From fd17ae34ecd5443418994910f02c34379fea36f3 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 5 Apr 2024 02:38:12 +0100 Subject: [PATCH 110/333] Tidy up keyboards/zvecr (#23418) --- keyboards/zvecr/split_blackpill/config.h | 39 +----------------- keyboards/zvecr/split_blackpill/halconf.h | 23 +---------- .../{info.json => keyboard.json} | 11 +++++ .../split_blackpill/keymaps/default/keymap.c | 8 ++-- keyboards/zvecr/split_blackpill/mcuconf.h | 23 +---------- keyboards/zvecr/split_blackpill/rules.mk | 18 --------- .../zvecr/split_blackpill/split_blackpill.c | 26 ++++-------- keyboards/zvecr/zv48/config.h | 40 ++----------------- keyboards/zvecr/zv48/f401/halconf.h | 23 +---------- keyboards/zvecr/zv48/f401/keyboard.json | 4 +- keyboards/zvecr/zv48/f401/mcuconf.h | 23 +---------- keyboards/zvecr/zv48/f401/rules.mk | 1 + keyboards/zvecr/zv48/f411/halconf.h | 23 +---------- keyboards/zvecr/zv48/f411/keyboard.json | 4 +- keyboards/zvecr/zv48/f411/mcuconf.h | 23 +---------- keyboards/zvecr/zv48/f411/rules.mk | 1 + keyboards/zvecr/zv48/info.json | 12 ++++++ keyboards/zvecr/zv48/keymaps/default/keymap.c | 8 ++-- keyboards/zvecr/zv48/rules.mk | 19 --------- keyboards/zvecr/zv48/zv48.c | 30 +++++--------- 20 files changed, 70 insertions(+), 289 deletions(-) rename keyboards/zvecr/split_blackpill/{info.json => keyboard.json} (94%) create mode 100644 keyboards/zvecr/zv48/f401/rules.mk create mode 100644 keyboards/zvecr/zv48/f411/rules.mk delete mode 100644 keyboards/zvecr/zv48/rules.mk diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h index dd26e9ca325..efc3bbe66a9 100644 --- a/keyboards/zvecr/split_blackpill/config.h +++ b/keyboards/zvecr/split_blackpill/config.h @@ -1,45 +1,10 @@ -/* Copyright 2020 zvecr - * - * 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 . - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define SPLIT_HAND_PIN B3 #define SELECT_SOFT_SERIAL_SPEED 0 #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 #define WS2812_PWM_DMA_CHANNEL 3 - -/* 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/zvecr/split_blackpill/halconf.h b/keyboards/zvecr/split_blackpill/halconf.h index 0ee73f028ad..894921e6d2b 100644 --- a/keyboards/zvecr/split_blackpill/halconf.h +++ b/keyboards/zvecr/split_blackpill/halconf.h @@ -1,23 +1,5 @@ -/* Copyright 2020 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 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/zvecr/split_blackpill/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -26,4 +8,3 @@ #define HAL_USE_SERIAL TRUE #include_next - diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/keyboard.json similarity index 94% rename from keyboards/zvecr/split_blackpill/info.json rename to keyboards/zvecr/split_blackpill/keyboard.json index 377ec44f97e..71eb99b7d40 100644 --- a/keyboards/zvecr/split_blackpill/info.json +++ b/keyboards/zvecr/split_blackpill/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B1", "B0", "A7", "A6"], "rows": ["B15", "B14", "B13", "B12"], @@ -15,6 +22,10 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, + "handedness": { + "pin": "B3" + }, "soft_serial_pin": "B6", "bootmagic": { "matrix": [4, 0] diff --git a/keyboards/zvecr/split_blackpill/keymaps/default/keymap.c b/keyboards/zvecr/split_blackpill/keymaps/default/keymap.c index 51052bd6c3f..e48a7950289 100644 --- a/keyboards/zvecr/split_blackpill/keymaps/default/keymap.c +++ b/keyboards/zvecr/split_blackpill/keymaps/default/keymap.c @@ -1,6 +1,8 @@ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H -// Defines names for use in layer keycodes and the keymap enum layer_names { _QWERTY, _LOWER, @@ -26,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_ortho_4x12( KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, KC_LGUI, KC_LALT, KC_APP, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), @@ -78,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, QK_BOOT, _______, + _______, QK_BOOT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/zvecr/split_blackpill/mcuconf.h b/keyboards/zvecr/split_blackpill/mcuconf.h index 01cb4f40f42..72b7a95be8b 100644 --- a/keyboards/zvecr/split_blackpill/mcuconf.h +++ b/keyboards/zvecr/split_blackpill/mcuconf.h @@ -1,23 +1,5 @@ -/* Copyright 2020 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 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/zvecr/split_blackpill/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h` - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -31,4 +13,3 @@ #undef STM32_SPI_USE_SPI2 #define STM32_SPI_USE_SPI2 FALSE - diff --git a/keyboards/zvecr/split_blackpill/rules.mk b/keyboards/zvecr/split_blackpill/rules.mk index 196b4019ca5..c6e29883213 100644 --- a/keyboards/zvecr/split_blackpill/rules.mk +++ b/keyboards/zvecr/split_blackpill/rules.mk @@ -1,19 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart - -# Disable unsupported hardware -AUDIO_SUPPORTED = no -BACKLIGHT_SUPPORTED = no diff --git a/keyboards/zvecr/split_blackpill/split_blackpill.c b/keyboards/zvecr/split_blackpill/split_blackpill.c index 6c7db0580e7..64f1cb84013 100644 --- a/keyboards/zvecr/split_blackpill/split_blackpill.c +++ b/keyboards/zvecr/split_blackpill/split_blackpill.c @@ -1,25 +1,13 @@ -/* Copyright 2020 zvecr - * - * 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 . - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later + #include "quantum.h" -void keyboard_pre_init_kb(void){ +void keyboard_pre_init_kb(void) { // Workaround for reversible pcb/mcu - palSetLineMode(C13, PAL_MODE_OUTPUT_OPENDRAIN); - palSetLineMode(B9, PAL_MODE_OUTPUT_OPENDRAIN); - palSetLineMode(B8, PAL_MODE_OUTPUT_OPENDRAIN); + gpio_set_pin_output_open_drain(C13); + gpio_set_pin_output_open_drain(B9); + gpio_set_pin_output_open_drain(B8); keyboard_pre_init_user(); } diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h index a67a46a1850..9e8c2656a91 100644 --- a/keyboards/zvecr/zv48/config.h +++ b/keyboards/zvecr/zv48/config.h @@ -1,21 +1,8 @@ -/* Copyright 2020 zvecr - * - * 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 . - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later + #pragma once -#define SPLIT_HAND_PIN B9 //#define SELECT_SOFT_SERIAL_SPEED 0 #define SERIAL_USART_SPEED 921600 @@ -24,24 +11,3 @@ #define WS2812_PWM_PAL_MODE 2 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 #define WS2812_PWM_DMA_CHANNEL 5 - -/* 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/zvecr/zv48/f401/halconf.h b/keyboards/zvecr/zv48/f401/halconf.h index b42a6939968..089526f1f0d 100644 --- a/keyboards/zvecr/zv48/f401/halconf.h +++ b/keyboards/zvecr/zv48/f401/halconf.h @@ -1,23 +1,5 @@ -/* Copyright 2020 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 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -28,4 +10,3 @@ #define SERIAL_USB_BUFFERS_SIZE 256 #include_next - diff --git a/keyboards/zvecr/zv48/f401/keyboard.json b/keyboards/zvecr/zv48/f401/keyboard.json index acd7e83f77d..797e9900595 100644 --- a/keyboards/zvecr/zv48/f401/keyboard.json +++ b/keyboards/zvecr/zv48/f401/keyboard.json @@ -1,5 +1,3 @@ { - "processor": "STM32F401", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F401" + "development_board": "blackpill_f401" } diff --git a/keyboards/zvecr/zv48/f401/mcuconf.h b/keyboards/zvecr/zv48/f401/mcuconf.h index 3c14f5e0275..6a6ab823771 100644 --- a/keyboards/zvecr/zv48/f401/mcuconf.h +++ b/keyboards/zvecr/zv48/f401/mcuconf.h @@ -1,23 +1,5 @@ -/* Copyright 2020 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 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h` - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -28,4 +10,3 @@ #undef STM32_SERIAL_USE_USART1 #define STM32_SERIAL_USE_USART1 TRUE - diff --git a/keyboards/zvecr/zv48/f401/rules.mk b/keyboards/zvecr/zv48/f401/rules.mk new file mode 100644 index 00000000000..c6e29883213 --- /dev/null +++ b/keyboards/zvecr/zv48/f401/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = usart diff --git a/keyboards/zvecr/zv48/f411/halconf.h b/keyboards/zvecr/zv48/f411/halconf.h index 3678cd52b51..089526f1f0d 100644 --- a/keyboards/zvecr/zv48/f411/halconf.h +++ b/keyboards/zvecr/zv48/f411/halconf.h @@ -1,23 +1,5 @@ -/* Copyright 2020 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 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f411/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -28,4 +10,3 @@ #define SERIAL_USB_BUFFERS_SIZE 256 #include_next - diff --git a/keyboards/zvecr/zv48/f411/keyboard.json b/keyboards/zvecr/zv48/f411/keyboard.json index 2517a82403f..a41c5f4dd14 100644 --- a/keyboards/zvecr/zv48/f411/keyboard.json +++ b/keyboards/zvecr/zv48/f411/keyboard.json @@ -1,5 +1,3 @@ { - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } diff --git a/keyboards/zvecr/zv48/f411/mcuconf.h b/keyboards/zvecr/zv48/f411/mcuconf.h index 572a8616cfb..6a6ab823771 100644 --- a/keyboards/zvecr/zv48/f411/mcuconf.h +++ b/keyboards/zvecr/zv48/f411/mcuconf.h @@ -1,23 +1,5 @@ -/* Copyright 2020 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 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f411/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F411/configs/mcuconf.h` - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -28,4 +10,3 @@ #undef STM32_SERIAL_USE_USART1 #define STM32_SERIAL_USE_USART1 TRUE - diff --git a/keyboards/zvecr/zv48/f411/rules.mk b/keyboards/zvecr/zv48/f411/rules.mk new file mode 100644 index 00000000000..c6e29883213 --- /dev/null +++ b/keyboards/zvecr/zv48/f411/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = usart diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json index cd81109ed14..e596eb6e79b 100644 --- a/keyboards/zvecr/zv48/info.json +++ b/keyboards/zvecr/zv48/info.json @@ -8,6 +8,14 @@ "pid": "0x0048", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B15", "B10", "B0", "A5", "A4", "A3"], "rows": ["A10", "A15", "B3", "B4"], @@ -41,6 +49,10 @@ } }, "split": { + "enabled": true, + "handedness": { + "pin": "B9" + }, "soft_serial_pin": "B6", "bootmagic": { "matrix": [4, 0] diff --git a/keyboards/zvecr/zv48/keymaps/default/keymap.c b/keyboards/zvecr/zv48/keymaps/default/keymap.c index 51052bd6c3f..e48a7950289 100644 --- a/keyboards/zvecr/zv48/keymaps/default/keymap.c +++ b/keyboards/zvecr/zv48/keymaps/default/keymap.c @@ -1,6 +1,8 @@ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H -// Defines names for use in layer keycodes and the keymap enum layer_names { _QWERTY, _LOWER, @@ -26,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_ortho_4x12( KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, KC_LGUI, KC_LALT, KC_APP, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), @@ -78,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, QK_BOOT, _______, + _______, QK_BOOT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/zvecr/zv48/rules.mk b/keyboards/zvecr/zv48/rules.mk deleted file mode 100644 index 7b615f95fa4..00000000000 --- a/keyboards/zvecr/zv48/rules.mk +++ /dev/null @@ -1,19 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra -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 = yes # Enable keyboard RGB underglow -ENCODER_ENABLE = yes # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes -SERIAL_DRIVER = usart - -DEFAULT_FOLDER = zvecr/zv48/f401 diff --git a/keyboards/zvecr/zv48/zv48.c b/keyboards/zvecr/zv48/zv48.c index 2716b780806..91cf2d25209 100644 --- a/keyboards/zvecr/zv48/zv48.c +++ b/keyboards/zvecr/zv48/zv48.c @@ -1,27 +1,15 @@ -/* Copyright 2020 zvecr - * - * 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 . - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later + #include "quantum.h" -void keyboard_pre_init_kb(void){ +void keyboard_pre_init_kb(void) { // Workaround for reversible pcb/mcu - palSetLineMode(C13, PAL_MODE_INPUT_PULLUP); - palSetLineMode(C15, PAL_MODE_INPUT_PULLUP); - palSetLineMode(B7, PAL_MODE_OUTPUT_OPENDRAIN); - palSetLineMode(A0, PAL_MODE_OUTPUT_OPENDRAIN); - palSetLineMode(A1, PAL_MODE_OUTPUT_OPENDRAIN); + gpio_set_pin_input_high(C13); + gpio_set_pin_input_high(C15); + gpio_set_pin_output_open_drain(B7); + gpio_set_pin_output_open_drain(A0); + gpio_set_pin_output_open_drain(A1); keyboard_pre_init_user(); } From 0696a624764363d48e98286ba27e200e18db1ffa Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 5 Apr 2024 02:38:35 +0100 Subject: [PATCH 111/333] "features.split" is not a valid key (#23419) --- keyboards/tweetydabird/lotus58/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/tweetydabird/lotus58/info.json b/keyboards/tweetydabird/lotus58/info.json index f4660c3ad9f..2c3f85cdd9f 100644 --- a/keyboards/tweetydabird/lotus58/info.json +++ b/keyboards/tweetydabird/lotus58/info.json @@ -14,7 +14,6 @@ "nkro": true, "oled": true, "rgblight": true, - "split": true, "tri_layer": true }, "rgblight": { @@ -118,4 +117,4 @@ ] } } -} \ No newline at end of file +} From f8a7a6848d737b01dcb5843503bcabcdd68cdb01 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Fri, 5 Apr 2024 13:23:43 +1100 Subject: [PATCH 112/333] Update ChibiOS submodules. (#23405) --- lib/chibios | 2 +- lib/chibios-contrib | 2 +- platforms/chibios/platform.mk | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/chibios b/lib/chibios index 11edb161098..be44b3305f9 160000 --- a/lib/chibios +++ b/lib/chibios @@ -1 +1 @@ -Subproject commit 11edb1610980f213b9f83161e1715a46fb7e4c51 +Subproject commit be44b3305f9a9fe5f2f49a4e7b978db322dc463e diff --git a/lib/chibios-contrib b/lib/chibios-contrib index 9d7a7f904ed..77cb0a4f758 160000 --- a/lib/chibios-contrib +++ b/lib/chibios-contrib @@ -1 +1 @@ -Subproject commit 9d7a7f904ed135e3459cf6d602db56a26872df6b +Subproject commit 77cb0a4f7589f89e724f5e6ecb1d76d514dd1212 diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk index b13eed39be8..169707966ff 100644 --- a/platforms/chibios/platform.mk +++ b/platforms/chibios/platform.mk @@ -258,8 +258,8 @@ endif # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk --include $(CHIBIOS)/os/hal/osal/rt/osal.mk # ChibiOS <= 19.x --include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk # ChibiOS >= 20.x +include $(CHIBIOS)/os/oslib/oslib.mk +include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk # Other files (optional). @@ -270,6 +270,7 @@ PLATFORM_SRC = \ $(KERNSRC) \ $(PORTSRC) \ $(OSALSRC) \ + $(OSLIBSRC) \ $(HALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ @@ -285,11 +286,11 @@ QUANTUM_LIB_SRC += $(STARTUPASM) $(PORTASM) $(OSALASM) $(PLATFORMASM) PLATFORM_SRC := $(patsubst $(TOP_DIR)/%,%,$(PLATFORM_SRC)) -EXTRAINCDIRS += $(CHIBIOS)/os/license $(CHIBIOS)/os/oslib/include \ +EXTRAINCDIRS += $(CHIBIOS)/os/license \ $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs \ $(TOP_DIR)/platforms/chibios/boards/common/configs \ $(HALCONFDIR) $(CHCONFDIR) \ - $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ + $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) $(OSLIBINC) \ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ $(STREAMSINC) $(CHIBIOS)/os/various $(COMMON_VPATH) From a14c03b96e75212d042621f4c68ccbecb7ee9901 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 5 Apr 2024 14:48:21 +1100 Subject: [PATCH 113/333] Remove more unnecessary `quantum.h` includes (#23402) --- keyboards/bastardkb/charybdis/3x5/3x5.c | 2 +- keyboards/bastardkb/charybdis/3x6/3x6.c | 2 +- keyboards/bastardkb/charybdis/4x6/4x6.c | 2 +- keyboards/bastardkb/dilemma/3x5_3/3x5_3.c | 2 +- keyboards/bastardkb/dilemma/4x6_4/4x6_4.c | 2 +- keyboards/cipulot/common/ec_board.c | 2 +- keyboards/crkbd/lib/host_led_state_reader.c | 3 ++- keyboards/crkbd/lib/keylogger.c | 3 ++- keyboards/crkbd/lib/layer_state_reader.c | 2 +- keyboards/crkbd/lib/logo_reader.c | 2 -- keyboards/crkbd/lib/mode_icon_reader.c | 1 - keyboards/crkbd/lib/rgb_state_reader.c | 2 +- keyboards/crkbd/lib/timelogger.c | 2 +- keyboards/doio/kb16/lib/bongocat/bongocat.c | 9 +++++++-- keyboards/doio/kb16/lib/layer_status/layer_status.c | 4 +++- keyboards/doio/kb16/lib/logo.c | 3 ++- keyboards/durgod/dgk6x/galaxy/galaxy.c | 2 +- keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c | 2 +- keyboards/durgod/dgk6x/hades_iso/hades_iso.c | 2 +- keyboards/durgod/dgk6x/venus/venus.c | 2 +- keyboards/gboards/engine/engine.h | 5 ++++- keyboards/gboards/g/engine.h | 5 ++++- keyboards/gopolar/gg86/lib/logo.c | 3 ++- keyboards/handwired/dygma/raise/ansi/ansi.c | 2 +- keyboards/handwired/dygma/raise/iso/iso.c | 2 +- .../handwired/tractyl_manuform/5x6_right/f411/f411.c | 2 +- keyboards/helix/rev3_5rows/rev3_5rows.c | 2 +- keyboards/horrortroll/handwired_k552/lib/bongocat.c | 9 +++++++-- keyboards/horrortroll/handwired_k552/lib/galaxy.c | 4 +++- keyboards/horrortroll/handwired_k552/lib/logo.c | 4 +++- keyboards/horrortroll/lemon40/lib/bongocat.c | 9 +++++++-- keyboards/hotdox/hotdox.c | 2 -- keyboards/kbdfans/odin75/lib/bongocat.c | 8 +++++++- keyboards/keyboardio/model01/model01.c | 4 ++-- keyboards/lily58/lib/layer_state_reader.c | 2 +- keyboards/marksard/rhymestone/common/oled_helper.c | 4 +++- keyboards/marksard/treadstone48/common/oled_helper.c | 4 +++- keyboards/monstargear/xo87/solderable/solderable.c | 1 - keyboards/palette1202/lib/oled_helper.c | 2 +- keyboards/rgbkb/sol/rev1/rev1.c | 2 +- keyboards/rgbkb/sol/rev2/rev2.c | 2 +- keyboards/satt/comet46/lib/host_led_state_reader.c | 3 ++- keyboards/satt/comet46/lib/modifier_state_reader.c | 2 +- keyboards/sekigon/grs_70ec/ec_switch_matrix.c | 3 +-- keyboards/terrazzo/terrazzo.c | 4 ---- keyboards/tzarc/djinn/djinn.c | 6 ++---- keyboards/tzarc/djinn/djinn_portscan_matrix.c | 3 --- keyboards/tzarc/djinn/djinn_split_sync.c | 2 -- keyboards/tzarc/djinn/djinn_usbpd.c | 2 -- keyboards/v60_type_r/v60_type_r.c | 2 -- keyboards/v60_type_r/v60_type_r.h | 2 -- keyboards/viktus/minne_topre/ec.c | 2 +- keyboards/viktus/osav2_numpad_topre/ec.c | 2 +- keyboards/viktus/osav2_topre/ec.c | 2 +- keyboards/viktus/styrka_topre/ec.c | 2 +- keyboards/vinhcatba/uncertainty/bongo.c | 7 +++++++ keyboards/vinhcatba/uncertainty/bongo.h | 2 ++ keyboards/vinhcatba/uncertainty/uncertainty.c | 3 +-- keyboards/yosino58/lib/layer_state_reader.c | 2 +- keyboards/yosino58/lib/rgb_state_reader.c | 1 - 60 files changed, 103 insertions(+), 78 deletions(-) diff --git a/keyboards/bastardkb/charybdis/3x5/3x5.c b/keyboards/bastardkb/charybdis/3x5/3x5.c index 082dbbc3bd4..6e8e3bef106 100644 --- a/keyboards/bastardkb/charybdis/3x5/3x5.c +++ b/keyboards/bastardkb/charybdis/3x5/3x5.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "charybdis.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/charybdis/3x6/3x6.c b/keyboards/bastardkb/charybdis/3x6/3x6.c index a6c7ce07d6e..d2c0a39815c 100644 --- a/keyboards/bastardkb/charybdis/3x6/3x6.c +++ b/keyboards/bastardkb/charybdis/3x6/3x6.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "charybdis.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/charybdis/4x6/4x6.c b/keyboards/bastardkb/charybdis/4x6/4x6.c index c7856c12bbb..ff1bbea4704 100644 --- a/keyboards/bastardkb/charybdis/4x6/4x6.c +++ b/keyboards/bastardkb/charybdis/4x6/4x6.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "charybdis.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c index 0a5ba151814..3decc51e846 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c +++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dilemma.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c b/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c index c80ccbc8eb8..49b24fbd049 100644 --- a/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c +++ b/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dilemma.h" #ifdef SWAP_HANDS_ENABLE const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/cipulot/common/ec_board.c b/keyboards/cipulot/common/ec_board.c index 2225d6da63d..d9ba1975893 100644 --- a/keyboards/cipulot/common/ec_board.c +++ b/keyboards/cipulot/common/ec_board.c @@ -15,7 +15,7 @@ */ #include "ec_switch_matrix.h" -#include "quantum.h" +#include "keyboard.h" void eeconfig_init_kb(void) { // Default values diff --git a/keyboards/crkbd/lib/host_led_state_reader.c b/keyboards/crkbd/lib/host_led_state_reader.c index 2593ac5f8b7..8602134f699 100644 --- a/keyboards/crkbd/lib/host_led_state_reader.c +++ b/keyboards/crkbd/lib/host_led_state_reader.c @@ -1,5 +1,6 @@ #include -#include "quantum.h" +#include "led.h" +#include "host.h" char host_led_state_str[24]; diff --git a/keyboards/crkbd/lib/keylogger.c b/keyboards/crkbd/lib/keylogger.c index 9adb55d6eeb..84d2f8913db 100644 --- a/keyboards/crkbd/lib/keylogger.c +++ b/keyboards/crkbd/lib/keylogger.c @@ -1,5 +1,6 @@ #include -#include "quantum.h" +#include +#include "action.h" char keylog_str[24] = {}; char keylogs_str[21] = {}; diff --git a/keyboards/crkbd/lib/layer_state_reader.c b/keyboards/crkbd/lib/layer_state_reader.c index 7dd17024859..f1030cae099 100644 --- a/keyboards/crkbd/lib/layer_state_reader.c +++ b/keyboards/crkbd/lib/layer_state_reader.c @@ -1,5 +1,5 @@ -#include "quantum.h" #include +#include "action_layer.h" // in the future, should use (1U<<_LAYER_NAME) instead, but needs to be moved to keymap,c #define L_BASE 0 diff --git a/keyboards/crkbd/lib/logo_reader.c b/keyboards/crkbd/lib/logo_reader.c index 4a710bb2502..039a538cc54 100644 --- a/keyboards/crkbd/lib/logo_reader.c +++ b/keyboards/crkbd/lib/logo_reader.c @@ -1,5 +1,3 @@ -#include "quantum.h" - const char *read_logo(void) { static char logo[] = { 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, diff --git a/keyboards/crkbd/lib/mode_icon_reader.c b/keyboards/crkbd/lib/mode_icon_reader.c index 02a63ec1c60..9dadd6ac86b 100644 --- a/keyboards/crkbd/lib/mode_icon_reader.c +++ b/keyboards/crkbd/lib/mode_icon_reader.c @@ -1,5 +1,4 @@ #include -#include "quantum.h" char mode_icon[24]; diff --git a/keyboards/crkbd/lib/rgb_state_reader.c b/keyboards/crkbd/lib/rgb_state_reader.c index a255cd662d2..8ba0cda8df7 100644 --- a/keyboards/crkbd/lib/rgb_state_reader.c +++ b/keyboards/crkbd/lib/rgb_state_reader.c @@ -1,7 +1,7 @@ #ifdef RGBLIGHT_ENABLE #include -#include "quantum.h" +#include "rgblight.h" extern rgblight_config_t rgblight_config; char rbf_info_str[24]; diff --git a/keyboards/crkbd/lib/timelogger.c b/keyboards/crkbd/lib/timelogger.c index bce9d99a4be..83fe9706ddc 100644 --- a/keyboards/crkbd/lib/timelogger.c +++ b/keyboards/crkbd/lib/timelogger.c @@ -1,5 +1,5 @@ #include -#include "quantum.h" +#include "timer.h" char timelog_str[24] = {}; int last_time = 0; diff --git a/keyboards/doio/kb16/lib/bongocat/bongocat.c b/keyboards/doio/kb16/lib/bongocat/bongocat.c index 12ca8694c1d..c90df38aec0 100644 --- a/keyboards/doio/kb16/lib/bongocat/bongocat.c +++ b/keyboards/doio/kb16/lib/bongocat/bongocat.c @@ -14,7 +14,13 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "bongocat.h" +#include +#include "oled_driver.h" +#include "progmem.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" // WPM-responsive animation stuff here #define IDLE_FRAMES 5 @@ -28,7 +34,6 @@ #define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 -#define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro uint32_t curr_anim_duration = 0; // variable animation duration uint32_t bongo_timer = 0; diff --git a/keyboards/doio/kb16/lib/layer_status/layer_status.c b/keyboards/doio/kb16/lib/layer_status/layer_status.c index 657ac86ff21..d9ba20bd8c4 100644 --- a/keyboards/doio/kb16/lib/layer_status/layer_status.c +++ b/keyboards/doio/kb16/lib/layer_status/layer_status.c @@ -15,7 +15,9 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "oled_driver.h" +#include "action_layer.h" +#include "progmem.h" #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/doio/kb16/lib/logo.c b/keyboards/doio/kb16/lib/logo.c index 7a52b479ff4..ade4b954e09 100644 --- a/keyboards/doio/kb16/lib/logo.c +++ b/keyboards/doio/kb16/lib/logo.c @@ -15,7 +15,8 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "oled_driver.h" +#include "progmem.h" #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/durgod/dgk6x/galaxy/galaxy.c b/keyboards/durgod/dgk6x/galaxy/galaxy.c index 1cf2d712558..5d08163109a 100644 --- a/keyboards/durgod/dgk6x/galaxy/galaxy.c +++ b/keyboards/durgod/dgk6x/galaxy/galaxy.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dgk6x.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c index e984c36d911..d092310814b 100644 --- a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c +++ b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dgk6x.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c index 5ccc60e841e..dcd821803e9 100644 --- a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c +++ b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dgk6x.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/durgod/dgk6x/venus/venus.c b/keyboards/durgod/dgk6x/venus/venus.c index 9bde901374b..5433266e3ba 100644 --- a/keyboards/durgod/dgk6x/venus/venus.c +++ b/keyboards/durgod/dgk6x/venus/venus.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dgk6x.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/gboards/engine/engine.h b/keyboards/gboards/engine/engine.h index 005dd730b8d..a28777f4f24 100644 --- a/keyboards/gboards/engine/engine.h +++ b/keyboards/gboards/engine/engine.h @@ -12,9 +12,12 @@ #pragma once -#include "quantum.h" +#include +#include #include #include +#include "action.h" +#include "progmem.h" #include "config_engine.h" // Maximum values for combos diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h index a78ddc96ff0..2b62165c51e 100644 --- a/keyboards/gboards/g/engine.h +++ b/keyboards/gboards/g/engine.h @@ -12,9 +12,12 @@ #pragma once -#include "quantum.h" +#include +#include #include #include +#include "action.h" +#include "progmem.h" #include "config_engine.h" // Set defaults diff --git a/keyboards/gopolar/gg86/lib/logo.c b/keyboards/gopolar/gg86/lib/logo.c index 3db3acdac10..8a8b97c4b7e 100644 --- a/keyboards/gopolar/gg86/lib/logo.c +++ b/keyboards/gopolar/gg86/lib/logo.c @@ -14,7 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "oled_driver.h" +#include "progmem.h" #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/handwired/dygma/raise/ansi/ansi.c b/keyboards/handwired/dygma/raise/ansi/ansi.c index c9e0cb288cb..67b84c3bc88 100644 --- a/keyboards/handwired/dygma/raise/ansi/ansi.c +++ b/keyboards/handwired/dygma/raise/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "raise.h" // "led_map" is taken from kaleidoscope // LHK = Left Hand Keys diff --git a/keyboards/handwired/dygma/raise/iso/iso.c b/keyboards/handwired/dygma/raise/iso/iso.c index 48ba85bf902..9643af7b8c0 100644 --- a/keyboards/handwired/dygma/raise/iso/iso.c +++ b/keyboards/handwired/dygma/raise/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "raise.h" // "led_map" is taken from kaleidoscope // LHK = Left Hand Keys diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c index a0c3ee0f4e4..24263fa832c 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "tractyl_manuform.h" void keyboard_pre_init_sub(void) { setPinInputHigh(A0); } diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c index 921558e80d9..28fa314a7ba 100644 --- a/keyboards/helix/rev3_5rows/rev3_5rows.c +++ b/keyboards/helix/rev3_5rows/rev3_5rows.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "rev3_5rows.h" bool is_mac_mode(void) { return keymap_config.swap_lalt_lgui == false; diff --git a/keyboards/horrortroll/handwired_k552/lib/bongocat.c b/keyboards/horrortroll/handwired_k552/lib/bongocat.c index 6510223b222..70699ff3cda 100644 --- a/keyboards/horrortroll/handwired_k552/lib/bongocat.c +++ b/keyboards/horrortroll/handwired_k552/lib/bongocat.c @@ -14,7 +14,13 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "bongocat.h" +#include +#include "oled_driver.h" +#include "progmem.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" // WPM-responsive animation stuff here # define IDLE_FRAMES 5 @@ -28,7 +34,6 @@ # define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing # define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024 -# define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro uint32_t curr_anim_duration = 0; // variable animation duration uint32_t bongo_timer = 0; diff --git a/keyboards/horrortroll/handwired_k552/lib/galaxy.c b/keyboards/horrortroll/handwired_k552/lib/galaxy.c index 04885b80859..6578295c6f0 100644 --- a/keyboards/horrortroll/handwired_k552/lib/galaxy.c +++ b/keyboards/horrortroll/handwired_k552/lib/galaxy.c @@ -14,7 +14,9 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "galaxy.h" +#include "oled_driver.h" +#include "progmem.h" # define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/horrortroll/handwired_k552/lib/logo.c b/keyboards/horrortroll/handwired_k552/lib/logo.c index 3931fdf4554..f3ae2f8a068 100644 --- a/keyboards/horrortroll/handwired_k552/lib/logo.c +++ b/keyboards/horrortroll/handwired_k552/lib/logo.c @@ -14,7 +14,9 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "logo.h" +#include "oled_driver.h" +#include "progmem.h" # define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/horrortroll/lemon40/lib/bongocat.c b/keyboards/horrortroll/lemon40/lib/bongocat.c index 12ca8694c1d..c90df38aec0 100644 --- a/keyboards/horrortroll/lemon40/lib/bongocat.c +++ b/keyboards/horrortroll/lemon40/lib/bongocat.c @@ -14,7 +14,13 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "bongocat.h" +#include +#include "oled_driver.h" +#include "progmem.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" // WPM-responsive animation stuff here #define IDLE_FRAMES 5 @@ -28,7 +34,6 @@ #define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 -#define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro uint32_t curr_anim_duration = 0; // variable animation duration uint32_t bongo_timer = 0; diff --git a/keyboards/hotdox/hotdox.c b/keyboards/hotdox/hotdox.c index 00af9efb1e5..4e86ec6d18b 100644 --- a/keyboards/hotdox/hotdox.c +++ b/keyboards/hotdox/hotdox.c @@ -1,6 +1,4 @@ #include "hotdox.h" -#include "backlight.h" -#include "quantum.h" extern inline void ergodox_board_led_on(void); extern inline void ergodox_right_led_1_on(void); diff --git a/keyboards/kbdfans/odin75/lib/bongocat.c b/keyboards/kbdfans/odin75/lib/bongocat.c index 05be2173d15..9c7a5dc1fce 100644 --- a/keyboards/kbdfans/odin75/lib/bongocat.c +++ b/keyboards/kbdfans/odin75/lib/bongocat.c @@ -14,7 +14,13 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "bongocat.h" +#include +#include "oled_driver.h" +#include "progmem.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" // WPM-responsive animation stuff here #define IDLE_FRAMES 5 diff --git a/keyboards/keyboardio/model01/model01.c b/keyboards/keyboardio/model01/model01.c index 3644f045163..33198423de6 100644 --- a/keyboards/keyboardio/model01/model01.c +++ b/keyboards/keyboardio/model01/model01.c @@ -13,10 +13,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "quantum.h" + +#include "model01.h" #include "i2c_master.h" #include -#include "model01.h" void matrix_init_kb(void) { /* the bootloader can leave LEDs on, so */ diff --git a/keyboards/lily58/lib/layer_state_reader.c b/keyboards/lily58/lib/layer_state_reader.c index 69b46130931..fb74825ef94 100644 --- a/keyboards/lily58/lib/layer_state_reader.c +++ b/keyboards/lily58/lib/layer_state_reader.c @@ -1,4 +1,4 @@ -#include "quantum.h" +#include "action_layer.h" #include #define L_BASE 0 diff --git a/keyboards/marksard/rhymestone/common/oled_helper.c b/keyboards/marksard/rhymestone/common/oled_helper.c index 613798c941e..4a0ca72e89f 100644 --- a/keyboards/marksard/rhymestone/common/oled_helper.c +++ b/keyboards/marksard/rhymestone/common/oled_helper.c @@ -1,9 +1,11 @@ #include "oled_helper.h" -#include "quantum.h" +#include "host.h" +#include "progmem.h" #include #include #ifdef OLED_ENABLE +#include "oled_driver.h" void render_logo(void) { diff --git a/keyboards/marksard/treadstone48/common/oled_helper.c b/keyboards/marksard/treadstone48/common/oled_helper.c index e9a8cf564a3..66124abe120 100644 --- a/keyboards/marksard/treadstone48/common/oled_helper.c +++ b/keyboards/marksard/treadstone48/common/oled_helper.c @@ -1,5 +1,7 @@ #include "oled_helper.h" -#include "quantum.h" +#include "oled_driver.h" +#include "host.h" +#include "rgblight.h" #include #include diff --git a/keyboards/monstargear/xo87/solderable/solderable.c b/keyboards/monstargear/xo87/solderable/solderable.c index f1fc65ea011..cb4da24a3ac 100644 --- a/keyboards/monstargear/xo87/solderable/solderable.c +++ b/keyboards/monstargear/xo87/solderable/solderable.c @@ -15,7 +15,6 @@ */ #include "solderable.h" -#include "quantum.h" #define noLed {255,255} diff --git a/keyboards/palette1202/lib/oled_helper.c b/keyboards/palette1202/lib/oled_helper.c index 38608e5a6c9..9e46da921d6 100644 --- a/keyboards/palette1202/lib/oled_helper.c +++ b/keyboards/palette1202/lib/oled_helper.c @@ -1,5 +1,5 @@ #include "oled_helper.h" -#include "quantum.h" +#include "oled_driver.h" #include #include diff --git a/keyboards/rgbkb/sol/rev1/rev1.c b/keyboards/rgbkb/sol/rev1/rev1.c index 21b4503ab9f..f5997bac007 100644 --- a/keyboards/rgbkb/sol/rev1/rev1.c +++ b/keyboards/rgbkb/sol/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "quantum.h" +#include "sol.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/rgbkb/sol/rev2/rev2.c b/keyboards/rgbkb/sol/rev2/rev2.c index e00c4856098..cd2c9f96452 100644 --- a/keyboards/rgbkb/sol/rev2/rev2.c +++ b/keyboards/rgbkb/sol/rev2/rev2.c @@ -1,4 +1,4 @@ -#include "quantum.h" +#include "sol.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/satt/comet46/lib/host_led_state_reader.c b/keyboards/satt/comet46/lib/host_led_state_reader.c index e9910e01414..54be4195790 100644 --- a/keyboards/satt/comet46/lib/host_led_state_reader.c +++ b/keyboards/satt/comet46/lib/host_led_state_reader.c @@ -1,5 +1,6 @@ #include -#include "quantum.h" +#include "led.h" +#include "host.h" char host_led_state_str[22]; diff --git a/keyboards/satt/comet46/lib/modifier_state_reader.c b/keyboards/satt/comet46/lib/modifier_state_reader.c index c85c83b1dea..856b8d8a682 100644 --- a/keyboards/satt/comet46/lib/modifier_state_reader.c +++ b/keyboards/satt/comet46/lib/modifier_state_reader.c @@ -1,5 +1,5 @@ #include -#include "quantum.h" +#include "action_util.h" char modifier_state_str[22]; diff --git a/keyboards/sekigon/grs_70ec/ec_switch_matrix.c b/keyboards/sekigon/grs_70ec/ec_switch_matrix.c index d1c2d85ac83..9c474695a11 100644 --- a/keyboards/sekigon/grs_70ec/ec_switch_matrix.c +++ b/keyboards/sekigon/grs_70ec/ec_switch_matrix.c @@ -15,8 +15,7 @@ */ #include "ec_switch_matrix.h" - -#include "quantum.h" +#include #include "analog.h" #include "print.h" diff --git a/keyboards/terrazzo/terrazzo.c b/keyboards/terrazzo/terrazzo.c index 53b0bd4c519..34aa7c4324a 100644 --- a/keyboards/terrazzo/terrazzo.c +++ b/keyboards/terrazzo/terrazzo.c @@ -17,10 +17,6 @@ #include "terrazzo.h" #ifdef LED_MATRIX_ENABLE - #include - #include "print.h" - #include "quantum.h" - const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { /* Refer to IS31 manual for these locations * https://cdn-learn.adafruit.com/downloads/pdf/adafruit-15x7-7x15-charlieplex-led-matrix-charliewing-featherwing.pdf diff --git a/keyboards/tzarc/djinn/djinn.c b/keyboards/tzarc/djinn/djinn.c index 17e5833ee9e..8d6e2ec92e2 100644 --- a/keyboards/tzarc/djinn/djinn.c +++ b/keyboards/tzarc/djinn/djinn.c @@ -1,12 +1,10 @@ // Copyright 2018-2023 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include "quantum.h" -#include #include "djinn.h" +#include +#include #include "serial.h" #include "split_util.h" -#include "qp.h" painter_device_t lcd; diff --git a/keyboards/tzarc/djinn/djinn_portscan_matrix.c b/keyboards/tzarc/djinn/djinn_portscan_matrix.c index ac81ad18c1b..63f480be270 100644 --- a/keyboards/tzarc/djinn/djinn_portscan_matrix.c +++ b/keyboards/tzarc/djinn/djinn_portscan_matrix.c @@ -1,8 +1,5 @@ // Copyright 2018-2022 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include -#include "quantum.h" #include "djinn.h" #define GPIOB_BITMASK (1 << 13 | 1 << 14 | 1 << 15) // B13, B14, B15 diff --git a/keyboards/tzarc/djinn/djinn_split_sync.c b/keyboards/tzarc/djinn/djinn_split_sync.c index 8b10e88b4b2..3a2a8a4ff3e 100644 --- a/keyboards/tzarc/djinn/djinn_split_sync.c +++ b/keyboards/tzarc/djinn/djinn_split_sync.c @@ -1,7 +1,5 @@ // Copyright 2018-2023 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include "quantum.h" #include "transactions.h" #include "split_util.h" #include "djinn.h" diff --git a/keyboards/tzarc/djinn/djinn_usbpd.c b/keyboards/tzarc/djinn/djinn_usbpd.c index 7a56f92b8e9..e4e75f20d80 100644 --- a/keyboards/tzarc/djinn/djinn_usbpd.c +++ b/keyboards/tzarc/djinn/djinn_usbpd.c @@ -1,7 +1,5 @@ // Copyright 2018-2022 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include "quantum.h" #include "djinn.h" const char* usbpd_str(usbpd_allowance_t allowance) { diff --git a/keyboards/v60_type_r/v60_type_r.c b/keyboards/v60_type_r/v60_type_r.c index b266472e64e..540c5ec6ecf 100644 --- a/keyboards/v60_type_r/v60_type_r.c +++ b/keyboards/v60_type_r/v60_type_r.c @@ -15,8 +15,6 @@ */ #include "v60_type_r.h" -#include "quantum.h" - // if we've got an RGB underglow! #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/v60_type_r/v60_type_r.h b/keyboards/v60_type_r/v60_type_r.h index 1a7098fc416..ae2381a9514 100644 --- a/keyboards/v60_type_r/v60_type_r.h +++ b/keyboards/v60_type_r/v60_type_r.h @@ -19,8 +19,6 @@ #ifdef RGBLIGHT_ENABLE -#include "rgblight.h" - void rgb_init(void); void set_rgb_color(uint8_t pin, uint8_t value, uint8_t timer_value); diff --git a/keyboards/viktus/minne_topre/ec.c b/keyboards/viktus/minne_topre/ec.c index 569c8785822..edd5f9a31db 100644 --- a/keyboards/viktus/minne_topre/ec.c +++ b/keyboards/viktus/minne_topre/ec.c @@ -14,8 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "ec.h" +#include #include "analog.h" //#include "debug.h" // needed for debugging diff --git a/keyboards/viktus/osav2_numpad_topre/ec.c b/keyboards/viktus/osav2_numpad_topre/ec.c index e4f59c3b6bf..93e698412a0 100644 --- a/keyboards/viktus/osav2_numpad_topre/ec.c +++ b/keyboards/viktus/osav2_numpad_topre/ec.c @@ -14,8 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "ec.h" +#include #include "analog.h" //#include "debug.h" // needed for debugging diff --git a/keyboards/viktus/osav2_topre/ec.c b/keyboards/viktus/osav2_topre/ec.c index 076ffc0ba86..13d9fde654c 100644 --- a/keyboards/viktus/osav2_topre/ec.c +++ b/keyboards/viktus/osav2_topre/ec.c @@ -14,8 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "ec.h" +#include #include "analog.h" //#include "debug.h" // needed for debugging diff --git a/keyboards/viktus/styrka_topre/ec.c b/keyboards/viktus/styrka_topre/ec.c index c9980461afb..078723f691e 100644 --- a/keyboards/viktus/styrka_topre/ec.c +++ b/keyboards/viktus/styrka_topre/ec.c @@ -15,8 +15,8 @@ */ #include "ec.h" +#include -#include "quantum.h" #include "analog.h" //#include "debug.h" diff --git a/keyboards/vinhcatba/uncertainty/bongo.c b/keyboards/vinhcatba/uncertainty/bongo.c index 707955ee881..773a882f508 100644 --- a/keyboards/vinhcatba/uncertainty/bongo.c +++ b/keyboards/vinhcatba/uncertainty/bongo.c @@ -1,7 +1,14 @@ // Copyright 2022 Parker Levin (@pedker) // SPDX-License-Identifier: GPL-2.0-or-later +#include "bongo.h" +#include #include "quantum.h" +#include "matrix.h" +#include "oled_driver.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" #define ANIM_FRAME_DURATION 75 // how long each frame lasts in ms #define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/vinhcatba/uncertainty/bongo.h b/keyboards/vinhcatba/uncertainty/bongo.h index d1cecbc6197..c4bb1ed6756 100644 --- a/keyboards/vinhcatba/uncertainty/bongo.h +++ b/keyboards/vinhcatba/uncertainty/bongo.h @@ -3,4 +3,6 @@ #pragma once +#include + void draw_bongo(bool minimal); diff --git a/keyboards/vinhcatba/uncertainty/uncertainty.c b/keyboards/vinhcatba/uncertainty/uncertainty.c index 19e5a5cfd53..c569f07a3bd 100644 --- a/keyboards/vinhcatba/uncertainty/uncertainty.c +++ b/keyboards/vinhcatba/uncertainty/uncertainty.c @@ -1,8 +1,7 @@ // Copyright 2023 Vinh Le (@vinhcatba) // SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H -#include "quantum.h" +#include "uncertainty.h" #ifdef OLED_ENABLE #include "bongo.h" diff --git a/keyboards/yosino58/lib/layer_state_reader.c b/keyboards/yosino58/lib/layer_state_reader.c index f9cd9345685..5f48c1f426d 100644 --- a/keyboards/yosino58/lib/layer_state_reader.c +++ b/keyboards/yosino58/lib/layer_state_reader.c @@ -1,5 +1,5 @@ -#include "quantum.h" +#include "action_layer.h" #include #define L_BASE 0 diff --git a/keyboards/yosino58/lib/rgb_state_reader.c b/keyboards/yosino58/lib/rgb_state_reader.c index daa008d8499..3d74fb45e4e 100644 --- a/keyboards/yosino58/lib/rgb_state_reader.c +++ b/keyboards/yosino58/lib/rgb_state_reader.c @@ -1,6 +1,5 @@ #ifdef RGBLIGHT_ENABLE -#include "quantum.h" #include extern rgblight_config_t rgblight_config; From 9fa91ad4947293f75df4c0e85ea594b1529afbca Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 6 Apr 2024 01:43:52 +1100 Subject: [PATCH 114/333] Rename `process_{led,rgb}_matrix()` (#23422) --- quantum/keyboard.c | 4 ++-- quantum/led_matrix/led_matrix.c | 2 +- quantum/led_matrix/led_matrix.h | 2 +- quantum/rgb_matrix/rgb_matrix.c | 2 +- quantum/rgb_matrix/rgb_matrix.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/quantum/keyboard.c b/quantum/keyboard.c index 5aaa4b452f2..df1dc1c3ee0 100644 --- a/quantum/keyboard.c +++ b/quantum/keyboard.c @@ -500,10 +500,10 @@ void keyboard_init(void) { */ void switch_events(uint8_t row, uint8_t col, bool pressed) { #if defined(LED_MATRIX_ENABLE) - process_led_matrix(row, col, pressed); + led_matrix_handle_key_event(row, col, pressed); #endif #if defined(RGB_MATRIX_ENABLE) - process_rgb_matrix(row, col, pressed); + rgb_matrix_handle_key_event(row, col, pressed); #endif } diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c index c0fb4c810b1..2ca62c6969d 100644 --- a/quantum/led_matrix/led_matrix.c +++ b/quantum/led_matrix/led_matrix.c @@ -159,7 +159,7 @@ void led_matrix_set_value_all(uint8_t value) { #endif } -void process_led_matrix(uint8_t row, uint8_t col, bool pressed) { +void led_matrix_handle_key_event(uint8_t row, uint8_t col, bool pressed) { #ifndef LED_MATRIX_SPLIT if (!is_keyboard_master()) return; #endif diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h index 941d42aecad..9a13c3e52b4 100644 --- a/quantum/led_matrix/led_matrix.h +++ b/quantum/led_matrix/led_matrix.h @@ -124,7 +124,7 @@ uint8_t led_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *l void led_matrix_set_value(int index, uint8_t value); void led_matrix_set_value_all(uint8_t value); -void process_led_matrix(uint8_t row, uint8_t col, bool pressed); +void led_matrix_handle_key_event(uint8_t row, uint8_t col, bool pressed); void led_matrix_task(void); diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c index 655aca18679..aaba00b4576 100644 --- a/quantum/rgb_matrix/rgb_matrix.c +++ b/quantum/rgb_matrix/rgb_matrix.c @@ -156,7 +156,7 @@ void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue) { #endif } -void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) { +void rgb_matrix_handle_key_event(uint8_t row, uint8_t col, bool pressed) { #ifndef RGB_MATRIX_SPLIT if (!is_keyboard_master()) return; #endif diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h index f8a6845e02b..ceb3185d1a8 100644 --- a/quantum/rgb_matrix/rgb_matrix.h +++ b/quantum/rgb_matrix/rgb_matrix.h @@ -148,7 +148,7 @@ uint8_t rgb_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *l void rgb_matrix_set_color(int index, uint8_t red, uint8_t green, uint8_t blue); void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue); -void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed); +void rgb_matrix_handle_key_event(uint8_t row, uint8_t col, bool pressed); void rgb_matrix_task(void); From 1f3d709fcb22dd922369fa434813531fed3748ab Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 5 Apr 2024 15:44:06 +0100 Subject: [PATCH 115/333] Migrate build target markers to keyboard.json - YZ (#23421) --- keyboards/yampad/{info.json => keyboard.json} | 7 +++++++ keyboards/yampad/rules.mk | 14 -------------- .../buff67v3/{info.json => keyboard.json} | 7 +++++++ keyboards/yandrstudio/buff67v3/rules.mk | 13 ------------- .../eau87/{info.json => keyboard.json} | 6 ++++++ keyboards/yandrstudio/eau87/rules.mk | 13 ------------- .../eau_r2/{info.json => keyboard.json} | 7 +++++++ keyboards/yandrstudio/eau_r2/rules.mk | 13 ------------- .../nightstar75/{info.json => keyboard.json} | 7 +++++++ keyboards/yandrstudio/nightstar75/rules.mk | 13 ------------- .../nz67v2/{info.json => keyboard.json} | 8 ++++++++ keyboards/yandrstudio/nz67v2/rules.mk | 15 --------------- .../tg67/{info.json => keyboard.json} | 7 +++++++ keyboards/yandrstudio/tg67/rules.mk | 14 -------------- .../wave75/{info.json => keyboard.json} | 6 ++++++ keyboards/yandrstudio/wave75/rules.mk | 13 ------------- .../yr6095/{info.json => keyboard.json} | 7 +++++++ keyboards/yandrstudio/yr6095/rules.mk | 13 ------------- .../yr80/{info.json => keyboard.json} | 7 +++++++ keyboards/yandrstudio/yr80/rules.mk | 13 ------------- .../ydkb/grape/{info.json => keyboard.json} | 7 +++++++ keyboards/ydkb/grape/rules.mk | 13 ------------- .../ydkb/just60/{info.json => keyboard.json} | 3 +++ keyboards/ydkb/just60/rules.mk | 13 ------------- .../barleycorn/{info.json => keyboard.json} | 5 +++++ keyboards/yiancardesigns/barleycorn/rules.mk | 13 ------------- .../gingham/{info.json => keyboard.json} | 5 +++++ keyboards/yiancardesigns/gingham/rules.mk | 17 ++--------------- .../seigaiha/{info.json => keyboard.json} | 5 +++++ keyboards/yiancardesigns/seigaiha/rules.mk | 13 ------------- .../ymdk/id75/{info.json => keyboard.json} | 0 keyboards/ymdk/id75/rules.mk | 1 - .../soldered/{info.json => keyboard.json} | 8 ++++++++ keyboards/ymdk/melody96/soldered/rules.mk | 12 ------------ .../ymdk/sp64/{info.json => keyboard.json} | 6 ++++++ keyboards/ymdk/sp64/rules.mk | 13 +------------ .../ymd40/air40/{info.json => keyboard.json} | 7 +++++++ keyboards/ymdk/ymd40/air40/rules.mk | 16 ---------------- .../ymdk/ymd40/v2/{info.json => keyboard.json} | 7 +++++++ keyboards/ymdk/ymd40/v2/rules.mk | 15 --------------- .../lunakey_mini/{info.json => keyboard.json} | 5 +++++ keyboards/yoichiro/lunakey_mini/rules.mk | 13 ------------- .../lunakey_pico/{info.json => keyboard.json} | 0 .../yosino58/rev1/{info.json => keyboard.json} | 1 + keyboards/yosino58/rev1/rules.mk | 13 ------------- .../yynmt/acperience12/rev1/keyboard.json | 5 +++++ keyboards/yynmt/acperience12/rules.mk | 13 ------------- .../zigotica/z34/{info.json => keyboard.json} | 7 +++++++ keyboards/zigotica/z34/rules.mk | 16 ---------------- .../lets_split_v3/{info.json => keyboard.json} | 0 keyboards/zlant/{info.json => keyboard.json} | 7 +++++++ keyboards/zlant/rules.mk | 13 ------------- .../moonlander/{info.json => keyboard.json} | 16 +++++++++++++++- keyboards/zsa/moonlander/rules.mk | 18 +----------------- 54 files changed, 166 insertions(+), 343 deletions(-) rename keyboards/yampad/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/yampad/rules.mk rename keyboards/yandrstudio/buff67v3/{info.json => keyboard.json} (96%) rename keyboards/yandrstudio/eau87/{info.json => keyboard.json} (97%) rename keyboards/yandrstudio/eau_r2/{info.json => keyboard.json} (97%) rename keyboards/yandrstudio/nightstar75/{info.json => keyboard.json} (97%) rename keyboards/yandrstudio/nz67v2/{info.json => keyboard.json} (98%) rename keyboards/yandrstudio/tg67/{info.json => keyboard.json} (97%) rename keyboards/yandrstudio/wave75/{info.json => keyboard.json} (97%) rename keyboards/yandrstudio/yr6095/{info.json => keyboard.json} (98%) rename keyboards/yandrstudio/yr80/{info.json => keyboard.json} (97%) rename keyboards/ydkb/grape/{info.json => keyboard.json} (99%) rename keyboards/ydkb/just60/{info.json => keyboard.json} (98%) rename keyboards/yiancardesigns/barleycorn/{info.json => keyboard.json} (99%) rename keyboards/yiancardesigns/gingham/{info.json => keyboard.json} (98%) rename keyboards/yiancardesigns/seigaiha/{info.json => keyboard.json} (99%) rename keyboards/ymdk/id75/{info.json => keyboard.json} (100%) rename keyboards/ymdk/melody96/soldered/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/ymdk/melody96/soldered/rules.mk rename keyboards/ymdk/sp64/{info.json => keyboard.json} (97%) rename keyboards/ymdk/ymd40/air40/{info.json => keyboard.json} (98%) rename keyboards/ymdk/ymd40/v2/{info.json => keyboard.json} (98%) rename keyboards/yoichiro/lunakey_mini/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/yoichiro/lunakey_mini/rules.mk rename keyboards/yoichiro/lunakey_pico/{info.json => keyboard.json} (100%) rename keyboards/yosino58/rev1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/yosino58/rev1/rules.mk rename keyboards/zigotica/z34/{info.json => keyboard.json} (96%) rename keyboards/ziptyze/lets_split_v3/{info.json => keyboard.json} (100%) rename keyboards/zlant/{info.json => keyboard.json} (97%) rename keyboards/zsa/moonlander/{info.json => keyboard.json} (94%) diff --git a/keyboards/yampad/info.json b/keyboards/yampad/keyboard.json similarity index 93% rename from keyboards/yampad/info.json rename to keyboards/yampad/keyboard.json index bf9841492d9..76efef72ad9 100644 --- a/keyboards/yampad/info.json +++ b/keyboards/yampad/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x8369", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "rgblight": { "led_count": 9, "animations": { @@ -27,6 +33,7 @@ "pin": "F4" }, "build": { + "lto": true, "debounce_type": "sym_eager_pk" }, "matrix_pins": { diff --git a/keyboards/yampad/rules.mk b/keyboards/yampad/rules.mk deleted file mode 100644 index 498bf77b977..00000000000 --- a/keyboards/yampad/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -AUDIO_ENABLE = no # Audio output -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -COMMAND_ENABLE = no # Commands for debug and configuration -CONSOLE_ENABLE = no # Console for debug -EXTRAKEY_ENABLE = no # Audio control and System control -LTO_ENABLE = yes # Link time optimise, reduce firmware size -MOUSEKEY_ENABLE = no # Mouse keys -NKRO_ENABLE = yes # Enable N-Key Rollover -OLED_ENABLE = yes -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/keyboard.json similarity index 96% rename from keyboards/yandrstudio/buff67v3/info.json rename to keyboards/yandrstudio/buff67v3/keyboard.json index 9fe09cd95b9..918bc7b0e7c 100644 --- a/keyboards/yandrstudio/buff67v3/info.json +++ b/keyboards/yandrstudio/buff67v3/keyboard.json @@ -6,6 +6,13 @@ "pid": "0xAA88", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "led_count": 1, "animations": { diff --git a/keyboards/yandrstudio/buff67v3/rules.mk b/keyboards/yandrstudio/buff67v3/rules.mk index 421ae9fce11..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/buff67v3/rules.mk +++ b/keyboards/yandrstudio/buff67v3/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yandrstudio/eau87/info.json b/keyboards/yandrstudio/eau87/keyboard.json similarity index 97% rename from keyboards/yandrstudio/eau87/info.json rename to keyboards/yandrstudio/eau87/keyboard.json index 39eeac8564b..ec91989d0f2 100644 --- a/keyboards/yandrstudio/eau87/info.json +++ b/keyboards/yandrstudio/eau87/keyboard.json @@ -6,6 +6,12 @@ "pid": "0xAAEB", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "A15", "B3"], "rows": ["B12", "B5", "B4", "A4", "B7", "B6"] diff --git a/keyboards/yandrstudio/eau87/rules.mk b/keyboards/yandrstudio/eau87/rules.mk index 4a92d0f891c..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/eau87/rules.mk +++ b/keyboards/yandrstudio/eau87/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# 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 diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/keyboard.json similarity index 97% rename from keyboards/yandrstudio/eau_r2/info.json rename to keyboards/yandrstudio/eau_r2/keyboard.json index c3aaf39e2d8..78f7dc108c4 100644 --- a/keyboards/yandrstudio/eau_r2/info.json +++ b/keyboards/yandrstudio/eau_r2/keyboard.json @@ -6,6 +6,13 @@ "pid": "0xAACD", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B7", "A6", "B6", "B5", "B4", "B3", "A5", "A10", "B1", "B0", "A7", "A9", "B11", "B10", "B2", "A15", "B15"], "rows": ["A3", "B9", "B8", "A4", "C14", "C13"] diff --git a/keyboards/yandrstudio/eau_r2/rules.mk b/keyboards/yandrstudio/eau_r2/rules.mk index 421ae9fce11..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/eau_r2/rules.mk +++ b/keyboards/yandrstudio/eau_r2/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/keyboard.json similarity index 97% rename from keyboards/yandrstudio/nightstar75/info.json rename to keyboards/yandrstudio/nightstar75/keyboard.json index 956016a7e6d..d356b81fd5c 100644 --- a/keyboards/yandrstudio/nightstar75/info.json +++ b/keyboards/yandrstudio/nightstar75/keyboard.json @@ -6,6 +6,13 @@ "pid": "0xAA87", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "ws2812": { "pin": "A7", "driver": "pwm" diff --git a/keyboards/yandrstudio/nightstar75/rules.mk b/keyboards/yandrstudio/nightstar75/rules.mk index 421ae9fce11..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/nightstar75/rules.mk +++ b/keyboards/yandrstudio/nightstar75/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/keyboard.json similarity index 98% rename from keyboards/yandrstudio/nz67v2/info.json rename to keyboards/yandrstudio/nz67v2/keyboard.json index 372330eb68f..fc931f3427a 100644 --- a/keyboards/yandrstudio/nz67v2/info.json +++ b/keyboards/yandrstudio/nz67v2/keyboard.json @@ -6,6 +6,14 @@ "pid": "0xAA83", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "ws2812": { "pin": "B5", "driver": "pwm" diff --git a/keyboards/yandrstudio/nz67v2/rules.mk b/keyboards/yandrstudio/nz67v2/rules.mk index ba2d7ccbc32..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/nz67v2/rules.mk +++ b/keyboards/yandrstudio/nz67v2/rules.mk @@ -1,17 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# 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 = yes # Enable keyboard RGB matrix functionality -ENCODER_ENABLE = yes # Rotary encoder support diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/keyboard.json similarity index 97% rename from keyboards/yandrstudio/tg67/info.json rename to keyboards/yandrstudio/tg67/keyboard.json index 0e4a0f62434..8a1df37805d 100644 --- a/keyboards/yandrstudio/tg67/info.json +++ b/keyboards/yandrstudio/tg67/keyboard.json @@ -6,6 +6,13 @@ "pid": "0xAA8D", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "ws2812": { "pin": "A7", "driver": "pwm" diff --git a/keyboards/yandrstudio/tg67/rules.mk b/keyboards/yandrstudio/tg67/rules.mk index 8aabb4f22e0..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/tg67/rules.mk +++ b/keyboards/yandrstudio/tg67/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# 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 = yes # Enable keyboard RGB Matrix diff --git a/keyboards/yandrstudio/wave75/info.json b/keyboards/yandrstudio/wave75/keyboard.json similarity index 97% rename from keyboards/yandrstudio/wave75/info.json rename to keyboards/yandrstudio/wave75/keyboard.json index d055dc00486..8455eb11886 100644 --- a/keyboards/yandrstudio/wave75/info.json +++ b/keyboards/yandrstudio/wave75/keyboard.json @@ -6,6 +6,12 @@ "pid": "0xAA8E", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["B0", "A7", "A6", "B15", "B14", "B13", "A5", "B7", "B6", "B5", "A4", "B12", "A3", "B2", "A2"], diff --git a/keyboards/yandrstudio/wave75/rules.mk b/keyboards/yandrstudio/wave75/rules.mk index 4a92d0f891c..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/wave75/rules.mk +++ b/keyboards/yandrstudio/wave75/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# 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 diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/keyboard.json similarity index 98% rename from keyboards/yandrstudio/yr6095/info.json rename to keyboards/yandrstudio/yr6095/keyboard.json index 7f5308f50a7..7a5d11181ef 100644 --- a/keyboards/yandrstudio/yr6095/info.json +++ b/keyboards/yandrstudio/yr6095/keyboard.json @@ -6,6 +6,13 @@ "pid": "0xAA0C", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "led_count": 1, "animations": { diff --git a/keyboards/yandrstudio/yr6095/rules.mk b/keyboards/yandrstudio/yr6095/rules.mk index 421ae9fce11..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/yr6095/rules.mk +++ b/keyboards/yandrstudio/yr6095/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yandrstudio/yr80/info.json b/keyboards/yandrstudio/yr80/keyboard.json similarity index 97% rename from keyboards/yandrstudio/yr80/info.json rename to keyboards/yandrstudio/yr80/keyboard.json index 3581fa9d1c8..abf552af5c9 100644 --- a/keyboards/yandrstudio/yr80/info.json +++ b/keyboards/yandrstudio/yr80/keyboard.json @@ -6,6 +6,13 @@ "pid": "0xAA0D", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "led_count": 1, "animations": { diff --git a/keyboards/yandrstudio/yr80/rules.mk b/keyboards/yandrstudio/yr80/rules.mk index 421ae9fce11..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/yr80/rules.mk +++ b/keyboards/yandrstudio/yr80/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ydkb/grape/info.json b/keyboards/ydkb/grape/keyboard.json similarity index 99% rename from keyboards/ydkb/grape/info.json rename to keyboards/ydkb/grape/keyboard.json index 75aa8fffafe..f8f0364d93d 100644 --- a/keyboards/ydkb/grape/info.json +++ b/keyboards/ydkb/grape/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x6772", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/ydkb/grape/rules.mk b/keyboards/ydkb/grape/rules.mk index d1eb5135b4d..6beea3e392f 100644 --- a/keyboards/ydkb/grape/rules.mk +++ b/keyboards/ydkb/grape/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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite VPATH += drivers/gpio SRC += matrix.c sn74x138.c diff --git a/keyboards/ydkb/just60/info.json b/keyboards/ydkb/just60/keyboard.json similarity index 98% rename from keyboards/ydkb/just60/info.json rename to keyboards/ydkb/just60/keyboard.json index d61f09221a9..fb46e08ea31 100644 --- a/keyboards/ydkb/just60/info.json +++ b/keyboards/ydkb/just60/keyboard.json @@ -8,6 +8,9 @@ "pid": "0x1960", "device_version": "0.0.1" }, + "features": { + "bootmagic": true + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B6", "B5", "B7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0"], "rows": ["E2", "C7", "B3", "B2", "B1"] diff --git a/keyboards/ydkb/just60/rules.mk b/keyboards/ydkb/just60/rules.mk index 2a99e009194..3437a35bdf1 100644 --- a/keyboards/ydkb/just60/rules.mk +++ b/keyboards/ydkb/just60/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 = 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/yiancardesigns/barleycorn/info.json b/keyboards/yiancardesigns/barleycorn/keyboard.json similarity index 99% rename from keyboards/yiancardesigns/barleycorn/info.json rename to keyboards/yiancardesigns/barleycorn/keyboard.json index 99786319b3e..2fd79052c91 100644 --- a/keyboards/yiancardesigns/barleycorn/info.json +++ b/keyboards/yiancardesigns/barleycorn/keyboard.json @@ -8,6 +8,11 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true + }, "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/yiancardesigns/barleycorn/rules.mk b/keyboards/yiancardesigns/barleycorn/rules.mk index 3808b0d3f24..c04c3c92ed3 100644 --- a/keyboards/yiancardesigns/barleycorn/rules.mk +++ b/keyboards/yiancardesigns/barleycorn/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 = 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 SRC += matrix.c diff --git a/keyboards/yiancardesigns/gingham/info.json b/keyboards/yiancardesigns/gingham/keyboard.json similarity index 98% rename from keyboards/yiancardesigns/gingham/info.json rename to keyboards/yiancardesigns/gingham/keyboard.json index 23f0788d0f2..eb5573a355b 100644 --- a/keyboards/yiancardesigns/gingham/info.json +++ b/keyboards/yiancardesigns/gingham/keyboard.json @@ -9,6 +9,11 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true + }, "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/yiancardesigns/gingham/rules.mk b/keyboards/yiancardesigns/gingham/rules.mk index cd47b89aeda..23e7186f190 100644 --- a/keyboards/yiancardesigns/gingham/rules.mk +++ b/keyboards/yiancardesigns/gingham/rules.mk @@ -1,17 +1,4 @@ +CUSTOM_MATRIX = lite + SRC = matrix.c I2C_DRIVER_REQUIRED = yes - -# 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 - -CUSTOM_MATRIX = lite diff --git a/keyboards/yiancardesigns/seigaiha/info.json b/keyboards/yiancardesigns/seigaiha/keyboard.json similarity index 99% rename from keyboards/yiancardesigns/seigaiha/info.json rename to keyboards/yiancardesigns/seigaiha/keyboard.json index 91a0529e88a..5890357c99f 100644 --- a/keyboards/yiancardesigns/seigaiha/info.json +++ b/keyboards/yiancardesigns/seigaiha/keyboard.json @@ -9,6 +9,11 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true + }, "bootmagic": { "matrix": [1, 0] }, diff --git a/keyboards/yiancardesigns/seigaiha/rules.mk b/keyboards/yiancardesigns/seigaiha/rules.mk index 3808b0d3f24..c04c3c92ed3 100644 --- a/keyboards/yiancardesigns/seigaiha/rules.mk +++ b/keyboards/yiancardesigns/seigaiha/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 = 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 SRC += matrix.c diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/keyboard.json similarity index 100% rename from keyboards/ymdk/id75/info.json rename to keyboards/ymdk/id75/keyboard.json diff --git a/keyboards/ymdk/id75/rules.mk b/keyboards/ymdk/id75/rules.mk index edbd3dd7181..dbee20ab053 100644 --- a/keyboards/ymdk/id75/rules.mk +++ b/keyboards/ymdk/id75/rules.mk @@ -3,4 +3,3 @@ MCU_LDSCRIPT = STM32F103xB # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - diff --git a/keyboards/ymdk/melody96/soldered/info.json b/keyboards/ymdk/melody96/soldered/keyboard.json similarity index 99% rename from keyboards/ymdk/melody96/soldered/info.json rename to keyboards/ymdk/melody96/soldered/keyboard.json index f941c659702..06d39472406 100644 --- a/keyboards/ymdk/melody96/soldered/info.json +++ b/keyboards/ymdk/melody96/soldered/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4D96", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/ymdk/melody96/soldered/rules.mk b/keyboards/ymdk/melody96/soldered/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/ymdk/melody96/soldered/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ymdk/sp64/info.json b/keyboards/ymdk/sp64/keyboard.json similarity index 97% rename from keyboards/ymdk/sp64/info.json rename to keyboards/ymdk/sp64/keyboard.json index a0091c8f3da..bfb140873af 100644 --- a/keyboards/ymdk/sp64/info.json +++ b/keyboards/ymdk/sp64/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x5364", "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "command": true, + "extrakey": true, + "rgblight": true + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", diff --git a/keyboards/ymdk/sp64/rules.mk b/keyboards/ymdk/sp64/rules.mk index 56da806510d..9edee34f595 100644 --- a/keyboards/ymdk/sp64/rules.mk +++ b/keyboards/ymdk/sp64/rules.mk @@ -1,16 +1,5 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow + CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/ymdk/ymd40/air40/info.json b/keyboards/ymdk/ymd40/air40/keyboard.json similarity index 98% rename from keyboards/ymdk/ymd40/air40/info.json rename to keyboards/ymdk/ymd40/air40/keyboard.json index 4e791c87c47..aaca80156b1 100644 --- a/keyboards/ymdk/ymd40/air40/info.json +++ b/keyboards/ymdk/ymd40/air40/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0911", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations":{ "alphas_mods": true, @@ -68,6 +74,7 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/ymdk/ymd40/air40/rules.mk b/keyboards/ymdk/ymd40/air40/rules.mk index f408492aa87..9f9c86d4bbf 100644 --- a/keyboards/ymdk/ymd40/air40/rules.mk +++ b/keyboards/ymdk/ymd40/air40/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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no RGBLIGHT_SUPPORTED = no -RGB_MATRIX_ENABLE = yes -AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no -KEY_LOCK_ENABLE = no - -LAYOUTS = ortho_4x12 diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/keyboard.json similarity index 98% rename from keyboards/ymdk/ymd40/v2/info.json rename to keyboards/ymdk/ymd40/v2/keyboard.json index 6686030166b..08f5f0a4e37 100644 --- a/keyboards/ymdk/ymd40/v2/info.json +++ b/keyboards/ymdk/ymd40/v2/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x4440", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D0", "B3", "B2", "B1"] diff --git a/keyboards/ymdk/ymd40/v2/rules.mk b/keyboards/ymdk/ymd40/v2/rules.mk index e0fdb5c802b..79487b2ec4b 100644 --- a/keyboards/ymdk/ymd40/v2/rules.mk +++ b/keyboards/ymdk/ymd40/v2/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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -KEY_LOCK_ENABLE = no - AUDIO_SUPPORTED = no diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/keyboard.json similarity index 97% rename from keyboards/yoichiro/lunakey_mini/info.json rename to keyboards/yoichiro/lunakey_mini/keyboard.json index aa00e7e69e3..5fbf6c8fbc9 100644 --- a/keyboards/yoichiro/lunakey_mini/info.json +++ b/keyboards/yoichiro/lunakey_mini/keyboard.json @@ -8,12 +8,17 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "D7", "E6", "B4"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/yoichiro/lunakey_mini/rules.mk b/keyboards/yoichiro/lunakey_mini/rules.mk deleted file mode 100644 index 6188406cdee..00000000000 --- a/keyboards/yoichiro/lunakey_mini/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes # Enable Split keyboard diff --git a/keyboards/yoichiro/lunakey_pico/info.json b/keyboards/yoichiro/lunakey_pico/keyboard.json similarity index 100% rename from keyboards/yoichiro/lunakey_pico/info.json rename to keyboards/yoichiro/lunakey_pico/keyboard.json diff --git a/keyboards/yosino58/rev1/info.json b/keyboards/yosino58/rev1/keyboard.json similarity index 99% rename from keyboards/yosino58/rev1/info.json rename to keyboards/yosino58/rev1/keyboard.json index c0dc03831fa..2e50450a272 100644 --- a/keyboards/yosino58/rev1/info.json +++ b/keyboards/yosino58/rev1/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/yosino58/rev1/rules.mk b/keyboards/yosino58/rev1/rules.mk deleted file mode 100644 index 2fcc81da0f6..00000000000 --- a/keyboards/yosino58/rev1/rules.mk +++ /dev/null @@ -1,13 +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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes diff --git a/keyboards/yynmt/acperience12/rev1/keyboard.json b/keyboards/yynmt/acperience12/rev1/keyboard.json index 5eea37a35df..deb02bd55d4 100644 --- a/keyboards/yynmt/acperience12/rev1/keyboard.json +++ b/keyboards/yynmt/acperience12/rev1/keyboard.json @@ -8,6 +8,11 @@ "pid": "0xEA51", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "matrix_pins": { diff --git a/keyboards/yynmt/acperience12/rules.mk b/keyboards/yynmt/acperience12/rules.mk index 3a226546213..cfe8b8ac18f 100644 --- a/keyboards/yynmt/acperience12/rules.mk +++ b/keyboards/yynmt/acperience12/rules.mk @@ -1,14 +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 - DEFAULT_FOLDER = yynmt/acperience12/rev1 diff --git a/keyboards/zigotica/z34/info.json b/keyboards/zigotica/z34/keyboard.json similarity index 96% rename from keyboards/zigotica/z34/info.json rename to keyboards/zigotica/z34/keyboard.json index e82a6dd304c..5faa9b23b21 100644 --- a/keyboards/zigotica/z34/info.json +++ b/keyboards/zigotica/z34/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "extrakey": true + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { @@ -19,6 +25,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "matrix_pins": { "right": { diff --git a/keyboards/zigotica/z34/rules.mk b/keyboards/zigotica/z34/rules.mk index 669d2bc02f2..68cfee02814 100644 --- a/keyboards/zigotica/z34/rules.mk +++ b/keyboards/zigotica/z34/rules.mk @@ -1,19 +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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes # Split common -LTO_ENABLE = yes # Enables Link Time Optimization (LTO) which reduces the compiled size - # There are no extra pins, so we make sure to disable OLED and Encoders OLED_SUPPORTED = no # Enables the use of OLED displays ENCODER_SUPPORTED = no # Enables the use of encoders - diff --git a/keyboards/ziptyze/lets_split_v3/info.json b/keyboards/ziptyze/lets_split_v3/keyboard.json similarity index 100% rename from keyboards/ziptyze/lets_split_v3/info.json rename to keyboards/ziptyze/lets_split_v3/keyboard.json diff --git a/keyboards/zlant/info.json b/keyboards/zlant/keyboard.json similarity index 97% rename from keyboards/zlant/info.json rename to keyboards/zlant/keyboard.json index 7fba339db1c..d59b1c3f19d 100644 --- a/keyboards/zlant/info.json +++ b/keyboards/zlant/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B7", "D1", "D2", "D3", "B3", "B2"], "rows": ["B0", "B1", "D4", "D5"] diff --git a/keyboards/zlant/rules.mk b/keyboards/zlant/rules.mk index c0d021d8912..4df55cd2206 100755 --- a/keyboards/zlant/rules.mk +++ b/keyboards/zlant/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 -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes - # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/zsa/moonlander/info.json b/keyboards/zsa/moonlander/keyboard.json similarity index 94% rename from keyboards/zsa/moonlander/info.json rename to keyboards/zsa/moonlander/keyboard.json index 31d6693e398..233cb46bba7 100644 --- a/keyboards/zsa/moonlander/info.json +++ b/keyboards/zsa/moonlander/keyboard.json @@ -6,7 +6,21 @@ "usb": { "vid": "0x3297", "pid": "0x1969", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "mouse": false + } + }, + "features": { + "audio": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true, + "swap_hands": true }, "dynamic_keymap": { "layer_count": 8 diff --git a/keyboards/zsa/moonlander/rules.mk b/keyboards/zsa/moonlander/rules.mk index 204c5940e44..46375584890 100644 --- a/keyboards/zsa/moonlander/rules.mk +++ b/keyboards/zsa/moonlander/rules.mk @@ -1,22 +1,6 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output AUDIO_DRIVER = dac_additive CUSTOM_MATRIX = lite -SWAP_HANDS_ENABLE = yes -RGB_MATRIX_ENABLE = yes -#project specific files +# project specific files SRC += matrix.c I2C_DRIVER_REQUIRED = yes - -MOUSE_SHARED_EP = no From 36ae585468d4ee781a31303185c71662e2e27d0e Mon Sep 17 00:00:00 2001 From: yiancar Date: Sat, 6 Apr 2024 09:43:20 +0100 Subject: [PATCH 116/333] [Keyboard] Add Skelett60 (#23409) Co-authored-by: yiancar Co-authored-by: Ryan Co-authored-by: Duncan Sutherland --- keyboards/novelkeys/skelett60/info.json | 946 ++++++++++++++++++ .../skelett60/keymaps/default/keymap.c | 32 + .../novelkeys/skelett60/keymaps/via/keymap.c | 32 + .../novelkeys/skelett60/keymaps/via/rules.mk | 1 + keyboards/novelkeys/skelett60/readme.md | 36 + keyboards/novelkeys/skelett60/rules.mk | 3 + keyboards/novelkeys/skelett60/skelett60.c | 21 + 7 files changed, 1071 insertions(+) create mode 100755 keyboards/novelkeys/skelett60/info.json create mode 100644 keyboards/novelkeys/skelett60/keymaps/default/keymap.c create mode 100644 keyboards/novelkeys/skelett60/keymaps/via/keymap.c create mode 100755 keyboards/novelkeys/skelett60/keymaps/via/rules.mk create mode 100755 keyboards/novelkeys/skelett60/readme.md create mode 100644 keyboards/novelkeys/skelett60/rules.mk create mode 100755 keyboards/novelkeys/skelett60/skelett60.c diff --git a/keyboards/novelkeys/skelett60/info.json b/keyboards/novelkeys/skelett60/info.json new file mode 100755 index 00000000000..1a8f988b018 --- /dev/null +++ b/keyboards/novelkeys/skelett60/info.json @@ -0,0 +1,946 @@ +{ + "manufacturer": "Yiancar-Designs", + "keyboard_name": "Skelett 60", + "maintainer": "Yiancar-Designs", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "indicators": { + "caps_lock": "B6", + "on_state": 0 + }, + "matrix_pins": { + "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"], + "rows": ["A2", "B9", "B8", "B5", "B4"] + }, + "processor": "STM32F072", + "url": "https://yiancar-designs.com", + "usb": { + "device_version": "0.0.1", + "pid": "0x7336", + "vid": "0x8968" + }, + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift", "60_tsangan_hhkb"], + "layouts": { + "LAYOUT_60_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_ansi_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_ansi_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_iso_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_iso_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_tsangan_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + } + } +} diff --git a/keyboards/novelkeys/skelett60/keymaps/default/keymap.c b/keyboards/novelkeys/skelett60/keymaps/default/keymap.c new file mode 100644 index 00000000000..6ce0d78bc7c --- /dev/null +++ b/keyboards/novelkeys/skelett60/keymaps/default/keymap.c @@ -0,0 +1,32 @@ +/* Copyright 2024 Yiancar-Designs + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_all( /* Base */ + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL), + +[1] = LAYOUT_all( /* FN */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/novelkeys/skelett60/keymaps/via/keymap.c b/keyboards/novelkeys/skelett60/keymaps/via/keymap.c new file mode 100644 index 00000000000..6ce0d78bc7c --- /dev/null +++ b/keyboards/novelkeys/skelett60/keymaps/via/keymap.c @@ -0,0 +1,32 @@ +/* Copyright 2024 Yiancar-Designs + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_all( /* Base */ + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL), + +[1] = LAYOUT_all( /* FN */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/novelkeys/skelett60/keymaps/via/rules.mk b/keyboards/novelkeys/skelett60/keymaps/via/rules.mk new file mode 100755 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/novelkeys/skelett60/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/novelkeys/skelett60/readme.md b/keyboards/novelkeys/skelett60/readme.md new file mode 100755 index 00000000000..05c920502b3 --- /dev/null +++ b/keyboards/novelkeys/skelett60/readme.md @@ -0,0 +1,36 @@ +# Skelett 60 + +This is a standard 60% layout PCB. It supports VIA. + +* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar) +* Hardware Supported: A 60% keyboard with STM32F072CB +* Hardware Availability: https://novelkeys.com/ + +## Instructions + +### Build + +Make example for this keyboard (after setting up your build environment): + + make novelkeys/skelett60:default + +Flashing example for this keyboard: + + make novelkeys/skelett60: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). + +### Reset + +- Unplug +- Hold Escape +- Plug In +- Unplug +- Release Escape + +### Flash + +- Unplug +- Hold Escape +- Plug In +- Flash using QMK Toolbox or CLI (`make novelkeys/skelett60::flash`) diff --git a/keyboards/novelkeys/skelett60/rules.mk b/keyboards/novelkeys/skelett60/rules.mk new file mode 100644 index 00000000000..6dd24d8e068 --- /dev/null +++ b/keyboards/novelkeys/skelett60/rules.mk @@ -0,0 +1,3 @@ +# Wildcard to allow APM32 MCU +DFU_SUFFIX_ARGS = -v FFFF -p FFFF + diff --git a/keyboards/novelkeys/skelett60/skelett60.c b/keyboards/novelkeys/skelett60/skelett60.c new file mode 100755 index 00000000000..fdbfa8f2727 --- /dev/null +++ b/keyboards/novelkeys/skelett60/skelett60.c @@ -0,0 +1,21 @@ +/* Copyright 2024 Yiancar-Designs + * + * 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 . + */ +#include "quantum.h" + +void led_init_ports(void) { + // Set our LED pins as open drain outputs + gpio_set_pin_output_open_drain(LED_CAPS_LOCK_PIN); +} From b0e948c380a073833a38881e998963db4da456e0 Mon Sep 17 00:00:00 2001 From: Felix Teutsch <63754496+FelixTeutsch@users.noreply.github.com> Date: Sun, 7 Apr 2024 00:57:12 +0200 Subject: [PATCH 117/333] Update hand_wire.md (#23429) --- docs/hand_wire.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/hand_wire.md b/docs/hand_wire.md index 06809254df2..cfae38d6d20 100644 --- a/docs/hand_wire.md +++ b/docs/hand_wire.md @@ -175,7 +175,7 @@ As you move along, be sure that the controller is staying in place - recutting a From here, you should have a working keyboard once you program a firmware. -Simple firmware can be created easily using the [Keyboard Firmware Builder](https://kbfirmware.com/) website. Recreate your layout using [Keyboard Layout Editor](https://www.keyboard-layout-editor.com), import it and recreate the matrix (if not already done as part of [planning the matrix](#planning-the-matrix). +Simple firmware can be created easily using the [Keyboard Firmware Builder](https://kbfirmware.com/) website. Recreate your layout using [Keyboard Layout Editor](https://www.keyboard-layout-editor.com), import it and recreate the matrix (if not already done as part of [planning the matrix](#planning-the-matrix)). Go through the rest of the tabs, assigning keys until you get to the last one where you can compile and download your firmware. The .hex file can be flashed straight onto your keyboard, or for advanced functionality, compiled locally after [Setting up Your Environment](newbs_getting_started.md). From ad8d934d3cb325d5ad2ed98167a8aa869ccc5e9e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 8 Apr 2024 02:56:46 +0100 Subject: [PATCH 118/333] Tidy up default layer handling in keymaps (#23436) --- .../dz60/keymaps/iso_split-spacebar/keymap.c | 6 ---- keyboards/eco/keymaps/default/keymap.c | 21 ----------- .../atreus50/keymaps/default/keymap.c | 11 ++---- .../4x5/keymaps/default/keymap.c | 5 --- .../4x5/keymaps/dvorak/keymap.c | 6 ---- .../4x6/keymaps/default/keymap.c | 5 --- .../ortho5x13/keymaps/default/keymap.c | 11 ++---- .../promethium/keymaps/default/keymap.c | 15 ++++---- .../terminus_mini/keymaps/default/keymap.c | 5 --- keyboards/helix/pico/keymaps/default/keymap.c | 11 ++---- keyboards/helix/rev2/keymaps/default/keymap.c | 11 ++---- .../halberd/keymaps/default/keymap.c | 9 +---- .../halberd/keymaps/right_modifiers/keymap.c | 9 +---- .../miniaxe/keymaps/default/keymap.c | 10 +----- .../miniaxe/keymaps/underglow/keymap.c | 10 +----- .../keebio/levinson/keymaps/default/keymap.c | 11 ++---- .../keebio/nyquist/keymaps/default/keymap.c | 11 ++---- .../keebio/nyquist/keymaps/tester/keymap.c | 13 +++---- .../keebio/wavelet/keymaps/default/keymap.c | 11 ++---- keyboards/lets_split/keymaps/poker/config.h | 32 ----------------- keyboards/lets_split/keymaps/poker/keymap.c | 13 +++---- .../lfk78/keymaps/default/keymap.c | 8 ----- .../lfkeyboards/lfk78/keymaps/iso/keymap.c | 8 ----- .../lfk78/keymaps/split_bs_osx/keymap.c | 8 ----- .../lfkeyboards/lfk78/keymaps/via/keymap.c | 8 ----- .../lfk87/keymaps/default/keymap.c | 8 ----- .../lfkeyboards/lfk87/keymaps/iso/keymap.c | 8 ----- .../lfkpad/keymaps/default/keymap.c | 8 ----- .../mini1800/keymaps/default/keymap.c | 8 ----- .../minidox/keymaps/default/keymap.c | 17 +-------- .../the_ruler/keymaps/default/keymap.c | 18 ---------- .../ergodash/rev1/keymaps/default/keymap.c | 15 +------- .../rgbkb/zen/rev1/keymaps/default/keymap.c | 36 ------------------- .../rgbkb/zen/rev2/keymaps/default/keymap.c | 24 ------------- .../minivan/keymaps/default/keymap.c | 11 ++---- .../roadkit/keymaps/default/keymap.c | 23 ------------ .../divergetm2/keymaps/default/keymap.c | 6 ++-- .../woodkeys/meira/keymaps/default/keymap.c | 3 -- .../woodkeys/meira/keymaps/takmiya/keymap.c | 14 ++------ 39 files changed, 50 insertions(+), 417 deletions(-) delete mode 100644 keyboards/lets_split/keymaps/poker/config.h diff --git a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c index 8a6945567a1..26edee65b97 100644 --- a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c +++ b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c @@ -144,12 +144,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - // always enable num lock on layer NL and disable on other layers // thanks to spidey3 & Erovia on discord layer_state_t layer_state_set_user(layer_state_t state) { diff --git a/keyboards/eco/keymaps/default/keymap.c b/keyboards/eco/keymaps/default/keymap.c index 8867e11124f..096d955e85b 100644 --- a/keyboards/eco/keymaps/default/keymap.c +++ b/keyboards/eco/keymaps/default/keymap.c @@ -13,10 +13,6 @@ #define _FN1 2 #define _FN2 3 -enum eco_keycodes { - QWERTY = SAFE_RANGE -}; - // Defines for task manager and such #define CALTDEL LCTL(LALT(KC_DEL)) #define TSKMGR LCTL(LSFT(KC_ESC)) @@ -78,20 +74,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - persistant_default_layer_set(1UL<<_QWERTY); - } - return false; - break; - } - return true; -} diff --git a/keyboards/handwired/atreus50/keymaps/default/keymap.c b/keyboards/handwired/atreus50/keymaps/default/keymap.c index c9de095cf89..ea6018bfcce 100644 --- a/keyboards/handwired/atreus50/keymaps/default/keymap.c +++ b/keyboards/handwired/atreus50/keymaps/default/keymap.c @@ -107,11 +107,6 @@ float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -119,7 +114,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -128,7 +123,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -137,7 +132,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c index 375c2082444..630b106ca77 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c @@ -130,8 +130,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______ ) }; - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c index bc309f5a783..d0136c4c51d 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c +++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c @@ -119,9 +119,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ____, ____, ____, ____ ) }; - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c index b447b5c18c3..e218c65d426 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c @@ -70,8 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______ ) }; - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} diff --git a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c index d7253971998..0cf3573a072 100644 --- a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c +++ b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c @@ -175,11 +175,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -187,7 +182,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -196,7 +191,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -205,7 +200,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c index 8af82d8297c..7db69a2a978 100644 --- a/keyboards/handwired/promethium/keymaps/default/keymap.c +++ b/keyboards/handwired/promethium/keymaps/default/keymap.c @@ -940,9 +940,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); +void persistent_default_layer_set(uint8_t default_layer) { + set_single_persistent_default_layer(default_layer); #ifdef RGBSPS_ENABLE led_set_default_layer_indicator(); #endif @@ -1119,14 +1118,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // layout switchers case QWERTY: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_QWERTY); + persistent_default_layer_set(_QWERTY); } return false; break; #ifdef LAYOUT_DVORAK case DVORAK: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_DVORAK); + persistent_default_layer_set(_DVORAK); } return false; break; @@ -1134,7 +1133,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef LAYOUT_COLEMAK case COLEMAK: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_COLEMAK); + persistent_default_layer_set(_COLEMAK); } return false; break; @@ -1142,7 +1141,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef LAYOUT_WORKMAN case WORKMAN: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_WORKMAN); + persistent_default_layer_set(_WORKMAN); } return false; break; @@ -1150,7 +1149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef LAYOUT_NORMAN case NORMAN: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_NORMAN); + persistent_default_layer_set(_NORMAN); } return false; break; diff --git a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c index 5b0dc9f3839..e6d8bb6f052 100644 --- a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c +++ b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c @@ -201,11 +201,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - // Cases to switch default layer to QWERTY, COLEMAK or DVORAK and to access ADJUST layer bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { diff --git a/keyboards/helix/pico/keymaps/default/keymap.c b/keyboards/helix/pico/keymaps/default/keymap.c index 3ee620360d8..6684890f72b 100644 --- a/keyboards/helix/pico/keymaps/default/keymap.c +++ b/keyboards/helix/pico/keymaps/default/keymap.c @@ -179,11 +179,6 @@ float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); bool TOG_STATUS = false; int RGB_current_mode; -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - // Setting ADJUST layer RGB back to default void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) { @@ -203,7 +198,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -212,7 +207,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -221,7 +216,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/helix/rev2/keymaps/default/keymap.c b/keyboards/helix/rev2/keymaps/default/keymap.c index f23ff07b4fc..15bf4e86af6 100644 --- a/keyboards/helix/rev2/keymaps/default/keymap.c +++ b/keyboards/helix/rev2/keymaps/default/keymap.c @@ -191,11 +191,6 @@ float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); bool TOG_STATUS = false; int RGB_current_mode; -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - // Setting ADJUST layer RGB back to default void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) { @@ -215,7 +210,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -224,7 +219,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -233,7 +228,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/kagizaraya/halberd/keymaps/default/keymap.c b/keyboards/kagizaraya/halberd/keymaps/default/keymap.c index ecc0e328a7b..27f54ce7c12 100644 --- a/keyboards/kagizaraya/halberd/keymaps/default/keymap.c +++ b/keyboards/kagizaraya/halberd/keymaps/default/keymap.c @@ -25,8 +25,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -112,12 +111,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - // persistant_default_layer_set(1UL<<_QWERTY); - set_single_persistent_default_layer(_QWERTY); - } - return false; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c index a5c017336a4..500e3a93a4a 100644 --- a/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c +++ b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c @@ -25,8 +25,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -112,12 +111,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - // persistant_default_layer_set(1UL<<_QWERTY); - set_single_persistent_default_layer(_QWERTY); - } - return false; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c b/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c index 81f8004e694..1957c0276ce 100644 --- a/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c +++ b/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c @@ -24,8 +24,7 @@ enum layer_names { }; enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -112,13 +111,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - // persistant_default_layer_set(1UL<<_QWERTY); - set_single_persistent_default_layer(_QWERTY); - } - return false; - break; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c b/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c index 8b4417f62d1..c162c12045b 100644 --- a/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c +++ b/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c @@ -24,8 +24,7 @@ enum layer_names { }; enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -112,13 +111,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - // persistant_default_layer_set(1UL<<_QWERTY); - set_single_persistent_default_layer(_QWERTY); - } - return false; - break; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/keebio/levinson/keymaps/default/keymap.c b/keyboards/keebio/levinson/keymaps/default/keymap.c index 72da4addc31..bdc4a50827f 100644 --- a/keyboards/keebio/levinson/keymaps/default/keymap.c +++ b/keyboards/keebio/levinson/keymaps/default/keymap.c @@ -142,11 +142,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -154,7 +149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -163,7 +158,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -172,7 +167,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/keebio/nyquist/keymaps/default/keymap.c b/keyboards/keebio/nyquist/keymaps/default/keymap.c index 8bf16240fb1..df399d355f1 100644 --- a/keyboards/keebio/nyquist/keymaps/default/keymap.c +++ b/keyboards/keebio/nyquist/keymaps/default/keymap.c @@ -162,11 +162,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -174,7 +169,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -183,7 +178,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -192,7 +187,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/keebio/nyquist/keymaps/tester/keymap.c b/keyboards/keebio/nyquist/keymaps/tester/keymap.c index 6109661ffd1..7ed85044ca6 100644 --- a/keyboards/keebio/nyquist/keymaps/tester/keymap.c +++ b/keyboards/keebio/nyquist/keymaps/tester/keymap.c @@ -11,7 +11,7 @@ extern keymap_config_t keymap_config; #define _DVORAK 2 #define _LOWER 3 #define _RAISE 4 -#define _ADJUST 16 +#define _ADJUST 5 enum custom_keycodes { QWERTY = SAFE_RANGE, @@ -159,11 +159,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -171,7 +166,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -180,7 +175,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -189,7 +184,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/keebio/wavelet/keymaps/default/keymap.c b/keyboards/keebio/wavelet/keymaps/default/keymap.c index 72da4addc31..bdc4a50827f 100644 --- a/keyboards/keebio/wavelet/keymaps/default/keymap.c +++ b/keyboards/keebio/wavelet/keymaps/default/keymap.c @@ -142,11 +142,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -154,7 +149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -163,7 +158,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -172,7 +167,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/lets_split/keymaps/poker/config.h b/keyboards/lets_split/keymaps/poker/config.h deleted file mode 100644 index 470fc078542..00000000000 --- a/keyboards/lets_split/keymaps/poker/config.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -This is the c configuration file for the keymap - -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 . -*/ - -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "../../config.h" - -/* Select hand configuration */ - -#define MASTER_LEFT -// #define MASTER_RIGHT -// #define EE_HANDS - -#endif diff --git a/keyboards/lets_split/keymaps/poker/keymap.c b/keyboards/lets_split/keymaps/poker/keymap.c index 37e9dd9aedb..7b17b71f971 100644 --- a/keyboards/lets_split/keymaps/poker/keymap.c +++ b/keyboards/lets_split/keymaps/poker/keymap.c @@ -13,7 +13,7 @@ extern keymap_config_t keymap_config; #define _LOWER 3 #define _RAISE 4 #define _FN 5 -#define _ADJUST 16 +#define _ADJUST 6 enum custom_keycodes { QWERTY = SAFE_RANGE, @@ -161,11 +161,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -173,7 +168,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -182,7 +177,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -191,7 +186,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c index d81ed91814d..c149ea04b4b 100644 --- a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c @@ -70,11 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c index 1f3ef6fc8e1..d07d7de4e6d 100644 --- a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c +++ b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c @@ -70,11 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c index 041c3cdfd03..3073c47bf78 100644 --- a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c +++ b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c @@ -70,11 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c index 88aa97da702..7ed2e71a7f6 100644 --- a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c +++ b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c @@ -62,11 +62,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_SAI ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c index b9057e9047d..84e4fbb59fb 100644 --- a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c @@ -79,11 +79,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SAD, RGB_HUD, RGB_SAI ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c index 510aa6730f0..46286c3f321 100644 --- a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c +++ b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c @@ -79,11 +79,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c index 0aa720e4003..05f42b8b98e 100644 --- a/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c @@ -21,11 +21,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, RGB_TOG ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c index c2abd128430..7d6e267611f 100644 --- a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c @@ -76,11 +76,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI, XXXXXXX, XXXXXXX ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/maple_computing/minidox/keymaps/default/keymap.c b/keyboards/maple_computing/minidox/keymaps/default/keymap.c index d71e5b6e559..39ebffd9875 100644 --- a/keyboards/maple_computing/minidox/keymaps/default/keymap.c +++ b/keyboards/maple_computing/minidox/keymaps/default/keymap.c @@ -13,8 +13,7 @@ enum layer_names { }; enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -114,22 +113,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_qwerty); - #endif - persistant_default_layer_set(1UL<<_QWERTY); - } - return false; - break; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c b/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c index 87190f0b3f1..6ef57fd895a 100644 --- a/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c +++ b/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c @@ -9,12 +9,6 @@ #define _FN_1 1 #define _FN_2 2 -enum custom_keycodes { - DEFAULT = SAFE_RANGE, - FN_1, - FN_2 -}; - // Defines for task manager and such #define CALTDEL LCTL(LALT(KC_DEL)) #define TSKMGR LCTL(LSFT(KC_ESC)) @@ -49,15 +43,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - // NONE - } - return true; -} diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c index 739e22c04e6..f112f113945 100644 --- a/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c +++ b/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c @@ -9,8 +9,7 @@ enum layer_names { }; enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -108,20 +107,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { float tone_qwerty[][2] = SONG(QWERTY_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - print("mode just switched to qwerty and this is a huge string\n"); - set_single_persistent_default_layer(_QWERTY); - } - return false; - break; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c index b044652afd2..c84d9574af8 100644 --- a/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c +++ b/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c @@ -10,13 +10,6 @@ enum layer_number { _NAV }; - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - NAV, - -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty @@ -67,32 +60,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { float tone_qwerty[][2] = SONG(QWERTY_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif - -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_qwerty); - #endif - persistant_default_layer_set(1UL<<_QWERTY); - } - return false; - break; - //case COLEMAK: - //if (record->event.pressed) { - //#ifdef AUDIO_ENABLE - //PLAY_SONG(tone_colemak); - //#endif - //persistant_default_layer_set(1UL<<_COLEMAK); - //} - //return false; - //break; - } - return true; -} diff --git a/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c index 4b289b095fd..1776c6b5856 100644 --- a/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c +++ b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c @@ -10,11 +10,6 @@ enum layer_number { _NAV }; -enum custom_keycodes { - QWERTY = SAFE_RANGE, - NAV -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty @@ -84,25 +79,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) { return true; } -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - set_single_persistent_default_layer(1UL<<_QWERTY); - } - return false; - break; - //case COLEMAK: - //if (record->event.pressed) { - //set_single_persistent_default_layer(1UL<<_COLEMAK); - //} - //return false; - //break; - } - return true; -} - - #if OLED_ENABLE const char* layer_name_user(uint32_t layer) { switch (layer) { diff --git a/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c index fec08cea3ea..fadf9990cd9 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c @@ -63,26 +63,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch(keycode) { case DVORAK: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_DV); + set_single_persistent_default_layer(_DV); } return false; case QWERTY: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_QW); + set_single_persistent_default_layer(_QW); } return false; case COLEMAK: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_CM); + set_single_persistent_default_layer(_CM); } return false; default: diff --git a/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c index 32e4694cd55..ac9d97bde54 100644 --- a/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c +++ b/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c @@ -1,6 +1,5 @@ #include QMK_KEYBOARD_H - // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them @@ -8,10 +7,6 @@ #define _NP 0 -enum custom_keycodes { - NUMPAD = SAFE_RANGE -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NP] = LAYOUT_numpad_4x4( /* Numpad */ KC_P7, KC_P8, KC_P9, KC_PPLS, @@ -20,21 +15,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P0, KC_PDOT ), }; - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch(keycode) { - case NUMPAD: - if (record->event.pressed) { - persistent_default_layer_set(1UL<<_NP); - } - return false; - default: - return true; - } - return true; -}; diff --git a/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c b/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c index d4f38e4a199..3111ac26d76 100644 --- a/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c +++ b/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c @@ -170,7 +170,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - set_single_persistent_default_layer(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -179,7 +179,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - set_single_persistent_default_layer(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -188,7 +188,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - set_single_persistent_default_layer(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/woodkeys/meira/keymaps/default/keymap.c b/keyboards/woodkeys/meira/keymaps/default/keymap.c index 8aedffc675f..72f465e44ac 100644 --- a/keyboards/woodkeys/meira/keymaps/default/keymap.c +++ b/keyboards/woodkeys/meira/keymaps/default/keymap.c @@ -182,7 +182,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - // persistent_default_layer_set(1UL<<_QWERTY); } return false; break; @@ -191,7 +190,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - // persistent_default_layer_set(1UL<<_COLEMAK); } return false; break; @@ -200,7 +198,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - // persistent_default_layer_set(1UL<<_DVORAK); } return false; break; diff --git a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c index cf1b2b8ce69..bba1b5583ee 100644 --- a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c +++ b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c @@ -26,8 +26,7 @@ extern rgblight_config_t rgblight_config; #define _ADJUST 3 enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -104,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( BL_TOGG, QK_BOOT, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, - BL_STEP, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______, + BL_STEP, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) @@ -124,15 +123,6 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_qwerty); - #endif -// persistent_default_layer_set(1UL<<_QWERTY); - } - return false; - break; case LOWER: if (record->event.pressed) { //not sure how to have keyboard check mode and set it to a variable, so my work around From cd0043de8ffaa1cdbeb86f242b250c8d23f5a231 Mon Sep 17 00:00:00 2001 From: Draic Date: Mon, 8 Apr 2024 17:47:11 +0200 Subject: [PATCH 119/333] Fix Layout_Arrow 3rd key in bottom row (#23443) Co-authored-by: v --- keyboards/trashman/ketch/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json index a674acb2759..9c3474c32ed 100644 --- a/keyboards/trashman/ketch/info.json +++ b/keyboards/trashman/ketch/info.json @@ -130,7 +130,7 @@ {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25}, {"matrix": [5, 4], "x": 1.25, "y": 3, "w": 1.5}, - {"matrix": [3, 0], "x": 2.75, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 2.75, "y": 3, "w": 1.25}, {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25}, {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2}, {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.5}, From b99143fdd2637f573bb8c2632a38b84acc1945a0 Mon Sep 17 00:00:00 2001 From: NoOne2246 Date: Tue, 9 Apr 2024 04:55:42 +1000 Subject: [PATCH 120/333] Oneshot locked mods split transaction (#23434) --- docs/feature_split_keyboard.md | 2 +- quantum/split_common/transactions.c | 5 +++++ quantum/split_common/transport.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/feature_split_keyboard.md b/docs/feature_split_keyboard.md index 59159cb3fab..99c252d03ec 100644 --- a/docs/feature_split_keyboard.md +++ b/docs/feature_split_keyboard.md @@ -266,7 +266,7 @@ This enables syncing of the Host LED status (caps lock, num lock, etc) between b #define SPLIT_MODS_ENABLE ``` -This enables transmitting modifier state (normal, weak and oneshot) to the non primary side of the split keyboard. The purpose of this feature is to support cosmetic use of modifer state (e.g. displaying status on an OLED screen). +This enables transmitting modifier state (normal, weak, oneshot and oneshot locked) to the non primary side of the split keyboard. The purpose of this feature is to support cosmetic use of modifer state (e.g. displaying status on an OLED screen). ```c #define SPLIT_WPM_ENABLE diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c index 33bc9e9f575..decf5e5ede0 100644 --- a/quantum/split_common/transactions.c +++ b/quantum/split_common/transactions.c @@ -419,6 +419,10 @@ static bool mods_handlers_master(matrix_row_t master_matrix[], matrix_row_t slav if (!mods_need_sync && new_mods.oneshot_mods != split_shmem->mods.oneshot_mods) { mods_need_sync = true; } + new_mods.oneshot_locked_mods = get_oneshot_locked_mods(); + if (!mods_need_sync && new_mods.oneshot_locked_mods != split_shmem->mods.oneshot_locked_mods) { + mods_need_sync = true; + } # endif // NO_ACTION_ONESHOT bool okay = true; @@ -442,6 +446,7 @@ static void mods_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave set_weak_mods(mods.weak_mods); # ifndef NO_ACTION_ONESHOT set_oneshot_mods(mods.oneshot_mods); + set_oneshot_locked_mods(mods.oneshot_locked_mods); # endif } diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h index 4f6b968fa8a..fbd87ca3123 100644 --- a/quantum/split_common/transport.h +++ b/quantum/split_common/transport.h @@ -101,6 +101,7 @@ typedef struct _split_mods_sync_t { uint8_t weak_mods; # ifndef NO_ACTION_ONESHOT uint8_t oneshot_mods; + uint8_t oneshot_locked_mods; # endif // NO_ACTION_ONESHOT } split_mods_sync_t; #endif // SPLIT_MODS_ENABLE From 4acdddbf48707e5221cb754b4aa5caf32ce28276 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Wed, 10 Apr 2024 19:03:11 +1000 Subject: [PATCH 121/333] Bodge consolidation. (#23448) --- builddefs/build_keyboard.mk | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index 0b9ab8849f7..f0788e55c99 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -521,22 +521,14 @@ ifeq ($(strip $(KEEP_INTERMEDIATES)), yes) OPT_DEFS += -save-temps=obj endif -# TODO: remove this bodge? -PROJECT_DEFS := $(OPT_DEFS) -PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS) -PROJECT_CONFIG := $(CONFIG_H) - -CONFIG_H += $(POST_CONFIG_H) -ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H) - OUTPUTS := $(INTERMEDIATE_OUTPUT) $(INTERMEDIATE_OUTPUT)_SRC := $(SRC) $(PLATFORM_SRC) -$(INTERMEDIATE_OUTPUT)_DEFS := $(OPT_DEFS) \ +$(INTERMEDIATE_OUTPUT)_DEFS := \ -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h\" \ -DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \ - $(PROJECT_DEFS) -$(INTERMEDIATE_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) $(PROJECT_INC) -$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(PROJECT_CONFIG) + $(OPT_DEFS) +$(INTERMEDIATE_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS) +$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(POST_CONFIG_H) # Default target. all: build check-size From 25f608c1b437060e8c9b451ed81c7e37a2531284 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 11 Apr 2024 14:06:36 +1000 Subject: [PATCH 122/333] Separate keycode handling for LED Matrix and Backlight (#23426) --- builddefs/common_features.mk | 2 +- quantum/process_keycode/process_backlight.c | 30 ++---------------- quantum/process_keycode/process_led_matrix.c | 32 ++++++++++++++++++++ quantum/process_keycode/process_led_matrix.h | 10 ++++++ quantum/quantum.c | 11 +++++-- 5 files changed, 54 insertions(+), 31 deletions(-) create mode 100644 quantum/process_keycode/process_led_matrix.c create mode 100644 quantum/process_keycode/process_led_matrix.h diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index 49197dc91e1..68f9a1dd08a 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -353,7 +353,7 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), yes) COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations/runners POST_CONFIG_H += $(QUANTUM_DIR)/led_matrix/post_config.h - SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c + SRC += $(QUANTUM_DIR)/process_keycode/process_led_matrix.c SRC += $(QUANTUM_DIR)/led_matrix/led_matrix.c SRC += $(QUANTUM_DIR)/led_matrix/led_matrix_drivers.c LIB8TION_ENABLE := yes diff --git a/quantum/process_keycode/process_backlight.c b/quantum/process_keycode/process_backlight.c index c1596ec07d1..dafe9797607 100644 --- a/quantum/process_keycode/process_backlight.c +++ b/quantum/process_keycode/process_backlight.c @@ -15,36 +15,11 @@ */ #include "process_backlight.h" - -#ifdef LED_MATRIX_ENABLE -# include "led_matrix.h" -#else -# include "backlight.h" -#endif +#include "backlight.h" bool process_backlight(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { switch (keycode) { -#ifdef LED_MATRIX_ENABLE - case QK_BACKLIGHT_ON: - led_matrix_enable(); - return false; - case QK_BACKLIGHT_OFF: - led_matrix_disable(); - return false; - case QK_BACKLIGHT_DOWN: - led_matrix_decrease_val(); - return false; - case QK_BACKLIGHT_UP: - led_matrix_increase_val(); - return false; - case QK_BACKLIGHT_TOGGLE: - led_matrix_toggle(); - return false; - case QK_BACKLIGHT_STEP: - led_matrix_step(); - return false; -#else case QK_BACKLIGHT_ON: backlight_level(BACKLIGHT_LEVELS); return false; @@ -63,11 +38,10 @@ bool process_backlight(uint16_t keycode, keyrecord_t *record) { case QK_BACKLIGHT_STEP: backlight_step(); return false; -# ifdef BACKLIGHT_BREATHING +#ifdef BACKLIGHT_BREATHING case QK_BACKLIGHT_TOGGLE_BREATHING: backlight_toggle_breathing(); return false; -# endif #endif } } diff --git a/quantum/process_keycode/process_led_matrix.c b/quantum/process_keycode/process_led_matrix.c new file mode 100644 index 00000000000..217c9a2c28a --- /dev/null +++ b/quantum/process_keycode/process_led_matrix.c @@ -0,0 +1,32 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "process_led_matrix.h" +#include "led_matrix.h" + +bool process_led_matrix(uint16_t keycode, keyrecord_t *record) { + if (record->event.pressed) { + switch (keycode) { + case QK_BACKLIGHT_ON: + led_matrix_enable(); + return false; + case QK_BACKLIGHT_OFF: + led_matrix_disable(); + return false; + case QK_BACKLIGHT_DOWN: + led_matrix_decrease_val(); + return false; + case QK_BACKLIGHT_UP: + led_matrix_increase_val(); + return false; + case QK_BACKLIGHT_TOGGLE: + led_matrix_toggle(); + return false; + case QK_BACKLIGHT_STEP: + led_matrix_step(); + return false; + } + } + + return true; +} diff --git a/quantum/process_keycode/process_led_matrix.h b/quantum/process_keycode/process_led_matrix.h new file mode 100644 index 00000000000..407d04aa27e --- /dev/null +++ b/quantum/process_keycode/process_led_matrix.h @@ -0,0 +1,10 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include +#include "action.h" + +bool process_led_matrix(uint16_t keycode, keyrecord_t *record); diff --git a/quantum/quantum.c b/quantum/quantum.c index 6639dc22910..011f9d73e4a 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -16,7 +16,7 @@ #include "quantum.h" -#if defined(BACKLIGHT_ENABLE) || defined(LED_MATRIX_ENABLE) +#ifdef BACKLIGHT_ENABLE # include "process_backlight.h" #endif @@ -40,6 +40,10 @@ # include "process_leader.h" #endif +#ifdef LED_MATRIX_ENABLE +# include "process_led_matrix.h" +#endif + #ifdef MAGIC_ENABLE # include "process_magic.h" #endif @@ -333,9 +337,12 @@ bool process_record_quantum(keyrecord_t *record) { #ifdef AUDIO_ENABLE process_audio(keycode, record) && #endif -#if defined(BACKLIGHT_ENABLE) || defined(LED_MATRIX_ENABLE) +#if defined(BACKLIGHT_ENABLE) process_backlight(keycode, record) && #endif +#if defined(LED_MATRIX_ENABLE) + process_led_matrix(keycode, record) && +#endif #ifdef STENO_ENABLE process_steno(keycode, record) && #endif From 52d3ef0fe4bd860420893e364be36c155f4ba300 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 11 Apr 2024 14:14:02 +1000 Subject: [PATCH 123/333] Add new set of keycodes for LED Matrix (#23432) --- data/constants/keycodes/keycodes_0.0.4.hjson | 0 .../keycodes/keycodes_0.0.4_lighting.hjson | 67 +++++++++++++++++++ docs/feature_led_matrix.md | 21 +++--- docs/keycodes.md | 16 +++++ quantum/keycodes.h | 20 ++++++ tests/test_common/keycode_table.cpp | 9 +++ 6 files changed, 123 insertions(+), 10 deletions(-) create mode 100644 data/constants/keycodes/keycodes_0.0.4.hjson create mode 100644 data/constants/keycodes/keycodes_0.0.4_lighting.hjson diff --git a/data/constants/keycodes/keycodes_0.0.4.hjson b/data/constants/keycodes/keycodes_0.0.4.hjson new file mode 100644 index 00000000000..e69de29bb2d diff --git a/data/constants/keycodes/keycodes_0.0.4_lighting.hjson b/data/constants/keycodes/keycodes_0.0.4_lighting.hjson new file mode 100644 index 00000000000..d7b27230f30 --- /dev/null +++ b/data/constants/keycodes/keycodes_0.0.4_lighting.hjson @@ -0,0 +1,67 @@ +{ + "keycodes": { + "0x7810": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_ON", + "aliases": [ + "LM_ON" + ] + }, + "0x7811": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_OFF", + "aliases": [ + "LM_OFF" + ] + }, + "0x7812": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_TOGGLE", + "aliases": [ + "LM_TOGG" + ] + }, + "0x7813": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_MODE_NEXT", + "aliases": [ + "LM_NEXT" + ] + }, + "0x7814": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_MODE_PREVIOUS", + "aliases": [ + "LM_PREV" + ] + }, + "0x7815": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_BRIGHTNESS_UP", + "aliases": [ + "LM_BRIU" + ] + }, + "0x7816": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_BRIGHTNESS_DOWN", + "aliases": [ + "LM_BRID" + ] + }, + "0x7817": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_SPEED_UP", + "aliases": [ + "LM_SPDU" + ] + }, + "0x7818": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_SPEED_DOWN", + "aliases": [ + "LM_SPDD" + ] + } + } +} diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md index 3a3a9dbf844..83357ab14e8 100644 --- a/docs/feature_led_matrix.md +++ b/docs/feature_led_matrix.md @@ -217,16 +217,17 @@ As mentioned earlier, the center of the keyboard by default is expected to be `{ ## Keycodes :id=keycodes -All LED matrix keycodes are currently shared with the [Backlight feature](feature_backlight.md). - -| Key | Aliases | Description | -|-------------------------|-----------|-------------------------------| -| `QK_BACKLIGHT_TOGGLE` | `BL_TOGG` | Toggle LED Matrix on or off | -| `QK_BACKLIGHT_STEP` | `BL_STEP` | Cycle through modes | -| `QK_BACKLIGHT_ON` | `BL_ON` | Turn on LED Matrix | -| `QK_BACKLIGHT_OFF` | `BL_OFF` | Turn off LED Matrix | -| `QK_BACKLIGHT_UP` | `BL_UP` | Increase the brightness level | -| `QK_BACKLIGHT_DOWN` | `BL_DOWN` | Decrease the brightness level | +|Key |Aliases |Description | +|-------------------------------|---------|-----------------------------------| +|`QK_LED_MATRIX_ON` |`LM_ON` |Turn on LED Matrix | +|`QK_LED_MATRIX_OFF` |`LM_OFF` |Turn off LED Matrix | +|`QK_LED_MATRIX_TOGGLE` |`LM_TOGG`|Toggle LED Matrix on or off | +|`QK_LED_MATRIX_MODE_NEXT` |`LM_NEXT`|Cycle through animations | +|`QK_LED_MATRIX_MODE_PREVIOUS` |`LM_PREV`|Cycle through animations in reverse| +|`QK_LED_MATRIX_BRIGHTNESS_UP` |`LM_BRIU`|Increase the brightness level | +|`QK_LED_MATRIX_BRIGHTNESS_DOWN`|`LM_BRID`|Decrease the brightness level | +|`QK_LED_MATRIX_SPEED_UP` |`LM_SPDU`|Increase the animation speed | +|`QK_LED_MATRIX_SPEED_DOWN` |`LM_SPDD`|Decrease the animation speed | ## LED Matrix Effects :id=led-matrix-effects diff --git a/docs/keycodes.md b/docs/keycodes.md index 65762234a44..9d722216a93 100644 --- a/docs/keycodes.md +++ b/docs/keycodes.md @@ -398,6 +398,22 @@ See also: [Leader Key](feature_leader_key.md) |---------|------------------------| |`QK_LEAD`|Begins a leader sequence| +## LED Matrix :id=led-matrix + +See also: [LED Matrix](feature_led_matrix.md) + +|Key |Aliases |Description | +|-------------------------------|---------|-----------------------------------| +|`QK_LED_MATRIX_ON` |`LM_ON` |Turn on LED Matrix | +|`QK_LED_MATRIX_OFF` |`LM_OFF` |Turn off LED Matrix | +|`QK_LED_MATRIX_TOGGLE` |`LM_TOGG`|Toggle LED Matrix on or off | +|`QK_LED_MATRIX_MODE_NEXT` |`LM_NEXT`|Cycle through animations | +|`QK_LED_MATRIX_MODE_PREVIOUS` |`LM_PREV`|Cycle through animations in reverse| +|`QK_LED_MATRIX_BRIGHTNESS_UP` |`LM_BRIU`|Increase the brightness level | +|`QK_LED_MATRIX_BRIGHTNESS_DOWN`|`LM_BRID`|Decrease the brightness level | +|`QK_LED_MATRIX_SPEED_UP` |`LM_SPDU`|Increase the animation speed | +|`QK_LED_MATRIX_SPEED_DOWN` |`LM_SPDD`|Decrease the animation speed | + ## Magic Keycodes :id=magic-keycodes See also: [Magic Keycodes](keycodes_magic.md) diff --git a/quantum/keycodes.h b/quantum/keycodes.h index 69d62b57311..da1012cf12b 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -627,6 +627,15 @@ enum qk_keycode_defines { QK_BACKLIGHT_UP = 0x7804, QK_BACKLIGHT_STEP = 0x7805, QK_BACKLIGHT_TOGGLE_BREATHING = 0x7806, + QK_LED_MATRIX_ON = 0x7810, + QK_LED_MATRIX_OFF = 0x7811, + QK_LED_MATRIX_TOGGLE = 0x7812, + QK_LED_MATRIX_MODE_NEXT = 0x7813, + QK_LED_MATRIX_MODE_PREVIOUS = 0x7814, + QK_LED_MATRIX_BRIGHTNESS_UP = 0x7815, + QK_LED_MATRIX_BRIGHTNESS_DOWN = 0x7816, + QK_LED_MATRIX_SPEED_UP = 0x7817, + QK_LED_MATRIX_SPEED_DOWN = 0x7818, RGB_TOG = 0x7820, RGB_MODE_FORWARD = 0x7821, RGB_MODE_REVERSE = 0x7822, @@ -1281,6 +1290,15 @@ enum qk_keycode_defines { BL_UP = QK_BACKLIGHT_UP, BL_STEP = QK_BACKLIGHT_STEP, BL_BRTG = QK_BACKLIGHT_TOGGLE_BREATHING, + LM_ON = QK_LED_MATRIX_ON, + LM_OFF = QK_LED_MATRIX_OFF, + LM_TOGG = QK_LED_MATRIX_TOGGLE, + LM_NEXT = QK_LED_MATRIX_MODE_NEXT, + LM_PREV = QK_LED_MATRIX_MODE_PREVIOUS, + LM_BRIU = QK_LED_MATRIX_BRIGHTNESS_UP, + LM_BRID = QK_LED_MATRIX_BRIGHTNESS_DOWN, + LM_SPDU = QK_LED_MATRIX_SPEED_UP, + LM_SPDD = QK_LED_MATRIX_SPEED_DOWN, RGB_MOD = RGB_MODE_FORWARD, RGB_RMOD = RGB_MODE_REVERSE, RGB_M_P = RGB_MODE_PLAIN, @@ -1416,6 +1434,7 @@ enum qk_keycode_defines { #define IS_STENO_KEYCODE(code) ((code) >= QK_STENO_BOLT && (code) <= QK_STENO_COMB_MAX) #define IS_MACRO_KEYCODE(code) ((code) >= QK_MACRO_0 && (code) <= QK_MACRO_31) #define IS_BACKLIGHT_KEYCODE(code) ((code) >= QK_BACKLIGHT_ON && (code) <= QK_BACKLIGHT_TOGGLE_BREATHING) +#define IS_LED_MATRIX_KEYCODE(code) ((code) >= QK_LED_MATRIX_ON && (code) <= QK_LED_MATRIX_SPEED_DOWN) #define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE) #define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_ALT_REPEAT_KEY) #define IS_KB_KEYCODE(code) ((code) >= QK_KB_0 && (code) <= QK_KB_31) @@ -1438,6 +1457,7 @@ enum qk_keycode_defines { #define STENO_KEYCODE_RANGE QK_STENO_BOLT ... QK_STENO_COMB_MAX #define MACRO_KEYCODE_RANGE QK_MACRO_0 ... QK_MACRO_31 #define BACKLIGHT_KEYCODE_RANGE QK_BACKLIGHT_ON ... QK_BACKLIGHT_TOGGLE_BREATHING +#define LED_MATRIX_KEYCODE_RANGE QK_LED_MATRIX_ON ... QK_LED_MATRIX_SPEED_DOWN #define RGB_KEYCODE_RANGE RGB_TOG ... RGB_MODE_TWINKLE #define QUANTUM_KEYCODE_RANGE QK_BOOTLOADER ... QK_ALT_REPEAT_KEY #define KB_KEYCODE_RANGE QK_KB_0 ... QK_KB_31 diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp index 29f7c710a03..06064e77f91 100644 --- a/tests/test_common/keycode_table.cpp +++ b/tests/test_common/keycode_table.cpp @@ -569,6 +569,15 @@ std::map KEYCODE_ID_TABLE = { {QK_BACKLIGHT_UP, "QK_BACKLIGHT_UP"}, {QK_BACKLIGHT_STEP, "QK_BACKLIGHT_STEP"}, {QK_BACKLIGHT_TOGGLE_BREATHING, "QK_BACKLIGHT_TOGGLE_BREATHING"}, + {QK_LED_MATRIX_ON, "QK_LED_MATRIX_ON"}, + {QK_LED_MATRIX_OFF, "QK_LED_MATRIX_OFF"}, + {QK_LED_MATRIX_TOGGLE, "QK_LED_MATRIX_TOGGLE"}, + {QK_LED_MATRIX_MODE_NEXT, "QK_LED_MATRIX_MODE_NEXT"}, + {QK_LED_MATRIX_MODE_PREVIOUS, "QK_LED_MATRIX_MODE_PREVIOUS"}, + {QK_LED_MATRIX_BRIGHTNESS_UP, "QK_LED_MATRIX_BRIGHTNESS_UP"}, + {QK_LED_MATRIX_BRIGHTNESS_DOWN, "QK_LED_MATRIX_BRIGHTNESS_DOWN"}, + {QK_LED_MATRIX_SPEED_UP, "QK_LED_MATRIX_SPEED_UP"}, + {QK_LED_MATRIX_SPEED_DOWN, "QK_LED_MATRIX_SPEED_DOWN"}, {RGB_TOG, "RGB_TOG"}, {RGB_MODE_FORWARD, "RGB_MODE_FORWARD"}, {RGB_MODE_REVERSE, "RGB_MODE_REVERSE"}, From f73e69f56d86949fece6f11f97e322f6cca70f98 Mon Sep 17 00:00:00 2001 From: era <73109780+eerraa@users.noreply.github.com> Date: Thu, 11 Apr 2024 13:47:14 +0900 Subject: [PATCH 124/333] [Keyboard] Add N86 (#23454) --- keyboards/era/linx3/n86/config.h | 8 + keyboards/era/linx3/n86/info.json | 451 ++++++++++++++++++ .../era/linx3/n86/keymaps/default/keymap.c | 24 + keyboards/era/linx3/n86/keymaps/via/keymap.c | 24 + keyboards/era/linx3/n86/keymaps/via/rules.mk | 1 + keyboards/era/linx3/n86/readme.md | 23 + keyboards/era/linx3/n86/rules.mk | 1 + 7 files changed, 532 insertions(+) create mode 100644 keyboards/era/linx3/n86/config.h create mode 100644 keyboards/era/linx3/n86/info.json create mode 100644 keyboards/era/linx3/n86/keymaps/default/keymap.c create mode 100644 keyboards/era/linx3/n86/keymaps/via/keymap.c create mode 100644 keyboards/era/linx3/n86/keymaps/via/rules.mk create mode 100644 keyboards/era/linx3/n86/readme.md create mode 100644 keyboards/era/linx3/n86/rules.mk diff --git a/keyboards/era/linx3/n86/config.h b/keyboards/era/linx3/n86/config.h new file mode 100644 index 00000000000..8b294dd91b1 --- /dev/null +++ b/keyboards/era/linx3/n86/config.h @@ -0,0 +1,8 @@ +// Copyright 2024 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Reset */ +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 2000U \ No newline at end of file diff --git a/keyboards/era/linx3/n86/info.json b/keyboards/era/linx3/n86/info.json new file mode 100644 index 00000000000..40e1f78baaa --- /dev/null +++ b/keyboards/era/linx3/n86/info.json @@ -0,0 +1,451 @@ +{ + "manufacturer": "eerraa", + "keyboard_name": "N86", + "maintainer": "eerraa", + "bootloader": "rp2040", + "build": { + "debounce_type": "sym_defer_pk" + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP20", "GP19", "GP18", "GP17", "GP16", "GP21", "GP11", "GP9", "GP5"], + "rows": ["GP3", "GP2", "GP1", "GP0", "GP10", "GP8"] + }, + "processor": "RP2040", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 16], "x": 224, "y": 0, "flags": 4}, + {"matrix": [0, 15], "x": 211, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 198, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 182, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 169, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 156, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 143, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 123, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 110, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 97, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 84, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 65, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 52, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 39, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 26, "y": 0, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}, + {"matrix": [1, 0], "x": 0, "y": 15, "flags": 4}, + {"matrix": [1, 1], "x": 13, "y": 15, "flags": 4}, + {"matrix": [1, 2], "x": 26, "y": 15, "flags": 4}, + {"matrix": [1, 3], "x": 39, "y": 15, "flags": 4}, + {"matrix": [1, 4], "x": 52, "y": 15, "flags": 4}, + {"matrix": [1, 5], "x": 65, "y": 15, "flags": 4}, + {"matrix": [1, 6], "x": 78, "y": 15, "flags": 4}, + {"matrix": [1, 7], "x": 91, "y": 15, "flags": 4}, + {"matrix": [1, 8], "x": 104, "y": 15, "flags": 4}, + {"matrix": [1, 9], "x": 117, "y": 15, "flags": 4}, + {"matrix": [1, 10], "x": 130, "y": 15, "flags": 4}, + {"matrix": [1, 11], "x": 143, "y": 15, "flags": 4}, + {"matrix": [1, 12], "x": 156, "y": 15, "flags": 4}, + {"matrix": [1, 13], "x": 175, "y": 15, "flags": 1}, + {"matrix": [2, 14], "x": 198, "y": 15, "flags": 4}, + {"matrix": [1, 15], "x": 211, "y": 15, "flags": 4}, + {"matrix": [1, 16], "x": 224, "y": 15, "flags": 4}, + {"matrix": [2, 16], "x": 224, "y": 27, "flags": 4}, + {"matrix": [2, 15], "x": 211, "y": 27, "flags": 4}, + {"matrix": [3, 14], "x": 198, "y": 27, "flags": 4}, + {"matrix": [2, 13], "x": 179, "y": 27, "flags": 4}, + {"matrix": [2, 12], "x": 162, "y": 27, "flags": 4}, + {"matrix": [2, 11], "x": 149, "y": 27, "flags": 4}, + {"matrix": [2, 10], "x": 136, "y": 27, "flags": 4}, + {"matrix": [2, 9], "x": 123, "y": 27, "flags": 4}, + {"matrix": [2, 8], "x": 110, "y": 27, "flags": 4}, + {"matrix": [2, 7], "x": 97, "y": 27, "flags": 4}, + {"matrix": [2, 6], "x": 84, "y": 27, "flags": 4}, + {"matrix": [2, 5], "x": 71, "y": 27, "flags": 4}, + {"matrix": [2, 4], "x": 58, "y": 27, "flags": 4}, + {"matrix": [2, 3], "x": 45, "y": 27, "flags": 4}, + {"matrix": [2, 2], "x": 32, "y": 27, "flags": 4}, + {"matrix": [2, 1], "x": 19, "y": 27, "flags": 4}, + {"matrix": [2, 0], "x": 3, "y": 27, "flags": 1}, + {"matrix": [3, 0], "x": 2, "y": 40, "flags": 1}, + {"matrix": [3, 1], "x": 23, "y": 40, "flags": 4}, + {"matrix": [3, 2], "x": 36, "y": 40, "flags": 4}, + {"matrix": [3, 3], "x": 49, "y": 40, "flags": 4}, + {"matrix": [3, 4], "x": 62, "y": 40, "flags": 4}, + {"matrix": [3, 5], "x": 75, "y": 40, "flags": 4}, + {"matrix": [3, 6], "x": 88, "y": 40, "flags": 4}, + {"matrix": [3, 7], "x": 101, "y": 40, "flags": 4}, + {"matrix": [3, 8], "x": 114, "y": 40, "flags": 4}, + {"matrix": [3, 9], "x": 127, "y": 40, "flags": 4}, + {"matrix": [3, 10], "x": 140, "y": 40, "flags": 4}, + {"matrix": [3, 11], "x": 153, "y": 40, "flags": 4}, + {"matrix": [3, 13], "x": 174, "y": 40, "flags": 1}, + {"matrix": [4, 15], "x": 211, "y": 52, "flags": 1}, + {"matrix": [4, 13], "x": 182, "y": 52, "flags": 4}, + {"matrix": [4, 12], "x": 170, "y": 52, "flags": 1}, + {"matrix": [4, 11], "x": 146, "y": 52, "flags": 4}, + {"matrix": [4, 10], "x": 133, "y": 52, "flags": 4}, + {"matrix": [4, 9], "x": 120, "y": 52, "flags": 4}, + {"matrix": [4, 8], "x": 107, "y": 52, "flags": 4}, + {"matrix": [4, 7], "x": 94, "y": 52, "flags": 4}, + {"matrix": [4, 6], "x": 81, "y": 52, "flags": 4}, + {"matrix": [4, 5], "x": 68, "y": 52, "flags": 4}, + {"matrix": [4, 4], "x": 55, "y": 52, "flags": 4}, + {"matrix": [4, 3], "x": 42, "y": 52, "flags": 4}, + {"matrix": [4, 2], "x": 29, "y": 52, "flags": 4}, + {"matrix": [4, 0], "x": 8, "y": 52, "flags": 1}, + {"matrix": [5, 0], "x": 3, "y": 64, "flags": 1}, + {"matrix": [5, 1], "x": 19, "y": 64, "flags": 1}, + {"matrix": [5, 2], "x": 36, "y": 64, "flags": 1}, + {"x": 62, "y": 64, "flags": 4}, + {"x": 76, "y": 64, "flags": 4}, + {"matrix": [5, 7], "x": 91, "y": 64, "flags": 4}, + {"x": 106, "y": 64, "flags": 4}, + {"x": 120, "y": 64, "flags": 4}, + {"matrix": [5, 11], "x": 146, "y": 64, "flags": 1}, + {"matrix": [5, 12], "x": 162, "y": 64, "flags": 1}, + {"matrix": [5, 13], "x": 179, "y": 64, "flags": 1}, + {"matrix": [5, 14], "x": 198, "y": 64, "flags": 1}, + {"matrix": [5, 15], "x": 211, "y": 64, "flags": 1}, + {"matrix": [5, 16], "x": 224, "y": 64, "flags": 1} + ], + "sleep": true + }, + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0008", + "vid": "0x4552" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP4" + }, + "community_layouts": ["tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift"], + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 11.75, "y": 3.25}, + {"matrix": [3, 11], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/era/linx3/n86/keymaps/default/keymap.c b/keyboards/era/linx3/n86/keymaps/default/keymap.c new file mode 100644 index 00000000000..49ae04a5a79 --- /dev/null +++ b/keyboards/era/linx3/n86/keymaps/default/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2024 QMK (@qmk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + 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_F12 , KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END , KC_PGDN, + KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_UP , + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/linx3/n86/keymaps/via/keymap.c b/keyboards/era/linx3/n86/keymaps/via/keymap.c new file mode 100644 index 00000000000..49ae04a5a79 --- /dev/null +++ b/keyboards/era/linx3/n86/keymaps/via/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2024 QMK (@qmk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + 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_F12 , KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END , KC_PGDN, + KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_UP , + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/linx3/n86/keymaps/via/rules.mk b/keyboards/era/linx3/n86/keymaps/via/rules.mk new file mode 100644 index 00000000000..036bd6d1c3e --- /dev/null +++ b/keyboards/era/linx3/n86/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/era/linx3/n86/readme.md b/keyboards/era/linx3/n86/readme.md new file mode 100644 index 00000000000..ba681090689 --- /dev/null +++ b/keyboards/era/linx3/n86/readme.md @@ -0,0 +1,23 @@ +# N86 + +* Keyboard Maintainer: [ERA](https://github.com/eerraa) +* Hardware supported: Syryan & Linx3 +* Hardware availability: [Syryan](https://srind.mysoho.com/) & [Linx3](https://allthatkeyboard.com) + +Make example for this keyboard (after setting up your build environment): + + make era/linx3/n86:default + +Flashing example for this keyboard: + + make era/linx3/n86: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at ESC(0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly short the `RESET` and `GND` pads on the SWD header twice, or short the `BOOT` header and plug in keyboard +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file diff --git a/keyboards/era/linx3/n86/rules.mk b/keyboards/era/linx3/n86/rules.mk new file mode 100644 index 00000000000..7ff128fa692 --- /dev/null +++ b/keyboards/era/linx3/n86/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From de4d28cd6065058057535aac168d48bd734f2adc Mon Sep 17 00:00:00 2001 From: era <73109780+eerraa@users.noreply.github.com> Date: Thu, 11 Apr 2024 13:48:32 +0900 Subject: [PATCH 125/333] [Keyboard] Add N8X (#23444) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Duncan Sutherland --- keyboards/era/linx3/n8x/config.h | 14 + keyboards/era/linx3/n8x/halconf.h | 8 + keyboards/era/linx3/n8x/info.json | 1230 +++++++++++++++++ .../era/linx3/n8x/keymaps/default/keymap.c | 24 + keyboards/era/linx3/n8x/keymaps/via/keymap.c | 24 + keyboards/era/linx3/n8x/keymaps/via/rules.mk | 1 + keyboards/era/linx3/n8x/mcuconf.h | 9 + keyboards/era/linx3/n8x/readme.md | 23 + keyboards/era/linx3/n8x/rules.mk | 1 + 9 files changed, 1334 insertions(+) create mode 100644 keyboards/era/linx3/n8x/config.h create mode 100644 keyboards/era/linx3/n8x/halconf.h create mode 100644 keyboards/era/linx3/n8x/info.json create mode 100644 keyboards/era/linx3/n8x/keymaps/default/keymap.c create mode 100644 keyboards/era/linx3/n8x/keymaps/via/keymap.c create mode 100644 keyboards/era/linx3/n8x/keymaps/via/rules.mk create mode 100644 keyboards/era/linx3/n8x/mcuconf.h create mode 100644 keyboards/era/linx3/n8x/readme.md create mode 100644 keyboards/era/linx3/n8x/rules.mk diff --git a/keyboards/era/linx3/n8x/config.h b/keyboards/era/linx3/n8x/config.h new file mode 100644 index 00000000000..b2cffb1151a --- /dev/null +++ b/keyboards/era/linx3/n8x/config.h @@ -0,0 +1,14 @@ +// Copyright 2024 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Reset */ +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 2000U + +/* BACKLIGHT PWM */ +#define BACKLIGHT_PWM_DRIVER PWMD1 +#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B + +#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 4 \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/halconf.h b/keyboards/era/linx3/n8x/halconf.h new file mode 100644 index 00000000000..3dbc886a838 --- /dev/null +++ b/keyboards/era/linx3/n8x/halconf.h @@ -0,0 +1,8 @@ +// Copyright 2024 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/info.json b/keyboards/era/linx3/n8x/info.json new file mode 100644 index 00000000000..ae0d608ffa8 --- /dev/null +++ b/keyboards/era/linx3/n8x/info.json @@ -0,0 +1,1230 @@ +{ + "manufacturer": "eerraa", + "keyboard_name": "N8X", + "maintainer": "eerraa", + "backlight": { + "breathing": true, + "breathing_period": 5, + "levels": 10, + "pin": "GP3" + }, + "bootloader": "rp2040", + "build": { + "debounce_type": "sym_defer_pk" + }, + "diode_direction": "COL2ROW", + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "indicators": { + "caps_lock": "GP11", + "scroll_lock": "GP8" + }, + "matrix_pins": { + "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP20", "GP19", "GP18", "GP17", "GP16", "GP21", "GP1", "GP0", "GP2"], + "rows": ["GP4", "GP5", "GP6", "GP7", "GP10", "GP9"] + }, + "processor": "RP2040", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0007", + "vid": "0x4552" + }, + "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift"], + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_iso_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_iso_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_iso_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_iso_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + } + "LAYOUT_tkl_iso_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/keymaps/default/keymap.c b/keyboards/era/linx3/n8x/keymaps/default/keymap.c new file mode 100644 index 00000000000..3dd2571ab86 --- /dev/null +++ b/keyboards/era/linx3/n8x/keymaps/default/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2024 QMK (@qmk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + 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_F12 , KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END , KC_PGDN, + KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT , + KC_LSFT, KC_NUBS, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_UP , + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RGUI, MO(1) , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/keymaps/via/keymap.c b/keyboards/era/linx3/n8x/keymaps/via/keymap.c new file mode 100644 index 00000000000..3dd2571ab86 --- /dev/null +++ b/keyboards/era/linx3/n8x/keymaps/via/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2024 QMK (@qmk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + 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_F12 , KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END , KC_PGDN, + KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT , + KC_LSFT, KC_NUBS, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_UP , + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RGUI, MO(1) , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/keymaps/via/rules.mk b/keyboards/era/linx3/n8x/keymaps/via/rules.mk new file mode 100644 index 00000000000..036bd6d1c3e --- /dev/null +++ b/keyboards/era/linx3/n8x/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/mcuconf.h b/keyboards/era/linx3/n8x/mcuconf.h new file mode 100644 index 00000000000..9a4b5b1c61e --- /dev/null +++ b/keyboards/era/linx3/n8x/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2024 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef RP_PWM_USE_PWM1 +#define RP_PWM_USE_PWM1 TRUE \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/readme.md b/keyboards/era/linx3/n8x/readme.md new file mode 100644 index 00000000000..b414e149758 --- /dev/null +++ b/keyboards/era/linx3/n8x/readme.md @@ -0,0 +1,23 @@ +# N8X + +* Keyboard Maintainer: [ERA](https://github.com/eerraa) +* Hardware supported: Syryan & Linx3 +* Hardware availability: [Syryan](https://srind.mysoho.com/) & [Linx3](https://allthatkeyboard.com) + +Make example for this keyboard (after setting up your build environment): + + make era/linx3/n8x:default + +Flashing example for this keyboard: + + make era/linx3/n8x: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at ESC(0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly short the `RESET` and `GND` pads on the SWD header twice, or short the `BOOT` header and plug in keyboard +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/rules.mk b/keyboards/era/linx3/n8x/rules.mk new file mode 100644 index 00000000000..7ff128fa692 --- /dev/null +++ b/keyboards/era/linx3/n8x/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From a532d1cc5a785da3d73812330aad95555efb81fa Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 11 Apr 2024 08:29:10 -0700 Subject: [PATCH 126/333] Data-driven Keyboard Conversions: C (#23453) --- keyboards/cannonkeys/aella/info.json | 8 ++++++++ keyboards/cannonkeys/aella/rules.mk | 14 -------------- keyboards/cannonkeys/an_c/info.json | 10 ++++++++++ keyboards/cannonkeys/an_c/rules.mk | 13 ------------- keyboards/cannonkeys/balance/info.json | 9 +++++++++ keyboards/cannonkeys/balance/rules.mk | 15 --------------- keyboards/cannonkeys/brutalv2_65/info.json | 8 ++++++++ keyboards/cannonkeys/brutalv2_65/rules.mk | 14 -------------- keyboards/cannonkeys/cloudline/info.json | 10 ++++++++++ keyboards/cannonkeys/cloudline/rules.mk | 14 -------------- keyboards/cannonkeys/crin/info.json | 9 +++++++++ keyboards/cannonkeys/crin/rules.mk | 14 -------------- keyboards/cannonkeys/db60/info.json | 12 +++++++++++- keyboards/cannonkeys/db60/rules.mk | 13 ------------- keyboards/cannonkeys/devastatingtkl/info.json | 10 ++++++++++ keyboards/cannonkeys/devastatingtkl/rules.mk | 13 ------------- keyboards/cannonkeys/gentoo/info.json | 8 ++++++++ keyboards/cannonkeys/gentoo/rules.mk | 14 -------------- keyboards/cannonkeys/gentoo_hs/info.json | 8 ++++++++ keyboards/cannonkeys/gentoo_hs/rules.mk | 14 -------------- keyboards/cannonkeys/instant60/info.json | 10 ++++++++++ keyboards/cannonkeys/instant60/rules.mk | 13 ------------- keyboards/cannonkeys/instant65/info.json | 10 ++++++++++ keyboards/cannonkeys/instant65/rules.mk | 14 -------------- keyboards/cannonkeys/malicious_ergo/info.json | 10 ++++++++++ keyboards/cannonkeys/malicious_ergo/rules.mk | 14 -------------- keyboards/cannonkeys/obliterated75/info.json | 10 ++++++++++ keyboards/cannonkeys/obliterated75/rules.mk | 14 -------------- keyboards/cannonkeys/onyx/info.json | 9 +++++++++ keyboards/cannonkeys/onyx/rules.mk | 14 -------------- keyboards/cannonkeys/rekt1800/info.json | 9 +++++++++ keyboards/cannonkeys/rekt1800/rules.mk | 13 ------------- keyboards/cannonkeys/sagittarius/info.json | 10 ++++++++++ keyboards/cannonkeys/sagittarius/rules.mk | 14 -------------- keyboards/cannonkeys/savage65/info.json | 10 ++++++++++ keyboards/cannonkeys/savage65/rules.mk | 13 ------------- keyboards/cannonkeys/tmov2/info.json | 10 ++++++++++ keyboards/cannonkeys/tmov2/rules.mk | 13 ------------- keyboards/cannonkeys/tsukuyomi/info.json | 10 ++++++++++ keyboards/cannonkeys/tsukuyomi/rules.mk | 14 -------------- keyboards/cannonkeys/vicious40/info.json | 9 +++++++++ keyboards/cannonkeys/vicious40/rules.mk | 14 -------------- keyboards/centromere/info.json | 8 ++++++++ keyboards/centromere/rules.mk | 13 ------------- .../checkerboards/phoenix45_ortho/info.json | 9 +++++++++ .../checkerboards/phoenix45_ortho/rules.mk | 14 -------------- keyboards/checkerboards/quark/info.json | 10 ++++++++++ keyboards/checkerboards/quark/rules.mk | 16 ---------------- keyboards/checkerboards/quark_squared/info.json | 10 ++++++++++ keyboards/checkerboards/quark_squared/rules.mk | 14 -------------- .../snop60/{info.json => keyboard.json} | 13 +++++++++++++ keyboards/checkerboards/snop60/rules.mk | 13 ------------- .../str_merro60/{info.json => keyboard.json} | 8 ++++++++ keyboards/chlx/str_merro60/rules.mk | 14 -------------- .../cipulot/kawayo/{info.json => keyboard.json} | 11 ++++++++++- keyboards/cipulot/kawayo/rules.mk | 14 -------------- .../prototype/{info.json => keyboard.json} | 3 +++ .../clueboard/66_hotswap/prototype/rules.mk | 1 - .../coarse/ixora/{info.json => keyboard.json} | 6 ++++++ keyboards/coarse/ixora/rules.mk | 10 ---------- .../coarse/vinta/{info.json => keyboard.json} | 6 ++++++ keyboards/coarse/vinta/rules.mk | 10 ---------- keyboards/controllerworks/city42/info.json | 5 +++-- keyboards/controllerworks/city42/rules.mk | 3 +-- keyboards/converter/adb_usb/info.json | 5 +++++ keyboards/converter/adb_usb/rules.mk | 12 ------------ keyboards/converter/hp_46010a/info.json | 7 +++++++ keyboards/converter/hp_46010a/rules.mk | 13 ------------- keyboards/converter/ibm_terminal/info.json | 7 +++++++ keyboards/converter/ibm_terminal/rules.mk | 13 ------------- keyboards/converter/m0110_usb/info.json | 7 +++++++ keyboards/converter/m0110_usb/rules.mk | 11 ----------- keyboards/converter/palm_usb/info.json | 9 ++++++++- keyboards/converter/palm_usb/rules.mk | 12 ------------ .../periboard_512/{info.json => keyboard.json} | 5 +++++ keyboards/converter/periboard_512/rules.mk | 12 ------------ keyboards/converter/siemens_tastatur/info.json | 9 +++++++++ keyboards/converter/siemens_tastatur/rules.mk | 17 +---------------- keyboards/converter/sun_usb/info.json | 10 +++++++++- keyboards/converter/sun_usb/rules.mk | 12 ------------ keyboards/converter/xt_usb/info.json | 8 ++++++++ keyboards/converter/xt_usb/rules.mk | 12 ------------ keyboards/coseyfannitutti/discipline/info.json | 5 +++++ keyboards/coseyfannitutti/discipline/rules.mk | 13 ------------- keyboards/coseyfannitutti/mysterium/info.json | 5 +++++ keyboards/coseyfannitutti/mysterium/rules.mk | 13 ------------- keyboards/cozykeys/speedo/v3/info.json | 6 ++++++ keyboards/cozykeys/speedo/v3/rules.mk | 13 ------------- keyboards/crimsonkeyboards/resume1800/info.json | 5 +++++ keyboards/crimsonkeyboards/resume1800/rules.mk | 13 ------------- keyboards/crypt_macro/info.json | 7 +++++++ keyboards/crypt_macro/rules.mk | 13 ------------- keyboards/custommk/genesis/rev1/keyboard.json | 8 ++++++++ .../genesis/rev2/{info.json => keyboard.json} | 8 ++++++++ keyboards/custommk/genesis/rev2/rules.mk | 13 ------------- keyboards/custommk/genesis/rules.mk | 14 -------------- 96 files changed, 395 insertions(+), 620 deletions(-) rename keyboards/checkerboards/snop60/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/checkerboards/snop60/rules.mk rename keyboards/chlx/str_merro60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/chlx/str_merro60/rules.mk rename keyboards/cipulot/kawayo/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/cipulot/kawayo/rules.mk rename keyboards/clueboard/66_hotswap/prototype/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/clueboard/66_hotswap/prototype/rules.mk rename keyboards/coarse/ixora/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/coarse/ixora/rules.mk rename keyboards/coarse/vinta/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/coarse/vinta/rules.mk rename keyboards/converter/periboard_512/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/converter/periboard_512/rules.mk rename keyboards/custommk/genesis/rev2/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/custommk/genesis/rev2/rules.mk diff --git a/keyboards/cannonkeys/aella/info.json b/keyboards/cannonkeys/aella/info.json index 0cab7223380..54679d57921 100644 --- a/keyboards/cannonkeys/aella/info.json +++ b/keyboards/cannonkeys/aella/info.json @@ -15,6 +15,14 @@ "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/aella/rules.mk b/keyboards/cannonkeys/aella/rules.mk index 480e8661799..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/aella/rules.mk +++ b/keyboards/cannonkeys/aella/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json index 9de1ff5fff6..e1e18f51670 100644 --- a/keyboards/cannonkeys/an_c/info.json +++ b/keyboards/cannonkeys/an_c/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["60_ansi", "60_tsangan_hhkb"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/cannonkeys/an_c/rules.mk b/keyboards/cannonkeys/an_c/rules.mk index 8d3de1b8b23..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/an_c/rules.mk +++ b/keyboards/cannonkeys/an_c/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes -RGBLIGHT_ENABLE = yes - diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/info.json index 9565795169c..c7ecea37f8e 100644 --- a/keyboards/cannonkeys/balance/info.json +++ b/keyboards/cannonkeys/balance/info.json @@ -28,6 +28,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "encoder": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/balance/rules.mk b/keyboards/cannonkeys/balance/rules.mk index 5afdd3772f5..04fe1eba2ac 100644 --- a/keyboards/cannonkeys/balance/rules.mk +++ b/keyboards/cannonkeys/balance/rules.mk @@ -1,17 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - diff --git a/keyboards/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/info.json index 0eddf11aaa5..4cff1a7571f 100644 --- a/keyboards/cannonkeys/brutalv2_65/info.json +++ b/keyboards/cannonkeys/brutalv2_65/info.json @@ -19,6 +19,14 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "community_layouts": [ "65_ansi_blocker", "65_ansi_blocker_split_bs", diff --git a/keyboards/cannonkeys/brutalv2_65/rules.mk b/keyboards/cannonkeys/brutalv2_65/rules.mk index 480e8661799..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/brutalv2_65/rules.mk +++ b/keyboards/cannonkeys/brutalv2_65/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json index d1bbce929a1..ac1bca976b1 100644 --- a/keyboards/cannonkeys/cloudline/info.json +++ b/keyboards/cannonkeys/cloudline/info.json @@ -44,6 +44,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": [ "tkl_f13_ansi_tsangan", "tkl_f13_ansi_tsangan_split_bs_rshift", diff --git a/keyboards/cannonkeys/cloudline/rules.mk b/keyboards/cannonkeys/cloudline/rules.mk index 86794ca0f70..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/cloudline/rules.mk +++ b/keyboards/cannonkeys/cloudline/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/info.json index a8468b3ed33..f61d0e12e5b 100644 --- a/keyboards/cannonkeys/crin/info.json +++ b/keyboards/cannonkeys/crin/info.json @@ -24,6 +24,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT" }, diff --git a/keyboards/cannonkeys/crin/rules.mk b/keyboards/cannonkeys/crin/rules.mk index a5906b6a90f..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/crin/rules.mk +++ b/keyboards/cannonkeys/crin/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json index 112ebaddde7..0c437ed921f 100644 --- a/keyboards/cannonkeys/db60/info.json +++ b/keyboards/cannonkeys/db60/info.json @@ -36,5 +36,15 @@ "driver": "spi" }, "processor": "STM32F072", - "bootloader": "stm32-dfu" + "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + } } diff --git a/keyboards/cannonkeys/db60/rules.mk b/keyboards/cannonkeys/db60/rules.mk index 023b329ad22..60addd7fe72 100644 --- a/keyboards/cannonkeys/db60/rules.mk +++ b/keyboards/cannonkeys/db60/rules.mk @@ -1,17 +1,4 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF -# 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 = yes -RGBLIGHT_ENABLE = yes - DEFAULT_FOLDER = cannonkeys/db60/rev2 - diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json index a3b269f1cfe..7acea3fe8b1 100644 --- a/keyboards/cannonkeys/devastatingtkl/info.json +++ b/keyboards/cannonkeys/devastatingtkl/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": [ "tkl_f13_ansi", "tkl_f13_ansi_split_bs_rshift", diff --git a/keyboards/cannonkeys/devastatingtkl/rules.mk b/keyboards/cannonkeys/devastatingtkl/rules.mk index 8d3de1b8b23..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/devastatingtkl/rules.mk +++ b/keyboards/cannonkeys/devastatingtkl/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes -RGBLIGHT_ENABLE = yes - diff --git a/keyboards/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/info.json index a371ae42320..3d8a4acac93 100644 --- a/keyboards/cannonkeys/gentoo/info.json +++ b/keyboards/cannonkeys/gentoo/info.json @@ -19,6 +19,14 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "community_layouts": [ "65_ansi", "65_ansi_split_bs", diff --git a/keyboards/cannonkeys/gentoo/rules.mk b/keyboards/cannonkeys/gentoo/rules.mk index 480e8661799..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/gentoo/rules.mk +++ b/keyboards/cannonkeys/gentoo/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/info.json index ef496628dac..fa97ae58772 100644 --- a/keyboards/cannonkeys/gentoo_hs/info.json +++ b/keyboards/cannonkeys/gentoo_hs/info.json @@ -19,6 +19,14 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "layout_aliases": { "LAYOUT_default": "LAYOUT_65_ansi_rwkl" }, diff --git a/keyboards/cannonkeys/gentoo_hs/rules.mk b/keyboards/cannonkeys/gentoo_hs/rules.mk index 4ee7a29916a..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/gentoo_hs/rules.mk +++ b/keyboards/cannonkeys/gentoo_hs/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/info.json index 355ae99f0c9..bca90e50157 100644 --- a/keyboards/cannonkeys/instant60/info.json +++ b/keyboards/cannonkeys/instant60/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["60_ansi", "60_tsangan_hhkb"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/cannonkeys/instant60/rules.mk b/keyboards/cannonkeys/instant60/rules.mk index 8d3de1b8b23..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/instant60/rules.mk +++ b/keyboards/cannonkeys/instant60/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes -RGBLIGHT_ENABLE = yes - diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/info.json index 3c447a4bd3e..63e84be0aa4 100644 --- a/keyboards/cannonkeys/instant65/info.json +++ b/keyboards/cannonkeys/instant65/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/instant65/rules.mk b/keyboards/cannonkeys/instant65/rules.mk index 86794ca0f70..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/instant65/rules.mk +++ b/keyboards/cannonkeys/instant65/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json index d5941f5f969..3897aea08b9 100644 --- a/keyboards/cannonkeys/malicious_ergo/info.json +++ b/keyboards/cannonkeys/malicious_ergo/info.json @@ -45,6 +45,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/malicious_ergo/rules.mk b/keyboards/cannonkeys/malicious_ergo/rules.mk index 86794ca0f70..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/malicious_ergo/rules.mk +++ b/keyboards/cannonkeys/malicious_ergo/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json index d831eb1aca5..19227c51507 100644 --- a/keyboards/cannonkeys/obliterated75/info.json +++ b/keyboards/cannonkeys/obliterated75/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/obliterated75/rules.mk b/keyboards/cannonkeys/obliterated75/rules.mk index 86794ca0f70..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/obliterated75/rules.mk +++ b/keyboards/cannonkeys/obliterated75/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/info.json index 8be4673df4b..5ae7039049a 100644 --- a/keyboards/cannonkeys/onyx/info.json +++ b/keyboards/cannonkeys/onyx/info.json @@ -20,6 +20,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/onyx/rules.mk b/keyboards/cannonkeys/onyx/rules.mk index a5906b6a90f..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/onyx/rules.mk +++ b/keyboards/cannonkeys/onyx/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/rekt1800/info.json b/keyboards/cannonkeys/rekt1800/info.json index 889ff5eff92..f9a58afa020 100644 --- a/keyboards/cannonkeys/rekt1800/info.json +++ b/keyboards/cannonkeys/rekt1800/info.json @@ -20,6 +20,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/rekt1800/rules.mk b/keyboards/cannonkeys/rekt1800/rules.mk index 01d0c0ade11..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/rekt1800/rules.mk +++ b/keyboards/cannonkeys/rekt1800/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes -RGBLIGHT_ENABLE = no - diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json index d9236b39056..876c68e82e2 100644 --- a/keyboards/cannonkeys/sagittarius/info.json +++ b/keyboards/cannonkeys/sagittarius/info.json @@ -44,6 +44,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/sagittarius/rules.mk b/keyboards/cannonkeys/sagittarius/rules.mk index 86794ca0f70..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/sagittarius/rules.mk +++ b/keyboards/cannonkeys/sagittarius/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/info.json index 0c2409713b9..9d7d454e550 100644 --- a/keyboards/cannonkeys/savage65/info.json +++ b/keyboards/cannonkeys/savage65/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker"], "layouts": { "LAYOUT_default": { diff --git a/keyboards/cannonkeys/savage65/rules.mk b/keyboards/cannonkeys/savage65/rules.mk index 8d3de1b8b23..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/savage65/rules.mk +++ b/keyboards/cannonkeys/savage65/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes -RGBLIGHT_ENABLE = yes - diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json index ed834c73cd9..acc5093221d 100644 --- a/keyboards/cannonkeys/tmov2/info.json +++ b/keyboards/cannonkeys/tmov2/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/tmov2/rules.mk b/keyboards/cannonkeys/tmov2/rules.mk index 8d3de1b8b23..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/tmov2/rules.mk +++ b/keyboards/cannonkeys/tmov2/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes -RGBLIGHT_ENABLE = yes - diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/info.json index 3542bca1f6b..a874d3d2935 100644 --- a/keyboards/cannonkeys/tsukuyomi/info.json +++ b/keyboards/cannonkeys/tsukuyomi/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/tsukuyomi/rules.mk b/keyboards/cannonkeys/tsukuyomi/rules.mk index 86794ca0f70..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/tsukuyomi/rules.mk +++ b/keyboards/cannonkeys/tsukuyomi/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/vicious40/info.json b/keyboards/cannonkeys/vicious40/info.json index d6669155cfc..b2d68545f0b 100644 --- a/keyboards/cannonkeys/vicious40/info.json +++ b/keyboards/cannonkeys/vicious40/info.json @@ -20,6 +20,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/vicious40/rules.mk b/keyboards/cannonkeys/vicious40/rules.mk index 9d14eaf9aa0..04fe1eba2ac 100644 --- a/keyboards/cannonkeys/vicious40/rules.mk +++ b/keyboards/cannonkeys/vicious40/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/centromere/info.json b/keyboards/centromere/info.json index 280ab8bd7e4..c190bd84d71 100644 --- a/keyboards/centromere/info.json +++ b/keyboards/centromere/info.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "unicode": true + }, "community_layouts": ["split_3x5_3", "split_3x6_3"], "layout_aliases": { "LAYOUT": "LAYOUT_split_3x6_3" diff --git a/keyboards/centromere/rules.mk b/keyboards/centromere/rules.mk index 26081e41321..0bb4817a8bd 100644 --- a/keyboards/centromere/rules.mk +++ b/keyboards/centromere/rules.mk @@ -1,19 +1,6 @@ # 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 = 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 -UNICODE_ENABLE = yes CUSTOM_MATRIX = lite # project specific files diff --git a/keyboards/checkerboards/phoenix45_ortho/info.json b/keyboards/checkerboards/phoenix45_ortho/info.json index 5bd7c644cff..43565b98529 100644 --- a/keyboards/checkerboards/phoenix45_ortho/info.json +++ b/keyboards/checkerboards/phoenix45_ortho/info.json @@ -20,6 +20,15 @@ }, "processor": "atmega32u2", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true, + "unicode": true, + "encoder": true + }, "layouts": { "LAYOUT_ortho_2x225u": { "layout": [ diff --git a/keyboards/checkerboards/phoenix45_ortho/rules.mk b/keyboards/checkerboards/phoenix45_ortho/rules.mk index 634fd79c1de..4df55cd2206 100644 --- a/keyboards/checkerboards/phoenix45_ortho/rules.mk +++ b/keyboards/checkerboards/phoenix45_ortho/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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode -ENCODER_ENABLE = yes # Encoder enable - # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/info.json index ca844603484..22fa758e7ed 100644 --- a/keyboards/checkerboards/quark/info.json +++ b/keyboards/checkerboards/quark/info.json @@ -41,6 +41,16 @@ }, "processor": "atmega32u2", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true, + "unicode": true, + "encoder": true + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_ortho_5x12_2x225u": { diff --git a/keyboards/checkerboards/quark/rules.mk b/keyboards/checkerboards/quark/rules.mk index 2dd2e10d801..4df55cd2206 100644 --- a/keyboards/checkerboards/quark/rules.mk +++ b/keyboards/checkerboards/quark/rules.mk @@ -1,19 +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 = 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 -UNICODE_ENABLE = yes # Unicode -ENCODER_ENABLE = yes # Enable Rotary Encoders - - # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/info.json index a47253d5b4a..e242bfc5d9a 100644 --- a/keyboards/checkerboards/quark_squared/info.json +++ b/keyboards/checkerboards/quark_squared/info.json @@ -41,6 +41,16 @@ }, "processor": "atmega32u2", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true, + "unicode": true, + "encoder": true + }, "layouts": { "LAYOUT_4_2x225u": { "layout": [ diff --git a/keyboards/checkerboards/quark_squared/rules.mk b/keyboards/checkerboards/quark_squared/rules.mk index 88b0022c5fd..4df55cd2206 100644 --- a/keyboards/checkerboards/quark_squared/rules.mk +++ b/keyboards/checkerboards/quark_squared/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 = 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 -UNICODE_ENABLE = yes # Unicode -ENCODER_ENABLE = yes # Enable Rotary Encoders # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/checkerboards/snop60/info.json b/keyboards/checkerboards/snop60/keyboard.json similarity index 96% rename from keyboards/checkerboards/snop60/info.json rename to keyboards/checkerboards/snop60/keyboard.json index f88186faddc..60b22caf76a 100644 --- a/keyboards/checkerboards/snop60/info.json +++ b/keyboards/checkerboards/snop60/keyboard.json @@ -47,6 +47,19 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, "layout_aliases": { "LAYOUT_7u": "LAYOUT_60_ansi_tsangan_split_bs_rshift", "LAYOUT_2x3u": "LAYOUT_60_ansi_tsangan_split_bs_rshift_space" diff --git a/keyboards/checkerboards/snop60/rules.mk b/keyboards/checkerboards/snop60/rules.mk deleted file mode 100644 index d24c9861b4d..00000000000 --- a/keyboards/checkerboards/snop60/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENBALE = yes # Enable Rotary Encoders diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/keyboard.json similarity index 99% rename from keyboards/chlx/str_merro60/info.json rename to keyboards/chlx/str_merro60/keyboard.json index 89fdd4baa12..15903f2f6cb 100644 --- a/keyboards/chlx/str_merro60/info.json +++ b/keyboards/chlx/str_merro60/keyboard.json @@ -36,12 +36,20 @@ "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "layout_aliases": { "LAYOUT_default": "LAYOUT_all", "LAYOUT_hhkb": "LAYOUT_60_hhkb", "LAYOUT_iso": "LAYOUT_60_iso_split_bs_rshift", "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb" }, + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_tsangan_hhkb"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/chlx/str_merro60/rules.mk b/keyboards/chlx/str_merro60/rules.mk deleted file mode 100644 index 9cceab1f746..00000000000 --- a/keyboards/chlx/str_merro60/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -Layouts = 60_ansi 60_ansi_split_bs_rshift 60_hhkb 60_iso 60_tsangan_hhkb diff --git a/keyboards/cipulot/kawayo/info.json b/keyboards/cipulot/kawayo/keyboard.json similarity index 99% rename from keyboards/cipulot/kawayo/info.json rename to keyboards/cipulot/kawayo/keyboard.json index 85a5f81c2b3..ac4d24b9b53 100644 --- a/keyboards/cipulot/kawayo/info.json +++ b/keyboards/cipulot/kawayo/keyboard.json @@ -6,7 +6,10 @@ "usb": { "vid": "0x6369", "pid": "0x6B7F", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "matrix_pins": { "cols": ["B10", "A0", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A4", "A3", "A2", "A1"], @@ -15,6 +18,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs" }, diff --git a/keyboards/cipulot/kawayo/rules.mk b/keyboards/cipulot/kawayo/rules.mk deleted file mode 100644 index fbab9885cdb..00000000000 --- a/keyboards/cipulot/kawayo/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -KEYBOARD_SHARED_EP = yes - -# 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 diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/keyboard.json similarity index 99% rename from keyboards/clueboard/66_hotswap/prototype/info.json rename to keyboards/clueboard/66_hotswap/prototype/keyboard.json index 2ef1fbec1eb..9d0b0dd27c7 100644 --- a/keyboards/clueboard/66_hotswap/prototype/info.json +++ b/keyboards/clueboard/66_hotswap/prototype/keyboard.json @@ -16,6 +16,9 @@ "nkro": true, "rgblight": true }, + "build": { + "lto": true + }, "indicators": { "caps_lock": "B4" }, diff --git a/keyboards/clueboard/66_hotswap/prototype/rules.mk b/keyboards/clueboard/66_hotswap/prototype/rules.mk deleted file mode 100644 index 4da205a168c..00000000000 --- a/keyboards/clueboard/66_hotswap/prototype/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes diff --git a/keyboards/coarse/ixora/info.json b/keyboards/coarse/ixora/keyboard.json similarity index 93% rename from keyboards/coarse/ixora/info.json rename to keyboards/coarse/ixora/keyboard.json index 8d51f1e9272..33ba2270acf 100644 --- a/keyboards/coarse/ixora/info.json +++ b/keyboards/coarse/ixora/keyboard.json @@ -20,6 +20,12 @@ }, "processor": "STM32F042", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "debounce": 0, "layouts": { "LAYOUT_full": { diff --git a/keyboards/coarse/ixora/rules.mk b/keyboards/coarse/ixora/rules.mk deleted file mode 100644 index 285aeb82028..00000000000 --- a/keyboards/coarse/ixora/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# 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 diff --git a/keyboards/coarse/vinta/info.json b/keyboards/coarse/vinta/keyboard.json similarity index 99% rename from keyboards/coarse/vinta/info.json rename to keyboards/coarse/vinta/keyboard.json index 3dd9898f1aa..df9aa7e5a18 100644 --- a/keyboards/coarse/vinta/info.json +++ b/keyboards/coarse/vinta/keyboard.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F042", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "debounce": 0, "community_layouts": ["65_ansi_blocker"], "layout_aliases": { diff --git a/keyboards/coarse/vinta/rules.mk b/keyboards/coarse/vinta/rules.mk deleted file mode 100644 index 285aeb82028..00000000000 --- a/keyboards/coarse/vinta/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# 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 diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/info.json index bff73f7e6ff..6657a7485b1 100644 --- a/keyboards/controllerworks/city42/info.json +++ b/keyboards/controllerworks/city42/info.json @@ -14,7 +14,8 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true + "rgb_matrix": true, + "pointing_device": true }, "matrix_pins": { "cols": ["GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5"], @@ -174,4 +175,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/controllerworks/city42/rules.mk b/keyboards/controllerworks/city42/rules.mk index 2e0f2befbf4..fb5d6497359 100644 --- a/keyboards/controllerworks/city42/rules.mk +++ b/keyboards/controllerworks/city42/rules.mk @@ -1,2 +1 @@ -POINTING_DEVICE_ENABLE = yes -POINTING_DEVICE_DRIVER = cirque_pinnacle_spi \ No newline at end of file +POINTING_DEVICE_DRIVER = cirque_pinnacle_spi diff --git a/keyboards/converter/adb_usb/info.json b/keyboards/converter/adb_usb/info.json index b553dfc10ff..47467a97c72 100644 --- a/keyboards/converter/adb_usb/info.json +++ b/keyboards/converter/adb_usb/info.json @@ -8,6 +8,11 @@ "pid": "0x0ADB", "device_version": "1.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true + }, "layouts": { "LAYOUT_ext_ansi": { "layout": [ diff --git a/keyboards/converter/adb_usb/rules.mk b/keyboards/converter/adb_usb/rules.mk index 4e4d068a704..28df56c337d 100644 --- a/keyboards/converter/adb_usb/rules.mk +++ b/keyboards/converter/adb_usb/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 = 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 CUSTOM_MATRIX = yes SRC += matrix.c adb.c led.c diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/info.json index da29c72fac7..0296bda5e98 100644 --- a/keyboards/converter/hp_46010a/info.json +++ b/keyboards/converter/hp_46010a/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/hp_46010a/rules.mk b/keyboards/converter/hp_46010a/rules.mk index 104381f12fc..3c6124d20ab 100644 --- a/keyboards/converter/hp_46010a/rules.mk +++ b/keyboards/converter/hp_46010a/rules.mk @@ -1,16 +1,3 @@ -# 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 = 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. -SPLIT_KEYBOARD = no WAIT_FOR_USB = yes CUSTOM_MATRIX = yes diff --git a/keyboards/converter/ibm_terminal/info.json b/keyboards/converter/ibm_terminal/info.json index 39840eb6276..b95ea58d206 100644 --- a/keyboards/converter/ibm_terminal/info.json +++ b/keyboards/converter/ibm_terminal/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "ps2": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/ibm_terminal/rules.mk b/keyboards/converter/ibm_terminal/rules.mk index c04e7e01a47..038d8da5a2f 100644 --- a/keyboards/converter/ibm_terminal/rules.mk +++ b/keyboards/converter/ibm_terminal/rules.mk @@ -1,16 +1,3 @@ -# 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 = 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_ENABLE = yes PS2_DRIVER = usart CUSTOM_MATRIX = yes diff --git a/keyboards/converter/m0110_usb/info.json b/keyboards/converter/m0110_usb/info.json index 1869d2dacb8..522f83caba1 100644 --- a/keyboards/converter/m0110_usb/info.json +++ b/keyboards/converter/m0110_usb/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "console": true, + "extrakey": true, + "usb_hid": true + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/converter/m0110_usb/rules.mk b/keyboards/converter/m0110_usb/rules.mk index a9dc1a9e499..7021c1052a2 100644 --- a/keyboards/converter/m0110_usb/rules.mk +++ b/keyboards/converter/m0110_usb/rules.mk @@ -1,17 +1,6 @@ # Processor frequency F_CPU = 8000000 -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -EXTRAKEY_ENABLE = yes -USB_HID_ENABLE = yes -BACKLIGHT_ENABLE = no CUSTOM_MATRIX = yes SRC = matrix.c m0110.c diff --git a/keyboards/converter/palm_usb/info.json b/keyboards/converter/palm_usb/info.json index 2fe66720ec7..c5b893d7576 100644 --- a/keyboards/converter/palm_usb/info.json +++ b/keyboards/converter/palm_usb/info.json @@ -9,5 +9,12 @@ "device_version": "1.0.0" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "console": true, + "command": true + } } diff --git a/keyboards/converter/palm_usb/rules.mk b/keyboards/converter/palm_usb/rules.mk index 72d9daf6d9a..bdb3bb0d6bb 100644 --- a/keyboards/converter/palm_usb/rules.mk +++ b/keyboards/converter/palm_usb/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 = 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 -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. #HARDWARE_SERIAL = yes CUSTOM_MATRIX = yes diff --git a/keyboards/converter/periboard_512/info.json b/keyboards/converter/periboard_512/keyboard.json similarity index 98% rename from keyboards/converter/periboard_512/info.json rename to keyboards/converter/periboard_512/keyboard.json index 08cc8ee9bf3..b3359314931 100644 --- a/keyboards/converter/periboard_512/info.json +++ b/keyboards/converter/periboard_512/keyboard.json @@ -10,6 +10,11 @@ }, "processor": "at90usb1286", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "diode_direction": "ROW2COL", "matrix_pins": { "cols": ["B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"], diff --git a/keyboards/converter/periboard_512/rules.mk b/keyboards/converter/periboard_512/rules.mk deleted file mode 100644 index 1eeda920b40..00000000000 --- a/keyboards/converter/periboard_512/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/converter/siemens_tastatur/info.json b/keyboards/converter/siemens_tastatur/info.json index 8ed2523c260..571d06a5c31 100644 --- a/keyboards/converter/siemens_tastatur/info.json +++ b/keyboards/converter/siemens_tastatur/info.json @@ -10,6 +10,15 @@ }, "processor": "STM32F103", "bootloader": "stm32duino", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "sleep_led": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/siemens_tastatur/rules.mk b/keyboards/converter/siemens_tastatur/rules.mk index 1bc8ee188b8..3215e3588a3 100644 --- a/keyboards/converter/siemens_tastatur/rules.mk +++ b/keyboards/converter/siemens_tastatur/rules.mk @@ -1,17 +1,2 @@ -SRC = matrix.c - -# 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no -SLEEP_LED_ENABLE = yes CUSTOM_MATRIX = yes - - +SRC = matrix.c diff --git a/keyboards/converter/sun_usb/info.json b/keyboards/converter/sun_usb/info.json index a243a64da25..e4031595ad3 100644 --- a/keyboards/converter/sun_usb/info.json +++ b/keyboards/converter/sun_usb/info.json @@ -9,5 +9,13 @@ "device_version": "1.0.0" }, "processor": "atmega32u4", - "bootloader": "lufa-dfu" + "bootloader": "lufa-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + } } diff --git a/keyboards/converter/sun_usb/rules.mk b/keyboards/converter/sun_usb/rules.mk index ae20f51b37e..d3ec00c5d5f 100644 --- a/keyboards/converter/sun_usb/rules.mk +++ b/keyboards/converter/sun_usb/rules.mk @@ -1,15 +1,3 @@ -# 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. #HARDWARE_SERIAL = yes CUSTOM_MATRIX = yes diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/info.json index 1c9bcf5e345..649b2833292 100644 --- a/keyboards/converter/xt_usb/info.json +++ b/keyboards/converter/xt_usb/info.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT_xt": { "layout": [ diff --git a/keyboards/converter/xt_usb/rules.mk b/keyboards/converter/xt_usb/rules.mk index f98bdcc5d35..3fd6b1cfa65 100644 --- a/keyboards/converter/xt_usb/rules.mk +++ b/keyboards/converter/xt_usb/rules.mk @@ -1,15 +1,3 @@ -# 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 = 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 = yes SRC += matrix.c xt_interrupt.c diff --git a/keyboards/coseyfannitutti/discipline/info.json b/keyboards/coseyfannitutti/discipline/info.json index 82da2f800f7..1fb94c7052c 100644 --- a/keyboards/coseyfannitutti/discipline/info.json +++ b/keyboards/coseyfannitutti/discipline/info.json @@ -16,6 +16,11 @@ "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "layout_aliases": { "LAYOUT_65_ansi_2_right_mods": "LAYOUT_65_ansi_blocker", "LAYOUT_65_iso_2_right_mods": "LAYOUT_65_iso_blocker", diff --git a/keyboards/coseyfannitutti/discipline/rules.mk b/keyboards/coseyfannitutti/discipline/rules.mk index 18550f0a64d..c2ee0bc86f9 100644 --- a/keyboards/coseyfannitutti/discipline/rules.mk +++ b/keyboards/coseyfannitutti/discipline/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/coseyfannitutti/mysterium/info.json b/keyboards/coseyfannitutti/mysterium/info.json index ff6e2de22b0..0d75d192293 100644 --- a/keyboards/coseyfannitutti/mysterium/info.json +++ b/keyboards/coseyfannitutti/mysterium/info.json @@ -15,6 +15,11 @@ "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true + }, "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/coseyfannitutti/mysterium/rules.mk b/keyboards/coseyfannitutti/mysterium/rules.mk index b6082e107ce..c2ee0bc86f9 100644 --- a/keyboards/coseyfannitutti/mysterium/rules.mk +++ b/keyboards/coseyfannitutti/mysterium/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 = 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 diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json index 3a084b04baa..7636d9b702f 100644 --- a/keyboards/cozykeys/speedo/v3/info.json +++ b/keyboards/cozykeys/speedo/v3/info.json @@ -36,6 +36,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cozykeys/speedo/v3/rules.mk b/keyboards/cozykeys/speedo/v3/rules.mk index 78ff4d5d60e..baf23318ccd 100644 --- a/keyboards/cozykeys/speedo/v3/rules.mk +++ b/keyboards/cozykeys/speedo/v3/rules.mk @@ -1,14 +1 @@ PIN_COMPATIBLE = elite_c - -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/info.json index 23257be46e5..f88b7032086 100644 --- a/keyboards/crimsonkeyboards/resume1800/info.json +++ b/keyboards/crimsonkeyboards/resume1800/info.json @@ -20,6 +20,11 @@ }, "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "layout_aliases": { "LAYOUT_resume1800_ansi_all": "LAYOUT_ansi_all", "LAYOUT_resume1800_iso_all": "LAYOUT_iso_all" diff --git a/keyboards/crimsonkeyboards/resume1800/rules.mk b/keyboards/crimsonkeyboards/resume1800/rules.mk index 18550f0a64d..c2ee0bc86f9 100644 --- a/keyboards/crimsonkeyboards/resume1800/rules.mk +++ b/keyboards/crimsonkeyboards/resume1800/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/crypt_macro/info.json b/keyboards/crypt_macro/info.json index 1b340ff74f6..e8771e363e6 100644 --- a/keyboards/crypt_macro/info.json +++ b/keyboards/crypt_macro/info.json @@ -31,6 +31,13 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "direct": [ ["B12", "B6", "B7"], diff --git a/keyboards/crypt_macro/rules.mk b/keyboards/crypt_macro/rules.mk index cc9d7bb3f53..0ab54aaaf71 100644 --- a/keyboards/crypt_macro/rules.mk +++ b/keyboards/crypt_macro/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/custommk/genesis/rev1/keyboard.json b/keyboards/custommk/genesis/rev1/keyboard.json index f859a6b9bf3..7025834d91b 100644 --- a/keyboards/custommk/genesis/rev1/keyboard.json +++ b/keyboards/custommk/genesis/rev1/keyboard.json @@ -45,6 +45,14 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "encoder": true + }, "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/keyboard.json similarity index 95% rename from keyboards/custommk/genesis/rev2/info.json rename to keyboards/custommk/genesis/rev2/keyboard.json index 5760ba52cdc..d56cdb9df5e 100644 --- a/keyboards/custommk/genesis/rev2/info.json +++ b/keyboards/custommk/genesis/rev2/keyboard.json @@ -45,6 +45,14 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "encoder": true + }, "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/custommk/genesis/rev2/rules.mk b/keyboards/custommk/genesis/rev2/rules.mk deleted file mode 100644 index 212c267b251..00000000000 --- a/keyboards/custommk/genesis/rev2/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 -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 -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/custommk/genesis/rules.mk b/keyboards/custommk/genesis/rules.mk index cb164c1a89f..3d64c0af2b9 100644 --- a/keyboards/custommk/genesis/rules.mk +++ b/keyboards/custommk/genesis/rules.mk @@ -1,15 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - DEFAULT_FOLDER = custommk/genesis/rev2 From cb81913d18fd567cb2dbadcd9a5c5c767f75ba60 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:21:32 -0700 Subject: [PATCH 127/333] Data-Driven Keyboard Conversions: B (#23425) Converts configuration definitions and rules to data-driven where applicable. Renames `info.json` to `keyboard.json` in instances where `rules.mk` can be safely deleted. Affects: - `bacca70` - `baguette` - `baion_808` - `bajjak` - `bandominedoni` - `bantam44` - `barleycorn_smd` - `barracuda` - `basekeys/slice/rev1` - `basekeys/slice/rev1_rgb` - `basekeys/trifecta` - `basketweave` - `bastardkb/dilemma/4x6_4` - `bbrfkr/dynamis` - `bear_face` - `beatervan` - `bemeier/bmek` - `biacco42/ergo42` - `biacco42/meishi` - `biacco42/meishi2` - `binepad/bn003` - `binepad/bn009/r1` - `binepad/bnr1` - `bioi/g60` - `bioi/g60ble` - `bioi/morgan65` - `bioi/s65` - `blackplum` - `blank/blank01` - `blank_tehnologii/manibus` - `blockey` - `bluebell/swoop` - `boardrun/bizarre` - `boardrun/classic` - `boardsource/equals/48` - `boardsource/equals/60` - `boardwalk` - `bop` - `boston` - `boston_meetup/2019` - `box75` - `bpiphany/four_banger` - `bpiphany/frosty_flake` - `bpiphany/ghost_squid` - `bpiphany/hid_liber` - `bpiphany/kitten_paw` - `bpiphany/tiger_lily` - `bpiphany/unloved_bastard` - `bt66tech/bt66tech60` - `bubble75/hotswap` - `budgy` - `buildakb/potato65` - `buildakb/potato65hs` - `buildakb/potato65s` - `buzzard` --- keyboards/bacca70/config.h | 25 ----- keyboards/bacca70/keyboard.json | 6 ++ keyboards/baguette/config.h | 39 ------- keyboards/baguette/keyboard.json | 6 ++ keyboards/baion_808/info.json | 7 ++ keyboards/baion_808/rules.mk | 15 --- keyboards/bajjak/config.h | 5 - keyboards/bajjak/info.json | 15 +++ keyboards/bajjak/rules.mk | 15 --- .../{info.json => keyboard.json} | 11 ++ keyboards/bandominedoni/rules.mk | 18 ---- keyboards/bantam44/config.h | 39 ------- keyboards/bantam44/keyboard.json | 6 ++ keyboards/barleycorn_smd/config.h | 5 - keyboards/barleycorn_smd/info.json | 12 +++ keyboards/barleycorn_smd/rules.mk | 13 --- keyboards/barracuda/config.h | 22 ---- keyboards/barracuda/keyboard.json | 6 ++ keyboards/basekeys/slice/rev1/config.h | 5 - .../slice/rev1/{info.json => keyboard.json} | 12 +++ keyboards/basekeys/slice/rev1/rules.mk | 12 --- keyboards/basekeys/slice/rev1_rgb/config.h | 5 - .../rev1_rgb/{info.json => keyboard.json} | 17 +++ keyboards/basekeys/slice/rev1_rgb/rules.mk | 16 --- keyboards/basekeys/trifecta/config.h | 23 ---- keyboards/basekeys/trifecta/keyboard.json | 91 +++++++++++++++- keyboards/basekeys/trifecta/trifecta.c | 61 ----------- keyboards/basketweave/config.h | 22 ---- keyboards/basketweave/info.json | 12 ++- keyboards/basketweave/rules.mk | 14 --- keyboards/bastardkb/dilemma/4x6_4/config.h | 3 - keyboards/bbrfkr/dynamis/info.json | 11 ++ keyboards/bbrfkr/dynamis/rules.mk | 16 --- keyboards/bear_face/config.h | 39 ------- keyboards/bear_face/info.json | 6 ++ keyboards/beatervan/config.h | 22 ---- keyboards/beatervan/keyboard.json | 6 ++ .../bmek/rev1/{info.json => keyboard.json} | 11 ++ keyboards/bemeier/bmek/rev1/rules.mk | 15 --- .../bmek/rev2/{info.json => keyboard.json} | 11 ++ keyboards/bemeier/bmek/rev2/rules.mk | 15 --- .../bmek/rev3/{info.json => keyboard.json} | 11 ++ keyboards/bemeier/bmek/rev3/rules.mk | 15 --- keyboards/biacco42/ergo42/rev1/config.h | 41 ------- .../ergo42/rev1/{info.json => keyboard.json} | 13 +++ keyboards/biacco42/ergo42/rev1/rules.mk | 1 - keyboards/biacco42/ergo42/rules.mk | 15 --- keyboards/biacco42/meishi/config.h | 39 ------- keyboards/biacco42/meishi/keyboard.json | 6 ++ keyboards/biacco42/meishi2/config.h | 39 ------- keyboards/biacco42/meishi2/keyboard.json | 6 ++ keyboards/binepad/bn003/config.h | 22 ---- keyboards/binepad/bn003/keyboard.json | 6 ++ .../bn009/r1/{info.json => keyboard.json} | 3 + keyboards/binepad/bn009/r1/rules.mk | 4 - keyboards/binepad/bnr1/rules.mk | 2 - .../bnr1/v1/{info.json => keyboard.json} | 3 + keyboards/binepad/bnr1/v1/rules.mk | 3 - keyboards/bioi/g60/config.h | 5 - keyboards/bioi/g60/info.json | 18 ++++ keyboards/bioi/g60/rules.mk | 14 --- keyboards/bioi/g60ble/config.h | 5 - keyboards/bioi/g60ble/info.json | 18 ++++ keyboards/bioi/g60ble/rules.mk | 14 --- keyboards/bioi/morgan65/config.h | 5 - keyboards/bioi/morgan65/info.json | 18 ++++ keyboards/bioi/morgan65/rules.mk | 14 --- keyboards/bioi/s65/config.h | 5 - keyboards/bioi/s65/keyboard.json | 6 ++ keyboards/blackplum/config.h | 7 -- keyboards/blackplum/keyboard.json | 6 ++ keyboards/blank/blank01/config.h | 39 ------- keyboards/blank/blank01/keyboard.json | 6 ++ .../manibus/{info.json => keyboard.json} | 9 ++ keyboards/blank_tehnologii/manibus/rules.mk | 14 --- keyboards/blockey/config.h | 39 ------- keyboards/blockey/keyboard.json | 6 ++ .../swoop/{info.json => keyboard.json} | 7 ++ keyboards/bluebell/swoop/rules.mk | 11 -- keyboards/boardrun/bizarre/config.h | 37 ------- keyboards/boardrun/bizarre/keyboard.json | 6 ++ keyboards/boardrun/classic/config.h | 37 ------- keyboards/boardrun/classic/keyboard.json | 6 ++ keyboards/boardsource/equals/48/info.json | 3 +- keyboards/boardsource/equals/48/rules.mk | 1 - keyboards/boardsource/equals/60/info.json | 3 +- keyboards/boardsource/equals/60/rules.mk | 1 - keyboards/boardwalk/config.h | 37 ------- keyboards/boardwalk/keyboard.json | 6 ++ keyboards/bop/config.h | 6 -- keyboards/bop/keyboard.json | 6 ++ keyboards/boston/config.h | 5 - keyboards/boston/keyboard.json | 6 +- keyboards/boston_meetup/2019/info.json | 9 ++ keyboards/boston_meetup/2019/rules.mk | 15 --- keyboards/box75/config.h | 39 ------- keyboards/box75/keyboard.json | 6 ++ keyboards/bpiphany/four_banger/config.h | 7 -- keyboards/bpiphany/four_banger/keyboard.json | 6 ++ keyboards/bpiphany/frosty_flake/config.h | 5 - keyboards/bpiphany/frosty_flake/info.json | 6 ++ keyboards/bpiphany/ghost_squid/info.json | 5 + keyboards/bpiphany/ghost_squid/rules.mk | 12 --- keyboards/bpiphany/hid_liber/config.h | 5 - keyboards/bpiphany/hid_liber/info.json | 14 +++ keyboards/bpiphany/hid_liber/rules.mk | 12 --- keyboards/bpiphany/kitten_paw/config.h | 5 - keyboards/bpiphany/kitten_paw/info.json | 13 +++ keyboards/bpiphany/kitten_paw/rules.mk | 12 --- keyboards/bpiphany/tiger_lily/config.h | 5 - keyboards/bpiphany/tiger_lily/info.json | 13 +++ keyboards/bpiphany/tiger_lily/rules.mk | 12 --- keyboards/bpiphany/unloved_bastard/config.h | 5 - keyboards/bpiphany/unloved_bastard/info.json | 14 +++ keyboards/bpiphany/unloved_bastard/rules.mk | 13 --- keyboards/bt66tech/bt66tech60/config.h | 5 - keyboards/bt66tech/bt66tech60/keyboard.json | 6 ++ keyboards/bubble75/hotswap/config.h | 23 ---- keyboards/bubble75/hotswap/hotswap.c | 30 ------ .../hotswap/{info.json => keyboard.json} | 101 +++++++++++++++++- keyboards/bubble75/hotswap/rules.mk | 12 --- keyboards/budgy/info.json | 1 + keyboards/budgy/rules.mk | 1 - keyboards/buildakb/potato65/config.h | 39 ------- keyboards/buildakb/potato65/keyboard.json | 6 ++ keyboards/buildakb/potato65hs/config.h | 24 ----- keyboards/buildakb/potato65hs/keyboard.json | 6 ++ keyboards/buildakb/potato65s/config.h | 24 ----- keyboards/buildakb/potato65s/keyboard.json | 6 ++ keyboards/buzzard/rev1/config.h | 5 - keyboards/buzzard/rev1/info.json | 16 +++ keyboards/buzzard/rev1/rules.mk | 1 - keyboards/buzzard/rules.mk | 15 --- 133 files changed, 645 insertions(+), 1274 deletions(-) delete mode 100644 keyboards/bacca70/config.h delete mode 100644 keyboards/baguette/config.h rename keyboards/bandominedoni/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/bandominedoni/rules.mk delete mode 100644 keyboards/bantam44/config.h delete mode 100644 keyboards/barracuda/config.h rename keyboards/basekeys/slice/rev1/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/basekeys/slice/rev1/rules.mk rename keyboards/basekeys/slice/rev1_rgb/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/basekeys/slice/rev1_rgb/rules.mk delete mode 100644 keyboards/basekeys/trifecta/config.h delete mode 100644 keyboards/basekeys/trifecta/trifecta.c delete mode 100644 keyboards/basketweave/config.h delete mode 100644 keyboards/bear_face/config.h delete mode 100644 keyboards/beatervan/config.h rename keyboards/bemeier/bmek/rev1/{info.json => keyboard.json} (74%) delete mode 100755 keyboards/bemeier/bmek/rev1/rules.mk rename keyboards/bemeier/bmek/rev2/{info.json => keyboard.json} (74%) delete mode 100755 keyboards/bemeier/bmek/rev2/rules.mk rename keyboards/bemeier/bmek/rev3/{info.json => keyboard.json} (74%) delete mode 100755 keyboards/bemeier/bmek/rev3/rules.mk delete mode 100644 keyboards/biacco42/ergo42/rev1/config.h rename keyboards/biacco42/ergo42/rev1/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/biacco42/ergo42/rev1/rules.mk delete mode 100644 keyboards/biacco42/meishi/config.h delete mode 100644 keyboards/biacco42/meishi2/config.h delete mode 100644 keyboards/binepad/bn003/config.h rename keyboards/binepad/bn009/r1/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/binepad/bn009/r1/rules.mk rename keyboards/binepad/bnr1/v1/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/binepad/bnr1/v1/rules.mk delete mode 100644 keyboards/blackplum/config.h delete mode 100644 keyboards/blank/blank01/config.h rename keyboards/blank_tehnologii/manibus/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/blank_tehnologii/manibus/rules.mk delete mode 100644 keyboards/blockey/config.h rename keyboards/bluebell/swoop/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/bluebell/swoop/rules.mk delete mode 100644 keyboards/boardrun/bizarre/config.h delete mode 100644 keyboards/boardrun/classic/config.h delete mode 100644 keyboards/boardwalk/config.h delete mode 100644 keyboards/box75/config.h delete mode 100644 keyboards/bpiphany/four_banger/config.h delete mode 100644 keyboards/bubble75/hotswap/config.h rename keyboards/bubble75/hotswap/{info.json => keyboard.json} (58%) delete mode 100644 keyboards/bubble75/hotswap/rules.mk delete mode 100644 keyboards/buildakb/potato65/config.h delete mode 100644 keyboards/buildakb/potato65hs/config.h delete mode 100644 keyboards/buildakb/potato65s/config.h diff --git a/keyboards/bacca70/config.h b/keyboards/bacca70/config.h deleted file mode 100644 index 0c56f57b207..00000000000 --- a/keyboards/bacca70/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2022 keebnewb - -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 - - diff --git a/keyboards/bacca70/keyboard.json b/keyboards/bacca70/keyboard.json index c192fb0eb23..8d4483bc6fa 100644 --- a/keyboards/bacca70/keyboard.json +++ b/keyboards/bacca70/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "B12", "B13", "B14", "B15", "A8"], "rows": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "A9", "A10"] diff --git a/keyboards/baguette/config.h b/keyboards/baguette/config.h deleted file mode 100644 index 3005d1bcfbb..00000000000 --- a/keyboards/baguette/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Yiancar - -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/baguette/keyboard.json b/keyboards/baguette/keyboard.json index f6797dd9390..001757f8618 100644 --- a/keyboards/baguette/keyboard.json +++ b/keyboards/baguette/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "D0", "D1", "D2", "D3", "D5", "D4"], "rows": ["B3", "B2", "B1", "E6", "D6"] diff --git a/keyboards/baion_808/info.json b/keyboards/baion_808/info.json index d8834ec0662..c770a65e257 100755 --- a/keyboards/baion_808/info.json +++ b/keyboards/baion_808/info.json @@ -8,6 +8,12 @@ "pid": "0x4238", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"], "rows": ["A2", "A14", "A15", "B3", "B4", "B5"] @@ -20,6 +26,7 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "community_layouts": ["tkl_ansi", "tkl_ansi_tsangan", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/baion_808/rules.mk b/keyboards/baion_808/rules.mk index 11c4a00e5a5..0ab54aaaf71 100644 --- a/keyboards/baion_808/rules.mk +++ b/keyboards/baion_808/rules.mk @@ -1,17 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 - -LAYOUTS = tkl_ansi tkl_ansi_tsangan tkl_ansi_split_bs_rshift tkl_ansi_tsangan_split_bs_rshift tkl_iso tkl_iso_split_bs_rshift tkl_iso_tsangan tkl_iso_tsangan_split_bs_rshift diff --git a/keyboards/bajjak/config.h b/keyboards/bajjak/config.h index 72d296bca4b..455588fb084 100644 --- a/keyboards/bajjak/config.h +++ b/keyboards/bajjak/config.h @@ -43,11 +43,6 @@ along with this program. If not, see . #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* 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 - /* key combination for command */ #define IS_COMMAND() ( \ get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/info.json index bf090bb7d63..a4ab7298ee1 100644 --- a/keyboards/bajjak/info.json +++ b/keyboards/bajjak/info.json @@ -8,6 +8,21 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "unicode": true, + "swap_hands": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u4", "bootloader": "halfkay", "tapping": { diff --git a/keyboards/bajjak/rules.mk b/keyboards/bajjak/rules.mk index 21db4112e06..08caba6edc1 100644 --- a/keyboards/bajjak/rules.mk +++ b/keyboards/bajjak/rules.mk @@ -3,22 +3,7 @@ # details), include the following define: OPT_DEFS += -DLEFT_LEDS -# 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 -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite # Custom matrix file for the BAJJAK -UNICODE_ENABLE = yes # Unicode -SWAP_HANDS_ENABLE = yes # Allow swapping hands of keyboard # Disable unsupported hardware BACKLIGHT_SUPPORTED = no diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/keyboard.json similarity index 96% rename from keyboards/bandominedoni/info.json rename to keyboards/bandominedoni/keyboard.json index deea0f3e5ef..c253da0c839 100644 --- a/keyboards/bandominedoni/info.json +++ b/keyboards/bandominedoni/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xF4B5", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "midi": true, + "encoder": true + }, + "build": { + "lto": true + }, "rgb_matrix": { "driver": "ws2812", "max_brightness": 50, @@ -19,6 +29,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/bandominedoni/rules.mk b/keyboards/bandominedoni/rules.mk deleted file mode 100644 index c32d761f102..00000000000 --- a/keyboards/bandominedoni/rules.mk +++ /dev/null @@ -1,18 +0,0 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -MIDI_ENABLE = yes # MIDI support -ENCODER_ENABLE = yes # encoder on mute button -SPLIT_KEYBOARD = yes # Enables split keyboard support -RGB_MATRIX_ENABLE = no # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.) - -LTO_ENABLE = yes diff --git a/keyboards/bantam44/config.h b/keyboards/bantam44/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/bantam44/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/bantam44/keyboard.json b/keyboards/bantam44/keyboard.json index 2a884c2524e..ac534af6a99 100644 --- a/keyboards/bantam44/keyboard.json +++ b/keyboards/bantam44/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "B6", "F7", "F6", "F5", "F4", "F1"], "rows": ["F0", "D6", "D4", "D5"] diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h index 06c67798c01..e64c243aad3 100644 --- a/keyboards/barleycorn_smd/config.h +++ b/keyboards/barleycorn_smd/config.h @@ -41,11 +41,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* 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. diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/info.json index b4aef08b62d..cc269296d73 100644 --- a/keyboards/barleycorn_smd/info.json +++ b/keyboards/barleycorn_smd/info.json @@ -8,6 +8,18 @@ "device_version": "0.0.1", "max_power": 400 }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "B2", "num_lock": "B3" diff --git a/keyboards/barleycorn_smd/rules.mk b/keyboards/barleycorn_smd/rules.mk index 69ecebae2ae..c04c3c92ed3 100644 --- a/keyboards/barleycorn_smd/rules.mk +++ b/keyboards/barleycorn_smd/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 = no # 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 = lite SRC += matrix.c diff --git a/keyboards/barracuda/config.h b/keyboards/barracuda/config.h deleted file mode 100644 index 5dd1c8d063a..00000000000 --- a/keyboards/barracuda/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 knaruo - * - * 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 diff --git a/keyboards/barracuda/keyboard.json b/keyboards/barracuda/keyboard.json index 56cf8f08bb3..6e606e11ea9 100644 --- a/keyboards/barracuda/keyboard.json +++ b/keyboards/barracuda/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "D5", "D6", "B0", "B1", "B2"], "rows": ["C4", "C5", "C6", "D1", "D2", "D3"] diff --git a/keyboards/basekeys/slice/rev1/config.h b/keyboards/basekeys/slice/rev1/config.h index c1008da9b86..aecd34737d4 100644 --- a/keyboards/basekeys/slice/rev1/config.h +++ b/keyboards/basekeys/slice/rev1/config.h @@ -21,8 +21,3 @@ along with this program. If not, see . //#define EE_HANDS #define MASTER_LEFT //#define MASTER_RIGHT - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/basekeys/slice/rev1/info.json b/keyboards/basekeys/slice/rev1/keyboard.json similarity index 98% rename from keyboards/basekeys/slice/rev1/info.json rename to keyboards/basekeys/slice/rev1/keyboard.json index 6b97d0c9ec9..c341597ee66 100644 --- a/keyboards/basekeys/slice/rev1/info.json +++ b/keyboards/basekeys/slice/rev1/keyboard.json @@ -8,12 +8,24 @@ "pid": "0xEC17", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"], "rows": ["D4", "C6", "D7", "E6", "B4"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/basekeys/slice/rev1/rules.mk b/keyboards/basekeys/slice/rev1/rules.mk deleted file mode 100644 index 992af66fa22..00000000000 --- a/keyboards/basekeys/slice/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# this is split keyboard. -SPLIT_KEYBOARD = yes - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h index 8a0c1946c16..2594d39f2a4 100644 --- a/keyboards/basekeys/slice/rev1_rgb/config.h +++ b/keyboards/basekeys/slice/rev1_rgb/config.h @@ -21,9 +21,4 @@ along with this program. If not, see . #define MASTER_LEFT //#define MASTER_RIGHT -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - #define OLED_FONT_H "keyboards/basekeys/slice/slice_font.c" diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/keyboard.json similarity index 97% rename from keyboards/basekeys/slice/rev1_rgb/info.json rename to keyboards/basekeys/slice/rev1_rgb/keyboard.json index faec5a99533..a666f266617 100644 --- a/keyboards/basekeys/slice/rev1_rgb/info.json +++ b/keyboards/basekeys/slice/rev1_rgb/keyboard.json @@ -8,12 +8,29 @@ "pid": "0xEC15", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "rgblight": true, + "oled": true + }, + "build": { + "lto": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"], "rows": ["D4", "C6", "D7", "E6", "B4"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "ws2812": { diff --git a/keyboards/basekeys/slice/rev1_rgb/rules.mk b/keyboards/basekeys/slice/rev1_rgb/rules.mk deleted file mode 100644 index 1e24ec177f9..00000000000 --- a/keyboards/basekeys/slice/rev1_rgb/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# this is split keyboard. -SPLIT_KEYBOARD = yes - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -OLED_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h deleted file mode 100644 index 584a6e4bfc5..00000000000 --- a/keyboards/basekeys/trifecta/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Swiftrax and Basekeys.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/basekeys/trifecta/keyboard.json b/keyboards/basekeys/trifecta/keyboard.json index 8777b1ffa9d..8660156f64c 100644 --- a/keyboards/basekeys/trifecta/keyboard.json +++ b/keyboards/basekeys/trifecta/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "D1", "B2", "D0", "B3"], "rows": ["B0", "B7", "F7", "B1", "B6", "C6", "C7", "B5", "F6", "D2"] @@ -54,6 +60,7 @@ } }, "rgb_matrix": { + "driver": "ws2812", "sat_steps": 8, "val_steps": 8, "speed_steps": 10, @@ -102,7 +109,89 @@ "multisplash": true, "solid_splash": true, "solid_multisplash": true - } + }, + "layout": [ + {"x": 218, "y": 7, "flags": 2}, + {"x": 214, "y": 45, "flags": 2}, + {"x": 180, "y": 47, "flags": 2}, + {"x": 147, "y": 50, "flags": 2}, + {"x": 94, "y": 62, "flags": 2}, + {"x": 37, "y": 51, "flags": 2}, + {"x": 4, "y": 8, "flags": 2}, + {"x": 36, "y": 15, "flags": 2}, + {"x": 62, "y": 18, "flags": 2}, + {"x": 78, "y": 5, "flags": 2}, + {"x": 119, "y": 7, "flags": 2}, + {"x": 145, "y": 16, "flags": 2}, + {"x": 166, "y": 3, "flags": 2}, + {"x": 200, "y": 16, "flags": 2}, + {"matrix": [0, 7], "x": 185, "y": 11, "flags": 4}, + {"matrix": [2, 7], "x": 191, "y": 22, "flags": 4}, + {"matrix": [4, 7], "x": 188, "y": 33, "flags": 4}, + {"matrix": [6, 7], "x": 200, "y": 46, "flags": 4}, + {"matrix": [8, 7], "x": 200, "y": 57, "flags": 4}, + {"matrix": [9, 7], "x": 212, "y": 57, "flags": 4}, + {"matrix": [9, 6], "x": 188, "y": 57, "flags": 4}, + {"matrix": [7, 6], "x": 181, "y": 44, "flags": 4}, + {"matrix": [3, 6], "x": 176, "y": 22, "flags": 4}, + {"matrix": [1, 6], "x": 168, "y": 11, "flags": 4}, + {"matrix": [0, 6], "x": 155, "y": 11, "flags": 4}, + {"matrix": [2, 6], "x": 164, "y": 22, "flags": 4}, + {"matrix": [5, 6], "x": 169, "y": 32, "flags": 4}, + {"matrix": [6, 6], "x": 165, "y": 44, "flags": 4}, + {"matrix": [8, 6], "x": 172, "y": 55, "flags": 4}, + {"matrix": [9, 5], "x": 157, "y": 54, "flags": 4}, + {"matrix": [7, 5], "x": 153, "y": 44, "flags": 4}, + {"matrix": [4, 5], "x": 156, "y": 33, "flags": 4}, + {"matrix": [3, 5], "x": 153, "y": 22, "flags": 4}, + {"matrix": [1, 5], "x": 142, "y": 12, "flags": 4}, + {"matrix": [0, 5], "x": 130, "y": 13, "flags": 4}, + {"matrix": [2, 5], "x": 138, "y": 23, "flags": 4}, + {"matrix": [5, 5], "x": 143, "y": 33, "flags": 4}, + {"matrix": [6, 5], "x": 140, "y": 45, "flags": 4}, + {"matrix": [8, 5], "x": 137, "y": 56, "flags": 4}, + {"matrix": [7, 4], "x": 128, "y": 47, "flags": 4}, + {"matrix": [4, 4], "x": 132, "y": 35, "flags": 4}, + {"matrix": [3, 4], "x": 127, "y": 25, "flags": 4}, + {"matrix": [1, 4], "x": 119, "y": 16, "flags": 4}, + {"matrix": [0, 4], "x": 107, "y": 17, "flags": 4}, + {"matrix": [2, 4], "x": 115, "y": 27, "flags": 4}, + {"matrix": [5, 4], "x": 120, "y": 37, "flags": 4}, + {"matrix": [6, 4], "x": 116, "y": 48, "flags": 4}, + {"matrix": [9, 4], "x": 117, "y": 59, "flags": 4}, + {"matrix": [7, 3], "x": 104, "y": 51, "flags": 4}, + {"matrix": [4, 3], "x": 109, "y": 39, "flags": 4}, + {"matrix": [3, 3], "x": 104, "y": 29, "flags": 4}, + {"matrix": [1, 3], "x": 86, "y": 19, "flags": 4}, + {"matrix": [0, 3], "x": 74, "y": 16, "flags": 4}, + {"matrix": [2, 3], "x": 78, "y": 28, "flags": 4}, + {"matrix": [5, 3], "x": 79, "y": 39, "flags": 4}, + {"matrix": [6, 3], "x": 82, "y": 50, "flags": 4}, + {"matrix": [8, 2], "x": 73, "y": 60, "flags": 4}, + {"matrix": [7, 2], "x": 71, "y": 48, "flags": 4}, + {"matrix": [4, 2], "x": 67, "y": 37, "flags": 4}, + {"matrix": [3, 2], "x": 66, "y": 26, "flags": 4}, + {"matrix": [1, 2], "x": 63, "y": 15, "flags": 4}, + {"matrix": [0, 2], "x": 50, "y": 12, "flags": 4}, + {"matrix": [2, 2], "x": 55, "y": 24, "flags": 4}, + {"matrix": [5, 2], "x": 55, "y": 35, "flags": 4}, + {"matrix": [6, 2], "x": 59, "y": 47, "flags": 4}, + {"matrix": [9, 1], "x": 50, "y": 56, "flags": 4}, + {"matrix": [7, 1], "x": 47, "y": 45, "flags": 4}, + {"matrix": [4, 1], "x": 43, "y": 33, "flags": 4}, + {"matrix": [3, 1], "x": 43, "y": 22, "flags": 4}, + {"matrix": [1, 1], "x": 39, "y": 10, "flags": 4}, + {"matrix": [0, 1], "x": 25, "y": 11, "flags": 4}, + {"matrix": [2, 1], "x": 29, "y": 22, "flags": 4}, + {"matrix": [5, 1], "x": 30, "y": 33, "flags": 4}, + {"matrix": [6, 1], "x": 34, "y": 44, "flags": 4}, + {"matrix": [8, 1], "x": 24, "y": 54, "flags": 4}, + {"matrix": [9, 0], "x": 9, "y": 55, "flags": 4}, + {"matrix": [7, 0], "x": 15, "y": 44, "flags": 4}, + {"matrix": [4, 0], "x": 14, "y": 33, "flags": 4}, + {"matrix": [3, 0], "x": 14, "y": 22, "flags": 4}, + {"matrix": [1, 0], "x": 14, "y": 11, "flags": 4} + ] }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/basekeys/trifecta/trifecta.c b/keyboards/basekeys/trifecta/trifecta.c deleted file mode 100644 index 926180d9966..00000000000 --- a/keyboards/basekeys/trifecta/trifecta.c +++ /dev/null @@ -1,61 +0,0 @@ -/* Copyright 2020 Swiftrax and Basekeys.com - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "quantum.h" - -#ifdef RGB_MATRIX_ENABLE - -led_config_t g_led_config = { { - { NO_LED, 70, 61, 52, 43, 34, 24, 14 }, - { 79, 69, 60, 51, 42, 33, 23, NO_LED }, - { NO_LED, 71, 62, 53, 44, 35, 25, 15 }, - { 78, 68, 59, 50, 41, 32, 22, NO_LED }, - { 77, 67, 58, 49, 40, 31, NO_LED, 16 }, - { NO_LED, 72, 63, 54, 45, 36, 26, NO_LED }, - { NO_LED, 73, 64, 55, 46, 37, 27, 17 }, - { 76, 66, 57, 48, 39, 30, 21, NO_LED }, - { NO_LED, 74, 56, NO_LED, NO_LED, 38, 28, 18 }, - { 75, 65, NO_LED, NO_LED, 47, 29, 20, 19 } -}, { - // Underglow - { 218, 7 }, { 214, 45 }, { 180, 47 }, { 147, 50 }, { 94, 62 }, { 37, 51 }, { 4, 8 }, { 36, 15 }, - { 62, 18 }, { 78, 5 }, { 119, 7 }, { 145, 16 }, { 166, 3 }, { 200, 16 }, - - //Per Key - { 185, 11 }, { 191, 22 }, { 188, 33 }, { 200, 46 }, { 200, 57 }, { 212, 57 }, { 188, 57 }, { 181, 44 }, - { 176, 22 }, { 168, 11 }, { 155, 11 }, { 164, 22 }, { 169, 32 }, { 165, 44 }, { 172, 55 }, { 157, 54 }, - { 153, 44 }, { 156, 33 }, { 153, 22 }, { 142, 12 }, { 130, 13 }, { 138, 23 }, { 143, 33 }, { 140, 45 }, - { 137, 56 }, { 128, 47 }, { 132, 35 }, { 127, 25 }, { 119, 16 }, { 107, 17 }, { 115, 27 }, { 120, 37 }, - { 116, 48 }, { 117, 59 }, { 104, 51 }, { 109, 39 }, { 104, 29 }, { 86, 19 }, { 74, 16 }, { 78, 28 }, - { 79, 39 }, { 82, 50 }, { 73, 60 }, { 71, 48 }, { 67, 37 }, { 66, 26 }, { 63, 15 }, { 50, 12 }, - { 55, 24 }, { 55, 35 }, { 59, 47 }, { 50, 56 }, { 47, 45 }, { 43, 33 }, { 43, 22 }, { 39, 10 }, - { 25, 11 }, { 29, 22 }, { 30, 33 }, { 34, 44 }, { 24, 54 }, { 9, 55 }, { 15, 44 }, { 14, 33 }, - { 14, 22 }, { 14, 11 } -}, { - 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, - - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4 -} }; -#endif \ No newline at end of file diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h deleted file mode 100644 index ebf85963191..00000000000 --- a/keyboards/basketweave/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 null-ll - * - * 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 diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json index 705ef675ba8..75a720b7dd8 100644 --- a/keyboards/basketweave/info.json +++ b/keyboards/basketweave/info.json @@ -9,6 +9,12 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "encoder": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "B0", "B1", "B2", "D5", "D6", "C5", "C4", "C3", "C2", "C1"], "rows": ["A6", "C6", "C7", "A7", "A5"] @@ -20,7 +26,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "processor": "atmega32a", "bootloader": "usbasploader", diff --git a/keyboards/basketweave/rules.mk b/keyboards/basketweave/rules.mk index b43c5121f47..c2ee0bc86f9 100644 --- a/keyboards/basketweave/rules.mk +++ b/keyboards/basketweave/rules.mk @@ -1,16 +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 -ENCODER_ENABLE = yes diff --git a/keyboards/bastardkb/dilemma/4x6_4/config.h b/keyboards/bastardkb/dilemma/4x6_4/config.h index 549965444d4..7276c6181fa 100644 --- a/keyboards/bastardkb/dilemma/4x6_4/config.h +++ b/keyboards/bastardkb/dilemma/4x6_4/config.h @@ -42,6 +42,3 @@ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U - -/* RGB matrix support. */ -#define SPLIT_TRANSPORT_MIRROR \ No newline at end of file diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json index 6d1ae830ebe..dc9b6cf5848 100644 --- a/keyboards/bbrfkr/dynamis/info.json +++ b/keyboards/bbrfkr/dynamis/info.json @@ -8,6 +8,17 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "pointing_device": true, + "encoder": true + }, + "build": { + "lto": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"], "rows": ["B6", "B4", "D6", "D5", "D1", "C6", "B5", "D7", "D4", "D0"] diff --git a/keyboards/bbrfkr/dynamis/rules.mk b/keyboards/bbrfkr/dynamis/rules.mk index aef3d2a28a0..fab9162dc64 100644 --- a/keyboards/bbrfkr/dynamis/rules.mk +++ b/keyboards/bbrfkr/dynamis/rules.mk @@ -1,17 +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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = no -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pmw3360 -ENCODER_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/bear_face/config.h b/keyboards/bear_face/config.h deleted file mode 100644 index 81ada21b71e..00000000000 --- a/keyboards/bear_face/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 chemicalwill - -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/bear_face/info.json b/keyboards/bear_face/info.json index 24dd696e9b4..ad12468d56f 100644 --- a/keyboards/bear_face/info.json +++ b/keyboards/bear_face/info.json @@ -18,6 +18,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "C7", "C6", "F0", "E6", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["F5", "F6", "F4", "F1", "B0", "B6"] diff --git a/keyboards/beatervan/config.h b/keyboards/beatervan/config.h deleted file mode 100644 index f482b43c10b..00000000000 --- a/keyboards/beatervan/config.h +++ /dev/null @@ -1,22 +0,0 @@ - -/* Copyright 2020 OJtheTiny - * - * 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 diff --git a/keyboards/beatervan/keyboard.json b/keyboards/beatervan/keyboard.json index 4828127d14b..27d0f3e5352 100644 --- a/keyboards/beatervan/keyboard.json +++ b/keyboards/beatervan/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D1", "D0", "D4", "C6"] diff --git a/keyboards/bemeier/bmek/rev1/info.json b/keyboards/bemeier/bmek/rev1/keyboard.json similarity index 74% rename from keyboards/bemeier/bmek/rev1/info.json rename to keyboards/bemeier/bmek/rev1/keyboard.json index 70873aa5274..5f559009667 100644 --- a/keyboards/bemeier/bmek/rev1/info.json +++ b/keyboards/bemeier/bmek/rev1/keyboard.json @@ -2,6 +2,17 @@ "usb": { "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "sleep_led": true, + "nkro": true, + "rgblight": true + }, + "build": { + "lto": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/bemeier/bmek/rev1/rules.mk b/keyboards/bemeier/bmek/rev1/rules.mk deleted file mode 100755 index e9b89a01e1c..00000000000 --- a/keyboards/bemeier/bmek/rev1/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 -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = no -SLEEP_LED_ENABLE = yes -SPLIT_KEYBOARD = no -BACKLIGHT_ENABLE = no -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = yes -AUDIO_ENABLE = no -LTO_ENABLE = yes diff --git a/keyboards/bemeier/bmek/rev2/info.json b/keyboards/bemeier/bmek/rev2/keyboard.json similarity index 74% rename from keyboards/bemeier/bmek/rev2/info.json rename to keyboards/bemeier/bmek/rev2/keyboard.json index f1440afaf24..f9e264a2143 100644 --- a/keyboards/bemeier/bmek/rev2/info.json +++ b/keyboards/bemeier/bmek/rev2/keyboard.json @@ -2,6 +2,17 @@ "usb": { "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "sleep_led": true, + "nkro": true, + "rgblight": true + }, + "build": { + "lto": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/bemeier/bmek/rev2/rules.mk b/keyboards/bemeier/bmek/rev2/rules.mk deleted file mode 100755 index e9b89a01e1c..00000000000 --- a/keyboards/bemeier/bmek/rev2/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 -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = no -SLEEP_LED_ENABLE = yes -SPLIT_KEYBOARD = no -BACKLIGHT_ENABLE = no -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = yes -AUDIO_ENABLE = no -LTO_ENABLE = yes diff --git a/keyboards/bemeier/bmek/rev3/info.json b/keyboards/bemeier/bmek/rev3/keyboard.json similarity index 74% rename from keyboards/bemeier/bmek/rev3/info.json rename to keyboards/bemeier/bmek/rev3/keyboard.json index ac0faf87063..3d12f4ee4e1 100644 --- a/keyboards/bemeier/bmek/rev3/info.json +++ b/keyboards/bemeier/bmek/rev3/keyboard.json @@ -2,6 +2,17 @@ "usb": { "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "sleep_led": true, + "nkro": true, + "rgblight": true + }, + "build": { + "lto": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/bemeier/bmek/rev3/rules.mk b/keyboards/bemeier/bmek/rev3/rules.mk deleted file mode 100755 index e9b89a01e1c..00000000000 --- a/keyboards/bemeier/bmek/rev3/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 -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = no -SLEEP_LED_ENABLE = yes -SPLIT_KEYBOARD = no -BACKLIGHT_ENABLE = no -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = yes -AUDIO_ENABLE = no -LTO_ENABLE = yes diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h deleted file mode 100644 index 179b1172430..00000000000 --- a/keyboards/biacco42/ergo42/rev1/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert -Copyright 2017 Biacco42 - -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/biacco42/ergo42/rev1/info.json b/keyboards/biacco42/ergo42/rev1/keyboard.json similarity index 93% rename from keyboards/biacco42/ergo42/rev1/info.json rename to keyboards/biacco42/ergo42/rev1/keyboard.json index 67f27ad6129..b3a53bb3a4c 100644 --- a/keyboards/biacco42/ergo42/rev1/info.json +++ b/keyboards/biacco42/ergo42/rev1/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x0042", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "led_count": 12 }, @@ -20,6 +32,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/biacco42/ergo42/rev1/rules.mk b/keyboards/biacco42/ergo42/rev1/rules.mk deleted file mode 100644 index 7b30c0beff2..00000000000 --- a/keyboards/biacco42/ergo42/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no diff --git a/keyboards/biacco42/ergo42/rules.mk b/keyboards/biacco42/ergo42/rules.mk index 62044b6c13a..18059c0a3bc 100644 --- a/keyboards/biacco42/ergo42/rules.mk +++ b/keyboards/biacco42/ergo42/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 = 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 - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = biacco42/ergo42/rev1 diff --git a/keyboards/biacco42/meishi/config.h b/keyboards/biacco42/meishi/config.h deleted file mode 100644 index df5455b3c22..00000000000 --- a/keyboards/biacco42/meishi/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Biacco42 - -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/biacco42/meishi/keyboard.json b/keyboards/biacco42/meishi/keyboard.json index d9d37d72fe4..b7d751d83e0 100644 --- a/keyboards/biacco42/meishi/keyboard.json +++ b/keyboards/biacco42/meishi/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "B3", "B2", "B6"], "rows": ["B5"] diff --git a/keyboards/biacco42/meishi2/config.h b/keyboards/biacco42/meishi2/config.h deleted file mode 100644 index df5455b3c22..00000000000 --- a/keyboards/biacco42/meishi2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Biacco42 - -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/biacco42/meishi2/keyboard.json b/keyboards/biacco42/meishi2/keyboard.json index 3a392442f24..2f553681bc7 100644 --- a/keyboards/biacco42/meishi2/keyboard.json +++ b/keyboards/biacco42/meishi2/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6"], "rows": ["D7", "E6"] diff --git a/keyboards/binepad/bn003/config.h b/keyboards/binepad/bn003/config.h deleted file mode 100644 index 77f51ecf5a2..00000000000 --- a/keyboards/binepad/bn003/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 BINEPAD - * - * 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 diff --git a/keyboards/binepad/bn003/keyboard.json b/keyboards/binepad/bn003/keyboard.json index 695518828ec..440b5f65979 100644 --- a/keyboards/binepad/bn003/keyboard.json +++ b/keyboards/binepad/bn003/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "B5", "B6"], "rows": ["C6"] diff --git a/keyboards/binepad/bn009/r1/info.json b/keyboards/binepad/bn009/r1/keyboard.json similarity index 87% rename from keyboards/binepad/bn009/r1/info.json rename to keyboards/binepad/bn009/r1/keyboard.json index 4b6a49bb9d7..c5338c648d8 100644 --- a/keyboards/binepad/bn009/r1/info.json +++ b/keyboards/binepad/bn009/r1/keyboard.json @@ -1,5 +1,8 @@ { "keyboard_name": "BN009 R1", + "build": { + "lto": true + }, "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "matrix_pins": { diff --git a/keyboards/binepad/bn009/r1/rules.mk b/keyboards/binepad/bn009/r1/rules.mk deleted file mode 100644 index 10468472aa9..00000000000 --- a/keyboards/binepad/bn009/r1/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 2020 Binepad (@binpad) -# SPDX-License-Identifier: GPL-2.0-or-later - -LTO_ENABLE = yes diff --git a/keyboards/binepad/bnr1/rules.mk b/keyboards/binepad/bnr1/rules.mk index 9719de29b8e..ce85c574046 100755 --- a/keyboards/binepad/bnr1/rules.mk +++ b/keyboards/binepad/bnr1/rules.mk @@ -1,3 +1 @@ -# This file is mostly left blank - DEFAULT_FOLDER = binepad/bnr1/v2 diff --git a/keyboards/binepad/bnr1/v1/info.json b/keyboards/binepad/bnr1/v1/keyboard.json similarity index 89% rename from keyboards/binepad/bnr1/v1/info.json rename to keyboards/binepad/bnr1/v1/keyboard.json index e67ea81282b..ff3e633e191 100644 --- a/keyboards/binepad/bnr1/v1/info.json +++ b/keyboards/binepad/bnr1/v1/keyboard.json @@ -6,6 +6,9 @@ "pid": "0x4231", "device_version": "1.0.0" }, + "build": { + "lto": true + }, "matrix_pins": { "cols": ["B0"], "rows": ["E6"] diff --git a/keyboards/binepad/bnr1/v1/rules.mk b/keyboards/binepad/bnr1/v1/rules.mk deleted file mode 100644 index ac022b38ca8..00000000000 --- a/keyboards/binepad/bnr1/v1/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# This file is mostly left blank - -LTO_ENABLE = yes diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h index 976841be799..30ce798073d 100644 --- a/keyboards/bioi/g60/config.h +++ b/keyboards/bioi/g60/config.h @@ -17,11 +17,6 @@ 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 - /* key combination for magic key command */ #define KEYBOARD_LOCK_ENABLE #define MAGIC_KEY_LOCK L diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/info.json index a96d1acce57..8d3dd587707 100644 --- a/keyboards/bioi/g60/info.json +++ b/keyboards/bioi/g60/info.json @@ -8,6 +8,24 @@ "pid": "0x6080", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "backlight": true, + "rgblight": true, + "bluetooth": true + }, + "build": { + "lto": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"], "rows": ["E6", "B0", "F1", "F5", "F4"] diff --git a/keyboards/bioi/g60/rules.mk b/keyboards/bioi/g60/rules.mk index 3635daac6f3..c383c07affc 100644 --- a/keyboards/bioi/g60/rules.mk +++ b/keyboards/bioi/g60/rules.mk @@ -1,19 +1,5 @@ # 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 = yes # 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 -LTO_ENABLE = yes # Reduce firmware size -BLUETOOTH_ENABLE = yes - UART_DRIVER_REQUIRED = yes SRC += bluetooth_custom.c diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h index 0b4ce9a0907..8e0ef249fef 100644 --- a/keyboards/bioi/g60ble/config.h +++ b/keyboards/bioi/g60ble/config.h @@ -1,10 +1,5 @@ #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 - /* key combination for magic key command */ #define KEYBOARD_LOCK_ENABLE #define MAGIC_KEY_LOCK L diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json index 1699f7275e0..2d09fadff08 100644 --- a/keyboards/bioi/g60ble/info.json +++ b/keyboards/bioi/g60ble/info.json @@ -8,6 +8,24 @@ "pid": "0x6080", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "backlight": true, + "rgblight": true, + "bluetooth": true + }, + "build": { + "lto": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"], "rows": ["E6", "B0", "F1", "F5", "F4"] diff --git a/keyboards/bioi/g60ble/rules.mk b/keyboards/bioi/g60ble/rules.mk index 6bfcc62d7e0..c383c07affc 100644 --- a/keyboards/bioi/g60ble/rules.mk +++ b/keyboards/bioi/g60ble/rules.mk @@ -1,19 +1,5 @@ # 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 -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes -LTO_ENABLE = yes - -BLUETOOTH_ENABLE = yes - UART_DRIVER_REQUIRED = yes SRC += bluetooth_custom.c diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h index 2e78cc2a3e1..78f53856f79 100644 --- a/keyboards/bioi/morgan65/config.h +++ b/keyboards/bioi/morgan65/config.h @@ -17,11 +17,6 @@ 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 - /* key combination for magic key command */ #define KEYBOARD_LOCK_ENABLE #define MAGIC_KEY_LOCK L diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json index 6cf66b843ac..8f83237f82f 100644 --- a/keyboards/bioi/morgan65/info.json +++ b/keyboards/bioi/morgan65/info.json @@ -8,6 +8,24 @@ "pid": "0x6581", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "backlight": true, + "rgblight": true, + "bluetooth": true + }, + "build": { + "lto": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "C7", "B0", "B7", "B5", "D5", "B4", "D7", "D6", "D1", "D0", "B3"], "rows": ["E6", "C6", "F4", "B2", "D4"] diff --git a/keyboards/bioi/morgan65/rules.mk b/keyboards/bioi/morgan65/rules.mk index 3635daac6f3..c383c07affc 100644 --- a/keyboards/bioi/morgan65/rules.mk +++ b/keyboards/bioi/morgan65/rules.mk @@ -1,19 +1,5 @@ # 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 = yes # 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 -LTO_ENABLE = yes # Reduce firmware size -BLUETOOTH_ENABLE = yes - UART_DRIVER_REQUIRED = yes SRC += bluetooth_custom.c diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h index 8134bd96cfa..9f005f2d79f 100644 --- a/keyboards/bioi/s65/config.h +++ b/keyboards/bioi/s65/config.h @@ -17,11 +17,6 @@ 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 - /* key combination for magic key command */ #define KEYBOARD_LOCK_ENABLE #define MAGIC_KEY_LOCK L diff --git a/keyboards/bioi/s65/keyboard.json b/keyboards/bioi/s65/keyboard.json index b34cd9e602c..c55852f31cc 100644 --- a/keyboards/bioi/s65/keyboard.json +++ b/keyboards/bioi/s65/keyboard.json @@ -20,6 +20,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "B3", "F4", "F5", "F6", "E6", "C7", "B2", "B1", "C6", "B6", "B5", "B4", "D7", "D4", "D5"], "rows": ["D2", "D0", "D1", "F7", "D6"] diff --git a/keyboards/blackplum/config.h b/keyboards/blackplum/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/blackplum/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/blackplum/keyboard.json b/keyboards/blackplum/keyboard.json index d17bc378321..277e0eae622 100644 --- a/keyboards/blackplum/keyboard.json +++ b/keyboards/blackplum/keyboard.json @@ -39,6 +39,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "F7", "F6", "F5", "F4", "F1"], "rows": ["C6", "B6", "B4", "B5", "D6", "D7", "D5", "D3", "D4"] diff --git a/keyboards/blank/blank01/config.h b/keyboards/blank/blank01/config.h deleted file mode 100644 index aea945a035d..00000000000 --- a/keyboards/blank/blank01/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 gkeyboard - -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/blank/blank01/keyboard.json b/keyboards/blank/blank01/keyboard.json index 5dfa7e67ecc..f8af736bef8 100644 --- a/keyboards/blank/blank01/keyboard.json +++ b/keyboards/blank/blank01/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B5", "B4", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D0", "D1", "D2", "D3", "B3"] diff --git a/keyboards/blank_tehnologii/manibus/info.json b/keyboards/blank_tehnologii/manibus/keyboard.json similarity index 95% rename from keyboards/blank_tehnologii/manibus/info.json rename to keyboards/blank_tehnologii/manibus/keyboard.json index 7e783c45b5c..f6cd41758db 100644 --- a/keyboards/blank_tehnologii/manibus/info.json +++ b/keyboards/blank_tehnologii/manibus/keyboard.json @@ -9,12 +9,21 @@ "pid": "0x4D4E", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "B4", "B5", "B6", "F0", "D4", "D6"], "rows": ["F4", "F5", "F6", "D3", "C6"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { diff --git a/keyboards/blank_tehnologii/manibus/rules.mk b/keyboards/blank_tehnologii/manibus/rules.mk deleted file mode 100644 index 1321ae0d173..00000000000 --- a/keyboards/blank_tehnologii/manibus/rules.mk +++ /dev/null @@ -1,14 +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 -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 - -SPLIT_KEYBOARD = yes diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h deleted file mode 100644 index a93b381c85b..00000000000 --- a/keyboards/blockey/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Eucalyn - -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/blockey/keyboard.json b/keyboards/blockey/keyboard.json index 0c150420dc9..9710606a522 100644 --- a/keyboards/blockey/keyboard.json +++ b/keyboards/blockey/keyboard.json @@ -36,6 +36,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "B4", "C6", "D7", "F4", "F5", "F7"], "rows": ["D3", "D1", "D4", "E6", "B5", "D2", "F6", "B3", "B2", "B6"] diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/keyboard.json similarity index 95% rename from keyboards/bluebell/swoop/info.json rename to keyboards/bluebell/swoop/keyboard.json index 52c859c1540..5cc29818b86 100644 --- a/keyboards/bluebell/swoop/info.json +++ b/keyboards/bluebell/swoop/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x3046", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "ws2812": { "pin": "D3" }, @@ -35,6 +41,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/bluebell/swoop/rules.mk b/keyboards/bluebell/swoop/rules.mk deleted file mode 100644 index fc87c614046..00000000000 --- a/keyboards/bluebell/swoop/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -RGBLIGHT_ENABLE = yes # Enable underlight -SPLIT_KEYBOARD = yes diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h deleted file mode 100644 index 1b4e5a6d87e..00000000000 --- a/keyboards/boardrun/bizarre/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -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/boardrun/bizarre/keyboard.json b/keyboards/boardrun/bizarre/keyboard.json index 6901f93625d..f61f3b053f1 100644 --- a/keyboards/boardrun/bizarre/keyboard.json +++ b/keyboards/boardrun/bizarre/keyboard.json @@ -39,6 +39,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h deleted file mode 100644 index 1b4e5a6d87e..00000000000 --- a/keyboards/boardrun/classic/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -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/boardrun/classic/keyboard.json b/keyboards/boardrun/classic/keyboard.json index cd83ef58f06..4831131f18f 100644 --- a/keyboards/boardrun/classic/keyboard.json +++ b/keyboards/boardrun/classic/keyboard.json @@ -39,6 +39,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/boardsource/equals/48/info.json b/keyboards/boardsource/equals/48/info.json index 054779f6fe1..5b633559313 100644 --- a/keyboards/boardsource/equals/48/info.json +++ b/keyboards/boardsource/equals/48/info.json @@ -3,7 +3,8 @@ "bootloader": "rp2040", "processor": "RP2040", "features": { - "audio":true + "audio":true, + "quantum_painter": true }, "matrix_pins": { "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"], diff --git a/keyboards/boardsource/equals/48/rules.mk b/keyboards/boardsource/equals/48/rules.mk index 4192b0c2e54..2f75fc139fc 100644 --- a/keyboards/boardsource/equals/48/rules.mk +++ b/keyboards/boardsource/equals/48/rules.mk @@ -1,3 +1,2 @@ AUDIO_DRIVER = pwm_hardware -QUANTUM_PAINTER_ENABLE = yes QUANTUM_PAINTER_DRIVERS += st7735_spi diff --git a/keyboards/boardsource/equals/60/info.json b/keyboards/boardsource/equals/60/info.json index da3fc3691a6..3bc1f49be38 100644 --- a/keyboards/boardsource/equals/60/info.json +++ b/keyboards/boardsource/equals/60/info.json @@ -3,7 +3,8 @@ "bootloader": "rp2040", "processor": "RP2040", "features": { - "audio":true + "audio":true, + "quantum_painter": true }, "matrix_pins": { "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"], diff --git a/keyboards/boardsource/equals/60/rules.mk b/keyboards/boardsource/equals/60/rules.mk index 4192b0c2e54..2f75fc139fc 100644 --- a/keyboards/boardsource/equals/60/rules.mk +++ b/keyboards/boardsource/equals/60/rules.mk @@ -1,3 +1,2 @@ AUDIO_DRIVER = pwm_hardware -QUANTUM_PAINTER_ENABLE = yes QUANTUM_PAINTER_DRIVERS += st7735_spi diff --git a/keyboards/boardwalk/config.h b/keyboards/boardwalk/config.h deleted file mode 100644 index 1b4e5a6d87e..00000000000 --- a/keyboards/boardwalk/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -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/boardwalk/keyboard.json b/keyboards/boardwalk/keyboard.json index 8c4ad37eb09..6fb7673ec8a 100644 --- a/keyboards/boardwalk/keyboard.json +++ b/keyboards/boardwalk/keyboard.json @@ -39,6 +39,12 @@ "rgblight": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/bop/config.h b/keyboards/bop/config.h index 7d7310ec0ec..e80e4994396 100644 --- a/keyboards/bop/config.h +++ b/keyboards/bop/config.h @@ -16,11 +16,5 @@ #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 - /* Unicode select mode */ #define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE diff --git a/keyboards/bop/keyboard.json b/keyboards/bop/keyboard.json index 81bbbf33f08..6a88bb46177 100644 --- a/keyboards/bop/keyboard.json +++ b/keyboards/bop/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "C5", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "E7", "E6", "F0", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "C6"], "rows": ["B7", "D0", "D1", "D2", "D3", "D4"] diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h index 483c57940c3..aad033d221d 100644 --- a/keyboards/boston/config.h +++ b/keyboards/boston/config.h @@ -20,11 +20,6 @@ #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 RGBLIGHT_LAYERS //The 3D-printed version of Boston uses APA106 LEDs, which are reversed diff --git a/keyboards/boston/keyboard.json b/keyboards/boston/keyboard.json index 1960df6d45f..050076c7a69 100644 --- a/keyboards/boston/keyboard.json +++ b/keyboards/boston/keyboard.json @@ -30,7 +30,11 @@ ] }, "qmk": { - "tap_keycode_delay": 15 + "tap_keycode_delay": 15, + "locking": { + "enabled": true, + "resync": true + } }, "backlight": { "pin": "A6", diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json index 981d4de7c8d..5ced95c018b 100644 --- a/keyboards/boston_meetup/2019/info.json +++ b/keyboards/boston_meetup/2019/info.json @@ -2,6 +2,15 @@ "usb": { "device_version": "20.1.9" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "audio": true, + "haptic": true, + "oled": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk index f5ef6ba5a26..dea510c2ab3 100644 --- a/keyboards/boston_meetup/2019/rules.mk +++ b/keyboards/boston_meetup/2019/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = no -RGB_MATRIX_ENABLE = no -HAPTIC_ENABLE = yes HAPTIC_DRIVER = drv2605l -OLED_ENABLE = yes diff --git a/keyboards/box75/config.h b/keyboards/box75/config.h deleted file mode 100644 index f608132b5af..00000000000 --- a/keyboards/box75/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/box75/keyboard.json b/keyboards/box75/keyboard.json index 8932f81ae72..89afff17161 100644 --- a/keyboards/box75/keyboard.json +++ b/keyboards/box75/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14", "B13", "A15"], "rows": ["A10", "A9", "B12", "A2", "A1", "A0"] diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/bpiphany/four_banger/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/bpiphany/four_banger/keyboard.json b/keyboards/bpiphany/four_banger/keyboard.json index 24620506849..a368fbfe61b 100644 --- a/keyboards/bpiphany/four_banger/keyboard.json +++ b/keyboards/bpiphany/four_banger/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B4"], "rows": ["B2", "B6"] diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h index 8a895c3e50b..37c868b47f3 100644 --- a/keyboards/bpiphany/frosty_flake/config.h +++ b/keyboards/bpiphany/frosty_flake/config.h @@ -38,11 +38,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS { B0, B3, B2, B1, B6, B4, B5, C7 } #define MATRIX_ROW_PINS { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } -/* 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. diff --git a/keyboards/bpiphany/frosty_flake/info.json b/keyboards/bpiphany/frosty_flake/info.json index 95fbd477eb5..33a2f792d97 100644 --- a/keyboards/bpiphany/frosty_flake/info.json +++ b/keyboards/bpiphany/frosty_flake/info.json @@ -8,6 +8,12 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "dynamic_keymap": { diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/info.json index 49b6e103092..85f6f0fa8e8 100644 --- a/keyboards/bpiphany/ghost_squid/info.json +++ b/keyboards/bpiphany/ghost_squid/info.json @@ -8,6 +8,11 @@ "pid": "0x6050", "device_version": "1.0.4" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "indicators": { "caps_lock": "C6", "num_lock": "C5", diff --git a/keyboards/bpiphany/ghost_squid/rules.mk b/keyboards/bpiphany/ghost_squid/rules.mk index 2f6a5a7346e..30ce5d293b7 100644 --- a/keyboards/bpiphany/ghost_squid/rules.mk +++ b/keyboards/bpiphany/ghost_squid/rules.mk @@ -1,14 +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 = 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 SRC += matrix.c diff --git a/keyboards/bpiphany/hid_liber/config.h b/keyboards/bpiphany/hid_liber/config.h index 2e41e1f7005..8ba4e7c73b5 100755 --- a/keyboards/bpiphany/hid_liber/config.h +++ b/keyboards/bpiphany/hid_liber/config.h @@ -24,11 +24,6 @@ // HID Liberation Device uses custom matrix code to accomodate a 74HC238 3 to 8 decoder on pins B1, B2 and B3. -/* 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. diff --git a/keyboards/bpiphany/hid_liber/info.json b/keyboards/bpiphany/hid_liber/info.json index 82fd77781a0..67c8416849f 100644 --- a/keyboards/bpiphany/hid_liber/info.json +++ b/keyboards/bpiphany/hid_liber/info.json @@ -8,6 +8,20 @@ "pid": "0xB919", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "B5", "scroll_lock": "B6", diff --git a/keyboards/bpiphany/hid_liber/rules.mk b/keyboards/bpiphany/hid_liber/rules.mk index fc98be5c123..1b9ebdb1312 100755 --- a/keyboards/bpiphany/hid_liber/rules.mk +++ b/keyboards/bpiphany/hid_liber/rules.mk @@ -1,16 +1,4 @@ -# 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 CUSTOM_MATRIX = yes # Custom matrix file -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -AUDIO_ENABLE = no # Audio output # Project specific files SRC = matrix.c diff --git a/keyboards/bpiphany/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h index 0d23223dc93..3b934626f3a 100644 --- a/keyboards/bpiphany/kitten_paw/config.h +++ b/keyboards/bpiphany/kitten_paw/config.h @@ -22,11 +22,6 @@ along with this program. If not, see . #define MATRIX_ROWS 8 #define MATRIX_COLS 18 -/* 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. diff --git a/keyboards/bpiphany/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/info.json index 64a38a6e566..829129d4063 100644 --- a/keyboards/bpiphany/kitten_paw/info.json +++ b/keyboards/bpiphany/kitten_paw/info.json @@ -8,6 +8,19 @@ "pid": "0x6050", "device_version": "1.0.4" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "C6", "num_lock": "B7", diff --git a/keyboards/bpiphany/kitten_paw/rules.mk b/keyboards/bpiphany/kitten_paw/rules.mk index 43ebddd3574..8784813b335 100644 --- a/keyboards/bpiphany/kitten_paw/rules.mk +++ b/keyboards/bpiphany/kitten_paw/rules.mk @@ -1,14 +1,2 @@ -# 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 - CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/bpiphany/tiger_lily/config.h b/keyboards/bpiphany/tiger_lily/config.h index cb63e867fc7..c6817a89448 100644 --- a/keyboards/bpiphany/tiger_lily/config.h +++ b/keyboards/bpiphany/tiger_lily/config.h @@ -38,11 +38,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { C2, B3, B4, B2, B1, C7, B6, B5 } #define MATRIX_COL_PINS { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } -/* 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. diff --git a/keyboards/bpiphany/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/info.json index 659c6f3267a..118f89f39d0 100644 --- a/keyboards/bpiphany/tiger_lily/info.json +++ b/keyboards/bpiphany/tiger_lily/info.json @@ -8,6 +8,19 @@ "pid": "0x544C", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "C6", "num_lock": "C5", diff --git a/keyboards/bpiphany/tiger_lily/rules.mk b/keyboards/bpiphany/tiger_lily/rules.mk index 43ebddd3574..8784813b335 100644 --- a/keyboards/bpiphany/tiger_lily/rules.mk +++ b/keyboards/bpiphany/tiger_lily/rules.mk @@ -1,14 +1,2 @@ -# 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 - CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/bpiphany/unloved_bastard/config.h b/keyboards/bpiphany/unloved_bastard/config.h index af212673576..55322288ace 100644 --- a/keyboards/bpiphany/unloved_bastard/config.h +++ b/keyboards/bpiphany/unloved_bastard/config.h @@ -22,11 +22,6 @@ along with this program. If not, see . #define MATRIX_ROWS 8 #define MATRIX_COLS 18 -/* 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. diff --git a/keyboards/bpiphany/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/info.json index 4ca48fee995..4748057175e 100644 --- a/keyboards/bpiphany/unloved_bastard/info.json +++ b/keyboards/bpiphany/unloved_bastard/info.json @@ -7,6 +7,20 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "sleep_led": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "C5", "num_lock": "B7", diff --git a/keyboards/bpiphany/unloved_bastard/rules.mk b/keyboards/bpiphany/unloved_bastard/rules.mk index 7a32c860327..8784813b335 100644 --- a/keyboards/bpiphany/unloved_bastard/rules.mk +++ b/keyboards/bpiphany/unloved_bastard/rules.mk @@ -1,15 +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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -SLEEP_LED_ENABLE = yes - CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h index b49e0a11cd5..d7ce751a649 100644 --- a/keyboards/bt66tech/bt66tech60/config.h +++ b/keyboards/bt66tech/bt66tech60/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 5 /* diff --git a/keyboards/bt66tech/bt66tech60/keyboard.json b/keyboards/bt66tech/bt66tech60/keyboard.json index f89440f6955..26e4964d458 100644 --- a/keyboards/bt66tech/bt66tech60/keyboard.json +++ b/keyboards/bt66tech/bt66tech60/keyboard.json @@ -20,6 +20,12 @@ "rgblight": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12"], "rows": ["B10", "B1", "B0", "A7", "A6"] diff --git a/keyboards/bubble75/hotswap/config.h b/keyboards/bubble75/hotswap/config.h deleted file mode 100644 index de1b75d0d66..00000000000 --- a/keyboards/bubble75/hotswap/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2022 Velocifire - * - * 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 diff --git a/keyboards/bubble75/hotswap/hotswap.c b/keyboards/bubble75/hotswap/hotswap.c index 30c908a79f0..fc10b0fc8ca 100644 --- a/keyboards/bubble75/hotswap/hotswap.c +++ b/keyboards/bubble75/hotswap/hotswap.c @@ -17,34 +17,6 @@ #include "quantum.h" #ifdef RGB_MATRIX_ENABLE -led_config_t g_led_config = { - { - /* Key Matrix to LED Index */ - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, NO_LED, 13 }, - { 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, - { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43 }, - { 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, NO_LED, 44 }, - { 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, NO_LED, 70, 71 }, - { 80, 79, 78, NO_LED, NO_LED, 77, NO_LED, NO_LED, 76, 75, NO_LED, 74, NO_LED, 73, 72 } - }, { - /* LED Index to Physical Position */ - // Switch LEDs - {0,0}, {23,0}, {38,0}, {54,0}, {69,0}, {75,0}, {90,0}, {105,0}, {120,0}, {143,0}, {158,0}, {173,0}, {188,0}, {225,0}, - {225,18}, {203,18}, {180,18}, {165,18}, {150,18}, {135,18}, {120,18}, {105,18}, {90,18}, {75,18}, {60,18}, {45,18}, {30,18}, {15,18}, {0,18}, - {4,30}, {19,30}, {34,30}, {49,30}, {64,30}, {79,30}, {84,30}, {99,30}, {114,30}, {129,30}, {144,30}, {159,30}, {174,30}, {219,30}, {225,30}, - {225,41}, {201,41}, {191,41}, {161,41}, {146,41}, {131,41}, {116,41}, {101,41}, {86,41}, {71,41}, {56,41}, {41,41}, {26,41}, {6,41}, - {13,52}, {34,52}, {49,52}, {64,52}, {79,52}, {94,52}, {109,52}, {124,52}, {139,52}, {154,52}, {169,52}, {189,52}, {210,52}, {225,52}, - {225,64}, {210,64}, {195,64}, {186,64}, {167,64}, {94,64}, {39,64}, {21,64}, {2,64}, - }, { - 4,4,4,4,4,4,4,4,4,4,4,4, 4,4, - 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, - 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, - 4,4,4,4,4,4,4,4,4,4,4,4,4, 4, - 4,4,4,4,4,4,4,4,4,4,4,4, 4,4, - 4,4,4, 4, 4,4, 4, 4,4, - } -}; - bool rgb_matrix_indicators_kb(void) { if (!rgb_matrix_indicators_user()) { return false; @@ -54,6 +26,4 @@ bool rgb_matrix_indicators_kb(void) { } return true; } - - #endif diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/keyboard.json similarity index 58% rename from keyboards/bubble75/hotswap/info.json rename to keyboards/bubble75/hotswap/keyboard.json index 99cfc4064e0..011ce33ec40 100644 --- a/keyboards/bubble75/hotswap/info.json +++ b/keyboards/bubble75/hotswap/keyboard.json @@ -7,7 +7,21 @@ "vid": "0x4242", "pid": "0x5A4C", "device_version": "0.0.1", - "force_nkro": true + "force_nkro": true, + "no_startup_check": true + }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } }, "ws2812": { "pin": "B7" @@ -42,7 +56,90 @@ "solid_multisplash": true }, "driver": "ws2812", - "max_brightness": 180 + "max_brightness": 180, + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 23, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 38, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 54, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 69, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 143, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 158, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 173, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 188, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 225, "y": 0, "flags": 4}, + {"matrix": [1, 14], "x": 225, "y": 18, "flags": 4}, + {"matrix": [1, 13], "x": 203, "y": 18, "flags": 4}, + {"matrix": [1, 12], "x": 180, "y": 18, "flags": 4}, + {"matrix": [1, 11], "x": 165, "y": 18, "flags": 4}, + {"matrix": [1, 10], "x": 150, "y": 18, "flags": 4}, + {"matrix": [1, 9], "x": 135, "y": 18, "flags": 4}, + {"matrix": [1, 8], "x": 120, "y": 18, "flags": 4}, + {"matrix": [1, 7], "x": 105, "y": 18, "flags": 4}, + {"matrix": [1, 6], "x": 90, "y": 18, "flags": 4}, + {"matrix": [1, 5], "x": 75, "y": 18, "flags": 4}, + {"matrix": [1, 4], "x": 60, "y": 18, "flags": 4}, + {"matrix": [1, 3], "x": 45, "y": 18, "flags": 4}, + {"matrix": [1, 2], "x": 30, "y": 18, "flags": 4}, + {"matrix": [1, 1], "x": 15, "y": 18, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 18, "flags": 4}, + {"matrix": [2, 0], "x": 4, "y": 30, "flags": 4}, + {"matrix": [2, 1], "x": 19, "y": 30, "flags": 4}, + {"matrix": [2, 2], "x": 34, "y": 30, "flags": 4}, + {"matrix": [2, 3], "x": 49, "y": 30, "flags": 4}, + {"matrix": [2, 4], "x": 64, "y": 30, "flags": 4}, + {"matrix": [2, 5], "x": 79, "y": 30, "flags": 4}, + {"matrix": [2, 6], "x": 84, "y": 30, "flags": 4}, + {"matrix": [2, 7], "x": 99, "y": 30, "flags": 4}, + {"matrix": [2, 8], "x": 114, "y": 30, "flags": 4}, + {"matrix": [2, 9], "x": 129, "y": 30, "flags": 4}, + {"matrix": [2, 10], "x": 144, "y": 30, "flags": 4}, + {"matrix": [2, 11], "x": 159, "y": 30, "flags": 4}, + {"matrix": [2, 12], "x": 174, "y": 30, "flags": 4}, + {"matrix": [2, 13], "x": 219, "y": 30, "flags": 4}, + {"matrix": [2, 14], "x": 225, "y": 30, "flags": 4}, + {"matrix": [3, 14], "x": 225, "y": 41, "flags": 4}, + {"matrix": [3, 12], "x": 201, "y": 41, "flags": 4}, + {"matrix": [3, 11], "x": 191, "y": 41, "flags": 4}, + {"matrix": [3, 10], "x": 161, "y": 41, "flags": 4}, + {"matrix": [3, 9], "x": 146, "y": 41, "flags": 4}, + {"matrix": [3, 8], "x": 131, "y": 41, "flags": 4}, + {"matrix": [3, 7], "x": 116, "y": 41, "flags": 4}, + {"matrix": [3, 6], "x": 101, "y": 41, "flags": 4}, + {"matrix": [3, 5], "x": 86, "y": 41, "flags": 4}, + {"matrix": [3, 4], "x": 71, "y": 41, "flags": 4}, + {"matrix": [3, 3], "x": 56, "y": 41, "flags": 4}, + {"matrix": [3, 2], "x": 41, "y": 41, "flags": 4}, + {"matrix": [3, 1], "x": 26, "y": 41, "flags": 4}, + {"matrix": [3, 0], "x": 6, "y": 41, "flags": 4}, + {"matrix": [4, 0], "x": 13, "y": 52, "flags": 4}, + {"matrix": [4, 1], "x": 34, "y": 52, "flags": 4}, + {"matrix": [4, 2], "x": 49, "y": 52, "flags": 4}, + {"matrix": [4, 3], "x": 64, "y": 52, "flags": 4}, + {"matrix": [4, 4], "x": 79, "y": 52, "flags": 4}, + {"matrix": [4, 5], "x": 94, "y": 52, "flags": 4}, + {"matrix": [4, 6], "x": 109, "y": 52, "flags": 4}, + {"matrix": [4, 7], "x": 124, "y": 52, "flags": 4}, + {"matrix": [4, 8], "x": 139, "y": 52, "flags": 4}, + {"matrix": [4, 9], "x": 154, "y": 52, "flags": 4}, + {"matrix": [4, 10], "x": 169, "y": 52, "flags": 4}, + {"matrix": [4, 11], "x": 189, "y": 52, "flags": 4}, + {"matrix": [4, 13], "x": 210, "y": 52, "flags": 4}, + {"matrix": [4, 14], "x": 225, "y": 52, "flags": 4}, + {"matrix": [5, 14], "x": 225, "y": 64, "flags": 4}, + {"matrix": [5, 13], "x": 210, "y": 64, "flags": 4}, + {"matrix": [5, 11], "x": 195, "y": 64, "flags": 4}, + {"matrix": [5, 9], "x": 186, "y": 64, "flags": 4}, + {"matrix": [5, 8], "x": 167, "y": 64, "flags": 4}, + {"matrix": [5, 5], "x": 94, "y": 64, "flags": 4}, + {"matrix": [5, 2], "x": 39, "y": 64, "flags": 4}, + {"matrix": [5, 1], "x": 21, "y": 64, "flags": 4}, + {"matrix": [5, 0], "x": 2, "y": 64, "flags": 4} + ] }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "E6", "F0", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6"], diff --git a/keyboards/bubble75/hotswap/rules.mk b/keyboards/bubble75/hotswap/rules.mk deleted file mode 100644 index c11ab0df94c..00000000000 --- a/keyboards/bubble75/hotswap/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 -AUDIO_ENABLE = no # Audio output - -RGB_MATRIX_ENABLE = yes -NO_USB_STARTUP_CHECK = yes \ No newline at end of file diff --git a/keyboards/budgy/info.json b/keyboards/budgy/info.json index 5903daa68d0..645336e8ad9 100644 --- a/keyboards/budgy/info.json +++ b/keyboards/budgy/info.json @@ -27,6 +27,7 @@ ] }, "split": { + "enabled": true, "matrix_pins": { "right": { "direct": [ diff --git a/keyboards/budgy/rules.mk b/keyboards/budgy/rules.mk index 95546c6ef58..161ec22b16e 100644 --- a/keyboards/budgy/rules.mk +++ b/keyboards/budgy/rules.mk @@ -1,2 +1 @@ -SPLIT_KEYBOARD = yes SERIAL_DRIVER = vendor diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h deleted file mode 100644 index 5b25baa8c4b..00000000000 --- a/keyboards/buildakb/potato65/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Maelkk - -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/buildakb/potato65/keyboard.json b/keyboards/buildakb/potato65/keyboard.json index 1aeba49bde2..db203531424 100644 --- a/keyboards/buildakb/potato65/keyboard.json +++ b/keyboards/buildakb/potato65/keyboard.json @@ -39,6 +39,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h deleted file mode 100644 index d60fc7af019..00000000000 --- a/keyboards/buildakb/potato65hs/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Maelkk - -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 diff --git a/keyboards/buildakb/potato65hs/keyboard.json b/keyboards/buildakb/potato65hs/keyboard.json index 61ecd61a150..9e5edd6adb4 100644 --- a/keyboards/buildakb/potato65hs/keyboard.json +++ b/keyboards/buildakb/potato65hs/keyboard.json @@ -39,6 +39,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"], "rows": ["F5", "F4", "F6", "F0", "D2"] diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h deleted file mode 100644 index d60fc7af019..00000000000 --- a/keyboards/buildakb/potato65s/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Maelkk - -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 diff --git a/keyboards/buildakb/potato65s/keyboard.json b/keyboards/buildakb/potato65s/keyboard.json index 915f9674268..8dd9b6cc53c 100644 --- a/keyboards/buildakb/potato65s/keyboard.json +++ b/keyboards/buildakb/potato65s/keyboard.json @@ -39,6 +39,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"], "rows": ["F5", "F4", "F6", "F0", "D2"] diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h index 36313a1c6a2..a040e92dfd5 100644 --- a/keyboards/buzzard/rev1/config.h +++ b/keyboards/buzzard/rev1/config.h @@ -3,11 +3,6 @@ #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 - #ifdef OLED_ENABLE #define OLED_DISPLAY_128X32 #endif diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json index 0e7d246ae37..dd17a82754b 100644 --- a/keyboards/buzzard/rev1/info.json +++ b/keyboards/buzzard/rev1/info.json @@ -8,12 +8,28 @@ "pid": "0xB077", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "ps2": true + }, + "build": { + "lto": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "B3", "B2", "B6", "B5", "B4"], "rows": ["F4", "F5", "F6", "F7"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2", "transport": { "sync": { diff --git a/keyboards/buzzard/rev1/rules.mk b/keyboards/buzzard/rev1/rules.mk index 2beb545ece1..848877e3751 100644 --- a/keyboards/buzzard/rev1/rules.mk +++ b/keyboards/buzzard/rev1/rules.mk @@ -1,2 +1 @@ -PS2_ENABLE = yes PS2_DRIVER = interrupt diff --git a/keyboards/buzzard/rules.mk b/keyboards/buzzard/rules.mk index c0b4e9943d2..2f66720b774 100644 --- a/keyboards/buzzard/rules.mk +++ b/keyboards/buzzard/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 = 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 -SPLIT_KEYBOARD = yes -LTO_ENABLE = yes - DEFAULT_FOLDER = buzzard/rev1 From 8caa8674d225c1c26403f8c311be6ffbdd9081e1 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Fri, 12 Apr 2024 04:22:15 +0100 Subject: [PATCH 128/333] Move `SPLIT_KEYBOARD` to data driven (#21410) --- keyboards/bastardkb/charybdis/3x5/blackpill/info.json | 3 +++ keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json | 1 + keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk | 4 ---- keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json | 1 + keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk | 4 ---- keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json | 1 + keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json | 1 + keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json | 1 + keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/blackpill/info.json | 3 +++ keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json | 1 + keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json | 1 + keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json | 1 + keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json | 1 + keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json | 1 + keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/blackpill/info.json | 3 +++ keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json | 1 + keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk | 4 ---- keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json | 1 + keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk | 4 ---- keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json | 1 + keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json | 1 + keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json | 1 + keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/dilemma/3x5_2/assembled/info.json | 1 + keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk | 2 -- keyboards/bastardkb/dilemma/3x5_2/splinky/info.json | 1 + keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk | 2 -- keyboards/bastardkb/scylla/blackpill/info.json | 3 +++ keyboards/bastardkb/scylla/blackpill/rules.mk | 2 -- keyboards/bastardkb/scylla/v1/elitec/info.json | 1 + keyboards/bastardkb/scylla/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/scylla/v2/elitec/info.json | 1 + keyboards/bastardkb/scylla/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/scylla/v2/splinky_2/info.json | 1 + keyboards/bastardkb/scylla/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/scylla/v2/splinky_3/info.json | 1 + keyboards/bastardkb/scylla/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/scylla/v2/stemcell/info.json | 1 + keyboards/bastardkb/scylla/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/skeletyl/blackpill/info.json | 3 +++ keyboards/bastardkb/skeletyl/blackpill/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v1/elitec/info.json | 1 + keyboards/bastardkb/skeletyl/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v2/elitec/info.json | 1 + keyboards/bastardkb/skeletyl/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v2/splinky_2/info.json | 1 + keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v2/splinky_3/info.json | 1 + keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v2/stemcell/info.json | 1 + keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/tbk/info.json | 1 + keyboards/bastardkb/tbk/rules.mk | 1 - keyboards/bastardkb/tbkmini/blackpill/info.json | 3 +++ keyboards/bastardkb/tbkmini/blackpill/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v1/elitec/info.json | 1 + keyboards/bastardkb/tbkmini/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v2/elitec/info.json | 1 + keyboards/bastardkb/tbkmini/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v2/splinky_2/info.json | 1 + keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v2/splinky_3/info.json | 1 + keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v2/stemcell/info.json | 1 + keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk | 2 -- keyboards/biacco42/ergo42/info.json | 5 +++++ keyboards/buzzard/info.json | 5 +++++ keyboards/cantor/info.json | 1 + keyboards/cantor/rules.mk | 1 - keyboards/dailycraft/claw44/rev1/info.json | 1 + keyboards/dailycraft/claw44/rev1/rules.mk | 1 - keyboards/dailycraft/sandbox/rev2/info.json | 1 + keyboards/dailycraft/sandbox/rev2/rules.mk | 2 +- keyboards/dailycraft/wings42/info.json | 5 +++++ keyboards/dailycraft/wings42/rules.mk | 2 -- keyboards/deltasplit75/info.json | 5 +++++ keyboards/deltasplit75/rules.mk | 2 -- keyboards/dm9records/ergoinu/info.json | 1 + keyboards/dm9records/ergoinu/rules.mk | 2 -- keyboards/doppelganger/info.json | 1 + keyboards/doppelganger/rules.mk | 1 - keyboards/draculad/info.json | 1 + keyboards/draculad/rules.mk | 1 - keyboards/dumbo/info.json | 1 + keyboards/dumbo/rules.mk | 1 - keyboards/elephant42/info.json | 1 + keyboards/elephant42/rules.mk | 1 - keyboards/ergoslab/info.json | 5 +++++ keyboards/ergoslab/rules.mk | 2 -- keyboards/ergotravel/info.json | 5 +++++ keyboards/ergotravel/rules.mk | 2 -- keyboards/fluorite/info.json | 1 + keyboards/fluorite/rules.mk | 2 -- keyboards/flxlb/zplit/info.json | 1 + keyboards/flxlb/zplit/rules.mk | 1 - keyboards/fortitude60/info.json | 5 +++++ keyboards/fortitude60/rules.mk | 2 -- keyboards/fungo/rev1/info.json | 1 + keyboards/fungo/rev1/rules.mk | 2 -- keyboards/gummykey/info.json | 3 +++ keyboards/gummykey/rules.mk | 1 - keyboards/halfcliff/info.json | 1 + keyboards/halfcliff/rules.mk | 1 - keyboards/handwired/10k/info.json | 3 +++ keyboards/handwired/10k/rules.mk | 1 - keyboards/handwired/brain/info.json | 1 + keyboards/handwired/brain/rules.mk | 2 -- keyboards/handwired/chiron/info.json | 1 + keyboards/handwired/chiron/rules.mk | 1 - keyboards/handwired/dactyl_manuform/4x5/info.json | 1 + keyboards/handwired/dactyl_manuform/4x5/rules.mk | 1 - keyboards/handwired/dactyl_manuform/4x5_5/info.json | 1 + keyboards/handwired/dactyl_manuform/4x5_5/rules.mk | 1 - keyboards/handwired/dactyl_manuform/4x6/info.json | 1 + keyboards/handwired/dactyl_manuform/4x6/rules.mk | 1 - keyboards/handwired/dactyl_manuform/4x6_5/info.json | 1 + keyboards/handwired/dactyl_manuform/4x6_5/rules.mk | 1 - keyboards/handwired/dactyl_manuform/5x6/info.json | 1 + keyboards/handwired/dactyl_manuform/5x6/rules.mk | 1 - keyboards/handwired/dactyl_manuform/5x6_2_5/info.json | 1 + keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk | 1 - keyboards/handwired/dactyl_manuform/5x6_5/info.json | 1 + keyboards/handwired/dactyl_manuform/5x6_5/rules.mk | 1 - keyboards/handwired/dactyl_manuform/5x6_6/info.json | 1 + keyboards/handwired/dactyl_manuform/5x6_6/rules.mk | 1 - keyboards/handwired/dactyl_manuform/5x7/info.json | 1 + keyboards/handwired/dactyl_manuform/5x7/rules.mk | 1 - .../handwired/dactyl_manuform/6x6/blackpill_f411/info.json | 1 + .../handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk | 5 ----- .../handwired/dactyl_manuform/6x6/promicro/keyboard.json | 1 + keyboards/handwired/dactyl_manuform/6x6/rules.mk | 1 - keyboards/handwired/dactyl_manuform/6x6_4/info.json | 1 + keyboards/handwired/dactyl_manuform/6x6_4/rules.mk | 1 - keyboards/handwired/dactyl_promicro/info.json | 1 + keyboards/handwired/dactyl_promicro/rules.mk | 2 -- keyboards/handwired/dactyl_rah/info.json | 1 + keyboards/handwired/dactyl_rah/rules.mk | 1 - keyboards/handwired/elrgo_s/info.json | 1 + keyboards/handwired/elrgo_s/rules.mk | 1 - keyboards/handwired/freoduo/info.json | 1 + keyboards/handwired/freoduo/rules.mk | 1 - keyboards/handwired/jtallbean/split_65/info.json | 1 + keyboards/handwired/jtallbean/split_65/rules.mk | 1 - keyboards/handwired/ks63/info.json | 1 + keyboards/handwired/ks63/rules.mk | 2 -- keyboards/handwired/lagrange/info.json | 1 + keyboards/handwired/lagrange/rules.mk | 1 - keyboards/handwired/myskeeb/info.json | 1 + keyboards/handwired/myskeeb/rules.mk | 1 - keyboards/handwired/not_so_minidox/info.json | 1 + keyboards/handwired/not_so_minidox/rules.mk | 2 -- keyboards/handwired/skakunm_dactyl/info.json | 1 + keyboards/handwired/skakunm_dactyl/rules.mk | 4 +--- keyboards/handwired/split65/promicro/info.json | 1 + keyboards/handwired/split65/promicro/rules.mk | 1 - keyboards/handwired/split65/stm32/info.json | 1 + keyboards/handwired/split65/stm32/rules.mk | 1 - keyboards/handwired/split89/info.json | 1 + keyboards/handwired/split89/rules.mk | 2 -- keyboards/handwired/splittest/info.json | 3 +++ keyboards/handwired/splittest/rules.mk | 2 -- keyboards/handwired/tractyl_manuform/4x6_right/info.json | 1 + keyboards/handwired/tractyl_manuform/4x6_right/rules.mk | 2 -- keyboards/handwired/tractyl_manuform/5x6_right/info.json | 1 + keyboards/handwired/tractyl_manuform/5x6_right/rules.mk | 2 -- keyboards/handwired/unk/info.json | 5 +++++ keyboards/handwired/unk/rules.mk | 2 -- keyboards/handwired/xealous/info.json | 5 +++++ keyboards/handwired/xealous/rules.mk | 1 - keyboards/helix/pico/info.json | 1 + keyboards/helix/pico/rules.mk | 2 -- keyboards/helix/pico/sc/rules.mk | 1 - keyboards/helix/rev2/info.json | 1 + keyboards/helix/rev2/keymaps/default/rules.mk | 2 -- keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk | 1 - keyboards/helix/rev2/keymaps/led_test/rules.mk | 1 - keyboards/helix/rev2/rules.mk | 2 -- keyboards/helix/rev2/sc/rules.mk | 1 - keyboards/helix/rev3_4rows/info.json | 1 + keyboards/helix/rev3_4rows/rules.mk | 1 - keyboards/helix/rev3_5rows/info.json | 1 + keyboards/helix/rev3_5rows/rules.mk | 1 - keyboards/hidtech/bastyl/info.json | 1 + keyboards/hidtech/bastyl/rules.mk | 1 - keyboards/hillside/46/0_1/info.json | 1 + keyboards/hillside/46/0_1/rules.mk | 1 - keyboards/hillside/48/0_1/info.json | 1 + keyboards/hillside/48/0_1/rules.mk | 1 - keyboards/hillside/52/0_1/info.json | 1 + keyboards/hillside/52/0_1/rules.mk | 1 - keyboards/ibnuda/squiggle/rev1/info.json | 1 + keyboards/ibnuda/squiggle/rev1/rules.mk | 2 -- keyboards/input_club/ergodox_infinity/info.json | 3 +++ keyboards/input_club/ergodox_infinity/rules.mk | 1 - keyboards/jian/handwired/rules.mk | 1 - keyboards/jian/nsrev2/rules.mk | 1 - keyboards/jian/rev1/info.json | 3 +++ keyboards/jian/rev1/rules.mk | 1 - keyboards/jian/rev2/info.json | 1 + keyboards/jian/rev2/rules.mk | 1 - keyboards/jiran/info.json | 1 + keyboards/jiran/rules.mk | 1 - keyboards/jorne/info.json | 5 +++++ keyboards/jorne/rules.mk | 1 - keyboards/kagizaraya/miniaxe/info.json | 1 + keyboards/kagizaraya/miniaxe/rules.mk | 1 - keyboards/kagizaraya/scythe/info.json | 1 + keyboards/kagizaraya/scythe/rules.mk | 1 - keyboards/kakunpc/rabbit_capture_plan/info.json | 1 + keyboards/kakunpc/rabbit_capture_plan/rules.mk | 1 - keyboards/kakunpc/suihankey/rules.mk | 1 - keyboards/kakunpc/suihankey/split/info.json | 1 + keyboards/kakunpc/suihankey/split/rules.mk | 1 - keyboards/kapl/info.json | 5 +++++ keyboards/kapl/rules.mk | 1 - keyboards/kb58/info.json | 1 + keyboards/kb58/rules.mk | 2 -- keyboards/keebio/bfo9000/info.json | 3 ++- keyboards/keebio/bfo9000/rules.mk | 2 -- keyboards/keebio/foldkb/info.json | 5 +++++ keyboards/keebio/foldkb/rules.mk | 1 - keyboards/keebio/fourier/info.json | 1 + keyboards/keebio/fourier/rules.mk | 2 -- keyboards/keebio/iris/rev1/info.json | 1 + keyboards/keebio/iris/rev1/rules.mk | 2 -- keyboards/keebio/iris/rev1_led/info.json | 1 + keyboards/keebio/iris/rev1_led/rules.mk | 2 -- keyboards/keebio/iris/rev2/info.json | 1 + keyboards/keebio/iris/rev2/rules.mk | 2 -- keyboards/keebio/iris/rev3/info.json | 1 + keyboards/keebio/iris/rev3/rules.mk | 1 - keyboards/keebio/iris/rev4/info.json | 1 + keyboards/keebio/iris/rev4/rules.mk | 1 - keyboards/keebio/iris/rev5/info.json | 1 + keyboards/keebio/iris/rev5/rules.mk | 1 - keyboards/keebio/iris/rev6/info.json | 1 + keyboards/keebio/iris/rev6/rules.mk | 1 - keyboards/keebio/iris/rev7/info.json | 1 + keyboards/keebio/iris/rev7/rules.mk | 1 - keyboards/keebio/kbo5000/info.json | 5 +++++ keyboards/keebio/kbo5000/rules.mk | 1 - keyboards/keebio/levinson/info.json | 3 +++ keyboards/keebio/levinson/rules.mk | 2 -- keyboards/keebio/nyquist/rev1/info.json | 1 + keyboards/keebio/nyquist/rev1/rules.mk | 2 -- keyboards/keebio/nyquist/rev2/info.json | 1 + keyboards/keebio/nyquist/rev2/rules.mk | 2 -- keyboards/keebio/nyquist/rev3/info.json | 1 + keyboards/keebio/nyquist/rev3/rules.mk | 2 -- keyboards/keebio/quefrency/info.json | 5 +++++ keyboards/keebio/quefrency/rules.mk | 2 -- keyboards/keebio/rorschach/info.json | 5 +++++ keyboards/keebio/rorschach/rules.mk | 2 -- keyboards/keebio/viterbi/info.json | 3 +++ keyboards/keebio/viterbi/rules.mk | 2 -- keyboards/keyprez/bison/info.json | 1 + keyboards/keyprez/bison/rules.mk | 1 - keyboards/keyprez/unicorn/info.json | 1 + keyboards/keyprez/unicorn/rules.mk | 1 - keyboards/keystonecaps/gameroyadvance/info.json | 1 + keyboards/keystonecaps/gameroyadvance/rules.mk | 1 - keyboards/kumaokobo/kudox/info.json | 5 +++++ keyboards/kumaokobo/kudox/rules.mk | 2 -- keyboards/kumaokobo/kudox_full/info.json | 5 +++++ keyboards/kumaokobo/kudox_full/rules.mk | 2 -- keyboards/kumaokobo/pico/info.json | 5 +++++ keyboards/kumaokobo/pico/rules.mk | 2 -- keyboards/lets_split/info.json | 3 +++ keyboards/lets_split/rules.mk | 2 -- keyboards/lime/info.json | 5 +++++ keyboards/lime/rules.mk | 1 - keyboards/majistic/info.json | 1 + keyboards/majistic/rules.mk | 2 -- keyboards/malevolti/lyra/rev1/info.json | 1 + keyboards/malevolti/lyra/rev1/rules.mk | 3 +-- keyboards/manta60/info.json | 1 + keyboards/manta60/rules.mk | 1 - keyboards/maple_computing/lets_split_eh/info.json | 5 +++++ keyboards/maple_computing/lets_split_eh/rules.mk | 2 -- keyboards/maple_computing/minidox/info.json | 5 +++++ keyboards/maple_computing/minidox/rules.mk | 2 -- keyboards/marksard/rhymestone/info.json | 5 +++++ keyboards/marksard/rhymestone/rules.mk | 1 - keyboards/marksard/treadstone48/rev1/keyboard.json | 1 + keyboards/marksard/treadstone48/rev2/rules.mk | 2 +- keyboards/marksard/treadstone48/rules.mk | 1 - keyboards/mechwild/mokulua/mirrored/info.json | 1 + keyboards/mechwild/mokulua/mirrored/rules.mk | 1 - keyboards/mechwild/mokulua/standard/info.json | 1 + keyboards/mechwild/mokulua/standard/rules.mk | 1 - keyboards/merge/um70/info.json | 1 + keyboards/merge/um70/rules.mk | 1 - keyboards/merge/um80/info.json | 1 + keyboards/merge/um80/rules.mk | 1 - keyboards/merge/uma/info.json | 1 + keyboards/merge/uma/rules.mk | 1 - keyboards/meson/info.json | 1 + keyboards/meson/rules.mk | 1 - keyboards/mint60/info.json | 1 + keyboards/mint60/rules.mk | 2 -- keyboards/mlego/m60_split/rev1/info.json | 1 + keyboards/mlego/m60_split/rev1/rules.mk | 1 - keyboards/mlego/m60_split/rev2/info.json | 1 + keyboards/mlego/m60_split/rev2/rules.mk | 1 - keyboards/momoka_ergo/info.json | 1 + keyboards/momoka_ergo/rules.mk | 1 - keyboards/nacly/sodium42/info.json | 1 + keyboards/nacly/sodium42/rules.mk | 2 -- keyboards/nacly/sodium50/info.json | 1 + keyboards/nacly/sodium50/rules.mk | 2 -- keyboards/nacly/sodium62/info.json | 1 + keyboards/nacly/sodium62/rules.mk | 1 - keyboards/nacly/splitreus62/info.json | 1 + keyboards/nacly/splitreus62/rules.mk | 2 -- keyboards/nullbitsco/snap/info.json | 1 + keyboards/nullbitsco/snap/rules.mk | 1 - keyboards/obosob/arch_36/info.json | 1 + keyboards/obosob/arch_36/rules.mk | 1 - keyboards/obosob/steal_this_keyboard/info.json | 1 + keyboards/obosob/steal_this_keyboard/rules.mk | 1 - keyboards/oddball/info.json | 3 +++ keyboards/oddball/rules.mk | 1 - keyboards/ogre/ergo_single/rules.mk | 1 - keyboards/ogre/ergo_split/info.json | 1 + keyboards/ogre/ergo_split/rules.mk | 1 - keyboards/omkbd/ergodash/info.json | 5 ++++- keyboards/omkbd/ergodash/rules.mk | 2 -- keyboards/omkbd/runner3680/info.json | 5 ++++- keyboards/omkbd/runner3680/rules.mk | 2 -- keyboards/orthodox/info.json | 5 +++++ keyboards/orthodox/rules.mk | 2 -- keyboards/phoenix/info.json | 1 + keyboards/phoenix/rules.mk | 1 - keyboards/pinky/info.json | 5 +++++ keyboards/pinky/rules.mk | 2 -- keyboards/pisces/info.json | 1 + keyboards/pisces/rules.mk | 3 --- keyboards/pluckey/info.json | 1 + keyboards/pluckey/rules.mk | 1 - keyboards/pteron36/info.json | 1 + keyboards/pteron36/rules.mk | 1 - keyboards/rate/pistachio/rev1/info.json | 3 +++ keyboards/rate/pistachio/rev1/rules.mk | 1 - keyboards/rate/pistachio/rev2/info.json | 3 +++ keyboards/rate/pistachio/rev2/rules.mk | 1 - keyboards/recompile_keys/choco60/rev1/info.json | 1 + keyboards/recompile_keys/choco60/rev1/rules.mk | 2 -- keyboards/recompile_keys/choco60/rev2/info.json | 1 + keyboards/recompile_keys/choco60/rev2/rules.mk | 2 -- keyboards/recompile_keys/cocoa40/info.json | 1 + keyboards/recompile_keys/cocoa40/rules.mk | 1 - keyboards/redox_media/info.json | 1 + keyboards/redox_media/rules.mk | 1 - keyboards/rgbkb/mun/info.json | 5 +++++ keyboards/rgbkb/mun/rules.mk | 1 - keyboards/rgbkb/sol/info.json | 5 +++++ keyboards/rgbkb/sol/rules.mk | 1 - keyboards/rgbkb/sol3/info.json | 5 +++++ keyboards/rgbkb/sol3/rules.mk | 1 - keyboards/rgbkb/zen/info.json | 5 +++++ keyboards/rgbkb/zen/rules.mk | 1 - keyboards/rgbkb/zygomorph/info.json | 5 +++++ keyboards/rgbkb/zygomorph/rules.mk | 2 -- keyboards/rura66/rev1/info.json | 1 + keyboards/rura66/rev1/rules.mk | 1 - keyboards/rura66/rules.mk | 1 - keyboards/salicylic_acid3/7skb/info.json | 5 +++++ keyboards/salicylic_acid3/7skb/rules.mk | 2 -- keyboards/salicylic_acid3/7splus/info.json | 1 + keyboards/salicylic_acid3/7splus/rules.mk | 2 -- keyboards/salicylic_acid3/ajisai74/info.json | 1 + keyboards/salicylic_acid3/ajisai74/rules.mk | 2 -- keyboards/salicylic_acid3/ergoarrows/info.json | 1 + keyboards/salicylic_acid3/ergoarrows/rules.mk | 2 -- keyboards/salicylic_acid3/jisplit89/info.json | 5 +++++ keyboards/salicylic_acid3/jisplit89/rules.mk | 2 -- keyboards/salicylic_acid3/naked48/info.json | 5 +++++ keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk | 1 - .../salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk | 1 - keyboards/salicylic_acid3/naked48/rules.mk | 2 -- keyboards/salicylic_acid3/naked60/info.json | 5 +++++ keyboards/salicylic_acid3/naked60/rules.mk | 2 -- keyboards/salicylic_acid3/naked64/info.json | 5 +++++ keyboards/salicylic_acid3/naked64/rules.mk | 2 -- keyboards/salicylic_acid3/nknl7en/info.json | 1 + keyboards/salicylic_acid3/nknl7en/rules.mk | 2 -- keyboards/salicylic_acid3/nknl7jp/info.json | 1 + keyboards/salicylic_acid3/nknl7jp/rules.mk | 2 -- keyboards/scatter42/info.json | 1 + keyboards/scatter42/rules.mk | 1 - keyboards/sekigon/grs_70ec/info.json | 1 + keyboards/sekigon/grs_70ec/rules.mk | 1 - keyboards/silverbullet44/info.json | 1 + keyboards/silverbullet44/rules.mk | 1 - keyboards/sofle/keyhive/keyboard.json | 2 ++ keyboards/sofle/rev1/keyboard.json | 2 ++ keyboards/sparrow62/info.json | 1 + keyboards/sparrow62/rules.mk | 2 -- keyboards/supersplit/info.json | 1 + keyboards/supersplit/rules.mk | 3 --- keyboards/takashicompany/compacx/info.json | 1 + keyboards/takashicompany/compacx/rules.mk | 1 - keyboards/takashiski/hecomi/alpha/info.json | 1 + keyboards/takashiski/hecomi/alpha/rules.mk | 1 - keyboards/takashiski/otaku_split/rev0/info.json | 1 + keyboards/takashiski/otaku_split/rev0/rules.mk | 1 - keyboards/takashiski/otaku_split/rev1/info.json | 1 + keyboards/takashiski/otaku_split/rev1/rules.mk | 1 - keyboards/tkw/grandiceps/info.json | 1 + keyboards/tkw/grandiceps/rules.mk | 1 - keyboards/unikeyboard/diverge3/info.json | 1 + keyboards/unikeyboard/diverge3/rules.mk | 1 - keyboards/unikeyboard/divergetm2/info.json | 1 + keyboards/unikeyboard/divergetm2/rules.mk | 4 +--- keyboards/uzu42/info.json | 5 +++++ keyboards/uzu42/rules.mk | 1 - keyboards/viktus/sp_mini/info.json | 1 + keyboards/viktus/sp_mini/rules.mk | 1 - keyboards/vitamins_included/rev1/info.json | 1 + keyboards/vitamins_included/rev1/rules.mk | 2 +- keyboards/vitamins_included/rev2/info.json | 1 + keyboards/vitamins_included/rev2/rules.mk | 2 -- keyboards/waterfowl/info.json | 1 + keyboards/waterfowl/rules.mk | 1 - keyboards/whale/sk/v3/info.json | 6 ++++++ keyboards/whale/sk/v3/rules.mk | 3 --- keyboards/wren/info.json | 1 + keyboards/wren/rules.mk | 1 - keyboards/xenon/info.json | 1 + keyboards/xenon/rules.mk | 1 - keyboards/yushakobo/navpad/10_helix_r/info.json | 1 + keyboards/yushakobo/navpad/10_helix_r/rules.mk | 1 - 445 files changed, 412 insertions(+), 355 deletions(-) create mode 100644 keyboards/biacco42/ergo42/info.json create mode 100644 keyboards/buzzard/info.json create mode 100644 keyboards/dailycraft/wings42/info.json create mode 100644 keyboards/deltasplit75/info.json create mode 100644 keyboards/ergoslab/info.json create mode 100644 keyboards/ergotravel/info.json create mode 100644 keyboards/fortitude60/info.json create mode 100644 keyboards/handwired/unk/info.json create mode 100644 keyboards/handwired/xealous/info.json create mode 100644 keyboards/jorne/info.json create mode 100644 keyboards/kapl/info.json create mode 100644 keyboards/keebio/foldkb/info.json create mode 100644 keyboards/keebio/kbo5000/info.json create mode 100644 keyboards/keebio/quefrency/info.json create mode 100644 keyboards/keebio/rorschach/info.json create mode 100644 keyboards/kumaokobo/kudox/info.json create mode 100644 keyboards/kumaokobo/kudox_full/info.json create mode 100644 keyboards/kumaokobo/pico/info.json create mode 100644 keyboards/lime/info.json create mode 100644 keyboards/maple_computing/lets_split_eh/info.json create mode 100644 keyboards/maple_computing/minidox/info.json create mode 100644 keyboards/marksard/rhymestone/info.json create mode 100644 keyboards/orthodox/info.json create mode 100644 keyboards/pinky/info.json create mode 100644 keyboards/rgbkb/mun/info.json create mode 100644 keyboards/rgbkb/sol/info.json create mode 100644 keyboards/rgbkb/sol3/info.json create mode 100644 keyboards/rgbkb/zen/info.json create mode 100644 keyboards/rgbkb/zygomorph/info.json create mode 100644 keyboards/salicylic_acid3/7skb/info.json create mode 100644 keyboards/salicylic_acid3/jisplit89/info.json create mode 100644 keyboards/salicylic_acid3/naked48/info.json create mode 100644 keyboards/salicylic_acid3/naked60/info.json create mode 100644 keyboards/salicylic_acid3/naked64/info.json create mode 100644 keyboards/uzu42/info.json diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json index a20b2ce636a..1e77de54e94 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json @@ -6,6 +6,9 @@ "eeprom": { "driver": "spi" }, + "split": { + "enabled": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk index 4bd570ddd8c..1bf0d489a97 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json index bbb0fd66ba2..05be6acde22 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json @@ -15,6 +15,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D2", "matrix_pins": { "right": { diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk index cc6c21e8d20..0869ac07972 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk @@ -16,10 +16,6 @@ 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 -# Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on -# the trackball side). -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json index 4b69b244fbe..61d953ec8f6 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json @@ -15,6 +15,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk index cc6c21e8d20..0869ac07972 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk @@ -16,10 +16,6 @@ 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 -# Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on -# the trackball side). -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json index 2c0faa95675..f7dd9d2c7e2 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json @@ -12,6 +12,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "GP1" }, "ws2812": { diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk index 87a2d912b89..03b7e8ca31a 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json index 0a88daf352d..33fda9c2a47 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json @@ -12,6 +12,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "GP1" }, "ws2812": { diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk index 87a2d912b89..03b7e8ca31a 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json index af74a299be7..cf9cf2eb62d 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json @@ -19,6 +19,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "A3" }, "development_board": "stemcell" diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk index 4bd570ddd8c..1bf0d489a97 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json index bda53275f83..1dbfdb53452 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json @@ -6,6 +6,9 @@ "eeprom": { "driver": "spi" }, + "split": { + "enabled": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk index 4bd570ddd8c..1bf0d489a97 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json index 69c8bd6fb4f..8bc6a86eaf1 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json @@ -15,6 +15,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D2", "matrix_pins": { "right": { diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk index 6862a8e3095..0869ac07972 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json index 67ada55640e..13283d5b8fa 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json @@ -15,6 +15,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk index 6862a8e3095..0869ac07972 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json index 9b44b3f336c..8dcc8187abb 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json @@ -12,6 +12,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "GP1" }, "ws2812": { diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk index 87a2d912b89..03b7e8ca31a 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json index d1ac62e1abe..288e08b9ee9 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json @@ -12,6 +12,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "GP1" }, "ws2812": { diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk index 87a2d912b89..03b7e8ca31a 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json index 4309fd5ee30..c09c9c90ca0 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json @@ -19,6 +19,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "A3" }, "development_board": "stemcell" diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk index 4bd570ddd8c..1bf0d489a97 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json index b4040e84a5b..5c0b65b7c3d 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json @@ -6,6 +6,9 @@ "eeprom": { "driver": "spi" }, + "split": { + "enabled": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk index f8de9a3fb13..e2a00339775 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json index 161d36f45d4..3419eaea8b7 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json @@ -15,6 +15,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D2", "matrix_pins": { "right": { diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk index 51c8c665e26..e1f2bf81f8f 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk @@ -16,10 +16,6 @@ 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 -# Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the -# trackball side). -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json index 2ee88c4f9e4..bb892c4e6ec 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json @@ -15,6 +15,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk index 51c8c665e26..e1f2bf81f8f 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk @@ -16,10 +16,6 @@ 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 -# Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the -# trackball side). -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json index 961a0b1420d..48a2eb51584 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json @@ -12,6 +12,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "GP1" }, "ws2812": { diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk index 87a2d912b89..03b7e8ca31a 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json index 28a1dee31f4..72aa8b59c6e 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json @@ -12,6 +12,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "GP1" }, "ws2812": { diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk index 87a2d912b89..03b7e8ca31a 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json index 8060c758b88..d49755a861a 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json @@ -19,6 +19,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "A3" }, "development_board": "stemcell" diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk index 4bd570ddd8c..1bf0d489a97 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json index 796d22dc713..2190d542c2c 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json @@ -6,6 +6,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "GP1" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk index b4722fc8e6a..b54403222b4 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk @@ -20,5 +20,3 @@ SERIAL_DRIVER = vendor POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Assembled version uses SPI. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json index 7796a7c3111..9e07843788f 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json @@ -6,6 +6,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "GP1" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk index 227d42fa24d..0de2c9a8071 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk @@ -20,5 +20,3 @@ SERIAL_DRIVER = vendor POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c # DIY version uses I2C. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json index 8d7cb4c823a..30f3688cad1 100644 --- a/keyboards/bastardkb/scylla/blackpill/info.json +++ b/keyboards/bastardkb/scylla/blackpill/info.json @@ -6,6 +6,9 @@ "eeprom": { "driver": "spi" }, + "split": { + "enabled": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk index b5612ce38a8..20c87fca307 100644 --- a/keyboards/bastardkb/scylla/blackpill/rules.mk +++ b/keyboards/bastardkb/scylla/blackpill/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json index 3984c69f2fa..4b7e5092199 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/info.json +++ b/keyboards/bastardkb/scylla/v1/elitec/info.json @@ -15,6 +15,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk index ba717ec1150..6221b2ef6a5 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk +++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk @@ -15,5 +15,3 @@ 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) - -SPLIT_KEYBOARD = yes diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json index f9069afd911..a7c68fb628a 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/info.json +++ b/keyboards/bastardkb/scylla/v2/elitec/info.json @@ -15,6 +15,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk index ba717ec1150..6221b2ef6a5 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk +++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk @@ -15,5 +15,3 @@ 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) - -SPLIT_KEYBOARD = yes diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json index 0c7dc406b07..83cfd06ca79 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json +++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json @@ -12,6 +12,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "GP1" }, "ws2812": { diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk index 53f4c0baa87..83407eef806 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk @@ -16,6 +16,4 @@ 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 -SPLIT_KEYBOARD = yes - SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json index 377fd4424ac..14386303dc5 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json +++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json @@ -12,6 +12,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "GP1" }, "ws2812": { diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk index 53f4c0baa87..83407eef806 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk @@ -16,6 +16,4 @@ 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 -SPLIT_KEYBOARD = yes - SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json index 598ca9d9ee0..d6bea6463ac 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/info.json +++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json @@ -19,6 +19,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "A3" }, "development_board": "stemcell" diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk index 8256842e21d..ef125eb2fea 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk @@ -16,6 +16,4 @@ 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 -SPLIT_KEYBOARD = yes - SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json index c0f0d6a3b11..34ca3ff0b2c 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/info.json +++ b/keyboards/bastardkb/skeletyl/blackpill/info.json @@ -6,6 +6,9 @@ "eeprom": { "driver": "spi" }, + "split": { + "enabled": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk index b5612ce38a8..20c87fca307 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk +++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json index f3eb68587d0..cc5d2adfadd 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json +++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json @@ -15,6 +15,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk index ba717ec1150..6221b2ef6a5 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk +++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk @@ -15,5 +15,3 @@ 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) - -SPLIT_KEYBOARD = yes diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json index 5e5ccd25458..4f245663bce 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json +++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json @@ -15,6 +15,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk index ba717ec1150..6221b2ef6a5 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk @@ -15,5 +15,3 @@ 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) - -SPLIT_KEYBOARD = yes diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json index e9c2b345923..fa15c27148e 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json @@ -12,6 +12,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "GP1" }, "ws2812": { diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk index 53f4c0baa87..83407eef806 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk @@ -16,6 +16,4 @@ 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 -SPLIT_KEYBOARD = yes - SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json index a47464720c0..b34581757ba 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json @@ -12,6 +12,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "GP1" }, "ws2812": { diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk index 53f4c0baa87..83407eef806 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk @@ -16,6 +16,4 @@ 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 -SPLIT_KEYBOARD = yes - SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json index b384da9dbdc..d7b1fc5cdb4 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json @@ -19,6 +19,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "A3" }, "development_board": "stemcell" diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk index 8256842e21d..ef125eb2fea 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk @@ -16,6 +16,4 @@ 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 -SPLIT_KEYBOARD = yes - SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json index 3afca1e792e..40c33619d19 100644 --- a/keyboards/bastardkb/tbk/info.json +++ b/keyboards/bastardkb/tbk/info.json @@ -30,6 +30,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/bastardkb/tbk/rules.mk b/keyboards/bastardkb/tbk/rules.mk index 323b24ba201..2eba275490a 100644 --- a/keyboards/bastardkb/tbk/rules.mk +++ b/keyboards/bastardkb/tbk/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json index c4104608574..bb6e9bb7e9e 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/info.json +++ b/keyboards/bastardkb/tbkmini/blackpill/info.json @@ -6,6 +6,9 @@ "eeprom": { "driver": "spi" }, + "split": { + "enabled": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk index b5612ce38a8..20c87fca307 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk +++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk @@ -16,8 +16,6 @@ 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 -SPLIT_KEYBOARD = yes - MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint KEYBOARD_SHARED_EP = yes diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json index f246ce0e7ce..54433f39bf3 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json @@ -15,6 +15,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk index ba717ec1150..6221b2ef6a5 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk @@ -15,5 +15,3 @@ 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) - -SPLIT_KEYBOARD = yes diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json index 07bf99658b1..57c7399c01d 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json @@ -15,6 +15,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk index ba717ec1150..6221b2ef6a5 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk @@ -15,5 +15,3 @@ 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) - -SPLIT_KEYBOARD = yes diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json index 3bcae1df607..2f64d2b51bf 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json @@ -12,6 +12,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "GP1" }, "ws2812": { diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk index 53f4c0baa87..83407eef806 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk @@ -16,6 +16,4 @@ 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 -SPLIT_KEYBOARD = yes - SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json index e7f01c359dc..b67bc1d744c 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json @@ -12,6 +12,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "GP1" }, "ws2812": { diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk index 53f4c0baa87..83407eef806 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk @@ -16,6 +16,4 @@ 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 -SPLIT_KEYBOARD = yes - SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json index f62427438b7..d08c89ec574 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json @@ -19,6 +19,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "A3" }, "development_board": "stemcell" diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk index 8256842e21d..ef125eb2fea 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk @@ -16,6 +16,4 @@ 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 -SPLIT_KEYBOARD = yes - SERIAL_DRIVER = usart diff --git a/keyboards/biacco42/ergo42/info.json b/keyboards/biacco42/ergo42/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/biacco42/ergo42/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/buzzard/info.json b/keyboards/buzzard/info.json new file mode 100644 index 00000000000..3e85dd16974 --- /dev/null +++ b/keyboards/buzzard/info.json @@ -0,0 +1,5 @@ +{ + "split":{ + "enabled": true + } +} diff --git a/keyboards/cantor/info.json b/keyboards/cantor/info.json index fdc90871429..e401b2ce972 100644 --- a/keyboards/cantor/info.json +++ b/keyboards/cantor/info.json @@ -28,6 +28,7 @@ ] }, "split": { + "enabled": true, "bootmagic": { "matrix": [4, 5] }, diff --git a/keyboards/cantor/rules.mk b/keyboards/cantor/rules.mk index 6bd8b9bf770..c6e29883213 100644 --- a/keyboards/cantor/rules.mk +++ b/keyboards/cantor/rules.mk @@ -1,2 +1 @@ -SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json index 622e534864b..b3caa8ad13e 100644 --- a/keyboards/dailycraft/claw44/rev1/info.json +++ b/keyboards/dailycraft/claw44/rev1/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/dailycraft/claw44/rev1/rules.mk b/keyboards/dailycraft/claw44/rev1/rules.mk index a66eb7d352e..7e2ee0ceacb 100644 --- a/keyboards/dailycraft/claw44/rev1/rules.mk +++ b/keyboards/dailycraft/claw44/rev1/rules.mk @@ -11,4 +11,3 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. SWAP_HANDS_ENABLE = no # Enable one-hand typing OLED_ENABLE = no # Add OLED displays support -SPLIT_KEYBOARD = yes diff --git a/keyboards/dailycraft/sandbox/rev2/info.json b/keyboards/dailycraft/sandbox/rev2/info.json index 99535b94738..5d7255ff67e 100644 --- a/keyboards/dailycraft/sandbox/rev2/info.json +++ b/keyboards/dailycraft/sandbox/rev2/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/dailycraft/sandbox/rev2/rules.mk b/keyboards/dailycraft/sandbox/rev2/rules.mk index d38a6180907..3bbd2614291 100644 --- a/keyboards/dailycraft/sandbox/rev2/rules.mk +++ b/keyboards/dailycraft/sandbox/rev2/rules.mk @@ -1 +1 @@ -SPLIT_KEYBOARD = yes +# File intentionally blank diff --git a/keyboards/dailycraft/wings42/info.json b/keyboards/dailycraft/wings42/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/dailycraft/wings42/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/dailycraft/wings42/rules.mk b/keyboards/dailycraft/wings42/rules.mk index 9e762b19074..f69adcecec0 100644 --- a/keyboards/dailycraft/wings42/rules.mk +++ b/keyboards/dailycraft/wings42/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = dailycraft/wings42/rev2 diff --git a/keyboards/deltasplit75/info.json b/keyboards/deltasplit75/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/deltasplit75/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/deltasplit75/rules.mk b/keyboards/deltasplit75/rules.mk index 8285c29cb78..da8a2124e8f 100644 --- a/keyboards/deltasplit75/rules.mk +++ b/keyboards/deltasplit75/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = deltasplit75/v2 diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json index 4f3b03b6f9e..a78ecef2114 100644 --- a/keyboards/dm9records/ergoinu/info.json +++ b/keyboards/dm9records/ergoinu/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/dm9records/ergoinu/rules.mk b/keyboards/dm9records/ergoinu/rules.mk index a876de5b539..951dd07d6e0 100644 --- a/keyboards/dm9records/ergoinu/rules.mk +++ b/keyboards/dm9records/ergoinu/rules.mk @@ -10,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/info.json index ea53bfb9156..e9f3aba7157 100644 --- a/keyboards/doppelganger/info.json +++ b/keyboards/doppelganger/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D1", "matrix_pins": { "right": { diff --git a/keyboards/doppelganger/rules.mk b/keyboards/doppelganger/rules.mk index f1a07bd25ef..3414d97c204 100644 --- a/keyboards/doppelganger/rules.mk +++ b/keyboards/doppelganger/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes diff --git a/keyboards/draculad/info.json b/keyboards/draculad/info.json index cd157a0ed58..1635b8bd2c1 100644 --- a/keyboards/draculad/info.json +++ b/keyboards/draculad/info.json @@ -36,6 +36,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/draculad/rules.mk b/keyboards/draculad/rules.mk index 5f5fd002a1a..130d29fb1de 100644 --- a/keyboards/draculad/rules.mk +++ b/keyboards/draculad/rules.mk @@ -10,7 +10,6 @@ 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 -SPLIT_KEYBOARD = yes OLED_ENABLE = yes WPM_ENABLE = yes ENCODER_ENABLE = yes diff --git a/keyboards/dumbo/info.json b/keyboards/dumbo/info.json index faf59b7ecc9..ddcab98dd32 100644 --- a/keyboards/dumbo/info.json +++ b/keyboards/dumbo/info.json @@ -20,6 +20,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/dumbo/rules.mk b/keyboards/dumbo/rules.mk index 6364de07d9b..a64aa6f849b 100644 --- a/keyboards/dumbo/rules.mk +++ b/keyboards/dumbo/rules.mk @@ -9,5 +9,4 @@ 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 -SPLIT_KEYBOARD = yes LTO_ENABLE = yes diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json index 1bc39ced986..eb53fda96d8 100644 --- a/keyboards/elephant42/info.json +++ b/keyboards/elephant42/info.json @@ -41,6 +41,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2", "transport": { "sync": { diff --git a/keyboards/elephant42/rules.mk b/keyboards/elephant42/rules.mk index db121c92e35..9091c741718 100644 --- a/keyboards/elephant42/rules.mk +++ b/keyboards/elephant42/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes OLED_ENABLE = yes LTO_ENABLE = yes diff --git a/keyboards/ergoslab/info.json b/keyboards/ergoslab/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/ergoslab/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/ergoslab/rules.mk b/keyboards/ergoslab/rules.mk index 503f274a9f3..5255b41b06f 100644 --- a/keyboards/ergoslab/rules.mk +++ b/keyboards/ergoslab/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = ergoslab/rev1 diff --git a/keyboards/ergotravel/info.json b/keyboards/ergotravel/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/ergotravel/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/ergotravel/rules.mk b/keyboards/ergotravel/rules.mk index aab244a2179..f52203f7059 100644 --- a/keyboards/ergotravel/rules.mk +++ b/keyboards/ergotravel/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = ergotravel/rev1 diff --git a/keyboards/fluorite/info.json b/keyboards/fluorite/info.json index bdc94b3eb94..f28694389e9 100644 --- a/keyboards/fluorite/info.json +++ b/keyboards/fluorite/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/fluorite/rules.mk b/keyboards/fluorite/rules.mk index 139055a96bd..ad81ce036a2 100644 --- a/keyboards/fluorite/rules.mk +++ b/keyboards/fluorite/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes diff --git a/keyboards/flxlb/zplit/info.json b/keyboards/flxlb/zplit/info.json index 6d2aadcb437..850cb3f5d3b 100644 --- a/keyboards/flxlb/zplit/info.json +++ b/keyboards/flxlb/zplit/info.json @@ -39,6 +39,7 @@ "pin": "D3" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/flxlb/zplit/rules.mk b/keyboards/flxlb/zplit/rules.mk index 7b181ca73e5..901257cd173 100644 --- a/keyboards/flxlb/zplit/rules.mk +++ b/keyboards/flxlb/zplit/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -SPLIT_KEYBOARD = yes diff --git a/keyboards/fortitude60/info.json b/keyboards/fortitude60/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/fortitude60/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/fortitude60/rules.mk b/keyboards/fortitude60/rules.mk index 9302b674251..181f73ba110 100644 --- a/keyboards/fortitude60/rules.mk +++ b/keyboards/fortitude60/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = fortitude60/rev1 diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json index d153f9f834a..7c05cd7371b 100644 --- a/keyboards/fungo/rev1/info.json +++ b/keyboards/fungo/rev1/info.json @@ -15,6 +15,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D3", "matrix_pins": { "right": { diff --git a/keyboards/fungo/rev1/rules.mk b/keyboards/fungo/rev1/rules.mk index e8d7a7aed53..2365546821a 100644 --- a/keyboards/fungo/rev1/rules.mk +++ b/keyboards/fungo/rev1/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output KEY_LOCK_ENABLE = yes # kc_lock use - OLED_ENABLE = no -SPLIT_KEYBOARD = yes # split type diff --git a/keyboards/gummykey/info.json b/keyboards/gummykey/info.json index 6f3758c31a1..1520809502a 100644 --- a/keyboards/gummykey/info.json +++ b/keyboards/gummykey/info.json @@ -10,6 +10,9 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "split": { + "enabled": true + }, "diode_direction": "ROW2COL", "layouts": { "LAYOUT_split_4x6_5": { diff --git a/keyboards/gummykey/rules.mk b/keyboards/gummykey/rules.mk index b043543633b..6e0404820cd 100644 --- a/keyboards/gummykey/rules.mk +++ b/keyboards/gummykey/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json index 0c9b4ddb0f4..225c5dcb37a 100644 --- a/keyboards/halfcliff/info.json +++ b/keyboards/halfcliff/info.json @@ -14,6 +14,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/halfcliff/rules.mk b/keyboards/halfcliff/rules.mk index 004db2a6d71..425015c04d8 100644 --- a/keyboards/halfcliff/rules.mk +++ b/keyboards/halfcliff/rules.mk @@ -10,7 +10,6 @@ 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 -SPLIT_KEYBOARD = yes ENCODER_ENABLE = no POINTING_DEVICE_ENABLE = no CUSTOM_MATRIX = yes diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json index 9c215a5e860..9b0164ed85e 100644 --- a/keyboards/handwired/10k/info.json +++ b/keyboards/handwired/10k/info.json @@ -15,6 +15,9 @@ "mousekey": false, "nkro": false }, + "split": { + "enabled": true + }, "usb": { "vid": "0x6869", "pid": "0x0001", diff --git a/keyboards/handwired/10k/rules.mk b/keyboards/handwired/10k/rules.mk index b4310ab72a6..4da205a168c 100644 --- a/keyboards/handwired/10k/rules.mk +++ b/keyboards/handwired/10k/rules.mk @@ -1,2 +1 @@ -SPLIT_KEYBOARD = yes LTO_ENABLE = yes diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json index 910a628ca6a..01ec6602b7c 100644 --- a/keyboards/handwired/brain/info.json +++ b/keyboards/handwired/brain/info.json @@ -25,6 +25,7 @@ "max_brightness": 120 }, "split": { + "enabled": true, "soft_serial_pin": "D0", "bootmagic": { "matrix": [5, 0] diff --git a/keyboards/handwired/brain/rules.mk b/keyboards/handwired/brain/rules.mk index df7d719da16..6fe874e748b 100644 --- a/keyboards/handwired/brain/rules.mk +++ b/keyboards/handwired/brain/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json index 0bbdefe9216..9d1d47564a7 100644 --- a/keyboards/handwired/chiron/info.json +++ b/keyboards/handwired/chiron/info.json @@ -24,6 +24,7 @@ "pin": "D3" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/chiron/rules.mk b/keyboards/handwired/chiron/rules.mk index 9ca8ab3ebc9..61784649426 100644 --- a/keyboards/handwired/chiron/rules.mk +++ b/keyboards/handwired/chiron/rules.mk @@ -14,4 +14,3 @@ MOUSEKEY_ENABLE = yes NKRO_ENABLE = no # Enable N-Key Rollover RGBLIGHT_ENABLE = yes SLEEP_LED_ENABLE = yes -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json index 141bb477177..12f6f6397a0 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5/info.json @@ -20,6 +20,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/dactyl_manuform/4x5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5/rules.mk index b893863bb52..3f2eac5940c 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/rules.mk +++ b/keyboards/handwired/dactyl_manuform/4x5/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/info.json index 76f13971d45..689b43c5bf5 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5_5/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "development_board": "promicro", diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk index 4240679233b..7748be4c5b3 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk +++ b/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk @@ -9,4 +9,3 @@ 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json index 5b415fbd2bb..9305461f865 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6/info.json @@ -20,6 +20,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/dactyl_manuform/4x6/rules.mk b/keyboards/handwired/dactyl_manuform/4x6/rules.mk index b893863bb52..3f2eac5940c 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/rules.mk +++ b/keyboards/handwired/dactyl_manuform/4x6/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json index f54f0d56d25..9a879132a3e 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json @@ -20,6 +20,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk index b893863bb52..3f2eac5940c 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk +++ b/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json index e6372961d8f..66658447487 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6/info.json @@ -20,6 +20,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/dactyl_manuform/5x6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/rules.mk index b893863bb52..3f2eac5940c 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/rules.mk +++ b/keyboards/handwired/dactyl_manuform/5x6/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json index e9aba3fa180..ec6a432cb24 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0", "bootmagic": { "matrix": [6, 5] diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk index 04b1fc01b7f..ab2c49da70e 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk +++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/info.json index e60286d1664..14b0105cae2 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_5/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0", "bootmagic": { "matrix": [6, 5] diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk index c397f50ab5c..3b6a1809db1 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk +++ b/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/info.json index a00a3bda18d..6a2b00ffffa 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_6/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D3" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk index 59ada7958fa..e70d1927dee 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk +++ b/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes \ No newline at end of file diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json index 68270606cc4..8f1cfe5d17d 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/info.json +++ b/keyboards/handwired/dactyl_manuform/5x7/info.json @@ -20,6 +20,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/dactyl_manuform/5x7/rules.mk b/keyboards/handwired/dactyl_manuform/5x7/rules.mk index b893863bb52..3f2eac5940c 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/rules.mk +++ b/keyboards/handwired/dactyl_manuform/5x7/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json index 0295176c259..905ed5cc3fe 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json @@ -5,6 +5,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "bootmagic": { "matrix": [7, 0] } diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk index 9be91100437..c6228f59ed7 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk @@ -11,11 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -# Build Options -# change yes to no to disable -# -SPLIT_KEYBOARD = yes # split settings # https://beta.docs.qmk.fm/developing-qmk/c-development/hardware_drivers/serial_driver SERIAL_DRIVER = usart diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json index 245310fd3c5..e9b1152d664 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json @@ -5,6 +5,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/handwired/dactyl_manuform/6x6/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/rules.mk index 84645084d3a..389d7509f00 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/rules.mk +++ b/keyboards/handwired/dactyl_manuform/6x6/rules.mk @@ -10,6 +10,5 @@ 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 -SPLIT_KEYBOARD = yes DEFAULT_FOLDER = handwired/dactyl_manuform/6x6/promicro diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json index 955060de7a0..e9b0eb40295 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json @@ -20,6 +20,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk index b893863bb52..3f2eac5940c 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk +++ b/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/info.json index 2ae20d2f4a8..3c354bbcec4 100644 --- a/keyboards/handwired/dactyl_promicro/info.json +++ b/keyboards/handwired/dactyl_promicro/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/handwired/dactyl_promicro/rules.mk b/keyboards/handwired/dactyl_promicro/rules.mk index d3768185db4..d68e4764c51 100644 --- a/keyboards/handwired/dactyl_promicro/rules.mk +++ b/keyboards/handwired/dactyl_promicro/rules.mk @@ -10,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/dactyl_rah/info.json b/keyboards/handwired/dactyl_rah/info.json index bfacb99a4b0..6cd23a54cf0 100644 --- a/keyboards/handwired/dactyl_rah/info.json +++ b/keyboards/handwired/dactyl_rah/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/dactyl_rah/rules.mk b/keyboards/handwired/dactyl_rah/rules.mk index b893863bb52..3f2eac5940c 100644 --- a/keyboards/handwired/dactyl_rah/rules.mk +++ b/keyboards/handwired/dactyl_rah/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/info.json index 9a43e14c883..ea54669232d 100644 --- a/keyboards/handwired/elrgo_s/info.json +++ b/keyboards/handwired/elrgo_s/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/elrgo_s/rules.mk b/keyboards/handwired/elrgo_s/rules.mk index 04b1fc01b7f..ab2c49da70e 100644 --- a/keyboards/handwired/elrgo_s/rules.mk +++ b/keyboards/handwired/elrgo_s/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json index 0be6c8cdb98..04ba446e702 100644 --- a/keyboards/handwired/freoduo/info.json +++ b/keyboards/handwired/freoduo/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/handwired/freoduo/rules.mk b/keyboards/handwired/freoduo/rules.mk index ed940647bba..89a6989a8c6 100644 --- a/keyboards/handwired/freoduo/rules.mk +++ b/keyboards/handwired/freoduo/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output VELOCIKEY_ENABLE = yes -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/jtallbean/split_65/info.json b/keyboards/handwired/jtallbean/split_65/info.json index fd121427291..502b41ebce0 100644 --- a/keyboards/handwired/jtallbean/split_65/info.json +++ b/keyboards/handwired/jtallbean/split_65/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { diff --git a/keyboards/handwired/jtallbean/split_65/rules.mk b/keyboards/handwired/jtallbean/split_65/rules.mk index c644dd59ee1..fce764c22d4 100644 --- a/keyboards/handwired/jtallbean/split_65/rules.mk +++ b/keyboards/handwired/jtallbean/split_65/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes # Enable split keyboard support diff --git a/keyboards/handwired/ks63/info.json b/keyboards/handwired/ks63/info.json index 6fcd1c12bb8..095f53b7c6c 100644 --- a/keyboards/handwired/ks63/info.json +++ b/keyboards/handwired/ks63/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/ks63/rules.mk b/keyboards/handwired/ks63/rules.mk index 12dd064c625..3f2eac5940c 100644 --- a/keyboards/handwired/ks63/rules.mk +++ b/keyboards/handwired/ks63/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json index 243f9a5d7bd..0c968c419d8 100644 --- a/keyboards/handwired/lagrange/info.json +++ b/keyboards/handwired/lagrange/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "matrix_pins": { "right": { "cols": ["C7", "F7", "F6", "F5", "F4", "F1"], diff --git a/keyboards/handwired/lagrange/rules.mk b/keyboards/handwired/lagrange/rules.mk index f4af87851c7..256826f7fcc 100644 --- a/keyboards/handwired/lagrange/rules.mk +++ b/keyboards/handwired/lagrange/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output UNICODE_ENABLE = yes -SPLIT_KEYBOARD = yes SPLIT_TRANSPORT = custom SRC += transport.c diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json index eae71d95083..cd5de808f4d 100644 --- a/keyboards/handwired/myskeeb/info.json +++ b/keyboards/handwired/myskeeb/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D3", "matrix_pins": { "right": { diff --git a/keyboards/handwired/myskeeb/rules.mk b/keyboards/handwired/myskeeb/rules.mk index e09e2e2bbe9..21c4a23eb3b 100644 --- a/keyboards/handwired/myskeeb/rules.mk +++ b/keyboards/handwired/myskeeb/rules.mk @@ -10,6 +10,5 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes # Enables split keyboard support OLED_ENABLE = yes NO_USB_STARTUP_CHECK = yes diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/info.json index b5298dfae4d..e14bf01acb5 100644 --- a/keyboards/handwired/not_so_minidox/info.json +++ b/keyboards/handwired/not_so_minidox/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/not_so_minidox/rules.mk b/keyboards/handwired/not_so_minidox/rules.mk index 8ea05b5f74a..ab2c49da70e 100644 --- a/keyboards/handwired/not_so_minidox/rules.mk +++ b/keyboards/handwired/not_so_minidox/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/skakunm_dactyl/info.json b/keyboards/handwired/skakunm_dactyl/info.json index d36024c67cd..fa7aad4c4d9 100644 --- a/keyboards/handwired/skakunm_dactyl/info.json +++ b/keyboards/handwired/skakunm_dactyl/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/skakunm_dactyl/rules.mk b/keyboards/handwired/skakunm_dactyl/rules.mk index 7f1fc659ccb..e39bab4422a 100644 --- a/keyboards/handwired/skakunm_dactyl/rules.mk +++ b/keyboards/handwired/skakunm_dactyl/rules.mk @@ -9,6 +9,4 @@ 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 -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/info.json index ea41cb3ac17..c106e4fd5ed 100644 --- a/keyboards/handwired/split65/promicro/info.json +++ b/keyboards/handwired/split65/promicro/info.json @@ -6,6 +6,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D3" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/split65/promicro/rules.mk b/keyboards/handwired/split65/promicro/rules.mk index 3bc7f499ecd..c20f156f45f 100644 --- a/keyboards/handwired/split65/promicro/rules.mk +++ b/keyboards/handwired/split65/promicro/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output OLED_ENABLE = yes -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json index 61aff0e7eab..a9693b3a5b9 100644 --- a/keyboards/handwired/split65/stm32/info.json +++ b/keyboards/handwired/split65/stm32/info.json @@ -6,6 +6,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "A9" }, "processor": "STM32F303", diff --git a/keyboards/handwired/split65/stm32/rules.mk b/keyboards/handwired/split65/stm32/rules.mk index 5033bd1e21f..94186bf8c72 100644 --- a/keyboards/handwired/split65/stm32/rules.mk +++ b/keyboards/handwired/split65/stm32/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = yes # Audio output OLED_ENABLE = yes -SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart diff --git a/keyboards/handwired/split89/info.json b/keyboards/handwired/split89/info.json index dfc1198c588..477f1f6612c 100644 --- a/keyboards/handwired/split89/info.json +++ b/keyboards/handwired/split89/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { diff --git a/keyboards/handwired/split89/rules.mk b/keyboards/handwired/split89/rules.mk index 8ea05b5f74a..ab2c49da70e 100644 --- a/keyboards/handwired/split89/rules.mk +++ b/keyboards/handwired/split89/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/splittest/info.json b/keyboards/handwired/splittest/info.json index 73ffb66e9b4..07cac23aad5 100644 --- a/keyboards/handwired/splittest/info.json +++ b/keyboards/handwired/splittest/info.json @@ -8,6 +8,9 @@ "pid": "0x1111", "device_version": "1.0.0" }, + "split": { + "enabled": true + }, "rgblight": { "led_count": 12, "split_count": [6, 6], diff --git a/keyboards/handwired/splittest/rules.mk b/keyboards/handwired/splittest/rules.mk index cc924d61d83..8d00fcc579f 100644 --- a/keyboards/handwired/splittest/rules.mk +++ b/keyboards/handwired/splittest/rules.mk @@ -10,6 +10,4 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = handwired/splittest/promicro diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json index 321202383f6..aa01e763eb4 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json @@ -18,6 +18,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D3", "bootmagic": { "matrix": [4, 5] diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk index aabe18457a7..0b23bdc61ff 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk +++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk @@ -15,5 +15,3 @@ RGB_MATRIX_ENABLE = no POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = yes - -SPLIT_KEYBOARD = yes diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json index eaaf00bbbd9..c9fe6e89cff 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json @@ -5,6 +5,7 @@ "device_version": "0.0.1" }, "split": { + "enabled": true, "bootmagic": { "matrix": [6, 5] } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk index a689be3dd5a..220a361a4cc 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk @@ -16,6 +16,4 @@ POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = yes -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = handwired/tractyl_manuform/5x6_right/teensy2pp diff --git a/keyboards/handwired/unk/info.json b/keyboards/handwired/unk/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/handwired/unk/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/handwired/unk/rules.mk b/keyboards/handwired/unk/rules.mk index c8a36bee0f2..a03f28dbf5f 100644 --- a/keyboards/handwired/unk/rules.mk +++ b/keyboards/handwired/unk/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = handwired/unk/rev1 diff --git a/keyboards/handwired/xealous/info.json b/keyboards/handwired/xealous/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/handwired/xealous/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk index aff4db8cfd7..aa77674920d 100644 --- a/keyboards/handwired/xealous/rules.mk +++ b/keyboards/handwired/xealous/rules.mk @@ -10,7 +10,6 @@ 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. -SPLIT_KEYBOARD = yes # Use shared split_common code SRC += matrix.c diff --git a/keyboards/helix/pico/info.json b/keyboards/helix/pico/info.json index 953cc2ea101..d4fabc756e4 100644 --- a/keyboards/helix/pico/info.json +++ b/keyboards/helix/pico/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.2" }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "tapping": { diff --git a/keyboards/helix/pico/rules.mk b/keyboards/helix/pico/rules.mk index efa7ae4be57..e18b8fb0c45 100644 --- a/keyboards/helix/pico/rules.mk +++ b/keyboards/helix/pico/rules.mk @@ -1,5 +1,3 @@ -SPLIT_KEYBOARD = yes - # Helix Spacific Build Options default values LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.) LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) diff --git a/keyboards/helix/pico/sc/rules.mk b/keyboards/helix/pico/sc/rules.mk index 4ed0672a708..066fffb74af 100644 --- a/keyboards/helix/pico/sc/rules.mk +++ b/keyboards/helix/pico/sc/rules.mk @@ -1,2 +1 @@ -SPLIT_KEYBOARD = yes LED_BACK_ENABLE = yes diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json index aac3cc9dbb1..fd829782c02 100644 --- a/keyboards/helix/rev2/info.json +++ b/keyboards/helix/rev2/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2", "transport": { "sync": { diff --git a/keyboards/helix/rev2/keymaps/default/rules.mk b/keyboards/helix/rev2/keymaps/default/rules.mk index 7897a5b1e66..83029d1e0b7 100644 --- a/keyboards/helix/rev2/keymaps/default/rules.mk +++ b/keyboards/helix/rev2/keymaps/default/rules.mk @@ -1,5 +1,3 @@ -SPLIT_KEYBOARD = yes - LTO_ENABLE = yes # if firmware size over limit, try this option # Helix Spacific Build Options diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk index 4ca86c4f99e..b4f8e27de4d 100644 --- a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk +++ b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk @@ -1,5 +1,4 @@ LTO_ENABLE = no # if firmware size over limit, try this option -SPLIT_KEYBOARD = yes # Helix Spacific Build Options # you can uncomment and edit follows 7 Variables diff --git a/keyboards/helix/rev2/keymaps/led_test/rules.mk b/keyboards/helix/rev2/keymaps/led_test/rules.mk index 98df1f45e82..5aa9439f4c1 100644 --- a/keyboards/helix/rev2/keymaps/led_test/rules.mk +++ b/keyboards/helix/rev2/keymaps/led_test/rules.mk @@ -5,7 +5,6 @@ # See TOP/keyboards/helix/rules.mk for a list of options that can be set. # See TOP/docs/config_options.md for more information. # -SPLIT_KEYBOARD = yes LTO_ENABLE = no # if firmware size over limit, try this option diff --git a/keyboards/helix/rev2/rules.mk b/keyboards/helix/rev2/rules.mk index 03396029a3d..e827ae111f1 100644 --- a/keyboards/helix/rev2/rules.mk +++ b/keyboards/helix/rev2/rules.mk @@ -1,7 +1,5 @@ KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk -SPLIT_KEYBOARD = yes - # Helix Spacific Build Options default values OLED_ENABLE = yes # OLED_ENABLE LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c" diff --git a/keyboards/helix/rev2/sc/rules.mk b/keyboards/helix/rev2/sc/rules.mk index 4ed0672a708..066fffb74af 100644 --- a/keyboards/helix/rev2/sc/rules.mk +++ b/keyboards/helix/rev2/sc/rules.mk @@ -1,2 +1 @@ -SPLIT_KEYBOARD = yes LED_BACK_ENABLE = yes diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json index a1752d01236..ce7bcde3e03 100644 --- a/keyboards/helix/rev3_4rows/info.json +++ b/keyboards/helix/rev3_4rows/info.json @@ -26,6 +26,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "ws2812": { diff --git a/keyboards/helix/rev3_4rows/rules.mk b/keyboards/helix/rev3_4rows/rules.mk index a46f9d9c59f..01251cd7807 100644 --- a/keyboards/helix/rev3_4rows/rules.mk +++ b/keyboards/helix/rev3_4rows/rules.mk @@ -1,6 +1,5 @@ EXTRAKEY_ENABLE = yes # Audio control and System control RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -SPLIT_KEYBOARD = yes RGB_MATRIX_ENABLE = no OLED_ENABLE = yes ENCODER_ENABLE = yes diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json index 57d4e11dfe5..e867f033262 100644 --- a/keyboards/helix/rev3_5rows/info.json +++ b/keyboards/helix/rev3_5rows/info.json @@ -92,6 +92,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "ws2812": { diff --git a/keyboards/helix/rev3_5rows/rules.mk b/keyboards/helix/rev3_5rows/rules.mk index 7cd934ebc4e..d1972faa1b3 100644 --- a/keyboards/helix/rev3_5rows/rules.mk +++ b/keyboards/helix/rev3_5rows/rules.mk @@ -1,6 +1,5 @@ EXTRAKEY_ENABLE = yes # Audio control and System control RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -SPLIT_KEYBOARD = yes RGB_MATRIX_ENABLE = no OLED_ENABLE = yes ENCODER_ENABLE = yes diff --git a/keyboards/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/info.json index ee43e96bdd0..67903569ab2 100644 --- a/keyboards/hidtech/bastyl/info.json +++ b/keyboards/hidtech/bastyl/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "ws2812": { diff --git a/keyboards/hidtech/bastyl/rules.mk b/keyboards/hidtech/bastyl/rules.mk index 323b24ba201..2eba275490a 100644 --- a/keyboards/hidtech/bastyl/rules.mk +++ b/keyboards/hidtech/bastyl/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/info.json index 7512debabdf..6dd45b06f08 100644 --- a/keyboards/hillside/46/0_1/info.json +++ b/keyboards/hillside/46/0_1/info.json @@ -22,6 +22,7 @@ "rgblight": true }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/hillside/46/0_1/rules.mk b/keyboards/hillside/46/0_1/rules.mk index 3c12e55b581..093b81abfe0 100644 --- a/keyboards/hillside/46/0_1/rules.mk +++ b/keyboards/hillside/46/0_1/rules.mk @@ -1,4 +1,3 @@ -SPLIT_KEYBOARD = yes # Use shared split_common code LTO_ENABLE = yes # Use link time optimization for smaller firmware # If you add a haptic board, diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/info.json index b6007f1f729..4f565f5cdc6 100644 --- a/keyboards/hillside/48/0_1/info.json +++ b/keyboards/hillside/48/0_1/info.json @@ -22,6 +22,7 @@ "rgblight": true }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/hillside/48/0_1/rules.mk b/keyboards/hillside/48/0_1/rules.mk index 3c12e55b581..093b81abfe0 100644 --- a/keyboards/hillside/48/0_1/rules.mk +++ b/keyboards/hillside/48/0_1/rules.mk @@ -1,4 +1,3 @@ -SPLIT_KEYBOARD = yes # Use shared split_common code LTO_ENABLE = yes # Use link time optimization for smaller firmware # If you add a haptic board, diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/info.json index 63bbf3b2577..2064ba617cc 100644 --- a/keyboards/hillside/52/0_1/info.json +++ b/keyboards/hillside/52/0_1/info.json @@ -22,6 +22,7 @@ "rgblight": true }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/hillside/52/0_1/rules.mk b/keyboards/hillside/52/0_1/rules.mk index 3c12e55b581..093b81abfe0 100644 --- a/keyboards/hillside/52/0_1/rules.mk +++ b/keyboards/hillside/52/0_1/rules.mk @@ -1,4 +1,3 @@ -SPLIT_KEYBOARD = yes # Use shared split_common code LTO_ENABLE = yes # Use link time optimization for smaller firmware # If you add a haptic board, diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json index 081dd8ddd5d..862b6323b02 100644 --- a/keyboards/ibnuda/squiggle/rev1/info.json +++ b/keyboards/ibnuda/squiggle/rev1/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/ibnuda/squiggle/rev1/rules.mk b/keyboards/ibnuda/squiggle/rev1/rules.mk index ff66487bad9..2382d570350 100644 --- a/keyboards/ibnuda/squiggle/rev1/rules.mk +++ b/keyboards/ibnuda/squiggle/rev1/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json index d2d1e73943a..51bf7a5f126 100644 --- a/keyboards/input_club/ergodox_infinity/info.json +++ b/keyboards/input_club/ergodox_infinity/info.json @@ -38,6 +38,9 @@ "rows": ["B2", "B3", "B18", "B19", "C0", "C9", "C10", "C11", "D0"] }, "diode_direction": "ROW2COL", + "split": { + "enabled": true + }, "processor": "MK20DX256", "bootloader": "kiibohd", "board": "IC_TEENSY_3_1", diff --git a/keyboards/input_club/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk index 4f1b0c01881..da68a7f25d1 100644 --- a/keyboards/input_club/ergodox_infinity/rules.mk +++ b/keyboards/input_club/ergodox_infinity/rules.mk @@ -13,7 +13,6 @@ SLEEP_LED_ENABLE = yes RGBLIGHT_ENABLE = no -SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart ST7565_ENABLE = yes diff --git a/keyboards/jian/handwired/rules.mk b/keyboards/jian/handwired/rules.mk index 947cf020389..a0c271ea25c 100644 --- a/keyboards/jian/handwired/rules.mk +++ b/keyboards/jian/handwired/rules.mk @@ -1,6 +1,5 @@ # Build Options # change yes to no to disable # -SPLIT_KEYBOARD = no BACKLIGHT_ENABLE = no RGBLIGHT_ENABLE = no diff --git a/keyboards/jian/nsrev2/rules.mk b/keyboards/jian/nsrev2/rules.mk index 3d0af8ae989..a05436d218b 100644 --- a/keyboards/jian/nsrev2/rules.mk +++ b/keyboards/jian/nsrev2/rules.mk @@ -2,6 +2,5 @@ # change yes to no to disable # CONSOLE_ENABLE = no -SPLIT_KEYBOARD = no BACKLIGHT_ENABLE = yes RGBLIGHT_ENABLE = no diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json index 68a6efe47b1..3cfc0266670 100644 --- a/keyboards/jian/rev1/info.json +++ b/keyboards/jian/rev1/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "1.0.0" }, + "split": { + "enabled": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D3", "D2", "E6", "B4"] diff --git a/keyboards/jian/rev1/rules.mk b/keyboards/jian/rev1/rules.mk index 33588c1755e..bd3228c26eb 100644 --- a/keyboards/jian/rev1/rules.mk +++ b/keyboards/jian/rev1/rules.mk @@ -2,7 +2,6 @@ # change yes to no to disable # CONSOLE_ENABLE = no -SPLIT_KEYBOARD = yes BACKLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes DIP_SWITCH_ENABLE = yes diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json index cfcfc8e2fa4..ebd015c9a4a 100644 --- a/keyboards/jian/rev2/info.json +++ b/keyboards/jian/rev2/info.json @@ -38,6 +38,7 @@ "esc_output": "D3" }, "split": { + "enabled": true, "soft_serial_pin": "D1" }, "processor": "atmega32u4", diff --git a/keyboards/jian/rev2/rules.mk b/keyboards/jian/rev2/rules.mk index 8e6da2d84f0..e8415063bc2 100644 --- a/keyboards/jian/rev2/rules.mk +++ b/keyboards/jian/rev2/rules.mk @@ -2,6 +2,5 @@ # change yes to no to disable # CONSOLE_ENABLE = no -SPLIT_KEYBOARD = yes BACKLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json index 0332657ffc6..061ac2cc7c6 100644 --- a/keyboards/jiran/info.json +++ b/keyboards/jiran/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D1" }, "processor": "atmega32u4", diff --git a/keyboards/jiran/rules.mk b/keyboards/jiran/rules.mk index b4c74a089dc..d1450315061 100644 --- a/keyboards/jiran/rules.mk +++ b/keyboards/jiran/rules.mk @@ -10,6 +10,5 @@ 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 -SPLIT_KEYBOARD = yes DEFAULT_FOLDER = jiran/rev1 diff --git a/keyboards/jorne/info.json b/keyboards/jorne/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/jorne/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/jorne/rules.mk b/keyboards/jorne/rules.mk index 60e4f7b0dee..fb1b47d1065 100644 --- a/keyboards/jorne/rules.mk +++ b/keyboards/jorne/rules.mk @@ -9,7 +9,6 @@ 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 -SPLIT_KEYBOARD = yes # Split common LTO_ENABLE = yes DEFAULT_FOLDER = jorne/rev1 diff --git a/keyboards/kagizaraya/miniaxe/info.json b/keyboards/kagizaraya/miniaxe/info.json index 9b7f3104a0c..a1de251618c 100644 --- a/keyboards/kagizaraya/miniaxe/info.json +++ b/keyboards/kagizaraya/miniaxe/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/kagizaraya/miniaxe/rules.mk b/keyboards/kagizaraya/miniaxe/rules.mk index ee687e87af2..f71583eb50d 100644 --- a/keyboards/kagizaraya/miniaxe/rules.mk +++ b/keyboards/kagizaraya/miniaxe/rules.mk @@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DEBUG_ENABLE = no -SPLIT_KEYBOARD = yes # Use shared split_common code diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json index 6603e790c45..0900eee5a6d 100644 --- a/keyboards/kagizaraya/scythe/info.json +++ b/keyboards/kagizaraya/scythe/info.json @@ -17,6 +17,7 @@ "pin": "B7" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/kagizaraya/scythe/rules.mk b/keyboards/kagizaraya/scythe/rules.mk index aa7fc332fe5..4b976051f32 100644 --- a/keyboards/kagizaraya/scythe/rules.mk +++ b/keyboards/kagizaraya/scythe/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes # Use shared split_common RGBLIGHT_SPLIT = yes diff --git a/keyboards/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json index ac7732e7ca5..fe6cf5bd012 100644 --- a/keyboards/kakunpc/rabbit_capture_plan/info.json +++ b/keyboards/kakunpc/rabbit_capture_plan/info.json @@ -37,6 +37,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/kakunpc/rabbit_capture_plan/rules.mk b/keyboards/kakunpc/rabbit_capture_plan/rules.mk index 18499a95838..698712de91f 100644 --- a/keyboards/kakunpc/rabbit_capture_plan/rules.mk +++ b/keyboards/kakunpc/rabbit_capture_plan/rules.mk @@ -10,5 +10,4 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes OLED_ENABLE = no diff --git a/keyboards/kakunpc/suihankey/rules.mk b/keyboards/kakunpc/suihankey/rules.mk index 80475ea69aa..f777eaf8613 100644 --- a/keyboards/kakunpc/suihankey/rules.mk +++ b/keyboards/kakunpc/suihankey/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output OLED_ENABLE = yes -SPLIT_KEYBOARD = no DEFAULT_FOLDER = kakunpc/suihankey/rev1 diff --git a/keyboards/kakunpc/suihankey/split/info.json b/keyboards/kakunpc/suihankey/split/info.json index 8f624aeb6cf..c186263123b 100644 --- a/keyboards/kakunpc/suihankey/split/info.json +++ b/keyboards/kakunpc/suihankey/split/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/kakunpc/suihankey/split/rules.mk b/keyboards/kakunpc/suihankey/split/rules.mk index 6da41b20b82..08f9eb20bd9 100644 --- a/keyboards/kakunpc/suihankey/split/rules.mk +++ b/keyboards/kakunpc/suihankey/split/rules.mk @@ -1,4 +1,3 @@ OLED_ENABLE = no -SPLIT_KEYBOARD = yes DEFAULT_FOLDER = kakunpc/suihankey/split/rev1 diff --git a/keyboards/kapl/info.json b/keyboards/kapl/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/kapl/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/kapl/rules.mk b/keyboards/kapl/rules.mk index e243d257030..586557a9637 100644 --- a/keyboards/kapl/rules.mk +++ b/keyboards/kapl/rules.mk @@ -10,6 +10,5 @@ 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 -SPLIT_KEYBOARD = yes # Split common DEFAULT_FOLDER = kapl/rev1 diff --git a/keyboards/kb58/info.json b/keyboards/kb58/info.json index b1b1cc98551..0e32ab834bd 100644 --- a/keyboards/kb58/info.json +++ b/keyboards/kb58/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2", "matrix_pins": { "right": { diff --git a/keyboards/kb58/rules.mk b/keyboards/kb58/rules.mk index d8ff9ad313d..164c05712b1 100644 --- a/keyboards/kb58/rules.mk +++ b/keyboards/kb58/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes # Enables split keyboard support diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json index 5738ac69530..c5571d31db0 100644 --- a/keyboards/keebio/bfo9000/info.json +++ b/keyboards/keebio/bfo9000/info.json @@ -14,7 +14,8 @@ }, "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "enabled": true, + "soft_serial_pin": "D0" }, "rgblight": { "led_count": 20, diff --git a/keyboards/keebio/bfo9000/rules.mk b/keyboards/keebio/bfo9000/rules.mk index 743a54659e1..b7f1787db7b 100644 --- a/keyboards/keebio/bfo9000/rules.mk +++ b/keyboards/keebio/bfo9000/rules.mk @@ -10,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/keebio/foldkb/info.json b/keyboards/keebio/foldkb/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/keebio/foldkb/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/keebio/foldkb/rules.mk b/keyboards/keebio/foldkb/rules.mk index 744acea63fe..b9c01e0aff0 100644 --- a/keyboards/keebio/foldkb/rules.mk +++ b/keyboards/keebio/foldkb/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes -SPLIT_KEYBOARD = yes DEFAULT_FOLDER = keebio/foldkb/rev1 diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json index 8631fd58411..8f0de7e531e 100644 --- a/keyboards/keebio/fourier/info.json +++ b/keyboards/keebio/fourier/info.json @@ -20,6 +20,7 @@ "speaker": "C6" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/keebio/fourier/rules.mk b/keyboards/keebio/fourier/rules.mk index ff93a339143..cda7d53ecb4 100644 --- a/keyboards/keebio/fourier/rules.mk +++ b/keyboards/keebio/fourier/rules.mk @@ -10,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json index f5efce863a8..b639cb4328f 100644 --- a/keyboards/keebio/iris/rev1/info.json +++ b/keyboards/keebio/iris/rev1/info.json @@ -15,6 +15,7 @@ "levels": 5 }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/keebio/iris/rev1/rules.mk b/keyboards/keebio/iris/rev1/rules.mk index 12e5a0674bb..2ed95720625 100644 --- a/keyboards/keebio/iris/rev1/rules.mk +++ b/keyboards/keebio/iris/rev1/rules.mk @@ -10,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json index fb5db92913a..85e6ba797af 100644 --- a/keyboards/keebio/iris/rev1_led/info.json +++ b/keyboards/keebio/iris/rev1_led/info.json @@ -14,6 +14,7 @@ "levels": 5 }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/keebio/iris/rev1_led/rules.mk b/keyboards/keebio/iris/rev1_led/rules.mk index 12e5a0674bb..2ed95720625 100644 --- a/keyboards/keebio/iris/rev1_led/rules.mk +++ b/keyboards/keebio/iris/rev1_led/rules.mk @@ -10,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json index aa41d0ebffa..bbd6f97cf4a 100644 --- a/keyboards/keebio/iris/rev2/info.json +++ b/keyboards/keebio/iris/rev2/info.json @@ -14,6 +14,7 @@ "levels": 5 }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/keebio/iris/rev2/rules.mk b/keyboards/keebio/iris/rev2/rules.mk index 286733cc508..d7e69407a24 100644 --- a/keyboards/keebio/iris/rev2/rules.mk +++ b/keyboards/keebio/iris/rev2/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes - LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json index 39bf9dcfb5c..5014519408f 100644 --- a/keyboards/keebio/iris/rev3/info.json +++ b/keyboards/keebio/iris/rev3/info.json @@ -44,6 +44,7 @@ "speaker": "C6" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/keebio/iris/rev3/rules.mk b/keyboards/keebio/iris/rev3/rules.mk index 44c1c1fac3f..6f0bda4dcc0 100644 --- a/keyboards/keebio/iris/rev3/rules.mk +++ b/keyboards/keebio/iris/rev3/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes ENCODER_ENABLE = yes LTO_ENABLE = yes diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json index cc01dab3ec6..6faf28ea447 100644 --- a/keyboards/keebio/iris/rev4/info.json +++ b/keyboards/keebio/iris/rev4/info.json @@ -44,6 +44,7 @@ "speaker": "C6" }, "split": { + "enabled": true, "soft_serial_pin": "D0", "encoder": { "right": { diff --git a/keyboards/keebio/iris/rev4/rules.mk b/keyboards/keebio/iris/rev4/rules.mk index 02da189f9ea..55a08a2117b 100644 --- a/keyboards/keebio/iris/rev4/rules.mk +++ b/keyboards/keebio/iris/rev4/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes ENCODER_ENABLE = yes LTO_ENABLE = yes diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json index 4bb4554f7c0..e812a086e90 100644 --- a/keyboards/keebio/iris/rev5/info.json +++ b/keyboards/keebio/iris/rev5/info.json @@ -50,6 +50,7 @@ "speaker": "C6" }, "split": { + "enabled": true, "soft_serial_pin": "D0", "encoder": { "right": { diff --git a/keyboards/keebio/iris/rev5/rules.mk b/keyboards/keebio/iris/rev5/rules.mk index 8859d8f69ca..8b2f28c1c46 100644 --- a/keyboards/keebio/iris/rev5/rules.mk +++ b/keyboards/keebio/iris/rev5/rules.mk @@ -10,5 +10,4 @@ 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 -SPLIT_KEYBOARD = yes ENCODER_ENABLE = yes diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json index 8563ba64ab7..837bb4e0d06 100644 --- a/keyboards/keebio/iris/rev6/info.json +++ b/keyboards/keebio/iris/rev6/info.json @@ -84,6 +84,7 @@ } }, "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { diff --git a/keyboards/keebio/iris/rev6/rules.mk b/keyboards/keebio/iris/rev6/rules.mk index 5cdaba9bcec..69d1764838d 100644 --- a/keyboards/keebio/iris/rev6/rules.mk +++ b/keyboards/keebio/iris/rev6/rules.mk @@ -10,7 +10,6 @@ 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 -SPLIT_KEYBOARD = yes ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json index a7b81f9224b..a3f25202ce3 100644 --- a/keyboards/keebio/iris/rev7/info.json +++ b/keyboards/keebio/iris/rev7/info.json @@ -83,6 +83,7 @@ } }, "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { diff --git a/keyboards/keebio/iris/rev7/rules.mk b/keyboards/keebio/iris/rev7/rules.mk index 5cdaba9bcec..69d1764838d 100644 --- a/keyboards/keebio/iris/rev7/rules.mk +++ b/keyboards/keebio/iris/rev7/rules.mk @@ -10,7 +10,6 @@ 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 -SPLIT_KEYBOARD = yes ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keebio/kbo5000/info.json b/keyboards/keebio/kbo5000/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/keebio/kbo5000/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/keebio/kbo5000/rules.mk b/keyboards/keebio/kbo5000/rules.mk index 68661bd7dcf..c6a1e8d0d17 100644 --- a/keyboards/keebio/kbo5000/rules.mk +++ b/keyboards/keebio/kbo5000/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. LTO_ENABLE = yes -SPLIT_KEYBOARD = yes DEFAULT_FOLDER = keebio/kbo5000/rev1 diff --git a/keyboards/keebio/levinson/info.json b/keyboards/keebio/levinson/info.json index d7cbab9f451..29ae8be8cb5 100644 --- a/keyboards/keebio/levinson/info.json +++ b/keyboards/keebio/levinson/info.json @@ -6,6 +6,9 @@ "usb": { "vid": "0xCB10" }, + "split": { + "enabled": true + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x12"] diff --git a/keyboards/keebio/levinson/rules.mk b/keyboards/keebio/levinson/rules.mk index 249f8878816..eab321ff014 100644 --- a/keyboards/keebio/levinson/rules.mk +++ b/keyboards/keebio/levinson/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = keebio/levinson/rev2 diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/info.json index cd729aa87b7..105e159d5a3 100644 --- a/keyboards/keebio/nyquist/rev1/info.json +++ b/keyboards/keebio/nyquist/rev1/info.json @@ -10,6 +10,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/keebio/nyquist/rev1/rules.mk b/keyboards/keebio/nyquist/rev1/rules.mk index 714a247e2bd..e39bab4422a 100644 --- a/keyboards/keebio/nyquist/rev1/rules.mk +++ b/keyboards/keebio/nyquist/rev1/rules.mk @@ -10,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/info.json index f6b80cb9460..31987f2f949 100644 --- a/keyboards/keebio/nyquist/rev2/info.json +++ b/keyboards/keebio/nyquist/rev2/info.json @@ -21,6 +21,7 @@ "pin": "D3" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/keebio/nyquist/rev2/rules.mk b/keyboards/keebio/nyquist/rev2/rules.mk index 83432f0b5e6..083a3e806cb 100644 --- a/keyboards/keebio/nyquist/rev2/rules.mk +++ b/keyboards/keebio/nyquist/rev2/rules.mk @@ -10,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/info.json index 9b3cc6d15aa..955c9281074 100644 --- a/keyboards/keebio/nyquist/rev3/info.json +++ b/keyboards/keebio/nyquist/rev3/info.json @@ -14,6 +14,7 @@ "levels": 7 }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/keebio/nyquist/rev3/rules.mk b/keyboards/keebio/nyquist/rev3/rules.mk index 83432f0b5e6..083a3e806cb 100644 --- a/keyboards/keebio/nyquist/rev3/rules.mk +++ b/keyboards/keebio/nyquist/rev3/rules.mk @@ -10,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/keebio/quefrency/info.json b/keyboards/keebio/quefrency/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/keebio/quefrency/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/keebio/quefrency/rules.mk b/keyboards/keebio/quefrency/rules.mk index cd165afef28..33c64f3d654 100644 --- a/keyboards/keebio/quefrency/rules.mk +++ b/keyboards/keebio/quefrency/rules.mk @@ -8,7 +8,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = keebio/quefrency/rev1 LTO_ENABLE = yes diff --git a/keyboards/keebio/rorschach/info.json b/keyboards/keebio/rorschach/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/keebio/rorschach/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/keebio/rorschach/rules.mk b/keyboards/keebio/rorschach/rules.mk index baf3beba146..59170f1516a 100644 --- a/keyboards/keebio/rorschach/rules.mk +++ b/keyboards/keebio/rorschach/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = keebio/rorschach/rev1 diff --git a/keyboards/keebio/viterbi/info.json b/keyboards/keebio/viterbi/info.json index 1fadcce126f..8b1063ea98c 100644 --- a/keyboards/keebio/viterbi/info.json +++ b/keyboards/keebio/viterbi/info.json @@ -5,6 +5,9 @@ "usb": { "vid": "0xCB10" }, + "split": { + "enabled": true + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_5x14"] diff --git a/keyboards/keebio/viterbi/rules.mk b/keyboards/keebio/viterbi/rules.mk index 2008e63b003..5192d5ba728 100644 --- a/keyboards/keebio/viterbi/rules.mk +++ b/keyboards/keebio/viterbi/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = keebio/viterbi/rev2 diff --git a/keyboards/keyprez/bison/info.json b/keyboards/keyprez/bison/info.json index 3e47764d5eb..29b1a9da723 100644 --- a/keyboards/keyprez/bison/info.json +++ b/keyboards/keyprez/bison/info.json @@ -19,6 +19,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D0", "encoder": { "right": { diff --git a/keyboards/keyprez/bison/rules.mk b/keyboards/keyprez/bison/rules.mk index 21a7746f6c6..453f0a34d38 100644 --- a/keyboards/keyprez/bison/rules.mk +++ b/keyboards/keyprez/bison/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes ENCODER_ENABLE = yes diff --git a/keyboards/keyprez/unicorn/info.json b/keyboards/keyprez/unicorn/info.json index 58d2a98d300..2d2ab010e79 100644 --- a/keyboards/keyprez/unicorn/info.json +++ b/keyboards/keyprez/unicorn/info.json @@ -19,6 +19,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { diff --git a/keyboards/keyprez/unicorn/rules.mk b/keyboards/keyprez/unicorn/rules.mk index 9458603d100..4f4828ca976 100644 --- a/keyboards/keyprez/unicorn/rules.mk +++ b/keyboards/keyprez/unicorn/rules.mk @@ -10,5 +10,4 @@ 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 -SPLIT_KEYBOARD = yes ENCODER_ENABLE = yes diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json index b2d2a01f8b0..21f078a7c58 100644 --- a/keyboards/keystonecaps/gameroyadvance/info.json +++ b/keyboards/keystonecaps/gameroyadvance/info.json @@ -39,6 +39,7 @@ "pin": "C7" }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/keystonecaps/gameroyadvance/rules.mk b/keyboards/keystonecaps/gameroyadvance/rules.mk index 2a8d8c7bce6..f90bd0ef997 100644 --- a/keyboards/keystonecaps/gameroyadvance/rules.mk +++ b/keyboards/keystonecaps/gameroyadvance/rules.mk @@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -SPLIT_KEYBOARD = yes \ No newline at end of file diff --git a/keyboards/kumaokobo/kudox/info.json b/keyboards/kumaokobo/kudox/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/kumaokobo/kudox/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/kumaokobo/kudox/rules.mk b/keyboards/kumaokobo/kudox/rules.mk index 261c8e2a2b7..ff1dfc760e7 100644 --- a/keyboards/kumaokobo/kudox/rules.mk +++ b/keyboards/kumaokobo/kudox/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = kumaokobo/kudox/rev3 diff --git a/keyboards/kumaokobo/kudox_full/info.json b/keyboards/kumaokobo/kudox_full/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/kumaokobo/kudox_full/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/kumaokobo/kudox_full/rules.mk b/keyboards/kumaokobo/kudox_full/rules.mk index 06453b2337a..2924b7cee57 100644 --- a/keyboards/kumaokobo/kudox_full/rules.mk +++ b/keyboards/kumaokobo/kudox_full/rules.mk @@ -13,6 +13,4 @@ AUDIO_ENABLE = no # Audio output UNICODE_ENABLE = yes # Unicode LTO_ENABLE = yes -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = kumaokobo/kudox_full/rev1 diff --git a/keyboards/kumaokobo/pico/info.json b/keyboards/kumaokobo/pico/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/kumaokobo/pico/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/kumaokobo/pico/rules.mk b/keyboards/kumaokobo/pico/rules.mk index 11fe77d618d..36372376ea1 100644 --- a/keyboards/kumaokobo/pico/rules.mk +++ b/keyboards/kumaokobo/pico/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = kumaokobo/pico/65keys diff --git a/keyboards/lets_split/info.json b/keyboards/lets_split/info.json index a92a948abd2..4640bd9e84f 100644 --- a/keyboards/lets_split/info.json +++ b/keyboards/lets_split/info.json @@ -3,5 +3,8 @@ "maintainer": "qmk", "processor": "atmega32u4", "bootloader": "caterina", + "split": { + "enabled": true + }, "community_layouts": ["ortho_4x12"] } diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk index cb7097b091a..11f365e8e9c 100644 --- a/keyboards/lets_split/rules.mk +++ b/keyboards/lets_split/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = lets_split/rev2 diff --git a/keyboards/lime/info.json b/keyboards/lime/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/lime/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/lime/rules.mk b/keyboards/lime/rules.mk index 1d1f049a53d..cd2da2eedf3 100644 --- a/keyboards/lime/rules.mk +++ b/keyboards/lime/rules.mk @@ -10,6 +10,5 @@ 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 -SPLIT_KEYBOARD = yes SWAP_HANDS_ENABLE = yes DEFAULT_FOLDER = lime/rev1 diff --git a/keyboards/majistic/info.json b/keyboards/majistic/info.json index 7f4cfa8e94c..00dffa2fc19 100644 --- a/keyboards/majistic/info.json +++ b/keyboards/majistic/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2", "matrix_pins": { "right": { diff --git a/keyboards/majistic/rules.mk b/keyboards/majistic/rules.mk index d7abef3ae35..fce764c22d4 100644 --- a/keyboards/majistic/rules.mk +++ b/keyboards/majistic/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json index 7a9aa305acb..6bbf3477dc0 100644 --- a/keyboards/malevolti/lyra/rev1/info.json +++ b/keyboards/malevolti/lyra/rev1/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "tapping": { diff --git a/keyboards/malevolti/lyra/rev1/rules.mk b/keyboards/malevolti/lyra/rev1/rules.mk index 78e2bfea04a..c2c363d51c3 100644 --- a/keyboards/malevolti/lyra/rev1/rules.mk +++ b/keyboards/malevolti/lyra/rev1/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes -LTO_ENABLE = yes \ No newline at end of file +LTO_ENABLE = yes diff --git a/keyboards/manta60/info.json b/keyboards/manta60/info.json index 86637d4b680..06bcfb88d71 100644 --- a/keyboards/manta60/info.json +++ b/keyboards/manta60/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/manta60/rules.mk b/keyboards/manta60/rules.mk index 31ff5c952c5..be0c854d3c6 100644 --- a/keyboards/manta60/rules.mk +++ b/keyboards/manta60/rules.mk @@ -10,6 +10,5 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes IOS_DEVICE_ENABLE = no # connect to IOS device (iPad, iPhone) diff --git a/keyboards/maple_computing/lets_split_eh/info.json b/keyboards/maple_computing/lets_split_eh/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/maple_computing/lets_split_eh/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/maple_computing/lets_split_eh/rules.mk b/keyboards/maple_computing/lets_split_eh/rules.mk index 4c5d9f9e5d4..8e8d4c13b6c 100644 --- a/keyboards/maple_computing/lets_split_eh/rules.mk +++ b/keyboards/maple_computing/lets_split_eh/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = maple_computing/lets_split_eh/eh diff --git a/keyboards/maple_computing/minidox/info.json b/keyboards/maple_computing/minidox/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/maple_computing/minidox/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/maple_computing/minidox/rules.mk b/keyboards/maple_computing/minidox/rules.mk index 4cf751c4931..64efe315122 100644 --- a/keyboards/maple_computing/minidox/rules.mk +++ b/keyboards/maple_computing/minidox/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = maple_computing/minidox/rev1 diff --git a/keyboards/marksard/rhymestone/info.json b/keyboards/marksard/rhymestone/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/marksard/rhymestone/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/marksard/rhymestone/rules.mk b/keyboards/marksard/rhymestone/rules.mk index 6f15328b5a4..477a0a7da73 100644 --- a/keyboards/marksard/rhymestone/rules.mk +++ b/keyboards/marksard/rhymestone/rules.mk @@ -10,7 +10,6 @@ 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 -SPLIT_KEYBOARD = yes RGB_MATRIX_ENABLE = no DEFAULT_FOLDER = marksard/rhymestone/rev1 diff --git a/keyboards/marksard/treadstone48/rev1/keyboard.json b/keyboards/marksard/treadstone48/rev1/keyboard.json index 5c13e5b15c5..07ad96140d9 100644 --- a/keyboards/marksard/treadstone48/rev1/keyboard.json +++ b/keyboards/marksard/treadstone48/rev1/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "ws2812": { diff --git a/keyboards/marksard/treadstone48/rev2/rules.mk b/keyboards/marksard/treadstone48/rev2/rules.mk index d29d9074a01..3bbd2614291 100644 --- a/keyboards/marksard/treadstone48/rev2/rules.mk +++ b/keyboards/marksard/treadstone48/rev2/rules.mk @@ -1 +1 @@ -SPLIT_KEYBOARD = no +# File intentionally blank diff --git a/keyboards/marksard/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk index e9a2de4c251..dddb6f07296 100644 --- a/keyboards/marksard/treadstone48/rules.mk +++ b/keyboards/marksard/treadstone48/rules.mk @@ -8,7 +8,6 @@ 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 -SPLIT_KEYBOARD = yes MOUSEKEY_ENABLE = yes # Mouse keys diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json index 7289147e6b5..ccc2d02b637 100644 --- a/keyboards/mechwild/mokulua/mirrored/info.json +++ b/keyboards/mechwild/mokulua/mirrored/info.json @@ -22,6 +22,7 @@ "tap_keycode_delay": 10 }, "split": { + "enabled": true, "soft_serial_pin": "D3", "transport": { "sync": { diff --git a/keyboards/mechwild/mokulua/mirrored/rules.mk b/keyboards/mechwild/mokulua/mirrored/rules.mk index 875d4311681..1a9045155ba 100644 --- a/keyboards/mechwild/mokulua/mirrored/rules.mk +++ b/keyboards/mechwild/mokulua/mirrored/rules.mk @@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable encoder OLED_ENABLE = yes # Enable OLED Screen -SPLIT_KEYBOARD = yes # Define split functionality diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json index da82447980f..5b22023cce3 100644 --- a/keyboards/mechwild/mokulua/standard/info.json +++ b/keyboards/mechwild/mokulua/standard/info.json @@ -22,6 +22,7 @@ "tap_keycode_delay": 10 }, "split": { + "enabled": true "soft_serial_pin": "D3", "transport": { "sync": { diff --git a/keyboards/mechwild/mokulua/standard/rules.mk b/keyboards/mechwild/mokulua/standard/rules.mk index 875d4311681..1a9045155ba 100644 --- a/keyboards/mechwild/mokulua/standard/rules.mk +++ b/keyboards/mechwild/mokulua/standard/rules.mk @@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable encoder OLED_ENABLE = yes # Enable OLED Screen -SPLIT_KEYBOARD = yes # Define split functionality diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json index 9c120b92247..a667dbe11be 100644 --- a/keyboards/merge/um70/info.json +++ b/keyboards/merge/um70/info.json @@ -19,6 +19,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "ws2812": { diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk index 11776618e22..45cbdcf0157 100644 --- a/keyboards/merge/um70/rules.mk +++ b/keyboards/merge/um70/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -SPLIT_KEYBOARD = yes OLED_ENABLE = yes diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json index 554d1997a36..64939a18fbd 100644 --- a/keyboards/merge/um80/info.json +++ b/keyboards/merge/um80/info.json @@ -19,6 +19,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "ws2812": { diff --git a/keyboards/merge/um80/rules.mk b/keyboards/merge/um80/rules.mk index 11776618e22..45cbdcf0157 100644 --- a/keyboards/merge/um80/rules.mk +++ b/keyboards/merge/um80/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -SPLIT_KEYBOARD = yes OLED_ENABLE = yes diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json index 7de7cd251f1..6413480391e 100644 --- a/keyboards/merge/uma/info.json +++ b/keyboards/merge/uma/info.json @@ -22,6 +22,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/merge/uma/rules.mk b/keyboards/merge/uma/rules.mk index 8bd01d2bb4c..e146f96ce6f 100644 --- a/keyboards/merge/uma/rules.mk +++ b/keyboards/merge/uma/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -SPLIT_KEYBOARD = yes LTO_ENABLE = yes OLED_ENABLE = yes diff --git a/keyboards/meson/info.json b/keyboards/meson/info.json index 55b4591f1fb..aeec25f0465 100644 --- a/keyboards/meson/info.json +++ b/keyboards/meson/info.json @@ -13,6 +13,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/meson/rules.mk b/keyboards/meson/rules.mk index 2f33b87f294..9686f2e033e 100644 --- a/keyboards/meson/rules.mk +++ b/keyboards/meson/rules.mk @@ -1,7 +1,6 @@ # Build Options # change yes to no to disable # -SPLIT_KEYBOARD = yes BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json index 4f2f658a205..a7f992056ef 100644 --- a/keyboards/mint60/info.json +++ b/keyboards/mint60/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/mint60/rules.mk b/keyboards/mint60/rules.mk index 2cd353930ea..e788df9b325 100644 --- a/keyboards/mint60/rules.mk +++ b/keyboards/mint60/rules.mk @@ -10,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json index 8280ffa022b..83e66ce2ccf 100644 --- a/keyboards/mlego/m60_split/rev1/info.json +++ b/keyboards/mlego/m60_split/rev1/info.json @@ -45,6 +45,7 @@ } }, "split": { + "enabled": true, "bootmagic": { "matrix": [5, 0] }, diff --git a/keyboards/mlego/m60_split/rev1/rules.mk b/keyboards/mlego/m60_split/rev1/rules.mk index 497e86c8cb6..c38e4335e89 100644 --- a/keyboards/mlego/m60_split/rev1/rules.mk +++ b/keyboards/mlego/m60_split/rev1/rules.mk @@ -10,7 +10,6 @@ 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 -SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart ENCODER_ENABLE = yes # Enable encoder diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json index 4ba64424434..e13ce195b42 100644 --- a/keyboards/mlego/m60_split/rev2/info.json +++ b/keyboards/mlego/m60_split/rev2/info.json @@ -38,6 +38,7 @@ "pin": "B15" }, "split": { + "enabled": true, "bootmagic": { "matrix": [5, 0] }, diff --git a/keyboards/mlego/m60_split/rev2/rules.mk b/keyboards/mlego/m60_split/rev2/rules.mk index ac47e053a2a..f3ecf1b52cb 100644 --- a/keyboards/mlego/m60_split/rev2/rules.mk +++ b/keyboards/mlego/m60_split/rev2/rules.mk @@ -10,6 +10,5 @@ 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 -SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart ENCODER_ENABLE = yes # Enable encoder diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json index d45bb124b06..f509451ab3d 100644 --- a/keyboards/momoka_ergo/info.json +++ b/keyboards/momoka_ergo/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D1" }, "rgblight": { diff --git a/keyboards/momoka_ergo/rules.mk b/keyboards/momoka_ergo/rules.mk index 850aa4e2248..6d85e16f920 100644 --- a/keyboards/momoka_ergo/rules.mk +++ b/keyboards/momoka_ergo/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json index 0c92f469aea..e87c76e21a6 100644 --- a/keyboards/nacly/sodium42/info.json +++ b/keyboards/nacly/sodium42/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D3" }, "processor": "atmega32u4", diff --git a/keyboards/nacly/sodium42/rules.mk b/keyboards/nacly/sodium42/rules.mk index f30bd81997e..7c9f712027b 100644 --- a/keyboards/nacly/sodium42/rules.mk +++ b/keyboards/nacly/sodium42/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes \ No newline at end of file diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json index aa60255b0d3..e82dc8c1b5d 100644 --- a/keyboards/nacly/sodium50/info.json +++ b/keyboards/nacly/sodium50/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D3" }, "processor": "atmega32u4", diff --git a/keyboards/nacly/sodium50/rules.mk b/keyboards/nacly/sodium50/rules.mk index f30bd81997e..7c9f712027b 100644 --- a/keyboards/nacly/sodium50/rules.mk +++ b/keyboards/nacly/sodium50/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes \ No newline at end of file diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json index de4f22d6074..45f5c488b8c 100644 --- a/keyboards/nacly/sodium62/info.json +++ b/keyboards/nacly/sodium62/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D3" }, "processor": "atmega32u4", diff --git a/keyboards/nacly/sodium62/rules.mk b/keyboards/nacly/sodium62/rules.mk index c62dc408b51..020e7029212 100644 --- a/keyboards/nacly/sodium62/rules.mk +++ b/keyboards/nacly/sodium62/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes OLED_ENABLE = yes diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json index c4992778890..85038a903b7 100644 --- a/keyboards/nacly/splitreus62/info.json +++ b/keyboards/nacly/splitreus62/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/nacly/splitreus62/rules.mk b/keyboards/nacly/splitreus62/rules.mk index 81ed47f82da..28c29a3b4dc 100644 --- a/keyboards/nacly/splitreus62/rules.mk +++ b/keyboards/nacly/splitreus62/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes diff --git a/keyboards/nullbitsco/snap/info.json b/keyboards/nullbitsco/snap/info.json index 65cd463708b..909e45d1625 100644 --- a/keyboards/nullbitsco/snap/info.json +++ b/keyboards/nullbitsco/snap/info.json @@ -31,6 +31,7 @@ } }, "split": { + "enabled": true, "encoder": { "right": { "rotary": [ diff --git a/keyboards/nullbitsco/snap/rules.mk b/keyboards/nullbitsco/snap/rules.mk index 2ad88b97c02..087be867f3e 100644 --- a/keyboards/nullbitsco/snap/rules.mk +++ b/keyboards/nullbitsco/snap/rules.mk @@ -9,7 +9,6 @@ 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 -SPLIT_KEYBOARD = yes # Split common LTO_ENABLE = yes # Use Link Time Optimization ENCODER_ENABLE = yes # Enables the use of one or more encoders SPACE_CADET_ENABLE = no # Enables the use of Space Cadet diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json index 464cd01be8f..bc997372785 100644 --- a/keyboards/obosob/arch_36/info.json +++ b/keyboards/obosob/arch_36/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/obosob/arch_36/rules.mk b/keyboards/obosob/arch_36/rules.mk index 7d311cd4058..7d3e33104ff 100644 --- a/keyboards/obosob/arch_36/rules.mk +++ b/keyboards/obosob/arch_36/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow OLED_ENABLE = yes AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes # Split common diff --git a/keyboards/obosob/steal_this_keyboard/info.json b/keyboards/obosob/steal_this_keyboard/info.json index e598ec33929..aecfffd7596 100644 --- a/keyboards/obosob/steal_this_keyboard/info.json +++ b/keyboards/obosob/steal_this_keyboard/info.json @@ -19,6 +19,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "matrix_pins": { "right": { diff --git a/keyboards/obosob/steal_this_keyboard/rules.mk b/keyboards/obosob/steal_this_keyboard/rules.mk index 0ce5439c7b3..f59e3a88231 100644 --- a/keyboards/obosob/steal_this_keyboard/rules.mk +++ b/keyboards/obosob/steal_this_keyboard/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow UNICODE_ENABLE = yes # Unicode AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes # Use shared split_common code diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json index 8e21be5d690..8ec0cb69b21 100644 --- a/keyboards/oddball/info.json +++ b/keyboards/oddball/info.json @@ -8,6 +8,9 @@ "pid": "0xCA49", "device_version": "0.0.1" }, + "split": { + "enabled": true + }, "processor": "atmega32u4", "layouts": { "LAYOUT": { diff --git a/keyboards/oddball/rules.mk b/keyboards/oddball/rules.mk index 50c2891bb8a..5a3becd82a6 100644 --- a/keyboards/oddball/rules.mk +++ b/keyboards/oddball/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = adns9800 diff --git a/keyboards/ogre/ergo_single/rules.mk b/keyboards/ogre/ergo_single/rules.mk index a3964a74c08..ff287d5235b 100644 --- a/keyboards/ogre/ergo_single/rules.mk +++ b/keyboards/ogre/ergo_single/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = no diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json index 7da3bb487a6..d937fe9373a 100644 --- a/keyboards/ogre/ergo_split/info.json +++ b/keyboards/ogre/ergo_split/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D3" }, "rgblight": { diff --git a/keyboards/ogre/ergo_split/rules.mk b/keyboards/ogre/ergo_split/rules.mk index ce485aeb0a5..ff287d5235b 100644 --- a/keyboards/ogre/ergo_split/rules.mk +++ b/keyboards/ogre/ergo_split/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes diff --git a/keyboards/omkbd/ergodash/info.json b/keyboards/omkbd/ergodash/info.json index 4369a041038..306a3970bb8 100644 --- a/keyboards/omkbd/ergodash/info.json +++ b/keyboards/omkbd/ergodash/info.json @@ -1,4 +1,7 @@ { "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "split": { + "enabled": true + } } diff --git a/keyboards/omkbd/ergodash/rules.mk b/keyboards/omkbd/ergodash/rules.mk index 9a3cb950887..015ffcd8fb7 100644 --- a/keyboards/omkbd/ergodash/rules.mk +++ b/keyboards/omkbd/ergodash/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes # Enables split keyboard support - DEFAULT_FOLDER = omkbd/ergodash/rev1 diff --git a/keyboards/omkbd/runner3680/info.json b/keyboards/omkbd/runner3680/info.json index 4369a041038..306a3970bb8 100644 --- a/keyboards/omkbd/runner3680/info.json +++ b/keyboards/omkbd/runner3680/info.json @@ -1,4 +1,7 @@ { "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "split": { + "enabled": true + } } diff --git a/keyboards/omkbd/runner3680/rules.mk b/keyboards/omkbd/runner3680/rules.mk index 5f16740e242..d90dd4adda3 100644 --- a/keyboards/omkbd/runner3680/rules.mk +++ b/keyboards/omkbd/runner3680/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes # Enables split keyboard support - DEFAULT_FOLDER = omkbd/runner3680/5x8 diff --git a/keyboards/orthodox/info.json b/keyboards/orthodox/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/orthodox/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/orthodox/rules.mk b/keyboards/orthodox/rules.mk index bb68468ec43..8fa7b0a404f 100644 --- a/keyboards/orthodox/rules.mk +++ b/keyboards/orthodox/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = orthodox/rev3 diff --git a/keyboards/phoenix/info.json b/keyboards/phoenix/info.json index 2079750678a..c6a55a973af 100644 --- a/keyboards/phoenix/info.json +++ b/keyboards/phoenix/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "A9" }, "processor": "STM32F401", diff --git a/keyboards/phoenix/rules.mk b/keyboards/phoenix/rules.mk index a83da5e996d..1e98eb214a5 100644 --- a/keyboards/phoenix/rules.mk +++ b/keyboards/phoenix/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output STENO_ENABLE = no -SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart KEYBOARD_SHARED_EP = yes diff --git a/keyboards/pinky/info.json b/keyboards/pinky/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/pinky/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/pinky/rules.mk b/keyboards/pinky/rules.mk index 1b080863552..0329fc8dd57 100644 --- a/keyboards/pinky/rules.mk +++ b/keyboards/pinky/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = pinky/3 diff --git a/keyboards/pisces/info.json b/keyboards/pisces/info.json index e3dfef5ab7e..48ef9db5c0e 100644 --- a/keyboards/pisces/info.json +++ b/keyboards/pisces/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u2", diff --git a/keyboards/pisces/rules.mk b/keyboards/pisces/rules.mk index b3c916d3cea..3b6a1809db1 100644 --- a/keyboards/pisces/rules.mk +++ b/keyboards/pisces/rules.mk @@ -10,6 +10,3 @@ 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 - -# Enable generic behavior for split boards -SPLIT_KEYBOARD = yes diff --git a/keyboards/pluckey/info.json b/keyboards/pluckey/info.json index 3668fc9a2b4..0efd9db12d5 100644 --- a/keyboards/pluckey/info.json +++ b/keyboards/pluckey/info.json @@ -19,6 +19,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/pluckey/rules.mk b/keyboards/pluckey/rules.mk index 171b6139c2c..b03b6fa9058 100644 --- a/keyboards/pluckey/rules.mk +++ b/keyboards/pluckey/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -SPLIT_KEYBOARD = yes diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json index 76b6e596471..2adb97ec511 100644 --- a/keyboards/pteron36/info.json +++ b/keyboards/pteron36/info.json @@ -22,6 +22,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D3", "encoder": { "right": { diff --git a/keyboards/pteron36/rules.mk b/keyboards/pteron36/rules.mk index d07878747eb..182bad228c7 100644 --- a/keyboards/pteron36/rules.mk +++ b/keyboards/pteron36/rules.mk @@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output OLED_ENABLE = yes # OLED display ENCODER_ENABLE = yes # Encoder support -SPLIT_KEYBOARD = yes # Split enable diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/info.json index 2bec0c52af2..ca8434fdd7d 100644 --- a/keyboards/rate/pistachio/rev1/info.json +++ b/keyboards/rate/pistachio/rev1/info.json @@ -4,6 +4,9 @@ "led_count": 2, "split_count": [1, 1] }, + "split": { + "enabled": true + }, "ws2812": { "pin": "D2" }, diff --git a/keyboards/rate/pistachio/rev1/rules.mk b/keyboards/rate/pistachio/rev1/rules.mk index dda6154e66d..09f976d0e64 100644 --- a/keyboards/rate/pistachio/rev1/rules.mk +++ b/keyboards/rate/pistachio/rev1/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes # Enable split keyboard diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json index 9f0c169b873..0bca53aca36 100644 --- a/keyboards/rate/pistachio/rev2/info.json +++ b/keyboards/rate/pistachio/rev2/info.json @@ -8,6 +8,9 @@ "max_brightness": 195, "split_count": [38, 46] }, + "split": { + "enabled": true + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"], "rows": ["B5", "B4", "E6", "D7", "C6", "D4"] diff --git a/keyboards/rate/pistachio/rev2/rules.mk b/keyboards/rate/pistachio/rev2/rules.mk index dda6154e66d..09f976d0e64 100644 --- a/keyboards/rate/pistachio/rev2/rules.mk +++ b/keyboards/rate/pistachio/rev2/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes # Enable split keyboard diff --git a/keyboards/recompile_keys/choco60/rev1/info.json b/keyboards/recompile_keys/choco60/rev1/info.json index 3960f575ab9..2a4dd3f7f3d 100644 --- a/keyboards/recompile_keys/choco60/rev1/info.json +++ b/keyboards/recompile_keys/choco60/rev1/info.json @@ -5,6 +5,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D3" }, "processor": "atmega32u4", diff --git a/keyboards/recompile_keys/choco60/rev1/rules.mk b/keyboards/recompile_keys/choco60/rev1/rules.mk index b74db0a672b..4d82dff69aa 100644 --- a/keyboards/recompile_keys/choco60/rev1/rules.mk +++ b/keyboards/recompile_keys/choco60/rev1/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes # Enable split keyboard diff --git a/keyboards/recompile_keys/choco60/rev2/info.json b/keyboards/recompile_keys/choco60/rev2/info.json index c03e8678f6b..6565dc98347 100644 --- a/keyboards/recompile_keys/choco60/rev2/info.json +++ b/keyboards/recompile_keys/choco60/rev2/info.json @@ -5,6 +5,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { diff --git a/keyboards/recompile_keys/choco60/rev2/rules.mk b/keyboards/recompile_keys/choco60/rev2/rules.mk index ca4dbbab2fa..fa6fbf34d9f 100644 --- a/keyboards/recompile_keys/choco60/rev2/rules.mk +++ b/keyboards/recompile_keys/choco60/rev2/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes diff --git a/keyboards/recompile_keys/cocoa40/info.json b/keyboards/recompile_keys/cocoa40/info.json index 76a9302eff1..1051dfb673a 100644 --- a/keyboards/recompile_keys/cocoa40/info.json +++ b/keyboards/recompile_keys/cocoa40/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/recompile_keys/cocoa40/rules.mk b/keyboards/recompile_keys/cocoa40/rules.mk index 10e75fed2e2..7552bdafa65 100644 --- a/keyboards/recompile_keys/cocoa40/rules.mk +++ b/keyboards/recompile_keys/cocoa40/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes diff --git a/keyboards/redox_media/info.json b/keyboards/redox_media/info.json index 12e8f089b59..c4e890f5577 100644 --- a/keyboards/redox_media/info.json +++ b/keyboards/redox_media/info.json @@ -19,6 +19,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/redox_media/rules.mk b/keyboards/redox_media/rules.mk index 786e3ac0293..5ad7700a767 100644 --- a/keyboards/redox_media/rules.mk +++ b/keyboards/redox_media/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -SPLIT_KEYBOARD = yes # Disable unsupported hardware AUDIO_SUPPORTED = no diff --git a/keyboards/rgbkb/mun/info.json b/keyboards/rgbkb/mun/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/rgbkb/mun/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk index 4269e3b0a1f..04d4c554ad5 100644 --- a/keyboards/rgbkb/mun/rules.mk +++ b/keyboards/rgbkb/mun/rules.mk @@ -22,7 +22,6 @@ OLED_ENABLE = yes ENCODER_ENABLE = yes -SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart LTO_ENABLE = yes OPT = 3 diff --git a/keyboards/rgbkb/sol/info.json b/keyboards/rgbkb/sol/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/rgbkb/sol/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/rgbkb/sol/rules.mk b/keyboards/rgbkb/sol/rules.mk index 2cacb68825d..c956bb9f5f1 100644 --- a/keyboards/rgbkb/sol/rules.mk +++ b/keyboards/rgbkb/sol/rules.mk @@ -1,7 +1,6 @@ # Custom local font file OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" -SPLIT_KEYBOARD = yes ENCODER_ENABLE = yes DEFAULT_FOLDER = rgbkb/sol/rev2 diff --git a/keyboards/rgbkb/sol3/info.json b/keyboards/rgbkb/sol3/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/rgbkb/sol3/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk index 227219e3024..bf22130a55a 100644 --- a/keyboards/rgbkb/sol3/rules.mk +++ b/keyboards/rgbkb/sol3/rules.mk @@ -26,7 +26,6 @@ OLED_ENABLE = yes ENCODER_ENABLE = yes -SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart LTO_ENABLE = yes OPT = 3 diff --git a/keyboards/rgbkb/zen/info.json b/keyboards/rgbkb/zen/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/rgbkb/zen/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/rgbkb/zen/rules.mk b/keyboards/rgbkb/zen/rules.mk index 3c692c76fce..28653a7d5f8 100644 --- a/keyboards/rgbkb/zen/rules.mk +++ b/keyboards/rgbkb/zen/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = no # Enable N-Key Rollover AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight DEFAULT_FOLDER = rgbkb/zen/rev2 diff --git a/keyboards/rgbkb/zygomorph/info.json b/keyboards/rgbkb/zygomorph/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/rgbkb/zygomorph/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/rgbkb/zygomorph/rules.mk b/keyboards/rgbkb/zygomorph/rules.mk index bc168c39832..dfdffe3c3a8 100644 --- a/keyboards/rgbkb/zygomorph/rules.mk +++ b/keyboards/rgbkb/zygomorph/rules.mk @@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = rgbkb/zygomorph/rev1 # Disable unsupported hardware diff --git a/keyboards/rura66/rev1/info.json b/keyboards/rura66/rev1/info.json index 591d6228b72..71bb374bfb7 100644 --- a/keyboards/rura66/rev1/info.json +++ b/keyboards/rura66/rev1/info.json @@ -30,6 +30,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "ws2812": { diff --git a/keyboards/rura66/rev1/rules.mk b/keyboards/rura66/rev1/rules.mk index 1c7bdc0c3cd..ec47c1e0348 100644 --- a/keyboards/rura66/rev1/rules.mk +++ b/keyboards/rura66/rev1/rules.mk @@ -1,6 +1,5 @@ EXTRAKEY_ENABLE = yes # Audio control and System control RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -SPLIT_KEYBOARD = yes RGB_MATRIX_ENABLE = no ENCODER_ENABLE = no LTO_ENABLE = yes diff --git a/keyboards/rura66/rules.mk b/keyboards/rura66/rules.mk index c7eacfa19a9..4cbe55ac766 100644 --- a/keyboards/rura66/rules.mk +++ b/keyboards/rura66/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output OLED_ENABLE = yes -SPLIT_KEYBOARD = yes LTO_ENABLE = yes DEFAULT_FOLDER = rura66/rev1 diff --git a/keyboards/salicylic_acid3/7skb/info.json b/keyboards/salicylic_acid3/7skb/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/salicylic_acid3/7skb/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk index 171b119b34d..09cad7556c4 100644 --- a/keyboards/salicylic_acid3/7skb/rules.mk +++ b/keyboards/salicylic_acid3/7skb/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = salicylic_acid3/7skb/rev1 diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json index 35b3d7ec170..4a3ed4cc90f 100644 --- a/keyboards/salicylic_acid3/7splus/info.json +++ b/keyboards/salicylic_acid3/7splus/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/salicylic_acid3/7splus/rules.mk b/keyboards/salicylic_acid3/7splus/rules.mk index 124c57ba15a..a3deaf30b97 100644 --- a/keyboards/salicylic_acid3/7splus/rules.mk +++ b/keyboards/salicylic_acid3/7splus/rules.mk @@ -10,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes diff --git a/keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json index c802635334f..7c8110c1552 100644 --- a/keyboards/salicylic_acid3/ajisai74/info.json +++ b/keyboards/salicylic_acid3/ajisai74/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/salicylic_acid3/ajisai74/rules.mk b/keyboards/salicylic_acid3/ajisai74/rules.mk index 8ea05b5f74a..ab2c49da70e 100644 --- a/keyboards/salicylic_acid3/ajisai74/rules.mk +++ b/keyboards/salicylic_acid3/ajisai74/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json index 3b4df223632..bc6a715f1d6 100644 --- a/keyboards/salicylic_acid3/ergoarrows/info.json +++ b/keyboards/salicylic_acid3/ergoarrows/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/salicylic_acid3/ergoarrows/rules.mk b/keyboards/salicylic_acid3/ergoarrows/rules.mk index a876de5b539..951dd07d6e0 100644 --- a/keyboards/salicylic_acid3/ergoarrows/rules.mk +++ b/keyboards/salicylic_acid3/ergoarrows/rules.mk @@ -10,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes diff --git a/keyboards/salicylic_acid3/jisplit89/info.json b/keyboards/salicylic_acid3/jisplit89/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/salicylic_acid3/jisplit89/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/salicylic_acid3/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk index a496323b5d3..f90f3d9c07c 100644 --- a/keyboards/salicylic_acid3/jisplit89/rules.mk +++ b/keyboards/salicylic_acid3/jisplit89/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = salicylic_acid3/jisplit89/rev1 diff --git a/keyboards/salicylic_acid3/naked48/info.json b/keyboards/salicylic_acid3/naked48/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/salicylic_acid3/naked48/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk index 8712957dfaa..9b6b7a048f7 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk +++ b/keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk @@ -1,3 +1,2 @@ VIA_ENABLE = yes - SPLIT_KEYBOARD = no diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk index 49bb80ca31e..88b5b8b0ade 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk +++ b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk @@ -1,5 +1,4 @@ RGBLIGHT_ENABLE = no RGB_MATRIX_ENABLE = yes VIA_ENABLE = yes - SPLIT_KEYBOARD = no diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk index 033ade5a497..fd9a93f5030 100644 --- a/keyboards/salicylic_acid3/naked48/rules.mk +++ b/keyboards/salicylic_acid3/naked48/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = no -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = salicylic_acid3/naked48/rev1 diff --git a/keyboards/salicylic_acid3/naked60/info.json b/keyboards/salicylic_acid3/naked60/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/salicylic_acid3/naked60/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/salicylic_acid3/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk index e4bce8739b7..2210ae765c9 100644 --- a/keyboards/salicylic_acid3/naked60/rules.mk +++ b/keyboards/salicylic_acid3/naked60/rules.mk @@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = salicylic_acid3/naked60/rev1 diff --git a/keyboards/salicylic_acid3/naked64/info.json b/keyboards/salicylic_acid3/naked64/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/salicylic_acid3/naked64/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/salicylic_acid3/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk index 70e97d797de..03a0fe22c08 100644 --- a/keyboards/salicylic_acid3/naked64/rules.mk +++ b/keyboards/salicylic_acid3/naked64/rules.mk @@ -13,6 +13,4 @@ RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. OLED_ENABLE = no USE_I2C = no -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = salicylic_acid3/naked64/rev1 diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json index fad22122f6c..b5ac551bc9c 100644 --- a/keyboards/salicylic_acid3/nknl7en/info.json +++ b/keyboards/salicylic_acid3/nknl7en/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/salicylic_acid3/nknl7en/rules.mk b/keyboards/salicylic_acid3/nknl7en/rules.mk index a876de5b539..951dd07d6e0 100644 --- a/keyboards/salicylic_acid3/nknl7en/rules.mk +++ b/keyboards/salicylic_acid3/nknl7en/rules.mk @@ -10,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json index 7bafe46d9a0..2501f84d9f9 100644 --- a/keyboards/salicylic_acid3/nknl7jp/info.json +++ b/keyboards/salicylic_acid3/nknl7jp/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/salicylic_acid3/nknl7jp/rules.mk b/keyboards/salicylic_acid3/nknl7jp/rules.mk index a876de5b539..951dd07d6e0 100644 --- a/keyboards/salicylic_acid3/nknl7jp/rules.mk +++ b/keyboards/salicylic_acid3/nknl7jp/rules.mk @@ -10,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes diff --git a/keyboards/scatter42/info.json b/keyboards/scatter42/info.json index 7c76e98f644..c0f8df47bee 100644 --- a/keyboards/scatter42/info.json +++ b/keyboards/scatter42/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/scatter42/rules.mk b/keyboards/scatter42/rules.mk index db5c82928c7..ab2c49da70e 100644 --- a/keyboards/scatter42/rules.mk +++ b/keyboards/scatter42/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD = yes \ No newline at end of file diff --git a/keyboards/sekigon/grs_70ec/info.json b/keyboards/sekigon/grs_70ec/info.json index c213e1e26f8..833cd747895 100644 --- a/keyboards/sekigon/grs_70ec/info.json +++ b/keyboards/sekigon/grs_70ec/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "split": { + "enabled": true, "soft_serial_pin": "D3" }, "processor": "atmega32u4", diff --git a/keyboards/sekigon/grs_70ec/rules.mk b/keyboards/sekigon/grs_70ec/rules.mk index 4bd93ef25bb..ac989e7ea83 100644 --- a/keyboards/sekigon/grs_70ec/rules.mk +++ b/keyboards/sekigon/grs_70ec/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite -SPLIT_KEYBOARD = yes ANALOG_DRIVER_REQUIRED = yes diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json index fe45ad86c5c..e232fdba3e8 100644 --- a/keyboards/silverbullet44/info.json +++ b/keyboards/silverbullet44/info.json @@ -44,6 +44,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk index ed06e173de0..95e92dce2a4 100644 --- a/keyboards/silverbullet44/rules.mk +++ b/keyboards/silverbullet44/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = no AUDIO_ENABLE = yes # Audio output -SPLIT_KEYBOARD = yes LTO_ENABLE = yes diff --git a/keyboards/sofle/keyhive/keyboard.json b/keyboards/sofle/keyhive/keyboard.json index 8c76e875b01..c5060b28c7d 100644 --- a/keyboards/sofle/keyhive/keyboard.json +++ b/keyboards/sofle/keyhive/keyboard.json @@ -24,6 +24,8 @@ ] }, "split": { + "enabled": true, + "soft_serial_pin": "D2", "encoder": { "right": { "rotary": [ diff --git a/keyboards/sofle/rev1/keyboard.json b/keyboards/sofle/rev1/keyboard.json index 20548d6baff..9a244face8c 100644 --- a/keyboards/sofle/rev1/keyboard.json +++ b/keyboards/sofle/rev1/keyboard.json @@ -17,6 +17,8 @@ ] }, "split": { + "enabled": true, + "soft_serial_pin": "D2", "encoder": { "right": { "rotary": [ diff --git a/keyboards/sparrow62/info.json b/keyboards/sparrow62/info.json index f15b7696494..d7d0d8b84d6 100644 --- a/keyboards/sparrow62/info.json +++ b/keyboards/sparrow62/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/sparrow62/rules.mk b/keyboards/sparrow62/rules.mk index 8ea05b5f74a..ab2c49da70e 100644 --- a/keyboards/sparrow62/rules.mk +++ b/keyboards/sparrow62/rules.mk @@ -10,5 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes diff --git a/keyboards/supersplit/info.json b/keyboards/supersplit/info.json index 4c6bd2d1da3..6748321ff37 100644 --- a/keyboards/supersplit/info.json +++ b/keyboards/supersplit/info.json @@ -24,6 +24,7 @@ "vid": "0xFEED" }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "layouts": { diff --git a/keyboards/supersplit/rules.mk b/keyboards/supersplit/rules.mk index 65e2c2165eb..a4f16a0b6be 100644 --- a/keyboards/supersplit/rules.mk +++ b/keyboards/supersplit/rules.mk @@ -1,4 +1 @@ -# This file intentionally left blank -SPLIT_KEYBOARD = yes - SERIAL_DRIVER = bitbang diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json index ba90f9fdd7d..08dcbfee54b 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/info.json @@ -42,6 +42,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/takashicompany/compacx/rules.mk b/keyboards/takashicompany/compacx/rules.mk index 8e0e5ffd1ab..25fcdc1a34c 100644 --- a/keyboards/takashicompany/compacx/rules.mk +++ b/keyboards/takashicompany/compacx/rules.mk @@ -10,6 +10,5 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD=yes ENCODER_ENABLE = yes LTO_ENABLE = yes diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json index a7b470ce880..767f787e5e3 100644 --- a/keyboards/takashiski/hecomi/alpha/info.json +++ b/keyboards/takashiski/hecomi/alpha/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D1" }, "rgblight": { diff --git a/keyboards/takashiski/hecomi/alpha/rules.mk b/keyboards/takashiski/hecomi/alpha/rules.mk index adea9f5950d..98c2f6b6a7f 100644 --- a/keyboards/takashiski/hecomi/alpha/rules.mk +++ b/keyboards/takashiski/hecomi/alpha/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes diff --git a/keyboards/takashiski/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/info.json index 2c65d48a3cd..c65a429f69d 100644 --- a/keyboards/takashiski/otaku_split/rev0/info.json +++ b/keyboards/takashiski/otaku_split/rev0/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/takashiski/otaku_split/rev0/rules.mk b/keyboards/takashiski/otaku_split/rev0/rules.mk index d43bca5db2a..fce764c22d4 100644 --- a/keyboards/takashiski/otaku_split/rev0/rules.mk +++ b/keyboards/takashiski/otaku_split/rev0/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD=yes diff --git a/keyboards/takashiski/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/info.json index 2c15c414e11..251e2c36b90 100644 --- a/keyboards/takashiski/otaku_split/rev1/info.json +++ b/keyboards/takashiski/otaku_split/rev1/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { diff --git a/keyboards/takashiski/otaku_split/rev1/rules.mk b/keyboards/takashiski/otaku_split/rev1/rules.mk index d43bca5db2a..fce764c22d4 100644 --- a/keyboards/takashiski/otaku_split/rev1/rules.mk +++ b/keyboards/takashiski/otaku_split/rev1/rules.mk @@ -10,4 +10,3 @@ 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 -SPLIT_KEYBOARD=yes diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json index de4fa5cd491..7700780b2e8 100644 --- a/keyboards/tkw/grandiceps/info.json +++ b/keyboards/tkw/grandiceps/info.json @@ -39,6 +39,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "A15", "matrix_pins": { "right": { diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk index 86483ba9207..5b78d6fe55c 100644 --- a/keyboards/tkw/grandiceps/rules.mk +++ b/keyboards/tkw/grandiceps/rules.mk @@ -13,7 +13,6 @@ ENCODER_ENABLE = yes # Enable rotary encoder support AUDIO_ENABLE = no # Audio output KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra -SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart OLED_ENABLE = yes OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json index cf7067f629c..d85d76b785e 100644 --- a/keyboards/unikeyboard/diverge3/info.json +++ b/keyboards/unikeyboard/diverge3/info.json @@ -19,6 +19,7 @@ "breathing": true }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/unikeyboard/diverge3/rules.mk b/keyboards/unikeyboard/diverge3/rules.mk index 40695440183..fd50645e4a1 100644 --- a/keyboards/unikeyboard/diverge3/rules.mk +++ b/keyboards/unikeyboard/diverge3/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes diff --git a/keyboards/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json index 9533371de12..d68c4da94b5 100644 --- a/keyboards/unikeyboard/divergetm2/info.json +++ b/keyboards/unikeyboard/divergetm2/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "ROW2COL", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/unikeyboard/divergetm2/rules.mk b/keyboards/unikeyboard/divergetm2/rules.mk index 7f1fc659ccb..e39bab4422a 100644 --- a/keyboards/unikeyboard/divergetm2/rules.mk +++ b/keyboards/unikeyboard/divergetm2/rules.mk @@ -9,6 +9,4 @@ 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 -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/uzu42/info.json b/keyboards/uzu42/info.json new file mode 100644 index 00000000000..2b9790e84e6 --- /dev/null +++ b/keyboards/uzu42/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/uzu42/rules.mk b/keyboards/uzu42/rules.mk index ceb65c3053f..49b64b12745 100644 --- a/keyboards/uzu42/rules.mk +++ b/keyboards/uzu42/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. OLED_ENABLE = no # OLED display -SPLIT_KEYBOARD = yes DEFAULT_FOLDER = uzu42/rev1 diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json index 6deb64c63ca..c6309422411 100644 --- a/keyboards/viktus/sp_mini/info.json +++ b/keyboards/viktus/sp_mini/info.json @@ -19,6 +19,7 @@ ] }, "split": { + "enabled": true, "matrix_pins": { "right": { "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", "B7"], diff --git a/keyboards/viktus/sp_mini/rules.mk b/keyboards/viktus/sp_mini/rules.mk index ca2a1036c34..e3c4a42def8 100644 --- a/keyboards/viktus/sp_mini/rules.mk +++ b/keyboards/viktus/sp_mini/rules.mk @@ -10,5 +10,4 @@ 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 -SPLIT_KEYBOARD = yes ENCODER_ENABLE = yes diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json index ff1504a5aa7..de21929c39b 100644 --- a/keyboards/vitamins_included/rev1/info.json +++ b/keyboards/vitamins_included/rev1/info.json @@ -8,6 +8,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/vitamins_included/rev1/rules.mk b/keyboards/vitamins_included/rev1/rules.mk index d38a6180907..3bbd2614291 100644 --- a/keyboards/vitamins_included/rev1/rules.mk +++ b/keyboards/vitamins_included/rev1/rules.mk @@ -1 +1 @@ -SPLIT_KEYBOARD = yes +# File intentionally blank diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json index ed8596538df..4418b869099 100644 --- a/keyboards/vitamins_included/rev2/info.json +++ b/keyboards/vitamins_included/rev2/info.json @@ -14,6 +14,7 @@ "speaker": "C6" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/vitamins_included/rev2/rules.mk b/keyboards/vitamins_included/rev2/rules.mk index 9f05083d69e..fe598d78616 100644 --- a/keyboards/vitamins_included/rev2/rules.mk +++ b/keyboards/vitamins_included/rev2/rules.mk @@ -1,4 +1,2 @@ -SPLIT_KEYBOARD = yes - # Disable unsupported hardware BACKLIGHT_SUPPORTED = no diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/info.json index 159773a1c97..92b4add8ea2 100644 --- a/keyboards/waterfowl/info.json +++ b/keyboards/waterfowl/info.json @@ -20,6 +20,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "transport": { "sync": { diff --git a/keyboards/waterfowl/rules.mk b/keyboards/waterfowl/rules.mk index 0eed9cdd8f6..afab74111f8 100644 --- a/keyboards/waterfowl/rules.mk +++ b/keyboards/waterfowl/rules.mk @@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output OLED_ENABLE = yes # Enables the use of OLED displays -SPLIT_KEYBOARD = yes # Enables split functionality ENCODER_ENABLE = yes # Enables the encoders diff --git a/keyboards/whale/sk/v3/info.json b/keyboards/whale/sk/v3/info.json index b3e6970a3cb..a7751b1d064 100644 --- a/keyboards/whale/sk/v3/info.json +++ b/keyboards/whale/sk/v3/info.json @@ -13,6 +13,12 @@ "rows": ["B1", "B2", "B3", "B4", "B5", "B6"] }, "diode_direction": "COL2ROW", + "split": { + "enabled": true, + "transport": { + "protocol": "custom" + } + }, "processor": "atmega32u4", "bootloader": "caterina", "debounce": 3, diff --git a/keyboards/whale/sk/v3/rules.mk b/keyboards/whale/sk/v3/rules.mk index 21303846dcc..ab2c49da70e 100644 --- a/keyboards/whale/sk/v3/rules.mk +++ b/keyboards/whale/sk/v3/rules.mk @@ -10,6 +10,3 @@ 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 - -SPLIT_KEYBOARD = yes -SPLIT_TRANSPORT = custom diff --git a/keyboards/wren/info.json b/keyboards/wren/info.json index a496d4babab..ed56ff2b3ad 100644 --- a/keyboards/wren/info.json +++ b/keyboards/wren/info.json @@ -18,6 +18,7 @@ ] }, "split": { + "enabled": true, "encoder": { "right": { "rotary": [ diff --git a/keyboards/wren/rules.mk b/keyboards/wren/rules.mk index 6b9cc95ebf2..088c390ec80 100644 --- a/keyboards/wren/rules.mk +++ b/keyboards/wren/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enables the use of one or more encoders -SPLIT_KEYBOARD = yes # Enables split keyboard diff --git a/keyboards/xenon/info.json b/keyboards/xenon/info.json index 2bc916fde4a..de20eacaf40 100644 --- a/keyboards/xenon/info.json +++ b/keyboards/xenon/info.json @@ -19,6 +19,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/xenon/rules.mk b/keyboards/xenon/rules.mk index 190ff6ca62b..108932bcceb 100644 --- a/keyboards/xenon/rules.mk +++ b/keyboards/xenon/rules.mk @@ -10,6 +10,5 @@ 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 -SPLIT_KEYBOARD = yes OLED_ENABLE = yes ENCODER_ENABLE = yes diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json index 1f01ffde5f9..8084f1f7bd8 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/info.json +++ b/keyboards/yushakobo/navpad/10_helix_r/info.json @@ -19,6 +19,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/yushakobo/navpad/10_helix_r/rules.mk b/keyboards/yushakobo/navpad/10_helix_r/rules.mk index aa146fa1d2d..f30c00650ce 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/rules.mk +++ b/keyboards/yushakobo/navpad/10_helix_r/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes ENCODER_ENABLE = yes SRC += navpad_prefs.c From 45b710f9e16733ab73af5f2ed1b0b13233db49e9 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 12 Apr 2024 04:36:31 +0100 Subject: [PATCH 129/333] Migrate build target markers to keyboard.json - X (#23460) --- .../xbows/woody/{info.json => keyboard.json} | 7 +++++ keyboards/xbows/woody/rules.mk | 12 ------- keyboards/xelus/dawn60/info.json | 6 ++++ keyboards/xelus/dawn60/rev1/config.h | 5 --- .../dawn60/rev1/{info.json => keyboard.json} | 6 ++++ keyboards/xelus/dawn60/rev1/rules.mk | 17 +--------- keyboards/xelus/dawn60/rev1_qmk/config.h | 5 --- .../rev1_qmk/{info.json => keyboard.json} | 11 +++++++ keyboards/xelus/dawn60/rev1_qmk/rules.mk | 23 ++------------ keyboards/xelus/la_plus/config.h | 27 ---------------- .../la_plus/{info.json => keyboard.json} | 17 ++++++++++ keyboards/xelus/la_plus/rules.mk | 15 --------- keyboards/xelus/pachi/rgb/info.json | 20 ++++++++++++ keyboards/xelus/pachi/rgb/rev1/config.h | 6 ---- .../rgb/rev1/{info.json => keyboard.json} | 0 keyboards/xelus/pachi/rgb/rev1/rules.mk | 16 ---------- keyboards/xelus/pachi/rgb/rev2/config.h | 6 ---- .../rgb/rev2/{info.json => keyboard.json} | 0 keyboards/xelus/pachi/rgb/rev2/rules.mk | 15 --------- keyboards/xelus/rs108/config.h | 6 ---- .../xelus/rs108/{info.json => keyboard.json} | 18 ++++++++++- keyboards/xelus/rs108/rules.mk | 16 ---------- keyboards/xelus/rs60/info.json | 6 ++++ keyboards/xelus/rs60/rev1/config.h | 22 ------------- keyboards/xelus/rs60/rev2_0/config.h | 6 ---- .../rs60/rev2_0/{info.json => keyboard.json} | 13 +++++++- keyboards/xelus/rs60/rev2_0/rules.mk | 16 ---------- keyboards/xelus/rs60/rev2_1/config.h | 23 -------------- .../rs60/rev2_1/{info.json => keyboard.json} | 13 +++++++- keyboards/xelus/rs60/rev2_1/rules.mk | 16 ---------- keyboards/xelus/trinityxttkl/config.h | 22 ------------- .../trinityxttkl/{info.json => keyboard.json} | 13 ++++++++ keyboards/xelus/trinityxttkl/rules.mk | 14 --------- keyboards/xelus/valor/info.json | 8 +++++ keyboards/xelus/valor/rev1/config.h | 23 -------------- keyboards/xelus/valor/rev2/config.h | 6 ---- .../valor/rev2/{info.json => keyboard.json} | 10 ++++++ keyboards/xelus/valor/rev2/rules.mk | 14 --------- keyboards/xelus/valor_frl_tkl/info.json | 6 ++++ keyboards/xelus/valor_frl_tkl/rev1/config.h | 6 ---- keyboards/xelus/valor_frl_tkl/rev2_0/config.h | 6 ---- .../rev2_0/{info.json => keyboard.json} | 13 +++++++- keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk | 14 --------- keyboards/xelus/valor_frl_tkl/rev2_1/config.h | 6 ---- .../rev2_1/{info.json => keyboard.json} | 13 +++++++- keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk | 14 --------- keyboards/xelus/xs60/hotswap/config.h | 6 ---- .../xs60/hotswap/{info.json => keyboard.json} | 0 keyboards/xelus/xs60/hotswap/rules.mk | 15 --------- keyboards/xelus/xs60/info.json | 19 ++++++++++++ keyboards/xelus/xs60/soldered/config.h | 6 ---- .../soldered/{info.json => keyboard.json} | 0 keyboards/xelus/xs60/soldered/rules.mk | 15 --------- keyboards/xenon/config.h | 31 ------------------- keyboards/xenon/{info.json => keyboard.json} | 15 +++++++++ keyboards/xenon/rules.mk | 14 --------- keyboards/xiaomi/mk02/config.h | 16 ---------- .../xiaomi/mk02/{info.json => keyboard.json} | 2 ++ keyboards/xiaomi/mk02/rules.mk | 15 +-------- .../xiudi/xd002/{info.json => keyboard.json} | 10 ++++++ keyboards/xiudi/xd002/rules.mk | 25 +-------------- keyboards/xiudi/xd84/config.h | 22 ------------- .../xiudi/xd84/{info.json => keyboard.json} | 17 ++++++++++ keyboards/xiudi/xd84/rules.mk | 14 --------- keyboards/xiudi/xd96/config.h | 22 ------------- .../xiudi/xd96/{info.json => keyboard.json} | 17 ++++++++++ keyboards/xiudi/xd96/rules.mk | 14 --------- keyboards/xw60/config.h | 4 --- keyboards/xw60/{info.json => keyboard.json} | 12 +++++++ keyboards/xw60/rules.mk | 13 -------- 70 files changed, 272 insertions(+), 609 deletions(-) rename keyboards/xbows/woody/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/xbows/woody/rules.mk rename keyboards/xelus/dawn60/rev1/{info.json => keyboard.json} (98%) rename keyboards/xelus/dawn60/rev1_qmk/{info.json => keyboard.json} (98%) delete mode 100755 keyboards/xelus/la_plus/config.h rename keyboards/xelus/la_plus/{info.json => keyboard.json} (97%) create mode 100644 keyboards/xelus/pachi/rgb/info.json rename keyboards/xelus/pachi/rgb/rev1/{info.json => keyboard.json} (100%) rename keyboards/xelus/pachi/rgb/rev2/{info.json => keyboard.json} (100%) rename keyboards/xelus/rs108/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/xelus/rs108/rules.mk delete mode 100644 keyboards/xelus/rs60/rev1/config.h rename keyboards/xelus/rs60/rev2_0/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/xelus/rs60/rev2_0/rules.mk delete mode 100644 keyboards/xelus/rs60/rev2_1/config.h rename keyboards/xelus/rs60/rev2_1/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/xelus/rs60/rev2_1/rules.mk delete mode 100644 keyboards/xelus/trinityxttkl/config.h rename keyboards/xelus/trinityxttkl/{info.json => keyboard.json} (99%) create mode 100644 keyboards/xelus/valor/info.json delete mode 100644 keyboards/xelus/valor/rev1/config.h rename keyboards/xelus/valor/rev2/{info.json => keyboard.json} (98%) rename keyboards/xelus/valor_frl_tkl/rev2_0/{info.json => keyboard.json} (56%) delete mode 100644 keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk rename keyboards/xelus/valor_frl_tkl/rev2_1/{info.json => keyboard.json} (56%) delete mode 100644 keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk rename keyboards/xelus/xs60/hotswap/{info.json => keyboard.json} (100%) create mode 100644 keyboards/xelus/xs60/info.json rename keyboards/xelus/xs60/soldered/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/xenon/config.h rename keyboards/xenon/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/xenon/rules.mk rename keyboards/xiaomi/mk02/{info.json => keyboard.json} (98%) rename keyboards/xiudi/xd002/{info.json => keyboard.json} (78%) rename keyboards/xiudi/xd84/{info.json => keyboard.json} (96%) rename keyboards/xiudi/xd96/{info.json => keyboard.json} (98%) rename keyboards/xw60/{info.json => keyboard.json} (97%) diff --git a/keyboards/xbows/woody/info.json b/keyboards/xbows/woody/keyboard.json similarity index 97% rename from keyboards/xbows/woody/info.json rename to keyboards/xbows/woody/keyboard.json index 487fc766983..538354507e0 100644 --- a/keyboards/xbows/woody/info.json +++ b/keyboards/xbows/woody/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x1224", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/xbows/woody/rules.mk b/keyboards/xbows/woody/rules.mk deleted file mode 100644 index d9a69f35bb6..00000000000 --- a/keyboards/xbows/woody/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -BACKLIGHT_ENABLE = no -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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/xelus/dawn60/info.json b/keyboards/xelus/dawn60/info.json index 4bdc6df8a93..aafac25e05d 100644 --- a/keyboards/xelus/dawn60/info.json +++ b/keyboards/xelus/dawn60/info.json @@ -8,6 +8,12 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h index 25529426351..e64b0895fac 100644 --- a/keyboards/xelus/dawn60/rev1/config.h +++ b/keyboards/xelus/dawn60/rev1/config.h @@ -20,11 +20,6 @@ #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA #define IS31FL3731_LED_COUNT 64 -// 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. diff --git a/keyboards/xelus/dawn60/rev1/info.json b/keyboards/xelus/dawn60/rev1/keyboard.json similarity index 98% rename from keyboards/xelus/dawn60/rev1/info.json rename to keyboards/xelus/dawn60/rev1/keyboard.json index 872bf0d33a3..bfdaf26e764 100644 --- a/keyboards/xelus/dawn60/rev1/info.json +++ b/keyboards/xelus/dawn60/rev1/keyboard.json @@ -1,4 +1,10 @@ { + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "ws2812": { "pin": "F0" }, diff --git a/keyboards/xelus/dawn60/rev1/rules.mk b/keyboards/xelus/dawn60/rev1/rules.mk index 0a72a60eca1..879710e8e7a 100644 --- a/keyboards/xelus/dawn60/rev1/rules.mk +++ b/keyboards/xelus/dawn60/rev1/rules.mk @@ -3,27 +3,12 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - We have custom RGB underglow - CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes WS2812_DRIVER_REQUIRED = yes - # project specific files SRC += keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c - -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h index 81d5dc1e83e..b54fcaee2ad 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/config.h +++ b/keyboards/xelus/dawn60/rev1_qmk/config.h @@ -15,11 +15,6 @@ */ #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 - //RGB Underglow defines #define WS2812_LED_TOTAL 20 diff --git a/keyboards/xelus/dawn60/rev1_qmk/info.json b/keyboards/xelus/dawn60/rev1_qmk/keyboard.json similarity index 98% rename from keyboards/xelus/dawn60/rev1_qmk/info.json rename to keyboards/xelus/dawn60/rev1_qmk/keyboard.json index 12d6a5d5292..7c3aa607dfe 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/info.json +++ b/keyboards/xelus/dawn60/rev1_qmk/keyboard.json @@ -1,4 +1,15 @@ { + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "ws2812": { "pin": "F0" }, diff --git a/keyboards/xelus/dawn60/rev1_qmk/rules.mk b/keyboards/xelus/dawn60/rev1_qmk/rules.mk index edb15fa760d..5a17af39fcd 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/rules.mk +++ b/keyboards/xelus/dawn60/rev1_qmk/rules.mk @@ -3,28 +3,9 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 = 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 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - We have custom RGB underglow - -RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects. +I2C_DRIVER_REQUIRED = yes WS2812_DRIVER_REQUIRED = yes -COMMON_VPATH += $(DRIVER_PATH)/issi - # project specific files +COMMON_VPATH += $(DRIVER_PATH)/issi SRC += drivers/led/issi/is31fl3731.c - -I2C_DRIVER_REQUIRED = yes - -LTO_ENABLE = yes diff --git a/keyboards/xelus/la_plus/config.h b/keyboards/xelus/la_plus/config.h deleted file mode 100755 index c8b4a6e5b16..00000000000 --- a/keyboards/xelus/la_plus/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * 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 - -// Custom Startup Animation -// comment out for solid animation -// #define STARTUP_ANIMATION_DOTS diff --git a/keyboards/xelus/la_plus/info.json b/keyboards/xelus/la_plus/keyboard.json similarity index 97% rename from keyboards/xelus/la_plus/info.json rename to keyboards/xelus/la_plus/keyboard.json index 85e4e60215c..902364471ff 100644 --- a/keyboards/xelus/la_plus/info.json +++ b/keyboards/xelus/la_plus/keyboard.json @@ -8,6 +8,23 @@ "pid": "0x4C50", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "F1" }, diff --git a/keyboards/xelus/la_plus/rules.mk b/keyboards/xelus/la_plus/rules.mk index 7f3c8075a53..942ef4c5dbd 100755 --- a/keyboards/xelus/la_plus/rules.mk +++ b/keyboards/xelus/la_plus/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 = 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 -AUDIO_ENABLE = no # Audio output - -RGB_MATRIX_ENABLE = yes RGB_MATRIX_CUSTOM_KB = yes - -LTO_ENABLE = yes diff --git a/keyboards/xelus/pachi/rgb/info.json b/keyboards/xelus/pachi/rgb/info.json new file mode 100644 index 00000000000..9bf3ca04ef7 --- /dev/null +++ b/keyboards/xelus/pachi/rgb/info.json @@ -0,0 +1,20 @@ +{ + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + } +} diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h index 6cb40a9fae4..8ed9a356334 100644 --- a/keyboards/xelus/pachi/rgb/rev1/config.h +++ b/keyboards/xelus/pachi/rgb/rev1/config.h @@ -16,12 +16,6 @@ #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 - // I2C setup #define I2C1_SCL_PIN B8 #define I2C1_SDA_PIN B9 diff --git a/keyboards/xelus/pachi/rgb/rev1/info.json b/keyboards/xelus/pachi/rgb/rev1/keyboard.json similarity index 100% rename from keyboards/xelus/pachi/rgb/rev1/info.json rename to keyboards/xelus/pachi/rgb/rev1/keyboard.json diff --git a/keyboards/xelus/pachi/rgb/rev1/rules.mk b/keyboards/xelus/pachi/rgb/rev1/rules.mk index 4c27f450080..8ecbd28acc4 100644 --- a/keyboards/xelus/pachi/rgb/rev1/rules.mk +++ b/keyboards/xelus/pachi/rgb/rev1/rules.mk @@ -1,20 +1,4 @@ -# 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches - -RGB_MATRIX_ENABLE = yes - COMMON_VPATH += $(DRIVER_PATH)/issi SRC += drivers/led/issi/is31fl3741.c -LTO_ENABLE = yes OPT = 2 diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h index 50f7d6ac1df..a5fc38e0708 100644 --- a/keyboards/xelus/pachi/rgb/rev2/config.h +++ b/keyboards/xelus/pachi/rgb/rev2/config.h @@ -16,12 +16,6 @@ #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 - // I2C setup #define I2C1_SCL_PIN B6 #define I2C1_SDA_PIN B7 diff --git a/keyboards/xelus/pachi/rgb/rev2/info.json b/keyboards/xelus/pachi/rgb/rev2/keyboard.json similarity index 100% rename from keyboards/xelus/pachi/rgb/rev2/info.json rename to keyboards/xelus/pachi/rgb/rev2/keyboard.json diff --git a/keyboards/xelus/pachi/rgb/rev2/rules.mk b/keyboards/xelus/pachi/rgb/rev2/rules.mk index 62bb12bfb04..8ecbd28acc4 100644 --- a/keyboards/xelus/pachi/rgb/rev2/rules.mk +++ b/keyboards/xelus/pachi/rgb/rev2/rules.mk @@ -1,19 +1,4 @@ -# 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - -RGB_MATRIX_ENABLE = yes - COMMON_VPATH += $(DRIVER_PATH)/issi SRC += drivers/led/issi/is31fl3741.c -LTO_ENABLE = yes OPT = 2 diff --git a/keyboards/xelus/rs108/config.h b/keyboards/xelus/rs108/config.h index 45f2a545309..3d3bc49228f 100644 --- a/keyboards/xelus/rs108/config.h +++ b/keyboards/xelus/rs108/config.h @@ -15,12 +15,6 @@ */ #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 - // I2C config #define I2C1_SCL_PIN B8 #define I2C1_SDA_PIN B9 diff --git a/keyboards/xelus/rs108/info.json b/keyboards/xelus/rs108/keyboard.json similarity index 95% rename from keyboards/xelus/rs108/info.json rename to keyboards/xelus/rs108/keyboard.json index 0342177e641..12ffbb3fdc2 100644 --- a/keyboards/xelus/rs108/info.json +++ b/keyboards/xelus/rs108/keyboard.json @@ -7,7 +7,23 @@ "vid": "0x5845", "pid": "0x5208", "device_version": "0.0.2", - "force_nkro": true + "force_nkro": true, + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } }, "matrix_pins": { "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B1", "B10", "B4", "B3", "A15"], diff --git a/keyboards/xelus/rs108/rules.mk b/keyboards/xelus/rs108/rules.mk deleted file mode 100644 index b763de52c78..00000000000 --- a/keyboards/xelus/rs108/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 - -# Save hid interface -KEYBOARD_SHARED_EP = yes - diff --git a/keyboards/xelus/rs60/info.json b/keyboards/xelus/rs60/info.json index 98b545a9e81..c1771427f13 100644 --- a/keyboards/xelus/rs60/info.json +++ b/keyboards/xelus/rs60/info.json @@ -7,5 +7,11 @@ "vid": "0x5845", "pid": "0x5253" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_ansi_tsangan", "60_tsangan_hhkb"] } diff --git a/keyboards/xelus/rs60/rev1/config.h b/keyboards/xelus/rs60/rev1/config.h deleted file mode 100644 index 3c53ebc8bcf..00000000000 --- a/keyboards/xelus/rs60/rev1/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * 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 diff --git a/keyboards/xelus/rs60/rev2_0/config.h b/keyboards/xelus/rs60/rev2_0/config.h index 45f2a545309..3d3bc49228f 100644 --- a/keyboards/xelus/rs60/rev2_0/config.h +++ b/keyboards/xelus/rs60/rev2_0/config.h @@ -15,12 +15,6 @@ */ #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 - // I2C config #define I2C1_SCL_PIN B8 #define I2C1_SDA_PIN B9 diff --git a/keyboards/xelus/rs60/rev2_0/info.json b/keyboards/xelus/rs60/rev2_0/keyboard.json similarity index 98% rename from keyboards/xelus/rs60/rev2_0/info.json rename to keyboards/xelus/rs60/rev2_0/keyboard.json index 499a5a922fc..9cb7b24043e 100644 --- a/keyboards/xelus/rs60/rev2_0/info.json +++ b/keyboards/xelus/rs60/rev2_0/keyboard.json @@ -1,7 +1,18 @@ { "usb": { "device_version": "0.2.0", - "force_nkro": true + "force_nkro": true, + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true }, "matrix_pins": { "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], diff --git a/keyboards/xelus/rs60/rev2_0/rules.mk b/keyboards/xelus/rs60/rev2_0/rules.mk deleted file mode 100644 index b763de52c78..00000000000 --- a/keyboards/xelus/rs60/rev2_0/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 - -# Save hid interface -KEYBOARD_SHARED_EP = yes - diff --git a/keyboards/xelus/rs60/rev2_1/config.h b/keyboards/xelus/rs60/rev2_1/config.h deleted file mode 100644 index 430a5a47f7f..00000000000 --- a/keyboards/xelus/rs60/rev2_1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2022 Harrison Chan (Xelus) - * - * 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 - diff --git a/keyboards/xelus/rs60/rev2_1/info.json b/keyboards/xelus/rs60/rev2_1/keyboard.json similarity index 98% rename from keyboards/xelus/rs60/rev2_1/info.json rename to keyboards/xelus/rs60/rev2_1/keyboard.json index fe87561e61c..d7e56fe1cfc 100644 --- a/keyboards/xelus/rs60/rev2_1/info.json +++ b/keyboards/xelus/rs60/rev2_1/keyboard.json @@ -1,7 +1,18 @@ { "usb": { "device_version": "0.2.1", - "force_nkro": true + "force_nkro": true, + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true }, "matrix_pins": { "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], diff --git a/keyboards/xelus/rs60/rev2_1/rules.mk b/keyboards/xelus/rs60/rev2_1/rules.mk deleted file mode 100644 index b763de52c78..00000000000 --- a/keyboards/xelus/rs60/rev2_1/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 - -# Save hid interface -KEYBOARD_SHARED_EP = yes - diff --git a/keyboards/xelus/trinityxttkl/config.h b/keyboards/xelus/trinityxttkl/config.h deleted file mode 100644 index 651f613045d..00000000000 --- a/keyboards/xelus/trinityxttkl/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * 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 diff --git a/keyboards/xelus/trinityxttkl/info.json b/keyboards/xelus/trinityxttkl/keyboard.json similarity index 99% rename from keyboards/xelus/trinityxttkl/info.json rename to keyboards/xelus/trinityxttkl/keyboard.json index f3b8956b137..eea94c59792 100644 --- a/keyboards/xelus/trinityxttkl/info.json +++ b/keyboards/xelus/trinityxttkl/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x5854", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A10", "B9", "B4"], "rows": ["A14", "A15", "B3", "A2", "B6", "B5"] diff --git a/keyboards/xelus/trinityxttkl/rules.mk b/keyboards/xelus/trinityxttkl/rules.mk index ef90964f9b3..0ab54aaaf71 100644 --- a/keyboards/xelus/trinityxttkl/rules.mk +++ b/keyboards/xelus/trinityxttkl/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no - - diff --git a/keyboards/xelus/valor/info.json b/keyboards/xelus/valor/info.json new file mode 100644 index 00000000000..588361fc989 --- /dev/null +++ b/keyboards/xelus/valor/info.json @@ -0,0 +1,8 @@ +{ + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + } +} diff --git a/keyboards/xelus/valor/rev1/config.h b/keyboards/xelus/valor/rev1/config.h deleted file mode 100644 index fe18ba5b717..00000000000 --- a/keyboards/xelus/valor/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Harrison Chan (Xelus) - * - * 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 diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h index 9491d1f175d..7b968ea2a39 100644 --- a/keyboards/xelus/valor/rev2/config.h +++ b/keyboards/xelus/valor/rev2/config.h @@ -16,12 +16,6 @@ #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 - // I2C setup #define I2C1_SCL_PIN B8 #define I2C1_SDA_PIN B9 diff --git a/keyboards/xelus/valor/rev2/info.json b/keyboards/xelus/valor/rev2/keyboard.json similarity index 98% rename from keyboards/xelus/valor/rev2/info.json rename to keyboards/xelus/valor/rev2/keyboard.json index 196c1ad1c43..21de5fb4a2a 100644 --- a/keyboards/xelus/valor/rev2/info.json +++ b/keyboards/xelus/valor/rev2/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x5653", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "ws2812": { "pin": "A9", "driver": "pwm" diff --git a/keyboards/xelus/valor/rev2/rules.mk b/keyboards/xelus/valor/rev2/rules.mk index 7fd72e35e76..8d76aac36cc 100644 --- a/keyboards/xelus/valor/rev2/rules.mk +++ b/keyboards/xelus/valor/rev2/rules.mk @@ -1,17 +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 -RGB_MATRIX_ENABLE = yes RGB_MATRIX_CUSTOM_KB = yes OPT = 2 -LTO_ENABLE = yes diff --git a/keyboards/xelus/valor_frl_tkl/info.json b/keyboards/xelus/valor_frl_tkl/info.json index fee349b989a..a0b7a70a89f 100644 --- a/keyboards/xelus/valor_frl_tkl/info.json +++ b/keyboards/xelus/valor_frl_tkl/info.json @@ -6,6 +6,12 @@ "vid": "0x5845", "pid": "0x4654" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_ansi_split_bs_rshift" }, diff --git a/keyboards/xelus/valor_frl_tkl/rev1/config.h b/keyboards/xelus/valor_frl_tkl/rev1/config.h index af702fcafda..44406be7b59 100644 --- a/keyboards/xelus/valor_frl_tkl/rev1/config.h +++ b/keyboards/xelus/valor_frl_tkl/rev1/config.h @@ -16,12 +16,6 @@ #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 - // I2C OLED defines #define I2C1_SCL_PIN B8 #define I2C1_SDA_PIN B9 diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h index cb37aaa4ccb..b085b99d884 100644 --- a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h +++ b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h @@ -16,10 +16,4 @@ #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 STM32_HSECLK 16000000 diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/info.json b/keyboards/xelus/valor_frl_tkl/rev2_0/keyboard.json similarity index 56% rename from keyboards/xelus/valor_frl_tkl/rev2_0/info.json rename to keyboards/xelus/valor_frl_tkl/rev2_0/keyboard.json index d3e21777934..36db1d4398e 100644 --- a/keyboards/xelus/valor_frl_tkl/rev2_0/info.json +++ b/keyboards/xelus/valor_frl_tkl/rev2_0/keyboard.json @@ -1,7 +1,18 @@ { "keyboard_name": "Valor FRL TKL Rev2.0", "usb": { - "device_version": "0.0.2" + "device_version": "0.0.2", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true }, "matrix_pins": { "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B9", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"], diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk deleted file mode 100644 index 8ee0c3e8fe8..00000000000 --- a/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h index cb37aaa4ccb..b085b99d884 100644 --- a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h +++ b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h @@ -16,10 +16,4 @@ #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 STM32_HSECLK 16000000 diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/info.json b/keyboards/xelus/valor_frl_tkl/rev2_1/keyboard.json similarity index 56% rename from keyboards/xelus/valor_frl_tkl/rev2_1/info.json rename to keyboards/xelus/valor_frl_tkl/rev2_1/keyboard.json index 61a26ca4c97..376d73a4299 100644 --- a/keyboards/xelus/valor_frl_tkl/rev2_1/info.json +++ b/keyboards/xelus/valor_frl_tkl/rev2_1/keyboard.json @@ -1,7 +1,18 @@ { "keyboard_name": "Valor FRL TKL Rev2.2", "usb": { - "device_version": "0.0.3" + "device_version": "0.0.3", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true }, "matrix_pins": { "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B9", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"], diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk deleted file mode 100644 index 8ee0c3e8fe8..00000000000 --- a/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/xelus/xs60/hotswap/config.h b/keyboards/xelus/xs60/hotswap/config.h index 877313776ad..17967f05f59 100644 --- a/keyboards/xelus/xs60/hotswap/config.h +++ b/keyboards/xelus/xs60/hotswap/config.h @@ -16,12 +16,6 @@ #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 - // I2C setup #define I2C1_SCL_PAL_MODE 4 #define I2C1_SDA_PAL_MODE 4 diff --git a/keyboards/xelus/xs60/hotswap/info.json b/keyboards/xelus/xs60/hotswap/keyboard.json similarity index 100% rename from keyboards/xelus/xs60/hotswap/info.json rename to keyboards/xelus/xs60/hotswap/keyboard.json diff --git a/keyboards/xelus/xs60/hotswap/rules.mk b/keyboards/xelus/xs60/hotswap/rules.mk index f632b896ab1..3aa0e2bf061 100644 --- a/keyboards/xelus/xs60/hotswap/rules.mk +++ b/keyboards/xelus/xs60/hotswap/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 = 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 -AUDIO_ENABLE = no # Audio output - -RGBLIGHT_ENABLE = yes - -LTO_ENABLE = yes OPT = 2 diff --git a/keyboards/xelus/xs60/info.json b/keyboards/xelus/xs60/info.json new file mode 100644 index 00000000000..719cf2aac12 --- /dev/null +++ b/keyboards/xelus/xs60/info.json @@ -0,0 +1,19 @@ +{ + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + } +} diff --git a/keyboards/xelus/xs60/soldered/config.h b/keyboards/xelus/xs60/soldered/config.h index 5b966800c68..8ab23ab40cf 100644 --- a/keyboards/xelus/xs60/soldered/config.h +++ b/keyboards/xelus/xs60/soldered/config.h @@ -16,12 +16,6 @@ #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 - // I2C setup #define I2C1_SCL_PAL_MODE 4 #define I2C1_SDA_PAL_MODE 4 diff --git a/keyboards/xelus/xs60/soldered/info.json b/keyboards/xelus/xs60/soldered/keyboard.json similarity index 100% rename from keyboards/xelus/xs60/soldered/info.json rename to keyboards/xelus/xs60/soldered/keyboard.json diff --git a/keyboards/xelus/xs60/soldered/rules.mk b/keyboards/xelus/xs60/soldered/rules.mk index f632b896ab1..3aa0e2bf061 100644 --- a/keyboards/xelus/xs60/soldered/rules.mk +++ b/keyboards/xelus/xs60/soldered/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 = 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 -AUDIO_ENABLE = no # Audio output - -RGBLIGHT_ENABLE = yes - -LTO_ENABLE = yes OPT = 2 diff --git a/keyboards/xenon/config.h b/keyboards/xenon/config.h deleted file mode 100644 index 4a0752d3718..00000000000 --- a/keyboards/xenon/config.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -Copyright 2020 Kyrre Havik Eriksen - -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 - -#ifdef OLED_ENABLE - #define OLED_DISPLAY_128X32 -#endif - -// If you are using an Elite C rev3 on the slave side, uncomment the lines below: -// #define SPLIT_USB_DETECT -// #define NO_USB_STARTUP_CHECK diff --git a/keyboards/xenon/info.json b/keyboards/xenon/keyboard.json similarity index 92% rename from keyboards/xenon/info.json rename to keyboards/xenon/keyboard.json index de20eacaf40..7f78988525a 100644 --- a/keyboards/xenon/info.json +++ b/keyboards/xenon/keyboard.json @@ -8,6 +8,21 @@ "pid": "0x3404", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/xenon/rules.mk b/keyboards/xenon/rules.mk deleted file mode 100644 index 108932bcceb..00000000000 --- a/keyboards/xenon/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/xiaomi/mk02/config.h b/keyboards/xiaomi/mk02/config.h index 093618f2b33..fc20837593b 100644 --- a/keyboards/xiaomi/mk02/config.h +++ b/keyboards/xiaomi/mk02/config.h @@ -18,19 +18,3 @@ along with this program. If not, see . #pragma once #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE - -/* - * 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/xiaomi/mk02/info.json b/keyboards/xiaomi/mk02/keyboard.json similarity index 98% rename from keyboards/xiaomi/mk02/info.json rename to keyboards/xiaomi/mk02/keyboard.json index 16cbfd1703b..28d5d8a17d3 100644 --- a/keyboards/xiaomi/mk02/info.json +++ b/keyboards/xiaomi/mk02/keyboard.json @@ -8,6 +8,8 @@ "pid": "0x0B91", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "custom", "matrix_pins": { "cols": ["B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C14", "C15", "B11", "A1", "A2", "B12"], "rows": ["A3", "A4", "A5", "A6", "A7", "B0"] diff --git a/keyboards/xiaomi/mk02/rules.mk b/keyboards/xiaomi/mk02/rules.mk index c20d67dd89d..5920e3de5fa 100644 --- a/keyboards/xiaomi/mk02/rules.mk +++ b/keyboards/xiaomi/mk02/rules.mk @@ -1,19 +1,6 @@ -# MCU name -MCU = STM32F072 +# custom bootloader BOARD = ST_STM32F072B_DISCOVERY MCU_LDSCRIPT = STM32F072_0x2000_bootloader -# Bootloader selection -BOOTLOADER = custom - DFU_ARGS = -d 0483:df11 -a 0 -s 0x08002000:leave DFU_SUFFIX_ARGS = -v 0483 -p DF11 - -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 = yes # This is broken on 072 for some reason -RGBLIGHT_ENABLE = no diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/keyboard.json similarity index 78% rename from keyboards/xiudi/xd002/info.json rename to keyboards/xiudi/xd002/keyboard.json index 1e0b22f96b1..98b06cb84ac 100644 --- a/keyboards/xiudi/xd002/info.json +++ b/keyboards/xiudi/xd002/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0202", "device_version": "0.0.1" }, + "processor": "attiny85", + "bootloader": "custom", + "build": { + "lto": true + }, + "features": { + "grave_esc": false, + "magic": false, + "space_cadet": false + }, "rgblight": { "led_count": 2 }, diff --git a/keyboards/xiudi/xd002/rules.mk b/keyboards/xiudi/xd002/rules.mk index 70c620c8f06..e31f5d531fd 100644 --- a/keyboards/xiudi/xd002/rules.mk +++ b/keyboards/xiudi/xd002/rules.mk @@ -1,26 +1,3 @@ -# MCU name -MCU = attiny85 - -# Bootloader selection -BOOTLOADER = custom +# custom bootloader OPT_DEFS += -DBOOTLOADER_SIZE=1862 PROGRAM_CMD = micronucleus --run $(BUILD_DIR)/$(TARGET).hex - -# 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 - -# Save as much space as we can... -LTO_ENABLE = yes -GRAVE_ESC_ENABLE = no -MAGIC_ENABLE = no -SPACE_CADET_ENABLE = no diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h index 0ad3910060c..e40e570c14d 100644 --- a/keyboards/xiudi/xd84/config.h +++ b/keyboards/xiudi/xd84/config.h @@ -16,28 +16,6 @@ #pragma once - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 - -/* 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/xiudi/xd84/info.json b/keyboards/xiudi/xd84/keyboard.json similarity index 96% rename from keyboards/xiudi/xd84/info.json rename to keyboards/xiudi/xd84/keyboard.json index b97efe9cf85..0411869633d 100644 --- a/keyboards/xiudi/xd84/info.json +++ b/keyboards/xiudi/xd84/keyboard.json @@ -8,6 +8,23 @@ "pid": "0x8484", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "B5", "levels": 10, diff --git a/keyboards/xiudi/xd84/rules.mk b/keyboards/xiudi/xd84/rules.mk index 89d05c5487e..e11c65db028 100644 --- a/keyboards/xiudi/xd84/rules.mk +++ b/keyboards/xiudi/xd84/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/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h index 059b57a0c6f..6eb4fc5f58e 100644 --- a/keyboards/xiudi/xd96/config.h +++ b/keyboards/xiudi/xd96/config.h @@ -16,28 +16,6 @@ #pragma once - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 18 - -/* 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/xiudi/xd96/info.json b/keyboards/xiudi/xd96/keyboard.json similarity index 98% rename from keyboards/xiudi/xd96/info.json rename to keyboards/xiudi/xd96/keyboard.json index 2b4ee4aad0a..df1fd1cfd44 100644 --- a/keyboards/xiudi/xd96/info.json +++ b/keyboards/xiudi/xd96/keyboard.json @@ -8,6 +8,23 @@ "pid": "0x9696", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "B5", "levels": 10 diff --git a/keyboards/xiudi/xd96/rules.mk b/keyboards/xiudi/xd96/rules.mk index 89d05c5487e..e11c65db028 100644 --- a/keyboards/xiudi/xd96/rules.mk +++ b/keyboards/xiudi/xd96/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/xw60/config.h b/keyboards/xw60/config.h index 32516a5ec2b..7bc4f081160 100644 --- a/keyboards/xw60/config.h +++ b/keyboards/xw60/config.h @@ -1,9 +1,5 @@ #pragma once -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ - #define SOLENOID_PIN F6 #define SOLENOID_ACTIVE true #define SOLENOID_DEFAULT_DWELL 75 diff --git a/keyboards/xw60/info.json b/keyboards/xw60/keyboard.json similarity index 97% rename from keyboards/xw60/info.json rename to keyboards/xw60/keyboard.json index 50315c5ffde..6316f944e50 100644 --- a/keyboards/xw60/info.json +++ b/keyboards/xw60/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": false, + "haptic": true, + "mousekey": false, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/xw60/rules.mk b/keyboards/xw60/rules.mk index 710fb4ca887..a521203b326 100644 --- a/keyboards/xw60/rules.mk +++ b/keyboards/xw60/rules.mk @@ -1,14 +1 @@ -# 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid From 244b7143b68bbb43cab15fe20b9e80fc485b74ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20Sj=C3=B6linder?= Date: Fri, 12 Apr 2024 06:08:01 +0200 Subject: [PATCH 130/333] [Keyboard] Add Chapter1 (#23452) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/mechstudio/chapter1/info.json | 402 ++++++++++++++++++ .../chapter1/keymaps/default/keymap.c | 32 ++ .../chapter1/keymaps/default/rules.mk | 1 + .../mechstudio/chapter1/keymaps/via/keymap.c | 31 ++ .../mechstudio/chapter1/keymaps/via/rules.mk | 2 + keyboards/mechstudio/chapter1/readme.md | 29 ++ keyboards/mechstudio/chapter1/rules.mk | 1 + 7 files changed, 498 insertions(+) create mode 100644 keyboards/mechstudio/chapter1/info.json create mode 100644 keyboards/mechstudio/chapter1/keymaps/default/keymap.c create mode 100644 keyboards/mechstudio/chapter1/keymaps/default/rules.mk create mode 100644 keyboards/mechstudio/chapter1/keymaps/via/keymap.c create mode 100644 keyboards/mechstudio/chapter1/keymaps/via/rules.mk create mode 100644 keyboards/mechstudio/chapter1/readme.md create mode 100644 keyboards/mechstudio/chapter1/rules.mk diff --git a/keyboards/mechstudio/chapter1/info.json b/keyboards/mechstudio/chapter1/info.json new file mode 100644 index 00000000000..7f761a2e119 --- /dev/null +++ b/keyboards/mechstudio/chapter1/info.json @@ -0,0 +1,402 @@ +{ + "manufacturer": "Mech Studio", + "keyboard_name": "Chapter 1", + "maintainer": "Cheezi0747", + "bootloader": "qmk-dfu", + "bootmagic": { + "matrix": [1, 0] + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "F6", "pin_b": "F7"} + ] + }, + "features": { + "bootmagic": true, + "caps_word": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B3", "F4", "F5", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["F1", "F0", "E6", "B1", "B2"] + }, + "processor": "atmega32u4", + "qmk_lufa_bootloader": { + "esc_input": "B3", + "esc_output": "F1" + }, + "url": "https://rooke.myportfolio.com/chapter-165-1", + "usb": { + "device_version": "0.0.1", + "pid": "0x0006", + "vid": "0x4D53" + }, + "layouts": { + "LAYOUT_65_ansi_blocker": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "y": 0}, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1}, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25}, + {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3}, + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25}, + {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25}, + {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25}, + {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_65_ansi_blocker_split_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "y": 0}, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1}, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25}, + {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3}, + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25}, + {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25}, + {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25}, + {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_65_iso_blocker": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "y": 0}, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1}, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "ISO \\", "matrix": [3, 1], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25}, + {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3}, + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25}, + {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25}, + {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25}, + {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_65_iso_blocker_split_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "y": 0}, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1}, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "ISO \\", "matrix": [3, 1], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25}, + {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3}, + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25}, + {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25}, + {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25}, + {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_all": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "y": 0}, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1}, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 1}, + {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25}, + {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3}, + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25}, + {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25}, + {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25}, + {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25} + ] + } + } +} diff --git a/keyboards/mechstudio/chapter1/keymaps/default/keymap.c b/keyboards/mechstudio/chapter1/keymaps/default/keymap.c new file mode 100644 index 00000000000..38508b2b031 --- /dev/null +++ b/keyboards/mechstudio/chapter1/keymaps/default/keymap.c @@ -0,0 +1,32 @@ +/* Copyright 2024 Linus Sjölinder + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSLS, KC_DEL, KC_MPLY, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, + KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT , KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP, _______, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RCTL , KC_LEFT, KC_DOWN, KC_RGHT) +}; + + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = {ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN)} +}; +#endif diff --git a/keyboards/mechstudio/chapter1/keymaps/default/rules.mk b/keyboards/mechstudio/chapter1/keymaps/default/rules.mk new file mode 100644 index 00000000000..ee325681483 --- /dev/null +++ b/keyboards/mechstudio/chapter1/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/mechstudio/chapter1/keymaps/via/keymap.c b/keyboards/mechstudio/chapter1/keymaps/via/keymap.c new file mode 100644 index 00000000000..6811aca06c6 --- /dev/null +++ b/keyboards/mechstudio/chapter1/keymaps/via/keymap.c @@ -0,0 +1,31 @@ +/* Copyright 2024 Linus Sjölinder + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSLS, KC_DEL, KC_MPLY, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, + KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT , KC_PGDN, + KC_LSFT, KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP, _______, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RCTL , KC_LEFT, KC_DOWN, KC_RGHT) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = {ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN)} +}; +#endif diff --git a/keyboards/mechstudio/chapter1/keymaps/via/rules.mk b/keyboards/mechstudio/chapter1/keymaps/via/rules.mk new file mode 100644 index 00000000000..f1adcab005e --- /dev/null +++ b/keyboards/mechstudio/chapter1/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/mechstudio/chapter1/readme.md b/keyboards/mechstudio/chapter1/readme.md new file mode 100644 index 00000000000..eb52f8eb49a --- /dev/null +++ b/keyboards/mechstudio/chapter1/readme.md @@ -0,0 +1,29 @@ +# Chapter 1 + +A exploded 65% with a rotary encoder designed by Rooke Design + +![Chapter-1](https://i.imgur.com/GNI5KdW.jpeg) + +## Support + +- Keyboard Maintainer: [Cheezi](https://github.com/cheezi747) +- Hardware Supported: Chapter-1 +- Hardware Availability: [Rooke Design](https://rooke.myportfolio.com/chapter-165-1) + +Make example for this keyboard (after setting up your build environment): + + make mechstudio/chapter1:default + +Flashing example for this keyboard: + + make mechstudio/chapter1: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +- **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/mechstudio/chapter1/rules.mk b/keyboards/mechstudio/chapter1/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/mechstudio/chapter1/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 214e091ec2a7af0629ce36bce28793a3630090c3 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 12 Apr 2024 13:44:06 +0100 Subject: [PATCH 131/333] Corrections to split keyboard migrations (#23462) --- keyboards/biacco42/ergo42/info.json | 5 ----- keyboards/buzzard/info.json | 5 ----- keyboards/deltasplit75/info.json | 5 ----- keyboards/deltasplit75/v2/info.json | 1 + keyboards/ergoslab/info.json | 5 ----- keyboards/ergoslab/rev1/keyboard.json | 1 + keyboards/ergotravel/info.json | 5 ----- keyboards/ergotravel/rev1/info.json | 1 + keyboards/fortitude60/info.json | 5 ----- keyboards/fortitude60/rev1/keyboard.json | 1 + keyboards/handwired/unk/info.json | 5 ----- keyboards/handwired/unk/rev1/keyboard.json | 1 + keyboards/handwired/xealous/info.json | 5 ----- keyboards/handwired/xealous/rev1/keyboard.json | 3 +++ keyboards/jorne/info.json | 5 ----- keyboards/jorne/rev1/info.json | 1 + keyboards/kapl/info.json | 5 ----- keyboards/kapl/rev1/info.json | 1 + keyboards/keebio/foldkb/info.json | 5 ----- keyboards/keebio/foldkb/rev1/info.json | 1 + keyboards/keebio/kbo5000/info.json | 5 ----- keyboards/keebio/kbo5000/rev1/info.json | 1 + keyboards/keebio/rorschach/info.json | 5 ----- keyboards/keebio/rorschach/rev1/info.json | 1 + keyboards/kumaokobo/kudox_full/info.json | 5 ----- keyboards/kumaokobo/kudox_full/rev1/info.json | 1 + keyboards/lime/info.json | 5 ----- keyboards/lime/rev1/info.json | 1 + keyboards/maple_computing/lets_split_eh/eh/info.json | 1 + keyboards/maple_computing/lets_split_eh/info.json | 5 ----- keyboards/maple_computing/minidox/info.json | 5 ----- keyboards/maple_computing/minidox/rev1/info.json | 1 + keyboards/marksard/rhymestone/info.json | 5 ----- keyboards/marksard/rhymestone/rev1/keyboard.json | 1 + keyboards/rgbkb/mun/info.json | 5 ----- keyboards/rgbkb/mun/rev1/keyboard.json | 1 + keyboards/rgbkb/sol/info.json | 5 ----- keyboards/rgbkb/sol/rev1/info.json | 1 + keyboards/rgbkb/sol/rev2/info.json | 1 + keyboards/rgbkb/sol3/info.json | 5 ----- keyboards/rgbkb/sol3/rev1/keyboard.json | 1 + keyboards/rgbkb/zygomorph/info.json | 5 ----- keyboards/rgbkb/zygomorph/rev1/keyboard.json | 1 + keyboards/salicylic_acid3/7skb/info.json | 5 ----- keyboards/salicylic_acid3/7skb/rev1/keyboard.json | 1 + keyboards/salicylic_acid3/jisplit89/info.json | 5 ----- keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json | 1 + keyboards/salicylic_acid3/naked48/info.json | 5 ----- keyboards/salicylic_acid3/naked48/rev1/keyboard.json | 1 + keyboards/salicylic_acid3/naked60/info.json | 5 ----- keyboards/salicylic_acid3/naked60/rev1/keyboard.json | 1 + keyboards/salicylic_acid3/naked64/info.json | 5 ----- keyboards/salicylic_acid3/naked64/rev1/keyboard.json | 1 + keyboards/sofle/keyhive/keyboard.json | 2 -- keyboards/sofle/rev1/keyboard.json | 2 -- keyboards/uzu42/info.json | 5 ----- keyboards/uzu42/rev1/info.json | 1 + 57 files changed, 29 insertions(+), 144 deletions(-) delete mode 100644 keyboards/biacco42/ergo42/info.json delete mode 100644 keyboards/buzzard/info.json delete mode 100644 keyboards/deltasplit75/info.json delete mode 100644 keyboards/ergoslab/info.json delete mode 100644 keyboards/ergotravel/info.json delete mode 100644 keyboards/fortitude60/info.json delete mode 100644 keyboards/handwired/unk/info.json delete mode 100644 keyboards/handwired/xealous/info.json delete mode 100644 keyboards/jorne/info.json delete mode 100644 keyboards/kapl/info.json delete mode 100644 keyboards/keebio/foldkb/info.json delete mode 100644 keyboards/keebio/kbo5000/info.json delete mode 100644 keyboards/keebio/rorschach/info.json delete mode 100644 keyboards/kumaokobo/kudox_full/info.json delete mode 100644 keyboards/lime/info.json delete mode 100644 keyboards/maple_computing/lets_split_eh/info.json delete mode 100644 keyboards/maple_computing/minidox/info.json delete mode 100644 keyboards/marksard/rhymestone/info.json delete mode 100644 keyboards/rgbkb/mun/info.json delete mode 100644 keyboards/rgbkb/sol/info.json delete mode 100644 keyboards/rgbkb/sol3/info.json delete mode 100644 keyboards/rgbkb/zygomorph/info.json delete mode 100644 keyboards/salicylic_acid3/7skb/info.json delete mode 100644 keyboards/salicylic_acid3/jisplit89/info.json delete mode 100644 keyboards/salicylic_acid3/naked48/info.json delete mode 100644 keyboards/salicylic_acid3/naked60/info.json delete mode 100644 keyboards/salicylic_acid3/naked64/info.json delete mode 100644 keyboards/uzu42/info.json diff --git a/keyboards/biacco42/ergo42/info.json b/keyboards/biacco42/ergo42/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/biacco42/ergo42/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/buzzard/info.json b/keyboards/buzzard/info.json deleted file mode 100644 index 3e85dd16974..00000000000 --- a/keyboards/buzzard/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split":{ - "enabled": true - } -} diff --git a/keyboards/deltasplit75/info.json b/keyboards/deltasplit75/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/deltasplit75/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/info.json index d583f3bb65b..8372650df5d 100644 --- a/keyboards/deltasplit75/v2/info.json +++ b/keyboards/deltasplit75/v2/info.json @@ -13,6 +13,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/ergoslab/info.json b/keyboards/ergoslab/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/ergoslab/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/ergoslab/rev1/keyboard.json b/keyboards/ergoslab/rev1/keyboard.json index 51c522043b3..82e4b41b6df 100644 --- a/keyboards/ergoslab/rev1/keyboard.json +++ b/keyboards/ergoslab/rev1/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/ergotravel/info.json b/keyboards/ergotravel/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/ergotravel/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/ergotravel/rev1/info.json b/keyboards/ergotravel/rev1/info.json index 77aecec0ed1..43d3d01a925 100644 --- a/keyboards/ergotravel/rev1/info.json +++ b/keyboards/ergotravel/rev1/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/fortitude60/info.json b/keyboards/fortitude60/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/fortitude60/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/fortitude60/rev1/keyboard.json b/keyboards/fortitude60/rev1/keyboard.json index 0ae02161cd5..ff8756bb684 100644 --- a/keyboards/fortitude60/rev1/keyboard.json +++ b/keyboards/fortitude60/rev1/keyboard.json @@ -24,6 +24,7 @@ "pin": "B5" }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/handwired/unk/info.json b/keyboards/handwired/unk/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/handwired/unk/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/handwired/unk/rev1/keyboard.json b/keyboards/handwired/unk/rev1/keyboard.json index 171ae7bb027..fc1cfc90b72 100644 --- a/keyboards/handwired/unk/rev1/keyboard.json +++ b/keyboards/handwired/unk/rev1/keyboard.json @@ -20,6 +20,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { diff --git a/keyboards/handwired/xealous/info.json b/keyboards/handwired/xealous/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/handwired/xealous/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/handwired/xealous/rev1/keyboard.json b/keyboards/handwired/xealous/rev1/keyboard.json index b8b45e5ee14..001cd82074c 100644 --- a/keyboards/handwired/xealous/rev1/keyboard.json +++ b/keyboards/handwired/xealous/rev1/keyboard.json @@ -17,6 +17,9 @@ "rows": ["B5", "B4", "E6", "D7", "D4"] }, "diode_direction": "COL2ROW", + "split": { + "enabled": true + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/jorne/info.json b/keyboards/jorne/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/jorne/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json index f76b9c0e7d9..fedab8fd08a 100644 --- a/keyboards/jorne/rev1/info.json +++ b/keyboards/jorne/rev1/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2", "transport": { "sync": { diff --git a/keyboards/kapl/info.json b/keyboards/kapl/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/kapl/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json index 0d95b99e294..dbbfde0e2a4 100644 --- a/keyboards/kapl/rev1/info.json +++ b/keyboards/kapl/rev1/info.json @@ -60,6 +60,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2", "transport": { "sync": { diff --git a/keyboards/keebio/foldkb/info.json b/keyboards/keebio/foldkb/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/keebio/foldkb/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json index e826f34e329..cc3fe50636b 100644 --- a/keyboards/keebio/foldkb/rev1/info.json +++ b/keyboards/keebio/foldkb/rev1/info.json @@ -22,6 +22,7 @@ "pin": "B5" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/keebio/kbo5000/info.json b/keyboards/keebio/kbo5000/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/keebio/kbo5000/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json index da7fbfb40f5..939a7723485 100644 --- a/keyboards/keebio/kbo5000/rev1/info.json +++ b/keyboards/keebio/kbo5000/rev1/info.json @@ -42,6 +42,7 @@ "pin": "E6" }, "split": { + "enabled": true, "soft_serial_pin": "D0", "encoder": { "right": { diff --git a/keyboards/keebio/rorschach/info.json b/keyboards/keebio/rorschach/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/keebio/rorschach/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json index 55fcae83873..22a5de3b931 100644 --- a/keyboards/keebio/rorschach/rev1/info.json +++ b/keyboards/keebio/rorschach/rev1/info.json @@ -38,6 +38,7 @@ "pin": "D3" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/kumaokobo/kudox_full/info.json b/keyboards/kumaokobo/kudox_full/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/kumaokobo/kudox_full/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/kumaokobo/kudox_full/rev1/info.json b/keyboards/kumaokobo/kudox_full/rev1/info.json index 673fda9acfc..d12984f16e3 100644 --- a/keyboards/kumaokobo/kudox_full/rev1/info.json +++ b/keyboards/kumaokobo/kudox_full/rev1/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/lime/info.json b/keyboards/lime/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/lime/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/info.json index 19ac7dfda2b..2e395f5e6a7 100644 --- a/keyboards/lime/rev1/info.json +++ b/keyboards/lime/rev1/info.json @@ -19,6 +19,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json index 2b77267da81..6b680418df3 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/info.json +++ b/keyboards/maple_computing/lets_split_eh/eh/info.json @@ -36,6 +36,7 @@ "pin": "B2" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/maple_computing/lets_split_eh/info.json b/keyboards/maple_computing/lets_split_eh/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/maple_computing/lets_split_eh/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/maple_computing/minidox/info.json b/keyboards/maple_computing/minidox/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/maple_computing/minidox/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json index e42ec5a08df..6f3a0dd1fca 100644 --- a/keyboards/maple_computing/minidox/rev1/info.json +++ b/keyboards/maple_computing/minidox/rev1/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/marksard/rhymestone/info.json b/keyboards/marksard/rhymestone/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/marksard/rhymestone/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/marksard/rhymestone/rev1/keyboard.json b/keyboards/marksard/rhymestone/rev1/keyboard.json index bc474f08817..31eb063c030 100644 --- a/keyboards/marksard/rhymestone/rev1/keyboard.json +++ b/keyboards/marksard/rhymestone/rev1/keyboard.json @@ -22,6 +22,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "ws2812": { diff --git a/keyboards/rgbkb/mun/info.json b/keyboards/rgbkb/mun/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/rgbkb/mun/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/rgbkb/mun/rev1/keyboard.json b/keyboards/rgbkb/mun/rev1/keyboard.json index 7374f6cd478..98265c6dd90 100644 --- a/keyboards/rgbkb/mun/rev1/keyboard.json +++ b/keyboards/rgbkb/mun/rev1/keyboard.json @@ -102,6 +102,7 @@ "tap_keycode_delay": 5 }, "split": { + "enabled": true, "soft_serial_pin": "A9", "transport": { "sync": { diff --git a/keyboards/rgbkb/sol/info.json b/keyboards/rgbkb/sol/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/rgbkb/sol/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json index 874b4ece22e..16b61d9e020 100644 --- a/keyboards/rgbkb/sol/rev1/info.json +++ b/keyboards/rgbkb/sol/rev1/info.json @@ -82,6 +82,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D3" }, "tapping": { diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json index ac57e4e74eb..f7ec84cfce3 100644 --- a/keyboards/rgbkb/sol/rev2/info.json +++ b/keyboards/rgbkb/sol/rev2/info.json @@ -77,6 +77,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D3" }, "tapping": { diff --git a/keyboards/rgbkb/sol3/info.json b/keyboards/rgbkb/sol3/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/rgbkb/sol3/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/rgbkb/sol3/rev1/keyboard.json b/keyboards/rgbkb/sol3/rev1/keyboard.json index 96213156f0c..3b8b7d060c8 100644 --- a/keyboards/rgbkb/sol3/rev1/keyboard.json +++ b/keyboards/rgbkb/sol3/rev1/keyboard.json @@ -103,6 +103,7 @@ ] }, "split": { + "enabled": true, "dip_switch": { "right": { "pins": ["A14", "B0"] diff --git a/keyboards/rgbkb/zygomorph/info.json b/keyboards/rgbkb/zygomorph/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/rgbkb/zygomorph/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/rgbkb/zygomorph/rev1/keyboard.json b/keyboards/rgbkb/zygomorph/rev1/keyboard.json index 3bd412cc3b3..851842d0815 100644 --- a/keyboards/rgbkb/zygomorph/rev1/keyboard.json +++ b/keyboards/rgbkb/zygomorph/rev1/keyboard.json @@ -23,6 +23,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D3" }, "rgblight": { diff --git a/keyboards/salicylic_acid3/7skb/info.json b/keyboards/salicylic_acid3/7skb/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/salicylic_acid3/7skb/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json index 89e675db525..3ea79da589d 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/salicylic_acid3/jisplit89/info.json b/keyboards/salicylic_acid3/jisplit89/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/salicylic_acid3/jisplit89/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json index e3d884bdb1b..ccfe99ad18f 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/salicylic_acid3/naked48/info.json b/keyboards/salicylic_acid3/naked48/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/salicylic_acid3/naked48/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json index f0aa33b9625..da82c1a16c1 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json @@ -17,6 +17,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2", "matrix_pins": { "right": { diff --git a/keyboards/salicylic_acid3/naked60/info.json b/keyboards/salicylic_acid3/naked60/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/salicylic_acid3/naked60/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json index a8ba1431841..f5d53c001d4 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2", "matrix_pins": { "right": { diff --git a/keyboards/salicylic_acid3/naked64/info.json b/keyboards/salicylic_acid3/naked64/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/salicylic_acid3/naked64/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json index a95f8d60fe0..2034b7d9ab4 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2", "matrix_pins": { "right": { diff --git a/keyboards/sofle/keyhive/keyboard.json b/keyboards/sofle/keyhive/keyboard.json index c5060b28c7d..8c76e875b01 100644 --- a/keyboards/sofle/keyhive/keyboard.json +++ b/keyboards/sofle/keyhive/keyboard.json @@ -24,8 +24,6 @@ ] }, "split": { - "enabled": true, - "soft_serial_pin": "D2", "encoder": { "right": { "rotary": [ diff --git a/keyboards/sofle/rev1/keyboard.json b/keyboards/sofle/rev1/keyboard.json index 9a244face8c..20548d6baff 100644 --- a/keyboards/sofle/rev1/keyboard.json +++ b/keyboards/sofle/rev1/keyboard.json @@ -17,8 +17,6 @@ ] }, "split": { - "enabled": true, - "soft_serial_pin": "D2", "encoder": { "right": { "rotary": [ diff --git a/keyboards/uzu42/info.json b/keyboards/uzu42/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/uzu42/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json index 1354c6d93e6..c7d6f7159bb 100644 --- a/keyboards/uzu42/rev1/info.json +++ b/keyboards/uzu42/rev1/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "ws2812": { From 6b60089fc704e4fc6bb75686b725a19da6a92fa9 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 12 Apr 2024 23:34:44 +0100 Subject: [PATCH 132/333] Migrate build target markers to keyboard.json - 0AB (#23488) --- .../10bleoledhub/{info.json => keyboard.json} | 9 ++++++ keyboards/10bleoledhub/rules.mk | 16 ---------- keyboards/1k/{info.json => keyboard.json} | 10 ++++++ keyboards/1k/rules.mk | 24 -------------- .../1upslider8/{info.json => keyboard.json} | 0 .../1upkeyboards/pi40/grid_v1_1/keyboard.json | 1 + .../1upkeyboards/pi40/mit_v1_0/keyboard.json | 1 + .../1upkeyboards/pi40/mit_v1_1/keyboard.json | 1 + keyboards/1upkeyboards/pi40/rules.mk | 2 -- keyboards/25keys/zinc/rules.mk | 3 -- .../{rev2/info.json => rev1/keyboard.json} | 10 +++++- keyboards/3w6/rev1/rules.mk | 16 ---------- .../{rev1/info.json => rev2/keyboard.json} | 10 +++++- keyboards/3w6/rev2/rules.mk | 16 ---------- .../rev_e/{info.json => keyboard.json} | 0 .../rev_e_ansi/{info.json => keyboard.json} | 0 .../rev_e_iso/{info.json => keyboard.json} | 0 .../shark/alpha/{info.json => keyboard.json} | 0 .../macropad/{info.json => keyboard.json} | 0 .../mine/{info.json => keyboard.json} | 0 .../ext65/rev3/{info.json => keyboard.json} | 0 .../rev1/{info.json => keyboard.json} | 0 .../lunar_ii/{info.json => keyboard.json} | 0 .../sango/{info.json => keyboard.json} | 0 keyboards/al1/{info.json => keyboard.json} | 0 keyboards/alas/{info.json => keyboard.json} | 0 .../pianoforte/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../amj66/{info.json => keyboard.json} | 0 .../amj96/{info.json => keyboard.json} | 0 .../annepro2/c15/{info.json => keyboard.json} | 0 .../annepro2/c18/{info.json => keyboard.json} | 0 keyboards/argyle/{info.json => keyboard.json} | 0 .../wings/{info.json => keyboard.json} | 0 .../lvl/rev_hs01/{info.json => keyboard.json} | 0 .../aurora65/{info.json => keyboard.json} | 0 .../helpo/{info.json => keyboard.json} | 0 .../baion_808/{info.json => keyboard.json} | 0 keyboards/bajjak/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../basketweave/{info.json => keyboard.json} | 0 .../dynamis/{info.json => keyboard.json} | 0 .../piantor/{info.json => keyboard.json} | 0 .../piantor_pro/{info.json => keyboard.json} | 0 .../bioi/g60/{info.json => keyboard.json} | 0 .../bioi/g60ble/{info.json => keyboard.json} | 0 .../morgan65/{info.json => keyboard.json} | 0 .../equals/48/{info.json => keyboard.json} | 0 .../equals/60/{info.json => keyboard.json} | 0 .../lulu/rp2040/{info.json => keyboard.json} | 0 .../unicorne/{info.json => keyboard.json} | 0 .../2019/{info.json => keyboard.json} | 32 +++++++++++++++++-- keyboards/boston_meetup/info.json | 32 ------------------- keyboards/boston_meetup/rules.mk | 1 - .../ghost_squid/{info.json => keyboard.json} | 0 .../hid_liber/{info.json => keyboard.json} | 0 keyboards/bpiphany/hid_liber/rules.mk | 4 +-- .../kitten_paw/{info.json => keyboard.json} | 0 .../2013/{info.json => keyboard.json} | 0 .../2015/{info.json => keyboard.json} | 0 .../tiger_lily/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 keyboards/budgy/{info.json => keyboard.json} | 0 .../buzzard/rev1/{info.json => keyboard.json} | 0 64 files changed, 71 insertions(+), 117 deletions(-) rename keyboards/10bleoledhub/{info.json => keyboard.json} (89%) rename keyboards/1k/{info.json => keyboard.json} (71%) rename keyboards/1upkeyboards/1upslider8/{info.json => keyboard.json} (100%) rename keyboards/3w6/{rev2/info.json => rev1/keyboard.json} (90%) rename keyboards/3w6/{rev1/info.json => rev2/keyboard.json} (90%) rename keyboards/4pplet/waffling60/rev_e/{info.json => keyboard.json} (100%) rename keyboards/4pplet/waffling60/rev_e_ansi/{info.json => keyboard.json} (100%) rename keyboards/4pplet/waffling60/rev_e_iso/{info.json => keyboard.json} (100%) rename keyboards/acheron/shark/alpha/{info.json => keyboard.json} (100%) rename keyboards/adafruit/macropad/{info.json => keyboard.json} (100%) rename keyboards/adpenrose/mine/{info.json => keyboard.json} (100%) rename keyboards/aeboards/ext65/rev3/{info.json => keyboard.json} (100%) rename keyboards/aeboards/satellite/rev1/{info.json => keyboard.json} (100%) rename keyboards/ai03/lunar_ii/{info.json => keyboard.json} (100%) rename keyboards/aidansmithdotdev/sango/{info.json => keyboard.json} (100%) rename keyboards/al1/{info.json => keyboard.json} (100%) rename keyboards/alas/{info.json => keyboard.json} (100%) rename keyboards/aliceh66/pianoforte/{info.json => keyboard.json} (100%) rename keyboards/aliceh66/pianoforte_hs/{info.json => keyboard.json} (100%) rename keyboards/amjkeyboard/amj66/{info.json => keyboard.json} (100%) rename keyboards/amjkeyboard/amj96/{info.json => keyboard.json} (100%) rename keyboards/annepro2/c15/{info.json => keyboard.json} (100%) rename keyboards/annepro2/c18/{info.json => keyboard.json} (100%) rename keyboards/argyle/{info.json => keyboard.json} (100%) rename keyboards/arrowmechanics/wings/{info.json => keyboard.json} (100%) rename keyboards/artifact/lvl/rev_hs01/{info.json => keyboard.json} (100%) rename keyboards/aurora65/{info.json => keyboard.json} (100%) rename keyboards/axolstudio/helpo/{info.json => keyboard.json} (100%) rename keyboards/baion_808/{info.json => keyboard.json} (100%) rename keyboards/bajjak/{info.json => keyboard.json} (100%) rename keyboards/barleycorn_smd/{info.json => keyboard.json} (100%) rename keyboards/basketweave/{info.json => keyboard.json} (100%) rename keyboards/bbrfkr/dynamis/{info.json => keyboard.json} (100%) rename keyboards/beekeeb/piantor/{info.json => keyboard.json} (100%) rename keyboards/beekeeb/piantor_pro/{info.json => keyboard.json} (100%) rename keyboards/bioi/g60/{info.json => keyboard.json} (100%) rename keyboards/bioi/g60ble/{info.json => keyboard.json} (100%) rename keyboards/bioi/morgan65/{info.json => keyboard.json} (100%) rename keyboards/boardsource/equals/48/{info.json => keyboard.json} (100%) rename keyboards/boardsource/equals/60/{info.json => keyboard.json} (100%) rename keyboards/boardsource/lulu/rp2040/{info.json => keyboard.json} (100%) rename keyboards/boardsource/unicorne/{info.json => keyboard.json} (100%) rename keyboards/boston_meetup/2019/{info.json => keyboard.json} (51%) delete mode 100644 keyboards/boston_meetup/info.json rename keyboards/bpiphany/ghost_squid/{info.json => keyboard.json} (100%) rename keyboards/bpiphany/hid_liber/{info.json => keyboard.json} (100%) rename keyboards/bpiphany/kitten_paw/{info.json => keyboard.json} (100%) rename keyboards/bpiphany/pegasushoof/2013/{info.json => keyboard.json} (100%) rename keyboards/bpiphany/pegasushoof/2015/{info.json => keyboard.json} (100%) rename keyboards/bpiphany/tiger_lily/{info.json => keyboard.json} (100%) rename keyboards/bpiphany/unloved_bastard/{info.json => keyboard.json} (100%) rename keyboards/budgy/{info.json => keyboard.json} (100%) rename keyboards/buzzard/rev1/{info.json => keyboard.json} (100%) diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/keyboard.json similarity index 89% rename from keyboards/10bleoledhub/info.json rename to keyboards/10bleoledhub/keyboard.json index 17ebcaf4587..8f48e09127f 100644 --- a/keyboards/10bleoledhub/info.json +++ b/keyboards/10bleoledhub/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x7C99", "device_version": "0.0.1" }, + "features": { + "bluetooth": true, + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true + }, "bluetooth": { "driver": "bluefruit_le" }, diff --git a/keyboards/10bleoledhub/rules.mk b/keyboards/10bleoledhub/rules.mk index 12bfe122d62..3437a35bdf1 100644 --- a/keyboards/10bleoledhub/rules.mk +++ b/keyboards/10bleoledhub/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 -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 -OLED_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/1k/info.json b/keyboards/1k/keyboard.json similarity index 71% rename from keyboards/1k/info.json rename to keyboards/1k/keyboard.json index 34f33d50595..440856d0bd4 100644 --- a/keyboards/1k/info.json +++ b/keyboards/1k/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "attiny85", + "bootloader": "custom", + "build": { + "lto": true + }, + "features": { + "grave_esc": false, + "magic": false, + "space_cadet": false + }, "rgblight": { "led_count": 1 }, diff --git a/keyboards/1k/rules.mk b/keyboards/1k/rules.mk index b3bd401f6ba..4078fe342aa 100644 --- a/keyboards/1k/rules.mk +++ b/keyboards/1k/rules.mk @@ -1,26 +1,2 @@ -# MCU name -MCU = attiny85 - -# Bootloader selection -BOOTLOADER = custom BOOTLOADER_SIZE = 1862 PROGRAM_CMD = micronucleus --run $(BUILD_DIR)/$(TARGET).hex - -# 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 - -# Save as much space as we can... -LTO_ENABLE = yes -GRAVE_ESC_ENABLE = no -MAGIC_ENABLE = no -SPACE_CADET_ENABLE = no diff --git a/keyboards/1upkeyboards/1upslider8/info.json b/keyboards/1upkeyboards/1upslider8/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/1upslider8/info.json rename to keyboards/1upkeyboards/1upslider8/keyboard.json diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json b/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json index 3512838186a..63f76eb1a65 100644 --- a/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json +++ b/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json @@ -24,6 +24,7 @@ "extrakey": true, "mousekey": true, "nkro": false, + "oled": true, "rgb_matrix": true }, "matrix_pins": { diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json b/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json index 230ce3d8574..ed1f1391261 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json @@ -24,6 +24,7 @@ "extrakey": true, "mousekey": true, "nkro": false, + "oled": true, "rgb_matrix": true }, "matrix_pins": { diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json b/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json index 47625ecc4dd..aa19a502b98 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json +++ b/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json @@ -24,6 +24,7 @@ "extrakey": true, "mousekey": true, "nkro": false, + "oled": true, "rgb_matrix": true }, "matrix_pins": { diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk index 3451f44976a..48aea570e01 100644 --- a/keyboards/1upkeyboards/pi40/rules.mk +++ b/keyboards/1upkeyboards/pi40/rules.mk @@ -1,3 +1 @@ -OLED_ENABLE = yes - DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0 diff --git a/keyboards/25keys/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk index a8c773a3054..1edcb0a3455 100644 --- a/keyboards/25keys/zinc/rules.mk +++ b/keyboards/25keys/zinc/rules.mk @@ -1,4 +1 @@ DEFAULT_FOLDER = 25keys/zinc/rev1 - -#SRC += i2c.c -SRC += serial.c diff --git a/keyboards/3w6/rev2/info.json b/keyboards/3w6/rev1/keyboard.json similarity index 90% rename from keyboards/3w6/rev2/info.json rename to keyboards/3w6/rev1/keyboard.json index 70ee0e0fcac..478c79b9427 100644 --- a/keyboards/3w6/rev2/info.json +++ b/keyboards/3w6/rev1/keyboard.json @@ -1,6 +1,14 @@ { "usb": { - "device_version": "0.0.2" + "device_version": "0.0.1", + "no_startup_check": true + }, + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "unicode": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/3w6/rev1/rules.mk b/keyboards/3w6/rev1/rules.mk index b7988ce4f55..cea39bb5c90 100644 --- a/keyboards/3w6/rev1/rules.mk +++ b/keyboards/3w6/rev1/rules.mk @@ -1,19 +1,3 @@ -# 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 = no - SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/3w6/rev1/info.json b/keyboards/3w6/rev2/keyboard.json similarity index 90% rename from keyboards/3w6/rev1/info.json rename to keyboards/3w6/rev2/keyboard.json index 2db9363564d..f3981e88d98 100644 --- a/keyboards/3w6/rev1/info.json +++ b/keyboards/3w6/rev2/keyboard.json @@ -1,6 +1,14 @@ { "usb": { - "device_version": "0.0.1" + "device_version": "0.0.2", + "no_startup_check": true + }, + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "unicode": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/3w6/rev2/rules.mk b/keyboards/3w6/rev2/rules.mk index b7988ce4f55..cea39bb5c90 100644 --- a/keyboards/3w6/rev2/rules.mk +++ b/keyboards/3w6/rev2/rules.mk @@ -1,19 +1,3 @@ -# 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 = no - SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/4pplet/waffling60/rev_e/info.json b/keyboards/4pplet/waffling60/rev_e/keyboard.json similarity index 100% rename from keyboards/4pplet/waffling60/rev_e/info.json rename to keyboards/4pplet/waffling60/rev_e/keyboard.json diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/info.json b/keyboards/4pplet/waffling60/rev_e_ansi/keyboard.json similarity index 100% rename from keyboards/4pplet/waffling60/rev_e_ansi/info.json rename to keyboards/4pplet/waffling60/rev_e_ansi/keyboard.json diff --git a/keyboards/4pplet/waffling60/rev_e_iso/info.json b/keyboards/4pplet/waffling60/rev_e_iso/keyboard.json similarity index 100% rename from keyboards/4pplet/waffling60/rev_e_iso/info.json rename to keyboards/4pplet/waffling60/rev_e_iso/keyboard.json diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/keyboard.json similarity index 100% rename from keyboards/acheron/shark/alpha/info.json rename to keyboards/acheron/shark/alpha/keyboard.json diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/keyboard.json similarity index 100% rename from keyboards/adafruit/macropad/info.json rename to keyboards/adafruit/macropad/keyboard.json diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/keyboard.json similarity index 100% rename from keyboards/adpenrose/mine/info.json rename to keyboards/adpenrose/mine/keyboard.json diff --git a/keyboards/aeboards/ext65/rev3/info.json b/keyboards/aeboards/ext65/rev3/keyboard.json similarity index 100% rename from keyboards/aeboards/ext65/rev3/info.json rename to keyboards/aeboards/ext65/rev3/keyboard.json diff --git a/keyboards/aeboards/satellite/rev1/info.json b/keyboards/aeboards/satellite/rev1/keyboard.json similarity index 100% rename from keyboards/aeboards/satellite/rev1/info.json rename to keyboards/aeboards/satellite/rev1/keyboard.json diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/keyboard.json similarity index 100% rename from keyboards/ai03/lunar_ii/info.json rename to keyboards/ai03/lunar_ii/keyboard.json diff --git a/keyboards/aidansmithdotdev/sango/info.json b/keyboards/aidansmithdotdev/sango/keyboard.json similarity index 100% rename from keyboards/aidansmithdotdev/sango/info.json rename to keyboards/aidansmithdotdev/sango/keyboard.json diff --git a/keyboards/al1/info.json b/keyboards/al1/keyboard.json similarity index 100% rename from keyboards/al1/info.json rename to keyboards/al1/keyboard.json diff --git a/keyboards/alas/info.json b/keyboards/alas/keyboard.json similarity index 100% rename from keyboards/alas/info.json rename to keyboards/alas/keyboard.json diff --git a/keyboards/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/keyboard.json similarity index 100% rename from keyboards/aliceh66/pianoforte/info.json rename to keyboards/aliceh66/pianoforte/keyboard.json diff --git a/keyboards/aliceh66/pianoforte_hs/info.json b/keyboards/aliceh66/pianoforte_hs/keyboard.json similarity index 100% rename from keyboards/aliceh66/pianoforte_hs/info.json rename to keyboards/aliceh66/pianoforte_hs/keyboard.json diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/keyboard.json similarity index 100% rename from keyboards/amjkeyboard/amj66/info.json rename to keyboards/amjkeyboard/amj66/keyboard.json diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/keyboard.json similarity index 100% rename from keyboards/amjkeyboard/amj96/info.json rename to keyboards/amjkeyboard/amj96/keyboard.json diff --git a/keyboards/annepro2/c15/info.json b/keyboards/annepro2/c15/keyboard.json similarity index 100% rename from keyboards/annepro2/c15/info.json rename to keyboards/annepro2/c15/keyboard.json diff --git a/keyboards/annepro2/c18/info.json b/keyboards/annepro2/c18/keyboard.json similarity index 100% rename from keyboards/annepro2/c18/info.json rename to keyboards/annepro2/c18/keyboard.json diff --git a/keyboards/argyle/info.json b/keyboards/argyle/keyboard.json similarity index 100% rename from keyboards/argyle/info.json rename to keyboards/argyle/keyboard.json diff --git a/keyboards/arrowmechanics/wings/info.json b/keyboards/arrowmechanics/wings/keyboard.json similarity index 100% rename from keyboards/arrowmechanics/wings/info.json rename to keyboards/arrowmechanics/wings/keyboard.json diff --git a/keyboards/artifact/lvl/rev_hs01/info.json b/keyboards/artifact/lvl/rev_hs01/keyboard.json similarity index 100% rename from keyboards/artifact/lvl/rev_hs01/info.json rename to keyboards/artifact/lvl/rev_hs01/keyboard.json diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/keyboard.json similarity index 100% rename from keyboards/aurora65/info.json rename to keyboards/aurora65/keyboard.json diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/keyboard.json similarity index 100% rename from keyboards/axolstudio/helpo/info.json rename to keyboards/axolstudio/helpo/keyboard.json diff --git a/keyboards/baion_808/info.json b/keyboards/baion_808/keyboard.json similarity index 100% rename from keyboards/baion_808/info.json rename to keyboards/baion_808/keyboard.json diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/keyboard.json similarity index 100% rename from keyboards/bajjak/info.json rename to keyboards/bajjak/keyboard.json diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/keyboard.json similarity index 100% rename from keyboards/barleycorn_smd/info.json rename to keyboards/barleycorn_smd/keyboard.json diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/keyboard.json similarity index 100% rename from keyboards/basketweave/info.json rename to keyboards/basketweave/keyboard.json diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/keyboard.json similarity index 100% rename from keyboards/bbrfkr/dynamis/info.json rename to keyboards/bbrfkr/dynamis/keyboard.json diff --git a/keyboards/beekeeb/piantor/info.json b/keyboards/beekeeb/piantor/keyboard.json similarity index 100% rename from keyboards/beekeeb/piantor/info.json rename to keyboards/beekeeb/piantor/keyboard.json diff --git a/keyboards/beekeeb/piantor_pro/info.json b/keyboards/beekeeb/piantor_pro/keyboard.json similarity index 100% rename from keyboards/beekeeb/piantor_pro/info.json rename to keyboards/beekeeb/piantor_pro/keyboard.json diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/keyboard.json similarity index 100% rename from keyboards/bioi/g60/info.json rename to keyboards/bioi/g60/keyboard.json diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/keyboard.json similarity index 100% rename from keyboards/bioi/g60ble/info.json rename to keyboards/bioi/g60ble/keyboard.json diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/keyboard.json similarity index 100% rename from keyboards/bioi/morgan65/info.json rename to keyboards/bioi/morgan65/keyboard.json diff --git a/keyboards/boardsource/equals/48/info.json b/keyboards/boardsource/equals/48/keyboard.json similarity index 100% rename from keyboards/boardsource/equals/48/info.json rename to keyboards/boardsource/equals/48/keyboard.json diff --git a/keyboards/boardsource/equals/60/info.json b/keyboards/boardsource/equals/60/keyboard.json similarity index 100% rename from keyboards/boardsource/equals/60/info.json rename to keyboards/boardsource/equals/60/keyboard.json diff --git a/keyboards/boardsource/lulu/rp2040/info.json b/keyboards/boardsource/lulu/rp2040/keyboard.json similarity index 100% rename from keyboards/boardsource/lulu/rp2040/info.json rename to keyboards/boardsource/lulu/rp2040/keyboard.json diff --git a/keyboards/boardsource/unicorne/info.json b/keyboards/boardsource/unicorne/keyboard.json similarity index 100% rename from keyboards/boardsource/unicorne/info.json rename to keyboards/boardsource/unicorne/keyboard.json diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/keyboard.json similarity index 51% rename from keyboards/boston_meetup/2019/info.json rename to keyboards/boston_meetup/2019/keyboard.json index 5ced95c018b..97990bb5030 100644 --- a/keyboards/boston_meetup/2019/info.json +++ b/keyboards/boston_meetup/2019/keyboard.json @@ -1,6 +1,12 @@ { + "keyboard_name": "Boston Meetup Board", + "manufacturer": "ishtob", + "url": "", + "maintainer": "qmk", "usb": { - "device_version": "20.1.9" + "vid": "0xFB30", + "pid": "0x26BE", + "device_version": "20.1.9" }, "features": { "bootmagic": true, @@ -45,5 +51,27 @@ "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", - "debounce": 6 + "debounce": 6, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3} + ] + } + } } diff --git a/keyboards/boston_meetup/info.json b/keyboards/boston_meetup/info.json deleted file mode 100644 index 3156c643c96..00000000000 --- a/keyboards/boston_meetup/info.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "keyboard_name": "Boston Meetup Board", - "manufacturer": "ishtob", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0xFB30", - "pid": "0x26BE" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3} - ] - } - } -} diff --git a/keyboards/boston_meetup/rules.mk b/keyboards/boston_meetup/rules.mk index 6dd899edc85..6d6745a0e57 100644 --- a/keyboards/boston_meetup/rules.mk +++ b/keyboards/boston_meetup/rules.mk @@ -1,2 +1 @@ - DEFAULT_FOLDER = boston_meetup/2019 diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/keyboard.json similarity index 100% rename from keyboards/bpiphany/ghost_squid/info.json rename to keyboards/bpiphany/ghost_squid/keyboard.json diff --git a/keyboards/bpiphany/hid_liber/info.json b/keyboards/bpiphany/hid_liber/keyboard.json similarity index 100% rename from keyboards/bpiphany/hid_liber/info.json rename to keyboards/bpiphany/hid_liber/keyboard.json diff --git a/keyboards/bpiphany/hid_liber/rules.mk b/keyboards/bpiphany/hid_liber/rules.mk index 1b9ebdb1312..3215e3588a3 100755 --- a/keyboards/bpiphany/hid_liber/rules.mk +++ b/keyboards/bpiphany/hid_liber/rules.mk @@ -1,4 +1,2 @@ -CUSTOM_MATRIX = yes # Custom matrix file - -# Project specific files +CUSTOM_MATRIX = yes SRC = matrix.c diff --git a/keyboards/bpiphany/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/keyboard.json similarity index 100% rename from keyboards/bpiphany/kitten_paw/info.json rename to keyboards/bpiphany/kitten_paw/keyboard.json diff --git a/keyboards/bpiphany/pegasushoof/2013/info.json b/keyboards/bpiphany/pegasushoof/2013/keyboard.json similarity index 100% rename from keyboards/bpiphany/pegasushoof/2013/info.json rename to keyboards/bpiphany/pegasushoof/2013/keyboard.json diff --git a/keyboards/bpiphany/pegasushoof/2015/info.json b/keyboards/bpiphany/pegasushoof/2015/keyboard.json similarity index 100% rename from keyboards/bpiphany/pegasushoof/2015/info.json rename to keyboards/bpiphany/pegasushoof/2015/keyboard.json diff --git a/keyboards/bpiphany/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/keyboard.json similarity index 100% rename from keyboards/bpiphany/tiger_lily/info.json rename to keyboards/bpiphany/tiger_lily/keyboard.json diff --git a/keyboards/bpiphany/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/keyboard.json similarity index 100% rename from keyboards/bpiphany/unloved_bastard/info.json rename to keyboards/bpiphany/unloved_bastard/keyboard.json diff --git a/keyboards/budgy/info.json b/keyboards/budgy/keyboard.json similarity index 100% rename from keyboards/budgy/info.json rename to keyboards/budgy/keyboard.json diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/keyboard.json similarity index 100% rename from keyboards/buzzard/rev1/info.json rename to keyboards/buzzard/rev1/keyboard.json From bbf63a84664282289a10ccf2b7bd4dadde3ed635 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 13 Apr 2024 13:15:22 +1000 Subject: [PATCH 133/333] LED Matrix: replace backlight keycodes with newly added ones (#23455) --- .../66_hotswap/gen1/keymaps/66_ansi/keymap.c | 2 +- .../66_hotswap/gen1/keymaps/default/keymap.c | 6 ++-- .../keymaps/halfkeyboard/keymap.c | 4 +-- .../ansi/white/keymaps/default/keymap.c | 16 +++++----- .../ansi/white/keymaps/keychron/keymap.c | 16 +++++----- .../c1_pro/ansi/white/keymaps/via/keymap.c | 16 +++++----- keyboards/keychron/c1_pro/ansi/white/white.c | 2 +- .../ansi/white/keymaps/default/keymap.c | 16 +++++----- .../ansi/white/keymaps/keychron/keymap.c | 16 +++++----- .../c2_pro/ansi/white/keymaps/via/keymap.c | 16 +++++----- .../s1/ansi/white/keymaps/default/keymap.c | 16 +++++----- .../s1/ansi/white/keymaps/keychron/keymap.c | 16 +++++----- .../s1/ansi/white/keymaps/via/keymap.c | 16 +++++----- keyboards/keychron/s1/s1.c | 2 +- quantum/process_keycode/process_led_matrix.c | 29 ++++++++++++++----- 15 files changed, 102 insertions(+), 87 deletions(-) diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c index 4dfa570cbcc..9bd7f227dc1 100644 --- a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c +++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _CL: Control layer */ [_CL] = LAYOUT_66_ansi( - BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI, + LM_NEXT,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI, _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c index 2a1a7722721..07f7d0f7dea 100644 --- a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c +++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c @@ -68,11 +68,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _CL: Control layer */ [_CL] = LAYOUT( - BL_STEP,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, BL_TOGG, BL_UP, - _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DOWN, + LM_NEXT,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, LM_TOGG, LM_BRIU, + _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, LM_BRID, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, - _______,_______,_______, BL_BRTG,BL_BRTG, _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), + _______,_______,_______, _______,_______, _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), }; diff --git a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c index 35f459fab5f..48b26c704ee 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c +++ b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c @@ -233,8 +233,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_DOWN, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_MINUS, KC_KP_ENTER, KC_NO,KC_AMPR,KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_PLUS, KC_NO, KC_TRNS,KC_DOT, KC_0, KC_KP_EQUAL, KC_NO, - BL_OFF, KC_TRNS, - BL_ON, + LM_OFF, KC_TRNS, + LM_ON, KC_NO, KC_NO, LT(HALFSYMB, KC_ENT) ), /* Keymap 6: Mirrored Symbol Layer diff --git a/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c index a829c118922..93dab79e7a1 100644 --- a/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c +++ b/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c @@ -30,7 +30,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_tkl_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, @@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_tkl_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), [WIN_BASE] = LAYOUT_tkl_ansi( - 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_F12, KC_PSCR, _______, BL_STEP, + 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_F12, KC_PSCR, _______, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, @@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_tkl_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c b/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c index e17d67eb718..f819b4fc031 100644 --- a/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c +++ b/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c @@ -26,7 +26,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_tkl_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, @@ -34,15 +34,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_tkl_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), [WIN_BASE] = LAYOUT_tkl_ansi( - 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_F12, KC_PSCR, KC_CRTA, BL_STEP, + 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_F12, KC_PSCR, KC_CRTA, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, @@ -50,10 +50,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_tkl_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c index a829c118922..93dab79e7a1 100644 --- a/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c +++ b/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c @@ -30,7 +30,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_tkl_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, @@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_tkl_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), [WIN_BASE] = LAYOUT_tkl_ansi( - 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_F12, KC_PSCR, _______, BL_STEP, + 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_F12, KC_PSCR, _______, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, @@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_tkl_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/keychron/c1_pro/ansi/white/white.c b/keyboards/keychron/c1_pro/ansi/white/white.c index 2b41845c9b5..9009225b3b2 100644 --- a/keyboards/keychron/c1_pro/ansi/white/white.c +++ b/keyboards/keychron/c1_pro/ansi/white/white.c @@ -128,7 +128,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return false; } switch (keycode) { - case BL_TOGG: + case LM_TOGG: if (record->event.pressed) { switch (led_matrix_get_flags()) { case LED_FLAG_ALL: { diff --git a/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c index 70934e122e3..b8c26b19397 100644 --- a/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c +++ b/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c @@ -30,7 +30,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, @@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [MAC_FN] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [WIN_BASE] = 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_F12, KC_PSCR, KC_NO, BL_STEP, + 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_F12, KC_PSCR, KC_NO, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, @@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [WIN_FN] = LAYOUT( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c b/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c index 09002c3d7a4..c99b5bc4916 100644 --- a/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c +++ b/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c @@ -26,7 +26,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, @@ -34,15 +34,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [MAC_FN] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [WIN_BASE] = 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_F12, KC_PSCR, KC_CRTA, BL_STEP, + 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_F12, KC_PSCR, KC_CRTA, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, @@ -50,10 +50,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [WIN_FN] = LAYOUT( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c index 547521e099b..a162e3d3a5e 100644 --- a/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c +++ b/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c @@ -28,7 +28,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, @@ -36,15 +36,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [MAC_FN] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [WIN_BASE] = 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_F12, KC_PSCR, KC_NO, BL_STEP, + 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_F12, KC_PSCR, KC_NO, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, @@ -52,10 +52,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [WIN_FN] = LAYOUT( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c index 00dc1c07793..1ee03394298 100644 --- a/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c +++ b/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c @@ -30,7 +30,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_75_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_DEL, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_DEL, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, @@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_75_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), [WIN_BASE] = LAYOUT_75_ansi( - 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_F12, KC_PSCR, KC_DEL, BL_STEP, + 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_F12, KC_PSCR, KC_DEL, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, @@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_75_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c b/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c index baced4f97c7..cf080071764 100644 --- a/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c +++ b/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c @@ -28,7 +28,7 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_75_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, @@ -36,15 +36,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_75_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), [WIN_BASE] = LAYOUT_75_ansi( - 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_F12, KC_PSCR, KC_DEL, BL_STEP, + 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_F12, KC_PSCR, KC_DEL, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, @@ -52,10 +52,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_75_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c index 10d2e08aef3..a515205b3a0 100644 --- a/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c +++ b/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c @@ -30,7 +30,7 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_75_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_DEL, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_DEL, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, @@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_75_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), [WIN_BASE] = LAYOUT_75_ansi( - 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_F12, KC_PSCR, KC_DEL, BL_STEP, + 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_F12, KC_PSCR, KC_DEL, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, @@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_75_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/keychron/s1/s1.c b/keyboards/keychron/s1/s1.c index 2f1b905505f..51bc0596c4a 100644 --- a/keyboards/keychron/s1/s1.c +++ b/keyboards/keychron/s1/s1.c @@ -78,7 +78,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { if (!process_record_user(keycode, record)) { return false; } switch (keycode) { #ifdef LED_MATRIX_ENABLE - case BL_TOGG: + case LM_TOGG: if (record->event.pressed) { switch (led_matrix_get_flags()) { case LED_FLAG_ALL: { diff --git a/quantum/process_keycode/process_led_matrix.c b/quantum/process_keycode/process_led_matrix.c index 217c9a2c28a..7f95bf10115 100644 --- a/quantum/process_keycode/process_led_matrix.c +++ b/quantum/process_keycode/process_led_matrix.c @@ -7,24 +7,39 @@ bool process_led_matrix(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { switch (keycode) { - case QK_BACKLIGHT_ON: + case QK_BACKLIGHT_ON: // TODO: Remove backlight keycodes + case QK_LED_MATRIX_ON: led_matrix_enable(); return false; case QK_BACKLIGHT_OFF: + case QK_LED_MATRIX_OFF: led_matrix_disable(); return false; - case QK_BACKLIGHT_DOWN: - led_matrix_decrease_val(); - return false; - case QK_BACKLIGHT_UP: - led_matrix_increase_val(); - return false; case QK_BACKLIGHT_TOGGLE: + case QK_LED_MATRIX_TOGGLE: led_matrix_toggle(); return false; case QK_BACKLIGHT_STEP: + case QK_LED_MATRIX_MODE_NEXT: led_matrix_step(); return false; + case QK_LED_MATRIX_MODE_PREVIOUS: + led_matrix_step_reverse(); + return false; + case QK_BACKLIGHT_UP: + case QK_LED_MATRIX_BRIGHTNESS_UP: + led_matrix_increase_val(); + return false; + case QK_BACKLIGHT_DOWN: + case QK_LED_MATRIX_BRIGHTNESS_DOWN: + led_matrix_decrease_val(); + return false; + case QK_LED_MATRIX_SPEED_UP: + led_matrix_increase_speed(); + return false; + case QK_LED_MATRIX_SPEED_DOWN: + led_matrix_decrease_speed(); + return false; } } From 43a122e050647057dbaa16bc50417b9306e00bcc Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 13 Apr 2024 06:31:34 +0100 Subject: [PATCH 134/333] Migrate build target markers to keyboard.json - W (#23511) --- .../waterfowl/{info.json => keyboard.json} | 8 ++++ keyboards/waterfowl/rules.mk | 15 ------- keyboards/wekey/we27/config.h | 39 ------------------- .../wekey/we27/{info.json => keyboard.json} | 14 +++++++ keyboards/wekey/we27/rules.mk | 15 ------- keyboards/westm/westmergo/config.h | 22 ----------- .../westmergo/{info.json => keyboard.json} | 15 +++++++ keyboards/westm/westmergo/rules.mk | 13 ------- .../whale/sk/v3/{info.json => keyboard.json} | 6 +++ keyboards/whale/sk/v3/rules.mk | 12 ------ .../{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/rama_works_kara/rules.mk | 15 +------ .../{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/rama_works_koyu/rules.mk | 15 +------ .../{info.json => keyboard.json} | 6 +++ .../wilba_tech/rama_works_m10_c/rules.mk | 18 ++------- .../{info.json => keyboard.json} | 6 +++ .../wilba_tech/rama_works_m50_a/rules.mk | 18 ++------- .../{info.json => keyboard.json} | 6 +++ .../wilba_tech/rama_works_m60_a/rules.mk | 15 +------ .../{info.json => keyboard.json} | 6 +++ .../wilba_tech/rama_works_m65_b/rules.mk | 18 ++------- .../{info.json => keyboard.json} | 6 +++ .../wilba_tech/rama_works_m65_bx/rules.mk | 18 ++------- .../{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/rama_works_m6_a/rules.mk | 13 ------- .../{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/rama_works_m6_b/rules.mk | 15 +------ .../{info.json => keyboard.json} | 6 +++ .../wilba_tech/rama_works_u80_a/rules.mk | 13 +------ .../wt60_a/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt60_a/rules.mk | 13 +------ .../wt60_b/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt60_b/rules.mk | 15 +------ .../wt60_bx/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt60_bx/rules.mk | 15 +------ .../wt60_c/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt60_c/rules.mk | 15 +------ .../wt65_a/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt65_a/rules.mk | 13 +------ .../wt65_b/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt65_b/rules.mk | 13 +------ .../wt69_a/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt69_a/rules.mk | 12 ------ .../wt75_a/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt75_a/rules.mk | 13 +------ .../wt75_b/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt75_b/rules.mk | 13 +------ .../wt75_c/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt75_c/rules.mk | 13 +------ .../wt80_a/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt80_a/rules.mk | 13 +------ keyboards/wilba_tech/wt80_bc/config.h | 22 ----------- .../wt80_bc/{info.json => keyboard.json} | 12 ++++++ keyboards/wilba_tech/wt80_bc/rules.mk | 12 ------ keyboards/wilba_tech/wt8_a/config.h | 22 ----------- .../wt8_a/{info.json => keyboard.json} | 12 ++++++ keyboards/wilba_tech/wt8_a/rules.mk | 12 ------ .../zeal60/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/zeal60/rules.mk | 15 +------ .../zeal65/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/zeal65/rules.mk | 15 +------ .../wolf/frogpad/{info.json => keyboard.json} | 0 .../wolf/kuku65/{info.json => keyboard.json} | 6 +++ keyboards/wolf/kuku65/rules.mk | 13 ------- .../wolf/m60_b/{info.json => keyboard.json} | 0 .../wolf/m6_c/{info.json => keyboard.json} | 0 .../wolf/neely65/{info.json => keyboard.json} | 0 .../wolf/ryujin/{info.json => keyboard.json} | 6 +++ keyboards/wolf/ryujin/rules.mk | 13 ------- .../wolf/sabre/{info.json => keyboard.json} | 7 ++++ keyboards/wolf/sabre/rules.mk | 14 ------- .../wolf/ts60/{info.json => keyboard.json} | 8 ++++ keyboards/wolf/ts60/rules.mk | 13 ------- keyboards/wolfmarkclub/wm1/config.h | 39 ------------------- .../wm1/{info.json => keyboard.json} | 21 ++++++++++ keyboards/wolfmarkclub/wm1/rules.mk | 22 ----------- .../micro/{info.json => keyboard.json} | 0 .../nano/{info.json => keyboard.json} | 12 ++++++ keyboards/work_louder/nano/rules.mk | 17 -------- .../numpad/{info.json => keyboard.json} | 0 keyboards/wren/config.h | 21 ---------- keyboards/wren/{info.json => keyboard.json} | 13 +++++++ keyboards/wren/rules.mk | 13 ------- .../creek70/{info.json => keyboard.json} | 3 +- keyboards/wuque/creek70/rules.mk | 1 - keyboards/wuque/ikki68_aurora/config.h | 24 ------------ .../{info.json => keyboard.json} | 13 +++++++ keyboards/wuque/ikki68_aurora/rules.mk | 14 ------- .../serneity65/{info.json => keyboard.json} | 8 ++++ keyboards/wuque/serneity65/rules.mk | 15 ------- 91 files changed, 330 insertions(+), 711 deletions(-) rename keyboards/waterfowl/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/waterfowl/rules.mk delete mode 100644 keyboards/wekey/we27/config.h rename keyboards/wekey/we27/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/westm/westmergo/config.h rename keyboards/westm/westmergo/{info.json => keyboard.json} (93%) rename keyboards/whale/sk/v3/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/whale/sk/v3/rules.mk rename keyboards/wilba_tech/rama_works_kara/{info.json => keyboard.json} (96%) rename keyboards/wilba_tech/rama_works_koyu/{info.json => keyboard.json} (97%) rename keyboards/wilba_tech/rama_works_m10_c/{info.json => keyboard.json} (91%) rename keyboards/wilba_tech/rama_works_m50_a/{info.json => keyboard.json} (96%) rename keyboards/wilba_tech/rama_works_m60_a/{info.json => keyboard.json} (96%) rename keyboards/wilba_tech/rama_works_m65_b/{info.json => keyboard.json} (97%) rename keyboards/wilba_tech/rama_works_m65_bx/{info.json => keyboard.json} (98%) rename keyboards/wilba_tech/rama_works_m6_a/{info.json => keyboard.json} (87%) rename keyboards/wilba_tech/rama_works_m6_b/{info.json => keyboard.json} (87%) rename keyboards/wilba_tech/rama_works_u80_a/{info.json => keyboard.json} (98%) rename keyboards/wilba_tech/wt60_a/{info.json => keyboard.json} (98%) rename keyboards/wilba_tech/wt60_b/{info.json => keyboard.json} (98%) rename keyboards/wilba_tech/wt60_bx/{info.json => keyboard.json} (99%) rename keyboards/wilba_tech/wt60_c/{info.json => keyboard.json} (99%) rename keyboards/wilba_tech/wt65_a/{info.json => keyboard.json} (99%) rename keyboards/wilba_tech/wt65_b/{info.json => keyboard.json} (98%) rename keyboards/wilba_tech/wt69_a/{info.json => keyboard.json} (98%) rename keyboards/wilba_tech/wt75_a/{info.json => keyboard.json} (99%) rename keyboards/wilba_tech/wt75_b/{info.json => keyboard.json} (99%) rename keyboards/wilba_tech/wt75_c/{info.json => keyboard.json} (99%) rename keyboards/wilba_tech/wt80_a/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/wilba_tech/wt80_bc/config.h rename keyboards/wilba_tech/wt80_bc/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/wilba_tech/wt8_a/config.h rename keyboards/wilba_tech/wt8_a/{info.json => keyboard.json} (80%) rename keyboards/wilba_tech/zeal60/{info.json => keyboard.json} (99%) rename keyboards/wilba_tech/zeal65/{info.json => keyboard.json} (98%) rename keyboards/wolf/frogpad/{info.json => keyboard.json} (100%) rename keyboards/wolf/kuku65/{info.json => keyboard.json} (97%) rename keyboards/wolf/m60_b/{info.json => keyboard.json} (100%) rename keyboards/wolf/m6_c/{info.json => keyboard.json} (100%) rename keyboards/wolf/neely65/{info.json => keyboard.json} (100%) rename keyboards/wolf/ryujin/{info.json => keyboard.json} (97%) rename keyboards/wolf/sabre/{info.json => keyboard.json} (97%) rename keyboards/wolf/ts60/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/wolfmarkclub/wm1/config.h rename keyboards/wolfmarkclub/wm1/{info.json => keyboard.json} (91%) rename keyboards/work_louder/micro/{info.json => keyboard.json} (100%) rename keyboards/work_louder/nano/{info.json => keyboard.json} (91%) rename keyboards/work_louder/numpad/{info.json => keyboard.json} (100%) rename keyboards/wren/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/wren/rules.mk rename keyboards/wuque/creek70/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wuque/creek70/rules.mk delete mode 100644 keyboards/wuque/ikki68_aurora/config.h rename keyboards/wuque/ikki68_aurora/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wuque/ikki68_aurora/rules.mk rename keyboards/wuque/serneity65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wuque/serneity65/rules.mk diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/keyboard.json similarity index 94% rename from keyboards/waterfowl/info.json rename to keyboards/waterfowl/keyboard.json index 92b4add8ea2..a1783130426 100644 --- a/keyboards/waterfowl/info.json +++ b/keyboards/waterfowl/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x9CE3", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/waterfowl/rules.mk b/keyboards/waterfowl/rules.mk deleted file mode 100644 index afab74111f8..00000000000 --- a/keyboards/waterfowl/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -OLED_ENABLE = yes # Enables the use of OLED displays -ENCODER_ENABLE = yes # Enables the encoders diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h deleted file mode 100644 index c86ead57bd8..00000000000 --- a/keyboards/wekey/we27/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 @wekey - -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/wekey/we27/info.json b/keyboards/wekey/we27/keyboard.json similarity index 89% rename from keyboards/wekey/we27/info.json rename to keyboards/wekey/we27/keyboard.json index 802ae8eed6c..d8cb7b0f802 100644 --- a/keyboards/wekey/we27/info.json +++ b/keyboards/wekey/we27/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgb_matrix": { "animations": { "rainbow_moving_chevron": true diff --git a/keyboards/wekey/we27/rules.mk b/keyboards/wekey/we27/rules.mk index 1c5cc136ca4..942ef4c5dbd 100644 --- a/keyboards/wekey/we27/rules.mk +++ b/keyboards/wekey/we27/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 -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes # Use RGB matrix - RGB_MATRIX_CUSTOM_KB = yes diff --git a/keyboards/westm/westmergo/config.h b/keyboards/westm/westmergo/config.h deleted file mode 100644 index 4e85b2e402a..00000000000 --- a/keyboards/westm/westmergo/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 WestM - * - * 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 diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/keyboard.json similarity index 93% rename from keyboards/westm/westmergo/info.json rename to keyboards/westm/westmergo/keyboard.json index de733b988a8..0ead8662029 100644 --- a/keyboards/westm/westmergo/info.json +++ b/keyboards/westm/westmergo/keyboard.json @@ -8,6 +8,21 @@ "pid": "0x0201", "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": { "led_count": 16, "animations": { diff --git a/keyboards/westm/westmergo/rules.mk b/keyboards/westm/westmergo/rules.mk index aae254503b0..0ab54aaaf71 100644 --- a/keyboards/westm/westmergo/rules.mk +++ b/keyboards/westm/westmergo/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 \ No newline at end of file diff --git a/keyboards/whale/sk/v3/info.json b/keyboards/whale/sk/v3/keyboard.json similarity index 98% rename from keyboards/whale/sk/v3/info.json rename to keyboards/whale/sk/v3/keyboard.json index a7751b1d064..ce73d8251cb 100644 --- a/keyboards/whale/sk/v3/info.json +++ b/keyboards/whale/sk/v3/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0495", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "F4", "F5", "F6"], "rows": ["B1", "B2", "B3", "B4", "B5", "B6"] diff --git a/keyboards/whale/sk/v3/rules.mk b/keyboards/whale/sk/v3/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/whale/sk/v3/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 = 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/wilba_tech/rama_works_kara/info.json b/keyboards/wilba_tech/rama_works_kara/keyboard.json similarity index 96% rename from keyboards/wilba_tech/rama_works_kara/info.json rename to keyboards/wilba_tech/rama_works_kara/keyboard.json index d4a5d079b3c..896892e2847 100644 --- a/keyboards/wilba_tech/rama_works_kara/info.json +++ b/keyboards/wilba_tech/rama_works_kara/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x4B52", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_kara/rules.mk b/keyboards/wilba_tech/rama_works_kara/rules.mk index b49711824a2..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/rama_works_kara/rules.mk +++ b/keyboards/wilba_tech/rama_works_kara/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC = keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_koyu/info.json b/keyboards/wilba_tech/rama_works_koyu/keyboard.json similarity index 97% rename from keyboards/wilba_tech/rama_works_koyu/info.json rename to keyboards/wilba_tech/rama_works_koyu/keyboard.json index 6d3def254d5..507b5e1546f 100644 --- a/keyboards/wilba_tech/rama_works_koyu/info.json +++ b/keyboards/wilba_tech/rama_works_koyu/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x4B59", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_koyu/rules.mk b/keyboards/wilba_tech/rama_works_koyu/rules.mk index c921fc5c184..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/rama_works_koyu/rules.mk +++ b/keyboards/wilba_tech/rama_works_koyu/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC = keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_m10_c/info.json b/keyboards/wilba_tech/rama_works_m10_c/keyboard.json similarity index 91% rename from keyboards/wilba_tech/rama_works_m10_c/info.json rename to keyboards/wilba_tech/rama_works_m10_c/keyboard.json index 3b75a67557e..bba4720aa34 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/info.json +++ b/keyboards/wilba_tech/rama_works_m10_c/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x00AC", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"], "rows": ["E6"] diff --git a/keyboards/wilba_tech/rama_works_m10_c/rules.mk b/keyboards/wilba_tech/rama_works_m10_c/rules.mk index d8a2bae4553..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/rules.mk +++ b/keyboards/wilba_tech/rama_works_m10_c/rules.mk @@ -1,25 +1,13 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -CIE1931_CURVE = yes - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes + # project specific files SRC = keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_m50_a/info.json b/keyboards/wilba_tech/rama_works_m50_a/keyboard.json similarity index 96% rename from keyboards/wilba_tech/rama_works_m50_a/info.json rename to keyboards/wilba_tech/rama_works_m50_a/keyboard.json index 5745804c5dd..bf33a12277f 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/info.json +++ b/keyboards/wilba_tech/rama_works_m50_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x050A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"], "rows": ["F0", "F1", "F5", "F6"] diff --git a/keyboards/wilba_tech/rama_works_m50_a/rules.mk b/keyboards/wilba_tech/rama_works_m50_a/rules.mk index d8a2bae4553..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_m50_a/rules.mk @@ -1,25 +1,13 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -CIE1931_CURVE = yes - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes + # project specific files SRC = keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_m60_a/info.json b/keyboards/wilba_tech/rama_works_m60_a/keyboard.json similarity index 96% rename from keyboards/wilba_tech/rama_works_m60_a/info.json rename to keyboards/wilba_tech/rama_works_m60_a/keyboard.json index 32f6f2a5d3d..566f6cd42a4 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/info.json +++ b/keyboards/wilba_tech/rama_works_m60_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x060A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_m60_a/rules.mk b/keyboards/wilba_tech/rama_works_m60_a/rules.mk index c921fc5c184..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_m60_a/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC = keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_m65_b/info.json b/keyboards/wilba_tech/rama_works_m65_b/keyboard.json similarity index 97% rename from keyboards/wilba_tech/rama_works_m65_b/info.json rename to keyboards/wilba_tech/rama_works_m65_b/keyboard.json index 5bc67f79251..156affff7da 100644 --- a/keyboards/wilba_tech/rama_works_m65_b/info.json +++ b/keyboards/wilba_tech/rama_works_m65_b/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x065B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_m65_b/rules.mk b/keyboards/wilba_tech/rama_works_m65_b/rules.mk index d8a2bae4553..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/rama_works_m65_b/rules.mk +++ b/keyboards/wilba_tech/rama_works_m65_b/rules.mk @@ -1,25 +1,13 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -CIE1931_CURVE = yes - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes + # project specific files SRC = keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_m65_bx/info.json b/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json similarity index 98% rename from keyboards/wilba_tech/rama_works_m65_bx/info.json rename to keyboards/wilba_tech/rama_works_m65_bx/keyboard.json index 113dae991ba..9b4edcc6efc 100644 --- a/keyboards/wilba_tech/rama_works_m65_bx/info.json +++ b/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x165B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk index d8a2bae4553..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk +++ b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk @@ -1,25 +1,13 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -CIE1931_CURVE = yes - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes + # project specific files SRC = keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_m6_a/info.json b/keyboards/wilba_tech/rama_works_m6_a/keyboard.json similarity index 87% rename from keyboards/wilba_tech/rama_works_m6_a/info.json rename to keyboards/wilba_tech/rama_works_m6_a/keyboard.json index 73091d30363..df7fc90a962 100644 --- a/keyboards/wilba_tech/rama_works_m6_a/info.json +++ b/keyboards/wilba_tech/rama_works_m6_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x006A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "B5", "F4", "D7", "C6", "F6"], "rows": ["E6"] diff --git a/keyboards/wilba_tech/rama_works_m6_a/rules.mk b/keyboards/wilba_tech/rama_works_m6_a/rules.mk index 95303152b9b..806a82e12af 100644 --- a/keyboards/wilba_tech/rama_works_m6_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_m6_a/rules.mk @@ -2,16 +2,3 @@ # when we get USB suspend event. We want it to keep updating # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN - -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. diff --git a/keyboards/wilba_tech/rama_works_m6_b/info.json b/keyboards/wilba_tech/rama_works_m6_b/keyboard.json similarity index 87% rename from keyboards/wilba_tech/rama_works_m6_b/info.json rename to keyboards/wilba_tech/rama_works_m6_b/keyboard.json index 4356011aae1..4d258b826b9 100644 --- a/keyboards/wilba_tech/rama_works_m6_b/info.json +++ b/keyboards/wilba_tech/rama_works_m6_b/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x006B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "B5", "F4", "D7", "C6", "F6"], "rows": ["E6"] diff --git a/keyboards/wilba_tech/rama_works_m6_b/rules.mk b/keyboards/wilba_tech/rama_works_m6_b/rules.mk index eff0605d909..4650d7a6ea2 100644 --- a/keyboards/wilba_tech/rama_works_m6_b/rules.mk +++ b/keyboards/wilba_tech/rama_works_m6_b/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. - CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC = keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3218.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_u80_a/info.json b/keyboards/wilba_tech/rama_works_u80_a/keyboard.json similarity index 98% rename from keyboards/wilba_tech/rama_works_u80_a/info.json rename to keyboards/wilba_tech/rama_works_u80_a/keyboard.json index 96349f39093..bf06d9508f2 100644 --- a/keyboards/wilba_tech/rama_works_u80_a/info.json +++ b/keyboards/wilba_tech/rama_works_u80_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x080A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_u80_a/rules.mk b/keyboards/wilba_tech/rama_works_u80_a/rules.mk index b2629858808..d6df34b9bc0 100644 --- a/keyboards/wilba_tech/rama_works_u80_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_u80_a/rules.mk @@ -1,19 +1,8 @@ -# 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 -AUDIO_ENABLE = no # Audio output CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC = keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/wt60_a/info.json b/keyboards/wilba_tech/wt60_a/keyboard.json similarity index 98% rename from keyboards/wilba_tech/wt60_a/info.json rename to keyboards/wilba_tech/wt60_a/keyboard.json index 6016905bdc3..1c6d9f8c35d 100644 --- a/keyboards/wilba_tech/wt60_a/info.json +++ b/keyboards/wilba_tech/wt60_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x060A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_a/rules.mk b/keyboards/wilba_tech/wt60_a/rules.mk index f7482c7a2f2..858c317c200 100644 --- a/keyboards/wilba_tech/wt60_a/rules.mk +++ b/keyboards/wilba_tech/wt60_a/rules.mk @@ -1,18 +1,7 @@ -# 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 -AUDIO_ENABLE = no # Audio output +I2C_DRIVER_REQUIRED = yes # project specific files SRC = drivers/led/issi/is31fl3736-mono.c \ quantum/color.c \ keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_main.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file diff --git a/keyboards/wilba_tech/wt60_b/info.json b/keyboards/wilba_tech/wt60_b/keyboard.json similarity index 98% rename from keyboards/wilba_tech/wt60_b/info.json rename to keyboards/wilba_tech/wt60_b/keyboard.json index 253c081b9aa..765ba96f61f 100644 --- a/keyboards/wilba_tech/wt60_b/info.json +++ b/keyboards/wilba_tech/wt60_b/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x60B0", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_b/rules.mk b/keyboards/wilba_tech/wt60_b/rules.mk index 397643d3722..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/wt60_b/rules.mk +++ b/keyboards/wilba_tech/wt60_b/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC = keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/wt60_bx/info.json b/keyboards/wilba_tech/wt60_bx/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt60_bx/info.json rename to keyboards/wilba_tech/wt60_bx/keyboard.json index 1978ce8a4f1..6b4b6e9fb18 100644 --- a/keyboards/wilba_tech/wt60_bx/info.json +++ b/keyboards/wilba_tech/wt60_bx/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x60B1", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_bx/rules.mk b/keyboards/wilba_tech/wt60_bx/rules.mk index 397643d3722..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/wt60_bx/rules.mk +++ b/keyboards/wilba_tech/wt60_bx/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC = keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/wt60_c/info.json b/keyboards/wilba_tech/wt60_c/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt60_c/info.json rename to keyboards/wilba_tech/wt60_c/keyboard.json index 652714f52af..569cca93b75 100644 --- a/keyboards/wilba_tech/wt60_c/info.json +++ b/keyboards/wilba_tech/wt60_c/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x60C0", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_c/rules.mk b/keyboards/wilba_tech/wt60_c/rules.mk index 397643d3722..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/wt60_c/rules.mk +++ b/keyboards/wilba_tech/wt60_c/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC = keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/wt65_a/info.json b/keyboards/wilba_tech/wt65_a/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt65_a/info.json rename to keyboards/wilba_tech/wt65_a/keyboard.json index 1957c88dd2f..ec87e830f07 100644 --- a/keyboards/wilba_tech/wt65_a/info.json +++ b/keyboards/wilba_tech/wt65_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x065A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_a/rules.mk b/keyboards/wilba_tech/wt65_a/rules.mk index f7482c7a2f2..858c317c200 100644 --- a/keyboards/wilba_tech/wt65_a/rules.mk +++ b/keyboards/wilba_tech/wt65_a/rules.mk @@ -1,18 +1,7 @@ -# 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 -AUDIO_ENABLE = no # Audio output +I2C_DRIVER_REQUIRED = yes # project specific files SRC = drivers/led/issi/is31fl3736-mono.c \ quantum/color.c \ keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_main.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file diff --git a/keyboards/wilba_tech/wt65_b/info.json b/keyboards/wilba_tech/wt65_b/keyboard.json similarity index 98% rename from keyboards/wilba_tech/wt65_b/info.json rename to keyboards/wilba_tech/wt65_b/keyboard.json index 10de33b143b..56f71f3fc11 100644 --- a/keyboards/wilba_tech/wt65_b/info.json +++ b/keyboards/wilba_tech/wt65_b/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x065B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_b/rules.mk b/keyboards/wilba_tech/wt65_b/rules.mk index f7482c7a2f2..858c317c200 100644 --- a/keyboards/wilba_tech/wt65_b/rules.mk +++ b/keyboards/wilba_tech/wt65_b/rules.mk @@ -1,18 +1,7 @@ -# 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 -AUDIO_ENABLE = no # Audio output +I2C_DRIVER_REQUIRED = yes # project specific files SRC = drivers/led/issi/is31fl3736-mono.c \ quantum/color.c \ keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_main.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file diff --git a/keyboards/wilba_tech/wt69_a/info.json b/keyboards/wilba_tech/wt69_a/keyboard.json similarity index 98% rename from keyboards/wilba_tech/wt69_a/info.json rename to keyboards/wilba_tech/wt69_a/keyboard.json index bd93286a0f1..8321ae86c40 100644 --- a/keyboards/wilba_tech/wt69_a/info.json +++ b/keyboards/wilba_tech/wt69_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x069A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt69_a/rules.mk b/keyboards/wilba_tech/wt69_a/rules.mk index 396da8c7344..c0b7344f731 100644 --- a/keyboards/wilba_tech/wt69_a/rules.mk +++ b/keyboards/wilba_tech/wt69_a/rules.mk @@ -1,14 +1,2 @@ -# 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 -AUDIO_ENABLE = no # Audio output - # project specific files SRC = keyboards/wilba_tech/wt_main.c diff --git a/keyboards/wilba_tech/wt75_a/info.json b/keyboards/wilba_tech/wt75_a/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt75_a/info.json rename to keyboards/wilba_tech/wt75_a/keyboard.json index 5cbb6f1f8b6..609dff0c36f 100644 --- a/keyboards/wilba_tech/wt75_a/info.json +++ b/keyboards/wilba_tech/wt75_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x075A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt75_a/rules.mk b/keyboards/wilba_tech/wt75_a/rules.mk index f7482c7a2f2..858c317c200 100644 --- a/keyboards/wilba_tech/wt75_a/rules.mk +++ b/keyboards/wilba_tech/wt75_a/rules.mk @@ -1,18 +1,7 @@ -# 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 -AUDIO_ENABLE = no # Audio output +I2C_DRIVER_REQUIRED = yes # project specific files SRC = drivers/led/issi/is31fl3736-mono.c \ quantum/color.c \ keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_main.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file diff --git a/keyboards/wilba_tech/wt75_b/info.json b/keyboards/wilba_tech/wt75_b/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt75_b/info.json rename to keyboards/wilba_tech/wt75_b/keyboard.json index c0e996e0018..15bc61e9236 100644 --- a/keyboards/wilba_tech/wt75_b/info.json +++ b/keyboards/wilba_tech/wt75_b/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x075B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B7", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "D4"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt75_b/rules.mk b/keyboards/wilba_tech/wt75_b/rules.mk index f7482c7a2f2..858c317c200 100644 --- a/keyboards/wilba_tech/wt75_b/rules.mk +++ b/keyboards/wilba_tech/wt75_b/rules.mk @@ -1,18 +1,7 @@ -# 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 -AUDIO_ENABLE = no # Audio output +I2C_DRIVER_REQUIRED = yes # project specific files SRC = drivers/led/issi/is31fl3736-mono.c \ quantum/color.c \ keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_main.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file diff --git a/keyboards/wilba_tech/wt75_c/info.json b/keyboards/wilba_tech/wt75_c/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt75_c/info.json rename to keyboards/wilba_tech/wt75_c/keyboard.json index daa6303fb96..38d1450ae09 100644 --- a/keyboards/wilba_tech/wt75_c/info.json +++ b/keyboards/wilba_tech/wt75_c/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x075C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B7", "D4"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt75_c/rules.mk b/keyboards/wilba_tech/wt75_c/rules.mk index f7482c7a2f2..858c317c200 100644 --- a/keyboards/wilba_tech/wt75_c/rules.mk +++ b/keyboards/wilba_tech/wt75_c/rules.mk @@ -1,18 +1,7 @@ -# 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 -AUDIO_ENABLE = no # Audio output +I2C_DRIVER_REQUIRED = yes # project specific files SRC = drivers/led/issi/is31fl3736-mono.c \ quantum/color.c \ keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_main.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file diff --git a/keyboards/wilba_tech/wt80_a/info.json b/keyboards/wilba_tech/wt80_a/keyboard.json similarity index 98% rename from keyboards/wilba_tech/wt80_a/info.json rename to keyboards/wilba_tech/wt80_a/keyboard.json index 570b3dc03af..d7d6d11882e 100644 --- a/keyboards/wilba_tech/wt80_a/info.json +++ b/keyboards/wilba_tech/wt80_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x080A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt80_a/rules.mk b/keyboards/wilba_tech/wt80_a/rules.mk index f7482c7a2f2..858c317c200 100644 --- a/keyboards/wilba_tech/wt80_a/rules.mk +++ b/keyboards/wilba_tech/wt80_a/rules.mk @@ -1,18 +1,7 @@ -# 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 -AUDIO_ENABLE = no # Audio output +I2C_DRIVER_REQUIRED = yes # project specific files SRC = drivers/led/issi/is31fl3736-mono.c \ quantum/color.c \ keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_main.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file diff --git a/keyboards/wilba_tech/wt80_bc/config.h b/keyboards/wilba_tech/wt80_bc/config.h deleted file mode 100644 index 9541b1df126..00000000000 --- a/keyboards/wilba_tech/wt80_bc/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt80_bc/info.json b/keyboards/wilba_tech/wt80_bc/keyboard.json similarity index 98% rename from keyboards/wilba_tech/wt80_bc/info.json rename to keyboards/wilba_tech/wt80_bc/keyboard.json index b76e9cf86ce..072b965aefe 100644 --- a/keyboards/wilba_tech/wt80_bc/info.json +++ b/keyboards/wilba_tech/wt80_bc/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x80B0", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt80_bc/rules.mk b/keyboards/wilba_tech/wt80_bc/rules.mk index 5b8a8888456..c0b7344f731 100644 --- a/keyboards/wilba_tech/wt80_bc/rules.mk +++ b/keyboards/wilba_tech/wt80_bc/rules.mk @@ -1,14 +1,2 @@ -# 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 -AUDIO_ENABLE = no # Audio output - # project specific files SRC = keyboards/wilba_tech/wt_main.c diff --git a/keyboards/wilba_tech/wt8_a/config.h b/keyboards/wilba_tech/wt8_a/config.h deleted file mode 100644 index 1377a18714c..00000000000 --- a/keyboards/wilba_tech/wt8_a/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt8_a/info.json b/keyboards/wilba_tech/wt8_a/keyboard.json similarity index 80% rename from keyboards/wilba_tech/wt8_a/info.json rename to keyboards/wilba_tech/wt8_a/keyboard.json index a07707d7897..a84ff6a33f9 100644 --- a/keyboards/wilba_tech/wt8_a/info.json +++ b/keyboards/wilba_tech/wt8_a/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x008A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F1", "B2", "B6", "F6", "F7", "D5", "B4"], "rows": ["E6"] diff --git a/keyboards/wilba_tech/wt8_a/rules.mk b/keyboards/wilba_tech/wt8_a/rules.mk index 396da8c7344..c0b7344f731 100644 --- a/keyboards/wilba_tech/wt8_a/rules.mk +++ b/keyboards/wilba_tech/wt8_a/rules.mk @@ -1,14 +1,2 @@ -# 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 -AUDIO_ENABLE = no # Audio output - # project specific files SRC = keyboards/wilba_tech/wt_main.c diff --git a/keyboards/wilba_tech/zeal60/info.json b/keyboards/wilba_tech/zeal60/keyboard.json similarity index 99% rename from keyboards/wilba_tech/zeal60/info.json rename to keyboards/wilba_tech/zeal60/keyboard.json index 295d11c0696..34f7a312aaf 100644 --- a/keyboards/wilba_tech/zeal60/info.json +++ b/keyboards/wilba_tech/zeal60/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/zeal60/rules.mk b/keyboards/wilba_tech/zeal60/rules.mk index d1ce11b473c..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/zeal60/rules.mk +++ b/keyboards/wilba_tech/zeal60/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC = keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/zeal65/info.json b/keyboards/wilba_tech/zeal65/keyboard.json similarity index 98% rename from keyboards/wilba_tech/zeal65/info.json rename to keyboards/wilba_tech/zeal65/keyboard.json index 814ea28660e..2bc5e65b7b2 100644 --- a/keyboards/wilba_tech/zeal65/info.json +++ b/keyboards/wilba_tech/zeal65/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/zeal65/rules.mk b/keyboards/wilba_tech/zeal65/rules.mk index d1ce11b473c..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/zeal65/rules.mk +++ b/keyboards/wilba_tech/zeal65/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC = keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wolf/frogpad/info.json b/keyboards/wolf/frogpad/keyboard.json similarity index 100% rename from keyboards/wolf/frogpad/info.json rename to keyboards/wolf/frogpad/keyboard.json diff --git a/keyboards/wolf/kuku65/info.json b/keyboards/wolf/kuku65/keyboard.json similarity index 97% rename from keyboards/wolf/kuku65/info.json rename to keyboards/wolf/kuku65/keyboard.json index e088a5b7779..5146d77d1b5 100644 --- a/keyboards/wolf/kuku65/info.json +++ b/keyboards/wolf/kuku65/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0052", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["B3", "B2", "B1", "B0", "B7"] diff --git a/keyboards/wolf/kuku65/rules.mk b/keyboards/wolf/kuku65/rules.mk index 67bb6296514..3437a35bdf1 100644 --- a/keyboards/wolf/kuku65/rules.mk +++ b/keyboards/wolf/kuku65/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/wolf/m60_b/info.json b/keyboards/wolf/m60_b/keyboard.json similarity index 100% rename from keyboards/wolf/m60_b/info.json rename to keyboards/wolf/m60_b/keyboard.json diff --git a/keyboards/wolf/m6_c/info.json b/keyboards/wolf/m6_c/keyboard.json similarity index 100% rename from keyboards/wolf/m6_c/info.json rename to keyboards/wolf/m6_c/keyboard.json diff --git a/keyboards/wolf/neely65/info.json b/keyboards/wolf/neely65/keyboard.json similarity index 100% rename from keyboards/wolf/neely65/info.json rename to keyboards/wolf/neely65/keyboard.json diff --git a/keyboards/wolf/ryujin/info.json b/keyboards/wolf/ryujin/keyboard.json similarity index 97% rename from keyboards/wolf/ryujin/info.json rename to keyboards/wolf/ryujin/keyboard.json index 1e7702a3401..8e72cccd9e9 100644 --- a/keyboards/wolf/ryujin/info.json +++ b/keyboards/wolf/ryujin/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0200", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D5", "D3", "D2", "D1", "D0"] diff --git a/keyboards/wolf/ryujin/rules.mk b/keyboards/wolf/ryujin/rules.mk index 67bb6296514..3437a35bdf1 100644 --- a/keyboards/wolf/ryujin/rules.mk +++ b/keyboards/wolf/ryujin/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/keyboard.json similarity index 97% rename from keyboards/wolf/sabre/info.json rename to keyboards/wolf/sabre/keyboard.json index 1be6824d09e..11b235efe7a 100644 --- a/keyboards/wolf/sabre/info.json +++ b/keyboards/wolf/sabre/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0055", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B2", "B1"], "rows": ["D0", "D1", "F1", "F0", "B5", "B6", "C7", "C6", "F6", "F7", "F4", "F5"] diff --git a/keyboards/wolf/sabre/rules.mk b/keyboards/wolf/sabre/rules.mk index e7cc37d18d6..3437a35bdf1 100644 --- a/keyboards/wolf/sabre/rules.mk +++ b/keyboards/wolf/sabre/rules.mk @@ -1,16 +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 # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -BACKLIGHT_ENABLE = yes diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/keyboard.json similarity index 97% rename from keyboards/wolf/ts60/info.json rename to keyboards/wolf/ts60/keyboard.json index 8f6d9318ea5..ff5059f2f1c 100644 --- a/keyboards/wolf/ts60/info.json +++ b/keyboards/wolf/ts60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "D5", "C7", "C6", "B6", "B5", "B4", "D7"], "rows": ["D2", "D3", "D6", "D4", "F6", "F7", "F5", "F0", "F4", "F1"] diff --git a/keyboards/wolf/ts60/rules.mk b/keyboards/wolf/ts60/rules.mk index fb26dc7de5f..3437a35bdf1 100644 --- a/keyboards/wolf/ts60/rules.mk +++ b/keyboards/wolf/ts60/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 = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h deleted file mode 100644 index 4b007cf387e..00000000000 --- a/keyboards/wolfmarkclub/wm1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/keyboard.json similarity index 91% rename from keyboards/wolfmarkclub/wm1/info.json rename to keyboards/wolfmarkclub/wm1/keyboard.json index 04b8ae3b115..56c062e1024 100644 --- a/keyboards/wolfmarkclub/wm1/info.json +++ b/keyboards/wolfmarkclub/wm1/keyboard.json @@ -8,6 +8,25 @@ "pid": "0x2B29", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "sleep_led": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, @@ -34,6 +53,8 @@ "rows": ["C4", "A7", "A6", "A5", "A4"] }, "diode_direction": "COL2ROW", + "processor": "STM32F103", + "bootloader": "custom", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/wolfmarkclub/wm1/rules.mk b/keyboards/wolfmarkclub/wm1/rules.mk index 512ef119fdb..63ba3477c3c 100644 --- a/keyboards/wolfmarkclub/wm1/rules.mk +++ b/keyboards/wolfmarkclub/wm1/rules.mk @@ -1,27 +1,5 @@ -# MCU name -MCU = STM32F103 - # GENERIC STM32F103C8T6 board - mass storage bootloader MCU_LDSCRIPT = wm1_f103 BOARD = STM32_F103_STM32DUINO -# Bootloader selection -BOOTLOADER = custom - PROGRAM_CMD = echo 'CLI flashing not supported' >&2 - -# 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SLEEP_LED_ENABLE = yes -LTO_ENABLE = yes - diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/keyboard.json similarity index 100% rename from keyboards/work_louder/micro/info.json rename to keyboards/work_louder/micro/keyboard.json diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/keyboard.json similarity index 91% rename from keyboards/work_louder/nano/info.json rename to keyboards/work_louder/nano/keyboard.json index 61c48b3e802..e15d095de0f 100644 --- a/keyboards/work_louder/nano/info.json +++ b/keyboards/work_louder/nano/keyboard.json @@ -9,6 +9,18 @@ "device_version": "0.0.1", "max_power": 100 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true, + "rgblight": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/work_louder/nano/rules.mk b/keyboards/work_louder/nano/rules.mk index bcbb4bb31d5..e0822c009b2 100644 --- a/keyboards/work_louder/nano/rules.mk +++ b/keyboards/work_louder/nano/rules.mk @@ -1,18 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes - -RGB_MATRIX_ENABLE = yes - SRC += rgb_functions.c diff --git a/keyboards/work_louder/numpad/info.json b/keyboards/work_louder/numpad/keyboard.json similarity index 100% rename from keyboards/work_louder/numpad/info.json rename to keyboards/work_louder/numpad/keyboard.json diff --git a/keyboards/wren/config.h b/keyboards/wren/config.h index bd4af23167d..4969f8e8318 100644 --- a/keyboards/wren/config.h +++ b/keyboards/wren/config.h @@ -18,24 +18,3 @@ along with this program. If not, see . #pragma once #define USE_I2C - -/* 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/wren/info.json b/keyboards/wren/keyboard.json similarity index 95% rename from keyboards/wren/info.json rename to keyboards/wren/keyboard.json index ed56ff2b3ad..c6d0330e2ff 100644 --- a/keyboards/wren/info.json +++ b/keyboards/wren/keyboard.json @@ -7,6 +7,19 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D7", "F0"], "rows": ["D3", "D2", "C6", "D4", "B5"] diff --git a/keyboards/wren/rules.mk b/keyboards/wren/rules.mk deleted file mode 100644 index 088c390ec80..00000000000 --- a/keyboards/wren/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enables the use of one or more encoders diff --git a/keyboards/wuque/creek70/info.json b/keyboards/wuque/creek70/keyboard.json similarity index 99% rename from keyboards/wuque/creek70/info.json rename to keyboards/wuque/creek70/keyboard.json index f0951430db3..e7227ace8e5 100644 --- a/keyboards/wuque/creek70/info.json +++ b/keyboards/wuque/creek70/keyboard.json @@ -11,7 +11,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgblight": true }, "matrix_pins": { "rows": ["B3", "B2", "F0", "D3", "D1"], diff --git a/keyboards/wuque/creek70/rules.mk b/keyboards/wuque/creek70/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/wuque/creek70/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h deleted file mode 100644 index db5a8d534ef..00000000000 --- a/keyboards/wuque/ikki68_aurora/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 wuquestudio - -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 diff --git a/keyboards/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/keyboard.json similarity index 99% rename from keyboards/wuque/ikki68_aurora/info.json rename to keyboards/wuque/ikki68_aurora/keyboard.json index a65b265b66c..31d0ff2f91e 100644 --- a/keyboards/wuque/ikki68_aurora/info.json +++ b/keyboards/wuque/ikki68_aurora/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0", "F0", "F1", "E6", "B5", "B4", "D7", "D6", "D4", "F4", "F5", "F6"], "rows": ["B7", "B3", "B2", "B1", "B0"] diff --git a/keyboards/wuque/ikki68_aurora/rules.mk b/keyboards/wuque/ikki68_aurora/rules.mk deleted file mode 100644 index 540e0c2514d..00000000000 --- a/keyboards/wuque/ikki68_aurora/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LAYOUT = 68_ansi 68_iso diff --git a/keyboards/wuque/serneity65/info.json b/keyboards/wuque/serneity65/keyboard.json similarity index 99% rename from keyboards/wuque/serneity65/info.json rename to keyboards/wuque/serneity65/keyboard.json index f27073b2858..b64103d5338 100644 --- a/keyboards/wuque/serneity65/info.json +++ b/keyboards/wuque/serneity65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "B5", "D5", "D4", "D6", "B4", "D7", "F1", "F4", "F5", "F6", "F7", "C7", "E6", "B7"], "rows": ["B0", "F0", "B1", "D2", "D3"] diff --git a/keyboards/wuque/serneity65/rules.mk b/keyboards/wuque/serneity65/rules.mk deleted file mode 100644 index 8c163bff643..00000000000 --- a/keyboards/wuque/serneity65/rules.mk +++ /dev/null @@ -1,15 +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 = 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 -ENCODER_ENABLE = yes # Enable Encoder - -LAYOUT = 65_ansi From 8ad3a36fb60d75b5f0279f0cd4d9c24dde6b6330 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 12 Apr 2024 22:33:49 -0700 Subject: [PATCH 135/333] Data-Driven Keyboard Conversions: D (#23461) --- .../claw44/rev1/{info.json => keyboard.json} | 5 +++++ keyboards/dailycraft/claw44/rev1/rules.mk | 13 ------------- keyboards/dailycraft/claw44/rules.mk | 13 ------------- .../dailycraft/sandbox/rev1/keyboard.json | 6 ++++++ .../sandbox/rev2/{info.json => keyboard.json} | 6 ++++++ keyboards/dailycraft/sandbox/rev2/rules.mk | 1 - keyboards/dailycraft/sandbox/rules.mk | 14 -------------- keyboards/dailycraft/wings42/info.json | 5 ----- .../dailycraft/wings42/rev1/keyboard.json | 6 ++++++ .../wings42/rev1_extkeys/keyboard.json | 6 ++++++ .../dailycraft/wings42/rev2/keyboard.json | 6 ++++++ keyboards/dailycraft/wings42/rules.mk | 13 ------------- keyboards/dc01/arrow/info.json | 9 ++++++++- keyboards/dc01/arrow/rules.mk | 14 +------------- keyboards/dc01/left/info.json | 6 ++++++ keyboards/dc01/left/rules.mk | 14 +------------- keyboards/dc01/numpad/info.json | 9 ++++++++- keyboards/dc01/numpad/rules.mk | 14 +------------- keyboards/dc01/right/info.json | 9 ++++++++- keyboards/dc01/right/rules.mk | 14 +------------- keyboards/delikeeb/vanana/info.json | 9 --------- .../vanana/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/delikeeb/vanana/rev1/rules.mk | 2 -- .../vanana/rev2/{info.json => keyboard.json} | 11 +++++++++++ keyboards/delikeeb/vanana/rev2/rules.mk | 2 -- .../delikeeb/waaffle/rev3/elite_c/info.json | 4 ---- .../waaffle/rev3/elite_c/keyboard.json | 14 ++++++++++++++ .../delikeeb/waaffle/rev3/elite_c/rules.mk | 3 --- keyboards/delikeeb/waaffle/rev3/info.json | 8 -------- .../delikeeb/waaffle/rev3/pro_micro/info.json | 4 ---- .../waaffle/rev3/pro_micro/keyboard.json | 12 ++++++++++++ .../delikeeb/waaffle/rev3/pro_micro/rules.mk | 3 --- keyboards/deltasplit75/rules.mk | 13 ------------- .../v2/{info.json => keyboard.json} | 6 ++++++ keyboards/deltasplit75/v2/rules.mk | 1 - keyboards/deng/thirty/info.json | 8 ++++++++ keyboards/deng/thirty/rules.mk | 13 ------------- keyboards/dichotomy/info.json | 9 +++++++++ keyboards/dichotomy/rules.mk | 11 ----------- .../ergoinu/{info.json => keyboard.json} | 6 ++++++ keyboards/dm9records/ergoinu/rules.mk | 12 ------------ keyboards/dm9records/plaid/info.json | 5 +++++ keyboards/dm9records/plaid/rules.mk | 13 ------------- keyboards/dm9records/tartan/info.json | 5 +++++ keyboards/dm9records/tartan/rules.mk | 13 ------------- keyboards/doio/kb16/info.json | 9 --------- keyboards/doio/kb16/rev1/info.json | 7 +++++++ keyboards/doio/kb16/rev2/info.json | 11 ++++++++++- keyboards/doio/kb38/info.json | 4 +++- keyboards/doio/kb38/rules.mk | 4 +--- .../doppelganger/{info.json => keyboard.json} | 6 ++++++ keyboards/doppelganger/rules.mk | 12 ------------ keyboards/dp3000/info.json | 10 ---------- keyboards/dp3000/rev1/keyboard.json | 8 ++++++++ keyboards/dp3000/rev2/keyboard.json | 8 ++++++++ keyboards/dp60/info.json | 7 +++++++ keyboards/dp60/rules.mk | 14 -------------- .../draculad/{info.json => keyboard.json} | 13 +++++++++++++ keyboards/draculad/rules.mk | 16 ---------------- keyboards/draytronics/scarlet/info.json | 5 +++++ keyboards/draytronics/scarlet/rules.mk | 13 ------------- keyboards/duck/eagle_viper/v2/info.json | 9 +++++++++ keyboards/duck/eagle_viper/v2/rules.mk | 13 ------------- keyboards/duck/jetfire/info.json | 9 +++++++++ keyboards/duck/jetfire/rules.mk | 13 ------------- keyboards/duck/lightsaver/info.json | 9 +++++++++ keyboards/duck/lightsaver/rules.mk | 13 ------------- keyboards/duck/octagon/v1/info.json | 9 +++++++++ keyboards/duck/octagon/v1/rules.mk | 13 ------------- keyboards/duck/octagon/v2/info.json | 9 +++++++++ keyboards/duck/octagon/v2/rules.mk | 13 ------------- keyboards/duck/orion/v3/info.json | 9 +++++++++ keyboards/duck/orion/v3/rules.mk | 13 ------------- keyboards/duck/tcv3/info.json | 8 ++++++++ keyboards/duck/tcv3/rules.mk | 13 ------------- keyboards/ducky/one2mini/1861st/info.json | 7 +++++++ keyboards/ducky/one2mini/1861st/rules.mk | 15 --------------- keyboards/ducky/one2sf/1967st/info.json | 7 +++++++ keyboards/ducky/one2sf/1967st/rules.mk | 15 --------------- keyboards/dumbo/{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbo/rules.mk | 12 ------------ .../dumbpad/v0x/{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbpad/v0x/rules.mk | 15 --------------- .../{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbpad/v0x_dualencoder/rules.mk | 15 --------------- .../v0x_right/{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbpad/v0x_right/rules.mk | 15 --------------- .../dumbpad/v1x/{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbpad/v1x/rules.mk | 15 --------------- .../{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbpad/v1x_dualencoder/rules.mk | 15 --------------- .../v1x_oled/{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbpad/v1x_oled/rules.mk | 16 ---------------- .../v1x_right/{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbpad/v1x_right/rules.mk | 15 --------------- .../dumbpad/v3x/{info.json => keyboard.json} | 7 +++++++ keyboards/dumbpad/v3x/rules.mk | 16 ---------------- keyboards/durgod/dgk6x/info.json | 10 ++++++++++ keyboards/durgod/dgk6x/rules.mk | 16 ---------------- keyboards/durgod/k310/base/info.json | 9 +++++++++ keyboards/durgod/k310/base/rules.mk | 14 -------------- .../dz60rgb/v1/{info.json => keyboard.json} | 7 +++++++ keyboards/dztech/dz60rgb/v1/rules.mk | 13 ------------- .../dz60rgb/v2/{info.json => keyboard.json} | 7 +++++++ keyboards/dztech/dz60rgb/v2/rules.mk | 13 ------------- keyboards/dztech/dz60rgb/v2_1/info.json | 12 ++++++++++++ keyboards/dztech/dz60rgb/v2_1/rules.mk | 18 ------------------ .../v1/{info.json => keyboard.json} | 7 +++++++ keyboards/dztech/dz60rgb_ansi/v1/rules.mk | 13 ------------- .../v2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/dztech/dz60rgb_ansi/v2/rules.mk | 15 --------------- keyboards/dztech/dz60rgb_ansi/v2_1/info.json | 10 ++++++++++ keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk | 15 --------------- .../v1/{info.json => keyboard.json} | 7 +++++++ keyboards/dztech/dz60rgb_wkl/v1/rules.mk | 13 ------------- .../v2/{info.json => keyboard.json} | 7 +++++++ keyboards/dztech/dz60rgb_wkl/v2/rules.mk | 13 ------------- keyboards/dztech/dz60rgb_wkl/v2_1/info.json | 10 ++++++++++ keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk | 15 --------------- .../dz64rgb/{info.json => keyboard.json} | 11 +++++++++++ keyboards/dztech/dz64rgb/rules.mk | 15 --------------- keyboards/dztech/dz65rgb/v3/info.json | 10 ++++++++++ keyboards/dztech/dz65rgb/v3/rules.mk | 15 --------------- 123 files changed, 486 insertions(+), 747 deletions(-) rename keyboards/dailycraft/claw44/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/dailycraft/claw44/rev1/rules.mk rename keyboards/dailycraft/sandbox/rev2/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/dailycraft/sandbox/rev2/rules.mk delete mode 100644 keyboards/dailycraft/wings42/info.json rename keyboards/delikeeb/vanana/rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/delikeeb/vanana/rev1/rules.mk rename keyboards/delikeeb/vanana/rev2/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/delikeeb/vanana/rev2/rules.mk delete mode 100644 keyboards/delikeeb/waaffle/rev3/elite_c/info.json create mode 100644 keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json delete mode 100644 keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk delete mode 100644 keyboards/delikeeb/waaffle/rev3/pro_micro/info.json create mode 100644 keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json delete mode 100644 keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk rename keyboards/deltasplit75/v2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/deltasplit75/v2/rules.mk rename keyboards/dm9records/ergoinu/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/dm9records/ergoinu/rules.mk rename keyboards/doppelganger/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/doppelganger/rules.mk rename keyboards/draculad/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/draculad/rules.mk rename keyboards/dumbo/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/dumbo/rules.mk rename keyboards/dumbpad/v0x/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dumbpad/v0x/rules.mk rename keyboards/dumbpad/v0x_dualencoder/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dumbpad/v0x_dualencoder/rules.mk rename keyboards/dumbpad/v0x_right/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dumbpad/v0x_right/rules.mk rename keyboards/dumbpad/v1x/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dumbpad/v1x/rules.mk rename keyboards/dumbpad/v1x_dualencoder/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dumbpad/v1x_dualencoder/rules.mk rename keyboards/dumbpad/v1x_oled/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dumbpad/v1x_oled/rules.mk rename keyboards/dumbpad/v1x_right/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dumbpad/v1x_right/rules.mk rename keyboards/dumbpad/v3x/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/dumbpad/v3x/rules.mk rename keyboards/dztech/dz60rgb/v1/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/dztech/dz60rgb/v1/rules.mk rename keyboards/dztech/dz60rgb/v2/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/dztech/dz60rgb/v2/rules.mk rename keyboards/dztech/dz60rgb_ansi/v1/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/dztech/dz60rgb_ansi/v1/rules.mk rename keyboards/dztech/dz60rgb_ansi/v2/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dztech/dz60rgb_ansi/v2/rules.mk rename keyboards/dztech/dz60rgb_wkl/v1/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/dztech/dz60rgb_wkl/v1/rules.mk rename keyboards/dztech/dz60rgb_wkl/v2/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/dztech/dz60rgb_wkl/v2/rules.mk rename keyboards/dztech/dz64rgb/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/dztech/dz64rgb/rules.mk diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/keyboard.json similarity index 96% rename from keyboards/dailycraft/claw44/rev1/info.json rename to keyboards/dailycraft/claw44/rev1/keyboard.json index b3caa8ad13e..724cf5979fb 100644 --- a/keyboards/dailycraft/claw44/rev1/info.json +++ b/keyboards/dailycraft/claw44/rev1/keyboard.json @@ -19,6 +19,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/claw44/rev1/rules.mk b/keyboards/dailycraft/claw44/rev1/rules.mk deleted file mode 100644 index 7e2ee0ceacb..00000000000 --- a/keyboards/dailycraft/claw44/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -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 # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SWAP_HANDS_ENABLE = no # Enable one-hand typing - -OLED_ENABLE = no # Add OLED displays support diff --git a/keyboards/dailycraft/claw44/rules.mk b/keyboards/dailycraft/claw44/rules.mk index 6bc66a514a3..0344b3ee285 100644 --- a/keyboards/dailycraft/claw44/rules.mk +++ b/keyboards/dailycraft/claw44/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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = dailycraft/claw44/rev1 diff --git a/keyboards/dailycraft/sandbox/rev1/keyboard.json b/keyboards/dailycraft/sandbox/rev1/keyboard.json index 8ff7c65a2f0..0a48996815e 100644 --- a/keyboards/dailycraft/sandbox/rev1/keyboard.json +++ b/keyboards/dailycraft/sandbox/rev1/keyboard.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "oled": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/sandbox/rev2/info.json b/keyboards/dailycraft/sandbox/rev2/keyboard.json similarity index 92% rename from keyboards/dailycraft/sandbox/rev2/info.json rename to keyboards/dailycraft/sandbox/rev2/keyboard.json index 5d7255ff67e..d6f0ac2c2a5 100644 --- a/keyboards/dailycraft/sandbox/rev2/info.json +++ b/keyboards/dailycraft/sandbox/rev2/keyboard.json @@ -19,6 +19,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "oled": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/sandbox/rev2/rules.mk b/keyboards/dailycraft/sandbox/rev2/rules.mk deleted file mode 100644 index 3bbd2614291..00000000000 --- a/keyboards/dailycraft/sandbox/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionally blank diff --git a/keyboards/dailycraft/sandbox/rules.mk b/keyboards/dailycraft/sandbox/rules.mk index 2afb4624d12..c62f01e18f5 100644 --- a/keyboards/dailycraft/sandbox/rules.mk +++ b/keyboards/dailycraft/sandbox/rules.mk @@ -1,15 +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 -OLED_ENABLE = yes - DEFAULT_FOLDER = dailycraft/sandbox/rev2 diff --git a/keyboards/dailycraft/wings42/info.json b/keyboards/dailycraft/wings42/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/dailycraft/wings42/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/dailycraft/wings42/rev1/keyboard.json b/keyboards/dailycraft/wings42/rev1/keyboard.json index 657c8a9e512..a32b591bd6e 100644 --- a/keyboards/dailycraft/wings42/rev1/keyboard.json +++ b/keyboards/dailycraft/wings42/rev1/keyboard.json @@ -14,10 +14,16 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "community_layouts": [ "split_3x6_3" ], diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json index 53db2db4ca6..ff665a3bb75 100644 --- a/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json +++ b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json @@ -14,10 +14,16 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/wings42/rev2/keyboard.json b/keyboards/dailycraft/wings42/rev2/keyboard.json index a3c3e2396ef..dcb3a0268de 100644 --- a/keyboards/dailycraft/wings42/rev2/keyboard.json +++ b/keyboards/dailycraft/wings42/rev2/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "features": { @@ -27,6 +28,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "layout_aliases": { "LAYOUT_split_3x6_3_2": "LAYOUT_split_3x6_3" }, diff --git a/keyboards/dailycraft/wings42/rules.mk b/keyboards/dailycraft/wings42/rules.mk index f69adcecec0..b027fec9b97 100644 --- a/keyboards/dailycraft/wings42/rules.mk +++ b/keyboards/dailycraft/wings42/rules.mk @@ -1,14 +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 - DEFAULT_FOLDER = dailycraft/wings42/rev2 diff --git a/keyboards/dc01/arrow/info.json b/keyboards/dc01/arrow/info.json index 992b623d45c..85ca25c23e8 100644 --- a/keyboards/dc01/arrow/info.json +++ b/keyboards/dc01/arrow/info.json @@ -6,10 +6,17 @@ "usb": { "vid": "0x8968", "pid": "0x1012", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/dc01/arrow/rules.mk b/keyboards/dc01/arrow/rules.mk index b2c66861ea5..d4c0eb26725 100644 --- a/keyboards/dc01/arrow/rules.mk +++ b/keyboards/dc01/arrow/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 = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in -CUSTOM_MATRIX = yes # Use custom matrix +CUSTOM_MATRIX = yes SRC += matrix.c \ i2c_slave.c diff --git a/keyboards/dc01/left/info.json b/keyboards/dc01/left/info.json index 17fe3c64a28..e2967909955 100644 --- a/keyboards/dc01/left/info.json +++ b/keyboards/dc01/left/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "debounce": 0, "layouts": { "LAYOUT_ansi": { diff --git a/keyboards/dc01/left/rules.mk b/keyboards/dc01/left/rules.mk index 3a9422733c1..2493924f46a 100644 --- a/keyboards/dc01/left/rules.mk +++ b/keyboards/dc01/left/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 = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - -CUSTOM_MATRIX = yes # Use custom matrix +CUSTOM_MATRIX = yes SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/dc01/numpad/info.json b/keyboards/dc01/numpad/info.json index eab2d0c33f4..0cf73c23e33 100644 --- a/keyboards/dc01/numpad/info.json +++ b/keyboards/dc01/numpad/info.json @@ -6,10 +6,17 @@ "usb": { "vid": "0x8968", "pid": "0x1013", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "community_layouts": ["numpad_5x4", "ortho_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/dc01/numpad/rules.mk b/keyboards/dc01/numpad/rules.mk index b2c66861ea5..d4c0eb26725 100644 --- a/keyboards/dc01/numpad/rules.mk +++ b/keyboards/dc01/numpad/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 = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in -CUSTOM_MATRIX = yes # Use custom matrix +CUSTOM_MATRIX = yes SRC += matrix.c \ i2c_slave.c diff --git a/keyboards/dc01/right/info.json b/keyboards/dc01/right/info.json index 2b89117c44b..6f48e05483e 100644 --- a/keyboards/dc01/right/info.json +++ b/keyboards/dc01/right/info.json @@ -6,10 +6,17 @@ "usb": { "vid": "0x8968", "pid": "0x1011", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/dc01/right/rules.mk b/keyboards/dc01/right/rules.mk index b2c66861ea5..d4c0eb26725 100644 --- a/keyboards/dc01/right/rules.mk +++ b/keyboards/dc01/right/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 = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in -CUSTOM_MATRIX = yes # Use custom matrix +CUSTOM_MATRIX = yes SRC += matrix.c \ i2c_slave.c diff --git a/keyboards/delikeeb/vanana/info.json b/keyboards/delikeeb/vanana/info.json index 67bec439f13..520cd92b09c 100644 --- a/keyboards/delikeeb/vanana/info.json +++ b/keyboards/delikeeb/vanana/info.json @@ -2,15 +2,6 @@ "manufacturer": "dELIKEEb", "url": "", "maintainer": "noclew", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "encoder": true, - "extrakey": true, - "mousekey": true, - "nkro": false - }, "usb": { "vid": "0x9906", "pid": "0x0013" diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/keyboard.json similarity index 95% rename from keyboards/delikeeb/vanana/rev1/info.json rename to keyboards/delikeeb/vanana/rev1/keyboard.json index a4c101ec237..9ae59761de9 100644 --- a/keyboards/delikeeb/vanana/rev1/info.json +++ b/keyboards/delikeeb/vanana/rev1/keyboard.json @@ -28,6 +28,15 @@ {"pin_a": "F1", "pin_b": "F0"} ] }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/delikeeb/vanana/rev1/rules.mk b/keyboards/delikeeb/vanana/rev1/rules.mk deleted file mode 100644 index eee766eca6c..00000000000 --- a/keyboards/delikeeb/vanana/rev1/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/keyboard.json similarity index 94% rename from keyboards/delikeeb/vanana/rev2/info.json rename to keyboards/delikeeb/vanana/rev2/keyboard.json index 252e111fb2a..a15ad3e71a3 100644 --- a/keyboards/delikeeb/vanana/rev2/info.json +++ b/keyboards/delikeeb/vanana/rev2/keyboard.json @@ -28,6 +28,17 @@ {"pin_a": "F0", "pin_b": "F1"} ] }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true, + "audio": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/delikeeb/vanana/rev2/rules.mk b/keyboards/delikeeb/vanana/rev2/rules.mk deleted file mode 100644 index 8bb6ab5d91c..00000000000 --- a/keyboards/delikeeb/vanana/rev2/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/info.json b/keyboards/delikeeb/waaffle/rev3/elite_c/info.json deleted file mode 100644 index 042c41f34d6..00000000000 --- a/keyboards/delikeeb/waaffle/rev3/elite_c/info.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "processor": "atmega32u4", - "bootloader": "atmel-dfu" -} diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json b/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json new file mode 100644 index 00000000000..44fd177e020 --- /dev/null +++ b/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json @@ -0,0 +1,14 @@ +{ + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true, + "encoder": true + } +} diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk b/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk deleted file mode 100644 index 307296b1bae..00000000000 --- a/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# supported on Elite-C controllers -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -ENCODER_ENABLE = yes # Enable Rotary Encoder diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json index 1f9a8124a96..1201411d46b 100644 --- a/keyboards/delikeeb/waaffle/rev3/info.json +++ b/keyboards/delikeeb/waaffle/rev3/info.json @@ -22,14 +22,6 @@ "ws2812": { "pin": "C7" }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": false - }, "matrix_pins": { "cols": ["D3", "D2", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["F4", "B6", "B2", "B3", "B1", "F5", "F6", "F7"] diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json b/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json deleted file mode 100644 index 4369a041038..00000000000 --- a/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "processor": "atmega32u4", - "bootloader": "caterina" -} diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json b/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json new file mode 100644 index 00000000000..a97bf794ea1 --- /dev/null +++ b/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json @@ -0,0 +1,12 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + } +} diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk b/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk deleted file mode 100644 index 17c9907319d..00000000000 --- a/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# not supported on Pro Micro controllers -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = no # Enable Rotary Encoder diff --git a/keyboards/deltasplit75/rules.mk b/keyboards/deltasplit75/rules.mk index da8a2124e8f..ee888337e5e 100644 --- a/keyboards/deltasplit75/rules.mk +++ b/keyboards/deltasplit75/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 = deltasplit75/v2 diff --git a/keyboards/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/keyboard.json similarity index 98% rename from keyboards/deltasplit75/v2/info.json rename to keyboards/deltasplit75/v2/keyboard.json index 8372650df5d..2c1968e0b59 100644 --- a/keyboards/deltasplit75/v2/info.json +++ b/keyboards/deltasplit75/v2/keyboard.json @@ -24,6 +24,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + }, "layouts": { "LAYOUT_v2": { "layout": [ diff --git a/keyboards/deltasplit75/v2/rules.mk b/keyboards/deltasplit75/v2/rules.mk deleted file mode 100644 index f845616741c..00000000000 --- a/keyboards/deltasplit75/v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no \ No newline at end of file diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json index 8e594cccb9c..a26d727f12b 100644 --- a/keyboards/deng/thirty/info.json +++ b/keyboards/deng/thirty/info.json @@ -78,6 +78,14 @@ }, "processor": "STM32F103", "bootloader": "stm32duino", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgb_matrix": true + }, "layouts": { "LAYOUT_ortho_3x10": { "layout": [ diff --git a/keyboards/deng/thirty/rules.mk b/keyboards/deng/thirty/rules.mk index d1753c1e6c4..04fe1eba2ac 100644 --- a/keyboards/deng/thirty/rules.mk +++ b/keyboards/deng/thirty/rules.mk @@ -1,15 +1,2 @@ - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# Build Options -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 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/dichotomy/info.json b/keyboards/dichotomy/info.json index 1b2d9a29c9b..bc3546a0829 100644 --- a/keyboards/dichotomy/info.json +++ b/keyboards/dichotomy/info.json @@ -10,6 +10,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "pointing_device": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dichotomy/rules.mk b/keyboards/dichotomy/rules.mk index bfa5252a039..fd5fa4db1a9 100755 --- a/keyboards/dichotomy/rules.mk +++ b/keyboards/dichotomy/rules.mk @@ -1,16 +1,5 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -#MOUSEKEY_ENABLE = yes # Mouse keys -POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully. POINTING_DEVICE_DRIVER = custom -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration CUSTOM_MATRIX = yes # Remote matrix from the wireless bridge -NKRO_ENABLE = yes # Enable N-Key Rollover -# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality # # project specific files SRC += matrix.c diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/keyboard.json similarity index 97% rename from keyboards/dm9records/ergoinu/info.json rename to keyboards/dm9records/ergoinu/keyboard.json index a78ecef2114..c132f18268b 100644 --- a/keyboards/dm9records/ergoinu/info.json +++ b/keyboards/dm9records/ergoinu/keyboard.json @@ -26,6 +26,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dm9records/ergoinu/rules.mk b/keyboards/dm9records/ergoinu/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/dm9records/ergoinu/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json index a18de0accdb..a2052e55621 100644 --- a/keyboards/dm9records/plaid/info.json +++ b/keyboards/dm9records/plaid/info.json @@ -16,6 +16,11 @@ "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12", diff --git a/keyboards/dm9records/plaid/rules.mk b/keyboards/dm9records/plaid/rules.mk index 760f9b9650b..16051206467 100644 --- a/keyboards/dm9records/plaid/rules.mk +++ b/keyboards/dm9records/plaid/rules.mk @@ -1,16 +1,3 @@ -# 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 - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/info.json index 0f8168edb9d..208dcf330b9 100644 --- a/keyboards/dm9records/tartan/info.json +++ b/keyboards/dm9records/tartan/info.json @@ -15,6 +15,11 @@ "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true + }, "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], "layout_aliases": { "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift" diff --git a/keyboards/dm9records/tartan/rules.mk b/keyboards/dm9records/tartan/rules.mk index 722ea170590..16051206467 100644 --- a/keyboards/dm9records/tartan/rules.mk +++ b/keyboards/dm9records/tartan/rules.mk @@ -1,16 +1,3 @@ -# 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 - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/doio/kb16/info.json b/keyboards/doio/kb16/info.json index cadfabdf861..08c19819bb0 100644 --- a/keyboards/doio/kb16/info.json +++ b/keyboards/doio/kb16/info.json @@ -8,15 +8,6 @@ "force_nkro": true }, "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "nkro": true, - "oled": true, - "rgb_matrix": true, - "encoder": true - }, "build": { "lto": true }, diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json index fc9b30a20a0..e1382860b8f 100644 --- a/keyboards/doio/kb16/rev1/info.json +++ b/keyboards/doio/kb16/rev1/info.json @@ -3,6 +3,13 @@ "device_version": "0.0.1" }, "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "oled": true, + "rgb_matrix": true, + "encoder": true, "grave_esc": false, "space_cadet": false, "magic": false diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json index b3f14e180d7..a1157072910 100644 --- a/keyboards/doio/kb16/rev2/info.json +++ b/keyboards/doio/kb16/rev2/info.json @@ -17,5 +17,14 @@ "pin": "A10" }, "processor": "STM32F103", - "bootloader": "stm32duino" + "bootloader": "stm32duino", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "oled": true, + "rgb_matrix": true, + "encoder": true + } } diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json index a1775a2b107..7e978b2be8b 100644 --- a/keyboards/doio/kb38/info.json +++ b/keyboards/doio/kb38/info.json @@ -12,7 +12,9 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true + "rgb_matrix": true, + "oled": true, + "encoder": true }, "matrix_pins": { "cols": ["F5", "F4", "F1", "F0", "B7", "B6", "B5", "B4"], diff --git a/keyboards/doio/kb38/rules.mk b/keyboards/doio/kb38/rules.mk index a5f1063634e..942ef4c5dbd 100644 --- a/keyboards/doio/kb38/rules.mk +++ b/keyboards/doio/kb38/rules.mk @@ -1,3 +1 @@ -OLED_ENABLE = yes -ENCODER_ENABLE = yes -RGB_MATRIX_CUSTOM_KB = yes \ No newline at end of file +RGB_MATRIX_CUSTOM_KB = yes diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/keyboard.json similarity index 97% rename from keyboards/doppelganger/info.json rename to keyboards/doppelganger/keyboard.json index e9f3aba7157..2be90e30abf 100644 --- a/keyboards/doppelganger/info.json +++ b/keyboards/doppelganger/keyboard.json @@ -35,6 +35,12 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/doppelganger/rules.mk b/keyboards/doppelganger/rules.mk deleted file mode 100644 index 3414d97c204..00000000000 --- a/keyboards/doppelganger/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/dp3000/info.json b/keyboards/dp3000/info.json index 442d6d6a66d..7fa05f4c121 100644 --- a/keyboards/dp3000/info.json +++ b/keyboards/dp3000/info.json @@ -3,16 +3,6 @@ "maintainer": "depermana12", "diode_direction": "COL2ROW", "development_board": "promicro", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "encoder": true, - "oled": true, - "mousekey": false, - "nkro": false - }, "build": { "lto": true }, diff --git a/keyboards/dp3000/rev1/keyboard.json b/keyboards/dp3000/rev1/keyboard.json index 63d023de5cf..aa7ff8bc0a9 100644 --- a/keyboards/dp3000/rev1/keyboard.json +++ b/keyboards/dp3000/rev1/keyboard.json @@ -1,6 +1,14 @@ { "keyboard_name": "dp3000", "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "encoder": true, + "oled": true, + "mousekey": false, + "nkro": false, "rgb_matrix": true }, "usb": { diff --git a/keyboards/dp3000/rev2/keyboard.json b/keyboards/dp3000/rev2/keyboard.json index f6f03eeb639..7d82c384601 100644 --- a/keyboards/dp3000/rev2/keyboard.json +++ b/keyboards/dp3000/rev2/keyboard.json @@ -1,6 +1,14 @@ { "keyboard_name": "dp3000 rev2", "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "encoder": true, + "oled": true, + "mousekey": false, + "nkro": false, "rgblight": true }, "usb": { diff --git a/keyboards/dp60/info.json b/keyboards/dp60/info.json index ec36a725c34..c9b3b6fddef 100644 --- a/keyboards/dp60/info.json +++ b/keyboards/dp60/info.json @@ -64,6 +64,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "layout_aliases": { "LAYOUT_60_wkl": "LAYOUT_60_ansi_tsangan_split_rshift", "LAYOUT_60_wkl_split_bs": "LAYOUT_60_tsangan_hhkb" diff --git a/keyboards/dp60/rules.mk b/keyboards/dp60/rules.mk index 0aa07f4709d..8784813b335 100644 --- a/keyboards/dp60/rules.mk +++ b/keyboards/dp60/rules.mk @@ -1,16 +1,2 @@ -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Use RGB underglow light -RGB_MATRIX_ENABLE = yes - CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/draculad/info.json b/keyboards/draculad/keyboard.json similarity index 92% rename from keyboards/draculad/info.json rename to keyboards/draculad/keyboard.json index 1635b8bd2c1..bfaa8a4979d 100644 --- a/keyboards/draculad/info.json +++ b/keyboards/draculad/keyboard.json @@ -49,6 +49,19 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "oled": true, + "wpm": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/draculad/rules.mk b/keyboards/draculad/rules.mk deleted file mode 100644 index 130d29fb1de..00000000000 --- a/keyboards/draculad/rules.mk +++ /dev/null @@ -1,16 +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 -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 -OLED_ENABLE = yes -WPM_ENABLE = yes -ENCODER_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/draytronics/scarlet/info.json b/keyboards/draytronics/scarlet/info.json index cb84baca06c..b70c7bfae65 100644 --- a/keyboards/draytronics/scarlet/info.json +++ b/keyboards/draytronics/scarlet/info.json @@ -15,6 +15,11 @@ "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/draytronics/scarlet/rules.mk b/keyboards/draytronics/scarlet/rules.mk index 1e9f9255447..c2ee0bc86f9 100644 --- a/keyboards/draytronics/scarlet/rules.mk +++ b/keyboards/draytronics/scarlet/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/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/info.json index c2acc3b0d95..9c16c48db3e 100644 --- a/keyboards/duck/eagle_viper/v2/info.json +++ b/keyboards/duck/eagle_viper/v2/info.json @@ -32,6 +32,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layout_aliases": { "LAYOUT_eagle": "LAYOUT_60_ansi", "LAYOUT_viper": "LAYOUT_60_hhkb", diff --git a/keyboards/duck/eagle_viper/v2/rules.mk b/keyboards/duck/eagle_viper/v2/rules.mk index a2b82ea590e..819cb814ecc 100644 --- a/keyboards/duck/eagle_viper/v2/rules.mk +++ b/keyboards/duck/eagle_viper/v2/rules.mk @@ -1,15 +1,2 @@ -# 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 # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = yes SRC += indicator_leds.c matrix.c duck_led/duck_led.c diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/info.json index fbd5d8cb140..a97ff193a88 100644 --- a/keyboards/duck/jetfire/info.json +++ b/keyboards/duck/jetfire/info.json @@ -35,6 +35,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "console": true, + "command": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/duck/jetfire/rules.mk b/keyboards/duck/jetfire/rules.mk index 26898366237..8d6e39eef11 100644 --- a/keyboards/duck/jetfire/rules.mk +++ b/keyboards/duck/jetfire/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 = no # 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = yes SRC += indicator_leds.c \ matrix.c duck_led/duck_led.c diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/info.json index 06d0d59ed19..d4e1cd1e351 100644 --- a/keyboards/duck/lightsaver/info.json +++ b/keyboards/duck/lightsaver/info.json @@ -35,6 +35,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/duck/lightsaver/rules.mk b/keyboards/duck/lightsaver/rules.mk index 2014cb46117..8d6e39eef11 100644 --- a/keyboards/duck/lightsaver/rules.mk +++ b/keyboards/duck/lightsaver/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 = no # 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes - CUSTOM_MATRIX = yes SRC += indicator_leds.c \ matrix.c duck_led/duck_led.c diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json index fbbae2723a8..47f3acdc4d8 100644 --- a/keyboards/duck/octagon/v1/info.json +++ b/keyboards/duck/octagon/v1/info.json @@ -35,6 +35,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["75_ansi"], "layouts": { "LAYOUT_75_ansi": { diff --git a/keyboards/duck/octagon/v1/rules.mk b/keyboards/duck/octagon/v1/rules.mk index 5d79f0af09d..8784813b335 100644 --- a/keyboards/duck/octagon/v1/rules.mk +++ b/keyboards/duck/octagon/v1/rules.mk @@ -1,15 +1,2 @@ -# 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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes - CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json index be552c7b57a..4afbc42d47c 100644 --- a/keyboards/duck/octagon/v2/info.json +++ b/keyboards/duck/octagon/v2/info.json @@ -35,6 +35,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/duck/octagon/v2/rules.mk b/keyboards/duck/octagon/v2/rules.mk index 5e50c2ff8e9..8d6e39eef11 100644 --- a/keyboards/duck/octagon/v2/rules.mk +++ b/keyboards/duck/octagon/v2/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 = no # 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes - CUSTOM_MATRIX = yes SRC += indicator_leds.c \ matrix.c duck_led/duck_led.c diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json index 97885c09102..280cd8b07f8 100644 --- a/keyboards/duck/orion/v3/info.json +++ b/keyboards/duck/orion/v3/info.json @@ -36,6 +36,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/duck/orion/v3/rules.mk b/keyboards/duck/orion/v3/rules.mk index 49bc32f39b8..8d6e39eef11 100644 --- a/keyboards/duck/orion/v3/rules.mk +++ b/keyboards/duck/orion/v3/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 = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes - CUSTOM_MATRIX = yes SRC += indicator_leds.c \ matrix.c duck_led/duck_led.c diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/info.json index cee675229d9..c03142b4db2 100644 --- a/keyboards/duck/tcv3/info.json +++ b/keyboards/duck/tcv3/info.json @@ -31,6 +31,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "command": true, + "nkro": true, + "rgblight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/duck/tcv3/rules.mk b/keyboards/duck/tcv3/rules.mk index b13684d8fd9..8d6e39eef11 100644 --- a/keyboards/duck/tcv3/rules.mk +++ b/keyboards/duck/tcv3/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 = no # 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes - CUSTOM_MATRIX = yes SRC += indicator_leds.c \ matrix.c duck_led/duck_led.c diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/info.json index 4eb7c4941ed..a39945d68c2 100644 --- a/keyboards/ducky/one2mini/1861st/info.json +++ b/keyboards/ducky/one2mini/1861st/info.json @@ -15,6 +15,13 @@ "dip_switch": { "matrix_grid": [ [0,14], [1,14], [2,14], [3,14] ] }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "dip_switch": true + }, "layout_aliases": { "LAYOUT_iso": "LAYOUT_60_iso" }, diff --git a/keyboards/ducky/one2mini/1861st/rules.mk b/keyboards/ducky/one2mini/1861st/rules.mk index b7db490c11e..5eb1c44f8a1 100644 --- a/keyboards/ducky/one2mini/1861st/rules.mk +++ b/keyboards/ducky/one2mini/1861st/rules.mk @@ -15,18 +15,3 @@ BOARD = NUC123SD4AN0 MCU = cortex-m0 # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 ARMV = 6 - -# 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 -DIP_SWITCH_ENABLE = yes - diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/info.json index 3774be1bc06..3bb58fd48f3 100644 --- a/keyboards/ducky/one2sf/1967st/info.json +++ b/keyboards/ducky/one2sf/1967st/info.json @@ -16,6 +16,13 @@ "dip_switch": { "matrix_grid": [ [0,14], [1,14], [2,14], [3,14] ] }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "dip_switch": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ducky/one2sf/1967st/rules.mk b/keyboards/ducky/one2sf/1967st/rules.mk index b7db490c11e..5eb1c44f8a1 100644 --- a/keyboards/ducky/one2sf/1967st/rules.mk +++ b/keyboards/ducky/one2sf/1967st/rules.mk @@ -15,18 +15,3 @@ BOARD = NUC123SD4AN0 MCU = cortex-m0 # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 ARMV = 6 - -# 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 -DIP_SWITCH_ENABLE = yes - diff --git a/keyboards/dumbo/info.json b/keyboards/dumbo/keyboard.json similarity index 95% rename from keyboards/dumbo/info.json rename to keyboards/dumbo/keyboard.json index ddcab98dd32..84993a6b6d9 100644 --- a/keyboards/dumbo/info.json +++ b/keyboards/dumbo/keyboard.json @@ -33,6 +33,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_split_3x6_4": { "layout": [ diff --git a/keyboards/dumbo/rules.mk b/keyboards/dumbo/rules.mk deleted file mode 100644 index a64aa6f849b..00000000000 --- a/keyboards/dumbo/rules.mk +++ /dev/null @@ -1,12 +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 -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 # Audio output -LTO_ENABLE = yes diff --git a/keyboards/dumbpad/v0x/info.json b/keyboards/dumbpad/v0x/keyboard.json similarity index 88% rename from keyboards/dumbpad/v0x/info.json rename to keyboards/dumbpad/v0x/keyboard.json index 84594e01afe..f0cecd80638 100644 --- a/keyboards/dumbpad/v0x/info.json +++ b/keyboards/dumbpad/v0x/keyboard.json @@ -17,6 +17,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "encoder": true, + "key_lock": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v0x/rules.mk b/keyboards/dumbpad/v0x/rules.mk deleted file mode 100644 index 7816aab001a..00000000000 --- a/keyboards/dumbpad/v0x/rules.mk +++ /dev/null @@ -1,15 +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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -KEY_LOCK_ENABLE = yes diff --git a/keyboards/dumbpad/v0x_dualencoder/info.json b/keyboards/dumbpad/v0x_dualencoder/keyboard.json similarity index 88% rename from keyboards/dumbpad/v0x_dualencoder/info.json rename to keyboards/dumbpad/v0x_dualencoder/keyboard.json index a841d9d6425..71b501cedd5 100644 --- a/keyboards/dumbpad/v0x_dualencoder/info.json +++ b/keyboards/dumbpad/v0x_dualencoder/keyboard.json @@ -18,6 +18,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "encoder": true, + "key_lock": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v0x_dualencoder/rules.mk b/keyboards/dumbpad/v0x_dualencoder/rules.mk deleted file mode 100644 index 7816aab001a..00000000000 --- a/keyboards/dumbpad/v0x_dualencoder/rules.mk +++ /dev/null @@ -1,15 +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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -KEY_LOCK_ENABLE = yes diff --git a/keyboards/dumbpad/v0x_right/info.json b/keyboards/dumbpad/v0x_right/keyboard.json similarity index 88% rename from keyboards/dumbpad/v0x_right/info.json rename to keyboards/dumbpad/v0x_right/keyboard.json index d0530abd7d1..883f2f785d7 100644 --- a/keyboards/dumbpad/v0x_right/info.json +++ b/keyboards/dumbpad/v0x_right/keyboard.json @@ -17,6 +17,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "encoder": true, + "key_lock": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v0x_right/rules.mk b/keyboards/dumbpad/v0x_right/rules.mk deleted file mode 100644 index 7816aab001a..00000000000 --- a/keyboards/dumbpad/v0x_right/rules.mk +++ /dev/null @@ -1,15 +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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -KEY_LOCK_ENABLE = yes diff --git a/keyboards/dumbpad/v1x/info.json b/keyboards/dumbpad/v1x/keyboard.json similarity index 88% rename from keyboards/dumbpad/v1x/info.json rename to keyboards/dumbpad/v1x/keyboard.json index f790bb80ecd..9ab78e1a9f1 100644 --- a/keyboards/dumbpad/v1x/info.json +++ b/keyboards/dumbpad/v1x/keyboard.json @@ -17,6 +17,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "encoder": true, + "key_lock": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x/rules.mk b/keyboards/dumbpad/v1x/rules.mk deleted file mode 100644 index 7816aab001a..00000000000 --- a/keyboards/dumbpad/v1x/rules.mk +++ /dev/null @@ -1,15 +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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -KEY_LOCK_ENABLE = yes diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/keyboard.json similarity index 88% rename from keyboards/dumbpad/v1x_dualencoder/info.json rename to keyboards/dumbpad/v1x_dualencoder/keyboard.json index ad16fa4417a..f3aeafe6252 100644 --- a/keyboards/dumbpad/v1x_dualencoder/info.json +++ b/keyboards/dumbpad/v1x_dualencoder/keyboard.json @@ -18,6 +18,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "encoder": true, + "key_lock": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_dualencoder/rules.mk b/keyboards/dumbpad/v1x_dualencoder/rules.mk deleted file mode 100644 index 7816aab001a..00000000000 --- a/keyboards/dumbpad/v1x_dualencoder/rules.mk +++ /dev/null @@ -1,15 +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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -KEY_LOCK_ENABLE = yes diff --git a/keyboards/dumbpad/v1x_oled/info.json b/keyboards/dumbpad/v1x_oled/keyboard.json similarity index 88% rename from keyboards/dumbpad/v1x_oled/info.json rename to keyboards/dumbpad/v1x_oled/keyboard.json index b4dd15c76b7..3a437699b86 100644 --- a/keyboards/dumbpad/v1x_oled/info.json +++ b/keyboards/dumbpad/v1x_oled/keyboard.json @@ -15,6 +15,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "encoder": true, + "oled": true, + "wpm": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_oled/rules.mk b/keyboards/dumbpad/v1x_oled/rules.mk deleted file mode 100644 index 53db407bc36..00000000000 --- a/keyboards/dumbpad/v1x_oled/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/keyboard.json similarity index 88% rename from keyboards/dumbpad/v1x_right/info.json rename to keyboards/dumbpad/v1x_right/keyboard.json index 55b898b701a..583d60bc5d2 100644 --- a/keyboards/dumbpad/v1x_right/info.json +++ b/keyboards/dumbpad/v1x_right/keyboard.json @@ -17,6 +17,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "encoder": true, + "key_lock": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_right/rules.mk b/keyboards/dumbpad/v1x_right/rules.mk deleted file mode 100644 index 7816aab001a..00000000000 --- a/keyboards/dumbpad/v1x_right/rules.mk +++ /dev/null @@ -1,15 +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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -KEY_LOCK_ENABLE = yes diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/keyboard.json similarity index 94% rename from keyboards/dumbpad/v3x/info.json rename to keyboards/dumbpad/v3x/keyboard.json index 4dc17272a95..7ea29cd9ad3 100644 --- a/keyboards/dumbpad/v3x/info.json +++ b/keyboards/dumbpad/v3x/keyboard.json @@ -57,6 +57,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "encoder": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v3x/rules.mk b/keyboards/dumbpad/v3x/rules.mk deleted file mode 100644 index 11f04a3adec..00000000000 --- a/keyboards/dumbpad/v3x/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/durgod/dgk6x/info.json b/keyboards/durgod/dgk6x/info.json index b8d38e2d9f9..d036bc06308 100644 --- a/keyboards/durgod/dgk6x/info.json +++ b/keyboards/durgod/dgk6x/info.json @@ -54,5 +54,15 @@ }, "processor": "STM32F072", // F070 "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "board": "DURGOD_STM32_F070" } diff --git a/keyboards/durgod/dgk6x/rules.mk b/keyboards/durgod/dgk6x/rules.mk index 36a93aa827b..597f5bbcf9e 100644 --- a/keyboards/durgod/dgk6x/rules.mk +++ b/keyboards/durgod/dgk6x/rules.mk @@ -1,20 +1,4 @@ # Do not put the microcontroller into power saving mode NO_SUSPEND_POWER_DOWN = yes -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - -RGB_MATRIX_ENABLE = yes - DEFAULT_FOLDER=durgod/dgk6x/hades_ansi diff --git a/keyboards/durgod/k310/base/info.json b/keyboards/durgod/k310/base/info.json index 6047c40fc05..94dae4d8097 100644 --- a/keyboards/durgod/k310/base/info.json +++ b/keyboards/durgod/k310/base/info.json @@ -12,5 +12,14 @@ }, "processor": "STM32F072", // F070 "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true + }, + "build": { + "lto": true + }, "board": "DURGOD_STM32_F070" } diff --git a/keyboards/durgod/k310/base/rules.mk b/keyboards/durgod/k310/base/rules.mk index 454cf102ec2..0ab54aaaf71 100644 --- a/keyboards/durgod/k310/base/rules.mk +++ b/keyboards/durgod/k310/base/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/keyboard.json similarity index 93% rename from keyboards/dztech/dz60rgb/v1/info.json rename to keyboards/dztech/dz60rgb/v1/keyboard.json index 8a9801c4f30..fa82578c766 100644 --- a/keyboards/dztech/dz60rgb/v1/info.json +++ b/keyboards/dztech/dz60rgb/v1/keyboard.json @@ -61,6 +61,13 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "board": "QMK_PROTON_C", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb/v1/rules.mk b/keyboards/dztech/dz60rgb/v1/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/dztech/dz60rgb/v1/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 -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 = yes # Use RGB matrix diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/keyboard.json similarity index 90% rename from keyboards/dztech/dz60rgb/v2/info.json rename to keyboards/dztech/dz60rgb/v2/keyboard.json index c3e1837dbd3..710f86e04c5 100644 --- a/keyboards/dztech/dz60rgb/v2/info.json +++ b/keyboards/dztech/dz60rgb/v2/keyboard.json @@ -44,5 +44,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb/v2/rules.mk b/keyboards/dztech/dz60rgb/v2/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/dztech/dz60rgb/v2/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 -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 = yes # Use RGB matrix diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json index 1d97037c311..7678e9985c9 100644 --- a/keyboards/dztech/dz60rgb/v2_1/info.json +++ b/keyboards/dztech/dz60rgb/v2_1/info.json @@ -43,5 +43,17 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "space_cadet": false, + "grave_esc": false + }, + "build": { + "lto": true + }, "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb/v2_1/rules.mk b/keyboards/dztech/dz60rgb/v2_1/rules.mk index 5c51de83766..13252d81696 100644 --- a/keyboards/dztech/dz60rgb/v2_1/rules.mk +++ b/keyboards/dztech/dz60rgb/v2_1/rules.mk @@ -1,19 +1 @@ BOOTLOADER_SIZE = 6144 - -# 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 = yes # Use RGB matrix -LTO_ENABLE = yes - -SPACE_CADET_ENABLE = no -GRAVE_ESC_ENABLE = no diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/keyboard.json similarity index 93% rename from keyboards/dztech/dz60rgb_ansi/v1/info.json rename to keyboards/dztech/dz60rgb_ansi/v1/keyboard.json index d09c967d008..de0229c1512 100644 --- a/keyboards/dztech/dz60rgb_ansi/v1/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v1/keyboard.json @@ -61,6 +61,13 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "board": "QMK_PROTON_C", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/dztech/dz60rgb_ansi/v1/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 -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 = yes # Use RGB matrix diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/keyboard.json similarity index 88% rename from keyboards/dztech/dz60rgb_ansi/v2/info.json rename to keyboards/dztech/dz60rgb_ansi/v2/keyboard.json index 5769daefef2..9a4a11ffdc6 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v2/keyboard.json @@ -46,5 +46,15 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk deleted file mode 100644 index f478792adbc..00000000000 --- a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes # Use RGB matrix - -LTO_ENABLE = yes diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json index 649ea2e2611..9d3b1efeac1 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json @@ -43,5 +43,15 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk index a89963c2d40..13252d81696 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk @@ -1,16 +1 @@ BOOTLOADER_SIZE = 6144 - -# 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 = yes # Use RGB matrix -LTO_ENABLE = yes diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/keyboard.json similarity index 93% rename from keyboards/dztech/dz60rgb_wkl/v1/info.json rename to keyboards/dztech/dz60rgb_wkl/v1/keyboard.json index 320d412aaef..c0b78aa8a9f 100644 --- a/keyboards/dztech/dz60rgb_wkl/v1/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v1/keyboard.json @@ -61,6 +61,13 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "board": "QMK_PROTON_C", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v1/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/dztech/dz60rgb_wkl/v1/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 -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 = yes # Use RGB matrix diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/keyboard.json similarity index 90% rename from keyboards/dztech/dz60rgb_wkl/v2/info.json rename to keyboards/dztech/dz60rgb_wkl/v2/keyboard.json index f7d6acff0c7..fd095b548a5 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v2/keyboard.json @@ -42,5 +42,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/dztech/dz60rgb_wkl/v2/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 -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 = yes # Use RGB matrix diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json index 5a3cc636024..968488e5449 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json @@ -43,5 +43,15 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk index a89963c2d40..13252d81696 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk @@ -1,16 +1 @@ BOOTLOADER_SIZE = 6144 - -# 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 = yes # Use RGB matrix -LTO_ENABLE = yes diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/keyboard.json similarity index 95% rename from keyboards/dztech/dz64rgb/info.json rename to keyboards/dztech/dz64rgb/keyboard.json index b568170e14d..ea22af59db9 100644 --- a/keyboards/dztech/dz64rgb/info.json +++ b/keyboards/dztech/dz64rgb/keyboard.json @@ -50,6 +50,17 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, + "community_layouts": ["64_ansi"], "layouts": { "LAYOUT_64_ansi": { "layout": [ diff --git a/keyboards/dztech/dz64rgb/rules.mk b/keyboards/dztech/dz64rgb/rules.mk deleted file mode 100644 index a20c8b449f7..00000000000 --- a/keyboards/dztech/dz64rgb/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 = 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 = yes -LTO_ENABLE = yes -LAYOUT= 64_ansi \ No newline at end of file diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json index ea7390ee9ee..8fef8b34683 100644 --- a/keyboards/dztech/dz65rgb/v3/info.json +++ b/keyboards/dztech/dz65rgb/v3/info.json @@ -64,6 +64,16 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/dztech/dz65rgb/v3/rules.mk b/keyboards/dztech/dz65rgb/v3/rules.mk index bbe22adb0c5..13252d81696 100755 --- a/keyboards/dztech/dz65rgb/v3/rules.mk +++ b/keyboards/dztech/dz65rgb/v3/rules.mk @@ -1,16 +1 @@ BOOTLOADER_SIZE = 6144 - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix -LTO_ENABLE = yes From 2eea2cdc46b3e920578ed75c4545a8b5160135bd Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 13 Apr 2024 08:45:27 +0100 Subject: [PATCH 136/333] Miscellaneous keyboard.json migrations (#23486) --- .../bastardkb/tbk/{info.json => keyboard.json} | 9 +++++++++ keyboards/bastardkb/tbk/rules.mk | 12 ------------ .../flxlb/zplit/{info.json => keyboard.json} | 10 ++++++++++ keyboards/flxlb/zplit/rules.mk | 13 ------------- .../fungo/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/fungo/rev1/rules.mk | 15 --------------- keyboards/gummykey/{info.json => keyboard.json} | 8 ++++++++ keyboards/gummykey/rules.mk | 12 ------------ keyboards/hand88/{info.json => keyboard.json} | 8 ++++++++ keyboards/hand88/rules.mk | 13 ------------- .../handwired/brain/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/brain/rules.mk | 12 ------------ .../chiron/{info.json => keyboard.json} | 10 ++++++++++ keyboards/handwired/chiron/rules.mk | 16 ---------------- .../4x5/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/dactyl_manuform/4x5/rules.mk | 12 ------------ .../4x5_5/{info.json => keyboard.json} | 8 ++++++++ .../handwired/dactyl_manuform/4x5_5/rules.mk | 11 ----------- .../4x6/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/dactyl_manuform/4x6/rules.mk | 12 ------------ .../4x6_5/{info.json => keyboard.json} | 8 ++++++++ .../handwired/dactyl_manuform/4x6_5/rules.mk | 12 ------------ .../5x6/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/dactyl_manuform/5x6/rules.mk | 12 ------------ .../5x6_2_5/{info.json => keyboard.json} | 8 ++++++++ .../handwired/dactyl_manuform/5x6_2_5/rules.mk | 12 ------------ .../5x6_5/{info.json => keyboard.json} | 8 ++++++++ .../handwired/dactyl_manuform/5x6_5/rules.mk | 12 ------------ .../5x6_6/{info.json => keyboard.json} | 8 ++++++++ .../handwired/dactyl_manuform/5x6_6/rules.mk | 12 ------------ .../5x7/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/dactyl_manuform/5x7/rules.mk | 12 ------------ .../6x6_4/{info.json => keyboard.json} | 8 ++++++++ .../handwired/dactyl_manuform/6x6_4/rules.mk | 12 ------------ .../dactyl_promicro/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/dactyl_promicro/rules.mk | 12 ------------ .../dactyl_rah/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/dactyl_rah/rules.mk | 12 ------------ .../elrgo_s/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/elrgo_s/rules.mk | 12 ------------ .../freoduo/{info.json => keyboard.json} | 10 ++++++++++ keyboards/handwired/freoduo/rules.mk | 13 ------------- .../split_65/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/jtallbean/split_65/rules.mk | 12 ------------ .../handwired/ks63/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/ks63/rules.mk | 12 ------------ .../not_so_minidox/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/not_so_minidox/rules.mk | 12 ------------ .../skakunm_dactyl/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/skakunm_dactyl/rules.mk | 12 ------------ .../promicro/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/split65/promicro/rules.mk | 13 ------------- .../split89/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/split89/rules.mk | 12 ------------ .../hidtech/bastyl/{info.json => keyboard.json} | 9 +++++++++ keyboards/hidtech/bastyl/rules.mk | 12 ------------ .../miniaxe/{info.json => keyboard.json} | 8 ++++++++ keyboards/kagizaraya/miniaxe/rules.mk | 14 -------------- .../{info.json => keyboard.json} | 9 +++++++++ keyboards/kakunpc/rabbit_capture_plan/rules.mk | 13 ------------- .../mkiirgb/v2/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk | 12 ------------ .../kbdfans/maja/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/maja/rules.mk | 12 ------------ .../maja_soldered/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/maja_soldered/rules.mk | 11 ----------- .../keebio/bfo9000/{info.json => keyboard.json} | 8 ++++++++ keyboards/keebio/bfo9000/rules.mk | 12 ------------ .../keebio/fourier/{info.json => keyboard.json} | 9 +++++++++ keyboards/keebio/fourier/rules.mk | 12 ------------ .../iris/rev1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keebio/iris/rev1/rules.mk | 12 ------------ .../iris/rev1_led/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keebio/iris/rev1_led/rules.mk | 12 ------------ .../iris/rev5/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keebio/iris/rev5/rules.mk | 13 ------------- .../nyquist/rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/keebio/nyquist/rev1/rules.mk | 12 ------------ .../nyquist/rev2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keebio/nyquist/rev2/rules.mk | 12 ------------ .../nyquist/rev3/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keebio/nyquist/rev3/rules.mk | 12 ------------ .../keyprez/bison/{info.json => keyboard.json} | 9 +++++++++ keyboards/keyprez/bison/rules.mk | 14 -------------- .../keyprez/unicorn/{info.json => keyboard.json} | 9 +++++++++ keyboards/keyprez/unicorn/rules.mk | 13 ------------- .../gameroyadvance/{info.json => keyboard.json} | 9 +++++++++ keyboards/keystonecaps/gameroyadvance/rules.mk | 14 -------------- .../latin17rgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/latincompass/latin17rgb/rules.mk | 13 ------------- keyboards/majistic/{info.json => keyboard.json} | 8 ++++++++ keyboards/majistic/rules.mk | 12 ------------ keyboards/manta60/{info.json => keyboard.json} | 9 +++++++++ keyboards/manta60/rules.mk | 14 -------------- .../mj61/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/melgeek/mj61/rev1/rules.mk | 12 ------------ .../rev3/info.json => mj61/rev2/keyboard.json} | 9 +++++++++ keyboards/melgeek/mj61/rev2/rules.mk | 12 ------------ .../rev1/info.json => mj63/rev1/keyboard.json} | 9 +++++++++ keyboards/melgeek/mj63/rev1/rules.mk | 12 ------------ .../rev2/info.json => mj63/rev2/keyboard.json} | 9 +++++++++ keyboards/melgeek/mj63/rev2/rules.mk | 12 ------------ .../rev1/info.json => mj64/rev1/keyboard.json} | 9 +++++++++ keyboards/melgeek/mj64/rev1/rules.mk | 12 ------------ .../mj64/rev2/{info.json => keyboard.json} | 9 +++++++++ keyboards/melgeek/mj64/rev2/rules.mk | 12 ------------ .../rev2/info.json => mj64/rev3/keyboard.json} | 9 +++++++++ keyboards/melgeek/mj64/rev3/rules.mk | 12 ------------ .../merge/um70/{info.json => keyboard.json} | 11 +++++++++++ keyboards/merge/um70/rules.mk | 14 -------------- .../merge/um80/{info.json => keyboard.json} | 11 +++++++++++ keyboards/merge/um80/rules.mk | 14 -------------- keyboards/meson/{info.json => keyboard.json} | 9 +++++++++ keyboards/meson/rules.mk | 12 ------------ .../miller/gm862/{info.json => keyboard.json} | 9 +++++++++ keyboards/miller/gm862/rules.mk | 13 ------------- keyboards/mint60/{info.json => keyboard.json} | 9 +++++++++ keyboards/mint60/rules.mk | 12 ------------ .../momoka_ergo/{info.json => keyboard.json} | 9 +++++++++ keyboards/momoka_ergo/rules.mk | 12 ------------ .../nacly/sodium42/{info.json => keyboard.json} | 8 ++++++++ keyboards/nacly/sodium42/rules.mk | 12 ------------ .../nacly/sodium50/{info.json => keyboard.json} | 8 ++++++++ keyboards/nacly/sodium50/rules.mk | 12 ------------ .../nacly/sodium62/{info.json => keyboard.json} | 9 +++++++++ keyboards/nacly/sodium62/rules.mk | 14 -------------- .../splitreus62/{info.json => keyboard.json} | 9 +++++++++ keyboards/nacly/splitreus62/rules.mk | 12 ------------ .../obosob/arch_36/{info.json => keyboard.json} | 10 ++++++++++ keyboards/obosob/arch_36/rules.mk | 13 ------------- .../{info.json => keyboard.json} | 9 +++++++++ keyboards/obosob/steal_this_keyboard/rules.mk | 13 ------------- .../ergo_single/{info.json => keyboard.json} | 9 +++++++++ keyboards/ogre/ergo_single/rules.mk | 12 ------------ .../ogre/ergo_split/{info.json => keyboard.json} | 9 +++++++++ keyboards/ogre/ergo_split/rules.mk | 12 ------------ keyboards/pisces/{info.json => keyboard.json} | 8 ++++++++ keyboards/pisces/rules.mk | 12 ------------ keyboards/pluckey/{info.json => keyboard.json} | 9 +++++++++ keyboards/pluckey/rules.mk | 13 ------------- keyboards/pteron36/{info.json => keyboard.json} | 11 +++++++++++ keyboards/pteron36/rules.mk | 14 -------------- .../cocoa40/{info.json => keyboard.json} | 8 ++++++++ keyboards/recompile_keys/cocoa40/rules.mk | 12 ------------ .../7splus/{info.json => keyboard.json} | 9 +++++++++ keyboards/salicylic_acid3/7splus/rules.mk | 12 ------------ .../ajisai74/{info.json => keyboard.json} | 8 ++++++++ keyboards/salicylic_acid3/ajisai74/rules.mk | 12 ------------ .../ergoarrows/{info.json => keyboard.json} | 9 +++++++++ keyboards/salicylic_acid3/ergoarrows/rules.mk | 12 ------------ .../nknl7en/{info.json => keyboard.json} | 9 +++++++++ keyboards/salicylic_acid3/nknl7en/rules.mk | 12 ------------ .../nknl7jp/{info.json => keyboard.json} | 9 +++++++++ keyboards/salicylic_acid3/nknl7jp/rules.mk | 12 ------------ keyboards/scatter42/{info.json => keyboard.json} | 8 ++++++++ keyboards/scatter42/rules.mk | 12 ------------ keyboards/sparrow62/{info.json => keyboard.json} | 8 ++++++++ keyboards/sparrow62/rules.mk | 12 ------------ .../rev0/{info.json => keyboard.json} | 8 ++++++++ keyboards/takashiski/otaku_split/rev0/rules.mk | 12 ------------ .../rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/takashiski/otaku_split/rev1/rules.mk | 12 ------------ .../diverge3/{info.json => keyboard.json} | 9 +++++++++ keyboards/unikeyboard/diverge3/rules.mk | 12 ------------ .../divergetm2/{info.json => keyboard.json} | 8 ++++++++ keyboards/unikeyboard/divergetm2/rules.mk | 12 ------------ .../viktus/sp_mini/{info.json => keyboard.json} | 10 ++++++++++ keyboards/viktus/sp_mini/rules.mk | 13 ------------- 168 files changed, 738 insertions(+), 1042 deletions(-) rename keyboards/bastardkb/tbk/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/bastardkb/tbk/rules.mk rename keyboards/flxlb/zplit/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/flxlb/zplit/rules.mk rename keyboards/fungo/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/fungo/rev1/rules.mk rename keyboards/gummykey/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/gummykey/rules.mk rename keyboards/hand88/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/hand88/rules.mk rename keyboards/handwired/brain/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/brain/rules.mk rename keyboards/handwired/chiron/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/chiron/rules.mk rename keyboards/handwired/dactyl_manuform/4x5/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/dactyl_manuform/4x5/rules.mk rename keyboards/handwired/dactyl_manuform/4x5_5/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/dactyl_manuform/4x5_5/rules.mk rename keyboards/handwired/dactyl_manuform/4x6/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/dactyl_manuform/4x6/rules.mk rename keyboards/handwired/dactyl_manuform/4x6_5/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/rules.mk rename keyboards/handwired/dactyl_manuform/5x6/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/dactyl_manuform/5x6/rules.mk rename keyboards/handwired/dactyl_manuform/5x6_2_5/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk rename keyboards/handwired/dactyl_manuform/5x6_5/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_5/rules.mk rename keyboards/handwired/dactyl_manuform/5x6_6/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_6/rules.mk rename keyboards/handwired/dactyl_manuform/5x7/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/dactyl_manuform/5x7/rules.mk rename keyboards/handwired/dactyl_manuform/6x6_4/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/dactyl_manuform/6x6_4/rules.mk rename keyboards/handwired/dactyl_promicro/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/dactyl_promicro/rules.mk rename keyboards/handwired/dactyl_rah/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/dactyl_rah/rules.mk rename keyboards/handwired/elrgo_s/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/elrgo_s/rules.mk rename keyboards/handwired/freoduo/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/freoduo/rules.mk rename keyboards/handwired/jtallbean/split_65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/handwired/jtallbean/split_65/rules.mk rename keyboards/handwired/ks63/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/ks63/rules.mk rename keyboards/handwired/not_so_minidox/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/not_so_minidox/rules.mk rename keyboards/handwired/skakunm_dactyl/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/handwired/skakunm_dactyl/rules.mk rename keyboards/handwired/split65/promicro/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/split65/promicro/rules.mk rename keyboards/handwired/split89/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/split89/rules.mk rename keyboards/hidtech/bastyl/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/hidtech/bastyl/rules.mk rename keyboards/kagizaraya/miniaxe/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/kagizaraya/miniaxe/rules.mk rename keyboards/kakunpc/rabbit_capture_plan/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kakunpc/rabbit_capture_plan/rules.mk rename keyboards/kbdfans/kbd67/mkiirgb/v2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk rename keyboards/kbdfans/maja/{info.json => keyboard.json} (96%) delete mode 100755 keyboards/kbdfans/maja/rules.mk rename keyboards/kbdfans/maja_soldered/{info.json => keyboard.json} (95%) delete mode 100755 keyboards/kbdfans/maja_soldered/rules.mk rename keyboards/keebio/bfo9000/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/keebio/bfo9000/rules.mk rename keyboards/keebio/fourier/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keebio/fourier/rules.mk rename keyboards/keebio/iris/rev1/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keebio/iris/rev1/rules.mk rename keyboards/keebio/iris/rev1_led/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keebio/iris/rev1_led/rules.mk rename keyboards/keebio/iris/rev5/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keebio/iris/rev5/rules.mk rename keyboards/keebio/nyquist/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/keebio/nyquist/rev1/rules.mk rename keyboards/keebio/nyquist/rev2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keebio/nyquist/rev2/rules.mk rename keyboards/keebio/nyquist/rev3/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keebio/nyquist/rev3/rules.mk rename keyboards/keyprez/bison/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/keyprez/bison/rules.mk rename keyboards/keyprez/unicorn/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keyprez/unicorn/rules.mk rename keyboards/keystonecaps/gameroyadvance/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/keystonecaps/gameroyadvance/rules.mk rename keyboards/latincompass/latin17rgb/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/latincompass/latin17rgb/rules.mk rename keyboards/majistic/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/majistic/rules.mk rename keyboards/manta60/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/manta60/rules.mk rename keyboards/melgeek/mj61/rev1/{info.json => keyboard.json} (52%) delete mode 100644 keyboards/melgeek/mj61/rev1/rules.mk rename keyboards/melgeek/{mj64/rev3/info.json => mj61/rev2/keyboard.json} (52%) delete mode 100644 keyboards/melgeek/mj61/rev2/rules.mk rename keyboards/melgeek/{mj64/rev1/info.json => mj63/rev1/keyboard.json} (52%) delete mode 100644 keyboards/melgeek/mj63/rev1/rules.mk rename keyboards/melgeek/{mj61/rev2/info.json => mj63/rev2/keyboard.json} (52%) delete mode 100644 keyboards/melgeek/mj63/rev2/rules.mk rename keyboards/melgeek/{mj63/rev1/info.json => mj64/rev1/keyboard.json} (52%) delete mode 100644 keyboards/melgeek/mj64/rev1/rules.mk rename keyboards/melgeek/mj64/rev2/{info.json => keyboard.json} (52%) delete mode 100644 keyboards/melgeek/mj64/rev2/rules.mk rename keyboards/melgeek/{mj63/rev2/info.json => mj64/rev3/keyboard.json} (52%) delete mode 100644 keyboards/melgeek/mj64/rev3/rules.mk rename keyboards/merge/um70/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/merge/um70/rules.mk rename keyboards/merge/um80/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/merge/um80/rules.mk rename keyboards/meson/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/meson/rules.mk rename keyboards/miller/gm862/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/miller/gm862/rules.mk rename keyboards/mint60/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/mint60/rules.mk rename keyboards/momoka_ergo/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/momoka_ergo/rules.mk rename keyboards/nacly/sodium42/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/nacly/sodium42/rules.mk rename keyboards/nacly/sodium50/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/nacly/sodium50/rules.mk rename keyboards/nacly/sodium62/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/nacly/sodium62/rules.mk rename keyboards/nacly/splitreus62/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/nacly/splitreus62/rules.mk rename keyboards/obosob/arch_36/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/obosob/arch_36/rules.mk rename keyboards/obosob/steal_this_keyboard/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/obosob/steal_this_keyboard/rules.mk rename keyboards/ogre/ergo_single/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ogre/ergo_single/rules.mk rename keyboards/ogre/ergo_split/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ogre/ergo_split/rules.mk rename keyboards/pisces/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/pisces/rules.mk rename keyboards/pluckey/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/pluckey/rules.mk rename keyboards/pteron36/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/pteron36/rules.mk rename keyboards/recompile_keys/cocoa40/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/recompile_keys/cocoa40/rules.mk rename keyboards/salicylic_acid3/7splus/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/salicylic_acid3/7splus/rules.mk rename keyboards/salicylic_acid3/ajisai74/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/salicylic_acid3/ajisai74/rules.mk rename keyboards/salicylic_acid3/ergoarrows/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/salicylic_acid3/ergoarrows/rules.mk rename keyboards/salicylic_acid3/nknl7en/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/salicylic_acid3/nknl7en/rules.mk rename keyboards/salicylic_acid3/nknl7jp/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/salicylic_acid3/nknl7jp/rules.mk rename keyboards/scatter42/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/scatter42/rules.mk rename keyboards/sparrow62/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/sparrow62/rules.mk rename keyboards/takashiski/otaku_split/rev0/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/takashiski/otaku_split/rev0/rules.mk rename keyboards/takashiski/otaku_split/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/takashiski/otaku_split/rev1/rules.mk rename keyboards/unikeyboard/diverge3/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/unikeyboard/diverge3/rules.mk rename keyboards/unikeyboard/divergetm2/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/unikeyboard/divergetm2/rules.mk rename keyboards/viktus/sp_mini/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/viktus/sp_mini/rules.mk diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/keyboard.json similarity index 95% rename from keyboards/bastardkb/tbk/info.json rename to keyboards/bastardkb/tbk/keyboard.json index 40c33619d19..90e37478a1e 100644 --- a/keyboards/bastardkb/tbk/info.json +++ b/keyboards/bastardkb/tbk/keyboard.json @@ -24,6 +24,15 @@ "ws2812": { "pin": "D2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "E6", "C6", "B1", "B3", "B2"], "rows": ["D7", "B5", "F7", "F6", "B6"] diff --git a/keyboards/bastardkb/tbk/rules.mk b/keyboards/bastardkb/tbk/rules.mk deleted file mode 100644 index 2eba275490a..00000000000 --- a/keyboards/bastardkb/tbk/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/flxlb/zplit/info.json b/keyboards/flxlb/zplit/keyboard.json similarity index 94% rename from keyboards/flxlb/zplit/info.json rename to keyboards/flxlb/zplit/keyboard.json index 850cb3f5d3b..2d5c33f49f3 100644 --- a/keyboards/flxlb/zplit/info.json +++ b/keyboards/flxlb/zplit/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B2", "B3", "D6", "D7", "B4", "B5"], "rows": ["D4", "F5", "F4", "F1"] diff --git a/keyboards/flxlb/zplit/rules.mk b/keyboards/flxlb/zplit/rules.mk deleted file mode 100644 index 901257cd173..00000000000 --- a/keyboards/flxlb/zplit/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/keyboard.json similarity index 96% rename from keyboards/fungo/rev1/info.json rename to keyboards/fungo/rev1/keyboard.json index 7c05cd7371b..988ba0f6431 100644 --- a/keyboards/fungo/rev1/info.json +++ b/keyboards/fungo/rev1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1233", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "key_lock": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"], diff --git a/keyboards/fungo/rev1/rules.mk b/keyboards/fungo/rev1/rules.mk deleted file mode 100644 index 2365546821a..00000000000 --- a/keyboards/fungo/rev1/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # 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 -KEY_LOCK_ENABLE = yes # kc_lock use - -OLED_ENABLE = no diff --git a/keyboards/gummykey/info.json b/keyboards/gummykey/keyboard.json similarity index 95% rename from keyboards/gummykey/info.json rename to keyboards/gummykey/keyboard.json index 1520809502a..bb7001438df 100644 --- a/keyboards/gummykey/info.json +++ b/keyboards/gummykey/keyboard.json @@ -3,6 +3,14 @@ "manufacturer": "Gumorr", "url": "https://github.com/gumorr/GummyKey", "maintainer": "Gumorr", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "usb": { "vid": "0xAA12", "pid": "0x0001", diff --git a/keyboards/gummykey/rules.mk b/keyboards/gummykey/rules.mk deleted file mode 100644 index 6e0404820cd..00000000000 --- a/keyboards/gummykey/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 = 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/hand88/info.json b/keyboards/hand88/keyboard.json similarity index 99% rename from keyboards/hand88/info.json rename to keyboards/hand88/keyboard.json index 0dc55ed89ac..cb8a320aaf0 100755 --- a/keyboards/hand88/info.json +++ b/keyboards/hand88/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3838", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"], "rows": ["A2", "A14", "A15", "B3", "B4", "B5"] diff --git a/keyboards/hand88/rules.mk b/keyboards/hand88/rules.mk deleted file mode 100644 index d3ca7b060e1..00000000000 --- a/keyboards/hand88/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 -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/brain/info.json b/keyboards/handwired/brain/keyboard.json similarity index 95% rename from keyboards/handwired/brain/info.json rename to keyboards/handwired/brain/keyboard.json index 01ec6602b7c..e9093711d00 100644 --- a/keyboards/handwired/brain/info.json +++ b/keyboards/handwired/brain/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1"] diff --git a/keyboards/handwired/brain/rules.mk b/keyboards/handwired/brain/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/handwired/brain/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/keyboard.json similarity index 95% rename from keyboards/handwired/chiron/info.json rename to keyboards/handwired/chiron/keyboard.json index 9d1d47564a7..6c2626df64b 100644 --- a/keyboards/handwired/chiron/info.json +++ b/keyboards/handwired/chiron/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": true, + "nkro": false, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/chiron/rules.mk b/keyboards/handwired/chiron/rules.mk deleted file mode 100644 index 61784649426..00000000000 --- a/keyboards/handwired/chiron/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -AUDIO_ENABLE = no -AUTOLOG_ENABLE = no -BACKLIGHT_ENABLE = no -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -COMMAND_ENABLE = no -CONSOLE_ENABLE = no -DEBUG_ENABLE = no -EXTRAKEY_ENABLE = no -LEADER_ENABLE = no -MOUSEKEY_ENABLE = yes -NKRO_ENABLE = no # Enable N-Key Rollover -RGBLIGHT_ENABLE = yes -SLEEP_LED_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/keyboard.json similarity index 96% rename from keyboards/handwired/dactyl_manuform/4x5/info.json rename to keyboards/handwired/dactyl_manuform/4x5/keyboard.json index 12f6f6397a0..b779e9d3c1e 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5/keyboard.json @@ -14,6 +14,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/4x5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/dactyl_manuform/4x5/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json similarity index 94% rename from keyboards/handwired/dactyl_manuform/4x5_5/info.json rename to keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json index 689b43c5bf5..8f53dd03039 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3435", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "F6"], "rows": ["F7", "B1", "B3", "B2", "B4"] diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk deleted file mode 100644 index 7748be4c5b3..00000000000 --- a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options - -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 -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/keyboard.json similarity index 95% rename from keyboards/handwired/dactyl_manuform/4x6/info.json rename to keyboards/handwired/dactyl_manuform/4x6/keyboard.json index 9305461f865..feb58db5dbe 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6/keyboard.json @@ -14,6 +14,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/4x6/rules.mk b/keyboards/handwired/dactyl_manuform/4x6/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/dactyl_manuform/4x6/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json similarity index 97% rename from keyboards/handwired/dactyl_manuform/4x6_5/info.json rename to keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json index 9a879132a3e..a0607c70683 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json @@ -14,6 +14,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/keyboard.json similarity index 95% rename from keyboards/handwired/dactyl_manuform/5x6/info.json rename to keyboards/handwired/dactyl_manuform/5x6/keyboard.json index 66658447487..b5681f4ca7e 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6/keyboard.json @@ -14,6 +14,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x6/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json similarity index 95% rename from keyboards/handwired/dactyl_manuform/5x6_2_5/info.json rename to keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json index ec6a432cb24..e36acea627c 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/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 = 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/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json similarity index 95% rename from keyboards/handwired/dactyl_manuform/5x6_5/info.json rename to keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json index 14b0105cae2..1153bcdb44e 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3536", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_5/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 = 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/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json similarity index 95% rename from keyboards/handwired/dactyl_manuform/5x6_6/info.json rename to keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json index 6a2b00ffffa..8a3e69f2efb 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk deleted file mode 100644 index e70d1927dee..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk +++ /dev/null @@ -1,12 +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 -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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/keyboard.json similarity index 96% rename from keyboards/handwired/dactyl_manuform/5x7/info.json rename to keyboards/handwired/dactyl_manuform/5x7/keyboard.json index 8f1cfe5d17d..bc734607cf3 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/info.json +++ b/keyboards/handwired/dactyl_manuform/5x7/keyboard.json @@ -14,6 +14,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/dactyl_manuform/5x7/rules.mk b/keyboards/handwired/dactyl_manuform/5x7/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x7/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json similarity index 96% rename from keyboards/handwired/dactyl_manuform/6x6_4/info.json rename to keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json index e9b0eb40295..36051fb7feb 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json @@ -14,6 +14,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/keyboard.json similarity index 96% rename from keyboards/handwired/dactyl_promicro/info.json rename to keyboards/handwired/dactyl_promicro/keyboard.json index 3c354bbcec4..572ea05b2f3 100644 --- a/keyboards/handwired/dactyl_promicro/info.json +++ b/keyboards/handwired/dactyl_promicro/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_promicro/rules.mk b/keyboards/handwired/dactyl_promicro/rules.mk deleted file mode 100644 index d68e4764c51..00000000000 --- a/keyboards/handwired/dactyl_promicro/rules.mk +++ /dev/null @@ -1,12 +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 -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/handwired/dactyl_rah/info.json b/keyboards/handwired/dactyl_rah/keyboard.json similarity index 96% rename from keyboards/handwired/dactyl_rah/info.json rename to keyboards/handwired/dactyl_rah/keyboard.json index 6cd23a54cf0..f550a055c7f 100644 --- a/keyboards/handwired/dactyl_rah/info.json +++ b/keyboards/handwired/dactyl_rah/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_rah/rules.mk b/keyboards/handwired/dactyl_rah/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/dactyl_rah/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/keyboard.json similarity index 94% rename from keyboards/handwired/elrgo_s/info.json rename to keyboards/handwired/elrgo_s/keyboard.json index ea54669232d..0da809d2ac5 100644 --- a/keyboards/handwired/elrgo_s/info.json +++ b/keyboards/handwired/elrgo_s/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/elrgo_s/rules.mk b/keyboards/handwired/elrgo_s/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/elrgo_s/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 = 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/freoduo/info.json b/keyboards/handwired/freoduo/keyboard.json similarity index 95% rename from keyboards/handwired/freoduo/info.json rename to keyboards/handwired/freoduo/keyboard.json index 04ba446e702..0d23776f4a6 100644 --- a/keyboards/handwired/freoduo/info.json +++ b/keyboards/handwired/freoduo/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0602", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "velocikey": true + }, "matrix_pins": { "cols": ["B2", "B6", "F6", "B3", "B1", "F7"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/freoduo/rules.mk b/keyboards/handwired/freoduo/rules.mk deleted file mode 100644 index 89a6989a8c6..00000000000 --- a/keyboards/handwired/freoduo/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 -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 -VELOCIKEY_ENABLE = yes diff --git a/keyboards/handwired/jtallbean/split_65/info.json b/keyboards/handwired/jtallbean/split_65/keyboard.json similarity index 98% rename from keyboards/handwired/jtallbean/split_65/info.json rename to keyboards/handwired/jtallbean/split_65/keyboard.json index 502b41ebce0..d1b974a59be 100644 --- a/keyboards/handwired/jtallbean/split_65/info.json +++ b/keyboards/handwired/jtallbean/split_65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "B7"], "rows": ["F4", "F1", "F0", "C7", "B6"] diff --git a/keyboards/handwired/jtallbean/split_65/rules.mk b/keyboards/handwired/jtallbean/split_65/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/handwired/jtallbean/split_65/rules.mk +++ /dev/null @@ -1,12 +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 -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/ks63/info.json b/keyboards/handwired/ks63/keyboard.json similarity index 95% rename from keyboards/handwired/ks63/info.json rename to keyboards/handwired/ks63/keyboard.json index 095f53b7c6c..542cd76811e 100644 --- a/keyboards/handwired/ks63/info.json +++ b/keyboards/handwired/ks63/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3061", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["B5", "B4", "E6", "D7", "C6"] diff --git a/keyboards/handwired/ks63/rules.mk b/keyboards/handwired/ks63/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/ks63/rules.mk +++ /dev/null @@ -1,12 +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 -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 diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/keyboard.json similarity index 94% rename from keyboards/handwired/not_so_minidox/info.json rename to keyboards/handwired/not_so_minidox/keyboard.json index e14bf01acb5..b48eba771bd 100644 --- a/keyboards/handwired/not_so_minidox/info.json +++ b/keyboards/handwired/not_so_minidox/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "D4"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/not_so_minidox/rules.mk b/keyboards/handwired/not_so_minidox/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/not_so_minidox/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 = 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/skakunm_dactyl/info.json b/keyboards/handwired/skakunm_dactyl/keyboard.json similarity index 93% rename from keyboards/handwired/skakunm_dactyl/info.json rename to keyboards/handwired/skakunm_dactyl/keyboard.json index fa7aad4c4d9..91ee5b1fb6c 100644 --- a/keyboards/handwired/skakunm_dactyl/info.json +++ b/keyboards/handwired/skakunm_dactyl/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5"], "rows": ["B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/skakunm_dactyl/rules.mk b/keyboards/handwired/skakunm_dactyl/rules.mk deleted file mode 100644 index e39bab4422a..00000000000 --- a/keyboards/handwired/skakunm_dactyl/rules.mk +++ /dev/null @@ -1,12 +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 -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/keyboard.json similarity index 95% rename from keyboards/handwired/split65/promicro/info.json rename to keyboards/handwired/split65/promicro/keyboard.json index c106e4fd5ed..5efdd93629f 100644 --- a/keyboards/handwired/split65/promicro/info.json +++ b/keyboards/handwired/split65/promicro/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "oled": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"], diff --git a/keyboards/handwired/split65/promicro/rules.mk b/keyboards/handwired/split65/promicro/rules.mk deleted file mode 100644 index c20f156f45f..00000000000 --- a/keyboards/handwired/split65/promicro/rules.mk +++ /dev/null @@ -1,13 +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 -OLED_ENABLE = yes diff --git a/keyboards/handwired/split89/info.json b/keyboards/handwired/split89/keyboard.json similarity index 97% rename from keyboards/handwired/split89/info.json rename to keyboards/handwired/split89/keyboard.json index 477f1f6612c..d30105844af 100644 --- a/keyboards/handwired/split89/info.json +++ b/keyboards/handwired/split89/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/split89/rules.mk b/keyboards/handwired/split89/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/split89/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 = 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/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/keyboard.json similarity index 95% rename from keyboards/hidtech/bastyl/info.json rename to keyboards/hidtech/bastyl/keyboard.json index 67903569ab2..5c3a9fcfcff 100644 --- a/keyboards/hidtech/bastyl/info.json +++ b/keyboards/hidtech/bastyl/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1827", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "E6", "C6", "B1", "B3", "B2"], "rows": ["D7", "B5", "F7", "F6", "B6"] diff --git a/keyboards/hidtech/bastyl/rules.mk b/keyboards/hidtech/bastyl/rules.mk deleted file mode 100644 index 2eba275490a..00000000000 --- a/keyboards/hidtech/bastyl/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kagizaraya/miniaxe/info.json b/keyboards/kagizaraya/miniaxe/keyboard.json similarity index 94% rename from keyboards/kagizaraya/miniaxe/info.json rename to keyboards/kagizaraya/miniaxe/keyboard.json index a1de251618c..fa9f4d79dfc 100644 --- a/keyboards/kagizaraya/miniaxe/info.json +++ b/keyboards/kagizaraya/miniaxe/keyboard.json @@ -34,6 +34,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "direct": [ ["F1", "E6", "B0", "B2", "B3"], diff --git a/keyboards/kagizaraya/miniaxe/rules.mk b/keyboards/kagizaraya/miniaxe/rules.mk deleted file mode 100644 index f71583eb50d..00000000000 --- a/keyboards/kagizaraya/miniaxe/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -DEBUG_ENABLE = no diff --git a/keyboards/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/keyboard.json similarity index 96% rename from keyboards/kakunpc/rabbit_capture_plan/info.json rename to keyboards/kakunpc/rabbit_capture_plan/keyboard.json index fe6cf5bd012..7667e5e41b1 100644 --- a/keyboards/kakunpc/rabbit_capture_plan/info.json +++ b/keyboards/kakunpc/rabbit_capture_plan/keyboard.json @@ -31,6 +31,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/kakunpc/rabbit_capture_plan/rules.mk b/keyboards/kakunpc/rabbit_capture_plan/rules.mk deleted file mode 100644 index 698712de91f..00000000000 --- a/keyboards/kakunpc/rabbit_capture_plan/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = no diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json similarity index 96% rename from keyboards/kbdfans/kbd67/mkiirgb/v2/info.json rename to keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json index 9285255f36f..561c4df2ac0 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json @@ -39,6 +39,15 @@ "led_process_limit": 4, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F0", "F1", "F4", "E6", "C6"] diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk deleted file mode 100644 index 502113e3b85..00000000000 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/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 = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/kbdfans/maja/info.json b/keyboards/kbdfans/maja/keyboard.json similarity index 96% rename from keyboards/kbdfans/maja/info.json rename to keyboards/kbdfans/maja/keyboard.json index 7b64cae8934..c307f78637a 100644 --- a/keyboards/kbdfans/maja/info.json +++ b/keyboards/kbdfans/maja/keyboard.json @@ -45,6 +45,15 @@ "led_process_limit": 4, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"], "rows": ["F0", "B6", "B5", "B4", "D7"] diff --git a/keyboards/kbdfans/maja/rules.mk b/keyboards/kbdfans/maja/rules.mk deleted file mode 100755 index a59c9aa4cf9..00000000000 --- a/keyboards/kbdfans/maja/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 = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/kbdfans/maja_soldered/info.json b/keyboards/kbdfans/maja_soldered/keyboard.json similarity index 95% rename from keyboards/kbdfans/maja_soldered/info.json rename to keyboards/kbdfans/maja_soldered/keyboard.json index 197f26870b8..f9ae338ae73 100644 --- a/keyboards/kbdfans/maja_soldered/info.json +++ b/keyboards/kbdfans/maja_soldered/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6069", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"], "rows": ["F0", "B6", "D6", "B4", "D7"] diff --git a/keyboards/kbdfans/maja_soldered/rules.mk b/keyboards/kbdfans/maja_soldered/rules.mk deleted file mode 100755 index 901d395d65a..00000000000 --- a/keyboards/kbdfans/maja_soldered/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/keyboard.json similarity index 97% rename from keyboards/keebio/bfo9000/info.json rename to keyboards/keebio/bfo9000/keyboard.json index c5571d31db0..86fd59a5986 100644 --- a/keyboards/keebio/bfo9000/info.json +++ b/keyboards/keebio/bfo9000/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1169", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D4", "C6", "D7", "E6"] diff --git a/keyboards/keebio/bfo9000/rules.mk b/keyboards/keebio/bfo9000/rules.mk deleted file mode 100644 index b7f1787db7b..00000000000 --- a/keyboards/keebio/bfo9000/rules.mk +++ /dev/null @@ -1,12 +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 -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/keyboard.json similarity index 94% rename from keyboards/keebio/fourier/info.json rename to keyboards/keebio/fourier/keyboard.json index 8f0de7e531e..a1dab05c567 100644 --- a/keyboards/keebio/fourier/info.json +++ b/keyboards/keebio/fourier/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1247", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["F4", "D7", "E6", "B4"] diff --git a/keyboards/keebio/fourier/rules.mk b/keyboards/keebio/fourier/rules.mk deleted file mode 100644 index cda7d53ecb4..00000000000 --- a/keyboards/keebio/fourier/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 = 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/keyboard.json similarity index 94% rename from keyboards/keebio/iris/rev1/info.json rename to keyboards/keebio/iris/rev1/keyboard.json index b639cb4328f..c6b69c36778 100644 --- a/keyboards/keebio/iris/rev1/info.json +++ b/keyboards/keebio/iris/rev1/keyboard.json @@ -4,6 +4,16 @@ "pid": "0x1256", "device_version": "1.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D7", "E6", "B4", "B5", "D4"] diff --git a/keyboards/keebio/iris/rev1/rules.mk b/keyboards/keebio/iris/rev1/rules.mk deleted file mode 100644 index 2ed95720625..00000000000 --- a/keyboards/keebio/iris/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 = 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/keyboard.json similarity index 94% rename from keyboards/keebio/iris/rev1_led/info.json rename to keyboards/keebio/iris/rev1_led/keyboard.json index 85e6ba797af..70500da27e9 100644 --- a/keyboards/keebio/iris/rev1_led/info.json +++ b/keyboards/keebio/iris/rev1_led/keyboard.json @@ -4,6 +4,16 @@ "pid": "0x1256", "device_version": "1.1.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "F4"], "rows": ["D7", "E6", "B4", "B5", "D4"] diff --git a/keyboards/keebio/iris/rev1_led/rules.mk b/keyboards/keebio/iris/rev1_led/rules.mk deleted file mode 100644 index 2ed95720625..00000000000 --- a/keyboards/keebio/iris/rev1_led/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 = 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/keyboard.json similarity index 94% rename from keyboards/keebio/iris/rev5/info.json rename to keyboards/keebio/iris/rev5/keyboard.json index e812a086e90..a1f97a78311 100644 --- a/keyboards/keebio/iris/rev5/info.json +++ b/keyboards/keebio/iris/rev5/keyboard.json @@ -4,6 +4,17 @@ "pid": "0x5356", "device_version": "5.1.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F4", "D3", "D2", "B7", "D4"], "rows": ["B1", "F0", "F5", "F6", "F7"] diff --git a/keyboards/keebio/iris/rev5/rules.mk b/keyboards/keebio/iris/rev5/rules.mk deleted file mode 100644 index 8b2f28c1c46..00000000000 --- a/keyboards/keebio/iris/rev5/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/keyboard.json similarity index 97% rename from keyboards/keebio/nyquist/rev1/info.json rename to keyboards/keebio/nyquist/rev1/keyboard.json index 105e159d5a3..717b49e9713 100644 --- a/keyboards/keebio/nyquist/rev1/info.json +++ b/keyboards/keebio/nyquist/rev1/keyboard.json @@ -4,6 +4,14 @@ "pid": "0x1156", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/keebio/nyquist/rev1/rules.mk b/keyboards/keebio/nyquist/rev1/rules.mk deleted file mode 100644 index e39bab4422a..00000000000 --- a/keyboards/keebio/nyquist/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 = 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/keyboard.json similarity index 96% rename from keyboards/keebio/nyquist/rev2/info.json rename to keyboards/keebio/nyquist/rev2/keyboard.json index 31987f2f949..435cdd189fc 100644 --- a/keyboards/keebio/nyquist/rev2/info.json +++ b/keyboards/keebio/nyquist/rev2/keyboard.json @@ -4,6 +4,16 @@ "pid": "0x2156", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D2", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/keebio/nyquist/rev2/rules.mk b/keyboards/keebio/nyquist/rev2/rules.mk deleted file mode 100644 index 083a3e806cb..00000000000 --- a/keyboards/keebio/nyquist/rev2/rules.mk +++ /dev/null @@ -1,12 +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 -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/keyboard.json similarity index 96% rename from keyboards/keebio/nyquist/rev3/info.json rename to keyboards/keebio/nyquist/rev3/keyboard.json index 955c9281074..80e5a10a17a 100644 --- a/keyboards/keebio/nyquist/rev3/info.json +++ b/keyboards/keebio/nyquist/rev3/keyboard.json @@ -4,6 +4,16 @@ "pid": "0x3156", "device_version": "3.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F4", "B7", "D2", "D3", "D4"], "rows": ["F0", "F5", "D7", "F6", "F7"] diff --git a/keyboards/keebio/nyquist/rev3/rules.mk b/keyboards/keebio/nyquist/rev3/rules.mk deleted file mode 100644 index 083a3e806cb..00000000000 --- a/keyboards/keebio/nyquist/rev3/rules.mk +++ /dev/null @@ -1,12 +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 -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/keyprez/bison/info.json b/keyboards/keyprez/bison/keyboard.json similarity index 98% rename from keyboards/keyprez/bison/info.json rename to keyboards/keyprez/bison/keyboard.json index 29b1a9da723..462b9d4274c 100644 --- a/keyboards/keyprez/bison/info.json +++ b/keyboards/keyprez/bison/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "E6", "B2", "B4", "D4", "F6", "F5", "F4"], "rows": ["D2", "F7", "B1", "B3", "D7"] diff --git a/keyboards/keyprez/bison/rules.mk b/keyboards/keyprez/bison/rules.mk deleted file mode 100644 index 453f0a34d38..00000000000 --- a/keyboards/keyprez/bison/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes diff --git a/keyboards/keyprez/unicorn/info.json b/keyboards/keyprez/unicorn/keyboard.json similarity index 96% rename from keyboards/keyprez/unicorn/info.json rename to keyboards/keyprez/unicorn/keyboard.json index 2d2ab010e79..56061290ea7 100644 --- a/keyboards/keyprez/unicorn/info.json +++ b/keyboards/keyprez/unicorn/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x7563", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "B2", "B5", "D7", "B4", "B6", "E6", "D4"], "rows": ["F4", "D3", "F6", "F7", "B1", "B3"] diff --git a/keyboards/keyprez/unicorn/rules.mk b/keyboards/keyprez/unicorn/rules.mk deleted file mode 100644 index 4f4828ca976..00000000000 --- a/keyboards/keyprez/unicorn/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/keyboard.json similarity index 98% rename from keyboards/keystonecaps/gameroyadvance/info.json rename to keyboards/keystonecaps/gameroyadvance/keyboard.json index 21f078a7c58..89b30fe4d80 100644 --- a/keyboards/keystonecaps/gameroyadvance/info.json +++ b/keyboards/keystonecaps/gameroyadvance/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "D0", "D1", "C6", "D7", "E6", "F4", "B2", "B6"], "rows": ["F5", "F6", "F7", "B1", "B3"] diff --git a/keyboards/keystonecaps/gameroyadvance/rules.mk b/keyboards/keystonecaps/gameroyadvance/rules.mk deleted file mode 100644 index f90bd0ef997..00000000000 --- a/keyboards/keystonecaps/gameroyadvance/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes diff --git a/keyboards/latincompass/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/keyboard.json similarity index 94% rename from keyboards/latincompass/latin17rgb/info.json rename to keyboards/latincompass/latin17rgb/keyboard.json index a211846f628..161672aea4f 100644 --- a/keyboards/latincompass/latin17rgb/info.json +++ b/keyboards/latincompass/latin17rgb/keyboard.json @@ -64,6 +64,15 @@ "driver": "is31fl3731", "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4"], "rows": ["C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/latincompass/latin17rgb/rules.mk b/keyboards/latincompass/latin17rgb/rules.mk deleted file mode 100644 index 0af5f68e5e1..00000000000 --- a/keyboards/latincompass/latin17rgb/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 -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 diff --git a/keyboards/majistic/info.json b/keyboards/majistic/keyboard.json similarity index 96% rename from keyboards/majistic/info.json rename to keyboards/majistic/keyboard.json index 00dffa2fc19..258df08d883 100644 --- a/keyboards/majistic/info.json +++ b/keyboards/majistic/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6E55", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"], "rows": ["F6", "F7", "B1", "B3", "B2"] diff --git a/keyboards/majistic/rules.mk b/keyboards/majistic/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/majistic/rules.mk +++ /dev/null @@ -1,12 +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 -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/manta60/info.json b/keyboards/manta60/keyboard.json similarity index 95% rename from keyboards/manta60/info.json rename to keyboards/manta60/keyboard.json index 06bcfb88d71..8482970b9b2 100644 --- a/keyboards/manta60/info.json +++ b/keyboards/manta60/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x991D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": false, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/manta60/rules.mk b/keyboards/manta60/rules.mk deleted file mode 100644 index be0c854d3c6..00000000000 --- a/keyboards/manta60/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = no # 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -IOS_DEVICE_ENABLE = no # connect to IOS device (iPad, iPhone) diff --git a/keyboards/melgeek/mj61/rev1/info.json b/keyboards/melgeek/mj61/rev1/keyboard.json similarity index 52% rename from keyboards/melgeek/mj61/rev1/info.json rename to keyboards/melgeek/mj61/rev1/keyboard.json index 67a4a004d62..e0bd315865d 100644 --- a/keyboards/melgeek/mj61/rev1/info.json +++ b/keyboards/melgeek/mj61/rev1/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj61/rev1/rules.mk b/keyboards/melgeek/mj61/rev1/rules.mk deleted file mode 100644 index c66b1abcd45..00000000000 --- a/keyboards/melgeek/mj61/rev1/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 = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/melgeek/mj64/rev3/info.json b/keyboards/melgeek/mj61/rev2/keyboard.json similarity index 52% rename from keyboards/melgeek/mj64/rev3/info.json rename to keyboards/melgeek/mj61/rev2/keyboard.json index 62c58271177..779cfc091c8 100644 --- a/keyboards/melgeek/mj64/rev3/info.json +++ b/keyboards/melgeek/mj61/rev2/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj61/rev2/rules.mk b/keyboards/melgeek/mj61/rev2/rules.mk deleted file mode 100644 index c66b1abcd45..00000000000 --- a/keyboards/melgeek/mj61/rev2/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 = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/melgeek/mj64/rev1/info.json b/keyboards/melgeek/mj63/rev1/keyboard.json similarity index 52% rename from keyboards/melgeek/mj64/rev1/info.json rename to keyboards/melgeek/mj63/rev1/keyboard.json index 67a4a004d62..e0bd315865d 100644 --- a/keyboards/melgeek/mj64/rev1/info.json +++ b/keyboards/melgeek/mj63/rev1/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj63/rev1/rules.mk b/keyboards/melgeek/mj63/rev1/rules.mk deleted file mode 100644 index c66b1abcd45..00000000000 --- a/keyboards/melgeek/mj63/rev1/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 = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/melgeek/mj61/rev2/info.json b/keyboards/melgeek/mj63/rev2/keyboard.json similarity index 52% rename from keyboards/melgeek/mj61/rev2/info.json rename to keyboards/melgeek/mj63/rev2/keyboard.json index 62c58271177..779cfc091c8 100644 --- a/keyboards/melgeek/mj61/rev2/info.json +++ b/keyboards/melgeek/mj63/rev2/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj63/rev2/rules.mk b/keyboards/melgeek/mj63/rev2/rules.mk deleted file mode 100644 index c66b1abcd45..00000000000 --- a/keyboards/melgeek/mj63/rev2/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 = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/melgeek/mj63/rev1/info.json b/keyboards/melgeek/mj64/rev1/keyboard.json similarity index 52% rename from keyboards/melgeek/mj63/rev1/info.json rename to keyboards/melgeek/mj64/rev1/keyboard.json index 67a4a004d62..e0bd315865d 100644 --- a/keyboards/melgeek/mj63/rev1/info.json +++ b/keyboards/melgeek/mj64/rev1/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj64/rev1/rules.mk b/keyboards/melgeek/mj64/rev1/rules.mk deleted file mode 100644 index c66b1abcd45..00000000000 --- a/keyboards/melgeek/mj64/rev1/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 = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/melgeek/mj64/rev2/info.json b/keyboards/melgeek/mj64/rev2/keyboard.json similarity index 52% rename from keyboards/melgeek/mj64/rev2/info.json rename to keyboards/melgeek/mj64/rev2/keyboard.json index 67a4a004d62..e0bd315865d 100644 --- a/keyboards/melgeek/mj64/rev2/info.json +++ b/keyboards/melgeek/mj64/rev2/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj64/rev2/rules.mk b/keyboards/melgeek/mj64/rev2/rules.mk deleted file mode 100644 index c66b1abcd45..00000000000 --- a/keyboards/melgeek/mj64/rev2/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 = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/melgeek/mj63/rev2/info.json b/keyboards/melgeek/mj64/rev3/keyboard.json similarity index 52% rename from keyboards/melgeek/mj63/rev2/info.json rename to keyboards/melgeek/mj64/rev3/keyboard.json index 62c58271177..779cfc091c8 100644 --- a/keyboards/melgeek/mj63/rev2/info.json +++ b/keyboards/melgeek/mj64/rev3/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj64/rev3/rules.mk b/keyboards/melgeek/mj64/rev3/rules.mk deleted file mode 100644 index c66b1abcd45..00000000000 --- a/keyboards/melgeek/mj64/rev3/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 = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/keyboard.json similarity index 98% rename from keyboards/merge/um70/info.json rename to keyboards/merge/um70/keyboard.json index a667dbe11be..c349abc7881 100644 --- a/keyboards/merge/um70/info.json +++ b/keyboards/merge/um70/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x3222", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk deleted file mode 100644 index 45cbdcf0157..00000000000 --- a/keyboards/merge/um70/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/keyboard.json similarity index 96% rename from keyboards/merge/um80/info.json rename to keyboards/merge/um80/keyboard.json index 64939a18fbd..5a369877f88 100644 --- a/keyboards/merge/um80/info.json +++ b/keyboards/merge/um80/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x3241", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"], "rows": ["B0", "B1", "B2", "B3", "B7", "C7"] diff --git a/keyboards/merge/um80/rules.mk b/keyboards/merge/um80/rules.mk deleted file mode 100644 index 45cbdcf0157..00000000000 --- a/keyboards/merge/um80/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/meson/info.json b/keyboards/meson/keyboard.json similarity index 96% rename from keyboards/meson/info.json rename to keyboards/meson/keyboard.json index aeec25f0465..72d9ec58e72 100644 --- a/keyboards/meson/info.json +++ b/keyboards/meson/keyboard.json @@ -7,6 +7,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "D7", "E6", "B3", "B2", "B6", "F4"], "rows": ["F7", "C6", "F6", "F5"] diff --git a/keyboards/meson/rules.mk b/keyboards/meson/rules.mk deleted file mode 100644 index 9686f2e033e..00000000000 --- a/keyboards/meson/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 = 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/miller/gm862/info.json b/keyboards/miller/gm862/keyboard.json similarity index 96% rename from keyboards/miller/gm862/info.json rename to keyboards/miller/gm862/keyboard.json index 1249b0a5aba..b8c32cf16a6 100644 --- a/keyboards/miller/gm862/info.json +++ b/keyboards/miller/gm862/keyboard.json @@ -42,6 +42,15 @@ "driver": "is31fl3733", "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"], "rows": ["F0", "F1", "F4", "F5", "B4"] diff --git a/keyboards/miller/gm862/rules.mk b/keyboards/miller/gm862/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/miller/gm862/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 -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 = yes # Use RGB matrix diff --git a/keyboards/mint60/info.json b/keyboards/mint60/keyboard.json similarity index 95% rename from keyboards/mint60/info.json rename to keyboards/mint60/keyboard.json index a7f992056ef..332a366aa6e 100644 --- a/keyboards/mint60/info.json +++ b/keyboards/mint60/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "B3", "B1", "F7", "B2", "B6", "F6", "F5"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/mint60/rules.mk b/keyboards/mint60/rules.mk deleted file mode 100644 index e788df9b325..00000000000 --- a/keyboards/mint60/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 = yes # Enable WS2812 RGB underlight. -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/keyboard.json similarity index 96% rename from keyboards/momoka_ergo/info.json rename to keyboards/momoka_ergo/keyboard.json index f509451ab3d..da21c509b92 100644 --- a/keyboards/momoka_ergo/info.json +++ b/keyboards/momoka_ergo/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7"] diff --git a/keyboards/momoka_ergo/rules.mk b/keyboards/momoka_ergo/rules.mk deleted file mode 100644 index 6d85e16f920..00000000000 --- a/keyboards/momoka_ergo/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/keyboard.json similarity index 94% rename from keyboards/nacly/sodium42/info.json rename to keyboards/nacly/sodium42/keyboard.json index e87c76e21a6..f084ca2a239 100644 --- a/keyboards/nacly/sodium42/info.json +++ b/keyboards/nacly/sodium42/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D2", "C6", "E6", "B5", "B2", "B3"], "rows": ["F7", "D4", "D7", "B4"] diff --git a/keyboards/nacly/sodium42/rules.mk b/keyboards/nacly/sodium42/rules.mk deleted file mode 100644 index 7c9f712027b..00000000000 --- a/keyboards/nacly/sodium42/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 = 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/keyboard.json similarity index 95% rename from keyboards/nacly/sodium50/info.json rename to keyboards/nacly/sodium50/keyboard.json index e82dc8c1b5d..ff7b691d9d7 100644 --- a/keyboards/nacly/sodium50/info.json +++ b/keyboards/nacly/sodium50/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"], "rows": ["F7", "D4", "D7", "B4"] diff --git a/keyboards/nacly/sodium50/rules.mk b/keyboards/nacly/sodium50/rules.mk deleted file mode 100644 index 7c9f712027b..00000000000 --- a/keyboards/nacly/sodium50/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 = 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/keyboard.json similarity index 95% rename from keyboards/nacly/sodium62/info.json rename to keyboards/nacly/sodium62/keyboard.json index 45f5c488b8c..941bad2bd6c 100644 --- a/keyboards/nacly/sodium62/info.json +++ b/keyboards/nacly/sodium62/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x636C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true + }, "matrix_pins": { "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"], "rows": ["F7", "D4", "D7", "B4", "B6"] diff --git a/keyboards/nacly/sodium62/rules.mk b/keyboards/nacly/sodium62/rules.mk deleted file mode 100644 index 020e7029212..00000000000 --- a/keyboards/nacly/sodium62/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 - -OLED_ENABLE = yes diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/keyboard.json similarity index 94% rename from keyboards/nacly/splitreus62/info.json rename to keyboards/nacly/splitreus62/keyboard.json index 85038a903b7..4efc32f5c5d 100644 --- a/keyboards/nacly/splitreus62/info.json +++ b/keyboards/nacly/splitreus62/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "B4", "B5", "B6", "B2", "B3"], "rows": ["D3", "D2", "D1", "D4", "C6", "D7"] diff --git a/keyboards/nacly/splitreus62/rules.mk b/keyboards/nacly/splitreus62/rules.mk deleted file mode 100644 index 28c29a3b4dc..00000000000 --- a/keyboards/nacly/splitreus62/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 = 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/obosob/arch_36/info.json b/keyboards/obosob/arch_36/keyboard.json similarity index 92% rename from keyboards/obosob/arch_36/info.json rename to keyboards/obosob/arch_36/keyboard.json index bc997372785..db3e356f3a7 100644 --- a/keyboards/obosob/arch_36/info.json +++ b/keyboards/obosob/arch_36/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x9CE3", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "B1", "B3", "B2", "B6"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/obosob/arch_36/rules.mk b/keyboards/obosob/arch_36/rules.mk deleted file mode 100644 index 7d3e33104ff..00000000000 --- a/keyboards/obosob/arch_36/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 -OLED_ENABLE = yes -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/obosob/steal_this_keyboard/info.json b/keyboards/obosob/steal_this_keyboard/keyboard.json similarity index 93% rename from keyboards/obosob/steal_this_keyboard/info.json rename to keyboards/obosob/steal_this_keyboard/keyboard.json index aecfffd7596..83de29d69c8 100644 --- a/keyboards/obosob/steal_this_keyboard/info.json +++ b/keyboards/obosob/steal_this_keyboard/keyboard.json @@ -10,6 +10,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "unicode": true + }, "matrix_pins": { "direct": [ ["F4", "F7", "B2", "D1", "D7"], diff --git a/keyboards/obosob/steal_this_keyboard/rules.mk b/keyboards/obosob/steal_this_keyboard/rules.mk deleted file mode 100644 index f59e3a88231..00000000000 --- a/keyboards/obosob/steal_this_keyboard/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 -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 -UNICODE_ENABLE = yes # Unicode -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/keyboard.json similarity index 96% rename from keyboards/ogre/ergo_single/info.json rename to keyboards/ogre/ergo_single/keyboard.json index 6c3feea0e05..3ebd88b0d28 100644 --- a/keyboards/ogre/ergo_single/info.json +++ b/keyboards/ogre/ergo_single/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/ogre/ergo_single/rules.mk b/keyboards/ogre/ergo_single/rules.mk deleted file mode 100644 index ff287d5235b..00000000000 --- a/keyboards/ogre/ergo_single/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/keyboard.json similarity index 96% rename from keyboards/ogre/ergo_split/info.json rename to keyboards/ogre/ergo_split/keyboard.json index d937fe9373a..765bebc2fba 100644 --- a/keyboards/ogre/ergo_split/info.json +++ b/keyboards/ogre/ergo_split/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/ogre/ergo_split/rules.mk b/keyboards/ogre/ergo_split/rules.mk deleted file mode 100644 index ff287d5235b..00000000000 --- a/keyboards/ogre/ergo_split/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/pisces/info.json b/keyboards/pisces/keyboard.json similarity index 93% rename from keyboards/pisces/info.json rename to keyboards/pisces/keyboard.json index 48ef9db5c0e..2783f1085fd 100644 --- a/keyboards/pisces/info.json +++ b/keyboards/pisces/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B1", "B2", "B3", "B4", "B5", "B6", "B7"], "rows": ["C4", "B0", "C7"] diff --git a/keyboards/pisces/rules.mk b/keyboards/pisces/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/pisces/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 = 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/pluckey/info.json b/keyboards/pluckey/keyboard.json similarity index 97% rename from keyboards/pluckey/info.json rename to keyboards/pluckey/keyboard.json index 0efd9db12d5..52e951e875c 100644 --- a/keyboards/pluckey/info.json +++ b/keyboards/pluckey/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x91CE", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "F7"], "rows": ["B4", "F5", "F6", "B6", "B5"] diff --git a/keyboards/pluckey/rules.mk b/keyboards/pluckey/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/pluckey/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/keyboard.json similarity index 95% rename from keyboards/pteron36/info.json rename to keyboards/pteron36/keyboard.json index 2adb97ec511..f4bab524196 100644 --- a/keyboards/pteron36/info.json +++ b/keyboards/pteron36/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x5054", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2"], "rows": ["E6", "D7", "B4", "B5"] diff --git a/keyboards/pteron36/rules.mk b/keyboards/pteron36/rules.mk deleted file mode 100644 index 182bad228c7..00000000000 --- a/keyboards/pteron36/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes # OLED display -ENCODER_ENABLE = yes # Encoder support diff --git a/keyboards/recompile_keys/cocoa40/info.json b/keyboards/recompile_keys/cocoa40/keyboard.json similarity index 94% rename from keyboards/recompile_keys/cocoa40/info.json rename to keyboards/recompile_keys/cocoa40/keyboard.json index 1051dfb673a..f964ff6621d 100644 --- a/keyboards/recompile_keys/cocoa40/info.json +++ b/keyboards/recompile_keys/cocoa40/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/recompile_keys/cocoa40/rules.mk b/keyboards/recompile_keys/cocoa40/rules.mk deleted file mode 100644 index 7552bdafa65..00000000000 --- a/keyboards/recompile_keys/cocoa40/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 = 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/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/keyboard.json similarity index 96% rename from keyboards/salicylic_acid3/7splus/info.json rename to keyboards/salicylic_acid3/7splus/keyboard.json index 4a3ed4cc90f..38ca750cd47 100644 --- a/keyboards/salicylic_acid3/7splus/info.json +++ b/keyboards/salicylic_acid3/7splus/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xEAE7", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/7splus/rules.mk b/keyboards/salicylic_acid3/7splus/rules.mk deleted file mode 100644 index a3deaf30b97..00000000000 --- a/keyboards/salicylic_acid3/7splus/rules.mk +++ /dev/null @@ -1,12 +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 = no # 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/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/keyboard.json similarity index 96% rename from keyboards/salicylic_acid3/ajisai74/info.json rename to keyboards/salicylic_acid3/ajisai74/keyboard.json index 7c8110c1552..b29c5bf178c 100644 --- a/keyboards/salicylic_acid3/ajisai74/info.json +++ b/keyboards/salicylic_acid3/ajisai74/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xEB54", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D3"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/ajisai74/rules.mk b/keyboards/salicylic_acid3/ajisai74/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/salicylic_acid3/ajisai74/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 = 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/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/keyboard.json similarity index 96% rename from keyboards/salicylic_acid3/ergoarrows/info.json rename to keyboards/salicylic_acid3/ergoarrows/keyboard.json index bc6a715f1d6..bb9956a2d07 100644 --- a/keyboards/salicylic_acid3/ergoarrows/info.json +++ b/keyboards/salicylic_acid3/ergoarrows/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xEA54", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/salicylic_acid3/ergoarrows/rules.mk b/keyboards/salicylic_acid3/ergoarrows/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/salicylic_acid3/ergoarrows/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/keyboard.json similarity index 96% rename from keyboards/salicylic_acid3/nknl7en/info.json rename to keyboards/salicylic_acid3/nknl7en/keyboard.json index b5ac551bc9c..4d6b494b9fb 100644 --- a/keyboards/salicylic_acid3/nknl7en/info.json +++ b/keyboards/salicylic_acid3/nknl7en/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xEA56", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/nknl7en/rules.mk b/keyboards/salicylic_acid3/nknl7en/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/salicylic_acid3/nknl7en/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/keyboard.json similarity index 96% rename from keyboards/salicylic_acid3/nknl7jp/info.json rename to keyboards/salicylic_acid3/nknl7jp/keyboard.json index 2501f84d9f9..0f260cdfdd7 100644 --- a/keyboards/salicylic_acid3/nknl7jp/info.json +++ b/keyboards/salicylic_acid3/nknl7jp/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xEA55", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/nknl7jp/rules.mk b/keyboards/salicylic_acid3/nknl7jp/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/salicylic_acid3/nknl7jp/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/scatter42/info.json b/keyboards/scatter42/keyboard.json similarity index 94% rename from keyboards/scatter42/info.json rename to keyboards/scatter42/keyboard.json index c0f8df47bee..7ccf9cb9fcf 100644 --- a/keyboards/scatter42/info.json +++ b/keyboards/scatter42/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3B47", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/scatter42/rules.mk b/keyboards/scatter42/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/scatter42/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 = 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/sparrow62/info.json b/keyboards/sparrow62/keyboard.json similarity index 95% rename from keyboards/sparrow62/info.json rename to keyboards/sparrow62/keyboard.json index d7d0d8b84d6..e551bb48517 100644 --- a/keyboards/sparrow62/info.json +++ b/keyboards/sparrow62/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x7461", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/sparrow62/rules.mk b/keyboards/sparrow62/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/sparrow62/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 = 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/takashiski/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/keyboard.json similarity index 96% rename from keyboards/takashiski/otaku_split/rev0/info.json rename to keyboards/takashiski/otaku_split/rev0/keyboard.json index c65a429f69d..db577c22606 100644 --- a/keyboards/takashiski/otaku_split/rev0/info.json +++ b/keyboards/takashiski/otaku_split/rev0/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["B5", "B4", "E6", "D7", "C6"] diff --git a/keyboards/takashiski/otaku_split/rev0/rules.mk b/keyboards/takashiski/otaku_split/rev0/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/takashiski/otaku_split/rev0/rules.mk +++ /dev/null @@ -1,12 +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 -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/takashiski/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/keyboard.json similarity index 96% rename from keyboards/takashiski/otaku_split/rev1/info.json rename to keyboards/takashiski/otaku_split/rev1/keyboard.json index 251e2c36b90..0c83593eea6 100644 --- a/keyboards/takashiski/otaku_split/rev1/info.json +++ b/keyboards/takashiski/otaku_split/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/takashiski/otaku_split/rev1/rules.mk b/keyboards/takashiski/otaku_split/rev1/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/takashiski/otaku_split/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 = 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/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/keyboard.json similarity index 95% rename from keyboards/unikeyboard/diverge3/info.json rename to keyboards/unikeyboard/diverge3/keyboard.json index d85d76b785e..a6dd684be6d 100644 --- a/keyboards/unikeyboard/diverge3/info.json +++ b/keyboards/unikeyboard/diverge3/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1257", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/unikeyboard/diverge3/rules.mk b/keyboards/unikeyboard/diverge3/rules.mk deleted file mode 100644 index fd50645e4a1..00000000000 --- a/keyboards/unikeyboard/diverge3/rules.mk +++ /dev/null @@ -1,12 +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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/keyboard.json similarity index 94% rename from keyboards/unikeyboard/divergetm2/info.json rename to keyboards/unikeyboard/divergetm2/keyboard.json index d68c4da94b5..3c1420c39ad 100644 --- a/keyboards/unikeyboard/divergetm2/info.json +++ b/keyboards/unikeyboard/divergetm2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1256", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/unikeyboard/divergetm2/rules.mk b/keyboards/unikeyboard/divergetm2/rules.mk deleted file mode 100644 index e39bab4422a..00000000000 --- a/keyboards/unikeyboard/divergetm2/rules.mk +++ /dev/null @@ -1,12 +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 -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/keyboard.json similarity index 99% rename from keyboards/viktus/sp_mini/info.json rename to keyboards/viktus/sp_mini/keyboard.json index c6309422411..25aa4c94942 100644 --- a/keyboards/viktus/sp_mini/info.json +++ b/keyboards/viktus/sp_mini/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x534D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", null], "rows": ["F0", "B5", "B4", "D7", "D6"] diff --git a/keyboards/viktus/sp_mini/rules.mk b/keyboards/viktus/sp_mini/rules.mk deleted file mode 100644 index e3c4a42def8..00000000000 --- a/keyboards/viktus/sp_mini/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes From 96025250d101d6819e81c989a0d46e3ee14a906b Mon Sep 17 00:00:00 2001 From: zvecr Date: Sat, 13 Apr 2024 08:49:31 +0100 Subject: [PATCH 137/333] Fix dailycraft/wings42/rev2 --- keyboards/dailycraft/wings42/rev2/keyboard.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/keyboards/dailycraft/wings42/rev2/keyboard.json b/keyboards/dailycraft/wings42/rev2/keyboard.json index dcb3a0268de..13f283d92b3 100644 --- a/keyboards/dailycraft/wings42/rev2/keyboard.json +++ b/keyboards/dailycraft/wings42/rev2/keyboard.json @@ -17,9 +17,6 @@ "enabled": true, "soft_serial_pin": "D2" }, - "features": { - "encoder": true - }, "encoder": { "rotary": [ { "pin_a": "B5", "pin_b": "B4" }, @@ -30,8 +27,9 @@ "bootloader": "caterina", "features": { "bootmagic": true, - "mousekey": true, - "extrakey": true + "encoder": true, + "extrakey": true, + "mousekey": true }, "layout_aliases": { "LAYOUT_split_3x6_3_2": "LAYOUT_split_3x6_3" From 9de523810309b7737c42bbcd3989ff431351d2d3 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 13 Apr 2024 16:16:06 -0700 Subject: [PATCH 138/333] Data-Driven Keyboard Conversions: E (#23512) --- keyboards/eco/info.json | 10 ---------- keyboards/eco/rev1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/eco/rev1/rules.mk | 1 - keyboards/eco/rev2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/eco/rev2/rules.mk | 1 - keyboards/edi/hardlight/mk2/info.json | 11 +++++++++++ keyboards/edi/hardlight/mk2/rules.mk | 16 ---------------- keyboards/edinburgh41/info.json | 8 ++++++++ keyboards/edinburgh41/rules.mk | 14 -------------- keyboards/efreet/info.json | 7 +++++++ keyboards/efreet/rules.mk | 13 ------------- .../elephant42/{info.json => keyboard.json} | 10 ++++++++++ keyboards/elephant42/rules.mk | 15 --------------- keyboards/emery65/info.json | 6 ++++++ keyboards/emery65/rules.mk | 13 ------------- .../era/linx3/n86/{info.json => keyboard.json} | 0 keyboards/era/linx3/n86/rules.mk | 1 - .../era/linx3/n8x/{info.json => keyboard.json} | 0 keyboards/era/linx3/n8x/rules.mk | 1 - keyboards/ergodox_ez/glow/info.json | 6 ------ keyboards/ergodox_ez/glow/keyboard.json | 13 +++++++++++++ keyboards/ergodox_ez/glow/rules.mk | 1 - keyboards/ergodox_ez/rules.mk | 13 ------------- keyboards/ergodox_ez/shine/info.json | 7 +++++++ keyboards/ergodox_ez/shine/rules.mk | 1 - keyboards/ergodox_stm32/info.json | 7 +++++++ keyboards/ergodox_stm32/rules.mk | 9 +-------- keyboards/ergoslab/rev1/keyboard.json | 7 +++++++ keyboards/ergoslab/rules.mk | 13 ------------- .../ergotravel/rev1/{info.json => keyboard.json} | 7 +++++++ keyboards/ergotravel/rev1/rules.mk | 1 - keyboards/ergotravel/rules.mk | 13 ------------- keyboards/ericrlau/numdiscipline/rev1/info.json | 5 +++++ keyboards/ericrlau/numdiscipline/rev1/rules.mk | 13 ------------- .../atom47/rev2/{info.json => keyboard.json} | 6 ++++++ keyboards/evyd13/atom47/rev2/rules.mk | 3 --- .../atom47/rev3/{info.json => keyboard.json} | 6 ++++++ keyboards/evyd13/atom47/rev3/rules.mk | 1 - .../atom47/rev4/{info.json => keyboard.json} | 6 ++++++ keyboards/evyd13/atom47/rev4/rules.mk | 4 ---- .../atom47/rev5/{info.json => keyboard.json} | 6 ++++++ keyboards/evyd13/atom47/rev5/rules.mk | 1 - keyboards/evyd13/atom47/rules.mk | 13 ------------- keyboards/evyd13/eon40/info.json | 8 ++++++++ keyboards/evyd13/eon40/rules.mk | 14 -------------- keyboards/evyd13/nt660/info.json | 5 +++++ keyboards/evyd13/nt660/rules.mk | 13 ------------- keyboards/evyd13/pockettype/info.json | 5 +++++ keyboards/evyd13/pockettype/rules.mk | 13 ------------- keyboards/evyd13/wasdat_code/info.json | 7 +++++++ keyboards/evyd13/wasdat_code/rules.mk | 13 ------------- keyboards/exclusive/e85/hotswap/keyboard.json | 11 +++++++++++ keyboards/exclusive/e85/rules.mk | 14 -------------- keyboards/exclusive/e85/soldered/keyboard.json | 11 +++++++++++ 54 files changed, 180 insertions(+), 243 deletions(-) rename keyboards/eco/rev1/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/eco/rev1/rules.mk rename keyboards/eco/rev2/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/eco/rev2/rules.mk rename keyboards/elephant42/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/elephant42/rules.mk rename keyboards/era/linx3/n86/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/era/linx3/n86/rules.mk rename keyboards/era/linx3/n8x/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/era/linx3/n8x/rules.mk delete mode 100644 keyboards/ergodox_ez/glow/info.json create mode 100644 keyboards/ergodox_ez/glow/keyboard.json delete mode 100644 keyboards/ergodox_ez/glow/rules.mk rename keyboards/ergotravel/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ergotravel/rev1/rules.mk rename keyboards/evyd13/atom47/rev2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/evyd13/atom47/rev2/rules.mk rename keyboards/evyd13/atom47/rev3/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/evyd13/atom47/rev3/rules.mk rename keyboards/evyd13/atom47/rev4/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/evyd13/atom47/rev4/rules.mk rename keyboards/evyd13/atom47/rev5/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/evyd13/atom47/rev5/rules.mk diff --git a/keyboards/eco/info.json b/keyboards/eco/info.json index 74c66fdcb91..6a1b2adda1b 100644 --- a/keyboards/eco/info.json +++ b/keyboards/eco/info.json @@ -3,16 +3,6 @@ "manufacturer": "Bishop Keyboards", "url": "", "maintainer": "qmk", - "features": { - "backlight": true, - "bootmagic": false, - "command": true, - "console": false, - "extrakey": true, - "midi": true, - "mousekey": false, - "nkro": false - }, "usb": { "vid": "0x1337", "pid": "0x6006" diff --git a/keyboards/eco/rev1/info.json b/keyboards/eco/rev1/keyboard.json similarity index 93% rename from keyboards/eco/rev1/info.json rename to keyboards/eco/rev1/keyboard.json index f2a7842ce40..1b3cb5f8dfb 100644 --- a/keyboards/eco/rev1/info.json +++ b/keyboards/eco/rev1/keyboard.json @@ -7,6 +7,16 @@ "rows": ["B1", "B6", "B2", "B3"] }, "diode_direction": "COL2ROW", + "features": { + "backlight": false, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "midi": true, + "mousekey": false, + "nkro": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/eco/rev1/rules.mk b/keyboards/eco/rev1/rules.mk deleted file mode 100644 index f845616741c..00000000000 --- a/keyboards/eco/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no \ No newline at end of file diff --git a/keyboards/eco/rev2/info.json b/keyboards/eco/rev2/keyboard.json similarity index 93% rename from keyboards/eco/rev2/info.json rename to keyboards/eco/rev2/keyboard.json index 8148e78f859..8effdd85e5b 100644 --- a/keyboards/eco/rev2/info.json +++ b/keyboards/eco/rev2/keyboard.json @@ -7,6 +7,16 @@ "rows": ["D7", "B5", "B4", "E6"] }, "diode_direction": "COL2ROW", + "features": { + "backlight": false, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "midi": true, + "mousekey": false, + "nkro": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/eco/rev2/rules.mk b/keyboards/eco/rev2/rules.mk deleted file mode 100644 index f845616741c..00000000000 --- a/keyboards/eco/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no \ No newline at end of file diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json index 2be212702ac..cb337b71c89 100644 --- a/keyboards/edi/hardlight/mk2/info.json +++ b/keyboards/edi/hardlight/mk2/info.json @@ -32,6 +32,17 @@ "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "rgblight": true, + "velocikey": true, + "key_lock": true + }, "community_layouts": ["ortho_4x16"], "layouts": { "LAYOUT_ortho_4x16": { diff --git a/keyboards/edi/hardlight/mk2/rules.mk b/keyboards/edi/hardlight/mk2/rules.mk index b7b67ba5b2b..0ab54aaaf71 100644 --- a/keyboards/edi/hardlight/mk2/rules.mk +++ b/keyboards/edi/hardlight/mk2/rules.mk @@ -1,18 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -VELOCIKEY_ENABLE = yes -KEY_LOCK_ENABLE = yes - diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/info.json index 745710f92f3..374f10b2b77 100644 --- a/keyboards/edinburgh41/info.json +++ b/keyboards/edinburgh41/info.json @@ -4,6 +4,14 @@ "maintainer": "schwarzer-geiger", "bootloader": "atmel-dfu", "processor": "atmega32u4", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "pointing_device": true + }, "url": "https://github.com/schwarzer-geiger/Edinburgh41", "usb": { "device_version": "1.0.0", diff --git a/keyboards/edinburgh41/rules.mk b/keyboards/edinburgh41/rules.mk index bf33c793b6b..c76a8bf8a18 100644 --- a/keyboards/edinburgh41/rules.mk +++ b/keyboards/edinburgh41/rules.mk @@ -1,15 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = analog_joystick diff --git a/keyboards/efreet/info.json b/keyboards/efreet/info.json index b7749ed3419..4a53df1294e 100644 --- a/keyboards/efreet/info.json +++ b/keyboards/efreet/info.json @@ -20,6 +20,13 @@ }, "processor": "atmega32u2", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/efreet/rules.mk b/keyboards/efreet/rules.mk index f82a86f3e3a..09057bea54b 100644 --- a/keyboards/efreet/rules.mk +++ b/keyboards/efreet/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 = yes # 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/elephant42/info.json b/keyboards/elephant42/keyboard.json similarity index 95% rename from keyboards/elephant42/info.json rename to keyboards/elephant42/keyboard.json index eb53fda96d8..e71f1438130 100644 --- a/keyboards/elephant42/info.json +++ b/keyboards/elephant42/keyboard.json @@ -54,6 +54,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "oled": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/elephant42/rules.mk b/keyboards/elephant42/rules.mk deleted file mode 100644 index 9091c741718..00000000000 --- a/keyboards/elephant42/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 = 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 -RGB_MATRIX_ENABLE = yes -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/emery65/info.json b/keyboards/emery65/info.json index 74d06b52ad6..c80bcf80425 100644 --- a/keyboards/emery65/info.json +++ b/keyboards/emery65/info.json @@ -19,6 +19,12 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs" }, diff --git a/keyboards/emery65/rules.mk b/keyboards/emery65/rules.mk index 7c0709f41e6..0ab54aaaf71 100644 --- a/keyboards/emery65/rules.mk +++ b/keyboards/emery65/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 diff --git a/keyboards/era/linx3/n86/info.json b/keyboards/era/linx3/n86/keyboard.json similarity index 100% rename from keyboards/era/linx3/n86/info.json rename to keyboards/era/linx3/n86/keyboard.json diff --git a/keyboards/era/linx3/n86/rules.mk b/keyboards/era/linx3/n86/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/era/linx3/n86/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/info.json b/keyboards/era/linx3/n8x/keyboard.json similarity index 100% rename from keyboards/era/linx3/n8x/info.json rename to keyboards/era/linx3/n8x/keyboard.json diff --git a/keyboards/era/linx3/n8x/rules.mk b/keyboards/era/linx3/n8x/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/era/linx3/n8x/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/ergodox_ez/glow/info.json b/keyboards/ergodox_ez/glow/info.json deleted file mode 100644 index dcbb1999ca9..00000000000 --- a/keyboards/ergodox_ez/glow/info.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "keyboard_name": "ErgoDox EZ Glow", - "usb": { - "pid": "0x4976" - } -} diff --git a/keyboards/ergodox_ez/glow/keyboard.json b/keyboards/ergodox_ez/glow/keyboard.json new file mode 100644 index 00000000000..43f0ee0b490 --- /dev/null +++ b/keyboards/ergodox_ez/glow/keyboard.json @@ -0,0 +1,13 @@ +{ + "keyboard_name": "ErgoDox EZ Glow", + "usb": { + "pid": "0x4976" + }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + } +} diff --git a/keyboards/ergodox_ez/glow/rules.mk b/keyboards/ergodox_ez/glow/rules.mk deleted file mode 100644 index aad92997d0f..00000000000 --- a/keyboards/ergodox_ez/glow/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk index 68f785f3cc0..187d9dd8e2e 100644 --- a/keyboards/ergodox_ez/rules.mk +++ b/keyboards/ergodox_ez/rules.mk @@ -3,20 +3,7 @@ # details), include the following define: # OPT_DEFS += -DLEFT_LEDS -# 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 CUSTOM_MATRIX = lite # Custom matrix file for the ErgoDox EZ -NKRO_ENABLE = yes # Enable N-Key Rollover -UNICODE_ENABLE = no # Unicode -SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard - -RGB_MATRIX_ENABLE = no # enable later # project specific files SRC += matrix.c diff --git a/keyboards/ergodox_ez/shine/info.json b/keyboards/ergodox_ez/shine/info.json index 181ac52e6ce..bc0f218d7ec 100644 --- a/keyboards/ergodox_ez/shine/info.json +++ b/keyboards/ergodox_ez/shine/info.json @@ -5,5 +5,12 @@ }, "rgblight": { "driver": "custom" + }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true } } diff --git a/keyboards/ergodox_ez/shine/rules.mk b/keyboards/ergodox_ez/shine/rules.mk index 4ab494d1aae..827f58bd6ae 100644 --- a/keyboards/ergodox_ez/shine/rules.mk +++ b/keyboards/ergodox_ez/shine/rules.mk @@ -1,3 +1,2 @@ -RGBLIGHT_ENABLE = yes WS2812_DRIVER_REQUIRED = yes SRC += rgblight_custom.c diff --git a/keyboards/ergodox_stm32/info.json b/keyboards/ergodox_stm32/info.json index 305adc9e125..24e90ad7d71 100644 --- a/keyboards/ergodox_stm32/info.json +++ b/keyboards/ergodox_stm32/info.json @@ -8,6 +8,13 @@ "pid": "0x1308", "device_version": "1.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "unicode": true + }, "layouts": { "LAYOUT_ergodox": { "layout": [ diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk index 5481eef1a2e..21b474509d6 100644 --- a/keyboards/ergodox_stm32/rules.mk +++ b/keyboards/ergodox_stm32/rules.mk @@ -6,14 +6,7 @@ BOARD = ST_NUCLEO64_F103RB # Bootloader selection BOOTLOADER = custom -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 -CUSTOM_MATRIX = yes # Custom matrix file -UNICODE_ENABLE = yes # Unicode +CUSTOM_MATRIX = yes SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/ergoslab/rev1/keyboard.json b/keyboards/ergoslab/rev1/keyboard.json index 82e4b41b6df..ef40c1d960d 100644 --- a/keyboards/ergoslab/rev1/keyboard.json +++ b/keyboards/ergoslab/rev1/keyboard.json @@ -25,6 +25,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "rgblight": true + }, "layout_aliases": { "LAYOUT_ergoslab": "LAYOUT" }, diff --git a/keyboards/ergoslab/rules.mk b/keyboards/ergoslab/rules.mk index 5255b41b06f..8eb40c77d5a 100644 --- a/keyboards/ergoslab/rules.mk +++ b/keyboards/ergoslab/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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = ergoslab/rev1 diff --git a/keyboards/ergotravel/rev1/info.json b/keyboards/ergotravel/rev1/keyboard.json similarity index 96% rename from keyboards/ergotravel/rev1/info.json rename to keyboards/ergotravel/rev1/keyboard.json index 43d3d01a925..14c645d2f0c 100644 --- a/keyboards/ergotravel/rev1/info.json +++ b/keyboards/ergotravel/rev1/keyboard.json @@ -25,6 +25,13 @@ }, "bootloader": "caterina", "processor": "atmega32u4", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ergotravel/rev1/rules.mk b/keyboards/ergotravel/rev1/rules.mk deleted file mode 100644 index 7b30c0beff2..00000000000 --- a/keyboards/ergotravel/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no diff --git a/keyboards/ergotravel/rules.mk b/keyboards/ergotravel/rules.mk index f52203f7059..3f30277bb56 100644 --- a/keyboards/ergotravel/rules.mk +++ b/keyboards/ergotravel/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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = ergotravel/rev1 diff --git a/keyboards/ericrlau/numdiscipline/rev1/info.json b/keyboards/ericrlau/numdiscipline/rev1/info.json index 36a39c1abe2..6fd9c377f68 100644 --- a/keyboards/ericrlau/numdiscipline/rev1/info.json +++ b/keyboards/ericrlau/numdiscipline/rev1/info.json @@ -16,6 +16,11 @@ "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ericrlau/numdiscipline/rev1/rules.mk b/keyboards/ericrlau/numdiscipline/rev1/rules.mk index 18550f0a64d..c2ee0bc86f9 100644 --- a/keyboards/ericrlau/numdiscipline/rev1/rules.mk +++ b/keyboards/ericrlau/numdiscipline/rev1/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/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/keyboard.json similarity index 96% rename from keyboards/evyd13/atom47/rev2/info.json rename to keyboards/evyd13/atom47/rev2/keyboard.json index 8c5720d0c48..62927b70a36 100644 --- a/keyboards/evyd13/atom47/rev2/info.json +++ b/keyboards/evyd13/atom47/rev2/keyboard.json @@ -34,6 +34,12 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "backlight": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_split_space" }, diff --git a/keyboards/evyd13/atom47/rev2/rules.mk b/keyboards/evyd13/atom47/rev2/rules.mk deleted file mode 100644 index 104711e4206..00000000000 --- a/keyboards/evyd13/atom47/rev2/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# Build Options -RGBLIGHT_ENABLE = no -BACKLIGHT_ENABLE = yes diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/keyboard.json similarity index 98% rename from keyboards/evyd13/atom47/rev3/info.json rename to keyboards/evyd13/atom47/rev3/keyboard.json index fc4046d3fc3..009c3ef5345 100644 --- a/keyboards/evyd13/atom47/rev3/info.json +++ b/keyboards/evyd13/atom47/rev3/keyboard.json @@ -47,6 +47,12 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "backlight": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_split_space" }, diff --git a/keyboards/evyd13/atom47/rev3/rules.mk b/keyboards/evyd13/atom47/rev3/rules.mk deleted file mode 100644 index 54a2685bf63..00000000000 --- a/keyboards/evyd13/atom47/rev3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = yes \ No newline at end of file diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/keyboard.json similarity index 97% rename from keyboards/evyd13/atom47/rev4/info.json rename to keyboards/evyd13/atom47/rev4/keyboard.json index b2b4bf9ef23..cea416e1a68 100644 --- a/keyboards/evyd13/atom47/rev4/info.json +++ b/keyboards/evyd13/atom47/rev4/keyboard.json @@ -29,6 +29,12 @@ }, "processor": "atmega32u2", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "encoder": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_split_space" }, diff --git a/keyboards/evyd13/atom47/rev4/rules.mk b/keyboards/evyd13/atom47/rev4/rules.mk deleted file mode 100644 index 1eb7c8bd08b..00000000000 --- a/keyboards/evyd13/atom47/rev4/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -ENCODER_ENABLE = yes -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no \ No newline at end of file diff --git a/keyboards/evyd13/atom47/rev5/info.json b/keyboards/evyd13/atom47/rev5/keyboard.json similarity index 97% rename from keyboards/evyd13/atom47/rev5/info.json rename to keyboards/evyd13/atom47/rev5/keyboard.json index e82a7797dee..c002dcb18c0 100644 --- a/keyboards/evyd13/atom47/rev5/info.json +++ b/keyboards/evyd13/atom47/rev5/keyboard.json @@ -49,6 +49,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_split_space" }, diff --git a/keyboards/evyd13/atom47/rev5/rules.mk b/keyboards/evyd13/atom47/rev5/rules.mk deleted file mode 100644 index aad92997d0f..00000000000 --- a/keyboards/evyd13/atom47/rev5/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/evyd13/atom47/rules.mk b/keyboards/evyd13/atom47/rules.mk index ab8264de7c2..9d5b7530777 100644 --- a/keyboards/evyd13/atom47/rules.mk +++ b/keyboards/evyd13/atom47/rules.mk @@ -1,14 +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 - DEFAULT_FOLDER = evyd13/atom47/rev4 diff --git a/keyboards/evyd13/eon40/info.json b/keyboards/evyd13/eon40/info.json index ce989e1d2a5..59511f117c0 100644 --- a/keyboards/evyd13/eon40/info.json +++ b/keyboards/evyd13/eon40/info.json @@ -26,6 +26,14 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "encoder": true + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/evyd13/eon40/rules.mk b/keyboards/evyd13/eon40/rules.mk index ece680a57a3..16051206467 100644 --- a/keyboards/evyd13/eon40/rules.mk +++ b/keyboards/evyd13/eon40/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 = 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 -ENCODER_ENABLE = yes - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/evyd13/nt660/info.json b/keyboards/evyd13/nt660/info.json index c222aba7005..ea51efaa300 100644 --- a/keyboards/evyd13/nt660/info.json +++ b/keyboards/evyd13/nt660/info.json @@ -23,6 +23,11 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true + }, "community_layouts": ["66_ansi", "66_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/evyd13/nt660/rules.mk b/keyboards/evyd13/nt660/rules.mk index f8c29ddc982..16051206467 100644 --- a/keyboards/evyd13/nt660/rules.mk +++ b/keyboards/evyd13/nt660/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 = 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 - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/evyd13/pockettype/info.json b/keyboards/evyd13/pockettype/info.json index eda670af118..bcca3dc9364 100644 --- a/keyboards/evyd13/pockettype/info.json +++ b/keyboards/evyd13/pockettype/info.json @@ -15,6 +15,11 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true + }, "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/evyd13/pockettype/rules.mk b/keyboards/evyd13/pockettype/rules.mk index f8c29ddc982..16051206467 100644 --- a/keyboards/evyd13/pockettype/rules.mk +++ b/keyboards/evyd13/pockettype/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 = 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 - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json index 9fb14283ae9..8c1bb52b6bf 100644 --- a/keyboards/evyd13/wasdat_code/info.json +++ b/keyboards/evyd13/wasdat_code/info.json @@ -32,6 +32,13 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "backlight": true + }, "community_layouts": ["fullsize_ansi", "fullsize_iso", "tkl_ansi", "tkl_iso"], "layout_aliases": { "LAYOUT_all": "LAYOUT_fullsize_iso" diff --git a/keyboards/evyd13/wasdat_code/rules.mk b/keyboards/evyd13/wasdat_code/rules.mk index 00967d18474..6beea3e392f 100644 --- a/keyboards/evyd13/wasdat_code/rules.mk +++ b/keyboards/evyd13/wasdat_code/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 = 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 - CUSTOM_MATRIX = lite VPATH += drivers/gpio SRC += matrix.c sn74x138.c diff --git a/keyboards/exclusive/e85/hotswap/keyboard.json b/keyboards/exclusive/e85/hotswap/keyboard.json index 779a717ec55..c64509496aa 100644 --- a/keyboards/exclusive/e85/hotswap/keyboard.json +++ b/keyboards/exclusive/e85/hotswap/keyboard.json @@ -41,6 +41,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_ansi_standard": { "layout": [ diff --git a/keyboards/exclusive/e85/rules.mk b/keyboards/exclusive/e85/rules.mk index 4251159d944..8eef46d0ab4 100644 --- a/keyboards/exclusive/e85/rules.mk +++ b/keyboards/exclusive/e85/rules.mk @@ -1,15 +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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - DEFAULT_FOLDER = exclusive/e85/hotswap diff --git a/keyboards/exclusive/e85/soldered/keyboard.json b/keyboards/exclusive/e85/soldered/keyboard.json index d34440389a6..5f7458e851b 100644 --- a/keyboards/exclusive/e85/soldered/keyboard.json +++ b/keyboards/exclusive/e85/soldered/keyboard.json @@ -41,6 +41,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_all": { "layout": [ From 1a831a01b7d2dd1f9746d3aac7280eedc0012f90 Mon Sep 17 00:00:00 2001 From: Logan Foster <44828794+Lrfoster03@users.noreply.github.com> Date: Sat, 13 Apr 2024 22:12:14 -0700 Subject: [PATCH 139/333] Adjusted Compensator on-state and keymaps (#23509) --- keyboards/compensator/info.json | 3 +-- keyboards/compensator/keymaps/default/keymap.c | 2 +- keyboards/compensator/keymaps/via/keymap.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/keyboards/compensator/info.json b/keyboards/compensator/info.json index ceaa1763338..fbba0d750e8 100644 --- a/keyboards/compensator/info.json +++ b/keyboards/compensator/info.json @@ -28,8 +28,7 @@ "layer_count": 3 }, "indicators": { - "caps_lock": "E6", - "on_state": 0 + "caps_lock": "E6" }, "layouts": { "LAYOUT": { diff --git a/keyboards/compensator/keymaps/default/keymap.c b/keyboards/compensator/keymaps/default/keymap.c index 5e39c20e72f..0bdf18496a8 100644 --- a/keyboards/compensator/keymaps/default/keymap.c +++ b/keyboards/compensator/keymaps/default/keymap.c @@ -21,7 +21,7 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* Base -> XT:Num:Nav:Alphas:Nav:Num:Xt*/ - KC_F1, KC_F2, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_INS, KC_HOME, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_F1, KC_F2, + KC_F1, KC_F2, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_F1, KC_F2, KC_F3, KC_F4, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_F3, KC_F4, KC_F5, KC_F6, KC_PENT, KC_P1, KC_P2, KC_P3, KC_NO, KC_UP, KC_NO, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_NO, KC_UP, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_F5, KC_F6, KC_F7, KC_F8, KC_PMNS, KC_PDOT, KC_P0, KC_P00, KC_LEFT, KC_DOWN, KC_RIGHT, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P00, KC_P0, KC_PDOT, KC_PMNS, KC_F7, KC_F8 diff --git a/keyboards/compensator/keymaps/via/keymap.c b/keyboards/compensator/keymaps/via/keymap.c index d9124a96aff..a7285b32577 100644 --- a/keyboards/compensator/keymaps/via/keymap.c +++ b/keyboards/compensator/keymaps/via/keymap.c @@ -21,7 +21,7 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* Base -> XT:Num:Nav:Alphas:Nav:Num:Xt*/ - KC_F1, KC_F2, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_INS, KC_HOME, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_F1, KC_F2, + KC_F1, KC_F2, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_F1, KC_F2, KC_F3, KC_F4, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_F3, KC_F4, KC_F5, KC_F6, KC_PENT, KC_P1, KC_P2, KC_P3, KC_NO, KC_UP, KC_NO, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_NO, KC_UP, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_F5, KC_F6, KC_F7, KC_F8, KC_PMNS, KC_PDOT, KC_P0, KC_P00, KC_LEFT, KC_DOWN, KC_RIGHT, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P00, KC_P0, KC_PDOT, KC_PMNS, KC_F7, KC_F8 From 9baafef968ea4b1439ed9cb58479e66eec1f80d7 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Sun, 14 Apr 2024 09:00:19 -0400 Subject: [PATCH 140/333] Swap PID and VID on is0gr in QMK (#23458) --- keyboards/cannonkeys/is0gr/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/info.json index 49aaaddd525..3f5e92a99c9 100644 --- a/keyboards/cannonkeys/is0gr/info.json +++ b/keyboards/cannonkeys/is0gr/info.json @@ -18,8 +18,8 @@ "url": "https://cannonkeys.com", "usb": { "device_version": "0.0.1", - "pid": "0x0028", - "vid": "0xCA04" + "pid": "0xCA04", + "vid": "0x0028" }, "community_layouts": ["ortho_1x1"], "layouts": { From 22b3cf4e9102aa6d746f9ac2b5ee5b529e884010 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 14 Apr 2024 18:28:15 +0100 Subject: [PATCH 141/333] Migrate build target markers to keyboard.json - DE (#23515) --- .../dasky/reverb/{info.json => keyboard.json} | 0 .../dc01/arrow/{info.json => keyboard.json} | 0 .../dc01/left/{info.json => keyboard.json} | 0 .../dc01/numpad/{info.json => keyboard.json} | 0 .../dc01/right/{info.json => keyboard.json} | 0 .../redherring/{info.json => keyboard.json} | 0 .../deng/thirty/{info.json => keyboard.json} | 0 .../dichotomy/{info.json => keyboard.json} | 0 .../plaid/{info.json => keyboard.json} | 0 .../tartan/{info.json => keyboard.json} | 0 .../kb16/rev1/{info.json => keyboard.json} | 0 .../kb16/rev2/{info.json => keyboard.json} | 0 .../doio/kb38/{info.json => keyboard.json} | 0 keyboards/dp60/{info.json => keyboard.json} | 0 keyboards/draytronics/scarlet/config.h | 37 ------------------ .../scarlet/{info.json => keyboard.json} | 6 +++ .../drop/alt/v2/{info.json => keyboard.json} | 0 .../drop/cstm65/{info.json => keyboard.json} | 0 .../drop/cstm80/{info.json => keyboard.json} | 0 .../drop/ctrl/v2/{info.json => keyboard.json} | 0 .../drop/sense75/{info.json => keyboard.json} | 0 .../shift/v2/{info.json => keyboard.json} | 0 .../v2/{info.json => keyboard.json} | 0 .../duck/jetfire/{info.json => keyboard.json} | 0 .../lightsaver/{info.json => keyboard.json} | 0 .../octagon/v1/{info.json => keyboard.json} | 0 .../octagon/v2/{info.json => keyboard.json} | 0 .../orion/v3/{info.json => keyboard.json} | 0 .../duck/tcv3/{info.json => keyboard.json} | 0 .../1861st/{info.json => keyboard.json} | 0 .../1967st/{info.json => keyboard.json} | 0 .../k310/base/{info.json => keyboard.json} | 0 .../dz60rgb/v2_1/{info.json => keyboard.json} | 0 .../v2_1/{info.json => keyboard.json} | 0 .../v2_1/{info.json => keyboard.json} | 0 .../dz65rgb/v3/{info.json => keyboard.json} | 0 keyboards/edi/hardlight/mk1/config.h | 28 ------------- keyboards/edi/hardlight/mk1/keyboard.json | 6 +++ keyboards/edi/hardlight/mk2/config.h | 5 --- .../mk2/{info.json => keyboard.json} | 6 +++ .../edinburgh41/{info.json => keyboard.json} | 0 keyboards/efreet/config.h | 39 ------------------- keyboards/efreet/{info.json => keyboard.json} | 6 +++ .../elcantorhs/{info.json => keyboard.json} | 0 .../emery65/{info.json => keyboard.json} | 0 .../shine/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 4 +- keyboards/ergodox_stm32/rules.mk | 6 +-- .../ericrlau/numdiscipline/rev1/config.h | 39 ------------------- .../rev1/{info.json => keyboard.json} | 6 +++ keyboards/evyd13/eon40/config.h | 38 ------------------ .../evyd13/eon40/{info.json => keyboard.json} | 6 +++ keyboards/evyd13/nt660/config.h | 39 ------------------- .../evyd13/nt660/{info.json => keyboard.json} | 6 +++ keyboards/evyd13/pockettype/config.h | 38 ------------------ .../pockettype/{info.json => keyboard.json} | 6 +++ .../wasdat/{info.json => keyboard.json} | 0 .../wasdat_code/{info.json => keyboard.json} | 0 .../teensy_32/{info.json => keyboard.json} | 0 .../teensy_lc/{info.json => keyboard.json} | 0 60 files changed, 52 insertions(+), 269 deletions(-) rename keyboards/dasky/reverb/{info.json => keyboard.json} (100%) rename keyboards/dc01/arrow/{info.json => keyboard.json} (100%) rename keyboards/dc01/left/{info.json => keyboard.json} (100%) rename keyboards/dc01/numpad/{info.json => keyboard.json} (100%) rename keyboards/dc01/right/{info.json => keyboard.json} (100%) rename keyboards/dcpedit/redherring/{info.json => keyboard.json} (100%) rename keyboards/deng/thirty/{info.json => keyboard.json} (100%) rename keyboards/dichotomy/{info.json => keyboard.json} (100%) rename keyboards/dm9records/plaid/{info.json => keyboard.json} (100%) rename keyboards/dm9records/tartan/{info.json => keyboard.json} (100%) rename keyboards/doio/kb16/rev1/{info.json => keyboard.json} (100%) rename keyboards/doio/kb16/rev2/{info.json => keyboard.json} (100%) rename keyboards/doio/kb38/{info.json => keyboard.json} (100%) rename keyboards/dp60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/draytronics/scarlet/config.h rename keyboards/draytronics/scarlet/{info.json => keyboard.json} (93%) rename keyboards/drop/alt/v2/{info.json => keyboard.json} (100%) rename keyboards/drop/cstm65/{info.json => keyboard.json} (100%) rename keyboards/drop/cstm80/{info.json => keyboard.json} (100%) rename keyboards/drop/ctrl/v2/{info.json => keyboard.json} (100%) rename keyboards/drop/sense75/{info.json => keyboard.json} (100%) rename keyboards/drop/shift/v2/{info.json => keyboard.json} (100%) rename keyboards/duck/eagle_viper/v2/{info.json => keyboard.json} (100%) rename keyboards/duck/jetfire/{info.json => keyboard.json} (100%) rename keyboards/duck/lightsaver/{info.json => keyboard.json} (100%) rename keyboards/duck/octagon/v1/{info.json => keyboard.json} (100%) rename keyboards/duck/octagon/v2/{info.json => keyboard.json} (100%) rename keyboards/duck/orion/v3/{info.json => keyboard.json} (100%) rename keyboards/duck/tcv3/{info.json => keyboard.json} (100%) rename keyboards/ducky/one2mini/1861st/{info.json => keyboard.json} (100%) rename keyboards/ducky/one2sf/1967st/{info.json => keyboard.json} (100%) rename keyboards/durgod/k310/base/{info.json => keyboard.json} (100%) rename keyboards/dztech/dz60rgb/v2_1/{info.json => keyboard.json} (100%) rename keyboards/dztech/dz60rgb_ansi/v2_1/{info.json => keyboard.json} (100%) rename keyboards/dztech/dz60rgb_wkl/v2_1/{info.json => keyboard.json} (100%) rename keyboards/dztech/dz65rgb/v3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/edi/hardlight/mk1/config.h rename keyboards/edi/hardlight/mk2/{info.json => keyboard.json} (97%) rename keyboards/edinburgh41/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/efreet/config.h rename keyboards/efreet/{info.json => keyboard.json} (98%) rename keyboards/elcantorhs/{info.json => keyboard.json} (100%) rename keyboards/emery65/{info.json => keyboard.json} (100%) rename keyboards/ergodox_ez/shine/{info.json => keyboard.json} (100%) rename keyboards/ergodox_stm32/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/ericrlau/numdiscipline/rev1/config.h rename keyboards/ericrlau/numdiscipline/rev1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/evyd13/eon40/config.h rename keyboards/evyd13/eon40/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/evyd13/nt660/config.h rename keyboards/evyd13/nt660/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/evyd13/pockettype/config.h rename keyboards/evyd13/pockettype/{info.json => keyboard.json} (97%) rename keyboards/evyd13/wasdat/{info.json => keyboard.json} (100%) rename keyboards/evyd13/wasdat_code/{info.json => keyboard.json} (100%) rename keyboards/ez_maker/directpins/teensy_32/{info.json => keyboard.json} (100%) rename keyboards/ez_maker/directpins/teensy_lc/{info.json => keyboard.json} (100%) diff --git a/keyboards/dasky/reverb/info.json b/keyboards/dasky/reverb/keyboard.json similarity index 100% rename from keyboards/dasky/reverb/info.json rename to keyboards/dasky/reverb/keyboard.json diff --git a/keyboards/dc01/arrow/info.json b/keyboards/dc01/arrow/keyboard.json similarity index 100% rename from keyboards/dc01/arrow/info.json rename to keyboards/dc01/arrow/keyboard.json diff --git a/keyboards/dc01/left/info.json b/keyboards/dc01/left/keyboard.json similarity index 100% rename from keyboards/dc01/left/info.json rename to keyboards/dc01/left/keyboard.json diff --git a/keyboards/dc01/numpad/info.json b/keyboards/dc01/numpad/keyboard.json similarity index 100% rename from keyboards/dc01/numpad/info.json rename to keyboards/dc01/numpad/keyboard.json diff --git a/keyboards/dc01/right/info.json b/keyboards/dc01/right/keyboard.json similarity index 100% rename from keyboards/dc01/right/info.json rename to keyboards/dc01/right/keyboard.json diff --git a/keyboards/dcpedit/redherring/info.json b/keyboards/dcpedit/redherring/keyboard.json similarity index 100% rename from keyboards/dcpedit/redherring/info.json rename to keyboards/dcpedit/redherring/keyboard.json diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/keyboard.json similarity index 100% rename from keyboards/deng/thirty/info.json rename to keyboards/deng/thirty/keyboard.json diff --git a/keyboards/dichotomy/info.json b/keyboards/dichotomy/keyboard.json similarity index 100% rename from keyboards/dichotomy/info.json rename to keyboards/dichotomy/keyboard.json diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/keyboard.json similarity index 100% rename from keyboards/dm9records/plaid/info.json rename to keyboards/dm9records/plaid/keyboard.json diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/keyboard.json similarity index 100% rename from keyboards/dm9records/tartan/info.json rename to keyboards/dm9records/tartan/keyboard.json diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/keyboard.json similarity index 100% rename from keyboards/doio/kb16/rev1/info.json rename to keyboards/doio/kb16/rev1/keyboard.json diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/keyboard.json similarity index 100% rename from keyboards/doio/kb16/rev2/info.json rename to keyboards/doio/kb16/rev2/keyboard.json diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/keyboard.json similarity index 100% rename from keyboards/doio/kb38/info.json rename to keyboards/doio/kb38/keyboard.json diff --git a/keyboards/dp60/info.json b/keyboards/dp60/keyboard.json similarity index 100% rename from keyboards/dp60/info.json rename to keyboards/dp60/keyboard.json diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h deleted file mode 100644 index 4ae200c6a66..00000000000 --- a/keyboards/draytronics/scarlet/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/*Copyright 2020 Blake Drayson / Draytronics - -Contact info@draytronics.co.uk - -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/draytronics/scarlet/info.json b/keyboards/draytronics/scarlet/keyboard.json similarity index 93% rename from keyboards/draytronics/scarlet/info.json rename to keyboards/draytronics/scarlet/keyboard.json index b70c7bfae65..0eabd378da2 100644 --- a/keyboards/draytronics/scarlet/info.json +++ b/keyboards/draytronics/scarlet/keyboard.json @@ -20,6 +20,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/drop/alt/v2/info.json b/keyboards/drop/alt/v2/keyboard.json similarity index 100% rename from keyboards/drop/alt/v2/info.json rename to keyboards/drop/alt/v2/keyboard.json diff --git a/keyboards/drop/cstm65/info.json b/keyboards/drop/cstm65/keyboard.json similarity index 100% rename from keyboards/drop/cstm65/info.json rename to keyboards/drop/cstm65/keyboard.json diff --git a/keyboards/drop/cstm80/info.json b/keyboards/drop/cstm80/keyboard.json similarity index 100% rename from keyboards/drop/cstm80/info.json rename to keyboards/drop/cstm80/keyboard.json diff --git a/keyboards/drop/ctrl/v2/info.json b/keyboards/drop/ctrl/v2/keyboard.json similarity index 100% rename from keyboards/drop/ctrl/v2/info.json rename to keyboards/drop/ctrl/v2/keyboard.json diff --git a/keyboards/drop/sense75/info.json b/keyboards/drop/sense75/keyboard.json similarity index 100% rename from keyboards/drop/sense75/info.json rename to keyboards/drop/sense75/keyboard.json diff --git a/keyboards/drop/shift/v2/info.json b/keyboards/drop/shift/v2/keyboard.json similarity index 100% rename from keyboards/drop/shift/v2/info.json rename to keyboards/drop/shift/v2/keyboard.json diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/keyboard.json similarity index 100% rename from keyboards/duck/eagle_viper/v2/info.json rename to keyboards/duck/eagle_viper/v2/keyboard.json diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/keyboard.json similarity index 100% rename from keyboards/duck/jetfire/info.json rename to keyboards/duck/jetfire/keyboard.json diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/keyboard.json similarity index 100% rename from keyboards/duck/lightsaver/info.json rename to keyboards/duck/lightsaver/keyboard.json diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/keyboard.json similarity index 100% rename from keyboards/duck/octagon/v1/info.json rename to keyboards/duck/octagon/v1/keyboard.json diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/keyboard.json similarity index 100% rename from keyboards/duck/octagon/v2/info.json rename to keyboards/duck/octagon/v2/keyboard.json diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/keyboard.json similarity index 100% rename from keyboards/duck/orion/v3/info.json rename to keyboards/duck/orion/v3/keyboard.json diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/keyboard.json similarity index 100% rename from keyboards/duck/tcv3/info.json rename to keyboards/duck/tcv3/keyboard.json diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/keyboard.json similarity index 100% rename from keyboards/ducky/one2mini/1861st/info.json rename to keyboards/ducky/one2mini/1861st/keyboard.json diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/keyboard.json similarity index 100% rename from keyboards/ducky/one2sf/1967st/info.json rename to keyboards/ducky/one2sf/1967st/keyboard.json diff --git a/keyboards/durgod/k310/base/info.json b/keyboards/durgod/k310/base/keyboard.json similarity index 100% rename from keyboards/durgod/k310/base/info.json rename to keyboards/durgod/k310/base/keyboard.json diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/keyboard.json similarity index 100% rename from keyboards/dztech/dz60rgb/v2_1/info.json rename to keyboards/dztech/dz60rgb/v2_1/keyboard.json diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/keyboard.json similarity index 100% rename from keyboards/dztech/dz60rgb_ansi/v2_1/info.json rename to keyboards/dztech/dz60rgb_ansi/v2_1/keyboard.json diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/keyboard.json similarity index 100% rename from keyboards/dztech/dz60rgb_wkl/v2_1/info.json rename to keyboards/dztech/dz60rgb_wkl/v2_1/keyboard.json diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/keyboard.json similarity index 100% rename from keyboards/dztech/dz65rgb/v3/info.json rename to keyboards/dztech/dz65rgb/v3/keyboard.json diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h deleted file mode 100644 index 89b008296bc..00000000000 --- a/keyboards/edi/hardlight/mk1/config.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -©2021 Everywhere Defense Industries / Fate Everywhere - -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 - -/* - * Enable Audio Subsystem with two voices - */ -// #define AUDIO_PIN C6 diff --git a/keyboards/edi/hardlight/mk1/keyboard.json b/keyboards/edi/hardlight/mk1/keyboard.json index 7f33c262278..3cb07cb2f18 100644 --- a/keyboards/edi/hardlight/mk1/keyboard.json +++ b/keyboards/edi/hardlight/mk1/keyboard.json @@ -16,6 +16,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5"], "rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"] diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h index 52636c6484e..bd604db6846 100644 --- a/keyboards/edi/hardlight/mk2/config.h +++ b/keyboards/edi/hardlight/mk2/config.h @@ -17,11 +17,6 @@ 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 RGBLIGHT_EFFECT_KNIGHT_LENGTH 5 /* PWM RGB Underglow Defines */ diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/keyboard.json similarity index 97% rename from keyboards/edi/hardlight/mk2/info.json rename to keyboards/edi/hardlight/mk2/keyboard.json index cb337b71c89..a1f47aabf5a 100644 --- a/keyboards/edi/hardlight/mk2/info.json +++ b/keyboards/edi/hardlight/mk2/keyboard.json @@ -43,6 +43,12 @@ "velocikey": true, "key_lock": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x16"], "layouts": { "LAYOUT_ortho_4x16": { diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/keyboard.json similarity index 100% rename from keyboards/edinburgh41/info.json rename to keyboards/edinburgh41/keyboard.json diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h deleted file mode 100644 index 46a265902c4..00000000000 --- a/keyboards/efreet/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Amber Holly - -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/efreet/info.json b/keyboards/efreet/keyboard.json similarity index 98% rename from keyboards/efreet/info.json rename to keyboards/efreet/keyboard.json index 4a53df1294e..7dac78cc397 100644 --- a/keyboards/efreet/info.json +++ b/keyboards/efreet/keyboard.json @@ -27,6 +27,12 @@ "nkro": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/keyboard.json similarity index 100% rename from keyboards/elcantorhs/info.json rename to keyboards/elcantorhs/keyboard.json diff --git a/keyboards/emery65/info.json b/keyboards/emery65/keyboard.json similarity index 100% rename from keyboards/emery65/info.json rename to keyboards/emery65/keyboard.json diff --git a/keyboards/ergodox_ez/shine/info.json b/keyboards/ergodox_ez/shine/keyboard.json similarity index 100% rename from keyboards/ergodox_ez/shine/info.json rename to keyboards/ergodox_ez/shine/keyboard.json diff --git a/keyboards/ergodox_stm32/info.json b/keyboards/ergodox_stm32/keyboard.json similarity index 99% rename from keyboards/ergodox_stm32/info.json rename to keyboards/ergodox_stm32/keyboard.json index 24e90ad7d71..9315a3971f5 100644 --- a/keyboards/ergodox_stm32/info.json +++ b/keyboards/ergodox_stm32/keyboard.json @@ -15,7 +15,9 @@ "nkro": true, "unicode": true }, -"layouts": { + "processor": "STM32F103", + "bootloader": "custom", + "layouts": { "LAYOUT_ergodox": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5}, diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk index 21b474509d6..a4e9df8c6a9 100644 --- a/keyboards/ergodox_stm32/rules.mk +++ b/keyboards/ergodox_stm32/rules.mk @@ -1,11 +1,7 @@ -# MCU name -MCU = STM32F103 +# custom bootloader MCU_LDSCRIPT = stm32f103_bootloader BOARD = ST_NUCLEO64_F103RB -# Bootloader selection -BOOTLOADER = custom - CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h deleted file mode 100644 index 055e8afe380..00000000000 --- a/keyboards/ericrlau/numdiscipline/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Eric Lau - -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/ericrlau/numdiscipline/rev1/info.json b/keyboards/ericrlau/numdiscipline/rev1/keyboard.json similarity index 99% rename from keyboards/ericrlau/numdiscipline/rev1/info.json rename to keyboards/ericrlau/numdiscipline/rev1/keyboard.json index 6fd9c377f68..5e9f3937324 100644 --- a/keyboards/ericrlau/numdiscipline/rev1/info.json +++ b/keyboards/ericrlau/numdiscipline/rev1/keyboard.json @@ -21,6 +21,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/eon40/config.h b/keyboards/evyd13/eon40/config.h deleted file mode 100644 index 230ff5e311e..00000000000 --- a/keyboards/evyd13/eon40/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/evyd13/eon40/info.json b/keyboards/evyd13/eon40/keyboard.json similarity index 98% rename from keyboards/evyd13/eon40/info.json rename to keyboards/evyd13/eon40/keyboard.json index 59511f117c0..e957b109ff2 100644 --- a/keyboards/evyd13/eon40/info.json +++ b/keyboards/evyd13/eon40/keyboard.json @@ -34,6 +34,12 @@ "command": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h deleted file mode 100644 index f64827d05f1..00000000000 --- a/keyboards/evyd13/nt660/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Evy Dekkers - -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/evyd13/nt660/info.json b/keyboards/evyd13/nt660/keyboard.json similarity index 99% rename from keyboards/evyd13/nt660/info.json rename to keyboards/evyd13/nt660/keyboard.json index ea51efaa300..142e9f2920d 100644 --- a/keyboards/evyd13/nt660/info.json +++ b/keyboards/evyd13/nt660/keyboard.json @@ -28,6 +28,12 @@ "mousekey": false, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["66_ansi", "66_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/evyd13/pockettype/config.h b/keyboards/evyd13/pockettype/config.h deleted file mode 100644 index 230ff5e311e..00000000000 --- a/keyboards/evyd13/pockettype/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/evyd13/pockettype/info.json b/keyboards/evyd13/pockettype/keyboard.json similarity index 97% rename from keyboards/evyd13/pockettype/info.json rename to keyboards/evyd13/pockettype/keyboard.json index bcca3dc9364..358e89020a6 100644 --- a/keyboards/evyd13/pockettype/info.json +++ b/keyboards/evyd13/pockettype/keyboard.json @@ -20,6 +20,12 @@ "mousekey": false, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/evyd13/wasdat/info.json b/keyboards/evyd13/wasdat/keyboard.json similarity index 100% rename from keyboards/evyd13/wasdat/info.json rename to keyboards/evyd13/wasdat/keyboard.json diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/keyboard.json similarity index 100% rename from keyboards/evyd13/wasdat_code/info.json rename to keyboards/evyd13/wasdat_code/keyboard.json diff --git a/keyboards/ez_maker/directpins/teensy_32/info.json b/keyboards/ez_maker/directpins/teensy_32/keyboard.json similarity index 100% rename from keyboards/ez_maker/directpins/teensy_32/info.json rename to keyboards/ez_maker/directpins/teensy_32/keyboard.json diff --git a/keyboards/ez_maker/directpins/teensy_lc/info.json b/keyboards/ez_maker/directpins/teensy_lc/keyboard.json similarity index 100% rename from keyboards/ez_maker/directpins/teensy_lc/info.json rename to keyboards/ez_maker/directpins/teensy_lc/keyboard.json From bc8ff28a5841c8b12261bf7e085aaa67757ec5a2 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 14 Apr 2024 10:31:26 -0700 Subject: [PATCH 142/333] Data-Driven Keyboard Conversions: F (#23516) --- keyboards/fallacy/info.json | 8 ++++++++ keyboards/fallacy/rules.mk | 13 ------------- keyboards/fc660c/info.json | 8 ++++++++ keyboards/fc660c/rules.mk | 10 ---------- keyboards/fc980c/info.json | 8 ++++++++ keyboards/fc980c/rules.mk | 10 ---------- .../blue_team_pad/{info.json => keyboard.json} | 3 ++- keyboards/fearherbs1/blue_team_pad/rules.mk | 1 - keyboards/ferris/0_1/info.json | 12 +++++++++++- keyboards/ferris/0_1/rules.mk | 15 --------------- keyboards/ferris/0_2/bling/info.json | 3 +++ keyboards/ferris/0_2/bling/rules.mk | 1 - keyboards/ferris/0_2/info.json | 9 ++++++++- keyboards/ferris/0_2/rules.mk | 15 --------------- keyboards/fjlabs/7vhotswap/info.json | 8 ++++++++ keyboards/fjlabs/7vhotswap/rules.mk | 13 ------------- keyboards/fjlabs/ad65/info.json | 7 +++++++ keyboards/fjlabs/ad65/rules.mk | 13 ------------- keyboards/fjlabs/avalon/info.json | 8 ++++++++ keyboards/fjlabs/avalon/rules.mk | 13 ------------- keyboards/fjlabs/bks65/info.json | 8 ++++++++ keyboards/fjlabs/bks65/rules.mk | 13 ------------- keyboards/fjlabs/bks65solder/info.json | 8 ++++++++ keyboards/fjlabs/bks65solder/rules.mk | 13 ------------- keyboards/fjlabs/bolsa65/info.json | 7 +++++++ keyboards/fjlabs/bolsa65/rules.mk | 13 ------------- keyboards/fjlabs/kf87/info.json | 8 ++++++++ keyboards/fjlabs/kf87/rules.mk | 13 ------------- keyboards/fjlabs/kyuu/info.json | 8 ++++++++ keyboards/fjlabs/kyuu/rules.mk | 12 ------------ keyboards/fjlabs/ldk65/info.json | 7 +++++++ keyboards/fjlabs/ldk65/rules.mk | 13 ------------- keyboards/fjlabs/midway60/info.json | 7 +++++++ keyboards/fjlabs/midway60/rules.mk | 13 ------------- keyboards/fjlabs/mk61rgbansi/info.json | 8 ++++++++ keyboards/fjlabs/mk61rgbansi/rules.mk | 13 ------------- keyboards/fjlabs/peaker/info.json | 7 +++++++ keyboards/fjlabs/peaker/rules.mk | 13 ------------- keyboards/fjlabs/polaris/info.json | 7 +++++++ keyboards/fjlabs/polaris/rules.mk | 13 ------------- keyboards/fjlabs/ready100/info.json | 8 ++++++++ keyboards/fjlabs/ready100/rules.mk | 13 ------------- keyboards/fjlabs/sinanju/info.json | 7 +++++++ keyboards/fjlabs/sinanju/rules.mk | 13 ------------- keyboards/fjlabs/sinanjuwk/info.json | 7 +++++++ keyboards/fjlabs/sinanjuwk/rules.mk | 13 ------------- keyboards/fjlabs/solanis/info.json | 8 ++++++++ keyboards/fjlabs/solanis/rules.mk | 13 ------------- keyboards/fjlabs/swordfish/info.json | 8 ++++++++ keyboards/fjlabs/swordfish/rules.mk | 13 ------------- keyboards/fjlabs/tf60ansi/info.json | 8 ++++++++ keyboards/fjlabs/tf60ansi/rules.mk | 13 ------------- keyboards/fjlabs/tf60v2/info.json | 8 ++++++++ keyboards/fjlabs/tf60v2/rules.mk | 13 ------------- keyboards/fjlabs/tf65rgbv2/info.json | 8 ++++++++ keyboards/fjlabs/tf65rgbv2/rules.mk | 13 ------------- keyboards/fluorite/{info.json => keyboard.json} | 5 +++++ keyboards/fluorite/rules.mk | 12 ------------ keyboards/fortitude60/rev1/keyboard.json | 5 +++++ keyboards/fortitude60/rules.mk | 13 ------------- keyboards/fractal/info.json | 6 ++++++ keyboards/fractal/rules.mk | 12 ------------ keyboards/frobiac/blackbowl/info.json | 4 +++- keyboards/frobiac/blackbowl/rules.mk | 2 -- .../walnut/{info.json => keyboard.json} | 3 ++- keyboards/frooastboard/walnut/rules.mk | 4 ---- 66 files changed, 229 insertions(+), 385 deletions(-) rename keyboards/fearherbs1/blue_team_pad/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/fearherbs1/blue_team_pad/rules.mk rename keyboards/fluorite/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/fluorite/rules.mk rename keyboards/frooastboard/walnut/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/frooastboard/walnut/rules.mk diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json index 9489463a4cd..fbeca239d9f 100644 --- a/keyboards/fallacy/info.json +++ b/keyboards/fallacy/info.json @@ -32,6 +32,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["alice", "alice_split_bs"], "layout_aliases": { "LAYOUT_all": "LAYOUT_alice_split_bs", diff --git a/keyboards/fallacy/rules.mk b/keyboards/fallacy/rules.mk index ee1a36c9108..4b016ac9ad5 100755 --- a/keyboards/fallacy/rules.mk +++ b/keyboards/fallacy/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 = 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 - # project specific files SRC += indicators.c \ drivers/led/issi/is31fl3731-mono.c diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/info.json index e65ed35dae7..6c573fef88b 100644 --- a/keyboards/fc660c/info.json +++ b/keyboards/fc660c/info.json @@ -17,6 +17,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/fc660c/rules.mk b/keyboards/fc660c/rules.mk index 03a674d668c..46c4fa1efe4 100644 --- a/keyboards/fc660c/rules.mk +++ b/keyboards/fc660c/rules.mk @@ -1,13 +1,3 @@ -# 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 = yes # Enable N-Key Rollover - # Optimize size but this may cause error "relocation truncated to fit" #EXTRALDFLAGS = -Wl,--relax diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/info.json index 5060885c695..9944dd3899d 100644 --- a/keyboards/fc980c/info.json +++ b/keyboards/fc980c/info.json @@ -18,6 +18,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/fc980c/rules.mk b/keyboards/fc980c/rules.mk index 03a674d668c..46c4fa1efe4 100644 --- a/keyboards/fc980c/rules.mk +++ b/keyboards/fc980c/rules.mk @@ -1,13 +1,3 @@ -# 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 = yes # Enable N-Key Rollover - # Optimize size but this may cause error "relocation truncated to fit" #EXTRALDFLAGS = -Wl,--relax diff --git a/keyboards/fearherbs1/blue_team_pad/info.json b/keyboards/fearherbs1/blue_team_pad/keyboard.json similarity index 97% rename from keyboards/fearherbs1/blue_team_pad/info.json rename to keyboards/fearherbs1/blue_team_pad/keyboard.json index 3a06f9c0660..b47b049b45e 100644 --- a/keyboards/fearherbs1/blue_team_pad/info.json +++ b/keyboards/fearherbs1/blue_team_pad/keyboard.json @@ -17,7 +17,8 @@ "extrakey": true, "console": true, "command": false, - "nkro": true + "nkro": true, + "oled": true }, "diode_direction": "COL2ROW", "matrix_pins": { diff --git a/keyboards/fearherbs1/blue_team_pad/rules.mk b/keyboards/fearherbs1/blue_team_pad/rules.mk deleted file mode 100644 index dd68e9d3b09..00000000000 --- a/keyboards/fearherbs1/blue_team_pad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = yes diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json index 5a65369f61c..a7f7c08bec1 100644 --- a/keyboards/ferris/0_1/info.json +++ b/keyboards/ferris/0_1/info.json @@ -4,10 +4,20 @@ "usb": { "vid": "0xC2AB", "pid": "0x0000", - "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_2"], "layout_aliases": { "LAYOUT": "LAYOUT_split_3x5_2" diff --git a/keyboards/ferris/0_1/rules.mk b/keyboards/ferris/0_1/rules.mk index f971aa9a48b..c04c3c92ed3 100644 --- a/keyboards/ferris/0_1/rules.mk +++ b/keyboards/ferris/0_1/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/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/info.json index 06a826450b4..22ef500d6da 100644 --- a/keyboards/ferris/0_2/bling/info.json +++ b/keyboards/ferris/0_2/bling/info.json @@ -50,5 +50,8 @@ "solid_multisplash": true }, "driver": "is31fl3731" + }, + "features": { + "rgb_matrix": true } } diff --git a/keyboards/ferris/0_2/bling/rules.mk b/keyboards/ferris/0_2/bling/rules.mk index aad92997d0f..e69de29bb2d 100644 --- a/keyboards/ferris/0_2/bling/rules.mk +++ b/keyboards/ferris/0_2/bling/rules.mk @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json index c6584ecf01a..d1108b51c49 100644 --- a/keyboards/ferris/0_2/info.json +++ b/keyboards/ferris/0_2/info.json @@ -2,10 +2,17 @@ "manufacturer": "Cuddly Keyboards Ltd.", "usb": { "vid": "0xC2AB", - "device_version": "0.0.2" + "device_version": "0.0.2", + "no_startup_check": true }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "unicode": true + }, "community_layouts": ["split_3x5_2"], "layout_aliases": { "LAYOUT": "LAYOUT_split_3x5_2" diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk index 6f67e3dece3..11b9d33a699 100644 --- a/keyboards/ferris/0_2/rules.mk +++ b/keyboards/ferris/0_2/rules.mk @@ -1,19 +1,4 @@ -# 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 -UNICODE_ENABLE = yes CUSTOM_MATRIX = lite -NO_USB_STARTUP_CHECK = yes -LTO_ENABLE = no SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json index 8244960e45a..220cf28831f 100644 --- a/keyboards/fjlabs/7vhotswap/info.json +++ b/keyboards/fjlabs/7vhotswap/info.json @@ -33,6 +33,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "layouts": { "LAYOUT_75_all": { "layout": [ diff --git a/keyboards/fjlabs/7vhotswap/rules.mk b/keyboards/fjlabs/7vhotswap/rules.mk index 8bb5a64bff4..3437a35bdf1 100644 --- a/keyboards/fjlabs/7vhotswap/rules.mk +++ b/keyboards/fjlabs/7vhotswap/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/fjlabs/ad65/info.json b/keyboards/fjlabs/ad65/info.json index 041d8a1d2fe..19adad79325 100644 --- a/keyboards/fjlabs/ad65/info.json +++ b/keyboards/fjlabs/ad65/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": [ "65_ansi_blocker", "65_ansi_blocker_split_bs", diff --git a/keyboards/fjlabs/ad65/rules.mk b/keyboards/fjlabs/ad65/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/ad65/rules.mk +++ b/keyboards/fjlabs/ad65/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json index 77b5fbe9566..2407c3ec26b 100644 --- a/keyboards/fjlabs/avalon/info.json +++ b/keyboards/fjlabs/avalon/info.json @@ -41,6 +41,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/fjlabs/avalon/rules.mk b/keyboards/fjlabs/avalon/rules.mk index dca4b0aabb4..3437a35bdf1 100644 --- a/keyboards/fjlabs/avalon/rules.mk +++ b/keyboards/fjlabs/avalon/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/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/info.json index 5e0d9d5fb9b..5be09bfe0d0 100644 --- a/keyboards/fjlabs/bks65/info.json +++ b/keyboards/fjlabs/bks65/info.json @@ -36,6 +36,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/fjlabs/bks65/rules.mk b/keyboards/fjlabs/bks65/rules.mk index dca4b0aabb4..3437a35bdf1 100644 --- a/keyboards/fjlabs/bks65/rules.mk +++ b/keyboards/fjlabs/bks65/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/fjlabs/bks65solder/info.json b/keyboards/fjlabs/bks65solder/info.json index dae926d08c9..609dc4cdbc0 100644 --- a/keyboards/fjlabs/bks65solder/info.json +++ b/keyboards/fjlabs/bks65solder/info.json @@ -33,6 +33,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/fjlabs/bks65solder/rules.mk b/keyboards/fjlabs/bks65solder/rules.mk index dca4b0aabb4..3437a35bdf1 100644 --- a/keyboards/fjlabs/bks65solder/rules.mk +++ b/keyboards/fjlabs/bks65solder/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/fjlabs/bolsa65/info.json b/keyboards/fjlabs/bolsa65/info.json index 2f53b237d24..9deb09fef29 100644 --- a/keyboards/fjlabs/bolsa65/info.json +++ b/keyboards/fjlabs/bolsa65/info.json @@ -15,6 +15,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/fjlabs/bolsa65/rules.mk b/keyboards/fjlabs/bolsa65/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/bolsa65/rules.mk +++ b/keyboards/fjlabs/bolsa65/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/info.json index cd2f6a7ac2f..e4f48acc8ec 100644 --- a/keyboards/fjlabs/kf87/info.json +++ b/keyboards/fjlabs/kf87/info.json @@ -38,6 +38,14 @@ }, "processor": "at90usb646", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "layouts": { "LAYOUT_tkl_all": { "layout": [ diff --git a/keyboards/fjlabs/kf87/rules.mk b/keyboards/fjlabs/kf87/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/fjlabs/kf87/rules.mk +++ b/keyboards/fjlabs/kf87/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/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/info.json index ed02d7d3b42..a16e2835cf2 100644 --- a/keyboards/fjlabs/kyuu/info.json +++ b/keyboards/fjlabs/kyuu/info.json @@ -37,6 +37,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "layouts": { "LAYOUT_65_ansi_blocker_badge": { "layout": [ diff --git a/keyboards/fjlabs/kyuu/rules.mk b/keyboards/fjlabs/kyuu/rules.mk index a140b3b2525..3437a35bdf1 100644 --- a/keyboards/fjlabs/kyuu/rules.mk +++ b/keyboards/fjlabs/kyuu/rules.mk @@ -1,14 +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 \ No newline at end of file diff --git a/keyboards/fjlabs/ldk65/info.json b/keyboards/fjlabs/ldk65/info.json index e8616b291be..a9d997c67e0 100644 --- a/keyboards/fjlabs/ldk65/info.json +++ b/keyboards/fjlabs/ldk65/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/fjlabs/ldk65/rules.mk b/keyboards/fjlabs/ldk65/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/ldk65/rules.mk +++ b/keyboards/fjlabs/ldk65/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/fjlabs/midway60/info.json b/keyboards/fjlabs/midway60/info.json index db91dbb021c..0f5b1e13bca 100644 --- a/keyboards/fjlabs/midway60/info.json +++ b/keyboards/fjlabs/midway60/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": [ "60_ansi", "60_ansi_split_bs_rshift", diff --git a/keyboards/fjlabs/midway60/rules.mk b/keyboards/fjlabs/midway60/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/midway60/rules.mk +++ b/keyboards/fjlabs/midway60/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json index 8c42aa97b64..de26f98ebe6 100644 --- a/keyboards/fjlabs/mk61rgbansi/info.json +++ b/keyboards/fjlabs/mk61rgbansi/info.json @@ -38,6 +38,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/fjlabs/mk61rgbansi/rules.mk b/keyboards/fjlabs/mk61rgbansi/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/fjlabs/mk61rgbansi/rules.mk +++ b/keyboards/fjlabs/mk61rgbansi/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/fjlabs/peaker/info.json b/keyboards/fjlabs/peaker/info.json index 2d9e806101e..73f4f754c31 100644 --- a/keyboards/fjlabs/peaker/info.json +++ b/keyboards/fjlabs/peaker/info.json @@ -15,6 +15,13 @@ "diode_direction": "COL2ROW", "processor": "at90usb646", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT_tkl_all": { "layout": [ diff --git a/keyboards/fjlabs/peaker/rules.mk b/keyboards/fjlabs/peaker/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/peaker/rules.mk +++ b/keyboards/fjlabs/peaker/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/fjlabs/polaris/info.json b/keyboards/fjlabs/polaris/info.json index 6757372bf9f..c4f3caf2879 100644 --- a/keyboards/fjlabs/polaris/info.json +++ b/keyboards/fjlabs/polaris/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": [ "60_ansi", "60_ansi_split_bs_rshift", diff --git a/keyboards/fjlabs/polaris/rules.mk b/keyboards/fjlabs/polaris/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/polaris/rules.mk +++ b/keyboards/fjlabs/polaris/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/info.json index dd717bb68a8..b5940b9c527 100644 --- a/keyboards/fjlabs/ready100/info.json +++ b/keyboards/fjlabs/ready100/info.json @@ -34,6 +34,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "layout_aliases": { "LAYOUT_64key": "LAYOUT_64_ansi" }, diff --git a/keyboards/fjlabs/ready100/rules.mk b/keyboards/fjlabs/ready100/rules.mk index dca4b0aabb4..3437a35bdf1 100644 --- a/keyboards/fjlabs/ready100/rules.mk +++ b/keyboards/fjlabs/ready100/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/fjlabs/sinanju/info.json b/keyboards/fjlabs/sinanju/info.json index f71ad6fca21..ef9cf0e872b 100644 --- a/keyboards/fjlabs/sinanju/info.json +++ b/keyboards/fjlabs/sinanju/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT_60_ansi_wkl": { "layout": [ diff --git a/keyboards/fjlabs/sinanju/rules.mk b/keyboards/fjlabs/sinanju/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/sinanju/rules.mk +++ b/keyboards/fjlabs/sinanju/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/fjlabs/sinanjuwk/info.json b/keyboards/fjlabs/sinanjuwk/info.json index 9f34f4aa528..e825ae335e7 100644 --- a/keyboards/fjlabs/sinanjuwk/info.json +++ b/keyboards/fjlabs/sinanjuwk/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift" }, diff --git a/keyboards/fjlabs/sinanjuwk/rules.mk b/keyboards/fjlabs/sinanjuwk/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/sinanjuwk/rules.mk +++ b/keyboards/fjlabs/sinanjuwk/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/info.json index ecc495d59a9..12103d10586 100644 --- a/keyboards/fjlabs/solanis/info.json +++ b/keyboards/fjlabs/solanis/info.json @@ -34,6 +34,14 @@ }, "processor": "at90usb646", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": [ "tkl_ansi", "tkl_ansi_split_bs_rshift", diff --git a/keyboards/fjlabs/solanis/rules.mk b/keyboards/fjlabs/solanis/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/fjlabs/solanis/rules.mk +++ b/keyboards/fjlabs/solanis/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/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/info.json index 822d9662d42..331bae459c0 100644 --- a/keyboards/fjlabs/swordfish/info.json +++ b/keyboards/fjlabs/swordfish/info.json @@ -33,6 +33,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "layouts": { "LAYOUT_2u_bs": { "layout": [ diff --git a/keyboards/fjlabs/swordfish/rules.mk b/keyboards/fjlabs/swordfish/rules.mk index 8bb5a64bff4..3437a35bdf1 100644 --- a/keyboards/fjlabs/swordfish/rules.mk +++ b/keyboards/fjlabs/swordfish/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/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/info.json index f161284ae01..69ff0690a18 100644 --- a/keyboards/fjlabs/tf60ansi/info.json +++ b/keyboards/fjlabs/tf60ansi/info.json @@ -38,6 +38,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/fjlabs/tf60ansi/rules.mk b/keyboards/fjlabs/tf60ansi/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/fjlabs/tf60ansi/rules.mk +++ b/keyboards/fjlabs/tf60ansi/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/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/info.json index e3051c0da7b..337a06843f1 100644 --- a/keyboards/fjlabs/tf60v2/info.json +++ b/keyboards/fjlabs/tf60v2/info.json @@ -38,6 +38,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["60_ansi_arrow"], "layouts": { "LAYOUT_60_ansi_arrow": { diff --git a/keyboards/fjlabs/tf60v2/rules.mk b/keyboards/fjlabs/tf60v2/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/fjlabs/tf60v2/rules.mk +++ b/keyboards/fjlabs/tf60v2/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/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/info.json index ab105ff4a9f..dd567c63b85 100644 --- a/keyboards/fjlabs/tf65rgbv2/info.json +++ b/keyboards/fjlabs/tf65rgbv2/info.json @@ -38,6 +38,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/fjlabs/tf65rgbv2/rules.mk b/keyboards/fjlabs/tf65rgbv2/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/fjlabs/tf65rgbv2/rules.mk +++ b/keyboards/fjlabs/tf65rgbv2/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/fluorite/info.json b/keyboards/fluorite/keyboard.json similarity index 98% rename from keyboards/fluorite/info.json rename to keyboards/fluorite/keyboard.json index f28694389e9..ca23f773b0e 100644 --- a/keyboards/fluorite/info.json +++ b/keyboards/fluorite/keyboard.json @@ -19,6 +19,11 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/fluorite/rules.mk b/keyboards/fluorite/rules.mk deleted file mode 100644 index ad81ce036a2..00000000000 --- a/keyboards/fluorite/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/fortitude60/rev1/keyboard.json b/keyboards/fortitude60/rev1/keyboard.json index ff8756bb684..f651c784247 100644 --- a/keyboards/fortitude60/rev1/keyboard.json +++ b/keyboards/fortitude60/rev1/keyboard.json @@ -29,6 +29,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/fortitude60/rules.mk b/keyboards/fortitude60/rules.mk index 181f73ba110..ef158b8cf08 100644 --- a/keyboards/fortitude60/rules.mk +++ b/keyboards/fortitude60/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 = 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 - DEFAULT_FOLDER = fortitude60/rev1 diff --git a/keyboards/fractal/info.json b/keyboards/fractal/info.json index 0d2ce4aecac..4086ff969fe 100644 --- a/keyboards/fractal/info.json +++ b/keyboards/fractal/info.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/fractal/rules.mk b/keyboards/fractal/rules.mk index ee623488daa..16051206467 100755 --- a/keyboards/fractal/rules.mk +++ b/keyboards/fractal/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 = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/info.json index 2e99c5806b2..8a4aed19484 100644 --- a/keyboards/frobiac/blackbowl/info.json +++ b/keyboards/frobiac/blackbowl/info.json @@ -13,7 +13,9 @@ "dynamic_macro": true, "extrakey": true, "mousekey": true, - "nkro": false + "nkro": false, + "ps2": true, + "ps2_mouse": true }, "build": { "lto": true diff --git a/keyboards/frobiac/blackbowl/rules.mk b/keyboards/frobiac/blackbowl/rules.mk index 4e81c7280cd..3b95c118432 100644 --- a/keyboards/frobiac/blackbowl/rules.mk +++ b/keyboards/frobiac/blackbowl/rules.mk @@ -4,6 +4,4 @@ CUSTOM_MATRIX = lite I2C_DRIVER_REQUIRED = yes SRC += matrix.c -PS2_MOUSE_ENABLE = yes -PS2_ENABLE = yes PS2_DRIVER = usart diff --git a/keyboards/frooastboard/walnut/info.json b/keyboards/frooastboard/walnut/keyboard.json similarity index 99% rename from keyboards/frooastboard/walnut/info.json rename to keyboards/frooastboard/walnut/keyboard.json index 4864e12fbcf..4387452d381 100644 --- a/keyboards/frooastboard/walnut/info.json +++ b/keyboards/frooastboard/walnut/keyboard.json @@ -12,7 +12,8 @@ "console": false, "extrakey": false, "mousekey": false, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "rgb_matrix": { "animations": { diff --git a/keyboards/frooastboard/walnut/rules.mk b/keyboards/frooastboard/walnut/rules.mk deleted file mode 100644 index c529890fb51..00000000000 --- a/keyboards/frooastboard/walnut/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix From 130a2a31a66f17969102f95045fa2dcfac84e01d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 14 Apr 2024 18:09:46 -0700 Subject: [PATCH 143/333] Data-Driven Keyboard Conversions: G (#23522) --- keyboards/gboards/ergotaco/info.json | 7 ++++++ keyboards/gboards/ergotaco/rules.mk | 3 --- keyboards/gboards/georgi/info.json | 11 +++++++++ keyboards/gboards/georgi/rules.mk | 16 +------------ keyboards/gboards/gergo/info.json | 7 ++++++ keyboards/gboards/gergo/rules.mk | 4 ---- keyboards/gboards/gergoplex/info.json | 7 ++++++ keyboards/gboards/gergoplex/rules.mk | 9 -------- .../giabalanai/{info.json => keyboard.json} | 8 ++++++- keyboards/giabalanai/rules.mk | 9 -------- keyboards/gl516/a52gl/info.json | 5 ++++ keyboards/gl516/a52gl/rules.mk | 15 +----------- keyboards/gl516/j73gl/info.json | 6 +++++ keyboards/gl516/j73gl/rules.mk | 15 +----------- keyboards/gl516/n51gl/info.json | 7 ++++++ keyboards/gl516/n51gl/rules.mk | 15 +----------- keyboards/glenpickle/chimera_ergo/info.json | 8 +++++++ keyboards/glenpickle/chimera_ergo/rules.mk | 12 ---------- keyboards/glenpickle/chimera_ls/info.json | 8 +++++++ keyboards/glenpickle/chimera_ls/rules.mk | 12 ---------- keyboards/glenpickle/chimera_ortho/info.json | 8 +++++++ keyboards/glenpickle/chimera_ortho/rules.mk | 12 ---------- .../glenpickle/chimera_ortho_plus/info.json | 9 ++++++++ .../glenpickle/chimera_ortho_plus/rules.mk | 13 ----------- keyboards/gmmk/numpad/info.json | 17 +++++++++++++- keyboards/gmmk/numpad/rules.mk | 20 ---------------- keyboards/gon/nerd60/info.json | 7 ++++++ keyboards/gon/nerd60/rules.mk | 13 ----------- keyboards/gon/nerdtkl/info.json | 7 ++++++ keyboards/gon/nerdtkl/rules.mk | 13 ----------- keyboards/gopolar/gg86/info.json | 14 ++++++++++- keyboards/gopolar/gg86/rules.mk | 23 ------------------- keyboards/gray_studio/cod67/info.json | 8 +++++++ keyboards/gray_studio/cod67/rules.mk | 13 ----------- 34 files changed, 145 insertions(+), 216 deletions(-) rename keyboards/giabalanai/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/giabalanai/rules.mk diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json index 80558ad6929..1d13c2458a7 100644 --- a/keyboards/gboards/ergotaco/info.json +++ b/keyboards/gboards/ergotaco/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true + }, "tapping": { "toggle": 1 }, diff --git a/keyboards/gboards/ergotaco/rules.mk b/keyboards/gboards/ergotaco/rules.mk index 6fbefbd22d7..5d025b31ef2 100644 --- a/keyboards/gboards/ergotaco/rules.mk +++ b/keyboards/gboards/ergotaco/rules.mk @@ -1,7 +1,4 @@ CUSTOM_MATRIX = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = yes -COMMAND_ENABLE = yes # A bunch of stuff that you shouldn't touch unless you # know what you're doing. diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json index 51737f75af8..066797a2415 100644 --- a/keyboards/gboards/georgi/info.json +++ b/keyboards/gboards/georgi/info.json @@ -11,6 +11,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "nkro": true, + "steno": true + }, + "build": { + "lto": true + }, "tapping": { "toggle": 2 }, diff --git a/keyboards/gboards/georgi/rules.mk b/keyboards/gboards/georgi/rules.mk index 5b63e269fa5..42be966784a 100644 --- a/keyboards/gboards/georgi/rules.mk +++ b/keyboards/gboards/georgi/rules.mk @@ -1,18 +1,4 @@ -# 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 CUSTOM_MATRIX = yes -STENO_ENABLE = yes -LTO_ENABLE = yes SRC += matrix.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file +I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json index bc53f2db5f0..e576ac8012e 100644 --- a/keyboards/gboards/gergo/info.json +++ b/keyboards/gboards/gergo/info.json @@ -16,6 +16,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true + }, "tapping": { "toggle": 1 }, diff --git a/keyboards/gboards/gergo/rules.mk b/keyboards/gboards/gergo/rules.mk index d789b349da8..77c632bc1ca 100644 --- a/keyboards/gboards/gergo/rules.mk +++ b/keyboards/gboards/gergo/rules.mk @@ -2,10 +2,6 @@ # change yes to no to disable # CUSTOM_MATRIX = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = yes -COMMAND_ENABLE = yes -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json index c5f6be47509..cf1e4513923 100644 --- a/keyboards/gboards/gergoplex/info.json +++ b/keyboards/gboards/gergoplex/info.json @@ -13,6 +13,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/gboards/gergoplex/rules.mk b/keyboards/gboards/gergoplex/rules.mk index 9846c64771e..6ae3f1122b1 100644 --- a/keyboards/gboards/gergoplex/rules.mk +++ b/keyboards/gboards/gergoplex/rules.mk @@ -1,15 +1,6 @@ # 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/keyboard.json similarity index 98% rename from keyboards/giabalanai/info.json rename to keyboards/giabalanai/keyboard.json index 953e0bebc37..ae5787cec6e 100644 --- a/keyboards/giabalanai/info.json +++ b/keyboards/giabalanai/keyboard.json @@ -36,7 +36,13 @@ "bootmagic": false, "console": false, "mousekey": false, - "nkro": false + "nkro": false, + "command": false, + "backlight": false, + "rgb_matrix": false + }, + "build": { + "lto": true }, "encoder": { "rotary": [] diff --git a/keyboards/giabalanai/rules.mk b/keyboards/giabalanai/rules.mk deleted file mode 100644 index 90ba252d264..00000000000 --- a/keyboards/giabalanai/rules.mk +++ /dev/null @@ -1,9 +0,0 @@ -# Build Options -# change yes to no to disable -# -COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -# RGB_MATRIX_ENABLE is not suitable for giabalanai keyboard on the right side (there are dulpicate keys). -RGB_MATRIX_ENABLE = no # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.) - -LTO_ENABLE = yes diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json index bc9b1cacfad..54fbce6bdad 100644 --- a/keyboards/gl516/a52gl/info.json +++ b/keyboards/gl516/a52gl/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gl516/a52gl/rules.mk b/keyboards/gl516/a52gl/rules.mk index 109f8bc976d..179d02c3c68 100644 --- a/keyboards/gl516/a52gl/rules.mk +++ b/keyboards/gl516/a52gl/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 = 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 -SRC += matrix.c \ No newline at end of file +SRC += matrix.c diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json index fa78788e666..b252363f700 100644 --- a/keyboards/gl516/j73gl/info.json +++ b/keyboards/gl516/j73gl/info.json @@ -28,6 +28,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gl516/j73gl/rules.mk b/keyboards/gl516/j73gl/rules.mk index 3ea771b6701..179d02c3c68 100644 --- a/keyboards/gl516/j73gl/rules.mk +++ b/keyboards/gl516/j73gl/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 = no # 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 = lite -SRC += matrix.c \ No newline at end of file +SRC += matrix.c diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json index c5abdd45428..0e54ee52a45 100644 --- a/keyboards/gl516/n51gl/info.json +++ b/keyboards/gl516/n51gl/info.json @@ -33,6 +33,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gl516/n51gl/rules.mk b/keyboards/gl516/n51gl/rules.mk index c5b4f3e3764..179d02c3c68 100644 --- a/keyboards/gl516/n51gl/rules.mk +++ b/keyboards/gl516/n51gl/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes CUSTOM_MATRIX = lite -SRC += matrix.c \ No newline at end of file +SRC += matrix.c diff --git a/keyboards/glenpickle/chimera_ergo/info.json b/keyboards/glenpickle/chimera_ergo/info.json index ea49dabbca4..038498fd10a 100644 --- a/keyboards/glenpickle/chimera_ergo/info.json +++ b/keyboards/glenpickle/chimera_ergo/info.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/glenpickle/chimera_ergo/rules.mk b/keyboards/glenpickle/chimera_ergo/rules.mk index f543b5fd9a2..18d234d62a0 100644 --- a/keyboards/glenpickle/chimera_ergo/rules.mk +++ b/keyboards/glenpickle/chimera_ergo/rules.mk @@ -1,15 +1,3 @@ -# 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 = 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/glenpickle/chimera_ls/info.json b/keyboards/glenpickle/chimera_ls/info.json index 300b6be928e..b0d6a529124 100644 --- a/keyboards/glenpickle/chimera_ls/info.json +++ b/keyboards/glenpickle/chimera_ls/info.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/glenpickle/chimera_ls/rules.mk b/keyboards/glenpickle/chimera_ls/rules.mk index 706d6106538..812e3cef929 100644 --- a/keyboards/glenpickle/chimera_ls/rules.mk +++ b/keyboards/glenpickle/chimera_ls/rules.mk @@ -1,15 +1,3 @@ -# 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 = 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/glenpickle/chimera_ortho/info.json b/keyboards/glenpickle/chimera_ortho/info.json index 4932d2f5a5a..b62616ce689 100644 --- a/keyboards/glenpickle/chimera_ortho/info.json +++ b/keyboards/glenpickle/chimera_ortho/info.json @@ -9,6 +9,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/glenpickle/chimera_ortho/rules.mk b/keyboards/glenpickle/chimera_ortho/rules.mk index f543b5fd9a2..18d234d62a0 100644 --- a/keyboards/glenpickle/chimera_ortho/rules.mk +++ b/keyboards/glenpickle/chimera_ortho/rules.mk @@ -1,15 +1,3 @@ -# 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 = 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/glenpickle/chimera_ortho_plus/info.json b/keyboards/glenpickle/chimera_ortho_plus/info.json index 39d6c11eb22..bf0ae445483 100644 --- a/keyboards/glenpickle/chimera_ortho_plus/info.json +++ b/keyboards/glenpickle/chimera_ortho_plus/info.json @@ -9,6 +9,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "unicode": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/glenpickle/chimera_ortho_plus/rules.mk b/keyboards/glenpickle/chimera_ortho_plus/rules.mk index 539a2d1004b..18d234d62a0 100644 --- a/keyboards/glenpickle/chimera_ortho_plus/rules.mk +++ b/keyboards/glenpickle/chimera_ortho_plus/rules.mk @@ -1,16 +1,3 @@ -# 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 = 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 = lite # project specific files diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/info.json index 63ae544ad32..70e2d3e6791 100644 --- a/keyboards/gmmk/numpad/info.json +++ b/keyboards/gmmk/numpad/info.json @@ -6,7 +6,10 @@ "usb": { "vid": "0x320F", "pid": "0x5088", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "eeprom": { "driver": "wear_leveling", @@ -70,6 +73,18 @@ }, "processor": "WB32F3G71", "bootloader": "wb32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "midi": true + }, + "build": { + "lto": true + }, "diode_direction": "ROW2COL", "matrix_pins": { "rows": ["A3", "A4", "A5", "A6", "A7"], diff --git a/keyboards/gmmk/numpad/rules.mk b/keyboards/gmmk/numpad/rules.mk index d289eb81a4d..752b0ce9d0b 100644 --- a/keyboards/gmmk/numpad/rules.mk +++ b/keyboards/gmmk/numpad/rules.mk @@ -1,23 +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 -ENCODER_ENABLE = yes -KEYBOARD_SHARED_EP = yes -MIDI_ENABLE = yes - -RGB_MATRIX_ENABLE = yes - -LTO_ENABLE = yes - ANALOG_DRIVER_REQUIRED = yes SRC += matrix.c diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json index 38152a32e6c..33ad716b4fd 100644 --- a/keyboards/gon/nerd60/info.json +++ b/keyboards/gon/nerd60/info.json @@ -21,6 +21,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/gon/nerd60/rules.mk b/keyboards/gon/nerd60/rules.mk index e0782ddcb51..3437a35bdf1 100644 --- a/keyboards/gon/nerd60/rules.mk +++ b/keyboards/gon/nerd60/rules.mk @@ -1,15 +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 = 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 diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json index 103c856bf0b..301cbaf19f1 100644 --- a/keyboards/gon/nerdtkl/info.json +++ b/keyboards/gon/nerdtkl/info.json @@ -21,6 +21,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT_tkl": { "layout": [ diff --git a/keyboards/gon/nerdtkl/rules.mk b/keyboards/gon/nerdtkl/rules.mk index e0782ddcb51..3437a35bdf1 100644 --- a/keyboards/gon/nerdtkl/rules.mk +++ b/keyboards/gon/nerdtkl/rules.mk @@ -1,15 +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 = 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 diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json index 13669a85420..b704582aa6c 100644 --- a/keyboards/gopolar/gg86/info.json +++ b/keyboards/gopolar/gg86/info.json @@ -7,7 +7,8 @@ "vid": "0x0007", "pid": "0x0007", "device_version": "0.0.1", - "force_nkro": true + "force_nkro": true, + "no_startup_check": true }, "ws2812": { "pin": "E2" @@ -64,6 +65,17 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "oled": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/gopolar/gg86/rules.mk b/keyboards/gopolar/gg86/rules.mk index acdf49b47da..7b380ccdfbe 100644 --- a/keyboards/gopolar/gg86/rules.mk +++ b/keyboards/gopolar/gg86/rules.mk @@ -1,24 +1 @@ SRC += lib/logo.c - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# Additional thing to reduce compiled size -LTO_ENABLE = yes -NO_USB_STARTUP_CHECK = yes - -# RGB Matrix enabled -RGB_MATRIX_ENABLE = yes - -# OLED enabled -OLED_ENABLE = yes diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json index 653885f963e..e3687ce9591 100644 --- a/keyboards/gray_studio/cod67/info.json +++ b/keyboards/gray_studio/cod67/info.json @@ -41,6 +41,14 @@ }, "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gray_studio/cod67/rules.mk b/keyboards/gray_studio/cod67/rules.mk index c8d3337cb38..e22d5248895 100644 --- a/keyboards/gray_studio/cod67/rules.mk +++ b/keyboards/gray_studio/cod67/rules.mk @@ -1,15 +1,2 @@ # This board uses the older unsafe 6k version of lufa-ms BOOTLOADER_SIZE = 6144 - -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable RGB underglow -AUDIO_ENABLE = no # Audio output From 2e01b67ecc4e36668098cb1bc4a5b63976d4c94d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:19:08 -0700 Subject: [PATCH 144/333] Data-Driven Keyboard Conversions: H, Part 1 (#23524) --- .../hadron/ver2/{info.json => keyboard.json} | 10 +++++++++- keyboards/hadron/ver2/rules.mk | 13 ------------ keyboards/hadron/ver3/info.json | 12 +++++++++++ keyboards/hadron/ver3/rules.mk | 16 --------------- keyboards/halfcliff/info.json | 5 +++++ keyboards/halfcliff/rules.mk | 16 --------------- .../hardwareabstraction/handwire/info.json | 8 +++++++- .../hardwareabstraction/handwire/rules.mk | 6 ------ keyboards/hazel/bad_wings/info.json | 5 ++++- keyboards/hazel/bad_wings/rules.mk | 4 ---- keyboards/hhkb/jp/info.json | 7 +++++++ keyboards/hhkb/jp/rules.mk | 7 ------- keyboards/hhkb/yang/info.json | 6 ++++++ keyboards/hhkb/yang/rules.mk | 10 ---------- keyboards/hillside/46/0_1/info.json | 3 +++ keyboards/hillside/46/0_1/rules.mk | 2 -- keyboards/hillside/48/0_1/info.json | 3 +++ keyboards/hillside/48/0_1/rules.mk | 2 -- keyboards/hillside/52/0_1/info.json | 3 +++ keyboards/hillside/52/0_1/rules.mk | 2 -- keyboards/hineybush/hbcp/info.json | 10 ++++++++++ keyboards/hineybush/hbcp/rules.mk | 12 ----------- .../horrortroll/handwired_k552/info.json | 9 +++++++++ keyboards/horrortroll/handwired_k552/rules.mk | 20 ------------------- keyboards/horrortroll/lemon40/info.json | 12 +++++++++++ keyboards/horrortroll/lemon40/rules.mk | 20 ------------------- keyboards/hotdox/info.json | 9 +++++++++ keyboards/hotdox/rules.mk | 13 ------------ keyboards/hs60/v1/info.json | 8 ++++++++ keyboards/hs60/v1/rules.mk | 14 ------------- keyboards/hs60/v2/ansi/info.json | 6 ++++++ keyboards/hs60/v2/ansi/rules.mk | 12 ----------- keyboards/hs60/v2/hhkb/info.json | 6 ++++++ keyboards/hs60/v2/hhkb/rules.mk | 12 ----------- keyboards/hs60/v2/iso/info.json | 6 ++++++ keyboards/hs60/v2/iso/rules.mk | 12 ----------- 36 files changed, 125 insertions(+), 196 deletions(-) rename keyboards/hadron/ver2/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/hadron/ver2/rules.mk diff --git a/keyboards/hadron/ver2/info.json b/keyboards/hadron/ver2/keyboard.json similarity index 79% rename from keyboards/hadron/ver2/info.json rename to keyboards/hadron/ver2/keyboard.json index fb1dc102b7e..fbb97f1c186 100644 --- a/keyboards/hadron/ver2/info.json +++ b/keyboards/hadron/ver2/keyboard.json @@ -27,5 +27,13 @@ "pin": "D4" }, "processor": "atmega32u4", - "bootloader": "halfkay" + "bootloader": "halfkay", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "oled": true + } } diff --git a/keyboards/hadron/ver2/rules.mk b/keyboards/hadron/ver2/rules.mk deleted file mode 100644 index 188b4696f18..00000000000 --- a/keyboards/hadron/ver2/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 -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 = yes # Enable WS2812 RGB underlight -OLED_ENABLE = yes diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/info.json index 381a5dc5501..02a75d59eb8 100644 --- a/keyboards/hadron/ver3/info.json +++ b/keyboards/hadron/ver3/info.json @@ -35,5 +35,17 @@ }, "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "audio": true, + "rgblight": true, + "haptic": true, + "oled": true, + "encoder": true + }, "board": "QMK_PROTON_C" } diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk index edc5fa7d5bf..dea510c2ab3 100644 --- a/keyboards/hadron/ver3/rules.mk +++ b/keyboards/hadron/ver3/rules.mk @@ -1,17 +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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -AUDIO_ENABLE = yes -RGBLIGHT_ENABLE = yes -RGB_MATRIX_ENABLE = no # once arm_rgb is implemented -HAPTIC_ENABLE = yes HAPTIC_DRIVER = drv2605l -OLED_ENABLE = yes -ENCODER_ENABLER = yes diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json index 225c5dcb37a..1f60537b249 100644 --- a/keyboards/halfcliff/info.json +++ b/keyboards/halfcliff/info.json @@ -29,6 +29,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/halfcliff/rules.mk b/keyboards/halfcliff/rules.mk index 425015c04d8..8784813b335 100644 --- a/keyboards/halfcliff/rules.mk +++ b/keyboards/halfcliff/rules.mk @@ -1,18 +1,2 @@ -# 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 -ENCODER_ENABLE = no -POINTING_DEVICE_ENABLE = no CUSTOM_MATRIX = yes -OLED_ENABLE = no - SRC += matrix.c diff --git a/keyboards/hardwareabstraction/handwire/info.json b/keyboards/hardwareabstraction/handwire/info.json index 6fa33228df8..5e0ec6f11e2 100644 --- a/keyboards/hardwareabstraction/handwire/info.json +++ b/keyboards/hardwareabstraction/handwire/info.json @@ -10,7 +10,13 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "haptic": true, + "oled": true, + "wpm": true + }, + "build": { + "lto": true }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], diff --git a/keyboards/hardwareabstraction/handwire/rules.mk b/keyboards/hardwareabstraction/handwire/rules.mk index 8a33a553313..a521203b326 100644 --- a/keyboards/hardwareabstraction/handwire/rules.mk +++ b/keyboards/hardwareabstraction/handwire/rules.mk @@ -1,7 +1 @@ -LTO_ENABLE = yes -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid - -OLED_ENABLE = yes - -WPM_ENABLE = yes diff --git a/keyboards/hazel/bad_wings/info.json b/keyboards/hazel/bad_wings/info.json index 070a69f6917..fef514c539f 100644 --- a/keyboards/hazel/bad_wings/info.json +++ b/keyboards/hazel/bad_wings/info.json @@ -18,7 +18,10 @@ "features": { "bootmagic": true, "deferred_exec": true, - "nkro": false + "nkro": false, + "pointing_device": true, + "tri_layer": true, + "caps_word": true }, "community_layouts": ["split_3x5_3"], "layouts": { diff --git a/keyboards/hazel/bad_wings/rules.mk b/keyboards/hazel/bad_wings/rules.mk index 47a188155fe..a49017527d7 100644 --- a/keyboards/hazel/bad_wings/rules.mk +++ b/keyboards/hazel/bad_wings/rules.mk @@ -1,10 +1,6 @@ -TRI_LAYER_ENABLE = yes -CAPS_WORD_ENABLE = yes - SRC += matrix.c SPI_DRIVER_REQUIRED = yes CUSTOM_MATRIX = lite POINTING_DEVICE_DRIVER = cirque_pinnacle_spi -POINTING_DEVICE_ENABLE = yes diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/info.json index 589cf98dde4..d745f21d20b 100644 --- a/keyboards/hhkb/jp/info.json +++ b/keyboards/hhkb/jp/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, "layouts": { "LAYOUT_jp": { "layout": [ diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk index 5c659643418..9e74e1cfb9a 100644 --- a/keyboards/hhkb/jp/rules.mk +++ b/keyboards/hhkb/jp/rules.mk @@ -1,14 +1,7 @@ # 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 CUSTOM_MATRIX = yes # Custom matrix file for the HHKB -NKRO_ENABLE = no # Enable N-Key Rollover -# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality # project specific files SRC = matrix.c diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/info.json index 24cd750e09c..a5725d6afaa 100644 --- a/keyboards/hhkb/yang/info.json +++ b/keyboards/hhkb/yang/info.json @@ -16,6 +16,12 @@ }, "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true + }, "debounce": 0, "community_layouts": ["60_hhkb"], "layouts": { diff --git a/keyboards/hhkb/yang/rules.mk b/keyboards/hhkb/yang/rules.mk index 99f77d0c162..d8acce0a36b 100644 --- a/keyboards/hhkb/yang/rules.mk +++ b/keyboards/hhkb/yang/rules.mk @@ -1,16 +1,6 @@ # MCU 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 = no # USB Nkey Rollover - # Custom matrix file for the HHKB CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/info.json index 6dd45b06f08..7cb7150f3f2 100644 --- a/keyboards/hillside/46/0_1/info.json +++ b/keyboards/hillside/46/0_1/info.json @@ -16,6 +16,9 @@ {"pin_a": "F5", "pin_b": "F4"} ] }, + "build": { + "lto": true + }, "features": { "encoder": true, "extrakey": true, diff --git a/keyboards/hillside/46/0_1/rules.mk b/keyboards/hillside/46/0_1/rules.mk index 093b81abfe0..89c84d8be9d 100644 --- a/keyboards/hillside/46/0_1/rules.mk +++ b/keyboards/hillside/46/0_1/rules.mk @@ -1,5 +1,3 @@ -LTO_ENABLE = yes # Use link time optimization for smaller firmware - # 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 diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/info.json index 4f565f5cdc6..b640bc0cbf2 100644 --- a/keyboards/hillside/48/0_1/info.json +++ b/keyboards/hillside/48/0_1/info.json @@ -16,6 +16,9 @@ {"pin_a": "F5", "pin_b": "F4"} ] }, + "build": { + "lto": true + }, "features": { "encoder": true, "extrakey": true, diff --git a/keyboards/hillside/48/0_1/rules.mk b/keyboards/hillside/48/0_1/rules.mk index 093b81abfe0..89c84d8be9d 100644 --- a/keyboards/hillside/48/0_1/rules.mk +++ b/keyboards/hillside/48/0_1/rules.mk @@ -1,5 +1,3 @@ -LTO_ENABLE = yes # Use link time optimization for smaller firmware - # 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 diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/info.json index 2064ba617cc..0949fa9bb8e 100644 --- a/keyboards/hillside/52/0_1/info.json +++ b/keyboards/hillside/52/0_1/info.json @@ -16,6 +16,9 @@ {"pin_a": "F5", "pin_b": "F4"} ] }, + "build": { + "lto": true + }, "features": { "encoder": true, "extrakey": true, diff --git a/keyboards/hillside/52/0_1/rules.mk b/keyboards/hillside/52/0_1/rules.mk index 093b81abfe0..89c84d8be9d 100644 --- a/keyboards/hillside/52/0_1/rules.mk +++ b/keyboards/hillside/52/0_1/rules.mk @@ -1,5 +1,3 @@ -LTO_ENABLE = yes # Use link time optimization for smaller firmware - # 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 diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/info.json index ca92b3f4a52..ab36bfaea09 100644 --- a/keyboards/hineybush/hbcp/info.json +++ b/keyboards/hineybush/hbcp/info.json @@ -36,6 +36,16 @@ }, "processor": "at90usb1286", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/hineybush/hbcp/rules.mk b/keyboards/hineybush/hbcp/rules.mk index f60d6afa1e2..30ce5d293b7 100644 --- a/keyboards/hineybush/hbcp/rules.mk +++ b/keyboards/hineybush/hbcp/rules.mk @@ -1,14 +1,2 @@ -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/info.json index 6eb5cbd80ec..6bbfa86e124 100644 --- a/keyboards/horrortroll/handwired_k552/info.json +++ b/keyboards/horrortroll/handwired_k552/info.json @@ -48,6 +48,15 @@ "backing_size": 2048 } }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "oled": true, + "wpm": true + }, "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/horrortroll/handwired_k552/rules.mk b/keyboards/horrortroll/handwired_k552/rules.mk index 6d6ec253db3..b2ab6eed6df 100644 --- a/keyboards/horrortroll/handwired_k552/rules.mk +++ b/keyboards/horrortroll/handwired_k552/rules.mk @@ -12,23 +12,3 @@ BOARD = STM32_F103_STM32DUINO BOOTLOADER_TYPE = stm32duino DFU_ARGS = -d 1EAF:0003 -a 2 -R DFU_SUFFIX_ARGS = -v 1EAF -p 0003 - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# RGB Matrix enabled -RGB_MATRIX_ENABLE = yes - -# OLED enabled -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json index 7b0b1c394b3..6303fb70bba 100644 --- a/keyboards/horrortroll/lemon40/info.json +++ b/keyboards/horrortroll/lemon40/info.json @@ -32,6 +32,18 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgblight": true, + "oled": true, + "wpm": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/horrortroll/lemon40/rules.mk b/keyboards/horrortroll/lemon40/rules.mk index 9ac59719d8e..89d3a12a0b6 100644 --- a/keyboards/horrortroll/lemon40/rules.mk +++ b/keyboards/horrortroll/lemon40/rules.mk @@ -1,21 +1 @@ SRC += lib/bongocat.c - -# 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 - -# OLED enabled -OLED_ENABLE = yes -WPM_ENABLE = yes - -# Additional thing to reduce compiled size -LTO_ENABLE = yes diff --git a/keyboards/hotdox/info.json b/keyboards/hotdox/info.json index 8184588e5d7..5d2c3ec5acd 100644 --- a/keyboards/hotdox/info.json +++ b/keyboards/hotdox/info.json @@ -12,6 +12,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true, + "backlight": true, + "unicode": true + }, "tapping": { "toggle": 1 }, diff --git a/keyboards/hotdox/rules.mk b/keyboards/hotdox/rules.mk index 8e11eeabe08..f5dfc77dd19 100644 --- a/keyboards/hotdox/rules.mk +++ b/keyboards/hotdox/rules.mk @@ -1,17 +1,4 @@ -# Build Options -# change yes to no to disable -# CUSTOM_MATRIX = yes # Custom matrix file for the ErgoDone -UNICODE_ENABLE = yes # Unicode -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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -SWAP_HANDS_ENABLE = no # Disable Onehand -RGBLIGHT_ENABLE = no # project specific files SRC = matrix.c \ diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/info.json index f9d77c3513a..63fef233840 100644 --- a/keyboards/hs60/v1/info.json +++ b/keyboards/hs60/v1/info.json @@ -68,6 +68,14 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "raw": true + }, "community_layouts": ["60_ansi", "60_iso"], "layouts": { "LAYOUT_60_iso": { diff --git a/keyboards/hs60/v1/rules.mk b/keyboards/hs60/v1/rules.mk index 7aa0a5ae51d..4af34f6e5bf 100644 --- a/keyboards/hs60/v1/rules.mk +++ b/keyboards/hs60/v1/rules.mk @@ -3,20 +3,6 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix -RAW_ENABLE = yes - # Experimental features for zealcmd please do no enable #RAW_ENABLE = yes #USE_KEYMAPS_IN_EEPROM = yes diff --git a/keyboards/hs60/v2/ansi/info.json b/keyboards/hs60/v2/ansi/info.json index 0debcea8d1f..e0781ef54b5 100644 --- a/keyboards/hs60/v2/ansi/info.json +++ b/keyboards/hs60/v2/ansi/info.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "board": "QMK_PROTON_C", "community_layouts": ["60_ansi"], "layouts": { diff --git a/keyboards/hs60/v2/ansi/rules.mk b/keyboards/hs60/v2/ansi/rules.mk index 96e559f742e..611bb888bac 100644 --- a/keyboards/hs60/v2/ansi/rules.mk +++ b/keyboards/hs60/v2/ansi/rules.mk @@ -3,18 +3,6 @@ # 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 - CIE1931_CURVE = yes # project specific files diff --git a/keyboards/hs60/v2/hhkb/info.json b/keyboards/hs60/v2/hhkb/info.json index 5323fe20f01..d9bc040e23c 100644 --- a/keyboards/hs60/v2/hhkb/info.json +++ b/keyboards/hs60/v2/hhkb/info.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "board": "QMK_PROTON_C", "layouts": { "LAYOUT_60_hhkb": { diff --git a/keyboards/hs60/v2/hhkb/rules.mk b/keyboards/hs60/v2/hhkb/rules.mk index 96e559f742e..611bb888bac 100644 --- a/keyboards/hs60/v2/hhkb/rules.mk +++ b/keyboards/hs60/v2/hhkb/rules.mk @@ -3,18 +3,6 @@ # 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 - CIE1931_CURVE = yes # project specific files diff --git a/keyboards/hs60/v2/iso/info.json b/keyboards/hs60/v2/iso/info.json index c422ae2d727..a51dac05fa2 100644 --- a/keyboards/hs60/v2/iso/info.json +++ b/keyboards/hs60/v2/iso/info.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "board": "QMK_PROTON_C", "community_layouts": ["60_iso"], "layouts": { diff --git a/keyboards/hs60/v2/iso/rules.mk b/keyboards/hs60/v2/iso/rules.mk index 96e559f742e..611bb888bac 100644 --- a/keyboards/hs60/v2/iso/rules.mk +++ b/keyboards/hs60/v2/iso/rules.mk @@ -3,18 +3,6 @@ # 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 - CIE1931_CURVE = yes # project specific files From 9c1662f8f9f28d185ccf0ce1dee084934c896367 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 15 Apr 2024 19:19:23 +0100 Subject: [PATCH 145/333] Migrate build target markers to keyboard.json - TUV (#23514) --- keyboards/tada68/config.h | 39 --------------- keyboards/tada68/{info.json => keyboard.json} | 14 ++++++ keyboards/tada68/keymaps/rgb/config.h | 2 +- keyboards/tada68/keymaps/rgb/rules.mk | 17 ------- keyboards/tada68/rules.mk | 13 ----- keyboards/takashicompany/compacx/config.h | 39 --------------- .../compacx/{info.json => keyboard.json} | 17 +++++++ keyboards/takashicompany/compacx/rules.mk | 14 ------ .../spreadwriter/{info.json => keyboard.json} | 6 +-- .../takashicompany/spreadwriter/rules.mk | 2 - keyboards/takashiski/hecomi/alpha/config.h | 47 ------------------- .../hecomi/alpha/{info.json => keyboard.json} | 15 ++++++ keyboards/takashiski/hecomi/alpha/rules.mk | 12 ----- .../telophase/{info.json => keyboard.json} | 8 ++++ keyboards/telophase/rules.mk | 14 ------ .../tkc/portico/{info.json => keyboard.json} | 7 +++ keyboards/tkc/portico/rules.mk | 16 +------ .../portico75/{info.json => keyboard.json} | 9 ++++ keyboards/tkc/portico75/keymaps/via/rules.mk | 1 + keyboards/tkc/portico75/rules.mk | 15 ------ keyboards/tkw/grandiceps/info.json | 14 +++++- .../rev2/{info.json => keyboard.json} | 0 keyboards/tkw/grandiceps/rules.mk | 17 ------- .../stoutgat/v1/{info.json => keyboard.json} | 7 +++ keyboards/tkw/stoutgat/v1/rules.mk | 14 ------ keyboards/tkw/stoutgat/v2/info.json | 8 ++++ keyboards/tkw/stoutgat/v2/rules.mk | 17 ------- .../alix40/{info.json => keyboard.json} | 8 ++++ keyboards/tokyokeyboard/alix40/rules.mk | 14 ------ .../rev1/{info.json => keyboard.json} | 6 +++ .../tominabox1/littlefoot_lx/rev1/rules.mk | 12 ----- .../rev2/{info.json => keyboard.json} | 6 +++ .../tominabox1/littlefoot_lx/rev2/rules.mk | 12 ----- .../tominabox1/underscore33/rev1/config.h | 21 --------- .../rev1/{info.json => keyboard.json} | 12 +++++ .../tominabox1/underscore33/rev1/rules.mk | 12 ----- .../tominabox1/underscore33/rev2/config.h | 21 --------- .../rev2/{info.json => keyboard.json} | 12 +++++ .../tominabox1/underscore33/rev2/rules.mk | 13 ----- keyboards/torn/{info.json => keyboard.json} | 8 ++++ keyboards/torn/rules.mk | 13 ----- keyboards/touchpad/config.h | 22 --------- .../touchpad/{info.json => keyboard.json} | 13 +++++ keyboards/touchpad/rules.mk | 12 ----- .../nanoboot/{info.json => keyboard.json} | 0 .../rp2040_ce/{info.json => keyboard.json} | 0 .../launch_pad/{info.json => keyboard.json} | 16 +++++++ keyboards/ungodly/launch_pad/rules.mk | 21 --------- .../classic_ultracl_post_2013/info.json | 5 +- .../{info.json => keyboard.json} | 7 +++ .../overnumpad_1xb/rules.mk | 16 ------- .../classic_ultracl_pre_2013/info.json | 5 +- .../{info.json => keyboard.json} | 7 +++ .../overnumpad_1xb/rules.mk | 16 ------- keyboards/unicomp/pc122/info.json | 5 +- .../{info.json => keyboard.json} | 7 +++ .../unicomp/pc122/overnumpad_1xb/rules.mk | 16 ------- .../unicomp/spacesaver_m_post_2013/info.json | 5 +- .../{info.json => keyboard.json} | 7 +++ .../overnumpad_1xb/rules.mk | 16 ------- .../unicomp/spacesaver_m_pre_2013/info.json | 5 +- .../{info.json => keyboard.json} | 7 +++ .../overnumpad_1xb/rules.mk | 16 ------- .../unison/v04/{info.json => keyboard.json} | 11 +++++ keyboards/unison/v04/rules.mk | 15 ------ .../uzu42/rev1/{info.json => keyboard.json} | 7 +++ keyboards/uzu42/{uzu42.c => rev1/rev1.c} | 0 keyboards/uzu42/rev1/rules.mk | 1 - keyboards/uzu42/rules.mk | 14 ------ .../v2/{info.json => keyboard.json} | 7 +++ keyboards/v4n4g0rth0n/v2/rules.mk | 13 ----- .../angle65/{info.json => keyboard.json} | 10 ++++ keyboards/vertex/angle65/rules.mk | 14 ------ .../minne_topre/{info.json => keyboard.json} | 3 -- .../{info.json => keyboard.json} | 0 .../osav2_topre/{info.json => keyboard.json} | 0 .../viktus/sp111/{info.json => keyboard.json} | 9 ++++ keyboards/viktus/sp111/rules.mk | 15 ------ .../styrka_topre/{info.json => keyboard.json} | 0 .../uncertainty/{info.json => keyboard.json} | 0 .../rev1/{info.json => keyboard.json} | 0 keyboards/vitamins_included/rev1/rules.mk | 1 - .../rev2/{info.json => keyboard.json} | 0 83 files changed, 284 insertions(+), 614 deletions(-) delete mode 100755 keyboards/tada68/config.h rename keyboards/tada68/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/takashicompany/compacx/config.h rename keyboards/takashicompany/compacx/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/takashicompany/compacx/rules.mk rename keyboards/takashicompany/spreadwriter/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/takashicompany/spreadwriter/rules.mk delete mode 100644 keyboards/takashiski/hecomi/alpha/config.h rename keyboards/takashiski/hecomi/alpha/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/takashiski/hecomi/alpha/rules.mk rename keyboards/telophase/{info.json => keyboard.json} (94%) rename keyboards/tkc/portico/{info.json => keyboard.json} (97%) rename keyboards/tkc/portico75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/tkc/portico75/rules.mk rename keyboards/tkw/grandiceps/rev2/{info.json => keyboard.json} (100%) rename keyboards/tkw/stoutgat/v1/{info.json => keyboard.json} (99%) rename keyboards/tokyokeyboard/alix40/{info.json => keyboard.json} (95%) rename keyboards/tominabox1/littlefoot_lx/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/tominabox1/littlefoot_lx/rev1/rules.mk rename keyboards/tominabox1/littlefoot_lx/rev2/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/tominabox1/littlefoot_lx/rev2/rules.mk delete mode 100644 keyboards/tominabox1/underscore33/rev1/config.h rename keyboards/tominabox1/underscore33/rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/tominabox1/underscore33/rev1/rules.mk delete mode 100644 keyboards/tominabox1/underscore33/rev2/config.h rename keyboards/tominabox1/underscore33/rev2/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/tominabox1/underscore33/rev2/rules.mk rename keyboards/torn/{info.json => keyboard.json} (94%) rename keyboards/touchpad/{info.json => keyboard.json} (89%) rename keyboards/tweetydabird/lotus58/nanoboot/{info.json => keyboard.json} (100%) rename keyboards/tweetydabird/lotus58/rp2040_ce/{info.json => keyboard.json} (100%) rename keyboards/ungodly/launch_pad/{info.json => keyboard.json} (86%) rename keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/{info.json => keyboard.json} (85%) rename keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/{info.json => keyboard.json} (85%) rename keyboards/unicomp/pc122/overnumpad_1xb/{info.json => keyboard.json} (84%) rename keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/{info.json => keyboard.json} (84%) rename keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/{info.json => keyboard.json} (84%) rename keyboards/unison/v04/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/unison/v04/rules.mk rename keyboards/uzu42/rev1/{info.json => keyboard.json} (95%) rename keyboards/uzu42/{uzu42.c => rev1/rev1.c} (100%) delete mode 100644 keyboards/uzu42/rev1/rules.mk rename keyboards/v4n4g0rth0n/v2/{info.json => keyboard.json} (67%) rename keyboards/vertex/angle65/{info.json => keyboard.json} (96%) rename keyboards/viktus/minne_topre/{info.json => keyboard.json} (99%) rename keyboards/viktus/osav2_numpad_topre/{info.json => keyboard.json} (100%) rename keyboards/viktus/osav2_topre/{info.json => keyboard.json} (100%) rename keyboards/viktus/sp111/{info.json => keyboard.json} (99%) rename keyboards/viktus/styrka_topre/{info.json => keyboard.json} (100%) rename keyboards/vinhcatba/uncertainty/{info.json => keyboard.json} (100%) rename keyboards/vitamins_included/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/vitamins_included/rev1/rules.mk rename keyboards/vitamins_included/rev2/{info.json => keyboard.json} (100%) diff --git a/keyboards/tada68/config.h b/keyboards/tada68/config.h deleted file mode 100755 index b9449c4714b..00000000000 --- a/keyboards/tada68/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/tada68/info.json b/keyboards/tada68/keyboard.json similarity index 97% rename from keyboards/tada68/info.json rename to keyboards/tada68/keyboard.json index 1311017d361..641def01a31 100644 --- a/keyboards/tada68/info.json +++ b/keyboards/tada68/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x0001", "device_version": "0.0.3" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], "rows": ["D0", "D1", "F6", "F7", "D5"] diff --git a/keyboards/tada68/keymaps/rgb/config.h b/keyboards/tada68/keymaps/rgb/config.h index 21ddfa1850e..363a41accd6 100755 --- a/keyboards/tada68/keymaps/rgb/config.h +++ b/keyboards/tada68/keymaps/rgb/config.h @@ -1,4 +1,4 @@ -#include "../../config.h" +#pragma once /* WS2812B RGB Underglow LED */ #define WS2812_DI_PIN F5 // See readme.md for wiring your led's diff --git a/keyboards/tada68/keymaps/rgb/rules.mk b/keyboards/tada68/keymaps/rgb/rules.mk index 7cffca44fad..c777cb1b9ff 100644 --- a/keyboards/tada68/keymaps/rgb/rules.mk +++ b/keyboards/tada68/keymaps/rgb/rules.mk @@ -1,18 +1 @@ -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -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 # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - diff --git a/keyboards/tada68/rules.mk b/keyboards/tada68/rules.mk index 01310bd4ea0..e22d5248895 100755 --- a/keyboards/tada68/rules.mk +++ b/keyboards/tada68/rules.mk @@ -1,15 +1,2 @@ # This board uses the older unsafe 6k version of lufa-ms BOOTLOADER_SIZE = 6144 - -# 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 -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h deleted file mode 100644 index 7b4e38bd964..00000000000 --- a/keyboards/takashicompany/compacx/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 takashicompany - -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/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/keyboard.json similarity index 94% rename from keyboards/takashicompany/compacx/info.json rename to keyboards/takashicompany/compacx/keyboard.json index 08dcbfee54b..b4460cce770 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/keyboard.json @@ -8,6 +8,23 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/takashicompany/compacx/rules.mk b/keyboards/takashicompany/compacx/rules.mk deleted file mode 100644 index 25fcdc1a34c..00000000000 --- a/keyboards/takashicompany/compacx/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/takashicompany/spreadwriter/info.json b/keyboards/takashicompany/spreadwriter/keyboard.json similarity index 98% rename from keyboards/takashicompany/spreadwriter/info.json rename to keyboards/takashicompany/spreadwriter/keyboard.json index da5a95b8957..2c9fcd1619a 100644 --- a/keyboards/takashicompany/spreadwriter/info.json +++ b/keyboards/takashicompany/spreadwriter/keyboard.json @@ -6,11 +6,11 @@ "diode_direction": "COL2ROW", "features": { "bootmagic": true, - "command": false, - "console": false, + "encoder": true, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgblight": true }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"], diff --git a/keyboards/takashicompany/spreadwriter/rules.mk b/keyboards/takashicompany/spreadwriter/rules.mk deleted file mode 100644 index 248f19320f0..00000000000 --- a/keyboards/takashicompany/spreadwriter/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -ENCODER_ENABLE = yes -RGBLIGHT_ENABLE = yes \ No newline at end of file diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h deleted file mode 100644 index 1c14611b2b9..00000000000 --- a/keyboards/takashiski/hecomi/alpha/config.h +++ /dev/null @@ -1,47 +0,0 @@ -/* -Copyright 2018 takashiski - -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 - -//#define USE_I2C - -/* 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 - -/* -#define USE_I2C -#define MASTER_LEFT -#define EEHANDS -*/ diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/keyboard.json similarity index 94% rename from keyboards/takashiski/hecomi/alpha/info.json rename to keyboards/takashiski/hecomi/alpha/keyboard.json index 767f787e5e3..0a6bf513f0c 100644 --- a/keyboards/takashiski/hecomi/alpha/info.json +++ b/keyboards/takashiski/hecomi/alpha/keyboard.json @@ -8,6 +8,21 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/takashiski/hecomi/alpha/rules.mk b/keyboards/takashiski/hecomi/alpha/rules.mk deleted file mode 100644 index 98c2f6b6a7f..00000000000 --- a/keyboards/takashiski/hecomi/alpha/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/telophase/info.json b/keyboards/telophase/keyboard.json similarity index 94% rename from keyboards/telophase/info.json rename to keyboards/telophase/keyboard.json index 2dd6c5dc783..8efbae55195 100644 --- a/keyboards/telophase/info.json +++ b/keyboards/telophase/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/telophase/rules.mk b/keyboards/telophase/rules.mk index 706d6106538..ae63f87e079 100644 --- a/keyboards/telophase/rules.mk +++ b/keyboards/telophase/rules.mk @@ -1,18 +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 = 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 SRC += matrix.c UART_DRIVER_REQUIRED = yes diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/keyboard.json similarity index 97% rename from keyboards/tkc/portico/info.json rename to keyboards/tkc/portico/keyboard.json index 4f908c83e62..29b7d8246b2 100644 --- a/keyboards/tkc/portico/info.json +++ b/keyboards/tkc/portico/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/tkc/portico/rules.mk b/keyboards/tkc/portico/rules.mk index 6bc05372aff..4263ceb1684 100644 --- a/keyboards/tkc/portico/rules.mk +++ b/keyboards/tkc/portico/rules.mk @@ -1,22 +1,8 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = no CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC += keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c - -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/keyboard.json similarity index 96% rename from keyboards/tkc/portico75/info.json rename to keyboards/tkc/portico75/keyboard.json index fa2a24951fa..79ead697648 100644 --- a/keyboards/tkc/portico75/info.json +++ b/keyboards/tkc/portico75/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/tkc/portico75/keymaps/via/rules.mk b/keyboards/tkc/portico75/keymaps/via/rules.mk index 1706771222e..81628aba6ba 100644 --- a/keyboards/tkc/portico75/keymaps/via/rules.mk +++ b/keyboards/tkc/portico75/keymaps/via/rules.mk @@ -10,3 +10,4 @@ SRC += keyboards/wilba_tech/wt_main.c \ drivers/led/issi/is31fl3741.c I2C_DRIVER_REQUIRED = yes +CIE1931_CURVE = yes diff --git a/keyboards/tkc/portico75/rules.mk b/keyboards/tkc/portico75/rules.mk deleted file mode 100644 index 36e22b992da..00000000000 --- a/keyboards/tkc/portico75/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix -CIE1931_CURVE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json index 7700780b2e8..507f4c47926 100644 --- a/keyboards/tkw/grandiceps/info.json +++ b/keyboards/tkw/grandiceps/info.json @@ -4,7 +4,19 @@ "maintainer": "vattern", "usb": { "vid": "0xFEED", - "pid": "0x7812" + "pid": "0x7812", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true }, "ws2812": { "pin": "B1", diff --git a/keyboards/tkw/grandiceps/rev2/info.json b/keyboards/tkw/grandiceps/rev2/keyboard.json similarity index 100% rename from keyboards/tkw/grandiceps/rev2/info.json rename to keyboards/tkw/grandiceps/rev2/keyboard.json diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk index 5b78d6fe55c..01fa5217635 100644 --- a/keyboards/tkw/grandiceps/rules.mk +++ b/keyboards/tkw/grandiceps/rules.mk @@ -1,20 +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 = yes # Enable keyboard RGB underglow -ENCODER_ENABLE = yes # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra - SERIAL_DRIVER = usart -OLED_ENABLE = yes -OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE DEFAULT_FOLDER = tkw/grandiceps/rev1 diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/keyboard.json similarity index 99% rename from keyboards/tkw/stoutgat/v1/info.json rename to keyboards/tkw/stoutgat/v1/keyboard.json index 9d7a60a4b97..2dd46af4947 100644 --- a/keyboards/tkw/stoutgat/v1/info.json +++ b/keyboards/tkw/stoutgat/v1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x7811", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D6", "D5", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"], "rows": ["D1", "D0", "A0", "A1", "A2"] diff --git a/keyboards/tkw/stoutgat/v1/rules.mk b/keyboards/tkw/stoutgat/v1/rules.mk index 8dca0665f77..c2ee0bc86f9 100644 --- a/keyboards/tkw/stoutgat/v1/rules.mk +++ b/keyboards/tkw/stoutgat/v1/rules.mk @@ -1,16 +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 -ENCODER_ENABLE = yes diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json index b1232f6816e..dbb227b0fdc 100644 --- a/keyboards/tkw/stoutgat/v2/info.json +++ b/keyboards/tkw/stoutgat/v2/info.json @@ -8,6 +8,14 @@ "pid": "0x7811", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "ws2812": { "pin": "B1", "driver": "pwm" diff --git a/keyboards/tkw/stoutgat/v2/rules.mk b/keyboards/tkw/stoutgat/v2/rules.mk index 477d680add8..1a660af26c9 100644 --- a/keyboards/tkw/stoutgat/v2/rules.mk +++ b/keyboards/tkw/stoutgat/v2/rules.mk @@ -1,18 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra -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 = yes # Enable keyboard RGB underglow -ENCODER_ENABLE = yes # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output - -OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE - DEFAULT_FOLDER = tkw/stoutgat/v2/f411 diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/keyboard.json similarity index 95% rename from keyboards/tokyokeyboard/alix40/info.json rename to keyboards/tokyokeyboard/alix40/keyboard.json index 7b2f198e596..e4c27aaec21 100644 --- a/keyboards/tokyokeyboard/alix40/info.json +++ b/keyboards/tokyokeyboard/alix40/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4134", "device_version": "0.0.1" }, + "features": { + "bluetooth": true, + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D0", "D1", "D2", "D3", "D5", "D6"], "rows": ["D7", "C6", "C7", "B5"] diff --git a/keyboards/tokyokeyboard/alix40/rules.mk b/keyboards/tokyokeyboard/alix40/rules.mk index 5d6d78ae10a..3437a35bdf1 100644 --- a/keyboards/tokyokeyboard/alix40/rules.mk +++ b/keyboards/tokyokeyboard/alix40/rules.mk @@ -1,16 +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 = 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 -BLUETOOTH_ENABLE = yes diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/info.json b/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json similarity index 97% rename from keyboards/tominabox1/littlefoot_lx/rev1/info.json rename to keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json index be22362de21..b021ba9c8d4 100644 --- a/keyboards/tominabox1/littlefoot_lx/rev1/info.json +++ b/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x6C78", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "D6", "D4", "E2", "F5", "F6", "F7", "B6", "B5", "B4"], "rows": ["D5", "F4", "D3", "F1", "F0"] diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk b/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk deleted file mode 100644 index 964fd155399..00000000000 --- a/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk +++ /dev/null @@ -1,12 +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 = 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/tominabox1/littlefoot_lx/rev2/info.json b/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json similarity index 97% rename from keyboards/tominabox1/littlefoot_lx/rev2/info.json rename to keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json index 6a48b5076b4..fe1cf6e5960 100644 --- a/keyboards/tominabox1/littlefoot_lx/rev2/info.json +++ b/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x6C78", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "D6", "D4", "C7", "F5", "F6", "F7", "B6", "B5", "B4"], "rows": ["D5", "F4", "D3", "F1", "F0"] diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk b/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk deleted file mode 100644 index 964fd155399..00000000000 --- a/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk +++ /dev/null @@ -1,12 +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 = 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/tominabox1/underscore33/rev1/config.h b/keyboards/tominabox1/underscore33/rev1/config.h deleted file mode 100644 index 333d0a100eb..00000000000 --- a/keyboards/tominabox1/underscore33/rev1/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 tominabox1 - * - * 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 diff --git a/keyboards/tominabox1/underscore33/rev1/info.json b/keyboards/tominabox1/underscore33/rev1/keyboard.json similarity index 95% rename from keyboards/tominabox1/underscore33/rev1/info.json rename to keyboards/tominabox1/underscore33/rev1/keyboard.json index c52c1b13730..221ecccb041 100644 --- a/keyboards/tominabox1/underscore33/rev1/info.json +++ b/keyboards/tominabox1/underscore33/rev1/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x3301", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "B5", "D5", "F7", "B1", "F4", "B3", "D7", "B0", "B2"], "rows": ["F5", "F6", "C6", "D0"] diff --git a/keyboards/tominabox1/underscore33/rev1/rules.mk b/keyboards/tominabox1/underscore33/rev1/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/tominabox1/underscore33/rev1/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 = 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/tominabox1/underscore33/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h deleted file mode 100644 index 333d0a100eb..00000000000 --- a/keyboards/tominabox1/underscore33/rev2/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 tominabox1 - * - * 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 diff --git a/keyboards/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/keyboard.json similarity index 95% rename from keyboards/tominabox1/underscore33/rev2/info.json rename to keyboards/tominabox1/underscore33/rev2/keyboard.json index b9c8b87b502..4375116963f 100644 --- a/keyboards/tominabox1/underscore33/rev2/info.json +++ b/keyboards/tominabox1/underscore33/rev2/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x3302", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "led_count": 12, "animations": { diff --git a/keyboards/tominabox1/underscore33/rev2/rules.mk b/keyboards/tominabox1/underscore33/rev2/rules.mk deleted file mode 100644 index dd8f1a5ae7d..00000000000 --- a/keyboards/tominabox1/underscore33/rev2/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/torn/info.json b/keyboards/torn/keyboard.json similarity index 94% rename from keyboards/torn/info.json rename to keyboards/torn/keyboard.json index c1b83188f06..162e7d08c0e 100644 --- a/keyboards/torn/info.json +++ b/keyboards/torn/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": false, + "mousekey": false, + "oled": true, + "wpm": true + }, "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B1"} diff --git a/keyboards/torn/rules.mk b/keyboards/torn/rules.mk index f855a651a55..213b5db8ab8 100644 --- a/keyboards/torn/rules.mk +++ b/keyboards/torn/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 = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = yes # Enable rotary encoder -OLED_ENABLE = yes -WPM_ENABLE = yes CUSTOM_MATRIX = lite SRC += matrix.c \ diff --git a/keyboards/touchpad/config.h b/keyboards/touchpad/config.h index d499fb795c3..f6f58cc5a12 100644 --- a/keyboards/touchpad/config.h +++ b/keyboards/touchpad/config.h @@ -17,28 +17,6 @@ along with this program. If not, see . #pragma once - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 6 - -/* 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/touchpad/info.json b/keyboards/touchpad/keyboard.json similarity index 89% rename from keyboards/touchpad/info.json rename to keyboards/touchpad/keyboard.json index 7b3cc0950d9..5429b5844db 100644 --- a/keyboards/touchpad/info.json +++ b/keyboards/touchpad/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0DB8", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/touchpad/rules.mk b/keyboards/touchpad/rules.mk index b9fb83c48c7..42be966784a 100644 --- a/keyboards/touchpad/rules.mk +++ b/keyboards/touchpad/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 = 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/tweetydabird/lotus58/nanoboot/info.json b/keyboards/tweetydabird/lotus58/nanoboot/keyboard.json similarity index 100% rename from keyboards/tweetydabird/lotus58/nanoboot/info.json rename to keyboards/tweetydabird/lotus58/nanoboot/keyboard.json diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/info.json b/keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json similarity index 100% rename from keyboards/tweetydabird/lotus58/rp2040_ce/info.json rename to keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/keyboard.json similarity index 86% rename from keyboards/ungodly/launch_pad/info.json rename to keyboards/ungodly/launch_pad/keyboard.json index d9d0ea30edd..50b6c2bcbf6 100644 --- a/keyboards/ungodly/launch_pad/info.json +++ b/keyboards/ungodly/launch_pad/keyboard.json @@ -8,6 +8,22 @@ "pid": "0x4C50", "device_version": "99.9.9" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "midi": true, + "mousekey": false, + "nkro": true, + "oled": true, + "rgb_matrix": true, + "magic": false, + "grave_esc": false, + "space_cadet": false + }, "rgb_matrix": { "animations": { "gradient_left_right": true, diff --git a/keyboards/ungodly/launch_pad/rules.mk b/keyboards/ungodly/launch_pad/rules.mk index 31fabc928ca..cc588202788 100644 --- a/keyboards/ungodly/launch_pad/rules.mk +++ b/keyboards/ungodly/launch_pad/rules.mk @@ -1,22 +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 -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 -MIDI_ENABLE = yes -OLED_ENABLE = yes -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes -SPACE_CADET_ENABLE = no -MAGIC_ENABLE = no -GRAVE_ESC_ENABLE = no -LTO_ENABLE = yes - ANALOG_DRIVER_REQUIRED = yes diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json index f92299e9fa4..98138b87dd7 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json similarity index 85% rename from keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json rename to keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json index 13615db22d4..0ef2cc4d5ed 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json +++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "maintainer": "purdeaandrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/classic_ultracl_post_2013/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/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json index a8dcd9418fb..3072222ea6e 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "community_layouts": ["fullsize_ansi", "fullsize_iso"], "layouts": { diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json similarity index 85% rename from keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json rename to keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json index 1c2f5b300bd..30264dd537d 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json +++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/classic_ultracl_pre_2013/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/unicomp/pc122/info.json b/keyboards/unicomp/pc122/info.json index 162495c25b8..0847f665043 100644 --- a/keyboards/unicomp/pc122/info.json +++ b/keyboards/unicomp/pc122/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/info.json b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json similarity index 84% rename from keyboards/unicomp/pc122/overnumpad_1xb/info.json rename to keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json index 16e39168231..936e286af1d 100644 --- a/keyboards/unicomp/pc122/overnumpad_1xb/info.json +++ b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/pc122/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/unicomp/spacesaver_m_post_2013/info.json b/keyboards/unicomp/spacesaver_m_post_2013/info.json index 52eb4d80368..f5d783b1265 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_post_2013/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json similarity index 84% rename from keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json rename to keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json index cf25addc9e2..9fd91ce48fc 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json +++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C12" }, diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/spacesaver_m_post_2013/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/unicomp/spacesaver_m_pre_2013/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/info.json index 166baaca416..6ac69a66aab 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_pre_2013/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json similarity index 84% rename from keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json rename to keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json index 31fc97a527f..db772e46e24 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json +++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C12" }, diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/spacesaver_m_pre_2013/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/unison/v04/info.json b/keyboards/unison/v04/keyboard.json similarity index 97% rename from keyboards/unison/v04/info.json rename to keyboards/unison/v04/keyboard.json index 7b182df2515..14f495aa2ca 100644 --- a/keyboards/unison/v04/info.json +++ b/keyboards/unison/v04/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x176A", "device_version": "0.4.0" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "encoder": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"], "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"] diff --git a/keyboards/unison/v04/rules.mk b/keyboards/unison/v04/rules.mk deleted file mode 100644 index b4fc6e0d29e..00000000000 --- a/keyboards/unison/v04/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# 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 = no # Audio output -ENCODER_ENABLE = no # Rotary Encoder - -LTO_ENABLE = yes diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/keyboard.json similarity index 95% rename from keyboards/uzu42/rev1/info.json rename to keyboards/uzu42/rev1/keyboard.json index c7d6f7159bb..71d9f424cc8 100644 --- a/keyboards/uzu42/rev1/info.json +++ b/keyboards/uzu42/rev1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/uzu42/uzu42.c b/keyboards/uzu42/rev1/rev1.c similarity index 100% rename from keyboards/uzu42/uzu42.c rename to keyboards/uzu42/rev1/rev1.c diff --git a/keyboards/uzu42/rev1/rules.mk b/keyboards/uzu42/rev1/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/uzu42/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/uzu42/rules.mk b/keyboards/uzu42/rules.mk index 49b64b12745..277e74b7153 100644 --- a/keyboards/uzu42/rules.mk +++ b/keyboards/uzu42/rules.mk @@ -1,15 +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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -OLED_ENABLE = no # OLED display - DEFAULT_FOLDER = uzu42/rev1 diff --git a/keyboards/v4n4g0rth0n/v2/info.json b/keyboards/v4n4g0rth0n/v2/keyboard.json similarity index 67% rename from keyboards/v4n4g0rth0n/v2/info.json rename to keyboards/v4n4g0rth0n/v2/keyboard.json index 6959188be9a..c43848178f2 100644 --- a/keyboards/v4n4g0rth0n/v2/info.json +++ b/keyboards/v4n4g0rth0n/v2/keyboard.json @@ -2,6 +2,13 @@ "usb": { "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "B0"], "rows": ["C7", "C6", "B6", "B5", "B7"] diff --git a/keyboards/v4n4g0rth0n/v2/rules.mk b/keyboards/v4n4g0rth0n/v2/rules.mk index 01145044866..cc588202788 100644 --- a/keyboards/v4n4g0rth0n/v2/rules.mk +++ b/keyboards/v4n4g0rth0n/v2/rules.mk @@ -1,14 +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 = 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 - ANALOG_DRIVER_REQUIRED = yes diff --git a/keyboards/vertex/angle65/info.json b/keyboards/vertex/angle65/keyboard.json similarity index 96% rename from keyboards/vertex/angle65/info.json rename to keyboards/vertex/angle65/keyboard.json index 096e89555aa..962b3fd4f11 100644 --- a/keyboards/vertex/angle65/info.json +++ b/keyboards/vertex/angle65/keyboard.json @@ -9,6 +9,16 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "processor": "STM32F103", "bootloader": "stm32duino", "matrix_pins": { diff --git a/keyboards/vertex/angle65/rules.mk b/keyboards/vertex/angle65/rules.mk index 330f6ff76b8..a521203b326 100644 --- a/keyboards/vertex/angle65/rules.mk +++ b/keyboards/vertex/angle65/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/keyboard.json similarity index 99% rename from keyboards/viktus/minne_topre/info.json rename to keyboards/viktus/minne_topre/keyboard.json index 7928430015d..6919e7f9ccd 100644 --- a/keyboards/viktus/minne_topre/info.json +++ b/keyboards/viktus/minne_topre/keyboard.json @@ -18,9 +18,6 @@ "mousekey": true, "nkro": true }, - "bootmagic": { - "matrix": [0, 0] - }, "build": { "lto": true }, diff --git a/keyboards/viktus/osav2_numpad_topre/info.json b/keyboards/viktus/osav2_numpad_topre/keyboard.json similarity index 100% rename from keyboards/viktus/osav2_numpad_topre/info.json rename to keyboards/viktus/osav2_numpad_topre/keyboard.json diff --git a/keyboards/viktus/osav2_topre/info.json b/keyboards/viktus/osav2_topre/keyboard.json similarity index 100% rename from keyboards/viktus/osav2_topre/info.json rename to keyboards/viktus/osav2_topre/keyboard.json diff --git a/keyboards/viktus/sp111/info.json b/keyboards/viktus/sp111/keyboard.json similarity index 99% rename from keyboards/viktus/sp111/info.json rename to keyboards/viktus/sp111/keyboard.json index 67f5b63bcaf..a309c14afe3 100644 --- a/keyboards/viktus/sp111/info.json +++ b/keyboards/viktus/sp111/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x5111", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/viktus/sp111/rules.mk b/keyboards/viktus/sp111/rules.mk index 1be8c7ad68a..d9b01484992 100644 --- a/keyboards/viktus/sp111/rules.mk +++ b/keyboards/viktus/sp111/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 -LTO_ENABLE = yes # Smaller (and slightly faster) firmware - - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/viktus/styrka_topre/info.json b/keyboards/viktus/styrka_topre/keyboard.json similarity index 100% rename from keyboards/viktus/styrka_topre/info.json rename to keyboards/viktus/styrka_topre/keyboard.json diff --git a/keyboards/vinhcatba/uncertainty/info.json b/keyboards/vinhcatba/uncertainty/keyboard.json similarity index 100% rename from keyboards/vinhcatba/uncertainty/info.json rename to keyboards/vinhcatba/uncertainty/keyboard.json diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/keyboard.json similarity index 100% rename from keyboards/vitamins_included/rev1/info.json rename to keyboards/vitamins_included/rev1/keyboard.json diff --git a/keyboards/vitamins_included/rev1/rules.mk b/keyboards/vitamins_included/rev1/rules.mk deleted file mode 100644 index 3bbd2614291..00000000000 --- a/keyboards/vitamins_included/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionally blank diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/keyboard.json similarity index 100% rename from keyboards/vitamins_included/rev2/info.json rename to keyboards/vitamins_included/rev2/keyboard.json From 3c9dd3680991479a70de9f68c1cf2f8af788dad6 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:22:31 -0700 Subject: [PATCH 146/333] Data-Driven Keyboard Conversions: H, Part 2 (#23525) --- keyboards/handwired/108key_trackpoint/info.json | 10 ++++++++++ keyboards/handwired/108key_trackpoint/rules.mk | 14 -------------- .../handwired/10k/{info.json => keyboard.json} | 3 +++ keyboards/handwired/10k/rules.mk | 1 - keyboards/handwired/42/info.json | 7 +++++++ keyboards/handwired/42/rules.mk | 15 --------------- keyboards/handwired/aball/info.json | 6 ++++++ keyboards/handwired/aball/rules.mk | 15 --------------- .../handwired/battleship_gamepad/info.json | 7 +++++++ keyboards/handwired/battleship_gamepad/rules.mk | 13 ------------- keyboards/handwired/bdn9_ble/info.json | 9 +++++++++ keyboards/handwired/bdn9_ble/rules.mk | 15 --------------- .../bento/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/bento/rev1/rules.mk | 13 ------------- keyboards/handwired/cyberstar/info.json | 7 +++++++ keyboards/handwired/cyberstar/rules.mk | 13 ------------- keyboards/handwired/d48/info.json | 12 ++++++++++++ keyboards/handwired/d48/rules.mk | 17 ----------------- keyboards/handwired/dactyl/info.json | 8 ++++++++ keyboards/handwired/dactyl/rules.mk | 15 +-------------- .../6x6/blackpill_f411/info.json | 7 +++++++ .../dactyl_manuform/6x6/blackpill_f411/rules.mk | 13 ------------- .../dactyl_manuform/6x6/promicro/keyboard.json | 8 +++++++- .../handwired/dactyl_manuform/6x6/rules.mk | 13 ------------- keyboards/handwired/datahand/info.json | 8 ++++++++ keyboards/handwired/datahand/rules.mk | 13 +------------ keyboards/handwired/dqz11n1g/info.json | 7 +++++++ keyboards/handwired/dqz11n1g/rules.mk | 14 -------------- keyboards/handwired/dygma/raise/info.json | 6 ++++++ keyboards/handwired/dygma/raise/rules.mk | 13 ------------- keyboards/handwired/frenchdev/info.json | 8 ++++++++ keyboards/handwired/frenchdev/rules.mk | 14 +------------- keyboards/handwired/fruity60/info.json | 7 +++++++ keyboards/handwired/fruity60/rules.mk | 14 -------------- .../{info.json => keyboard.json} | 12 +++++++++++- keyboards/handwired/hacked_motospeed/rules.mk | 14 -------------- keyboards/handwired/lagrange/info.json | 10 ++++++++++ keyboards/handwired/lagrange/rules.mk | 15 --------------- keyboards/handwired/m40/5x5_macropad/info.json | 6 ++++++ keyboards/handwired/m40/5x5_macropad/rules.mk | 15 +-------------- .../f401/{info.json => keyboard.json} | 12 ++++++++++++ keyboards/handwired/macroboard/f401/rules.mk | 13 ------------- keyboards/handwired/macroboard/f411/info.json | 13 +++++++++++++ keyboards/handwired/macroboard/f411/rules.mk | 13 ------------- keyboards/handwired/meck_tkl/info.json | 7 +++++++ keyboards/handwired/meck_tkl/rules.mk | 12 ------------ .../myskeeb/{info.json => keyboard.json} | 10 +++++++++- keyboards/handwired/myskeeb/rules.mk | 14 -------------- 48 files changed, 200 insertions(+), 320 deletions(-) rename keyboards/handwired/10k/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/10k/rules.mk rename keyboards/handwired/bento/rev1/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/handwired/bento/rev1/rules.mk rename keyboards/handwired/hacked_motospeed/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/handwired/hacked_motospeed/rules.mk rename keyboards/handwired/macroboard/f401/{info.json => keyboard.json} (56%) delete mode 100644 keyboards/handwired/macroboard/f401/rules.mk rename keyboards/handwired/myskeeb/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/myskeeb/rules.mk diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/info.json index 605c77875d2..396b4c33cb5 100644 --- a/keyboards/handwired/108key_trackpoint/info.json +++ b/keyboards/handwired/108key_trackpoint/info.json @@ -15,6 +15,16 @@ "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "ps2_mouse": true, + "ps2": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/108key_trackpoint/rules.mk b/keyboards/handwired/108key_trackpoint/rules.mk index acdf7bf3932..74035c9903b 100644 --- a/keyboards/handwired/108key_trackpoint/rules.mk +++ b/keyboards/handwired/108key_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 = yes # 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 = yes -PS2_ENABLE = yes PS2_DRIVER = usart diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/keyboard.json similarity index 97% rename from keyboards/handwired/10k/info.json rename to keyboards/handwired/10k/keyboard.json index 9b0164ed85e..a3293601e3a 100644 --- a/keyboards/handwired/10k/info.json +++ b/keyboards/handwired/10k/keyboard.json @@ -7,6 +7,9 @@ "cols": ["C6", "D7", "E6", "B4", "B5"], "rows": ["B6"] }, + "build": { + "lto": true + }, "features": { "bootmagic": false, "command": false, diff --git a/keyboards/handwired/10k/rules.mk b/keyboards/handwired/10k/rules.mk deleted file mode 100644 index 4da205a168c..00000000000 --- a/keyboards/handwired/10k/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/info.json index e2cc8dbf716..d68dcd1ec2f 100644 --- a/keyboards/handwired/42/info.json +++ b/keyboards/handwired/42/info.json @@ -21,6 +21,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "bluetooth": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/42/rules.mk b/keyboards/handwired/42/rules.mk index 0c5b506f63f..3437a35bdf1 100644 --- a/keyboards/handwired/42/rules.mk +++ b/keyboards/handwired/42/rules.mk @@ -1,17 +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 = yes # 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/aball/info.json b/keyboards/handwired/aball/info.json index 173abdfb60a..6ab686c5186 100644 --- a/keyboards/handwired/aball/info.json +++ b/keyboards/handwired/aball/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": false, + "pointing_device": true + }, "matrix_pins": { "direct": [ [null] diff --git a/keyboards/handwired/aball/rules.mk b/keyboards/handwired/aball/rules.mk index d5e8e6ab985..84de35aeb14 100644 --- a/keyboards/handwired/aball/rules.mk +++ b/keyboards/handwired/aball/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 = 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 - -# Add trackball support -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = adns9800 diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/info.json index 06ef96ba21e..3b4010ce40c 100644 --- a/keyboards/handwired/battleship_gamepad/info.json +++ b/keyboards/handwired/battleship_gamepad/info.json @@ -15,6 +15,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "joystick": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/battleship_gamepad/rules.mk b/keyboards/handwired/battleship_gamepad/rules.mk index a41273f8900..c5ab560bca9 100644 --- a/keyboards/handwired/battleship_gamepad/rules.mk +++ b/keyboards/handwired/battleship_gamepad/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 = 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 -JOYSTICK_ENABLE = yes JOYSTICK_DRIVER = analog diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json index e5c94794537..76d9e42f83c 100644 --- a/keyboards/handwired/bdn9_ble/info.json +++ b/keyboards/handwired/bdn9_ble/info.json @@ -18,6 +18,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "backlight": true, + "bluetooth": true + }, "matrix_pins": { "direct": [ ["D1", "D0", "C6"], diff --git a/keyboards/handwired/bdn9_ble/rules.mk b/keyboards/handwired/bdn9_ble/rules.mk index 0dafe2f289e..3437a35bdf1 100644 --- a/keyboards/handwired/bdn9_ble/rules.mk +++ b/keyboards/handwired/bdn9_ble/rules.mk @@ -1,17 +1,2 @@ # 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 = yes # 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 -ENCODER_ENABLE = no -BLUETOOTH_ENABLE = yes diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/keyboard.json similarity index 87% rename from keyboards/handwired/bento/rev1/info.json rename to keyboards/handwired/bento/rev1/keyboard.json index 6730c14a361..3baa7d77ce4 100644 --- a/keyboards/handwired/bento/rev1/info.json +++ b/keyboards/handwired/bento/rev1/keyboard.json @@ -36,6 +36,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true, + "encoder": true + }, "matrix_pins": { "direct": [ ["D7", "B1", "D2"], diff --git a/keyboards/handwired/bento/rev1/rules.mk b/keyboards/handwired/bento/rev1/rules.mk deleted file mode 100644 index 6a4a0677378..00000000000 --- a/keyboards/handwired/bento/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json index 6b2db46b1f0..344c576462d 100644 --- a/keyboards/handwired/cyberstar/info.json +++ b/keyboards/handwired/cyberstar/info.json @@ -36,6 +36,13 @@ "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_split_space_split_bs" }, diff --git a/keyboards/handwired/cyberstar/rules.mk b/keyboards/handwired/cyberstar/rules.mk index cc9d7bb3f53..0ab54aaaf71 100644 --- a/keyboards/handwired/cyberstar/rules.mk +++ b/keyboards/handwired/cyberstar/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json index 295fead5879..e5ee61093e9 100644 --- a/keyboards/handwired/d48/info.json +++ b/keyboards/handwired/d48/info.json @@ -44,6 +44,18 @@ }, "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "nkro": true, + "audio": true, + "rgblight": true, + "encoder": true, + "oled": true, + "unicode": true + }, "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/d48/rules.mk b/keyboards/handwired/d48/rules.mk index 7fa8dfdd340..62866f887a6 100644 --- a/keyboards/handwired/d48/rules.mk +++ b/keyboards/handwired/d48/rules.mk @@ -1,18 +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 = 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 -AUDIO_ENABLE = yes -USE_I2C = no -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes -OLED_ENABLE = yes -UNICODE_ENABLE = yes - SRC += ds1307.c taphold.c diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/info.json index e95c380d9c0..339119e6fd4 100644 --- a/keyboards/handwired/dactyl/info.json +++ b/keyboards/handwired/dactyl/info.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "unicode": true, + "swap_hands": true + }, "debounce": 15, "tapping": { "toggle": 1 diff --git a/keyboards/handwired/dactyl/rules.mk b/keyboards/handwired/dactyl/rules.mk index bffd901b04d..35b5df19738 100644 --- a/keyboards/handwired/dactyl/rules.mk +++ b/keyboards/handwired/dactyl/rules.mk @@ -1,17 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -POINTING_DEVICE_ENABLE = no -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 -CUSTOM_MATRIX = yes # Custom matrix file for the Dactyl -NKRO_ENABLE = yes # Enable N-Key Rollover -UNICODE_ENABLE = yes # Unicode -SWAP_HANDS_ENABLE = yes # Allow swapping hands of keyboard -RGBLIGHT_ENABLE = no +CUSTOM_MATRIX = yes # project specific files I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json index 905ed5cc3fe..9ab62df2373 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json @@ -12,5 +12,12 @@ }, "processor": "STM32F411", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk index c6228f59ed7..c018471cadc 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/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 = 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 - # split settings # https://beta.docs.qmk.fm/developing-qmk/c-development/hardware_drivers/serial_driver SERIAL_DRIVER = usart diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json index e9b1152d664..0ec00196ba5 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json @@ -15,5 +15,11 @@ "pin": "D3" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + } } diff --git a/keyboards/handwired/dactyl_manuform/6x6/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/rules.mk index 389d7509f00..29194b429ef 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/rules.mk +++ b/keyboards/handwired/dactyl_manuform/6x6/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/dactyl_manuform/6x6/promicro diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/info.json index 372619565da..96e49388dc8 100644 --- a/keyboards/handwired/datahand/info.json +++ b/keyboards/handwired/datahand/info.json @@ -11,6 +11,14 @@ }, "processor": "at90usb1286", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/datahand/rules.mk b/keyboards/handwired/datahand/rules.mk index 447e7fdc02c..a0a4f497e13 100644 --- a/keyboards/handwired/datahand/rules.mk +++ b/keyboards/handwired/datahand/rules.mk @@ -1,15 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -CUSTOM_MATRIX = yes # We definitely have a nonstandard matrix +CUSTOM_MATRIX = yes # Project specific files SRC = matrix.c diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/info.json index 4df41850109..4e45a5a920c 100644 --- a/keyboards/handwired/dqz11n1g/info.json +++ b/keyboards/handwired/dqz11n1g/info.json @@ -15,6 +15,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "audio": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dqz11n1g/rules.mk b/keyboards/handwired/dqz11n1g/rules.mk index 220e353ab77..d998c6a8843 100644 --- a/keyboards/handwired/dqz11n1g/rules.mk +++ b/keyboards/handwired/dqz11n1g/rules.mk @@ -2,17 +2,3 @@ CUSTOM_MATRIX = lite SRC += matrix.c SPI_DRIVER_REQUIRED = yes - -# 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 = yes # Audio output - diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json index b9bcd2e639c..112a8a6abe2 100644 --- a/keyboards/handwired/dygma/raise/info.json +++ b/keyboards/handwired/dygma/raise/info.json @@ -26,6 +26,12 @@ }, "processor": "STM32F411", "bootloader": "stm32-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "board": "BLACKPILL_STM32_F411", "debounce": 0 } diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk index ecf156629aa..7a078c9757b 100644 --- a/keyboards/handwired/dygma/raise/rules.mk +++ b/keyboards/handwired/dygma/raise/rules.mk @@ -1,16 +1,3 @@ -# 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 -RGB_MATRIX_ENABLE = yes CUSTOM_MATRIX = lite # TODO(ibash) we don't actually need to enable raw, but there's some side effect diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/info.json index 8d031b3c42f..ab811888a9a 100644 --- a/keyboards/handwired/frenchdev/info.json +++ b/keyboards/handwired/frenchdev/info.json @@ -9,6 +9,14 @@ }, "processor": "atmega32u4", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "tapping": { "toggle": 1 }, diff --git a/keyboards/handwired/frenchdev/rules.mk b/keyboards/handwired/frenchdev/rules.mk index e226d0b5172..9b396b76686 100644 --- a/keyboards/handwired/frenchdev/rules.mk +++ b/keyboards/handwired/frenchdev/rules.mk @@ -1,16 +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 -CUSTOM_MATRIX = yes # Custom matrix file (taken and adapted from the ErgoDox EZ to handle custom number of columns) -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no +CUSTOM_MATRIX = yes # project specific files SRC = matrix.c diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/info.json index 34b1edc8207..4984f3fc03c 100644 --- a/keyboards/handwired/fruity60/info.json +++ b/keyboards/handwired/fruity60/info.json @@ -18,6 +18,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "bluetooth": true + }, "community_layouts": ["60_tsangan_hhkb"], "layouts": { "LAYOUT_60_tsangan_hhkb": { diff --git a/keyboards/handwired/fruity60/rules.mk b/keyboards/handwired/fruity60/rules.mk index 79e2ef4eff9..3437a35bdf1 100644 --- a/keyboards/handwired/fruity60/rules.mk +++ b/keyboards/handwired/fruity60/rules.mk @@ -1,16 +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 = 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 -BLUETOOTH_ENABLE = yes diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/keyboard.json similarity index 91% rename from keyboards/handwired/hacked_motospeed/info.json rename to keyboards/handwired/hacked_motospeed/keyboard.json index 899bd58bcbf..af76a4dd769 100644 --- a/keyboards/handwired/hacked_motospeed/info.json +++ b/keyboards/handwired/hacked_motospeed/keyboard.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x0690", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "bluetooth": { "driver": "rn42" @@ -21,6 +22,15 @@ }, "processor": "at90usb1286", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "backlight": true, + "bluetooth": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/hacked_motospeed/rules.mk b/keyboards/handwired/hacked_motospeed/rules.mk deleted file mode 100644 index 362a7fadbed..00000000000 --- a/keyboards/handwired/hacked_motospeed/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in -BLUETOOTH_ENABLE = yes diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json index 0c968c419d8..d7ad47355ab 100644 --- a/keyboards/handwired/lagrange/info.json +++ b/keyboards/handwired/lagrange/info.json @@ -20,6 +20,9 @@ "cols": ["C7", "F7", "F6", "F5", "F4", "F1"], "rows": ["B5", "B4", "D7", "B6", "C6", "D6", "D4"] } + }, + "transport": { + "protocol": "custom" } }, "indicators": { @@ -28,6 +31,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "unicode": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/lagrange/rules.mk b/keyboards/handwired/lagrange/rules.mk index 256826f7fcc..1f2175e9cbf 100644 --- a/keyboards/handwired/lagrange/rules.mk +++ b/keyboards/handwired/lagrange/rules.mk @@ -1,17 +1,2 @@ -# 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 = 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 -SPLIT_TRANSPORT = custom - SRC += transport.c SPI_DRIVER_REQUIRED = yes diff --git a/keyboards/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/info.json index 41342fc2ec6..b4bc53afc54 100644 --- a/keyboards/handwired/m40/5x5_macropad/info.json +++ b/keyboards/handwired/m40/5x5_macropad/info.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + }, "layouts": { "LAYOUT_ortho_5x5": { "layout": [ diff --git a/keyboards/handwired/m40/5x5_macropad/rules.mk b/keyboards/handwired/m40/5x5_macropad/rules.mk index fe66abc8493..4df55cd2206 100644 --- a/keyboards/handwired/m40/5x5_macropad/rules.mk +++ b/keyboards/handwired/m40/5x5_macropad/rules.mk @@ -1,16 +1,3 @@ -# 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 - # Disable unsupported hardware AUDIO_SUPPORTED = no -BACKLIGHT_SUPPORTED = no \ No newline at end of file +BACKLIGHT_SUPPORTED = no diff --git a/keyboards/handwired/macroboard/f401/info.json b/keyboards/handwired/macroboard/f401/keyboard.json similarity index 56% rename from keyboards/handwired/macroboard/f401/info.json rename to keyboards/handwired/macroboard/f401/keyboard.json index 5108d8ce50b..43aa322a2a8 100644 --- a/keyboards/handwired/macroboard/f401/info.json +++ b/keyboards/handwired/macroboard/f401/keyboard.json @@ -1,4 +1,9 @@ { + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["A5", "A6", "A7", "B0", "B1", "B10"], "rows": ["A4", "A3", "A2", "A1", "A0"] @@ -9,5 +14,12 @@ }, "processor": "STM32F401", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/handwired/macroboard/f401/rules.mk b/keyboards/handwired/macroboard/f401/rules.mk deleted file mode 100644 index bc0cd6b97f6..00000000000 --- a/keyboards/handwired/macroboard/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 -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 -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/info.json index d7ff61f52b6..0f6d7077a3c 100644 --- a/keyboards/handwired/macroboard/f411/info.json +++ b/keyboards/handwired/macroboard/f411/info.json @@ -1,4 +1,9 @@ { + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["B12", "B13", "B14", "B15", "A8", "A10"], "rows": ["A15", "B3", "B4", "B5", "B7"] @@ -9,5 +14,13 @@ }, "processor": "STM32F411", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "audio": true + }, "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/handwired/macroboard/f411/rules.mk b/keyboards/handwired/macroboard/f411/rules.mk index cdf33bfea5b..72f75f4367e 100644 --- a/keyboards/handwired/macroboard/f411/rules.mk +++ b/keyboards/handwired/macroboard/f411/rules.mk @@ -1,14 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output AUDIO_DRIVER = pwm_hardware -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/meck_tkl/info.json b/keyboards/handwired/meck_tkl/info.json index 8266e704bc6..5147d96ee02 100644 --- a/keyboards/handwired/meck_tkl/info.json +++ b/keyboards/handwired/meck_tkl/info.json @@ -8,6 +8,13 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/handwired/meck_tkl/rules.mk b/keyboards/handwired/meck_tkl/rules.mk index 6213285117b..cdf3900ff0d 100644 --- a/keyboards/handwired/meck_tkl/rules.mk +++ b/keyboards/handwired/meck_tkl/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/keyboard.json similarity index 95% rename from keyboards/handwired/myskeeb/info.json rename to keyboards/handwired/myskeeb/keyboard.json index cd5de808f4d..f2da286f194 100644 --- a/keyboards/handwired/myskeeb/info.json +++ b/keyboards/handwired/myskeeb/keyboard.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x6060", - "device_version": "1.0.0" + "device_version": "1.0.0", + "no_startup_check": true }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F6", "F7", "F5"], @@ -24,6 +25,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "oled": true + }, "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/myskeeb/rules.mk b/keyboards/handwired/myskeeb/rules.mk deleted file mode 100644 index 21c4a23eb3b..00000000000 --- a/keyboards/handwired/myskeeb/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# 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 = no # Enable WS2812 RGB underlight. -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -NO_USB_STARTUP_CHECK = yes From abe4d9cdcac51b49da494ec9077ffe79bbfd5ef7 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 16 Apr 2024 02:16:08 +0100 Subject: [PATCH 147/333] Migrate build target markers to keyboard.json - E (#23529) --- .../cablecardesigns/phoenix/{info.json => keyboard.json} | 0 keyboards/cannonkeys/aella/{info.json => keyboard.json} | 0 keyboards/cannonkeys/an_c/{info.json => keyboard.json} | 0 .../bakeneko60_iso_hs/{info.json => keyboard.json} | 0 .../bakeneko65_iso_hs/{info.json => keyboard.json} | 0 keyboards/cannonkeys/balance/{info.json => keyboard.json} | 0 .../cannonkeys/brutalv2_65/{info.json => keyboard.json} | 0 .../cannonkeys/chimera65_hs/{info.json => keyboard.json} | 0 keyboards/cannonkeys/cloudline/{info.json => keyboard.json} | 0 keyboards/cannonkeys/crin/{info.json => keyboard.json} | 0 .../cannonkeys/devastatingtkl/{info.json => keyboard.json} | 0 keyboards/cannonkeys/ellipse/{info.json => keyboard.json} | 0 .../cannonkeys/ellipse_hs/{info.json => keyboard.json} | 0 keyboards/cannonkeys/gentoo/{info.json => keyboard.json} | 0 keyboards/cannonkeys/gentoo_hs/{info.json => keyboard.json} | 0 keyboards/cannonkeys/instant60/{info.json => keyboard.json} | 0 keyboards/cannonkeys/instant65/{info.json => keyboard.json} | 0 keyboards/cannonkeys/is0gr/{info.json => keyboard.json} | 0 keyboards/cannonkeys/leviatan/{info.json => keyboard.json} | 0 .../cannonkeys/malicious_ergo/{info.json => keyboard.json} | 0 .../cannonkeys/meetuppad2023/{info.json => keyboard.json} | 0 keyboards/cannonkeys/moment/{info.json => keyboard.json} | 0 keyboards/cannonkeys/moment_hs/{info.json => keyboard.json} | 0 .../cannonkeys/obliterated75/{info.json => keyboard.json} | 0 keyboards/cannonkeys/onyx/{info.json => keyboard.json} | 0 keyboards/cannonkeys/rekt1800/{info.json => keyboard.json} | 0 keyboards/cannonkeys/ripple/{info.json => keyboard.json} | 0 keyboards/cannonkeys/ripple_hs/{info.json => keyboard.json} | 0 .../cannonkeys/sagittarius/{info.json => keyboard.json} | 0 .../satisfaction75_hs/{info.json => keyboard.json} | 0 keyboards/cannonkeys/savage65/{info.json => keyboard.json} | 0 keyboards/cannonkeys/serenity/{info.json => keyboard.json} | 0 keyboards/cannonkeys/tmov2/{info.json => keyboard.json} | 0 keyboards/cannonkeys/tsukuyomi/{info.json => keyboard.json} | 0 keyboards/cannonkeys/vector/{info.json => keyboard.json} | 0 keyboards/cannonkeys/vicious40/{info.json => keyboard.json} | 0 keyboards/cantor/{info.json => keyboard.json} | 0 keyboards/centromere/{info.json => keyboard.json} | 0 .../phoenix45_ortho/{info.json => keyboard.json} | 0 keyboards/checkerboards/quark/{info.json => keyboard.json} | 0 .../quark_squared/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_23u/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_60/{info.json => keyboard.json} | 0 .../cipulot/ec_alveus/1_0_0/{info.json => keyboard.json} | 0 .../cipulot/ec_alveus/1_2_0/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_pro2/{info.json => keyboard.json} | 0 .../cipulot/ec_prox/ansi_iso/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_prox/jis/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_theca/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_typek/{info.json => keyboard.json} | 0 keyboards/cipulot/mnk_60_ec/{info.json => keyboard.json} | 0 keyboards/cipulot/mnk_65_ec/{info.json => keyboard.json} | 0 keyboards/cipulot/rf_r1_8_9xu/{info.json => keyboard.json} | 0 .../clueboard/2x1800/2021/{info.json => keyboard.json} | 0 keyboards/clueboard/60/{info.json => keyboard.json} | 0 .../controllerworks/city42/{info.json => keyboard.json} | 0 .../controllerworks/mini36/{info.json => keyboard.json} | 0 .../controllerworks/mini42/{info.json => keyboard.json} | 0 keyboards/converter/hp_46010a/{info.json => keyboard.json} | 0 .../converter/ibm_terminal/{info.json => keyboard.json} | 0 keyboards/converter/m0110_usb/{info.json => keyboard.json} | 0 .../converter/siemens_tastatur/{info.json => keyboard.json} | 0 .../converter/usb_usb/ble/{info.json => keyboard.json} | 6 ++++++ keyboards/converter/usb_usb/ble/rules.mk | 4 ---- .../usb_usb/pro_micro/{info.json => keyboard.json} | 0 keyboards/converter/xmk/{info.json => keyboard.json} | 0 keyboards/converter/xt_usb/{info.json => keyboard.json} | 0 .../coseyfannitutti/discipline/{info.json => keyboard.json} | 0 .../coseyfannitutti/mysterium/{info.json => keyboard.json} | 0 keyboards/cozykeys/speedo/v3/{info.json => keyboard.json} | 1 + keyboards/cozykeys/speedo/v3/rules.mk | 1 - .../resume1800/{info.json => keyboard.json} | 0 keyboards/crypt_macro/{info.json => keyboard.json} | 0 keyboards/custommk/cmk11/{info.json => keyboard.json} | 0 keyboards/custommk/ergostrafer/{info.json => keyboard.json} | 0 keyboards/custommk/evo70_r2/{info.json => keyboard.json} | 0 76 files changed, 7 insertions(+), 5 deletions(-) rename keyboards/cablecardesigns/phoenix/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/aella/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/an_c/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/bakeneko60_iso_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/bakeneko65_iso_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/balance/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/brutalv2_65/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/chimera65_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/cloudline/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/crin/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/devastatingtkl/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/ellipse/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/ellipse_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/gentoo/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/gentoo_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/instant60/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/instant65/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/is0gr/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/leviatan/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/malicious_ergo/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/meetuppad2023/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/moment/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/moment_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/obliterated75/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/onyx/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/rekt1800/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/ripple/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/ripple_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/sagittarius/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/satisfaction75_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/savage65/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/serenity/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/tmov2/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/tsukuyomi/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/vector/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/vicious40/{info.json => keyboard.json} (100%) rename keyboards/cantor/{info.json => keyboard.json} (100%) rename keyboards/centromere/{info.json => keyboard.json} (100%) rename keyboards/checkerboards/phoenix45_ortho/{info.json => keyboard.json} (100%) rename keyboards/checkerboards/quark/{info.json => keyboard.json} (100%) rename keyboards/checkerboards/quark_squared/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_23u/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_60/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_alveus/1_0_0/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_alveus/1_2_0/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_pro2/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_prox/ansi_iso/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_prox/jis/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_theca/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_typek/{info.json => keyboard.json} (100%) rename keyboards/cipulot/mnk_60_ec/{info.json => keyboard.json} (100%) rename keyboards/cipulot/mnk_65_ec/{info.json => keyboard.json} (100%) rename keyboards/cipulot/rf_r1_8_9xu/{info.json => keyboard.json} (100%) rename keyboards/clueboard/2x1800/2021/{info.json => keyboard.json} (100%) rename keyboards/clueboard/60/{info.json => keyboard.json} (100%) rename keyboards/controllerworks/city42/{info.json => keyboard.json} (100%) rename keyboards/controllerworks/mini36/{info.json => keyboard.json} (100%) rename keyboards/controllerworks/mini42/{info.json => keyboard.json} (100%) rename keyboards/converter/hp_46010a/{info.json => keyboard.json} (100%) rename keyboards/converter/ibm_terminal/{info.json => keyboard.json} (100%) rename keyboards/converter/m0110_usb/{info.json => keyboard.json} (100%) rename keyboards/converter/siemens_tastatur/{info.json => keyboard.json} (100%) rename keyboards/converter/usb_usb/ble/{info.json => keyboard.json} (50%) rename keyboards/converter/usb_usb/pro_micro/{info.json => keyboard.json} (100%) rename keyboards/converter/xmk/{info.json => keyboard.json} (100%) rename keyboards/converter/xt_usb/{info.json => keyboard.json} (100%) rename keyboards/coseyfannitutti/discipline/{info.json => keyboard.json} (100%) rename keyboards/coseyfannitutti/mysterium/{info.json => keyboard.json} (100%) rename keyboards/cozykeys/speedo/v3/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/cozykeys/speedo/v3/rules.mk rename keyboards/crimsonkeyboards/resume1800/{info.json => keyboard.json} (100%) rename keyboards/crypt_macro/{info.json => keyboard.json} (100%) rename keyboards/custommk/cmk11/{info.json => keyboard.json} (100%) rename keyboards/custommk/ergostrafer/{info.json => keyboard.json} (100%) rename keyboards/custommk/evo70_r2/{info.json => keyboard.json} (100%) diff --git a/keyboards/cablecardesigns/phoenix/info.json b/keyboards/cablecardesigns/phoenix/keyboard.json similarity index 100% rename from keyboards/cablecardesigns/phoenix/info.json rename to keyboards/cablecardesigns/phoenix/keyboard.json diff --git a/keyboards/cannonkeys/aella/info.json b/keyboards/cannonkeys/aella/keyboard.json similarity index 100% rename from keyboards/cannonkeys/aella/info.json rename to keyboards/cannonkeys/aella/keyboard.json diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/keyboard.json similarity index 100% rename from keyboards/cannonkeys/an_c/info.json rename to keyboards/cannonkeys/an_c/keyboard.json diff --git a/keyboards/cannonkeys/bakeneko60_iso_hs/info.json b/keyboards/cannonkeys/bakeneko60_iso_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/bakeneko60_iso_hs/info.json rename to keyboards/cannonkeys/bakeneko60_iso_hs/keyboard.json diff --git a/keyboards/cannonkeys/bakeneko65_iso_hs/info.json b/keyboards/cannonkeys/bakeneko65_iso_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/bakeneko65_iso_hs/info.json rename to keyboards/cannonkeys/bakeneko65_iso_hs/keyboard.json diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/keyboard.json similarity index 100% rename from keyboards/cannonkeys/balance/info.json rename to keyboards/cannonkeys/balance/keyboard.json diff --git a/keyboards/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/keyboard.json similarity index 100% rename from keyboards/cannonkeys/brutalv2_65/info.json rename to keyboards/cannonkeys/brutalv2_65/keyboard.json diff --git a/keyboards/cannonkeys/chimera65_hs/info.json b/keyboards/cannonkeys/chimera65_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/chimera65_hs/info.json rename to keyboards/cannonkeys/chimera65_hs/keyboard.json diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/keyboard.json similarity index 100% rename from keyboards/cannonkeys/cloudline/info.json rename to keyboards/cannonkeys/cloudline/keyboard.json diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/keyboard.json similarity index 100% rename from keyboards/cannonkeys/crin/info.json rename to keyboards/cannonkeys/crin/keyboard.json diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/keyboard.json similarity index 100% rename from keyboards/cannonkeys/devastatingtkl/info.json rename to keyboards/cannonkeys/devastatingtkl/keyboard.json diff --git a/keyboards/cannonkeys/ellipse/info.json b/keyboards/cannonkeys/ellipse/keyboard.json similarity index 100% rename from keyboards/cannonkeys/ellipse/info.json rename to keyboards/cannonkeys/ellipse/keyboard.json diff --git a/keyboards/cannonkeys/ellipse_hs/info.json b/keyboards/cannonkeys/ellipse_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/ellipse_hs/info.json rename to keyboards/cannonkeys/ellipse_hs/keyboard.json diff --git a/keyboards/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/keyboard.json similarity index 100% rename from keyboards/cannonkeys/gentoo/info.json rename to keyboards/cannonkeys/gentoo/keyboard.json diff --git a/keyboards/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/gentoo_hs/info.json rename to keyboards/cannonkeys/gentoo_hs/keyboard.json diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/keyboard.json similarity index 100% rename from keyboards/cannonkeys/instant60/info.json rename to keyboards/cannonkeys/instant60/keyboard.json diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/keyboard.json similarity index 100% rename from keyboards/cannonkeys/instant65/info.json rename to keyboards/cannonkeys/instant65/keyboard.json diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/keyboard.json similarity index 100% rename from keyboards/cannonkeys/is0gr/info.json rename to keyboards/cannonkeys/is0gr/keyboard.json diff --git a/keyboards/cannonkeys/leviatan/info.json b/keyboards/cannonkeys/leviatan/keyboard.json similarity index 100% rename from keyboards/cannonkeys/leviatan/info.json rename to keyboards/cannonkeys/leviatan/keyboard.json diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/keyboard.json similarity index 100% rename from keyboards/cannonkeys/malicious_ergo/info.json rename to keyboards/cannonkeys/malicious_ergo/keyboard.json diff --git a/keyboards/cannonkeys/meetuppad2023/info.json b/keyboards/cannonkeys/meetuppad2023/keyboard.json similarity index 100% rename from keyboards/cannonkeys/meetuppad2023/info.json rename to keyboards/cannonkeys/meetuppad2023/keyboard.json diff --git a/keyboards/cannonkeys/moment/info.json b/keyboards/cannonkeys/moment/keyboard.json similarity index 100% rename from keyboards/cannonkeys/moment/info.json rename to keyboards/cannonkeys/moment/keyboard.json diff --git a/keyboards/cannonkeys/moment_hs/info.json b/keyboards/cannonkeys/moment_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/moment_hs/info.json rename to keyboards/cannonkeys/moment_hs/keyboard.json diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/keyboard.json similarity index 100% rename from keyboards/cannonkeys/obliterated75/info.json rename to keyboards/cannonkeys/obliterated75/keyboard.json diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/keyboard.json similarity index 100% rename from keyboards/cannonkeys/onyx/info.json rename to keyboards/cannonkeys/onyx/keyboard.json diff --git a/keyboards/cannonkeys/rekt1800/info.json b/keyboards/cannonkeys/rekt1800/keyboard.json similarity index 100% rename from keyboards/cannonkeys/rekt1800/info.json rename to keyboards/cannonkeys/rekt1800/keyboard.json diff --git a/keyboards/cannonkeys/ripple/info.json b/keyboards/cannonkeys/ripple/keyboard.json similarity index 100% rename from keyboards/cannonkeys/ripple/info.json rename to keyboards/cannonkeys/ripple/keyboard.json diff --git a/keyboards/cannonkeys/ripple_hs/info.json b/keyboards/cannonkeys/ripple_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/ripple_hs/info.json rename to keyboards/cannonkeys/ripple_hs/keyboard.json diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/keyboard.json similarity index 100% rename from keyboards/cannonkeys/sagittarius/info.json rename to keyboards/cannonkeys/sagittarius/keyboard.json diff --git a/keyboards/cannonkeys/satisfaction75_hs/info.json b/keyboards/cannonkeys/satisfaction75_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/satisfaction75_hs/info.json rename to keyboards/cannonkeys/satisfaction75_hs/keyboard.json diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/keyboard.json similarity index 100% rename from keyboards/cannonkeys/savage65/info.json rename to keyboards/cannonkeys/savage65/keyboard.json diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/keyboard.json similarity index 100% rename from keyboards/cannonkeys/serenity/info.json rename to keyboards/cannonkeys/serenity/keyboard.json diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/keyboard.json similarity index 100% rename from keyboards/cannonkeys/tmov2/info.json rename to keyboards/cannonkeys/tmov2/keyboard.json diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/keyboard.json similarity index 100% rename from keyboards/cannonkeys/tsukuyomi/info.json rename to keyboards/cannonkeys/tsukuyomi/keyboard.json diff --git a/keyboards/cannonkeys/vector/info.json b/keyboards/cannonkeys/vector/keyboard.json similarity index 100% rename from keyboards/cannonkeys/vector/info.json rename to keyboards/cannonkeys/vector/keyboard.json diff --git a/keyboards/cannonkeys/vicious40/info.json b/keyboards/cannonkeys/vicious40/keyboard.json similarity index 100% rename from keyboards/cannonkeys/vicious40/info.json rename to keyboards/cannonkeys/vicious40/keyboard.json diff --git a/keyboards/cantor/info.json b/keyboards/cantor/keyboard.json similarity index 100% rename from keyboards/cantor/info.json rename to keyboards/cantor/keyboard.json diff --git a/keyboards/centromere/info.json b/keyboards/centromere/keyboard.json similarity index 100% rename from keyboards/centromere/info.json rename to keyboards/centromere/keyboard.json diff --git a/keyboards/checkerboards/phoenix45_ortho/info.json b/keyboards/checkerboards/phoenix45_ortho/keyboard.json similarity index 100% rename from keyboards/checkerboards/phoenix45_ortho/info.json rename to keyboards/checkerboards/phoenix45_ortho/keyboard.json diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/keyboard.json similarity index 100% rename from keyboards/checkerboards/quark/info.json rename to keyboards/checkerboards/quark/keyboard.json diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/keyboard.json similarity index 100% rename from keyboards/checkerboards/quark_squared/info.json rename to keyboards/checkerboards/quark_squared/keyboard.json diff --git a/keyboards/cipulot/ec_23u/info.json b/keyboards/cipulot/ec_23u/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_23u/info.json rename to keyboards/cipulot/ec_23u/keyboard.json diff --git a/keyboards/cipulot/ec_60/info.json b/keyboards/cipulot/ec_60/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_60/info.json rename to keyboards/cipulot/ec_60/keyboard.json diff --git a/keyboards/cipulot/ec_alveus/1_0_0/info.json b/keyboards/cipulot/ec_alveus/1_0_0/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_alveus/1_0_0/info.json rename to keyboards/cipulot/ec_alveus/1_0_0/keyboard.json diff --git a/keyboards/cipulot/ec_alveus/1_2_0/info.json b/keyboards/cipulot/ec_alveus/1_2_0/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_alveus/1_2_0/info.json rename to keyboards/cipulot/ec_alveus/1_2_0/keyboard.json diff --git a/keyboards/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_pro2/info.json rename to keyboards/cipulot/ec_pro2/keyboard.json diff --git a/keyboards/cipulot/ec_prox/ansi_iso/info.json b/keyboards/cipulot/ec_prox/ansi_iso/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_prox/ansi_iso/info.json rename to keyboards/cipulot/ec_prox/ansi_iso/keyboard.json diff --git a/keyboards/cipulot/ec_prox/jis/info.json b/keyboards/cipulot/ec_prox/jis/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_prox/jis/info.json rename to keyboards/cipulot/ec_prox/jis/keyboard.json diff --git a/keyboards/cipulot/ec_theca/info.json b/keyboards/cipulot/ec_theca/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_theca/info.json rename to keyboards/cipulot/ec_theca/keyboard.json diff --git a/keyboards/cipulot/ec_typek/info.json b/keyboards/cipulot/ec_typek/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_typek/info.json rename to keyboards/cipulot/ec_typek/keyboard.json diff --git a/keyboards/cipulot/mnk_60_ec/info.json b/keyboards/cipulot/mnk_60_ec/keyboard.json similarity index 100% rename from keyboards/cipulot/mnk_60_ec/info.json rename to keyboards/cipulot/mnk_60_ec/keyboard.json diff --git a/keyboards/cipulot/mnk_65_ec/info.json b/keyboards/cipulot/mnk_65_ec/keyboard.json similarity index 100% rename from keyboards/cipulot/mnk_65_ec/info.json rename to keyboards/cipulot/mnk_65_ec/keyboard.json diff --git a/keyboards/cipulot/rf_r1_8_9xu/info.json b/keyboards/cipulot/rf_r1_8_9xu/keyboard.json similarity index 100% rename from keyboards/cipulot/rf_r1_8_9xu/info.json rename to keyboards/cipulot/rf_r1_8_9xu/keyboard.json diff --git a/keyboards/clueboard/2x1800/2021/info.json b/keyboards/clueboard/2x1800/2021/keyboard.json similarity index 100% rename from keyboards/clueboard/2x1800/2021/info.json rename to keyboards/clueboard/2x1800/2021/keyboard.json diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/keyboard.json similarity index 100% rename from keyboards/clueboard/60/info.json rename to keyboards/clueboard/60/keyboard.json diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/keyboard.json similarity index 100% rename from keyboards/controllerworks/city42/info.json rename to keyboards/controllerworks/city42/keyboard.json diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/keyboard.json similarity index 100% rename from keyboards/controllerworks/mini36/info.json rename to keyboards/controllerworks/mini36/keyboard.json diff --git a/keyboards/controllerworks/mini42/info.json b/keyboards/controllerworks/mini42/keyboard.json similarity index 100% rename from keyboards/controllerworks/mini42/info.json rename to keyboards/controllerworks/mini42/keyboard.json diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/keyboard.json similarity index 100% rename from keyboards/converter/hp_46010a/info.json rename to keyboards/converter/hp_46010a/keyboard.json diff --git a/keyboards/converter/ibm_terminal/info.json b/keyboards/converter/ibm_terminal/keyboard.json similarity index 100% rename from keyboards/converter/ibm_terminal/info.json rename to keyboards/converter/ibm_terminal/keyboard.json diff --git a/keyboards/converter/m0110_usb/info.json b/keyboards/converter/m0110_usb/keyboard.json similarity index 100% rename from keyboards/converter/m0110_usb/info.json rename to keyboards/converter/m0110_usb/keyboard.json diff --git a/keyboards/converter/siemens_tastatur/info.json b/keyboards/converter/siemens_tastatur/keyboard.json similarity index 100% rename from keyboards/converter/siemens_tastatur/info.json rename to keyboards/converter/siemens_tastatur/keyboard.json diff --git a/keyboards/converter/usb_usb/ble/info.json b/keyboards/converter/usb_usb/ble/keyboard.json similarity index 50% rename from keyboards/converter/usb_usb/ble/info.json rename to keyboards/converter/usb_usb/ble/keyboard.json index 18edf5f577c..b92bfe7f3e0 100644 --- a/keyboards/converter/usb_usb/ble/info.json +++ b/keyboards/converter/usb_usb/ble/keyboard.json @@ -2,5 +2,11 @@ "bootloader": "caterina", "bluetooth": { "driver": "bluefruit_le" + }, + "build": { + "lto": true + }, + "features":{ + "bluetooth": true } } diff --git a/keyboards/converter/usb_usb/ble/rules.mk b/keyboards/converter/usb_usb/ble/rules.mk index 5b0435372b7..3437a35bdf1 100644 --- a/keyboards/converter/usb_usb/ble/rules.mk +++ b/keyboards/converter/usb_usb/ble/rules.mk @@ -1,6 +1,2 @@ # Processor frequency F_CPU = 8000000 - -EXTRAKEY_ENABLE = no -BLUETOOTH_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/converter/usb_usb/pro_micro/info.json b/keyboards/converter/usb_usb/pro_micro/keyboard.json similarity index 100% rename from keyboards/converter/usb_usb/pro_micro/info.json rename to keyboards/converter/usb_usb/pro_micro/keyboard.json diff --git a/keyboards/converter/xmk/info.json b/keyboards/converter/xmk/keyboard.json similarity index 100% rename from keyboards/converter/xmk/info.json rename to keyboards/converter/xmk/keyboard.json diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/keyboard.json similarity index 100% rename from keyboards/converter/xt_usb/info.json rename to keyboards/converter/xt_usb/keyboard.json diff --git a/keyboards/coseyfannitutti/discipline/info.json b/keyboards/coseyfannitutti/discipline/keyboard.json similarity index 100% rename from keyboards/coseyfannitutti/discipline/info.json rename to keyboards/coseyfannitutti/discipline/keyboard.json diff --git a/keyboards/coseyfannitutti/mysterium/info.json b/keyboards/coseyfannitutti/mysterium/keyboard.json similarity index 100% rename from keyboards/coseyfannitutti/mysterium/info.json rename to keyboards/coseyfannitutti/mysterium/keyboard.json diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/keyboard.json similarity index 99% rename from keyboards/cozykeys/speedo/v3/info.json rename to keyboards/cozykeys/speedo/v3/keyboard.json index 7636d9b702f..c4aaaecb6d1 100644 --- a/keyboards/cozykeys/speedo/v3/info.json +++ b/keyboards/cozykeys/speedo/v3/keyboard.json @@ -36,6 +36,7 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "pin_compatible": "elite_c", "features": { "bootmagic": false, "mousekey": true, diff --git a/keyboards/cozykeys/speedo/v3/rules.mk b/keyboards/cozykeys/speedo/v3/rules.mk deleted file mode 100644 index baf23318ccd..00000000000 --- a/keyboards/cozykeys/speedo/v3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -PIN_COMPATIBLE = elite_c diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/keyboard.json similarity index 100% rename from keyboards/crimsonkeyboards/resume1800/info.json rename to keyboards/crimsonkeyboards/resume1800/keyboard.json diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/keyboard.json similarity index 100% rename from keyboards/crypt_macro/info.json rename to keyboards/crypt_macro/keyboard.json diff --git a/keyboards/custommk/cmk11/info.json b/keyboards/custommk/cmk11/keyboard.json similarity index 100% rename from keyboards/custommk/cmk11/info.json rename to keyboards/custommk/cmk11/keyboard.json diff --git a/keyboards/custommk/ergostrafer/info.json b/keyboards/custommk/ergostrafer/keyboard.json similarity index 100% rename from keyboards/custommk/ergostrafer/info.json rename to keyboards/custommk/ergostrafer/keyboard.json diff --git a/keyboards/custommk/evo70_r2/info.json b/keyboards/custommk/evo70_r2/keyboard.json similarity index 100% rename from keyboards/custommk/evo70_r2/info.json rename to keyboards/custommk/evo70_r2/keyboard.json From 1d5ee895ad00b99d2d99a6cfb67b01b6dc84c874 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 16 Apr 2024 05:42:34 +0100 Subject: [PATCH 148/333] Migrate build target markers to keyboard.json - FG (#23534) --- keyboards/fallacy/{info.json => keyboard.json} | 0 keyboards/fc660c/{info.json => keyboard.json} | 0 keyboards/fc980c/{info.json => keyboard.json} | 0 keyboards/ferris/0_1/{info.json => keyboard.json} | 0 keyboards/ferris/0_2/bling/{info.json => keyboard.json} | 0 keyboards/ferris/0_2/bling/rules.mk | 0 keyboards/fjlabs/7vhotswap/{info.json => keyboard.json} | 0 keyboards/fjlabs/ad65/{info.json => keyboard.json} | 0 keyboards/fjlabs/avalon/{info.json => keyboard.json} | 0 keyboards/fjlabs/bks65/{info.json => keyboard.json} | 0 keyboards/fjlabs/bks65solder/{info.json => keyboard.json} | 0 keyboards/fjlabs/bolsa65/{info.json => keyboard.json} | 0 keyboards/fjlabs/kf87/{info.json => keyboard.json} | 0 keyboards/fjlabs/kyuu/{info.json => keyboard.json} | 0 keyboards/fjlabs/ldk65/{info.json => keyboard.json} | 0 keyboards/fjlabs/midway60/{info.json => keyboard.json} | 0 keyboards/fjlabs/mk61rgbansi/{info.json => keyboard.json} | 0 keyboards/fjlabs/peaker/{info.json => keyboard.json} | 0 keyboards/fjlabs/polaris/{info.json => keyboard.json} | 0 keyboards/fjlabs/ready100/{info.json => keyboard.json} | 0 keyboards/fjlabs/sinanju/{info.json => keyboard.json} | 0 keyboards/fjlabs/sinanjuwk/{info.json => keyboard.json} | 0 keyboards/fjlabs/solanis/{info.json => keyboard.json} | 0 keyboards/fjlabs/swordfish/{info.json => keyboard.json} | 0 keyboards/fjlabs/tf60ansi/{info.json => keyboard.json} | 0 keyboards/fjlabs/tf60v2/{info.json => keyboard.json} | 0 keyboards/fjlabs/tf65rgbv2/{info.json => keyboard.json} | 0 keyboards/fractal/{info.json => keyboard.json} | 0 keyboards/frobiac/blackbowl/{info.json => keyboard.json} | 0 keyboards/gboards/ergotaco/{info.json => keyboard.json} | 0 keyboards/gboards/georgi/{info.json => keyboard.json} | 0 keyboards/gboards/gergo/{info.json => keyboard.json} | 0 keyboards/gboards/gergoplex/{info.json => keyboard.json} | 0 keyboards/geistmaschine/macropod/{info.json => keyboard.json} | 0 keyboards/geonworks/ee_at/{info.json => keyboard.json} | 0 keyboards/geonworks/w1_at/{info.json => keyboard.json} | 0 keyboards/gl516/a52gl/{info.json => keyboard.json} | 0 keyboards/gl516/j73gl/{info.json => keyboard.json} | 0 keyboards/gl516/n51gl/{info.json => keyboard.json} | 0 keyboards/glenpickle/chimera_ergo/{info.json => keyboard.json} | 0 keyboards/glenpickle/chimera_ls/{info.json => keyboard.json} | 0 keyboards/glenpickle/chimera_ortho/{info.json => keyboard.json} | 0 .../glenpickle/chimera_ortho_plus/{info.json => keyboard.json} | 0 keyboards/gmmk/numpad/{info.json => keyboard.json} | 0 keyboards/gon/nerd60/{info.json => keyboard.json} | 0 keyboards/gon/nerdtkl/{info.json => keyboard.json} | 0 keyboards/gopolar/gg86/{info.json => keyboard.json} | 0 keyboards/gray_studio/cod67/{info.json => keyboard.json} | 0 keyboards/gregandcin/teaqueen/{info.json => keyboard.json} | 0 49 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/fallacy/{info.json => keyboard.json} (100%) rename keyboards/fc660c/{info.json => keyboard.json} (100%) rename keyboards/fc980c/{info.json => keyboard.json} (100%) rename keyboards/ferris/0_1/{info.json => keyboard.json} (100%) rename keyboards/ferris/0_2/bling/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ferris/0_2/bling/rules.mk rename keyboards/fjlabs/7vhotswap/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/ad65/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/avalon/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/bks65/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/bks65solder/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/bolsa65/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/kf87/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/kyuu/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/ldk65/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/midway60/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/mk61rgbansi/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/peaker/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/polaris/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/ready100/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/sinanju/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/sinanjuwk/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/solanis/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/swordfish/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/tf60ansi/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/tf60v2/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/tf65rgbv2/{info.json => keyboard.json} (100%) rename keyboards/fractal/{info.json => keyboard.json} (100%) rename keyboards/frobiac/blackbowl/{info.json => keyboard.json} (100%) rename keyboards/gboards/ergotaco/{info.json => keyboard.json} (100%) rename keyboards/gboards/georgi/{info.json => keyboard.json} (100%) rename keyboards/gboards/gergo/{info.json => keyboard.json} (100%) rename keyboards/gboards/gergoplex/{info.json => keyboard.json} (100%) rename keyboards/geistmaschine/macropod/{info.json => keyboard.json} (100%) rename keyboards/geonworks/ee_at/{info.json => keyboard.json} (100%) rename keyboards/geonworks/w1_at/{info.json => keyboard.json} (100%) rename keyboards/gl516/a52gl/{info.json => keyboard.json} (100%) rename keyboards/gl516/j73gl/{info.json => keyboard.json} (100%) rename keyboards/gl516/n51gl/{info.json => keyboard.json} (100%) rename keyboards/glenpickle/chimera_ergo/{info.json => keyboard.json} (100%) rename keyboards/glenpickle/chimera_ls/{info.json => keyboard.json} (100%) rename keyboards/glenpickle/chimera_ortho/{info.json => keyboard.json} (100%) rename keyboards/glenpickle/chimera_ortho_plus/{info.json => keyboard.json} (100%) rename keyboards/gmmk/numpad/{info.json => keyboard.json} (100%) rename keyboards/gon/nerd60/{info.json => keyboard.json} (100%) rename keyboards/gon/nerdtkl/{info.json => keyboard.json} (100%) rename keyboards/gopolar/gg86/{info.json => keyboard.json} (100%) rename keyboards/gray_studio/cod67/{info.json => keyboard.json} (100%) rename keyboards/gregandcin/teaqueen/{info.json => keyboard.json} (100%) diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/keyboard.json similarity index 100% rename from keyboards/fallacy/info.json rename to keyboards/fallacy/keyboard.json diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/keyboard.json similarity index 100% rename from keyboards/fc660c/info.json rename to keyboards/fc660c/keyboard.json diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/keyboard.json similarity index 100% rename from keyboards/fc980c/info.json rename to keyboards/fc980c/keyboard.json diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/keyboard.json similarity index 100% rename from keyboards/ferris/0_1/info.json rename to keyboards/ferris/0_1/keyboard.json diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/keyboard.json similarity index 100% rename from keyboards/ferris/0_2/bling/info.json rename to keyboards/ferris/0_2/bling/keyboard.json diff --git a/keyboards/ferris/0_2/bling/rules.mk b/keyboards/ferris/0_2/bling/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/keyboard.json similarity index 100% rename from keyboards/fjlabs/7vhotswap/info.json rename to keyboards/fjlabs/7vhotswap/keyboard.json diff --git a/keyboards/fjlabs/ad65/info.json b/keyboards/fjlabs/ad65/keyboard.json similarity index 100% rename from keyboards/fjlabs/ad65/info.json rename to keyboards/fjlabs/ad65/keyboard.json diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/keyboard.json similarity index 100% rename from keyboards/fjlabs/avalon/info.json rename to keyboards/fjlabs/avalon/keyboard.json diff --git a/keyboards/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/keyboard.json similarity index 100% rename from keyboards/fjlabs/bks65/info.json rename to keyboards/fjlabs/bks65/keyboard.json diff --git a/keyboards/fjlabs/bks65solder/info.json b/keyboards/fjlabs/bks65solder/keyboard.json similarity index 100% rename from keyboards/fjlabs/bks65solder/info.json rename to keyboards/fjlabs/bks65solder/keyboard.json diff --git a/keyboards/fjlabs/bolsa65/info.json b/keyboards/fjlabs/bolsa65/keyboard.json similarity index 100% rename from keyboards/fjlabs/bolsa65/info.json rename to keyboards/fjlabs/bolsa65/keyboard.json diff --git a/keyboards/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/keyboard.json similarity index 100% rename from keyboards/fjlabs/kf87/info.json rename to keyboards/fjlabs/kf87/keyboard.json diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/keyboard.json similarity index 100% rename from keyboards/fjlabs/kyuu/info.json rename to keyboards/fjlabs/kyuu/keyboard.json diff --git a/keyboards/fjlabs/ldk65/info.json b/keyboards/fjlabs/ldk65/keyboard.json similarity index 100% rename from keyboards/fjlabs/ldk65/info.json rename to keyboards/fjlabs/ldk65/keyboard.json diff --git a/keyboards/fjlabs/midway60/info.json b/keyboards/fjlabs/midway60/keyboard.json similarity index 100% rename from keyboards/fjlabs/midway60/info.json rename to keyboards/fjlabs/midway60/keyboard.json diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/keyboard.json similarity index 100% rename from keyboards/fjlabs/mk61rgbansi/info.json rename to keyboards/fjlabs/mk61rgbansi/keyboard.json diff --git a/keyboards/fjlabs/peaker/info.json b/keyboards/fjlabs/peaker/keyboard.json similarity index 100% rename from keyboards/fjlabs/peaker/info.json rename to keyboards/fjlabs/peaker/keyboard.json diff --git a/keyboards/fjlabs/polaris/info.json b/keyboards/fjlabs/polaris/keyboard.json similarity index 100% rename from keyboards/fjlabs/polaris/info.json rename to keyboards/fjlabs/polaris/keyboard.json diff --git a/keyboards/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/keyboard.json similarity index 100% rename from keyboards/fjlabs/ready100/info.json rename to keyboards/fjlabs/ready100/keyboard.json diff --git a/keyboards/fjlabs/sinanju/info.json b/keyboards/fjlabs/sinanju/keyboard.json similarity index 100% rename from keyboards/fjlabs/sinanju/info.json rename to keyboards/fjlabs/sinanju/keyboard.json diff --git a/keyboards/fjlabs/sinanjuwk/info.json b/keyboards/fjlabs/sinanjuwk/keyboard.json similarity index 100% rename from keyboards/fjlabs/sinanjuwk/info.json rename to keyboards/fjlabs/sinanjuwk/keyboard.json diff --git a/keyboards/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/keyboard.json similarity index 100% rename from keyboards/fjlabs/solanis/info.json rename to keyboards/fjlabs/solanis/keyboard.json diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/keyboard.json similarity index 100% rename from keyboards/fjlabs/swordfish/info.json rename to keyboards/fjlabs/swordfish/keyboard.json diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/keyboard.json similarity index 100% rename from keyboards/fjlabs/tf60ansi/info.json rename to keyboards/fjlabs/tf60ansi/keyboard.json diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/keyboard.json similarity index 100% rename from keyboards/fjlabs/tf60v2/info.json rename to keyboards/fjlabs/tf60v2/keyboard.json diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/keyboard.json similarity index 100% rename from keyboards/fjlabs/tf65rgbv2/info.json rename to keyboards/fjlabs/tf65rgbv2/keyboard.json diff --git a/keyboards/fractal/info.json b/keyboards/fractal/keyboard.json similarity index 100% rename from keyboards/fractal/info.json rename to keyboards/fractal/keyboard.json diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/keyboard.json similarity index 100% rename from keyboards/frobiac/blackbowl/info.json rename to keyboards/frobiac/blackbowl/keyboard.json diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/keyboard.json similarity index 100% rename from keyboards/gboards/ergotaco/info.json rename to keyboards/gboards/ergotaco/keyboard.json diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/keyboard.json similarity index 100% rename from keyboards/gboards/georgi/info.json rename to keyboards/gboards/georgi/keyboard.json diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/keyboard.json similarity index 100% rename from keyboards/gboards/gergo/info.json rename to keyboards/gboards/gergo/keyboard.json diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/keyboard.json similarity index 100% rename from keyboards/gboards/gergoplex/info.json rename to keyboards/gboards/gergoplex/keyboard.json diff --git a/keyboards/geistmaschine/macropod/info.json b/keyboards/geistmaschine/macropod/keyboard.json similarity index 100% rename from keyboards/geistmaschine/macropod/info.json rename to keyboards/geistmaschine/macropod/keyboard.json diff --git a/keyboards/geonworks/ee_at/info.json b/keyboards/geonworks/ee_at/keyboard.json similarity index 100% rename from keyboards/geonworks/ee_at/info.json rename to keyboards/geonworks/ee_at/keyboard.json diff --git a/keyboards/geonworks/w1_at/info.json b/keyboards/geonworks/w1_at/keyboard.json similarity index 100% rename from keyboards/geonworks/w1_at/info.json rename to keyboards/geonworks/w1_at/keyboard.json diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/keyboard.json similarity index 100% rename from keyboards/gl516/a52gl/info.json rename to keyboards/gl516/a52gl/keyboard.json diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/keyboard.json similarity index 100% rename from keyboards/gl516/j73gl/info.json rename to keyboards/gl516/j73gl/keyboard.json diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/keyboard.json similarity index 100% rename from keyboards/gl516/n51gl/info.json rename to keyboards/gl516/n51gl/keyboard.json diff --git a/keyboards/glenpickle/chimera_ergo/info.json b/keyboards/glenpickle/chimera_ergo/keyboard.json similarity index 100% rename from keyboards/glenpickle/chimera_ergo/info.json rename to keyboards/glenpickle/chimera_ergo/keyboard.json diff --git a/keyboards/glenpickle/chimera_ls/info.json b/keyboards/glenpickle/chimera_ls/keyboard.json similarity index 100% rename from keyboards/glenpickle/chimera_ls/info.json rename to keyboards/glenpickle/chimera_ls/keyboard.json diff --git a/keyboards/glenpickle/chimera_ortho/info.json b/keyboards/glenpickle/chimera_ortho/keyboard.json similarity index 100% rename from keyboards/glenpickle/chimera_ortho/info.json rename to keyboards/glenpickle/chimera_ortho/keyboard.json diff --git a/keyboards/glenpickle/chimera_ortho_plus/info.json b/keyboards/glenpickle/chimera_ortho_plus/keyboard.json similarity index 100% rename from keyboards/glenpickle/chimera_ortho_plus/info.json rename to keyboards/glenpickle/chimera_ortho_plus/keyboard.json diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/keyboard.json similarity index 100% rename from keyboards/gmmk/numpad/info.json rename to keyboards/gmmk/numpad/keyboard.json diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/keyboard.json similarity index 100% rename from keyboards/gon/nerd60/info.json rename to keyboards/gon/nerd60/keyboard.json diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/keyboard.json similarity index 100% rename from keyboards/gon/nerdtkl/info.json rename to keyboards/gon/nerdtkl/keyboard.json diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/keyboard.json similarity index 100% rename from keyboards/gopolar/gg86/info.json rename to keyboards/gopolar/gg86/keyboard.json diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/keyboard.json similarity index 100% rename from keyboards/gray_studio/cod67/info.json rename to keyboards/gray_studio/cod67/keyboard.json diff --git a/keyboards/gregandcin/teaqueen/info.json b/keyboards/gregandcin/teaqueen/keyboard.json similarity index 100% rename from keyboards/gregandcin/teaqueen/info.json rename to keyboards/gregandcin/teaqueen/keyboard.json From 45d60214f46c21ce83f7352b48cb31e3534621da Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Tue, 16 Apr 2024 15:55:40 -0700 Subject: [PATCH 149/333] [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 150/333] 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 151/333] 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 152/333] 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 153/333] 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 154/333] 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 From b31ebe789d29e4d97728f87c35292cd003f01711 Mon Sep 17 00:00:00 2001 From: Epomaker <113156000+Epomaker@users.noreply.github.com> Date: Wed, 17 Apr 2024 21:44:53 +0800 Subject: [PATCH 155/333] [Keyboard] Add Epomaker tide65 (#23356) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 岩弈 Co-authored-by: yanyi24 --- keyboards/epomaker/tide65/info.json | 231 ++++++++++++++++++ .../epomaker/tide65/keymaps/default/keymap.c | 26 ++ .../epomaker/tide65/keymaps/via/keymap.c | 33 +++ .../epomaker/tide65/keymaps/via/rules.mk | 2 + keyboards/epomaker/tide65/readme.md | 21 ++ keyboards/epomaker/tide65/rules.mk | 1 + keyboards/epomaker/tide65/tide65.c | 10 + 7 files changed, 324 insertions(+) create mode 100644 keyboards/epomaker/tide65/info.json create mode 100644 keyboards/epomaker/tide65/keymaps/default/keymap.c create mode 100644 keyboards/epomaker/tide65/keymaps/via/keymap.c create mode 100644 keyboards/epomaker/tide65/keymaps/via/rules.mk create mode 100644 keyboards/epomaker/tide65/readme.md create mode 100644 keyboards/epomaker/tide65/rules.mk create mode 100644 keyboards/epomaker/tide65/tide65.c diff --git a/keyboards/epomaker/tide65/info.json b/keyboards/epomaker/tide65/info.json new file mode 100644 index 00000000000..2715b923f47 --- /dev/null +++ b/keyboards/epomaker/tide65/info.json @@ -0,0 +1,231 @@ +{ + "manufacturer": "HS", + "keyboard_name": "EPOMAKER TIDE 65", + "maintainer": "sdk66", + "bootloader": "wb32-dfu", + "diode_direction": "ROW2COL", + "encoder": { + "rotary": [ + {"pin_a": "B7", "pin_b": "B6"} + ] + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "A6", "B10", "B11", "B12", "B13", "B14", "A10", "C6", "C7", "C8", "C9"], + "rows": ["A1", "A2", "A3", "A4", "C13"] + }, + "processor": "WB32FQ95", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 208, "y": 0, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, + {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4}, + {"matrix": [1, 6], "x": 96, "y": 16, "flags": 4}, + {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4}, + {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4}, + {"matrix": [1, 9], "x": 144, "y": 16, "flags": 4}, + {"matrix": [1, 10], "x": 160, "y": 16, "flags": 4}, + {"matrix": [1, 11], "x": 176, "y": 16, "flags": 4}, + {"matrix": [1, 12], "x": 192, "y": 16, "flags": 4}, + {"matrix": [1, 13], "x": 208, "y": 16, "flags": 4}, + {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, + {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, + {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, + {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, + {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4}, + {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4}, + {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4}, + {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4}, + {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4}, + {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4}, + {"matrix": [2, 13], "x": 208, "y": 32, "flags": 4}, + {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4}, + {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4}, + {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4}, + {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4}, + {"matrix": [3, 7], "x": 112, "y": 48, "flags": 4}, + {"matrix": [3, 8], "x": 128, "y": 48, "flags": 4}, + {"matrix": [3, 9], "x": 144, "y": 48, "flags": 4}, + {"matrix": [3, 11], "x": 176, "y": 48, "flags": 4}, + {"matrix": [3, 12], "x": 192, "y": 48, "flags": 4}, + {"matrix": [3, 13], "x": 208, "y": 48, "flags": 4}, + {"matrix": [3, 14], "x": 224, "y": 48, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [4, 1], "x": 16, "y": 64, "flags": 4}, + {"matrix": [4, 2], "x": 32, "y": 64, "flags": 4}, + {"matrix": [4, 3], "x": 48, "y": 64, "flags": 4}, + {"matrix": [4, 4], "x": 64, "y": 64, "flags": 4}, + {"matrix": [4, 5], "x": 80, "y": 64, "flags": 4}, + {"matrix": [4, 6], "x": 96, "y": 64, "flags": 4}, + {"matrix": [4, 9], "x": 144, "y": 64, "flags": 4}, + {"matrix": [4, 11], "x": 176, "y": 64, "flags": 4}, + {"matrix": [4, 12], "x": 192, "y": 64, "flags": 4}, + {"matrix": [4, 13], "x": 208, "y": 64, "flags": 4}, + {"matrix": [4, 14], "x": 224, "y": 64, "flags": 4} + ] + }, + "url": "", + "usb": { + "device_version": "0.0.1", + "force_nkro": true, + "pid": "0xE463", + "suspend_wakeup_delay": 1000, + "vid": "0x342D" + }, + "ws2812": { + "pin": "B15" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 1.75}, + {"matrix": [2, 14], "x": 15, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 6, "y": 3.75, "w": 1.25}, + {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/epomaker/tide65/keymaps/default/keymap.c b/keyboards/epomaker/tide65/keymaps/default/keymap.c new file mode 100644 index 00000000000..830e2e03c36 --- /dev/null +++ b/keyboards/epomaker/tide65/keymaps/default/keymap.c @@ -0,0 +1,26 @@ +// Copyright 2024 SDK (@sdk66) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( /* Base */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( /* Base */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_SCRL, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, GU_TOGG, _______, EE_CLR, EE_CLR, EE_CLR, EE_CLR, _______, _______, _______, _______, _______ + ) +}; + +// clang-format on diff --git a/keyboards/epomaker/tide65/keymaps/via/keymap.c b/keyboards/epomaker/tide65/keymaps/via/keymap.c new file mode 100644 index 00000000000..6dfde729136 --- /dev/null +++ b/keyboards/epomaker/tide65/keymaps/via/keymap.c @@ -0,0 +1,33 @@ +// Copyright 2024 SDK (@sdk66) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( /* Base */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( /* Base */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_SCRL, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, GU_TOGG, _______, EE_CLR, EE_CLR, EE_CLR, EE_CLR, _______, _______, _______, _______, _______ + ) +}; + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [1] = {ENCODER_CCW_CW(_______, _______)}, +}; +#endif + +// clang-format on diff --git a/keyboards/epomaker/tide65/keymaps/via/rules.mk b/keyboards/epomaker/tide65/keymaps/via/rules.mk new file mode 100644 index 00000000000..715838ecc5d --- /dev/null +++ b/keyboards/epomaker/tide65/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +ENCODER_MAP_ENABLE = yes +VIA_ENABLE = yes diff --git a/keyboards/epomaker/tide65/readme.md b/keyboards/epomaker/tide65/readme.md new file mode 100644 index 00000000000..8274f2dddbb --- /dev/null +++ b/keyboards/epomaker/tide65/readme.md @@ -0,0 +1,21 @@ +# EPOMAKER TIDE 65 + +* Keyboard Maintainer: [sdk66](https://github.com/sdk66) +* Hardware Supported: EPOMAKER TIDE 65 +* Hardware Availability: [epomaker](https://www.epomaker.com) + +Make example for this keyboard (after setting up your build environment): + + make epomaker/tide_65:default + +Flashing example for this keyboard: + + make epomaker/tide65:default:flash + +To reset the board into bootloader mode, do one of the following: + +* Hold the Reset switch mounted on the bottom side of the PCB while connecting the USB cable +* Hold the Escape key while connecting the USB cable (also erases persistent settings) +* Fn+R_Shift+Esc will reset the board to bootloader mode if you have flashed the default QMK keymap + +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). diff --git a/keyboards/epomaker/tide65/rules.mk b/keyboards/epomaker/tide65/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/epomaker/tide65/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/epomaker/tide65/tide65.c b/keyboards/epomaker/tide65/tide65.c new file mode 100644 index 00000000000..fc9e7c0db57 --- /dev/null +++ b/keyboards/epomaker/tide65/tide65.c @@ -0,0 +1,10 @@ +// Copyright 2024 SDK (@sdk66) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "quantum.h" + +void keyboard_pre_init_kb(void) { + gpio_set_pin_output(A5); + gpio_write_pin_high(A5); + keyboard_pre_init_user(); +} From c25dfe543ba461f62b9bdd98f8aa91ec3bc67fc5 Mon Sep 17 00:00:00 2001 From: suikagiken <115451678+suikagiken@users.noreply.github.com> Date: Wed, 17 Apr 2024 22:46:20 +0900 Subject: [PATCH 156/333] [Keyboard] Add suika85ergo (#23380) --- keyboards/suikagiken/suika85ergo/info.json | 124 ++++++++++++++++++ .../suika85ergo/keymaps/default/keymap.c | 23 ++++ .../suika85ergo/keymaps/via/keymap.c | 23 ++++ .../suika85ergo/keymaps/via/rules.mk | 1 + keyboards/suikagiken/suika85ergo/readme.md | 44 +++++++ keyboards/suikagiken/suika85ergo/rules.mk | 1 + 6 files changed, 216 insertions(+) create mode 100644 keyboards/suikagiken/suika85ergo/info.json create mode 100644 keyboards/suikagiken/suika85ergo/keymaps/default/keymap.c create mode 100644 keyboards/suikagiken/suika85ergo/keymaps/via/keymap.c create mode 100644 keyboards/suikagiken/suika85ergo/keymaps/via/rules.mk create mode 100644 keyboards/suikagiken/suika85ergo/readme.md create mode 100644 keyboards/suikagiken/suika85ergo/rules.mk diff --git a/keyboards/suikagiken/suika85ergo/info.json b/keyboards/suikagiken/suika85ergo/info.json new file mode 100644 index 00000000000..e0514dfab85 --- /dev/null +++ b/keyboards/suikagiken/suika85ergo/info.json @@ -0,0 +1,124 @@ +{ + "manufacturer": "suikagiken", + "keyboard_name": "suika85ergo", + "maintainer": "suikagiken", + "development_board": "elite_c", + "pin_compatible": "elite_c", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B3", "B2", "B6", "F0", "F1", "C7", "D5", "B7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"], + "rows": ["B0", "F4", "F5", "F6", "F7", "B1"] + }, + "url": "https://github.com/suikagiken/suika85ergo", + "usb": { + "device_version": "1.0.0", + "vid": "0x4B48", + "pid": "0x0002" + }, + "dynamic_keymap": { + "layer_count": 2 + }, + "build": { + "debounce_type": "sym_eager_pk" + }, + "debounce": 50, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + {"matrix": [0, 16], "x": 16, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + {"matrix": [1, 16], "x": 16, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [2, 14], "x": 14, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + {"matrix": [2, 16], "x": 16, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 4], "x": 4, "y": 5}, + {"matrix": [5, 5], "x": 5, "y": 5}, + {"matrix": [5, 6], "x": 6, "y": 5}, + {"matrix": [5, 7], "x": 7, "y": 5}, + {"matrix": [5, 8], "x": 8, "y": 5}, + {"matrix": [5, 9], "x": 9, "y": 5}, + {"matrix": [5, 10], "x": 10, "y": 5}, + {"matrix": [5, 11], "x": 11, "y": 5}, + {"matrix": [5, 12], "x": 12, "y": 5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/suikagiken/suika85ergo/keymaps/default/keymap.c b/keyboards/suikagiken/suika85ergo/keymaps/default/keymap.c new file mode 100644 index 00000000000..3678c5481db --- /dev/null +++ b/keyboards/suikagiken/suika85ergo/keymaps/default/keymap.c @@ -0,0 +1,23 @@ +// Copyright 2024 suikagiken (@suikagiken) +// 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_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_DEL , + C(KC_X), KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_PSCR, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_BSPC, + C(KC_C), KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_EQL , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSLS, KC_ENT , + C(KC_V), KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_LBRC, KC_RBRC, KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_UP , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, + KC_LCTL, KC_LWIN, KC_LOPT, MO(1) , KC_SPC , KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC , MO(1) , KC_ROPT, KC_APP , KC_RCTL + ), + [1] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END , _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/suikagiken/suika85ergo/keymaps/via/keymap.c b/keyboards/suikagiken/suika85ergo/keymaps/via/keymap.c new file mode 100644 index 00000000000..3678c5481db --- /dev/null +++ b/keyboards/suikagiken/suika85ergo/keymaps/via/keymap.c @@ -0,0 +1,23 @@ +// Copyright 2024 suikagiken (@suikagiken) +// 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_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_DEL , + C(KC_X), KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_PSCR, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_BSPC, + C(KC_C), KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_EQL , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSLS, KC_ENT , + C(KC_V), KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_LBRC, KC_RBRC, KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_UP , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, + KC_LCTL, KC_LWIN, KC_LOPT, MO(1) , KC_SPC , KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC , MO(1) , KC_ROPT, KC_APP , KC_RCTL + ), + [1] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END , _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/suikagiken/suika85ergo/keymaps/via/rules.mk b/keyboards/suikagiken/suika85ergo/keymaps/via/rules.mk new file mode 100644 index 00000000000..036bd6d1c3e --- /dev/null +++ b/keyboards/suikagiken/suika85ergo/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/suikagiken/suika85ergo/readme.md b/keyboards/suikagiken/suika85ergo/readme.md new file mode 100644 index 00000000000..956755bcccf --- /dev/null +++ b/keyboards/suikagiken/suika85ergo/readme.md @@ -0,0 +1,44 @@ +# suika85ergo +(English Follows Japanese) + +## 概要 + +suika85ergoはカラムスタッガードの一体型エルゴキーボードです。 +ファンクションキーや矢印キーなど、コンパクトキーボードでは省略されがちなキーも備えており、フルキーボードからの移行も容易です。 + +* 制作 : すいか技研 （https://suikagiken.net） GitHub [suikagiken](https://github.com/suikagiken) +* 販売 : 遊舎工房様（ https://shop.yushakobo.jp/products/9015 ）にてお求め頂けます + +## ビルドガイド + +[こちらのリンク](https://github.com/suikagiken/suika85ergo/blob/main/buildguide.md)からご覧下さい。 + +--- + +## Overview + +suika85ergo is a column-staggered ergonomic keyboard with 85 keys. It has function keys or arrow keys, which are omitted in compact keyboards, making it easy to switch from a conventional full keyboard. + +* Keyboard Maintainer: [suikagiken](https://github.com/suikagiken) +* Hardware Supported: Purchase PCBs from the following stores. +* Hardware Availability: Available at YushaKobo (https://shop.yushakobo.jp/products/9015) + +Make example for this keyboard (after setting up your build environment): + + make suikagiken/suika85ergo:default + +Flashing example for this keyboard: + + make suikagiken/suika85ergo: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available + + diff --git a/keyboards/suikagiken/suika85ergo/rules.mk b/keyboards/suikagiken/suika85ergo/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/suikagiken/suika85ergo/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From aa15b64f552d69419ed2ef8f73e9517992818c5f Mon Sep 17 00:00:00 2001 From: yiancar Date: Wed, 17 Apr 2024 16:57:21 +0100 Subject: [PATCH 157/333] [Keyboard] Keycult 65 (#23485) Co-authored-by: yiancar --- keyboards/keycult/keycult65/info.json | 315 ++++++++++++++++++ keyboards/keycult/keycult65/keycult65.c | 21 ++ .../keycult65/keymaps/default/keymap.c | 32 ++ .../keycult/keycult65/keymaps/via/keymap.c | 32 ++ .../keycult/keycult65/keymaps/via/rules.mk | 1 + keyboards/keycult/keycult65/readme.md | 32 ++ keyboards/keycult/keycult65/rules.mk | 2 + 7 files changed, 435 insertions(+) create mode 100644 keyboards/keycult/keycult65/info.json create mode 100644 keyboards/keycult/keycult65/keycult65.c create mode 100644 keyboards/keycult/keycult65/keymaps/default/keymap.c create mode 100644 keyboards/keycult/keycult65/keymaps/via/keymap.c create mode 100644 keyboards/keycult/keycult65/keymaps/via/rules.mk create mode 100644 keyboards/keycult/keycult65/readme.md create mode 100644 keyboards/keycult/keycult65/rules.mk diff --git a/keyboards/keycult/keycult65/info.json b/keyboards/keycult/keycult65/info.json new file mode 100644 index 00000000000..f9436b7b824 --- /dev/null +++ b/keyboards/keycult/keycult65/info.json @@ -0,0 +1,315 @@ +{ + "manufacturer": "Yiancar-Designs", + "keyboard_name": "Keycult 65", + "maintainer": "Yiancar-Designs", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "indicators": { + "caps_lock": "B6", + "on_state": 0 + }, + "matrix_pins": { + "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B2", "B1", "B0", "A0", "A1", "A2", "A3", "A5"], + "rows": ["B3", "B4", "B5", "A8", "A4"] + }, + "processor": "STM32F072", + "url": "https://yiancar-designs.com", + "usb": { + "device_version": "0.0.1", + "pid": "0x6335", + "vid": "0x8968" + }, + "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"], + "layouts": { + "LAYOUT_65_ansi_blocker": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [1, 13], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker_tsangan_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [1, 13], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/keycult/keycult65/keycult65.c b/keyboards/keycult/keycult65/keycult65.c new file mode 100644 index 00000000000..fdbfa8f2727 --- /dev/null +++ b/keyboards/keycult/keycult65/keycult65.c @@ -0,0 +1,21 @@ +/* Copyright 2024 Yiancar-Designs + * + * 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 . + */ +#include "quantum.h" + +void led_init_ports(void) { + // Set our LED pins as open drain outputs + gpio_set_pin_output_open_drain(LED_CAPS_LOCK_PIN); +} diff --git a/keyboards/keycult/keycult65/keymaps/default/keymap.c b/keyboards/keycult/keycult65/keymaps/default/keymap.c new file mode 100644 index 00000000000..94ed786b933 --- /dev/null +++ b/keyboards/keycult/keycult65/keymaps/default/keymap.c @@ -0,0 +1,32 @@ +/* Copyright 2024 Yiancar-Designs + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_65_ansi_blocker( /* Base */ + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + +[1] = LAYOUT_65_ansi_blocker( /* FN */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/keycult/keycult65/keymaps/via/keymap.c b/keyboards/keycult/keycult65/keymaps/via/keymap.c new file mode 100644 index 00000000000..92c81b41947 --- /dev/null +++ b/keyboards/keycult/keycult65/keymaps/via/keymap.c @@ -0,0 +1,32 @@ +/* Copyright 2024 Yiancar-Designs + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_65_ansi_blocker_split_bs( /* Base */ + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + +[1] = LAYOUT_65_ansi_blocker_split_bs( /* FN */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/keycult/keycult65/keymaps/via/rules.mk b/keyboards/keycult/keycult65/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/keycult/keycult65/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/keycult/keycult65/readme.md b/keyboards/keycult/keycult65/readme.md new file mode 100644 index 00000000000..42d5875140c --- /dev/null +++ b/keyboards/keycult/keycult65/readme.md @@ -0,0 +1,32 @@ +# Keycult 65 + +This is a 65% layout PCB. It supports VIA. + +* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar) +* Hardware Supported: A 65% keyboard with STM32F072CB +* Hardware Availability: https://keycult.com/ + +## Instructions + +### Build + +Make example for this keyboard (after setting up your build environment): + + make keycult/keycult65:default + +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). + +### Reset + +- Unplug +- Hold Escape +- Plug In +- Unplug +- Release Escape + +### Flash + +- Unplug +- Hold Escape +- Plug In +- Flash using QMK Toolbox or CLI (`make keycult/keycult65::flash`) diff --git a/keyboards/keycult/keycult65/rules.mk b/keyboards/keycult/keycult65/rules.mk new file mode 100644 index 00000000000..0ab54aaaf71 --- /dev/null +++ b/keyboards/keycult/keycult65/rules.mk @@ -0,0 +1,2 @@ +# Wildcard to allow APM32 MCU +DFU_SUFFIX_ARGS = -v FFFF -p FFFF From abcaf39e6c399f77a846e627324d4b9d9d79fe5f Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 17 Apr 2024 19:32:56 +0100 Subject: [PATCH 158/333] Migrate build target markers to keyboard.json - R (#23542) --- keyboards/rart/rart75hs/config.h | 24 ------------ .../rart75hs/{info.json => keyboard.json} | 15 +++++++ keyboards/rart/rart75hs/rules.mk | 14 ------- keyboards/rart/rart80/config.h | 24 ------------ .../rart/rart80/{info.json => keyboard.json} | 14 +++++++ keyboards/rart/rart80/rules.mk | 13 ------- .../rartland/{info.json => keyboard.json} | 9 +++++ keyboards/rart/rartland/rules.mk | 16 -------- .../rev1/{info.json => keyboard.json} | 8 ++++ keyboards/rate/pistachio/rev1/rules.mk | 12 ------ .../rev2/{info.json => keyboard.json} | 8 ++++ keyboards/rate/pistachio/rev2/rules.mk | 12 ------ .../{info.json => keyboard.json} | 8 ++++ keyboards/rate/pistachio_pro/rules.mk | 15 ------- .../rev_a/{info.json => keyboard.json} | 0 .../choco60/rev1/{info.json => keyboard.json} | 6 +++ .../recompile_keys/choco60/rev1/rules.mk | 12 ------ .../choco60/rev2/{info.json => keyboard.json} | 6 +++ .../recompile_keys/choco60/rev2/rules.mk | 12 ------ .../nomu30/rev1/{info.json => keyboard.json} | 6 +++ keyboards/recompile_keys/nomu30/rev1/rules.mk | 12 ------ keyboards/recompile_keys/nomu30/rev2/config.h | 23 ----------- .../nomu30/rev2/{info.json => keyboard.json} | 12 ++++++ keyboards/recompile_keys/nomu30/rev2/rules.mk | 12 ------ .../proton_c/{info.json => keyboard.json} | 0 .../wireless/{info.json => keyboard.json} | 0 keyboards/redox_media/config.h | 23 ----------- .../redox_media/{info.json => keyboard.json} | 13 +++++++ keyboards/redox_media/rules.mk | 14 ------- .../verb/{info.json => keyboard.json} | 7 ++++ keyboards/redscarf_iiplus/verb/rules.mk | 13 ------- .../verc/{info.json => keyboard.json} | 7 ++++ keyboards/redscarf_iiplus/verc/rules.mk | 13 ------- .../verd/{info.json => keyboard.json} | 7 ++++ keyboards/redscarf_iiplus/verd/rules.mk | 13 ------- keyboards/reviung/reviung61/config.h | 23 ----------- .../reviung61/{info.json => keyboard.json} | 12 ++++++ keyboards/reviung/reviung61/rules.mk | 12 ------ keyboards/ristretto/config.h | 23 ----------- .../ristretto/{info.json => keyboard.json} | 14 +++++++ keyboards/ristretto/rules.mk | 14 ------- .../aelith/{info.json => keyboard.json} | 6 +++ keyboards/rmi_kb/aelith/rules.mk | 13 ------- .../chevron/{info.json => keyboard.json} | 7 ++++ keyboards/rmi_kb/chevron/rules.mk | 14 ------- .../pro/{info.json => keyboard.json} | 12 ++++++ keyboards/rmi_kb/herringbone/pro/rules.mk | 17 -------- .../v1/{info.json => keyboard.json} | 6 +++ keyboards/rmi_kb/herringbone/v1/rules.mk | 13 ------- keyboards/rmi_kb/mona/v1/config.h | 23 ----------- .../mona/v1/{info.json => keyboard.json} | 12 ++++++ keyboards/rmi_kb/mona/v1/rules.mk | 12 ------ .../mona/v1_1/{info.json => keyboard.json} | 6 +++ keyboards/rmi_kb/mona/v1_1/rules.mk | 12 ------ .../mona/v32a/{info.json => keyboard.json} | 6 +++ keyboards/rmi_kb/mona/v32a/rules.mk | 13 ------- keyboards/rmi_kb/tkl_ff/config.h | 39 ------------------- keyboards/rmi_kb/tkl_ff/info.json | 6 +++ .../tkl_ff/v2/{info.json => keyboard.json} | 3 ++ keyboards/rmi_kb/tkl_ff/v2/rules.mk | 1 - .../wete/v1/{info.json => keyboard.json} | 11 ++++++ keyboards/rmi_kb/wete/v1/rules.mk | 14 ------- .../wete/v2/{info.json => keyboard.json} | 8 ++++ keyboards/rmi_kb/wete/v2/rules.mk | 13 ------- .../{info.json => keyboard.json} | 14 +++++++ keyboards/rocketboard_16/rules.mk | 17 -------- .../neopad/rev1/{info.json => keyboard.json} | 9 +++++ keyboards/rookiebwoy/neopad/rev1/rules.mk | 15 ------- keyboards/rose75/{info.json => keyboard.json} | 0 keyboards/rose75/rules.mk | 1 - .../hackboard/{info.json => keyboard.json} | 0 keyboards/rubi/{info.json => keyboard.json} | 8 ++++ keyboards/rubi/rules.mk | 15 ------- .../rura66/rev1/{info.json => keyboard.json} | 11 ++++++ keyboards/rura66/rev1/rules.mk | 6 --- keyboards/rura66/rules.mk | 15 ------- .../rskeys100/{info.json => keyboard.json} | 8 ++++ keyboards/ryanskidmore/rskeys100/rules.mk | 13 ------- 78 files changed, 285 insertions(+), 615 deletions(-) delete mode 100644 keyboards/rart/rart75hs/config.h rename keyboards/rart/rart75hs/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/rart/rart80/config.h rename keyboards/rart/rart80/{info.json => keyboard.json} (99%) rename keyboards/rart/rartland/{info.json => keyboard.json} (98%) rename keyboards/rate/pistachio/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/rate/pistachio/rev1/rules.mk rename keyboards/rate/pistachio/rev2/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/rate/pistachio/rev2/rules.mk rename keyboards/rate/pistachio_pro/{info.json => keyboard.json} (97%) rename keyboards/rationalist/ratio60_hotswap/rev_a/{info.json => keyboard.json} (100%) rename keyboards/recompile_keys/choco60/rev1/{info.json => keyboard.json} (71%) delete mode 100644 keyboards/recompile_keys/choco60/rev1/rules.mk rename keyboards/recompile_keys/choco60/rev2/{info.json => keyboard.json} (80%) delete mode 100644 keyboards/recompile_keys/choco60/rev2/rules.mk rename keyboards/recompile_keys/nomu30/rev1/{info.json => keyboard.json} (66%) delete mode 100644 keyboards/recompile_keys/nomu30/rev1/rules.mk delete mode 100644 keyboards/recompile_keys/nomu30/rev2/config.h rename keyboards/recompile_keys/nomu30/rev2/{info.json => keyboard.json} (51%) delete mode 100644 keyboards/recompile_keys/nomu30/rev2/rules.mk rename keyboards/redox/rev1/proton_c/{info.json => keyboard.json} (100%) rename keyboards/redox/wireless/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/redox_media/config.h rename keyboards/redox_media/{info.json => keyboard.json} (95%) rename keyboards/redscarf_iiplus/verb/{info.json => keyboard.json} (98%) rename keyboards/redscarf_iiplus/verc/{info.json => keyboard.json} (98%) rename keyboards/redscarf_iiplus/verd/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/reviung/reviung61/config.h rename keyboards/reviung/reviung61/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/reviung/reviung61/rules.mk delete mode 100644 keyboards/ristretto/config.h rename keyboards/ristretto/{info.json => keyboard.json} (92%) rename keyboards/rmi_kb/aelith/{info.json => keyboard.json} (98%) rename keyboards/rmi_kb/chevron/{info.json => keyboard.json} (97%) rename keyboards/rmi_kb/herringbone/pro/{info.json => keyboard.json} (98%) rename keyboards/rmi_kb/herringbone/v1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/rmi_kb/mona/v1/config.h rename keyboards/rmi_kb/mona/v1/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/rmi_kb/mona/v1/rules.mk rename keyboards/rmi_kb/mona/v1_1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/rmi_kb/mona/v1_1/rules.mk rename keyboards/rmi_kb/mona/v32a/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/rmi_kb/tkl_ff/config.h rename keyboards/rmi_kb/tkl_ff/v2/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/rmi_kb/tkl_ff/v2/rules.mk rename keyboards/rmi_kb/wete/v1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/rmi_kb/wete/v1/rules.mk rename keyboards/rmi_kb/wete/v2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/rmi_kb/wete/v2/rules.mk rename keyboards/rocketboard_16/{info.json => keyboard.json} (88%) rename keyboards/rookiebwoy/neopad/rev1/{info.json => keyboard.json} (83%) delete mode 100755 keyboards/rookiebwoy/neopad/rev1/rules.mk rename keyboards/rose75/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rose75/rules.mk rename keyboards/rot13labs/hackboard/{info.json => keyboard.json} (100%) rename keyboards/rubi/{info.json => keyboard.json} (90%) rename keyboards/rura66/rev1/{info.json => keyboard.json} (95%) rename keyboards/ryanskidmore/rskeys100/{info.json => keyboard.json} (97%) diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h deleted file mode 100644 index 3715a98a6d1..00000000000 --- a/keyboards/rart/rart75hs/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2022 Alabahuy - -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 diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/keyboard.json similarity index 98% rename from keyboards/rart/rart75hs/info.json rename to keyboards/rart/rart75hs/keyboard.json index 148dfba3852..f8763bfbee9 100644 --- a/keyboards/rart/rart75hs/info.json +++ b/keyboards/rart/rart75hs/keyboard.json @@ -8,6 +8,21 @@ "pid": "0x5575", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "command": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "B3", "B2", "B1", "B0", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C3"], "rows": ["D5", "D6", "D7", "D0", "C5", "C4"] diff --git a/keyboards/rart/rart75hs/rules.mk b/keyboards/rart/rart75hs/rules.mk index 804d61435b6..c2ee0bc86f9 100644 --- a/keyboards/rart/rart75hs/rules.mk +++ b/keyboards/rart/rart75hs/rules.mk @@ -1,16 +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 = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/rart/rart80/config.h b/keyboards/rart/rart80/config.h deleted file mode 100644 index 3715a98a6d1..00000000000 --- a/keyboards/rart/rart80/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2022 Alabahuy - -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 diff --git a/keyboards/rart/rart80/info.json b/keyboards/rart/rart80/keyboard.json similarity index 99% rename from keyboards/rart/rart80/info.json rename to keyboards/rart/rart80/keyboard.json index e2093e50292..06fbd1add67 100644 --- a/keyboards/rart/rart80/info.json +++ b/keyboards/rart/rart80/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x0080", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C2", "C1", "C0", "D7", "B4", "B2", "B1"], "rows": ["B3", "A1", "B0", "C3", "D0", "D1"] diff --git a/keyboards/rart/rart80/rules.mk b/keyboards/rart/rart80/rules.mk index 044259ad5de..c2ee0bc86f9 100644 --- a/keyboards/rart/rart80/rules.mk +++ b/keyboards/rart/rart80/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 = 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/rart/rartland/info.json b/keyboards/rart/rartland/keyboard.json similarity index 98% rename from keyboards/rart/rartland/info.json rename to keyboards/rart/rartland/keyboard.json index c1e167d1d81..ea037b78b60 100644 --- a/keyboards/rart/rartland/info.json +++ b/keyboards/rart/rartland/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6065", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "unicode": true + }, "matrix_pins": { "cols": ["B0", "A1", "B1", "A2", "B2", "A3", "B3", "A4", "C7", "C6", "D0", "C5", "D1", "C4"], "rows": ["B4", "A7", "A5", "A6", "C3"] diff --git a/keyboards/rart/rartland/rules.mk b/keyboards/rart/rartland/rules.mk index 5e5e0f090d7..c2ee0bc86f9 100644 --- a/keyboards/rart/rartland/rules.mk +++ b/keyboards/rart/rartland/rules.mk @@ -1,18 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# 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 -UNICODE_ENABLE = yes -OLED_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/keyboard.json similarity index 97% rename from keyboards/rate/pistachio/rev1/info.json rename to keyboards/rate/pistachio/rev1/keyboard.json index ca8434fdd7d..2a74e00c0d2 100644 --- a/keyboards/rate/pistachio/rev1/info.json +++ b/keyboards/rate/pistachio/rev1/keyboard.json @@ -1,4 +1,12 @@ { + "features": { + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "hue_steps": 10, "led_count": 2, diff --git a/keyboards/rate/pistachio/rev1/rules.mk b/keyboards/rate/pistachio/rev1/rules.mk deleted file mode 100644 index 09f976d0e64..00000000000 --- a/keyboards/rate/pistachio/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 = 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/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/keyboard.json similarity index 97% rename from keyboards/rate/pistachio/rev2/info.json rename to keyboards/rate/pistachio/rev2/keyboard.json index 0bca53aca36..72ad90478e5 100644 --- a/keyboards/rate/pistachio/rev2/info.json +++ b/keyboards/rate/pistachio/rev2/keyboard.json @@ -1,4 +1,12 @@ { + "features": { + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "ws2812": { "pin": "D2" }, diff --git a/keyboards/rate/pistachio/rev2/rules.mk b/keyboards/rate/pistachio/rev2/rules.mk deleted file mode 100644 index 09f976d0e64..00000000000 --- a/keyboards/rate/pistachio/rev2/rules.mk +++ /dev/null @@ -1,12 +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 -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/rate/pistachio_pro/info.json b/keyboards/rate/pistachio_pro/keyboard.json similarity index 97% rename from keyboards/rate/pistachio_pro/info.json rename to keyboards/rate/pistachio_pro/keyboard.json index cf0218b050f..4dc439c4721 100644 --- a/keyboards/rate/pistachio_pro/info.json +++ b/keyboards/rate/pistachio_pro/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xF40C", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true + }, "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D3"} diff --git a/keyboards/rate/pistachio_pro/rules.mk b/keyboards/rate/pistachio_pro/rules.mk index 7d8b50ef3fd..73e734bd968 100644 --- a/keyboards/rate/pistachio_pro/rules.mk +++ b/keyboards/rate/pistachio_pro/rules.mk @@ -1,18 +1,3 @@ -# 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 -OLED_ENABLE = yes -ENCODER_ENABLE = yes - CUSTOM_MATRIX = lite SRC += matrix.c SRC += ./lib/bme280.c diff --git a/keyboards/rationalist/ratio60_hotswap/rev_a/info.json b/keyboards/rationalist/ratio60_hotswap/rev_a/keyboard.json similarity index 100% rename from keyboards/rationalist/ratio60_hotswap/rev_a/info.json rename to keyboards/rationalist/ratio60_hotswap/rev_a/keyboard.json diff --git a/keyboards/recompile_keys/choco60/rev1/info.json b/keyboards/recompile_keys/choco60/rev1/keyboard.json similarity index 71% rename from keyboards/recompile_keys/choco60/rev1/info.json rename to keyboards/recompile_keys/choco60/rev1/keyboard.json index 2a4dd3f7f3d..916c3de8d03 100644 --- a/keyboards/recompile_keys/choco60/rev1/info.json +++ b/keyboards/recompile_keys/choco60/rev1/keyboard.json @@ -1,4 +1,10 @@ { + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/recompile_keys/choco60/rev1/rules.mk b/keyboards/recompile_keys/choco60/rev1/rules.mk deleted file mode 100644 index 4d82dff69aa..00000000000 --- a/keyboards/recompile_keys/choco60/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 = 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/recompile_keys/choco60/rev2/info.json b/keyboards/recompile_keys/choco60/rev2/keyboard.json similarity index 80% rename from keyboards/recompile_keys/choco60/rev2/info.json rename to keyboards/recompile_keys/choco60/rev2/keyboard.json index 6565dc98347..fbc947a9f0c 100644 --- a/keyboards/recompile_keys/choco60/rev2/info.json +++ b/keyboards/recompile_keys/choco60/rev2/keyboard.json @@ -1,4 +1,10 @@ { + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "B4", "B3", "B2", "B1", "B0", null, null, null], "rows": ["C5", "C4", "B6", "B7", "C7"] diff --git a/keyboards/recompile_keys/choco60/rev2/rules.mk b/keyboards/recompile_keys/choco60/rev2/rules.mk deleted file mode 100644 index fa6fbf34d9f..00000000000 --- a/keyboards/recompile_keys/choco60/rev2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/recompile_keys/nomu30/rev1/info.json b/keyboards/recompile_keys/nomu30/rev1/keyboard.json similarity index 66% rename from keyboards/recompile_keys/nomu30/rev1/info.json rename to keyboards/recompile_keys/nomu30/rev1/keyboard.json index 815f200cd8e..01afb9fe7d5 100644 --- a/keyboards/recompile_keys/nomu30/rev1/info.json +++ b/keyboards/recompile_keys/nomu30/rev1/keyboard.json @@ -1,4 +1,10 @@ { + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D1", "D0", "D4"] diff --git a/keyboards/recompile_keys/nomu30/rev1/rules.mk b/keyboards/recompile_keys/nomu30/rev1/rules.mk deleted file mode 100644 index e29387316f7..00000000000 --- a/keyboards/recompile_keys/nomu30/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/recompile_keys/nomu30/rev2/config.h b/keyboards/recompile_keys/nomu30/rev2/config.h deleted file mode 100644 index ff4630d838a..00000000000 --- a/keyboards/recompile_keys/nomu30/rev2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 Naoto Takai - -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 diff --git a/keyboards/recompile_keys/nomu30/rev2/info.json b/keyboards/recompile_keys/nomu30/rev2/keyboard.json similarity index 51% rename from keyboards/recompile_keys/nomu30/rev2/info.json rename to keyboards/recompile_keys/nomu30/rev2/keyboard.json index 70730415a5c..0e1df3f32ad 100644 --- a/keyboards/recompile_keys/nomu30/rev2/info.json +++ b/keyboards/recompile_keys/nomu30/rev2/keyboard.json @@ -1,4 +1,16 @@ { + "features": { + "bootmagic": true, + "extrakey": false, + "mousekey": false, + "nkro": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "D5", "D4", "D3"], "rows": ["B2", "B1", "B0"] diff --git a/keyboards/recompile_keys/nomu30/rev2/rules.mk b/keyboards/recompile_keys/nomu30/rev2/rules.mk deleted file mode 100644 index c3de5dd6e58..00000000000 --- a/keyboards/recompile_keys/nomu30/rev2/rules.mk +++ /dev/null @@ -1,12 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/keyboard.json similarity index 100% rename from keyboards/redox/rev1/proton_c/info.json rename to keyboards/redox/rev1/proton_c/keyboard.json diff --git a/keyboards/redox/wireless/info.json b/keyboards/redox/wireless/keyboard.json similarity index 100% rename from keyboards/redox/wireless/info.json rename to keyboards/redox/wireless/keyboard.json diff --git a/keyboards/redox_media/config.h b/keyboards/redox_media/config.h deleted file mode 100644 index ca325c381e3..00000000000 --- a/keyboards/redox_media/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Shiftux - -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 diff --git a/keyboards/redox_media/info.json b/keyboards/redox_media/keyboard.json similarity index 95% rename from keyboards/redox_media/info.json rename to keyboards/redox_media/keyboard.json index c4e890f5577..baf1cfeb434 100644 --- a/keyboards/redox_media/info.json +++ b/keyboards/redox_media/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0000", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "D1"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/redox_media/rules.mk b/keyboards/redox_media/rules.mk index 5ad7700a767..1056aa2c41b 100644 --- a/keyboards/redox_media/rules.mk +++ b/keyboards/redox_media/rules.mk @@ -1,17 +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 -ENCODER_ENABLE = yes - # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/redscarf_iiplus/verb/info.json b/keyboards/redscarf_iiplus/verb/keyboard.json similarity index 98% rename from keyboards/redscarf_iiplus/verb/info.json rename to keyboards/redscarf_iiplus/verb/keyboard.json index 82892e9325a..a027fe1003f 100644 --- a/keyboards/redscarf_iiplus/verb/info.json +++ b/keyboards/redscarf_iiplus/verb/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "backlight": { "pin": "B7" }, diff --git a/keyboards/redscarf_iiplus/verb/rules.mk b/keyboards/redscarf_iiplus/verb/rules.mk index 73a2fe6487b..8784813b335 100755 --- a/keyboards/redscarf_iiplus/verb/rules.mk +++ b/keyboards/redscarf_iiplus/verb/rules.mk @@ -1,15 +1,2 @@ -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/redscarf_iiplus/verc/info.json b/keyboards/redscarf_iiplus/verc/keyboard.json similarity index 98% rename from keyboards/redscarf_iiplus/verc/info.json rename to keyboards/redscarf_iiplus/verc/keyboard.json index b0c785e1b65..c7f5314e7a8 100644 --- a/keyboards/redscarf_iiplus/verc/info.json +++ b/keyboards/redscarf_iiplus/verc/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "backlight": { "pin": "B7" }, diff --git a/keyboards/redscarf_iiplus/verc/rules.mk b/keyboards/redscarf_iiplus/verc/rules.mk index 73a2fe6487b..8784813b335 100755 --- a/keyboards/redscarf_iiplus/verc/rules.mk +++ b/keyboards/redscarf_iiplus/verc/rules.mk @@ -1,15 +1,2 @@ -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/redscarf_iiplus/verd/info.json b/keyboards/redscarf_iiplus/verd/keyboard.json similarity index 98% rename from keyboards/redscarf_iiplus/verd/info.json rename to keyboards/redscarf_iiplus/verd/keyboard.json index c8de6db7c27..ef8dba4a4e1 100644 --- a/keyboards/redscarf_iiplus/verd/info.json +++ b/keyboards/redscarf_iiplus/verd/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x7778", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "backlight": { "pin": "B7" }, diff --git a/keyboards/redscarf_iiplus/verd/rules.mk b/keyboards/redscarf_iiplus/verd/rules.mk index 4164035629a..8784813b335 100644 --- a/keyboards/redscarf_iiplus/verd/rules.mk +++ b/keyboards/redscarf_iiplus/verd/rules.mk @@ -1,15 +1,2 @@ -# 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/reviung/reviung61/config.h b/keyboards/reviung/reviung61/config.h deleted file mode 100644 index 2e9cb65b562..00000000000 --- a/keyboards/reviung/reviung61/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 gtips - -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 diff --git a/keyboards/reviung/reviung61/info.json b/keyboards/reviung/reviung61/keyboard.json similarity index 94% rename from keyboards/reviung/reviung61/info.json rename to keyboards/reviung/reviung61/keyboard.json index c76f797d409..99a297bde4c 100644 --- a/keyboards/reviung/reviung61/info.json +++ b/keyboards/reviung/reviung61/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x7C1A", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/reviung/reviung61/rules.mk b/keyboards/reviung/reviung61/rules.mk deleted file mode 100644 index ad81ce036a2..00000000000 --- a/keyboards/reviung/reviung61/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/ristretto/config.h b/keyboards/ristretto/config.h deleted file mode 100644 index de203ddc4e6..00000000000 --- a/keyboards/ristretto/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Brandon Lewis - * - * 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 diff --git a/keyboards/ristretto/info.json b/keyboards/ristretto/keyboard.json similarity index 92% rename from keyboards/ristretto/info.json rename to keyboards/ristretto/keyboard.json index 3853accd9b7..b28f3c1dc10 100644 --- a/keyboards/ristretto/info.json +++ b/keyboards/ristretto/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x7273", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "oled": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "B7", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["B1", "B2", "B3", "D3"] diff --git a/keyboards/ristretto/rules.mk b/keyboards/ristretto/rules.mk index 13002485f83..908e5e972ec 100644 --- a/keyboards/ristretto/rules.mk +++ b/keyboards/ristretto/rules.mk @@ -1,15 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes WAIT_FOR_USB = yes diff --git a/keyboards/rmi_kb/aelith/info.json b/keyboards/rmi_kb/aelith/keyboard.json similarity index 98% rename from keyboards/rmi_kb/aelith/info.json rename to keyboards/rmi_kb/aelith/keyboard.json index 269839dfe5d..bacc4801876 100644 --- a/keyboards/rmi_kb/aelith/info.json +++ b/keyboards/rmi_kb/aelith/keyboard.json @@ -8,6 +8,12 @@ "pid": "0xE460", "device_version": "0.1.2" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A6", "A5", "A0", "A1", "A2", "A3", "A4"], "rows": ["D5", "D1", "D0", "D6", "A7"] diff --git a/keyboards/rmi_kb/aelith/rules.mk b/keyboards/rmi_kb/aelith/rules.mk index 1e9f9255447..c2ee0bc86f9 100644 --- a/keyboards/rmi_kb/aelith/rules.mk +++ b/keyboards/rmi_kb/aelith/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/rmi_kb/chevron/info.json b/keyboards/rmi_kb/chevron/keyboard.json similarity index 97% rename from keyboards/rmi_kb/chevron/info.json rename to keyboards/rmi_kb/chevron/keyboard.json index 48f4373c263..a4cb864705e 100644 --- a/keyboards/rmi_kb/chevron/info.json +++ b/keyboards/rmi_kb/chevron/keyboard.json @@ -8,6 +8,13 @@ "pid": "0xC4EE", "device_version": "0.1.2" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "A4", "A3", "A2", "B4"], "rows": ["D5", "D6", "C0", "D7"] diff --git a/keyboards/rmi_kb/chevron/rules.mk b/keyboards/rmi_kb/chevron/rules.mk index 36c6a2d0500..c2ee0bc86f9 100644 --- a/keyboards/rmi_kb/chevron/rules.mk +++ b/keyboards/rmi_kb/chevron/rules.mk @@ -1,16 +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 -ENCODER_ENABLE = yes diff --git a/keyboards/rmi_kb/herringbone/pro/info.json b/keyboards/rmi_kb/herringbone/pro/keyboard.json similarity index 98% rename from keyboards/rmi_kb/herringbone/pro/info.json rename to keyboards/rmi_kb/herringbone/pro/keyboard.json index caab0f11e15..506022a42b4 100644 --- a/keyboards/rmi_kb/herringbone/pro/info.json +++ b/keyboards/rmi_kb/herringbone/pro/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x440B", "device_version": "0.1.2" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "wpm": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "D6", "D5", "D1", "B0", "B1", "B2", "B3", "B4", "D7"], "rows": ["C4", "C5", "C6", "C7", "A7", "A6", null] diff --git a/keyboards/rmi_kb/herringbone/pro/rules.mk b/keyboards/rmi_kb/herringbone/pro/rules.mk index 890f20de86a..85b16472c53 100644 --- a/keyboards/rmi_kb/herringbone/pro/rules.mk +++ b/keyboards/rmi_kb/herringbone/pro/rules.mk @@ -1,21 +1,4 @@ # 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 -ENCODER_ENABLE = yes -OLED_ENABLE = yes -WPM_ENABLE = yes -LTO_ENABLE = yes - SRC += pattern.c diff --git a/keyboards/rmi_kb/herringbone/v1/info.json b/keyboards/rmi_kb/herringbone/v1/keyboard.json similarity index 99% rename from keyboards/rmi_kb/herringbone/v1/info.json rename to keyboards/rmi_kb/herringbone/v1/keyboard.json index 89e15d9c350..91fbf2cf244 100644 --- a/keyboards/rmi_kb/herringbone/v1/info.json +++ b/keyboards/rmi_kb/herringbone/v1/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x04E5", "device_version": "0.1.2" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "D6", "D5", "D1", "B0", "B1", "B2", "B3", "B4", "D7"], "rows": ["C4", "C5", "C6", "C7", "A7", "A6"] diff --git a/keyboards/rmi_kb/herringbone/v1/rules.mk b/keyboards/rmi_kb/herringbone/v1/rules.mk index 18550f0a64d..c2ee0bc86f9 100644 --- a/keyboards/rmi_kb/herringbone/v1/rules.mk +++ b/keyboards/rmi_kb/herringbone/v1/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/rmi_kb/mona/v1/config.h b/keyboards/rmi_kb/mona/v1/config.h deleted file mode 100644 index b53bfc15542..00000000000 --- a/keyboards/rmi_kb/mona/v1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 Ramon Imbao - -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 diff --git a/keyboards/rmi_kb/mona/v1/info.json b/keyboards/rmi_kb/mona/v1/keyboard.json similarity index 98% rename from keyboards/rmi_kb/mona/v1/info.json rename to keyboards/rmi_kb/mona/v1/keyboard.json index abb6877be61..7bd5f56e142 100644 --- a/keyboards/rmi_kb/mona/v1/info.json +++ b/keyboards/rmi_kb/mona/v1/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x404A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D3", "D2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D1", "D5", "B7", "F0", "F1"] diff --git a/keyboards/rmi_kb/mona/v1/rules.mk b/keyboards/rmi_kb/mona/v1/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/rmi_kb/mona/v1/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 = 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/rmi_kb/mona/v1_1/info.json b/keyboards/rmi_kb/mona/v1_1/keyboard.json similarity index 99% rename from keyboards/rmi_kb/mona/v1_1/info.json rename to keyboards/rmi_kb/mona/v1_1/keyboard.json index 3457d9cf739..7f25b8da478 100644 --- a/keyboards/rmi_kb/mona/v1_1/info.json +++ b/keyboards/rmi_kb/mona/v1_1/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x404B", "device_version": "0.1.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D0", "D3", "D2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D1", "D5", "B7", "F0", "F1"] diff --git a/keyboards/rmi_kb/mona/v1_1/rules.mk b/keyboards/rmi_kb/mona/v1_1/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/rmi_kb/mona/v1_1/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 = 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/rmi_kb/mona/v32a/info.json b/keyboards/rmi_kb/mona/v32a/keyboard.json similarity index 99% rename from keyboards/rmi_kb/mona/v32a/info.json rename to keyboards/rmi_kb/mona/v32a/keyboard.json index a489e0fffc6..363ea3438f5 100644 --- a/keyboards/rmi_kb/mona/v32a/info.json +++ b/keyboards/rmi_kb/mona/v32a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x4032", "device_version": "0.1.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B4", "B3", "B2", "B1", "B0", "A0", "A1", "A2", "A5", "A4", "A3", "A7", "D5", "C7", "C6"], "rows": ["C2", "C3", "D6", "D1", "A6"] diff --git a/keyboards/rmi_kb/mona/v32a/rules.mk b/keyboards/rmi_kb/mona/v32a/rules.mk index 1e9f9255447..c2ee0bc86f9 100644 --- a/keyboards/rmi_kb/mona/v32a/rules.mk +++ b/keyboards/rmi_kb/mona/v32a/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/rmi_kb/tkl_ff/config.h b/keyboards/rmi_kb/tkl_ff/config.h deleted file mode 100644 index 656deab55a6..00000000000 --- a/keyboards/rmi_kb/tkl_ff/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Ramon Imbao - -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/rmi_kb/tkl_ff/info.json b/keyboards/rmi_kb/tkl_ff/info.json index b09e0e888ec..a4fe24cab73 100644 --- a/keyboards/rmi_kb/tkl_ff/info.json +++ b/keyboards/rmi_kb/tkl_ff/info.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D5", "B0", "B1", "D1"], "rows": ["B2", "B3", "B7", "D6", "D3", "D2"] diff --git a/keyboards/rmi_kb/tkl_ff/v2/info.json b/keyboards/rmi_kb/tkl_ff/v2/keyboard.json similarity index 90% rename from keyboards/rmi_kb/tkl_ff/v2/info.json rename to keyboards/rmi_kb/tkl_ff/v2/keyboard.json index 72a3406af3e..49e662fecc4 100644 --- a/keyboards/rmi_kb/tkl_ff/v2/info.json +++ b/keyboards/rmi_kb/tkl_ff/v2/keyboard.json @@ -2,6 +2,9 @@ "usb": { "pid": "0x10FF" }, + "features": { + "rgblight": true + }, "rgblight": { "hue_steps": 32, "saturation_steps": 32, diff --git a/keyboards/rmi_kb/tkl_ff/v2/rules.mk b/keyboards/rmi_kb/tkl_ff/v2/rules.mk deleted file mode 100644 index 84ef473c02e..00000000000 --- a/keyboards/rmi_kb/tkl_ff/v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/rmi_kb/wete/v1/info.json b/keyboards/rmi_kb/wete/v1/keyboard.json similarity index 99% rename from keyboards/rmi_kb/wete/v1/info.json rename to keyboards/rmi_kb/wete/v1/keyboard.json index 47a6befec34..569455923ca 100644 --- a/keyboards/rmi_kb/wete/v1/info.json +++ b/keyboards/rmi_kb/wete/v1/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x00B5", "device_version": "0.1.2" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["B13", "B14", "B15", "A8", "B0", "A7", "A5", "A4", "A3", "B9", "C13", "C14", "C15", "F0", "F1", "A0", "A1", "A2", "B8", "B7"], "rows": ["A9", "B12", "B11", "B10", "B2", "B1"] diff --git a/keyboards/rmi_kb/wete/v1/rules.mk b/keyboards/rmi_kb/wete/v1/rules.mk deleted file mode 100644 index 108db79ad0b..00000000000 --- a/keyboards/rmi_kb/wete/v1/rules.mk +++ /dev/null @@ -1,14 +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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SLEEP_LED_ENABLE = yes - diff --git a/keyboards/rmi_kb/wete/v2/info.json b/keyboards/rmi_kb/wete/v2/keyboard.json similarity index 99% rename from keyboards/rmi_kb/wete/v2/info.json rename to keyboards/rmi_kb/wete/v2/keyboard.json index 45ae1b5708c..140071d01f7 100644 --- a/keyboards/rmi_kb/wete/v2/info.json +++ b/keyboards/rmi_kb/wete/v2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x00B3", "device_version": "35.0.0" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B1", "B0", "B7", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B3", "B2", "B6", "C6", "C7", "E6", "F7", "F6", "F5", "F4", "F1", "F0", null] diff --git a/keyboards/rmi_kb/wete/v2/rules.mk b/keyboards/rmi_kb/wete/v2/rules.mk deleted file mode 100644 index 7386bf69993..00000000000 --- a/keyboards/rmi_kb/wete/v2/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Rotary encoder diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/keyboard.json similarity index 88% rename from keyboards/rocketboard_16/info.json rename to keyboards/rocketboard_16/keyboard.json index 5e3ee7b0e8f..84baf6c5a76 100644 --- a/keyboards/rocketboard_16/info.json +++ b/keyboards/rocketboard_16/keyboard.json @@ -8,6 +8,20 @@ "pid": "0xFF16", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "processor": "STM32F103", "bootloader": "stm32duino", "matrix_pins": { diff --git a/keyboards/rocketboard_16/rules.mk b/keyboards/rocketboard_16/rules.mk index dcc3d4516bd..c8915ad1829 100644 --- a/keyboards/rocketboard_16/rules.mk +++ b/keyboards/rocketboard_16/rules.mk @@ -4,21 +4,4 @@ MCU_LDSCRIPT = STM32F103xB # Extra include SRC += keycode_lookup.c -# 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 backlit keys -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -ENCODER_ENABLE = yes - RAW_ENABLE = yes # Enables HID RAW communication between the board and the PC - -LTO_ENABLE = yes diff --git a/keyboards/rookiebwoy/neopad/rev1/info.json b/keyboards/rookiebwoy/neopad/rev1/keyboard.json similarity index 83% rename from keyboards/rookiebwoy/neopad/rev1/info.json rename to keyboards/rookiebwoy/neopad/rev1/keyboard.json index 0a0340c06df..426d8af7ec0 100755 --- a/keyboards/rookiebwoy/neopad/rev1/info.json +++ b/keyboards/rookiebwoy/neopad/rev1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0913", "device_version": "0.1.0" }, + "features": { + "bootmagic": true, + "console": true, + "encoder": true, + "extrakey": true, + "key_lock": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B3", "B2", "B6"], "rows": ["F4", "F5"] diff --git a/keyboards/rookiebwoy/neopad/rev1/rules.mk b/keyboards/rookiebwoy/neopad/rev1/rules.mk deleted file mode 100755 index 7816aab001a..00000000000 --- a/keyboards/rookiebwoy/neopad/rev1/rules.mk +++ /dev/null @@ -1,15 +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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -KEY_LOCK_ENABLE = yes diff --git a/keyboards/rose75/info.json b/keyboards/rose75/keyboard.json similarity index 100% rename from keyboards/rose75/info.json rename to keyboards/rose75/keyboard.json diff --git a/keyboards/rose75/rules.mk b/keyboards/rose75/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/rose75/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/rot13labs/hackboard/info.json b/keyboards/rot13labs/hackboard/keyboard.json similarity index 100% rename from keyboards/rot13labs/hackboard/info.json rename to keyboards/rot13labs/hackboard/keyboard.json diff --git a/keyboards/rubi/info.json b/keyboards/rubi/keyboard.json similarity index 90% rename from keyboards/rubi/info.json rename to keyboards/rubi/keyboard.json index d61ef345481..e434977b37c 100644 --- a/keyboards/rubi/info.json +++ b/keyboards/rubi/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5242", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "oled": true + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "F7"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/rubi/rules.mk b/keyboards/rubi/rules.mk index e4810730443..c10753cb62b 100644 --- a/keyboards/rubi/rules.mk +++ b/keyboards/rubi/rules.mk @@ -1,18 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -ENCODER_ENABLE = yes - SRC += lib/oled.c \ lib/encoder.c \ lib/calc.c diff --git a/keyboards/rura66/rev1/info.json b/keyboards/rura66/rev1/keyboard.json similarity index 95% rename from keyboards/rura66/rev1/info.json rename to keyboards/rura66/rev1/keyboard.json index 71bb374bfb7..ded87a7e0e9 100644 --- a/keyboards/rura66/rev1/info.json +++ b/keyboards/rura66/rev1/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0200", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/rura66/rev1/rules.mk b/keyboards/rura66/rev1/rules.mk index ec47c1e0348..0e22d6afa96 100644 --- a/keyboards/rura66/rev1/rules.mk +++ b/keyboards/rura66/rev1/rules.mk @@ -1,7 +1 @@ -EXTRAKEY_ENABLE = yes # Audio control and System control -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = no -ENCODER_ENABLE = no -LTO_ENABLE = yes - SRC += oled_display.c diff --git a/keyboards/rura66/rules.mk b/keyboards/rura66/rules.mk index 4cbe55ac766..556ec176559 100644 --- a/keyboards/rura66/rules.mk +++ b/keyboards/rura66/rules.mk @@ -1,16 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -LTO_ENABLE = yes - DEFAULT_FOLDER = rura66/rev1 diff --git a/keyboards/ryanskidmore/rskeys100/info.json b/keyboards/ryanskidmore/rskeys100/keyboard.json similarity index 97% rename from keyboards/ryanskidmore/rskeys100/info.json rename to keyboards/ryanskidmore/rskeys100/keyboard.json index dfd6ce5c24c..b42a23217dc 100644 --- a/keyboards/ryanskidmore/rskeys100/info.json +++ b/keyboards/ryanskidmore/rskeys100/keyboard.json @@ -7,6 +7,14 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": true, + "extrakey": false, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "ws2812": { "pin": "C7" }, diff --git a/keyboards/ryanskidmore/rskeys100/rules.mk b/keyboards/ryanskidmore/rskeys100/rules.mk index 8db3728a22a..179d02c3c68 100644 --- a/keyboards/ryanskidmore/rskeys100/rules.mk +++ b/keyboards/ryanskidmore/rskeys100/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 = no # 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 = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite SRC += matrix.c From f75e66dd19788f1f79db062f0bd27f79c63cbea5 Mon Sep 17 00:00:00 2001 From: Alabahuy Date: Fri, 19 Apr 2024 07:16:43 +0700 Subject: [PATCH 159/333] add jaykeeb joker (#23535) --- keyboards/jaykeeb/joker/info.json | 493 ++++++++++++++++++ .../jaykeeb/joker/keymaps/default/keymap.c | 15 + keyboards/jaykeeb/joker/keymaps/via/keymap.c | 15 + keyboards/jaykeeb/joker/keymaps/via/rules.mk | 1 + keyboards/jaykeeb/joker/matrix_diagram.md | 23 + keyboards/jaykeeb/joker/readme.md | 27 + keyboards/jaykeeb/joker/rules.mk | 1 + 7 files changed, 575 insertions(+) create mode 100644 keyboards/jaykeeb/joker/info.json create mode 100644 keyboards/jaykeeb/joker/keymaps/default/keymap.c create mode 100644 keyboards/jaykeeb/joker/keymaps/via/keymap.c create mode 100644 keyboards/jaykeeb/joker/keymaps/via/rules.mk create mode 100644 keyboards/jaykeeb/joker/matrix_diagram.md create mode 100644 keyboards/jaykeeb/joker/readme.md create mode 100644 keyboards/jaykeeb/joker/rules.mk diff --git a/keyboards/jaykeeb/joker/info.json b/keyboards/jaykeeb/joker/info.json new file mode 100644 index 00000000000..ed8b59d03f4 --- /dev/null +++ b/keyboards/jaykeeb/joker/info.json @@ -0,0 +1,493 @@ +{ + "manufacturer": "Jaykeeb Studio", + "keyboard_name": "Joker", + "maintainer": "Alabahuy", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP15", "GP14", "GP10", "GP4", "GP3", "GP2", "GP1"], + "rows": ["GP5", "GP6", "GP0", "GP9", "GP7", "GP8"] + }, + "indicators": { + "caps_lock": "GP12", + "num_lock": "GP11", + "scroll_lock": "GP13", + "on_state": 0 + }, + "processor": "RP2040", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0795", + "vid": "0x414C" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + + {"label": "Print Screen", "matrix": [0, 13], "x": 14, "y": 0}, + + {"label": "Scroll Lock", "matrix": [0, 14], "x": 15.25, "y": 0}, + + {"label": "Pause", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + {"label": "End", "matrix": [0, 17], "x": 18.5, "y": 0}, + {"label": "Delete", "matrix": [0, 18], "x": 19.5, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25}, + {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25}, + + {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + + {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25}, + {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25}, + {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25}, + {"label": "-", "matrix": [1, 18], "x": 19.5, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"label": "Page Up", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + + {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25}, + {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25}, + {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25}, + {"label": "+", "matrix": [2, 18], "x": 19.5, "y": 2.25, "h": 2}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"label": "Page Down", "matrix": [3, 14], "x": 15.25, "y": 3.25}, + + {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25}, + {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25}, + {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + + {"label": "\u2191", "matrix": [4, 13], "x": 14.25, "y": 4.5}, + + {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25}, + {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25}, + {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25}, + {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25, "h": 2}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "Ctrl", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5}, + + {"label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.5}, + {"label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.5}, + {"label": "\u2192", "matrix": [5, 14], "x": 15.25, "y": 5.5}, + + {"label": "0", "matrix": [5, 15], "x": 16.5, "y": 5.25, "w": 2}, + {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25} + ] + }, + "LAYOUT_ansi": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "Print Screen", "matrix": [0, 13], "x": 14, "y": 0}, + {"label": "Scroll Lock", "matrix": [0, 14], "x": 15.25, "y": 0}, + {"label": "Pause", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + {"label": "End", "matrix": [0, 17], "x": 18.5, "y": 0}, + {"label": "Delete", "matrix": [0, 18], "x": 19.5, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25}, + {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25}, + {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25}, + {"label": "-", "matrix": [1, 18], "x": 19.5, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Page Up", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25}, + {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25}, + {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25}, + {"label": "+", "matrix": [2, 18], "x": 19.5, "y": 2.25, "h": 2}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "Page Down", "matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25}, + {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25}, + {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Up", "matrix": [4, 13], "x": 14.25, "y": 4.5}, + {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25}, + {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25}, + {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25}, + {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25, "h": 2}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "Ctrl", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5}, + {"label": "Left", "matrix": [5, 12], "x": 13.25, "y": 5.5}, + {"label": "Down", "matrix": [5, 13], "x": 14.25, "y": 5.5}, + {"label": "Right", "matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"label": "0", "matrix": [5, 15], "x": 16.5, "y": 5.25, "w": 2}, + {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25} + ] + },"LAYOUT_ansi_wkl": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "Print Screen", "matrix": [0, 13], "x": 14, "y": 0}, + {"label": "Scroll Lock", "matrix": [0, 14], "x": 15.25, "y": 0}, + {"label": "Pause", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + {"label": "End", "matrix": [0, 17], "x": 18.5, "y": 0}, + {"label": "Delete", "matrix": [0, 18], "x": 19.5, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25}, + {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25}, + {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25}, + {"label": "-", "matrix": [1, 18], "x": 19.5, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Page Up", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25}, + {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25}, + {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25}, + {"label": "+", "matrix": [2, 18], "x": 19.5, "y": 2.25, "h": 2}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "Page Down", "matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25}, + {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25}, + {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Up", "matrix": [4, 13], "x": 14.25, "y": 4.5}, + {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25}, + {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25}, + {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25}, + {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25, "h": 2}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "Alt", "matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.5}, + {"label": "Space", "matrix": [5, 6], "x": 3, "y": 5.25, "w": 7}, + {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "Ctrl", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5}, + {"label": "Left", "matrix": [5, 12], "x": 13.25, "y": 5.5}, + {"label": "Down", "matrix": [5, 13], "x": 14.25, "y": 5.5}, + {"label": "Right", "matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"label": "0", "matrix": [5, 15], "x": 16.5, "y": 5.25, "w": 2}, + {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25} + ] + }, + "LAYOUT_ansi_wkl_split_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "Print Screen", "matrix": [0, 13], "x": 14, "y": 0}, + {"label": "Scroll Lock", "matrix": [0, 14], "x": 15.25, "y": 0}, + {"label": "Pause", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + {"label": "End", "matrix": [0, 17], "x": 18.5, "y": 0}, + {"label": "Delete", "matrix": [0, 18], "x": 19.5, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25}, + {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 1.25}, + {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25}, + {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25}, + {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25}, + {"label": "-", "matrix": [1, 18], "x": 19.5, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Page Up", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25}, + {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25}, + {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25}, + {"label": "+", "matrix": [2, 18], "x": 19.5, "y": 2.25, "h": 2}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "Page Down", "matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25}, + {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25}, + {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Up", "matrix": [4, 13], "x": 14.25, "y": 4.5}, + {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25}, + {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25}, + {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25}, + {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25, "h": 2}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "Alt", "matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.5}, + {"label": "Space", "matrix": [5, 6], "x": 3, "y": 5.25, "w": 7}, + {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "Ctrl", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5}, + {"label": "Left", "matrix": [5, 12], "x": 13.25, "y": 5.5}, + {"label": "Down", "matrix": [5, 13], "x": 14.25, "y": 5.5}, + {"label": "Right", "matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"label": "0", "matrix": [5, 15], "x": 16.5, "y": 5.25, "w": 2}, + {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/jaykeeb/joker/keymaps/default/keymap.c b/keyboards/jaykeeb/joker/keymaps/default/keymap.c new file mode 100644 index 00000000000..a9f71941604 --- /dev/null +++ b/keyboards/jaykeeb/joker/keymaps/default/keymap.c @@ -0,0 +1,15 @@ +// Copyright 2024 Alabahuy +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi( + 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_F12 , KC_PSCR, KC_SCRL, KC_PAUS, KC_HOME, KC_END , KC_DEL , + KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_INS , KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_P7 , KC_P8 , KC_P9 , KC_PPLS, + KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , KC_PGDN, KC_P4 , KC_P5 , KC_P6 , + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP , KC_P1 , KC_P2 , KC_P3 , KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0 , KC_PDOT + ) +}; \ No newline at end of file diff --git a/keyboards/jaykeeb/joker/keymaps/via/keymap.c b/keyboards/jaykeeb/joker/keymaps/via/keymap.c new file mode 100644 index 00000000000..a9f71941604 --- /dev/null +++ b/keyboards/jaykeeb/joker/keymaps/via/keymap.c @@ -0,0 +1,15 @@ +// Copyright 2024 Alabahuy +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi( + 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_F12 , KC_PSCR, KC_SCRL, KC_PAUS, KC_HOME, KC_END , KC_DEL , + KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_INS , KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_P7 , KC_P8 , KC_P9 , KC_PPLS, + KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , KC_PGDN, KC_P4 , KC_P5 , KC_P6 , + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP , KC_P1 , KC_P2 , KC_P3 , KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0 , KC_PDOT + ) +}; \ No newline at end of file diff --git a/keyboards/jaykeeb/joker/keymaps/via/rules.mk b/keyboards/jaykeeb/joker/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/jaykeeb/joker/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/jaykeeb/joker/matrix_diagram.md b/keyboards/jaykeeb/joker/matrix_diagram.md new file mode 100644 index 00000000000..d7b79bf97af --- /dev/null +++ b/keyboards/jaykeeb/joker/matrix_diagram.md @@ -0,0 +1,23 @@ +# Matrix Diagram for jaykeeb joker + +``` +┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐┌───┬───┬───┬───┐ +│00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E ││0F │0G │0H │0I │ +└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┘└───┴───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐ ┌───────┐ +│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │2D ││1E ││1F │1G │1H │1I │ │1E │ 2u Backspace +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤├───┼───┼───┼───┤ └───────┘ +│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │3D ││2E ││2F │2G │2H │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┤├───┼───┼───┤2I │ +│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C ││3E ││3F │3G │3H │ │ +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘└───┘├───┼───┼───┼───┤ +│40 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │┌───┐ │4F │4G │4H │ │ +├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┘│4D │ ├───┴───┼───┤4I │ +│50 │51 │52 │56 │5A │5B │┌───┼───┼───┐│5F │5H │ │ +└────┴────┴────┴────────────────────────┴─────┴─────┘│5C │5D │5E │└───────┴───┴───┘ + └───┴───┴───┘ + +┌─────┬─────┬───────────────────────────┬─────┬─────┐ +│50 │51 │56 │5A │5B │ WKL +└─────┴─────┴───────────────────────────┴─────┴─────┘ +``` \ No newline at end of file diff --git a/keyboards/jaykeeb/joker/readme.md b/keyboards/jaykeeb/joker/readme.md new file mode 100644 index 00000000000..d356b5b3c22 --- /dev/null +++ b/keyboards/jaykeeb/joker/readme.md @@ -0,0 +1,27 @@ +# Joker + +![joker](https://i.imgur.com/7uNPp7r.png) + +1800 layout pcb replace for austin + +* Keyboard Maintainer: [Alabahuy](https://github.com/Alabahuy) +* Hardware Supported: RP2040 +* Hardware Availability: Private GB + +Make example for this keyboard (after setting up your build environment): + + make jaykeeb/joker:default + +Flashing example for this keyboard: + + make jaykeeb/joker: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/jaykeeb/joker/rules.mk b/keyboards/jaykeeb/joker/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/jaykeeb/joker/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From d0e1d36144e1c1b2269be171c748a01f15ec32f2 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 18 Apr 2024 17:49:15 -0700 Subject: [PATCH 160/333] Data-Driven Keyboard Conversions: J (#23547) --- .../bear_65/rev1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/jacky_studio/bear_65/rev1/rules.mk | 16 ---------------- .../bear_65/rev2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/jacky_studio/bear_65/rev2/rules.mk | 16 ---------------- .../handwired/{info.json => keyboard.json} | 0 keyboards/jian/handwired/rules.mk | 5 ----- keyboards/jian/info.json | 3 +++ .../jian/nsrev2/{info.json => keyboard.json} | 3 +++ keyboards/jian/nsrev2/rules.mk | 6 ------ .../jian/rev1/{info.json => keyboard.json} | 5 +++++ keyboards/jian/rev1/rules.mk | 7 ------- .../jian/rev2/{info.json => keyboard.json} | 4 ++++ keyboards/jian/rev2/rules.mk | 6 ------ keyboards/jian/rules.mk | 1 - .../jiran/rev1/{info.json => keyboard.json} | 6 ++++++ keyboards/jiran/rev1/rules.mk | 1 - .../jiran/rev2/{info.json => keyboard.json} | 6 ++++++ keyboards/jiran/rev2/rules.mk | 1 - keyboards/jiran/rules.mk | 13 ------------- keyboards/jones/v03/info.json | 10 ++++++++++ keyboards/jones/v03/rules.mk | 19 +------------------ keyboards/jones/v03_1/info.json | 11 +++++++++++ keyboards/jones/v03_1/rules.mk | 19 +------------------ .../jones/v1/{info.json => keyboard.json} | 11 +++++++++++ keyboards/jones/v1/rules.mk | 15 --------------- .../jorne/rev1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/jorne/rev1/rules.mk | 2 -- keyboards/jorne/rules.mk | 13 ------------- keyboards/joshajohnson/hub16/info.json | 7 +++++++ keyboards/joshajohnson/hub16/rules.mk | 13 ------------- keyboards/jpe230/big_knob/info.json | 3 ++- keyboards/jpe230/big_knob/rules.mk | 1 - 32 files changed, 100 insertions(+), 153 deletions(-) rename keyboards/jacky_studio/bear_65/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/jacky_studio/bear_65/rev1/rules.mk rename keyboards/jacky_studio/bear_65/rev2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/jacky_studio/bear_65/rev2/rules.mk rename keyboards/jian/handwired/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jian/handwired/rules.mk rename keyboards/jian/nsrev2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/jian/nsrev2/rules.mk rename keyboards/jian/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/jian/rev1/rules.mk rename keyboards/jian/rev2/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/jian/rev2/rules.mk rename keyboards/jiran/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/jiran/rev1/rules.mk rename keyboards/jiran/rev2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/jiran/rev2/rules.mk rename keyboards/jones/v1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/jones/v1/rules.mk rename keyboards/jorne/rev1/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/jorne/rev1/rules.mk diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/keyboard.json similarity index 97% rename from keyboards/jacky_studio/bear_65/rev1/info.json rename to keyboards/jacky_studio/bear_65/rev1/keyboard.json index 098817dedb1..2c79dc41f52 100644 --- a/keyboards/jacky_studio/bear_65/rev1/info.json +++ b/keyboards/jacky_studio/bear_65/rev1/keyboard.json @@ -5,6 +5,16 @@ "maintainer": "qmk", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "backlight": true, + "rgblight": true + }, + "build": { + "lto": true + }, "usb": { "vid": "0xA13B", "pid": "0x000A", diff --git a/keyboards/jacky_studio/bear_65/rev1/rules.mk b/keyboards/jacky_studio/bear_65/rev1/rules.mk deleted file mode 100644 index 7e038109428..00000000000 --- a/keyboards/jacky_studio/bear_65/rev1/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LTO_ENABLE = yes # Use LTO flags to reduce firmware size - -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/keyboard.json similarity index 98% rename from keyboards/jacky_studio/bear_65/rev2/info.json rename to keyboards/jacky_studio/bear_65/rev2/keyboard.json index 52e8354fabd..ec2ff1b7c78 100644 --- a/keyboards/jacky_studio/bear_65/rev2/info.json +++ b/keyboards/jacky_studio/bear_65/rev2/keyboard.json @@ -5,6 +5,16 @@ "maintainer": "qmk", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "backlight": true, + "rgblight": true + }, + "build": { + "lto": true + }, "usb": { "vid": "0x45D4", "pid": "0x0428", diff --git a/keyboards/jacky_studio/bear_65/rev2/rules.mk b/keyboards/jacky_studio/bear_65/rev2/rules.mk deleted file mode 100644 index 7e038109428..00000000000 --- a/keyboards/jacky_studio/bear_65/rev2/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LTO_ENABLE = yes # Use LTO flags to reduce firmware size - -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/keyboard.json similarity index 100% rename from keyboards/jian/handwired/info.json rename to keyboards/jian/handwired/keyboard.json diff --git a/keyboards/jian/handwired/rules.mk b/keyboards/jian/handwired/rules.mk deleted file mode 100644 index a0c271ea25c..00000000000 --- a/keyboards/jian/handwired/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no diff --git a/keyboards/jian/info.json b/keyboards/jian/info.json index f0b0261dc95..c9f6f46c1a7 100644 --- a/keyboards/jian/info.json +++ b/keyboards/jian/info.json @@ -5,5 +5,8 @@ "usb": { "vid": "0xC0DE", "pid": "0x1337" + }, + "build": { + "lto": true } } diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/keyboard.json similarity index 98% rename from keyboards/jian/nsrev2/info.json rename to keyboards/jian/nsrev2/keyboard.json index 4ea315f51e0..2981adf9b5a 100644 --- a/keyboards/jian/nsrev2/info.json +++ b/keyboards/jian/nsrev2/keyboard.json @@ -40,6 +40,9 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "backlight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jian/nsrev2/rules.mk b/keyboards/jian/nsrev2/rules.mk deleted file mode 100644 index a05436d218b..00000000000 --- a/keyboards/jian/nsrev2/rules.mk +++ /dev/null @@ -1,6 +0,0 @@ -# Build Options -# change yes to no to disable -# -CONSOLE_ENABLE = no -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = no diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/keyboard.json similarity index 97% rename from keyboards/jian/rev1/info.json rename to keyboards/jian/rev1/keyboard.json index 3cfc0266670..1a8957d8b3c 100644 --- a/keyboards/jian/rev1/info.json +++ b/keyboards/jian/rev1/keyboard.json @@ -44,6 +44,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "backlight": true, + "rgblight": true, + "dip_switch": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jian/rev1/rules.mk b/keyboards/jian/rev1/rules.mk deleted file mode 100644 index bd3228c26eb..00000000000 --- a/keyboards/jian/rev1/rules.mk +++ /dev/null @@ -1,7 +0,0 @@ -# Build Options -# change yes to no to disable -# -CONSOLE_ENABLE = no -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -DIP_SWITCH_ENABLE = yes diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/keyboard.json similarity index 97% rename from keyboards/jian/rev2/info.json rename to keyboards/jian/rev2/keyboard.json index ebd015c9a4a..e64df224a5f 100644 --- a/keyboards/jian/rev2/info.json +++ b/keyboards/jian/rev2/keyboard.json @@ -43,6 +43,10 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jian/rev2/rules.mk b/keyboards/jian/rev2/rules.mk deleted file mode 100644 index e8415063bc2..00000000000 --- a/keyboards/jian/rev2/rules.mk +++ /dev/null @@ -1,6 +0,0 @@ -# Build Options -# change yes to no to disable -# -CONSOLE_ENABLE = no -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/jian/rules.mk b/keyboards/jian/rules.mk index 72270833056..c19fa00b5cb 100644 --- a/keyboards/jian/rules.mk +++ b/keyboards/jian/rules.mk @@ -1,2 +1 @@ DEFAULT_FOLDER = jian/rev2 -LTO_ENABLE = yes diff --git a/keyboards/jiran/rev1/info.json b/keyboards/jiran/rev1/keyboard.json similarity index 96% rename from keyboards/jiran/rev1/info.json rename to keyboards/jiran/rev1/keyboard.json index b9a6d56fe6b..1e36d757caf 100644 --- a/keyboards/jiran/rev1/info.json +++ b/keyboards/jiran/rev1/keyboard.json @@ -3,6 +3,12 @@ "pin": "B6", "levels": 5 }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "backlight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jiran/rev1/rules.mk b/keyboards/jiran/rev1/rules.mk deleted file mode 100644 index bd518d8f273..00000000000 --- a/keyboards/jiran/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = yes diff --git a/keyboards/jiran/rev2/info.json b/keyboards/jiran/rev2/keyboard.json similarity index 96% rename from keyboards/jiran/rev2/info.json rename to keyboards/jiran/rev2/keyboard.json index 8f52510ff76..37bed5c7960 100644 --- a/keyboards/jiran/rev2/info.json +++ b/keyboards/jiran/rev2/keyboard.json @@ -19,6 +19,12 @@ "ws2812": { "pin": "B6" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jiran/rev2/rules.mk b/keyboards/jiran/rev2/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/jiran/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/jiran/rules.mk b/keyboards/jiran/rules.mk index d1450315061..3ffe13302d3 100644 --- a/keyboards/jiran/rules.mk +++ b/keyboards/jiran/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 = no # Audio output - DEFAULT_FOLDER = jiran/rev1 diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json index 2f8a7803d2f..f5b18c9d2fd 100644 --- a/keyboards/jones/v03/info.json +++ b/keyboards/jones/v03/info.json @@ -28,6 +28,16 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/jones/v03/rules.mk b/keyboards/jones/v03/rules.mk index 0afd3b816aa..30ce5d293b7 100644 --- a/keyboards/jones/v03/rules.mk +++ b/keyboards/jones/v03/rules.mk @@ -1,19 +1,2 @@ -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes # Rotary Encoder - -CUSTOM_MATRIX = lite # Custom matrix for "Round-Robin Matrix" +CUSTOM_MATRIX = lite SRC += matrix.c - -LTO_ENABLE = yes diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json index 9e46cdd40a2..ae89012884f 100644 --- a/keyboards/jones/v03_1/info.json +++ b/keyboards/jones/v03_1/info.json @@ -29,6 +29,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "rgblight": true, + "audio": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/jones/v03_1/rules.mk b/keyboards/jones/v03_1/rules.mk index eff64d9a584..30ce5d293b7 100644 --- a/keyboards/jones/v03_1/rules.mk +++ b/keyboards/jones/v03_1/rules.mk @@ -1,19 +1,2 @@ -# 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 # Rotary Encoder - -CUSTOM_MATRIX = lite # Custom matrix for "Round-Robin Matrix" +CUSTOM_MATRIX = lite SRC += matrix.c - -LTO_ENABLE = yes diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/keyboard.json similarity index 96% rename from keyboards/jones/v1/info.json rename to keyboards/jones/v1/keyboard.json index 54496d31649..df30c596d4c 100644 --- a/keyboards/jones/v1/info.json +++ b/keyboards/jones/v1/keyboard.json @@ -38,6 +38,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "audio": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jones/v1/rules.mk b/keyboards/jones/v1/rules.mk deleted file mode 100644 index 6f522a43656..00000000000 --- a/keyboards/jones/v1/rules.mk +++ /dev/null @@ -1,15 +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 -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 # Rotary Encoder - -LTO_ENABLE = yes diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/keyboard.json similarity index 94% rename from keyboards/jorne/rev1/info.json rename to keyboards/jorne/rev1/keyboard.json index fedab8fd08a..93ece816bb9 100644 --- a/keyboards/jorne/rev1/info.json +++ b/keyboards/jorne/rev1/keyboard.json @@ -32,6 +32,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "oled": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/jorne/rev1/rules.mk b/keyboards/jorne/rev1/rules.mk deleted file mode 100644 index 52a6de4da9f..00000000000 --- a/keyboards/jorne/rev1/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -OLED_ENABLE = yes # Enable OLED -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/jorne/rules.mk b/keyboards/jorne/rules.mk index fb1b47d1065..c43649b3486 100644 --- a/keyboards/jorne/rules.mk +++ b/keyboards/jorne/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 = 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 -LTO_ENABLE = yes - DEFAULT_FOLDER = jorne/rev1 diff --git a/keyboards/joshajohnson/hub16/info.json b/keyboards/joshajohnson/hub16/info.json index 920b42feec8..7d8f0ab3568 100644 --- a/keyboards/joshajohnson/hub16/info.json +++ b/keyboards/joshajohnson/hub16/info.json @@ -37,6 +37,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true + }, "debounce": 20, "layouts": { "LAYOUT": { diff --git a/keyboards/joshajohnson/hub16/rules.mk b/keyboards/joshajohnson/hub16/rules.mk index 51fa8f6ee62..9a337c23b8a 100755 --- a/keyboards/joshajohnson/hub16/rules.mk +++ b/keyboards/joshajohnson/hub16/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# CUSTOM_MATRIX = lite # Custom scanning of matrix -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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Rotary Encoder support SRC = matrix.c diff --git a/keyboards/jpe230/big_knob/info.json b/keyboards/jpe230/big_knob/info.json index 083a1ae690a..e46aba594fb 100644 --- a/keyboards/jpe230/big_knob/info.json +++ b/keyboards/jpe230/big_knob/info.json @@ -16,7 +16,8 @@ "extrakey": true, "mousekey": true, "encoder": true, - "backlight": true + "backlight": true, + "quantum_painter": true }, "matrix_pins": { "direct": [ diff --git a/keyboards/jpe230/big_knob/rules.mk b/keyboards/jpe230/big_knob/rules.mk index 5f7b604a803..2031911ced4 100644 --- a/keyboards/jpe230/big_knob/rules.mk +++ b/keyboards/jpe230/big_knob/rules.mk @@ -1,3 +1,2 @@ -QUANTUM_PAINTER_ENABLE = yes QUANTUM_PAINTER_DRIVERS += st7735_spi SRC += gfx/logo.qgf.c From 2693d6fd840ab236021a64e42aa6d9c25da9a69c Mon Sep 17 00:00:00 2001 From: Santosh Kumar Date: Fri, 19 Apr 2024 06:29:14 +0530 Subject: [PATCH 161/333] [sofle] Fix layout order affecting messed up lower/raise/adjust layer (#23555) --- keyboards/sofle/keymaps/default/config.h | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 keyboards/sofle/keymaps/default/config.h diff --git a/keyboards/sofle/keymaps/default/config.h b/keyboards/sofle/keymaps/default/config.h new file mode 100644 index 00000000000..085d5844d9f --- /dev/null +++ b/keyboards/sofle/keymaps/default/config.h @@ -0,0 +1,8 @@ +// Copyright 2024 Santosh Kumar (@santosh) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define TRI_LAYER_LOWER_LAYER 2 +#define TRI_LAYER_UPPER_LAYER 3 +#define TRI_LAYER_ADJUST_LAYER 4 From 1513966c3844df9303e2222e32824f3823e11d27 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 19 Apr 2024 02:18:51 +0100 Subject: [PATCH 162/333] Tidy use of raw hid within keyboards (#23557) --- keyboards/dp60/dp60.c | 24 ------ keyboards/dp60/keymaps/via/keymap.c | 20 +++++ keyboards/evyd13/plain60/keymaps/rgb/rules.mk | 2 - keyboards/hs60/v1/keyboard.json | 3 +- keyboards/hs60/v1/rules.mk | 4 - keyboards/hs60/v1/v1.c | 74 ------------------- keyboards/keychron/q6/iso/rules.mk | 1 - keyboards/keychron/q6/iso_encoder/rules.mk | 1 - keyboards/massdrop/alt/rules.mk | 1 - keyboards/massdrop/ctrl/rules.mk | 1 - keyboards/rocketboard_16/rules.mk | 2 - 11 files changed, 21 insertions(+), 112 deletions(-) diff --git a/keyboards/dp60/dp60.c b/keyboards/dp60/dp60.c index 5f23b355424..349e5cea9b3 100644 --- a/keyboards/dp60/dp60.c +++ b/keyboards/dp60/dp60.c @@ -172,27 +172,3 @@ webusb_pos_t webusb_keymap[] = { {4, 0}, {4, 1}, {4, 2}, {4, 6}, {4, 10}, {4, 11}, {4, 12}, {4, 13}, }; #endif - -#ifndef RAW_ENABLE -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { -#else -bool process_record_user(uint16_t keycode, keyrecord_t *record) { -#endif - if (record->event.pressed) { - switch(keycode) { - #ifdef RGBLIGHT_ENABLE - #ifdef RGB_MATRIX_ENABLE - case KC_F13: // toggle rgb matrix - rgb_matrix_toggle(); - return false; - case KC_F14: - rgb_matrix_step(); - return false; - #endif - #endif - default: - break; - } - } - return true; -} diff --git a/keyboards/dp60/keymaps/via/keymap.c b/keyboards/dp60/keymaps/via/keymap.c index 538a27886f0..fab799e08a4 100644 --- a/keyboards/dp60/keymaps/via/keymap.c +++ b/keyboards/dp60/keymaps/via/keymap.c @@ -44,3 +44,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______, _______,_______,_______,_______) }; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (record->event.pressed) { + switch(keycode) { + #ifdef RGBLIGHT_ENABLE + #ifdef RGB_MATRIX_ENABLE + case KC_F13: // toggle rgb matrix + rgb_matrix_toggle(); + return false; + case KC_F14: + rgb_matrix_step(); + return false; + #endif + #endif + default: + break; + } + } + return true; +} diff --git a/keyboards/evyd13/plain60/keymaps/rgb/rules.mk b/keyboards/evyd13/plain60/keymaps/rgb/rules.mk index b6cd87b7d4e..1e3cebb1451 100644 --- a/keyboards/evyd13/plain60/keymaps/rgb/rules.mk +++ b/keyboards/evyd13/plain60/keymaps/rgb/rules.mk @@ -1,3 +1 @@ RGBLIGHT_ENABLE = yes -RAW_ENABLE = no -DYNAMIC_KEYMAP_ENABLE = no diff --git a/keyboards/hs60/v1/keyboard.json b/keyboards/hs60/v1/keyboard.json index 63fef233840..3c07491a3db 100644 --- a/keyboards/hs60/v1/keyboard.json +++ b/keyboards/hs60/v1/keyboard.json @@ -73,8 +73,7 @@ "mousekey": false, "extrakey": true, "nkro": true, - "rgb_matrix": true, - "raw": true + "rgb_matrix": true }, "community_layouts": ["60_ansi", "60_iso"], "layouts": { diff --git a/keyboards/hs60/v1/rules.mk b/keyboards/hs60/v1/rules.mk index 4af34f6e5bf..806a82e12af 100644 --- a/keyboards/hs60/v1/rules.mk +++ b/keyboards/hs60/v1/rules.mk @@ -2,7 +2,3 @@ # when we get USB suspend event. We want it to keep updating # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN - -# Experimental features for zealcmd please do no enable -#RAW_ENABLE = yes -#USE_KEYMAPS_IN_EEPROM = yes diff --git a/keyboards/hs60/v1/v1.c b/keyboards/hs60/v1/v1.c index f68bcbdf9e7..7a43784ad96 100644 --- a/keyboards/hs60/v1/v1.c +++ b/keyboards/hs60/v1/v1.c @@ -15,80 +15,6 @@ */ #include "quantum.h" -// Please ignore this is for upcoming features -/*#ifdef RAW_ENABLE - -void raw_hid_receive( uint8_t *data, uint8_t length ) -{ - uint8_t command = data[0]; - switch ( command ) - { - case id_protocol_version: - { - msg_protocol_version *msg = (msg_protocol_version*)&data[1]; - msg->version = PROTOCOL_VERSION; - break; - } -#if USE_KEYMAPS_IN_EEPROM - case id_keymap_keycode_load: - { - msg_keymap_keycode_load *msg = (msg_keymap_keycode_load*)&data[1]; - msg->keycode = keymap_keycode_load( msg->layer, msg->row, msg->column ); - break; - } - case id_keymap_keycode_save: - { - msg_keymap_keycode_save *msg = (msg_keymap_keycode_save*)&data[1]; - keymap_keycode_save( msg->layer, msg->row, msg->column, msg->keycode); - break; - } - case id_keymap_default_save: - { - keymap_default_save(); - break; - } -#endif // USE_KEYMAPS_IN_EEPROM - case id_backlight_config_set_values: - { - msg_backlight_config_set_values *msg = (msg_backlight_config_set_values*)&data[1]; - backlight_config_set_values(msg); - backlight_config_save(); - break; - } - case id_backlight_config_set_alphas_mods: - { - msg_backlight_config_set_alphas_mods *msg = (msg_backlight_config_set_alphas_mods*)&data[1]; - backlight_config_set_alphas_mods( msg->alphas_mods ); - backlight_config_save(); - break; - } - case id_backlight_set_key_color: - { - msg_backlight_set_key_color *msg = (msg_backlight_set_key_color*)&data[1]; - backlight_set_key_color(msg->row, msg->column, msg->hsv); - break; - } - case id_system_get_state: - { - msg_system_state *msg = (msg_system_state*)&data[1]; - msg->value = backlight_get_tick(); - break; - } - default: - { - // Unhandled message. - data[0] = id_unhandled; - break; - } - } - - // Return same buffer with values changed - raw_hid_send( data, length ); - -} - -#endif*/ - #ifdef HS60_ANSI const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { diff --git a/keyboards/keychron/q6/iso/rules.mk b/keyboards/keychron/q6/iso/rules.mk index f16a475f61a..9383cc955f8 100644 --- a/keyboards/keychron/q6/iso/rules.mk +++ b/keyboards/keychron/q6/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RAW_ENABLE = yes LTO_ENABLE = yes # custom matrix setup diff --git a/keyboards/keychron/q6/iso_encoder/rules.mk b/keyboards/keychron/q6/iso_encoder/rules.mk index 712c2ef1fd6..929c4532a05 100644 --- a/keyboards/keychron/q6/iso_encoder/rules.mk +++ b/keyboards/keychron/q6/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RAW_ENABLE = yes LTO_ENABLE = yes # custom matrix setup diff --git a/keyboards/massdrop/alt/rules.mk b/keyboards/massdrop/alt/rules.mk index e176fa733da..765e92b9161 100644 --- a/keyboards/massdrop/alt/rules.mk +++ b/keyboards/massdrop/alt/rules.mk @@ -21,7 +21,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output VIRTSER_ENABLE = no # USB Serial Driver -RAW_ENABLE = no # Raw device AUTO_SHIFT_ENABLE = no # Auto Shift # Custom RGB matrix handling diff --git a/keyboards/massdrop/ctrl/rules.mk b/keyboards/massdrop/ctrl/rules.mk index e176fa733da..765e92b9161 100644 --- a/keyboards/massdrop/ctrl/rules.mk +++ b/keyboards/massdrop/ctrl/rules.mk @@ -21,7 +21,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output VIRTSER_ENABLE = no # USB Serial Driver -RAW_ENABLE = no # Raw device AUTO_SHIFT_ENABLE = no # Auto Shift # Custom RGB matrix handling diff --git a/keyboards/rocketboard_16/rules.mk b/keyboards/rocketboard_16/rules.mk index c8915ad1829..ad74cd9306c 100644 --- a/keyboards/rocketboard_16/rules.mk +++ b/keyboards/rocketboard_16/rules.mk @@ -3,5 +3,3 @@ MCU_LDSCRIPT = STM32F103xB # Extra include SRC += keycode_lookup.c - -RAW_ENABLE = yes # Enables HID RAW communication between the board and the PC From 5ab3b27e5f9049d2e4036a71cc4fc7f2922629d1 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 19 Apr 2024 09:25:03 -0700 Subject: [PATCH 163/333] Data-Driven Keyboard Conversions: K, Part 1 (#23556) --- keyboards/kagizaraya/chidori/info.json | 5 +++++ keyboards/kagizaraya/chidori/rules.mk | 10 ---------- keyboards/kagizaraya/scythe/info.json | 7 +++++++ keyboards/kagizaraya/scythe/rules.mk | 13 ------------- .../angel17/alpha/{info.json => keyboard.json} | 7 +++++++ keyboards/kakunpc/angel17/alpha/rules.mk | 12 ------------ keyboards/kakunpc/angel17/info.json | 8 -------- .../angel17/rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/kakunpc/angel17/rev1/rules.mk | 12 ------------ keyboards/kakunpc/angel64/alpha/keyboard.json | 7 +++++++ keyboards/kakunpc/angel64/rev1/keyboard.json | 7 +++++++ keyboards/kakunpc/angel64/rules.mk | 13 ------------- .../alpha/{info.json => keyboard.json} | 7 +++++++ keyboards/kakunpc/business_card/alpha/rules.mk | 13 ------------- .../beta/{info.json => keyboard.json} | 7 +++++++ keyboards/kakunpc/business_card/beta/rules.mk | 13 ------------- keyboards/kakunpc/business_card/rules.mk | 13 ------------- keyboards/kakunpc/choc_taro/info.json | 7 +++++++ keyboards/kakunpc/choc_taro/rules.mk | 13 ------------- .../suihankey/alpha/{info.json => keyboard.json} | 7 +++++++ keyboards/kakunpc/suihankey/alpha/rules.mk | 1 - .../suihankey/rev1/{info.json => keyboard.json} | 7 +++++++ keyboards/kakunpc/suihankey/rev1/rules.mk | 1 - keyboards/kakunpc/suihankey/rules.mk | 14 -------------- .../split/alpha/{info.json => keyboard.json} | 6 ++++++ keyboards/kakunpc/suihankey/split/alpha/rules.mk | 1 - .../split/rev1/{info.json => keyboard.json} | 6 ++++++ keyboards/kakunpc/suihankey/split/rev1/rules.mk | 1 - keyboards/kakunpc/suihankey/split/rules.mk | 2 -- keyboards/kakunpc/thedogkeyboard/info.json | 8 ++++++++ keyboards/kakunpc/thedogkeyboard/rules.mk | 12 ------------ keyboards/kapl/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/kapl/rev1/rules.mk | 4 ---- keyboards/kapl/rules.mk | 13 ------------- 34 files changed, 105 insertions(+), 169 deletions(-) rename keyboards/kakunpc/angel17/alpha/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/kakunpc/angel17/alpha/rules.mk rename keyboards/kakunpc/angel17/rev1/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/kakunpc/angel17/rev1/rules.mk rename keyboards/kakunpc/business_card/alpha/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/kakunpc/business_card/alpha/rules.mk rename keyboards/kakunpc/business_card/beta/{info.json => keyboard.json} (86%) delete mode 100644 keyboards/kakunpc/business_card/beta/rules.mk rename keyboards/kakunpc/suihankey/alpha/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/kakunpc/suihankey/alpha/rules.mk rename keyboards/kakunpc/suihankey/rev1/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/kakunpc/suihankey/rev1/rules.mk rename keyboards/kakunpc/suihankey/split/alpha/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/kakunpc/suihankey/split/alpha/rules.mk rename keyboards/kakunpc/suihankey/split/rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/kakunpc/suihankey/split/rev1/rules.mk rename keyboards/kapl/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kapl/rev1/rules.mk diff --git a/keyboards/kagizaraya/chidori/info.json b/keyboards/kagizaraya/chidori/info.json index 6603f54b036..f1b064baba0 100644 --- a/keyboards/kagizaraya/chidori/info.json +++ b/keyboards/kagizaraya/chidori/info.json @@ -11,6 +11,11 @@ }, "processor": "atmega328p", "bootloader": "usbasploader", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kagizaraya/chidori/rules.mk b/keyboards/kagizaraya/chidori/rules.mk index f94317cf22f..6641bc6b5a2 100644 --- a/keyboards/kagizaraya/chidori/rules.mk +++ b/keyboards/kagizaraya/chidori/rules.mk @@ -1,16 +1,6 @@ # 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite # project specific files diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json index 0900eee5a6d..eeebbe85a62 100644 --- a/keyboards/kagizaraya/scythe/info.json +++ b/keyboards/kagizaraya/scythe/info.json @@ -46,6 +46,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kagizaraya/scythe/rules.mk b/keyboards/kagizaraya/scythe/rules.mk index 4b976051f32..ab8787868ef 100644 --- a/keyboards/kagizaraya/scythe/rules.mk +++ b/keyboards/kagizaraya/scythe/rules.mk @@ -1,14 +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 -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 - RGBLIGHT_SPLIT = yes diff --git a/keyboards/kakunpc/angel17/alpha/info.json b/keyboards/kakunpc/angel17/alpha/keyboard.json similarity index 88% rename from keyboards/kakunpc/angel17/alpha/info.json rename to keyboards/kakunpc/angel17/alpha/keyboard.json index 8e0df61513a..425ac12f578 100644 --- a/keyboards/kakunpc/angel17/alpha/info.json +++ b/keyboards/kakunpc/angel17/alpha/keyboard.json @@ -4,6 +4,13 @@ "rows": ["D4", "C6", "D7", "E6"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, "layouts": { "LAYOUT_numpad_5x4": { "layout": [ diff --git a/keyboards/kakunpc/angel17/alpha/rules.mk b/keyboards/kakunpc/angel17/alpha/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/kakunpc/angel17/alpha/rules.mk +++ /dev/null @@ -1,12 +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 -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/kakunpc/angel17/info.json b/keyboards/kakunpc/angel17/info.json index c50e1b6e7ff..a8a4f2c1480 100644 --- a/keyboards/kakunpc/angel17/info.json +++ b/keyboards/kakunpc/angel17/info.json @@ -3,14 +3,6 @@ "manufacturer": "kakunpc", "url": "https://kakunpc.booth.pm/", "maintainer": "kakunpc", - "features": { - "bootmagic": false, - "command": true, - "console": true, - "extrakey": true, - "mousekey": true, - "nkro": false - }, "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/kakunpc/angel17/rev1/info.json b/keyboards/kakunpc/angel17/rev1/keyboard.json similarity index 88% rename from keyboards/kakunpc/angel17/rev1/info.json rename to keyboards/kakunpc/angel17/rev1/keyboard.json index 8395cf391c0..ef609ba2387 100644 --- a/keyboards/kakunpc/angel17/rev1/info.json +++ b/keyboards/kakunpc/angel17/rev1/keyboard.json @@ -13,6 +13,14 @@ "pin": "D3" }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true + }, "layouts": { "LAYOUT_numpad_5x4": { "layout": [ diff --git a/keyboards/kakunpc/angel17/rev1/rules.mk b/keyboards/kakunpc/angel17/rev1/rules.mk deleted file mode 100644 index 7585984f784..00000000000 --- a/keyboards/kakunpc/angel17/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kakunpc/angel64/alpha/keyboard.json b/keyboards/kakunpc/angel64/alpha/keyboard.json index cfa52eb172e..f00dd3b42bc 100644 --- a/keyboards/kakunpc/angel64/alpha/keyboard.json +++ b/keyboards/kakunpc/angel64/alpha/keyboard.json @@ -32,6 +32,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": false, + "rgblight": true, + "oled": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/angel64/rev1/keyboard.json b/keyboards/kakunpc/angel64/rev1/keyboard.json index 46f619462aa..eade3a5ec9d 100644 --- a/keyboards/kakunpc/angel64/rev1/keyboard.json +++ b/keyboards/kakunpc/angel64/rev1/keyboard.json @@ -32,6 +32,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": false, + "rgblight": true, + "oled": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kakunpc/angel64/rules.mk b/keyboards/kakunpc/angel64/rules.mk index 213576dfbd5..c95d5297bd7 100644 --- a/keyboards/kakunpc/angel64/rules.mk +++ b/keyboards/kakunpc/angel64/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # 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 -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/kakunpc/business_card/alpha/info.json b/keyboards/kakunpc/business_card/alpha/keyboard.json similarity index 86% rename from keyboards/kakunpc/business_card/alpha/info.json rename to keyboards/kakunpc/business_card/alpha/keyboard.json index 3270f8e4bcc..02c4604c446 100644 --- a/keyboards/kakunpc/business_card/alpha/info.json +++ b/keyboards/kakunpc/business_card/alpha/keyboard.json @@ -24,6 +24,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "rgblight": true, + "oled": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/business_card/alpha/rules.mk b/keyboards/kakunpc/business_card/alpha/rules.mk deleted file mode 100644 index 6744c64e1ba..00000000000 --- a/keyboards/kakunpc/business_card/alpha/rules.mk +++ /dev/null @@ -1,13 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes diff --git a/keyboards/kakunpc/business_card/beta/info.json b/keyboards/kakunpc/business_card/beta/keyboard.json similarity index 86% rename from keyboards/kakunpc/business_card/beta/info.json rename to keyboards/kakunpc/business_card/beta/keyboard.json index ef09a0ac906..da18001a906 100644 --- a/keyboards/kakunpc/business_card/beta/info.json +++ b/keyboards/kakunpc/business_card/beta/keyboard.json @@ -24,6 +24,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "rgblight": true, + "oled": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/business_card/beta/rules.mk b/keyboards/kakunpc/business_card/beta/rules.mk deleted file mode 100644 index 6744c64e1ba..00000000000 --- a/keyboards/kakunpc/business_card/beta/rules.mk +++ /dev/null @@ -1,13 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes diff --git a/keyboards/kakunpc/business_card/rules.mk b/keyboards/kakunpc/business_card/rules.mk index ffdd81c22b5..4525d52332a 100644 --- a/keyboards/kakunpc/business_card/rules.mk +++ b/keyboards/kakunpc/business_card/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = kakunpc/business_card/beta diff --git a/keyboards/kakunpc/choc_taro/info.json b/keyboards/kakunpc/choc_taro/info.json index 6adbb3280a7..b17e5e39206 100644 --- a/keyboards/kakunpc/choc_taro/info.json +++ b/keyboards/kakunpc/choc_taro/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kakunpc/choc_taro/rules.mk b/keyboards/kakunpc/choc_taro/rules.mk index 46d6848acef..30ce5d293b7 100644 --- a/keyboards/kakunpc/choc_taro/rules.mk +++ b/keyboards/kakunpc/choc_taro/rules.mk @@ -1,15 +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 = 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 SRC += matrix.c diff --git a/keyboards/kakunpc/suihankey/alpha/info.json b/keyboards/kakunpc/suihankey/alpha/keyboard.json similarity index 93% rename from keyboards/kakunpc/suihankey/alpha/info.json rename to keyboards/kakunpc/suihankey/alpha/keyboard.json index fb9249ab837..f76c56d746d 100644 --- a/keyboards/kakunpc/suihankey/alpha/info.json +++ b/keyboards/kakunpc/suihankey/alpha/keyboard.json @@ -36,6 +36,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "rgblight": true, + "oled": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/suihankey/alpha/rules.mk b/keyboards/kakunpc/suihankey/alpha/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/kakunpc/suihankey/alpha/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/kakunpc/suihankey/rev1/info.json b/keyboards/kakunpc/suihankey/rev1/keyboard.json similarity index 93% rename from keyboards/kakunpc/suihankey/rev1/info.json rename to keyboards/kakunpc/suihankey/rev1/keyboard.json index 37215632cf4..0e801b1963b 100644 --- a/keyboards/kakunpc/suihankey/rev1/info.json +++ b/keyboards/kakunpc/suihankey/rev1/keyboard.json @@ -36,6 +36,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "rgblight": true, + "oled": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/suihankey/rev1/rules.mk b/keyboards/kakunpc/suihankey/rev1/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/kakunpc/suihankey/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/kakunpc/suihankey/rules.mk b/keyboards/kakunpc/suihankey/rules.mk index f777eaf8613..46a0114bd57 100644 --- a/keyboards/kakunpc/suihankey/rules.mk +++ b/keyboards/kakunpc/suihankey/rules.mk @@ -1,15 +1 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes - DEFAULT_FOLDER = kakunpc/suihankey/rev1 diff --git a/keyboards/kakunpc/suihankey/split/alpha/info.json b/keyboards/kakunpc/suihankey/split/alpha/keyboard.json similarity index 95% rename from keyboards/kakunpc/suihankey/split/alpha/info.json rename to keyboards/kakunpc/suihankey/split/alpha/keyboard.json index fb7a619d0e1..956ee3357c7 100644 --- a/keyboards/kakunpc/suihankey/split/alpha/info.json +++ b/keyboards/kakunpc/suihankey/split/alpha/keyboard.json @@ -13,6 +13,12 @@ "rows": ["F4", "F5", "F6", "F7"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "rgblight": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_split_3x5_3" }, diff --git a/keyboards/kakunpc/suihankey/split/alpha/rules.mk b/keyboards/kakunpc/suihankey/split/alpha/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/kakunpc/suihankey/split/alpha/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/kakunpc/suihankey/split/rev1/info.json b/keyboards/kakunpc/suihankey/split/rev1/keyboard.json similarity index 95% rename from keyboards/kakunpc/suihankey/split/rev1/info.json rename to keyboards/kakunpc/suihankey/split/rev1/keyboard.json index 4410ad5bb10..0640e4e26a0 100644 --- a/keyboards/kakunpc/suihankey/split/rev1/info.json +++ b/keyboards/kakunpc/suihankey/split/rev1/keyboard.json @@ -25,6 +25,12 @@ "rows": ["D4", "C6", "D7", "E6", "B4"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "rgblight": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_split_3x5_3" }, diff --git a/keyboards/kakunpc/suihankey/split/rev1/rules.mk b/keyboards/kakunpc/suihankey/split/rev1/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/kakunpc/suihankey/split/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/kakunpc/suihankey/split/rules.mk b/keyboards/kakunpc/suihankey/split/rules.mk index 08f9eb20bd9..1dc7b014f02 100644 --- a/keyboards/kakunpc/suihankey/split/rules.mk +++ b/keyboards/kakunpc/suihankey/split/rules.mk @@ -1,3 +1 @@ -OLED_ENABLE = no - DEFAULT_FOLDER = kakunpc/suihankey/split/rev1 diff --git a/keyboards/kakunpc/thedogkeyboard/info.json b/keyboards/kakunpc/thedogkeyboard/info.json index 79ed132f68c..185b4c4fe0a 100644 --- a/keyboards/kakunpc/thedogkeyboard/info.json +++ b/keyboards/kakunpc/thedogkeyboard/info.json @@ -20,6 +20,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true + }, "community_layouts": [ "fullsize_ansi" ], diff --git a/keyboards/kakunpc/thedogkeyboard/rules.mk b/keyboards/kakunpc/thedogkeyboard/rules.mk index cc71e1e7cb1..09c02c88b0d 100644 --- a/keyboards/kakunpc/thedogkeyboard/rules.mk +++ b/keyboards/kakunpc/thedogkeyboard/rules.mk @@ -1,15 +1,3 @@ -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/keyboard.json similarity index 97% rename from keyboards/kapl/rev1/info.json rename to keyboards/kapl/rev1/keyboard.json index dbbfde0e2a4..650702ba5fc 100644 --- a/keyboards/kapl/rev1/info.json +++ b/keyboards/kapl/rev1/keyboard.json @@ -72,6 +72,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kapl/rev1/rules.mk b/keyboards/kapl/rev1/rules.mk deleted file mode 100644 index 95bef6d3a7a..00000000000 --- a/keyboards/kapl/rev1/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE -RGB_MATRIX_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/kapl/rules.mk b/keyboards/kapl/rules.mk index 586557a9637..a5dd22ce1c8 100644 --- a/keyboards/kapl/rules.mk +++ b/keyboards/kapl/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 = 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 - DEFAULT_FOLDER = kapl/rev1 From 49593dc81ffc178e56639c89e61572e570b42ad5 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 20 Apr 2024 09:18:12 +0100 Subject: [PATCH 164/333] Migrate build target markers to keyboard.json - OQ (#23564) --- keyboards/oddball/info.json | 7 +++++++ keyboards/oddball/rules.mk | 14 -------------- .../oddforge/vea/{info.json => keyboard.json} | 7 +++++++ keyboards/oddforge/vea/rules.mk | 11 ----------- keyboards/om60/{info.json => keyboard.json} | 8 ++++++++ keyboards/om60/rules.mk | 15 --------------- .../ergodash/mini/{info.json => keyboard.json} | 6 ++++++ keyboards/omkbd/ergodash/mini/rules.mk | 3 --- .../ergodash/rev1/{info.json => keyboard.json} | 6 ++++++ keyboards/omkbd/ergodash/rev1/rules.mk | 3 --- keyboards/omkbd/ergodash/rules.mk | 13 ------------- keyboards/omkbd/runner3680/info.json | 6 ++++++ keyboards/omkbd/runner3680/rules.mk | 13 ------------- .../omnikeyish/{info.json => keyboard.json} | 8 ++++++++ keyboards/omnikeyish/rules.mk | 13 ------------- .../32/rev1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/opendeck/32/rev1/rules.mk | 16 ---------------- keyboards/orthocode/{info.json => keyboard.json} | 11 +++++++++++ keyboards/orthocode/rules.mk | 15 --------------- keyboards/orthodox/info.json | 7 +++++++ .../orthodox/rev1/{info.json => keyboard.json} | 0 keyboards/orthodox/rev1/rules.mk | 1 - .../orthodox/rev3/{info.json => keyboard.json} | 0 keyboards/orthodox/rev3/rules.mk | 1 - .../rev3_teensy/{info.json => keyboard.json} | 0 keyboards/orthodox/rev3_teensy/rules.mk | 1 - keyboards/orthodox/rules.mk | 13 ------------- .../hotswap/625u/{info.json => keyboard.json} | 0 .../hotswap/7u/{info.json => keyboard.json} | 0 .../solder/{info.json => keyboard.json} | 0 .../rev1/{info.json => keyboard.json} | 7 +++++++ keyboards/qpockets/space_space/rev1/rules.mk | 13 ------------- .../rev2/{info.json => keyboard.json} | 7 +++++++ keyboards/qpockets/space_space/rev2/rules.mk | 13 ------------- keyboards/quokka/{info.json => keyboard.json} | 0 .../qvex/lynepad2/{info.json => keyboard.json} | 0 36 files changed, 90 insertions(+), 158 deletions(-) rename keyboards/oddforge/vea/{info.json => keyboard.json} (97%) rename keyboards/om60/{info.json => keyboard.json} (96%) rename keyboards/omkbd/ergodash/mini/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/omkbd/ergodash/mini/rules.mk rename keyboards/omkbd/ergodash/rev1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/omkbd/ergodash/rev1/rules.mk rename keyboards/omnikeyish/{info.json => keyboard.json} (99%) rename keyboards/opendeck/32/rev1/{info.json => keyboard.json} (94%) rename keyboards/orthocode/{info.json => keyboard.json} (95%) rename keyboards/orthodox/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/orthodox/rev1/rules.mk rename keyboards/orthodox/rev3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/orthodox/rev3/rules.mk rename keyboards/orthodox/rev3_teensy/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/orthodox/rev3_teensy/rules.mk rename keyboards/owlab/jelly_evolv/hotswap/625u/{info.json => keyboard.json} (100%) rename keyboards/owlab/jelly_evolv/hotswap/7u/{info.json => keyboard.json} (100%) rename keyboards/owlab/jelly_evolv/solder/{info.json => keyboard.json} (100%) rename keyboards/qpockets/space_space/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/qpockets/space_space/rev1/rules.mk rename keyboards/qpockets/space_space/rev2/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/qpockets/space_space/rev2/rules.mk rename keyboards/quokka/{info.json => keyboard.json} (100%) rename keyboards/qvex/lynepad2/{info.json => keyboard.json} (100%) diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json index 8ec0cb69b21..fdbb8b2b1db 100644 --- a/keyboards/oddball/info.json +++ b/keyboards/oddball/info.json @@ -8,6 +8,13 @@ "pid": "0xCA49", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "pointing_device": true + }, "split": { "enabled": true }, diff --git a/keyboards/oddball/rules.mk b/keyboards/oddball/rules.mk index 5a3becd82a6..2fc8995acbe 100644 --- a/keyboards/oddball/rules.mk +++ b/keyboards/oddball/rules.mk @@ -1,17 +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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = adns9800 DEFAULT_FOLDER = oddball/v1 diff --git a/keyboards/oddforge/vea/info.json b/keyboards/oddforge/vea/keyboard.json similarity index 97% rename from keyboards/oddforge/vea/info.json rename to keyboards/oddforge/vea/keyboard.json index 9b55d0f2b56..6a6780ea53c 100644 --- a/keyboards/oddforge/vea/info.json +++ b/keyboards/oddforge/vea/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x4155", "device_version": "1.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "extrakey": true, + "mousekey": false, + "rgblight": true + }, "backlight": { "pin": "D4" }, diff --git a/keyboards/oddforge/vea/rules.mk b/keyboards/oddforge/vea/rules.mk index b0c02543b19..bbfc7cbbf72 100644 --- a/keyboards/oddforge/vea/rules.mk +++ b/keyboards/oddforge/vea/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 = 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 = yes # Enable keyboard RGB underglow - # custom matrix setup CUSTOM_MATRIX = lite SRC = matrix.c diff --git a/keyboards/om60/info.json b/keyboards/om60/keyboard.json similarity index 96% rename from keyboards/om60/info.json rename to keyboards/om60/keyboard.json index df718e7fa02..22386db039a 100644 --- a/keyboards/om60/info.json +++ b/keyboards/om60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} diff --git a/keyboards/om60/rules.mk b/keyboards/om60/rules.mk index e3e0047771f..179d02c3c68 100644 --- a/keyboards/om60/rules.mk +++ b/keyboards/om60/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes - CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/keyboard.json similarity index 97% rename from keyboards/omkbd/ergodash/mini/info.json rename to keyboards/omkbd/ergodash/mini/keyboard.json index 4e4a13e93a4..04233261779 100644 --- a/keyboards/omkbd/ergodash/mini/info.json +++ b/keyboards/omkbd/ergodash/mini/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x6060", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/omkbd/ergodash/mini/rules.mk b/keyboards/omkbd/ergodash/mini/rules.mk deleted file mode 100644 index bb9e33b0829..00000000000 --- a/keyboards/omkbd/ergodash/mini/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no -AUDIO_ENABLE = no diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/keyboard.json similarity index 99% rename from keyboards/omkbd/ergodash/rev1/info.json rename to keyboards/omkbd/ergodash/rev1/keyboard.json index b3ebe4648e0..07405e22f72 100644 --- a/keyboards/omkbd/ergodash/rev1/info.json +++ b/keyboards/omkbd/ergodash/rev1/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x6060", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/omkbd/ergodash/rev1/rules.mk b/keyboards/omkbd/ergodash/rev1/rules.mk deleted file mode 100644 index bb9e33b0829..00000000000 --- a/keyboards/omkbd/ergodash/rev1/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no -AUDIO_ENABLE = no diff --git a/keyboards/omkbd/ergodash/rules.mk b/keyboards/omkbd/ergodash/rules.mk index 015ffcd8fb7..492cdde65d7 100644 --- a/keyboards/omkbd/ergodash/rules.mk +++ b/keyboards/omkbd/ergodash/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 = 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = omkbd/ergodash/rev1 diff --git a/keyboards/omkbd/runner3680/info.json b/keyboards/omkbd/runner3680/info.json index 306a3970bb8..c626b2e3b45 100644 --- a/keyboards/omkbd/runner3680/info.json +++ b/keyboards/omkbd/runner3680/info.json @@ -1,6 +1,12 @@ { "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "split": { "enabled": true } diff --git a/keyboards/omkbd/runner3680/rules.mk b/keyboards/omkbd/runner3680/rules.mk index d90dd4adda3..3460ad89640 100644 --- a/keyboards/omkbd/runner3680/rules.mk +++ b/keyboards/omkbd/runner3680/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 = no # Audio output - DEFAULT_FOLDER = omkbd/runner3680/5x8 diff --git a/keyboards/omnikeyish/info.json b/keyboards/omnikeyish/keyboard.json similarity index 99% rename from keyboards/omnikeyish/info.json rename to keyboards/omnikeyish/keyboard.json index 2b91c1447ef..cd61f2954bb 100644 --- a/keyboards/omnikeyish/info.json +++ b/keyboards/omnikeyish/keyboard.json @@ -9,6 +9,14 @@ "device_version": "13.3.7", "force_nkro": true }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "indicators": { "caps_lock": "E1", "num_lock": "E0", diff --git a/keyboards/omnikeyish/rules.mk b/keyboards/omnikeyish/rules.mk index a8a5143e24d..33820d54c07 100644 --- a/keyboards/omnikeyish/rules.mk +++ b/keyboards/omnikeyish/rules.mk @@ -1,15 +1,2 @@ -# 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 -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no - # Project specific files SRC += dynamic_macro.c diff --git a/keyboards/opendeck/32/rev1/info.json b/keyboards/opendeck/32/rev1/keyboard.json similarity index 94% rename from keyboards/opendeck/32/rev1/info.json rename to keyboards/opendeck/32/rev1/keyboard.json index 9ff22ec125e..e55c16c9fdd 100644 --- a/keyboards/opendeck/32/rev1/info.json +++ b/keyboards/opendeck/32/rev1/keyboard.json @@ -1,4 +1,14 @@ { + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "F7", "F6", "F5", "F4"], "rows": ["C7", "C6", "B6", "B5"] diff --git a/keyboards/opendeck/32/rev1/rules.mk b/keyboards/opendeck/32/rev1/rules.mk index d6a08c82512..3437a35bdf1 100644 --- a/keyboards/opendeck/32/rev1/rules.mk +++ b/keyboards/opendeck/32/rev1/rules.mk @@ -1,18 +1,2 @@ # 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 = 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 -RGB_MATRIX_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/orthocode/info.json b/keyboards/orthocode/keyboard.json similarity index 95% rename from keyboards/orthocode/info.json rename to keyboards/orthocode/keyboard.json index b7fe9dab472..69f3374b27f 100644 --- a/keyboards/orthocode/info.json +++ b/keyboards/orthocode/keyboard.json @@ -9,6 +9,17 @@ "device_version": "0.0.1", "max_power": 100 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C4", "C3", "C2", "C1", "C0", "D7", "D6", "A7", "A4", "A5", "A6", "A3", "A2", "A1", "A0"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/orthocode/rules.mk b/keyboards/orthocode/rules.mk index d9dd6a59c96..c2ee0bc86f9 100644 --- a/keyboards/orthocode/rules.mk +++ b/keyboards/orthocode/rules.mk @@ -1,17 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enables the use of one or more encoders -LTO_ENABLE = yes diff --git a/keyboards/orthodox/info.json b/keyboards/orthodox/info.json index 2b9790e84e6..107b0be8dd6 100644 --- a/keyboards/orthodox/info.json +++ b/keyboards/orthodox/info.json @@ -1,4 +1,11 @@ { + "features": { + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "split": { "enabled": true } diff --git a/keyboards/orthodox/rev1/info.json b/keyboards/orthodox/rev1/keyboard.json similarity index 100% rename from keyboards/orthodox/rev1/info.json rename to keyboards/orthodox/rev1/keyboard.json diff --git a/keyboards/orthodox/rev1/rules.mk b/keyboards/orthodox/rev1/rules.mk deleted file mode 100644 index 7b30c0beff2..00000000000 --- a/keyboards/orthodox/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no diff --git a/keyboards/orthodox/rev3/info.json b/keyboards/orthodox/rev3/keyboard.json similarity index 100% rename from keyboards/orthodox/rev3/info.json rename to keyboards/orthodox/rev3/keyboard.json diff --git a/keyboards/orthodox/rev3/rules.mk b/keyboards/orthodox/rev3/rules.mk deleted file mode 100644 index 7b30c0beff2..00000000000 --- a/keyboards/orthodox/rev3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no diff --git a/keyboards/orthodox/rev3_teensy/info.json b/keyboards/orthodox/rev3_teensy/keyboard.json similarity index 100% rename from keyboards/orthodox/rev3_teensy/info.json rename to keyboards/orthodox/rev3_teensy/keyboard.json diff --git a/keyboards/orthodox/rev3_teensy/rules.mk b/keyboards/orthodox/rev3_teensy/rules.mk deleted file mode 100644 index 7b30c0beff2..00000000000 --- a/keyboards/orthodox/rev3_teensy/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no diff --git a/keyboards/orthodox/rules.mk b/keyboards/orthodox/rules.mk index 8fa7b0a404f..fd71b6c8fb1 100644 --- a/keyboards/orthodox/rules.mk +++ b/keyboards/orthodox/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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = orthodox/rev3 diff --git a/keyboards/owlab/jelly_evolv/hotswap/625u/info.json b/keyboards/owlab/jelly_evolv/hotswap/625u/keyboard.json similarity index 100% rename from keyboards/owlab/jelly_evolv/hotswap/625u/info.json rename to keyboards/owlab/jelly_evolv/hotswap/625u/keyboard.json diff --git a/keyboards/owlab/jelly_evolv/hotswap/7u/info.json b/keyboards/owlab/jelly_evolv/hotswap/7u/keyboard.json similarity index 100% rename from keyboards/owlab/jelly_evolv/hotswap/7u/info.json rename to keyboards/owlab/jelly_evolv/hotswap/7u/keyboard.json diff --git a/keyboards/owlab/jelly_evolv/solder/info.json b/keyboards/owlab/jelly_evolv/solder/keyboard.json similarity index 100% rename from keyboards/owlab/jelly_evolv/solder/info.json rename to keyboards/owlab/jelly_evolv/solder/keyboard.json diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/keyboard.json similarity index 97% rename from keyboards/qpockets/space_space/rev1/info.json rename to keyboards/qpockets/space_space/rev1/keyboard.json index f54e5e8e3a8..70adf4997c2 100644 --- a/keyboards/qpockets/space_space/rev1/info.json +++ b/keyboards/qpockets/space_space/rev1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x7373", "device_version": "30.0.0" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "B4", "B5", "B6", "C6", "F7", "F6", "F0", "B0", "E6", "B1"], "rows": ["F1", "F4", "F5", "C7"] diff --git a/keyboards/qpockets/space_space/rev1/rules.mk b/keyboards/qpockets/space_space/rev1/rules.mk deleted file mode 100644 index 131aa72aeb5..00000000000 --- a/keyboards/qpockets/space_space/rev1/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/keyboard.json similarity index 97% rename from keyboards/qpockets/space_space/rev2/info.json rename to keyboards/qpockets/space_space/rev2/keyboard.json index 3fe0f71497c..b57e16db68b 100644 --- a/keyboards/qpockets/space_space/rev2/info.json +++ b/keyboards/qpockets/space_space/rev2/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x7373", "device_version": "30.0.2" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "F6", "F1", "F4", "F5", "E6", "D6", "B2", "B5", "D3", "D2"], "rows": ["B1", "B0", "D5", "B6"] diff --git a/keyboards/qpockets/space_space/rev2/rules.mk b/keyboards/qpockets/space_space/rev2/rules.mk deleted file mode 100644 index ebe0d0e0e32..00000000000 --- a/keyboards/qpockets/space_space/rev2/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/quokka/info.json b/keyboards/quokka/keyboard.json similarity index 100% rename from keyboards/quokka/info.json rename to keyboards/quokka/keyboard.json diff --git a/keyboards/qvex/lynepad2/info.json b/keyboards/qvex/lynepad2/keyboard.json similarity index 100% rename from keyboards/qvex/lynepad2/info.json rename to keyboards/qvex/lynepad2/keyboard.json From 5936a96620fb8346114bfbccc4edf2ea74c51cb3 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 20 Apr 2024 01:19:11 -0700 Subject: [PATCH 165/333] Data-Driven Keyboard Conversions: K, Part 2 (#23562) --- keyboards/kb58/{info.json => keyboard.json} | 5 +++++ keyboards/kb58/rules.mk | 12 ------------ keyboards/kb_elmo/aek2_usb/info.json | 5 +++++ keyboards/kb_elmo/aek2_usb/rules.mk | 13 ------------- keyboards/kb_elmo/elmopad/info.json | 5 +++++ keyboards/kb_elmo/elmopad/rules.mk | 13 ------------- keyboards/kb_elmo/isolation/info.json | 6 ++++++ keyboards/kb_elmo/isolation/rules.mk | 13 ------------- keyboards/kb_elmo/m0110a_usb/info.json | 5 +++++ keyboards/kb_elmo/m0110a_usb/rules.mk | 13 ------------- keyboards/kb_elmo/m0116_usb/info.json | 5 +++++ keyboards/kb_elmo/m0116_usb/rules.mk | 13 ------------- keyboards/kb_elmo/sesame/info.json | 5 +++++ keyboards/kb_elmo/sesame/rules.mk | 13 ------------- keyboards/kb_elmo/twelvekey/info.json | 6 ++++++ keyboards/kb_elmo/twelvekey/rules.mk | 13 ------------- .../bella/rgb/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kbdfans/bella/rgb/rules.mk | 15 --------------- .../bella/rgb_iso/{info.json => keyboard.json} | 10 ++++++++++ keyboards/kbdfans/bella/rgb_iso/rules.mk | 15 --------------- keyboards/kbdfans/jm60/info.json | 6 ++++++ keyboards/kbdfans/jm60/rules.mk | 14 -------------- keyboards/kbdfans/kbd4x/info.json | 9 +++++++++ keyboards/kbdfans/kbd4x/rules.mk | 13 ------------- keyboards/kbdfans/kbd67/mkiirgb/v3/info.json | 10 ++++++++++ keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk | 15 --------------- keyboards/kbdfans/kbd67/mkiirgb_iso/info.json | 7 +++++++ keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk | 14 -------------- .../kbd75/rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/kbdfans/kbd75/rev1/rules.mk | 12 ------------ .../kbd75/rev2/{info.json => keyboard.json} | 8 ++++++++ keyboards/kbdfans/kbd75/rev2/rules.mk | 12 ------------ keyboards/kbdfans/niu_mini/info.json | 9 +++++++++ keyboards/kbdfans/niu_mini/rules.mk | 13 ------------- keyboards/kbdmania/kmac/info.json | 8 ++++++++ keyboards/kbdmania/kmac/rules.mk | 11 ----------- keyboards/kbdmania/kmac_pad/info.json | 6 ++++++ keyboards/kbdmania/kmac_pad/rules.mk | 12 ------------ 38 files changed, 133 insertions(+), 249 deletions(-) rename keyboards/kb58/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kb58/rules.mk rename keyboards/kbdfans/bella/rgb/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kbdfans/bella/rgb/rules.mk rename keyboards/kbdfans/bella/rgb_iso/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/kbdfans/bella/rgb_iso/rules.mk rename keyboards/kbdfans/kbd75/rev1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kbdfans/kbd75/rev1/rules.mk rename keyboards/kbdfans/kbd75/rev2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/kbdfans/kbd75/rev2/rules.mk diff --git a/keyboards/kb58/info.json b/keyboards/kb58/keyboard.json similarity index 97% rename from keyboards/kb58/info.json rename to keyboards/kb58/keyboard.json index 0e32ab834bd..950bc51eaf0 100644 --- a/keyboards/kb58/info.json +++ b/keyboards/kb58/keyboard.json @@ -25,6 +25,11 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb58/rules.mk b/keyboards/kb58/rules.mk deleted file mode 100644 index 164c05712b1..00000000000 --- a/keyboards/kb58/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/kb_elmo/aek2_usb/info.json b/keyboards/kb_elmo/aek2_usb/info.json index 884390278d1..3ee3c521f73 100644 --- a/keyboards/kb_elmo/aek2_usb/info.json +++ b/keyboards/kb_elmo/aek2_usb/info.json @@ -23,6 +23,11 @@ }, "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/aek2_usb/rules.mk b/keyboards/kb_elmo/aek2_usb/rules.mk index 31ac76281ab..c2ee0bc86f9 100644 --- a/keyboards/kb_elmo/aek2_usb/rules.mk +++ b/keyboards/kb_elmo/aek2_usb/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 = 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 diff --git a/keyboards/kb_elmo/elmopad/info.json b/keyboards/kb_elmo/elmopad/info.json index 600daf3099b..584bd31d4e1 100644 --- a/keyboards/kb_elmo/elmopad/info.json +++ b/keyboards/kb_elmo/elmopad/info.json @@ -15,6 +15,11 @@ "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true + }, "community_layouts": ["numpad_6x4"], "layouts": { "LAYOUT_numpad_6x4": { diff --git a/keyboards/kb_elmo/elmopad/rules.mk b/keyboards/kb_elmo/elmopad/rules.mk index 31ac76281ab..c2ee0bc86f9 100644 --- a/keyboards/kb_elmo/elmopad/rules.mk +++ b/keyboards/kb_elmo/elmopad/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 = 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 diff --git a/keyboards/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/info.json index c381c62f702..e7a40a55e63 100644 --- a/keyboards/kb_elmo/isolation/info.json +++ b/keyboards/kb_elmo/isolation/info.json @@ -30,6 +30,12 @@ }, "processor": "atmega328p", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgblight": true + }, "matrix_pins": { "direct": [ ["B0"] diff --git a/keyboards/kb_elmo/isolation/rules.mk b/keyboards/kb_elmo/isolation/rules.mk index f1b708c074f..c2ee0bc86f9 100644 --- a/keyboards/kb_elmo/isolation/rules.mk +++ b/keyboards/kb_elmo/isolation/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 = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kb_elmo/m0110a_usb/info.json b/keyboards/kb_elmo/m0110a_usb/info.json index 419efe5be35..c106e35c301 100644 --- a/keyboards/kb_elmo/m0110a_usb/info.json +++ b/keyboards/kb_elmo/m0110a_usb/info.json @@ -15,6 +15,11 @@ "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/m0110a_usb/rules.mk b/keyboards/kb_elmo/m0110a_usb/rules.mk index 31ac76281ab..c2ee0bc86f9 100644 --- a/keyboards/kb_elmo/m0110a_usb/rules.mk +++ b/keyboards/kb_elmo/m0110a_usb/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 = 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 diff --git a/keyboards/kb_elmo/m0116_usb/info.json b/keyboards/kb_elmo/m0116_usb/info.json index 436d42a973a..7279dc3c861 100644 --- a/keyboards/kb_elmo/m0116_usb/info.json +++ b/keyboards/kb_elmo/m0116_usb/info.json @@ -18,6 +18,11 @@ }, "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/m0116_usb/rules.mk b/keyboards/kb_elmo/m0116_usb/rules.mk index 31ac76281ab..c2ee0bc86f9 100644 --- a/keyboards/kb_elmo/m0116_usb/rules.mk +++ b/keyboards/kb_elmo/m0116_usb/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 = 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 diff --git a/keyboards/kb_elmo/sesame/info.json b/keyboards/kb_elmo/sesame/info.json index ef10a725992..c962ef556d7 100644 --- a/keyboards/kb_elmo/sesame/info.json +++ b/keyboards/kb_elmo/sesame/info.json @@ -18,6 +18,11 @@ }, "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true + }, "community_layouts": ["alice", "alice_split_bs"], "layout_aliases": { "LAYOUT": "LAYOUT_alice", diff --git a/keyboards/kb_elmo/sesame/rules.mk b/keyboards/kb_elmo/sesame/rules.mk index 31ac76281ab..c2ee0bc86f9 100644 --- a/keyboards/kb_elmo/sesame/rules.mk +++ b/keyboards/kb_elmo/sesame/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 = 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 diff --git a/keyboards/kb_elmo/twelvekey/info.json b/keyboards/kb_elmo/twelvekey/info.json index 95091845e33..3d60c081147 100644 --- a/keyboards/kb_elmo/twelvekey/info.json +++ b/keyboards/kb_elmo/twelvekey/info.json @@ -20,6 +20,12 @@ }, "processor": "atmega328p", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "backlight": true + }, "layouts": { "LAYOUT_ortho_3x4": { "layout": [ diff --git a/keyboards/kb_elmo/twelvekey/rules.mk b/keyboards/kb_elmo/twelvekey/rules.mk index 7d1ccce5cb8..c2ee0bc86f9 100644 --- a/keyboards/kb_elmo/twelvekey/rules.mk +++ b/keyboards/kb_elmo/twelvekey/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 = 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/kbdfans/bella/rgb/info.json b/keyboards/kbdfans/bella/rgb/keyboard.json similarity index 97% rename from keyboards/kbdfans/bella/rgb/info.json rename to keyboards/kbdfans/bella/rgb/keyboard.json index c6486e0b39d..50310e36679 100644 --- a/keyboards/kbdfans/bella/rgb/info.json +++ b/keyboards/kbdfans/bella/rgb/keyboard.json @@ -66,6 +66,16 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kbdfans/bella/rgb/rules.mk b/keyboards/kbdfans/bella/rgb/rules.mk deleted file mode 100644 index 3d0767ea6d8..00000000000 --- a/keyboards/kbdfans/bella/rgb/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes - -LTO_ENABLE = yes diff --git a/keyboards/kbdfans/bella/rgb_iso/info.json b/keyboards/kbdfans/bella/rgb_iso/keyboard.json similarity index 97% rename from keyboards/kbdfans/bella/rgb_iso/info.json rename to keyboards/kbdfans/bella/rgb_iso/keyboard.json index 17ca4333fd9..20b00283ed2 100644 --- a/keyboards/kbdfans/bella/rgb_iso/info.json +++ b/keyboards/kbdfans/bella/rgb_iso/keyboard.json @@ -66,6 +66,16 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kbdfans/bella/rgb_iso/rules.mk b/keyboards/kbdfans/bella/rgb_iso/rules.mk deleted file mode 100644 index 3d0767ea6d8..00000000000 --- a/keyboards/kbdfans/bella/rgb_iso/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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 = yes - -LTO_ENABLE = yes diff --git a/keyboards/kbdfans/jm60/info.json b/keyboards/kbdfans/jm60/info.json index 496637383f2..c30b43b18b2 100644 --- a/keyboards/kbdfans/jm60/info.json +++ b/keyboards/kbdfans/jm60/info.json @@ -13,6 +13,12 @@ "rows": ["B11", "B10", "B2", "B1", "B0"] }, "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true + }, "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/kbdfans/jm60/rules.mk b/keyboards/kbdfans/jm60/rules.mk index 5dbf13f5e78..0c31ad1eab6 100644 --- a/keyboards/kbdfans/jm60/rules.mk +++ b/keyboards/kbdfans/jm60/rules.mk @@ -6,17 +6,3 @@ BOARD = ST_NUCLEO64_F103RB # Bootloader selection BOOTLOADER = custom - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json index 44c9daceb74..a1dc8e3dd49 100644 --- a/keyboards/kbdfans/kbd4x/info.json +++ b/keyboards/kbdfans/kbd4x/info.json @@ -40,6 +40,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/kbdfans/kbd4x/rules.mk b/keyboards/kbdfans/kbd4x/rules.mk index 33020c98c40..271780b75ec 100644 --- a/keyboards/kbdfans/kbd4x/rules.mk +++ b/keyboards/kbdfans/kbd4x/rules.mk @@ -1,15 +1,2 @@ -# 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 # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware AUDIO_SUPPORTED = no diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json index 1fd3448de49..4a3beea9eb9 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json @@ -49,6 +49,16 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk index bbe22adb0c5..13252d81696 100755 --- a/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk @@ -1,16 +1 @@ BOOTLOADER_SIZE = 6144 - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix -LTO_ENABLE = yes diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json index 8bbfc9a1500..b8e9fdaf1c4 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json @@ -54,6 +54,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "community_layouts": ["65_iso_blocker"], "layouts": { "LAYOUT_65_iso_blocker": { diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk index 5cd60621348..13252d81696 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk @@ -1,15 +1 @@ BOOTLOADER_SIZE = 6144 - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/keyboard.json similarity index 99% rename from keyboards/kbdfans/kbd75/rev1/info.json rename to keyboards/kbdfans/kbd75/rev1/keyboard.json index efbfbe60ddc..94f96988ffa 100644 --- a/keyboards/kbdfans/kbd75/rev1/info.json +++ b/keyboards/kbdfans/kbd75/rev1/keyboard.json @@ -44,6 +44,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layout_aliases": { "LAYOUT_ansi_1u": "LAYOUT_75_ansi" }, diff --git a/keyboards/kbdfans/kbd75/rev1/rules.mk b/keyboards/kbdfans/kbd75/rev1/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/kbdfans/kbd75/rev1/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/keyboard.json similarity index 99% rename from keyboards/kbdfans/kbd75/rev2/info.json rename to keyboards/kbdfans/kbd75/rev2/keyboard.json index 12a1737eadd..9bfd69f7fdc 100644 --- a/keyboards/kbdfans/kbd75/rev2/info.json +++ b/keyboards/kbdfans/kbd75/rev2/keyboard.json @@ -44,6 +44,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layout_aliases": { "LAYOUT_ansi_1u": "LAYOUT_75_ansi" }, diff --git a/keyboards/kbdfans/kbd75/rev2/rules.mk b/keyboards/kbdfans/kbd75/rev2/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/kbdfans/kbd75/rev2/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json index 32ecfd33c64..d4918e7713e 100644 --- a/keyboards/kbdfans/niu_mini/info.json +++ b/keyboards/kbdfans/niu_mini/info.json @@ -39,6 +39,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" diff --git a/keyboards/kbdfans/niu_mini/rules.mk b/keyboards/kbdfans/niu_mini/rules.mk index dfaed88540e..4df55cd2206 100644 --- a/keyboards/kbdfans/niu_mini/rules.mk +++ b/keyboards/kbdfans/niu_mini/rules.mk @@ -1,16 +1,3 @@ -# 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 = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/kbdmania/kmac/info.json b/keyboards/kbdmania/kmac/info.json index 0ec6f0b2a99..c372cb1fc81 100644 --- a/keyboards/kbdmania/kmac/info.json +++ b/keyboards/kbdmania/kmac/info.json @@ -17,6 +17,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "backlight": true + }, "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/kbdmania/kmac/rules.mk b/keyboards/kbdmania/kmac/rules.mk index d9aa87a7dca..b35b955f698 100644 --- a/keyboards/kbdmania/kmac/rules.mk +++ b/keyboards/kbdmania/kmac/rules.mk @@ -1,18 +1,7 @@ # 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 CUSTOM_MATRIX = yes # Custom matrix file -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output # Project specific files SRC += matrix.c diff --git a/keyboards/kbdmania/kmac_pad/info.json b/keyboards/kbdmania/kmac_pad/info.json index f41da8a4526..8dbb196f3e9 100644 --- a/keyboards/kbdmania/kmac_pad/info.json +++ b/keyboards/kbdmania/kmac_pad/info.json @@ -9,6 +9,12 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kbdmania/kmac_pad/rules.mk b/keyboards/kbdmania/kmac_pad/rules.mk index 1c42620aca5..2ec23373842 100644 --- a/keyboards/kbdmania/kmac_pad/rules.mk +++ b/keyboards/kbdmania/kmac_pad/rules.mk @@ -1,18 +1,6 @@ # 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 = 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 # Custom matrix file # Project specific files From 7b96e54e8c7e5d6aa105ea1d9d95875e4c9ce4b6 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 20 Apr 2024 01:20:16 -0700 Subject: [PATCH 166/333] Data-Driven Keyboard Conversions: K, Part 5 (#23569) --- keyboards/kinesis/nguyenvietyen/info.json | 3 ++- keyboards/kinesis/nguyenvietyen/rules.mk | 5 ----- .../borderland/{info.json => keyboard.json} | 10 +++++++++- keyboards/kiwikey/borderland/rules.mk | 14 -------------- .../kiwikey/kawii9/{info.json => keyboard.json} | 9 ++++++++- keyboards/kiwikey/kawii9/rules.mk | 13 ------------- keyboards/kmini/info.json | 7 +++++++ keyboards/kmini/rules.mk | 11 ----------- keyboards/kprepublic/bm60hsrgb/rev2/info.json | 10 ++++++++++ keyboards/kprepublic/bm60hsrgb/rev2/rules.mk | 14 -------------- .../kprepublic/bm60hsrgb_iso/rev2/info.json | 10 ++++++++++ .../kprepublic/bm60hsrgb_iso/rev2/rules.mk | 17 ----------------- .../kprepublic/bm60hsrgb_poker/rev2/info.json | 10 ++++++++++ .../kprepublic/bm60hsrgb_poker/rev2/rules.mk | 16 ---------------- .../kumaokobo/kudox/columner/keyboard.json | 8 ++++++++ keyboards/kumaokobo/kudox/info.json | 5 ----- keyboards/kumaokobo/kudox/rev1/keyboard.json | 8 ++++++++ keyboards/kumaokobo/kudox/rev2/keyboard.json | 8 ++++++++ keyboards/kumaokobo/kudox/rev3/keyboard.json | 8 ++++++++ keyboards/kumaokobo/kudox/rules.mk | 13 ------------- .../rev1/{info.json => keyboard.json} | 11 +++++++++++ keyboards/kumaokobo/kudox_full/rev1/rules.mk | 1 - keyboards/kumaokobo/kudox_full/rules.mk | 15 --------------- keyboards/kumaokobo/kudox_game/info.json | 8 -------- .../kumaokobo/kudox_game/rev1/keyboard.json | 8 ++++++++ .../rev2/{info.json => keyboard.json} | 9 +++++++++ keyboards/kumaokobo/kudox_game/rev2/rules.mk | 1 - keyboards/kumaokobo/pico/65keys/keyboard.json | 8 ++++++++ keyboards/kumaokobo/pico/70keys/keyboard.json | 8 ++++++++ keyboards/kumaokobo/pico/info.json | 5 ----- keyboards/kumaokobo/pico/rules.mk | 13 ------------- 31 files changed, 132 insertions(+), 154 deletions(-) rename keyboards/kiwikey/borderland/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/kiwikey/borderland/rules.mk rename keyboards/kiwikey/kawii9/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/kiwikey/kawii9/rules.mk delete mode 100644 keyboards/kumaokobo/kudox/info.json rename keyboards/kumaokobo/kudox_full/rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/kumaokobo/kudox_full/rev1/rules.mk rename keyboards/kumaokobo/kudox_game/rev2/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/kumaokobo/kudox_game/rev2/rules.mk delete mode 100644 keyboards/kumaokobo/pico/info.json diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/info.json index 2a99a4e6003..68bdd0f767c 100644 --- a/keyboards/kinesis/nguyenvietyen/info.json +++ b/keyboards/kinesis/nguyenvietyen/info.json @@ -12,7 +12,8 @@ "command": true, "mousekey": true, "extrakey": true, - "nkro": true + "nkro": true, + "sleep_led": true }, "indicators": { "caps_lock": "E6", diff --git a/keyboards/kinesis/nguyenvietyen/rules.mk b/keyboards/kinesis/nguyenvietyen/rules.mk index 59129f4320d..30ce5d293b7 100644 --- a/keyboards/kinesis/nguyenvietyen/rules.mk +++ b/keyboards/kinesis/nguyenvietyen/rules.mk @@ -1,7 +1,2 @@ -# Build Options -# change yes to no to disable -# - -SLEEP_LED_ENABLE = yes CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/kiwikey/borderland/info.json b/keyboards/kiwikey/borderland/keyboard.json similarity index 95% rename from keyboards/kiwikey/borderland/info.json rename to keyboards/kiwikey/borderland/keyboard.json index 2e6efabb422..247c6b304d4 100644 --- a/keyboards/kiwikey/borderland/info.json +++ b/keyboards/kiwikey/borderland/keyboard.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4B57", "pid": "0x424C", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], @@ -43,6 +44,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kiwikey/borderland/rules.mk b/keyboards/kiwikey/borderland/rules.mk deleted file mode 100644 index e44305c4fff..00000000000 --- a/keyboards/kiwikey/borderland/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -NO_USB_STARTUP_CHECK = yes diff --git a/keyboards/kiwikey/kawii9/info.json b/keyboards/kiwikey/kawii9/keyboard.json similarity index 88% rename from keyboards/kiwikey/kawii9/info.json rename to keyboards/kiwikey/kawii9/keyboard.json index ca0e6049517..07b4cca097a 100644 --- a/keyboards/kiwikey/kawii9/info.json +++ b/keyboards/kiwikey/kawii9/keyboard.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4B57", "pid": "0x0303", - "device_version": "0.0.2" + "device_version": "0.0.2", + "no_startup_check": true }, "rgblight": { "saturation_steps": 8, @@ -35,6 +36,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/kiwikey/kawii9/rules.mk b/keyboards/kiwikey/kawii9/rules.mk deleted file mode 100644 index a6f559ca779..00000000000 --- a/keyboards/kiwikey/kawii9/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -NO_USB_STARTUP_CHECK = yes diff --git a/keyboards/kmini/info.json b/keyboards/kmini/info.json index 6af61bbbf1e..d272baca955 100755 --- a/keyboards/kmini/info.json +++ b/keyboards/kmini/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kmini/rules.mk b/keyboards/kmini/rules.mk index c93d5be7ff3..018efde6ca7 100755 --- a/keyboards/kmini/rules.mk +++ b/keyboards/kmini/rules.mk @@ -1,18 +1,7 @@ # 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 CUSTOM_MATRIX = yes # Custom matrix file -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output # Project specific files SRC = matrix.c diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json index 9a77549e685..a82d5159cf6 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json @@ -83,6 +83,16 @@ "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "debounce": 3, "layouts": { "LAYOUT_60_ansi_arrow": { diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk index cbe283378da..bb6c11ea531 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk @@ -1,17 +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 -LTO_ENABLE = yes -RGB_MATRIX_ENABLE = yes WS2812_DRIVER_REQUIRED = yes COMMON_VPATH += $(DRIVER_PATH)/led/issi diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json index 111534b0f81..e84817122e4 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json @@ -91,6 +91,16 @@ "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "debounce": 3, "layouts": { "LAYOUT_60_iso_arrow": { diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk index d84cbc0bf15..7012deda8c0 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk @@ -1,20 +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 -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - - -# RGB Matrix is required to support per-key LEDs connected to IS31FL3733. -RGB_MATRIX_ENABLE = yes - # The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are # normally done by common_features.mk for both of these drivers need to be done # here manually. diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json index 9f16eb21210..62ff452a68c 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json @@ -87,6 +87,16 @@ "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk index 92b33edc1f8..7012deda8c0 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk @@ -1,19 +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 -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - -# RGB Matrix is required to support per-key LEDs connected to IS31FL3733. -RGB_MATRIX_ENABLE = yes - # The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are # normally done by common_features.mk for both of these drivers need to be done # here manually. diff --git a/keyboards/kumaokobo/kudox/columner/keyboard.json b/keyboards/kumaokobo/kudox/columner/keyboard.json index 5f7d4444114..903d0d97a57 100644 --- a/keyboards/kumaokobo/kudox/columner/keyboard.json +++ b/keyboards/kumaokobo/kudox/columner/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { @@ -38,6 +39,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/kudox/info.json b/keyboards/kumaokobo/kudox/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/kumaokobo/kudox/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/kumaokobo/kudox/rev1/keyboard.json b/keyboards/kumaokobo/kudox/rev1/keyboard.json index 52579e1c431..2be4cefc569 100644 --- a/keyboards/kumaokobo/kudox/rev1/keyboard.json +++ b/keyboards/kumaokobo/kudox/rev1/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { @@ -38,6 +39,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/kudox/rev2/keyboard.json b/keyboards/kumaokobo/kudox/rev2/keyboard.json index 98cb6bb4319..a5dad94322b 100644 --- a/keyboards/kumaokobo/kudox/rev2/keyboard.json +++ b/keyboards/kumaokobo/kudox/rev2/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { @@ -38,6 +39,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/kudox/rev3/keyboard.json b/keyboards/kumaokobo/kudox/rev3/keyboard.json index 35144cc25a1..1fe349a99ef 100644 --- a/keyboards/kumaokobo/kudox/rev3/keyboard.json +++ b/keyboards/kumaokobo/kudox/rev3/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { @@ -38,6 +39,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/kudox/rules.mk b/keyboards/kumaokobo/kudox/rules.mk index ff1dfc760e7..16c27e7c3b2 100644 --- a/keyboards/kumaokobo/kudox/rules.mk +++ b/keyboards/kumaokobo/kudox/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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = kumaokobo/kudox/rev3 diff --git a/keyboards/kumaokobo/kudox_full/rev1/info.json b/keyboards/kumaokobo/kudox_full/rev1/keyboard.json similarity index 95% rename from keyboards/kumaokobo/kudox_full/rev1/info.json rename to keyboards/kumaokobo/kudox_full/rev1/keyboard.json index d12984f16e3..046bc8e1824 100644 --- a/keyboards/kumaokobo/kudox_full/rev1/info.json +++ b/keyboards/kumaokobo/kudox_full/rev1/keyboard.json @@ -36,6 +36,17 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "unicode": true, + "oled": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/kudox_full/rev1/rules.mk b/keyboards/kumaokobo/kudox_full/rev1/rules.mk deleted file mode 100644 index dd68e9d3b09..00000000000 --- a/keyboards/kumaokobo/kudox_full/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = yes diff --git a/keyboards/kumaokobo/kudox_full/rules.mk b/keyboards/kumaokobo/kudox_full/rules.mk index 2924b7cee57..c912dcd2e5c 100644 --- a/keyboards/kumaokobo/kudox_full/rules.mk +++ b/keyboards/kumaokobo/kudox_full/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode -LTO_ENABLE = yes - DEFAULT_FOLDER = kumaokobo/kudox_full/rev1 diff --git a/keyboards/kumaokobo/kudox_game/info.json b/keyboards/kumaokobo/kudox_game/info.json index 0c38991bbb0..6968b5e427e 100644 --- a/keyboards/kumaokobo/kudox_game/info.json +++ b/keyboards/kumaokobo/kudox_game/info.json @@ -3,14 +3,6 @@ "manufacturer": "Kumao Kobo", "url": "", "maintainer": "Kumao Kobo", - "features": { - "bootmagic": false, - "command": true, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": false - }, "usb": { "vid": "0xABBA", "pid": "0x9696" diff --git a/keyboards/kumaokobo/kudox_game/rev1/keyboard.json b/keyboards/kumaokobo/kudox_game/rev1/keyboard.json index e5c39fce316..2163b89d971 100644 --- a/keyboards/kumaokobo/kudox_game/rev1/keyboard.json +++ b/keyboards/kumaokobo/kudox_game/rev1/keyboard.json @@ -27,6 +27,14 @@ "rows": ["D4", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/kudox_game/rev2/info.json b/keyboards/kumaokobo/kudox_game/rev2/keyboard.json similarity index 91% rename from keyboards/kumaokobo/kudox_game/rev2/info.json rename to keyboards/kumaokobo/kudox_game/rev2/keyboard.json index e811c70d5ba..554d03c76bd 100644 --- a/keyboards/kumaokobo/kudox_game/rev2/info.json +++ b/keyboards/kumaokobo/kudox_game/rev2/keyboard.json @@ -27,6 +27,15 @@ "rows": ["D4", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/kudox_game/rev2/rules.mk b/keyboards/kumaokobo/kudox_game/rev2/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/kumaokobo/kudox_game/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/kumaokobo/pico/65keys/keyboard.json b/keyboards/kumaokobo/pico/65keys/keyboard.json index 260b2db1e90..efcc96e1dcd 100644 --- a/keyboards/kumaokobo/pico/65keys/keyboard.json +++ b/keyboards/kumaokobo/pico/65keys/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { @@ -38,6 +39,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/pico/70keys/keyboard.json b/keyboards/kumaokobo/pico/70keys/keyboard.json index ed3c8163d13..8fe91b84cce 100644 --- a/keyboards/kumaokobo/pico/70keys/keyboard.json +++ b/keyboards/kumaokobo/pico/70keys/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { @@ -38,6 +39,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/pico/info.json b/keyboards/kumaokobo/pico/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/kumaokobo/pico/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/kumaokobo/pico/rules.mk b/keyboards/kumaokobo/pico/rules.mk index 36372376ea1..df859afa0fa 100644 --- a/keyboards/kumaokobo/pico/rules.mk +++ b/keyboards/kumaokobo/pico/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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = kumaokobo/pico/65keys From 69f96e1411bc786c49ef3de83d18d8bd226fd8ea Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:53:31 -0700 Subject: [PATCH 167/333] Data-Driven Keyboard Conversions: K, Part 4 (#23567) --- keyboards/keyboardio/model01/info.json | 7 +++++++ keyboards/keyboardio/model01/rules.mk | 13 ------------- keyboards/keycapsss/plaid_pad/info.json | 8 -------- .../plaid_pad/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/keycapsss/plaid_pad/rev1/rules.mk | 1 - .../plaid_pad/rev2/{info.json => keyboard.json} | 9 +++++++++ keyboards/keycapsss/plaid_pad/rev2/rules.mk | 1 - .../plaid_pad/rev3/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keycapsss/plaid_pad/rev3/rules.mk | 2 -- keyboards/keychron/q10/ansi_encoder/info.json | 9 +++++++++ keyboards/keychron/q10/ansi_encoder/rules.mk | 16 ---------------- keyboards/keychron/q10/iso_encoder/info.json | 9 +++++++++ keyboards/keychron/q10/iso_encoder/rules.mk | 16 ---------------- keyboards/keychron/q12/ansi_encoder/info.json | 9 +++++++++ keyboards/keychron/q12/ansi_encoder/rules.mk | 16 ---------------- keyboards/keychron/q12/iso_encoder/info.json | 9 +++++++++ keyboards/keychron/q12/iso_encoder/rules.mk | 16 ---------------- keyboards/keychron/q6/ansi/info.json | 11 +++++++++++ keyboards/keychron/q6/ansi/rules.mk | 16 ---------------- keyboards/keychron/q6/ansi_encoder/info.json | 12 ++++++++++++ keyboards/keychron/q6/ansi_encoder/rules.mk | 17 ----------------- keyboards/keychron/q6/iso/info.json | 11 +++++++++++ keyboards/keychron/q6/iso/rules.mk | 16 ---------------- keyboards/keychron/q6/iso_encoder/info.json | 12 ++++++++++++ keyboards/keychron/q6/iso_encoder/rules.mk | 17 ----------------- keyboards/keychron/q65/ansi_encoder/info.json | 9 +++++++++ keyboards/keychron/q65/ansi_encoder/rules.mk | 16 ---------------- keyboards/keychron/v1/ansi/info.json | 8 ++++++++ keyboards/keychron/v1/ansi/rules.mk | 15 --------------- keyboards/keychron/v1/ansi_encoder/info.json | 9 +++++++++ keyboards/keychron/v1/ansi_encoder/rules.mk | 16 ---------------- keyboards/keychron/v1/iso/info.json | 8 ++++++++ keyboards/keychron/v1/iso/rules.mk | 15 --------------- keyboards/keychron/v1/iso_encoder/info.json | 9 +++++++++ keyboards/keychron/v1/iso_encoder/rules.mk | 16 ---------------- keyboards/keychron/v1/jis/info.json | 8 ++++++++ keyboards/keychron/v1/jis/rules.mk | 15 --------------- keyboards/keychron/v1/jis_encoder/info.json | 9 +++++++++ keyboards/keychron/v1/jis_encoder/rules.mk | 16 ---------------- keyboards/keychron/v10/ansi_encoder/info.json | 9 +++++++++ keyboards/keychron/v10/ansi_encoder/rules.mk | 16 ---------------- keyboards/keychron/v10/iso_encoder/info.json | 9 +++++++++ keyboards/keychron/v10/iso_encoder/rules.mk | 16 ---------------- keyboards/keychron/v3/ansi_encoder/info.json | 9 +++++++++ keyboards/keychron/v3/ansi_encoder/rules.mk | 16 ---------------- keyboards/keychron/v3/iso_encoder/info.json | 9 +++++++++ keyboards/keychron/v3/iso_encoder/rules.mk | 16 ---------------- keyboards/keychron/v3/jis_encoder/info.json | 9 +++++++++ keyboards/keychron/v3/jis_encoder/rules.mk | 16 ---------------- keyboards/keychron/v5/ansi/info.json | 8 ++++++++ keyboards/keychron/v5/ansi/rules.mk | 15 --------------- keyboards/keychron/v5/ansi_encoder/info.json | 9 +++++++++ keyboards/keychron/v5/ansi_encoder/rules.mk | 16 ---------------- keyboards/keychron/v5/iso/info.json | 8 ++++++++ keyboards/keychron/v5/iso/rules.mk | 15 --------------- keyboards/keychron/v5/iso_encoder/info.json | 9 +++++++++ keyboards/keychron/v5/iso_encoder/rules.mk | 16 ---------------- keyboards/keychron/v6/ansi/info.json | 8 ++++++++ keyboards/keychron/v6/ansi/rules.mk | 15 --------------- keyboards/keychron/v6/ansi_encoder/info.json | 9 +++++++++ keyboards/keychron/v6/ansi_encoder/rules.mk | 16 ---------------- keyboards/keychron/v6/iso/info.json | 8 ++++++++ keyboards/keychron/v6/iso/rules.mk | 15 --------------- keyboards/keychron/v6/iso_encoder/info.json | 9 +++++++++ keyboards/keychron/v6/iso_encoder/rules.mk | 16 ---------------- keyboards/keygem/kg60ansi/info.json | 8 ++++++++ keyboards/keygem/kg60ansi/rules.mk | 13 ------------- keyboards/keygem/kg65rgbv2/info.json | 8 ++++++++ keyboards/keygem/kg65rgbv2/rules.mk | 13 ------------- keyboards/keyhive/honeycomb/info.json | 9 +++++++++ keyboards/keyhive/honeycomb/rules.mk | 11 ----------- keyboards/keyhive/lattice60/info.json | 5 +++++ keyboards/keyhive/lattice60/rules.mk | 13 ------------- .../navi10/rev0/{info.json => keyboard.json} | 7 +++++++ keyboards/keyhive/navi10/rev0/rules.mk | 12 ------------ .../navi10/rev2/{info.json => keyboard.json} | 7 +++++++ keyboards/keyhive/navi10/rev2/rules.mk | 12 ------------ .../navi10/rev3/{info.json => keyboard.json} | 7 +++++++ keyboards/keyhive/navi10/rev3/rules.mk | 12 ------------ .../uno/rev1/{info.json => keyboard.json} | 6 ++++++ keyboards/keyhive/uno/rev1/rules.mk | 12 ------------ .../uno/rev2/{info.json => keyboard.jsono} | 7 +++++++ keyboards/keyhive/uno/rev2/rules.mk | 13 ------------- 83 files changed, 354 insertions(+), 579 deletions(-) rename keyboards/keycapsss/plaid_pad/rev1/{info.json => keyboard.json} (53%) delete mode 100644 keyboards/keycapsss/plaid_pad/rev1/rules.mk rename keyboards/keycapsss/plaid_pad/rev2/{info.json => keyboard.json} (61%) delete mode 100644 keyboards/keycapsss/plaid_pad/rev2/rules.mk rename keyboards/keycapsss/plaid_pad/rev3/{info.json => keyboard.json} (59%) delete mode 100644 keyboards/keycapsss/plaid_pad/rev3/rules.mk rename keyboards/keyhive/navi10/rev0/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/keyhive/navi10/rev0/rules.mk rename keyboards/keyhive/navi10/rev2/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/keyhive/navi10/rev2/rules.mk rename keyboards/keyhive/navi10/rev3/{info.json => keyboard.json} (84%) delete mode 100644 keyboards/keyhive/navi10/rev3/rules.mk rename keyboards/keyhive/uno/rev1/{info.json => keyboard.json} (74%) delete mode 100644 keyboards/keyhive/uno/rev1/rules.mk rename keyboards/keyhive/uno/rev2/{info.json => keyboard.jsono} (75%) delete mode 100644 keyboards/keyhive/uno/rev2/rules.mk diff --git a/keyboards/keyboardio/model01/info.json b/keyboards/keyboardio/model01/info.json index fd17535be4b..c2438047b0c 100644 --- a/keyboards/keyboardio/model01/info.json +++ b/keyboards/keyboardio/model01/info.json @@ -110,6 +110,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "rgb_matrix": true + }, "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/keyboardio/model01/rules.mk b/keyboards/keyboardio/model01/rules.mk index 29e1f4fea80..952c9f6a4e2 100644 --- a/keyboards/keyboardio/model01/rules.mk +++ b/keyboards/keyboardio/model01/rules.mk @@ -1,17 +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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover - CUSTOM_MATRIX = yes I2C_DRIVER_REQUIRED = yes SRC += leds.c \ matrix.c - -# You can set RGB_MATRIX_ENABLE = no in your rules.mk to disable this and save the Flash -RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects. diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json index 0d8de8a1d90..c66bd05f1bc 100644 --- a/keyboards/keycapsss/plaid_pad/info.json +++ b/keyboards/keycapsss/plaid_pad/info.json @@ -10,14 +10,6 @@ "qmk": { "tap_keycode_delay": 60 }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": false - }, "matrix_pins": { "cols": ["B0", "D7", "D6", "D5"], "rows": ["C0", "C1", "C2", "C3"] diff --git a/keyboards/keycapsss/plaid_pad/rev1/info.json b/keyboards/keycapsss/plaid_pad/rev1/keyboard.json similarity index 53% rename from keyboards/keycapsss/plaid_pad/rev1/info.json rename to keyboards/keycapsss/plaid_pad/rev1/keyboard.json index 08770518586..e4a8a8d3c80 100644 --- a/keyboards/keycapsss/plaid_pad/rev1/info.json +++ b/keyboards/keycapsss/plaid_pad/rev1/keyboard.json @@ -8,5 +8,14 @@ {"pin_a": "D1", "pin_b": "D0"}, {"pin_a": "B2", "pin_b": "B1"} ] + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "encoder": true } } diff --git a/keyboards/keycapsss/plaid_pad/rev1/rules.mk b/keyboards/keycapsss/plaid_pad/rev1/rules.mk deleted file mode 100644 index 5af1ba85367..00000000000 --- a/keyboards/keycapsss/plaid_pad/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_ENABLE = yes diff --git a/keyboards/keycapsss/plaid_pad/rev2/info.json b/keyboards/keycapsss/plaid_pad/rev2/keyboard.json similarity index 61% rename from keyboards/keycapsss/plaid_pad/rev2/info.json rename to keyboards/keycapsss/plaid_pad/rev2/keyboard.json index 637139c5a44..8dc84d4ee83 100644 --- a/keyboards/keycapsss/plaid_pad/rev2/info.json +++ b/keyboards/keycapsss/plaid_pad/rev2/keyboard.json @@ -10,5 +10,14 @@ {"pin_a": "B4", "pin_b": "B3"}, {"pin_a": "D4", "pin_b": "B5"} ] + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "encoder": true } } diff --git a/keyboards/keycapsss/plaid_pad/rev2/rules.mk b/keyboards/keycapsss/plaid_pad/rev2/rules.mk deleted file mode 100644 index 5af1ba85367..00000000000 --- a/keyboards/keycapsss/plaid_pad/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_ENABLE = yes diff --git a/keyboards/keycapsss/plaid_pad/rev3/info.json b/keyboards/keycapsss/plaid_pad/rev3/keyboard.json similarity index 59% rename from keyboards/keycapsss/plaid_pad/rev3/info.json rename to keyboards/keycapsss/plaid_pad/rev3/keyboard.json index 0468b704994..4e1d0712874 100644 --- a/keyboards/keycapsss/plaid_pad/rev3/info.json +++ b/keyboards/keycapsss/plaid_pad/rev3/keyboard.json @@ -10,5 +10,15 @@ {"pin_a": "B4", "pin_b": "B3"}, {"pin_a": "D4", "pin_b": "B5"} ] + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "encoder": true, + "oled": true } } diff --git a/keyboards/keycapsss/plaid_pad/rev3/rules.mk b/keyboards/keycapsss/plaid_pad/rev3/rules.mk deleted file mode 100644 index 5ec06e96091..00000000000 --- a/keyboards/keycapsss/plaid_pad/rev3/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -ENCODER_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/info.json index c40c6054268..f47136edf72 100644 --- a/keyboards/keychron/q10/ansi_encoder/info.json +++ b/keyboards/keychron/q10/ansi_encoder/info.json @@ -18,6 +18,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_ansi_89": { "layout": [ diff --git a/keyboards/keychron/q10/ansi_encoder/rules.mk b/keyboards/keychron/q10/ansi_encoder/rules.mk index 4c6e5bebf00..3652da4b697 100644 --- a/keyboards/keychron/q10/ansi_encoder/rules.mk +++ b/keyboards/keychron/q10/ansi_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/info.json index ce5223df616..5ec70d1a146 100644 --- a/keyboards/keychron/q10/iso_encoder/info.json +++ b/keyboards/keychron/q10/iso_encoder/info.json @@ -18,6 +18,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_iso_90": { "layout": [ diff --git a/keyboards/keychron/q10/iso_encoder/rules.mk b/keyboards/keychron/q10/iso_encoder/rules.mk index 4c6e5bebf00..3652da4b697 100644 --- a/keyboards/keychron/q10/iso_encoder/rules.mk +++ b/keyboards/keychron/q10/iso_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/info.json index 7b1e46beb71..d2f90cb8ac6 100644 --- a/keyboards/keychron/q12/ansi_encoder/info.json +++ b/keyboards/keychron/q12/ansi_encoder/info.json @@ -15,6 +15,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_ansi_103": { "layout": [ diff --git a/keyboards/keychron/q12/ansi_encoder/rules.mk b/keyboards/keychron/q12/ansi_encoder/rules.mk index 213c733c9c2..3652da4b697 100644 --- a/keyboards/keychron/q12/ansi_encoder/rules.mk +++ b/keyboards/keychron/q12/ansi_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/q12/iso_encoder/info.json b/keyboards/keychron/q12/iso_encoder/info.json index c66c1bb665c..29e24a14913 100644 --- a/keyboards/keychron/q12/iso_encoder/info.json +++ b/keyboards/keychron/q12/iso_encoder/info.json @@ -15,6 +15,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_iso_104": { "layout": [ diff --git a/keyboards/keychron/q12/iso_encoder/rules.mk b/keyboards/keychron/q12/iso_encoder/rules.mk index 39b05940393..2d3e529c97e 100644 --- a/keyboards/keychron/q12/iso_encoder/rules.mk +++ b/keyboards/keychron/q12/iso_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/q6/ansi/info.json b/keyboards/keychron/q6/ansi/info.json index d3dbd4a0922..664fe870084 100644 --- a/keyboards/keychron/q6/ansi/info.json +++ b/keyboards/keychron/q6/ansi/info.json @@ -10,6 +10,17 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "dip_switch": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_ansi_108": { "layout": [ diff --git a/keyboards/keychron/q6/ansi/rules.mk b/keyboards/keychron/q6/ansi/rules.mk index 9383cc955f8..3652da4b697 100644 --- a/keyboards/keychron/q6/ansi/rules.mk +++ b/keyboards/keychron/q6/ansi/rules.mk @@ -1,19 +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 USB 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 -RGB_MATRIX_ENABLE = yes -LTO_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/q6/ansi_encoder/info.json b/keyboards/keychron/q6/ansi_encoder/info.json index 8e85336313f..a37b68f553a 100644 --- a/keyboards/keychron/q6/ansi_encoder/info.json +++ b/keyboards/keychron/q6/ansi_encoder/info.json @@ -15,6 +15,18 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_ansi_109": { "layout": [ diff --git a/keyboards/keychron/q6/ansi_encoder/rules.mk b/keyboards/keychron/q6/ansi_encoder/rules.mk index 929c4532a05..3652da4b697 100644 --- a/keyboards/keychron/q6/ansi_encoder/rules.mk +++ b/keyboards/keychron/q6/ansi_encoder/rules.mk @@ -1,20 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes -LTO_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/q6/iso/info.json b/keyboards/keychron/q6/iso/info.json index b88af93988d..28730b2d740 100644 --- a/keyboards/keychron/q6/iso/info.json +++ b/keyboards/keychron/q6/iso/info.json @@ -10,6 +10,17 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "dip_switch": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_iso_109": { "layout": [ diff --git a/keyboards/keychron/q6/iso/rules.mk b/keyboards/keychron/q6/iso/rules.mk index 9383cc955f8..3652da4b697 100644 --- a/keyboards/keychron/q6/iso/rules.mk +++ b/keyboards/keychron/q6/iso/rules.mk @@ -1,19 +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 USB 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 -RGB_MATRIX_ENABLE = yes -LTO_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/q6/iso_encoder/info.json b/keyboards/keychron/q6/iso_encoder/info.json index 54d4613b9c4..3fc4ee8f1cc 100644 --- a/keyboards/keychron/q6/iso_encoder/info.json +++ b/keyboards/keychron/q6/iso_encoder/info.json @@ -15,6 +15,18 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_iso_110": { "layout": [ diff --git a/keyboards/keychron/q6/iso_encoder/rules.mk b/keyboards/keychron/q6/iso_encoder/rules.mk index 929c4532a05..3652da4b697 100644 --- a/keyboards/keychron/q6/iso_encoder/rules.mk +++ b/keyboards/keychron/q6/iso_encoder/rules.mk @@ -1,20 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes -LTO_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/info.json index 2d622b869c4..76b17dd5fbd 100644 --- a/keyboards/keychron/q65/ansi_encoder/info.json +++ b/keyboards/keychron/q65/ansi_encoder/info.json @@ -18,6 +18,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "encoder": true, + "dip_switch": true, + "rgb_matrix": true + }, "layouts": { "LAYOUT_ansi_73": { "layout": [ diff --git a/keyboards/keychron/q65/ansi_encoder/rules.mk b/keyboards/keychron/q65/ansi_encoder/rules.mk index 4c6e5bebf00..3652da4b697 100644 --- a/keyboards/keychron/q65/ansi_encoder/rules.mk +++ b/keyboards/keychron/q65/ansi_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v1/ansi/info.json b/keyboards/keychron/v1/ansi/info.json index db2526e244e..d4bbca78de2 100644 --- a/keyboards/keychron/v1/ansi/info.json +++ b/keyboards/keychron/v1/ansi/info.json @@ -10,6 +10,14 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "dip_switch": true, + "rgb_matrix": true + }, "layouts": { "LAYOUT_ansi_82": { "layout": [ diff --git a/keyboards/keychron/v1/ansi/rules.mk b/keyboards/keychron/v1/ansi/rules.mk index 465dfa93486..3652da4b697 100644 --- a/keyboards/keychron/v1/ansi/rules.mk +++ b/keyboards/keychron/v1/ansi/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 USB 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 -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v1/ansi_encoder/info.json b/keyboards/keychron/v1/ansi_encoder/info.json index 621010039d6..62bbeb9d5df 100644 --- a/keyboards/keychron/v1/ansi_encoder/info.json +++ b/keyboards/keychron/v1/ansi_encoder/info.json @@ -15,6 +15,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "encoder": true, + "dip_switch": true, + "rgb_matrix": true + }, "layouts": { "LAYOUT_ansi_82": { "layout": [ diff --git a/keyboards/keychron/v1/ansi_encoder/rules.mk b/keyboards/keychron/v1/ansi_encoder/rules.mk index 4c6e5bebf00..3652da4b697 100644 --- a/keyboards/keychron/v1/ansi_encoder/rules.mk +++ b/keyboards/keychron/v1/ansi_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v1/iso/info.json b/keyboards/keychron/v1/iso/info.json index 9047aa2bb2f..6e307ea4df5 100644 --- a/keyboards/keychron/v1/iso/info.json +++ b/keyboards/keychron/v1/iso/info.json @@ -10,6 +10,14 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "dip_switch": true + }, "layouts": { "LAYOUT_iso_83": { "layout": [ diff --git a/keyboards/keychron/v1/iso/rules.mk b/keyboards/keychron/v1/iso/rules.mk index 465dfa93486..3652da4b697 100644 --- a/keyboards/keychron/v1/iso/rules.mk +++ b/keyboards/keychron/v1/iso/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 USB 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 -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v1/iso_encoder/info.json b/keyboards/keychron/v1/iso_encoder/info.json index 557585f82d9..077cb045b29 100644 --- a/keyboards/keychron/v1/iso_encoder/info.json +++ b/keyboards/keychron/v1/iso_encoder/info.json @@ -15,6 +15,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_iso_83": { "layout": [ diff --git a/keyboards/keychron/v1/iso_encoder/rules.mk b/keyboards/keychron/v1/iso_encoder/rules.mk index 4c6e5bebf00..3652da4b697 100644 --- a/keyboards/keychron/v1/iso_encoder/rules.mk +++ b/keyboards/keychron/v1/iso_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v1/jis/info.json b/keyboards/keychron/v1/jis/info.json index 1678c93c668..a6a43a75daf 100644 --- a/keyboards/keychron/v1/jis/info.json +++ b/keyboards/keychron/v1/jis/info.json @@ -10,6 +10,14 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "dip_switch": true + }, "layouts": { "LAYOUT_jis_86": { "layout": [ diff --git a/keyboards/keychron/v1/jis/rules.mk b/keyboards/keychron/v1/jis/rules.mk index 465dfa93486..3652da4b697 100644 --- a/keyboards/keychron/v1/jis/rules.mk +++ b/keyboards/keychron/v1/jis/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 USB 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 -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v1/jis_encoder/info.json b/keyboards/keychron/v1/jis_encoder/info.json index 7064bcdd552..4e39e3d4a88 100644 --- a/keyboards/keychron/v1/jis_encoder/info.json +++ b/keyboards/keychron/v1/jis_encoder/info.json @@ -15,6 +15,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_jis_86": { "layout": [ diff --git a/keyboards/keychron/v1/jis_encoder/rules.mk b/keyboards/keychron/v1/jis_encoder/rules.mk index 4c6e5bebf00..3652da4b697 100644 --- a/keyboards/keychron/v1/jis_encoder/rules.mk +++ b/keyboards/keychron/v1/jis_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v10/ansi_encoder/info.json b/keyboards/keychron/v10/ansi_encoder/info.json index 6cbc00a7f61..825fa65ef87 100644 --- a/keyboards/keychron/v10/ansi_encoder/info.json +++ b/keyboards/keychron/v10/ansi_encoder/info.json @@ -18,6 +18,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_ansi_89": { "layout": [ diff --git a/keyboards/keychron/v10/ansi_encoder/rules.mk b/keyboards/keychron/v10/ansi_encoder/rules.mk index 4c6e5bebf00..3652da4b697 100644 --- a/keyboards/keychron/v10/ansi_encoder/rules.mk +++ b/keyboards/keychron/v10/ansi_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v10/iso_encoder/info.json b/keyboards/keychron/v10/iso_encoder/info.json index 30763236ba5..ea2dfb35e2a 100644 --- a/keyboards/keychron/v10/iso_encoder/info.json +++ b/keyboards/keychron/v10/iso_encoder/info.json @@ -18,6 +18,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_iso_90": { "layout": [ diff --git a/keyboards/keychron/v10/iso_encoder/rules.mk b/keyboards/keychron/v10/iso_encoder/rules.mk index 4c6e5bebf00..3652da4b697 100644 --- a/keyboards/keychron/v10/iso_encoder/rules.mk +++ b/keyboards/keychron/v10/iso_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v3/ansi_encoder/info.json b/keyboards/keychron/v3/ansi_encoder/info.json index 2fc194feccd..5134b47d7e1 100644 --- a/keyboards/keychron/v3/ansi_encoder/info.json +++ b/keyboards/keychron/v3/ansi_encoder/info.json @@ -15,6 +15,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_tkl_f13_ansi": { "layout": [ diff --git a/keyboards/keychron/v3/ansi_encoder/rules.mk b/keyboards/keychron/v3/ansi_encoder/rules.mk index 4c6e5bebf00..3652da4b697 100644 --- a/keyboards/keychron/v3/ansi_encoder/rules.mk +++ b/keyboards/keychron/v3/ansi_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v3/iso_encoder/info.json b/keyboards/keychron/v3/iso_encoder/info.json index 1edb29a7410..8b4f0a9d005 100644 --- a/keyboards/keychron/v3/iso_encoder/info.json +++ b/keyboards/keychron/v3/iso_encoder/info.json @@ -15,6 +15,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_tkl_f13_iso": { "layout": [ diff --git a/keyboards/keychron/v3/iso_encoder/rules.mk b/keyboards/keychron/v3/iso_encoder/rules.mk index 4c6e5bebf00..3652da4b697 100644 --- a/keyboards/keychron/v3/iso_encoder/rules.mk +++ b/keyboards/keychron/v3/iso_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v3/jis_encoder/info.json b/keyboards/keychron/v3/jis_encoder/info.json index f9a9202eb00..ab9d6ab2a73 100644 --- a/keyboards/keychron/v3/jis_encoder/info.json +++ b/keyboards/keychron/v3/jis_encoder/info.json @@ -15,6 +15,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_jis_92": { "layout": [ diff --git a/keyboards/keychron/v3/jis_encoder/rules.mk b/keyboards/keychron/v3/jis_encoder/rules.mk index 4c6e5bebf00..3652da4b697 100644 --- a/keyboards/keychron/v3/jis_encoder/rules.mk +++ b/keyboards/keychron/v3/jis_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v5/ansi/info.json b/keyboards/keychron/v5/ansi/info.json index 2f2e33fecdf..b98302f336d 100644 --- a/keyboards/keychron/v5/ansi/info.json +++ b/keyboards/keychron/v5/ansi/info.json @@ -10,6 +10,14 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "dip_switch": true + }, "layouts": { "LAYOUT_ansi_100": { "layout": [ diff --git a/keyboards/keychron/v5/ansi/rules.mk b/keyboards/keychron/v5/ansi/rules.mk index 465dfa93486..3652da4b697 100644 --- a/keyboards/keychron/v5/ansi/rules.mk +++ b/keyboards/keychron/v5/ansi/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 USB 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 -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v5/ansi_encoder/info.json b/keyboards/keychron/v5/ansi_encoder/info.json index 1ed410eb7bf..af61e4a15ea 100644 --- a/keyboards/keychron/v5/ansi_encoder/info.json +++ b/keyboards/keychron/v5/ansi_encoder/info.json @@ -15,6 +15,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_ansi_98": { "layout": [ diff --git a/keyboards/keychron/v5/ansi_encoder/rules.mk b/keyboards/keychron/v5/ansi_encoder/rules.mk index 4c6e5bebf00..3652da4b697 100644 --- a/keyboards/keychron/v5/ansi_encoder/rules.mk +++ b/keyboards/keychron/v5/ansi_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v5/iso/info.json b/keyboards/keychron/v5/iso/info.json index 522730b2684..7e7280d5acb 100644 --- a/keyboards/keychron/v5/iso/info.json +++ b/keyboards/keychron/v5/iso/info.json @@ -10,6 +10,14 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "dip_switch": true + }, "layouts": { "LAYOUT_iso_101": { "layout": [ diff --git a/keyboards/keychron/v5/iso/rules.mk b/keyboards/keychron/v5/iso/rules.mk index 465dfa93486..3652da4b697 100644 --- a/keyboards/keychron/v5/iso/rules.mk +++ b/keyboards/keychron/v5/iso/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 USB 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 -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v5/iso_encoder/info.json b/keyboards/keychron/v5/iso_encoder/info.json index 2d4cf28cd1d..dfef0a7be79 100644 --- a/keyboards/keychron/v5/iso_encoder/info.json +++ b/keyboards/keychron/v5/iso_encoder/info.json @@ -15,6 +15,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_iso_99": { "layout": [ diff --git a/keyboards/keychron/v5/iso_encoder/rules.mk b/keyboards/keychron/v5/iso_encoder/rules.mk index 4c6e5bebf00..3652da4b697 100644 --- a/keyboards/keychron/v5/iso_encoder/rules.mk +++ b/keyboards/keychron/v5/iso_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v6/ansi/info.json b/keyboards/keychron/v6/ansi/info.json index 8b2cc055a8a..e68f3cdec8a 100644 --- a/keyboards/keychron/v6/ansi/info.json +++ b/keyboards/keychron/v6/ansi/info.json @@ -10,6 +10,14 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "dip_switch": true + }, "layouts": { "LAYOUT_ansi_108": { "layout": [ diff --git a/keyboards/keychron/v6/ansi/rules.mk b/keyboards/keychron/v6/ansi/rules.mk index eff255ee8c8..3652da4b697 100644 --- a/keyboards/keychron/v6/ansi/rules.mk +++ b/keyboards/keychron/v6/ansi/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 USB 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 -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v6/ansi_encoder/info.json b/keyboards/keychron/v6/ansi_encoder/info.json index 86ecc82e350..6ccc6d415b0 100644 --- a/keyboards/keychron/v6/ansi_encoder/info.json +++ b/keyboards/keychron/v6/ansi_encoder/info.json @@ -18,6 +18,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_ansi_109": { "layout": [ diff --git a/keyboards/keychron/v6/ansi_encoder/rules.mk b/keyboards/keychron/v6/ansi_encoder/rules.mk index 213c733c9c2..3652da4b697 100644 --- a/keyboards/keychron/v6/ansi_encoder/rules.mk +++ b/keyboards/keychron/v6/ansi_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v6/iso/info.json b/keyboards/keychron/v6/iso/info.json index 242e904cf03..e2f17e4f6e5 100644 --- a/keyboards/keychron/v6/iso/info.json +++ b/keyboards/keychron/v6/iso/info.json @@ -13,6 +13,14 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "dip_switch": true + }, "layouts": { "LAYOUT_iso_109": { "layout": [ diff --git a/keyboards/keychron/v6/iso/rules.mk b/keyboards/keychron/v6/iso/rules.mk index eff255ee8c8..3652da4b697 100644 --- a/keyboards/keychron/v6/iso/rules.mk +++ b/keyboards/keychron/v6/iso/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 USB 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 -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keychron/v6/iso_encoder/info.json b/keyboards/keychron/v6/iso_encoder/info.json index d4237a69f42..d7469b54e0d 100644 --- a/keyboards/keychron/v6/iso_encoder/info.json +++ b/keyboards/keychron/v6/iso_encoder/info.json @@ -18,6 +18,15 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "dip_switch": true + }, "layouts": { "LAYOUT_iso_110": { "layout": [ diff --git a/keyboards/keychron/v6/iso_encoder/rules.mk b/keyboards/keychron/v6/iso_encoder/rules.mk index 39b05940393..2d3e529c97e 100644 --- a/keyboards/keychron/v6/iso_encoder/rules.mk +++ b/keyboards/keychron/v6/iso_encoder/rules.mk @@ -1,19 +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 USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable Encoder -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/keygem/kg60ansi/info.json b/keyboards/keygem/kg60ansi/info.json index 73d31b8da1c..ea6353516bd 100644 --- a/keyboards/keygem/kg60ansi/info.json +++ b/keyboards/keygem/kg60ansi/info.json @@ -38,6 +38,14 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/keygem/kg60ansi/rules.mk b/keyboards/keygem/kg60ansi/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/keygem/kg60ansi/rules.mk +++ b/keyboards/keygem/kg60ansi/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/keygem/kg65rgbv2/info.json b/keyboards/keygem/kg65rgbv2/info.json index e7b48dcbb08..c6738f1e606 100644 --- a/keyboards/keygem/kg65rgbv2/info.json +++ b/keyboards/keygem/kg65rgbv2/info.json @@ -38,6 +38,14 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/keygem/kg65rgbv2/rules.mk b/keyboards/keygem/kg65rgbv2/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/keygem/kg65rgbv2/rules.mk +++ b/keyboards/keygem/kg65rgbv2/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/keyhive/honeycomb/info.json b/keyboards/keyhive/honeycomb/info.json index 639edee28d5..768f08275d6 100644 --- a/keyboards/keyhive/honeycomb/info.json +++ b/keyboards/keyhive/honeycomb/info.json @@ -10,6 +10,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "pointing_device": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keyhive/honeycomb/rules.mk b/keyboards/keyhive/honeycomb/rules.mk index bfa5252a039..fd5fa4db1a9 100755 --- a/keyboards/keyhive/honeycomb/rules.mk +++ b/keyboards/keyhive/honeycomb/rules.mk @@ -1,16 +1,5 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -#MOUSEKEY_ENABLE = yes # Mouse keys -POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully. POINTING_DEVICE_DRIVER = custom -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration CUSTOM_MATRIX = yes # Remote matrix from the wireless bridge -NKRO_ENABLE = yes # Enable N-Key Rollover -# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality # # project specific files SRC += matrix.c diff --git a/keyboards/keyhive/lattice60/info.json b/keyboards/keyhive/lattice60/info.json index 2c12fb6bfde..4afdd839d00 100644 --- a/keyboards/keyhive/lattice60/info.json +++ b/keyboards/keyhive/lattice60/info.json @@ -15,6 +15,11 @@ "diode_direction": "ROW2COL", "processor": "atmega328p", "bootloader": "usbasploader", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true + }, "community_layouts": ["60_hhkb"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/keyhive/lattice60/rules.mk b/keyboards/keyhive/lattice60/rules.mk index b60fe3290a5..7b459748299 100644 --- a/keyboards/keyhive/lattice60/rules.mk +++ b/keyboards/keyhive/lattice60/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 12000000 - -# 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 diff --git a/keyboards/keyhive/navi10/rev0/info.json b/keyboards/keyhive/navi10/rev0/keyboard.json similarity index 84% rename from keyboards/keyhive/navi10/rev0/info.json rename to keyboards/keyhive/navi10/rev0/keyboard.json index 548d9176670..092c2343ab5 100644 --- a/keyboards/keyhive/navi10/rev0/info.json +++ b/keyboards/keyhive/navi10/rev0/keyboard.json @@ -9,6 +9,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keyhive/navi10/rev0/rules.mk b/keyboards/keyhive/navi10/rev0/rules.mk deleted file mode 100644 index 27b0a2549ed..00000000000 --- a/keyboards/keyhive/navi10/rev0/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 = 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/keyhive/navi10/rev2/info.json b/keyboards/keyhive/navi10/rev2/keyboard.json similarity index 84% rename from keyboards/keyhive/navi10/rev2/info.json rename to keyboards/keyhive/navi10/rev2/keyboard.json index 8db97e67b71..2c7b9972dfa 100644 --- a/keyboards/keyhive/navi10/rev2/info.json +++ b/keyboards/keyhive/navi10/rev2/keyboard.json @@ -9,6 +9,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keyhive/navi10/rev2/rules.mk b/keyboards/keyhive/navi10/rev2/rules.mk deleted file mode 100644 index 27b0a2549ed..00000000000 --- a/keyboards/keyhive/navi10/rev2/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 = 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/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/keyboard.json similarity index 84% rename from keyboards/keyhive/navi10/rev3/info.json rename to keyboards/keyhive/navi10/rev3/keyboard.json index 82df44e8667..5e1b27f7ce9 100644 --- a/keyboards/keyhive/navi10/rev3/info.json +++ b/keyboards/keyhive/navi10/rev3/keyboard.json @@ -9,6 +9,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keyhive/navi10/rev3/rules.mk b/keyboards/keyhive/navi10/rev3/rules.mk deleted file mode 100644 index 27b0a2549ed..00000000000 --- a/keyboards/keyhive/navi10/rev3/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 = 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/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/keyboard.json similarity index 74% rename from keyboards/keyhive/uno/rev1/info.json rename to keyboards/keyhive/uno/rev1/keyboard.json index 61121267d7b..9eaf49c2faa 100644 --- a/keyboards/keyhive/uno/rev1/info.json +++ b/keyboards/keyhive/uno/rev1/keyboard.json @@ -14,6 +14,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "rgblight": true + }, "matrix_pins": { "direct": [ ["B6"] diff --git a/keyboards/keyhive/uno/rev1/rules.mk b/keyboards/keyhive/uno/rev1/rules.mk deleted file mode 100644 index 95667aacd75..00000000000 --- a/keyboards/keyhive/uno/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/keyboard.jsono similarity index 75% rename from keyboards/keyhive/uno/rev2/info.json rename to keyboards/keyhive/uno/rev2/keyboard.jsono index 908c254babb..0283c2aa5b8 100644 --- a/keyboards/keyhive/uno/rev2/info.json +++ b/keyboards/keyhive/uno/rev2/keyboard.jsono @@ -19,6 +19,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "rgblight": true, + "encoder": true + }, "matrix_pins": { "direct": [ ["D0"] diff --git a/keyboards/keyhive/uno/rev2/rules.mk b/keyboards/keyhive/uno/rev2/rules.mk deleted file mode 100644 index 98b5879d7b0..00000000000 --- a/keyboards/keyhive/uno/rev2/rules.mk +++ /dev/null @@ -1,13 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes From 191f62688079d644fe7ac471b2725e79e4d87f48 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:54:11 -0700 Subject: [PATCH 168/333] Data-Driven Keyboard Conversions: K, Part 3 (#23566) --- .../keebformom/{info.json => keyboard.json} | 12 +++++++++++- keyboards/keebformom/rules.mk | 15 --------------- .../bdn9/rev1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keebio/bdn9/rev1/rules.mk | 13 ------------- .../bdn9/rev2/{info.json => keyboard.json} | 9 +++++++++ keyboards/keebio/bdn9/rev2/rules.mk | 15 --------------- .../dsp40/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/keebio/dsp40/rev1/rules.mk | 13 ------------- keyboards/keebio/foldkb/rev1/info.json | 11 +++++++++++ keyboards/keebio/foldkb/rev1/rules.mk | 3 --- keyboards/keebio/foldkb/rules.mk | 14 -------------- .../iris/rev2/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keebio/iris/rev2/rules.mk | 14 -------------- .../iris/rev3/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keebio/iris/rev3/rules.mk | 15 --------------- .../iris/rev4/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keebio/iris/rev4/rules.mk | 16 ---------------- .../iris/rev6/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keebio/iris/rev6/rules.mk | 16 ---------------- .../iris/rev7/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keebio/iris/rev7/rules.mk | 16 ---------------- .../kbo5000/rev1/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keebio/kbo5000/rev1/rules.mk | 3 --- keyboards/keebio/kbo5000/rules.mk | 14 -------------- .../levinson/rev1/{info.json => keyboard.json} | 6 ++++++ keyboards/keebio/levinson/rev1/rules.mk | 1 - .../levinson/rev2/{info.json => keyboard.json} | 6 ++++++ keyboards/keebio/levinson/rev2/rules.mk | 1 - keyboards/keebio/levinson/rev3/info.json | 6 ++++++ keyboards/keebio/levinson/rev3/rules.mk | 2 -- keyboards/keebio/levinson/rules.mk | 13 ------------- .../quefrency/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/keebio/quefrency/rev1/rules.mk | 1 - .../quefrency/rev2/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keebio/quefrency/rev2/rules.mk | 3 --- .../quefrency/rev3/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keebio/quefrency/rev3/rules.mk | 3 --- .../quefrency/rev4/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keebio/quefrency/rev4/rules.mk | 3 --- .../quefrency/rev5/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keebio/quefrency/rev5/rules.mk | 3 --- keyboards/keebio/quefrency/rules.mk | 11 ----------- .../rorschach/rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/keebio/rorschach/rev1/rules.mk | 1 - keyboards/keebio/rorschach/rules.mk | 13 ------------- .../viterbi/rev1/{info.json => keyboard.json} | 5 +++++ keyboards/keebio/viterbi/rev1/rules.mk | 1 - .../viterbi/rev2/{info.json => keyboard.json} | 9 +++++++++ keyboards/keebio/viterbi/rev2/rules.mk | 3 --- keyboards/keebio/viterbi/rules.mk | 13 ------------- keyboards/keebio/wavelet/info.json | 8 ++++++++ keyboards/keebio/wavelet/rules.mk | 13 ------------- keyboards/keebwerk/mega/ansi/info.json | 6 ++++++ keyboards/keebwerk/mega/ansi/rules.mk | 13 ------------- keyboards/keebwerk/nano_slider/info.json | 11 +++++++++++ keyboards/keebwerk/nano_slider/rules.mk | 15 --------------- 56 files changed, 232 insertions(+), 281 deletions(-) rename keyboards/keebformom/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/keebformom/rules.mk rename keyboards/keebio/bdn9/rev1/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/keebio/bdn9/rev1/rules.mk rename keyboards/keebio/bdn9/rev2/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/keebio/bdn9/rev2/rules.mk rename keyboards/keebio/dsp40/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keebio/dsp40/rev1/rules.mk rename keyboards/keebio/iris/rev2/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keebio/iris/rev2/rules.mk rename keyboards/keebio/iris/rev3/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keebio/iris/rev3/rules.mk rename keyboards/keebio/iris/rev4/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keebio/iris/rev4/rules.mk rename keyboards/keebio/iris/rev6/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keebio/iris/rev6/rules.mk rename keyboards/keebio/iris/rev7/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keebio/iris/rev7/rules.mk rename keyboards/keebio/kbo5000/rev1/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/keebio/kbo5000/rev1/rules.mk rename keyboards/keebio/levinson/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keebio/levinson/rev1/rules.mk rename keyboards/keebio/levinson/rev2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keebio/levinson/rev2/rules.mk rename keyboards/keebio/quefrency/rev1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/keebio/quefrency/rev1/rules.mk rename keyboards/keebio/quefrency/rev2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/keebio/quefrency/rev2/rules.mk rename keyboards/keebio/quefrency/rev3/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/keebio/quefrency/rev3/rules.mk rename keyboards/keebio/quefrency/rev4/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/keebio/quefrency/rev4/rules.mk rename keyboards/keebio/quefrency/rev5/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/keebio/quefrency/rev5/rules.mk rename keyboards/keebio/rorschach/rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/keebio/rorschach/rev1/rules.mk rename keyboards/keebio/viterbi/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/keebio/viterbi/rev1/rules.mk rename keyboards/keebio/viterbi/rev2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keebio/viterbi/rev2/rules.mk diff --git a/keyboards/keebformom/info.json b/keyboards/keebformom/keyboard.json similarity index 92% rename from keyboards/keebformom/info.json rename to keyboards/keebformom/keyboard.json index 8262b4bf4ee..b1ffee0f3da 100644 --- a/keyboards/keebformom/info.json +++ b/keyboards/keebformom/keyboard.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x458F", "pid": "0x14E2", - "device_version": "1.0.0" + "device_version": "1.0.0", + "no_startup_check": true }, "ws2812": { "pin": "F4" @@ -30,6 +31,15 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true + }, + "build": { + "lto": true + }, + "community_layouts": ["ortho_4x10"], "layouts": { "LAYOUT_ortho_4x10": { "layout": [ diff --git a/keyboards/keebformom/rules.mk b/keyboards/keebformom/rules.mk deleted file mode 100644 index 50c95c8bbde..00000000000 --- a/keyboards/keebformom/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes -NO_USB_STARTUP_CHECK = yes -LAYOUTS = ortho_4x10 diff --git a/keyboards/keebio/bdn9/rev1/info.json b/keyboards/keebio/bdn9/rev1/keyboard.json similarity index 82% rename from keyboards/keebio/bdn9/rev1/info.json rename to keyboards/keebio/bdn9/rev1/keyboard.json index 0167052f6d7..9ab64e25d6f 100644 --- a/keyboards/keebio/bdn9/rev1/info.json +++ b/keyboards/keebio/bdn9/rev1/keyboard.json @@ -38,6 +38,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, "matrix_pins": { "direct": [ ["D2", "D4", "F4"], diff --git a/keyboards/keebio/bdn9/rev1/rules.mk b/keyboards/keebio/bdn9/rev1/rules.mk deleted file mode 100644 index b0fc1d94e5d..00000000000 --- a/keyboards/keebio/bdn9/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/bdn9/rev2/info.json b/keyboards/keebio/bdn9/rev2/keyboard.json similarity index 93% rename from keyboards/keebio/bdn9/rev2/info.json rename to keyboards/keebio/bdn9/rev2/keyboard.json index 74d6dac85be..174c5c826a9 100644 --- a/keyboards/keebio/bdn9/rev2/info.json +++ b/keyboards/keebio/bdn9/rev2/keyboard.json @@ -85,6 +85,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "encoder": true, + "rgb_matrix": true + }, "matrix_pins": { "direct": [ ["B12", "B5", "B6"], diff --git a/keyboards/keebio/bdn9/rev2/rules.mk b/keyboards/keebio/bdn9/rev2/rules.mk deleted file mode 100644 index e4077691471..00000000000 --- a/keyboards/keebio/bdn9/rev2/rules.mk +++ /dev/null @@ -1,15 +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 -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes - diff --git a/keyboards/keebio/dsp40/rev1/info.json b/keyboards/keebio/dsp40/rev1/keyboard.json similarity index 96% rename from keyboards/keebio/dsp40/rev1/info.json rename to keyboards/keebio/dsp40/rev1/keyboard.json index cc8fa692cdf..2011a23b7e5 100644 --- a/keyboards/keebio/dsp40/rev1/info.json +++ b/keyboards/keebio/dsp40/rev1/keyboard.json @@ -48,6 +48,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "backlight": true, + "encoder": true + }, "layout_aliases": { "LAYOUT_40_staggered": "LAYOUT" }, diff --git a/keyboards/keebio/dsp40/rev1/rules.mk b/keyboards/keebio/dsp40/rev1/rules.mk deleted file mode 100644 index 8c70082a374..00000000000 --- a/keyboards/keebio/dsp40/rev1/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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # 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 -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json index cc3fe50636b..891e2ce74bb 100644 --- a/keyboards/keebio/foldkb/rev1/info.json +++ b/keyboards/keebio/foldkb/rev1/info.json @@ -47,6 +47,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/foldkb/rev1/rules.mk b/keyboards/keebio/foldkb/rev1/rules.mk index 32e78815991..e69de29bb2d 100644 --- a/keyboards/keebio/foldkb/rev1/rules.mk +++ b/keyboards/keebio/foldkb/rev1/rules.mk @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/foldkb/rules.mk b/keyboards/keebio/foldkb/rules.mk index b9c01e0aff0..6a0522a902b 100644 --- a/keyboards/keebio/foldkb/rules.mk +++ b/keyboards/keebio/foldkb/rules.mk @@ -1,15 +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 -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 - DEFAULT_FOLDER = keebio/foldkb/rev1 diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/keyboard.json similarity index 94% rename from keyboards/keebio/iris/rev2/info.json rename to keyboards/keebio/iris/rev2/keyboard.json index bbd6f97cf4a..fafa9ba9240 100644 --- a/keyboards/keebio/iris/rev2/info.json +++ b/keyboards/keebio/iris/rev2/keyboard.json @@ -38,6 +38,17 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "backlight": true, + "rgblight": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/iris/rev2/rules.mk b/keyboards/keebio/iris/rev2/rules.mk deleted file mode 100644 index d7e69407a24..00000000000 --- a/keyboards/keebio/iris/rev2/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/keyboard.json similarity index 95% rename from keyboards/keebio/iris/rev3/info.json rename to keyboards/keebio/iris/rev3/keyboard.json index 5014519408f..8ce5ed89794 100644 --- a/keyboards/keebio/iris/rev3/info.json +++ b/keyboards/keebio/iris/rev3/keyboard.json @@ -49,6 +49,17 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/iris/rev3/rules.mk b/keyboards/keebio/iris/rev3/rules.mk deleted file mode 100644 index 6f0bda4dcc0..00000000000 --- a/keyboards/keebio/iris/rev3/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -ENCODER_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/keyboard.json similarity index 95% rename from keyboards/keebio/iris/rev4/info.json rename to keyboards/keebio/iris/rev4/keyboard.json index 6faf28ea447..88856e0030f 100644 --- a/keyboards/keebio/iris/rev4/info.json +++ b/keyboards/keebio/iris/rev4/keyboard.json @@ -62,6 +62,17 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/iris/rev4/rules.mk b/keyboards/keebio/iris/rev4/rules.mk deleted file mode 100644 index 55a08a2117b..00000000000 --- a/keyboards/keebio/iris/rev4/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -ENCODER_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/keyboard.json similarity index 96% rename from keyboards/keebio/iris/rev6/info.json rename to keyboards/keebio/iris/rev6/keyboard.json index 837bb4e0d06..7bbaabe2770 100644 --- a/keyboards/keebio/iris/rev6/info.json +++ b/keyboards/keebio/iris/rev6/keyboard.json @@ -95,6 +95,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "rgb_matrix": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/iris/rev6/rules.mk b/keyboards/keebio/iris/rev6/rules.mk deleted file mode 100644 index 69d1764838d..00000000000 --- a/keyboards/keebio/iris/rev6/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/keyboard.json similarity index 96% rename from keyboards/keebio/iris/rev7/info.json rename to keyboards/keebio/iris/rev7/keyboard.json index a3f25202ce3..decb81a18ed 100644 --- a/keyboards/keebio/iris/rev7/info.json +++ b/keyboards/keebio/iris/rev7/keyboard.json @@ -94,6 +94,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "rgb_matrix": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/iris/rev7/rules.mk b/keyboards/keebio/iris/rev7/rules.mk deleted file mode 100644 index 69d1764838d..00000000000 --- a/keyboards/keebio/iris/rev7/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/keyboard.json similarity index 98% rename from keyboards/keebio/kbo5000/rev1/info.json rename to keyboards/keebio/kbo5000/rev1/keyboard.json index 939a7723485..7733f06efcf 100644 --- a/keyboards/keebio/kbo5000/rev1/info.json +++ b/keyboards/keebio/kbo5000/rev1/keyboard.json @@ -61,6 +61,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/keebio/kbo5000/rev1/rules.mk b/keyboards/keebio/kbo5000/rev1/rules.mk deleted file mode 100644 index 32e78815991..00000000000 --- a/keyboards/keebio/kbo5000/rev1/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/kbo5000/rules.mk b/keyboards/keebio/kbo5000/rules.mk index c6a1e8d0d17..06d2f2f4123 100644 --- a/keyboards/keebio/kbo5000/rules.mk +++ b/keyboards/keebio/kbo5000/rules.mk @@ -1,15 +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 -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -LTO_ENABLE = yes - DEFAULT_FOLDER = keebio/kbo5000/rev1 diff --git a/keyboards/keebio/levinson/rev1/info.json b/keyboards/keebio/levinson/rev1/keyboard.json similarity index 96% rename from keyboards/keebio/levinson/rev1/info.json rename to keyboards/keebio/levinson/rev1/keyboard.json index 0a98e032d46..1ed976b4a9e 100644 --- a/keyboards/keebio/levinson/rev1/info.json +++ b/keyboards/keebio/levinson/rev1/keyboard.json @@ -23,6 +23,12 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "backlight": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/keebio/levinson/rev1/rules.mk b/keyboards/keebio/levinson/rev1/rules.mk deleted file mode 100644 index bd518d8f273..00000000000 --- a/keyboards/keebio/levinson/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = yes diff --git a/keyboards/keebio/levinson/rev2/info.json b/keyboards/keebio/levinson/rev2/keyboard.json similarity index 96% rename from keyboards/keebio/levinson/rev2/info.json rename to keyboards/keebio/levinson/rev2/keyboard.json index 962f555e128..73969388d18 100644 --- a/keyboards/keebio/levinson/rev2/info.json +++ b/keyboards/keebio/levinson/rev2/keyboard.json @@ -23,6 +23,12 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "backlight": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/keebio/levinson/rev2/rules.mk b/keyboards/keebio/levinson/rev2/rules.mk deleted file mode 100644 index bd518d8f273..00000000000 --- a/keyboards/keebio/levinson/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = yes diff --git a/keyboards/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/info.json index cac1c3ac351..5f38fe9874a 100644 --- a/keyboards/keebio/levinson/rev3/info.json +++ b/keyboards/keebio/levinson/rev3/info.json @@ -29,6 +29,12 @@ "ws2812": { "pin": "D7" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "backlight": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/keebio/levinson/rev3/rules.mk b/keyboards/keebio/levinson/rev3/rules.mk index 176c9b97dfb..09057bea54b 100644 --- a/keyboards/keebio/levinson/rev3/rules.mk +++ b/keyboards/keebio/levinson/rev3/rules.mk @@ -1,5 +1,3 @@ -BACKLIGHT_ENABLE = yes - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/keebio/levinson/rules.mk b/keyboards/keebio/levinson/rules.mk index eab321ff014..44cdce9d12d 100644 --- a/keyboards/keebio/levinson/rules.mk +++ b/keyboards/keebio/levinson/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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = keebio/levinson/rev2 diff --git a/keyboards/keebio/quefrency/rev1/info.json b/keyboards/keebio/quefrency/rev1/keyboard.json similarity index 99% rename from keyboards/keebio/quefrency/rev1/info.json rename to keyboards/keebio/quefrency/rev1/keyboard.json index 0bce37ad78b..6bca115e660 100644 --- a/keyboards/keebio/quefrency/rev1/info.json +++ b/keyboards/keebio/quefrency/rev1/keyboard.json @@ -43,6 +43,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/quefrency/rev1/rules.mk b/keyboards/keebio/quefrency/rev1/rules.mk deleted file mode 100644 index b771d431ad5..00000000000 --- a/keyboards/keebio/quefrency/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -MOUSEKEY_ENABLE = yes # Mouse keys diff --git a/keyboards/keebio/quefrency/rev2/info.json b/keyboards/keebio/quefrency/rev2/keyboard.json similarity index 99% rename from keyboards/keebio/quefrency/rev2/info.json rename to keyboards/keebio/quefrency/rev2/keyboard.json index 26df29e3f0d..0529fa13a6a 100644 --- a/keyboards/keebio/quefrency/rev2/info.json +++ b/keyboards/keebio/quefrency/rev2/keyboard.json @@ -59,6 +59,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev2/rules.mk b/keyboards/keebio/quefrency/rev2/rules.mk deleted file mode 100644 index 32e78815991..00000000000 --- a/keyboards/keebio/quefrency/rev2/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/keyboard.json similarity index 99% rename from keyboards/keebio/quefrency/rev3/info.json rename to keyboards/keebio/quefrency/rev3/keyboard.json index dac80973ae9..bd8d86f8849 100644 --- a/keyboards/keebio/quefrency/rev3/info.json +++ b/keyboards/keebio/quefrency/rev3/keyboard.json @@ -59,6 +59,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev3/rules.mk b/keyboards/keebio/quefrency/rev3/rules.mk deleted file mode 100644 index 32e78815991..00000000000 --- a/keyboards/keebio/quefrency/rev3/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/keyboard.json similarity index 99% rename from keyboards/keebio/quefrency/rev4/info.json rename to keyboards/keebio/quefrency/rev4/keyboard.json index 4eb4275f7af..936502fdcfd 100644 --- a/keyboards/keebio/quefrency/rev4/info.json +++ b/keyboards/keebio/quefrency/rev4/keyboard.json @@ -56,6 +56,16 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev4/rules.mk b/keyboards/keebio/quefrency/rev4/rules.mk deleted file mode 100644 index ab97bd78f35..00000000000 --- a/keyboards/keebio/quefrency/rev4/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/quefrency/rev5/info.json b/keyboards/keebio/quefrency/rev5/keyboard.json similarity index 99% rename from keyboards/keebio/quefrency/rev5/info.json rename to keyboards/keebio/quefrency/rev5/keyboard.json index 94d77ec8dd4..e0fd9847720 100644 --- a/keyboards/keebio/quefrency/rev5/info.json +++ b/keyboards/keebio/quefrency/rev5/keyboard.json @@ -56,6 +56,16 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev5/rules.mk b/keyboards/keebio/quefrency/rev5/rules.mk deleted file mode 100644 index ab97bd78f35..00000000000 --- a/keyboards/keebio/quefrency/rev5/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/quefrency/rules.mk b/keyboards/keebio/quefrency/rules.mk index 33c64f3d654..fb40fc8a56f 100644 --- a/keyboards/keebio/quefrency/rules.mk +++ b/keyboards/keebio/quefrency/rules.mk @@ -1,12 +1 @@ -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = keebio/quefrency/rev1 -LTO_ENABLE = yes diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/keyboard.json similarity index 95% rename from keyboards/keebio/rorschach/rev1/info.json rename to keyboards/keebio/rorschach/rev1/keyboard.json index 22a5de3b931..f7ea8fccc22 100644 --- a/keyboards/keebio/rorschach/rev1/info.json +++ b/keyboards/keebio/rorschach/rev1/keyboard.json @@ -43,6 +43,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/rorschach/rev1/rules.mk b/keyboards/keebio/rorschach/rev1/rules.mk deleted file mode 100644 index bd518d8f273..00000000000 --- a/keyboards/keebio/rorschach/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = yes diff --git a/keyboards/keebio/rorschach/rules.mk b/keyboards/keebio/rorschach/rules.mk index 59170f1516a..6cdac68a4e0 100644 --- a/keyboards/keebio/rorschach/rules.mk +++ b/keyboards/keebio/rorschach/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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = keebio/rorschach/rev1 diff --git a/keyboards/keebio/viterbi/rev1/info.json b/keyboards/keebio/viterbi/rev1/keyboard.json similarity index 97% rename from keyboards/keebio/viterbi/rev1/info.json rename to keyboards/keebio/viterbi/rev1/keyboard.json index a003331f25d..ebea5392486 100644 --- a/keyboards/keebio/viterbi/rev1/info.json +++ b/keyboards/keebio/viterbi/rev1/keyboard.json @@ -19,6 +19,11 @@ "rows": ["D4", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_5x14" }, diff --git a/keyboards/keebio/viterbi/rev1/rules.mk b/keyboards/keebio/viterbi/rev1/rules.mk deleted file mode 100644 index 7b30c0beff2..00000000000 --- a/keyboards/keebio/viterbi/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no diff --git a/keyboards/keebio/viterbi/rev2/info.json b/keyboards/keebio/viterbi/rev2/keyboard.json similarity index 96% rename from keyboards/keebio/viterbi/rev2/info.json rename to keyboards/keebio/viterbi/rev2/keyboard.json index 88ab2cd1374..36570e7c7ac 100644 --- a/keyboards/keebio/viterbi/rev2/info.json +++ b/keyboards/keebio/viterbi/rev2/keyboard.json @@ -23,6 +23,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "backlight": true + }, + "build": { + "lto": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_5x14" }, diff --git a/keyboards/keebio/viterbi/rev2/rules.mk b/keyboards/keebio/viterbi/rev2/rules.mk deleted file mode 100644 index 674318183b0..00000000000 --- a/keyboards/keebio/viterbi/rev2/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes - -LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/keebio/viterbi/rules.mk b/keyboards/keebio/viterbi/rules.mk index 5192d5ba728..ecf6a3fa875 100644 --- a/keyboards/keebio/viterbi/rules.mk +++ b/keyboards/keebio/viterbi/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 = 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 -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = keebio/viterbi/rev2 diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/info.json index 3b88fcdd771..7c87bcf4766 100644 --- a/keyboards/keebio/wavelet/info.json +++ b/keyboards/keebio/wavelet/info.json @@ -25,6 +25,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["ortho_4x12"], "layout_aliases": { "LAYOUT_ortho_4x12": "LAYOUT" diff --git a/keyboards/keebio/wavelet/rules.mk b/keyboards/keebio/wavelet/rules.mk index 74f0e0d5666..271780b75ec 100644 --- a/keyboards/keebio/wavelet/rules.mk +++ b/keyboards/keebio/wavelet/rules.mk @@ -1,15 +1,2 @@ -# 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - # Disable unsupported hardware AUDIO_SUPPORTED = no diff --git a/keyboards/keebwerk/mega/ansi/info.json b/keyboards/keebwerk/mega/ansi/info.json index 27ff1b9e8cb..e5a12585df4 100755 --- a/keyboards/keebwerk/mega/ansi/info.json +++ b/keyboards/keebwerk/mega/ansi/info.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/keebwerk/mega/ansi/rules.mk b/keyboards/keebwerk/mega/ansi/rules.mk index 82d4a940ede..ba2c38618a2 100755 --- a/keyboards/keebwerk/mega/ansi/rules.mk +++ b/keyboards/keebwerk/mega/ansi/rules.mk @@ -3,19 +3,6 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 - CIE1931_CURVE = yes # project specific files diff --git a/keyboards/keebwerk/nano_slider/info.json b/keyboards/keebwerk/nano_slider/info.json index fffbd7701bc..cc61c497d73 100644 --- a/keyboards/keebwerk/nano_slider/info.json +++ b/keyboards/keebwerk/nano_slider/info.json @@ -40,6 +40,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "midi": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebwerk/nano_slider/rules.mk b/keyboards/keebwerk/nano_slider/rules.mk index d133bb6d6ea..cc588202788 100644 --- a/keyboards/keebwerk/nano_slider/rules.mk +++ b/keyboards/keebwerk/nano_slider/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -MIDI_ENABLE = yes # MIDI support -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - ANALOG_DRIVER_REQUIRED = yes From 40d0512794651237a182b4f53a2278d0fb2e583e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 22 Apr 2024 02:06:41 +0100 Subject: [PATCH 169/333] Migrate build target markers to keyboard.json - P (#23565) --- .../palette1202/{info.json => keyboard.json} | 10 +++++ keyboards/palette1202/rules.mk | 15 ------- .../atlas/{info.json => keyboard.json} | 13 +++++++ keyboards/pearlboards/atlas/rules.mk | 16 -------- .../pearl/{info.json => keyboard.json} | 12 ++++++ keyboards/pearlboards/pearl/rules.mk | 15 ------- .../zeus/{info.json => keyboard.json} | 13 +++++++ keyboards/pearlboards/zeus/rules.mk | 16 -------- .../ortho/{info.json => keyboard.json} | 6 +++ keyboards/peej/rosaline/ortho/rules.mk | 12 ------ .../staggered/{info.json => keyboard.json} | 6 +++ keyboards/peej/rosaline/staggered/rules.mk | 12 ------ keyboards/peranekofactory/tone/rev1/config.h | 39 ------------------- .../{rev2/info.json => rev1/keyboard.json} | 11 ++++++ keyboards/peranekofactory/tone/rev1/rules.mk | 13 ------- keyboards/peranekofactory/tone/rev2/config.h | 39 ------------------- .../{rev1/info.json => rev2/keyboard.json} | 11 ++++++ keyboards/peranekofactory/tone/rev2/rules.mk | 13 ------- keyboards/percent/canoe_gen2/canoe_gen2.c | 2 + keyboards/percent/canoe_gen2/config.h | 23 ----------- .../canoe_gen2/{info.json => keyboard.json} | 14 +++++++ keyboards/percent/canoe_gen2/rules.mk | 14 ------- .../pila87/{info.json => keyboard.json} | 7 ++++ keyboards/phage_studio/pila87/rules.mk | 16 -------- .../hotswap/{info.json => keyboard.json} | 7 ++++ .../phase_studio/titan65/hotswap/rules.mk | 14 ------- .../soldered/{info.json => keyboard.json} | 6 +++ .../phase_studio/titan65/soldered/rules.mk | 14 ------- .../phoenix/{info.json => keyboard.json} | 11 +++++- keyboards/phoenix/rules.mk | 16 -------- .../pica40/rev2/{info.json => keyboard.json} | 0 keyboards/pierce/{info.json => keyboard.json} | 6 +++ keyboards/pierce/rules.mk | 13 ------- keyboards/pinky/info.json | 6 +++ keyboards/pinky/rules.mk | 13 ------- .../slice65/{info.json => keyboard.json} | 0 .../ez/glow/{info.json => keyboard.json} | 3 ++ keyboards/planck/ez/glow/rules.mk | 1 - keyboards/planck/ez/info.json | 15 ++++++- keyboards/planck/ez/rules.mk | 16 -------- .../rev6_drop/{info.json => keyboard.json} | 12 ++++++ keyboards/planck/rev6_drop/rules.mk | 17 -------- .../planck/rev7/{info.json => keyboard.json} | 1 + keyboards/planck/rev7/rules.mk | 5 --- .../planck/thk/{info.json => keyboard.json} | 8 ++++ keyboards/planck/thk/rules.mk | 15 ------- .../mouse/{info.json => keyboard.json} | 0 .../v4/{info.json => keyboard.json} | 0 .../v5/{info.json => keyboard.json} | 0 .../recore/v3/{info.json => keyboard.json} | 0 .../rev3_drop/{info.json => keyboard.json} | 12 ++++++ keyboards/preonic/rev3_drop/rules.mk | 18 --------- keyboards/primekb/prime_e/config.h | 23 ----------- keyboards/primekb/prime_e/info.json | 6 +++ .../prime_e/rgb/{info.json => keyboard.json} | 3 ++ keyboards/primekb/prime_e/rgb/rules.mk | 2 - .../prime_e/std/{info.json => keyboard.json} | 3 ++ keyboards/primekb/prime_e/std/rules.mk | 2 - keyboards/primekb/prime_l/config.h | 24 ------------ keyboards/primekb/prime_l/info.json | 6 +++ .../prime_l/v1/{info.json => keyboard.json} | 3 ++ keyboards/primekb/prime_l/v1/rules.mk | 1 - .../prime_l/v2/{info.json => keyboard.json} | 0 keyboards/primekb/prime_l/v2/rules.mk | 1 - .../printedpad/{info.json => keyboard.json} | 0 keyboards/program_yoink/config.h | 29 -------------- keyboards/program_yoink/info.json | 16 ++++++++ keyboards/program_yoink/rules.mk | 14 ------- .../alice/rev1/{info.json => keyboard.json} | 10 +++++ keyboards/projectkb/alice/rev1/rules.mk | 13 ------- .../alice/rev2/{info.json => keyboard.json} | 10 +++++ keyboards/projectkb/alice/rev2/rules.mk | 13 ------- .../{info.json => keyboard.json} | 11 ++++-- keyboards/prototypist/oceanographer/rules.mk | 5 --- .../cassini/{info.json => keyboard.json} | 6 +++ keyboards/protozoa/cassini/rules.mk | 13 ------- .../{info.json => keyboard.json} | 0 .../protozoa/p01/{info.json => keyboard.json} | 8 ++++ keyboards/protozoa/p01/rules.mk | 14 ------- keyboards/punk75/{info.json => keyboard.json} | 7 ++++ keyboards/punk75/rules.mk | 14 ------- 81 files changed, 276 insertions(+), 558 deletions(-) rename keyboards/palette1202/{info.json => keyboard.json} (87%) rename keyboards/pearlboards/atlas/{info.json => keyboard.json} (98%) rename keyboards/pearlboards/pearl/{info.json => keyboard.json} (96%) rename keyboards/pearlboards/zeus/{info.json => keyboard.json} (99%) rename keyboards/peej/rosaline/ortho/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/peej/rosaline/ortho/rules.mk rename keyboards/peej/rosaline/staggered/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/peej/rosaline/staggered/rules.mk delete mode 100644 keyboards/peranekofactory/tone/rev1/config.h rename keyboards/peranekofactory/tone/{rev2/info.json => rev1/keyboard.json} (82%) delete mode 100644 keyboards/peranekofactory/tone/rev1/rules.mk delete mode 100644 keyboards/peranekofactory/tone/rev2/config.h rename keyboards/peranekofactory/tone/{rev1/info.json => rev2/keyboard.json} (82%) delete mode 100644 keyboards/peranekofactory/tone/rev2/rules.mk delete mode 100644 keyboards/percent/canoe_gen2/config.h rename keyboards/percent/canoe_gen2/{info.json => keyboard.json} (97%) rename keyboards/phage_studio/pila87/{info.json => keyboard.json} (98%) rename keyboards/phase_studio/titan65/hotswap/{info.json => keyboard.json} (96%) rename keyboards/phase_studio/titan65/soldered/{info.json => keyboard.json} (99%) rename keyboards/phoenix/{info.json => keyboard.json} (97%) rename keyboards/pica40/rev2/{info.json => keyboard.json} (100%) rename keyboards/pierce/{info.json => keyboard.json} (95%) rename keyboards/pizzakeyboards/slice65/{info.json => keyboard.json} (100%) rename keyboards/planck/ez/glow/{info.json => keyboard.json} (62%) delete mode 100644 keyboards/planck/ez/glow/rules.mk rename keyboards/planck/rev6_drop/{info.json => keyboard.json} (98%) rename keyboards/planck/rev7/{info.json => keyboard.json} (99%) rename keyboards/planck/thk/{info.json => keyboard.json} (97%) rename keyboards/ploopyco/mouse/{info.json => keyboard.json} (100%) rename keyboards/pmk/posey_split/v4/{info.json => keyboard.json} (100%) rename keyboards/pmk/posey_split/v5/{info.json => keyboard.json} (100%) rename keyboards/pmk/recore/v3/{info.json => keyboard.json} (100%) rename keyboards/preonic/rev3_drop/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/primekb/prime_e/config.h rename keyboards/primekb/prime_e/rgb/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/primekb/prime_e/rgb/rules.mk rename keyboards/primekb/prime_e/std/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/primekb/prime_e/std/rules.mk delete mode 100644 keyboards/primekb/prime_l/config.h rename keyboards/primekb/prime_l/v1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/primekb/prime_l/v1/rules.mk rename keyboards/primekb/prime_l/v2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/primekb/prime_l/v2/rules.mk rename keyboards/printedpad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/program_yoink/config.h create mode 100644 keyboards/program_yoink/info.json rename keyboards/projectkb/alice/rev1/{info.json => keyboard.json} (75%) delete mode 100644 keyboards/projectkb/alice/rev1/rules.mk rename keyboards/projectkb/alice/rev2/{info.json => keyboard.json} (75%) delete mode 100644 keyboards/projectkb/alice/rev2/rules.mk rename keyboards/prototypist/oceanographer/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/prototypist/oceanographer/rules.mk rename keyboards/protozoa/cassini/{info.json => keyboard.json} (99%) rename keyboards/protozoa/event_horizon/{info.json => keyboard.json} (100%) rename keyboards/protozoa/p01/{info.json => keyboard.json} (99%) rename keyboards/punk75/{info.json => keyboard.json} (96%) diff --git a/keyboards/palette1202/info.json b/keyboards/palette1202/keyboard.json similarity index 87% rename from keyboards/palette1202/info.json rename to keyboards/palette1202/keyboard.json index 99f43a73f2b..db2a83573ac 100644 --- a/keyboards/palette1202/info.json +++ b/keyboards/palette1202/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x1202", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5"], "rows": ["B6", "B2", "B3"] diff --git a/keyboards/palette1202/rules.mk b/keyboards/palette1202/rules.mk index 8876586f4ba..37d8ebf017e 100644 --- a/keyboards/palette1202/rules.mk +++ b/keyboards/palette1202/rules.mk @@ -1,17 +1,2 @@ -# 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 -ENCODER_ENABLE = yes # Enable support for rotary encoders -OLED_ENABLE = yes - # Additional code SRC += lib/oled_helper.c # Adding OLED diff --git a/keyboards/pearlboards/atlas/info.json b/keyboards/pearlboards/atlas/keyboard.json similarity index 98% rename from keyboards/pearlboards/atlas/info.json rename to keyboards/pearlboards/atlas/keyboard.json index 5433eb3c75f..173a20892b5 100644 --- a/keyboards/pearlboards/atlas/info.json +++ b/keyboards/pearlboards/atlas/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x6964", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "bootmagic": false, + "encoder": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D5", "D4", "C1", "C2", "C3", "C5", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7"], "rows": ["D6", "E1", "C0", "C4", "E3"] diff --git a/keyboards/pearlboards/atlas/rules.mk b/keyboards/pearlboards/atlas/rules.mk index 1dd174f4366..dea510c2ab3 100644 --- a/keyboards/pearlboards/atlas/rules.mk +++ b/keyboards/pearlboards/atlas/rules.mk @@ -1,17 +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 = 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 = yes # Audio output -ENCODER_ENABLE = yes -HAPTIC_ENABLE = yes HAPTIC_DRIVER = drv2605l - -LTO_ENABLE = yes diff --git a/keyboards/pearlboards/pearl/info.json b/keyboards/pearlboards/pearl/keyboard.json similarity index 96% rename from keyboards/pearlboards/pearl/info.json rename to keyboards/pearlboards/pearl/keyboard.json index 43dd3ad871d..e2dddb86620 100644 --- a/keyboards/pearlboards/pearl/info.json +++ b/keyboards/pearlboards/pearl/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x6965", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "bootmagic": false, + "extrakey": true, + "haptic": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D2", "F1", "F4", "F5", "F6", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], "rows": ["D3", "F7", "F0", "E6"] diff --git a/keyboards/pearlboards/pearl/rules.mk b/keyboards/pearlboards/pearl/rules.mk index 83d6c3a33f5..dea510c2ab3 100644 --- a/keyboards/pearlboards/pearl/rules.mk +++ b/keyboards/pearlboards/pearl/rules.mk @@ -1,16 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output -HAPTIC_ENABLE = yes HAPTIC_DRIVER = drv2605l - -LTO_ENABLE = yes diff --git a/keyboards/pearlboards/zeus/info.json b/keyboards/pearlboards/zeus/keyboard.json similarity index 99% rename from keyboards/pearlboards/zeus/info.json rename to keyboards/pearlboards/zeus/keyboard.json index 3128b8c1d85..c77adfb5cf9 100644 --- a/keyboards/pearlboards/zeus/info.json +++ b/keyboards/pearlboards/zeus/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x6966", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "bootmagic": false, + "encoder": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C2", "C0"], "rows": ["F0", "C1", "E1", "E0", "D7", "D6"] diff --git a/keyboards/pearlboards/zeus/rules.mk b/keyboards/pearlboards/zeus/rules.mk index 5cb2d9b6493..34900998f76 100644 --- a/keyboards/pearlboards/zeus/rules.mk +++ b/keyboards/pearlboards/zeus/rules.mk @@ -1,17 +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 = 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 = yes # Audio output -ENCODER_ENABLE = yes # Rotary encoder -HAPTIC_ENABLE = yes # Rumble feefback HAPTIC_DRIVER = drv2605l # Rumble motor - -LTO_ENABLE = yes # Link time optimization diff --git a/keyboards/peej/rosaline/ortho/info.json b/keyboards/peej/rosaline/ortho/keyboard.json similarity index 96% rename from keyboards/peej/rosaline/ortho/info.json rename to keyboards/peej/rosaline/ortho/keyboard.json index 9fb9d3cb40d..49c3b9fb921 100644 --- a/keyboards/peej/rosaline/ortho/info.json +++ b/keyboards/peej/rosaline/ortho/keyboard.json @@ -9,6 +9,12 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"], "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"] diff --git a/keyboards/peej/rosaline/ortho/rules.mk b/keyboards/peej/rosaline/ortho/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/peej/rosaline/ortho/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 = 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/peej/rosaline/staggered/info.json b/keyboards/peej/rosaline/staggered/keyboard.json similarity index 98% rename from keyboards/peej/rosaline/staggered/info.json rename to keyboards/peej/rosaline/staggered/keyboard.json index 06792031632..ed4de2313f8 100644 --- a/keyboards/peej/rosaline/staggered/info.json +++ b/keyboards/peej/rosaline/staggered/keyboard.json @@ -9,6 +9,12 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"], "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"] diff --git a/keyboards/peej/rosaline/staggered/rules.mk b/keyboards/peej/rosaline/staggered/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/peej/rosaline/staggered/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 = 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/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h deleted file mode 100644 index bbe3b73627f..00000000000 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 peraneko - -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/peranekofactory/tone/rev2/info.json b/keyboards/peranekofactory/tone/rev1/keyboard.json similarity index 82% rename from keyboards/peranekofactory/tone/rev2/info.json rename to keyboards/peranekofactory/tone/rev1/keyboard.json index 67e08be6885..fb7b41b27a2 100644 --- a/keyboards/peranekofactory/tone/rev2/info.json +++ b/keyboards/peranekofactory/tone/rev1/keyboard.json @@ -8,12 +8,23 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B4"} ] }, "qmk": { + "locking": { + "enabled": true, + "resync": true + }, "tap_keycode_delay": 100 }, "processor": "atmega32u4", diff --git a/keyboards/peranekofactory/tone/rev1/rules.mk b/keyboards/peranekofactory/tone/rev1/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/peranekofactory/tone/rev1/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h deleted file mode 100644 index bbe3b73627f..00000000000 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 peraneko - -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/peranekofactory/tone/rev1/info.json b/keyboards/peranekofactory/tone/rev2/keyboard.json similarity index 82% rename from keyboards/peranekofactory/tone/rev1/info.json rename to keyboards/peranekofactory/tone/rev2/keyboard.json index 67e08be6885..fb7b41b27a2 100644 --- a/keyboards/peranekofactory/tone/rev1/info.json +++ b/keyboards/peranekofactory/tone/rev2/keyboard.json @@ -8,12 +8,23 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B4"} ] }, "qmk": { + "locking": { + "enabled": true, + "resync": true + }, "tap_keycode_delay": 100 }, "processor": "atmega32u4", diff --git a/keyboards/peranekofactory/tone/rev2/rules.mk b/keyboards/peranekofactory/tone/rev2/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/peranekofactory/tone/rev2/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/percent/canoe_gen2/canoe_gen2.c b/keyboards/percent/canoe_gen2/canoe_gen2.c index e5beff54a30..d174d01876c 100644 --- a/keyboards/percent/canoe_gen2/canoe_gen2.c +++ b/keyboards/percent/canoe_gen2/canoe_gen2.c @@ -20,6 +20,8 @@ along with this program. If not, see . void keyboard_pre_init_kb(void) { setPinOutput(E6); writePinHigh(E6); + + keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { diff --git a/keyboards/percent/canoe_gen2/config.h b/keyboards/percent/canoe_gen2/config.h deleted file mode 100644 index 1f54b79bd00..00000000000 --- a/keyboards/percent/canoe_gen2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 Evy Dekkers - -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 diff --git a/keyboards/percent/canoe_gen2/info.json b/keyboards/percent/canoe_gen2/keyboard.json similarity index 97% rename from keyboards/percent/canoe_gen2/info.json rename to keyboards/percent/canoe_gen2/keyboard.json index 0fe5d0e894d..0b6ece2613c 100644 --- a/keyboards/percent/canoe_gen2/info.json +++ b/keyboards/percent/canoe_gen2/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x89F0", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgb_matrix": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "B7" }, diff --git a/keyboards/percent/canoe_gen2/rules.mk b/keyboards/percent/canoe_gen2/rules.mk index d399c10822b..942ef4c5dbd 100644 --- a/keyboards/percent/canoe_gen2/rules.mk +++ b/keyboards/percent/canoe_gen2/rules.mk @@ -1,15 +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 = 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 -RGB_MATRIX_ENABLE = yes - RGB_MATRIX_CUSTOM_KB = yes diff --git a/keyboards/phage_studio/pila87/info.json b/keyboards/phage_studio/pila87/keyboard.json similarity index 98% rename from keyboards/phage_studio/pila87/info.json rename to keyboards/phage_studio/pila87/keyboard.json index 4d12cf2573d..fbdf5f637a3 100644 --- a/keyboards/phage_studio/pila87/info.json +++ b/keyboards/phage_studio/pila87/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x5887", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/phage_studio/pila87/rules.mk b/keyboards/phage_studio/pila87/rules.mk index 25fb7ed8c08..6f0a3736a73 100644 --- a/keyboards/phage_studio/pila87/rules.mk +++ b/keyboards/phage_studio/pila87/rules.mk @@ -1,18 +1,2 @@ # Configure for 128K flash MCU_LDSCRIPT = STM32F103xB - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# RGB Matrix enabled -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/phase_studio/titan65/hotswap/info.json b/keyboards/phase_studio/titan65/hotswap/keyboard.json similarity index 96% rename from keyboards/phase_studio/titan65/hotswap/info.json rename to keyboards/phase_studio/titan65/hotswap/keyboard.json index 2c1f3e2854c..8bf3152b903 100644 --- a/keyboards/phase_studio/titan65/hotswap/info.json +++ b/keyboards/phase_studio/titan65/hotswap/keyboard.json @@ -8,6 +8,13 @@ "pid": "0xBB91", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "ws2812": { "pin": "E6" }, diff --git a/keyboards/phase_studio/titan65/hotswap/rules.mk b/keyboards/phase_studio/titan65/hotswap/rules.mk index 871008928ea..5813081a716 100644 --- a/keyboards/phase_studio/titan65/hotswap/rules.mk +++ b/keyboards/phase_studio/titan65/hotswap/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 = 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 = yes - AUDIO_SUPPORTED = no RGBLIGHT_SUPPORTED = no diff --git a/keyboards/phase_studio/titan65/soldered/info.json b/keyboards/phase_studio/titan65/soldered/keyboard.json similarity index 99% rename from keyboards/phase_studio/titan65/soldered/info.json rename to keyboards/phase_studio/titan65/soldered/keyboard.json index ad1b8c07b5e..c60c689932d 100644 --- a/keyboards/phase_studio/titan65/soldered/info.json +++ b/keyboards/phase_studio/titan65/soldered/keyboard.json @@ -8,6 +8,12 @@ "pid": "0xBB92", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3"], "rows": ["B6", "C6", "C7", "F7", "E6"] diff --git a/keyboards/phase_studio/titan65/soldered/rules.mk b/keyboards/phase_studio/titan65/soldered/rules.mk index ad3fad5cb59..52030059798 100644 --- a/keyboards/phase_studio/titan65/soldered/rules.mk +++ b/keyboards/phase_studio/titan65/soldered/rules.mk @@ -1,17 +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 - - AUDIO_SUPPORTED = no RGBLIGHT_SUPPORTED = no RGB_MATRIX_SUPPORTED = no diff --git a/keyboards/phoenix/info.json b/keyboards/phoenix/keyboard.json similarity index 97% rename from keyboards/phoenix/info.json rename to keyboards/phoenix/keyboard.json index c6a55a973af..b6dd3599662 100644 --- a/keyboards/phoenix/info.json +++ b/keyboards/phoenix/keyboard.json @@ -6,7 +6,16 @@ "usb": { "vid": "0x456B", "pid": "0x0001", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true }, "matrix_pins": { "cols": ["B10", "B12", "B13", "B14", "B15", "A8", "A10"], diff --git a/keyboards/phoenix/rules.mk b/keyboards/phoenix/rules.mk index 1e98eb214a5..c6e29883213 100644 --- a/keyboards/phoenix/rules.mk +++ b/keyboards/phoenix/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -STENO_ENABLE = no SERIAL_DRIVER = usart -KEYBOARD_SHARED_EP = yes - -OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE diff --git a/keyboards/pica40/rev2/info.json b/keyboards/pica40/rev2/keyboard.json similarity index 100% rename from keyboards/pica40/rev2/info.json rename to keyboards/pica40/rev2/keyboard.json diff --git a/keyboards/pierce/info.json b/keyboards/pierce/keyboard.json similarity index 95% rename from keyboards/pierce/info.json rename to keyboards/pierce/keyboard.json index 971b9939cf7..ca6bb484251 100644 --- a/keyboards/pierce/info.json +++ b/keyboards/pierce/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["split_3x5_3"], diff --git a/keyboards/pierce/rules.mk b/keyboards/pierce/rules.mk index 660bba3c3fd..721c8fd9036 100644 --- a/keyboards/pierce/rules.mk +++ b/keyboards/pierce/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 - CUSTOM_MATRIX = lite SRC += matrix.c QUANTUM_LIB_SRC += i2c_slave.c diff --git a/keyboards/pinky/info.json b/keyboards/pinky/info.json index 2b9790e84e6..7fb7f9efe6c 100644 --- a/keyboards/pinky/info.json +++ b/keyboards/pinky/info.json @@ -1,4 +1,10 @@ { + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "split": { "enabled": true } diff --git a/keyboards/pinky/rules.mk b/keyboards/pinky/rules.mk index 0329fc8dd57..89b708f68f7 100644 --- a/keyboards/pinky/rules.mk +++ b/keyboards/pinky/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 = no # Audio output - DEFAULT_FOLDER = pinky/3 diff --git a/keyboards/pizzakeyboards/slice65/info.json b/keyboards/pizzakeyboards/slice65/keyboard.json similarity index 100% rename from keyboards/pizzakeyboards/slice65/info.json rename to keyboards/pizzakeyboards/slice65/keyboard.json diff --git a/keyboards/planck/ez/glow/info.json b/keyboards/planck/ez/glow/keyboard.json similarity index 62% rename from keyboards/planck/ez/glow/info.json rename to keyboards/planck/ez/glow/keyboard.json index 48522585709..6c957b165b0 100644 --- a/keyboards/planck/ez/glow/info.json +++ b/keyboards/planck/ez/glow/keyboard.json @@ -2,5 +2,8 @@ "keyboard_name": "Planck EZ Glow", "usb": { "pid": "0xC6CF" + }, + "features": { + "rgb_matrix": true } } diff --git a/keyboards/planck/ez/glow/rules.mk b/keyboards/planck/ez/glow/rules.mk deleted file mode 100644 index aad92997d0f..00000000000 --- a/keyboards/planck/ez/glow/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json index 044e187c4bc..4244b4d83d8 100644 --- a/keyboards/planck/ez/info.json +++ b/keyboards/planck/ez/info.json @@ -4,7 +4,20 @@ "maintainer": "jackhumbert", "usb": { "vid": "0x3297", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "mouse": false + } + }, + "features": { + "audio": true, + "bootmagic": true, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true }, "rgb_matrix": { "animations": { diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk index 97f68215f81..6cdb6ed4c29 100644 --- a/keyboards/planck/ez/rules.mk +++ b/keyboards/planck/ez/rules.mk @@ -1,22 +1,6 @@ -# 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 -AUDIO_ENABLE = yes # Audio output AUDIO_DRIVER = dac_additive -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -ENCODER_ENABLE = yes RGBLIGHT_SUPPORTED = no BAKCLIGHT_SUPPORTED = no -MOUSE_SHARED_EP = no - DEFAULT_FOLDER = planck/ez/base diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/keyboard.json similarity index 98% rename from keyboards/planck/rev6_drop/info.json rename to keyboards/planck/rev6_drop/keyboard.json index aff2eef5d72..ff301f8c860 100644 --- a/keyboards/planck/rev6_drop/info.json +++ b/keyboards/planck/rev6_drop/keyboard.json @@ -8,6 +8,18 @@ "pid": "0xA4F9", "device_version": "0.0.6" }, + "features": { + "audio": true, + "bootmagic": true, + "command": true, + "console": true, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "led_count": 9 }, diff --git a/keyboards/planck/rev6_drop/rules.mk b/keyboards/planck/rev6_drop/rules.mk index 022a5ccd537..30ce5d293b7 100644 --- a/keyboards/planck/rev6_drop/rules.mk +++ b/keyboards/planck/rev6_drop/rules.mk @@ -1,19 +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 = yes # Audio output CUSTOM_MATRIX = lite -# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE -RGB_MATRIX_ENABLE = no -ENCODER_ENABLE = yes -DIP_SWITCH_ENABLE = yes - SRC += matrix.c diff --git a/keyboards/planck/rev7/info.json b/keyboards/planck/rev7/keyboard.json similarity index 99% rename from keyboards/planck/rev7/info.json rename to keyboards/planck/rev7/keyboard.json index d674af98d17..691394d5d57 100644 --- a/keyboards/planck/rev7/info.json +++ b/keyboards/planck/rev7/keyboard.json @@ -42,6 +42,7 @@ "command": true, "console": true, "encoder": true, + "dip_switch": true, "extrakey": true, "mousekey": true, "nkro": true, diff --git a/keyboards/planck/rev7/rules.mk b/keyboards/planck/rev7/rules.mk index 04b21019aed..30ce5d293b7 100644 --- a/keyboards/planck/rev7/rules.mk +++ b/keyboards/planck/rev7/rules.mk @@ -1,7 +1,2 @@ -# Build Options -# change yes to no to disable -# CUSTOM_MATRIX = lite -DIP_SWITCH_ENABLE = yes - SRC += matrix.c diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/keyboard.json similarity index 97% rename from keyboards/planck/thk/info.json rename to keyboards/planck/thk/keyboard.json index 24b8d5f0a5b..b2c07ca0f0c 100644 --- a/keyboards/planck/thk/info.json +++ b/keyboards/planck/thk/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x25A7", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D7", "C2", "C3", "C4", "C5", "C6", "C7", "A3", "A2", "A1", "A0", "B0"], "rows": ["A7", "A6", "A5", "A4"] diff --git a/keyboards/planck/thk/rules.mk b/keyboards/planck/thk/rules.mk index 417fb95129a..c2ee0bc86f9 100644 --- a/keyboards/planck/thk/rules.mk +++ b/keyboards/planck/thk/rules.mk @@ -1,17 +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 -ENCODER_ENABLE = yes -DIP_SWITCH_ENABLE = yes diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/keyboard.json similarity index 100% rename from keyboards/ploopyco/mouse/info.json rename to keyboards/ploopyco/mouse/keyboard.json diff --git a/keyboards/pmk/posey_split/v4/info.json b/keyboards/pmk/posey_split/v4/keyboard.json similarity index 100% rename from keyboards/pmk/posey_split/v4/info.json rename to keyboards/pmk/posey_split/v4/keyboard.json diff --git a/keyboards/pmk/posey_split/v5/info.json b/keyboards/pmk/posey_split/v5/keyboard.json similarity index 100% rename from keyboards/pmk/posey_split/v5/info.json rename to keyboards/pmk/posey_split/v5/keyboard.json diff --git a/keyboards/pmk/recore/v3/info.json b/keyboards/pmk/recore/v3/keyboard.json similarity index 100% rename from keyboards/pmk/recore/v3/info.json rename to keyboards/pmk/recore/v3/keyboard.json diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/keyboard.json similarity index 98% rename from keyboards/preonic/rev3_drop/info.json rename to keyboards/preonic/rev3_drop/keyboard.json index 79487deaab7..f1cf1dfec1f 100644 --- a/keyboards/preonic/rev3_drop/info.json +++ b/keyboards/preonic/rev3_drop/keyboard.json @@ -6,6 +6,18 @@ "pid": "0xA649", "device_version": "0.0.3" }, + "features": { + "audio": true, + "bootmagic": true, + "command": true, + "console": true, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "led_count": 9, "animations": { diff --git a/keyboards/preonic/rev3_drop/rules.mk b/keyboards/preonic/rev3_drop/rules.mk index d3ff068813a..8784813b335 100644 --- a/keyboards/preonic/rev3_drop/rules.mk +++ b/keyboards/preonic/rev3_drop/rules.mk @@ -1,20 +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 = yes # Audio output CUSTOM_MATRIX = yes -ENCODER_ENABLE = yes -DIP_SWITCH_ENABLE = yes - -# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE -RGB_MATRIX_ENABLE = no - SRC += matrix.c diff --git a/keyboards/primekb/prime_e/config.h b/keyboards/primekb/prime_e/config.h deleted file mode 100644 index 6c8ce4c0eaf..00000000000 --- a/keyboards/primekb/prime_e/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Holten Campbell - -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 diff --git a/keyboards/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json index 44b8227fb64..e7ed77e403a 100644 --- a/keyboards/primekb/prime_e/info.json +++ b/keyboards/primekb/prime_e/info.json @@ -13,6 +13,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "C7", "B5", "B4"] diff --git a/keyboards/primekb/prime_e/rgb/info.json b/keyboards/primekb/prime_e/rgb/keyboard.json similarity index 91% rename from keyboards/primekb/prime_e/rgb/info.json rename to keyboards/primekb/prime_e/rgb/keyboard.json index 998331ad897..f1cb67358cb 100644 --- a/keyboards/primekb/prime_e/rgb/info.json +++ b/keyboards/primekb/prime_e/rgb/keyboard.json @@ -4,6 +4,9 @@ "pid": "0x0052", "device_version": "0.0.1" }, + "features": { + "rgblight": true + }, "rgblight": { "led_count": 8, "animations": { diff --git a/keyboards/primekb/prime_e/rgb/rules.mk b/keyboards/primekb/prime_e/rgb/rules.mk deleted file mode 100644 index 725c0cebcc5..00000000000 --- a/keyboards/primekb/prime_e/rgb/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = yes diff --git a/keyboards/primekb/prime_e/std/info.json b/keyboards/primekb/prime_e/std/keyboard.json similarity index 78% rename from keyboards/primekb/prime_e/std/info.json rename to keyboards/primekb/prime_e/std/keyboard.json index b6078c9d7a2..989ff941b5f 100644 --- a/keyboards/primekb/prime_e/std/info.json +++ b/keyboards/primekb/prime_e/std/keyboard.json @@ -4,6 +4,9 @@ "pid": "0x0051", "device_version": "0.0.1" }, + "features": { + "backlight": true + }, "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/primekb/prime_e/std/rules.mk b/keyboards/primekb/prime_e/std/rules.mk deleted file mode 100644 index f938676f448..00000000000 --- a/keyboards/primekb/prime_e/std/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = no diff --git a/keyboards/primekb/prime_l/config.h b/keyboards/primekb/prime_l/config.h deleted file mode 100644 index 053bc6236a7..00000000000 --- a/keyboards/primekb/prime_l/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2018 Jumail Mundekkat -Copyright 2020 Holten Campbell - -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 diff --git a/keyboards/primekb/prime_l/info.json b/keyboards/primekb/prime_l/info.json index 52d67139142..ed905f2b0b8 100644 --- a/keyboards/primekb/prime_l/info.json +++ b/keyboards/primekb/prime_l/info.json @@ -10,6 +10,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "usb": { "vid": "0x5052" }, diff --git a/keyboards/primekb/prime_l/v1/info.json b/keyboards/primekb/prime_l/v1/keyboard.json similarity index 99% rename from keyboards/primekb/prime_l/v1/info.json rename to keyboards/primekb/prime_l/v1/keyboard.json index c68d9929433..c14d18ece3e 100644 --- a/keyboards/primekb/prime_l/v1/info.json +++ b/keyboards/primekb/prime_l/v1/keyboard.json @@ -6,6 +6,9 @@ "pid": "0x504C", "device_version": "0.0.1" }, + "features": { + "backlight": true + }, "matrix_pins": { "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "C7", "C6", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D1", "D0", "B7", "B3", "B2"] diff --git a/keyboards/primekb/prime_l/v1/rules.mk b/keyboards/primekb/prime_l/v1/rules.mk deleted file mode 100644 index 54a2685bf63..00000000000 --- a/keyboards/primekb/prime_l/v1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = yes \ No newline at end of file diff --git a/keyboards/primekb/prime_l/v2/info.json b/keyboards/primekb/prime_l/v2/keyboard.json similarity index 100% rename from keyboards/primekb/prime_l/v2/info.json rename to keyboards/primekb/prime_l/v2/keyboard.json diff --git a/keyboards/primekb/prime_l/v2/rules.mk b/keyboards/primekb/prime_l/v2/rules.mk deleted file mode 100644 index f845616741c..00000000000 --- a/keyboards/primekb/prime_l/v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no \ No newline at end of file diff --git a/keyboards/printedpad/info.json b/keyboards/printedpad/keyboard.json similarity index 100% rename from keyboards/printedpad/info.json rename to keyboards/printedpad/keyboard.json diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h deleted file mode 100644 index dcf558fdf78..00000000000 --- a/keyboards/program_yoink/config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright 2020 melonbred - -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 - - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/program_yoink/info.json b/keyboards/program_yoink/info.json new file mode 100644 index 00000000000..36a2befc701 --- /dev/null +++ b/keyboards/program_yoink/info.json @@ -0,0 +1,16 @@ +{ + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + } +} \ No newline at end of file diff --git a/keyboards/program_yoink/rules.mk b/keyboards/program_yoink/rules.mk index 1d2265b8337..a7cc1a2dbf2 100644 --- a/keyboards/program_yoink/rules.mk +++ b/keyboards/program_yoink/rules.mk @@ -1,15 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable rotary encoder - DEFAULT_FOLDER = program_yoink/staggered diff --git a/keyboards/projectkb/alice/rev1/info.json b/keyboards/projectkb/alice/rev1/keyboard.json similarity index 75% rename from keyboards/projectkb/alice/rev1/info.json rename to keyboards/projectkb/alice/rev1/keyboard.json index 1157fb13ae2..1e97746ee88 100644 --- a/keyboards/projectkb/alice/rev1/info.json +++ b/keyboards/projectkb/alice/rev1/keyboard.json @@ -1,4 +1,14 @@ { + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "led_count": 14, "animations": { diff --git a/keyboards/projectkb/alice/rev1/rules.mk b/keyboards/projectkb/alice/rev1/rules.mk deleted file mode 100644 index f689205b388..00000000000 --- a/keyboards/projectkb/alice/rev1/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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/projectkb/alice/rev2/info.json b/keyboards/projectkb/alice/rev2/keyboard.json similarity index 75% rename from keyboards/projectkb/alice/rev2/info.json rename to keyboards/projectkb/alice/rev2/keyboard.json index be97136ccd2..0ed3b88ea2a 100644 --- a/keyboards/projectkb/alice/rev2/info.json +++ b/keyboards/projectkb/alice/rev2/keyboard.json @@ -1,4 +1,14 @@ { + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "led_count": 14, "animations": { diff --git a/keyboards/projectkb/alice/rev2/rules.mk b/keyboards/projectkb/alice/rev2/rules.mk deleted file mode 100644 index f689205b388..00000000000 --- a/keyboards/projectkb/alice/rev2/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 -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/prototypist/oceanographer/info.json b/keyboards/prototypist/oceanographer/keyboard.json similarity index 98% rename from keyboards/prototypist/oceanographer/info.json rename to keyboards/prototypist/oceanographer/keyboard.json index d7117d6abc3..8b0209d451f 100644 --- a/keyboards/prototypist/oceanographer/info.json +++ b/keyboards/prototypist/oceanographer/keyboard.json @@ -4,13 +4,18 @@ "maintainer": "Anjheos", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", + "build": { + "lto": true + }, "features": { + "audio": true, "bootmagic": true, - "command": false, - "console": false, + "encoder": true, "extrakey": true, "mousekey": false, - "nkro": true + "nkro": true, + "oled": true, + "rgblight": true }, "encoder": { "rotary": [ diff --git a/keyboards/prototypist/oceanographer/rules.mk b/keyboards/prototypist/oceanographer/rules.mk deleted file mode 100644 index e18a6cecee5..00000000000 --- a/keyboards/prototypist/oceanographer/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -OLED_ENABLE = yes -AUDIO_ENABLE = yes -LTO_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/protozoa/cassini/info.json b/keyboards/protozoa/cassini/keyboard.json similarity index 99% rename from keyboards/protozoa/cassini/info.json rename to keyboards/protozoa/cassini/keyboard.json index 079679be437..696480024fe 100644 --- a/keyboards/protozoa/cassini/info.json +++ b/keyboards/protozoa/cassini/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x4341", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"], "rows": ["A2", "B9", "B8", "B5", "B4"] diff --git a/keyboards/protozoa/cassini/rules.mk b/keyboards/protozoa/cassini/rules.mk index 7c0709f41e6..0ab54aaaf71 100644 --- a/keyboards/protozoa/cassini/rules.mk +++ b/keyboards/protozoa/cassini/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 diff --git a/keyboards/protozoa/event_horizon/info.json b/keyboards/protozoa/event_horizon/keyboard.json similarity index 100% rename from keyboards/protozoa/event_horizon/info.json rename to keyboards/protozoa/event_horizon/keyboard.json diff --git a/keyboards/protozoa/p01/info.json b/keyboards/protozoa/p01/keyboard.json similarity index 99% rename from keyboards/protozoa/p01/info.json rename to keyboards/protozoa/p01/keyboard.json index f414d6d71ad..4b453855525 100644 --- a/keyboards/protozoa/p01/info.json +++ b/keyboards/protozoa/p01/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x5031", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/protozoa/p01/rules.mk b/keyboards/protozoa/p01/rules.mk index adb0000e016..0ab54aaaf71 100644 --- a/keyboards/protozoa/p01/rules.mk +++ b/keyboards/protozoa/p01/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Encoder support diff --git a/keyboards/punk75/info.json b/keyboards/punk75/keyboard.json similarity index 96% rename from keyboards/punk75/info.json rename to keyboards/punk75/keyboard.json index 81f2bcc8183..5c1bd94a5ed 100644 --- a/keyboards/punk75/info.json +++ b/keyboards/punk75/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["C2", "C3", "C6", "C5", "C4", "A7", "A6", "A5", "A4", "B4", "A3", "B3", "A2", "B2", "A1"], "rows": ["D6", "D5", "C1", "C0", "D7"] diff --git a/keyboards/punk75/rules.mk b/keyboards/punk75/rules.mk index 362b5c8e08d..c2ee0bc86f9 100644 --- a/keyboards/punk75/rules.mk +++ b/keyboards/punk75/rules.mk @@ -1,16 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable rotary encoders support From ac2424fec687ee1ffde580a58c031fe7ad9d302b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 02:09:11 +0100 Subject: [PATCH 170/333] Bump JamesIves/github-pages-deploy-action from 4.5.0 to 4.6.0 (#23548) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fc0ed11c43f..3f7fbbe7aff 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -37,7 +37,7 @@ jobs: qmk --verbose generate-docs - name: Deploy - uses: JamesIves/github-pages-deploy-action@v4.5.0 + uses: JamesIves/github-pages-deploy-action@v4.6.0 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BASE_BRANCH: master From f387410c97c60132843e44025eccd4de4967ad39 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 22 Apr 2024 03:13:45 -0700 Subject: [PATCH 171/333] Data-Driven Keyboard Conversions: L (#23576) --- keyboards/latincompass/latin47ble/info.json | 7 +++++++ keyboards/latincompass/latin47ble/rules.mk | 14 -------------- keyboards/latincompass/latin64ble/info.json | 7 +++++++ keyboards/latincompass/latin64ble/rules.mk | 14 -------------- .../latin6rgb/{info.json => keyboard.json} | 6 ++++++ keyboards/latincompass/latin6rgb/rules.mk | 15 --------------- keyboards/lets_split/info.json | 3 --- keyboards/lets_split/rev1/keyboard.json | 7 +++++++ keyboards/lets_split/rev2/info.json | 7 +++++++ keyboards/lets_split/rules.mk | 13 ------------- keyboards/lets_split/sockets/info.json | 12 ++++++++++++ keyboards/lets_split/sockets/rules.mk | 6 ------ .../lfkeyboards/lfk78/revb/keyboard.json | 6 ++++++ .../lfkeyboards/lfk78/revc/keyboard.json | 6 ++++++ .../lfk78/revj/{info.json => keyboard.json} | 7 +++++++ keyboards/lfkeyboards/lfk78/revj/rules.mk | 1 - keyboards/lfkeyboards/lfk78/rules.mk | 12 ------------ keyboards/lfkeyboards/mini1800/reva/info.json | 4 ---- .../lfkeyboards/mini1800/reva/keyboard.json | 12 ++++++++++++ keyboards/lfkeyboards/mini1800/reva/rules.mk | 11 ----------- keyboards/lfkeyboards/mini1800/revc/info.json | 4 ---- .../lfkeyboards/mini1800/revc/keyboard.json | 12 ++++++++++++ keyboards/lfkeyboards/mini1800/revc/rules.mk | 11 ----------- .../glow_enc/{info.json => keyboard.json} | 3 +++ keyboards/lily58/glow_enc/rules.mk | 1 - .../lily58/light/{info.json => keyboard.json} | 3 +++ keyboards/lily58/light/rules.mk | 1 - .../lily58/r2g/{info.json => keyboard.json} | 3 +++ keyboards/lily58/r2g/rules.mk | 1 - .../lime/rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/lime/rev1/rules.mk | 3 --- keyboards/lime/rules.mk | 13 ------------- keyboards/linworks/fave65h/info.json | 7 +++++++ keyboards/linworks/fave65h/rules.mk | 14 -------------- keyboards/linworks/fave87h/info.json | 7 +++++++ keyboards/linworks/fave87h/rules.mk | 14 -------------- keyboards/loki65/info.json | 7 +++++++ keyboards/loki65/rules.mk | 13 ------------- keyboards/lucid/alexa/info.json | 7 +++++++ keyboards/lucid/alexa/rules.mk | 13 ------------- keyboards/lucid/alexa_solder/info.json | 7 +++++++ keyboards/lucid/alexa_solder/rules.mk | 13 ------------- keyboards/lucid/kbd8x_hs/info.json | 7 +++++++ keyboards/lucid/kbd8x_hs/rules.mk | 13 ------------- keyboards/lucid/phantom_hs/info.json | 7 +++++++ keyboards/lucid/phantom_hs/rules.mk | 13 ------------- keyboards/lucid/phantom_solder/info.json | 7 +++++++ keyboards/lucid/phantom_solder/rules.mk | 13 ------------- keyboards/lucid/scarlet/info.json | 7 +++++++ keyboards/lucid/scarlet/rules.mk | 13 ------------- keyboards/lxxt/{info.json => keyboard.json} | 3 ++- keyboards/lxxt/rules.mk | 1 - keyboards/lyso1/lck75/info.json | 9 +++++++++ keyboards/lyso1/lck75/rules.mk | 19 ------------------- keyboards/lz/erghost/info.json | 8 ++++++++ keyboards/lz/erghost/rules.mk | 12 ------------ 56 files changed, 188 insertions(+), 279 deletions(-) rename keyboards/latincompass/latin6rgb/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/latincompass/latin6rgb/rules.mk rename keyboards/lfkeyboards/lfk78/revj/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/lfkeyboards/lfk78/revj/rules.mk delete mode 100644 keyboards/lfkeyboards/mini1800/reva/info.json create mode 100644 keyboards/lfkeyboards/mini1800/reva/keyboard.json delete mode 100644 keyboards/lfkeyboards/mini1800/reva/rules.mk delete mode 100644 keyboards/lfkeyboards/mini1800/revc/info.json create mode 100644 keyboards/lfkeyboards/mini1800/revc/keyboard.json delete mode 100644 keyboards/lfkeyboards/mini1800/revc/rules.mk rename keyboards/lily58/glow_enc/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/lily58/glow_enc/rules.mk rename keyboards/lily58/light/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/lily58/light/rules.mk rename keyboards/lily58/r2g/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/lily58/r2g/rules.mk rename keyboards/lime/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/lime/rev1/rules.mk rename keyboards/lxxt/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/lxxt/rules.mk diff --git a/keyboards/latincompass/latin47ble/info.json b/keyboards/latincompass/latin47ble/info.json index 64ab0bd85c9..b0b14d66446 100644 --- a/keyboards/latincompass/latin47ble/info.json +++ b/keyboards/latincompass/latin47ble/info.json @@ -41,6 +41,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "bluetooth": true + }, "community_layouts": ["planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/latincompass/latin47ble/rules.mk b/keyboards/latincompass/latin47ble/rules.mk index 1c65d3584ea..3437a35bdf1 100644 --- a/keyboards/latincompass/latin47ble/rules.mk +++ b/keyboards/latincompass/latin47ble/rules.mk @@ -1,16 +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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -BLUETOOTH_ENABLE = yes diff --git a/keyboards/latincompass/latin64ble/info.json b/keyboards/latincompass/latin64ble/info.json index cce49aea054..b2563569d30 100644 --- a/keyboards/latincompass/latin64ble/info.json +++ b/keyboards/latincompass/latin64ble/info.json @@ -37,6 +37,13 @@ "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "bluetooth": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/latincompass/latin64ble/rules.mk b/keyboards/latincompass/latin64ble/rules.mk index 6ad854a5a2b..3437a35bdf1 100644 --- a/keyboards/latincompass/latin64ble/rules.mk +++ b/keyboards/latincompass/latin64ble/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -BLUETOOTH_ENABLE = yes diff --git a/keyboards/latincompass/latin6rgb/info.json b/keyboards/latincompass/latin6rgb/keyboard.json similarity index 93% rename from keyboards/latincompass/latin6rgb/info.json rename to keyboards/latincompass/latin6rgb/keyboard.json index 775b6d259e8..42aa82a030c 100644 --- a/keyboards/latincompass/latin6rgb/info.json +++ b/keyboards/latincompass/latin6rgb/keyboard.json @@ -49,6 +49,12 @@ "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "debounce": 3, "layouts": { "LAYOUT_numpad_2x3": { diff --git a/keyboards/latincompass/latin6rgb/rules.mk b/keyboards/latincompass/latin6rgb/rules.mk deleted file mode 100644 index 3d1f3ae6de1..00000000000 --- a/keyboards/latincompass/latin6rgb/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow - -AUDIO_ENABLE = no # Audio output - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/lets_split/info.json b/keyboards/lets_split/info.json index 4640bd9e84f..a92a948abd2 100644 --- a/keyboards/lets_split/info.json +++ b/keyboards/lets_split/info.json @@ -3,8 +3,5 @@ "maintainer": "qmk", "processor": "atmega32u4", "bootloader": "caterina", - "split": { - "enabled": true - }, "community_layouts": ["ortho_4x12"] } diff --git a/keyboards/lets_split/rev1/keyboard.json b/keyboards/lets_split/rev1/keyboard.json index 6f00161cd5d..ec85e70519f 100644 --- a/keyboards/lets_split/rev1/keyboard.json +++ b/keyboards/lets_split/rev1/keyboard.json @@ -12,6 +12,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { @@ -20,6 +21,12 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/lets_split/rev2/info.json b/keyboards/lets_split/rev2/info.json index 8c6d622732f..81ad2606b8d 100644 --- a/keyboards/lets_split/rev2/info.json +++ b/keyboards/lets_split/rev2/info.json @@ -12,6 +12,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { @@ -20,6 +21,12 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk index 11f365e8e9c..0fb6d362043 100644 --- a/keyboards/lets_split/rules.mk +++ b/keyboards/lets_split/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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = lets_split/rev2 diff --git a/keyboards/lets_split/sockets/info.json b/keyboards/lets_split/sockets/info.json index 76972243dc4..1354d9cf70f 100644 --- a/keyboards/lets_split/sockets/info.json +++ b/keyboards/lets_split/sockets/info.json @@ -12,6 +12,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { @@ -20,6 +21,17 @@ "ws2812": { "pin": "D4" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "rgblight": true, + "audio": true + }, + "build": { + "lto": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/lets_split/sockets/rules.mk b/keyboards/lets_split/sockets/rules.mk index 4174af2d0b8..fe598d78616 100644 --- a/keyboards/lets_split/sockets/rules.mk +++ b/keyboards/lets_split/sockets/rules.mk @@ -1,8 +1,2 @@ -BACKLIGHT_ENABLE = no -AUDIO_ENABLE = yes -RGBLIGHT_ENABLE = yes #Don't enable this along with I2C - -LTO_ENABLE = yes - # Disable unsupported hardware BACKLIGHT_SUPPORTED = no diff --git a/keyboards/lfkeyboards/lfk78/revb/keyboard.json b/keyboards/lfkeyboards/lfk78/revb/keyboard.json index ac98455afaa..7a4d881692b 100644 --- a/keyboards/lfkeyboards/lfk78/revb/keyboard.json +++ b/keyboards/lfkeyboards/lfk78/revb/keyboard.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lfkeyboards/lfk78/revc/keyboard.json b/keyboards/lfkeyboards/lfk78/revc/keyboard.json index 7bfaf8cac6d..e1788b68565 100644 --- a/keyboards/lfkeyboards/lfk78/revc/keyboard.json +++ b/keyboards/lfkeyboards/lfk78/revc/keyboard.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lfkeyboards/lfk78/revj/info.json b/keyboards/lfkeyboards/lfk78/revj/keyboard.json similarity index 99% rename from keyboards/lfkeyboards/lfk78/revj/info.json rename to keyboards/lfkeyboards/lfk78/revj/keyboard.json index f99df02ed9e..725425f0124 100644 --- a/keyboards/lfkeyboards/lfk78/revj/info.json +++ b/keyboards/lfkeyboards/lfk78/revj/keyboard.json @@ -15,6 +15,13 @@ "diode_direction": "COL2ROW", "processor": "at90usb646", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "audio": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lfkeyboards/lfk78/revj/rules.mk b/keyboards/lfkeyboards/lfk78/revj/rules.mk deleted file mode 100644 index ef72559a0c1..00000000000 --- a/keyboards/lfkeyboards/lfk78/revj/rules.mk +++ /dev/null @@ -1 +0,0 @@ -AUDIO_ENABLE = yes diff --git a/keyboards/lfkeyboards/lfk78/rules.mk b/keyboards/lfkeyboards/lfk78/rules.mk index 82ffed96f5e..5ebd387c834 100644 --- a/keyboards/lfkeyboards/lfk78/rules.mk +++ b/keyboards/lfkeyboards/lfk78/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 = 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 -WATCHDOG_ENABLE = no # Resets keyboard if matrix_scan isn't run every 250ms - DEFAULT_FOLDER = lfkeyboards/lfk78/revj diff --git a/keyboards/lfkeyboards/mini1800/reva/info.json b/keyboards/lfkeyboards/mini1800/reva/info.json deleted file mode 100644 index a0204033d8e..00000000000 --- a/keyboards/lfkeyboards/mini1800/reva/info.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "processor": "at90usb1286", - "bootloader": "atmel-dfu" -} diff --git a/keyboards/lfkeyboards/mini1800/reva/keyboard.json b/keyboards/lfkeyboards/mini1800/reva/keyboard.json new file mode 100644 index 00000000000..8d93a054e4d --- /dev/null +++ b/keyboards/lfkeyboards/mini1800/reva/keyboard.json @@ -0,0 +1,12 @@ +{ + "processor": "at90usb1286", + "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "audio": true, + "watchdog": true + } +} diff --git a/keyboards/lfkeyboards/mini1800/reva/rules.mk b/keyboards/lfkeyboards/mini1800/reva/rules.mk deleted file mode 100644 index fa0a6ab5b7e..00000000000 --- a/keyboards/lfkeyboards/mini1800/reva/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# 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 -AUDIO_ENABLE = yes # Audio output -WATCHDOG_ENABLE = yes # Resets keyboard if matrix_scan isn't run every 250ms diff --git a/keyboards/lfkeyboards/mini1800/revc/info.json b/keyboards/lfkeyboards/mini1800/revc/info.json deleted file mode 100644 index fd4b030c4ea..00000000000 --- a/keyboards/lfkeyboards/mini1800/revc/info.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "processor": "at90usb646", - "bootloader": "atmel-dfu" -} diff --git a/keyboards/lfkeyboards/mini1800/revc/keyboard.json b/keyboards/lfkeyboards/mini1800/revc/keyboard.json new file mode 100644 index 00000000000..408181d3280 --- /dev/null +++ b/keyboards/lfkeyboards/mini1800/revc/keyboard.json @@ -0,0 +1,12 @@ +{ + "processor": "at90usb646", + "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "audio": true, + "watchdog": true + } +} diff --git a/keyboards/lfkeyboards/mini1800/revc/rules.mk b/keyboards/lfkeyboards/mini1800/revc/rules.mk deleted file mode 100644 index fa0a6ab5b7e..00000000000 --- a/keyboards/lfkeyboards/mini1800/revc/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# 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 -AUDIO_ENABLE = yes # Audio output -WATCHDOG_ENABLE = yes # Resets keyboard if matrix_scan isn't run every 250ms diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/keyboard.json similarity index 99% rename from keyboards/lily58/glow_enc/info.json rename to keyboards/lily58/glow_enc/keyboard.json index 006cf0aa210..7778069833e 100644 --- a/keyboards/lily58/glow_enc/info.json +++ b/keyboards/lily58/glow_enc/keyboard.json @@ -44,6 +44,9 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lily58/glow_enc/rules.mk b/keyboards/lily58/glow_enc/rules.mk deleted file mode 100644 index 4da205a168c..00000000000 --- a/keyboards/lily58/glow_enc/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/keyboard.json similarity index 99% rename from keyboards/lily58/light/info.json rename to keyboards/lily58/light/keyboard.json index 1c556e429a6..34c4e28b186 100644 --- a/keyboards/lily58/light/info.json +++ b/keyboards/lily58/light/keyboard.json @@ -45,6 +45,9 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lily58/light/rules.mk b/keyboards/lily58/light/rules.mk deleted file mode 100644 index 4da205a168c..00000000000 --- a/keyboards/lily58/light/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes diff --git a/keyboards/lily58/r2g/info.json b/keyboards/lily58/r2g/keyboard.json similarity index 99% rename from keyboards/lily58/r2g/info.json rename to keyboards/lily58/r2g/keyboard.json index 3cad3dc8e8e..dbe5cfa9e01 100644 --- a/keyboards/lily58/r2g/info.json +++ b/keyboards/lily58/r2g/keyboard.json @@ -10,6 +10,9 @@ "oled": true, "rgb_matrix": true }, + "build": { + "lto": true + }, "usb": { "vid": "0x04D8", "pid": "0xEB2E", diff --git a/keyboards/lily58/r2g/rules.mk b/keyboards/lily58/r2g/rules.mk deleted file mode 100644 index 4da205a168c..00000000000 --- a/keyboards/lily58/r2g/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/keyboard.json similarity index 96% rename from keyboards/lime/rev1/info.json rename to keyboards/lime/rev1/keyboard.json index 2e395f5e6a7..e7d6231a6b9 100644 --- a/keyboards/lime/rev1/info.json +++ b/keyboards/lime/rev1/keyboard.json @@ -42,6 +42,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "swap_hands": true, + "encoder": true, + "oled": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lime/rev1/rules.mk b/keyboards/lime/rev1/rules.mk deleted file mode 100644 index 8ef96fa9d06..00000000000 --- a/keyboards/lime/rev1/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -ENCODER_ENABLE = yes -ENCODER_RIGHT_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/lime/rules.mk b/keyboards/lime/rules.mk index cd2da2eedf3..4643abab937 100644 --- a/keyboards/lime/rules.mk +++ b/keyboards/lime/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 = no # Audio output -SWAP_HANDS_ENABLE = yes DEFAULT_FOLDER = lime/rev1 diff --git a/keyboards/linworks/fave65h/info.json b/keyboards/linworks/fave65h/info.json index 32a3f5252c6..6e35f55a4b4 100644 --- a/keyboards/linworks/fave65h/info.json +++ b/keyboards/linworks/fave65h/info.json @@ -67,6 +67,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker_split_bs", "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs" diff --git a/keyboards/linworks/fave65h/rules.mk b/keyboards/linworks/fave65h/rules.mk index f92cb03d08c..3437a35bdf1 100644 --- a/keyboards/linworks/fave65h/rules.mk +++ b/keyboards/linworks/fave65h/rules.mk @@ -1,16 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json index 2951b56a434..5fb1d4d42aa 100644 --- a/keyboards/linworks/fave87h/info.json +++ b/keyboards/linworks/fave87h/info.json @@ -67,6 +67,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_tkl_ansi_split_bs" }, diff --git a/keyboards/linworks/fave87h/rules.mk b/keyboards/linworks/fave87h/rules.mk index f92cb03d08c..3437a35bdf1 100644 --- a/keyboards/linworks/fave87h/rules.mk +++ b/keyboards/linworks/fave87h/rules.mk @@ -1,16 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/loki65/info.json b/keyboards/loki65/info.json index 8424f7d437e..5f93cde5f80 100644 --- a/keyboards/loki65/info.json +++ b/keyboards/loki65/info.json @@ -40,6 +40,13 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/loki65/rules.mk b/keyboards/loki65/rules.mk index cc9d7bb3f53..0ab54aaaf71 100644 --- a/keyboards/loki65/rules.mk +++ b/keyboards/loki65/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/lucid/alexa/info.json b/keyboards/lucid/alexa/info.json index 791d2b60d31..4c2bd739ca5 100644 --- a/keyboards/lucid/alexa/info.json +++ b/keyboards/lucid/alexa/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs"], "layouts": { "LAYOUT_65_ansi_blocker_split_bs": { diff --git a/keyboards/lucid/alexa/rules.mk b/keyboards/lucid/alexa/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/lucid/alexa/rules.mk +++ b/keyboards/lucid/alexa/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/lucid/alexa_solder/info.json b/keyboards/lucid/alexa_solder/info.json index 469c77126d1..881fed5deee 100644 --- a/keyboards/lucid/alexa_solder/info.json +++ b/keyboards/lucid/alexa_solder/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": [ "65_ansi_blocker", "65_ansi_blocker_split_bs", diff --git a/keyboards/lucid/alexa_solder/rules.mk b/keyboards/lucid/alexa_solder/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/lucid/alexa_solder/rules.mk +++ b/keyboards/lucid/alexa_solder/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/lucid/kbd8x_hs/info.json b/keyboards/lucid/kbd8x_hs/info.json index ef78933882d..a542cde0239 100644 --- a/keyboards/lucid/kbd8x_hs/info.json +++ b/keyboards/lucid/kbd8x_hs/info.json @@ -18,6 +18,13 @@ }, "processor": "at90usb646", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/lucid/kbd8x_hs/rules.mk b/keyboards/lucid/kbd8x_hs/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/lucid/kbd8x_hs/rules.mk +++ b/keyboards/lucid/kbd8x_hs/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/lucid/phantom_hs/info.json b/keyboards/lucid/phantom_hs/info.json index 5709d422d45..ce331051670 100644 --- a/keyboards/lucid/phantom_hs/info.json +++ b/keyboards/lucid/phantom_hs/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/lucid/phantom_hs/rules.mk b/keyboards/lucid/phantom_hs/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/lucid/phantom_hs/rules.mk +++ b/keyboards/lucid/phantom_hs/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/lucid/phantom_solder/info.json b/keyboards/lucid/phantom_solder/info.json index 528068ebf01..53ba8eaeaa8 100644 --- a/keyboards/lucid/phantom_solder/info.json +++ b/keyboards/lucid/phantom_solder/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": [ "65_ansi_blocker", "65_ansi_blocker_split_bs", diff --git a/keyboards/lucid/phantom_solder/rules.mk b/keyboards/lucid/phantom_solder/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/lucid/phantom_solder/rules.mk +++ b/keyboards/lucid/phantom_solder/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/lucid/scarlet/info.json b/keyboards/lucid/scarlet/info.json index 89cdd218060..bcd56281c0d 100644 --- a/keyboards/lucid/scarlet/info.json +++ b/keyboards/lucid/scarlet/info.json @@ -15,6 +15,13 @@ "diode_direction": "COL2ROW", "processor": "at90usb646", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT_tkl_all": { "layout": [ diff --git a/keyboards/lucid/scarlet/rules.mk b/keyboards/lucid/scarlet/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/lucid/scarlet/rules.mk +++ b/keyboards/lucid/scarlet/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/lxxt/info.json b/keyboards/lxxt/keyboard.json similarity index 99% rename from keyboards/lxxt/info.json rename to keyboards/lxxt/keyboard.json index 2fcc3c49211..3a2700883d5 100644 --- a/keyboards/lxxt/info.json +++ b/keyboards/lxxt/keyboard.json @@ -52,7 +52,8 @@ "console": false, "command": false, "nkro": true, - "rgblight": true + "rgblight": true, + "encoder": true }, "layouts": { "LAYOUT": { diff --git a/keyboards/lxxt/rules.mk b/keyboards/lxxt/rules.mk deleted file mode 100644 index 5af1ba85367..00000000000 --- a/keyboards/lxxt/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_ENABLE = yes diff --git a/keyboards/lyso1/lck75/info.json b/keyboards/lyso1/lck75/info.json index aa2b1350bc4..a161172d490 100644 --- a/keyboards/lyso1/lck75/info.json +++ b/keyboards/lyso1/lck75/info.json @@ -20,6 +20,15 @@ }, "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "unicode": true, + "oled": true, + "encoder": true, + "wpm": true + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/lyso1/lck75/rules.mk b/keyboards/lyso1/lck75/rules.mk index 6f3aabc44fc..c2ee0bc86f9 100644 --- a/keyboards/lyso1/lck75/rules.mk +++ b/keyboards/lyso1/lck75/rules.mk @@ -1,21 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# 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 -UNICODE_ENABLE = yes -OLED_ENABLE = yes -ENCODER_ENABLE = yes -WPM_ENABLE = yes -LTO_ENABLE = no -AUTO_SHIFT_ENABLE = no diff --git a/keyboards/lz/erghost/info.json b/keyboards/lz/erghost/info.json index 68918a38f28..ac5ce2edf26 100644 --- a/keyboards/lz/erghost/info.json +++ b/keyboards/lz/erghost/info.json @@ -40,6 +40,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/lz/erghost/rules.mk b/keyboards/lz/erghost/rules.mk index 03ea2f1bda0..179d02c3c68 100644 --- a/keyboards/lz/erghost/rules.mk +++ b/keyboards/lz/erghost/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 -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite SRC += matrix.c From e807bb7e37202bc046fccd511cea03485339cb74 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Mon, 22 Apr 2024 18:22:36 +0400 Subject: [PATCH 172/333] Add Lisa keyboard (#23575) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan --- keyboards/keyten/lisa/info.json | 81 +++++++++++++++++++ .../keyten/lisa/keymaps/default/keymap.c | 28 +++++++ keyboards/keyten/lisa/keymaps/via/keymap.c | 28 +++++++ keyboards/keyten/lisa/keymaps/via/rules.mk | 1 + keyboards/keyten/lisa/lisa.c | 12 +++ keyboards/keyten/lisa/readme.md | 27 +++++++ keyboards/keyten/lisa/rules.mk | 0 7 files changed, 177 insertions(+) create mode 100644 keyboards/keyten/lisa/info.json create mode 100644 keyboards/keyten/lisa/keymaps/default/keymap.c create mode 100644 keyboards/keyten/lisa/keymaps/via/keymap.c create mode 100644 keyboards/keyten/lisa/keymaps/via/rules.mk create mode 100644 keyboards/keyten/lisa/lisa.c create mode 100644 keyboards/keyten/lisa/readme.md create mode 100644 keyboards/keyten/lisa/rules.mk diff --git a/keyboards/keyten/lisa/info.json b/keyboards/keyten/lisa/info.json new file mode 100644 index 00000000000..deac0f37408 --- /dev/null +++ b/keyboards/keyten/lisa/info.json @@ -0,0 +1,81 @@ +{ + "manufacturer": "keyten", + "keyboard_name": "Lisa", + "maintainer": "key10iq", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B7", "B6", "B5", "B4", "B3", "A15", "A3", "A4", "A5", "A6", "A7", "B0", "B1"], + "rows": ["B13", "B15", "B14", "A8"] + }, + "indicators": { + "caps_lock": "B10", + "num_lock": "B11" + } + "processor": "STM32F072", + "usb": { + "vid": "0xEB69", + "pid": "0x4001", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [1, 0], "w": 1.25, "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 7.75, "y": 1}, + {"matrix": [1, 7], "x": 8.75, "y": 1}, + {"matrix": [1, 8], "x": 9.75, "y": 1}, + {"matrix": [1, 9], "x": 10.75, "y": 1}, + {"matrix": [1, 10], "x": 11.75, "y": 1}, + {"matrix": [1, 12], "w": 1.75, "x": 12.75, "y": 1}, + {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 7.25, "y": 2}, + {"matrix": [2, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2}, + {"matrix": [2, 10], "x": 11.25, "y": 2}, + {"matrix": [2, 11], "x": 12.25, "y": 2}, + {"matrix": [2, 12], "w": 1.25, "x": 13.25, "y": 2}, + {"matrix": [3, 0], "w": 1.25, "x": 0, "y": 3}, + {"matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3}, + {"matrix": [3, 3], "w": 1.25, "x": 3.5, "y": 3}, + {"matrix": [3, 5], "w": 2, "x": 4.75, "y": 3}, + {"matrix": [3, 6], "w": 2.25, "x": 7.25, "y": 3}, + {"matrix": [3, 8], "w": 1.25, "x": 9.5, "y": 3}, + {"matrix": [3, 11], "w": 1.25, "x": 12, "y": 3}, + {"matrix": [3, 12], "w": 1.25, "x": 13.25, "y": 3} + ] + } + } +} diff --git a/keyboards/keyten/lisa/keymaps/default/keymap.c b/keyboards/keyten/lisa/keymaps/default/keymap.c new file mode 100644 index 00000000000..0803f25b6e0 --- /dev/null +++ b/keyboards/keyten/lisa/keymaps/default/keymap.c @@ -0,0 +1,28 @@ +// Copyright 2024 QMK +// 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_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, LT(1,KC_SPC), LT(2,KC_BSPC), KC_RALT, KC_RGUI, KC_RCTL + ), + + [1] = LAYOUT( + KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT( + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/keyten/lisa/keymaps/via/keymap.c b/keyboards/keyten/lisa/keymaps/via/keymap.c new file mode 100644 index 00000000000..0803f25b6e0 --- /dev/null +++ b/keyboards/keyten/lisa/keymaps/via/keymap.c @@ -0,0 +1,28 @@ +// Copyright 2024 QMK +// 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_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, LT(1,KC_SPC), LT(2,KC_BSPC), KC_RALT, KC_RGUI, KC_RCTL + ), + + [1] = LAYOUT( + KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT( + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/keyten/lisa/keymaps/via/rules.mk b/keyboards/keyten/lisa/keymaps/via/rules.mk new file mode 100644 index 00000000000..036bd6d1c3e --- /dev/null +++ b/keyboards/keyten/lisa/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/keyten/lisa/lisa.c b/keyboards/keyten/lisa/lisa.c new file mode 100644 index 00000000000..2ecff3a642c --- /dev/null +++ b/keyboards/keyten/lisa/lisa.c @@ -0,0 +1,12 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "quantum.h" + +#define LED_INDICATOR_PIN B2 + +void matrix_init_kb(void) { + gpio_set_pin_output(LED_INDICATOR_PIN); + gpio_write_pin_high(LED_INDICATOR_PIN); + matrix_init_user(); +} diff --git a/keyboards/keyten/lisa/readme.md b/keyboards/keyten/lisa/readme.md new file mode 100644 index 00000000000..e5d783e8406 --- /dev/null +++ b/keyboards/keyten/lisa/readme.md @@ -0,0 +1,27 @@ +# keyten Lisa + +Lisa is a Tadpole mount keyboard with Prime_E layout + +![Lisa](https://i.imgur.com/PaVECKC.png) + +* Keyboard Maintainer: [keyten](https://github.com/key10iq) +* Hardware Supported: keyten Lisa +* Hardware Availability: private GB + +Make example for this keyboard (after setting up your build environment): + + make keyten/lisa:default + +Flashing example for this keyboard: + + make keyten/lisa: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* Bootmagic reset: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* Keycode in layout: Press the key mapped to `QK_BOOT` if it is available +* Physical reset button: Hold the button on the back of the PCB diff --git a/keyboards/keyten/lisa/rules.mk b/keyboards/keyten/lisa/rules.mk new file mode 100644 index 00000000000..e69de29bb2d From e69b638756c80c0a26efa1959b611a04548a9f82 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 23 Apr 2024 03:59:04 +0100 Subject: [PATCH 173/333] Migrate build target markers to keyboard.json - JK (#23588) --- .../jacky_studio/piggy60/rev2/{info.json => keyboard.json} | 0 keyboards/janus/{info.json => keyboard.json} | 0 keyboards/jaykeeb/joker/{info.json => keyboard.json} | 0 keyboards/jaykeeb/joker/rules.mk | 1 - keyboards/jaykeeb/kamigakushi/{info.json => keyboard.json} | 0 keyboards/jones/v03/{info.json => keyboard.json} | 0 keyboards/jones/v03_1/{info.json => keyboard.json} | 0 keyboards/joshajohnson/hub16/{info.json => keyboard.json} | 0 keyboards/jpe230/big_knob/{info.json => keyboard.json} | 0 keyboards/kagizaraya/chidori/{info.json => keyboard.json} | 0 keyboards/kagizaraya/scythe/{info.json => keyboard.json} | 0 keyboards/kakunpc/choc_taro/{info.json => keyboard.json} | 0 .../kakunpc/thedogkeyboard/{info.json => keyboard.json} | 0 keyboards/kaly/kaly42/{info.json => keyboard.json} | 0 keyboards/karn/{info.json => keyboard.json} | 0 keyboards/kb_elmo/aek2_usb/{info.json => keyboard.json} | 0 keyboards/kb_elmo/elmopad/{info.json => keyboard.json} | 0 keyboards/kb_elmo/isolation/{info.json => keyboard.json} | 0 keyboards/kb_elmo/m0110a_usb/{info.json => keyboard.json} | 0 keyboards/kb_elmo/m0116_usb/{info.json => keyboard.json} | 0 keyboards/kb_elmo/sesame/{info.json => keyboard.json} | 0 keyboards/kb_elmo/twelvekey/{info.json => keyboard.json} | 0 keyboards/kbdfans/jm60/{info.json => keyboard.json} | 2 ++ keyboards/kbdfans/jm60/rules.mk | 7 +------ keyboards/kbdfans/kbd4x/{info.json => keyboard.json} | 0 .../kbdfans/kbd67/mkiirgb/v3/{info.json => keyboard.json} | 0 .../kbdfans/kbd67/mkiirgb_iso/{info.json => keyboard.json} | 0 keyboards/kbdfans/niu_mini/{info.json => keyboard.json} | 0 keyboards/kbdfans/odin75/{info.json => keyboard.json} | 0 keyboards/kbdmania/kmac/{info.json => keyboard.json} | 0 keyboards/kbdmania/kmac_pad/{info.json => keyboard.json} | 0 .../kbnordic/nordic65/rev_a/{info.json => keyboard.json} | 0 .../keebio/cepstrum/rev1/{info.json => keyboard.json} | 0 keyboards/keebio/foldkb/rev1/{info.json => keyboard.json} | 0 keyboards/keebio/foldkb/rev1/rules.mk | 0 keyboards/keebio/iris/rev8/{info.json => keyboard.json} | 0 keyboards/keebio/iris_ce/rev1/{info.json => keyboard.json} | 0 .../keebio/levinson/rev3/{info.json => keyboard.json} | 0 keyboards/keebio/nyquist/rev4/{info.json => keyboard.json} | 0 keyboards/keebio/sinc/rev3/{info.json => keyboard.json} | 0 keyboards/keebio/sinc/rev4/{info.json => keyboard.json} | 0 keyboards/keebio/wavelet/{info.json => keyboard.json} | 0 keyboards/keebwerk/mega/ansi/{info.json => keyboard.json} | 0 .../keebwerk/nano_slider/{info.json => keyboard.json} | 0 keyboards/keyboardio/model01/{info.json => keyboard.json} | 0 keyboards/keycapsss/3w6_2040/{info.json => keyboard.json} | 0 keyboards/keycult/keycult65/{info.json => keyboard.json} | 0 keyboards/keygem/kg60ansi/{info.json => keyboard.json} | 0 keyboards/keygem/kg65rgbv2/{info.json => keyboard.json} | 0 keyboards/keyhive/honeycomb/{info.json => keyboard.json} | 0 keyboards/keyhive/lattice60/{info.json => keyboard.json} | 0 keyboards/kin80/blackpill401/{info.json => keyboard.json} | 5 ++++- keyboards/kin80/blackpill401/rules.mk | 1 - keyboards/kin80/blackpill411/{info.json => keyboard.json} | 5 ++++- keyboards/kin80/blackpill411/rules.mk | 1 - keyboards/kinesis/alvicstep/{info.json => keyboard.json} | 0 keyboards/kinesis/kint41/{info.json => keyboard.json} | 0 keyboards/kinesis/kintlc/{info.json => keyboard.json} | 0 .../kinesis/nguyenvietyen/{info.json => keyboard.json} | 0 keyboards/kmini/{info.json => keyboard.json} | 0 .../kopibeng/mnk65_stm32/{info.json => keyboard.json} | 0 keyboards/kopibeng/xt87/{info.json => keyboard.json} | 0 keyboards/kopibeng/xt87/rules.mk | 2 -- .../kprepublic/bm60hsrgb/rev2/{info.json => keyboard.json} | 0 .../bm60hsrgb_iso/rev2/{info.json => keyboard.json} | 0 .../bm60hsrgb_poker/rev2/{info.json => keyboard.json} | 0 keyboards/ktec/ergodone/{info.json => keyboard.json} | 0 67 files changed, 11 insertions(+), 13 deletions(-) rename keyboards/jacky_studio/piggy60/rev2/{info.json => keyboard.json} (100%) rename keyboards/janus/{info.json => keyboard.json} (100%) rename keyboards/jaykeeb/joker/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jaykeeb/joker/rules.mk rename keyboards/jaykeeb/kamigakushi/{info.json => keyboard.json} (100%) rename keyboards/jones/v03/{info.json => keyboard.json} (100%) rename keyboards/jones/v03_1/{info.json => keyboard.json} (100%) rename keyboards/joshajohnson/hub16/{info.json => keyboard.json} (100%) rename keyboards/jpe230/big_knob/{info.json => keyboard.json} (100%) rename keyboards/kagizaraya/chidori/{info.json => keyboard.json} (100%) rename keyboards/kagizaraya/scythe/{info.json => keyboard.json} (100%) rename keyboards/kakunpc/choc_taro/{info.json => keyboard.json} (100%) rename keyboards/kakunpc/thedogkeyboard/{info.json => keyboard.json} (100%) rename keyboards/kaly/kaly42/{info.json => keyboard.json} (100%) rename keyboards/karn/{info.json => keyboard.json} (100%) rename keyboards/kb_elmo/aek2_usb/{info.json => keyboard.json} (100%) rename keyboards/kb_elmo/elmopad/{info.json => keyboard.json} (100%) rename keyboards/kb_elmo/isolation/{info.json => keyboard.json} (100%) rename keyboards/kb_elmo/m0110a_usb/{info.json => keyboard.json} (100%) rename keyboards/kb_elmo/m0116_usb/{info.json => keyboard.json} (100%) rename keyboards/kb_elmo/sesame/{info.json => keyboard.json} (100%) rename keyboards/kb_elmo/twelvekey/{info.json => keyboard.json} (100%) rename keyboards/kbdfans/jm60/{info.json => keyboard.json} (98%) rename keyboards/kbdfans/kbd4x/{info.json => keyboard.json} (100%) rename keyboards/kbdfans/kbd67/mkiirgb/v3/{info.json => keyboard.json} (100%) rename keyboards/kbdfans/kbd67/mkiirgb_iso/{info.json => keyboard.json} (100%) rename keyboards/kbdfans/niu_mini/{info.json => keyboard.json} (100%) rename keyboards/kbdfans/odin75/{info.json => keyboard.json} (100%) rename keyboards/kbdmania/kmac/{info.json => keyboard.json} (100%) rename keyboards/kbdmania/kmac_pad/{info.json => keyboard.json} (100%) rename keyboards/kbnordic/nordic65/rev_a/{info.json => keyboard.json} (100%) rename keyboards/keebio/cepstrum/rev1/{info.json => keyboard.json} (100%) rename keyboards/keebio/foldkb/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keebio/foldkb/rev1/rules.mk rename keyboards/keebio/iris/rev8/{info.json => keyboard.json} (100%) rename keyboards/keebio/iris_ce/rev1/{info.json => keyboard.json} (100%) rename keyboards/keebio/levinson/rev3/{info.json => keyboard.json} (100%) rename keyboards/keebio/nyquist/rev4/{info.json => keyboard.json} (100%) rename keyboards/keebio/sinc/rev3/{info.json => keyboard.json} (100%) rename keyboards/keebio/sinc/rev4/{info.json => keyboard.json} (100%) rename keyboards/keebio/wavelet/{info.json => keyboard.json} (100%) rename keyboards/keebwerk/mega/ansi/{info.json => keyboard.json} (100%) rename keyboards/keebwerk/nano_slider/{info.json => keyboard.json} (100%) rename keyboards/keyboardio/model01/{info.json => keyboard.json} (100%) rename keyboards/keycapsss/3w6_2040/{info.json => keyboard.json} (100%) rename keyboards/keycult/keycult65/{info.json => keyboard.json} (100%) rename keyboards/keygem/kg60ansi/{info.json => keyboard.json} (100%) rename keyboards/keygem/kg65rgbv2/{info.json => keyboard.json} (100%) rename keyboards/keyhive/honeycomb/{info.json => keyboard.json} (100%) rename keyboards/keyhive/lattice60/{info.json => keyboard.json} (100%) rename keyboards/kin80/blackpill401/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/kin80/blackpill401/rules.mk rename keyboards/kin80/blackpill411/{info.json => keyboard.json} (82%) delete mode 100644 keyboards/kin80/blackpill411/rules.mk rename keyboards/kinesis/alvicstep/{info.json => keyboard.json} (100%) rename keyboards/kinesis/kint41/{info.json => keyboard.json} (100%) rename keyboards/kinesis/kintlc/{info.json => keyboard.json} (100%) rename keyboards/kinesis/nguyenvietyen/{info.json => keyboard.json} (100%) rename keyboards/kmini/{info.json => keyboard.json} (100%) rename keyboards/kopibeng/mnk65_stm32/{info.json => keyboard.json} (100%) rename keyboards/kopibeng/xt87/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/kopibeng/xt87/rules.mk rename keyboards/kprepublic/bm60hsrgb/rev2/{info.json => keyboard.json} (100%) rename keyboards/kprepublic/bm60hsrgb_iso/rev2/{info.json => keyboard.json} (100%) rename keyboards/kprepublic/bm60hsrgb_poker/rev2/{info.json => keyboard.json} (100%) rename keyboards/ktec/ergodone/{info.json => keyboard.json} (100%) diff --git a/keyboards/jacky_studio/piggy60/rev2/info.json b/keyboards/jacky_studio/piggy60/rev2/keyboard.json similarity index 100% rename from keyboards/jacky_studio/piggy60/rev2/info.json rename to keyboards/jacky_studio/piggy60/rev2/keyboard.json diff --git a/keyboards/janus/info.json b/keyboards/janus/keyboard.json similarity index 100% rename from keyboards/janus/info.json rename to keyboards/janus/keyboard.json diff --git a/keyboards/jaykeeb/joker/info.json b/keyboards/jaykeeb/joker/keyboard.json similarity index 100% rename from keyboards/jaykeeb/joker/info.json rename to keyboards/jaykeeb/joker/keyboard.json diff --git a/keyboards/jaykeeb/joker/rules.mk b/keyboards/jaykeeb/joker/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/jaykeeb/joker/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/jaykeeb/kamigakushi/info.json b/keyboards/jaykeeb/kamigakushi/keyboard.json similarity index 100% rename from keyboards/jaykeeb/kamigakushi/info.json rename to keyboards/jaykeeb/kamigakushi/keyboard.json diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/keyboard.json similarity index 100% rename from keyboards/jones/v03/info.json rename to keyboards/jones/v03/keyboard.json diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/keyboard.json similarity index 100% rename from keyboards/jones/v03_1/info.json rename to keyboards/jones/v03_1/keyboard.json diff --git a/keyboards/joshajohnson/hub16/info.json b/keyboards/joshajohnson/hub16/keyboard.json similarity index 100% rename from keyboards/joshajohnson/hub16/info.json rename to keyboards/joshajohnson/hub16/keyboard.json diff --git a/keyboards/jpe230/big_knob/info.json b/keyboards/jpe230/big_knob/keyboard.json similarity index 100% rename from keyboards/jpe230/big_knob/info.json rename to keyboards/jpe230/big_knob/keyboard.json diff --git a/keyboards/kagizaraya/chidori/info.json b/keyboards/kagizaraya/chidori/keyboard.json similarity index 100% rename from keyboards/kagizaraya/chidori/info.json rename to keyboards/kagizaraya/chidori/keyboard.json diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/keyboard.json similarity index 100% rename from keyboards/kagizaraya/scythe/info.json rename to keyboards/kagizaraya/scythe/keyboard.json diff --git a/keyboards/kakunpc/choc_taro/info.json b/keyboards/kakunpc/choc_taro/keyboard.json similarity index 100% rename from keyboards/kakunpc/choc_taro/info.json rename to keyboards/kakunpc/choc_taro/keyboard.json diff --git a/keyboards/kakunpc/thedogkeyboard/info.json b/keyboards/kakunpc/thedogkeyboard/keyboard.json similarity index 100% rename from keyboards/kakunpc/thedogkeyboard/info.json rename to keyboards/kakunpc/thedogkeyboard/keyboard.json diff --git a/keyboards/kaly/kaly42/info.json b/keyboards/kaly/kaly42/keyboard.json similarity index 100% rename from keyboards/kaly/kaly42/info.json rename to keyboards/kaly/kaly42/keyboard.json diff --git a/keyboards/karn/info.json b/keyboards/karn/keyboard.json similarity index 100% rename from keyboards/karn/info.json rename to keyboards/karn/keyboard.json diff --git a/keyboards/kb_elmo/aek2_usb/info.json b/keyboards/kb_elmo/aek2_usb/keyboard.json similarity index 100% rename from keyboards/kb_elmo/aek2_usb/info.json rename to keyboards/kb_elmo/aek2_usb/keyboard.json diff --git a/keyboards/kb_elmo/elmopad/info.json b/keyboards/kb_elmo/elmopad/keyboard.json similarity index 100% rename from keyboards/kb_elmo/elmopad/info.json rename to keyboards/kb_elmo/elmopad/keyboard.json diff --git a/keyboards/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/keyboard.json similarity index 100% rename from keyboards/kb_elmo/isolation/info.json rename to keyboards/kb_elmo/isolation/keyboard.json diff --git a/keyboards/kb_elmo/m0110a_usb/info.json b/keyboards/kb_elmo/m0110a_usb/keyboard.json similarity index 100% rename from keyboards/kb_elmo/m0110a_usb/info.json rename to keyboards/kb_elmo/m0110a_usb/keyboard.json diff --git a/keyboards/kb_elmo/m0116_usb/info.json b/keyboards/kb_elmo/m0116_usb/keyboard.json similarity index 100% rename from keyboards/kb_elmo/m0116_usb/info.json rename to keyboards/kb_elmo/m0116_usb/keyboard.json diff --git a/keyboards/kb_elmo/sesame/info.json b/keyboards/kb_elmo/sesame/keyboard.json similarity index 100% rename from keyboards/kb_elmo/sesame/info.json rename to keyboards/kb_elmo/sesame/keyboard.json diff --git a/keyboards/kb_elmo/twelvekey/info.json b/keyboards/kb_elmo/twelvekey/keyboard.json similarity index 100% rename from keyboards/kb_elmo/twelvekey/info.json rename to keyboards/kb_elmo/twelvekey/keyboard.json diff --git a/keyboards/kbdfans/jm60/info.json b/keyboards/kbdfans/jm60/keyboard.json similarity index 98% rename from keyboards/kbdfans/jm60/info.json rename to keyboards/kbdfans/jm60/keyboard.json index c30b43b18b2..4b0f9609524 100644 --- a/keyboards/kbdfans/jm60/info.json +++ b/keyboards/kbdfans/jm60/keyboard.json @@ -19,6 +19,8 @@ "extrakey": true, "nkro": true }, + "bootloader": "custom", + "processor": "STM32F103", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/kbdfans/jm60/rules.mk b/keyboards/kbdfans/jm60/rules.mk index 0c31ad1eab6..7b2a61d4648 100644 --- a/keyboards/kbdfans/jm60/rules.mk +++ b/keyboards/kbdfans/jm60/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = STM32F103 - +# custom bootloader MCU_LDSCRIPT = jm60_bootloader BOARD = ST_NUCLEO64_F103RB - -# Bootloader selection -BOOTLOADER = custom diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/keyboard.json similarity index 100% rename from keyboards/kbdfans/kbd4x/info.json rename to keyboards/kbdfans/kbd4x/keyboard.json diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json similarity index 100% rename from keyboards/kbdfans/kbd67/mkiirgb/v3/info.json rename to keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json similarity index 100% rename from keyboards/kbdfans/kbd67/mkiirgb_iso/info.json rename to keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/keyboard.json similarity index 100% rename from keyboards/kbdfans/niu_mini/info.json rename to keyboards/kbdfans/niu_mini/keyboard.json diff --git a/keyboards/kbdfans/odin75/info.json b/keyboards/kbdfans/odin75/keyboard.json similarity index 100% rename from keyboards/kbdfans/odin75/info.json rename to keyboards/kbdfans/odin75/keyboard.json diff --git a/keyboards/kbdmania/kmac/info.json b/keyboards/kbdmania/kmac/keyboard.json similarity index 100% rename from keyboards/kbdmania/kmac/info.json rename to keyboards/kbdmania/kmac/keyboard.json diff --git a/keyboards/kbdmania/kmac_pad/info.json b/keyboards/kbdmania/kmac_pad/keyboard.json similarity index 100% rename from keyboards/kbdmania/kmac_pad/info.json rename to keyboards/kbdmania/kmac_pad/keyboard.json diff --git a/keyboards/kbnordic/nordic65/rev_a/info.json b/keyboards/kbnordic/nordic65/rev_a/keyboard.json similarity index 100% rename from keyboards/kbnordic/nordic65/rev_a/info.json rename to keyboards/kbnordic/nordic65/rev_a/keyboard.json diff --git a/keyboards/keebio/cepstrum/rev1/info.json b/keyboards/keebio/cepstrum/rev1/keyboard.json similarity index 100% rename from keyboards/keebio/cepstrum/rev1/info.json rename to keyboards/keebio/cepstrum/rev1/keyboard.json diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/keyboard.json similarity index 100% rename from keyboards/keebio/foldkb/rev1/info.json rename to keyboards/keebio/foldkb/rev1/keyboard.json diff --git a/keyboards/keebio/foldkb/rev1/rules.mk b/keyboards/keebio/foldkb/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/keebio/iris/rev8/info.json b/keyboards/keebio/iris/rev8/keyboard.json similarity index 100% rename from keyboards/keebio/iris/rev8/info.json rename to keyboards/keebio/iris/rev8/keyboard.json diff --git a/keyboards/keebio/iris_ce/rev1/info.json b/keyboards/keebio/iris_ce/rev1/keyboard.json similarity index 100% rename from keyboards/keebio/iris_ce/rev1/info.json rename to keyboards/keebio/iris_ce/rev1/keyboard.json diff --git a/keyboards/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/keyboard.json similarity index 100% rename from keyboards/keebio/levinson/rev3/info.json rename to keyboards/keebio/levinson/rev3/keyboard.json diff --git a/keyboards/keebio/nyquist/rev4/info.json b/keyboards/keebio/nyquist/rev4/keyboard.json similarity index 100% rename from keyboards/keebio/nyquist/rev4/info.json rename to keyboards/keebio/nyquist/rev4/keyboard.json diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/keyboard.json similarity index 100% rename from keyboards/keebio/sinc/rev3/info.json rename to keyboards/keebio/sinc/rev3/keyboard.json diff --git a/keyboards/keebio/sinc/rev4/info.json b/keyboards/keebio/sinc/rev4/keyboard.json similarity index 100% rename from keyboards/keebio/sinc/rev4/info.json rename to keyboards/keebio/sinc/rev4/keyboard.json diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/keyboard.json similarity index 100% rename from keyboards/keebio/wavelet/info.json rename to keyboards/keebio/wavelet/keyboard.json diff --git a/keyboards/keebwerk/mega/ansi/info.json b/keyboards/keebwerk/mega/ansi/keyboard.json similarity index 100% rename from keyboards/keebwerk/mega/ansi/info.json rename to keyboards/keebwerk/mega/ansi/keyboard.json diff --git a/keyboards/keebwerk/nano_slider/info.json b/keyboards/keebwerk/nano_slider/keyboard.json similarity index 100% rename from keyboards/keebwerk/nano_slider/info.json rename to keyboards/keebwerk/nano_slider/keyboard.json diff --git a/keyboards/keyboardio/model01/info.json b/keyboards/keyboardio/model01/keyboard.json similarity index 100% rename from keyboards/keyboardio/model01/info.json rename to keyboards/keyboardio/model01/keyboard.json diff --git a/keyboards/keycapsss/3w6_2040/info.json b/keyboards/keycapsss/3w6_2040/keyboard.json similarity index 100% rename from keyboards/keycapsss/3w6_2040/info.json rename to keyboards/keycapsss/3w6_2040/keyboard.json diff --git a/keyboards/keycult/keycult65/info.json b/keyboards/keycult/keycult65/keyboard.json similarity index 100% rename from keyboards/keycult/keycult65/info.json rename to keyboards/keycult/keycult65/keyboard.json diff --git a/keyboards/keygem/kg60ansi/info.json b/keyboards/keygem/kg60ansi/keyboard.json similarity index 100% rename from keyboards/keygem/kg60ansi/info.json rename to keyboards/keygem/kg60ansi/keyboard.json diff --git a/keyboards/keygem/kg65rgbv2/info.json b/keyboards/keygem/kg65rgbv2/keyboard.json similarity index 100% rename from keyboards/keygem/kg65rgbv2/info.json rename to keyboards/keygem/kg65rgbv2/keyboard.json diff --git a/keyboards/keyhive/honeycomb/info.json b/keyboards/keyhive/honeycomb/keyboard.json similarity index 100% rename from keyboards/keyhive/honeycomb/info.json rename to keyboards/keyhive/honeycomb/keyboard.json diff --git a/keyboards/keyhive/lattice60/info.json b/keyboards/keyhive/lattice60/keyboard.json similarity index 100% rename from keyboards/keyhive/lattice60/info.json rename to keyboards/keyhive/lattice60/keyboard.json diff --git a/keyboards/kin80/blackpill401/info.json b/keyboards/kin80/blackpill401/keyboard.json similarity index 82% rename from keyboards/kin80/blackpill401/info.json rename to keyboards/kin80/blackpill401/keyboard.json index 7591d3f39c7..1047c944580 100644 --- a/keyboards/kin80/blackpill401/info.json +++ b/keyboards/kin80/blackpill401/keyboard.json @@ -1,6 +1,9 @@ { "usb": { - "device_version": "0.0.3" + "device_version": "0.0.3", + "shared_endpoint": { + "keyboard": true + } }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"], diff --git a/keyboards/kin80/blackpill401/rules.mk b/keyboards/kin80/blackpill401/rules.mk deleted file mode 100644 index 1071cf62ee3..00000000000 --- a/keyboards/kin80/blackpill401/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/kin80/blackpill411/info.json b/keyboards/kin80/blackpill411/keyboard.json similarity index 82% rename from keyboards/kin80/blackpill411/info.json rename to keyboards/kin80/blackpill411/keyboard.json index a1486351edb..d1ac0a97f70 100644 --- a/keyboards/kin80/blackpill411/info.json +++ b/keyboards/kin80/blackpill411/keyboard.json @@ -1,6 +1,9 @@ { "usb": { - "device_version": "0.0.3" + "device_version": "0.0.3", + "shared_endpoint": { + "keyboard": true + } }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"], diff --git a/keyboards/kin80/blackpill411/rules.mk b/keyboards/kin80/blackpill411/rules.mk deleted file mode 100644 index 1071cf62ee3..00000000000 --- a/keyboards/kin80/blackpill411/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/kinesis/alvicstep/info.json b/keyboards/kinesis/alvicstep/keyboard.json similarity index 100% rename from keyboards/kinesis/alvicstep/info.json rename to keyboards/kinesis/alvicstep/keyboard.json diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/keyboard.json similarity index 100% rename from keyboards/kinesis/kint41/info.json rename to keyboards/kinesis/kint41/keyboard.json diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/keyboard.json similarity index 100% rename from keyboards/kinesis/kintlc/info.json rename to keyboards/kinesis/kintlc/keyboard.json diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/keyboard.json similarity index 100% rename from keyboards/kinesis/nguyenvietyen/info.json rename to keyboards/kinesis/nguyenvietyen/keyboard.json diff --git a/keyboards/kmini/info.json b/keyboards/kmini/keyboard.json similarity index 100% rename from keyboards/kmini/info.json rename to keyboards/kmini/keyboard.json diff --git a/keyboards/kopibeng/mnk65_stm32/info.json b/keyboards/kopibeng/mnk65_stm32/keyboard.json similarity index 100% rename from keyboards/kopibeng/mnk65_stm32/info.json rename to keyboards/kopibeng/mnk65_stm32/keyboard.json diff --git a/keyboards/kopibeng/xt87/info.json b/keyboards/kopibeng/xt87/keyboard.json similarity index 100% rename from keyboards/kopibeng/xt87/info.json rename to keyboards/kopibeng/xt87/keyboard.json diff --git a/keyboards/kopibeng/xt87/rules.mk b/keyboards/kopibeng/xt87/rules.mk deleted file mode 100644 index a92b0993283..00000000000 --- a/keyboards/kopibeng/xt87/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/keyboard.json similarity index 100% rename from keyboards/kprepublic/bm60hsrgb/rev2/info.json rename to keyboards/kprepublic/bm60hsrgb/rev2/keyboard.json diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keyboard.json similarity index 100% rename from keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json rename to keyboards/kprepublic/bm60hsrgb_iso/rev2/keyboard.json diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keyboard.json similarity index 100% rename from keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json rename to keyboards/kprepublic/bm60hsrgb_poker/rev2/keyboard.json diff --git a/keyboards/ktec/ergodone/info.json b/keyboards/ktec/ergodone/keyboard.json similarity index 100% rename from keyboards/ktec/ergodone/info.json rename to keyboards/ktec/ergodone/keyboard.json From dc0095c64b2658a8fb5421ce93cb6bdc53806693 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 23 Apr 2024 03:59:58 +0100 Subject: [PATCH 174/333] Migrate build target markers to keyboard.json - N (#23589) --- keyboards/nack/{info.json => keyboard.json} | 9 ++++++++ keyboards/nack/rules.mk | 16 +------------- keyboards/nasu/{info.json => keyboard.json} | 6 +++++ keyboards/nasu/rules.mk | 13 ----------- .../nek_type_a/{info.json => keyboard.json} | 9 ++++++++ keyboards/nek_type_a/rules.mk | 15 ------------- .../700e/{info.json => keyboard.json} | 10 ++++++++- keyboards/neson_design/700e/rules.mk | 13 ----------- .../n6/{info.json => keyboard.json} | 7 ++++++ keyboards/neson_design/n6/rules.mk | 12 ---------- .../nk20/{info.json => keyboard.json} | 7 ++++++ keyboards/novelkeys/nk20/rules.mk | 14 ------------ keyboards/novelkeys/nk65/info.json | 6 +++++ keyboards/novelkeys/nk65/rules.mk | 14 +----------- .../nk65b/{info.json => keyboard.json} | 7 ++++++ keyboards/novelkeys/nk65b/rules.mk | 14 ------------ .../nk87/{info.json => keyboard.json} | 6 +++++ keyboards/novelkeys/nk87/rules.mk | 15 +------------ .../nk87b/{info.json => keyboard.json} | 7 ++++++ keyboards/novelkeys/nk87b/rules.mk | 14 ------------ .../nk_plus/{info.json => keyboard.json} | 0 .../skelett60/{info.json => keyboard.json} | 0 keyboards/novelkeys/skelett60/rules.mk | 1 - .../nibble/{info.json => keyboard.json} | 11 ++++++++++ keyboards/nullbitsco/nibble/rules.mk | 19 +++------------- keyboards/nullbitsco/scramble/rules.mk | 3 --- .../scramble/v1/{info.json => keyboard.json} | 7 ++++++ keyboards/nullbitsco/scramble/v1/rules.mk | 13 ----------- .../scramble/v2/{info.json => keyboard.json} | 7 ++++++ keyboards/nullbitsco/scramble/v2/rules.mk | 13 ----------- .../snap/{info.json => keyboard.json} | 12 ++++++++++ keyboards/nullbitsco/snap/rules.mk | 20 +++-------------- .../tidbit/{info.json => keyboard.json} | 11 ++++++++++ keyboards/nullbitsco/tidbit/rules.mk | 15 ------------- .../numatreus/{info.json => keyboard.json} | 7 ++++++ keyboards/numatreus/keymaps/like_jis/config.h | 22 ++++++++----------- keyboards/numatreus/keymaps/like_jis/rules.mk | 5 ----- keyboards/numatreus/post_rules.mk | 3 --- keyboards/numatreus/rules.mk | 13 ----------- 39 files changed, 146 insertions(+), 250 deletions(-) rename keyboards/nack/{info.json => keyboard.json} (96%) rename keyboards/nasu/{info.json => keyboard.json} (98%) rename keyboards/nek_type_a/{info.json => keyboard.json} (96%) rename keyboards/neson_design/700e/{info.json => keyboard.json} (98%) rename keyboards/neson_design/n6/{info.json => keyboard.json} (98%) rename keyboards/novelkeys/nk20/{info.json => keyboard.json} (95%) rename keyboards/novelkeys/nk65b/{info.json => keyboard.json} (97%) rename keyboards/novelkeys/nk87/{info.json => keyboard.json} (98%) rename keyboards/novelkeys/nk87b/{info.json => keyboard.json} (98%) rename keyboards/novelkeys/nk_plus/{info.json => keyboard.json} (100%) rename keyboards/novelkeys/skelett60/{info.json => keyboard.json} (100%) rename keyboards/nullbitsco/nibble/{info.json => keyboard.json} (98%) rename keyboards/nullbitsco/scramble/v1/{info.json => keyboard.json} (68%) delete mode 100644 keyboards/nullbitsco/scramble/v1/rules.mk rename keyboards/nullbitsco/scramble/v2/{info.json => keyboard.json} (69%) delete mode 100644 keyboards/nullbitsco/scramble/v2/rules.mk rename keyboards/nullbitsco/snap/{info.json => keyboard.json} (98%) rename keyboards/nullbitsco/tidbit/{info.json => keyboard.json} (90%) rename keyboards/numatreus/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/numatreus/post_rules.mk delete mode 100644 keyboards/numatreus/rules.mk diff --git a/keyboards/nack/info.json b/keyboards/nack/keyboard.json similarity index 96% rename from keyboards/nack/info.json rename to keyboards/nack/keyboard.json index 4af3f641261..6a3b6db3ade 100644 --- a/keyboards/nack/info.json +++ b/keyboards/nack/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "audio": true, + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": true, + "rgb_matrix": true, + "unicode": true + }, "ws2812": { "pin": "B5", "driver": "spi" diff --git a/keyboards/nack/rules.mk b/keyboards/nack/rules.mk index d2558648ddc..72354402a6b 100644 --- a/keyboards/nack/rules.mk +++ b/keyboards/nack/rules.mk @@ -1,15 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output -RGB_MATRIX_ENABLE = yes -AUDIO_DRIVER = dac_basic # How to drive the 2 speakers -UNICODE_ENABLE = yes # Unicode support +AUDIO_DRIVER = dac_basic diff --git a/keyboards/nasu/info.json b/keyboards/nasu/keyboard.json similarity index 98% rename from keyboards/nasu/info.json rename to keyboards/nasu/keyboard.json index c92da94c502..54905f4d097 100644 --- a/keyboards/nasu/info.json +++ b/keyboards/nasu/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x4E53", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["A13", "A10", "B10", "B2", "A6"] diff --git a/keyboards/nasu/rules.mk b/keyboards/nasu/rules.mk index 7c0709f41e6..0ab54aaaf71 100644 --- a/keyboards/nasu/rules.mk +++ b/keyboards/nasu/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 diff --git a/keyboards/nek_type_a/info.json b/keyboards/nek_type_a/keyboard.json similarity index 96% rename from keyboards/nek_type_a/info.json rename to keyboards/nek_type_a/keyboard.json index 6cb972b17f6..632eafee44c 100644 --- a/keyboards/nek_type_a/info.json +++ b/keyboards/nek_type_a/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bluetooth": true, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "bluetooth": { "driver": "bluefruit_le" }, diff --git a/keyboards/nek_type_a/rules.mk b/keyboards/nek_type_a/rules.mk index f79051ebceb..e753d6afbe3 100644 --- a/keyboards/nek_type_a/rules.mk +++ b/keyboards/nek_type_a/rules.mk @@ -1,20 +1,5 @@ # 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 = 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 = yes -DEBUG_ENABLE = yes -BLUETOOTH_ENABLE = yes - SRC += matrix.c mcp23017.c diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/keyboard.json similarity index 98% rename from keyboards/neson_design/700e/info.json rename to keyboards/neson_design/700e/keyboard.json index 3b74e9609a9..64a18f436bc 100644 --- a/keyboards/neson_design/700e/info.json +++ b/keyboards/neson_design/700e/keyboard.json @@ -6,7 +6,15 @@ "usb": { "vid": "0x4E65", "pid": "0x700E", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true }, "matrix_pins": { "cols": ["F7", "B0", "B3", "B1", "B2", "F4", "C7", "C6", "B6", "B5", "B4", "D7", "D3", "D2", "D6", "D4"], diff --git a/keyboards/neson_design/700e/rules.mk b/keyboards/neson_design/700e/rules.mk index dd1db38babf..6fab966c731 100644 --- a/keyboards/neson_design/700e/rules.mk +++ b/keyboards/neson_design/700e/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 = yes # Enable keyboard RGB underglow -NO_USB_STARTUP_CHECK = yes - QUANTUM_LIB_SRC += drivers/led/issi/is31fl3731.c WS2812_DRIVER_REQUIRED = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/keyboard.json similarity index 98% rename from keyboards/neson_design/n6/info.json rename to keyboards/neson_design/n6/keyboard.json index c48824d80f3..66e6fb740c8 100644 --- a/keyboards/neson_design/n6/info.json +++ b/keyboards/neson_design/n6/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x4E36", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "B0", "E6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B2", "D3", "D2"], "rows": ["F0", "B1", "F6", "F4", "F1"] diff --git a/keyboards/neson_design/n6/rules.mk b/keyboards/neson_design/n6/rules.mk index 4c9ce453526..6fab966c731 100644 --- a/keyboards/neson_design/n6/rules.mk +++ b/keyboards/neson_design/n6/rules.mk @@ -1,15 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow - QUANTUM_LIB_SRC += drivers/led/issi/is31fl3731.c WS2812_DRIVER_REQUIRED = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/keyboard.json similarity index 95% rename from keyboards/novelkeys/nk20/info.json rename to keyboards/novelkeys/nk20/keyboard.json index 6d25ca4c21e..f2728967b44 100644 --- a/keyboards/novelkeys/nk20/info.json +++ b/keyboards/novelkeys/nk20/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x4E4E", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "ws2812": { "pin": "A7", "driver": "pwm" diff --git a/keyboards/novelkeys/nk20/rules.mk b/keyboards/novelkeys/nk20/rules.mk index 9470fce1ba2..0ab54aaaf71 100644 --- a/keyboards/novelkeys/nk20/rules.mk +++ b/keyboards/novelkeys/nk20/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable Per-key RGB diff --git a/keyboards/novelkeys/nk65/info.json b/keyboards/novelkeys/nk65/info.json index 59187f9ef87..e3bff193466 100755 --- a/keyboards/novelkeys/nk65/info.json +++ b/keyboards/novelkeys/nk65/info.json @@ -8,6 +8,12 @@ "pid": "0x4E4B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/novelkeys/nk65/rules.mk b/keyboards/novelkeys/nk65/rules.mk index 5827e557b95..9fe973310c1 100755 --- a/keyboards/novelkeys/nk65/rules.mk +++ b/keyboards/novelkeys/nk65/rules.mk @@ -3,25 +3,13 @@ # 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 - 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 DEFAULT_FOLDER = novelkeys/nk65/base diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/keyboard.json similarity index 97% rename from keyboards/novelkeys/nk65b/info.json rename to keyboards/novelkeys/nk65b/keyboard.json index 8e6e01fe46e..0c2794c1202 100755 --- a/keyboards/novelkeys/nk65b/info.json +++ b/keyboards/novelkeys/nk65b/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x4E4F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "ws2812": { "pin": "B4", "driver": "pwm" diff --git a/keyboards/novelkeys/nk65b/rules.mk b/keyboards/novelkeys/nk65b/rules.mk index 9470fce1ba2..0ab54aaaf71 100644 --- a/keyboards/novelkeys/nk65b/rules.mk +++ b/keyboards/novelkeys/nk65b/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable Per-key RGB diff --git a/keyboards/novelkeys/nk87/info.json b/keyboards/novelkeys/nk87/keyboard.json similarity index 98% rename from keyboards/novelkeys/nk87/info.json rename to keyboards/novelkeys/nk87/keyboard.json index 6170895405d..9573ff4c9ce 100755 --- a/keyboards/novelkeys/nk87/info.json +++ b/keyboards/novelkeys/nk87/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x4E4C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B2", "B0", "A6", "A0", "A1", "A2", "A3", "A5", "B1", "B10"], "rows": ["A7", "B3", "B4", "B5", "A8", "A4"] diff --git a/keyboards/novelkeys/nk87/rules.mk b/keyboards/novelkeys/nk87/rules.mk index a0a09c1dabb..ef378d1ec25 100755 --- a/keyboards/novelkeys/nk87/rules.mk +++ b/keyboards/novelkeys/nk87/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 - 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/novelkeys/nk87b/info.json b/keyboards/novelkeys/nk87b/keyboard.json similarity index 98% rename from keyboards/novelkeys/nk87b/info.json rename to keyboards/novelkeys/nk87b/keyboard.json index cbcc8e2e18f..f81793aceed 100755 --- a/keyboards/novelkeys/nk87b/info.json +++ b/keyboards/novelkeys/nk87b/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x4E50", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "ws2812": { "pin": "B0", "driver": "pwm" diff --git a/keyboards/novelkeys/nk87b/rules.mk b/keyboards/novelkeys/nk87b/rules.mk index 9470fce1ba2..0ab54aaaf71 100644 --- a/keyboards/novelkeys/nk87b/rules.mk +++ b/keyboards/novelkeys/nk87b/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 = yes # Enable Per-key RGB diff --git a/keyboards/novelkeys/nk_plus/info.json b/keyboards/novelkeys/nk_plus/keyboard.json similarity index 100% rename from keyboards/novelkeys/nk_plus/info.json rename to keyboards/novelkeys/nk_plus/keyboard.json diff --git a/keyboards/novelkeys/skelett60/info.json b/keyboards/novelkeys/skelett60/keyboard.json similarity index 100% rename from keyboards/novelkeys/skelett60/info.json rename to keyboards/novelkeys/skelett60/keyboard.json diff --git a/keyboards/novelkeys/skelett60/rules.mk b/keyboards/novelkeys/skelett60/rules.mk index 6dd24d8e068..0ab54aaaf71 100644 --- a/keyboards/novelkeys/skelett60/rules.mk +++ b/keyboards/novelkeys/skelett60/rules.mk @@ -1,3 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - diff --git a/keyboards/nullbitsco/nibble/info.json b/keyboards/nullbitsco/nibble/keyboard.json similarity index 98% rename from keyboards/nullbitsco/nibble/info.json rename to keyboards/nullbitsco/nibble/keyboard.json index 159e5012185..fb1c8098a0a 100644 --- a/keyboards/nullbitsco/nibble/info.json +++ b/keyboards/nullbitsco/nibble/keyboard.json @@ -7,6 +7,17 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B4"} diff --git a/keyboards/nullbitsco/nibble/rules.mk b/keyboards/nullbitsco/nibble/rules.mk index 5a1714cc9dd..ad36b7fcc97 100644 --- a/keyboards/nullbitsco/nibble/rules.mk +++ b/keyboards/nullbitsco/nibble/rules.mk @@ -1,22 +1,9 @@ -# 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 -ENCODER_ENABLE = yes # Use rotary encoder -LTO_ENABLE = yes # Link-time optimization -CUSTOM_MATRIX = lite # Lite custom matrix +CUSTOM_MATRIX = lite + +UART_DRIVER_REQUIRED = yes # Project specific files SRC += matrix.c \ common/bitc_led.c \ big_led.c \ common/remote_kb.c -UART_DRIVER_REQUIRED = yes diff --git a/keyboards/nullbitsco/scramble/rules.mk b/keyboards/nullbitsco/scramble/rules.mk index 6f83796e9f4..5753f7786db 100644 --- a/keyboards/nullbitsco/scramble/rules.mk +++ b/keyboards/nullbitsco/scramble/rules.mk @@ -1,4 +1 @@ -# NOTE: This file is shared and only exists to set the default build -# The real build rules are set in the v1/v2 directories - DEFAULT_FOLDER = nullbitsco/scramble/v2 diff --git a/keyboards/nullbitsco/scramble/v1/info.json b/keyboards/nullbitsco/scramble/v1/keyboard.json similarity index 68% rename from keyboards/nullbitsco/scramble/v1/info.json rename to keyboards/nullbitsco/scramble/v1/keyboard.json index 5a9aeef64be..145f4f389cc 100644 --- a/keyboards/nullbitsco/scramble/v1/info.json +++ b/keyboards/nullbitsco/scramble/v1/keyboard.json @@ -1,4 +1,11 @@ { + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "encoder": { "rotary": [ {"pin_a": "D6", "pin_b": "D7"} diff --git a/keyboards/nullbitsco/scramble/v1/rules.mk b/keyboards/nullbitsco/scramble/v1/rules.mk deleted file mode 100644 index f917d68f4e2..00000000000 --- a/keyboards/nullbitsco/scramble/v1/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Use rotary encoder diff --git a/keyboards/nullbitsco/scramble/v2/info.json b/keyboards/nullbitsco/scramble/v2/keyboard.json similarity index 69% rename from keyboards/nullbitsco/scramble/v2/info.json rename to keyboards/nullbitsco/scramble/v2/keyboard.json index 2a89a1063b2..a55e878741e 100644 --- a/keyboards/nullbitsco/scramble/v2/info.json +++ b/keyboards/nullbitsco/scramble/v2/keyboard.json @@ -1,4 +1,11 @@ { + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "encoder": { "rotary": [ {"pin_a": "GP24", "pin_b": "GP25"} diff --git a/keyboards/nullbitsco/scramble/v2/rules.mk b/keyboards/nullbitsco/scramble/v2/rules.mk deleted file mode 100644 index f917d68f4e2..00000000000 --- a/keyboards/nullbitsco/scramble/v2/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 -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Use rotary encoder diff --git a/keyboards/nullbitsco/snap/info.json b/keyboards/nullbitsco/snap/keyboard.json similarity index 98% rename from keyboards/nullbitsco/snap/info.json rename to keyboards/nullbitsco/snap/keyboard.json index 909e45d1625..139bbf5b450 100644 --- a/keyboards/nullbitsco/snap/info.json +++ b/keyboards/nullbitsco/snap/keyboard.json @@ -7,6 +7,18 @@ "pid": "0x6063", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true, + "space_cadet": false + }, "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B1"} diff --git a/keyboards/nullbitsco/snap/rules.mk b/keyboards/nullbitsco/snap/rules.mk index 087be867f3e..1603cb408ce 100644 --- a/keyboards/nullbitsco/snap/rules.mk +++ b/keyboards/nullbitsco/snap/rules.mk @@ -1,22 +1,8 @@ -# 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 -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes # Use Link Time Optimization -ENCODER_ENABLE = yes # Enables the use of one or more encoders -SPACE_CADET_ENABLE = no # Enables the use of Space Cadet -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -CUSTOM_MATRIX = lite # Split custom matrix +CUSTOM_MATRIX = lite + +UART_DRIVER_REQUIRED = yes # Project specific files SRC += common/bitc_led.c \ common/remote_kb.c \ matrix.c -UART_DRIVER_REQUIRED = yes diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/keyboard.json similarity index 90% rename from keyboards/nullbitsco/tidbit/info.json rename to keyboards/nullbitsco/tidbit/keyboard.json index b8eaf60d89e..83593ad5236 100644 --- a/keyboards/nullbitsco/tidbit/info.json +++ b/keyboards/nullbitsco/tidbit/keyboard.json @@ -7,6 +7,17 @@ "pid": "0x6064", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "rgblight": { "led_count": 8, "animations": { diff --git a/keyboards/nullbitsco/tidbit/rules.mk b/keyboards/nullbitsco/tidbit/rules.mk index b4a06216bb6..9cc22114aec 100644 --- a/keyboards/nullbitsco/tidbit/rules.mk +++ b/keyboards/nullbitsco/tidbit/rules.mk @@ -1,18 +1,3 @@ -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes - # Project specific files SRC += common/bitc_led.c \ common/remote_kb.c diff --git a/keyboards/numatreus/info.json b/keyboards/numatreus/keyboard.json similarity index 95% rename from keyboards/numatreus/info.json rename to keyboards/numatreus/keyboard.json index bdf4a574c68..cfb612a5416 100644 --- a/keyboards/numatreus/info.json +++ b/keyboards/numatreus/keyboard.json @@ -8,6 +8,13 @@ "pid": "0xE80A", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D2", "D1", "D0", "D4"], "rows": ["C6", "D7", "E6", "B4"] diff --git a/keyboards/numatreus/keymaps/like_jis/config.h b/keyboards/numatreus/keymaps/like_jis/config.h index 70faffdf37a..52675f5ec50 100644 --- a/keyboards/numatreus/keymaps/like_jis/config.h +++ b/keyboards/numatreus/keymaps/like_jis/config.h @@ -22,9 +22,7 @@ along with this program. If not, see . // place overrides here -#ifdef TAPPING_TERM #undef TAPPING_TERM -#endif #define TAPPING_TERM 225 #ifdef MOUSEKEY_ENABLE @@ -45,14 +43,12 @@ along with this program. If not, see . #endif // Selection of RGBLIGHT MODE to use. -#if defined(LED_ANIMATIONS) - //#define RGBLIGHT_EFFECT_BREATHING - #define RGBLIGHT_EFFECT_RAINBOW_MOOD - #define RGBLIGHT_EFFECT_RAINBOW_SWIRL - //#define RGBLIGHT_EFFECT_SNAKE - #define RGBLIGHT_EFFECT_KNIGHT - //#define RGBLIGHT_EFFECT_CHRISTMAS - #define RGBLIGHT_EFFECT_STATIC_GRADIENT - //#define RGBLIGHT_EFFECT_RGB_TEST - //#define RGBLIGHT_EFFECT_ALTERNATING -#endif +//#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +//#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +//#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +//#define RGBLIGHT_EFFECT_RGB_TEST +//#define RGBLIGHT_EFFECT_ALTERNATING diff --git a/keyboards/numatreus/keymaps/like_jis/rules.mk b/keyboards/numatreus/keymaps/like_jis/rules.mk index 959653f3f81..995178768cc 100644 --- a/keyboards/numatreus/keymaps/like_jis/rules.mk +++ b/keyboards/numatreus/keymaps/like_jis/rules.mk @@ -1,8 +1,3 @@ MOUSEKEY_ENABLE = yes TAP_DANCE_ENABLE = yes RGBLIGHT_ENABLE = yes -LED_ANIMATIONS = yes - -ifeq ($(strip $(LED_ANIMATIONS)), yes) - OPT_DEFS += -DLED_ANIMATIONS -endif diff --git a/keyboards/numatreus/post_rules.mk b/keyboards/numatreus/post_rules.mk deleted file mode 100644 index 1f49875d0fe..00000000000 --- a/keyboards/numatreus/post_rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(strip $(LED_ANIMATIONS)), yes) - OPT_DEFS += -DLED_ANIMATIONS -endif diff --git a/keyboards/numatreus/rules.mk b/keyboards/numatreus/rules.mk deleted file mode 100644 index 2a92a7e48b8..00000000000 --- a/keyboards/numatreus/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 = 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 -UNICODE_ENABLE = yes # Unicode -RGBLIGHT_ENABLE = no -LED_ANIMATIONS = no From a1cbdf145fe90a60fed2d567ac944277a4234089 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 22 Apr 2024 20:06:24 -0700 Subject: [PATCH 175/333] Data-Driven Keyboard Conversions: M, Part 1 (#23590) --- .../lyra/rev1/{info.json => keyboard.json} | 8 ++++ keyboards/malevolti/lyra/rev1/rules.mk | 14 ------ .../maple_computing/christmas_tree/info.json | 44 ------------------ .../christmas_tree/v2017/info.json | 5 --- .../christmas_tree/v2017/keyboard.json | 45 +++++++++++++++++++ .../christmas_tree/v2017/rules.mk | 3 -- .../maple_computing/ivy/rev1/keyboard.json | 6 +++ keyboards/maple_computing/ivy/rules.mk | 13 ------ keyboards/maple_computing/jnao/info.json | 8 ++++ keyboards/maple_computing/jnao/rules.mk | 13 ------ .../launchpad/rev1/keyboard.json | 6 +++ keyboards/maple_computing/launchpad/rules.mk | 13 ------ .../lets_split_eh/eh/info.json | 8 ++++ .../maple_computing/lets_split_eh/eh/rules.mk | 3 -- .../maple_computing/lets_split_eh/rules.mk | 13 ------ .../minidox/rev1/{info.json => keyboard.json} | 6 +++ .../maple_computing/minidox/rev1/rules.mk | 1 - keyboards/maple_computing/minidox/rules.mk | 13 ------ .../marksard/rhymestone/rev1/keyboard.json | 6 +++ keyboards/marksard/rhymestone/rules.mk | 14 ------ .../marksard/treadstone48/rev1/keyboard.json | 7 +++ .../marksard/treadstone48/rev2/info.json | 7 +++ keyboards/marksard/treadstone48/rev2/rules.mk | 1 - keyboards/marksard/treadstone48/rules.mk | 16 ------- keyboards/massdrop/alt/info.json | 7 +++ keyboards/massdrop/alt/rules.mk | 18 -------- keyboards/massdrop/ctrl/info.json | 7 +++ keyboards/massdrop/ctrl/rules.mk | 18 -------- keyboards/matrix/abelx/info.json | 9 +++- keyboards/matrix/abelx/rules.mk | 16 +------ keyboards/matrix/m12og/rev1/info.json | 9 ++++ keyboards/matrix/m12og/rev1/rules.mk | 14 ------ keyboards/matrix/m20add/info.json | 9 +++- keyboards/matrix/m20add/rules.mk | 13 ------ keyboards/matrix/noah/info.json | 10 ++++- keyboards/matrix/noah/rules.mk | 14 ------ 36 files changed, 156 insertions(+), 261 deletions(-) rename keyboards/malevolti/lyra/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/malevolti/lyra/rev1/rules.mk delete mode 100644 keyboards/maple_computing/christmas_tree/info.json delete mode 100644 keyboards/maple_computing/christmas_tree/v2017/info.json create mode 100644 keyboards/maple_computing/christmas_tree/v2017/keyboard.json delete mode 100644 keyboards/maple_computing/christmas_tree/v2017/rules.mk rename keyboards/maple_computing/minidox/rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/maple_computing/minidox/rev1/rules.mk diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/keyboard.json similarity index 96% rename from keyboards/malevolti/lyra/rev1/info.json rename to keyboards/malevolti/lyra/rev1/keyboard.json index 6bbf3477dc0..4c88b71692f 100644 --- a/keyboards/malevolti/lyra/rev1/info.json +++ b/keyboards/malevolti/lyra/rev1/keyboard.json @@ -22,6 +22,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/malevolti/lyra/rev1/rules.mk b/keyboards/malevolti/lyra/rev1/rules.mk deleted file mode 100644 index c2c363d51c3..00000000000 --- a/keyboards/malevolti/lyra/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LTO_ENABLE = yes diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json deleted file mode 100644 index ced352ccaa1..00000000000 --- a/keyboards/maple_computing/christmas_tree/info.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "keyboard_name": "Christmas Tree", - "manufacturer": "Maple Computing", - "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/", - "maintainer": "That-Canadian", - "usb": { - "vid": "0xFEED", - "pid": "0x3070" - }, - "features": { - "backlight": true, - "bootmagic": false, - "command": false, - "console": true, - "extrakey": true, - "mousekey": false, - "nkro": false - }, - "matrix_pins": { - "cols": ["D1"], - "rows": ["D3", "F4", "D0", "F6", "F5", "D4"] - }, - "diode_direction": "COL2ROW", - "backlight": { - "driver": "timer", - "pin": "D2" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 1, "y": 0}, - - {"matrix": [1, 0], "x": 0.5, "y": 1}, - {"matrix": [2, 0], "x": 1.5, "y": 1}, - - {"matrix": [3, 0], "x": 0, "y": 2}, - {"matrix": [4, 0], "x": 1, "y": 2}, - {"matrix": [5, 0], "x": 2, "y": 2} - ] - } - } -} diff --git a/keyboards/maple_computing/christmas_tree/v2017/info.json b/keyboards/maple_computing/christmas_tree/v2017/info.json deleted file mode 100644 index 6d00c2519fb..00000000000 --- a/keyboards/maple_computing/christmas_tree/v2017/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "usb": { - "device_version": "20.1.7" - } -} diff --git a/keyboards/maple_computing/christmas_tree/v2017/keyboard.json b/keyboards/maple_computing/christmas_tree/v2017/keyboard.json new file mode 100644 index 00000000000..dd54b78f5d4 --- /dev/null +++ b/keyboards/maple_computing/christmas_tree/v2017/keyboard.json @@ -0,0 +1,45 @@ +{ + "keyboard_name": "Christmas Tree", + "manufacturer": "Maple Computing", + "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/", + "maintainer": "That-Canadian", + "usb": { + "vid": "0xFEED", + "pid": "0x3070", + "device_version": "20.1.7" + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, + "matrix_pins": { + "cols": ["D1"], + "rows": ["D3", "F4", "D0", "F6", "F5", "D4"] + }, + "diode_direction": "COL2ROW", + "backlight": { + "driver": "timer", + "pin": "D2" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [ 0, 0 ], "x": 1, "y": 0}, + + {"matrix": [ 1, 0 ], "x": 0.5, "y": 1}, + {"matrix": [ 2, 0 ], "x": 1.5, "y": 1}, + + {"matrix": [ 3, 0 ], "x": 0, "y": 2}, + {"matrix": [ 4, 0 ], "x": 1, "y": 2}, + {"matrix": [ 5, 0 ], "x": 2, "y": 2} + ] + } + } +} diff --git a/keyboards/maple_computing/christmas_tree/v2017/rules.mk b/keyboards/maple_computing/christmas_tree/v2017/rules.mk deleted file mode 100644 index 184a1f2247e..00000000000 --- a/keyboards/maple_computing/christmas_tree/v2017/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -AUDIO_ENABLE = no # Audio output \ No newline at end of file diff --git a/keyboards/maple_computing/ivy/rev1/keyboard.json b/keyboards/maple_computing/ivy/rev1/keyboard.json index de89abee75c..a4c5cdcce3e 100644 --- a/keyboards/maple_computing/ivy/rev1/keyboard.json +++ b/keyboards/maple_computing/ivy/rev1/keyboard.json @@ -19,6 +19,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "backlight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/ivy/rules.mk b/keyboards/maple_computing/ivy/rules.mk index 49af313aeb8..2665d44abd7 100644 --- a/keyboards/maple_computing/ivy/rules.mk +++ b/keyboards/maple_computing/ivy/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 = 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = maple_computing/ivy/rev1 diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/info.json index 73ddf107ecb..861baa95b94 100644 --- a/keyboards/maple_computing/jnao/info.json +++ b/keyboards/maple_computing/jnao/info.json @@ -19,6 +19,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "backlight": true + }, "community_layouts": ["ortho_5x12", "ortho_4x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/maple_computing/jnao/rules.mk b/keyboards/maple_computing/jnao/rules.mk index a18e35e796a..09057bea54b 100644 --- a/keyboards/maple_computing/jnao/rules.mk +++ b/keyboards/maple_computing/jnao/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # 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/maple_computing/launchpad/rev1/keyboard.json b/keyboards/maple_computing/launchpad/rev1/keyboard.json index a846dd83f50..7308c496702 100644 --- a/keyboards/maple_computing/launchpad/rev1/keyboard.json +++ b/keyboards/maple_computing/launchpad/rev1/keyboard.json @@ -33,6 +33,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/launchpad/rules.mk b/keyboards/maple_computing/launchpad/rules.mk index 42b694f9180..8c35a608a6a 100644 --- a/keyboards/maple_computing/launchpad/rules.mk +++ b/keyboards/maple_computing/launchpad/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 = 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. - DEFAULT_FOLDER = maple_computing/launchpad/rev1 diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json index 6b680418df3..f40b15098f5 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/info.json +++ b/keyboards/maple_computing/lets_split_eh/eh/info.json @@ -41,6 +41,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["ortho_4x12"], "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" diff --git a/keyboards/maple_computing/lets_split_eh/eh/rules.mk b/keyboards/maple_computing/lets_split_eh/eh/rules.mk index 0c7e1cb04e1..271780b75ec 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/rules.mk +++ b/keyboards/maple_computing/lets_split_eh/eh/rules.mk @@ -1,5 +1,2 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes - # Disable unsupported hardware AUDIO_SUPPORTED = no diff --git a/keyboards/maple_computing/lets_split_eh/rules.mk b/keyboards/maple_computing/lets_split_eh/rules.mk index 8e8d4c13b6c..9bae45fde84 100644 --- a/keyboards/maple_computing/lets_split_eh/rules.mk +++ b/keyboards/maple_computing/lets_split_eh/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 = 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. - DEFAULT_FOLDER = maple_computing/lets_split_eh/eh diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/keyboard.json similarity index 95% rename from keyboards/maple_computing/minidox/rev1/info.json rename to keyboards/maple_computing/minidox/rev1/keyboard.json index 6f3a0dd1fca..e7f1e027ae5 100644 --- a/keyboards/maple_computing/minidox/rev1/info.json +++ b/keyboards/maple_computing/minidox/rev1/keyboard.json @@ -19,6 +19,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + }, "community_layouts": ["split_3x5_3"], "layout_aliases": { "LAYOUT": "LAYOUT_split_3x5_3" diff --git a/keyboards/maple_computing/minidox/rev1/rules.mk b/keyboards/maple_computing/minidox/rev1/rules.mk deleted file mode 100644 index 7b30c0beff2..00000000000 --- a/keyboards/maple_computing/minidox/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no diff --git a/keyboards/maple_computing/minidox/rules.mk b/keyboards/maple_computing/minidox/rules.mk index 64efe315122..d5a7f49e402 100644 --- a/keyboards/maple_computing/minidox/rules.mk +++ b/keyboards/maple_computing/minidox/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 = maple_computing/minidox/rev1 diff --git a/keyboards/marksard/rhymestone/rev1/keyboard.json b/keyboards/marksard/rhymestone/rev1/keyboard.json index 31eb063c030..86af26b0727 100644 --- a/keyboards/marksard/rhymestone/rev1/keyboard.json +++ b/keyboards/marksard/rhymestone/rev1/keyboard.json @@ -44,6 +44,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "nkro": true + }, "community_layouts": ["ortho_4x10"], "layouts": { "LAYOUT_ortho_4x10": { diff --git a/keyboards/marksard/rhymestone/rules.mk b/keyboards/marksard/rhymestone/rules.mk index 477a0a7da73..18338887081 100644 --- a/keyboards/marksard/rhymestone/rules.mk +++ b/keyboards/marksard/rhymestone/rules.mk @@ -1,15 +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 = 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 - DEFAULT_FOLDER = marksard/rhymestone/rev1 diff --git a/keyboards/marksard/treadstone48/rev1/keyboard.json b/keyboards/marksard/treadstone48/rev1/keyboard.json index 07ad96140d9..f8da65b7b50 100644 --- a/keyboards/marksard/treadstone48/rev1/keyboard.json +++ b/keyboards/marksard/treadstone48/rev1/keyboard.json @@ -34,6 +34,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": false, + "rgblight": true, + "oled": true + }, "layouts": { "LAYOUT_base": { "layout": [ diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json index 59af38e55d9..56346d080a6 100644 --- a/keyboards/marksard/treadstone48/rev2/info.json +++ b/keyboards/marksard/treadstone48/rev2/info.json @@ -31,6 +31,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": false, + "rgblight": true, + "oled": true + }, "layout_aliases": { "LAYOUT_full": "LAYOUT_base" }, diff --git a/keyboards/marksard/treadstone48/rev2/rules.mk b/keyboards/marksard/treadstone48/rev2/rules.mk index 3bbd2614291..e69de29bb2d 100644 --- a/keyboards/marksard/treadstone48/rev2/rules.mk +++ b/keyboards/marksard/treadstone48/rev2/rules.mk @@ -1 +0,0 @@ -# File intentionally blank diff --git a/keyboards/marksard/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk index dddb6f07296..23865d27e63 100644 --- a/keyboards/marksard/treadstone48/rules.mk +++ b/keyboards/marksard/treadstone48/rules.mk @@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -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 # Audio output - -MOUSEKEY_ENABLE = yes # Mouse keys - -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -OLED_ENABLE = yes - DEFAULT_FOLDER = marksard/treadstone48/rev1 diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/info.json index 90de8c69047..7598a43b7dd 100644 --- a/keyboards/massdrop/alt/info.json +++ b/keyboards/massdrop/alt/info.json @@ -17,6 +17,13 @@ }, "diode_direction": "COL2ROW", "community_layouts": ["65_ansi_blocker"], + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker" }, diff --git a/keyboards/massdrop/alt/rules.mk b/keyboards/massdrop/alt/rules.mk index 765e92b9161..869853e858e 100644 --- a/keyboards/massdrop/alt/rules.mk +++ b/keyboards/massdrop/alt/rules.mk @@ -7,21 +7,3 @@ MCU = cortex-m4 # Bootloader selection BOOTLOADER = md-boot - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -VIRTSER_ENABLE = no # USB Serial Driver -AUTO_SHIFT_ENABLE = no # Auto Shift - -# Custom RGB matrix handling -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json index e030881ca82..d3488ebd6bb 100644 --- a/keyboards/massdrop/ctrl/info.json +++ b/keyboards/massdrop/ctrl/info.json @@ -16,6 +16,13 @@ "rows": ["B04", "B05", "B06", "B07", "B08", "B09", "A10", "A11", "B10", "B11", "B12"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/massdrop/ctrl/rules.mk b/keyboards/massdrop/ctrl/rules.mk index 765e92b9161..869853e858e 100644 --- a/keyboards/massdrop/ctrl/rules.mk +++ b/keyboards/massdrop/ctrl/rules.mk @@ -7,21 +7,3 @@ MCU = cortex-m4 # Bootloader selection BOOTLOADER = md-boot - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -VIRTSER_ENABLE = no # USB Serial Driver -AUTO_SHIFT_ENABLE = no # Auto Shift - -# Custom RGB matrix handling -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/matrix/abelx/info.json b/keyboards/matrix/abelx/info.json index b9aa23b7566..d62ddf53e22 100644 --- a/keyboards/matrix/abelx/info.json +++ b/keyboards/matrix/abelx/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4D58", "pid": "0xAB87", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "rgblight": { "led_count": 9, @@ -27,6 +28,12 @@ "ws2812": { "pin": "B4" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/matrix/abelx/rules.mk b/keyboards/matrix/abelx/rules.mk index 83142dd71c6..00a63f4a279 100644 --- a/keyboards/matrix/abelx/rules.mk +++ b/keyboards/matrix/abelx/rules.mk @@ -1,4 +1,4 @@ -## chip/board settings +# # - the next two should match the directories in # /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) MCU_FAMILY = STM32 @@ -28,20 +28,6 @@ USE_FPU = yes # Bootloader selection BOOTLOADER = custom -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in - CUSTOM_MATRIX = lite # project specific files SRC += matrix.c tca6424.c aw9523b.c diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/info.json index 38a9de45acc..d5ee589cc17 100644 --- a/keyboards/matrix/m12og/rev1/info.json +++ b/keyboards/matrix/m12og/rev1/info.json @@ -31,6 +31,15 @@ "ws2812": { "pin": "B8" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "rgblight": true + }, + "build": { + "lto": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan" }, diff --git a/keyboards/matrix/m12og/rev1/rules.mk b/keyboards/matrix/m12og/rev1/rules.mk index 136d07cbaad..bc406d1cba4 100644 --- a/keyboards/matrix/m12og/rev1/rules.mk +++ b/keyboards/matrix/m12og/rev1/rules.mk @@ -8,19 +8,5 @@ BOARD = m12og_v1 # Bootloader selection BOOTLOADER = custom -# 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 # HAS TO BE ON! Otherwise the custom matrix doesn't work -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/info.json index 6e1a1c493f3..5a999bb4847 100644 --- a/keyboards/matrix/m20add/info.json +++ b/keyboards/matrix/m20add/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4D58", "pid": "0x20AD", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "rgblight": { "led_count": 20, @@ -27,6 +28,12 @@ "ws2812": { "pin": "B4" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "layouts": { "LAYOUT_tkl_ansi_tsangan": { "layout": [ diff --git a/keyboards/matrix/m20add/rules.mk b/keyboards/matrix/m20add/rules.mk index 1b005b8c174..150bd24e30e 100644 --- a/keyboards/matrix/m20add/rules.mk +++ b/keyboards/matrix/m20add/rules.mk @@ -13,19 +13,6 @@ BOARD = ST_NUCLEO64_F411RE # Bootloader selection BOOTLOADER = custom -# 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 -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in - -RGBLIGHT_ENABLE = yes - CUSTOM_MATRIX = lite # project specific files SRC += matrix.c tca6424.c rgb_ring.c drivers/led/issi/is31fl3731.c diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json index bc546cffc91..959c3c8c9c9 100644 --- a/keyboards/matrix/noah/info.json +++ b/keyboards/matrix/noah/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4D58", "pid": "0x0065", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "rgblight": { "driver": "custom", @@ -75,6 +76,13 @@ }, "driver": "is31fl3731" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "rgb_matrix": true + }, "community_layouts": ["65_iso_blocker"], "layouts": { "LAYOUT_default": { diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk index 3b75264222d..d1c19f36ffe 100644 --- a/keyboards/matrix/noah/rules.mk +++ b/keyboards/matrix/noah/rules.mk @@ -13,20 +13,6 @@ BOARD = ST_NUCLEO64_F411RE # Bootloader selection BOOTLOADER = custom -# 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 -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in - -RGB_MATRIX_ENABLE = yes - -RGBLIGHT_ENABLE = yes WS2812_DRIVER_REQUIRED = yes CUSTOM_MATRIX = yes From 33c453d771a89a5c050a512599422a308be62a37 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 23 Apr 2024 19:38:08 +1000 Subject: [PATCH 176/333] PR Checklist: explain wireless requirements. (#23584) --- docs/pr_checklist.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md index 0d503ab4177..94ff7eed665 100644 --- a/docs/pr_checklist.md +++ b/docs/pr_checklist.md @@ -148,6 +148,13 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard - For instance, only `wilba_tech` boards shall include `keyboards/wilba_tech/wt_main.c` and `keyboards/wilba_tech/wt_rgb_backlight.c`. But including `drivers/sensors/pmw3360.c` is absolutely fine for any and all boards that require it. - Code that needs to be used by multiple boards is a candidate for core code changes, and should be separated out. +Wireless-capable boards: +- Given license abuse from vendors, QMK does not accept any vendor PRs for wireless- or Bluetooth-capable keyboards without wireless and/or Bluetooth code + - Historically, vendors have done this in bad faith in order to attain downstream VIA compatibility with no intention of releasing wireless sources + - QMK's license, the GPL2+, requires full source disclosure for any distributed binary -- including full sources for any keyboard shipped by vendors containing QMK and/or firmware-side VIA code + - If a vendor's wireless-capable keyboard PR submission is lacking wireless capability, then the PR will be left on-hold and unmergeable until wireless bindings are provided + - If a vendor's wireless-capable keyboard is merged into QMK before it's known that the board is wireless, then all existing and future PRs from the same vendor will be put on hold until wireless bindings for the offending keyboard are provided + Also, specific to ChibiOS: - **strong** preference to using existing ChibiOS board definitions. - a lot of the time, an equivalent Nucleo board can be used with a different flash size or slightly different model in the same family From 1fa84ea83c68bb24bc6b21c5abc376ee12d1b939 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 23 Apr 2024 19:38:47 +1000 Subject: [PATCH 177/333] Fix up license check path. (#23571) --- lib/python/qmk/cli/license_check.py | 83 +++++++++++++++++------------ 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/lib/python/qmk/cli/license_check.py b/lib/python/qmk/cli/license_check.py index 4bda272ec9b..119a228c6d4 100644 --- a/lib/python/qmk/cli/license_check.py +++ b/lib/python/qmk/cli/license_check.py @@ -1,9 +1,9 @@ # Copyright 2023 Nick Brassel (@tzarc) # SPDX-License-Identifier: GPL-2.0-or-later import re -from pathlib import Path from milc import cli from qmk.constants import LICENSE_TEXTS +from qmk.path import normpath L_PAREN = re.compile(r'\(\[\{\<') R_PAREN = re.compile(r'\)\]\}\>') @@ -27,7 +27,45 @@ def _simplify_text(input): return ' '.join(lines) -def _detect_license_from_file_contents(filename, absolute=False): +def _preformat_license_texts(): + # Pre-format all the licenses + for _, long_licenses in LICENSE_TEXTS: + for i in range(len(long_licenses)): + long_licenses[i] = _simplify_text(long_licenses[i]) + + +def _determine_suffix_condition(extensions): + def _default_suffix_condition(s): + return s in SUFFIXES + + conditional = _default_suffix_condition + + if extensions is not None and len(extensions) > 0: + suffixes = [f'.{s}' if not s.startswith('.') else s for s in extensions] + + def _specific_suffix_condition(s): + return s in suffixes + + conditional = _specific_suffix_condition + + return conditional + + +def _determine_file_list(inputs, conditional): + check_list = set() + for filename in inputs: + if filename.is_dir(): + for file in sorted(filename.rglob('*')): + if file.is_file() and conditional(file.suffix): + check_list.add(file) + elif filename.is_file(): + if conditional(filename.suffix): + check_list.add(filename) + + return list(sorted(check_list)) + + +def _detect_license_from_file_contents(filename, absolute=False, short=False): data = filename.read_text(encoding='utf-8', errors='ignore') filename_out = str(filename.absolute()) if absolute else str(filename) @@ -42,13 +80,13 @@ def _detect_license_from_file_contents(filename, absolute=False): break if not found: - if cli.args.short: + if short: print(f'{filename_out} UNKNOWN') else: cli.log.error(f'{{fg_cyan}}{filename_out}{{fg_reset}} -- unknown license, or no license detected!') return False - if cli.args.short: + if short: print(f'{filename_out} {license}') else: cli.log.info(f'{{fg_cyan}}{filename_out}{{fg_reset}} -- license detected: {license} (SPDX License Identifier)') @@ -59,13 +97,13 @@ def _detect_license_from_file_contents(filename, absolute=False): for short_license, long_licenses in LICENSE_TEXTS: for long_license in long_licenses: if long_license in simple_text: - if cli.args.short: + if short: print(f'{filename_out} {short_license}') else: cli.log.info(f'{{fg_cyan}}{filename_out}{{fg_reset}} -- license detected: {short_license} (Full text)') return True - if cli.args.short: + if short: print(f'{filename_out} UNKNOWN') else: cli.log.error(f'{{fg_cyan}}{filename_out}{{fg_reset}} -- unknown license, or no license detected!') @@ -73,43 +111,20 @@ def _detect_license_from_file_contents(filename, absolute=False): return False -@cli.argument('inputs', nargs='*', arg_only=True, type=Path, help='List of input files or directories.') +@cli.argument('inputs', nargs='*', arg_only=True, type=normpath, help='List of input files or directories.') @cli.argument('-s', '--short', action='store_true', help='Short output.') @cli.argument('-a', '--absolute', action='store_true', help='Print absolute paths.') @cli.argument('-e', '--extension', arg_only=True, action='append', default=[], help='Override list of extensions. Can be specified multiple times for multiple extensions.') @cli.subcommand('File license check.', hidden=False if cli.config.user.developer else True) def license_check(cli): - def _default_suffix_condition(s): - return s in SUFFIXES + _preformat_license_texts() - conditional = _default_suffix_condition - - if len(cli.args.extension) > 0: - suffixes = [f'.{s}' if not s.startswith('.') else s for s in cli.args.extension] - - def _specific_suffix_condition(s): - return s in suffixes - - conditional = _specific_suffix_condition - - # Pre-format all the licenses - for _, long_licenses in LICENSE_TEXTS: - for i in range(len(long_licenses)): - long_licenses[i] = _simplify_text(long_licenses[i]) - - check_list = set() - for filename in sorted(cli.args.inputs): - if filename.is_dir(): - for file in sorted(filename.rglob('*')): - if file.is_file() and conditional(file.suffix): - check_list.add(file) - elif filename.is_file(): - if conditional(filename.suffix): - check_list.add(filename) + conditional = _determine_suffix_condition(cli.args.extension) + check_list = _determine_file_list(cli.args.inputs, conditional) failed = False for filename in sorted(check_list): - if not _detect_license_from_file_contents(filename, absolute=cli.args.absolute): + if not _detect_license_from_file_contents(filename, absolute=cli.args.absolute, short=cli.args.short): failed = True if failed: From 32136afe242c82f4b0f430eadc6914ca83dd8239 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 23 Apr 2024 10:47:30 +0100 Subject: [PATCH 178/333] Change to `development_board` (#21695) --- keyboards/bastardkb/charybdis/3x5/blackpill/info.json | 4 +--- keyboards/bastardkb/charybdis/3x6/blackpill/info.json | 4 +--- keyboards/bastardkb/charybdis/4x6/blackpill/info.json | 4 +--- keyboards/bastardkb/scylla/blackpill/info.json | 4 +--- keyboards/bastardkb/skeletyl/blackpill/info.json | 4 +--- keyboards/bastardkb/tbkmini/blackpill/info.json | 4 +--- keyboards/bt66tech/bt66tech60/keyboard.json | 3 +-- keyboards/cannonkeys/ortho48/keyboard.json | 3 +-- keyboards/cannonkeys/ortho60/keyboard.json | 3 +-- keyboards/cannonkeys/ortho75/keyboard.json | 3 +-- keyboards/cannonkeys/practice60/keyboard.json | 3 +-- keyboards/cannonkeys/practice65/keyboard.json | 5 ++--- keyboards/cantor/keyboard.json | 4 +--- keyboards/ckeys/thedora/keyboard.json | 4 +--- keyboards/converter/siemens_tastatur/keyboard.json | 3 +-- keyboards/ez_maker/directpins/proton_c/keyboard.json | 4 +--- keyboards/handwired/d48/keyboard.json | 4 +--- .../dactyl_manuform/6x6/blackpill_f411/keyboard.json | 6 ++---- keyboards/handwired/dygma/raise/info.json | 4 +--- keyboards/handwired/ergocheap/keyboard.json | 3 +-- keyboards/handwired/floorboard/keyboard.json | 4 +--- keyboards/handwired/macroboard/f401/keyboard.json | 6 ++---- keyboards/handwired/macroboard/f411/keyboard.json | 6 ++---- keyboards/handwired/pill60/blackpill_f401/keyboard.json | 4 +--- keyboards/handwired/pill60/blackpill_f411/keyboard.json | 4 +--- keyboards/handwired/pill60/bluepill/keyboard.json | 3 +-- keyboards/handwired/riblee_f401/keyboard.json | 4 +--- keyboards/handwired/riblee_f411/keyboard.json | 4 +--- keyboards/handwired/selene/keyboard.json | 4 +--- keyboards/handwired/sick_pad/keyboard.json | 4 +--- keyboards/handwired/sono1/stm32f103/keyboard.json | 3 +-- keyboards/handwired/split65/stm32/keyboard.json | 4 +--- keyboards/handwired/splittest/bluepill/keyboard.json | 3 +-- keyboards/handwired/symmetric70_proto/proton_c/info.json | 4 +--- keyboards/handwired/t111/keyboard.json | 3 +-- .../handwired/tractyl_manuform/5x6_right/f303/keyboard.json | 3 +-- .../handwired/tractyl_manuform/5x6_right/f411/keyboard.json | 4 ++-- keyboards/handwired/twig/twig50/keyboard.json | 4 +--- keyboards/handwired/uthol/rev3/keyboard.json | 6 ++---- keyboards/handwired/wulkan/keyboard.json | 4 +--- keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json | 4 +--- keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json | 3 +-- keyboards/kin80/blackpill401/keyboard.json | 4 +--- keyboards/kin80/blackpill411/keyboard.json | 4 +--- keyboards/kv/revt/keyboard.json | 4 +--- keyboards/mechwild/obe/f401/keyboard.json | 4 +--- keyboards/mechwild/obe/f411/keyboard.json | 4 +--- keyboards/mechwild/puckbuddy/info.json | 4 +--- keyboards/mechwild/waka60/f401/keyboard.json | 4 +--- keyboards/mechwild/waka60/f411/keyboard.json | 4 +--- keyboards/mlego/m60_split/rev2/info.json | 4 +--- keyboards/ms_sculpt/keyboard.json | 3 +-- keyboards/rart/rartlice/keyboard.json | 3 +-- keyboards/rgbkb/pan/rev1/proton_c/keyboard.json | 4 +--- keyboards/sowbug/68keys/keyboard.json | 3 +-- keyboards/sowbug/ansi_tkl/keyboard.json | 3 +-- keyboards/tkw/grandiceps/info.json | 4 +--- keyboards/tkw/stoutgat/v2/f411/keyboard.json | 4 +--- 58 files changed, 64 insertions(+), 160 deletions(-) diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json index 1e77de54e94..1af57cca9a4 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json @@ -24,7 +24,5 @@ "rows": ["A2", "B8", "A8", "B9"] }, "diode_direction": "ROW2COL", - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json index 1dbfdb53452..51f9c5dbea5 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json @@ -24,7 +24,5 @@ "rows": ["A2", "B8", "A8", "B9"] }, "diode_direction": "ROW2COL", - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json index 5c0b65b7c3d..86df4839fc9 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json @@ -24,7 +24,5 @@ "rows": ["B15", "A2", "B8", "A8", "B9"] }, "diode_direction": "ROW2COL", - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json index 30f3688cad1..167c979f4b9 100644 --- a/keyboards/bastardkb/scylla/blackpill/info.json +++ b/keyboards/bastardkb/scylla/blackpill/info.json @@ -24,7 +24,5 @@ "rows": ["B15", "A2", "B8", "A8", "B9"] }, "diode_direction": "ROW2COL", - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json index 34ca3ff0b2c..c0e5d4e2c85 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/info.json +++ b/keyboards/bastardkb/skeletyl/blackpill/info.json @@ -24,7 +24,5 @@ "rows": ["A2", "B8", "A8", "B9"] }, "diode_direction": "ROW2COL", - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json index bb6e9bb7e9e..62301b1f2bc 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/info.json +++ b/keyboards/bastardkb/tbkmini/blackpill/info.json @@ -24,7 +24,5 @@ "rows": ["A2", "B8", "A8", "B9"] }, "diode_direction": "ROW2COL", - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } diff --git a/keyboards/bt66tech/bt66tech60/keyboard.json b/keyboards/bt66tech/bt66tech60/keyboard.json index 26e4964d458..778e27fe67a 100644 --- a/keyboards/bt66tech/bt66tech60/keyboard.json +++ b/keyboards/bt66tech/bt66tech60/keyboard.json @@ -55,8 +55,7 @@ "pin": "B15", "driver": "spi" }, - "processor": "STM32F103", - "bootloader": "stm32duino", + "development_board": "bluepill", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/cannonkeys/ortho48/keyboard.json b/keyboards/cannonkeys/ortho48/keyboard.json index 1f35187e291..facd47633d0 100644 --- a/keyboards/cannonkeys/ortho48/keyboard.json +++ b/keyboards/cannonkeys/ortho48/keyboard.json @@ -48,8 +48,7 @@ "pin": "B15", "driver": "spi" }, - "processor": "STM32F103", - "bootloader": "stm32duino", + "development_board": "bluepill", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/cannonkeys/ortho60/keyboard.json b/keyboards/cannonkeys/ortho60/keyboard.json index f429bd9f405..d8eea8a6ae9 100644 --- a/keyboards/cannonkeys/ortho60/keyboard.json +++ b/keyboards/cannonkeys/ortho60/keyboard.json @@ -48,8 +48,7 @@ "pin": "B15", "driver": "spi" }, - "processor": "STM32F103", - "bootloader": "stm32duino", + "development_board": "bluepill", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/cannonkeys/ortho75/keyboard.json b/keyboards/cannonkeys/ortho75/keyboard.json index 236334c5985..49595685ef3 100644 --- a/keyboards/cannonkeys/ortho75/keyboard.json +++ b/keyboards/cannonkeys/ortho75/keyboard.json @@ -54,8 +54,7 @@ "pin": "B15", "driver": "spi" }, - "processor": "STM32F103", - "bootloader": "stm32duino", + "development_board": "bluepill", "community_layouts": ["ortho_5x15"], "layouts": { "LAYOUT_ortho_5x15": { diff --git a/keyboards/cannonkeys/practice60/keyboard.json b/keyboards/cannonkeys/practice60/keyboard.json index 3254b1702fa..ff8cf00cb04 100644 --- a/keyboards/cannonkeys/practice60/keyboard.json +++ b/keyboards/cannonkeys/practice60/keyboard.json @@ -48,8 +48,7 @@ "pin": "B15", "driver": "spi" }, - "processor": "STM32F103", - "bootloader": "stm32duino", + "development_board": "bluepill", "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/cannonkeys/practice65/keyboard.json b/keyboards/cannonkeys/practice65/keyboard.json index 950d1bae9ff..36fb46dd518 100644 --- a/keyboards/cannonkeys/practice65/keyboard.json +++ b/keyboards/cannonkeys/practice65/keyboard.json @@ -48,9 +48,8 @@ "pin": "B15", "driver": "spi" }, - "processor": "STM32F103", - "bootloader": "stm32duino", - "layouts": { + "development_board": "bluepill", + "layouts": { "LAYOUT_default": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/cantor/keyboard.json b/keyboards/cantor/keyboard.json index e401b2ce972..a9d84e6c8f4 100644 --- a/keyboards/cantor/keyboard.json +++ b/keyboards/cantor/keyboard.json @@ -2,7 +2,6 @@ "manufacturer": "Diego Palacios", "keyboard_name": "cantor", "maintainer": "diepala", - "bootloader": "stm32-dfu", "features": { "bootmagic": true, "command": false, @@ -11,8 +10,7 @@ "mousekey": true, "nkro": true }, - "processor": "STM32F401", - "board": "BLACKPILL_STM32_F401", + "development_board": "blackpill_f401", "url": "https://github.com/diepala/cantor", "usb": { "device_version": "1.0.0", diff --git a/keyboards/ckeys/thedora/keyboard.json b/keyboards/ckeys/thedora/keyboard.json index 0e52b24dfa6..08448e761c4 100644 --- a/keyboards/ckeys/thedora/keyboard.json +++ b/keyboards/ckeys/thedora/keyboard.json @@ -29,9 +29,7 @@ {"pin_a": "B13", "pin_b": "B15"} ] }, - "processor": "STM32F303", - "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C", + "development_board": "proton_c", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/siemens_tastatur/keyboard.json b/keyboards/converter/siemens_tastatur/keyboard.json index 571d06a5c31..639859f2081 100644 --- a/keyboards/converter/siemens_tastatur/keyboard.json +++ b/keyboards/converter/siemens_tastatur/keyboard.json @@ -8,8 +8,7 @@ "pid": "0x4353", "device_version": "0.0.1" }, - "processor": "STM32F103", - "bootloader": "stm32duino", + "development_board": "bluepill", "features": { "bootmagic": false, "mousekey": true, diff --git a/keyboards/ez_maker/directpins/proton_c/keyboard.json b/keyboards/ez_maker/directpins/proton_c/keyboard.json index a835ef7df19..4a46d4e1791 100644 --- a/keyboards/ez_maker/directpins/proton_c/keyboard.json +++ b/keyboards/ez_maker/directpins/proton_c/keyboard.json @@ -2,9 +2,7 @@ "manufacturer": "Zach White", "keyboard_name": "DirectPins Proton C", "maintainer": "skullydazed", - "processor": "STM32F303", - "board": "QMK_PROTON_C", - "bootloader": "stm32-dfu", + "development_board": "proton_c", "features": { "bootmagic": true, "extrakey": true, diff --git a/keyboards/handwired/d48/keyboard.json b/keyboards/handwired/d48/keyboard.json index e5ee61093e9..99c8a673263 100644 --- a/keyboards/handwired/d48/keyboard.json +++ b/keyboards/handwired/d48/keyboard.json @@ -42,8 +42,7 @@ "qmk": { "tap_keycode_delay": 10 }, - "processor": "STM32F303", - "bootloader": "stm32-dfu", + "development_board": "proton_c", "features": { "bootmagic": false, "mousekey": false, @@ -56,7 +55,6 @@ "oled": true, "unicode": true }, - "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json index 9ab62df2373..9391d3a46d4 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json @@ -10,14 +10,12 @@ "matrix": [7, 0] } }, - "processor": "STM32F411", - "bootloader": "stm32-dfu", + "development_board": "blackpill_f411", "features": { "bootmagic": true, "mousekey": true, "extrakey": true, "console": true, "command": true - }, - "board": "BLACKPILL_STM32_F411" + } } diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json index 112a8a6abe2..2d0c354f3b2 100644 --- a/keyboards/handwired/dygma/raise/info.json +++ b/keyboards/handwired/dygma/raise/info.json @@ -24,14 +24,12 @@ "led_flush_limit": 100, "sleep": true }, - "processor": "STM32F411", - "bootloader": "stm32-dfu", + "development_board": "blackpill_f411", "features": { "bootmagic": false, "mousekey": true, "extrakey": true, "rgb_matrix": true }, - "board": "BLACKPILL_STM32_F411", "debounce": 0 } diff --git a/keyboards/handwired/ergocheap/keyboard.json b/keyboards/handwired/ergocheap/keyboard.json index 72be536d64b..8728b486a8f 100644 --- a/keyboards/handwired/ergocheap/keyboard.json +++ b/keyboards/handwired/ergocheap/keyboard.json @@ -25,8 +25,7 @@ "rows": ["B5", "B6", "B7", "B9", "B8"] }, "diode_direction": "COL2ROW", - "processor": "STM32F103", - "bootloader": "stm32duino", + "development_board": "bluepill", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/floorboard/keyboard.json b/keyboards/handwired/floorboard/keyboard.json index 97e6395957f..0bcec56b8fe 100644 --- a/keyboards/handwired/floorboard/keyboard.json +++ b/keyboards/handwired/floorboard/keyboard.json @@ -21,9 +21,7 @@ "rows": ["A2", "A1", "A0", "B8"] }, "diode_direction": "COL2ROW", - "processor": "STM32F303", - "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C", + "development_board": "proton_c", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/handwired/macroboard/f401/keyboard.json b/keyboards/handwired/macroboard/f401/keyboard.json index 43aa322a2a8..d5e217b2f3d 100644 --- a/keyboards/handwired/macroboard/f401/keyboard.json +++ b/keyboards/handwired/macroboard/f401/keyboard.json @@ -12,14 +12,12 @@ "ws2812": { "driver": "pwm" }, - "processor": "STM32F401", - "bootloader": "stm32-dfu", + "development_board": "blackpill_f401", "features": { "bootmagic": true, "mousekey": true, "extrakey": true, "nkro": true, "rgblight": true - }, - "board": "BLACKPILL_STM32_F401" + } } diff --git a/keyboards/handwired/macroboard/f411/keyboard.json b/keyboards/handwired/macroboard/f411/keyboard.json index 0f6d7077a3c..03a8aadc1b9 100644 --- a/keyboards/handwired/macroboard/f411/keyboard.json +++ b/keyboards/handwired/macroboard/f411/keyboard.json @@ -12,8 +12,7 @@ "ws2812": { "driver": "pwm" }, - "processor": "STM32F411", - "bootloader": "stm32-dfu", + "development_board": "blackpill_f411", "features": { "bootmagic": true, "mousekey": true, @@ -21,6 +20,5 @@ "nkro": true, "rgblight": true, "audio": true - }, - "board": "BLACKPILL_STM32_F411" + } } diff --git a/keyboards/handwired/pill60/blackpill_f401/keyboard.json b/keyboards/handwired/pill60/blackpill_f401/keyboard.json index 9b3530b9583..f43fd45a855 100644 --- a/keyboards/handwired/pill60/blackpill_f401/keyboard.json +++ b/keyboards/handwired/pill60/blackpill_f401/keyboard.json @@ -9,7 +9,5 @@ "rows": ["B4", "B3", "A15", "B13", "B5"] }, "diode_direction": "COL2ROW", - "processor": "STM32F401", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F401" + "development_board": "blackpill_f401" } diff --git a/keyboards/handwired/pill60/blackpill_f411/keyboard.json b/keyboards/handwired/pill60/blackpill_f411/keyboard.json index 1961d616ddb..4d47a6b4349 100644 --- a/keyboards/handwired/pill60/blackpill_f411/keyboard.json +++ b/keyboards/handwired/pill60/blackpill_f411/keyboard.json @@ -9,7 +9,5 @@ "rows": ["B4", "B3", "A15", "B13", "B5"] }, "diode_direction": "COL2ROW", - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } diff --git a/keyboards/handwired/pill60/bluepill/keyboard.json b/keyboards/handwired/pill60/bluepill/keyboard.json index 028b1d89d87..3c52f8ad2ba 100644 --- a/keyboards/handwired/pill60/bluepill/keyboard.json +++ b/keyboards/handwired/pill60/bluepill/keyboard.json @@ -4,6 +4,5 @@ "rows": ["B4", "B3", "A15", "B13", "B5"] }, "diode_direction": "COL2ROW", - "processor": "STM32F103", - "bootloader": "stm32duino" + "development_board": "bluepill" } diff --git a/keyboards/handwired/riblee_f401/keyboard.json b/keyboards/handwired/riblee_f401/keyboard.json index 18d46b55cd0..53fc6137603 100644 --- a/keyboards/handwired/riblee_f401/keyboard.json +++ b/keyboards/handwired/riblee_f401/keyboard.json @@ -23,8 +23,7 @@ "pin": "A0", "levels": 5 }, - "processor": "STM32F401", - "bootloader": "stm32-dfu", + "development_board": "blackpill_f401", "features": { "bootmagic": true, "mousekey": true, @@ -32,7 +31,6 @@ "nkro": true, "backlight": true }, - "board": "BLACKPILL_STM32_F401", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/handwired/riblee_f411/keyboard.json b/keyboards/handwired/riblee_f411/keyboard.json index 9c7df63b3e1..47d6349ba77 100644 --- a/keyboards/handwired/riblee_f411/keyboard.json +++ b/keyboards/handwired/riblee_f411/keyboard.json @@ -19,15 +19,13 @@ "rows": ["A6", "A5", "A4", "A3", "A2"] }, "diode_direction": "COL2ROW", - "processor": "STM32F411", - "bootloader": "stm32-dfu", + "development_board": "blackpill_f411", "features": { "bootmagic": false, "mousekey": true, "extrakey": true, "nkro": true }, - "board": "BLACKPILL_STM32_F411", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/handwired/selene/keyboard.json b/keyboards/handwired/selene/keyboard.json index ed3231981df..5e46cc4f324 100644 --- a/keyboards/handwired/selene/keyboard.json +++ b/keyboards/handwired/selene/keyboard.json @@ -28,9 +28,7 @@ "rows": ["B10", "B9", "B15", "B14", "B13", "B8"] }, "diode_direction": "COL2ROW", - "processor": "STM32F303", - "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C", + "development_board": "proton_c", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/sick_pad/keyboard.json b/keyboards/handwired/sick_pad/keyboard.json index 8298a497ed3..86457a704e2 100644 --- a/keyboards/handwired/sick_pad/keyboard.json +++ b/keyboards/handwired/sick_pad/keyboard.json @@ -21,9 +21,7 @@ "rows": ["B0", "B1", "B2", "B3", "B4"] }, "diode_direction": "COL2ROW", - "processor": "STM32F303", - "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C", + "development_board": "proton_c", "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/handwired/sono1/stm32f103/keyboard.json b/keyboards/handwired/sono1/stm32f103/keyboard.json index f6e874a77f0..7a4b7420be4 100644 --- a/keyboards/handwired/sono1/stm32f103/keyboard.json +++ b/keyboards/handwired/sono1/stm32f103/keyboard.json @@ -13,6 +13,5 @@ "kana": "A2", "on_state": 0 }, - "processor": "STM32F103", - "bootloader": "stm32duino" + "development_board": "bluepill" } diff --git a/keyboards/handwired/split65/stm32/keyboard.json b/keyboards/handwired/split65/stm32/keyboard.json index d49339da021..6763c5eb886 100644 --- a/keyboards/handwired/split65/stm32/keyboard.json +++ b/keyboards/handwired/split65/stm32/keyboard.json @@ -9,8 +9,7 @@ "enabled": true, "soft_serial_pin": "A9" }, - "processor": "STM32F303", - "bootloader": "stm32-dfu", + "development_board": "proton_c", "features": { "bootmagic": false, "mousekey": false, @@ -18,7 +17,6 @@ "audio": true, "oled": true }, - "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/splittest/bluepill/keyboard.json b/keyboards/handwired/splittest/bluepill/keyboard.json index 28e7d091f83..5c061a71192 100644 --- a/keyboards/handwired/splittest/bluepill/keyboard.json +++ b/keyboards/handwired/splittest/bluepill/keyboard.json @@ -4,8 +4,7 @@ "rows": ["B10"] }, "diode_direction": "COL2ROW", - "processor": "STM32F103", - "bootloader": "stm32duino", + "development_board": "bluepill", "features": { "bootmagic": false, "mousekey": false, diff --git a/keyboards/handwired/symmetric70_proto/proton_c/info.json b/keyboards/handwired/symmetric70_proto/proton_c/info.json index a6f017ae75d..1fd231bbc47 100644 --- a/keyboards/handwired/symmetric70_proto/proton_c/info.json +++ b/keyboards/handwired/symmetric70_proto/proton_c/info.json @@ -1,6 +1,4 @@ { "keyboard_name": "Symmetric70 prototype proton-c", - "processor": "STM32F303", - "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C" + "development_board": "proton_c" } diff --git a/keyboards/handwired/t111/keyboard.json b/keyboards/handwired/t111/keyboard.json index 4c2b7ac4690..f65a3f087e8 100644 --- a/keyboards/handwired/t111/keyboard.json +++ b/keyboards/handwired/t111/keyboard.json @@ -21,8 +21,7 @@ "rows": ["A15", "B6", "B5", "B4", "B3", "B9", "B8", "B7"] }, "diode_direction": "ROW2COL", - "processor": "STM32F103", - "bootloader": "stm32duino", + "development_board": "bluepill", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json index 0bcc02fd743..000d8f0dd77 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json @@ -21,8 +21,7 @@ {"pin_a": "A7", "pin_b": "A8"} ] }, - "processor": "STM32F303", - "bootloader": "stm32-dfu", + "development_board": "proton_c", "features": { "console": true } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json index 3821f0380f2..73c13e8e318 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json @@ -24,10 +24,10 @@ {"pin_a": "A13", "pin_b": "A14"} ] }, + "development_board": "blackpill_f411", "processor": "STM32F411", "bootloader": "stm32-dfu", "features": { "console": true - }, - "board": "BLACKPILL_STM32_F411" + } } diff --git a/keyboards/handwired/twig/twig50/keyboard.json b/keyboards/handwired/twig/twig50/keyboard.json index aa78691838c..f1cc2f5a969 100644 --- a/keyboards/handwired/twig/twig50/keyboard.json +++ b/keyboards/handwired/twig/twig50/keyboard.json @@ -26,9 +26,7 @@ "rows": ["B7", "B6", "B5", "B4"] }, "diode_direction": "COL2ROW", - "processor": "STM32F303", - "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C", + "development_board": "proton_c", "debounce": 8, "layouts": { "LAYOUT_diag_4x14": { diff --git a/keyboards/handwired/uthol/rev3/keyboard.json b/keyboards/handwired/uthol/rev3/keyboard.json index 9b1a476b87c..8d826772b06 100644 --- a/keyboards/handwired/uthol/rev3/keyboard.json +++ b/keyboards/handwired/uthol/rev3/keyboard.json @@ -40,8 +40,7 @@ {"pin_a": "C15", "pin_b": "C14", "resolution": 2} ] }, - "processor": "STM32F401", - "bootloader": "stm32-dfu", + "development_board": "blackpill_f401", "features": { "bootmagic": true, "nkro": true, @@ -50,6 +49,5 @@ "extrakey": true, "encoder": true, "rgblight": true - }, - "board": "BLACKPILL_STM32_F401" + } } diff --git a/keyboards/handwired/wulkan/keyboard.json b/keyboards/handwired/wulkan/keyboard.json index b6823af5396..eceeb5c145e 100644 --- a/keyboards/handwired/wulkan/keyboard.json +++ b/keyboards/handwired/wulkan/keyboard.json @@ -14,15 +14,13 @@ "rows": ["B8", "A0", "A1", "A2"] }, "diode_direction": "COL2ROW", - "processor": "STM32F303", - "bootloader": "stm32-dfu", + "development_board": "proton_c", "features": { "bootmagic": true, "mousekey": true, "extrakey": true, "nkro": true }, - "board": "QMK_PROTON_C", "community_layouts": ["ortho_4x12"], "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" diff --git a/keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json b/keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json index 46abafb2c42..5abadff2f74 100644 --- a/keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json +++ b/keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json @@ -15,7 +15,5 @@ "rows": ["C13", "C14", "C15", "A0", "A1", "A2", "A3", "A4"] }, "diode_direction": "ROW2COL", - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } diff --git a/keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json b/keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json index e2f18d06e44..9a852141067 100644 --- a/keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json +++ b/keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json @@ -7,6 +7,5 @@ "rows": ["C13", "C14", "C15", "A1", "A2", "A3", "A4", "A5"] }, "diode_direction": "ROW2COL", - "processor": "STM32F103", - "bootloader": "stm32duino" + "development_board": "bluepill" } diff --git a/keyboards/kin80/blackpill401/keyboard.json b/keyboards/kin80/blackpill401/keyboard.json index 1047c944580..36d780187e4 100644 --- a/keyboards/kin80/blackpill401/keyboard.json +++ b/keyboards/kin80/blackpill401/keyboard.json @@ -16,7 +16,5 @@ "scroll_lock": "B3", "on_state": 0 }, - "processor": "STM32F401", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F401" + "development_board": "blackpill_f401" } diff --git a/keyboards/kin80/blackpill411/keyboard.json b/keyboards/kin80/blackpill411/keyboard.json index d1ac0a97f70..7a3c89acded 100644 --- a/keyboards/kin80/blackpill411/keyboard.json +++ b/keyboards/kin80/blackpill411/keyboard.json @@ -16,7 +16,5 @@ "scroll_lock": "B3", "on_state": 0 }, - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } diff --git a/keyboards/kv/revt/keyboard.json b/keyboards/kv/revt/keyboard.json index c54a4ba537c..1c2ee5a84ab 100644 --- a/keyboards/kv/revt/keyboard.json +++ b/keyboards/kv/revt/keyboard.json @@ -21,9 +21,7 @@ "rows": ["A6", "B13", "B8", "A0", "A1", "A2"] }, "diode_direction": "COL2ROW", - "processor": "STM32F303", - "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C", + "development_board": "proton_c", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/mechwild/obe/f401/keyboard.json b/keyboards/mechwild/obe/f401/keyboard.json index acd7e83f77d..797e9900595 100644 --- a/keyboards/mechwild/obe/f401/keyboard.json +++ b/keyboards/mechwild/obe/f401/keyboard.json @@ -1,5 +1,3 @@ { - "processor": "STM32F401", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F401" + "development_board": "blackpill_f401" } diff --git a/keyboards/mechwild/obe/f411/keyboard.json b/keyboards/mechwild/obe/f411/keyboard.json index 2517a82403f..a41c5f4dd14 100644 --- a/keyboards/mechwild/obe/f411/keyboard.json +++ b/keyboards/mechwild/obe/f411/keyboard.json @@ -1,5 +1,3 @@ { - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json index 56bac432b80..b430c4af450 100644 --- a/keyboards/mechwild/puckbuddy/info.json +++ b/keyboards/mechwild/puckbuddy/info.json @@ -52,9 +52,7 @@ "ws2812": { "pin": "A3" }, - "processor": "STM32F401", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F401", + "development_board": "blackpill_f401", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/waka60/f401/keyboard.json b/keyboards/mechwild/waka60/f401/keyboard.json index acd7e83f77d..797e9900595 100644 --- a/keyboards/mechwild/waka60/f401/keyboard.json +++ b/keyboards/mechwild/waka60/f401/keyboard.json @@ -1,5 +1,3 @@ { - "processor": "STM32F401", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F401" + "development_board": "blackpill_f401" } diff --git a/keyboards/mechwild/waka60/f411/keyboard.json b/keyboards/mechwild/waka60/f411/keyboard.json index 2517a82403f..a41c5f4dd14 100644 --- a/keyboards/mechwild/waka60/f411/keyboard.json +++ b/keyboards/mechwild/waka60/f411/keyboard.json @@ -1,5 +1,3 @@ { - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json index e13ce195b42..b4b18a91d69 100644 --- a/keyboards/mlego/m60_split/rev2/info.json +++ b/keyboards/mlego/m60_split/rev2/info.json @@ -55,7 +55,5 @@ } } }, - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } diff --git a/keyboards/ms_sculpt/keyboard.json b/keyboards/ms_sculpt/keyboard.json index 3536d4501f1..5353a0df7e7 100644 --- a/keyboards/ms_sculpt/keyboard.json +++ b/keyboards/ms_sculpt/keyboard.json @@ -2,7 +2,7 @@ "manufacturer": "Jean Bernard", "keyboard_name": "ms_sculpt", "maintainer": "jn-bernard", - "bootloader": "stm32-dfu", + "development_board": "blackpill_f401", "diode_direction": "COL2ROW", "features": { "bootmagic": true, @@ -22,7 +22,6 @@ "io_delay": 5 }, "debounce": 3, - "processor": "STM32F401", "url": "", "usb": { "polling_interval": 1, diff --git a/keyboards/rart/rartlice/keyboard.json b/keyboards/rart/rartlice/keyboard.json index 4d65deedefd..b22ca30c558 100644 --- a/keyboards/rart/rartlice/keyboard.json +++ b/keyboards/rart/rartlice/keyboard.json @@ -49,8 +49,7 @@ "pin": "B15", "driver": "spi" }, - "processor": "STM32F103", - "bootloader": "stm32duino", + "development_board": "bluepill", "layout_aliases": { "LAYOUT_all": "LAYOUT" }, diff --git a/keyboards/rgbkb/pan/rev1/proton_c/keyboard.json b/keyboards/rgbkb/pan/rev1/proton_c/keyboard.json index ff81cd10925..2ad3c056c8e 100644 --- a/keyboards/rgbkb/pan/rev1/proton_c/keyboard.json +++ b/keyboards/rgbkb/pan/rev1/proton_c/keyboard.json @@ -4,9 +4,7 @@ "rows": ["A15", "B10", "A14", "A13", "A7"] }, "diode_direction": "COL2ROW", - "processor": "STM32F303", - "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C", + "development_board": "proton_c", "encoder": { "rotary": [ {"pin_a": "B14", "pin_b": "B15"}, diff --git a/keyboards/sowbug/68keys/keyboard.json b/keyboards/sowbug/68keys/keyboard.json index cfdf78efaf2..2b8f7da3d50 100644 --- a/keyboards/sowbug/68keys/keyboard.json +++ b/keyboards/sowbug/68keys/keyboard.json @@ -74,8 +74,7 @@ "rows": ["C14", "C15", "A0", "A1", "A2"] }, "diode_direction": "COL2ROW", - "processor": "STM32F103", - "bootloader": "stm32duino", + "development_board": "bluepill", "layout_aliases": { "LAYOUT_default": "LAYOUT" }, diff --git a/keyboards/sowbug/ansi_tkl/keyboard.json b/keyboards/sowbug/ansi_tkl/keyboard.json index e6b9d28fdcb..69f78cba6d4 100644 --- a/keyboards/sowbug/ansi_tkl/keyboard.json +++ b/keyboards/sowbug/ansi_tkl/keyboard.json @@ -74,8 +74,7 @@ "rows": ["C14", "C15", "A0", "A1", "A2", "A3"] }, "diode_direction": "COL2ROW", - "processor": "STM32F103", - "bootloader": "stm32duino", + "development_board": "bluepill", "layout_aliases": { "LAYOUT": "LAYOUT_default" }, diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json index 507f4c47926..13bc1e7acf5 100644 --- a/keyboards/tkw/grandiceps/info.json +++ b/keyboards/tkw/grandiceps/info.json @@ -63,9 +63,7 @@ "qmk": { "tap_keycode_delay": 10 }, - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411", + "development_board": "blackpill_f411", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkw/stoutgat/v2/f411/keyboard.json b/keyboards/tkw/stoutgat/v2/f411/keyboard.json index 2517a82403f..a41c5f4dd14 100644 --- a/keyboards/tkw/stoutgat/v2/f411/keyboard.json +++ b/keyboards/tkw/stoutgat/v2/f411/keyboard.json @@ -1,5 +1,3 @@ { - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } From d9740c9de11d41493149bee2e712aee536d40b25 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 23 Apr 2024 16:33:39 +0100 Subject: [PATCH 179/333] Migrate build target markers to keyboard.json - Keychron (#23593) --- .../keychron/c2_pro/ansi/rgb/{info.json => keyboard.json} | 0 keyboards/keychron/c2_pro/ansi/rgb/rules.mk | 2 +- .../keychron/c2_pro/ansi/white/{info.json => keyboard.json} | 0 keyboards/keychron/c2_pro/ansi/white/rules.mk | 2 +- .../keychron/q10/ansi_encoder/{info.json => keyboard.json} | 0 .../keychron/q10/iso_encoder/{info.json => keyboard.json} | 0 .../keychron/q11/ansi_encoder/{info.json => keyboard.json} | 0 .../keychron/q11/iso_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q11/iso_encoder/rules.mk | 3 --- .../keychron/q12/ansi_encoder/{info.json => keyboard.json} | 0 .../keychron/q12/iso_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q12/iso_encoder/rules.mk | 1 - keyboards/keychron/q1v2/ansi/{info.json => keyboard.json} | 0 .../keychron/q1v2/ansi_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q1v2/iso/{info.json => keyboard.json} | 0 .../keychron/q1v2/iso_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q1v2/jis/{info.json => keyboard.json} | 0 .../keychron/q1v2/jis_encoder/{info.json => keyboard.json} | 0 .../keychron/q3/ansi_encoder/{info.json => keyboard.json} | 0 .../keychron/q3/iso_encoder/{info.json => keyboard.json} | 0 .../keychron/q3/jis_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q4/ansi/info.json | 3 +-- keyboards/keychron/q4/ansi/v1/keyboard.json | 5 +++++ keyboards/keychron/q4/ansi/v1/rules.mk | 1 - keyboards/keychron/q4/ansi/v2/keyboard.json | 5 +++++ keyboards/keychron/q4/ansi/v2/rules.mk | 1 - keyboards/keychron/q5/ansi/{info.json => keyboard.json} | 0 .../keychron/q5/ansi_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q5/iso/{info.json => keyboard.json} | 0 .../keychron/q5/iso_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q6/ansi/{info.json => keyboard.json} | 0 .../keychron/q6/ansi_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/q6/iso/{info.json => keyboard.json} | 0 .../keychron/q6/iso_encoder/{info.json => keyboard.json} | 0 .../keychron/q65/ansi_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/v1/ansi/{info.json => keyboard.json} | 0 .../keychron/v1/ansi_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/v1/iso/{info.json => keyboard.json} | 0 .../keychron/v1/iso_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/v1/jis/{info.json => keyboard.json} | 0 .../keychron/v1/jis_encoder/{info.json => keyboard.json} | 0 .../keychron/v10/ansi_encoder/{info.json => keyboard.json} | 0 .../keychron/v10/iso_encoder/{info.json => keyboard.json} | 0 .../keychron/v3/ansi_encoder/{info.json => keyboard.json} | 0 .../keychron/v3/iso_encoder/{info.json => keyboard.json} | 0 .../keychron/v3/jis_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/v5/ansi/{info.json => keyboard.json} | 0 .../keychron/v5/ansi_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/v5/iso/{info.json => keyboard.json} | 0 .../keychron/v5/iso_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/v6/ansi/{info.json => keyboard.json} | 0 .../keychron/v6/ansi_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/v6/iso/{info.json => keyboard.json} | 0 .../keychron/v6/iso_encoder/{info.json => keyboard.json} | 0 keyboards/keychron/v6/iso_encoder/rules.mk | 1 - 55 files changed, 13 insertions(+), 11 deletions(-) rename keyboards/keychron/c2_pro/ansi/rgb/{info.json => keyboard.json} (100%) rename keyboards/keychron/c2_pro/ansi/white/{info.json => keyboard.json} (100%) rename keyboards/keychron/q10/ansi_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q10/iso_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q11/ansi_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q11/iso_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q12/ansi_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q12/iso_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q1v2/ansi/{info.json => keyboard.json} (100%) rename keyboards/keychron/q1v2/ansi_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q1v2/iso/{info.json => keyboard.json} (100%) rename keyboards/keychron/q1v2/iso_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q1v2/jis/{info.json => keyboard.json} (100%) rename keyboards/keychron/q1v2/jis_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q3/ansi_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q3/iso_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q3/jis_encoder/{info.json => keyboard.json} (100%) create mode 100644 keyboards/keychron/q4/ansi/v1/keyboard.json delete mode 100644 keyboards/keychron/q4/ansi/v1/rules.mk create mode 100644 keyboards/keychron/q4/ansi/v2/keyboard.json delete mode 100644 keyboards/keychron/q4/ansi/v2/rules.mk rename keyboards/keychron/q5/ansi/{info.json => keyboard.json} (100%) rename keyboards/keychron/q5/ansi_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q5/iso/{info.json => keyboard.json} (100%) rename keyboards/keychron/q5/iso_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q6/ansi/{info.json => keyboard.json} (100%) rename keyboards/keychron/q6/ansi_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q6/iso/{info.json => keyboard.json} (100%) rename keyboards/keychron/q6/iso_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/q65/ansi_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/v1/ansi/{info.json => keyboard.json} (100%) rename keyboards/keychron/v1/ansi_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/v1/iso/{info.json => keyboard.json} (100%) rename keyboards/keychron/v1/iso_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/v1/jis/{info.json => keyboard.json} (100%) rename keyboards/keychron/v1/jis_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/v10/ansi_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/v10/iso_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/v3/ansi_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/v3/iso_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/v3/jis_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/v5/ansi/{info.json => keyboard.json} (100%) rename keyboards/keychron/v5/ansi_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/v5/iso/{info.json => keyboard.json} (100%) rename keyboards/keychron/v5/iso_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/v6/ansi/{info.json => keyboard.json} (100%) rename keyboards/keychron/v6/ansi_encoder/{info.json => keyboard.json} (100%) rename keyboards/keychron/v6/iso/{info.json => keyboard.json} (100%) rename keyboards/keychron/v6/iso_encoder/{info.json => keyboard.json} (100%) diff --git a/keyboards/keychron/c2_pro/ansi/rgb/info.json b/keyboards/keychron/c2_pro/ansi/rgb/keyboard.json similarity index 100% rename from keyboards/keychron/c2_pro/ansi/rgb/info.json rename to keyboards/keychron/c2_pro/ansi/rgb/keyboard.json diff --git a/keyboards/keychron/c2_pro/ansi/rgb/rules.mk b/keyboards/keychron/c2_pro/ansi/rgb/rules.mk index dab15510492..9760649931f 100644 --- a/keyboards/keychron/c2_pro/ansi/rgb/rules.mk +++ b/keyboards/keychron/c2_pro/ansi/rgb/rules.mk @@ -1,2 +1,2 @@ -# Build Options +# custom matrix setup SRC += matrix.c diff --git a/keyboards/keychron/c2_pro/ansi/white/info.json b/keyboards/keychron/c2_pro/ansi/white/keyboard.json similarity index 100% rename from keyboards/keychron/c2_pro/ansi/white/info.json rename to keyboards/keychron/c2_pro/ansi/white/keyboard.json diff --git a/keyboards/keychron/c2_pro/ansi/white/rules.mk b/keyboards/keychron/c2_pro/ansi/white/rules.mk index dab15510492..9760649931f 100644 --- a/keyboards/keychron/c2_pro/ansi/white/rules.mk +++ b/keyboards/keychron/c2_pro/ansi/white/rules.mk @@ -1,2 +1,2 @@ -# Build Options +# custom matrix setup SRC += matrix.c diff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q10/ansi_encoder/info.json rename to keyboards/keychron/q10/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q10/iso_encoder/info.json rename to keyboards/keychron/q10/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q11/ansi_encoder/info.json b/keyboards/keychron/q11/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q11/ansi_encoder/info.json rename to keyboards/keychron/q11/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q11/iso_encoder/info.json b/keyboards/keychron/q11/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q11/iso_encoder/info.json rename to keyboards/keychron/q11/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q11/iso_encoder/rules.mk b/keyboards/keychron/q11/iso_encoder/rules.mk index ac78b227d60..c6e29883213 100755 --- a/keyboards/keychron/q11/iso_encoder/rules.mk +++ b/keyboards/keychron/q11/iso_encoder/rules.mk @@ -1,4 +1 @@ -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE - SERIAL_DRIVER = usart diff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q12/ansi_encoder/info.json rename to keyboards/keychron/q12/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q12/iso_encoder/info.json b/keyboards/keychron/q12/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q12/iso_encoder/info.json rename to keyboards/keychron/q12/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q12/iso_encoder/rules.mk b/keyboards/keychron/q12/iso_encoder/rules.mk index 2d3e529c97e..3652da4b697 100644 --- a/keyboards/keychron/q12/iso_encoder/rules.mk +++ b/keyboards/keychron/q12/iso_encoder/rules.mk @@ -1,5 +1,4 @@ # custom matrix setup CUSTOM_MATRIX = lite -VPATH ?= keyboards/keychron/common SRC += matrix.c diff --git a/keyboards/keychron/q1v2/ansi/info.json b/keyboards/keychron/q1v2/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/q1v2/ansi/info.json rename to keyboards/keychron/q1v2/ansi/keyboard.json diff --git a/keyboards/keychron/q1v2/ansi_encoder/info.json b/keyboards/keychron/q1v2/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q1v2/ansi_encoder/info.json rename to keyboards/keychron/q1v2/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q1v2/iso/info.json b/keyboards/keychron/q1v2/iso/keyboard.json similarity index 100% rename from keyboards/keychron/q1v2/iso/info.json rename to keyboards/keychron/q1v2/iso/keyboard.json diff --git a/keyboards/keychron/q1v2/iso_encoder/info.json b/keyboards/keychron/q1v2/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q1v2/iso_encoder/info.json rename to keyboards/keychron/q1v2/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q1v2/jis/info.json b/keyboards/keychron/q1v2/jis/keyboard.json similarity index 100% rename from keyboards/keychron/q1v2/jis/info.json rename to keyboards/keychron/q1v2/jis/keyboard.json diff --git a/keyboards/keychron/q1v2/jis_encoder/info.json b/keyboards/keychron/q1v2/jis_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q1v2/jis_encoder/info.json rename to keyboards/keychron/q1v2/jis_encoder/keyboard.json diff --git a/keyboards/keychron/q3/ansi_encoder/info.json b/keyboards/keychron/q3/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q3/ansi_encoder/info.json rename to keyboards/keychron/q3/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q3/iso_encoder/info.json rename to keyboards/keychron/q3/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q3/jis_encoder/info.json b/keyboards/keychron/q3/jis_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q3/jis_encoder/info.json rename to keyboards/keychron/q3/jis_encoder/keyboard.json diff --git a/keyboards/keychron/q4/ansi/info.json b/keyboards/keychron/q4/ansi/info.json index 392ef8fc458..2f99641b25c 100644 --- a/keyboards/keychron/q4/ansi/info.json +++ b/keyboards/keychron/q4/ansi/info.json @@ -1,7 +1,6 @@ { "usb": { - "pid": "0x0140", - "device_version": "1.0.6" + "pid": "0x0140" }, "rgb_matrix": { "layout": [ diff --git a/keyboards/keychron/q4/ansi/v1/keyboard.json b/keyboards/keychron/q4/ansi/v1/keyboard.json new file mode 100644 index 00000000000..00eef71278e --- /dev/null +++ b/keyboards/keychron/q4/ansi/v1/keyboard.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "1.0.6" + } +} diff --git a/keyboards/keychron/q4/ansi/v1/rules.mk b/keyboards/keychron/q4/ansi/v1/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q4/ansi/v1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q4/ansi/v2/keyboard.json b/keyboards/keychron/q4/ansi/v2/keyboard.json new file mode 100644 index 00000000000..3bdd63ee287 --- /dev/null +++ b/keyboards/keychron/q4/ansi/v2/keyboard.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "2.0.0" + } +} diff --git a/keyboards/keychron/q4/ansi/v2/rules.mk b/keyboards/keychron/q4/ansi/v2/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/keychron/q4/ansi/v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/q5/ansi/info.json rename to keyboards/keychron/q5/ansi/keyboard.json diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q5/ansi_encoder/info.json rename to keyboards/keychron/q5/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/keyboard.json similarity index 100% rename from keyboards/keychron/q5/iso/info.json rename to keyboards/keychron/q5/iso/keyboard.json diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q5/iso_encoder/info.json rename to keyboards/keychron/q5/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q6/ansi/info.json b/keyboards/keychron/q6/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/q6/ansi/info.json rename to keyboards/keychron/q6/ansi/keyboard.json diff --git a/keyboards/keychron/q6/ansi_encoder/info.json b/keyboards/keychron/q6/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q6/ansi_encoder/info.json rename to keyboards/keychron/q6/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/q6/iso/info.json b/keyboards/keychron/q6/iso/keyboard.json similarity index 100% rename from keyboards/keychron/q6/iso/info.json rename to keyboards/keychron/q6/iso/keyboard.json diff --git a/keyboards/keychron/q6/iso_encoder/info.json b/keyboards/keychron/q6/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q6/iso_encoder/info.json rename to keyboards/keychron/q6/iso_encoder/keyboard.json diff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/q65/ansi_encoder/info.json rename to keyboards/keychron/q65/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/v1/ansi/info.json b/keyboards/keychron/v1/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/v1/ansi/info.json rename to keyboards/keychron/v1/ansi/keyboard.json diff --git a/keyboards/keychron/v1/ansi_encoder/info.json b/keyboards/keychron/v1/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v1/ansi_encoder/info.json rename to keyboards/keychron/v1/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/v1/iso/info.json b/keyboards/keychron/v1/iso/keyboard.json similarity index 100% rename from keyboards/keychron/v1/iso/info.json rename to keyboards/keychron/v1/iso/keyboard.json diff --git a/keyboards/keychron/v1/iso_encoder/info.json b/keyboards/keychron/v1/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v1/iso_encoder/info.json rename to keyboards/keychron/v1/iso_encoder/keyboard.json diff --git a/keyboards/keychron/v1/jis/info.json b/keyboards/keychron/v1/jis/keyboard.json similarity index 100% rename from keyboards/keychron/v1/jis/info.json rename to keyboards/keychron/v1/jis/keyboard.json diff --git a/keyboards/keychron/v1/jis_encoder/info.json b/keyboards/keychron/v1/jis_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v1/jis_encoder/info.json rename to keyboards/keychron/v1/jis_encoder/keyboard.json diff --git a/keyboards/keychron/v10/ansi_encoder/info.json b/keyboards/keychron/v10/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v10/ansi_encoder/info.json rename to keyboards/keychron/v10/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/v10/iso_encoder/info.json b/keyboards/keychron/v10/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v10/iso_encoder/info.json rename to keyboards/keychron/v10/iso_encoder/keyboard.json diff --git a/keyboards/keychron/v3/ansi_encoder/info.json b/keyboards/keychron/v3/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v3/ansi_encoder/info.json rename to keyboards/keychron/v3/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/v3/iso_encoder/info.json b/keyboards/keychron/v3/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v3/iso_encoder/info.json rename to keyboards/keychron/v3/iso_encoder/keyboard.json diff --git a/keyboards/keychron/v3/jis_encoder/info.json b/keyboards/keychron/v3/jis_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v3/jis_encoder/info.json rename to keyboards/keychron/v3/jis_encoder/keyboard.json diff --git a/keyboards/keychron/v5/ansi/info.json b/keyboards/keychron/v5/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/v5/ansi/info.json rename to keyboards/keychron/v5/ansi/keyboard.json diff --git a/keyboards/keychron/v5/ansi_encoder/info.json b/keyboards/keychron/v5/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v5/ansi_encoder/info.json rename to keyboards/keychron/v5/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/v5/iso/info.json b/keyboards/keychron/v5/iso/keyboard.json similarity index 100% rename from keyboards/keychron/v5/iso/info.json rename to keyboards/keychron/v5/iso/keyboard.json diff --git a/keyboards/keychron/v5/iso_encoder/info.json b/keyboards/keychron/v5/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v5/iso_encoder/info.json rename to keyboards/keychron/v5/iso_encoder/keyboard.json diff --git a/keyboards/keychron/v6/ansi/info.json b/keyboards/keychron/v6/ansi/keyboard.json similarity index 100% rename from keyboards/keychron/v6/ansi/info.json rename to keyboards/keychron/v6/ansi/keyboard.json diff --git a/keyboards/keychron/v6/ansi_encoder/info.json b/keyboards/keychron/v6/ansi_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v6/ansi_encoder/info.json rename to keyboards/keychron/v6/ansi_encoder/keyboard.json diff --git a/keyboards/keychron/v6/iso/info.json b/keyboards/keychron/v6/iso/keyboard.json similarity index 100% rename from keyboards/keychron/v6/iso/info.json rename to keyboards/keychron/v6/iso/keyboard.json diff --git a/keyboards/keychron/v6/iso_encoder/info.json b/keyboards/keychron/v6/iso_encoder/keyboard.json similarity index 100% rename from keyboards/keychron/v6/iso_encoder/info.json rename to keyboards/keychron/v6/iso_encoder/keyboard.json diff --git a/keyboards/keychron/v6/iso_encoder/rules.mk b/keyboards/keychron/v6/iso_encoder/rules.mk index 2d3e529c97e..3652da4b697 100644 --- a/keyboards/keychron/v6/iso_encoder/rules.mk +++ b/keyboards/keychron/v6/iso_encoder/rules.mk @@ -1,5 +1,4 @@ # custom matrix setup CUSTOM_MATRIX = lite -VPATH ?= keyboards/keychron/common SRC += matrix.c From c505ea48b37ce6b1a725dbfe13842007785f5ef2 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 24 Apr 2024 13:59:57 +1000 Subject: [PATCH 180/333] Add haptic driver to keyboard.json schema (#23591) --- data/mappings/info_rules.hjson | 1 + data/schemas/keyboard.jsonschema | 9 +++++++++ keyboards/ai03/lunar_ii/keyboard.json | 3 +++ keyboards/ai03/lunar_ii/rules.mk | 1 - keyboards/boston_meetup/2019/keyboard.json | 3 +++ keyboards/boston_meetup/2019/rules.mk | 1 - keyboards/dcpedit/redherring/keyboard.json | 3 +++ keyboards/dcpedit/redherring/rules.mk | 1 - keyboards/hadron/ver3/keyboard.json | 3 +++ keyboards/hadron/ver3/rules.mk | 1 - keyboards/hardwareabstraction/handwire/keyboard.json | 3 +++ keyboards/hardwareabstraction/handwire/rules.mk | 1 - .../ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json | 3 +++ keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk | 1 - keyboards/mechwild/clunker/{info.json => keyboard.json} | 3 +++ keyboards/mechwild/clunker/rules.mk | 1 - keyboards/pearlboards/atlas/keyboard.json | 3 +++ keyboards/pearlboards/atlas/rules.mk | 1 - keyboards/pearlboards/pearl/keyboard.json | 3 +++ keyboards/pearlboards/pearl/rules.mk | 1 - keyboards/pearlboards/zeus/keyboard.json | 3 +++ keyboards/pearlboards/zeus/rules.mk | 1 - keyboards/splitkb/zima/keyboard.json | 3 +++ keyboards/splitkb/zima/rules.mk | 1 - .../overnumpad_1xb/keyboard.json | 3 +++ .../classic_ultracl_post_2013/overnumpad_1xb/rules.mk | 1 - .../overnumpad_1xb/keyboard.json | 3 +++ .../classic_ultracl_pre_2013/overnumpad_1xb/rules.mk | 1 - keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json | 3 +++ keyboards/unicomp/pc122/overnumpad_1xb/rules.mk | 1 - .../spacesaver_m_post_2013/overnumpad_1xb/keyboard.json | 3 +++ .../spacesaver_m_post_2013/overnumpad_1xb/rules.mk | 1 - .../spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json | 3 +++ .../spacesaver_m_pre_2013/overnumpad_1xb/rules.mk | 1 - keyboards/vertex/angle65/keyboard.json | 3 +++ keyboards/vertex/angle65/rules.mk | 1 - keyboards/xw60/keyboard.json | 3 +++ keyboards/xw60/rules.mk | 1 - 38 files changed, 64 insertions(+), 18 deletions(-) delete mode 100644 keyboards/ai03/lunar_ii/rules.mk delete mode 100644 keyboards/boston_meetup/2019/rules.mk delete mode 100644 keyboards/hadron/ver3/rules.mk delete mode 100644 keyboards/hardwareabstraction/handwire/rules.mk delete mode 100644 keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk rename keyboards/mechwild/clunker/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/mechwild/clunker/rules.mk delete mode 100644 keyboards/pearlboards/atlas/rules.mk delete mode 100644 keyboards/pearlboards/pearl/rules.mk delete mode 100644 keyboards/pearlboards/zeus/rules.mk delete mode 100644 keyboards/splitkb/zima/rules.mk delete mode 100644 keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk delete mode 100644 keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk delete mode 100644 keyboards/unicomp/pc122/overnumpad_1xb/rules.mk delete mode 100644 keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk delete mode 100644 keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk delete mode 100644 keyboards/vertex/angle65/rules.mk delete mode 100644 keyboards/xw60/rules.mk diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson index fc25eb3328b..35e2e8dfc0d 100644 --- a/data/mappings/info_rules.hjson +++ b/data/mappings/info_rules.hjson @@ -23,6 +23,7 @@ "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"}, "ENCODER_DRIVER": {"info_key": "encoder.driver"}, "FIRMWARE_FORMAT": {"info_key": "build.firmware_format"}, + "HAPTIC_DRIVER": {"info_key": "haptic.driver"}, "KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"}, "LAYOUTS": {"info_key": "community_layouts", "value_type": "list"}, "LED_MATRIX_DRIVER": {"info_key": "led_matrix.driver"}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 25aaabcf4a3..f3116fd2710 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -387,6 +387,15 @@ } } }, + "haptic": { + "type": "object", + "properties": { + "driver": { + "type": "string", + "enum": ["drv2605l", "solenoid"] + } + } + }, "leader_key": { "type": "object", "properties": { diff --git a/keyboards/ai03/lunar_ii/keyboard.json b/keyboards/ai03/lunar_ii/keyboard.json index 38729595a29..badf9240aba 100644 --- a/keyboards/ai03/lunar_ii/keyboard.json +++ b/keyboards/ai03/lunar_ii/keyboard.json @@ -22,6 +22,9 @@ "resync": true } }, + "haptic": { + "driver": "solenoid" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/ai03/lunar_ii/rules.mk b/keyboards/ai03/lunar_ii/rules.mk deleted file mode 100644 index a521203b326..00000000000 --- a/keyboards/ai03/lunar_ii/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = solenoid diff --git a/keyboards/boston_meetup/2019/keyboard.json b/keyboards/boston_meetup/2019/keyboard.json index 97990bb5030..40a390b0a8c 100644 --- a/keyboards/boston_meetup/2019/keyboard.json +++ b/keyboards/boston_meetup/2019/keyboard.json @@ -17,6 +17,9 @@ "haptic": true, "oled": true }, + "haptic": { + "driver": "drv2605l" + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk deleted file mode 100644 index dea510c2ab3..00000000000 --- a/keyboards/boston_meetup/2019/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = drv2605l diff --git a/keyboards/dcpedit/redherring/keyboard.json b/keyboards/dcpedit/redherring/keyboard.json index 845c52e3e04..a2f87c90b9a 100644 --- a/keyboards/dcpedit/redherring/keyboard.json +++ b/keyboards/dcpedit/redherring/keyboard.json @@ -31,6 +31,9 @@ "qmk": { "tap_keycode_delay": 10 }, + "haptic": { + "driver": "solenoid" + }, "url": "https://github.com/dcpedit/redherring", "usb": { "device_version": "1.0.0", diff --git a/keyboards/dcpedit/redherring/rules.mk b/keyboards/dcpedit/redherring/rules.mk index 35c76d4cf1c..27d8af7683e 100644 --- a/keyboards/dcpedit/redherring/rules.mk +++ b/keyboards/dcpedit/redherring/rules.mk @@ -1,2 +1 @@ F_CPU = 16000000 -HAPTIC_DRIVER = solenoid \ No newline at end of file diff --git a/keyboards/hadron/ver3/keyboard.json b/keyboards/hadron/ver3/keyboard.json index 02a75d59eb8..f3e4bba06f1 100644 --- a/keyboards/hadron/ver3/keyboard.json +++ b/keyboards/hadron/ver3/keyboard.json @@ -15,6 +15,9 @@ {"pin_a": "B13", "pin_b": "B14"} ] }, + "haptic": { + "driver": "drv2605l" + }, "rgblight": { "led_count": 10, "animations": { diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk deleted file mode 100644 index dea510c2ab3..00000000000 --- a/keyboards/hadron/ver3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = drv2605l diff --git a/keyboards/hardwareabstraction/handwire/keyboard.json b/keyboards/hardwareabstraction/handwire/keyboard.json index 5e0ec6f11e2..225712dcc4f 100644 --- a/keyboards/hardwareabstraction/handwire/keyboard.json +++ b/keyboards/hardwareabstraction/handwire/keyboard.json @@ -15,6 +15,9 @@ "oled": true, "wpm": true }, + "haptic": { + "driver": "solenoid" + }, "build": { "lto": true }, diff --git a/keyboards/hardwareabstraction/handwire/rules.mk b/keyboards/hardwareabstraction/handwire/rules.mk deleted file mode 100644 index a521203b326..00000000000 --- a/keyboards/hardwareabstraction/handwire/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = solenoid diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json index 0f67e6606d7..be103896718 100644 --- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json +++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json @@ -11,6 +11,9 @@ "keyboard": true } }, + "haptic": { + "driver": "solenoid" + }, "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk deleted file mode 100644 index a521203b326..00000000000 --- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = solenoid diff --git a/keyboards/mechwild/clunker/info.json b/keyboards/mechwild/clunker/keyboard.json similarity index 99% rename from keyboards/mechwild/clunker/info.json rename to keyboards/mechwild/clunker/keyboard.json index 1a4114f8f29..acf9628f8e1 100644 --- a/keyboards/mechwild/clunker/info.json +++ b/keyboards/mechwild/clunker/keyboard.json @@ -17,6 +17,9 @@ "mousekey": true, "nkro": true }, + "haptic": { + "driver": "solenoid" + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "F6", "B3", "F7", "B2", "B1", "B6"] diff --git a/keyboards/mechwild/clunker/rules.mk b/keyboards/mechwild/clunker/rules.mk deleted file mode 100644 index a521203b326..00000000000 --- a/keyboards/mechwild/clunker/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = solenoid diff --git a/keyboards/pearlboards/atlas/keyboard.json b/keyboards/pearlboards/atlas/keyboard.json index 173a20892b5..714a344c33a 100644 --- a/keyboards/pearlboards/atlas/keyboard.json +++ b/keyboards/pearlboards/atlas/keyboard.json @@ -31,6 +31,9 @@ {"pin_a": "E0", "pin_b": "D7", "resolution": 1} ] }, + "haptic": { + "driver": "drv2605l" + }, "indicators": { "caps_lock": "F4", "num_lock": "F5", diff --git a/keyboards/pearlboards/atlas/rules.mk b/keyboards/pearlboards/atlas/rules.mk deleted file mode 100644 index dea510c2ab3..00000000000 --- a/keyboards/pearlboards/atlas/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = drv2605l diff --git a/keyboards/pearlboards/pearl/keyboard.json b/keyboards/pearlboards/pearl/keyboard.json index e2dddb86620..0dc6f9a7a5e 100644 --- a/keyboards/pearlboards/pearl/keyboard.json +++ b/keyboards/pearlboards/pearl/keyboard.json @@ -31,6 +31,9 @@ "scroll_lock": "B2", "on_state": 0 }, + "haptic": { + "driver": "drv2605l" + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/pearlboards/pearl/rules.mk b/keyboards/pearlboards/pearl/rules.mk deleted file mode 100644 index dea510c2ab3..00000000000 --- a/keyboards/pearlboards/pearl/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = drv2605l diff --git a/keyboards/pearlboards/zeus/keyboard.json b/keyboards/pearlboards/zeus/keyboard.json index c77adfb5cf9..43639179509 100644 --- a/keyboards/pearlboards/zeus/keyboard.json +++ b/keyboards/pearlboards/zeus/keyboard.json @@ -31,6 +31,9 @@ {"pin_a": "E7", "pin_b": "E6", "resolution": 1} ] }, + "haptic": { + "driver": "drv2605l" + }, "indicators": { "caps_lock": "C5", "num_lock": "C4", diff --git a/keyboards/pearlboards/zeus/rules.mk b/keyboards/pearlboards/zeus/rules.mk deleted file mode 100644 index 34900998f76..00000000000 --- a/keyboards/pearlboards/zeus/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = drv2605l # Rumble motor diff --git a/keyboards/splitkb/zima/keyboard.json b/keyboards/splitkb/zima/keyboard.json index 68892960da7..c3e33d939e1 100644 --- a/keyboards/splitkb/zima/keyboard.json +++ b/keyboards/splitkb/zima/keyboard.json @@ -22,6 +22,9 @@ "oled": true, "rgblight": true }, + "haptic": { + "driver": "drv2605l" + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/splitkb/zima/rules.mk b/keyboards/splitkb/zima/rules.mk deleted file mode 100644 index dea510c2ab3..00000000000 --- a/keyboards/splitkb/zima/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = drv2605l diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json index 0ef2cc4d5ed..cdc22909c0b 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json +++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json @@ -15,6 +15,9 @@ "num_lock": "C12", "scroll_lock": "C10" }, + "haptic": { + "driver": "solenoid" + }, "processor": "STM32F446", "bootloader": "stm32-dfu", "diode_direction": "ROW2COL", diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk deleted file mode 100644 index a521203b326..00000000000 --- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = solenoid diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json index 30264dd537d..71f706171eb 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json +++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json @@ -10,6 +10,9 @@ "mousekey": true, "nkro": false }, + "haptic": { + "driver": "solenoid" + }, "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk deleted file mode 100644 index a521203b326..00000000000 --- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = solenoid diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json index 936e286af1d..73b79e40473 100644 --- a/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json +++ b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json @@ -10,6 +10,9 @@ "mousekey": true, "nkro": false }, + "haptic": { + "driver": "solenoid" + }, "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk deleted file mode 100644 index a521203b326..00000000000 --- a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = solenoid diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json index 9fd91ce48fc..e2e6a610434 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json +++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json @@ -10,6 +10,9 @@ "mousekey": true, "nkro": false }, + "haptic": { + "driver": "solenoid" + }, "indicators": { "caps_lock": "C12" }, diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk deleted file mode 100644 index a521203b326..00000000000 --- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = solenoid diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json index db772e46e24..111b106f381 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json +++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json @@ -13,6 +13,9 @@ "indicators": { "caps_lock": "C12" }, + "haptic": { + "driver": "solenoid" + }, "processor": "STM32F446", // RET6 "bootloader": "stm32-dfu", "diode_direction": "ROW2COL", diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk deleted file mode 100644 index a521203b326..00000000000 --- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = solenoid diff --git a/keyboards/vertex/angle65/keyboard.json b/keyboards/vertex/angle65/keyboard.json index 962b3fd4f11..ef0aacfef4b 100644 --- a/keyboards/vertex/angle65/keyboard.json +++ b/keyboards/vertex/angle65/keyboard.json @@ -30,6 +30,9 @@ "caps_lock": "C13", "on_state": 0 }, + "haptic": { + "driver": "solenoid" + }, "rgblight": { "led_count": 9, "animations": { diff --git a/keyboards/vertex/angle65/rules.mk b/keyboards/vertex/angle65/rules.mk deleted file mode 100644 index a521203b326..00000000000 --- a/keyboards/vertex/angle65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = solenoid diff --git a/keyboards/xw60/keyboard.json b/keyboards/xw60/keyboard.json index 6316f944e50..3bd11e21c18 100644 --- a/keyboards/xw60/keyboard.json +++ b/keyboards/xw60/keyboard.json @@ -20,6 +20,9 @@ "enabled": true } }, + "haptic": { + "driver": "solenoid" + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/xw60/rules.mk b/keyboards/xw60/rules.mk deleted file mode 100644 index a521203b326..00000000000 --- a/keyboards/xw60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -HAPTIC_DRIVER = solenoid From c8ceda461afb9d6aab33309a06c94fceabfcbc72 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 24 Apr 2024 05:59:12 +0100 Subject: [PATCH 181/333] Remove RGBLIGHT_SPLIT in rules.mk (#23599) --- keyboards/kagizaraya/scythe/rules.mk | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/kagizaraya/scythe/rules.mk diff --git a/keyboards/kagizaraya/scythe/rules.mk b/keyboards/kagizaraya/scythe/rules.mk deleted file mode 100644 index ab8787868ef..00000000000 --- a/keyboards/kagizaraya/scythe/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_SPLIT = yes From 16cca527a6b46c2aa365428d7d1e214509068c4a Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 24 Apr 2024 19:33:52 +0100 Subject: [PATCH 182/333] Fix WAIT_FOR_USB handling (#23598) --- data/mappings/info_rules.hjson | 2 +- data/schemas/keyboard.jsonschema | 2 +- docs/config_options.md | 2 +- docs/ja/config_options.md | 2 +- docs/reference_info_json.md | 2 +- keyboards/converter/hp_46010a/keyboard.json | 3 ++- keyboards/converter/hp_46010a/rules.mk | 1 - keyboards/geekboards/macropad_v2/config.h | 2 -- keyboards/geekboards/macropad_v2/keyboard.json | 3 ++- keyboards/ristretto/keyboard.json | 3 ++- keyboards/ristretto/rules.mk | 1 - tmk_core/protocol.mk | 4 ++++ tmk_core/protocol/chibios/chibios.c | 7 ++++++- tmk_core/protocol/lufa/lufa.c | 7 ++++++- 14 files changed, 27 insertions(+), 14 deletions(-) delete mode 100644 keyboards/ristretto/rules.mk diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson index 35e2e8dfc0d..5d08be2fc1a 100644 --- a/data/mappings/info_rules.hjson +++ b/data/mappings/info_rules.hjson @@ -44,7 +44,7 @@ "SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "to_c": false}, "STENO_ENABLE": {"info_key": "stenography.enabled", "value_type": "bool"}, "STENO_PROTOCOL": {"info_key": "stenography.protocol"}, - "WAIT_FOR_USB": {"info_key": "usb.wait_for", "value_type": "bool"}, + "USB_WAIT_FOR_ENUMERATION": {"info_key": "usb.wait_for_enumeration", "value_type": "bool"}, "WEAR_LEVELING_DRIVER": {"info_key": "eeprom.wear_leveling.driver"}, "WS2812_DRIVER": {"info_key": "ws2812.driver"}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index f3116fd2710..24f7fec9ab3 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -894,7 +894,7 @@ } }, "suspend_wakeup_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"}, - "wait_for": {"type": "boolean"} + "wait_for_enumeration": {"type": "boolean"} } }, "qmk": { diff --git a/docs/config_options.md b/docs/config_options.md index 045d9c07479..fca80e54fde 100644 --- a/docs/config_options.md +++ b/docs/config_options.md @@ -446,7 +446,7 @@ Use these to enable or disable building certain features. The more you have enab * Allows replacing the standard matrix scanning routine with a custom one. * `DEBOUNCE_TYPE` * Allows replacing the standard key debouncing routine with an alternative or custom one. -* `WAIT_FOR_USB` +* `USB_WAIT_FOR_ENUMERATION` * Forces the keyboard to wait for a USB connection to be established before it starts up * `NO_USB_STARTUP_CHECK` * Disables usb suspend check after keyboard startup. Usually the keyboard waits for the host to wake it up before any tasks are performed. This is useful for split keyboards as one half will not get a wakeup call but must send commands to the master. diff --git a/docs/ja/config_options.md b/docs/ja/config_options.md index a349081d6a2..6cc1b6bfcd7 100644 --- a/docs/ja/config_options.md +++ b/docs/ja/config_options.md @@ -378,7 +378,7 @@ QMK での全ての利用可能な設定にはデフォルトがあります。 * 標準マトリックス走査ルーチンを独自のものに置き換えることができます。 * `DEBOUNCE_TYPE` * 標準キーデバウンスルーチンを代替または独自のものに置き換えることができます。 -* `WAIT_FOR_USB` +* `USB_WAIT_FOR_ENUMERATION` * キーボードが起動する前に、USB 接続が確立されるのをキーボードに待機させます * `NO_USB_STARTUP_CHECK` * キーボードの起動後の usb サスペンドチェックを無効にします。通常、キーボードはタスクが実行される前にホストがウェイク アップするのを待ちます。分割キーボードは半分はウェイクアップコールを取得できませんが、マスタにコマンドを送信する必要があるため、役に立ちます。 diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md index e6bc34e79ec..6f0b84c414b 100644 --- a/docs/reference_info_json.md +++ b/docs/reference_info_json.md @@ -833,7 +833,7 @@ Configures the [Stenography](feature_stenography.md) feature. * `suspend_wakeup_delay` * The amount of time to wait after sending a wakeup packet, in milliseconds. * Default: `0` (disabled) - * `wait_for` + * `wait_for_enumeration` * Force the keyboard to wait for USB enumeration before starting up. * Default: `false` diff --git a/keyboards/converter/hp_46010a/keyboard.json b/keyboards/converter/hp_46010a/keyboard.json index 0296bda5e98..45193069813 100644 --- a/keyboards/converter/hp_46010a/keyboard.json +++ b/keyboards/converter/hp_46010a/keyboard.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x6060", - "device_version": "0.0.1" + "device_version": "0.0.1", + "wait_for_enumeration": true }, "processor": "atmega32u4", "bootloader": "halfkay", diff --git a/keyboards/converter/hp_46010a/rules.mk b/keyboards/converter/hp_46010a/rules.mk index 3c6124d20ab..857395fb404 100644 --- a/keyboards/converter/hp_46010a/rules.mk +++ b/keyboards/converter/hp_46010a/rules.mk @@ -1,4 +1,3 @@ -WAIT_FOR_USB = yes CUSTOM_MATRIX = yes SRC = matrix.c diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h index dca98f0c954..e452c886f69 100644 --- a/keyboards/geekboards/macropad_v2/config.h +++ b/keyboards/geekboards/macropad_v2/config.h @@ -21,5 +21,3 @@ #define WS2812_PWM_PAL_MODE 1 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 #define WS2812_PWM_DMA_CHANNEL 3 - -#define WAIT_FOR_USB diff --git a/keyboards/geekboards/macropad_v2/keyboard.json b/keyboards/geekboards/macropad_v2/keyboard.json index 035a83c157d..54d779570a6 100644 --- a/keyboards/geekboards/macropad_v2/keyboard.json +++ b/keyboards/geekboards/macropad_v2/keyboard.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x0483", "pid": "0xA372", - "device_version": "0.0.2" + "device_version": "0.0.2", + "wait_for_enumeration": true }, "qmk": { "tap_keycode_delay": 10 diff --git a/keyboards/ristretto/keyboard.json b/keyboards/ristretto/keyboard.json index b28f3c1dc10..e8e812b7d2f 100644 --- a/keyboards/ristretto/keyboard.json +++ b/keyboards/ristretto/keyboard.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x666B", "pid": "0x7273", - "device_version": "0.0.1" + "device_version": "0.0.1", + "wait_for_enumeration": true }, "features": { "bootmagic": false, diff --git a/keyboards/ristretto/rules.mk b/keyboards/ristretto/rules.mk deleted file mode 100644 index 908e5e972ec..00000000000 --- a/keyboards/ristretto/rules.mk +++ /dev/null @@ -1 +0,0 @@ -WAIT_FOR_USB = yes diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk index fd5342d637e..796b4e87871 100644 --- a/tmk_core/protocol.mk +++ b/tmk_core/protocol.mk @@ -66,6 +66,10 @@ ifeq ($(strip $(NO_USB_STARTUP_CHECK)), yes) OPT_DEFS += -DNO_USB_STARTUP_CHECK endif +ifeq ($(strip $(USB_WAIT_FOR_ENUMERATION)), yes) + OPT_DEFS += -DUSB_WAIT_FOR_ENUMERATION +endif + ifeq ($(strip $(JOYSTICK_SHARED_EP)), yes) OPT_DEFS += -DJOYSTICK_SHARED_EP SHARED_EP_ENABLE = yes diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c index a02097785f4..a249af8d38c 100644 --- a/tmk_core/protocol/chibios/chibios.c +++ b/tmk_core/protocol/chibios/chibios.c @@ -51,6 +51,11 @@ #define USB_GETSTATUS_REMOTE_WAKEUP_ENABLED (2U) +#ifdef WAIT_FOR_USB +// TODO: Remove backwards compatibility with old define +# define USB_WAIT_FOR_ENUMERATION +#endif + /* ------------------------- * TMK host driver defs * ------------------------- @@ -143,7 +148,7 @@ void protocol_pre_init(void) { /* Wait until USB is active */ while (true) { -#if defined(WAIT_FOR_USB) +#if defined(USB_WAIT_FOR_ENUMERATION) if (USB_DRIVER.state == USB_ACTIVE) { driver = &chibios_driver; break; diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index d6f0c69b6b0..2142b04460a 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -67,6 +67,11 @@ # include "raw_hid.h" #endif +#ifdef WAIT_FOR_USB +// TODO: Remove backwards compatibility with old define +# define USB_WAIT_FOR_ENUMERATION +#endif + uint8_t keyboard_idle = 0; /* 0: Boot Protocol, 1: Report Protocol(default) */ uint8_t keyboard_protocol = 1; @@ -807,7 +812,7 @@ void protocol_pre_init(void) { /* wait for USB startup & debug output */ -#ifdef WAIT_FOR_USB +#ifdef USB_WAIT_FOR_ENUMERATION while (USB_DeviceState != DEVICE_STATE_Configured) { # if defined(INTERRUPT_CONTROL_ENDPOINT) ; From 861a9049240fcced58e15b2593964bcfca95b0d8 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 24 Apr 2024 22:53:58 +0100 Subject: [PATCH 183/333] Align NO_SUSPEND_POWER_DOWN keyboard config (#23606) --- keyboards/hs60/v1/rules.mk | 2 +- keyboards/hs60/v2/ansi/rules.mk | 4 ++-- keyboards/hs60/v2/hhkb/rules.mk | 4 ++-- keyboards/hs60/v2/iso/rules.mk | 4 ++-- keyboards/keebwerk/mega/ansi/rules.mk | 4 ++-- keyboards/novelkeys/nk65/rules.mk | 2 +- keyboards/novelkeys/nk87/rules.mk | 2 +- keyboards/spaceholdings/nebula12/rules.mk | 2 +- keyboards/spaceholdings/nebula68/rules.mk | 2 +- keyboards/wilba_tech/rama_works_kara/rules.mk | 2 +- keyboards/wilba_tech/rama_works_koyu/rules.mk | 2 +- keyboards/wilba_tech/rama_works_m10_c/rules.mk | 2 +- keyboards/wilba_tech/rama_works_m50_a/rules.mk | 2 +- keyboards/wilba_tech/rama_works_m60_a/rules.mk | 2 +- keyboards/wilba_tech/rama_works_m65_b/rules.mk | 2 +- keyboards/wilba_tech/rama_works_m65_bx/rules.mk | 2 +- keyboards/wilba_tech/rama_works_m6_a/rules.mk | 2 +- keyboards/wilba_tech/rama_works_m6_b/rules.mk | 2 +- keyboards/wilba_tech/wt60_b/rules.mk | 2 +- keyboards/wilba_tech/wt60_bx/rules.mk | 2 +- keyboards/wilba_tech/wt60_c/rules.mk | 2 +- keyboards/wilba_tech/zeal60/rules.mk | 2 +- keyboards/wilba_tech/zeal65/rules.mk | 2 +- keyboards/xelus/dawn60/rev1/rules.mk | 2 +- keyboards/xelus/dawn60/rev1_qmk/rules.mk | 2 +- 25 files changed, 29 insertions(+), 29 deletions(-) diff --git a/keyboards/hs60/v1/rules.mk b/keyboards/hs60/v1/rules.mk index 806a82e12af..5cde06a483e 100644 --- a/keyboards/hs60/v1/rules.mk +++ b/keyboards/hs60/v1/rules.mk @@ -1,4 +1,4 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes diff --git a/keyboards/hs60/v2/ansi/rules.mk b/keyboards/hs60/v2/ansi/rules.mk index 611bb888bac..3b7a32713c3 100644 --- a/keyboards/hs60/v2/ansi/rules.mk +++ b/keyboards/hs60/v2/ansi/rules.mk @@ -1,13 +1,13 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes 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/hs60/v2/hhkb/rules.mk b/keyboards/hs60/v2/hhkb/rules.mk index 611bb888bac..3b7a32713c3 100644 --- a/keyboards/hs60/v2/hhkb/rules.mk +++ b/keyboards/hs60/v2/hhkb/rules.mk @@ -1,13 +1,13 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes 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/hs60/v2/iso/rules.mk b/keyboards/hs60/v2/iso/rules.mk index 611bb888bac..3b7a32713c3 100644 --- a/keyboards/hs60/v2/iso/rules.mk +++ b/keyboards/hs60/v2/iso/rules.mk @@ -1,13 +1,13 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes 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/keebwerk/mega/ansi/rules.mk b/keyboards/keebwerk/mega/ansi/rules.mk index ba2c38618a2..60dc97f0586 100755 --- a/keyboards/keebwerk/mega/ansi/rules.mk +++ b/keyboards/keebwerk/mega/ansi/rules.mk @@ -1,13 +1,13 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes 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/novelkeys/nk65/rules.mk b/keyboards/novelkeys/nk65/rules.mk index 9fe973310c1..c0d789a5a6c 100755 --- a/keyboards/novelkeys/nk65/rules.mk +++ b/keyboards/novelkeys/nk65/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/novelkeys/nk87/rules.mk b/keyboards/novelkeys/nk87/rules.mk index ef378d1ec25..3b7a32713c3 100755 --- a/keyboards/novelkeys/nk87/rules.mk +++ b/keyboards/novelkeys/nk87/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/spaceholdings/nebula12/rules.mk b/keyboards/spaceholdings/nebula12/rules.mk index dd548eee148..edd7b800ef2 100755 --- a/keyboards/spaceholdings/nebula12/rules.mk +++ b/keyboards/spaceholdings/nebula12/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/spaceholdings/nebula68/rules.mk b/keyboards/spaceholdings/nebula68/rules.mk index c2507bf03df..60dc97f0586 100755 --- a/keyboards/spaceholdings/nebula68/rules.mk +++ b/keyboards/spaceholdings/nebula68/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_kara/rules.mk b/keyboards/wilba_tech/rama_works_kara/rules.mk index 34e6eaa45b8..cab0ca57e8c 100644 --- a/keyboards/wilba_tech/rama_works_kara/rules.mk +++ b/keyboards/wilba_tech/rama_works_kara/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_koyu/rules.mk b/keyboards/wilba_tech/rama_works_koyu/rules.mk index 34e6eaa45b8..cab0ca57e8c 100644 --- a/keyboards/wilba_tech/rama_works_koyu/rules.mk +++ b/keyboards/wilba_tech/rama_works_koyu/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_m10_c/rules.mk b/keyboards/wilba_tech/rama_works_m10_c/rules.mk index 34e6eaa45b8..cab0ca57e8c 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/rules.mk +++ b/keyboards/wilba_tech/rama_works_m10_c/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_m50_a/rules.mk b/keyboards/wilba_tech/rama_works_m50_a/rules.mk index 34e6eaa45b8..cab0ca57e8c 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_m50_a/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_m60_a/rules.mk b/keyboards/wilba_tech/rama_works_m60_a/rules.mk index 34e6eaa45b8..cab0ca57e8c 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_m60_a/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_m65_b/rules.mk b/keyboards/wilba_tech/rama_works_m65_b/rules.mk index 34e6eaa45b8..cab0ca57e8c 100644 --- a/keyboards/wilba_tech/rama_works_m65_b/rules.mk +++ b/keyboards/wilba_tech/rama_works_m65_b/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk index 34e6eaa45b8..cab0ca57e8c 100644 --- a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk +++ b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_m6_a/rules.mk b/keyboards/wilba_tech/rama_works_m6_a/rules.mk index 806a82e12af..5cde06a483e 100644 --- a/keyboards/wilba_tech/rama_works_m6_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_m6_a/rules.mk @@ -1,4 +1,4 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes diff --git a/keyboards/wilba_tech/rama_works_m6_b/rules.mk b/keyboards/wilba_tech/rama_works_m6_b/rules.mk index 4650d7a6ea2..67495c9835f 100644 --- a/keyboards/wilba_tech/rama_works_m6_b/rules.mk +++ b/keyboards/wilba_tech/rama_works_m6_b/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/wt60_b/rules.mk b/keyboards/wilba_tech/wt60_b/rules.mk index 34e6eaa45b8..cab0ca57e8c 100644 --- a/keyboards/wilba_tech/wt60_b/rules.mk +++ b/keyboards/wilba_tech/wt60_b/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/wt60_bx/rules.mk b/keyboards/wilba_tech/wt60_bx/rules.mk index 34e6eaa45b8..cab0ca57e8c 100644 --- a/keyboards/wilba_tech/wt60_bx/rules.mk +++ b/keyboards/wilba_tech/wt60_bx/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/wt60_c/rules.mk b/keyboards/wilba_tech/wt60_c/rules.mk index 34e6eaa45b8..cab0ca57e8c 100644 --- a/keyboards/wilba_tech/wt60_c/rules.mk +++ b/keyboards/wilba_tech/wt60_c/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/zeal60/rules.mk b/keyboards/wilba_tech/zeal60/rules.mk index 34e6eaa45b8..cab0ca57e8c 100644 --- a/keyboards/wilba_tech/zeal60/rules.mk +++ b/keyboards/wilba_tech/zeal60/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/zeal65/rules.mk b/keyboards/wilba_tech/zeal65/rules.mk index 34e6eaa45b8..cab0ca57e8c 100644 --- a/keyboards/wilba_tech/zeal65/rules.mk +++ b/keyboards/wilba_tech/zeal65/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/xelus/dawn60/rev1/rules.mk b/keyboards/xelus/dawn60/rev1/rules.mk index 879710e8e7a..69c283a207d 100644 --- a/keyboards/xelus/dawn60/rev1/rules.mk +++ b/keyboards/xelus/dawn60/rev1/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes CIE1931_CURVE = yes I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/xelus/dawn60/rev1_qmk/rules.mk b/keyboards/xelus/dawn60/rev1_qmk/rules.mk index 5a17af39fcd..16816a5bdf0 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/rules.mk +++ b/keyboards/xelus/dawn60/rev1_qmk/rules.mk @@ -1,7 +1,7 @@ # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. -OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +NO_SUSPEND_POWER_DOWN = yes I2C_DRIVER_REQUIRED = yes WS2812_DRIVER_REQUIRED = yes From b6d5cfe5751f9dba6d06b9fce110ed8c6160576c Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 25 Apr 2024 00:59:13 +0100 Subject: [PATCH 184/333] Migrate build target markers to keyboard.json - L (#23607) --- .../latin47ble/{info.json => keyboard.json} | 0 .../latin64ble/{info.json => keyboard.json} | 0 .../latinpadble/{info.json => keyboard.json} | 0 .../dimple/ortho/{info.json => keyboard.json} | 6 ++++++ keyboards/lazydesigners/dimple/ortho/rules.mk | 1 + keyboards/lazydesigners/dimple/rules.mk | 16 ---------------- .../{rev2/info.json => rev1/keyboard.json} | 11 +++++++++++ .../lazydesigners/dimple/staggered/rev1/rules.mk | 3 +-- .../{rev1/info.json => rev2/keyboard.json} | 8 +++++--- .../lazydesigners/dimple/staggered/rev2/rules.mk | 3 +-- .../staggered/rev3/{info.json => keyboard.json} | 7 +++++++ .../lazydesigners/dimple/staggered/rev3/rules.mk | 3 +-- .../lets_split/rev2/{info.json => keyboard.json} | 0 .../sockets/{info.json => keyboard.json} | 0 .../fave65h/{info.json => keyboard.json} | 0 .../fave84h/{info.json => keyboard.json} | 0 .../fave87h/{info.json => keyboard.json} | 0 keyboards/loki65/{info.json => keyboard.json} | 0 .../lucid/alexa/{info.json => keyboard.json} | 0 .../alexa_solder/{info.json => keyboard.json} | 0 .../lucid/kbd8x_hs/{info.json => keyboard.json} | 0 .../phantom_hs/{info.json => keyboard.json} | 0 .../phantom_solder/{info.json => keyboard.json} | 0 .../lucid/scarlet/{info.json => keyboard.json} | 0 .../velvet_hotswap/{info.json => keyboard.json} | 0 .../velvet_solder/{info.json => keyboard.json} | 0 .../lyso1/lck75/{info.json => keyboard.json} | 0 .../lz/erghost/{info.json => keyboard.json} | 0 28 files changed, 33 insertions(+), 25 deletions(-) rename keyboards/latincompass/latin47ble/{info.json => keyboard.json} (100%) rename keyboards/latincompass/latin64ble/{info.json => keyboard.json} (100%) rename keyboards/latincompass/latinpadble/{info.json => keyboard.json} (100%) rename keyboards/lazydesigners/dimple/ortho/{info.json => keyboard.json} (98%) rename keyboards/lazydesigners/dimple/staggered/{rev2/info.json => rev1/keyboard.json} (93%) rename keyboards/lazydesigners/dimple/staggered/{rev1/info.json => rev2/keyboard.json} (96%) rename keyboards/lazydesigners/dimple/staggered/rev3/{info.json => keyboard.json} (98%) rename keyboards/lets_split/rev2/{info.json => keyboard.json} (100%) rename keyboards/lets_split/sockets/{info.json => keyboard.json} (100%) rename keyboards/linworks/fave65h/{info.json => keyboard.json} (100%) rename keyboards/linworks/fave84h/{info.json => keyboard.json} (100%) rename keyboards/linworks/fave87h/{info.json => keyboard.json} (100%) rename keyboards/loki65/{info.json => keyboard.json} (100%) rename keyboards/lucid/alexa/{info.json => keyboard.json} (100%) rename keyboards/lucid/alexa_solder/{info.json => keyboard.json} (100%) rename keyboards/lucid/kbd8x_hs/{info.json => keyboard.json} (100%) rename keyboards/lucid/phantom_hs/{info.json => keyboard.json} (100%) rename keyboards/lucid/phantom_solder/{info.json => keyboard.json} (100%) rename keyboards/lucid/scarlet/{info.json => keyboard.json} (100%) rename keyboards/lucid/velvet_hotswap/{info.json => keyboard.json} (100%) rename keyboards/lucid/velvet_solder/{info.json => keyboard.json} (100%) rename keyboards/lyso1/lck75/{info.json => keyboard.json} (100%) rename keyboards/lz/erghost/{info.json => keyboard.json} (100%) diff --git a/keyboards/latincompass/latin47ble/info.json b/keyboards/latincompass/latin47ble/keyboard.json similarity index 100% rename from keyboards/latincompass/latin47ble/info.json rename to keyboards/latincompass/latin47ble/keyboard.json diff --git a/keyboards/latincompass/latin64ble/info.json b/keyboards/latincompass/latin64ble/keyboard.json similarity index 100% rename from keyboards/latincompass/latin64ble/info.json rename to keyboards/latincompass/latin64ble/keyboard.json diff --git a/keyboards/latincompass/latinpadble/info.json b/keyboards/latincompass/latinpadble/keyboard.json similarity index 100% rename from keyboards/latincompass/latinpadble/info.json rename to keyboards/latincompass/latinpadble/keyboard.json diff --git a/keyboards/lazydesigners/dimple/ortho/info.json b/keyboards/lazydesigners/dimple/ortho/keyboard.json similarity index 98% rename from keyboards/lazydesigners/dimple/ortho/info.json rename to keyboards/lazydesigners/dimple/ortho/keyboard.json index 7328cfca79e..f5c0cf3ad0f 100644 --- a/keyboards/lazydesigners/dimple/ortho/info.json +++ b/keyboards/lazydesigners/dimple/ortho/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0040", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D0", "D1", "D2", "D3"] diff --git a/keyboards/lazydesigners/dimple/ortho/rules.mk b/keyboards/lazydesigners/dimple/ortho/rules.mk index 902a3d4bbc7..dcedd7449b5 100644 --- a/keyboards/lazydesigners/dimple/ortho/rules.mk +++ b/keyboards/lazydesigners/dimple/ortho/rules.mk @@ -1,3 +1,4 @@ # Disable unsupported hardware BACKLIGHT_SUPPORTED = no RGBLIGHT_ENABLE = no +AUDIO_SUPPORTED = no diff --git a/keyboards/lazydesigners/dimple/rules.mk b/keyboards/lazydesigners/dimple/rules.mk index 5316d1bc7e1..cd05623d841 100644 --- a/keyboards/lazydesigners/dimple/rules.mk +++ b/keyboards/lazydesigners/dimple/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 = 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 -AUDIO_SUPPORTED = no DEFAULT_FOLDER = lazydesigners/dimple/staggered/rev1 diff --git a/keyboards/lazydesigners/dimple/staggered/rev2/info.json b/keyboards/lazydesigners/dimple/staggered/rev1/keyboard.json similarity index 93% rename from keyboards/lazydesigners/dimple/staggered/rev2/info.json rename to keyboards/lazydesigners/dimple/staggered/rev1/keyboard.json index 5109d49d3c8..bc5822214ab 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev2/info.json +++ b/keyboards/lazydesigners/dimple/staggered/rev1/keyboard.json @@ -1,4 +1,15 @@ { + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "indicators": { + "caps_lock": "E6", + "on_state": 0 + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lazydesigners/dimple/staggered/rev1/rules.mk b/keyboards/lazydesigners/dimple/staggered/rev1/rules.mk index 2fdb308d164..623023fdb63 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev1/rules.mk +++ b/keyboards/lazydesigners/dimple/staggered/rev1/rules.mk @@ -1,4 +1,3 @@ -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow - # Disable unsupported hardware BACKLIGHT_SUPPORTED = no +AUDIO_SUPPORTED = no diff --git a/keyboards/lazydesigners/dimple/staggered/rev1/info.json b/keyboards/lazydesigners/dimple/staggered/rev2/keyboard.json similarity index 96% rename from keyboards/lazydesigners/dimple/staggered/rev1/info.json rename to keyboards/lazydesigners/dimple/staggered/rev2/keyboard.json index 65e559b252d..d8b051db650 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev1/info.json +++ b/keyboards/lazydesigners/dimple/staggered/rev2/keyboard.json @@ -1,7 +1,9 @@ { - "indicators": { - "caps_lock": "E6", - "on_state": 0 + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true }, "layouts": { "LAYOUT": { diff --git a/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk b/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk index 1961392f2db..748a459f785 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk +++ b/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk @@ -1,4 +1,3 @@ -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality - # Disable unsupported hardware RGBLIGHT_ENABLE = no +AUDIO_SUPPORTED = no diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/info.json b/keyboards/lazydesigners/dimple/staggered/rev3/keyboard.json similarity index 98% rename from keyboards/lazydesigners/dimple/staggered/rev3/info.json rename to keyboards/lazydesigners/dimple/staggered/rev3/keyboard.json index 332a554610d..9262048c8ab 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev3/info.json +++ b/keyboards/lazydesigners/dimple/staggered/rev3/keyboard.json @@ -1,4 +1,11 @@ { + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "backlight": { "pin": "B7" }, diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk b/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk index b3b1cc58a19..748a459f785 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk +++ b/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk @@ -1,4 +1,3 @@ -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality - # Disable unsupported hardware RGBLIGHT_ENABLE = no +AUDIO_SUPPORTED = no diff --git a/keyboards/lets_split/rev2/info.json b/keyboards/lets_split/rev2/keyboard.json similarity index 100% rename from keyboards/lets_split/rev2/info.json rename to keyboards/lets_split/rev2/keyboard.json diff --git a/keyboards/lets_split/sockets/info.json b/keyboards/lets_split/sockets/keyboard.json similarity index 100% rename from keyboards/lets_split/sockets/info.json rename to keyboards/lets_split/sockets/keyboard.json diff --git a/keyboards/linworks/fave65h/info.json b/keyboards/linworks/fave65h/keyboard.json similarity index 100% rename from keyboards/linworks/fave65h/info.json rename to keyboards/linworks/fave65h/keyboard.json diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/keyboard.json similarity index 100% rename from keyboards/linworks/fave84h/info.json rename to keyboards/linworks/fave84h/keyboard.json diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/keyboard.json similarity index 100% rename from keyboards/linworks/fave87h/info.json rename to keyboards/linworks/fave87h/keyboard.json diff --git a/keyboards/loki65/info.json b/keyboards/loki65/keyboard.json similarity index 100% rename from keyboards/loki65/info.json rename to keyboards/loki65/keyboard.json diff --git a/keyboards/lucid/alexa/info.json b/keyboards/lucid/alexa/keyboard.json similarity index 100% rename from keyboards/lucid/alexa/info.json rename to keyboards/lucid/alexa/keyboard.json diff --git a/keyboards/lucid/alexa_solder/info.json b/keyboards/lucid/alexa_solder/keyboard.json similarity index 100% rename from keyboards/lucid/alexa_solder/info.json rename to keyboards/lucid/alexa_solder/keyboard.json diff --git a/keyboards/lucid/kbd8x_hs/info.json b/keyboards/lucid/kbd8x_hs/keyboard.json similarity index 100% rename from keyboards/lucid/kbd8x_hs/info.json rename to keyboards/lucid/kbd8x_hs/keyboard.json diff --git a/keyboards/lucid/phantom_hs/info.json b/keyboards/lucid/phantom_hs/keyboard.json similarity index 100% rename from keyboards/lucid/phantom_hs/info.json rename to keyboards/lucid/phantom_hs/keyboard.json diff --git a/keyboards/lucid/phantom_solder/info.json b/keyboards/lucid/phantom_solder/keyboard.json similarity index 100% rename from keyboards/lucid/phantom_solder/info.json rename to keyboards/lucid/phantom_solder/keyboard.json diff --git a/keyboards/lucid/scarlet/info.json b/keyboards/lucid/scarlet/keyboard.json similarity index 100% rename from keyboards/lucid/scarlet/info.json rename to keyboards/lucid/scarlet/keyboard.json diff --git a/keyboards/lucid/velvet_hotswap/info.json b/keyboards/lucid/velvet_hotswap/keyboard.json similarity index 100% rename from keyboards/lucid/velvet_hotswap/info.json rename to keyboards/lucid/velvet_hotswap/keyboard.json diff --git a/keyboards/lucid/velvet_solder/info.json b/keyboards/lucid/velvet_solder/keyboard.json similarity index 100% rename from keyboards/lucid/velvet_solder/info.json rename to keyboards/lucid/velvet_solder/keyboard.json diff --git a/keyboards/lyso1/lck75/info.json b/keyboards/lyso1/lck75/keyboard.json similarity index 100% rename from keyboards/lyso1/lck75/info.json rename to keyboards/lyso1/lck75/keyboard.json diff --git a/keyboards/lz/erghost/info.json b/keyboards/lz/erghost/keyboard.json similarity index 100% rename from keyboards/lz/erghost/info.json rename to keyboards/lz/erghost/keyboard.json From 3d83b3e7c5dc18b77d82798fdad9d7552487cfe4 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 25 Apr 2024 08:42:48 +0100 Subject: [PATCH 185/333] Migrate build target markers to keyboard.json - Misc (#23609) --- .../tide65/{info.json => keyboard.json} | 0 keyboards/epomaker/tide65/rules.mk | 1 - .../keyten/lisa/{info.json => keyboard.json} | 0 keyboards/keyten/lisa/rules.mk | 0 keyboards/maple_computing/jnao/config.h | 24 ---------------- .../jnao/{info.json => keyboard.json} | 6 ++++ .../{lets_split_eh.c => eh/eh.c} | 0 .../eh/{info.json => keyboard.json} | 0 .../rev2/{info.json => keyboard.json} | 0 keyboards/marksard/treadstone48/rev2/rules.mk | 0 .../massdrop/alt/{info.json => keyboard.json} | 0 .../ctrl/{info.json => keyboard.json} | 0 .../matrix/abelx/{info.json => keyboard.json} | 2 ++ keyboards/matrix/abelx/rules.mk | 28 +------------------ .../m12og/rev1/{info.json => keyboard.json} | 2 ++ keyboards/matrix/m12og/rev1/rev1.c | 2 ++ keyboards/matrix/m12og/rev1/rules.mk | 8 +----- keyboards/matrix/m12og/rev2/rev2.c | 4 ++- .../m20add/{info.json => keyboard.json} | 2 ++ keyboards/matrix/m20add/rules.mk | 13 +-------- .../matrix/noah/{info.json => keyboard.json} | 2 ++ keyboards/matrix/noah/rules.mk | 13 +-------- .../pan/rev1/32a/{info.json => keyboard.json} | 0 .../sol/rev1/{info.json => keyboard.json} | 0 .../sol/rev2/{info.json => keyboard.json} | 0 .../zen/rev2/{info.json => keyboard.json} | 0 keyboards/splitkb/kyria/rev1/info.json | 9 ++++++ .../proton_c/{info.json => keyboard.json} | 0 keyboards/splitkb/kyria/rev1/rules.mk | 14 +--------- keyboards/splitkb/kyria/rev2/info.json | 9 ++++++ .../proton_c/{info.json => keyboard.json} | 0 keyboards/splitkb/kyria/rev2/rules.mk | 14 +--------- .../suika85ergo/{info.json => keyboard.json} | 0 keyboards/suikagiken/suika85ergo/rules.mk | 1 - keyboards/yushakobo/navpad/10/info.json | 8 ++++++ keyboards/yushakobo/navpad/10/rev0/rules.mk | 1 + keyboards/yushakobo/navpad/10/rev1/rules.mk | 1 + keyboards/yushakobo/navpad/10/rules.mk | 16 ----------- .../10_helix_r/{info.json => keyboard.json} | 8 ++++++ .../yushakobo/navpad/10_helix_r/rules.mk | 15 ---------- .../quick17/{info.json => keyboard.json} | 8 ++++++ keyboards/yushakobo/quick17/rules.mk | 15 ---------- .../zsa/voyager/{info.json => keyboard.json} | 0 43 files changed, 69 insertions(+), 157 deletions(-) rename keyboards/epomaker/tide65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/epomaker/tide65/rules.mk rename keyboards/keyten/lisa/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keyten/lisa/rules.mk delete mode 100644 keyboards/maple_computing/jnao/config.h rename keyboards/maple_computing/jnao/{info.json => keyboard.json} (98%) rename keyboards/maple_computing/lets_split_eh/{lets_split_eh.c => eh/eh.c} (100%) rename keyboards/maple_computing/lets_split_eh/eh/{info.json => keyboard.json} (100%) rename keyboards/marksard/treadstone48/rev2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/marksard/treadstone48/rev2/rules.mk rename keyboards/massdrop/alt/{info.json => keyboard.json} (100%) rename keyboards/massdrop/ctrl/{info.json => keyboard.json} (100%) rename keyboards/matrix/abelx/{info.json => keyboard.json} (99%) rename keyboards/matrix/m12og/rev1/{info.json => keyboard.json} (99%) rename keyboards/matrix/m20add/{info.json => keyboard.json} (99%) rename keyboards/matrix/noah/{info.json => keyboard.json} (99%) rename keyboards/rgbkb/pan/rev1/32a/{info.json => keyboard.json} (100%) rename keyboards/rgbkb/sol/rev1/{info.json => keyboard.json} (100%) rename keyboards/rgbkb/sol/rev2/{info.json => keyboard.json} (100%) rename keyboards/rgbkb/zen/rev2/{info.json => keyboard.json} (100%) rename keyboards/splitkb/kyria/rev1/proton_c/{info.json => keyboard.json} (100%) rename keyboards/splitkb/kyria/rev2/proton_c/{info.json => keyboard.json} (100%) rename keyboards/suikagiken/suika85ergo/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/suikagiken/suika85ergo/rules.mk create mode 100644 keyboards/yushakobo/navpad/10/rev0/rules.mk create mode 100644 keyboards/yushakobo/navpad/10/rev1/rules.mk rename keyboards/yushakobo/navpad/10_helix_r/{info.json => keyboard.json} (96%) rename keyboards/yushakobo/quick17/{info.json => keyboard.json} (92%) rename keyboards/zsa/voyager/{info.json => keyboard.json} (100%) diff --git a/keyboards/epomaker/tide65/info.json b/keyboards/epomaker/tide65/keyboard.json similarity index 100% rename from keyboards/epomaker/tide65/info.json rename to keyboards/epomaker/tide65/keyboard.json diff --git a/keyboards/epomaker/tide65/rules.mk b/keyboards/epomaker/tide65/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/epomaker/tide65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keyten/lisa/info.json b/keyboards/keyten/lisa/keyboard.json similarity index 100% rename from keyboards/keyten/lisa/info.json rename to keyboards/keyten/lisa/keyboard.json diff --git a/keyboards/keyten/lisa/rules.mk b/keyboards/keyten/lisa/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/maple_computing/jnao/config.h b/keyboards/maple_computing/jnao/config.h deleted file mode 100644 index c2949ab3a7a..00000000000 --- a/keyboards/maple_computing/jnao/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 - diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/keyboard.json similarity index 98% rename from keyboards/maple_computing/jnao/info.json rename to keyboards/maple_computing/jnao/keyboard.json index 861baa95b94..97b51a7680f 100644 --- a/keyboards/maple_computing/jnao/info.json +++ b/keyboards/maple_computing/jnao/keyboard.json @@ -27,6 +27,12 @@ "command": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_5x12", "ortho_4x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c b/keyboards/maple_computing/lets_split_eh/eh/eh.c similarity index 100% rename from keyboards/maple_computing/lets_split_eh/lets_split_eh.c rename to keyboards/maple_computing/lets_split_eh/eh/eh.c diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/keyboard.json similarity index 100% rename from keyboards/maple_computing/lets_split_eh/eh/info.json rename to keyboards/maple_computing/lets_split_eh/eh/keyboard.json diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/keyboard.json similarity index 100% rename from keyboards/marksard/treadstone48/rev2/info.json rename to keyboards/marksard/treadstone48/rev2/keyboard.json diff --git a/keyboards/marksard/treadstone48/rev2/rules.mk b/keyboards/marksard/treadstone48/rev2/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/keyboard.json similarity index 100% rename from keyboards/massdrop/alt/info.json rename to keyboards/massdrop/alt/keyboard.json diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/keyboard.json similarity index 100% rename from keyboards/massdrop/ctrl/info.json rename to keyboards/massdrop/ctrl/keyboard.json diff --git a/keyboards/matrix/abelx/info.json b/keyboards/matrix/abelx/keyboard.json similarity index 99% rename from keyboards/matrix/abelx/info.json rename to keyboards/matrix/abelx/keyboard.json index d62ddf53e22..7fcad281da2 100644 --- a/keyboards/matrix/abelx/info.json +++ b/keyboards/matrix/abelx/keyboard.json @@ -34,6 +34,8 @@ "extrakey": true, "rgblight": true }, + "processor": "STM32F411", + "bootloader": "custom", "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/matrix/abelx/rules.mk b/keyboards/matrix/abelx/rules.mk index 00a63f4a279..ee9c23c0864 100644 --- a/keyboards/matrix/abelx/rules.mk +++ b/keyboards/matrix/abelx/rules.mk @@ -1,33 +1,7 @@ -# -# - the next two should match the directories in -# /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) -MCU_FAMILY = STM32 -MCU_SERIES = STM32F4xx - -# Linker script to use -# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ -# or /ld/ +# custom bootloader MCU_LDSCRIPT = abelx_boot - -# Startup code to use -# - it should exist in /os/common/startup/ARMCMx/compilers/GCC/mk/ -MCU_STARTUP = stm32f4xx - -# Board: it should exist either in /os/hal/boards/ -# or /boards BOARD = abelx_bd -# Cortex version -MCU = cortex-m4 - -# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 -ARMV = 7 - -USE_FPU = yes - -# Bootloader selection -BOOTLOADER = custom - CUSTOM_MATRIX = lite # project specific files SRC += matrix.c tca6424.c aw9523b.c diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/keyboard.json similarity index 99% rename from keyboards/matrix/m12og/rev1/info.json rename to keyboards/matrix/m12og/rev1/keyboard.json index d5ee589cc17..c956720a8d0 100644 --- a/keyboards/matrix/m12og/rev1/info.json +++ b/keyboards/matrix/m12og/rev1/keyboard.json @@ -40,6 +40,8 @@ "build": { "lto": true }, + "bootloader": "custom", + "processor": "STM32F103", "layout_aliases": { "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan" }, diff --git a/keyboards/matrix/m12og/rev1/rev1.c b/keyboards/matrix/m12og/rev1/rev1.c index 702d3857c4b..f517703c605 100644 --- a/keyboards/matrix/m12og/rev1/rev1.c +++ b/keyboards/matrix/m12og/rev1/rev1.c @@ -29,4 +29,6 @@ void keyboard_post_init_kb(void) { rgblight_enable_noeeprom(); rgblight_sethsv_noeeprom(5, 255, 255); rgblight_mode_noeeprom(37); + + keyboard_post_init_user(); } diff --git a/keyboards/matrix/m12og/rev1/rules.mk b/keyboards/matrix/m12og/rev1/rules.mk index bc406d1cba4..077011cdc16 100644 --- a/keyboards/matrix/m12og/rev1/rules.mk +++ b/keyboards/matrix/m12og/rev1/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = STM32F103 - +# custom bootloader MCU_LDSCRIPT = m12og_v1 - BOARD = m12og_v1 -# Bootloader selection -BOOTLOADER = custom - CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/matrix/m12og/rev2/rev2.c b/keyboards/matrix/m12og/rev2/rev2.c index 1a35dff7a90..fb424b164fb 100644 --- a/keyboards/matrix/m12og/rev2/rev2.c +++ b/keyboards/matrix/m12og/rev2/rev2.c @@ -4,10 +4,12 @@ #include "quantum.h" -void matrix_init_user(void) { +void matrix_init_kb(void) { setPinOutput(C6); setPinOutput(B2); setPinOutput(B1); + + matrix_init_user(); } bool led_update_kb(led_t led_state) { diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/keyboard.json similarity index 99% rename from keyboards/matrix/m20add/info.json rename to keyboards/matrix/m20add/keyboard.json index 5a999bb4847..fc58d242e60 100644 --- a/keyboards/matrix/m20add/info.json +++ b/keyboards/matrix/m20add/keyboard.json @@ -34,6 +34,8 @@ "extrakey": true, "rgblight": true }, + "processor": "STM32F411", + "bootloader": "custom", "layouts": { "LAYOUT_tkl_ansi_tsangan": { "layout": [ diff --git a/keyboards/matrix/m20add/rules.mk b/keyboards/matrix/m20add/rules.mk index 150bd24e30e..980cf9518bd 100644 --- a/keyboards/matrix/m20add/rules.mk +++ b/keyboards/matrix/m20add/rules.mk @@ -1,18 +1,7 @@ -# MCU name -MCU = STM32F411 - -# Linker script to use -# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ -# or /ld/ +# custom bootloader MCU_LDSCRIPT = m20add_boot - -# Board: it should exist either in /os/hal/boards/ -# or /boards BOARD = ST_NUCLEO64_F411RE -# Bootloader selection -BOOTLOADER = custom - CUSTOM_MATRIX = lite # project specific files SRC += matrix.c tca6424.c rgb_ring.c drivers/led/issi/is31fl3731.c diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/keyboard.json similarity index 99% rename from keyboards/matrix/noah/info.json rename to keyboards/matrix/noah/keyboard.json index 959c3c8c9c9..eb13e16aa2b 100644 --- a/keyboards/matrix/noah/info.json +++ b/keyboards/matrix/noah/keyboard.json @@ -83,6 +83,8 @@ "rgblight": true, "rgb_matrix": true }, + "processor": "STM32F411", + "bootloader": "custom", "community_layouts": ["65_iso_blocker"], "layouts": { "LAYOUT_default": { diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk index d1c19f36ffe..407c120a524 100644 --- a/keyboards/matrix/noah/rules.mk +++ b/keyboards/matrix/noah/rules.mk @@ -1,18 +1,7 @@ -# MCU name -MCU = STM32F411 - -# Linker script to use -# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ -# or /ld/ +# custom bootloader MCU_LDSCRIPT = noah_boot - -# Board: it should exist either in /os/hal/boards/ -# or /boards BOARD = ST_NUCLEO64_F411RE -# Bootloader selection -BOOTLOADER = custom - WS2812_DRIVER_REQUIRED = yes CUSTOM_MATRIX = yes diff --git a/keyboards/rgbkb/pan/rev1/32a/info.json b/keyboards/rgbkb/pan/rev1/32a/keyboard.json similarity index 100% rename from keyboards/rgbkb/pan/rev1/32a/info.json rename to keyboards/rgbkb/pan/rev1/32a/keyboard.json diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/keyboard.json similarity index 100% rename from keyboards/rgbkb/sol/rev1/info.json rename to keyboards/rgbkb/sol/rev1/keyboard.json diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/keyboard.json similarity index 100% rename from keyboards/rgbkb/sol/rev2/info.json rename to keyboards/rgbkb/sol/rev2/keyboard.json diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/keyboard.json similarity index 100% rename from keyboards/rgbkb/zen/rev2/info.json rename to keyboards/rgbkb/zen/rev2/keyboard.json diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json index 38a2e6bf3fa..3d84b37b311 100644 --- a/keyboards/splitkb/kyria/rev1/info.json +++ b/keyboards/splitkb/kyria/rev1/info.json @@ -4,6 +4,15 @@ "pid": "0x9D9D", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "rgblight": { "led_count": 20, "split_count": [10, 10] diff --git a/keyboards/splitkb/kyria/rev1/proton_c/info.json b/keyboards/splitkb/kyria/rev1/proton_c/keyboard.json similarity index 100% rename from keyboards/splitkb/kyria/rev1/proton_c/info.json rename to keyboards/splitkb/kyria/rev1/proton_c/keyboard.json diff --git a/keyboards/splitkb/kyria/rev1/rules.mk b/keyboards/splitkb/kyria/rev1/rules.mk index c4c82d05aa4..3a8bfbe0896 100644 --- a/keyboards/splitkb/kyria/rev1/rules.mk +++ b/keyboards/splitkb/kyria/rev1/rules.mk @@ -1,13 +1 @@ -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 -AUDIO_ENABLE = no # Audio output - -OLED_ENABLE = yes # Enables the use of OLED displays -ENCODER_ENABLE = yes # Enables the use of one or more encoders -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) +DEFAULT_FOLDER = splitkb/kyria/rev1/base diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json index 0290153f4ad..80f801e3d15 100644 --- a/keyboards/splitkb/kyria/rev2/info.json +++ b/keyboards/splitkb/kyria/rev2/info.json @@ -4,6 +4,15 @@ "pid": "0x9D9D", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "rgblight": { "led_count": 20, "split_count": [10, 10] diff --git a/keyboards/splitkb/kyria/rev2/proton_c/info.json b/keyboards/splitkb/kyria/rev2/proton_c/keyboard.json similarity index 100% rename from keyboards/splitkb/kyria/rev2/proton_c/info.json rename to keyboards/splitkb/kyria/rev2/proton_c/keyboard.json diff --git a/keyboards/splitkb/kyria/rev2/rules.mk b/keyboards/splitkb/kyria/rev2/rules.mk index c4c82d05aa4..fb808070bf8 100644 --- a/keyboards/splitkb/kyria/rev2/rules.mk +++ b/keyboards/splitkb/kyria/rev2/rules.mk @@ -1,13 +1 @@ -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 -AUDIO_ENABLE = no # Audio output - -OLED_ENABLE = yes # Enables the use of OLED displays -ENCODER_ENABLE = yes # Enables the use of one or more encoders -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) +DEFAULT_FOLDER = splitkb/kyria/rev2/base diff --git a/keyboards/suikagiken/suika85ergo/info.json b/keyboards/suikagiken/suika85ergo/keyboard.json similarity index 100% rename from keyboards/suikagiken/suika85ergo/info.json rename to keyboards/suikagiken/suika85ergo/keyboard.json diff --git a/keyboards/suikagiken/suika85ergo/rules.mk b/keyboards/suikagiken/suika85ergo/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/suikagiken/suika85ergo/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json index ef0cdf5cbed..e28a2e2cb17 100644 --- a/keyboards/yushakobo/navpad/10/info.json +++ b/keyboards/yushakobo/navpad/10/info.json @@ -7,6 +7,14 @@ "vid": "0x3265", "pid": "0x0008" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B6"} diff --git a/keyboards/yushakobo/navpad/10/rev0/rules.mk b/keyboards/yushakobo/navpad/10/rev0/rules.mk new file mode 100644 index 00000000000..e8ffcca7a6d --- /dev/null +++ b/keyboards/yushakobo/navpad/10/rev0/rules.mk @@ -0,0 +1 @@ +SRC += navpad_prefs.c diff --git a/keyboards/yushakobo/navpad/10/rev1/rules.mk b/keyboards/yushakobo/navpad/10/rev1/rules.mk new file mode 100644 index 00000000000..e8ffcca7a6d --- /dev/null +++ b/keyboards/yushakobo/navpad/10/rev1/rules.mk @@ -0,0 +1 @@ +SRC += navpad_prefs.c diff --git a/keyboards/yushakobo/navpad/10/rules.mk b/keyboards/yushakobo/navpad/10/rules.mk index 61cbbf351dc..32daeef814d 100644 --- a/keyboards/yushakobo/navpad/10/rules.mk +++ b/keyboards/yushakobo/navpad/10/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes - -SRC += navpad_prefs.c DEFAULT_FOLDER = yushakobo/navpad/10/rev1 diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/keyboard.json similarity index 96% rename from keyboards/yushakobo/navpad/10_helix_r/info.json rename to keyboards/yushakobo/navpad/10_helix_r/keyboard.json index 8084f1f7bd8..81854128da5 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/info.json +++ b/keyboards/yushakobo/navpad/10_helix_r/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F6", "B2", "B3", "B1", "F7", null], "rows": ["D4", "C6", "D7", "E6", "B4", "F4"] diff --git a/keyboards/yushakobo/navpad/10_helix_r/rules.mk b/keyboards/yushakobo/navpad/10_helix_r/rules.mk index f30c00650ce..e8ffcca7a6d 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/rules.mk +++ b/keyboards/yushakobo/navpad/10_helix_r/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes - SRC += navpad_prefs.c diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/keyboard.json similarity index 92% rename from keyboards/yushakobo/quick17/info.json rename to keyboards/yushakobo/quick17/keyboard.json index 51c41a6e82a..aa0d39756d9 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812", "max_brightness": 150, diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk index 70ab5e27442..083da9448c6 100644 --- a/keyboards/yushakobo/quick17/rules.mk +++ b/keyboards/yushakobo/quick17/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - -RGB_MATRIX_ENABLE = yes RGB_MATRIX_CUSTOM_KB = yes SRC += quick17_prefs.c diff --git a/keyboards/zsa/voyager/info.json b/keyboards/zsa/voyager/keyboard.json similarity index 100% rename from keyboards/zsa/voyager/info.json rename to keyboards/zsa/voyager/keyboard.json From e9b8929357abd35f62aae211d3edec434299b021 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 25 Apr 2024 18:37:44 +0100 Subject: [PATCH 186/333] Migrate build target markers to keyboard.json - Misc (#23612) --- keyboards/converter/usb_usb/info.json | 7 +++++++ keyboards/converter/usb_usb/matrix.c | 1 - keyboards/converter/usb_usb/rules.mk | 13 ------------- keyboards/hhkb/ansi/32u2/keyboard.json | 8 +++++++- keyboards/hhkb/ansi/32u2/rules.mk | 2 -- keyboards/hhkb/ansi/32u4/keyboard.json | 10 +++++++++- keyboards/hhkb/ansi/rules.mk | 19 +------------------ .../model_m/mschwingen/led_ffc/keyboard.json | 2 ++ .../ibm/model_m/mschwingen/led_ffc/rules.mk | 1 - .../mschwingen/led_wired/keyboard.json | 2 ++ .../ibm/model_m/mschwingen/led_wired/rules.mk | 1 - .../mschwingen/led_ws2812/keyboard.json | 2 ++ .../ibm/model_m/mschwingen/post_rules.mk | 2 ++ keyboards/ibm/model_m/mschwingen/rules.mk | 2 -- .../salicylic_acid3/7skb/rev1/keyboard.json | 8 ++++++++ keyboards/salicylic_acid3/7skb/rules.mk | 13 ------------- .../getta25/rev1/keyboard.json | 8 ++++++++ keyboards/salicylic_acid3/getta25/rules.mk | 14 -------------- .../jisplit89/rev1/keyboard.json | 8 ++++++++ keyboards/salicylic_acid3/jisplit89/rules.mk | 13 ------------- .../naked48/rev1/keyboard.json | 7 +++++++ keyboards/salicylic_acid3/naked48/rules.mk | 14 -------------- .../naked60/rev1/keyboard.json | 6 ++++++ keyboards/salicylic_acid3/naked60/rules.mk | 13 ------------- .../naked64/rev1/keyboard.json | 8 ++++++++ keyboards/salicylic_acid3/naked64/rules.mk | 15 --------------- .../setta21/rev1/keyboard.json | 7 +++++++ keyboards/salicylic_acid3/setta21/rules.mk | 16 ---------------- keyboards/stront/keyboard.json | 8 +++++--- keyboards/stront/rules.mk | 2 -- keyboards/teleport/native/info.json | 3 ++- keyboards/teleport/native/rules.mk | 1 - keyboards/tkw/grandiceps/rev2/config.h | 1 - keyboards/tkw/grandiceps/rev2/keyboard.json | 8 ++++++++ keyboards/tkw/grandiceps/rev2/rules.mk | 1 - keyboards/westm/westm68/info.json | 9 +++++++++ keyboards/westm/westm68/rules.mk | 13 ------------- keyboards/westm/westm9/info.json | 8 ++++++++ keyboards/westm/westm9/rules.mk | 15 --------------- .../woodkeys/meira/featherble/keyboard.json | 3 +++ keyboards/woodkeys/meira/featherble/rules.mk | 2 -- keyboards/work_louder/loop/info.json | 12 ++++++++++++ keyboards/work_louder/loop/rules.mk | 18 ------------------ keyboards/yanghu/unicorne/info.json | 10 ++++++++++ keyboards/yanghu/unicorne/rules.mk | 17 ----------------- 45 files changed, 141 insertions(+), 212 deletions(-) delete mode 100644 keyboards/converter/usb_usb/matrix.c delete mode 100644 keyboards/hhkb/ansi/32u2/rules.mk create mode 100644 keyboards/ibm/model_m/mschwingen/led_ffc/keyboard.json delete mode 100644 keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk create mode 100644 keyboards/ibm/model_m/mschwingen/led_wired/keyboard.json delete mode 100644 keyboards/ibm/model_m/mschwingen/led_wired/rules.mk create mode 100644 keyboards/ibm/model_m/mschwingen/led_ws2812/keyboard.json diff --git a/keyboards/converter/usb_usb/info.json b/keyboards/converter/usb_usb/info.json index 63c02322a2e..747fd497828 100644 --- a/keyboards/converter/usb_usb/info.json +++ b/keyboards/converter/usb_usb/info.json @@ -8,6 +8,13 @@ "pid": "0x005B", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "usb_hid": true + }, "processor": "atmega32u4", "community_layouts": ["fullsize_ansi", "fullsize_iso", "fullsize_jis"], "layouts": { diff --git a/keyboards/converter/usb_usb/matrix.c b/keyboards/converter/usb_usb/matrix.c deleted file mode 100644 index b077febd74d..00000000000 --- a/keyboards/converter/usb_usb/matrix.c +++ /dev/null @@ -1 +0,0 @@ -// Intentionally left empty. This file must exist for this board to build. diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk index 97aebc9349b..1e278514f68 100644 --- a/keyboards/converter/usb_usb/rules.mk +++ b/keyboards/converter/usb_usb/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 = 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 diff --git a/keyboards/hhkb/ansi/32u2/keyboard.json b/keyboards/hhkb/ansi/32u2/keyboard.json index dd190d18ee0..d210808d984 100644 --- a/keyboards/hhkb/ansi/32u2/keyboard.json +++ b/keyboards/hhkb/ansi/32u2/keyboard.json @@ -1,4 +1,10 @@ { "processor": "atmega32u2", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + } } diff --git a/keyboards/hhkb/ansi/32u2/rules.mk b/keyboards/hhkb/ansi/32u2/rules.mk deleted file mode 100644 index 95a1d66061d..00000000000 --- a/keyboards/hhkb/ansi/32u2/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration diff --git a/keyboards/hhkb/ansi/32u4/keyboard.json b/keyboards/hhkb/ansi/32u4/keyboard.json index 042c41f34d6..1e47ddd20fe 100644 --- a/keyboards/hhkb/ansi/32u4/keyboard.json +++ b/keyboards/hhkb/ansi/32u4/keyboard.json @@ -1,4 +1,12 @@ { "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + } } diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/rules.mk index f5a147ccb9a..841565b8465 100644 --- a/keyboards/hhkb/ansi/rules.mk +++ b/keyboards/hhkb/ansi/rules.mk @@ -1,23 +1,6 @@ -# 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 -CUSTOM_MATRIX = yes # Custom matrix file for the HHKB -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +CUSTOM_MATRIX = yes # project specific files SRC = matrix.c -# debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION -# debug-on: all - -# debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT -# debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS)) -# debug-off: all - DEFAULT_FOLDER = hhkb/ansi/32u4 diff --git a/keyboards/ibm/model_m/mschwingen/led_ffc/keyboard.json b/keyboards/ibm/model_m/mschwingen/led_ffc/keyboard.json new file mode 100644 index 00000000000..2c63c085104 --- /dev/null +++ b/keyboards/ibm/model_m/mschwingen/led_ffc/keyboard.json @@ -0,0 +1,2 @@ +{ +} diff --git a/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk b/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ibm/model_m/mschwingen/led_wired/keyboard.json b/keyboards/ibm/model_m/mschwingen/led_wired/keyboard.json new file mode 100644 index 00000000000..2c63c085104 --- /dev/null +++ b/keyboards/ibm/model_m/mschwingen/led_wired/keyboard.json @@ -0,0 +1,2 @@ +{ +} diff --git a/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk b/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ibm/model_m/mschwingen/led_ws2812/keyboard.json b/keyboards/ibm/model_m/mschwingen/led_ws2812/keyboard.json new file mode 100644 index 00000000000..2c63c085104 --- /dev/null +++ b/keyboards/ibm/model_m/mschwingen/led_ws2812/keyboard.json @@ -0,0 +1,2 @@ +{ +} diff --git a/keyboards/ibm/model_m/mschwingen/post_rules.mk b/keyboards/ibm/model_m/mschwingen/post_rules.mk index a1c2040f4c5..025068e057d 100644 --- a/keyboards/ibm/model_m/mschwingen/post_rules.mk +++ b/keyboards/ibm/model_m/mschwingen/post_rules.mk @@ -1,3 +1,5 @@ +UART_DEBUG ?= no + ifeq ($(strip $(UART_DEBUG)), yes) OPT_DEFS += -DUART_DEBUG endif diff --git a/keyboards/ibm/model_m/mschwingen/rules.mk b/keyboards/ibm/model_m/mschwingen/rules.mk index c86801e4090..65761bcf9a2 100644 --- a/keyboards/ibm/model_m/mschwingen/rules.mk +++ b/keyboards/ibm/model_m/mschwingen/rules.mk @@ -1,7 +1,5 @@ CUSTOM_MATRIX = lite -UART_DEBUG = no - SRC += matrix.c UART_DRIVER_REQUIRED = yes SPI_DRIVER_REQUIRED = yes diff --git a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json index 3ea79da589d..5b5e63b7ca2 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xEB5F", "device_version": "0.0.7" }, + "features": { + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk index 09cad7556c4..15364c29a51 100644 --- a/keyboards/salicylic_acid3/7skb/rules.mk +++ b/keyboards/salicylic_acid3/7skb/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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = salicylic_acid3/7skb/rev1 diff --git a/keyboards/salicylic_acid3/getta25/rev1/keyboard.json b/keyboards/salicylic_acid3/getta25/rev1/keyboard.json index e2148f9302a..3399f9e081b 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/getta25/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3060", "device_version": "0.1.3" }, + "features": { + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "rgblight": { "hue_steps": 10, "led_count": 9, diff --git a/keyboards/salicylic_acid3/getta25/rules.mk b/keyboards/salicylic_acid3/getta25/rules.mk index dae9b6ae3bd..069fe74b142 100644 --- a/keyboards/salicylic_acid3/getta25/rules.mk +++ b/keyboards/salicylic_acid3/getta25/rules.mk @@ -1,15 +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 = 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 -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -OLED_ENABLE = no - DEFAULT_FOLDER = salicylic_acid3/getta25/rev1 diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json index ccfe99ad18f..7c72c9b17aa 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xEB4F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk index f90f3d9c07c..d54d2ccef4d 100644 --- a/keyboards/salicylic_acid3/jisplit89/rules.mk +++ b/keyboards/salicylic_acid3/jisplit89/rules.mk @@ -1,14 +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 = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = salicylic_acid3/jisplit89/rev1 diff --git a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json index da82c1a16c1..f390db51f14 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0xE8BA", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk index fd9a93f5030..dadfa7a2579 100644 --- a/keyboards/salicylic_acid3/naked48/rules.mk +++ b/keyboards/salicylic_acid3/naked48/rules.mk @@ -1,15 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = no - DEFAULT_FOLDER = salicylic_acid3/naked48/rev1 diff --git a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json index f5d53c001d4..1916b01eb21 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json @@ -8,6 +8,12 @@ "pid": "0xEB5C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D7", "E6", "B4", "B5", "D3"], "rows": ["B6", "D1", "D0", "D4", "C6"] diff --git a/keyboards/salicylic_acid3/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk index 2210ae765c9..904309ea356 100644 --- a/keyboards/salicylic_acid3/naked60/rules.mk +++ b/keyboards/salicylic_acid3/naked60/rules.mk @@ -1,14 +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 - DEFAULT_FOLDER = salicylic_acid3/naked60/rev1 diff --git a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json index 2034b7d9ab4..8dc9a49c7a6 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3060", "device_version": "0.0.3" }, + "features": { + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D3"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/salicylic_acid3/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk index 03a0fe22c08..0ac8d83bfcc 100644 --- a/keyboards/salicylic_acid3/naked64/rules.mk +++ b/keyboards/salicylic_acid3/naked64/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 = 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -OLED_ENABLE = no -USE_I2C = no - DEFAULT_FOLDER = salicylic_acid3/naked64/rev1 diff --git a/keyboards/salicylic_acid3/setta21/rev1/keyboard.json b/keyboards/salicylic_acid3/setta21/rev1/keyboard.json index d510c2c3b2a..0d20c99f269 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/setta21/rev1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x3060", "device_version": "0.1.1" }, + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "rgblight": { "hue_steps": 10, "led_count": 21, diff --git a/keyboards/salicylic_acid3/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk index d4aab3ee3f0..02e68b57487 100644 --- a/keyboards/salicylic_acid3/setta21/rules.mk +++ b/keyboards/salicylic_acid3/setta21/rules.mk @@ -1,17 +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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -OLED_ENABLE = no -USE_I2C = no -RGB_MATRIX_ENABLE = no - DEFAULT_FOLDER = salicylic_acid3/setta21/rev1 diff --git a/keyboards/stront/keyboard.json b/keyboards/stront/keyboard.json index d2726c85f0e..5055a4fb30e 100644 --- a/keyboards/stront/keyboard.json +++ b/keyboards/stront/keyboard.json @@ -80,13 +80,15 @@ ] }, "features": { + "backlight": true, "bootmagic": true, "console": false, "encoder": true, - "backlight": true, "extrakey": true, - "rgb_matrix": true, - "nkro": false + "nkro": false, + "pointing_device": true, + "quantum_painter": true, + "rgb_matrix": true }, "backlight": { "pin": "GP14" diff --git a/keyboards/stront/rules.mk b/keyboards/stront/rules.mk index c6cdeb5bfca..61d59017cb7 100644 --- a/keyboards/stront/rules.mk +++ b/keyboards/stront/rules.mk @@ -1,9 +1,7 @@ SERIAL_DRIVER = vendor -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi -QUANTUM_PAINTER_ENABLE = yes QUANTUM_PAINTER_DRIVERS += st7789_spi QUANTUM_PAINTER_LVGL_INTEGRATION = yes diff --git a/keyboards/teleport/native/info.json b/keyboards/teleport/native/info.json index 3cd857a55dc..756764ff6f0 100644 --- a/keyboards/teleport/native/info.json +++ b/keyboards/teleport/native/info.json @@ -38,7 +38,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "diode_direction": "ROW2COL", "matrix_pins": { diff --git a/keyboards/teleport/native/rules.mk b/keyboards/teleport/native/rules.mk index 2a3743fa755..53dc2b17475 100644 --- a/keyboards/teleport/native/rules.mk +++ b/keyboards/teleport/native/rules.mk @@ -1,4 +1,3 @@ -RGB_MATRIX_ENABLE = yes RGB_MATRIX_CUSTOM_KB = yes DEFAULT_FOLDER = teleport/native/iso diff --git a/keyboards/tkw/grandiceps/rev2/config.h b/keyboards/tkw/grandiceps/rev2/config.h index 5810fe75bc9..83f1b561574 100644 --- a/keyboards/tkw/grandiceps/rev2/config.h +++ b/keyboards/tkw/grandiceps/rev2/config.h @@ -15,5 +15,4 @@ */ #pragma once -#define SPLIT_HAND_PIN B3 #define EEPROM_I2C_24LC64 diff --git a/keyboards/tkw/grandiceps/rev2/keyboard.json b/keyboards/tkw/grandiceps/rev2/keyboard.json index cd809481965..b0f9970bcdc 100644 --- a/keyboards/tkw/grandiceps/rev2/keyboard.json +++ b/keyboards/tkw/grandiceps/rev2/keyboard.json @@ -5,5 +5,13 @@ }, "eeprom": { "driver": "i2c" + }, + "features": { + "pointing_device": true + }, + "split": { + "handedness": { + "pin": "B3" + } } } diff --git a/keyboards/tkw/grandiceps/rev2/rules.mk b/keyboards/tkw/grandiceps/rev2/rules.mk index 20f28719241..0cac88f7f7d 100644 --- a/keyboards/tkw/grandiceps/rev2/rules.mk +++ b/keyboards/tkw/grandiceps/rev2/rules.mk @@ -1,2 +1 @@ -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pimoroni_trackball diff --git a/keyboards/westm/westm68/info.json b/keyboards/westm/westm68/info.json index c71d47a41d8..85dd61bf86b 100644 --- a/keyboards/westm/westm68/info.json +++ b/keyboards/westm/westm68/info.json @@ -7,6 +7,15 @@ "vid": "0x574D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["A13", "B9", "F1", "A10", "A9"] diff --git a/keyboards/westm/westm68/rules.mk b/keyboards/westm/westm68/rules.mk index 6174653422b..2a716f41c4a 100644 --- a/keyboards/westm/westm68/rules.mk +++ b/keyboards/westm/westm68/rules.mk @@ -1,17 +1,4 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF -# 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 - DEFAULT_FOLDER = westm/westm68/rev2 diff --git a/keyboards/westm/westm9/info.json b/keyboards/westm/westm9/info.json index 1a132137911..43f12b17add 100644 --- a/keyboards/westm/westm9/info.json +++ b/keyboards/westm/westm9/info.json @@ -7,6 +7,14 @@ "vid": "0x574D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B8", "B5", "B4"], "rows": ["A14", "A15", "B3"] diff --git a/keyboards/westm/westm9/rules.mk b/keyboards/westm/westm9/rules.mk index e522c525602..3ff78857b35 100644 --- a/keyboards/westm/westm9/rules.mk +++ b/keyboards/westm/westm9/rules.mk @@ -1,19 +1,4 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF -# 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -OLED_ENABLE = yes # Enable the OLED feature - DEFAULT_FOLDER = westm/westm9/rev2 diff --git a/keyboards/woodkeys/meira/featherble/keyboard.json b/keyboards/woodkeys/meira/featherble/keyboard.json index 8dc946dd571..416b788c904 100644 --- a/keyboards/woodkeys/meira/featherble/keyboard.json +++ b/keyboards/woodkeys/meira/featherble/keyboard.json @@ -3,5 +3,8 @@ "bootloader": "caterina", "bluetooth": { "driver": "bluefruit_le" + }, + "features": { + "bluetooth": true } } diff --git a/keyboards/woodkeys/meira/featherble/rules.mk b/keyboards/woodkeys/meira/featherble/rules.mk index 174947ff399..3437a35bdf1 100644 --- a/keyboards/woodkeys/meira/featherble/rules.mk +++ b/keyboards/woodkeys/meira/featherble/rules.mk @@ -1,4 +1,2 @@ # Processor frequency F_CPU = 8000000 - -BLUETOOTH_ENABLE = yes diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json index 3c395e057a1..771a31d105c 100644 --- a/keyboards/work_louder/loop/info.json +++ b/keyboards/work_louder/loop/info.json @@ -8,6 +8,18 @@ "pid": "0x1DF9", "max_power": 100 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true, + "rgblight": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/work_louder/loop/rules.mk b/keyboards/work_louder/loop/rules.mk index b68ae20d145..53c3227972d 100644 --- a/keyboards/work_louder/loop/rules.mk +++ b/keyboards/work_louder/loop/rules.mk @@ -1,21 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes - -RGB_MATRIX_ENABLE = yes -LTO_ENABLE = yes - SRC += rgb_functions.c DEFAULT_FOLDER = work_louder/loop/rev3 diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json index 26d54c2c827..504df68fb06 100644 --- a/keyboards/yanghu/unicorne/info.json +++ b/keyboards/yanghu/unicorne/info.json @@ -8,6 +8,16 @@ "pid": "0x0204", "device_version": "0.0.1" }, + "features": { + "audio": true, + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "rgblight": { "led_count": 8, "animations": { diff --git a/keyboards/yanghu/unicorne/rules.mk b/keyboards/yanghu/unicorne/rules.mk index 014f5d4d422..13cbb6b1e7d 100644 --- a/keyboards/yanghu/unicorne/rules.mk +++ b/keyboards/yanghu/unicorne/rules.mk @@ -1,20 +1,3 @@ -# 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 = yes # 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 -OLED_ENABLE = yes - AUDIO_DRIVER = pwm_hardware -RGB_MATRIX_ENABLE = no # Do not enable with RGBLIGHT - DEFAULT_FOLDER = yanghu/unicorne/f411 From 2893038fda6cd19ef84d92afa4ae8c4615698e38 Mon Sep 17 00:00:00 2001 From: Jay Greco Date: Thu, 25 Apr 2024 17:02:48 -0700 Subject: [PATCH 187/333] nullbitsco/snap: once again reduce size of bongo_reactive (#23284) --- keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h b/keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h index d4f07051e5c..b2c161d40ac 100644 --- a/keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h +++ b/keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h @@ -28,8 +28,11 @@ // Selectively undefine to save space // VIA support won't fit otherwise #ifdef RGBLIGHT_ENABLE -#undef RGBLIGHT_EFFECT_TWINKLE +#undef RGBLIGHT_EFFECT_ALTERNATING +#undef RGBLIGHT_EFFECT_CHRISTMAS #undef RGBLIGHT_EFFECT_RGB_TEST +#undef RGBLIGHT_EFFECT_SNAKE +#undef RGBLIGHT_EFFECT_TWINKLE #endif //RGB LIGHT_ENABLE // Split Options From 42f61611e8be856c65efa0e9cf56b19fe18c519e Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 25 Apr 2024 21:41:09 -0700 Subject: [PATCH 188/333] Data-Driven Keyboard Conversions: M, Part 3 (#23614) --- keyboards/mitosis/info.json | 9 +++++++++ keyboards/mitosis/rules.mk | 13 ------------- keyboards/mlego/m60_split/rev1/info.json | 8 ++++++++ keyboards/mlego/m60_split/rev1/rules.mk | 14 -------------- keyboards/mlego/m60_split/rev2/info.json | 8 ++++++++ keyboards/mlego/m60_split/rev2/rules.mk | 13 ------------- keyboards/molecule/info.json | 6 ++++++ keyboards/molecule/rules.mk | 14 -------------- keyboards/monokei/mnk1800s/info.json | 6 ++++++ keyboards/monokei/mnk1800s/rules.mk | 13 ------------- keyboards/monokei/mnk50/info.json | 6 ++++++ keyboards/monokei/mnk50/rules.mk | 13 ------------- keyboards/monokei/mnk75/info.json | 6 ++++++ keyboards/monokei/mnk75/rules.mk | 13 ------------- .../rebound/rev1/{info.json => keyboard.json} | 7 +++++++ keyboards/montsinger/rebound/rev1/rules.mk | 12 ------------ .../rebound/rev2/{info.json => keyboard.json} | 8 ++++++++ keyboards/montsinger/rebound/rev2/rules.mk | 13 ------------- .../rebound/rev3/{info.json => keyboard.json} | 8 ++++++++ keyboards/montsinger/rebound/rev3/rules.mk | 13 ------------- keyboards/montsinger/rebound/rev4/info.json | 8 ++++++++ keyboards/montsinger/rebound/rev4/rules.mk | 14 -------------- keyboards/moon/info.json | 9 +++++++++ keyboards/moon/rules.mk | 13 ------------- .../mt/ncr80/hotswap/{info.json => keyboard.json} | 6 ++++++ keyboards/mt/ncr80/hotswap/rules.mk | 12 ------------ .../mt/ncr80/solder/{info.json => keyboard.json} | 7 +++++++ keyboards/mt/ncr80/solder/rules.mk | 12 ------------ keyboards/mt/split75/info.json | 7 +++++++ keyboards/mt/split75/rules.mk | 11 ----------- 30 files changed, 109 insertions(+), 193 deletions(-) rename keyboards/montsinger/rebound/rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/montsinger/rebound/rev1/rules.mk rename keyboards/montsinger/rebound/rev2/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/montsinger/rebound/rev2/rules.mk rename keyboards/montsinger/rebound/rev3/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/montsinger/rebound/rev3/rules.mk rename keyboards/mt/ncr80/hotswap/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/mt/ncr80/hotswap/rules.mk rename keyboards/mt/ncr80/solder/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/mt/ncr80/solder/rules.mk diff --git a/keyboards/mitosis/info.json b/keyboards/mitosis/info.json index feab60b7fb8..c69d1d30cd4 100644 --- a/keyboards/mitosis/info.json +++ b/keyboards/mitosis/info.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "unicode": true + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/mitosis/rules.mk b/keyboards/mitosis/rules.mk index 539a2d1004b..18d234d62a0 100644 --- a/keyboards/mitosis/rules.mk +++ b/keyboards/mitosis/rules.mk @@ -1,16 +1,3 @@ -# 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 = 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 = lite # project specific files diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json index 83e66ce2ccf..9be9708081e 100644 --- a/keyboards/mlego/m60_split/rev1/info.json +++ b/keyboards/mlego/m60_split/rev1/info.json @@ -3,6 +3,14 @@ "pid": "0x6361", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "encoder": true + }, "matrix_pins": { "cols": ["B14", "A10", "A15", "B3", "B4", "B5"], "rows": ["B0", "A6", "A7", "B1", "A5"] diff --git a/keyboards/mlego/m60_split/rev1/rules.mk b/keyboards/mlego/m60_split/rev1/rules.mk index c38e4335e89..c6e29883213 100644 --- a/keyboards/mlego/m60_split/rev1/rules.mk +++ b/keyboards/mlego/m60_split/rev1/rules.mk @@ -1,15 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output SERIAL_DRIVER = usart -ENCODER_ENABLE = yes # Enable encoder - diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json index b4b18a91d69..5185a2e6456 100644 --- a/keyboards/mlego/m60_split/rev2/info.json +++ b/keyboards/mlego/m60_split/rev2/info.json @@ -3,6 +3,14 @@ "pid": "0x6362", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "encoder": true + }, "matrix_pins": { "cols": ["B14", "A10", "A15", "B3", "B4", "B5"], "rows": ["B0", "A6", "A7", "B1", "A5"] diff --git a/keyboards/mlego/m60_split/rev2/rules.mk b/keyboards/mlego/m60_split/rev2/rules.mk index f3ecf1b52cb..c6e29883213 100644 --- a/keyboards/mlego/m60_split/rev2/rules.mk +++ b/keyboards/mlego/m60_split/rev2/rules.mk @@ -1,14 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output SERIAL_DRIVER = usart -ENCODER_ENABLE = yes # Enable encoder diff --git a/keyboards/molecule/info.json b/keyboards/molecule/info.json index 51ca67c2820..f3bd818122c 100755 --- a/keyboards/molecule/info.json +++ b/keyboards/molecule/info.json @@ -8,6 +8,12 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "pointing_device": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "B6"] diff --git a/keyboards/molecule/rules.mk b/keyboards/molecule/rules.mk index 06a8f490ee7..3272be5a9b3 100755 --- a/keyboards/molecule/rules.mk +++ b/keyboards/molecule/rules.mk @@ -1,18 +1,4 @@ -# 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 - # Add trackball support -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = custom SRC += adns.c SPI_DRIVER_REQUIRED = yes diff --git a/keyboards/monokei/mnk1800s/info.json b/keyboards/monokei/mnk1800s/info.json index 9cf4f0f122c..b11038fcd3e 100755 --- a/keyboards/monokei/mnk1800s/info.json +++ b/keyboards/monokei/mnk1800s/info.json @@ -8,6 +8,12 @@ "pid": "0x3138", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B10", "B2", "B1", "B0", "B14", "B15", "A8", "A9", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["B13", "B12", "A7", "A6", "A5"] diff --git a/keyboards/monokei/mnk1800s/rules.mk b/keyboards/monokei/mnk1800s/rules.mk index 7c0709f41e6..0ab54aaaf71 100644 --- a/keyboards/monokei/mnk1800s/rules.mk +++ b/keyboards/monokei/mnk1800s/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 diff --git a/keyboards/monokei/mnk50/info.json b/keyboards/monokei/mnk50/info.json index 3d4c98edc7f..e5d72096dca 100755 --- a/keyboards/monokei/mnk50/info.json +++ b/keyboards/monokei/mnk50/info.json @@ -8,6 +8,12 @@ "pid": "0x4D35", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B14", "B15", "A8", "A9", "A13", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"], "rows": ["B12", "B13", "A10", "A6"] diff --git a/keyboards/monokei/mnk50/rules.mk b/keyboards/monokei/mnk50/rules.mk index 7c0709f41e6..0ab54aaaf71 100644 --- a/keyboards/monokei/mnk50/rules.mk +++ b/keyboards/monokei/mnk50/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 diff --git a/keyboards/monokei/mnk75/info.json b/keyboards/monokei/mnk75/info.json index 421e830a1bd..d9d7d6a8c8b 100755 --- a/keyboards/monokei/mnk75/info.json +++ b/keyboards/monokei/mnk75/info.json @@ -8,6 +8,12 @@ "pid": "0x4D37", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14"], "rows": ["A2", "A14", "A15", "B3", "B4", "B5"] diff --git a/keyboards/monokei/mnk75/rules.mk b/keyboards/monokei/mnk75/rules.mk index 50f3a3d1511..0ab54aaaf71 100644 --- a/keyboards/monokei/mnk75/rules.mk +++ b/keyboards/monokei/mnk75/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# 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 diff --git a/keyboards/montsinger/rebound/rev1/info.json b/keyboards/montsinger/rebound/rev1/keyboard.json similarity index 95% rename from keyboards/montsinger/rebound/rev1/info.json rename to keyboards/montsinger/rebound/rev1/keyboard.json index be323b6f65c..66ed41a6740 100644 --- a/keyboards/montsinger/rebound/rev1/info.json +++ b/keyboards/montsinger/rebound/rev1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, "matrix_pins": { "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D1", "B5", "B2", "B6"] diff --git a/keyboards/montsinger/rebound/rev1/rules.mk b/keyboards/montsinger/rebound/rev1/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/montsinger/rebound/rev1/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/montsinger/rebound/rev2/info.json b/keyboards/montsinger/rebound/rev2/keyboard.json similarity index 97% rename from keyboards/montsinger/rebound/rev2/info.json rename to keyboards/montsinger/rebound/rev2/keyboard.json index f09cb7f75f0..a3a99247ab3 100644 --- a/keyboards/montsinger/rebound/rev2/info.json +++ b/keyboards/montsinger/rebound/rev2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "encoder": true + }, "matrix_pins": { "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D1", "B5", "B2", "B6", "B0"] diff --git a/keyboards/montsinger/rebound/rev2/rules.mk b/keyboards/montsinger/rebound/rev2/rules.mk deleted file mode 100644 index f957b56f253..00000000000 --- a/keyboards/montsinger/rebound/rev2/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/montsinger/rebound/rev3/info.json b/keyboards/montsinger/rebound/rev3/keyboard.json similarity index 97% rename from keyboards/montsinger/rebound/rev3/info.json rename to keyboards/montsinger/rebound/rev3/keyboard.json index b898407f828..630761b4013 100644 --- a/keyboards/montsinger/rebound/rev3/info.json +++ b/keyboards/montsinger/rebound/rev3/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "encoder": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"], "rows": ["F4", "F5", "D1", "D0", "B0"] diff --git a/keyboards/montsinger/rebound/rev3/rules.mk b/keyboards/montsinger/rebound/rev3/rules.mk deleted file mode 100644 index f957b56f253..00000000000 --- a/keyboards/montsinger/rebound/rev3/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 -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 -ENCODER_ENABLE = yes diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/info.json index 565e56701f9..ad17ca423ea 100644 --- a/keyboards/montsinger/rebound/rev4/info.json +++ b/keyboards/montsinger/rebound/rev4/info.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "encoder": true + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5", "B2", "B3", "B1"], "rows": ["D1", "D0", "D4", "C6", "F7", "F6", "F5", "F4"] diff --git a/keyboards/montsinger/rebound/rev4/rules.mk b/keyboards/montsinger/rebound/rev4/rules.mk index 643c971d472..4df55cd2206 100644 --- a/keyboards/montsinger/rebound/rev4/rules.mk +++ b/keyboards/montsinger/rebound/rev4/rules.mk @@ -1,17 +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 = 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 -ENCODER_ENABLE = yes - # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/moon/info.json b/keyboards/moon/info.json index a89caf86d2d..4c66cb51a9b 100644 --- a/keyboards/moon/info.json +++ b/keyboards/moon/info.json @@ -8,6 +8,15 @@ "pid": "0xFCB8", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "backlight": { "pin": "C6" }, diff --git a/keyboards/moon/rules.mk b/keyboards/moon/rules.mk index 676f0971a2e..aee52dfee13 100644 --- a/keyboards/moon/rules.mk +++ b/keyboards/moon/rules.mk @@ -1,16 +1,3 @@ -# 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # custom matrix setup CUSTOM_MATRIX = yes diff --git a/keyboards/mt/ncr80/hotswap/info.json b/keyboards/mt/ncr80/hotswap/keyboard.json similarity index 97% rename from keyboards/mt/ncr80/hotswap/info.json rename to keyboards/mt/ncr80/hotswap/keyboard.json index b79a30709f3..6f82bb0e786 100644 --- a/keyboards/mt/ncr80/hotswap/info.json +++ b/keyboards/mt/ncr80/hotswap/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x2002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/mt/ncr80/hotswap/rules.mk b/keyboards/mt/ncr80/hotswap/rules.mk deleted file mode 100644 index e82e95f7843..00000000000 --- a/keyboards/mt/ncr80/hotswap/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/mt/ncr80/solder/info.json b/keyboards/mt/ncr80/solder/keyboard.json similarity index 99% rename from keyboards/mt/ncr80/solder/info.json rename to keyboards/mt/ncr80/solder/keyboard.json index ead9ed409d1..fac59abadd0 100644 --- a/keyboards/mt/ncr80/solder/info.json +++ b/keyboards/mt/ncr80/solder/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x2001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "backlight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/mt/ncr80/solder/rules.mk b/keyboards/mt/ncr80/solder/rules.mk deleted file mode 100644 index 9032f3e4b8f..00000000000 --- a/keyboards/mt/ncr80/solder/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = 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/mt/split75/info.json b/keyboards/mt/split75/info.json index e03d528a2a4..c13fa28b800 100644 --- a/keyboards/mt/split75/info.json +++ b/keyboards/mt/split75/info.json @@ -8,6 +8,13 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true + }, "backlight": { "pin": "D4" }, diff --git a/keyboards/mt/split75/rules.mk b/keyboards/mt/split75/rules.mk index b0c02543b19..bbfc7cbbf72 100644 --- a/keyboards/mt/split75/rules.mk +++ b/keyboards/mt/split75/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 = 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 = yes # Enable keyboard RGB underglow - # custom matrix setup CUSTOM_MATRIX = lite SRC = matrix.c From d333a25868039292a327a141dc90c0015b7fd017 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 26 Apr 2024 05:41:22 +0100 Subject: [PATCH 189/333] Add audio driver to keyboard.json schema (#23616) --- data/mappings/info_rules.hjson | 1 + data/schemas/keyboard.jsonschema | 4 ++++ docs/reference_info_json.md | 2 ++ keyboards/adafruit/macropad/keyboard.json | 1 + keyboards/adafruit/macropad/rules.mk | 1 - keyboards/arrowmechanics/wings/keyboard.json | 3 +++ keyboards/arrowmechanics/wings/rules.mk | 1 - keyboards/boardsource/equals/48/keyboard.json | 3 +++ keyboards/boardsource/equals/48/rules.mk | 1 - keyboards/boardsource/equals/60/keyboard.json | 3 +++ keyboards/boardsource/equals/60/rules.mk | 1 - keyboards/boardsource/unicorne/keyboard.json | 3 +++ keyboards/boardsource/unicorne/rules.mk | 1 - keyboards/custommk/cmk11/keyboard.json | 3 +++ keyboards/custommk/cmk11/rules.mk | 1 - keyboards/custommk/ergostrafer/keyboard.json | 3 +++ keyboards/custommk/ergostrafer/rules.mk | 1 - keyboards/custommk/evo70_r2/keyboard.json | 3 +++ keyboards/custommk/evo70_r2/rules.mk | 2 -- keyboards/handwired/macroboard/f411/keyboard.json | 3 +++ keyboards/handwired/macroboard/f411/rules.mk | 1 - .../handwired/tractyl_manuform/5x6_right/f303/keyboard.json | 3 +++ keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk | 1 - .../handwired/tractyl_manuform/5x6_right/f411/keyboard.json | 3 +++ keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk | 1 - keyboards/nack/keyboard.json | 3 +++ keyboards/nack/rules.mk | 1 - keyboards/planck/ez/info.json | 3 +++ keyboards/planck/ez/rules.mk | 2 -- keyboards/quokka/keyboard.json | 3 +++ keyboards/quokka/rules.mk | 1 - keyboards/rgbkb/sol3/rev1/keyboard.json | 3 +++ keyboards/rgbkb/sol3/rules.mk | 1 - keyboards/tzarc/djinn/info.json | 3 +++ keyboards/tzarc/djinn/rules.mk | 2 -- keyboards/yanghu/unicorne/info.json | 3 +++ keyboards/yanghu/unicorne/rules.mk | 2 -- keyboards/zsa/moonlander/keyboard.json | 3 +++ keyboards/zsa/moonlander/rules.mk | 1 - 39 files changed, 59 insertions(+), 22 deletions(-) delete mode 100644 keyboards/custommk/cmk11/rules.mk delete mode 100644 keyboards/custommk/ergostrafer/rules.mk delete mode 100644 keyboards/handwired/macroboard/f411/rules.mk delete mode 100644 keyboards/nack/rules.mk diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson index 5d08be2fc1a..97611bcf587 100644 --- a/data/mappings/info_rules.hjson +++ b/data/mappings/info_rules.hjson @@ -11,6 +11,7 @@ // invalid: Default `false`. Set to `true` to generate errors when a value exists // replace_with: use with a key marked deprecated or invalid to designate a replacement + "AUDIO_DRIVER": {"info_key": "audio.driver"}, "BACKLIGHT_DRIVER": {"info_key": "backlight.driver"}, "BLUETOOTH_DRIVER": {"info_key": "bluetooth.driver"}, "BOARD": {"info_key": "board"}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 24f7fec9ab3..585c64777f2 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -133,6 +133,10 @@ "clicky": {"type": "boolean"} } }, + "driver": { + "type": "string", + "enum": ["dac_additive", "dac_basic", "pwm_software", "pwm_hardware"] + }, "macro_beep": {"type": "boolean"}, "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}, "power_control": { diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md index 6f0b84c414b..d1dc5d3beac 100644 --- a/docs/reference_info_json.md +++ b/docs/reference_info_json.md @@ -118,6 +118,8 @@ Configures the [Audio](feature_audio.md) feature. * `clicky` * The default audio clicky enabled state. * Default: `true` + * `driver` + * The driver to use. Must be one of `dac_additive`, `dac_basic`, `pwm_software`, `pwm_hardware`. * `macro_beep` * Play a short beep for `\a` (ASCII `BEL`) characters in Send String macros. * Default: `false` diff --git a/keyboards/adafruit/macropad/keyboard.json b/keyboards/adafruit/macropad/keyboard.json index 86601c0167f..94f2673f98f 100644 --- a/keyboards/adafruit/macropad/keyboard.json +++ b/keyboards/adafruit/macropad/keyboard.json @@ -19,6 +19,7 @@ "oled": true }, "audio": { + "driver": "pwm_hardware", "power_control": { "pin": "GP14" } diff --git a/keyboards/adafruit/macropad/rules.mk b/keyboards/adafruit/macropad/rules.mk index 1630b74ceae..d7ca5b3b90f 100644 --- a/keyboards/adafruit/macropad/rules.mk +++ b/keyboards/adafruit/macropad/rules.mk @@ -1,2 +1 @@ -AUDIO_DRIVER = pwm_hardware OLED_TRANSPORT = spi diff --git a/keyboards/arrowmechanics/wings/keyboard.json b/keyboards/arrowmechanics/wings/keyboard.json index fca38314c9b..0f1e6696f75 100644 --- a/keyboards/arrowmechanics/wings/keyboard.json +++ b/keyboards/arrowmechanics/wings/keyboard.json @@ -17,6 +17,9 @@ "mousekey": true, "rgb_matrix": true }, + "audio": { + "driver": "pwm_hardware" + }, "matrix_pins": { "cols": ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16"], "rows": ["GP22", "GP21", "GP20", "GP19", "GP18", "GP17"] diff --git a/keyboards/arrowmechanics/wings/rules.mk b/keyboards/arrowmechanics/wings/rules.mk index 22ce54190c8..161ec22b16e 100644 --- a/keyboards/arrowmechanics/wings/rules.mk +++ b/keyboards/arrowmechanics/wings/rules.mk @@ -1,2 +1 @@ SERIAL_DRIVER = vendor -AUDIO_DRIVER = pwm_hardware diff --git a/keyboards/boardsource/equals/48/keyboard.json b/keyboards/boardsource/equals/48/keyboard.json index 5b633559313..13bc0d80ab7 100644 --- a/keyboards/boardsource/equals/48/keyboard.json +++ b/keyboards/boardsource/equals/48/keyboard.json @@ -10,6 +10,9 @@ "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"], "rows": ["GP12", "GP13", "GP16", "GP17"] }, + "audio": { + "driver": "pwm_hardware" + }, "ws2812": { "driver": "vendor", "pin": "GP21" diff --git a/keyboards/boardsource/equals/48/rules.mk b/keyboards/boardsource/equals/48/rules.mk index 2f75fc139fc..ec94c118ee1 100644 --- a/keyboards/boardsource/equals/48/rules.mk +++ b/keyboards/boardsource/equals/48/rules.mk @@ -1,2 +1 @@ -AUDIO_DRIVER = pwm_hardware QUANTUM_PAINTER_DRIVERS += st7735_spi diff --git a/keyboards/boardsource/equals/60/keyboard.json b/keyboards/boardsource/equals/60/keyboard.json index 3bc1f49be38..63cb4717e57 100644 --- a/keyboards/boardsource/equals/60/keyboard.json +++ b/keyboards/boardsource/equals/60/keyboard.json @@ -10,6 +10,9 @@ "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"], "rows": ["GP12", "GP13", "GP16", "GP17", "GP18"] }, + "audio": { + "driver": "pwm_hardware" + }, "ws2812": { "driver": "vendor", "pin": "GP21" diff --git a/keyboards/boardsource/equals/60/rules.mk b/keyboards/boardsource/equals/60/rules.mk index 2f75fc139fc..ec94c118ee1 100644 --- a/keyboards/boardsource/equals/60/rules.mk +++ b/keyboards/boardsource/equals/60/rules.mk @@ -1,2 +1 @@ -AUDIO_DRIVER = pwm_hardware QUANTUM_PAINTER_DRIVERS += st7735_spi diff --git a/keyboards/boardsource/unicorne/keyboard.json b/keyboards/boardsource/unicorne/keyboard.json index 6afbcc044cb..4fb63de9e32 100644 --- a/keyboards/boardsource/unicorne/keyboard.json +++ b/keyboards/boardsource/unicorne/keyboard.json @@ -32,6 +32,9 @@ "pid": "0x7563", "vid": "0x4273" }, + "audio": { + "driver": "pwm_hardware" + }, "ws2812": { "driver": "vendor", "pin": "GP29" diff --git a/keyboards/boardsource/unicorne/rules.mk b/keyboards/boardsource/unicorne/rules.mk index d123b2a2fa8..48b30dcd51a 100644 --- a/keyboards/boardsource/unicorne/rules.mk +++ b/keyboards/boardsource/unicorne/rules.mk @@ -1,3 +1,2 @@ SERIAL_DRIVER = vendor -AUDIO_DRIVER = pwm_hardware POINTING_DEVICE_DRIVER = analog_joystick diff --git a/keyboards/custommk/cmk11/keyboard.json b/keyboards/custommk/cmk11/keyboard.json index d831351aa78..9a853063ba3 100644 --- a/keyboards/custommk/cmk11/keyboard.json +++ b/keyboards/custommk/cmk11/keyboard.json @@ -18,6 +18,9 @@ "nkro": true, "rgb_matrix": true }, + "audio": { + "driver": "pwm_hardware" + }, "matrix_pins": { "cols": ["B0", "A1", "A2", "A3", "A6", "B10"], "rows": ["A5", "A4"] diff --git a/keyboards/custommk/cmk11/rules.mk b/keyboards/custommk/cmk11/rules.mk deleted file mode 100644 index 72f75f4367e..00000000000 --- a/keyboards/custommk/cmk11/rules.mk +++ /dev/null @@ -1 +0,0 @@ -AUDIO_DRIVER = pwm_hardware diff --git a/keyboards/custommk/ergostrafer/keyboard.json b/keyboards/custommk/ergostrafer/keyboard.json index a1283114c8e..4f23417415d 100644 --- a/keyboards/custommk/ergostrafer/keyboard.json +++ b/keyboards/custommk/ergostrafer/keyboard.json @@ -17,6 +17,9 @@ "encoder": true, "audio": true }, + "audio": { + "driver": "pwm_hardware" + }, "matrix_pins": { "cols": ["B0", "A1", "A2", "A3", "A6", "B6", "B10"], "rows": ["C13", "C14", "C15", "B1", "A7", "A5"] diff --git a/keyboards/custommk/ergostrafer/rules.mk b/keyboards/custommk/ergostrafer/rules.mk deleted file mode 100644 index 72f75f4367e..00000000000 --- a/keyboards/custommk/ergostrafer/rules.mk +++ /dev/null @@ -1 +0,0 @@ -AUDIO_DRIVER = pwm_hardware diff --git a/keyboards/custommk/evo70_r2/keyboard.json b/keyboards/custommk/evo70_r2/keyboard.json index dea56ed2570..5f10d6705d9 100644 --- a/keyboards/custommk/evo70_r2/keyboard.json +++ b/keyboards/custommk/evo70_r2/keyboard.json @@ -51,6 +51,9 @@ "twinkle": true } }, + "audio": { + "driver": "pwm_hardware" + }, "ws2812": { "driver": "pwm", "pin": "A10" diff --git a/keyboards/custommk/evo70_r2/rules.mk b/keyboards/custommk/evo70_r2/rules.mk index 193fe4f1a43..3961343ce4b 100644 --- a/keyboards/custommk/evo70_r2/rules.mk +++ b/keyboards/custommk/evo70_r2/rules.mk @@ -1,5 +1,3 @@ -AUDIO_DRIVER = pwm_hardware - # project specific files SRC += matrix.c diff --git a/keyboards/handwired/macroboard/f411/keyboard.json b/keyboards/handwired/macroboard/f411/keyboard.json index 03a8aadc1b9..8b1155d7740 100644 --- a/keyboards/handwired/macroboard/f411/keyboard.json +++ b/keyboards/handwired/macroboard/f411/keyboard.json @@ -9,6 +9,9 @@ "rows": ["A15", "B3", "B4", "B5", "B7"] }, "diode_direction": "COL2ROW", + "audio": { + "driver": "pwm_hardware" + }, "ws2812": { "driver": "pwm" }, diff --git a/keyboards/handwired/macroboard/f411/rules.mk b/keyboards/handwired/macroboard/f411/rules.mk deleted file mode 100644 index 72f75f4367e..00000000000 --- a/keyboards/handwired/macroboard/f411/rules.mk +++ /dev/null @@ -1 +0,0 @@ -AUDIO_DRIVER = pwm_hardware diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json index 000d8f0dd77..499390c6107 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json @@ -12,6 +12,9 @@ "led_count": 20, "split_count": [10, 10] }, + "audio": { + "driver": "dac_additive" + }, "ws2812": { "pin": "A6", "driver": "pwm" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk index 23f790a1ad4..22915ec0001 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk @@ -1,4 +1,3 @@ # KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart -AUDIO_DRIVER = dac_additive diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json index 73c13e8e318..7182ee17012 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json @@ -15,6 +15,9 @@ "build": { "debounce_type": "asym_eager_defer_pk" }, + "audio": { + "driver": "pwm_hardware" + }, "ws2812": { "pin": "A1", "driver": "pwm" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk index e75692030f7..f26cbbced12 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk @@ -2,4 +2,3 @@ KEYBOARD_SHARED_EP = yes MOUSE_SHARED_EP = yes SERIAL_DRIVER = usart -AUDIO_DRIVER = pwm_hardware diff --git a/keyboards/nack/keyboard.json b/keyboards/nack/keyboard.json index 6a3b6db3ade..cd08aac0af4 100644 --- a/keyboards/nack/keyboard.json +++ b/keyboards/nack/keyboard.json @@ -17,6 +17,9 @@ "rgb_matrix": true, "unicode": true }, + "audio": { + "driver": "dac_basic" + }, "ws2812": { "pin": "B5", "driver": "spi" diff --git a/keyboards/nack/rules.mk b/keyboards/nack/rules.mk deleted file mode 100644 index 72354402a6b..00000000000 --- a/keyboards/nack/rules.mk +++ /dev/null @@ -1 +0,0 @@ -AUDIO_DRIVER = dac_basic diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json index 4244b4d83d8..f7b2a8f8a1f 100644 --- a/keyboards/planck/ez/info.json +++ b/keyboards/planck/ez/info.json @@ -75,6 +75,9 @@ "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"] }, "diode_direction": "COL2ROW", + "audio": { + "driver": "dac_additive" + }, "encoder": { "rotary": [ {"pin_a": "B12", "pin_b": "B13"} diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk index 6cdb6ed4c29..ef20f95b652 100644 --- a/keyboards/planck/ez/rules.mk +++ b/keyboards/planck/ez/rules.mk @@ -1,5 +1,3 @@ -AUDIO_DRIVER = dac_additive - RGBLIGHT_SUPPORTED = no BAKCLIGHT_SUPPORTED = no diff --git a/keyboards/quokka/keyboard.json b/keyboards/quokka/keyboard.json index 0c34b0ee65f..094e3e496eb 100644 --- a/keyboards/quokka/keyboard.json +++ b/keyboards/quokka/keyboard.json @@ -13,6 +13,9 @@ "oled": true, "rgb_matrix": true }, + "audio": { + "driver": "pwm_hardware" + }, "matrix_pins": { "cols": ["GP8", "GP7", "GP6", "GP5", "GP4"], "rows": ["GP10", "GP19", "GP20", "GP18"] diff --git a/keyboards/quokka/rules.mk b/keyboards/quokka/rules.mk index c53818be735..161ec22b16e 100644 --- a/keyboards/quokka/rules.mk +++ b/keyboards/quokka/rules.mk @@ -1,2 +1 @@ -AUDIO_DRIVER = pwm_hardware SERIAL_DRIVER = vendor diff --git a/keyboards/rgbkb/sol3/rev1/keyboard.json b/keyboards/rgbkb/sol3/rev1/keyboard.json index 3b8b7d060c8..83e0a7a9275 100644 --- a/keyboards/rgbkb/sol3/rev1/keyboard.json +++ b/keyboards/rgbkb/sol3/rev1/keyboard.json @@ -24,6 +24,9 @@ "twinkle": true } }, + "audio": { + "driver": "dac_additive" + }, "ws2812": { "pin": "B5", "driver": "pwm" diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk index bf22130a55a..0c48b5d30e4 100644 --- a/keyboards/rgbkb/sol3/rules.mk +++ b/keyboards/rgbkb/sol3/rules.mk @@ -14,7 +14,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover AUDIO_ENABLE = yes # Audio output -AUDIO_DRIVER = dac_additive DYNAMIC_MACRO_ENABLE = yes DIP_SWITCH_ENABLE = yes diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json index fddee1c21fd..be0710ebef4 100644 --- a/keyboards/tzarc/djinn/info.json +++ b/keyboards/tzarc/djinn/info.json @@ -31,6 +31,9 @@ "rows": ["B13", "B14", "B15", "C6", "C7", "C8"], "cols": ["C0", "C1", "C2", "C3", "A0", "A1", "A2"] }, + "audio": { + "driver": "pwm_software" + }, "backlight": { "pin": "A7", "levels": 4 diff --git a/keyboards/tzarc/djinn/rules.mk b/keyboards/tzarc/djinn/rules.mk index 5a4589a86fe..78912d16d05 100644 --- a/keyboards/tzarc/djinn/rules.mk +++ b/keyboards/tzarc/djinn/rules.mk @@ -4,8 +4,6 @@ SERIAL_DRIVER = usart CIE1931_CURVE = yes -AUDIO_DRIVER = pwm_software - QUANTUM_PAINTER_DRIVERS = ili9341_spi SRC += \ diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json index 504df68fb06..1b890dcabaf 100644 --- a/keyboards/yanghu/unicorne/info.json +++ b/keyboards/yanghu/unicorne/info.json @@ -18,6 +18,9 @@ "oled": true, "rgblight": true }, + "audio": { + "driver": "pwm_hardware" + }, "rgblight": { "led_count": 8, "animations": { diff --git a/keyboards/yanghu/unicorne/rules.mk b/keyboards/yanghu/unicorne/rules.mk index 13cbb6b1e7d..96852c8abfe 100644 --- a/keyboards/yanghu/unicorne/rules.mk +++ b/keyboards/yanghu/unicorne/rules.mk @@ -1,3 +1 @@ -AUDIO_DRIVER = pwm_hardware - DEFAULT_FOLDER = yanghu/unicorne/f411 diff --git a/keyboards/zsa/moonlander/keyboard.json b/keyboards/zsa/moonlander/keyboard.json index 233cb46bba7..08864fe2d77 100644 --- a/keyboards/zsa/moonlander/keyboard.json +++ b/keyboards/zsa/moonlander/keyboard.json @@ -22,6 +22,9 @@ "rgb_matrix": true, "swap_hands": true }, + "audio": { + "driver": "dac_additive" + }, "dynamic_keymap": { "layer_count": 8 }, diff --git a/keyboards/zsa/moonlander/rules.mk b/keyboards/zsa/moonlander/rules.mk index 46375584890..10928ea0611 100644 --- a/keyboards/zsa/moonlander/rules.mk +++ b/keyboards/zsa/moonlander/rules.mk @@ -1,4 +1,3 @@ -AUDIO_DRIVER = dac_additive CUSTOM_MATRIX = lite # project specific files From 2224a768d598fe30bbfb80e11cac6d7704680371 Mon Sep 17 00:00:00 2001 From: Sergey Vlasov Date: Sat, 27 Apr 2024 02:28:29 +0300 Subject: [PATCH 190/333] Fix encoder breakage with 4 or more encoders (#23595) --- quantum/encoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quantum/encoder.c b/quantum/encoder.c index 0a48ac9a07b..2ddbf3ee1e0 100644 --- a/quantum/encoder.c +++ b/quantum/encoder.c @@ -83,7 +83,7 @@ bool encoder_task(void) { } bool encoder_queue_full_advanced(encoder_events_t *events) { - return events->head == (events->tail - 1) % MAX_QUEUED_ENCODER_EVENTS; + return events->tail == (events->head + 1) % MAX_QUEUED_ENCODER_EVENTS; } bool encoder_queue_full(void) { From 0ab77cf2e5b8edd78d3ad7bba0f0326bf934ab39 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 26 Apr 2024 19:17:40 -0700 Subject: [PATCH 191/333] Data-Driven Keyboard Conversions: M, Part 2 (#23601) --- .../mechmini/v1/{info.json => keyboard.json} | 8 +++++++ keyboards/mechkeys/mechmini/v1/rules.mk | 10 --------- .../mechmini/v2/{info.json => keyboard.json} | 8 +++++++ keyboards/mechkeys/mechmini/v2/rules.mk | 12 ----------- keyboards/mechstudio/ud_40_ortho/info.json | 6 ++++++ keyboards/mechstudio/ud_40_ortho/rules.mk | 13 ------------ keyboards/mechwild/bde/info.json | 10 --------- keyboards/mechwild/bde/lefty/keyboard.json | 7 +++++++ .../bde/rev2/{info.json => keyboard.json} | 9 ++++++++ keyboards/mechwild/bde/rev2/rules.mk | 2 -- keyboards/mechwild/bde/righty/keyboard.json | 7 +++++++ .../mirrored/{info.json => keyboard.json} | 8 +++++++ keyboards/mechwild/mokulua/mirrored/rules.mk | 14 ------------- .../standard/{info.json => keyboard.json} | 10 ++++++++- keyboards/mechwild/mokulua/standard/rules.mk | 14 ------------- keyboards/mechwild/puckbuddy/info.json | 11 ++++++++++ keyboards/mechwild/puckbuddy/rules.mk | 21 +------------------ .../mechwild/sugarglider/f401/keyboard.json | 17 ++++++++++++++- .../mechwild/sugarglider/f411/keyboard.json | 17 ++++++++++++++- keyboards/mechwild/sugarglider/info.json | 17 ++++----------- keyboards/mechwild/sugarglider/rules.mk | 10 --------- .../sugarglider/wide_oled/f401/keyboard.json | 17 ++++++++++++++- .../sugarglider/wide_oled/f411/keyboard.json | 17 ++++++++++++++- .../mechwild/sugarglider/wide_oled/rules.mk | 2 +- .../merge/uma/{info.json => keyboard.json} | 12 +++++++++++ keyboards/merge/uma/rules.mk | 15 ------------- keyboards/mexsistor/ludmila/info.json | 7 +++++++ keyboards/mexsistor/ludmila/rules.mk | 13 ------------ 28 files changed, 162 insertions(+), 152 deletions(-) rename keyboards/mechkeys/mechmini/v1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mechkeys/mechmini/v1/rules.mk rename keyboards/mechkeys/mechmini/v2/{info.json => keyboard.json} (98%) delete mode 100755 keyboards/mechkeys/mechmini/v2/rules.mk rename keyboards/mechwild/bde/rev2/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/mechwild/bde/rev2/rules.mk rename keyboards/mechwild/mokulua/mirrored/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mechwild/mokulua/mirrored/rules.mk rename keyboards/mechwild/mokulua/standard/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/mechwild/mokulua/standard/rules.mk rename keyboards/merge/uma/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/merge/uma/rules.mk diff --git a/keyboards/mechkeys/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/keyboard.json similarity index 96% rename from keyboards/mechkeys/mechmini/v1/info.json rename to keyboards/mechkeys/mechmini/v1/keyboard.json index 7dda26af254..8d3a4a9b84a 100644 --- a/keyboards/mechkeys/mechmini/v1/info.json +++ b/keyboards/mechkeys/mechmini/v1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xCA40", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "backlight": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/mechkeys/mechmini/v1/rules.mk b/keyboards/mechkeys/mechmini/v1/rules.mk deleted file mode 100644 index e1dfc317217..00000000000 --- a/keyboards/mechkeys/mechmini/v1/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/mechkeys/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/keyboard.json similarity index 98% rename from keyboards/mechkeys/mechmini/v2/info.json rename to keyboards/mechkeys/mechmini/v2/keyboard.json index 26d0b930001..da53e842038 100644 --- a/keyboards/mechkeys/mechmini/v2/info.json +++ b/keyboards/mechkeys/mechmini/v2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xCA40", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B1", "B0", "D5", "B7", "C7"], "rows": ["D0", "D1", "D2", "D3"] diff --git a/keyboards/mechkeys/mechmini/v2/rules.mk b/keyboards/mechkeys/mechmini/v2/rules.mk deleted file mode 100755 index 3a899c4650b..00000000000 --- a/keyboards/mechkeys/mechmini/v2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes diff --git a/keyboards/mechstudio/ud_40_ortho/info.json b/keyboards/mechstudio/ud_40_ortho/info.json index 6b301e69e40..31955239f5f 100644 --- a/keyboards/mechstudio/ud_40_ortho/info.json +++ b/keyboards/mechstudio/ud_40_ortho/info.json @@ -8,6 +8,12 @@ "pid": "0x0002", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C5", "D0", "B3", "B2", "B1", "B0", "D6", "D5", "D4", "D3", "D2", "D1"], "rows": ["C2", "B4", "B5", "B6"] diff --git a/keyboards/mechstudio/ud_40_ortho/rules.mk b/keyboards/mechstudio/ud_40_ortho/rules.mk index 585ce414dcd..4df55cd2206 100644 --- a/keyboards/mechstudio/ud_40_ortho/rules.mk +++ b/keyboards/mechstudio/ud_40_ortho/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/mechwild/bde/info.json b/keyboards/mechwild/bde/info.json index e2389455633..918c792aa70 100644 --- a/keyboards/mechwild/bde/info.json +++ b/keyboards/mechwild/bde/info.json @@ -8,16 +8,6 @@ "build": { "lto": true }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "debug": false, - "extrakey": true, - "mousekey": true, - "rgblight": true, - "nkro": true - }, "development_board": "promicro", "rgblight": { "sleep": true, diff --git a/keyboards/mechwild/bde/lefty/keyboard.json b/keyboards/mechwild/bde/lefty/keyboard.json index c9bcd051954..751a65b1a45 100644 --- a/keyboards/mechwild/bde/lefty/keyboard.json +++ b/keyboards/mechwild/bde/lefty/keyboard.json @@ -4,6 +4,13 @@ "pid": "0x1701", "device_version": "2.0.3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "rows": ["D1", "D7", "D3"], "cols": ["F7", "B1", "B6", "B2", "B3", "F6", "F5", "F4", "D0", "D4", "C6", "E6", "B5", "B4"] diff --git a/keyboards/mechwild/bde/rev2/info.json b/keyboards/mechwild/bde/rev2/keyboard.json similarity index 94% rename from keyboards/mechwild/bde/rev2/info.json rename to keyboards/mechwild/bde/rev2/keyboard.json index b8b7fc39d06..beb2624f3e3 100644 --- a/keyboards/mechwild/bde/rev2/info.json +++ b/keyboards/mechwild/bde/rev2/keyboard.json @@ -4,6 +4,15 @@ "pid": "0x170A", "device_version": "1.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "encoder": true, + "oled": true + }, "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D3"} diff --git a/keyboards/mechwild/bde/rev2/rules.mk b/keyboards/mechwild/bde/rev2/rules.mk deleted file mode 100644 index bade0749fc9..00000000000 --- a/keyboards/mechwild/bde/rev2/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -ENCODER_ENABLE = yes # Enable encoder -OLED_ENABLE = yes # Enable OLED Screen diff --git a/keyboards/mechwild/bde/righty/keyboard.json b/keyboards/mechwild/bde/righty/keyboard.json index 3f254da2861..54a7a4459f0 100644 --- a/keyboards/mechwild/bde/righty/keyboard.json +++ b/keyboards/mechwild/bde/righty/keyboard.json @@ -4,6 +4,13 @@ "pid": "0x1702", "device_version": "2.0.3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "rows": ["D1", "D7", "D3"], "cols": ["B4", "B5", "E6", "C6", "D4", "D0", "F4", "F5", "F6", "B3", "B2", "B6", "B1", "F7"] diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/keyboard.json similarity index 96% rename from keyboards/mechwild/mokulua/mirrored/info.json rename to keyboards/mechwild/mokulua/mirrored/keyboard.json index ccc2d02b637..be74fabbd32 100644 --- a/keyboards/mechwild/mokulua/mirrored/info.json +++ b/keyboards/mechwild/mokulua/mirrored/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x170C", "device_version": "1.0.3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true, + "oled": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3"] diff --git a/keyboards/mechwild/mokulua/mirrored/rules.mk b/keyboards/mechwild/mokulua/mirrored/rules.mk deleted file mode 100644 index 1a9045155ba..00000000000 --- a/keyboards/mechwild/mokulua/mirrored/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable encoder -OLED_ENABLE = yes # Enable OLED Screen diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/keyboard.json similarity index 96% rename from keyboards/mechwild/mokulua/standard/info.json rename to keyboards/mechwild/mokulua/standard/keyboard.json index 5b22023cce3..044573d82c5 100644 --- a/keyboards/mechwild/mokulua/standard/info.json +++ b/keyboards/mechwild/mokulua/standard/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x170B", "device_version": "1.0.3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true, + "oled": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3"] @@ -22,7 +30,7 @@ "tap_keycode_delay": 10 }, "split": { - "enabled": true + "enabled": true, "soft_serial_pin": "D3", "transport": { "sync": { diff --git a/keyboards/mechwild/mokulua/standard/rules.mk b/keyboards/mechwild/mokulua/standard/rules.mk deleted file mode 100644 index 1a9045155ba..00000000000 --- a/keyboards/mechwild/mokulua/standard/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable encoder -OLED_ENABLE = yes # Enable OLED Screen diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json index b430c4af450..4e827d1ba87 100644 --- a/keyboards/mechwild/puckbuddy/info.json +++ b/keyboards/mechwild/puckbuddy/info.json @@ -8,6 +8,17 @@ "pid": "0x170F", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true, + "oled": true, + "dip_switch": true, + "pointing_device": true, + "dynamic_tapping_term": true + }, "matrix_pins": { "cols": ["B10", "A8", "B4", "B5"], "rows": ["B12", "B13", "B14", "B15"] diff --git a/keyboards/mechwild/puckbuddy/rules.mk b/keyboards/mechwild/puckbuddy/rules.mk index 980fe281cff..fb5d6497359 100644 --- a/keyboards/mechwild/puckbuddy/rules.mk +++ b/keyboards/mechwild/puckbuddy/rules.mk @@ -1,20 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Encoder Enabled -OLED_ENABLE = yes # OLED Enabled -DIP_SWITCH_ENABLE = yes # Dip Switch Enabled - -POINTING_DEVICE_ENABLE = yes # Pointing Device Enabled -POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Pointing Device Driver - -DYNAMIC_TAPPING_TERM_ENABLE = yes # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily +POINTING_DEVICE_DRIVER = cirque_pinnacle_spi diff --git a/keyboards/mechwild/sugarglider/f401/keyboard.json b/keyboards/mechwild/sugarglider/f401/keyboard.json index 797e9900595..7bf58c1b45e 100644 --- a/keyboards/mechwild/sugarglider/f401/keyboard.json +++ b/keyboards/mechwild/sugarglider/f401/keyboard.json @@ -1,3 +1,18 @@ { - "development_board": "blackpill_f401" + "development_board": "blackpill_f401", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "rgblight": true, + "encoder": true, + "dip_switch": true, + "steno": true, + "oled": true, + "pointing_device": true, + "dynamic_tapping_term": true + } } diff --git a/keyboards/mechwild/sugarglider/f411/keyboard.json b/keyboards/mechwild/sugarglider/f411/keyboard.json index a41c5f4dd14..dd76af1f10e 100644 --- a/keyboards/mechwild/sugarglider/f411/keyboard.json +++ b/keyboards/mechwild/sugarglider/f411/keyboard.json @@ -1,3 +1,18 @@ { - "development_board": "blackpill_f411" + "development_board": "blackpill_f411", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "rgblight": true, + "encoder": true, + "dip_switch": true, + "steno": true, + "oled": true, + "pointing_device": true, + "dynamic_tapping_term": true + } } diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json index 749b0952cbd..80004f35d14 100644 --- a/keyboards/mechwild/sugarglider/info.json +++ b/keyboards/mechwild/sugarglider/info.json @@ -3,23 +3,14 @@ "keyboard_name": "Sugar Glider", "maintainer": "kylemccreery", "url": "https://mechwild.com/product/sugar-glider/", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true, - "encoder": true, - "rgblight": true, - "dip_switch": true, - "steno": true - }, "usb": { "vid": "0x6D77", "pid": "0x1710", "device_version": "0.2.0", - "force_nkro": true + "force_nkro": true, + "shared_endpoint": { + "keyboard": true + } }, "diode_direction": "COL2ROW", "dynamic_keymap": { diff --git a/keyboards/mechwild/sugarglider/rules.mk b/keyboards/mechwild/sugarglider/rules.mk index 6fd0836a733..a01a95a8685 100644 --- a/keyboards/mechwild/sugarglider/rules.mk +++ b/keyboards/mechwild/sugarglider/rules.mk @@ -1,12 +1,5 @@ -# Build Options -# change yes to no to disable -# -OLED_ENABLE = yes # OLED Enabled - # Cirque touchpad settings -POINTING_DEVICE_ENABLE = yes # Pointing Device Enabled POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Pointing Device Driver -DYNAMIC_TAPPING_TERM_ENABLE = yes # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily # Custom matrix setup CUSTOM_MATRIX = lite @@ -16,6 +9,3 @@ SRC += mcp23018.c matrix.c I2C_DRIVER_REQUIRED = yes DEFAULT_FOLDER = mechwild/sugarglider/wide_oled - -# Necessary for stenography functionality -KEYBOARD_SHARED_EP = yes # Needed to free up an endpoint in blackpill diff --git a/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json b/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json index 797e9900595..7bf58c1b45e 100644 --- a/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json +++ b/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json @@ -1,3 +1,18 @@ { - "development_board": "blackpill_f401" + "development_board": "blackpill_f401", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "rgblight": true, + "encoder": true, + "dip_switch": true, + "steno": true, + "oled": true, + "pointing_device": true, + "dynamic_tapping_term": true + } } diff --git a/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json b/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json index a41c5f4dd14..dd76af1f10e 100644 --- a/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json +++ b/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json @@ -1,3 +1,18 @@ { - "development_board": "blackpill_f411" + "development_board": "blackpill_f411", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "rgblight": true, + "encoder": true, + "dip_switch": true, + "steno": true, + "oled": true, + "pointing_device": true, + "dynamic_tapping_term": true + } } diff --git a/keyboards/mechwild/sugarglider/wide_oled/rules.mk b/keyboards/mechwild/sugarglider/wide_oled/rules.mk index 193169239b2..23e6cab873a 100644 --- a/keyboards/mechwild/sugarglider/wide_oled/rules.mk +++ b/keyboards/mechwild/sugarglider/wide_oled/rules.mk @@ -3,4 +3,4 @@ # WIDE_OLED_ENABLE = yes -DEFAULT_FOLDER = mechwild/sugarglider/wide_oled/f401 \ No newline at end of file +DEFAULT_FOLDER = mechwild/sugarglider/wide_oled/f401 diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/keyboard.json similarity index 99% rename from keyboards/merge/uma/info.json rename to keyboards/merge/uma/keyboard.json index 6413480391e..d5fea75fb49 100644 --- a/keyboards/merge/uma/info.json +++ b/keyboards/merge/uma/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x3232", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true, + "encoder": true, + "oled": true + }, + "build": { + "lto": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/merge/uma/rules.mk b/keyboards/merge/uma/rules.mk deleted file mode 100644 index e146f96ce6f..00000000000 --- a/keyboards/merge/uma/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/mexsistor/ludmila/info.json b/keyboards/mexsistor/ludmila/info.json index 6e44d33913c..71202208c5f 100644 --- a/keyboards/mexsistor/ludmila/info.json +++ b/keyboards/mexsistor/ludmila/info.json @@ -8,6 +8,13 @@ "pid": "0x6BF6", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true + }, "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F5"} diff --git a/keyboards/mexsistor/ludmila/rules.mk b/keyboards/mexsistor/ludmila/rules.mk index 547c4ad49c9..73766740561 100644 --- a/keyboards/mexsistor/ludmila/rules.mk +++ b/keyboards/mexsistor/ludmila/rules.mk @@ -1,15 +1,2 @@ -# Build Options -# change yes to no to disable -# CUSTOM_MATRIX = lite SRC = matrix.c -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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes From 569be5951e94c59138a172871f4213ec802e6877 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 27 Apr 2024 05:26:23 -0700 Subject: [PATCH 192/333] Data-Driven Keyboard Conversions: BastardKB (#23622) --- .../charybdis/3x5/blackpill/info.json | 12 +++++++++++- .../charybdis/3x5/blackpill/rules.mk | 17 ----------------- .../charybdis/3x5/v1/elitec/info.json | 10 ++++++++++ .../charybdis/3x5/v1/elitec/rules.mk | 19 ------------------- .../charybdis/3x5/v2/elitec/info.json | 10 ++++++++++ .../charybdis/3x5/v2/elitec/rules.mk | 19 ------------------- .../charybdis/3x5/v2/splinky_2/info.json | 7 +++++++ .../charybdis/3x5/v2/splinky_2/rules.mk | 15 --------------- .../charybdis/3x5/v2/splinky_3/info.json | 7 +++++++ .../charybdis/3x5/v2/splinky_3/rules.mk | 15 --------------- .../charybdis/3x5/v2/stemcell/info.json | 12 +++++++++++- .../charybdis/3x5/v2/stemcell/rules.mk | 16 ---------------- .../charybdis/3x6/blackpill/info.json | 12 +++++++++++- .../charybdis/3x6/blackpill/rules.mk | 16 ---------------- .../charybdis/3x6/v1/elitec/info.json | 10 ++++++++++ .../charybdis/3x6/v1/elitec/rules.mk | 19 ------------------- .../charybdis/3x6/v2/elitec/info.json | 10 ++++++++++ .../charybdis/3x6/v2/elitec/rules.mk | 19 ------------------- .../charybdis/3x6/v2/splinky_2/info.json | 7 +++++++ .../charybdis/3x6/v2/splinky_2/rules.mk | 15 --------------- .../charybdis/3x6/v2/splinky_3/info.json | 7 +++++++ .../charybdis/3x6/v2/splinky_3/rules.mk | 15 --------------- .../charybdis/3x6/v2/stemcell/info.json | 12 +++++++++++- .../charybdis/3x6/v2/stemcell/rules.mk | 16 ---------------- .../charybdis/4x6/blackpill/info.json | 12 +++++++++++- .../charybdis/4x6/blackpill/rules.mk | 16 ---------------- .../charybdis/4x6/v1/elitec/info.json | 10 ++++++++++ .../charybdis/4x6/v1/elitec/rules.mk | 19 ------------------- .../charybdis/4x6/v2/elitec/info.json | 10 ++++++++++ .../charybdis/4x6/v2/elitec/rules.mk | 19 ------------------- .../charybdis/4x6/v2/splinky_2/info.json | 7 +++++++ .../charybdis/4x6/v2/splinky_2/rules.mk | 15 --------------- .../charybdis/4x6/v2/splinky_3/info.json | 7 +++++++ .../charybdis/4x6/v2/splinky_3/rules.mk | 15 --------------- .../charybdis/4x6/v2/stemcell/info.json | 12 +++++++++++- .../charybdis/4x6/v2/stemcell/rules.mk | 16 ---------------- .../dilemma/3x5_2/assembled/info.json | 6 ++++++ .../dilemma/3x5_2/assembled/rules.mk | 15 --------------- .../bastardkb/dilemma/3x5_2/splinky/info.json | 6 ++++++ .../bastardkb/dilemma/3x5_2/splinky/rules.mk | 15 --------------- keyboards/bastardkb/dilemma/3x5_3/info.json | 1 + keyboards/bastardkb/dilemma/3x5_3/rules.mk | 1 - keyboards/bastardkb/dilemma/4x6_4/info.json | 1 + keyboards/bastardkb/dilemma/4x6_4/rules.mk | 1 - .../bastardkb/scylla/blackpill/info.json | 11 ++++++++++- keyboards/bastardkb/scylla/blackpill/rules.mk | 15 --------------- .../bastardkb/scylla/v1/elitec/info.json | 6 ++++++ keyboards/bastardkb/scylla/v1/elitec/rules.mk | 14 -------------- .../bastardkb/scylla/v2/elitec/info.json | 6 ++++++ keyboards/bastardkb/scylla/v2/elitec/rules.mk | 14 -------------- .../bastardkb/scylla/v2/splinky_2/info.json | 6 ++++++ .../bastardkb/scylla/v2/splinky_2/rules.mk | 14 -------------- .../bastardkb/scylla/v2/splinky_3/info.json | 6 ++++++ .../bastardkb/scylla/v2/splinky_3/rules.mk | 14 -------------- .../bastardkb/scylla/v2/stemcell/info.json | 6 ++++++ .../bastardkb/scylla/v2/stemcell/rules.mk | 14 -------------- .../bastardkb/skeletyl/blackpill/info.json | 11 ++++++++++- .../bastardkb/skeletyl/blackpill/rules.mk | 15 --------------- .../bastardkb/skeletyl/v1/elitec/info.json | 6 ++++++ .../bastardkb/skeletyl/v1/elitec/rules.mk | 14 -------------- .../bastardkb/skeletyl/v2/elitec/info.json | 6 ++++++ .../bastardkb/skeletyl/v2/elitec/rules.mk | 14 -------------- .../bastardkb/skeletyl/v2/splinky_2/info.json | 6 ++++++ .../bastardkb/skeletyl/v2/splinky_2/rules.mk | 14 -------------- .../bastardkb/skeletyl/v2/splinky_3/info.json | 6 ++++++ .../bastardkb/skeletyl/v2/splinky_3/rules.mk | 14 -------------- .../bastardkb/skeletyl/v2/stemcell/info.json | 6 ++++++ .../bastardkb/skeletyl/v2/stemcell/rules.mk | 14 -------------- .../bastardkb/tbkmini/blackpill/info.json | 11 ++++++++++- .../bastardkb/tbkmini/blackpill/rules.mk | 15 --------------- .../bastardkb/tbkmini/v1/elitec/info.json | 6 ++++++ .../bastardkb/tbkmini/v1/elitec/rules.mk | 14 -------------- .../bastardkb/tbkmini/v2/elitec/info.json | 6 ++++++ .../bastardkb/tbkmini/v2/elitec/rules.mk | 14 -------------- .../bastardkb/tbkmini/v2/splinky_2/info.json | 6 ++++++ .../bastardkb/tbkmini/v2/splinky_2/rules.mk | 14 -------------- .../bastardkb/tbkmini/v2/splinky_3/info.json | 6 ++++++ .../bastardkb/tbkmini/v2/splinky_3/rules.mk | 14 -------------- .../bastardkb/tbkmini/v2/stemcell/info.json | 6 ++++++ .../bastardkb/tbkmini/v2/stemcell/rules.mk | 14 -------------- 80 files changed, 302 insertions(+), 597 deletions(-) diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json index 1af57cca9a4..bcc57981b51 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json @@ -1,7 +1,17 @@ { "keyboard_name": "Charybdis Nano (3x5) Blackpill", "usb": { - "device_version": "1.0.0" + "device_version": "1.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true }, "eeprom": { "driver": "spi" diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk index d6eda5c2d10..c8d355efb78 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk @@ -1,22 +1,5 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes - SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json index 05be6acde22..4a94d023d46 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json @@ -3,6 +3,16 @@ "usb": { "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, + "build": { + "lto": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk index 7f2338227af..17dae28bd1c 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk @@ -1,23 +1,4 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint - -# Enable link-time optimization by default. The Charybdis packs a lot of -# features (RGB, Via, trackball) in a small atmega32u4 package. -LTO_ENABLE = yes diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json index 61d953ec8f6..bc95061ced9 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json @@ -3,6 +3,16 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, + "build": { + "lto": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk index 7f2338227af..17dae28bd1c 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk @@ -1,23 +1,4 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint - -# Enable link-time optimization by default. The Charybdis packs a lot of -# features (RGB, Via, trackball) in a small atmega32u4 package. -LTO_ENABLE = yes diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json index f7dd9d2c7e2..cc990d3f210 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json @@ -3,6 +3,13 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk index 8753565dfbc..db29cb6789b 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk @@ -1,20 +1,5 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json index 33fda9c2a47..6719b211968 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json @@ -3,6 +3,13 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk index 8753565dfbc..db29cb6789b 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk @@ -1,20 +1,5 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json index cf9cf2eb62d..2de77b07f0c 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json @@ -1,7 +1,17 @@ { "keyboard_name": "Charybdis Nano (3x5) STeMCell", "usb": { - "device_version": "2.0.0" + "device_version": "2.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true }, "rgb_matrix": { "driver": "ws2812" diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk index d6eda5c2d10..4373b9c33d2 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk @@ -1,22 +1,6 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json index 51f9c5dbea5..ecefbbeb999 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json @@ -1,7 +1,17 @@ { "keyboard_name": "Charybdis Mini (3x6) Blackpill", "usb": { - "device_version": "1.0.0" + "device_version": "1.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true }, "eeprom": { "driver": "spi" diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk index d6eda5c2d10..4373b9c33d2 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk @@ -1,22 +1,6 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json index 8bc6a86eaf1..dcc454366c6 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json @@ -3,6 +3,16 @@ "usb": { "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, + "build": { + "lto": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk index 7f2338227af..17dae28bd1c 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk @@ -1,23 +1,4 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint - -# Enable link-time optimization by default. The Charybdis packs a lot of -# features (RGB, Via, trackball) in a small atmega32u4 package. -LTO_ENABLE = yes diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json index 13283d5b8fa..ce74b2dc6df 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json @@ -3,6 +3,16 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, + "build": { + "lto": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk index 7f2338227af..17dae28bd1c 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk @@ -1,23 +1,4 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint - -# Enable link-time optimization by default. The Charybdis packs a lot of -# features (RGB, Via, trackball) in a small atmega32u4 package. -LTO_ENABLE = yes diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json index 8dcc8187abb..825508475c9 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json @@ -3,6 +3,13 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk index 8753565dfbc..db29cb6789b 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk @@ -1,20 +1,5 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json index 288e08b9ee9..4d9cfb616d8 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json @@ -3,6 +3,13 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk index 8753565dfbc..db29cb6789b 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk @@ -1,20 +1,5 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json index c09c9c90ca0..05d82b2445b 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json @@ -1,7 +1,17 @@ { "keyboard_name": "Charybdis Mini (3x6) STeMCell", "usb": { - "device_version": "2.0.0" + "device_version": "2.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true }, "rgb_matrix": { "driver": "ws2812" diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk index d6eda5c2d10..4373b9c33d2 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk @@ -1,22 +1,6 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json index 86df4839fc9..b55dc29445b 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json @@ -1,7 +1,17 @@ { "keyboard_name": "Charybdis (4x6) Blackpill", "usb": { - "device_version": "1.0.0" + "device_version": "1.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true }, "eeprom": { "driver": "spi" diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk index 9e797122a74..3caafdef92b 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk @@ -1,22 +1,6 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported. -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json index 3419eaea8b7..b90b144c8b8 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json @@ -3,6 +3,16 @@ "usb": { "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, + "build": { + "lto": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk index 808675da02b..0e4d15d5bc8 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk @@ -1,23 +1,4 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported. -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint - -# Enable link-time optimization by default. The Charybdis packs a lot of -# features (RGB, Via, trackball) in a small atmega32u4 package. -LTO_ENABLE = yes diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json index bb892c4e6ec..8ae66d083b4 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json @@ -3,6 +3,16 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, + "build": { + "lto": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk index 808675da02b..0e4d15d5bc8 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk @@ -1,23 +1,4 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported. -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint - -# Enable link-time optimization by default. The Charybdis packs a lot of -# features (RGB, Via, trackball) in a small atmega32u4 package. -LTO_ENABLE = yes diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json index 48a2eb51584..b0c98389f7f 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json @@ -3,6 +3,13 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk index 8753565dfbc..db29cb6789b 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk @@ -1,20 +1,5 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json index 72aa8b59c6e..1e072db85b0 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json @@ -3,6 +3,13 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk index 8753565dfbc..db29cb6789b 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk @@ -1,20 +1,5 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json index d49755a861a..ab145e0f95c 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json @@ -1,7 +1,17 @@ { "keyboard_name": "Charybdis (4x6) STeMCell", "usb": { - "device_version": "2.0.0" + "device_version": "2.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true }, "rgb_matrix": { "driver": "ws2812" diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk index d6eda5c2d10..4373b9c33d2 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk @@ -1,22 +1,6 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json index 2190d542c2c..ac52a86eb51 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json @@ -1,5 +1,11 @@ { "keyboard_name": "Dilemma (3x5+2) Assembled", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "pointing_device": true + }, "matrix_pins": { "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"], "rows": ["GP4", "GP5", "GP28", "GP26"] diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk index b54403222b4..48216ee8b71 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk @@ -1,22 +1,7 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported RGB_MATRIX_SUPPORTED = no # RGB matrix is supported and enabled by default RGBLIGHT_SUPPORTED = no # RGB underglow is supported, but not enabled by default -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Assembled version uses SPI. diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json index 9e07843788f..3c4c559cb6e 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json @@ -1,5 +1,11 @@ { "keyboard_name": "Dilemma (3x5+2) Splinky", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "pointing_device": true + }, "matrix_pins": { "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"], "rows": ["GP4", "GP5", "GP28", "GP26"] diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk index 0de2c9a8071..942028da2c0 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk @@ -1,22 +1,7 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported RGB_MATRIX_SUPPORTED = no # RGB matrix is supported and enabled by default RGBLIGHT_SUPPORTED = no # RGB underglow is supported, but not enabled by default -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c # DIY version uses I2C. diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json index 2da4f1785e2..12e336f023b 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/info.json +++ b/keyboards/bastardkb/dilemma/3x5_3/info.json @@ -38,6 +38,7 @@ "mousekey": true, "nkro": true, "rgb_matrix": true, + "pointing_device": true, "caps_word": true, "tri_layer": true }, diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk index 4923c2c84a5..60776009483 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk @@ -1,4 +1,3 @@ SERIAL_DRIVER = vendor -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi diff --git a/keyboards/bastardkb/dilemma/4x6_4/info.json b/keyboards/bastardkb/dilemma/4x6_4/info.json index cc8c30b5105..7e40208a5db 100644 --- a/keyboards/bastardkb/dilemma/4x6_4/info.json +++ b/keyboards/bastardkb/dilemma/4x6_4/info.json @@ -38,6 +38,7 @@ "mousekey": true, "nkro": true, "rgb_matrix": true, + "pointing_device": true, "caps_word": true, "tri_layer": true }, diff --git a/keyboards/bastardkb/dilemma/4x6_4/rules.mk b/keyboards/bastardkb/dilemma/4x6_4/rules.mk index 4923c2c84a5..60776009483 100644 --- a/keyboards/bastardkb/dilemma/4x6_4/rules.mk +++ b/keyboards/bastardkb/dilemma/4x6_4/rules.mk @@ -1,4 +1,3 @@ SERIAL_DRIVER = vendor -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json index 167c979f4b9..5294976fd34 100644 --- a/keyboards/bastardkb/scylla/blackpill/info.json +++ b/keyboards/bastardkb/scylla/blackpill/info.json @@ -1,7 +1,16 @@ { "keyboard_name": "Scylla Blackpill", "usb": { - "device_version": "1.0.0" + "device_version": "1.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true }, "eeprom": { "driver": "spi" diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk index 0875a191c5d..48c904dd644 100644 --- a/keyboards/bastardkb/scylla/blackpill/rules.mk +++ b/keyboards/bastardkb/scylla/blackpill/rules.mk @@ -1,20 +1,5 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json index 4b7e5092199..17b6b7fc367 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/info.json +++ b/keyboards/bastardkb/scylla/v1/elitec/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "ws2812": { "pin": "D2" }, diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk index a8a3e3d5873..1868c4bb027 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk +++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk @@ -1,15 +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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json index a7c68fb628a..7bfb7ff5a4e 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/info.json +++ b/keyboards/bastardkb/scylla/v2/elitec/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk index a8a3e3d5873..1868c4bb027 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk +++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk @@ -1,15 +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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json index 83cfd06ca79..2b9022d24ef 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json +++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk index d5f1d335c89..077573eb763 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/scylla/v2/splinky_2/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 = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json index 14386303dc5..cd4da3ac415 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json +++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk index d5f1d335c89..077573eb763 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/scylla/v2/splinky_3/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 = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json index d6bea6463ac..06bfeda7d28 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/info.json +++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk index 3834385af03..3fe3e4ffbea 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk @@ -1,17 +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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json index c0e5d4e2c85..16fa2b24121 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/info.json +++ b/keyboards/bastardkb/skeletyl/blackpill/info.json @@ -1,7 +1,16 @@ { "keyboard_name": "Skeletyl Blackpill", "usb": { - "device_version": "1.0.0" + "device_version": "1.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true }, "eeprom": { "driver": "spi" diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk index 0875a191c5d..48c904dd644 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk +++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk @@ -1,20 +1,5 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json index cc5d2adfadd..2910d80b2f5 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json +++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "ws2812": { "pin": "D2" }, diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk index a8a3e3d5873..1868c4bb027 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk +++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk @@ -1,15 +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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json index 4f245663bce..dec2537b65c 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json +++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk index a8a3e3d5873..1868c4bb027 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk @@ -1,15 +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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json index fa15c27148e..897f195a315 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk index d5f1d335c89..077573eb763 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/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 = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json index b34581757ba..06a93dfbeb7 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk index d5f1d335c89..077573eb763 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/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 = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json index d7b1fc5cdb4..6dd86bcc126 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk index 3834385af03..3fe3e4ffbea 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk @@ -1,17 +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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json index 62301b1f2bc..61d0e741fef 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/info.json +++ b/keyboards/bastardkb/tbkmini/blackpill/info.json @@ -1,7 +1,16 @@ { "keyboard_name": "TBK Mini Blackpill", "usb": { - "device_version": "1.0.0" + "device_version": "1.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true }, "eeprom": { "driver": "spi" diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk index 0875a191c5d..48c904dd644 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk +++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk @@ -1,20 +1,5 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json index 54433f39bf3..59988074baa 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "ws2812": { "pin": "D2" }, diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk index a8a3e3d5873..1868c4bb027 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk @@ -1,15 +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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json index 57c7399c01d..01679bcff9f 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk index a8a3e3d5873..1868c4bb027 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk @@ -1,15 +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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json index 2f64d2b51bf..2048db62515 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk index d5f1d335c89..077573eb763 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/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 = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json index b67bc1d744c..8dd21b75910 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk index d5f1d335c89..077573eb763 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/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 = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json index d08c89ec574..41abba96cb9 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk index 3834385af03..3fe3e4ffbea 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk @@ -1,17 +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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = usart From 8f8fffc1740be81fbfe4a07a74e9f03962c1062a Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 27 Apr 2024 05:58:04 -0700 Subject: [PATCH 193/333] Data-Driven Keyboard Conversions: Mechlovin (#23624) --- keyboards/mechlovin/adelais/info.json | 8 -------- .../rgb_led/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk | 1 - .../rgb_led/rev2/{info.json => keyboard.json} | 11 +++++++++++ keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk | 3 --- .../rgb_led/rev3/{info.json => keyboard.json} | 11 +++++++++++ keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk | 8 -------- keyboards/mechlovin/adelais/rgb_led/rules.mk | 4 +--- .../adelais/standard_led/arm/rev2/keyboard.json | 10 ++++++++++ .../arm/rev3/{info.json => keyboard.json} | 11 +++++++++++ .../adelais/standard_led/arm/rev3/rules.mk | 1 - .../standard_led/arm/rev4/apm32f103/keyboard.json | 13 ++++++++++++- .../adelais/standard_led/arm/rev4/info.json | 9 --------- .../standard_led/arm/rev4/stm32f303/keyboard.json | 13 ++++++++++++- .../avr/rev1/{info.json => keyboard.json} | 10 ++++++++++ .../adelais/standard_led/avr/rev1/rules.mk | 4 ---- keyboards/mechlovin/adelais/standard_led/rules.mk | 4 ---- keyboards/mechlovin/delphine/info.json | 8 -------- .../delphine/mono_led/{info.json => keyboard.json} | 8 ++++++++ keyboards/mechlovin/delphine/mono_led/rules.mk | 2 -- .../delphine/rgb_led/{info.json => keyboard.json} | 7 +++++++ keyboards/mechlovin/delphine/rgb_led/rules.mk | 2 -- .../hannah60rgb/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/mechlovin/hannah60rgb/rev1/rules.mk | 1 - .../hannah60rgb/rev2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mechlovin/hannah60rgb/rev2/rules.mk | 2 -- keyboards/mechlovin/hannah60rgb/rules.mk | 12 ------------ keyboards/mechlovin/hannah65/info.json | 9 --------- .../mechlovin/hannah65/rev1/haus/keyboard.json | 9 +++++++++ .../hannah910/rev1/{info.json => keyboard.json} | 7 +++++++ keyboards/mechlovin/hannah910/rev1/rules.mk | 12 ------------ .../hannah910/rev2/{info.json => keyboard.json} | 7 +++++++ keyboards/mechlovin/hannah910/rev2/rules.mk | 12 ------------ .../hannah910/rev3/{info.json => keyboard.json} | 7 +++++++ keyboards/mechlovin/hannah910/rev3/rules.mk | 12 ------------ keyboards/mechlovin/hex4b/rev1/info.json | 6 ++++++ keyboards/mechlovin/hex4b/rev1/rules.mk | 13 ------------- .../hex4b/rev2/{info.json => keyboard.json} | 9 +++++++++ keyboards/mechlovin/hex4b/rev2/rules.mk | 12 ------------ keyboards/mechlovin/infinity87/rev1/info.json | 9 --------- .../infinity87/rev1/rogue87/keyboard.json | 6 ++++++ .../infinity87/rev1/rouge87/keyboard.json | 6 ++++++ .../rev1/standard/{info.json => keyboard.json} | 10 ++++++++++ .../mechlovin/infinity87/rev1/standard/rules.mk | 1 - keyboards/mechlovin/infinity87/rev2/info.json | 8 ++++++++ keyboards/mechlovin/infinity87/rev2/rules.mk | 8 -------- .../rgb_rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/mechlovin/infinity87/rgb_rev1/rules.mk | 1 - keyboards/mechlovin/infinity87/rules.mk | 14 -------------- keyboards/mechlovin/infinity875/info.json | 6 ++++++ keyboards/mechlovin/infinity875/rules.mk | 13 ------------- keyboards/mechlovin/jay60/info.json | 5 +++++ keyboards/mechlovin/jay60/rules.mk | 13 ------------- keyboards/mechlovin/mechlovin9/info.json | 8 -------- .../mechlovin9/rev1/{info.json => keyboard.json} | 12 +++++++++--- keyboards/mechlovin/mechlovin9/rev1/rules.mk | 6 ------ keyboards/mechlovin/mechlovin9/rev2/info.json | 3 +++ keyboards/mechlovin/mechlovin9/rev3/keyboard.json | 5 +++++ keyboards/mechlovin/olly/bb/info.json | 7 +++++++ keyboards/mechlovin/olly/bb/rules.mk | 13 ------------- keyboards/mechlovin/olly/jf/info.json | 9 --------- keyboards/mechlovin/olly/jf/rev1/info.json | 6 +++++- keyboards/mechlovin/olly/jf/rev2/keyboard.json | 10 +++++++--- keyboards/mechlovin/serratus/info.json | 8 ++++++++ keyboards/mechlovin/serratus/rules.mk | 12 ------------ keyboards/mechlovin/th1800/info.json | 5 +++++ keyboards/mechlovin/th1800/rules.mk | 13 ------------- keyboards/mechlovin/zed1800/info.json | 9 --------- keyboards/mechlovin/zed1800/oreum/keyboard.json | 8 ++++++++ keyboards/mechlovin/zed1800/rules.mk | 2 +- keyboards/mechlovin/zed1800/saber/keyboard.json | 8 ++++++++ keyboards/mechlovin/zed1800/zepsody/keyboard.json | 8 ++++++++ keyboards/mechlovin/zed65/910/keyboard.json | 5 +++++ keyboards/mechlovin/zed65/info.json | 9 +-------- .../zed65/mono_led/{info.json => keyboard.json} | 10 ++++++++++ keyboards/mechlovin/zed65/mono_led/rules.mk | 4 ---- .../retro66/{info.json => keyboard.json} | 8 ++++++++ .../mechlovin/zed65/no_backlight/retro66/rules.mk | 1 - keyboards/mechlovin/zed65/no_backlight/rules.mk | 2 -- .../wearhaus66/{info.json => keyboard.json} | 8 ++++++++ .../zed65/no_backlight/wearhaus66/rules.mk | 1 - keyboards/mechlovin/zed65/rev1/keyboard.json | 5 +++++ 82 files changed, 327 insertions(+), 293 deletions(-) rename keyboards/mechlovin/adelais/rgb_led/rev1/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk rename keyboards/mechlovin/adelais/rgb_led/rev2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk rename keyboards/mechlovin/adelais/rgb_led/rev3/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk rename keyboards/mechlovin/adelais/standard_led/arm/rev3/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk rename keyboards/mechlovin/adelais/standard_led/avr/rev1/{info.json => keyboard.json} (98%) rename keyboards/mechlovin/delphine/mono_led/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/mechlovin/delphine/mono_led/rules.mk rename keyboards/mechlovin/delphine/rgb_led/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/mechlovin/delphine/rgb_led/rules.mk rename keyboards/mechlovin/hannah60rgb/rev1/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/hannah60rgb/rev1/rules.mk rename keyboards/mechlovin/hannah60rgb/rev2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/hannah60rgb/rev2/rules.mk rename keyboards/mechlovin/hannah910/rev1/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/hannah910/rev1/rules.mk rename keyboards/mechlovin/hannah910/rev2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/hannah910/rev2/rules.mk rename keyboards/mechlovin/hannah910/rev3/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/hannah910/rev3/rules.mk rename keyboards/mechlovin/hex4b/rev2/{info.json => keyboard.json} (75%) delete mode 100644 keyboards/mechlovin/hex4b/rev2/rules.mk rename keyboards/mechlovin/infinity87/rev1/standard/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/mechlovin/infinity87/rev1/standard/rules.mk rename keyboards/mechlovin/infinity87/rgb_rev1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/mechlovin/infinity87/rgb_rev1/rules.mk rename keyboards/mechlovin/mechlovin9/rev1/{info.json => keyboard.json} (80%) delete mode 100644 keyboards/mechlovin/mechlovin9/rev1/rules.mk rename keyboards/mechlovin/zed65/mono_led/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/zed65/mono_led/rules.mk rename keyboards/mechlovin/zed65/no_backlight/retro66/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk rename keyboards/mechlovin/zed65/no_backlight/wearhaus66/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json index d8aae5a8da7..42b16d63984 100644 --- a/keyboards/mechlovin/adelais/info.json +++ b/keyboards/mechlovin/adelais/info.json @@ -2,14 +2,6 @@ "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "mechlovin", - "features": { - "bootmagic": true, - "command": true, - "console": true, - "extrakey": true, - "mousekey": true, - "nkro": true - }, "usb": { "vid": "0x4D4C", "device_version": "0.0.1" diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json similarity index 98% rename from keyboards/mechlovin/adelais/rgb_led/rev1/info.json rename to keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json index af68bb84574..01232b07e80 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json @@ -3,6 +3,15 @@ "usb": { "pid": "0xAEC1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk deleted file mode 100644 index aad92997d0f..00000000000 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json similarity index 98% rename from keyboards/mechlovin/adelais/rgb_led/rev2/info.json rename to keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json index fb88cb359db..a8633af5da2 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json @@ -3,6 +3,17 @@ "usb": { "pid": "0xAEC2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "rgblight": true, + "rgb_matrix": true, + "encoder": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk deleted file mode 100644 index e79b2862e60..00000000000 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -RGB_MATRIX_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json similarity index 98% rename from keyboards/mechlovin/adelais/rgb_led/rev3/info.json rename to keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json index 62acf349c05..628eb404a5b 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json @@ -3,6 +3,17 @@ "usb": { "pid": "0xAEC3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "rgblight": true, + "rgb_matrix": true, + "encoder": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk deleted file mode 100644 index e144301381d..00000000000 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk +++ /dev/null @@ -1,8 +0,0 @@ -# Build Options -# change yes to no to disable -# -RGB_MATRIX_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration diff --git a/keyboards/mechlovin/adelais/rgb_led/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rules.mk index 8a9bdd433d6..18047f12c7e 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rules.mk +++ b/keyboards/mechlovin/adelais/rgb_led/rules.mk @@ -1,3 +1 @@ - - -DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1 \ No newline at end of file +DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json index 9a2a280c10b..53005dfa339 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json @@ -2,6 +2,16 @@ "usb": { "pid": "0xAD01" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "processor": "STM32F303", "board": "QMK_PROTON_C", "bootloader": "stm32-dfu", diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json similarity index 98% rename from keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json rename to keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json index 46907dc7a9d..11295007902 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json @@ -2,6 +2,17 @@ "usb": { "pid": "0xAD02" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, "encoder": { "rotary": [ {"pin_a": "A6", "pin_b": "A5"}, diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk deleted file mode 100644 index 5af1ba85367..00000000000 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_ENABLE = yes diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json index cf993be2471..f6b79e35d0d 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json @@ -1,4 +1,15 @@ { "processor": "STM32F103", - "bootloader": "stm32duino" + "bootloader": "stm32duino", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true, + "encoder": true + } } diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json index 17cf63fecf3..f0d10942adc 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json @@ -1,13 +1,4 @@ { - "features": { - "bootmagic": false, - "command": false, - "console": false, - "encoder": true, - "extrakey": false, - "mousekey": false, - "nkro": false - }, "usb": { "pid": "0xAD03" }, diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json index 774c3dcf317..9e9748fa93a 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json @@ -1,5 +1,16 @@ { "processor": "STM32F303", "board": "QMK_PROTON_C", - "bootloader": "stm32-dfu" + "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true, + "encoder": true + } } diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json similarity index 98% rename from keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json rename to keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json index 95aac7b0d41..3758a8f085a 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json @@ -3,6 +3,16 @@ "usb": { "pid": "0xAD04" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": true, + "rgblight": true + }, "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2"}, diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk index c807f2ad095..179d02c3c68 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk @@ -1,7 +1,3 @@ -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/mechlovin/adelais/standard_led/rules.mk b/keyboards/mechlovin/adelais/standard_led/rules.mk index 271c6a9179e..a1d2ba038de 100644 --- a/keyboards/mechlovin/adelais/standard_led/rules.mk +++ b/keyboards/mechlovin/adelais/standard_led/rules.mk @@ -1,5 +1 @@ - -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev2 diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json index e8f39b8d6d1..baeeab6f186 100644 --- a/keyboards/mechlovin/delphine/info.json +++ b/keyboards/mechlovin/delphine/info.json @@ -6,14 +6,6 @@ "usb": { "vid": "0x4D4C" }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, "matrix_pins": { "cols": ["F7", "D7", "D6", "D2"], "rows": ["F0", "F1", "F4", "F5", "F6", "D3"] diff --git a/keyboards/mechlovin/delphine/mono_led/info.json b/keyboards/mechlovin/delphine/mono_led/keyboard.json similarity index 78% rename from keyboards/mechlovin/delphine/mono_led/info.json rename to keyboards/mechlovin/delphine/mono_led/keyboard.json index e1b90d1191b..06fa071159e 100644 --- a/keyboards/mechlovin/delphine/mono_led/info.json +++ b/keyboards/mechlovin/delphine/mono_led/keyboard.json @@ -3,6 +3,14 @@ "pid": "0xDEF1", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/mechlovin/delphine/mono_led/rules.mk b/keyboards/mechlovin/delphine/mono_led/rules.mk deleted file mode 100644 index ed572b0bbfc..00000000000 --- a/keyboards/mechlovin/delphine/mono_led/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow \ No newline at end of file diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/keyboard.json similarity index 93% rename from keyboards/mechlovin/delphine/rgb_led/info.json rename to keyboards/mechlovin/delphine/rgb_led/keyboard.json index 6a0b8df2cf0..35a163c05f8 100644 --- a/keyboards/mechlovin/delphine/rgb_led/info.json +++ b/keyboards/mechlovin/delphine/rgb_led/keyboard.json @@ -3,6 +3,13 @@ "pid": "0xDEF2", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/mechlovin/delphine/rgb_led/rules.mk b/keyboards/mechlovin/delphine/rgb_led/rules.mk deleted file mode 100644 index 5c624bc68f6..00000000000 --- a/keyboards/mechlovin/delphine/rgb_led/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/keyboard.json similarity index 98% rename from keyboards/mechlovin/hannah60rgb/rev1/info.json rename to keyboards/mechlovin/hannah60rgb/rev1/keyboard.json index 6a3510c7dfc..4fb4dc2eef5 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "rgb_matrix": true + }, "ws2812": { "pin": "A15" }, diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk b/keyboards/mechlovin/hannah60rgb/rev1/rules.mk deleted file mode 100644 index aad92997d0f..00000000000 --- a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/keyboard.json similarity index 98% rename from keyboards/mechlovin/hannah60rgb/rev2/info.json rename to keyboards/mechlovin/hannah60rgb/rev2/keyboard.json index e6be250311c..06bb71a3482 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev2/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "rgblight": true, + "rgb_matrix": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk b/keyboards/mechlovin/hannah60rgb/rev2/rules.mk deleted file mode 100644 index e1f93c75251..00000000000 --- a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/mechlovin/hannah60rgb/rules.mk b/keyboards/mechlovin/hannah60rgb/rules.mk index 65e5f070fb7..e876a56afb5 100644 --- a/keyboards/mechlovin/hannah60rgb/rules.mk +++ b/keyboards/mechlovin/hannah60rgb/rules.mk @@ -1,13 +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 = 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 = no # Audio output - DEFAULT_FOLDER = mechlovin/hannah60rgb/rev1 diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json index f9adc729660..88a3f397192 100644 --- a/keyboards/mechlovin/hannah65/info.json +++ b/keyboards/mechlovin/hannah65/info.json @@ -3,15 +3,6 @@ "pin": "B8", "breathing": true }, - "features": { - "backlight": true, - "bootmagic": true, - "command": true, - "console": true, - "extrakey": true, - "mousekey": true, - "nkro": true - }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"], "rows": ["A4", "A5", "A3", "A2", "A1"] diff --git a/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json b/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json index ac97de5f180..7a935fc1a53 100644 --- a/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json +++ b/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6500", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/keyboard.json similarity index 98% rename from keyboards/mechlovin/hannah910/rev1/info.json rename to keyboards/mechlovin/hannah910/rev1/keyboard.json index af20cffd4fb..8f01f6f39b1 100644 --- a/keyboards/mechlovin/hannah910/rev1/info.json +++ b/keyboards/mechlovin/hannah910/rev1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x9101", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], "rows": ["B5", "B6", "D3", "C6", "C7"] diff --git a/keyboards/mechlovin/hannah910/rev1/rules.mk b/keyboards/mechlovin/hannah910/rev1/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/mechlovin/hannah910/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/keyboard.json similarity index 98% rename from keyboards/mechlovin/hannah910/rev2/info.json rename to keyboards/mechlovin/hannah910/rev2/keyboard.json index a9cfe5f66be..c6fe19c34d1 100644 --- a/keyboards/mechlovin/hannah910/rev2/info.json +++ b/keyboards/mechlovin/hannah910/rev2/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x9102", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], "rows": ["B5", "B6", "D3", "C6", "C7"] diff --git a/keyboards/mechlovin/hannah910/rev2/rules.mk b/keyboards/mechlovin/hannah910/rev2/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/mechlovin/hannah910/rev2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/keyboard.json similarity index 98% rename from keyboards/mechlovin/hannah910/rev3/info.json rename to keyboards/mechlovin/hannah910/rev3/keyboard.json index abeaa1e1824..8a6ea4d1234 100644 --- a/keyboards/mechlovin/hannah910/rev3/info.json +++ b/keyboards/mechlovin/hannah910/rev3/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x9103", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], "rows": ["B5", "B6", "D3", "C6", "C7"] diff --git a/keyboards/mechlovin/hannah910/rev3/rules.mk b/keyboards/mechlovin/hannah910/rev3/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/mechlovin/hannah910/rev3/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json index 1e9a7d57762..d3251f5808e 100644 --- a/keyboards/mechlovin/hex4b/rev1/info.json +++ b/keyboards/mechlovin/hex4b/rev1/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "backlight": true + }, "matrix_pins": { "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "D1", "D0"], "rows": ["B7", "A2", "A1", "A3", "A4", "A5"] diff --git a/keyboards/mechlovin/hex4b/rev1/rules.mk b/keyboards/mechlovin/hex4b/rev1/rules.mk index 15d473397d4..c2ee0bc86f9 100644 --- a/keyboards/mechlovin/hex4b/rev1/rules.mk +++ b/keyboards/mechlovin/hex4b/rev1/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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/keyboard.json similarity index 75% rename from keyboards/mechlovin/hex4b/rev2/info.json rename to keyboards/mechlovin/hex4b/rev2/keyboard.json index 8609be01c31..1bdda81c5ab 100644 --- a/keyboards/mechlovin/hex4b/rev2/info.json +++ b/keyboards/mechlovin/hex4b/rev2/keyboard.json @@ -3,6 +3,15 @@ "usb": { "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "C13", "B7", "B6", "B5", "B4", "B3"], "rows": ["A4", "B12", "B13", "B14", "B15", "A1"] diff --git a/keyboards/mechlovin/hex4b/rev2/rules.mk b/keyboards/mechlovin/hex4b/rev2/rules.mk deleted file mode 100644 index a5089d51a5b..00000000000 --- a/keyboards/mechlovin/hex4b/rev2/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 = 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/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json index 249bbd5cb47..dbe7cb83f99 100644 --- a/keyboards/mechlovin/infinity87/rev1/info.json +++ b/keyboards/mechlovin/infinity87/rev1/info.json @@ -1,13 +1,4 @@ { - "features": { - "backlight": true, - "bootmagic": false, - "command": false, - "console": false, - "extrakey": false, - "mousekey": false, - "nkro": false - }, "matrix_pins": { "cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"], "rows": ["A10", "B13", "B12", "B11", "C14", "C15"] diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json b/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json index 6fdc9d6e5d3..2ac0510dbf3 100644 --- a/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json +++ b/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x8704", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "backlight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json b/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json index 39a9f169258..6b947f0f1f1 100644 --- a/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json +++ b/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x8703", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "backlight": true + }, "community_layouts": [ "tkl_ansi_tsangan", "tkl_iso_tsangan" diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/keyboard.json similarity index 99% rename from keyboards/mechlovin/infinity87/rev1/standard/info.json rename to keyboards/mechlovin/infinity87/rev1/standard/keyboard.json index 964a7a8cb9a..a0cb10fac22 100644 --- a/keyboards/mechlovin/infinity87/rev1/standard/info.json +++ b/keyboards/mechlovin/infinity87/rev1/standard/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x8701", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "rgblight": { "led_count": 26, "sleep": true, diff --git a/keyboards/mechlovin/infinity87/rev1/standard/rules.mk b/keyboards/mechlovin/infinity87/rev1/standard/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/mechlovin/infinity87/rev1/standard/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json index 42db9894ca1..fdc66869889 100644 --- a/keyboards/mechlovin/infinity87/rev2/info.json +++ b/keyboards/mechlovin/infinity87/rev2/info.json @@ -8,6 +8,14 @@ "pid": "0x8702", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "backlight": { "pin": "B6", "breathing": true diff --git a/keyboards/mechlovin/infinity87/rev2/rules.mk b/keyboards/mechlovin/infinity87/rev2/rules.mk index ea7804f1585..179d02c3c68 100644 --- a/keyboards/mechlovin/infinity87/rev2/rules.mk +++ b/keyboards/mechlovin/infinity87/rev2/rules.mk @@ -1,11 +1,3 @@ -# Build Options -# change yes to no to disable -# -CONSOLE_ENABLE = no -COMMAND_ENABLE = no -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json similarity index 99% rename from keyboards/mechlovin/infinity87/rgb_rev1/info.json rename to keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json index 27a7b441e32..2d177949dc1 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json +++ b/keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x8710", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk deleted file mode 100644 index e408bde91c4..00000000000 --- a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/mechlovin/infinity87/rules.mk b/keyboards/mechlovin/infinity87/rules.mk index 251f8440aab..4aa072cae75 100644 --- a/keyboards/mechlovin/infinity87/rules.mk +++ b/keyboards/mechlovin/infinity87/rules.mk @@ -1,15 +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 = 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 - DEFAULT_FOLDER = mechlovin/infinity87/rgb_rev1 diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json index cb8154a713e..73bdb0af130 100644 --- a/keyboards/mechlovin/infinity875/info.json +++ b/keyboards/mechlovin/infinity875/info.json @@ -8,6 +8,12 @@ "pid": "0x0875", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812", "max_brightness": 200, diff --git a/keyboards/mechlovin/infinity875/rules.mk b/keyboards/mechlovin/infinity875/rules.mk index 33f549f3aef..179d02c3c68 100644 --- a/keyboards/mechlovin/infinity875/rules.mk +++ b/keyboards/mechlovin/infinity875/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 = 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 CUSTOM_MATRIX = lite -RGB_MATRIX_ENABLE = yes SRC += matrix.c diff --git a/keyboards/mechlovin/jay60/info.json b/keyboards/mechlovin/jay60/info.json index 1f8d68a5411..37f25f36fe8 100644 --- a/keyboards/mechlovin/jay60/info.json +++ b/keyboards/mechlovin/jay60/info.json @@ -8,6 +8,11 @@ "pid": "0x0600", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "matrix_pins": { "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "C3"], "rows": ["C2", "C1", "C0", "D7", "A1"] diff --git a/keyboards/mechlovin/jay60/rules.mk b/keyboards/mechlovin/jay60/rules.mk index 1e9f9255447..c2ee0bc86f9 100644 --- a/keyboards/mechlovin/jay60/rules.mk +++ b/keyboards/mechlovin/jay60/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/mechlovin/mechlovin9/info.json b/keyboards/mechlovin/mechlovin9/info.json index a5439f56a9d..41133813ef7 100644 --- a/keyboards/mechlovin/mechlovin9/info.json +++ b/keyboards/mechlovin/mechlovin9/info.json @@ -2,14 +2,6 @@ "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Team Mechlovin", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": false - }, "usb": { "vid": "0x4D4C" }, diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/keyboard.json similarity index 80% rename from keyboards/mechlovin/mechlovin9/rev1/info.json rename to keyboards/mechlovin/mechlovin9/rev1/keyboard.json index 1ece8fc52d2..2aebe566398 100644 --- a/keyboards/mechlovin/mechlovin9/rev1/info.json +++ b/keyboards/mechlovin/mechlovin9/rev1/keyboard.json @@ -4,14 +4,20 @@ "pid": "0x6509", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"], "rows": ["A4", "A5", "A3", "A2", "A1"] }, "diode_direction": "COL2ROW", - "features": { - "backlight": true - }, "backlight": { "pin": "B8", "breathing": true diff --git a/keyboards/mechlovin/mechlovin9/rev1/rules.mk b/keyboards/mechlovin/mechlovin9/rev1/rules.mk deleted file mode 100644 index d6fa8455698..00000000000 --- a/keyboards/mechlovin/mechlovin9/rev1/rules.mk +++ /dev/null @@ -1,6 +0,0 @@ -# Build Options -# change yes to no to disable -# -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json index 01e8d59579b..a9b45df59dd 100644 --- a/keyboards/mechlovin/mechlovin9/rev2/info.json +++ b/keyboards/mechlovin/mechlovin9/rev2/info.json @@ -10,6 +10,9 @@ }, "diode_direction": "COL2ROW", "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, "backlight": true }, "backlight": { diff --git a/keyboards/mechlovin/mechlovin9/rev3/keyboard.json b/keyboards/mechlovin/mechlovin9/rev3/keyboard.json index faa4cf0a877..aa2787c34c7 100644 --- a/keyboards/mechlovin/mechlovin9/rev3/keyboard.json +++ b/keyboards/mechlovin/mechlovin9/rev3/keyboard.json @@ -6,6 +6,11 @@ "pid": "0x6509", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "bootmagic": { "matrix": [0, 13] }, diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json index fddb8931136..ac08e94c3ce 100644 --- a/keyboards/mechlovin/olly/bb/info.json +++ b/keyboards/mechlovin/olly/bb/info.json @@ -8,6 +8,13 @@ "pid": "0xD181", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "backlight": true, + "rgblight": true + }, "backlight": { "pin": "D4", "breathing": true diff --git a/keyboards/mechlovin/olly/bb/rules.mk b/keyboards/mechlovin/olly/bb/rules.mk index 1d15495eef5..73681d1f1e0 100644 --- a/keyboards/mechlovin/olly/bb/rules.mk +++ b/keyboards/mechlovin/olly/bb/rules.mk @@ -1,18 +1,5 @@ # 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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json index b67551a111b..315191e8408 100644 --- a/keyboards/mechlovin/olly/jf/info.json +++ b/keyboards/mechlovin/olly/jf/info.json @@ -5,15 +5,6 @@ "usb": { "vid": "0x4D4C" }, - "features": { - "nkro": false, - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "rgblight": true - }, "diode_direction": "ROW2COL", "rgblight": { "led_count": 27, diff --git a/keyboards/mechlovin/olly/jf/rev1/info.json b/keyboards/mechlovin/olly/jf/rev1/info.json index 0b6aec094f8..69f092af07e 100644 --- a/keyboards/mechlovin/olly/jf/rev1/info.json +++ b/keyboards/mechlovin/olly/jf/rev1/info.json @@ -5,7 +5,11 @@ "device_version": "0.0.1" }, "features": { - "backlight": true + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "backlight": true, + "rgblight": true }, "matrix_pins": { "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], diff --git a/keyboards/mechlovin/olly/jf/rev2/keyboard.json b/keyboards/mechlovin/olly/jf/rev2/keyboard.json index 600bf8a3af3..3771188638b 100644 --- a/keyboards/mechlovin/olly/jf/rev2/keyboard.json +++ b/keyboards/mechlovin/olly/jf/rev2/keyboard.json @@ -7,10 +7,14 @@ } }, "features": { - "command": true, + "bootmagic": true, + "mousekey": true, + "extrakey": true, "console": true, + "command": true, + "nkro": true, "led_matrix": true, - "nkro": true + "rgblight": true }, "led_matrix": { "animations": { @@ -704,4 +708,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/info.json index 780a369cb81..c283c48a350 100644 --- a/keyboards/mechlovin/serratus/info.json +++ b/keyboards/mechlovin/serratus/info.json @@ -8,6 +8,14 @@ "pid": "0x0870", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "backlight": { "pin": "B6", "breathing": true diff --git a/keyboards/mechlovin/serratus/rules.mk b/keyboards/mechlovin/serratus/rules.mk index 03ea2f1bda0..179d02c3c68 100644 --- a/keyboards/mechlovin/serratus/rules.mk +++ b/keyboards/mechlovin/serratus/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 -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/info.json index 001c73f6839..66b74875454 100644 --- a/keyboards/mechlovin/th1800/info.json +++ b/keyboards/mechlovin/th1800/info.json @@ -8,6 +8,11 @@ "pid": "0x1800", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "matrix_pins": { "cols": ["A3", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "B3", "B2", "B0", "B1"], "rows": ["B6", "B7", "D0", "D1", "D5", "D6"] diff --git a/keyboards/mechlovin/th1800/rules.mk b/keyboards/mechlovin/th1800/rules.mk index 1e9f9255447..c2ee0bc86f9 100644 --- a/keyboards/mechlovin/th1800/rules.mk +++ b/keyboards/mechlovin/th1800/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/mechlovin/zed1800/info.json b/keyboards/mechlovin/zed1800/info.json index 41179a6ef14..9de42c24424 100644 --- a/keyboards/mechlovin/zed1800/info.json +++ b/keyboards/mechlovin/zed1800/info.json @@ -17,15 +17,6 @@ "backing_size": 4096 } }, - "features": { - "bootmagic": true, - "command": true, - "console": true, - "extrakey": true, - "mousekey": true, - "rgblight": true, - "audio": false - }, "rgblight": { "sleep": true, "animations": { diff --git a/keyboards/mechlovin/zed1800/oreum/keyboard.json b/keyboards/mechlovin/zed1800/oreum/keyboard.json index 4a15f61ce49..c5652213d62 100644 --- a/keyboards/mechlovin/zed1800/oreum/keyboard.json +++ b/keyboards/mechlovin/zed1800/oreum/keyboard.json @@ -3,6 +3,14 @@ "usb": { "pid": "0x1802" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"], "rows": ["B8", "B7", "B6", "B5", "B4", "B3"] diff --git a/keyboards/mechlovin/zed1800/rules.mk b/keyboards/mechlovin/zed1800/rules.mk index d007da3fa20..e0088c95c39 100644 --- a/keyboards/mechlovin/zed1800/rules.mk +++ b/keyboards/mechlovin/zed1800/rules.mk @@ -1 +1 @@ -DEFAULT_FOLDER = mechlovin/zed1800/saber \ No newline at end of file +DEFAULT_FOLDER = mechlovin/zed1800/saber diff --git a/keyboards/mechlovin/zed1800/saber/keyboard.json b/keyboards/mechlovin/zed1800/saber/keyboard.json index d921d95a950..a3d236e5112 100644 --- a/keyboards/mechlovin/zed1800/saber/keyboard.json +++ b/keyboards/mechlovin/zed1800/saber/keyboard.json @@ -3,6 +3,14 @@ "usb": { "pid": "0x1803" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"], "rows": ["B8", "B7", "B6", "B5", "B4", "B3"] diff --git a/keyboards/mechlovin/zed1800/zepsody/keyboard.json b/keyboards/mechlovin/zed1800/zepsody/keyboard.json index dab92b26d7e..8a973d181fa 100644 --- a/keyboards/mechlovin/zed1800/zepsody/keyboard.json +++ b/keyboards/mechlovin/zed1800/zepsody/keyboard.json @@ -3,6 +3,14 @@ "usb": { "pid": "0x1801" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"], "rows": ["B8", "B7", "B6", "B5", "B4", "B3"] diff --git a/keyboards/mechlovin/zed65/910/keyboard.json b/keyboards/mechlovin/zed65/910/keyboard.json index 3b1472014d7..36f1a1ed3bc 100644 --- a/keyboards/mechlovin/zed65/910/keyboard.json +++ b/keyboards/mechlovin/zed65/910/keyboard.json @@ -9,6 +9,11 @@ "device_version": "0.0.1" }, "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, "nkro": true, "rgblight": true }, diff --git a/keyboards/mechlovin/zed65/info.json b/keyboards/mechlovin/zed65/info.json index c255dd23c6e..cf993be2471 100644 --- a/keyboards/mechlovin/zed65/info.json +++ b/keyboards/mechlovin/zed65/info.json @@ -1,11 +1,4 @@ { "processor": "STM32F103", - "bootloader": "stm32duino", - "features": { - "bootmagic": true, - "command": true, - "console": true, - "extrakey": true, - "mousekey": true - }, + "bootloader": "stm32duino" } diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/keyboard.json similarity index 98% rename from keyboards/mechlovin/zed65/mono_led/info.json rename to keyboards/mechlovin/zed65/mono_led/keyboard.json index aa46b1bd8bc..0cf13002d9a 100644 --- a/keyboards/mechlovin/zed65/mono_led/info.json +++ b/keyboards/mechlovin/zed65/mono_led/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6503", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "led_matrix": true, + "rgblight": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/mechlovin/zed65/mono_led/rules.mk b/keyboards/mechlovin/zed65/mono_led/rules.mk deleted file mode 100644 index 55d38a7b91d..00000000000 --- a/keyboards/mechlovin/zed65/mono_led/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ - -NKRO_ENABLE = yes # Enable N-Key Rollover -LED_MATRIX_ENABLE = yes -RGBLIGHT_ENABLE = yes \ No newline at end of file diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json b/keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json similarity index 97% rename from keyboards/mechlovin/zed65/no_backlight/retro66/info.json rename to keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json index 0709014f76b..49ed44f0a1f 100644 --- a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6601", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "encoder": true + }, "matrix_pins": { "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"], "rows": ["B13", "B14", "A8", "A1", "A0"] diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk b/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk deleted file mode 100644 index 5af1ba85367..00000000000 --- a/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_ENABLE = yes diff --git a/keyboards/mechlovin/zed65/no_backlight/rules.mk b/keyboards/mechlovin/zed65/no_backlight/rules.mk index b0b388db500..a699765498b 100644 --- a/keyboards/mechlovin/zed65/no_backlight/rules.mk +++ b/keyboards/mechlovin/zed65/no_backlight/rules.mk @@ -1,3 +1 @@ -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality - DEFAULT_FOLDER = mechlovin/zed65/no_backlight/wearhaus66 diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json similarity index 98% rename from keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json rename to keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json index 5b0df671dfc..c9c9e0ddb1e 100644 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6602", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"], "rows": ["B13", "B14", "A8", "A1", "A0"] diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk deleted file mode 100644 index 84ef473c02e..00000000000 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/mechlovin/zed65/rev1/keyboard.json b/keyboards/mechlovin/zed65/rev1/keyboard.json index 20f04dbe655..99de5d53f2a 100644 --- a/keyboards/mechlovin/zed65/rev1/keyboard.json +++ b/keyboards/mechlovin/zed65/rev1/keyboard.json @@ -9,6 +9,11 @@ "device_version": "0.0.1" }, "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, "nkro": true, "rgblight": true }, From 0ff53b24984e88f385638e47ea076b4d2945c0c6 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 28 Apr 2024 00:36:54 +1000 Subject: [PATCH 194/333] Rename `RGBW` define to `WS2812_RGBW` (#23585) --- data/mappings/info_config.hjson | 3 ++- data/schemas/keyboard.jsonschema | 6 ++++- docs/config_options.md | 2 +- docs/feature_rgblight.md | 2 +- docs/reference_info_json.md | 6 ++--- docs/ws2812_driver.md | 22 +++++++++++++++++++ keyboards/ergodox_ez/config.h | 2 -- keyboards/ergodox_ez/info.json | 3 ++- keyboards/ergodox_ez/shine/rgblight_custom.c | 4 ++-- keyboards/handwired/tennie/config.h | 2 -- keyboards/handwired/tennie/keyboard.json | 3 ++- keyboards/oddforge/vea/ws2812_custom.c | 2 +- keyboards/rgbkb/pan/pan.c | 2 +- keyboards/westfoxtrot/aanzee/config.h | 2 -- keyboards/westfoxtrot/aanzee/keyboard.json | 3 ++- platforms/avr/drivers/ws2812_i2c.c | 2 +- .../drivers/vendor/RP/RP2040/ws2812_vendor.c | 6 ++--- platforms/chibios/drivers/ws2812_bitbang.c | 2 +- platforms/chibios/drivers/ws2812_pwm.c | 8 +++---- platforms/chibios/drivers/ws2812_spi.c | 4 ++-- quantum/color.c | 2 +- quantum/color.h | 4 ++-- quantum/rgb_matrix/rgb_matrix_drivers.c | 2 +- quantum/rgblight/rgblight.c | 18 +++++++-------- 24 files changed, 68 insertions(+), 44 deletions(-) diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index c0417b88396..b61ca040714 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -164,7 +164,6 @@ "RGBLIGHT_DEFAULT_SAT": {"info_key": "rgblight.default.sat", "value_type": "int"}, "RGBLIGHT_DEFAULT_VAL": {"info_key": "rgblight.default.val", "value_type": "int"}, "RGBLIGHT_DEFAULT_SPD": {"info_key": "rgblight.default.speed", "value_type": "int"}, - "RGBW": {"info_key": "rgblight.rgbw", "value_type": "flag"}, // Secure "SECURE_IDLE_TIMEOUT": {"info_key": "secure.idle_timeout", "value_type": "int"}, @@ -215,6 +214,7 @@ "WS2812_DI_PIN": {"info_key": "ws2812.pin"}, "WS2812_I2C_ADDRESS": {"info_key": "ws2812.i2c_address", "value_type": "hex"}, "WS2812_I2C_TIMEOUT": {"info_key": "ws2812.i2c_timeout", "value_type": "int"}, + "WS2812_RGBW": {"info_key": "ws2812.rgbw", "value_type": "flag"}, "LAYOUTS": {"info_key": "layout_aliases", "value_type": "mapping"}, @@ -229,6 +229,7 @@ "PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true}, "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true}, "RGB_DI_PIN": {"info_key": "rgblight.pin", "invalid": true, "replace_with": "WS2812_DI_PIN or APA102_DI_PIN"}, + "RGBW": {"info_key": "rgblight.rgbw", "invalid": true, "replace_with": "WS2812_RGBW"}, "RGB_DISABLE_WHEN_USB_SUSPENDED": {"info_key": "_invalid.rgb_matrix_sleep", "invalid": true, "replace_with": "RGB_MATRIX_SLEEP"}, "RGBLIGHT_ANIMATIONS": {"info_key": "_invalid.rgblight.animations.all", "value_type": "flag", "invalid": true}, "TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "flag", "deprecated": true}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 585c64777f2..de01809b43d 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -661,7 +661,10 @@ "$ref": "qmk.definitions.v1#/mcu_pin", "$comment": "Deprecated: use ws2812.pin instead" }, - "rgbw": {"type": "boolean"}, + "rgbw": { + "type": "boolean", + "$comment": "Deprecated: use ws2812.rgbw instead" + }, "saturation_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "sleep": {"type": "boolean"}, "split": {"type": "boolean"}, @@ -937,6 +940,7 @@ "enum": ["bitbang", "custom", "i2c", "pwm", "spi", "vendor"] }, "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "rgbw": {"type": "boolean"}, "i2c_address": {"$ref": "qmk.definitions.v1#/hex_number_2d"}, "i2c_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} } diff --git a/docs/config_options.md b/docs/config_options.md index fca80e54fde..046429a5875 100644 --- a/docs/config_options.md +++ b/docs/config_options.md @@ -237,7 +237,7 @@ If you define these options you will enable the associated feature, which may in * units to step when in/decreasing saturation * `#define RGBLIGHT_VAL_STEP 12` * units to step when in/decreasing value (brightness) -* `#define RGBW` +* `#define WS2812_RGBW` * Enables RGBW LED support ## Mouse Key Options diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md index a6a89d1d00c..ae37ceca92f 100644 --- a/docs/feature_rgblight.md +++ b/docs/feature_rgblight.md @@ -6,7 +6,7 @@ QMK has the ability to control RGB LEDs attached to your keyboard. This is commo Some keyboards come with RGB LEDs preinstalled. Others must have them installed after the fact. See the [Hardware Modification](#hardware-modification) section for information on adding RGB lighting to your keyboard. -Currently QMK supports the following addressable LEDs (however, the white LED in RGBW variants is not supported): +Currently QMK supports the following addressable LEDs: * WS2811, WS2812, WS2812B, WS2812C, etc. * SK6812, SK6812MINI, SK6805 diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md index d1dc5d3beac..5b06e9a3268 100644 --- a/docs/reference_info_json.md +++ b/docs/reference_info_json.md @@ -588,9 +588,6 @@ Configures the [RGB Lighting](feature_rgblight.md) feature. * `max_brightness` * The maximum value which the HSV "V" component is scaled to, from 0 to 255. * Default: `255` - * `rgbw` - * Enable RGBW LEDs. - * Default: `false` * `saturation_steps` * The number of saturation adjustment steps. * Default: `17` @@ -855,3 +852,6 @@ Configures the [WS2812](ws2812_driver.md) driver. * `i2c_timeout` * The I²C timeout in milliseconds (`i2c` driver only). * Default: `100` (100 ms) + * `rgbw` + * Enable RGBW LEDs. + * Default: `false` diff --git a/docs/ws2812_driver.md b/docs/ws2812_driver.md index 006529cc8ae..8851c042f04 100644 --- a/docs/ws2812_driver.md +++ b/docs/ws2812_driver.md @@ -33,6 +33,7 @@ Add the following to your `config.h`: |`WS2812_T0H` |`350` |The length of a "0" bit's high phase in nanoseconds | |`WS2812_TRST_US` |`280` |The length of the reset phase in microseconds | |`WS2812_BYTE_ORDER`|`WS2812_BYTE_ORDER_GRB`|The byte order of the RGB data | +|`WS2812_RGBW` |*Not defined* |Enables RGBW support (except `i2c` driver) | ### Timing Adjustment :id=timing-adjustment @@ -58,6 +59,27 @@ Where the byte order may be one of: |`RGB` |WS2812B-2020 | |`BGR` |TM1812 | +### RGBW Support :id=rgbw-support + +Rendering the color white with RGB LEDs is typically inconsistent due to inherent variations between each individual LED die. However, some WS2812 variants (such as SK6812RGBW) also possess a white LED along with the red, green, and blue channels, which allows for a more accurate white to be displayed. + +QMK can automatically convert the RGB data to be sent to the LEDs to mix in the white channel: + +``` +w = min(r, g, b) +r -= w +g -= w +b -= w +``` + +Thus, an RGB triplet of `255,255,255` will simply turn on the white LED fully (`0,0,0,255`). + +To enable RGBW conversion, add the following to your `config.h`: + +```c +#define WS2812_RGBW +``` + ## Driver Configuration :id=driver-configuration Driver selection can be configured in `rules.mk` as `WS2812_DRIVER`, or in `info.json` as `ws2812.driver`. Valid values are `bitbang` (default), `i2c`, `spi`, `pwm`, `vendor`, or `custom`. See below for information on individual drivers. diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h index 8209c21dba5..3688e007854 100644 --- a/keyboards/ergodox_ez/config.h +++ b/keyboards/ergodox_ez/config.h @@ -73,8 +73,6 @@ along with this program. If not, see . /* fix space cadet rollover issue */ #define DISABLE_SPACE_CADET_ROLLOVER -#define RGBW - /* * The debounce filtering reports a key/switch change directly, * without any extra delay. After that the debounce logic will filter diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json index f2495a409c3..a560e97a0b5 100644 --- a/keyboards/ergodox_ez/info.json +++ b/keyboards/ergodox_ez/info.json @@ -27,7 +27,8 @@ "debounce_type": "sym_eager_pr" }, "ws2812": { - "pin": "D7" + "pin": "D7", + "rgbw": true }, "rgb_matrix": { "animations": { diff --git a/keyboards/ergodox_ez/shine/rgblight_custom.c b/keyboards/ergodox_ez/shine/rgblight_custom.c index feac50cba08..29060e76fce 100644 --- a/keyboards/ergodox_ez/shine/rgblight_custom.c +++ b/keyboards/ergodox_ez/shine/rgblight_custom.c @@ -25,7 +25,7 @@ void setleds_custom(rgb_led_t *led, uint16_t led_num) { uint16_t length = 0; int i = 0; int j = 0; -# ifdef RGBW +# ifdef WS2812_RGBW int bytes_per_led = 4; # else int bytes_per_led = 3; @@ -52,7 +52,7 @@ void setleds_custom(rgb_led_t *led, uint16_t led_num) { data[j++] = data_byte[0]; data[j++] = data_byte[1]; data[j++] = data_byte[2]; -#ifdef RGBW +#ifdef WS2812_RGBW data[j++] = data_byte[3]; #endif } diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h index 7c77f53a82d..dcbcfeaaa8c 100644 --- a/keyboards/handwired/tennie/config.h +++ b/keyboards/handwired/tennie/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define RGBW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/tennie/keyboard.json b/keyboards/handwired/tennie/keyboard.json index 34e6676c953..36c1266d50b 100644 --- a/keyboards/handwired/tennie/keyboard.json +++ b/keyboards/handwired/tennie/keyboard.json @@ -26,7 +26,8 @@ } }, "ws2812": { - "pin": "D1" + "pin": "D1", + "rgbw": true }, "features": { "bootmagic": true, diff --git a/keyboards/oddforge/vea/ws2812_custom.c b/keyboards/oddforge/vea/ws2812_custom.c index a037b88b3e6..317f98130b1 100644 --- a/keyboards/oddforge/vea/ws2812_custom.c +++ b/keyboards/oddforge/vea/ws2812_custom.c @@ -1,7 +1,7 @@ #include "ws2812.h" #include "i2c_master.h" -#ifdef RGBW +#ifdef WS2812_RGBW # error "RGBW not supported" #endif diff --git a/keyboards/rgbkb/pan/pan.c b/keyboards/rgbkb/pan/pan.c index 191ff1ac1fb..401831e0e20 100644 --- a/keyboards/rgbkb/pan/pan.c +++ b/keyboards/rgbkb/pan/pan.c @@ -42,7 +42,7 @@ static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) { rgb_matrix_ws2812_array[i].g = g; rgb_matrix_ws2812_array[i].b = b; } -# ifdef RGBW +# ifdef WS2812_RGBW convert_rgb_to_rgbw(&rgb_matrix_ws2812_array[i]); # endif } diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h index c024f9d8d91..cd1f84bc1fc 100644 --- a/keyboards/westfoxtrot/aanzee/config.h +++ b/keyboards/westfoxtrot/aanzee/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define RGBW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/westfoxtrot/aanzee/keyboard.json b/keyboards/westfoxtrot/aanzee/keyboard.json index 7a12a3e52e3..898fe9e62b3 100644 --- a/keyboards/westfoxtrot/aanzee/keyboard.json +++ b/keyboards/westfoxtrot/aanzee/keyboard.json @@ -52,7 +52,8 @@ } }, "ws2812": { - "pin": "E6" + "pin": "E6", + "rgbw": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/platforms/avr/drivers/ws2812_i2c.c b/platforms/avr/drivers/ws2812_i2c.c index 60b466c32a9..86a5ac8394e 100644 --- a/platforms/avr/drivers/ws2812_i2c.c +++ b/platforms/avr/drivers/ws2812_i2c.c @@ -1,7 +1,7 @@ #include "ws2812.h" #include "i2c_master.h" -#ifdef RGBW +#ifdef WS2812_RGBW # error "RGBW not supported" #endif diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c index 95a827e4b8a..41a5311719f 100644 --- a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c +++ b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c @@ -161,7 +161,7 @@ static void ws2812_dma_callback(void* p, uint32_t ct) { // FIFO is already empty. rtcnt_t time_to_completion = (pio_sm_get_tx_fifo_level(pio, STATE_MACHINE) + 1) * MAX(WS2812_T1H + WS2812_T1L, WS2812_T0H + WS2812_T0L); -#if defined(RGBW) +#if defined(WS2812_RGBW) time_to_completion *= 32; #else time_to_completion *= 24; @@ -222,7 +222,7 @@ void ws2812_init(void) { sm_config_set_sideset(&config, 1, false, false); #endif -#if defined(RGBW) +#if defined(WS2812_RGBW) sm_config_set_out_shift(&config, false, true, 32); #else sm_config_set_out_shift(&config, false, true, 24); @@ -270,7 +270,7 @@ void ws2812_setleds(rgb_led_t* ledarray, uint16_t leds) { sync_ws2812_transfer(); for (int i = 0; i < leds; i++) { -#if defined(RGBW) +#if defined(WS2812_RGBW) WS2812_BUFFER[i] = rgbw8888_to_u32(ledarray[i].r, ledarray[i].g, ledarray[i].b, ledarray[i].w); #else WS2812_BUFFER[i] = rgbw8888_to_u32(ledarray[i].r, ledarray[i].g, ledarray[i].b, 0); diff --git a/platforms/chibios/drivers/ws2812_bitbang.c b/platforms/chibios/drivers/ws2812_bitbang.c index 9ed6bacd5ad..96378ec0ac5 100644 --- a/platforms/chibios/drivers/ws2812_bitbang.c +++ b/platforms/chibios/drivers/ws2812_bitbang.c @@ -101,7 +101,7 @@ void ws2812_setleds(rgb_led_t *ledarray, uint16_t leds) { sendByte(ledarray[i].r); #endif -#ifdef RGBW +#ifdef WS2812_RGBW sendByte(ledarray[i].w); #endif } diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c index 7dc3414eade..1e9d2ebb410 100644 --- a/platforms/chibios/drivers/ws2812_pwm.c +++ b/platforms/chibios/drivers/ws2812_pwm.c @@ -16,7 +16,7 @@ /* Adapted from https://github.com/joewa/WS2812-LED-Driver_ChibiOS/ */ -#ifdef RGBW +#ifdef WS2812_RGBW # define WS2812_CHANNELS 4 #else # define WS2812_CHANNELS 3 @@ -262,7 +262,7 @@ # define WS2812_BLUE_BIT(led, bit) WS2812_BIT((led), 0, (bit)) #endif -#ifdef RGBW +#ifdef WS2812_RGBW /** * @brief Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given white bit * @@ -381,7 +381,7 @@ void ws2812_write_led_rgbw(uint16_t led_number, uint8_t r, uint8_t g, uint8_t b, ws2812_frame_buffer[WS2812_RED_BIT(led_number, bit)] = ((r >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0; ws2812_frame_buffer[WS2812_GREEN_BIT(led_number, bit)] = ((g >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0; ws2812_frame_buffer[WS2812_BLUE_BIT(led_number, bit)] = ((b >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0; -#ifdef RGBW +#ifdef WS2812_RGBW ws2812_frame_buffer[WS2812_WHITE_BIT(led_number, bit)] = ((w >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0; #endif } @@ -390,7 +390,7 @@ void ws2812_write_led_rgbw(uint16_t led_number, uint8_t r, uint8_t g, uint8_t b, // Setleds for standard RGB void ws2812_setleds(rgb_led_t* ledarray, uint16_t leds) { for (uint16_t i = 0; i < leds; i++) { -#ifdef RGBW +#ifdef WS2812_RGBW ws2812_write_led_rgbw(i, ledarray[i].r, ledarray[i].g, ledarray[i].b, ledarray[i].w); #else ws2812_write_led(i, ledarray[i].r, ledarray[i].g, ledarray[i].b); diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c index 5b990ccaa06..ad2e87781c4 100644 --- a/platforms/chibios/drivers/ws2812_spi.c +++ b/platforms/chibios/drivers/ws2812_spi.c @@ -76,7 +76,7 @@ #endif #define BYTES_FOR_LED_BYTE 4 -#ifdef RGBW +#ifdef WS2812_RGBW # define WS2812_CHANNELS 4 #else # define WS2812_CHANNELS 3 @@ -131,7 +131,7 @@ static void set_led_color_rgb(rgb_led_t color, int pos) { for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.r, j); #endif -#ifdef RGBW +#ifdef WS2812_RGBW for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 4 + j] = get_protocol_eq(color.w, j); #endif diff --git a/quantum/color.c b/quantum/color.c index 395383f428e..96d548a33cc 100644 --- a/quantum/color.c +++ b/quantum/color.c @@ -109,7 +109,7 @@ RGB hsv_to_rgb_nocie(HSV hsv) { return hsv_to_rgb_impl(hsv, false); } -#ifdef RGBW +#ifdef WS2812_RGBW void convert_rgb_to_rgbw(rgb_led_t *led) { // Determine lowest value in all three colors, put that into // the white channel and then shift all colors by that amount diff --git a/quantum/color.h b/quantum/color.h index 00a3bfb3f84..b6a9dd0641c 100644 --- a/quantum/color.h +++ b/quantum/color.h @@ -96,7 +96,7 @@ typedef struct PACKED rgb_led_t { uint8_t g; uint8_t r; #endif -#ifdef RGBW +#ifdef WS2812_RGBW uint8_t w; #endif } rgb_led_t; @@ -111,6 +111,6 @@ typedef struct PACKED HSV { RGB hsv_to_rgb(HSV hsv); RGB hsv_to_rgb_nocie(HSV hsv); -#ifdef RGBW +#ifdef WS2812_RGBW void convert_rgb_to_rgbw(rgb_led_t *led); #endif diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c index 4370996d0e1..db3a2ef9e02 100644 --- a/quantum/rgb_matrix/rgb_matrix_drivers.c +++ b/quantum/rgb_matrix/rgb_matrix_drivers.c @@ -185,7 +185,7 @@ static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) { rgb_matrix_ws2812_array[i].r = r; rgb_matrix_ws2812_array[i].g = g; rgb_matrix_ws2812_array[i].b = b; -# ifdef RGBW +# ifdef WS2812_RGBW convert_rgb_to_rgbw(&rgb_matrix_ws2812_array[i]); # endif } diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c index 62137c020bd..b0f2dfdc1d8 100644 --- a/quantum/rgblight/rgblight.c +++ b/quantum/rgblight/rgblight.c @@ -149,7 +149,7 @@ void setrgb(uint8_t r, uint8_t g, uint8_t b, rgb_led_t *led1) { led1->r = r; led1->g = g; led1->b = b; -#ifdef RGBW +#ifdef WS2812_RGBW led1->w = 0; #endif } @@ -652,7 +652,7 @@ void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) { led[i].r = r; led[i].g = g; led[i].b = b; -#ifdef RGBW +#ifdef WS2812_RGBW led[i].w = 0; #endif } @@ -667,7 +667,7 @@ void rgblight_setrgb_at(uint8_t r, uint8_t g, uint8_t b, uint8_t index) { led[index].r = r; led[index].g = g; led[index].b = b; -#ifdef RGBW +#ifdef WS2812_RGBW led[index].w = 0; #endif rgblight_set(); @@ -704,7 +704,7 @@ void rgblight_setrgb_range(uint8_t r, uint8_t g, uint8_t b, uint8_t start, uint8 led[i].r = r; led[i].g = g; led[i].b = b; -#ifdef RGBW +#ifdef WS2812_RGBW led[i].w = 0; #endif } @@ -905,7 +905,7 @@ void rgblight_set(void) { led[i].r = 0; led[i].g = 0; led[i].b = 0; -#ifdef RGBW +#ifdef WS2812_RGBW led[i].w = 0; #endif } @@ -933,7 +933,7 @@ void rgblight_set(void) { start_led = led + rgblight_ranges.clipping_start_pos; #endif -#ifdef RGBW +#ifdef WS2812_RGBW for (uint8_t i = 0; i < num_leds; i++) { convert_rgb_to_rgbw(&start_led[i]); } @@ -1263,7 +1263,7 @@ void rgblight_effect_snake(animation_status_t *anim) { ledp->r = 0; ledp->g = 0; ledp->b = 0; -# ifdef RGBW +# ifdef WS2812_RGBW ledp->w = 0; # endif for (j = 0; j < RGBLIGHT_EFFECT_SNAKE_LENGTH; j++) { @@ -1323,7 +1323,7 @@ void rgblight_effect_knight(animation_status_t *anim) { led[i].r = 0; led[i].g = 0; led[i].b = 0; -# ifdef RGBW +# ifdef WS2812_RGBW led[i].w = 0; # endif } @@ -1337,7 +1337,7 @@ void rgblight_effect_knight(animation_status_t *anim) { led[cur].r = 0; led[cur].g = 0; led[cur].b = 0; -# ifdef RGBW +# ifdef WS2812_RGBW led[cur].w = 0; # endif } From a65818d929f415cc1b13ef06769a143579c91c67 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 27 Apr 2024 19:40:36 +0100 Subject: [PATCH 195/333] Migrate build target markers to keyboard.json - BM (#23627) --- .../charybdis/3x5/blackpill/{info.json => keyboard.json} | 0 .../charybdis/3x5/v1/elitec/{info.json => keyboard.json} | 0 .../charybdis/3x5/v2/elitec/{info.json => keyboard.json} | 0 .../charybdis/3x5/v2/splinky_2/{info.json => keyboard.json} | 0 .../charybdis/3x5/v2/splinky_3/{info.json => keyboard.json} | 0 .../charybdis/3x5/v2/stemcell/{info.json => keyboard.json} | 0 .../charybdis/3x6/blackpill/{info.json => keyboard.json} | 0 .../charybdis/3x6/v1/elitec/{info.json => keyboard.json} | 0 .../charybdis/3x6/v2/elitec/{info.json => keyboard.json} | 0 .../charybdis/3x6/v2/splinky_2/{info.json => keyboard.json} | 0 .../charybdis/3x6/v2/splinky_3/{info.json => keyboard.json} | 0 .../charybdis/3x6/v2/stemcell/{info.json => keyboard.json} | 0 .../charybdis/4x6/blackpill/{info.json => keyboard.json} | 0 .../charybdis/4x6/v1/elitec/{info.json => keyboard.json} | 0 .../charybdis/4x6/v2/elitec/{info.json => keyboard.json} | 0 .../charybdis/4x6/v2/splinky_2/{info.json => keyboard.json} | 0 .../charybdis/4x6/v2/splinky_3/{info.json => keyboard.json} | 0 .../charybdis/4x6/v2/stemcell/{info.json => keyboard.json} | 0 .../dilemma/3x5_2/assembled/{info.json => keyboard.json} | 0 .../bastardkb/dilemma/3x5_2/splinky/{info.json => keyboard.json} | 0 keyboards/bastardkb/dilemma/3x5_3/{info.json => keyboard.json} | 0 keyboards/bastardkb/dilemma/4x6_4/{info.json => keyboard.json} | 0 keyboards/bastardkb/scylla/blackpill/{info.json => keyboard.json} | 0 keyboards/bastardkb/scylla/v1/elitec/{info.json => keyboard.json} | 0 keyboards/bastardkb/scylla/v2/elitec/{info.json => keyboard.json} | 0 .../bastardkb/scylla/v2/splinky_2/{info.json => keyboard.json} | 0 .../bastardkb/scylla/v2/splinky_3/{info.json => keyboard.json} | 0 .../bastardkb/scylla/v2/stemcell/{info.json => keyboard.json} | 0 .../bastardkb/skeletyl/blackpill/{info.json => keyboard.json} | 0 .../bastardkb/skeletyl/v1/elitec/{info.json => keyboard.json} | 0 .../bastardkb/skeletyl/v2/elitec/{info.json => keyboard.json} | 0 .../bastardkb/skeletyl/v2/splinky_2/{info.json => keyboard.json} | 0 .../bastardkb/skeletyl/v2/splinky_3/{info.json => keyboard.json} | 0 .../bastardkb/skeletyl/v2/stemcell/{info.json => keyboard.json} | 0 .../bastardkb/tbkmini/blackpill/{info.json => keyboard.json} | 0 .../bastardkb/tbkmini/v1/elitec/{info.json => keyboard.json} | 0 .../bastardkb/tbkmini/v2/elitec/{info.json => keyboard.json} | 0 .../bastardkb/tbkmini/v2/splinky_2/{info.json => keyboard.json} | 0 .../bastardkb/tbkmini/v2/splinky_3/{info.json => keyboard.json} | 0 .../bastardkb/tbkmini/v2/stemcell/{info.json => keyboard.json} | 0 keyboards/mechlovin/hex4b/rev1/{info.json => keyboard.json} | 0 keyboards/mechlovin/infinity87/rev2/{info.json => keyboard.json} | 0 keyboards/mechlovin/infinity875/{info.json => keyboard.json} | 0 keyboards/mechlovin/jay60/{info.json => keyboard.json} | 0 keyboards/mechlovin/mechlovin9/rev2/{info.json => keyboard.json} | 0 keyboards/mechlovin/olly/bb/{info.json => keyboard.json} | 0 keyboards/mechlovin/olly/jf/rev1/{info.json => keyboard.json} | 0 keyboards/mechlovin/serratus/{info.json => keyboard.json} | 0 keyboards/mechlovin/th1800/{info.json => keyboard.json} | 0 keyboards/mechstudio/chapter1/{info.json => keyboard.json} | 0 keyboards/mechstudio/ud_40_ortho/{info.json => keyboard.json} | 0 keyboards/mechwild/bbs/{info.json => keyboard.json} | 0 keyboards/mechwild/puckbuddy/{info.json => keyboard.json} | 0 keyboards/mecxlabs/mp1/{info.json => keyboard.json} | 0 keyboards/meetlab/kafkasplit/{info.json => keyboard.json} | 0 keyboards/mexsistor/ludmila/{info.json => keyboard.json} | 0 keyboards/minimon/bartlesplit/{info.json => keyboard.json} | 0 keyboards/mitosis/{info.json => keyboard.json} | 0 keyboards/mkh_studio/bully/{info.json => keyboard.json} | 0 keyboards/mlego/m60_split/rev1/{info.json => keyboard.json} | 0 keyboards/mlego/m60_split/rev2/{info.json => keyboard.json} | 0 keyboards/molecule/{info.json => keyboard.json} | 0 keyboards/monokei/mnk1800s/{info.json => keyboard.json} | 0 keyboards/monokei/mnk50/{info.json => keyboard.json} | 0 keyboards/monokei/mnk75/{info.json => keyboard.json} | 0 keyboards/montsinger/rebound/rev4/{info.json => keyboard.json} | 0 keyboards/moon/{info.json => keyboard.json} | 0 keyboards/mt/split75/{info.json => keyboard.json} | 0 68 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/bastardkb/charybdis/3x5/blackpill/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/3x5/v1/elitec/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/3x5/v2/elitec/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/3x5/v2/splinky_2/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/3x5/v2/splinky_3/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/3x5/v2/stemcell/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/3x6/blackpill/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/3x6/v1/elitec/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/3x6/v2/elitec/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/3x6/v2/splinky_2/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/3x6/v2/splinky_3/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/3x6/v2/stemcell/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/4x6/blackpill/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/4x6/v1/elitec/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/4x6/v2/elitec/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/4x6/v2/splinky_2/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/4x6/v2/splinky_3/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/charybdis/4x6/v2/stemcell/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/dilemma/3x5_2/assembled/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/dilemma/3x5_2/splinky/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/dilemma/3x5_3/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/dilemma/4x6_4/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/scylla/blackpill/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/scylla/v1/elitec/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/scylla/v2/elitec/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/scylla/v2/splinky_2/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/scylla/v2/splinky_3/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/scylla/v2/stemcell/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/skeletyl/blackpill/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/skeletyl/v1/elitec/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/skeletyl/v2/elitec/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/skeletyl/v2/splinky_2/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/skeletyl/v2/splinky_3/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/skeletyl/v2/stemcell/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/tbkmini/blackpill/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/tbkmini/v1/elitec/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/tbkmini/v2/elitec/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/tbkmini/v2/splinky_2/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/tbkmini/v2/splinky_3/{info.json => keyboard.json} (100%) rename keyboards/bastardkb/tbkmini/v2/stemcell/{info.json => keyboard.json} (100%) rename keyboards/mechlovin/hex4b/rev1/{info.json => keyboard.json} (100%) rename keyboards/mechlovin/infinity87/rev2/{info.json => keyboard.json} (100%) rename keyboards/mechlovin/infinity875/{info.json => keyboard.json} (100%) rename keyboards/mechlovin/jay60/{info.json => keyboard.json} (100%) rename keyboards/mechlovin/mechlovin9/rev2/{info.json => keyboard.json} (100%) rename keyboards/mechlovin/olly/bb/{info.json => keyboard.json} (100%) rename keyboards/mechlovin/olly/jf/rev1/{info.json => keyboard.json} (100%) rename keyboards/mechlovin/serratus/{info.json => keyboard.json} (100%) rename keyboards/mechlovin/th1800/{info.json => keyboard.json} (100%) rename keyboards/mechstudio/chapter1/{info.json => keyboard.json} (100%) rename keyboards/mechstudio/ud_40_ortho/{info.json => keyboard.json} (100%) rename keyboards/mechwild/bbs/{info.json => keyboard.json} (100%) rename keyboards/mechwild/puckbuddy/{info.json => keyboard.json} (100%) rename keyboards/mecxlabs/mp1/{info.json => keyboard.json} (100%) rename keyboards/meetlab/kafkasplit/{info.json => keyboard.json} (100%) rename keyboards/mexsistor/ludmila/{info.json => keyboard.json} (100%) rename keyboards/minimon/bartlesplit/{info.json => keyboard.json} (100%) rename keyboards/mitosis/{info.json => keyboard.json} (100%) rename keyboards/mkh_studio/bully/{info.json => keyboard.json} (100%) rename keyboards/mlego/m60_split/rev1/{info.json => keyboard.json} (100%) rename keyboards/mlego/m60_split/rev2/{info.json => keyboard.json} (100%) rename keyboards/molecule/{info.json => keyboard.json} (100%) rename keyboards/monokei/mnk1800s/{info.json => keyboard.json} (100%) rename keyboards/monokei/mnk50/{info.json => keyboard.json} (100%) rename keyboards/monokei/mnk75/{info.json => keyboard.json} (100%) rename keyboards/montsinger/rebound/rev4/{info.json => keyboard.json} (100%) rename keyboards/moon/{info.json => keyboard.json} (100%) rename keyboards/mt/split75/{info.json => keyboard.json} (100%) diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/3x5/blackpill/info.json rename to keyboards/bastardkb/charybdis/3x5/blackpill/keyboard.json diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json rename to keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json rename to keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json rename to keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json rename to keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json rename to keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/3x6/blackpill/info.json rename to keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json rename to keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json rename to keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json rename to keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json rename to keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json rename to keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/4x6/blackpill/info.json rename to keyboards/bastardkb/charybdis/4x6/blackpill/keyboard.json diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json rename to keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json rename to keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json rename to keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json rename to keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json similarity index 100% rename from keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json rename to keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json similarity index 100% rename from keyboards/bastardkb/dilemma/3x5_2/assembled/info.json rename to keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json similarity index 100% rename from keyboards/bastardkb/dilemma/3x5_2/splinky/info.json rename to keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/keyboard.json similarity index 100% rename from keyboards/bastardkb/dilemma/3x5_3/info.json rename to keyboards/bastardkb/dilemma/3x5_3/keyboard.json diff --git a/keyboards/bastardkb/dilemma/4x6_4/info.json b/keyboards/bastardkb/dilemma/4x6_4/keyboard.json similarity index 100% rename from keyboards/bastardkb/dilemma/4x6_4/info.json rename to keyboards/bastardkb/dilemma/4x6_4/keyboard.json diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/keyboard.json similarity index 100% rename from keyboards/bastardkb/scylla/blackpill/info.json rename to keyboards/bastardkb/scylla/blackpill/keyboard.json diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/keyboard.json similarity index 100% rename from keyboards/bastardkb/scylla/v1/elitec/info.json rename to keyboards/bastardkb/scylla/v1/elitec/keyboard.json diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/keyboard.json similarity index 100% rename from keyboards/bastardkb/scylla/v2/elitec/info.json rename to keyboards/bastardkb/scylla/v2/elitec/keyboard.json diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json similarity index 100% rename from keyboards/bastardkb/scylla/v2/splinky_2/info.json rename to keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json similarity index 100% rename from keyboards/bastardkb/scylla/v2/splinky_3/info.json rename to keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json similarity index 100% rename from keyboards/bastardkb/scylla/v2/stemcell/info.json rename to keyboards/bastardkb/scylla/v2/stemcell/keyboard.json diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/keyboard.json similarity index 100% rename from keyboards/bastardkb/skeletyl/blackpill/info.json rename to keyboards/bastardkb/skeletyl/blackpill/keyboard.json diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json similarity index 100% rename from keyboards/bastardkb/skeletyl/v1/elitec/info.json rename to keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json similarity index 100% rename from keyboards/bastardkb/skeletyl/v2/elitec/info.json rename to keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json similarity index 100% rename from keyboards/bastardkb/skeletyl/v2/splinky_2/info.json rename to keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json similarity index 100% rename from keyboards/bastardkb/skeletyl/v2/splinky_3/info.json rename to keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json similarity index 100% rename from keyboards/bastardkb/skeletyl/v2/stemcell/info.json rename to keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/keyboard.json similarity index 100% rename from keyboards/bastardkb/tbkmini/blackpill/info.json rename to keyboards/bastardkb/tbkmini/blackpill/keyboard.json diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json similarity index 100% rename from keyboards/bastardkb/tbkmini/v1/elitec/info.json rename to keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json similarity index 100% rename from keyboards/bastardkb/tbkmini/v2/elitec/info.json rename to keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json similarity index 100% rename from keyboards/bastardkb/tbkmini/v2/splinky_2/info.json rename to keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json similarity index 100% rename from keyboards/bastardkb/tbkmini/v2/splinky_3/info.json rename to keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json similarity index 100% rename from keyboards/bastardkb/tbkmini/v2/stemcell/info.json rename to keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/keyboard.json similarity index 100% rename from keyboards/mechlovin/hex4b/rev1/info.json rename to keyboards/mechlovin/hex4b/rev1/keyboard.json diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/keyboard.json similarity index 100% rename from keyboards/mechlovin/infinity87/rev2/info.json rename to keyboards/mechlovin/infinity87/rev2/keyboard.json diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/keyboard.json similarity index 100% rename from keyboards/mechlovin/infinity875/info.json rename to keyboards/mechlovin/infinity875/keyboard.json diff --git a/keyboards/mechlovin/jay60/info.json b/keyboards/mechlovin/jay60/keyboard.json similarity index 100% rename from keyboards/mechlovin/jay60/info.json rename to keyboards/mechlovin/jay60/keyboard.json diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/keyboard.json similarity index 100% rename from keyboards/mechlovin/mechlovin9/rev2/info.json rename to keyboards/mechlovin/mechlovin9/rev2/keyboard.json diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/keyboard.json similarity index 100% rename from keyboards/mechlovin/olly/bb/info.json rename to keyboards/mechlovin/olly/bb/keyboard.json diff --git a/keyboards/mechlovin/olly/jf/rev1/info.json b/keyboards/mechlovin/olly/jf/rev1/keyboard.json similarity index 100% rename from keyboards/mechlovin/olly/jf/rev1/info.json rename to keyboards/mechlovin/olly/jf/rev1/keyboard.json diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/keyboard.json similarity index 100% rename from keyboards/mechlovin/serratus/info.json rename to keyboards/mechlovin/serratus/keyboard.json diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/keyboard.json similarity index 100% rename from keyboards/mechlovin/th1800/info.json rename to keyboards/mechlovin/th1800/keyboard.json diff --git a/keyboards/mechstudio/chapter1/info.json b/keyboards/mechstudio/chapter1/keyboard.json similarity index 100% rename from keyboards/mechstudio/chapter1/info.json rename to keyboards/mechstudio/chapter1/keyboard.json diff --git a/keyboards/mechstudio/ud_40_ortho/info.json b/keyboards/mechstudio/ud_40_ortho/keyboard.json similarity index 100% rename from keyboards/mechstudio/ud_40_ortho/info.json rename to keyboards/mechstudio/ud_40_ortho/keyboard.json diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/keyboard.json similarity index 100% rename from keyboards/mechwild/bbs/info.json rename to keyboards/mechwild/bbs/keyboard.json diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/keyboard.json similarity index 100% rename from keyboards/mechwild/puckbuddy/info.json rename to keyboards/mechwild/puckbuddy/keyboard.json diff --git a/keyboards/mecxlabs/mp1/info.json b/keyboards/mecxlabs/mp1/keyboard.json similarity index 100% rename from keyboards/mecxlabs/mp1/info.json rename to keyboards/mecxlabs/mp1/keyboard.json diff --git a/keyboards/meetlab/kafkasplit/info.json b/keyboards/meetlab/kafkasplit/keyboard.json similarity index 100% rename from keyboards/meetlab/kafkasplit/info.json rename to keyboards/meetlab/kafkasplit/keyboard.json diff --git a/keyboards/mexsistor/ludmila/info.json b/keyboards/mexsistor/ludmila/keyboard.json similarity index 100% rename from keyboards/mexsistor/ludmila/info.json rename to keyboards/mexsistor/ludmila/keyboard.json diff --git a/keyboards/minimon/bartlesplit/info.json b/keyboards/minimon/bartlesplit/keyboard.json similarity index 100% rename from keyboards/minimon/bartlesplit/info.json rename to keyboards/minimon/bartlesplit/keyboard.json diff --git a/keyboards/mitosis/info.json b/keyboards/mitosis/keyboard.json similarity index 100% rename from keyboards/mitosis/info.json rename to keyboards/mitosis/keyboard.json diff --git a/keyboards/mkh_studio/bully/info.json b/keyboards/mkh_studio/bully/keyboard.json similarity index 100% rename from keyboards/mkh_studio/bully/info.json rename to keyboards/mkh_studio/bully/keyboard.json diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/keyboard.json similarity index 100% rename from keyboards/mlego/m60_split/rev1/info.json rename to keyboards/mlego/m60_split/rev1/keyboard.json diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/keyboard.json similarity index 100% rename from keyboards/mlego/m60_split/rev2/info.json rename to keyboards/mlego/m60_split/rev2/keyboard.json diff --git a/keyboards/molecule/info.json b/keyboards/molecule/keyboard.json similarity index 100% rename from keyboards/molecule/info.json rename to keyboards/molecule/keyboard.json diff --git a/keyboards/monokei/mnk1800s/info.json b/keyboards/monokei/mnk1800s/keyboard.json similarity index 100% rename from keyboards/monokei/mnk1800s/info.json rename to keyboards/monokei/mnk1800s/keyboard.json diff --git a/keyboards/monokei/mnk50/info.json b/keyboards/monokei/mnk50/keyboard.json similarity index 100% rename from keyboards/monokei/mnk50/info.json rename to keyboards/monokei/mnk50/keyboard.json diff --git a/keyboards/monokei/mnk75/info.json b/keyboards/monokei/mnk75/keyboard.json similarity index 100% rename from keyboards/monokei/mnk75/info.json rename to keyboards/monokei/mnk75/keyboard.json diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/keyboard.json similarity index 100% rename from keyboards/montsinger/rebound/rev4/info.json rename to keyboards/montsinger/rebound/rev4/keyboard.json diff --git a/keyboards/moon/info.json b/keyboards/moon/keyboard.json similarity index 100% rename from keyboards/moon/info.json rename to keyboards/moon/keyboard.json diff --git a/keyboards/mt/split75/info.json b/keyboards/mt/split75/keyboard.json similarity index 100% rename from keyboards/mt/split75/info.json rename to keyboards/mt/split75/keyboard.json From e99b7f240aacd4d9a0182396533a3e972ea1f9a8 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sun, 28 Apr 2024 21:12:14 +1000 Subject: [PATCH 196/333] Remove broken CI workflow (#23631) --- .github/workflows/ci_builds.yml | 74 --------------------------------- 1 file changed, 74 deletions(-) delete mode 100644 .github/workflows/ci_builds.yml diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml deleted file mode 100644 index 7fa07fe09d9..00000000000 --- a/.github/workflows/ci_builds.yml +++ /dev/null @@ -1,74 +0,0 @@ -name: CI Builds - -permissions: - contents: read - -on: - push: - branches: [master, develop] - workflow_dispatch: - inputs: - branch: - type: choice - description: 'Branch to build' - options: [master, develop] - -concurrency: ci_build-${{ github.event.inputs.branch || github.ref_name }} - -jobs: - ci_builds: - if: github.repository == 'qmk/qmk_firmware' - name: "CI Build" - runs-on: self-hosted - timeout-minutes: 1380 - - strategy: - fail-fast: false - matrix: - keymap: [default, via] - - container: ghcr.io/qmk/qmk_cli - - steps: - - name: Disable safe.directory check - run : git config --global --add safe.directory '*' - - - uses: actions/checkout@v4 - with: - submodules: recursive - ref: ${{ github.event.inputs.branch || github.ref }} - - - name: Install dependencies - run: pip3 install -r requirements.txt - - - name: Run `qmk mass-compile` (keymap ${{ matrix.keymap }}) - run: | - export NCPUS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) - qmk mass-compile -t -j $NCPUS -km ${{ matrix.keymap }} -e DUMP_CI_METADATA=yes || touch .failed - # Generate the step summary markdown - ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true - # Truncate to a maximum of 1MB to deal with GitHub workflow limit - truncate --size='<960K' $GITHUB_STEP_SUMMARY || true - # Exit with failure if the compilation stage failed - [ ! -f .failed ] || exit 1 - - - name: 'Upload artifacts' - uses: actions/upload-artifact@v4 - if: always() - with: - name: artifacts-${{ github.event.inputs.branch || github.ref_name }}-${{ matrix.keymap }} - if-no-files-found: ignore - path: | - *.bin - *.hex - *.uf2 - .build/failed.* - - - name: 'CI Discord Notification' - if: always() - working-directory: util/ci/ - env: - DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }} - run: | - python3 -m pip install -r requirements.txt - python3 ./discord-results.py --branch ${{ github.event.inputs.branch || github.ref_name }} --keymap ${{ matrix.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} From 78a76b6c1e60e606eebc7cf571ee4251fc47d92a Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 29 Apr 2024 18:45:58 -0400 Subject: [PATCH 197/333] Iris keymap update (#23635) --- .../keebio/iris/keymaps/default/keymap.c | 115 ------------------ .../keebio/iris/keymaps/default/keymap.json | 29 +++++ keyboards/keebio/iris/keymaps/via/keymap.c | 29 ++--- 3 files changed, 36 insertions(+), 137 deletions(-) delete mode 100644 keyboards/keebio/iris/keymaps/default/keymap.c create mode 100644 keyboards/keebio/iris/keymaps/default/keymap.json diff --git a/keyboards/keebio/iris/keymaps/default/keymap.c b/keyboards/keebio/iris/keymaps/default/keymap.c deleted file mode 100644 index e1e050ab1d3..00000000000 --- a/keyboards/keebio/iris/keymaps/default/keymap.c +++ /dev/null @@ -1,115 +0,0 @@ -// Copyright 2023 Danny Nguyen (@nooges) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -#define _QWERTY 0 -#define _LOWER 1 -#define _RAISE 2 -#define _ADJUST 3 - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, - RAISE, - ADJUST, -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_QWERTY] = LAYOUT( - //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_HOME, KC_END, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - KC_LGUI, LOWER, KC_ENT, KC_SPC, RAISE, KC_RALT - // └────────┴────────┴────────┘ └────────┴────────┴────────┘ - ), - - [_LOWER] = LAYOUT( - //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - KC_DEL, _______, KC_LEFT, KC_RGHT, KC_UP, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_PLUS, KC_PIPE, - //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - BL_STEP, _______, _______, _______, KC_DOWN, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_P1, KC_P2, KC_P3, KC_MINS, _______, - //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - _______, _______, KC_DEL, KC_DEL, _______, KC_P0 - // └────────┴────────┴────────┘ └────────┴────────┴────────┘ - ), - - [_RAISE] = LAYOUT( - //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - RGB_TOG, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS, KC_EQL, KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_BSLS, - //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN, _______, KC_PLUS, KC_END, RGB_HUD, RGB_SAD, RGB_VAD, _______, - //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - _______, _______, _______, _______, _______, _______ - // └────────┴────────┴────────┘ └────────┴────────┴────────┘ - ), - - [_ADJUST] = LAYOUT( - //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - _______, _______, _______, _______, _______, _______ - // └────────┴────────┴────────┘ └────────┴────────┴────────┘ - ) -}; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - set_single_persistent_default_layer(_QWERTY); - } - return false; - break; - case LOWER: - if (record->event.pressed) { - layer_on(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case RAISE: - if (record->event.pressed) { - layer_on(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case ADJUST: - if (record->event.pressed) { - layer_on(_ADJUST); - } else { - layer_off(_ADJUST); - } - return false; - break; - } - return true; -} diff --git a/keyboards/keebio/iris/keymaps/default/keymap.json b/keyboards/keebio/iris/keymaps/default/keymap.json new file mode 100644 index 00000000000..8b141d992fd --- /dev/null +++ b/keyboards/keebio/iris/keymaps/default/keymap.json @@ -0,0 +1,29 @@ +{ + "config": { "features": {"tri_layer": true} }, + "keyboard": "keebio/iris", + "keymap": "default", + "layout": "LAYOUT", + "layers": [ + [ + "QK_GESC", "KC_1" , "KC_2" , "KC_3" , "KC_4" , "KC_5" , "KC_6" , "KC_7" , "KC_8" , "KC_9" , "KC_0" , "KC_BSPC", + "KC_TAB" , "KC_Q" , "KC_W" , "KC_E" , "KC_R" , "KC_T" , "KC_Y" , "KC_U" , "KC_I" , "KC_O" , "KC_P" , "KC_DEL" , + "KC_LCTL", "KC_A" , "KC_S" , "KC_D" , "KC_F" , "KC_G" , "KC_H" , "KC_J" , "KC_K" , "KC_L" , "KC_SCLN", "KC_QUOT", + "KC_LSFT", "KC_Z" , "KC_X" , "KC_C" , "KC_V" , "KC_B" , "KC_HOME", "KC_END" , "KC_N" , "KC_M" , "KC_COMM", "KC_DOT" , "KC_SLSH", "KC_RSFT", + "KC_LGUI", "TL_LOWR", "KC_ENT" , "KC_SPC" , "TL_UPPR", "KC_RALT" + ], + [ + "KC_TILD", "KC_EXLM", "KC_AT" , "KC_HASH", "KC_DLR" , "KC_PERC", "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", "KC_PGUP", + "KC_GRV" , "_______", "KC_UP" , "_______", "QK_BOOT", "_______", "_______", "KC_P7" , "KC_P8" , "KC_P9" , "KC_P0" , "KC_PGDN", + "KC_DEL" , "KC_LEFT", "KC_DOWN", "KC_RGHT", "_______", "KC_LBRC", "KC_RBRC", "KC_P4" , "KC_P5" , "KC_P6" , "KC_PLUS", "KC_PIPE", + "RGB_MOD", "EE_CLR" , "_______", "_______", "_______", "KC_LCBR", "KC_LPRN", "KC_RPRN", "KC_RCBR", "KC_P1" , "KC_P2" , "KC_P3" , "KC_MINS", "_______", + "_______", "_______", "KC_DEL" , "KC_DEL" , "_______", "KC_P0" + ], + [ + "KC_F12" , "KC_F1" , "KC_F2" , "KC_F3" , "KC_F4" , "KC_F5" , "KC_F6" , "KC_F7" , "KC_F8" , "KC_F9" , "KC_F10" , "KC_F11" , + "RGB_TOG", "KC_EXLM", "KC_AT" , "KC_HASH", "KC_DLR" , "KC_PERC", "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", "QK_BOOT", + "RGB_MOD", "KC_MPRV", "KC_MNXT", "KC_VOLU", "KC_PGUP", "KC_UNDS", "KC_EQL" , "KC_HOME", "RGB_HUI", "RGB_SAI", "RGB_VAI", "KC_BSLS", + "KC_MUTE", "KC_MSTP", "KC_MPLY", "KC_VOLD", "KC_PGDN", "KC_MINS", "KC_LPRN", "_______", "KC_PLUS", "KC_END" , "RGB_HUD", "RGB_SAD", "RGB_VAD", "EE_CLR" , + "_______", "_______", "_______", "_______", "_______", "_______" + ] + ] +} diff --git a/keyboards/keebio/iris/keymaps/via/keymap.c b/keyboards/keebio/iris/keymaps/via/keymap.c index c2753da2a45..04ebf000b8b 100644 --- a/keyboards/keebio/iris/keymaps/via/keymap.c +++ b/keyboards/keebio/iris/keymaps/via/keymap.c @@ -7,14 +7,13 @@ enum custom_layer { _MAIN, _FN1, _FN2, - _FN3, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MAIN] = LAYOUT( //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ @@ -28,13 +27,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT( //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PGUP, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + KC_GRV, _______, KC_UP, _______, QK_BOOT, _______, _______, KC_P7, KC_P8, KC_P9, KC_P0, KC_PGDN, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - KC_DEL, _______, KC_LEFT, KC_RGHT, KC_UP, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_PLUS, KC_PIPE, + KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_PLUS, KC_PIPE, //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - BL_STEP, _______, _______, _______, KC_DOWN, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_P1, KC_P2, KC_P3, KC_MINS, _______, + RGB_MOD, EE_CLR, _______, _______, _______, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_P1, KC_P2, KC_P3, KC_MINS, _______, //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ _______, _______, KC_DEL, KC_DEL, _______, KC_P0 // └────────┴────────┴────────┘ └────────┴────────┴────────┘ @@ -44,25 +43,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - RGB_TOG, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, + RGB_TOG, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, QK_BOOT, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS, KC_EQL, KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_BSLS, //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN, _______, KC_PLUS, KC_END, RGB_HUD, RGB_SAD, RGB_VAD, _______, - //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - _______, _______, _______, _______, _______, _______ - // └────────┴────────┴────────┘ └────────┴────────┴────────┘ - ), - - [_FN3] = LAYOUT( - //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN, _______, KC_PLUS, KC_END, RGB_HUD, RGB_SAD, RGB_VAD, EE_CLR, //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ _______, _______, _______, _______, _______, _______ // └────────┴────────┴────────┘ └────────┴────────┴────────┘ From b4b222a6e3b103df201ca098cb7ddecc99993b1e Mon Sep 17 00:00:00 2001 From: chalex <68408520+gaclee3b@users.noreply.github.com> Date: Mon, 29 Apr 2024 21:36:10 -0400 Subject: [PATCH 198/333] gh80_3000 - Enable indicator LED functionality (#23633) Co-authored-by: chalex --- keyboards/gh80_3000/config.h | 7 ----- keyboards/gh80_3000/keyboard.json | 12 +++++++++ keyboards/gh80_3000/keymaps/ansi_std/keymap.c | 27 ------------------- keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c | 26 ------------------ keyboards/gh80_3000/keymaps/default/keymap.c | 26 ------------------ .../gh80_3000/keymaps/iso_default/keymap.c | 26 ------------------ keyboards/gh80_3000/keymaps/iso_std/keymap.c | 26 ------------------ keyboards/gh80_3000/keymaps/iso_wkl/keymap.c | 26 ------------------ 8 files changed, 12 insertions(+), 164 deletions(-) delete mode 100644 keyboards/gh80_3000/config.h diff --git a/keyboards/gh80_3000/config.h b/keyboards/gh80_3000/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/gh80_3000/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/gh80_3000/keyboard.json b/keyboards/gh80_3000/keyboard.json index f5f4ba75332..c88f5c8232c 100644 --- a/keyboards/gh80_3000/keyboard.json +++ b/keyboards/gh80_3000/keyboard.json @@ -16,6 +16,18 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "indicators": { + "num_lock": "B5", + "caps_lock": "B6", + "scroll_lock": "B7", + "on_state": 0 + }, "matrix_pins": { "cols": ["C7", "C6", "B4", "D7", "B3", "B2", "B0", "E6", "B1", "D1", "D6"], "rows": ["F4", "F1", "F0", "F5", "F6", "F7", "D4", "D5", "D3", "D2", "D0"] diff --git a/keyboards/gh80_3000/keymaps/ansi_std/keymap.c b/keyboards/gh80_3000/keymaps/ansi_std/keymap.c index f99d522ead4..2f1e410656f 100644 --- a/keyboards/gh80_3000/keymaps/ansi_std/keymap.c +++ b/keyboards/gh80_3000/keymaps/ansi_std/keymap.c @@ -11,30 +11,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ) }; - -bool led_update_user(led_t led_state) { - if (led_state.num_lock) { - DDRB |= (1 << 5); - PORTB &= ~(1 << 5); - } else { - DDRB &= ~(1 << 5); - PORTB &= ~(1 << 5); - } - - if (led_state.caps_lock) { - DDRB |= (1 << 6); - PORTB &= ~(1 << 6); - } else { - DDRB &= ~(1 << 6); - PORTB &= ~(1 << 6); - } - - if (led_state.scroll_lock) { - DDRB |= (1 << 7); - PORTB &= ~(1 << 7); - } else { - DDRB &= ~(1 << 7); - PORTB &= ~(1 << 7); - } - return false; -} diff --git a/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c b/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c index b3f2426e88a..a949b11941e 100644 --- a/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c +++ b/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c @@ -12,29 +12,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool led_update_user(led_t led_state) { - if (led_state.num_lock) { - DDRB |= (1 << 5); - PORTB &= ~(1 << 5); - } else { - DDRB &= ~(1 << 5); - PORTB &= ~(1 << 5); - } - - if (led_state.caps_lock) { - DDRB |= (1 << 6); - PORTB &= ~(1 << 6); - } else { - DDRB &= ~(1 << 6); - PORTB &= ~(1 << 6); - } - - if (led_state.scroll_lock) { - DDRB |= (1 << 7); - PORTB &= ~(1 << 7); - } else { - DDRB &= ~(1 << 7); - PORTB &= ~(1 << 7); - } - return false; -} diff --git a/keyboards/gh80_3000/keymaps/default/keymap.c b/keyboards/gh80_3000/keymaps/default/keymap.c index b74127fc5e1..08f43c1d685 100644 --- a/keyboards/gh80_3000/keymaps/default/keymap.c +++ b/keyboards/gh80_3000/keymaps/default/keymap.c @@ -12,29 +12,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool led_update_user(led_t led_state) { - if (led_state.num_lock) { - DDRB |= (1 << 5); - PORTB &= ~(1 << 5); - } else { - DDRB &= ~(1 << 5); - PORTB &= ~(1 << 5); - } - - if (led_state.caps_lock) { - DDRB |= (1 << 6); - PORTB &= ~(1 << 6); - } else { - DDRB &= ~(1 << 6); - PORTB &= ~(1 << 6); - } - - if (led_state.scroll_lock) { - DDRB |= (1 << 7); - PORTB &= ~(1 << 7); - } else { - DDRB &= ~(1 << 7); - PORTB &= ~(1 << 7); - } - return false; -} diff --git a/keyboards/gh80_3000/keymaps/iso_default/keymap.c b/keyboards/gh80_3000/keymaps/iso_default/keymap.c index 4c4b10f458a..ff2b373a544 100644 --- a/keyboards/gh80_3000/keymaps/iso_default/keymap.c +++ b/keyboards/gh80_3000/keymaps/iso_default/keymap.c @@ -12,29 +12,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool led_update_user(led_t led_state) { - if (led_state.num_lock) { - DDRB |= (1 << 5); - PORTB &= ~(1 << 5); - } else { - DDRB &= ~(1 << 5); - PORTB &= ~(1 << 5); - } - - if (led_state.caps_lock) { - DDRB |= (1 << 6); - PORTB &= ~(1 << 6); - } else { - DDRB &= ~(1 << 6); - PORTB &= ~(1 << 6); - } - - if (led_state.scroll_lock) { - DDRB |= (1 << 7); - PORTB &= ~(1 << 7); - } else { - DDRB &= ~(1 << 7); - PORTB &= ~(1 << 7); - } - return false; -} diff --git a/keyboards/gh80_3000/keymaps/iso_std/keymap.c b/keyboards/gh80_3000/keymaps/iso_std/keymap.c index 9559bde1194..7783aae0a9f 100644 --- a/keyboards/gh80_3000/keymaps/iso_std/keymap.c +++ b/keyboards/gh80_3000/keymaps/iso_std/keymap.c @@ -12,29 +12,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool led_update_user(led_t led_state) { - if (led_state.num_lock) { - DDRB |= (1 << 5); - PORTB &= ~(1 << 5); - } else { - DDRB &= ~(1 << 5); - PORTB &= ~(1 << 5); - } - - if (led_state.caps_lock) { - DDRB |= (1 << 6); - PORTB &= ~(1 << 6); - } else { - DDRB &= ~(1 << 6); - PORTB &= ~(1 << 6); - } - - if (led_state.scroll_lock) { - DDRB |= (1 << 7); - PORTB &= ~(1 << 7); - } else { - DDRB &= ~(1 << 7); - PORTB &= ~(1 << 7); - } - return false; -} diff --git a/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c b/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c index 86054ba1fd5..9108f6aba41 100644 --- a/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c +++ b/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c @@ -12,29 +12,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool led_update_user(led_t led_state) { - if (led_state.num_lock) { - DDRB |= (1 << 5); - PORTB &= ~(1 << 5); - } else { - DDRB &= ~(1 << 5); - PORTB &= ~(1 << 5); - } - - if (led_state.caps_lock) { - DDRB |= (1 << 6); - PORTB &= ~(1 << 6); - } else { - DDRB &= ~(1 << 6); - PORTB &= ~(1 << 6); - } - - if (led_state.scroll_lock) { - DDRB |= (1 << 7); - PORTB &= ~(1 << 7); - } else { - DDRB &= ~(1 << 7); - PORTB &= ~(1 << 7); - } - return false; -} From 4f087591a8773664e587ac3450e95119f3d586d4 Mon Sep 17 00:00:00 2001 From: Richard Dawe Date: Tue, 30 Apr 2024 02:36:32 +0100 Subject: [PATCH 199/333] Add YMDK YMD62 ISO PCB (#23629) --- keyboards/ymdk/ymd62/config.h | 11 + keyboards/ymdk/ymd62/halconf.h | 8 + keyboards/ymdk/ymd62/info.json | 217 ++++++++++++++++++ keyboards/ymdk/ymd62/keymaps/default/keymap.c | 19 ++ keyboards/ymdk/ymd62/mcuconf.h | 9 + keyboards/ymdk/ymd62/readme.md | 28 +++ keyboards/ymdk/ymd62/rules.mk | 2 + 7 files changed, 294 insertions(+) create mode 100644 keyboards/ymdk/ymd62/config.h create mode 100644 keyboards/ymdk/ymd62/halconf.h create mode 100644 keyboards/ymdk/ymd62/info.json create mode 100644 keyboards/ymdk/ymd62/keymaps/default/keymap.c create mode 100644 keyboards/ymdk/ymd62/mcuconf.h create mode 100644 keyboards/ymdk/ymd62/readme.md create mode 100644 keyboards/ymdk/ymd62/rules.mk diff --git a/keyboards/ymdk/ymd62/config.h b/keyboards/ymdk/ymd62/config.h new file mode 100644 index 00000000000..5f1f3f3a2a5 --- /dev/null +++ b/keyboards/ymdk/ymd62/config.h @@ -0,0 +1,11 @@ +// Copyright 2021 Mike Tsao +// Copyright 2024 Richard Dawe (@richdawe) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define WS2812_PWM_DRIVER PWMD4 +#define WS2812_PWM_CHANNEL 4 +#define WS2812_PWM_PAL_MODE 2 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_DMA_CHANNEL 7 \ No newline at end of file diff --git a/keyboards/ymdk/ymd62/halconf.h b/keyboards/ymdk/ymd62/halconf.h new file mode 100644 index 00000000000..89073b2f3c1 --- /dev/null +++ b/keyboards/ymdk/ymd62/halconf.h @@ -0,0 +1,8 @@ +// Copyright 2024 Richard Dawe (@richdawe) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/ymdk/ymd62/info.json b/keyboards/ymdk/ymd62/info.json new file mode 100644 index 00000000000..92ed13d2606 --- /dev/null +++ b/keyboards/ymdk/ymd62/info.json @@ -0,0 +1,217 @@ +{ + "manufacturer": "YMDK", + "keyboard_name": "YMD62 ISO QMK", + "maintainer": "richdawe", + "bootloader": "uf2boot", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["A7", "B0", "B1", "B2", "B10", "B11", "A5", "A15", "B3", "B12", "B13", "B14", "B15", "A8"], + "rows": ["A4", "A3", "A2", "A1", "A0"] + }, + "processor": "STM32F103", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "dual_beacon": true, + "flower_blooming": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "riverflow": true, + "starlight": true, + "starlight_dual_hue": true, + "starlight_dual_sat": true + }, + "default": { + "animation": "rainbow_moving_chevron" + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 0], "x": 1, "y": 1, "flags": 4}, + {"matrix": [0, 1], "x": 14, "y": 1, "flags": 4}, + {"matrix": [0, 2], "x": 28, "y": 1, "flags": 4}, + {"matrix": [0, 3], "x": 44, "y": 1, "flags": 4}, + {"matrix": [0, 4], "x": 58, "y": 1, "flags": 4}, + {"matrix": [0, 5], "x": 75, "y": 1, "flags": 4}, + {"matrix": [0, 6], "x": 89, "y": 1, "flags": 4}, + {"matrix": [0, 7], "x": 103, "y": 1, "flags": 4}, + {"matrix": [0, 8], "x": 117, "y": 1, "flags": 4}, + {"matrix": [0, 9], "x": 129, "y": 1, "flags": 4}, + {"matrix": [0, 10], "x": 147, "y": 1, "flags": 4}, + {"matrix": [0, 11], "x": 167, "y": 1, "flags": 4}, + {"matrix": [0, 12], "x": 183, "y": 1, "flags": 4}, + {"matrix": [0, 13], "x": 200, "y": 1, "flags": 4}, + {"matrix": [1, 0], "x": 3, "y": 16, "flags": 4}, + {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 33, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 47, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 60, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 77, "y": 16, "flags": 4}, + {"matrix": [1, 6], "x": 91, "y": 16, "flags": 4}, + {"matrix": [1, 7], "x": 106, "y": 16, "flags": 4}, + {"matrix": [1, 8], "x": 120, "y": 16, "flags": 4}, + {"matrix": [1, 9], "x": 131, "y": 16, "flags": 4}, + {"matrix": [1, 10], "x": 149, "y": 16, "flags": 4}, + {"matrix": [1, 11], "x": 169, "y": 16, "flags": 4}, + {"matrix": [1, 12], "x": 185, "y": 16, "flags": 4}, + {"matrix": [1, 13], "x": 205, "y": 26, "flags": 4}, + {"matrix": [2, 0], "x": 5, "y": 32, "flags": 4}, + {"matrix": [2, 1], "x": 20, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 35, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 49, "y": 32, "flags": 4}, + {"matrix": [2, 4], "x": 62, "y": 32, "flags": 4}, + {"matrix": [2, 5], "x": 79, "y": 32, "flags": 4}, + {"matrix": [2, 6], "x": 93, "y": 32, "flags": 4}, + {"matrix": [2, 7], "x": 108, "y": 32, "flags": 4}, + {"matrix": [2, 8], "x": 122, "y": 32, "flags": 4}, + {"matrix": [2, 9], "x": 133, "y": 32, "flags": 4}, + {"matrix": [2, 10], "x": 151, "y": 32, "flags": 4}, + {"matrix": [2, 11], "x": 171, "y": 32, "flags": 4}, + {"matrix": [2, 13], "x": 199, "y": 32, "flags": 4}, + {"matrix": [3, 0], "x": 8, "y": 49, "flags": 4}, + {"matrix": [3, 1], "x": 23, "y": 49, "flags": 4}, + {"matrix": [3, 2], "x": 38, "y": 49, "flags": 4}, + {"matrix": [3, 3], "x": 51, "y": 49, "flags": 4}, + {"matrix": [3, 4], "x": 64, "y": 49, "flags": 4}, + {"matrix": [3, 5], "x": 81, "y": 49, "flags": 4}, + {"matrix": [3, 6], "x": 95, "y": 49, "flags": 4}, + {"matrix": [3, 7], "x": 110, "y": 49, "flags": 4}, + {"matrix": [3, 8], "x": 124, "y": 49, "flags": 4}, + {"matrix": [3, 9], "x": 135, "y": 49, "flags": 4}, + {"matrix": [3, 10], "x": 153, "y": 49, "flags": 4}, + {"matrix": [3, 11], "x": 189, "y": 49, "flags": 4}, + {"matrix": [3, 13], "x": 212, "y": 49, "flags": 4}, + {"matrix": [4, 0], "x": 2, "y": 63, "flags": 4}, + {"matrix": [4, 1], "x": 15, "y": 63, "flags": 4}, + {"matrix": [4, 2], "x": 33, "y": 63, "flags": 4}, + {"matrix": [4, 6], "x": 92, "y": 63, "flags": 4}, + {"matrix": [4, 9], "x": 149, "y": 63, "flags": 4}, + {"matrix": [4, 10], "x": 170, "y": 63, "flags": 4}, + {"matrix": [4, 11], "x": 188, "y": 63, "flags": 4}, + {"matrix": [4, 13], "x": 200, "y": 63, "flags": 4}, + {"x": 60, "y": 5, "flags": 2}, + {"x": 90, "y": 5, "flags": 2}, + {"x": 120, "y": 5, "flags": 2}, + {"x": 150, "y": 5, "flags": 2}, + {"x": 180, "y": 5, "flags": 2}, + {"x": 210, "y": 5, "flags": 2}, + {"x": 210, "y": 60, "flags": 2}, + {"x": 180, "y": 60, "flags": 2}, + {"x": 150, "y": 60, "flags": 2}, + {"x": 120, "y": 60, "flags": 2}, + {"x": 90, "y": 60, "flags": 2}, + {"x": 60, "y": 60, "flags": 2} + ], + "max_brightness": 128 + }, + "url": "https://ymdkey.com/products/ymd62-iso-rgb-hot-swap-pcb-fully-programmable-support-via-vial", + "usb": { + "device_version": "0.0.4", + "pid": "0x0062", + "vid": "0x45D4" + }, + "ws2812": { + "driver": "pwm", + "pin": "B9" + }, + "community_layouts": ["60_iso"], + "layouts": { + "LAYOUT_60_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + } + } +} diff --git a/keyboards/ymdk/ymd62/keymaps/default/keymap.c b/keyboards/ymdk/ymd62/keymaps/default/keymap.c new file mode 100644 index 00000000000..79c128295ef --- /dev/null +++ b/keyboards/ymdk/ymd62/keymaps/default/keymap.c @@ -0,0 +1,19 @@ +// Copyright 2024 Richard Dawe (@richdawe) +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_60_iso( /* Base */ + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL), + +[1] = LAYOUT_60_iso( /* FN */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL , + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT , + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_M_P, KC_TRNS, KC_TRNS, + KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +}; \ No newline at end of file diff --git a/keyboards/ymdk/ymd62/mcuconf.h b/keyboards/ymdk/ymd62/mcuconf.h new file mode 100644 index 00000000000..3c076403711 --- /dev/null +++ b/keyboards/ymdk/ymd62/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2024 Richard Dawe (@richdawe) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef STM32_PWM_USE_TIM4 +#define STM32_PWM_USE_TIM4 TRUE \ No newline at end of file diff --git a/keyboards/ymdk/ymd62/readme.md b/keyboards/ymdk/ymd62/readme.md new file mode 100644 index 00000000000..73eeed3dbb9 --- /dev/null +++ b/keyboards/ymdk/ymd62/readme.md @@ -0,0 +1,28 @@ +# YMDK YMD62 ISO + +A 60% PCB supporting the ISO layout, with hotswap sockets, backlit keys and underglow. + +* Keyboard Maintainer: [Richard Dawe](https://github.com/richdawe) +* Hardware Supported: YMD62 PCB +* Hardware Availability: [YMDK](https://ymdkey.com/products/ymd62-iso-rgb-hot-swap-pcb-fully-programmable-support-via-vial) + +Make example for this keyboard (after setting up your build environment): + + make ymdk/ymd62:default + +Flashing example for this keyboard: + + make ymdk/ymd62: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Double-tap the reset button on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available + +Note: The device does not reconnect automatically after the QMK firmware has been flashed. +Wait for the USB device to disappear after writing firmware, then unplug and re-plug it. \ No newline at end of file diff --git a/keyboards/ymdk/ymd62/rules.mk b/keyboards/ymdk/ymd62/rules.mk new file mode 100644 index 00000000000..ef4364b06ac --- /dev/null +++ b/keyboards/ymdk/ymd62/rules.mk @@ -0,0 +1,2 @@ +# Configure for 128K flash +MCU_LDSCRIPT = STM32F103xB \ No newline at end of file From fd32861c9f9c27d0a577d54dacf10a6267f794e5 Mon Sep 17 00:00:00 2001 From: Ming-Gih Lam Date: Mon, 29 Apr 2024 18:39:29 -0700 Subject: [PATCH 200/333] Masonry keyboard support (#23597) --- keyboards/dcpedit/masonry/info.json | 79 +++++++++++++++++++ .../masonry/keymaps/default/keymap.json | 21 +++++ .../dcpedit/masonry/keymaps/via/keymap.json | 26 ++++++ keyboards/dcpedit/masonry/readme.md | 27 +++++++ keyboards/dcpedit/masonry/rules.mk | 1 + 5 files changed, 154 insertions(+) create mode 100644 keyboards/dcpedit/masonry/info.json create mode 100644 keyboards/dcpedit/masonry/keymaps/default/keymap.json create mode 100644 keyboards/dcpedit/masonry/keymaps/via/keymap.json create mode 100644 keyboards/dcpedit/masonry/readme.md create mode 100644 keyboards/dcpedit/masonry/rules.mk diff --git a/keyboards/dcpedit/masonry/info.json b/keyboards/dcpedit/masonry/info.json new file mode 100644 index 00000000000..2d25f726219 --- /dev/null +++ b/keyboards/dcpedit/masonry/info.json @@ -0,0 +1,79 @@ +{ + "manufacturer": "dcpedit", + "keyboard_name": "Masonry", + "maintainer": "dcpedit", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 2 + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true + }, + "matrix_pins": { + "cols": ["A8", "B15", "B14", "B13", "B12", "A2"], + "rows": ["A9", "A0", "F0", "C15", "A10", "F1", "A1", "C14"] + }, + "processor": "STM32F072", + "url": "https://github.com/dcpedit/masonry", + "usb": { + "device_version": "1.0.0", + "pid": "0x177A", + "vid": "0xDC9E" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "4,0", "matrix": [4, 0], "x": 1, "y": 0}, + {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "4,1", "matrix": [4, 1], "x": 3, "y": 0}, + {"label": "0,2", "matrix": [0, 2], "x": 4, "y": 0}, + {"label": "4,2", "matrix": [4, 2], "x": 5, "y": 0}, + {"label": "0,3", "matrix": [0, 3], "x": 6, "y": 0}, + {"label": "4,3", "matrix": [4, 3], "x": 7, "y": 0}, + {"label": "0,4", "matrix": [0, 4], "x": 8, "y": 0}, + {"label": "4,4", "matrix": [4, 4], "x": 9, "y": 0}, + {"label": "0,5", "matrix": [0, 5], "x": 10, "y": 0}, + {"label": "4,5", "matrix": [4, 5], "x": 11, "y": 0}, + + {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.75}, + {"label": "5,0", "matrix": [5, 0], "x": 1, "y": 1.5}, + {"label": "1,1", "matrix": [1, 1], "x": 2, "y": 1.25}, + {"label": "5,1", "matrix": [5, 1], "x": 3, "y": 1}, + {"label": "1,2", "matrix": [1, 2], "x": 4, "y": 1.25}, + {"label": "5,2", "matrix": [5, 2], "x": 5, "y": 1.25}, + {"label": "1,3", "matrix": [1, 3], "x": 6, "y": 1.25}, + {"label": "5,3", "matrix": [5, 3], "x": 7, "y": 1.25}, + {"label": "1,4", "matrix": [1, 4], "x": 8, "y": 1}, + {"label": "5,4", "matrix": [5, 4], "x": 9, "y": 1.25}, + {"label": "1,5", "matrix": [1, 5], "x": 10, "y": 1.5}, + {"label": "5,5", "matrix": [5, 5], "x": 11, "y": 1.75}, + + {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.75}, + {"label": "6,0", "matrix": [6, 0], "x": 1, "y": 2.5}, + {"label": "2,1", "matrix": [2, 1], "x": 2, "y": 2.25}, + {"label": "6,1", "matrix": [6, 1], "x": 3, "y": 2}, + {"label": "2,2", "matrix": [2, 2], "x": 4, "y": 2.25}, + {"label": "6,2", "matrix": [6, 2], "x": 5, "y": 2.25}, + {"label": "2,3", "matrix": [2, 3], "x": 6, "y": 2.25}, + {"label": "6,3", "matrix": [6, 3], "x": 7, "y": 2.25}, + {"label": "2,4", "matrix": [2, 4], "x": 8, "y": 2}, + {"label": "6,4", "matrix": [6, 4], "x": 9, "y": 2.25}, + {"label": "2,5", "matrix": [2, 5], "x": 10, "y": 2.5}, + {"label": "6,5", "matrix": [6, 5], "x": 11, "y": 2.75}, + + {"label": "3,1", "matrix": [3, 1], "x": 2, "y": 3.25}, + {"label": "7,1", "matrix": [7, 1], "x": 3, "y": 3.25}, + {"label": "3,2", "matrix": [3, 2], "x": 4, "y": 3.25}, + {"label": "7,2", "matrix": [7, 2], "x": 5, "y": 3.25}, + {"label": "3,3", "matrix": [3, 3], "x": 6, "y": 3.25}, + {"label": "7,3", "matrix": [7, 3], "x": 7, "y": 3.25}, + {"label": "3,4", "matrix": [3, 4], "x": 8, "y": 3.25}, + {"label": "7,4", "matrix": [7, 4], "x": 9, "y": 3.25} + ] + } + } +} diff --git a/keyboards/dcpedit/masonry/keymaps/default/keymap.json b/keyboards/dcpedit/masonry/keymaps/default/keymap.json new file mode 100644 index 00000000000..6da346bb917 --- /dev/null +++ b/keyboards/dcpedit/masonry/keymaps/default/keymap.json @@ -0,0 +1,21 @@ +{ + "keyboard": "dcpedit/masonry", + "keymap": "default", + "author": "dcpedit", + "version": 1, + "layout": "LAYOUT", + "layers": [ + [ + "KC_ESC", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_QUOT", + "KC_TAB", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_ENT", + "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", + "KC_LCTL", "KC_LGUI", "LT(1,KC_BSPC)", "KC_BSPC", "KC_SPC", "LT(1,KC_SPC)", "KC_RALT", "KC_RGUI" + ], + [ + "KC_GRV" , "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_RGUI", + "KC_LCTL", "KC_LEFT", "KC_DOWN", "KC_UP", "KC_RGHT", "KC_HOME", "KC_END", "KC_MINS", "KC_EQL", "KC_LBRC", "KC_RBRC", "KC_RALT", + "_______", "_______", "_______", "_______", "_______", "_______", "KC_PGDN", "KC_PGUP", "_______", "_______", "KC_BSLS", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" + ] + ] +} \ No newline at end of file diff --git a/keyboards/dcpedit/masonry/keymaps/via/keymap.json b/keyboards/dcpedit/masonry/keymaps/via/keymap.json new file mode 100644 index 00000000000..76dfde65659 --- /dev/null +++ b/keyboards/dcpedit/masonry/keymaps/via/keymap.json @@ -0,0 +1,26 @@ +{ + "keyboard": "dcpedit/masonry", + "keymap": "default", + "author": "dcpedit", + "version": 1, + "config": { + "features": { + "via": true + } + }, + "layout": "LAYOUT", + "layers": [ + [ + "KC_ESC", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_QUOT", + "KC_TAB", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_ENT", + "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", + "KC_LCTL", "KC_LGUI", "LT(1,KC_BSPC)", "KC_BSPC", "KC_SPC", "LT(1,KC_SPC)", "KC_RALT", "KC_RGUI" + ], + [ + "KC_GRV" , "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_RGUI", + "KC_LCTL", "KC_LEFT", "KC_DOWN", "KC_UP", "KC_RGHT", "KC_HOME", "KC_END", "KC_MINS", "KC_EQL", "KC_LBRC", "KC_RBRC", "KC_RALT", + "_______", "_______", "_______", "_______", "_______", "_______", "KC_PGDN", "KC_PGUP", "_______", "_______", "KC_BSLS", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" + ] + ] +} \ No newline at end of file diff --git a/keyboards/dcpedit/masonry/readme.md b/keyboards/dcpedit/masonry/readme.md new file mode 100644 index 00000000000..9ba7a1597e5 --- /dev/null +++ b/keyboards/dcpedit/masonry/readme.md @@ -0,0 +1,27 @@ +# Masonry + +![Masonry](https://i.imgur.com/gqx2FZW.jpg) + +Masonry is a 40% ergoish columnar keyboard projected on a rectangular keyboard shape. + +* Keyboard Maintainer: [dcpedit](https://github.com/dcpedit) +* Hardware Supported: STM32F072 +* Hardware Availability: https://github.com/dcpedit/masonry + +Make example for this keyboard (after setting up your build environment): + + make dcpedit/masonry:default + +Flashing example for this keyboard: + + make dcpedit/masonry: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the ESC key (top-left key) and plug in the keyboard +* **Physical reset button**: On the PCB, while holding down the BOOT button, press and release the RESET button +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file diff --git a/keyboards/dcpedit/masonry/rules.mk b/keyboards/dcpedit/masonry/rules.mk new file mode 100644 index 00000000000..cfa2d9632f9 --- /dev/null +++ b/keyboards/dcpedit/masonry/rules.mk @@ -0,0 +1 @@ +# Intentionally left blank \ No newline at end of file From cc35aaadbf18da8f6145adfe8b135fc0f9ee26a1 Mon Sep 17 00:00:00 2001 From: Florent Linguenheld Date: Tue, 30 Apr 2024 03:40:01 +0200 Subject: [PATCH 201/333] Add Chew keyboard (#23628) --- keyboards/chew/config.h | 11 ++++ keyboards/chew/info.json | 84 +++++++++++++++++++++++++ keyboards/chew/keymaps/default/keymap.c | 27 ++++++++ keyboards/chew/readme.md | 38 +++++++++++ keyboards/chew/rules.mk | 1 + 5 files changed, 161 insertions(+) create mode 100644 keyboards/chew/config.h create mode 100644 keyboards/chew/info.json create mode 100644 keyboards/chew/keymaps/default/keymap.c create mode 100644 keyboards/chew/readme.md create mode 100644 keyboards/chew/rules.mk diff --git a/keyboards/chew/config.h b/keyboards/chew/config.h new file mode 100644 index 00000000000..22b43cf799d --- /dev/null +++ b/keyboards/chew/config.h @@ -0,0 +1,11 @@ +// Copyright 2024 Florent (@FLinguenheld) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Flash */ +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET // Activates the double-tap behavior +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U // In ms in which the double tap can occur + +#define EE_HANDS +#define SERIAL_USART_TX_PIN GP11 diff --git a/keyboards/chew/info.json b/keyboards/chew/info.json new file mode 100644 index 00000000000..f6ddaa627d8 --- /dev/null +++ b/keyboards/chew/info.json @@ -0,0 +1,84 @@ +{ + "manufacturer": "florent@linguenheld.fr", + "keyboard_name": "chew", + "maintainer": "florent@linguenheld.fr", + "bootloader": "rp2040", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "direct": [ + ["GP4", "GP3", "GP2", "GP1", "GP0"], + ["GP15", "GP26", "GP27", "GP28", "GP29"], + ["GP14", "GP13", "GP9", "GP8", "NO_PIN"], + ["GP7", "GP6", "GP5", "NO_PIN", "NO_PIN"] + ] + }, + "processor": "RP2040", + "split": { + "enabled": true, + "matrix_pins": { + "right": { + "direct": [ + ["GP0", "GP1", "GP2", "GP3", "GP4"], + ["GP29", "GP28", "GP27", "GP26", "GP15"], + ["GP8", "GP9", "GP13", "GP14", "NO_PIN"], + ["GP5", "GP6", "GP7", "NO_PIN", "NO_PIN"] + ] + } + }, + "transport": { + "watchdog": true + } + }, + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.25}, + {"matrix": [0, 1], "x": 1, "y": 0.125}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.125}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [4, 0], "x": 7, "y": 0.25}, + {"matrix": [4, 1], "x": 8, "y": 0.125}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0.125}, + {"matrix": [4, 4], "x": 11, "y": 0.25}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.125}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.125}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [5, 0], "x": 7, "y": 1.25}, + {"matrix": [5, 1], "x": 8, "y": 1.125}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 3], "x": 10, "y": 1.125}, + {"matrix": [5, 4], "x": 11, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.125}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.125}, + {"matrix": [6, 0], "x": 8, "y": 2.125}, + {"matrix": [6, 1], "x": 9, "y": 2}, + {"matrix": [6, 2], "x": 10, "y": 2.125}, + {"matrix": [6, 3], "x": 11, "y": 2.25}, + {"matrix": [3, 0], "x": 2.5, "y": 3.25}, + {"matrix": [3, 1], "x": 3.5, "y": 3.5}, + {"matrix": [3, 2], "x": 4.5, "y": 3.75}, + {"matrix": [7, 0], "x": 6.5, "y": 3.75}, + {"matrix": [7, 1], "x": 7.5, "y": 3.5}, + {"matrix": [7, 2], "x": 8.5, "y": 3.25} + ] + } + } +} diff --git a/keyboards/chew/keymaps/default/keymap.c b/keyboards/chew/keymaps/default/keymap.c new file mode 100644 index 00000000000..541ddbdf1c3 --- /dev/null +++ b/keyboards/chew/keymaps/default/keymap.c @@ -0,0 +1,27 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┐ + * │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │ + * ├───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┤ + * │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ + * ├───┼───┼───┼───┼───┘ └───┼───┼───┼───┼───┤ + * │ Z │ X │ C │ V │ │ M │ , │ . │ / │ + * └───┴───┴───┴───┘ └───┴───┴───┴───┘ + * ┌───┐ ┌───┐ + * │ B ├───┐ ┌───┤ N │ + * └───┤Bsp├───┐ ┌───┤Ent├───┘ + * └───┤Alt│ │ ├───┘ + * └───┘ └───┘ + */ + [0] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + KC_Z, KC_X, KC_C, KC_V, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_B, KC_BSPC, KC_RALT, KC_SPC, KC_ENT, KC_N + ) +}; diff --git a/keyboards/chew/readme.md b/keyboards/chew/readme.md new file mode 100644 index 00000000000..a08398ea0fa --- /dev/null +++ b/keyboards/chew/readme.md @@ -0,0 +1,38 @@ +## Chew + +![Chew front photo](https://live.staticflickr.com/65535/53681212617_90e4eebaf9_o.jpg) +![Chew front photo](https://live.staticflickr.com/65535/53682442119_1fcea26fef_o.jpg) + +A humble 34 key choc-spaced keyboard. + +- Keyboard Maintainer: [Florent Linguenheld](https://github.com/flinguenheld/) +- Visit the repository to get the last release: [Chew](https://github.com/flinguenheld/chew) +- Read the wiki to have some help or information: [Chew wiki](https://github.com/flinguenheld/chew/wiki) + + +![squirrel](https://github.com/flinguenheld/chew/blob/main/images/squirrel_brown.png?raw=true) + +### Requirements + +- 2x PCB +- 2x MCU board [RP2040-Zero](https://www.waveshare.com/wiki/RP2040-Zero) +- 2x TRRS jack +- 34 switches Choc V1 **only** +- 34 keycaps Choc V1 + +Optional: +- 23 [Mill Max sockets](https://splitkb.com/collections/keyboard-parts/products/mill-max-low-profile-sockets) +- 34 [kailh hotswap sockets](https://cdn.shopify.com/s/files/1/0588/1108/9090/files/5118-Choc-Socket.pdf?v=1686715063) +- 2x Back PCB + screws and bolts +- 2x [Tenting pucks](https://splitkb.com/collections/keyboard-parts/products/tenting-puck) +- 2x [Tripods](https://www.manfrotto.com/us-en/pocket-support-large-black-mp3-bk/) + +### Bootloader + +The controller has two buttons, so you can enter the bootloader in 2 ways: + +- Maintain the **boot** button and plug the usb cable in. +- Press twice the **reset** button. + +![hazelnuts](https://github.com/flinguenheld/chew/blob/main/images/hazelnuts.png?raw=true) +![Chew back photo](https://live.staticflickr.com/65535/53682442124_677ffa6cb5_o.jpg) diff --git a/keyboards/chew/rules.mk b/keyboards/chew/rules.mk new file mode 100644 index 00000000000..161ec22b16e --- /dev/null +++ b/keyboards/chew/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = vendor From c94c6fcc25cdf3a5eb16ba5609d2ef1b3e3a2916 Mon Sep 17 00:00:00 2001 From: Stephon Parker Date: Mon, 29 Apr 2024 21:46:48 -0400 Subject: [PATCH 202/333] [Keyboard] Add MECHWILD BB65 (#23581) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Duncan Sutherland --- keyboards/mechwild/bb65/config.h | 10 + keyboards/mechwild/bb65/f401/info.json | 3 + keyboards/mechwild/bb65/f401/rules.mk | 1 + keyboards/mechwild/bb65/f411/info.json | 3 + keyboards/mechwild/bb65/f411/rules.mk | 1 + keyboards/mechwild/bb65/halconf.h | 8 + keyboards/mechwild/bb65/info.json | 192 ++++++++++++++++++ .../mechwild/bb65/keymaps/default/keymap.json | 31 +++ .../mechwild/bb65/keymaps/via/keymap.json | 32 +++ keyboards/mechwild/bb65/mcuconf.h | 9 + keyboards/mechwild/bb65/readme.md | 23 +++ 11 files changed, 313 insertions(+) create mode 100644 keyboards/mechwild/bb65/config.h create mode 100644 keyboards/mechwild/bb65/f401/info.json create mode 100644 keyboards/mechwild/bb65/f401/rules.mk create mode 100644 keyboards/mechwild/bb65/f411/info.json create mode 100644 keyboards/mechwild/bb65/f411/rules.mk create mode 100644 keyboards/mechwild/bb65/halconf.h create mode 100644 keyboards/mechwild/bb65/info.json create mode 100644 keyboards/mechwild/bb65/keymaps/default/keymap.json create mode 100644 keyboards/mechwild/bb65/keymaps/via/keymap.json create mode 100644 keyboards/mechwild/bb65/mcuconf.h create mode 100644 keyboards/mechwild/bb65/readme.md diff --git a/keyboards/mechwild/bb65/config.h b/keyboards/mechwild/bb65/config.h new file mode 100644 index 00000000000..0792ca7f590 --- /dev/null +++ b/keyboards/mechwild/bb65/config.h @@ -0,0 +1,10 @@ +// Copyright 2023 Kyle McCreery (@kylemccreery) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define WS2812_PWM_DRIVER PWMD5 +#define WS2812_PWM_CHANNEL 2 +#define WS2812_PWM_PAL_MODE 2 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 +#define WS2812_DMA_CHANNEL 6 diff --git a/keyboards/mechwild/bb65/f401/info.json b/keyboards/mechwild/bb65/f401/info.json new file mode 100644 index 00000000000..797e9900595 --- /dev/null +++ b/keyboards/mechwild/bb65/f401/info.json @@ -0,0 +1,3 @@ +{ + "development_board": "blackpill_f401" +} diff --git a/keyboards/mechwild/bb65/f401/rules.mk b/keyboards/mechwild/bb65/f401/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/mechwild/bb65/f401/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/mechwild/bb65/f411/info.json b/keyboards/mechwild/bb65/f411/info.json new file mode 100644 index 00000000000..a41c5f4dd14 --- /dev/null +++ b/keyboards/mechwild/bb65/f411/info.json @@ -0,0 +1,3 @@ +{ + "development_board": "blackpill_f411" +} diff --git a/keyboards/mechwild/bb65/f411/rules.mk b/keyboards/mechwild/bb65/f411/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/mechwild/bb65/f411/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/mechwild/bb65/halconf.h b/keyboards/mechwild/bb65/halconf.h new file mode 100644 index 00000000000..d9ca9492565 --- /dev/null +++ b/keyboards/mechwild/bb65/halconf.h @@ -0,0 +1,8 @@ +// Copyright 2023 Kyle McCreery (@kylemccreery) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/mechwild/bb65/info.json b/keyboards/mechwild/bb65/info.json new file mode 100644 index 00000000000..a9d812d827f --- /dev/null +++ b/keyboards/mechwild/bb65/info.json @@ -0,0 +1,192 @@ +{ + "manufacturer": "MechWild", + "keyboard_name": "BB65", + "bootloader_instructions": "Hold down the BOOT button, then tap the NRST button on the BlackPill. Avoid touching the A11 and A12 pins.", + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "A3", "pin_b": "A2"} + ] + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "matrix_pins": { + "cols": ["B14", "B15", "A8", "A15", "B4", "B5", "B8", "B9", "B0"], + "rows": ["B13", "B3", "B10", "A7", "A6", "B12", "B1", "A5"] + }, + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "brightness_steps": 8, + "led_count": 10, + "saturation_steps": 8 + }, + "url": "https://mechwild.com/product/bb65/", + "usb": { + "device_version": "1.0.0", + "pid": "0x1712", + "vid": "0x6D77" + }, + "ws2812": { + "driver": "pwm", + "pin": "A1" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [5, 8], "x": 9, "y": 0}, + {"matrix": [5, 7], "x": 10, "y": 0}, + {"matrix": [5, 6], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [5, 4], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [6, 8], "x": 9.5, "y": 1}, + {"matrix": [6, 7], "x": 10.5, "y": 1}, + {"matrix": [6, 6], "x": 11.5, "y": 1}, + {"matrix": [6, 5], "x": 12.5, "y": 1}, + {"matrix": [6, 4], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [7, 0], "x": 9.75, "y": 2}, + {"matrix": [6, 0], "x": 10.75, "y": 2}, + {"matrix": [6, 1], "x": 11.75, "y": 2}, + {"matrix": [6, 2], "x": 12.75, "y": 2}, + {"matrix": [6, 3], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [7, 8], "x": 9.25, "y": 3}, + {"matrix": [7, 7], "x": 10.25, "y": 3}, + {"matrix": [7, 6], "x": 11.25, "y": 3}, + {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [7, 4], "x": 15.5, "y": 3}, + {"matrix": [7, 3], "x": 14.25, "y": 3.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 3], "x": 10, "y": 4}, + {"matrix": [4, 4], "x": 11, "y": 4}, + {"matrix": [4, 6], "x": 12, "y": 4}, + {"matrix": [4, 7], "x": 13.25, "y": 4.25}, + {"matrix": [4, 8], "x": 14.25, "y": 4.25}, + {"matrix": [7, 2], "x": 15.25, "y": 4.25} + ] + }, + "LAYOUT_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [5, 8], "x": 9, "y": 0}, + {"matrix": [5, 7], "x": 10, "y": 0}, + {"matrix": [5, 6], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [5, 4], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [6, 8], "x": 9.5, "y": 1}, + {"matrix": [6, 7], "x": 10.5, "y": 1}, + {"matrix": [6, 6], "x": 11.5, "y": 1}, + {"matrix": [6, 5], "x": 12.5, "y": 1}, + {"matrix": [6, 4], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [7, 0], "x": 9.75, "y": 2}, + {"matrix": [6, 0], "x": 10.75, "y": 2}, + {"matrix": [6, 1], "x": 11.75, "y": 2}, + {"matrix": [6, 3], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [7, 8], "x": 9.25, "y": 3}, + {"matrix": [7, 7], "x": 10.25, "y": 3}, + {"matrix": [7, 6], "x": 11.25, "y": 3}, + {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [7, 4], "x": 15.5, "y": 3}, + {"matrix": [7, 3], "x": 14.25, "y": 3.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 3], "x": 10, "y": 4}, + {"matrix": [4, 4], "x": 11, "y": 4}, + {"matrix": [4, 6], "x": 12, "y": 4}, + {"matrix": [4, 7], "x": 13.25, "y": 4.25}, + {"matrix": [4, 8], "x": 14.25, "y": 4.25}, + {"matrix": [7, 2], "x": 15.25, "y": 4.25} + ] + } + } +} diff --git a/keyboards/mechwild/bb65/keymaps/default/keymap.json b/keyboards/mechwild/bb65/keymaps/default/keymap.json new file mode 100644 index 00000000000..31d55e5f95a --- /dev/null +++ b/keyboards/mechwild/bb65/keymaps/default/keymap.json @@ -0,0 +1,31 @@ +{ + "keyboard": "mechwild/bb65/f401", + "keymap": "default", + "version": 1, + "layout": "LAYOUT_all", + "layers": [ + [ + "QK_GESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", + "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", + "MO(1)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_TRNS", "KC_ENT", + "KC_LSFT", "KC_TRNS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "RGB_TOG", + "RGB_RMOD", "KC_LGUI", "RGB_MOD", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT" + ], + [ + "KC_TRNS", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_PGDN", "KC_END" + ] + ], + "config": { + "features": { + "encoder_map": true + } + }, + "encoders": [ + [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}], + [{"ccw": "KC_TRNS", "cw": "KC_TRNS"}] + ] +} diff --git a/keyboards/mechwild/bb65/keymaps/via/keymap.json b/keyboards/mechwild/bb65/keymaps/via/keymap.json new file mode 100644 index 00000000000..1e6ebcb717c --- /dev/null +++ b/keyboards/mechwild/bb65/keymaps/via/keymap.json @@ -0,0 +1,32 @@ +{ + "keyboard": "mechwild/bb65/f401", + "keymap": "via", + "version": 1, + "layout": "LAYOUT_all", + "layers": [ + [ + "QK_GESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", + "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", + "MO(1)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_TRNS", "KC_ENT", + "KC_LSFT", "KC_TRNS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "RGB_TOG", + "RGB_RMOD", "KC_LGUI", "RGB_MOD", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT" + ], + [ + "KC_TRNS", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_PGDN", "KC_END" + ] + ], + "config": { + "features": { + "encoder_map": true, + "via": true + } + }, + "encoders": [ + [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}], + [{"ccw": "KC_TRNS", "cw": "KC_TRNS"}] + ] +} diff --git a/keyboards/mechwild/bb65/mcuconf.h b/keyboards/mechwild/bb65/mcuconf.h new file mode 100644 index 00000000000..f9e61e737de --- /dev/null +++ b/keyboards/mechwild/bb65/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2023 Kyle McCreery (@kylemccreery) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef STM32_PWM_USE_TIM5 +#define STM32_PWM_USE_TIM5 TRUE diff --git a/keyboards/mechwild/bb65/readme.md b/keyboards/mechwild/bb65/readme.md new file mode 100644 index 00000000000..43416f90c1b --- /dev/null +++ b/keyboards/mechwild/bb65/readme.md @@ -0,0 +1,23 @@ +# BB65 + +![bb65](https://i.imgur.com/0PrDjuS.png) + +BB65 is a completely normal BlackPill-powered 65% DIY kit. It’s got all the letters, a number row, and arrow keys. Basic as it can be. + +The `f401` version is the standard for this kit, using an STM32F401 BlackPill. The `f411` version will not run on an STM32F401 BlackPill; if in doubt, use `f401`. + +* Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery) +* Hardware Supported: BB65 v1.0 +* Hardware Availability: [BB65 on MechWild](https://mechwild.com/product/bb65/) + +Make example for this keyboard (after setting up your build environment): + + make mechwild/bb65/f401:default + make mechwild/bb65/f411:default + +Flashing example for this keyboard: + + make mechwild/bb65/f401:default:flash + make mechwild/bb65/f411: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). From ae8458e12dfdf34906443f6793e69436e78b1802 Mon Sep 17 00:00:00 2001 From: era <73109780+eerraa@users.noreply.github.com> Date: Tue, 30 Apr 2024 11:32:43 +0900 Subject: [PATCH 203/333] [Keyboard] Add SIRIND TOMAK (#23554) Co-authored-by: Joel Challis Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/era/sirind/tomak/config.h | 16 + keyboards/era/sirind/tomak/info.json | 710 ++++++++++++++++++ .../era/sirind/tomak/keymaps/default/keymap.c | 25 + .../tomak/keymaps/default_ansi/keymap.c | 25 + .../keymaps/default_ansi_split_bs/keymap.c | 25 + .../default_ansi_split_rshift/keymap.c | 25 + .../default_ansi_split_rshift_bs/keymap.c | 25 + .../era/sirind/tomak/keymaps/via/keymap.c | 25 + .../era/sirind/tomak/keymaps/via/rules.mk | 1 + keyboards/era/sirind/tomak/readme.md | 27 + keyboards/era/sirind/tomak/rules.mk | 1 + keyboards/era/sirind/tomak/tomak.c | 16 + 12 files changed, 921 insertions(+) create mode 100644 keyboards/era/sirind/tomak/config.h create mode 100644 keyboards/era/sirind/tomak/info.json create mode 100644 keyboards/era/sirind/tomak/keymaps/default/keymap.c create mode 100644 keyboards/era/sirind/tomak/keymaps/default_ansi/keymap.c create mode 100644 keyboards/era/sirind/tomak/keymaps/default_ansi_split_bs/keymap.c create mode 100644 keyboards/era/sirind/tomak/keymaps/default_ansi_split_rshift/keymap.c create mode 100644 keyboards/era/sirind/tomak/keymaps/default_ansi_split_rshift_bs/keymap.c create mode 100644 keyboards/era/sirind/tomak/keymaps/via/keymap.c create mode 100644 keyboards/era/sirind/tomak/keymaps/via/rules.mk create mode 100644 keyboards/era/sirind/tomak/readme.md create mode 100644 keyboards/era/sirind/tomak/rules.mk create mode 100644 keyboards/era/sirind/tomak/tomak.c diff --git a/keyboards/era/sirind/tomak/config.h b/keyboards/era/sirind/tomak/config.h new file mode 100644 index 00000000000..7bb56107054 --- /dev/null +++ b/keyboards/era/sirind/tomak/config.h @@ -0,0 +1,16 @@ +// Copyright 2023 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Split configuration */ +#define SPLIT_HAND_PIN GP21 +#define USB_VBUS_PIN GP29 +#define SERIAL_USART_FULL_DUPLEX +#define SERIAL_USART_TX_PIN GP0 +#define SERIAL_USART_RX_PIN GP1 +#define SERIAL_USART_PIN_SWAP + +/* Reset */ +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 2000U \ No newline at end of file diff --git a/keyboards/era/sirind/tomak/info.json b/keyboards/era/sirind/tomak/info.json new file mode 100644 index 00000000000..da7d12e94d1 --- /dev/null +++ b/keyboards/era/sirind/tomak/info.json @@ -0,0 +1,710 @@ +{ + "manufacturer": "SIRIND", + "keyboard_name": "Tomak", + "maintainer": "eerraa", + "bootloader": "rp2040", + "build": { + "debounce_type": "sym_defer_pk" + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["GP16", "GP9", "GP8", "GP6", "GP5", "GP4", "GP3", "GP2", null, null, null], + "rows": ["GP27", "GP10", "GP11", "GP12", "GP13", "GP14"] + }, + "processor": "RP2040", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 0], "x": 2, "y": 0, "flags": 1}, + {"matrix": [0, 2], "x": 19, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 31, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 43, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 55, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 73, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 85, "y": 0, "flags": 4}, + {"matrix": [1, 7], "x": 87, "y": 13, "flags": 4}, + {"matrix": [1, 6], "x": 74, "y": 13, "flags": 4}, + {"matrix": [1, 5], "x": 62, "y": 13, "flags": 4}, + {"matrix": [1, 4], "x": 50, "y": 13, "flags": 4}, + {"matrix": [1, 3], "x": 38, "y": 13, "flags": 4}, + {"matrix": [1, 2], "x": 26, "y": 13, "flags": 4}, + {"matrix": [1, 1], "x": 14, "y": 13, "flags": 4}, + {"matrix": [1, 0], "x": 2, "y": 13, "flags": 4}, + {"matrix": [2, 0], "x": 5, "y": 26, "flags": 1}, + {"matrix": [2, 1], "x": 20, "y": 26, "flags": 4}, + {"matrix": [2, 2], "x": 32, "y": 26, "flags": 4}, + {"matrix": [2, 3], "x": 44, "y": 26, "flags": 4}, + {"matrix": [2, 4], "x": 56, "y": 26, "flags": 4}, + {"matrix": [2, 5], "x": 68, "y": 26, "flags": 4}, + {"matrix": [2, 6], "x": 71, "y": 26, "flags": 4}, + {"matrix": [3, 6], "x": 84, "y": 38, "flags": 4}, + {"matrix": [3, 5], "x": 71, "y": 38, "flags": 4}, + {"matrix": [3, 4], "x": 59, "y": 38, "flags": 4}, + {"matrix": [3, 3], "x": 47, "y": 38, "flags": 4}, + {"matrix": [3, 2], "x": 35, "y": 38, "flags": 4}, + {"matrix": [3, 1], "x": 23, "y": 38, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 38, "flags": 1}, + {"matrix": [4, 0], "x": 9, "y": 51, "flags": 1}, + {"matrix": [4, 1], "x": 29, "y": 51, "flags": 4}, + {"matrix": [4, 2], "x": 41, "y": 51, "flags": 4}, + {"matrix": [4, 3], "x": 53, "y": 51, "flags": 4}, + {"matrix": [4, 4], "x": 65, "y": 51, "flags": 4}, + {"matrix": [4, 5], "x": 77, "y": 51, "flags": 4}, + {"matrix": [5, 5], "x": 84, "y": 64, "flags": 1}, + {"matrix": [5, 4], "x": 61, "y": 64, "flags": 4}, + {"matrix": [5, 2], "x": 35, "y": 64, "flags": 1}, + {"matrix": [5, 1], "x": 20, "y": 64, "flags": 1}, + {"matrix": [5, 0], "x": 5, "y": 64, "flags": 1}, + {"matrix": [6, 10], "x": 224, "y": 0, "flags": 4}, + {"matrix": [6, 9], "x": 212, "y": 0, "flags": 4}, + {"matrix": [6, 8], "x": 200, "y": 0, "flags": 4}, + {"matrix": [6, 7], "x": 184, "y": 0, "flags": 4}, + {"matrix": [6, 5], "x": 167, "y": 0, "flags": 4}, + {"matrix": [6, 4], "x": 155, "y": 0, "flags": 4}, + {"matrix": [6, 3], "x": 143, "y": 0, "flags": 4}, + {"matrix": [6, 2], "x": 131, "y": 0, "flags": 4}, + {"matrix": [6, 1], "x": 113, "y": 0, "flags": 4}, + {"matrix": [6, 0], "x": 101, "y": 0, "flags": 4}, + {"matrix": [7, 0], "x": 99, "y": 13, "flags": 4}, + {"matrix": [7, 1], "x": 112, "y": 13, "flags": 4}, + {"matrix": [7, 2], "x": 124, "y": 13, "flags": 4}, + {"matrix": [7, 3], "x": 136, "y": 13, "flags": 4}, + {"matrix": [7, 4], "x": 148, "y": 13, "flags": 4}, + {"matrix": [7, 5], "x": 160, "y": 13, "flags": 4}, + {"matrix": [7, 7], "x": 178, "y": 13, "flags": 1}, + {"matrix": [7, 8], "x": 200, "y": 13, "flags": 4}, + {"matrix": [7, 9], "x": 212, "y": 13, "flags": 4}, + {"matrix": [7, 10], "x": 224, "y": 13, "flags": 4}, + {"matrix": [8, 10], "x": 224, "y": 26, "flags": 4}, + {"matrix": [8, 9], "x": 212, "y": 26, "flags": 4}, + {"matrix": [8, 8], "x": 200, "y": 26, "flags": 4}, + {"matrix": [8, 7], "x": 181, "y": 26, "flags": 4}, + {"matrix": [8, 6], "x": 166, "y": 26, "flags": 4}, + {"matrix": [8, 5], "x": 154, "y": 26, "flags": 4}, + {"matrix": [8, 4], "x": 142, "y": 26, "flags": 4}, + {"matrix": [8, 3], "x": 130, "y": 26, "flags": 4}, + {"matrix": [8, 2], "x": 118, "y": 26, "flags": 4}, + {"matrix": [8, 1], "x": 105, "y": 26, "flags": 4}, + {"matrix": [8, 0], "x": 93, "y": 26, "flags": 4}, + {"matrix": [9, 0], "x": 96, "y": 38, "flags": 4}, + {"matrix": [9, 1], "x": 109, "y": 38, "flags": 4}, + {"matrix": [9, 2], "x": 121, "y": 38, "flags": 4}, + {"matrix": [9, 3], "x": 133, "y": 38, "flags": 4}, + {"matrix": [9, 4], "x": 145, "y": 38, "flags": 4}, + {"matrix": [9, 5], "x": 157, "y": 38, "flags": 4}, + {"matrix": [9, 7], "x": 177, "y": 38, "flags": 1}, + {"matrix": [10, 9], "x": 212, "y": 51, "flags": 4}, + {"matrix": [10, 7], "x": 184, "y": 45, "flags": 1}, + {"matrix": [10, 6], "x": 174, "y": 51, "flags": 1}, + {"matrix": [10, 5], "x": 151, "y": 51, "flags": 4}, + {"matrix": [10, 4], "x": 139, "y": 51, "flags": 4}, + {"matrix": [10, 3], "x": 127, "y": 51, "flags": 4}, + {"matrix": [10, 2], "x": 115, "y": 51, "flags": 4}, + {"matrix": [10, 1], "x": 102, "y": 51, "flags": 4}, + {"matrix": [10, 0], "x": 90, "y": 51, "flags": 4}, + {"matrix": [11, 1], "x": 96, "y": 64, "flags": 1}, + {"matrix": [11, 2], "x": 110, "y": 64, "flags": 4}, + {"matrix": [11, 4], "x": 137, "y": 64, "flags": 1}, + {"matrix": [11, 5], "x": 153, "y": 64, "flags": 1}, + {"matrix": [11, 6], "x": 168, "y": 64, "flags": 1}, + {"matrix": [11, 7], "x": 183, "y": 64, "flags": 1}, + {"matrix": [11, 8], "x": 200, "y": 64, "flags": 1}, + {"matrix": [11, 9], "x": 212, "y": 64, "flags": 1}, + {"matrix": [11, 10], "x": 224, "y": 64, "flags": 1}, + {"x": 224, "y": 40, "flags": 8}, + {"x": 224, "y": 45, "flags": 8}, + {"x": 224, "y": 50, "flags": 8} + ], + "max_brightness": 120, + "sleep": true, + "split_count": [40, 59] + }, + "split": { + "bootmagic": { + "matrix": [6, 0] + }, + "enabled": true, + "matrix_pins": { + "right": { + "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP27", "GP17", "GP13"], + "rows": ["GP10", "GP11", "GP12", "GP28", "GP19", "GP16"] + } + }, + "transport": { + "protocol": "serial_usart", + "sync": { + "indicators": true, + "layer_state": true, + "matrix_state": true + } + } + }, + "url": "", + "usb": { + "device_version": "1.0.2", + "pid": "0x0006", + "vid": "0x4552" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP20" + }, + "layout_aliases": { + "LAYOUT_all": "LAYOUT_split_tkl_ansi_split_rshift_bs_rspace", + "LAYOUT_ansi": "LAYOUT_split_tkl_ansi", + "LAYOUT_ansi_split_bs": "LAYOUT_split_tkl_ansi_split_bs", + "LAYOUT_ansi_split_rshift": "LAYOUT_split_tkl_ansi_split_rshift", + "LAYOUT_ansi_split_rshift_bs": "LAYOUT_split_tkl_ansi_split_rshift_bs" + }, + "layouts": { + "LAYOUT_split_tkl_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [6, 0], "x": 9.5, "y": 0}, + {"matrix": [6, 1], "x": 10.5, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0}, + {"matrix": [6, 3], "x": 13, "y": 0}, + {"matrix": [6, 4], "x": 14, "y": 0}, + {"matrix": [6, 5], "x": 15, "y": 0}, + {"matrix": [6, 7], "x": 16.5, "y": 0}, + {"matrix": [6, 8], "x": 17.75, "y": 0}, + {"matrix": [6, 9], "x": 18.75, "y": 0}, + {"matrix": [6, 10], "x": 19.75, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [7, 0], "x": 9.5, "y": 1.5}, + {"matrix": [7, 1], "x": 10.5, "y": 1.5}, + {"matrix": [7, 2], "x": 11.5, "y": 1.5}, + {"matrix": [7, 3], "x": 12.5, "y": 1.5}, + {"matrix": [7, 4], "x": 13.5, "y": 1.5}, + {"matrix": [7, 5], "x": 14.5, "y": 1.5}, + {"matrix": [7, 7], "x": 15.5, "y": 1.5, "w": 2}, + {"matrix": [7, 8], "x": 17.75, "y": 1.5}, + {"matrix": [7, 9], "x": 18.75, "y": 1.5}, + {"matrix": [7, 10], "x": 19.75, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [8, 0], "x": 9, "y": 2.5}, + {"matrix": [8, 1], "x": 10, "y": 2.5}, + {"matrix": [8, 2], "x": 11, "y": 2.5}, + {"matrix": [8, 3], "x": 12, "y": 2.5}, + {"matrix": [8, 4], "x": 13, "y": 2.5}, + {"matrix": [8, 5], "x": 14, "y": 2.5}, + {"matrix": [8, 6], "x": 15, "y": 2.5}, + {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25}, + {"matrix": [8, 8], "x": 17.75, "y": 2.5}, + {"matrix": [8, 9], "x": 18.75, "y": 2.5}, + {"matrix": [8, 10], "x": 19.75, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [9, 0], "x": 9.25, "y": 3.5}, + {"matrix": [9, 1], "x": 10.25, "y": 3.5}, + {"matrix": [9, 2], "x": 11.25, "y": 3.5}, + {"matrix": [9, 3], "x": 12.25, "y": 3.5}, + {"matrix": [9, 4], "x": 13.25, "y": 3.5}, + {"matrix": [9, 5], "x": 14.25, "y": 3.5}, + {"matrix": [9, 7], "x": 15.25, "y": 3.5, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [10, 0], "x": 8.75, "y": 4.5}, + {"matrix": [10, 1], "x": 9.75, "y": 4.5}, + {"matrix": [10, 2], "x": 10.75, "y": 4.5}, + {"matrix": [10, 3], "x": 11.75, "y": 4.5}, + {"matrix": [10, 4], "x": 12.75, "y": 4.5}, + {"matrix": [10, 5], "x": 13.75, "y": 4.5}, + {"matrix": [10, 6], "x": 14.75, "y": 4.5, "w": 2.75}, + {"matrix": [10, 9], "x": 18.75, "y": 4.5}, + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 4], "x": 4, "y": 5.5, "w": 2.75}, + {"matrix": [5, 5], "x": 6.75, "y": 5.5}, + {"matrix": [11, 2], "x": 9.25, "y": 5.5, "w": 3.25}, + {"matrix": [11, 4], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 5], "x": 13.75, "y": 5.5, "w": 1.25}, + {"matrix": [11, 6], "x": 15, "y": 5.5, "w": 1.25}, + {"matrix": [11, 7], "x": 16.25, "y": 5.5, "w": 1.25}, + {"matrix": [11, 8], "x": 17.75, "y": 5.5}, + {"matrix": [11, 9], "x": 18.75, "y": 5.5}, + {"matrix": [11, 10], "x": 19.75, "y": 5.5} + ] + }, + "LAYOUT_split_tkl_ansi_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [6, 0], "x": 9.5, "y": 0}, + {"matrix": [6, 1], "x": 10.5, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0}, + {"matrix": [6, 3], "x": 13, "y": 0}, + {"matrix": [6, 4], "x": 14, "y": 0}, + {"matrix": [6, 5], "x": 15, "y": 0}, + {"matrix": [6, 7], "x": 16.5, "y": 0}, + {"matrix": [6, 8], "x": 17.75, "y": 0}, + {"matrix": [6, 9], "x": 18.75, "y": 0}, + {"matrix": [6, 10], "x": 19.75, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [7, 0], "x": 9.5, "y": 1.5}, + {"matrix": [7, 1], "x": 10.5, "y": 1.5}, + {"matrix": [7, 2], "x": 11.5, "y": 1.5}, + {"matrix": [7, 3], "x": 12.5, "y": 1.5}, + {"matrix": [7, 4], "x": 13.5, "y": 1.5}, + {"matrix": [7, 5], "x": 14.5, "y": 1.5}, + {"matrix": [7, 6], "x": 15.5, "y": 1.5}, + {"matrix": [7, 7], "x": 16.5, "y": 1.5}, + {"matrix": [7, 8], "x": 17.75, "y": 1.5}, + {"matrix": [7, 9], "x": 18.75, "y": 1.5}, + {"matrix": [7, 10], "x": 19.75, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [8, 0], "x": 9, "y": 2.5}, + {"matrix": [8, 1], "x": 10, "y": 2.5}, + {"matrix": [8, 2], "x": 11, "y": 2.5}, + {"matrix": [8, 3], "x": 12, "y": 2.5}, + {"matrix": [8, 4], "x": 13, "y": 2.5}, + {"matrix": [8, 5], "x": 14, "y": 2.5}, + {"matrix": [8, 6], "x": 15, "y": 2.5}, + {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25}, + {"matrix": [8, 8], "x": 17.75, "y": 2.5}, + {"matrix": [8, 9], "x": 18.75, "y": 2.5}, + {"matrix": [8, 10], "x": 19.75, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [9, 0], "x": 9.25, "y": 3.5}, + {"matrix": [9, 1], "x": 10.25, "y": 3.5}, + {"matrix": [9, 2], "x": 11.25, "y": 3.5}, + {"matrix": [9, 3], "x": 12.25, "y": 3.5}, + {"matrix": [9, 4], "x": 13.25, "y": 3.5}, + {"matrix": [9, 5], "x": 14.25, "y": 3.5}, + {"matrix": [9, 7], "x": 15.25, "y": 3.5, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [10, 0], "x": 8.75, "y": 4.5}, + {"matrix": [10, 1], "x": 9.75, "y": 4.5}, + {"matrix": [10, 2], "x": 10.75, "y": 4.5}, + {"matrix": [10, 3], "x": 11.75, "y": 4.5}, + {"matrix": [10, 4], "x": 12.75, "y": 4.5}, + {"matrix": [10, 5], "x": 13.75, "y": 4.5}, + {"matrix": [10, 6], "x": 14.75, "y": 4.5, "w": 2.75}, + {"matrix": [10, 9], "x": 18.75, "y": 4.5}, + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 4], "x": 4, "y": 5.5, "w": 2.75}, + {"matrix": [5, 5], "x": 6.75, "y": 5.5}, + {"matrix": [11, 2], "x": 9.25, "y": 5.5, "w": 3.25}, + {"matrix": [11, 4], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 5], "x": 13.75, "y": 5.5, "w": 1.25}, + {"matrix": [11, 6], "x": 15, "y": 5.5, "w": 1.25}, + {"matrix": [11, 7], "x": 16.25, "y": 5.5, "w": 1.25}, + {"matrix": [11, 8], "x": 17.75, "y": 5.5}, + {"matrix": [11, 9], "x": 18.75, "y": 5.5}, + {"matrix": [11, 10], "x": 19.75, "y": 5.5} + ] + }, + "LAYOUT_split_tkl_ansi_split_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [6, 0], "x": 9.5, "y": 0}, + {"matrix": [6, 1], "x": 10.5, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0}, + {"matrix": [6, 3], "x": 13, "y": 0}, + {"matrix": [6, 4], "x": 14, "y": 0}, + {"matrix": [6, 5], "x": 15, "y": 0}, + {"matrix": [6, 7], "x": 16.5, "y": 0}, + {"matrix": [6, 8], "x": 17.75, "y": 0}, + {"matrix": [6, 9], "x": 18.75, "y": 0}, + {"matrix": [6, 10], "x": 19.75, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [7, 0], "x": 9.5, "y": 1.5}, + {"matrix": [7, 1], "x": 10.5, "y": 1.5}, + {"matrix": [7, 2], "x": 11.5, "y": 1.5}, + {"matrix": [7, 3], "x": 12.5, "y": 1.5}, + {"matrix": [7, 4], "x": 13.5, "y": 1.5}, + {"matrix": [7, 5], "x": 14.5, "y": 1.5}, + {"matrix": [7, 6], "x": 15.5, "y": 1.5, "w": 2}, + {"matrix": [7, 8], "x": 17.75, "y": 1.5}, + {"matrix": [7, 9], "x": 18.75, "y": 1.5}, + {"matrix": [7, 10], "x": 19.75, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [8, 0], "x": 9, "y": 2.5}, + {"matrix": [8, 1], "x": 10, "y": 2.5}, + {"matrix": [8, 2], "x": 11, "y": 2.5}, + {"matrix": [8, 3], "x": 12, "y": 2.5}, + {"matrix": [8, 4], "x": 13, "y": 2.5}, + {"matrix": [8, 5], "x": 14, "y": 2.5}, + {"matrix": [8, 6], "x": 15, "y": 2.5}, + {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25}, + {"matrix": [8, 8], "x": 17.75, "y": 2.5}, + {"matrix": [8, 9], "x": 18.75, "y": 2.5}, + {"matrix": [8, 10], "x": 19.75, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [9, 0], "x": 9.25, "y": 3.5}, + {"matrix": [9, 1], "x": 10.25, "y": 3.5}, + {"matrix": [9, 2], "x": 11.25, "y": 3.5}, + {"matrix": [9, 3], "x": 12.25, "y": 3.5}, + {"matrix": [9, 4], "x": 13.25, "y": 3.5}, + {"matrix": [9, 5], "x": 14.25, "y": 3.5}, + {"matrix": [9, 7], "x": 15.25, "y": 3.5, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [10, 0], "x": 8.75, "y": 4.5}, + {"matrix": [10, 1], "x": 9.75, "y": 4.5}, + {"matrix": [10, 2], "x": 10.75, "y": 4.5}, + {"matrix": [10, 3], "x": 11.75, "y": 4.5}, + {"matrix": [10, 4], "x": 12.75, "y": 4.5}, + {"matrix": [10, 5], "x": 13.75, "y": 4.5}, + {"matrix": [10, 6], "x": 14.75, "y": 4.5, "w": 1.75}, + {"matrix": [10, 7], "x": 16.5, "y": 4.5}, + {"matrix": [10, 9], "x": 18.75, "y": 4.5}, + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 4], "x": 4, "y": 5.5, "w": 2.75}, + {"matrix": [5, 5], "x": 6.75, "y": 5.5}, + {"matrix": [11, 2], "x": 9.25, "y": 5.5, "w": 3.25}, + {"matrix": [11, 4], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 5], "x": 13.75, "y": 5.5, "w": 1.25}, + {"matrix": [11, 6], "x": 15, "y": 5.5, "w": 1.25}, + {"matrix": [11, 7], "x": 16.25, "y": 5.5, "w": 1.25}, + {"matrix": [11, 8], "x": 17.75, "y": 5.5}, + {"matrix": [11, 9], "x": 18.75, "y": 5.5}, + {"matrix": [11, 10], "x": 19.75, "y": 5.5} + ] + }, + "LAYOUT_split_tkl_ansi_split_rshift_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [6, 0], "x": 9.5, "y": 0}, + {"matrix": [6, 1], "x": 10.5, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0}, + {"matrix": [6, 3], "x": 13, "y": 0}, + {"matrix": [6, 4], "x": 14, "y": 0}, + {"matrix": [6, 5], "x": 15, "y": 0}, + {"matrix": [6, 7], "x": 16.5, "y": 0}, + {"matrix": [6, 8], "x": 17.75, "y": 0}, + {"matrix": [6, 9], "x": 18.75, "y": 0}, + {"matrix": [6, 10], "x": 19.75, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [7, 0], "x": 9.5, "y": 1.5}, + {"matrix": [7, 1], "x": 10.5, "y": 1.5}, + {"matrix": [7, 2], "x": 11.5, "y": 1.5}, + {"matrix": [7, 3], "x": 12.5, "y": 1.5}, + {"matrix": [7, 4], "x": 13.5, "y": 1.5}, + {"matrix": [7, 5], "x": 14.5, "y": 1.5}, + {"matrix": [7, 6], "x": 15.5, "y": 1.5}, + {"matrix": [7, 7], "x": 16.5, "y": 1.5}, + {"matrix": [7, 8], "x": 17.75, "y": 1.5}, + {"matrix": [7, 9], "x": 18.75, "y": 1.5}, + {"matrix": [7, 10], "x": 19.75, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [8, 0], "x": 9, "y": 2.5}, + {"matrix": [8, 1], "x": 10, "y": 2.5}, + {"matrix": [8, 2], "x": 11, "y": 2.5}, + {"matrix": [8, 3], "x": 12, "y": 2.5}, + {"matrix": [8, 4], "x": 13, "y": 2.5}, + {"matrix": [8, 5], "x": 14, "y": 2.5}, + {"matrix": [8, 6], "x": 15, "y": 2.5}, + {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25}, + {"matrix": [8, 8], "x": 17.75, "y": 2.5}, + {"matrix": [8, 9], "x": 18.75, "y": 2.5}, + {"matrix": [8, 10], "x": 19.75, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [9, 0], "x": 9.25, "y": 3.5}, + {"matrix": [9, 1], "x": 10.25, "y": 3.5}, + {"matrix": [9, 2], "x": 11.25, "y": 3.5}, + {"matrix": [9, 3], "x": 12.25, "y": 3.5}, + {"matrix": [9, 4], "x": 13.25, "y": 3.5}, + {"matrix": [9, 5], "x": 14.25, "y": 3.5}, + {"matrix": [9, 7], "x": 15.25, "y": 3.5, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [10, 0], "x": 8.75, "y": 4.5}, + {"matrix": [10, 1], "x": 9.75, "y": 4.5}, + {"matrix": [10, 2], "x": 10.75, "y": 4.5}, + {"matrix": [10, 3], "x": 11.75, "y": 4.5}, + {"matrix": [10, 4], "x": 12.75, "y": 4.5}, + {"matrix": [10, 5], "x": 13.75, "y": 4.5}, + {"matrix": [10, 6], "x": 14.75, "y": 4.5, "w": 1.75}, + {"matrix": [10, 7], "x": 16.5, "y": 4.5}, + {"matrix": [10, 9], "x": 18.75, "y": 4.5}, + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 4], "x": 4, "y": 5.5, "w": 2.75}, + {"matrix": [5, 5], "x": 6.75, "y": 5.5}, + {"matrix": [11, 2], "x": 9.25, "y": 5.5, "w": 3.25}, + {"matrix": [11, 4], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 5], "x": 13.75, "y": 5.5, "w": 1.25}, + {"matrix": [11, 6], "x": 15, "y": 5.5, "w": 1.25}, + {"matrix": [11, 7], "x": 16.25, "y": 5.5, "w": 1.25}, + {"matrix": [11, 8], "x": 17.75, "y": 5.5}, + {"matrix": [11, 9], "x": 18.75, "y": 5.5}, + {"matrix": [11, 10], "x": 19.75, "y": 5.5} + ] + }, + "LAYOUT_split_tkl_ansi_split_rshift_bs_rspace": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [6, 0], "x": 9.5, "y": 0}, + {"matrix": [6, 1], "x": 10.5, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0}, + {"matrix": [6, 3], "x": 13, "y": 0}, + {"matrix": [6, 4], "x": 14, "y": 0}, + {"matrix": [6, 5], "x": 15, "y": 0}, + {"matrix": [6, 7], "x": 16.5, "y": 0}, + {"matrix": [6, 8], "x": 17.75, "y": 0}, + {"matrix": [6, 9], "x": 18.75, "y": 0}, + {"matrix": [6, 10], "x": 19.75, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [7, 0], "x": 9.5, "y": 1.5}, + {"matrix": [7, 1], "x": 10.5, "y": 1.5}, + {"matrix": [7, 2], "x": 11.5, "y": 1.5}, + {"matrix": [7, 3], "x": 12.5, "y": 1.5}, + {"matrix": [7, 4], "x": 13.5, "y": 1.5}, + {"matrix": [7, 5], "x": 14.5, "y": 1.5}, + {"matrix": [7, 6], "x": 15.5, "y": 1.5}, + {"matrix": [7, 7], "x": 16.5, "y": 1.5}, + {"matrix": [7, 8], "x": 17.75, "y": 1.5}, + {"matrix": [7, 9], "x": 18.75, "y": 1.5}, + {"matrix": [7, 10], "x": 19.75, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [8, 0], "x": 9, "y": 2.5}, + {"matrix": [8, 1], "x": 10, "y": 2.5}, + {"matrix": [8, 2], "x": 11, "y": 2.5}, + {"matrix": [8, 3], "x": 12, "y": 2.5}, + {"matrix": [8, 4], "x": 13, "y": 2.5}, + {"matrix": [8, 5], "x": 14, "y": 2.5}, + {"matrix": [8, 6], "x": 15, "y": 2.5}, + {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25}, + {"matrix": [8, 8], "x": 17.75, "y": 2.5}, + {"matrix": [8, 9], "x": 18.75, "y": 2.5}, + {"matrix": [8, 10], "x": 19.75, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [9, 0], "x": 9.25, "y": 3.5}, + {"matrix": [9, 1], "x": 10.25, "y": 3.5}, + {"matrix": [9, 2], "x": 11.25, "y": 3.5}, + {"matrix": [9, 3], "x": 12.25, "y": 3.5}, + {"matrix": [9, 4], "x": 13.25, "y": 3.5}, + {"matrix": [9, 5], "x": 14.25, "y": 3.5}, + {"matrix": [9, 7], "x": 15.25, "y": 3.5, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [10, 0], "x": 8.75, "y": 4.5}, + {"matrix": [10, 1], "x": 9.75, "y": 4.5}, + {"matrix": [10, 2], "x": 10.75, "y": 4.5}, + {"matrix": [10, 3], "x": 11.75, "y": 4.5}, + {"matrix": [10, 4], "x": 12.75, "y": 4.5}, + {"matrix": [10, 5], "x": 13.75, "y": 4.5}, + {"matrix": [10, 6], "x": 14.75, "y": 4.5, "w": 1.75}, + {"matrix": [10, 7], "x": 16.5, "y": 4.5}, + {"matrix": [10, 9], "x": 18.75, "y": 4.5}, + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 4], "x": 4, "y": 5.5, "w": 2.75}, + {"matrix": [5, 5], "x": 6.75, "y": 5.5}, + {"matrix": [11, 1], "x": 9.25, "y": 5.5}, + {"matrix": [11, 2], "x": 10.25, "y": 5.5, "w": 2.25}, + {"matrix": [11, 4], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 5], "x": 13.75, "y": 5.5, "w": 1.25}, + {"matrix": [11, 6], "x": 15, "y": 5.5, "w": 1.25}, + {"matrix": [11, 7], "x": 16.25, "y": 5.5, "w": 1.25}, + {"matrix": [11, 8], "x": 17.75, "y": 5.5}, + {"matrix": [11, 9], "x": 18.75, "y": 5.5}, + {"matrix": [11, 10], "x": 19.75, "y": 5.5} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/era/sirind/tomak/keymaps/default/keymap.c b/keyboards/era/sirind/tomak/keymaps/default/keymap.c new file mode 100644 index 00000000000..62941ff8b7a --- /dev/null +++ b/keyboards/era/sirind/tomak/keymaps/default/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2023 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + 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_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_all( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_MOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/sirind/tomak/keymaps/default_ansi/keymap.c b/keyboards/era/sirind/tomak/keymaps/default_ansi/keymap.c new file mode 100644 index 00000000000..3823cc69c36 --- /dev/null +++ b/keyboards/era/sirind/tomak/keymaps/default_ansi/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2023 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_ansi( + 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_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_ansi( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_MOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/sirind/tomak/keymaps/default_ansi_split_bs/keymap.c b/keyboards/era/sirind/tomak/keymaps/default_ansi_split_bs/keymap.c new file mode 100644 index 00000000000..87f3072a9e1 --- /dev/null +++ b/keyboards/era/sirind/tomak/keymaps/default_ansi_split_bs/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2023 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_ansi_split_bs( + 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_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_ansi_split_bs( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_MOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/sirind/tomak/keymaps/default_ansi_split_rshift/keymap.c b/keyboards/era/sirind/tomak/keymaps/default_ansi_split_rshift/keymap.c new file mode 100644 index 00000000000..6b8fb56e339 --- /dev/null +++ b/keyboards/era/sirind/tomak/keymaps/default_ansi_split_rshift/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2023 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_ansi_split_rshift( + 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_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_ansi_split_rshift( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_MOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/sirind/tomak/keymaps/default_ansi_split_rshift_bs/keymap.c b/keyboards/era/sirind/tomak/keymaps/default_ansi_split_rshift_bs/keymap.c new file mode 100644 index 00000000000..380689dd46b --- /dev/null +++ b/keyboards/era/sirind/tomak/keymaps/default_ansi_split_rshift_bs/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2023 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_ansi_split_rshift_bs( + 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_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_ansi_split_rshift_bs( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_MOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/sirind/tomak/keymaps/via/keymap.c b/keyboards/era/sirind/tomak/keymaps/via/keymap.c new file mode 100644 index 00000000000..62941ff8b7a --- /dev/null +++ b/keyboards/era/sirind/tomak/keymaps/via/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2023 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + 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_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_all( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_MOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/sirind/tomak/keymaps/via/rules.mk b/keyboards/era/sirind/tomak/keymaps/via/rules.mk new file mode 100644 index 00000000000..036bd6d1c3e --- /dev/null +++ b/keyboards/era/sirind/tomak/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/era/sirind/tomak/readme.md b/keyboards/era/sirind/tomak/readme.md new file mode 100644 index 00000000000..0834dfd6a87 --- /dev/null +++ b/keyboards/era/sirind/tomak/readme.md @@ -0,0 +1,27 @@ +# Tomak + +![Tomak](https://i.imgur.com/CmVR0G1.jpeg) + +Ergonomics Split Keyboard powered by RP2040. + +* Keyboard Maintainer: [ERA](https://github.com/eerraa) +* Hardware supported: SIRIND Tomak +* Hardware availability: [Syryan](https://srind.mysoho.com/) + +Make example for this keyboard (after setting up your build environment): + + make era/sirind/tomak:default + +Flashing example for this keyboard: + + make era/sirind/tomak: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the 'top-left(ESC, F7)' key and plug in the keyboard. +* **Physical reset**: Short the 'RESET' and 'GND' holes twice within one second, or plug in the keyboard with the 'BOOT' and 'GND' holes shorted. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. \ No newline at end of file diff --git a/keyboards/era/sirind/tomak/rules.mk b/keyboards/era/sirind/tomak/rules.mk new file mode 100644 index 00000000000..743228e94b6 --- /dev/null +++ b/keyboards/era/sirind/tomak/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = vendor \ No newline at end of file diff --git a/keyboards/era/sirind/tomak/tomak.c b/keyboards/era/sirind/tomak/tomak.c new file mode 100644 index 00000000000..8533cd4a737 --- /dev/null +++ b/keyboards/era/sirind/tomak/tomak.c @@ -0,0 +1,16 @@ +// Copyright 2023 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "quantum.h" + +bool rgb_matrix_indicators_kb(void) { + if (!rgb_matrix_indicators_user()) { + return false; + } + if (host_keyboard_led_state().caps_lock) { + rgb_matrix_set_color(96, 0, 128, 128); + rgb_matrix_set_color(97, 0, 128, 128); + rgb_matrix_set_color(98, 0, 128, 128); + } + return true; +} \ No newline at end of file From 284e29d4a1edcdd4bcaeb9a41d824d471369ceaf Mon Sep 17 00:00:00 2001 From: Alabahuy Date: Tue, 30 Apr 2024 09:42:32 +0700 Subject: [PATCH 204/333] [Keyboard] add jaykeeb jk65 (#23536) --- keyboards/jaykeeb/jk65/info.json | 410 ++++++++++++++++++ .../jaykeeb/jk65/keymaps/default/keymap.c | 22 + keyboards/jaykeeb/jk65/keymaps/via/keymap.c | 21 + keyboards/jaykeeb/jk65/keymaps/via/rules.mk | 1 + keyboards/jaykeeb/jk65/matrix_diagram.md | 24 + keyboards/jaykeeb/jk65/readme.md | 27 ++ keyboards/jaykeeb/jk65/rules.mk | 1 + 7 files changed, 506 insertions(+) create mode 100644 keyboards/jaykeeb/jk65/info.json create mode 100644 keyboards/jaykeeb/jk65/keymaps/default/keymap.c create mode 100644 keyboards/jaykeeb/jk65/keymaps/via/keymap.c create mode 100644 keyboards/jaykeeb/jk65/keymaps/via/rules.mk create mode 100644 keyboards/jaykeeb/jk65/matrix_diagram.md create mode 100644 keyboards/jaykeeb/jk65/readme.md create mode 100644 keyboards/jaykeeb/jk65/rules.mk diff --git a/keyboards/jaykeeb/jk65/info.json b/keyboards/jaykeeb/jk65/info.json new file mode 100644 index 00000000000..0be07caacdc --- /dev/null +++ b/keyboards/jaykeeb/jk65/info.json @@ -0,0 +1,410 @@ +{ + "manufacturer": "Jaykeeb Studio", + "keyboard_name": "JK65", + "maintainer": "Alabahuy", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["GP24", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], + "rows": ["GP29", "GP0", "GP15", "GP26", "GP27"] + }, + "indicators": { + "caps_lock": "GP25", + "on_state": 0 + }, + "processor": "RP2040", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x7765", + "vid": "0x414C" + }, + "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"], + "layouts": { + "LAYOUT_all": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "Delete", "matrix": [1, 13], "x": 14, "y": 0}, + {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "End", "matrix": [1, 14], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3}, + {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "End", "matrix": [1, 14], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3}, + {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker_split_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "Delete", "matrix": [1, 13], "x": 14, "y": 0}, + {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "End", "matrix": [1, 14], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3}, + {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker_tsangan": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "End", "matrix": [1, 14], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3}, + {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker_tsangan_split_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "Delete", "matrix": [1, 13], "x": 14, "y": 0}, + {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "End", "matrix": [1, 14], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3}, + {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/jaykeeb/jk65/keymaps/default/keymap.c b/keyboards/jaykeeb/jk65/keymaps/default/keymap.c new file mode 100644 index 00000000000..de10b49a6cf --- /dev/null +++ b/keyboards/jaykeeb/jk65/keymaps/default/keymap.c @@ -0,0 +1,22 @@ +// Copyright 2024 Alabahuy +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_65_ansi_blocker( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_65_ansi_blocker( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, + _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/jaykeeb/jk65/keymaps/via/keymap.c b/keyboards/jaykeeb/jk65/keymaps/via/keymap.c new file mode 100644 index 00000000000..bc93e7ea2be --- /dev/null +++ b/keyboards/jaykeeb/jk65/keymaps/via/keymap.c @@ -0,0 +1,21 @@ +// Copyright 2024 Alabahuy +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, + _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/jaykeeb/jk65/keymaps/via/rules.mk b/keyboards/jaykeeb/jk65/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/jaykeeb/jk65/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/jaykeeb/jk65/matrix_diagram.md b/keyboards/jaykeeb/jk65/matrix_diagram.md new file mode 100644 index 00000000000..7a36c0ae662 --- /dev/null +++ b/keyboards/jaykeeb/jk65/matrix_diagram.md @@ -0,0 +1,24 @@ +# Matrix Diagram for Jaykeeb JK65 + +``` + ┌───────┐ + 2u Backspace │0D │ + └───────┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │0E │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ +│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2D │1E │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ +│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ +│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │ +├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ +│40 │41 │42 │46 │4A │4B │ │4C │4D │4E │ +└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ +┌────────┐ +│30 │ 2.25u LShift +└────────┘ +┌─────┬───┬─────┬───────────────────────────┬─────┐ +│40 │41 │42 │46 │4B │ Blocker Tsangan +└─────┴───┴─────┴───────────────────────────┴─────┘ +``` diff --git a/keyboards/jaykeeb/jk65/readme.md b/keyboards/jaykeeb/jk65/readme.md new file mode 100644 index 00000000000..e0dbe05c581 --- /dev/null +++ b/keyboards/jaykeeb/jk65/readme.md @@ -0,0 +1,27 @@ +# JK65 + +![jk65]( https://i.imgur.com/NysDAOy.png ) + +Layout 65% support multi layout and keyboard case exiting + +* Keyboard Maintainer: [Alabahuy](https://github.com/Alabahuy) +* Hardware Supported: JK65 PCB, RP2040 +* Hardware Availability: Private GB + +Make example for this keyboard (after setting up your build environment): + + make jaykeeb/jk65:default + +Flashing example for this keyboard: + + make jaykeeb/jk65: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/jaykeeb/jk65/rules.mk b/keyboards/jaykeeb/jk65/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/jaykeeb/jk65/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From b99e09ee0ebdbd473afd2e1dc35266e453c405b2 Mon Sep 17 00:00:00 2001 From: Stefan Gluszek Date: Tue, 30 Apr 2024 04:45:46 +0200 Subject: [PATCH 205/333] [Keyboard] Fatotesa - custom asymmetric split keyboard (#23528) Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/fatotesa/info.json | 144 ++++++++++++++++++++ keyboards/fatotesa/keymaps/default/keymap.c | 30 ++++ keyboards/fatotesa/keymaps/default/rules.mk | 1 + keyboards/fatotesa/readme.md | 25 ++++ keyboards/fatotesa/rules.mk | 1 + 5 files changed, 201 insertions(+) create mode 100644 keyboards/fatotesa/info.json create mode 100644 keyboards/fatotesa/keymaps/default/keymap.c create mode 100644 keyboards/fatotesa/keymaps/default/rules.mk create mode 100644 keyboards/fatotesa/readme.md create mode 100644 keyboards/fatotesa/rules.mk diff --git a/keyboards/fatotesa/info.json b/keyboards/fatotesa/info.json new file mode 100644 index 00000000000..bdd5e40478d --- /dev/null +++ b/keyboards/fatotesa/info.json @@ -0,0 +1,144 @@ +{ + "development_board": "promicro", + "manufacturer": "fatotesa", + "keyboard_name": "fatotesa", + "maintainer": "stefangluszek", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "caps_word": true + }, + "encoder": { + "rotary": [ + { "pin_a": "D1", "pin_b": "D0" , "resolution": 2} + ] + }, + "split": { + "enabled": true, + "soft_serial_pin": "D2", + "usb_detect": { + "enabled": true, + "timeout": 2500 + }, + "matrix_pins": { + "right": { + "cols": ["F4", "F5", "F6", "C6", "F7", "B1", "B3", "B2"], + "rows": ["B6", "E6", "D4", "D7", "B4", "B5"] + } + }, + "bootmagic": { + "matrix": [4, 1] + } + }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", null], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + }, + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "label":"esc", "x":0, "y":0}, + {"matrix": [0, 2], "label":"f1", "x":2, "y":0}, + {"matrix": [0, 3], "label":"f2", "x":3, "y":0}, + {"matrix": [0, 4], "label":"f3", "x":4, "y":0}, + {"matrix": [0, 5], "label":"f4", "x":5, "y":0}, + + {"matrix": [6, 4], "label":"end", "x":13.25, "y":0}, + {"matrix": [6, 5], "label":"ins", "x":14.25, "y":0}, + {"matrix": [6, 6], "label":"del", "x":15.25, "y":0}, + {"matrix": [6, 7], "label":"enc", "x":16.5, "y":0, "encoder": 0}, + + + {"matrix": [1, 0], "label":"`", "x":0, "y":1}, + {"matrix": [1, 1], "label":"1", "x":1, "y":1}, + {"matrix": [1, 2], "label":"2", "x":2, "y":1}, + {"matrix": [1, 3], "label":"3", "x":3, "y":1}, + {"matrix": [1, 4], "label":"4", "x":4, "y":1}, + {"matrix": [1, 5], "label":"5", "x":5, "y":1}, + {"matrix": [1, 6], "label":"6", "x":6, "y":1}, + + {"matrix": [7, 1], "label":"7", "x":9.5, "y":1}, + {"matrix": [7, 2], "label":"8", "x":10.5, "y":1}, + {"matrix": [7, 3], "label":"9", "x":11.5, "y":1}, + {"matrix": [7, 4], "label":"0", "x":12.5, "y":1}, + {"matrix": [7, 5], "label":"-", "x":13.5, "y":1}, + {"matrix": [7, 6], "label":"=", "x":14.5, "y":1}, + {"matrix": [7, 7], "label":"<", "x":15.5, "y":1, "w":2}, + + + {"matrix": [2, 0], "label":"tab", "x":0, "y":2, "w":1.5}, + {"matrix": [2, 1], "label":"q", "x":1.5, "y":2}, + {"matrix": [2, 2], "label":"w", "x":2.5, "y":2}, + {"matrix": [2, 3], "label":"e", "x":3.5, "y":2}, + {"matrix": [2, 4], "label":"r", "x":4.5, "y":2}, + {"matrix": [2, 5], "label":"t", "x":5.5, "y":2}, + + {"matrix": [8, 0], "label":"y", "x":9, "y":2}, + {"matrix": [8, 1], "label":"u", "x":10, "y":2}, + {"matrix": [8, 2], "label":"i", "x":11, "y":2}, + {"matrix": [8, 3], "label":"o", "x":12, "y":2}, + {"matrix": [8, 4], "label":"p", "x":13, "y":2}, + {"matrix": [8, 5], "label":"[", "x":14, "y":2}, + {"matrix": [8, 6], "label":"]", "x":15, "y":2}, + {"matrix": [8, 7], "x":16.25, "y":2, "w":1.25, "h":2}, + + + {"matrix": [3, 0], "label":"caps", "x":0, "y":3, "w":1.75}, + {"matrix": [3, 1], "label":"a", "x":1.75, "y":3}, + {"matrix": [3, 2], "label":"s", "x":2.75, "y":3}, + {"matrix": [3, 3], "label":"d", "x":3.75, "y":3}, + {"matrix": [3, 4], "label":"f", "x":4.75, "y":3}, + {"matrix": [3, 5], "label":"g", "x":5.75, "y":3}, + + {"matrix": [9, 0], "label":"h", "x":9.25, "y":3}, + {"matrix": [9, 1], "label":"j", "x":10.25, "y":3}, + {"matrix": [9, 2], "label":"k", "x":11.25, "y":3}, + {"matrix": [9, 3], "label":"l", "x":12.25, "y":3}, + {"matrix": [9, 4], "label":";", "x":13.25, "y":3}, + {"matrix": [9, 5], "label":"'", "x":14.25, "y":3}, + {"matrix": [9, 6], "label":"\\", "x":15.25, "y":3}, + + + {"matrix": [4, 0], "label":"shift", "x":0, "y":4, "w":1.25}, + {"matrix": [4, 1], "label":"<", "x":1.25, "y":4}, + {"matrix": [4, 2], "label":"z", "x":2.25, "y":4}, + {"matrix": [4, 3], "label":"x", "x":3.25, "y":4}, + {"matrix": [4, 4], "label":"c", "x":4.25, "y":4}, + {"matrix": [4, 5], "label":"v", "x":5.25, "y":4}, + {"matrix": [4, 6], "label":"b", "x":6.25, "y":4}, + + {"matrix": [10, 2], "label":"n", "x":9.75, "y":4}, + {"matrix": [10, 3], "label":"m", "x":10.75, "y":4}, + {"matrix": [10, 4], "label":",", "x":11.75, "y":4}, + {"matrix": [10, 5], "label":".", "x":12.75, "y":4}, + {"matrix": [10, 6], "label":"/", "x":13.75, "y":4}, + {"matrix": [10, 7], "x":14.75, "y":4}, + + + {"matrix": [5, 0], "label":"ctrl", "x":0, "y":5, "w":1.25}, + {"matrix": [5, 1], "label":"win", "x":1.25, "y":5, "w":1.25}, + {"matrix": [5, 2], "label":"alt", "x":2.5, "y":5, "w":1.25}, + {"matrix": [5, 3], "label":"space", "x":3.75, "y":5, "w":1.75}, + {"matrix": [5, 4], "label":"na", "x":5.5, "y":5}, + + {"matrix": [11, 3], "label":"space", "x":10.5, "y":5, "w":2}, + {"matrix": [11, 4], "label":"alt gr", "x":12.5, "y":5, "w":1.25}, + {"matrix": [11, 5], "label":"ctrl", "x":13.75, "y":5, "w":1.25}, + {"matrix": [11, 6], "label":"?", "x":15, "y":5, "w":1.25}, + {"matrix": [11, 7], "label":"?", "x":16.25, "y":5, "w":1.25} + ] + } + } +} diff --git a/keyboards/fatotesa/keymaps/default/keymap.c b/keyboards/fatotesa/keymaps/default/keymap.c new file mode 100644 index 00000000000..1f6aa804889 --- /dev/null +++ b/keyboards/fatotesa/keymaps/default/keymap.c @@ -0,0 +1,30 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, +}; +#endif + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_END, KC_INSERT, KC_DELETE, KC_KB_MUTE, + KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BACKSPACE, + LT(1, KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LEFT_BRACKET, KC_RIGHT_BRACKET, KC_ENTER, + KC_LEFT_CTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SEMICOLON, KC_QUOTE, KC_BACKSLASH, + KC_LEFT_SHIFT, KC_LEFT_ANGLE_BRACKET, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RIGHT_SHIFT, + CW_TOGG, KC_LWIN, KC_LEFT_ALT, KC_BACKSPACE, KC_LEFT_ALT, KC_SPACE, KC_RIGHT_ALT, KC_RIGHT_CTRL, KC_NO, KC_NO + ), + [1] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______ + )}; diff --git a/keyboards/fatotesa/keymaps/default/rules.mk b/keyboards/fatotesa/keymaps/default/rules.mk new file mode 100644 index 00000000000..ee325681483 --- /dev/null +++ b/keyboards/fatotesa/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/fatotesa/readme.md b/keyboards/fatotesa/readme.md new file mode 100644 index 00000000000..a3794cfd667 --- /dev/null +++ b/keyboards/fatotesa/readme.md @@ -0,0 +1,25 @@ +# fatotesa + +![fatotesa](https://i.imgur.com/LbxQcU2.png) + +This is the QMK firmware for the [fat-o-tesa](https://github.com/stefangluszek/fat-o-tesa) keyboard. + +* Keyboard Maintainer: [Stefan Gluszek](https://github.com/stefangluszek) + +Make example for this keyboard (after setting up your build environment): + + make fatotesa:default + +Flashing example for this keyboard: + + make fatotesa: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (4,1) in the matrix and plug in the keyboard - this is somewhat unusual choice but our split halves are not symmetrical and we can't use (0,0) but instead a key that maps to the same matrix position regardless of which part is being connected to the computer and flashed. +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/fatotesa/rules.mk b/keyboards/fatotesa/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/fatotesa/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 4f4602abd532ede6dca9a99dd9c96a52076916d2 Mon Sep 17 00:00:00 2001 From: josh-l-wang <22173775+josh-l-wang@users.noreply.github.com> Date: Mon, 29 Apr 2024 22:49:34 -0400 Subject: [PATCH 206/333] [Keyboard] Vault35 WKL universal (#23519) --- keyboards/jlw/vault35_wkl_universal/config.h | 11 + keyboards/jlw/vault35_wkl_universal/halconf.h | 8 + keyboards/jlw/vault35_wkl_universal/info.json | 765 ++++++++++++++++++ .../keymaps/default/keymap.c | 36 + .../keymaps/default/rules.mk | 1 + keyboards/jlw/vault35_wkl_universal/mcuconf.h | 11 + keyboards/jlw/vault35_wkl_universal/readme.md | 27 + keyboards/jlw/vault35_wkl_universal/rules.mk | 1 + 8 files changed, 860 insertions(+) create mode 100644 keyboards/jlw/vault35_wkl_universal/config.h create mode 100644 keyboards/jlw/vault35_wkl_universal/halconf.h create mode 100644 keyboards/jlw/vault35_wkl_universal/info.json create mode 100644 keyboards/jlw/vault35_wkl_universal/keymaps/default/keymap.c create mode 100644 keyboards/jlw/vault35_wkl_universal/keymaps/default/rules.mk create mode 100644 keyboards/jlw/vault35_wkl_universal/mcuconf.h create mode 100644 keyboards/jlw/vault35_wkl_universal/readme.md create mode 100644 keyboards/jlw/vault35_wkl_universal/rules.mk diff --git a/keyboards/jlw/vault35_wkl_universal/config.h b/keyboards/jlw/vault35_wkl_universal/config.h new file mode 100644 index 00000000000..7edfb1b7c6b --- /dev/null +++ b/keyboards/jlw/vault35_wkl_universal/config.h @@ -0,0 +1,11 @@ +// Copyright 2024 jlw +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define WS2812_PWM_DRIVER PWMD17 +#define WS2812_PWM_CHANNEL 1 +#define WS2812_PWM_PAL_MODE 2 +#define WS2812_PWM_COMPLEMENTARY_OUTPUT +#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_DMA_CHANNEL 1 diff --git a/keyboards/jlw/vault35_wkl_universal/halconf.h b/keyboards/jlw/vault35_wkl_universal/halconf.h new file mode 100644 index 00000000000..e5c3093515a --- /dev/null +++ b/keyboards/jlw/vault35_wkl_universal/halconf.h @@ -0,0 +1,8 @@ +// Copyright 2024 jlw +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/jlw/vault35_wkl_universal/info.json b/keyboards/jlw/vault35_wkl_universal/info.json new file mode 100644 index 00000000000..3274b717731 --- /dev/null +++ b/keyboards/jlw/vault35_wkl_universal/info.json @@ -0,0 +1,765 @@ +{ + "manufacturer": "jlw", + "keyboard_name": "vault 35 WKL universal", + "maintainer": "jlw", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "B0", "pin_b": "A7"}, + {"pin_a": "B2", "pin_b": "B1"}, + {"pin_a": "B3", "pin_b": "A15"}, + {"pin_a": "B5", "pin_b": "B4"}, + {"pin_a": "A1", "pin_b": "A2"} + ] + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["B6", "B8", "A13", "B13", "B14", "A14", "A0", "A3", "A4", "A5", "A6"], + "rows": ["B9", "B12", "B15", "A8"] + }, + "processor": "STM32F072", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "ws2812", + "hue_steps": 4, + "layout": [ + {"matrix": [1, 0], "x": 1, "y": 22, "flags": 4}, + {"matrix": [0, 0], "x": 1, "y": 11, "flags": 4}, + {"matrix": [0, 0], "x": 3, "y": 2, "flags": 4}, + {"matrix": [0, 0], "x": 12, "y": 2, "flags": 4}, + {"matrix": [0, 1], "x": 23, "y": 2, "flags": 4}, + {"matrix": [1, 1], "x": 30, "y": 2, "flags": 4}, + {"matrix": [0, 1], "x": 42, "y": 2, "flags": 4}, + {"matrix": [0, 2], "x": 51, "y": 2, "flags": 4}, + {"matrix": [1, 2], "x": 60, "y": 2, "flags": 4}, + {"matrix": [0, 3], "x": 70, "y": 2, "flags": 4}, + {"matrix": [1, 3], "x": 79, "y": 2, "flags": 4}, + {"matrix": [0, 4], "x": 88, "y": 2, "flags": 4}, + {"matrix": [0, 5], "x": 98, "y": 2, "flags": 4}, + {"matrix": [0, 6], "x": 107, "y": 2, "flags": 4}, + {"matrix": [0, 7], "x": 116, "y": 2, "flags": 4}, + {"matrix": [1, 7], "x": 126, "y": 2, "flags": 4}, + {"matrix": [0, 7], "x": 135, "y": 2, "flags": 4}, + {"matrix": [0, 8], "x": 144, "y": 2, "flags": 4}, + {"matrix": [1, 8], "x": 154, "y": 2, "flags": 4}, + {"matrix": [0, 9], "x": 163, "y": 2, "flags": 4}, + {"matrix": [1, 9], "x": 173, "y": 2, "flags": 4}, + {"matrix": [0, 10], "x": 183, "y": 2, "flags": 4}, + {"matrix": [0, 10], "x": 192, "y": 2, "flags": 4}, + {"matrix": [0, 10], "x": 195, "y": 13, "flags": 4}, + {"matrix": [1, 10], "x": 195, "y": 23, "flags": 4}, + {"matrix": [1, 10], "x": 195, "y": 32, "flags": 4}, + {"matrix": [1, 10], "x": 195, "y": 43, "flags": 4}, + {"matrix": [2, 10], "x": 195, "y": 55, "flags": 4}, + {"matrix": [2, 10], "x": 195, "y": 67, "flags": 4}, + {"matrix": [3, 10], "x": 190, "y": 79, "flags": 4}, + {"matrix": [3, 10], "x": 195, "y": 87, "flags": 4}, + {"matrix": [3, 10], "x": 185, "y": 88, "flags": 4}, + {"matrix": [3, 9], "x": 176, "y": 88, "flags": 4}, + {"matrix": [3, 9], "x": 171, "y": 82, "flags": 4}, + {"matrix": [2, 9], "x": 171, "y": 73, "flags": 4}, + {"matrix": [2, 9], "x": 170, "y": 67, "flags": 4}, + {"matrix": [2, 9], "x": 164, "y": 67, "flags": 4}, + {"matrix": [2, 8], "x": 157, "y": 67, "flags": 4}, + {"matrix": [2, 8], "x": 151, "y": 67, "flags": 4}, + {"matrix": [3, 8], "x": 150, "y": 74, "flags": 4}, + {"matrix": [2, 8], "x": 150, "y": 81, "flags": 4}, + {"matrix": [3, 8], "x": 147, "y": 88, "flags": 4}, + {"matrix": [3, 7], "x": 139, "y": 88, "flags": 4}, + {"matrix": [2, 7], "x": 130, "y": 88, "flags": 4}, + {"matrix": [3, 7], "x": 122, "y": 88, "flags": 4}, + {"matrix": [3, 6], "x": 113, "y": 88, "flags": 4}, + {"matrix": [2, 5], "x": 102, "y": 85, "flags": 4}, + {"matrix": [3, 5], "x": 94, "y": 85, "flags": 4}, + {"matrix": [3, 4], "x": 85, "y": 88, "flags": 4}, + {"matrix": [2, 3], "x": 75, "y": 88, "flags": 4}, + {"matrix": [3, 3], "x": 66, "y": 88, "flags": 4}, + {"matrix": [2, 2], "x": 57, "y": 88, "flags": 4}, + {"matrix": [3, 2], "x": 49, "y": 88, "flags": 4}, + {"matrix": [3, 2], "x": 46, "y": 83, "flags": 4}, + {"matrix": [3, 2], "x": 46, "y": 75, "flags": 4}, + {"matrix": [2, 1], "x": 45, "y": 67, "flags": 4}, + {"matrix": [2, 1], "x": 39, "y": 67, "flags": 4}, + {"matrix": [2, 1], "x": 33, "y": 67, "flags": 4}, + {"matrix": [2, 1], "x": 26, "y": 67, "flags": 4}, + {"matrix": [3, 0], "x": 25, "y": 73, "flags": 4}, + {"matrix": [3, 0], "x": 25, "y": 82, "flags": 4}, + {"matrix": [3, 0], "x": 21, "y": 88, "flags": 4}, + {"matrix": [3, 0], "x": 12, "y": 88, "flags": 4}, + {"matrix": [3, 0], "x": 1, "y": 88, "flags": 4}, + {"matrix": [3, 0], "x": 6, "y": 80, "flags": 4}, + {"matrix": [3, 0], "x": 1, "y": 70, "flags": 4}, + {"matrix": [2, 0], "x": 1, "y": 58, "flags": 4}, + {"matrix": [2, 0], "x": 1, "y": 46, "flags": 4}, + {"matrix": [1, 0], "x": 1, "y": 34, "flags": 4} + ], + "sat_steps": 4, + "val_steps": 4 + }, + "url": "https://jlw-kb.com", + "usb": { + "device_version": "0.0.1", + "pid": "0xA457", + "vid": "0x1209" + }, + "ws2812": { + "driver": "pwm", + "pin": "B7" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_alpha": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2, "w": 1.5}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_katana": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0, "w": 1.25, "h": 2}, + {"matrix": [1, 0], "x": 0.25, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 6], "x": 5.75, "y": 1}, + {"matrix": [1, 7], "x": 6.75, "y": 1}, + {"matrix": [1, 8], "x": 7.75, "y": 1}, + {"matrix": [1, 9], "x": 8.75, "y": 1}, + {"matrix": [1, 10], "x": 9.75, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_katana_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0, "w": 1.25, "h": 2}, + {"matrix": [1, 0], "x": 0.25, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 6], "x": 5.75, "y": 1}, + {"matrix": [1, 7], "x": 6.75, "y": 1}, + {"matrix": [1, 8], "x": 7.75, "y": 1}, + {"matrix": [1, 9], "x": 8.75, "y": 1}, + {"matrix": [1, 10], "x": 9.75, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_ortho_125_center1u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "w": 1.25}, + {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_ortho_150_center1u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.5}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "w": 1.5}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_ortho_2u_bars": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2}, + {"matrix": [3, 6], "x": 5.5, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_ortho_3u_bars": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 3}, + {"matrix": [3, 6], "x": 5.5, "y": 3, "w": 3}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_ortho_6u_bar": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 4], "x": 2.5, "y": 3, "w": 6}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_ortho_cain_bars": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.75}, + {"matrix": [3, 6], "x": 5.5, "y": 3, "w": 1.75}, + {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_ortho_centered_3u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.5}, + {"matrix": [3, 4], "x": 4, "y": 3, "w": 3}, + {"matrix": [3, 7], "x": 7, "y": 3, "w": 1.5}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_row": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 6], "x": 5.25, "y": 1}, + {"matrix": [1, 7], "x": 6.25, "y": 1}, + {"matrix": [1, 8], "x": 7.25, "y": 1}, + {"matrix": [1, 9], "x": 8.25, "y": 1}, + {"matrix": [1, 10], "x": 9.25, "y": 1, "w": 1.75}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_treadstone": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 0.25, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 6], "x": 5.75, "y": 1}, + {"matrix": [1, 7], "x": 6.75, "y": 1}, + {"matrix": [1, 8], "x": 7.75, "y": 1}, + {"matrix": [1, 9], "x": 8.75, "y": 1}, + {"matrix": [1, 10], "x": 9.75, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_uniform": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 6], "x": 5.25, "y": 1}, + {"matrix": [1, 7], "x": 6.25, "y": 1}, + {"matrix": [1, 8], "x": 7.25, "y": 1}, + {"matrix": [1, 9], "x": 8.25, "y": 1}, + {"matrix": [1, 10], "x": 9.25, "y": 1, "w": 1.75}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2, "w": 1.5}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} + ] + } + } +} diff --git a/keyboards/jlw/vault35_wkl_universal/keymaps/default/keymap.c b/keyboards/jlw/vault35_wkl_universal/keymaps/default/keymap.c new file mode 100644 index 00000000000..ae5f304eed6 --- /dev/null +++ b/keyboards/jlw/vault35_wkl_universal/keymaps/default/keymap.c @@ -0,0 +1,36 @@ +// Copyright 2024 jlw +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_VOLU, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_VOLD, KC_H, KC_J, KC_K, KC_L, KC_QUOT, + KC_Z, KC_X, KC_C, KC_V, KC_B, RGB_TOG, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_ESC, MO(1), KC_ENT, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_BSPC + ), + + [1] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, + _______, _______, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, + _______, _______, _______, _______, _______, QK_BOOT, _______, KC_1, KC_2, KC_3, _______, + _______, _______, _______, _______, _______, _______, MO(2), _______ + ), + + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_LEFT, _______, + _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, + [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) } +}; +#endif + diff --git a/keyboards/jlw/vault35_wkl_universal/keymaps/default/rules.mk b/keyboards/jlw/vault35_wkl_universal/keymaps/default/rules.mk new file mode 100644 index 00000000000..a40474b4d5c --- /dev/null +++ b/keyboards/jlw/vault35_wkl_universal/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/jlw/vault35_wkl_universal/mcuconf.h b/keyboards/jlw/vault35_wkl_universal/mcuconf.h new file mode 100644 index 00000000000..3f3e8009459 --- /dev/null +++ b/keyboards/jlw/vault35_wkl_universal/mcuconf.h @@ -0,0 +1,11 @@ +// Copyright 2024 jlw +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef STM32_PWM_USE_TIM17 +#define STM32_PWM_USE_TIM17 TRUE +#define STM32_TIM17_SUPPRESS_ISR + diff --git a/keyboards/jlw/vault35_wkl_universal/readme.md b/keyboards/jlw/vault35_wkl_universal/readme.md new file mode 100644 index 00000000000..d06ee1a998b --- /dev/null +++ b/keyboards/jlw/vault35_wkl_universal/readme.md @@ -0,0 +1,27 @@ +# Vault 35 WKL Universal + +![Vault 35 WKL Universal](https://i.imgur.com/gtJwgiv.png) + +A drop in replacement PCB for the Vault 35 WKL case, originally designed by ProjectCain Mechvault. + +* Keyboard Maintainer: [jlw](https://github.com/josh-l-wang) +* Hardware Supported: Vault 35 WKL Universal PCB +* Hardware Availability: [jlw-kb.com](https://jlw-kb.com) + +Make example for this keyboard (after setting up your build environment): + + make jlw/vault35_wkl_universal:default + +Flashing example for this keyboard: + + make jlw/vault35_wkl_universal: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the top left key) and plug in the keyboard +* **Physical reset button**: Hold button on the back of the PCB while plugging in the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/jlw/vault35_wkl_universal/rules.mk b/keyboards/jlw/vault35_wkl_universal/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/jlw/vault35_wkl_universal/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From f215da3b7c92c2d2c9e5f791bfc1d654ddba6046 Mon Sep 17 00:00:00 2001 From: Joe Scotto <8194147+joe-scotto@users.noreply.github.com> Date: Mon, 29 Apr 2024 22:50:18 -0400 Subject: [PATCH 207/333] Add ScottoWing keyboard (#23513) Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/scottokeebs/scottowing/info.json | 75 +++++++++++++++++++ .../scottowing/keymaps/default/config.h | 23 ++++++ .../scottowing/keymaps/default/keymap.c | 45 +++++++++++ keyboards/scottokeebs/scottowing/readme.md | 29 +++++++ keyboards/scottokeebs/scottowing/rules.mk | 1 + 5 files changed, 173 insertions(+) create mode 100644 keyboards/scottokeebs/scottowing/info.json create mode 100644 keyboards/scottokeebs/scottowing/keymaps/default/config.h create mode 100644 keyboards/scottokeebs/scottowing/keymaps/default/keymap.c create mode 100644 keyboards/scottokeebs/scottowing/readme.md create mode 100644 keyboards/scottokeebs/scottowing/rules.mk diff --git a/keyboards/scottokeebs/scottowing/info.json b/keyboards/scottokeebs/scottowing/info.json new file mode 100644 index 00000000000..770e2fd18ec --- /dev/null +++ b/keyboards/scottokeebs/scottowing/info.json @@ -0,0 +1,75 @@ +{ + "manufacturer": "ScottoKeebs", + "keyboard_name": "ScottoWing (PCB Edition)", + "maintainer": "joe-scotto", + "bootloader": "rp2040", + "bootmagic": { + "matrix": [0, 1] + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP20", "GP22", "GP26", "GP27", "GP28", "GP29"], + "rows": ["GP8", "GP9", "GP23", "GP21"] + }, + "processor": "RP2040", + "url": "https://scottokeebs.com", + "usb": { + "device_version": "1.0.0", + "pid": "0x1026", + "vid": "0x534B" + }, + "layouts": { + "LAYOUT_split_3x6_2": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3} + ] + } + } +} diff --git a/keyboards/scottokeebs/scottowing/keymaps/default/config.h b/keyboards/scottokeebs/scottowing/keymaps/default/config.h new file mode 100644 index 00000000000..eb03070d83a --- /dev/null +++ b/keyboards/scottokeebs/scottowing/keymaps/default/config.h @@ -0,0 +1,23 @@ +/* +Copyright 2024 Joe Scotto + +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 + +// Define options +#define TAPPING_TERM 135 +#define PERMISSIVE_HOLD +#define TAPPING_TERM_PER_KEY diff --git a/keyboards/scottokeebs/scottowing/keymaps/default/keymap.c b/keyboards/scottokeebs/scottowing/keymaps/default/keymap.c new file mode 100644 index 00000000000..9a1c7daef30 --- /dev/null +++ b/keyboards/scottokeebs/scottowing/keymaps/default/keymap.c @@ -0,0 +1,45 @@ +/* +Copyright 2024 Joe Scotto + +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 . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_split_3x6_2( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_ENT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_BSPC, KC_QUOT, + KC_LSFT, LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH), KC_RSFT, + KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT) + ), + [1] = LAYOUT_split_3x6_2( + KC_TRNS, KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL, KC_TRNS, + KC_TRNS, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_TRNS, + KC_TRNS, LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS), KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT_split_3x6_2( + KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC, KC_TRNS, + KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, + KC_TRNS, KC_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT_split_3x6_2( + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, + KC_TRNS, KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/scottokeebs/scottowing/readme.md b/keyboards/scottokeebs/scottowing/readme.md new file mode 100644 index 00000000000..bf20164e666 --- /dev/null +++ b/keyboards/scottokeebs/scottowing/readme.md @@ -0,0 +1,29 @@ +# ScottoWing (PCB Edition) + +![ScottoWing](https://i.imgur.com/ckaYMAx.jpeg) + +The ScottoWing (PCB Edition) is a 3x5 (34-keys) or 3x6 (40-keys) split monoblock ergonomic column-staggered keyboard. + +* Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto) +* Hardware Supported: RP2040 Pro Micro, nice!nano +* Hardware Availability: [ScottoKeebs](https://scottokeebs.com), [Amazon](https://amazon.com), [AliExpress](https://aliexpress.com) + +# Compiling + +Make example for this keyboard (after setting up your build environment): + + make scottokeebs/scottowing:default + +Flashing example for this keyboard: + + make scottokeebs/scottowing: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). + +# Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,1) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/scottokeebs/scottowing/rules.mk b/keyboards/scottokeebs/scottowing/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/scottokeebs/scottowing/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From dc2db0c1d4d3168c07ad5c0c36998c9d91df29c7 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 29 Apr 2024 20:04:04 -0700 Subject: [PATCH 208/333] MechKeys ACR60 Layout Updates (#23309) --- docs/ChangeLog/20240526/PR23309.md | 35 + keyboards/mechkeys/acr60/keyboard.json | 1836 +++++++++++++++++--- keyboards/mechkeys/acr60/matrix_diagram.md | 57 + 3 files changed, 1713 insertions(+), 215 deletions(-) create mode 100644 docs/ChangeLog/20240526/PR23309.md create mode 100644 keyboards/mechkeys/acr60/matrix_diagram.md diff --git a/docs/ChangeLog/20240526/PR23309.md b/docs/ChangeLog/20240526/PR23309.md new file mode 100644 index 00000000000..b5ca5f1e4d0 --- /dev/null +++ b/docs/ChangeLog/20240526/PR23309.md @@ -0,0 +1,35 @@ +# MechKeys ACR60 Layout Updates + +This PR removed and changed some of the layouts that were configured for +the ACR60. If you use one of the following layouts, you will need to +update your keymap: + +- [`LAYOUT_hhkb`](#layout-hhkb) +- [`LAYOUT_true_hhkb`](#layout-true-hhkb) +- [`LAYOUT_directional`](#layout-directional) +- [`LAYOUT_mitchsplit`](#layout-mitchsplit) + +## `LAYOUT_hhkb` :id=layout-hhkb + +1. Change your layout macro to `LAYOUT_60_hhkb`. +2. Remove any keycodes for the key between Left Shift and QWERTY Z. + +## `LAYOUT_true_hhkb` :id=layout-true-hhkb + +1. Change your layout macro to `LAYOUT_60_true_hhkb`. +2. Remove any keycodes for the key between Left Shift and QWERTY Z. + +## `LAYOUT_directional` :id=layout-directional + +1. Change your layout macro to `LAYOUT_60_ansi_arrow_split_bs`. +2. Remove any keycodes for the key between Left Shift and QWERTY Z. +3. Remove any keycodes for the keys immediately before *and* after the +1.25u key of Split Spacebar. + +If you need split spacebars, you may implement +`LAYOUT_60_ansi_arrow_split_space_split_bs` and change your layout to +it, removing the keycode between Left Shift and QWERTY Z. + +## `LAYOUT_mitchsplit` :id=layout-mitchsplit + +1. Use `LAYOUT_60_ansi_split_space_split_rshift`. diff --git a/keyboards/mechkeys/acr60/keyboard.json b/keyboards/mechkeys/acr60/keyboard.json index f2d618b8bd1..916a750b963 100644 --- a/keyboards/mechkeys/acr60/keyboard.json +++ b/keyboards/mechkeys/acr60/keyboard.json @@ -53,8 +53,10 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_ansi_arrow", "64_ansi", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift", "64_iso"], "layout_aliases": { - "LAYOUT_2_shifts": "LAYOUT_all" + "LAYOUT_2_shifts": "LAYOUT_all", + "LAYOUT_mitchsplit": "LAYOUT_60_ansi_split_space_split_rshift" }, "layouts": { "LAYOUT_all": { @@ -133,6 +135,1623 @@ {"matrix": [4, 14], "x": 14, "y": 4} ] }, + "LAYOUT_60_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_ansi_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_ansi_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 12.5, "y": 4}, + {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_tsangan_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 12.5, "y": 4}, + {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_arrow": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 12], "x": 11.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} + ] + }, + "LAYOUT_60_ansi_arrow_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 12], "x": 11.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} + ] + }, + "LAYOUT_64_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} + ] + }, + "LAYOUT_64_ansi_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} + ] + }, + "LAYOUT_60_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_true_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 6}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4} + ] + }, + "LAYOUT_60_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_iso_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_iso_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 12.5, "y": 4}, + {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 12.5, "y": 4}, + {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_arrow": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 12], "x": 11.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} + ] + }, + "LAYOUT_60_iso_arrow_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 12], "x": 11.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} + ] + }, + "LAYOUT_64_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} + ] + }, + "LAYOUT_64_iso_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} + ] + }, + "LAYOUT_abnt2": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3, "w": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + }, "LAYOUT": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, @@ -208,220 +1827,7 @@ {"matrix": [4, 14], "x": 14, "y": 4} ] }, - "LAYOUT_hhkb": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0}, - {"matrix": [0, 14], "x": 14, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 2], "x": 1.5, "y": 1}, - {"matrix": [1, 3], "x": 2.5, "y": 1}, - {"matrix": [1, 4], "x": 3.5, "y": 1}, - {"matrix": [1, 5], "x": 4.5, "y": 1}, - {"matrix": [1, 6], "x": 5.5, "y": 1}, - {"matrix": [1, 7], "x": 6.5, "y": 1}, - {"matrix": [1, 8], "x": 7.5, "y": 1}, - {"matrix": [1, 9], "x": 8.5, "y": 1}, - {"matrix": [1, 10], "x": 9.5, "y": 1}, - {"matrix": [1, 11], "x": 10.5, "y": 1}, - {"matrix": [1, 12], "x": 11.5, "y": 1}, - {"matrix": [1, 13], "x": 12.5, "y": 1}, - {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [2, 2], "x": 1.75, "y": 2}, - {"matrix": [2, 3], "x": 2.75, "y": 2}, - {"matrix": [2, 4], "x": 3.75, "y": 2}, - {"matrix": [2, 5], "x": 4.75, "y": 2}, - {"matrix": [2, 6], "x": 5.75, "y": 2}, - {"matrix": [2, 7], "x": 6.75, "y": 2}, - {"matrix": [2, 8], "x": 7.75, "y": 2}, - {"matrix": [2, 9], "x": 8.75, "y": 2}, - {"matrix": [2, 10], "x": 9.75, "y": 2}, - {"matrix": [2, 11], "x": 10.75, "y": 2}, - {"matrix": [2, 12], "x": 11.75, "y": 2}, - {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [3, 1], "x": 1.25, "y": 3}, - {"matrix": [3, 2], "x": 2.25, "y": 3}, - {"matrix": [3, 3], "x": 3.25, "y": 3}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [3, 14], "x": 14, "y": 3}, - - {"matrix": [4, 1], "x": 1.5, "y": 4}, - {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, - {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [4, 13], "x": 12.5, "y": 4} - ] - }, - "LAYOUT_true_hhkb": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0}, - {"matrix": [0, 14], "x": 14, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 2], "x": 1.5, "y": 1}, - {"matrix": [1, 3], "x": 2.5, "y": 1}, - {"matrix": [1, 4], "x": 3.5, "y": 1}, - {"matrix": [1, 5], "x": 4.5, "y": 1}, - {"matrix": [1, 6], "x": 5.5, "y": 1}, - {"matrix": [1, 7], "x": 6.5, "y": 1}, - {"matrix": [1, 8], "x": 7.5, "y": 1}, - {"matrix": [1, 9], "x": 8.5, "y": 1}, - {"matrix": [1, 10], "x": 9.5, "y": 1}, - {"matrix": [1, 11], "x": 10.5, "y": 1}, - {"matrix": [1, 12], "x": 11.5, "y": 1}, - {"matrix": [1, 13], "x": 12.5, "y": 1}, - {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [2, 2], "x": 1.75, "y": 2}, - {"matrix": [2, 3], "x": 2.75, "y": 2}, - {"matrix": [2, 4], "x": 3.75, "y": 2}, - {"matrix": [2, 5], "x": 4.75, "y": 2}, - {"matrix": [2, 6], "x": 5.75, "y": 2}, - {"matrix": [2, 7], "x": 6.75, "y": 2}, - {"matrix": [2, 8], "x": 7.75, "y": 2}, - {"matrix": [2, 9], "x": 8.75, "y": 2}, - {"matrix": [2, 10], "x": 9.75, "y": 2}, - {"matrix": [2, 11], "x": 10.75, "y": 2}, - {"matrix": [2, 12], "x": 11.75, "y": 2}, - {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [3, 1], "x": 1.25, "y": 3}, - {"matrix": [3, 2], "x": 2.25, "y": 3}, - {"matrix": [3, 3], "x": 3.25, "y": 3}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [3, 14], "x": 14, "y": 3}, - - {"matrix": [4, 1], "x": 1.5, "y": 4}, - {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [4, 6], "x": 4, "y": 4, "w": 6}, - {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, - {"matrix": [4, 11], "x": 11.5, "y": 4} - ] - }, - "LAYOUT_directional": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0}, - {"matrix": [0, 14], "x": 14, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 2], "x": 1.5, "y": 1}, - {"matrix": [1, 3], "x": 2.5, "y": 1}, - {"matrix": [1, 4], "x": 3.5, "y": 1}, - {"matrix": [1, 5], "x": 4.5, "y": 1}, - {"matrix": [1, 6], "x": 5.5, "y": 1}, - {"matrix": [1, 7], "x": 6.5, "y": 1}, - {"matrix": [1, 8], "x": 7.5, "y": 1}, - {"matrix": [1, 9], "x": 8.5, "y": 1}, - {"matrix": [1, 10], "x": 9.5, "y": 1}, - {"matrix": [1, 11], "x": 10.5, "y": 1}, - {"matrix": [1, 12], "x": 11.5, "y": 1}, - {"matrix": [1, 13], "x": 12.5, "y": 1}, - {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [2, 2], "x": 1.75, "y": 2}, - {"matrix": [2, 3], "x": 2.75, "y": 2}, - {"matrix": [2, 4], "x": 3.75, "y": 2}, - {"matrix": [2, 5], "x": 4.75, "y": 2}, - {"matrix": [2, 6], "x": 5.75, "y": 2}, - {"matrix": [2, 7], "x": 6.75, "y": 2}, - {"matrix": [2, 8], "x": 7.75, "y": 2}, - {"matrix": [2, 9], "x": 8.75, "y": 2}, - {"matrix": [2, 10], "x": 9.75, "y": 2}, - {"matrix": [2, 11], "x": 10.75, "y": 2}, - {"matrix": [2, 12], "x": 11.75, "y": 2}, - {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [3, 1], "x": 1.25, "y": 3}, - {"matrix": [3, 2], "x": 2.25, "y": 3}, - {"matrix": [3, 3], "x": 3.25, "y": 3}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 12], "x": 11.25, "y": 3, "w": 1.75}, - {"matrix": [3, 13], "x": 13, "y": 3}, - {"matrix": [3, 14], "x": 14, "y": 3}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25}, - {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, - {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75}, - {"matrix": [4, 10], "x": 10, "y": 4}, - {"matrix": [4, 11], "x": 11, "y": 4}, - {"matrix": [4, 12], "x": 12, "y": 4}, - {"matrix": [4, 13], "x": 13, "y": 4}, - {"matrix": [4, 14], "x": 14, "y": 4} - ] - }, - "LAYOUT_mitchsplit": { + "LAYOUT_60_ansi_split_space_split_rshift": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, diff --git a/keyboards/mechkeys/acr60/matrix_diagram.md b/keyboards/mechkeys/acr60/matrix_diagram.md new file mode 100644 index 00000000000..27a38030afb --- /dev/null +++ b/keyboards/mechkeys/acr60/matrix_diagram.md @@ -0,0 +1,57 @@ +# Matrix Diagram for MechKeys ACR60 + +``` + ┌───────┐ + 2u Backspace │0E │ + └───────┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ┌─────┐ +│10 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌──┴┐2D │ ISO Enter +│20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │ │1E │ │ +└──────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴────────┘ └───┴────┘ +Shift Row Options: +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │ +└───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ +┌───────┐ ┌───────┐ +│30 │ 2u LShift 2u RShift │3D │ +└───────┘ └───────┘ +┌────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┬───┐ +│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │ Standard with Split Shifts +└────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴──────┴───┘ 1.25u/1u LShift + 1u/1.75u/1u RShift +┌────────┐ ┌───┬──────────┐ +│30 │ 2.25u LShift │3B │3D │ 2.75u RShift +└────────┘ └───┴──────────┘ + ┌──────┬───┬───┐ + │3C │3D │3E │ 1.75u/1u/1u RShift + └──────┴───┴───┘ +Bottom Row Options: +┌────┬────┬────┬────────┬────┬──────────┬───┬───┬───┬───┬───┐ +│40 │41 │43 │44 │46 │48 │4A │4B │4C │4D │4E │ 5x 1u Mods +└────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘ + Split Spacebar + [2.25/1.25/2.75] or [2.75/1.25/2.25] + ┌──────────┬────┬────────┐ + │44 │46 │48 │ + └──────────┴────┴────────┘ +┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐ ┐ +│40 │41 │43 │46 │4A │4B │4D │4E │ ├─ Standard +└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ │ or +┌─────┬───┬─────┬───────────────────────┬─────┬───┬───┬─────┐ │ Infinity/True HHKB +│40 │41 │43 │46 │4A │4B │4D │4E │ │ (same matrix) +└─────┴───┴─────┴───────────────────────┴─────┴───┴───┴─────┘ ┘ +┌─────┬───┬────┬────────────────────────┬───┬───┬───┬───┬───┐ +│40 │41 │43 │46 │4A │4B │4C │4D │4E │ +└─────┴───┴────┴────────────────────────┴───┴───┴───┴───┴───┘ +┌─────┬─────┬───────────────────────────┬───┬───┬───┬───┬───┐ +│40 │41 │46 │4A │4B │4C │4D │4E │ LWKL +└─────┴─────┴───────────────────────────┴───┴───┴───┴───┴───┘ +┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ +│40 │41 │43 │46 │4B │4D │4E │ Tsangan/WKL/HHKB +└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ +┌─────┬───┬─────┬───────────────────────────┬───┬───┬───┬───┐ +│40 │41 │43 │46 │4B │4C │4D │4E │ Tsangan Arrow +└─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘ +``` From e2618dc35cc04fbbcf857559df78d7eb9aa43640 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 30 Apr 2024 09:54:05 +0100 Subject: [PATCH 209/333] Uniform ISO Enter key sequence in JIS Community Layouts (#23181) --- layouts/default/60_jis/info.json | 2 +- layouts/default/tkl_f13_jis/info.json | 2 +- layouts/default/tkl_jis/info.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/default/60_jis/info.json b/layouts/default/60_jis/info.json index 56972148bda..039ced42f4a 100644 --- a/layouts/default/60_jis/info.json +++ b/layouts/default/60_jis/info.json @@ -34,7 +34,6 @@ {"x": 10.5, "y": 1}, {"x": 11.5, "y": 1}, {"x": 12.5, "y": 1}, - {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, {"x": 0, "y": 2, "w": 1.75}, {"x": 1.75, "y": 2}, @@ -49,6 +48,7 @@ {"x": 10.75, "y": 2}, {"x": 11.75, "y": 2}, {"x": 12.75, "y": 2}, + {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, {"x": 0, "y": 3, "w": 2.25}, {"x": 2.25, "y": 3}, diff --git a/layouts/default/tkl_f13_jis/info.json b/layouts/default/tkl_f13_jis/info.json index 97f5bd3880e..20ff38f6117 100644 --- a/layouts/default/tkl_f13_jis/info.json +++ b/layouts/default/tkl_f13_jis/info.json @@ -55,7 +55,6 @@ {"x": 10.5, "y": 2.25}, {"x": 11.5, "y": 2.25}, {"x": 12.5, "y": 2.25}, - {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, {"x": 15.25, "y": 2.25}, {"x": 16.25, "y": 2.25}, {"x": 17.25, "y": 2.25}, @@ -73,6 +72,7 @@ {"x": 10.75, "y": 3.25}, {"x": 11.75, "y": 3.25}, {"x": 12.75, "y": 3.25}, + {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, {"x": 0, "y": 4.25, "w": 2.25}, {"x": 2.25, "y": 4.25}, diff --git a/layouts/default/tkl_jis/info.json b/layouts/default/tkl_jis/info.json index 513852193a5..e1d16e2beb7 100644 --- a/layouts/default/tkl_jis/info.json +++ b/layouts/default/tkl_jis/info.json @@ -54,7 +54,6 @@ {"x": 10.5, "y": 2.25}, {"x": 11.5, "y": 2.25}, {"x": 12.5, "y": 2.25}, - {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, {"x": 15.25, "y": 2.25}, {"x": 16.25, "y": 2.25}, {"x": 17.25, "y": 2.25}, @@ -72,6 +71,7 @@ {"x": 10.75, "y": 3.25}, {"x": 11.75, "y": 3.25}, {"x": 12.75, "y": 3.25}, + {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, {"x": 0, "y": 4.25, "w": 2.25}, {"x": 2.25, "y": 4.25}, From 636c96ad256b1b2f21c4c810d195c78402e060a0 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 30 Apr 2024 19:34:37 +0200 Subject: [PATCH 210/333] Add EC Virgo (#23173) Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/cipulot/ec_23u/config.h | 5 - keyboards/cipulot/ec_23u/info.json | 6 + keyboards/cipulot/ec_23u/rules.mk | 3 +- keyboards/cipulot/ec_60/config.h | 6 - keyboards/cipulot/ec_60/info.json | 6 + keyboards/cipulot/ec_60/rules.mk | 3 +- keyboards/cipulot/ec_alveus/1_0_0/config.h | 6 - keyboards/cipulot/ec_alveus/1_0_0/info.json | 6 + keyboards/cipulot/ec_alveus/1_0_0/rules.mk | 3 +- keyboards/cipulot/ec_alveus/1_2_0/config.h | 6 - keyboards/cipulot/ec_alveus/1_2_0/info.json | 6 + keyboards/cipulot/ec_alveus/1_2_0/rules.mk | 3 +- keyboards/cipulot/ec_pro2/config.h | 5 - keyboards/cipulot/ec_pro2/info.json | 6 + keyboards/cipulot/ec_pro2/rules.mk | 3 +- keyboards/cipulot/ec_prox/ansi_iso/config.h | 6 - keyboards/cipulot/ec_prox/ansi_iso/info.json | 6 + keyboards/cipulot/ec_prox/ansi_iso/rules.mk | 3 +- keyboards/cipulot/ec_prox/jis/config.h | 6 - keyboards/cipulot/ec_prox/jis/info.json | 6 + keyboards/cipulot/ec_prox/jis/rules.mk | 3 +- keyboards/cipulot/ec_theca/config.h | 6 - keyboards/cipulot/ec_theca/info.json | 10 +- keyboards/cipulot/ec_theca/rules.mk | 3 +- keyboards/cipulot/ec_virgo/config.h | 66 +++++++++ .../{kawayo/config.h => ec_virgo/halconf.h} | 9 +- keyboards/cipulot/ec_virgo/info.json | 136 ++++++++++++++++++ .../cipulot/ec_virgo/keymaps/default/keymap.c | 37 +++++ .../cipulot/ec_virgo/keymaps/via/keymap.c | 37 +++++ .../cipulot/ec_virgo/keymaps/via/rules.mk | 1 + keyboards/cipulot/ec_virgo/mcuconf.h | 22 +++ keyboards/cipulot/ec_virgo/post_rules.mk | 3 + keyboards/cipulot/ec_virgo/readme.md | 26 ++++ keyboards/cipulot/ec_virgo/rules.mk | 5 + keyboards/cipulot/kallos/config.h | 23 --- keyboards/cipulot/kallos/info.json | 6 + keyboards/cipulot/kawayo/info.json | 6 + keyboards/cipulot/rf_r1_8_9xu/config.h | 6 - keyboards/cipulot/rf_r1_8_9xu/info.json | 7 +- keyboards/cipulot/rf_r1_8_9xu/rules.mk | 3 +- 40 files changed, 421 insertions(+), 94 deletions(-) create mode 100644 keyboards/cipulot/ec_virgo/config.h rename keyboards/cipulot/{kawayo/config.h => ec_virgo/halconf.h} (76%) create mode 100644 keyboards/cipulot/ec_virgo/info.json create mode 100644 keyboards/cipulot/ec_virgo/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/ec_virgo/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/ec_virgo/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/ec_virgo/mcuconf.h create mode 100644 keyboards/cipulot/ec_virgo/post_rules.mk create mode 100644 keyboards/cipulot/ec_virgo/readme.md create mode 100644 keyboards/cipulot/ec_virgo/rules.mk delete mode 100644 keyboards/cipulot/kallos/config.h diff --git a/keyboards/cipulot/ec_23u/config.h b/keyboards/cipulot/ec_23u/config.h index 3a3d482e3d3..f5b74b9e600 100644 --- a/keyboards/cipulot/ec_23u/config.h +++ b/keyboards/cipulot/ec_23u/config.h @@ -62,8 +62,3 @@ #define EECONFIG_KB_DATA_SIZE 57 -/* 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/cipulot/ec_23u/info.json b/keyboards/cipulot/ec_23u/info.json index 0f656f8e8ca..17aa5eb6e7a 100644 --- a/keyboards/cipulot/ec_23u/info.json +++ b/keyboards/cipulot/ec_23u/info.json @@ -6,6 +6,12 @@ "build": { "lto": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "features": { "bootmagic": false, diff --git a/keyboards/cipulot/ec_23u/rules.mk b/keyboards/cipulot/ec_23u/rules.mk index ab6c37cad43..318e0215ce9 100644 --- a/keyboards/cipulot/ec_23u/rules.mk +++ b/keyboards/cipulot/ec_23u/rules.mk @@ -1,4 +1,5 @@ CUSTOM_MATRIX = lite ANALOG_DRIVER_REQUIRED = yes -SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c OPT = 2 diff --git a/keyboards/cipulot/ec_60/config.h b/keyboards/cipulot/ec_60/config.h index c936b248c45..24525501439 100644 --- a/keyboards/cipulot/ec_60/config.h +++ b/keyboards/cipulot/ec_60/config.h @@ -64,9 +64,3 @@ // #define DEBUG_MATRIX_SCAN_RATE #define EECONFIG_KB_DATA_SIZE 159 - -/* 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/cipulot/ec_60/info.json b/keyboards/cipulot/ec_60/info.json index a86b20bfd63..860594f611a 100644 --- a/keyboards/cipulot/ec_60/info.json +++ b/keyboards/cipulot/ec_60/info.json @@ -6,6 +6,12 @@ "build": { "lto": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "features": { "bootmagic": false, diff --git a/keyboards/cipulot/ec_60/rules.mk b/keyboards/cipulot/ec_60/rules.mk index 70494b635f6..ce525670a68 100644 --- a/keyboards/cipulot/ec_60/rules.mk +++ b/keyboards/cipulot/ec_60/rules.mk @@ -1,4 +1,5 @@ CUSTOM_MATRIX = lite ANALOG_DRIVER_REQUIRED = yes -SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c OPT = 3 diff --git a/keyboards/cipulot/ec_alveus/1_0_0/config.h b/keyboards/cipulot/ec_alveus/1_0_0/config.h index ea43ba348d5..ab51289c023 100644 --- a/keyboards/cipulot/ec_alveus/1_0_0/config.h +++ b/keyboards/cipulot/ec_alveus/1_0_0/config.h @@ -63,9 +63,3 @@ // #define DEBUG_MATRIX_SCAN_RATE #define EECONFIG_KB_DATA_SIZE 169 - -/* 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/cipulot/ec_alveus/1_0_0/info.json b/keyboards/cipulot/ec_alveus/1_0_0/info.json index 4652166cc5e..cffd3ade586 100644 --- a/keyboards/cipulot/ec_alveus/1_0_0/info.json +++ b/keyboards/cipulot/ec_alveus/1_0_0/info.json @@ -6,6 +6,12 @@ "build": { "lto": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "features": { "bootmagic": false, diff --git a/keyboards/cipulot/ec_alveus/1_0_0/rules.mk b/keyboards/cipulot/ec_alveus/1_0_0/rules.mk index 70494b635f6..ce525670a68 100644 --- a/keyboards/cipulot/ec_alveus/1_0_0/rules.mk +++ b/keyboards/cipulot/ec_alveus/1_0_0/rules.mk @@ -1,4 +1,5 @@ CUSTOM_MATRIX = lite ANALOG_DRIVER_REQUIRED = yes -SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c OPT = 3 diff --git a/keyboards/cipulot/ec_alveus/1_2_0/config.h b/keyboards/cipulot/ec_alveus/1_2_0/config.h index ea43ba348d5..ab51289c023 100644 --- a/keyboards/cipulot/ec_alveus/1_2_0/config.h +++ b/keyboards/cipulot/ec_alveus/1_2_0/config.h @@ -63,9 +63,3 @@ // #define DEBUG_MATRIX_SCAN_RATE #define EECONFIG_KB_DATA_SIZE 169 - -/* 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/cipulot/ec_alveus/1_2_0/info.json b/keyboards/cipulot/ec_alveus/1_2_0/info.json index 8b63d02f770..da212f83411 100644 --- a/keyboards/cipulot/ec_alveus/1_2_0/info.json +++ b/keyboards/cipulot/ec_alveus/1_2_0/info.json @@ -6,6 +6,12 @@ "build": { "lto": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "features": { "bootmagic": false, diff --git a/keyboards/cipulot/ec_alveus/1_2_0/rules.mk b/keyboards/cipulot/ec_alveus/1_2_0/rules.mk index 70494b635f6..ce525670a68 100644 --- a/keyboards/cipulot/ec_alveus/1_2_0/rules.mk +++ b/keyboards/cipulot/ec_alveus/1_2_0/rules.mk @@ -1,4 +1,5 @@ CUSTOM_MATRIX = lite ANALOG_DRIVER_REQUIRED = yes -SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c OPT = 3 diff --git a/keyboards/cipulot/ec_pro2/config.h b/keyboards/cipulot/ec_pro2/config.h index c936b248c45..a05e716823a 100644 --- a/keyboards/cipulot/ec_pro2/config.h +++ b/keyboards/cipulot/ec_pro2/config.h @@ -65,8 +65,3 @@ #define EECONFIG_KB_DATA_SIZE 159 -/* 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/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/info.json index 2929edfb19c..2e05cff3c16 100644 --- a/keyboards/cipulot/ec_pro2/info.json +++ b/keyboards/cipulot/ec_pro2/info.json @@ -6,6 +6,12 @@ "build": { "lto": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "features": { "bootmagic": false, diff --git a/keyboards/cipulot/ec_pro2/rules.mk b/keyboards/cipulot/ec_pro2/rules.mk index ab6c37cad43..318e0215ce9 100644 --- a/keyboards/cipulot/ec_pro2/rules.mk +++ b/keyboards/cipulot/ec_pro2/rules.mk @@ -1,4 +1,5 @@ CUSTOM_MATRIX = lite ANALOG_DRIVER_REQUIRED = yes -SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c OPT = 2 diff --git a/keyboards/cipulot/ec_prox/ansi_iso/config.h b/keyboards/cipulot/ec_prox/ansi_iso/config.h index 6a165cf3abd..bf25d0b7128 100644 --- a/keyboards/cipulot/ec_prox/ansi_iso/config.h +++ b/keyboards/cipulot/ec_prox/ansi_iso/config.h @@ -64,9 +64,3 @@ // #define DEBUG_MATRIX_SCAN_RATE #define EECONFIG_KB_DATA_SIZE 159 - -/* 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/cipulot/ec_prox/ansi_iso/info.json b/keyboards/cipulot/ec_prox/ansi_iso/info.json index 3f390d0bc61..9a68d8b0bf7 100644 --- a/keyboards/cipulot/ec_prox/ansi_iso/info.json +++ b/keyboards/cipulot/ec_prox/ansi_iso/info.json @@ -6,6 +6,12 @@ "build": { "lto": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "features": { "bootmagic": false, diff --git a/keyboards/cipulot/ec_prox/ansi_iso/rules.mk b/keyboards/cipulot/ec_prox/ansi_iso/rules.mk index ab6c37cad43..318e0215ce9 100644 --- a/keyboards/cipulot/ec_prox/ansi_iso/rules.mk +++ b/keyboards/cipulot/ec_prox/ansi_iso/rules.mk @@ -1,4 +1,5 @@ CUSTOM_MATRIX = lite ANALOG_DRIVER_REQUIRED = yes -SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c OPT = 2 diff --git a/keyboards/cipulot/ec_prox/jis/config.h b/keyboards/cipulot/ec_prox/jis/config.h index 6a686d74044..fd3c048bc38 100644 --- a/keyboards/cipulot/ec_prox/jis/config.h +++ b/keyboards/cipulot/ec_prox/jis/config.h @@ -64,9 +64,3 @@ // #define DEBUG_MATRIX_SCAN_RATE #define EECONFIG_KB_DATA_SIZE 149 - -/* 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/cipulot/ec_prox/jis/info.json b/keyboards/cipulot/ec_prox/jis/info.json index 88067f9305e..4c92f8c6732 100644 --- a/keyboards/cipulot/ec_prox/jis/info.json +++ b/keyboards/cipulot/ec_prox/jis/info.json @@ -6,6 +6,12 @@ "build": { "lto": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "features": { "bootmagic": false, diff --git a/keyboards/cipulot/ec_prox/jis/rules.mk b/keyboards/cipulot/ec_prox/jis/rules.mk index ab6c37cad43..318e0215ce9 100644 --- a/keyboards/cipulot/ec_prox/jis/rules.mk +++ b/keyboards/cipulot/ec_prox/jis/rules.mk @@ -1,4 +1,5 @@ CUSTOM_MATRIX = lite ANALOG_DRIVER_REQUIRED = yes -SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c OPT = 2 diff --git a/keyboards/cipulot/ec_theca/config.h b/keyboards/cipulot/ec_theca/config.h index 4b834fdff68..d9fea559675 100644 --- a/keyboards/cipulot/ec_theca/config.h +++ b/keyboards/cipulot/ec_theca/config.h @@ -63,9 +63,3 @@ // #define DEBUG_MATRIX_SCAN_RATE #define DYNAMIC_KEYMAP_LAYER_COUNT 3 #define EECONFIG_KB_DATA_SIZE 201 - -/* 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/cipulot/ec_theca/info.json b/keyboards/cipulot/ec_theca/info.json index fbd7d7ec471..a438e401806 100644 --- a/keyboards/cipulot/ec_theca/info.json +++ b/keyboards/cipulot/ec_theca/info.json @@ -6,6 +6,12 @@ "build": { "lto": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "features": { "bootmagic": false, @@ -27,10 +33,6 @@ "LAYOUT_all": "LAYOUT_tkl_ansi", "LAYOUT_tkl_ansi_tsangan_wkl": "LAYOUT_tkl_ansi_wkl" }, - "community_layouts": [ - "tkl_ansi", - "tkl_ansi_tsangan" - ], "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/cipulot/ec_theca/rules.mk b/keyboards/cipulot/ec_theca/rules.mk index 70494b635f6..ce525670a68 100644 --- a/keyboards/cipulot/ec_theca/rules.mk +++ b/keyboards/cipulot/ec_theca/rules.mk @@ -1,4 +1,5 @@ CUSTOM_MATRIX = lite ANALOG_DRIVER_REQUIRED = yes -SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c OPT = 3 diff --git a/keyboards/cipulot/ec_virgo/config.h b/keyboards/cipulot/ec_virgo/config.h new file mode 100644 index 00000000000..2fce8cd7fa7 --- /dev/null +++ b/keyboards/cipulot/ec_virgo/config.h @@ -0,0 +1,66 @@ +/* Copyright 2023 Cipulot + * + * 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 MATRIX_ROWS 6 +#define MATRIX_COLS 18 + +#define MATRIX_ROW_PINS \ + { B6, B7, B5, B4, B3, A15 } + +#define AMUX_COUNT 2 +#define AMUX_MAX_COLS_COUNT 16 + +#define AMUX_EN_PINS \ + { A9, A8 } + +#define AMUX_SEL_PINS \ + { B12, B13, B15, B14 } + +#define AMUX_COL_CHANNELS_SIZES \ + { 7, 11 } + +#define AMUX_0_COL_CHANNELS \ + { 2, 1, 0, 3, 5, 4, 7 } + +#define AMUX_1_COL_CHANNELS \ + { 2, 1, 0, 15, 14, 13, 12, 8, 11, 10, 9 } + +#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS + +#define DISCHARGE_PIN A4 +#define ANALOG_PORT A3 + +#define DEFAULT_ACTUATION_MODE 0 +#define DEFAULT_MODE_0_ACTUATION_LEVEL 550 +#define DEFAULT_MODE_0_RELEASE_LEVEL 500 +#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL +#define DEFAULT_MODE_1_ACTUATION_OFFSET 70 +#define DEFAULT_MODE_1_RELEASE_OFFSET 70 +#define DEFAULT_EXTREMUM 1023 +#define EXPECTED_NOISE_FLOOR 0 +#define NOISE_FLOOR_THRESHOLD 50 +#define BOTTOMING_CALIBRATION_THRESHOLD 50 +#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30 +#define DEFAULT_BOTTOMING_READING 1023 +#define DEFAULT_CALIBRATION_STARTER true + +#define DISCHARGE_TIME 10 + +// #define DEBUG_MATRIX_SCAN_RATE + +#define EECONFIG_KB_DATA_SIZE 225 diff --git a/keyboards/cipulot/kawayo/config.h b/keyboards/cipulot/ec_virgo/halconf.h similarity index 76% rename from keyboards/cipulot/kawayo/config.h rename to keyboards/cipulot/ec_virgo/halconf.h index a08011b9cf9..835d43b6a0a 100644 --- a/keyboards/cipulot/kawayo/config.h +++ b/keyboards/cipulot/ec_virgo/halconf.h @@ -1,4 +1,4 @@ -/* Copyright 2022 Cipulot +/* Copyright 2023 Cipulot * * 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 @@ -16,7 +16,6 @@ #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 HAL_USE_ADC TRUE + +#include_next diff --git a/keyboards/cipulot/ec_virgo/info.json b/keyboards/cipulot/ec_virgo/info.json new file mode 100644 index 00000000000..6b37880181b --- /dev/null +++ b/keyboards/cipulot/ec_virgo/info.json @@ -0,0 +1,136 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "Virgo EC", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "eeprom": { + "wear_leveling": { + "backing_size": 4096 + } + }, + "features": { + "bootmagic": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "processor": "STM32F411", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6BC0", + "shared_endpoint": { + "keyboard": true + }, + "vid": "0x6369" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12.25, "y": 0}, + {"matrix": [0, 11], "x": 13.25, "y": 0}, + {"matrix": [0, 12], "x": 14.25, "y": 0}, + {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 17.25, "y": 0}, + {"matrix": [0, 16], "x": 18.25, "y": 0}, + {"matrix": [0, 17], "x": 19.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 9, "y": 1.5}, + {"matrix": [1, 8], "x": 10, "y": 1.5}, + {"matrix": [1, 9], "x": 11, "y": 1.5}, + {"matrix": [1, 10], "x": 12, "y": 1.5}, + {"matrix": [1, 11], "x": 13, "y": 1.5}, + {"matrix": [1, 12], "x": 14, "y": 1.5}, + {"matrix": [1, 13], "x": 15, "y": 1.5}, + {"matrix": [1, 14], "x": 16, "y": 1.5}, + {"matrix": [1, 15], "x": 17.25, "y": 1.5}, + {"matrix": [1, 16], "x": 18.25, "y": 1.5}, + {"matrix": [1, 17], "x": 19.25, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 8.5, "y": 2.5}, + {"matrix": [2, 7], "x": 9.5, "y": 2.5}, + {"matrix": [2, 8], "x": 10.5, "y": 2.5}, + {"matrix": [2, 9], "x": 11.5, "y": 2.5}, + {"matrix": [2, 10], "x": 12.5, "y": 2.5}, + {"matrix": [2, 11], "x": 13.5, "y": 2.5}, + {"matrix": [2, 12], "x": 14.5, "y": 2.5}, + {"matrix": [2, 13], "x": 15.5, "y": 2.5}, + {"matrix": [2, 14], "x": 16.5, "y": 2.5, "w": 0.5}, + {"matrix": [2, 15], "x": 17.25, "y": 2.5}, + {"matrix": [2, 16], "x": 18.25, "y": 2.5}, + {"matrix": [2, 17], "x": 19.25, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 8.75, "y": 3.5}, + {"matrix": [3, 7], "x": 9.75, "y": 3.5}, + {"matrix": [3, 8], "x": 10.75, "y": 3.5}, + {"matrix": [3, 9], "x": 11.75, "y": 3.5}, + {"matrix": [3, 10], "x": 12.75, "y": 3.5}, + {"matrix": [3, 11], "x": 13.75, "y": 3.5}, + {"matrix": [3, 12], "x": 14.75, "y": 3.5}, + {"matrix": [3, 13], "x": 15.75, "y": 3.5, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [5, 6], "x": 8.25, "y": 4.5}, + {"matrix": [4, 7], "x": 9.25, "y": 4.5}, + {"matrix": [4, 8], "x": 10.25, "y": 4.5}, + {"matrix": [4, 9], "x": 11.25, "y": 4.5}, + {"matrix": [4, 10], "x": 12.25, "y": 4.5}, + {"matrix": [4, 11], "x": 13.25, "y": 4.5}, + {"matrix": [4, 13], "x": 14.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 14], "x": 16, "y": 4.5}, + {"matrix": [4, 16], "x": 18.25, "y": 4.5}, + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 1.25}, + {"matrix": [5, 5], "x": 5, "y": 5.5, "w": 2.25}, + {"matrix": [5, 7], "x": 8.25, "y": 5.5, "w": 2.75}, + {"matrix": [5, 9], "x": 11, "y": 5.5, "w": 1.25}, + {"matrix": [5, 10], "x": 12.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 14.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 15], "x": 17.25, "y": 5.5}, + {"matrix": [5, 16], "x": 18.25, "y": 5.5}, + {"matrix": [5, 17], "x": 19.25, "y": 5.5} + ] + } + } +} diff --git a/keyboards/cipulot/ec_virgo/keymaps/default/keymap.c b/keyboards/cipulot/ec_virgo/keymaps/default/keymap.c new file mode 100644 index 00000000000..f176ec71dc0 --- /dev/null +++ b/keyboards/cipulot/ec_virgo/keymaps/default/keymap.c @@ -0,0 +1,37 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_ENTER, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENTER, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + [1] = LAYOUT( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + + // clang-format on +}; diff --git a/keyboards/cipulot/ec_virgo/keymaps/via/keymap.c b/keyboards/cipulot/ec_virgo/keymaps/via/keymap.c new file mode 100644 index 00000000000..f176ec71dc0 --- /dev/null +++ b/keyboards/cipulot/ec_virgo/keymaps/via/keymap.c @@ -0,0 +1,37 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_ENTER, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENTER, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + [1] = LAYOUT( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + + // clang-format on +}; diff --git a/keyboards/cipulot/ec_virgo/keymaps/via/rules.mk b/keyboards/cipulot/ec_virgo/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/cipulot/ec_virgo/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cipulot/ec_virgo/mcuconf.h b/keyboards/cipulot/ec_virgo/mcuconf.h new file mode 100644 index 00000000000..fa3c955e0d8 --- /dev/null +++ b/keyboards/cipulot/ec_virgo/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2023 Cipulot + * + * 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 + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/cipulot/ec_virgo/post_rules.mk b/keyboards/cipulot/ec_virgo/post_rules.mk new file mode 100644 index 00000000000..d726a112a8c --- /dev/null +++ b/keyboards/cipulot/ec_virgo/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(VIA_ENABLE)), yes) + SRC += keyboards/cipulot/common/via_ec.c +endif diff --git a/keyboards/cipulot/ec_virgo/readme.md b/keyboards/cipulot/ec_virgo/readme.md new file mode 100644 index 00000000000..ddf976ca792 --- /dev/null +++ b/keyboards/cipulot/ec_virgo/readme.md @@ -0,0 +1,26 @@ +# Virgo EC + +![Virgo EC PCB](https://i.imgur.com/iaKYqySh.jpeg) + +EC version of the Virgo keyboard. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: Virgo EC PCB +* Hardware Availability: [Antipode](https://www.antipode.no/) + +Make example for this keyboard (after setting up your build environment): + + make cipulot/ec_virgo:default + +Flashing example for this keyboard: + + make cipulot/ec_virgo: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). + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical reset**: Long short the exposed pads on the top of the PCB +* **Keycode in layout**: Press the key mapped to QK_BOOT if it is available diff --git a/keyboards/cipulot/ec_virgo/rules.mk b/keyboards/cipulot/ec_virgo/rules.mk new file mode 100644 index 00000000000..ce525670a68 --- /dev/null +++ b/keyboards/cipulot/ec_virgo/rules.mk @@ -0,0 +1,5 @@ +CUSTOM_MATRIX = lite +ANALOG_DRIVER_REQUIRED = yes +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c +OPT = 3 diff --git a/keyboards/cipulot/kallos/config.h b/keyboards/cipulot/kallos/config.h deleted file mode 100644 index dfe6b13b066..00000000000 --- a/keyboards/cipulot/kallos/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 Cipulot - -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 diff --git a/keyboards/cipulot/kallos/info.json b/keyboards/cipulot/kallos/info.json index b2f265c13fd..77330c2a66d 100644 --- a/keyboards/cipulot/kallos/info.json +++ b/keyboards/cipulot/kallos/info.json @@ -30,6 +30,12 @@ "cols": ["F5", "F6", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F7", "D2", "D1", "B7"], "rows": ["B3", "B2", "F0", "C7", "F4", "F1"] }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/cipulot/kawayo/info.json b/keyboards/cipulot/kawayo/info.json index 85a5f81c2b3..93c362d6649 100644 --- a/keyboards/cipulot/kawayo/info.json +++ b/keyboards/cipulot/kawayo/info.json @@ -12,6 +12,12 @@ "cols": ["B10", "A0", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A4", "A3", "A2", "A1"], "rows": ["B1", "B12", "C13", "A7", "B0"] }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", diff --git a/keyboards/cipulot/rf_r1_8_9xu/config.h b/keyboards/cipulot/rf_r1_8_9xu/config.h index fbd65f259fd..cd98ff7f3da 100644 --- a/keyboards/cipulot/rf_r1_8_9xu/config.h +++ b/keyboards/cipulot/rf_r1_8_9xu/config.h @@ -63,9 +63,3 @@ // #define DEBUG_MATRIX_SCAN_RATE #define DYNAMIC_KEYMAP_LAYER_COUNT 3 #define EECONFIG_KB_DATA_SIZE 201 - -/* 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/cipulot/rf_r1_8_9xu/info.json b/keyboards/cipulot/rf_r1_8_9xu/info.json index 6d3ab8b7091..4c1a0e4384c 100644 --- a/keyboards/cipulot/rf_r1_8_9xu/info.json +++ b/keyboards/cipulot/rf_r1_8_9xu/info.json @@ -6,6 +6,12 @@ "build": { "lto": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "features": { "bootmagic": false, @@ -47,7 +53,6 @@ }, "vid": "0x6369" }, - "community_layouts": ["tkl_jis", "tkl_iso_tsangan", "tkl_ansi_tsangan"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cipulot/rf_r1_8_9xu/rules.mk b/keyboards/cipulot/rf_r1_8_9xu/rules.mk index ab6c37cad43..318e0215ce9 100644 --- a/keyboards/cipulot/rf_r1_8_9xu/rules.mk +++ b/keyboards/cipulot/rf_r1_8_9xu/rules.mk @@ -1,4 +1,5 @@ CUSTOM_MATRIX = lite ANALOG_DRIVER_REQUIRED = yes -SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c OPT = 2 From 4e9967557ef9d68202f9e321a0798be2490b51a7 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 30 Apr 2024 19:35:40 +0200 Subject: [PATCH 211/333] Add EC Type-B (#23170) --- keyboards/cipulot/ec_typeb/config.h | 66 +++++++++++++ keyboards/cipulot/ec_typeb/halconf.h | 21 ++++ keyboards/cipulot/ec_typeb/info.json | 98 +++++++++++++++++++ .../cipulot/ec_typeb/keymaps/default/keymap.c | 42 ++++++++ .../cipulot/ec_typeb/keymaps/via/keymap.c | 42 ++++++++ .../cipulot/ec_typeb/keymaps/via/rules.mk | 1 + keyboards/cipulot/ec_typeb/mcuconf.h | 22 +++++ keyboards/cipulot/ec_typeb/post_rules.mk | 3 + keyboards/cipulot/ec_typeb/readme.md | 26 +++++ keyboards/cipulot/ec_typeb/rules.mk | 5 + 10 files changed, 326 insertions(+) create mode 100644 keyboards/cipulot/ec_typeb/config.h create mode 100644 keyboards/cipulot/ec_typeb/halconf.h create mode 100644 keyboards/cipulot/ec_typeb/info.json create mode 100644 keyboards/cipulot/ec_typeb/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/ec_typeb/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/ec_typeb/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/ec_typeb/mcuconf.h create mode 100644 keyboards/cipulot/ec_typeb/post_rules.mk create mode 100644 keyboards/cipulot/ec_typeb/readme.md create mode 100644 keyboards/cipulot/ec_typeb/rules.mk diff --git a/keyboards/cipulot/ec_typeb/config.h b/keyboards/cipulot/ec_typeb/config.h new file mode 100644 index 00000000000..bf25d0b7128 --- /dev/null +++ b/keyboards/cipulot/ec_typeb/config.h @@ -0,0 +1,66 @@ +/* Copyright 2023 Cipulot + * + * 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 MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define MATRIX_ROW_PINS \ + { A7, B0, A4, A5, A6 } + +#define AMUX_COUNT 2 +#define AMUX_MAX_COLS_COUNT 8 + +#define AMUX_EN_PINS \ + { B7, B3 } + +#define AMUX_SEL_PINS \ + { B4, B5, B6 } + +#define AMUX_COL_CHANNELS_SIZES \ + { 8, 7 } + +#define AMUX_0_COL_CHANNELS \ + { 0, 3, 1, 2, 5, 7, 6, 4 } + +#define AMUX_1_COL_CHANNELS \ + { 0, 3, 1, 2, 5, 7, 6 } + +#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS + +#define DISCHARGE_PIN A2 +#define ANALOG_PORT A1 + +#define DEFAULT_ACTUATION_MODE 0 +#define DEFAULT_MODE_0_ACTUATION_LEVEL 550 +#define DEFAULT_MODE_0_RELEASE_LEVEL 500 +#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL +#define DEFAULT_MODE_1_ACTUATION_OFFSET 70 +#define DEFAULT_MODE_1_RELEASE_OFFSET 70 +#define DEFAULT_EXTREMUM 1023 +#define EXPECTED_NOISE_FLOOR 0 +#define NOISE_FLOOR_THRESHOLD 50 +#define BOTTOMING_CALIBRATION_THRESHOLD 100 +#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30 +#define DEFAULT_BOTTOMING_READING 1023 +#define DEFAULT_CALIBRATION_STARTER true + +#define DISCHARGE_TIME 10 + +// #define DEBUG_MATRIX_SCAN_RATE + +#define EECONFIG_KB_DATA_SIZE 159 diff --git a/keyboards/cipulot/ec_typeb/halconf.h b/keyboards/cipulot/ec_typeb/halconf.h new file mode 100644 index 00000000000..835d43b6a0a --- /dev/null +++ b/keyboards/cipulot/ec_typeb/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2023 Cipulot + * + * 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_ADC TRUE + +#include_next diff --git a/keyboards/cipulot/ec_typeb/info.json b/keyboards/cipulot/ec_typeb/info.json new file mode 100644 index 00000000000..2036632af59 --- /dev/null +++ b/keyboards/cipulot/ec_typeb/info.json @@ -0,0 +1,98 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "EC Type-B", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "processor": "STM32F411", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6BAA", + "shared_endpoint": { + "keyboard": true + }, + "vid": "0x6369" + }, + "layouts": { + "LAYOUT_60_hhkb": { + "layout": [ + {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "1,13", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "2,13", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "3,13", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "3,14", "matrix": [3, 14], "x": 14, "y": 3}, + {"label": "4,1", "matrix": [4, 1], "x": 1.5, "y": 4}, + {"label": "4,2", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "4,6", "matrix": [4, 6], "x": 4, "y": 4, "w": 6}, + {"label": "4,9", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5}, + {"label": "4,10", "matrix": [4, 10], "x": 11.5, "y": 4} + ] + } + } +} diff --git a/keyboards/cipulot/ec_typeb/keymaps/default/keymap.c b/keyboards/cipulot/ec_typeb/keymaps/default/keymap.c new file mode 100644 index 00000000000..71f8cd0368d --- /dev/null +++ b/keyboards/cipulot/ec_typeb/keymaps/default/keymap.c @@ -0,0 +1,42 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_hhkb( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT), + + [1] = LAYOUT_60_hhkb( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, KC_BSPC, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, + _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, MO(2)), + + [2] = LAYOUT_60_hhkb( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_typeb/keymaps/via/keymap.c b/keyboards/cipulot/ec_typeb/keymaps/via/keymap.c new file mode 100644 index 00000000000..71f8cd0368d --- /dev/null +++ b/keyboards/cipulot/ec_typeb/keymaps/via/keymap.c @@ -0,0 +1,42 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_hhkb( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT), + + [1] = LAYOUT_60_hhkb( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, KC_BSPC, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, + _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, MO(2)), + + [2] = LAYOUT_60_hhkb( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_typeb/keymaps/via/rules.mk b/keyboards/cipulot/ec_typeb/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/cipulot/ec_typeb/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cipulot/ec_typeb/mcuconf.h b/keyboards/cipulot/ec_typeb/mcuconf.h new file mode 100644 index 00000000000..fa3c955e0d8 --- /dev/null +++ b/keyboards/cipulot/ec_typeb/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2023 Cipulot + * + * 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 + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/cipulot/ec_typeb/post_rules.mk b/keyboards/cipulot/ec_typeb/post_rules.mk new file mode 100644 index 00000000000..d726a112a8c --- /dev/null +++ b/keyboards/cipulot/ec_typeb/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(VIA_ENABLE)), yes) + SRC += keyboards/cipulot/common/via_ec.c +endif diff --git a/keyboards/cipulot/ec_typeb/readme.md b/keyboards/cipulot/ec_typeb/readme.md new file mode 100644 index 00000000000..c3bfe812388 --- /dev/null +++ b/keyboards/cipulot/ec_typeb/readme.md @@ -0,0 +1,26 @@ +# EC Type-B + +![EC Type-B](https://i.imgur.com/B6yFoUJh.jpg) + +EC Type-B Keyboard by bababaul. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: EC Type-B +* Hardware Availability: [Sand Keys](https://sandkeys.me/) + +Make example for this keyboard (after setting up your build environment): + + make cipulot/ec_typeb:default + +Flashing example for this keyboard: + + make cipulot/ec_typeb: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). + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/cipulot/ec_typeb/rules.mk b/keyboards/cipulot/ec_typeb/rules.mk new file mode 100644 index 00000000000..ce525670a68 --- /dev/null +++ b/keyboards/cipulot/ec_typeb/rules.mk @@ -0,0 +1,5 @@ +CUSTOM_MATRIX = lite +ANALOG_DRIVER_REQUIRED = yes +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c +OPT = 3 From a426abf017cce185c0b79fc2eb7f16a8c1442bed Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 30 Apr 2024 19:36:28 +0200 Subject: [PATCH 212/333] Add EC TKL (#23177) --- keyboards/cipulot/ec_tkl/config.h | 69 +++ keyboards/cipulot/ec_tkl/halconf.h | 23 + keyboards/cipulot/ec_tkl/info.json | 433 ++++++++++++++++++ .../cipulot/ec_tkl/keymaps/default/keymap.c | 39 ++ .../ec_tkl/keymaps/tkl_ansi_tsangan/keymap.c | 37 ++ .../ec_tkl/keymaps/tkl_iso_tsangan/keymap.c | 37 ++ .../cipulot/ec_tkl/keymaps/tkl_jis/keymap.c | 39 ++ keyboards/cipulot/ec_tkl/keymaps/via/config.h | 20 + keyboards/cipulot/ec_tkl/keymaps/via/keymap.c | 39 ++ keyboards/cipulot/ec_tkl/keymaps/via/rules.mk | 1 + keyboards/cipulot/ec_tkl/mcuconf.h | 25 + keyboards/cipulot/ec_tkl/post_rules.mk | 3 + keyboards/cipulot/ec_tkl/readme.md | 26 ++ keyboards/cipulot/ec_tkl/rules.mk | 5 + 14 files changed, 796 insertions(+) create mode 100644 keyboards/cipulot/ec_tkl/config.h create mode 100644 keyboards/cipulot/ec_tkl/halconf.h create mode 100644 keyboards/cipulot/ec_tkl/info.json create mode 100644 keyboards/cipulot/ec_tkl/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/ec_tkl/keymaps/tkl_ansi_tsangan/keymap.c create mode 100644 keyboards/cipulot/ec_tkl/keymaps/tkl_iso_tsangan/keymap.c create mode 100644 keyboards/cipulot/ec_tkl/keymaps/tkl_jis/keymap.c create mode 100644 keyboards/cipulot/ec_tkl/keymaps/via/config.h create mode 100644 keyboards/cipulot/ec_tkl/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/ec_tkl/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/ec_tkl/mcuconf.h create mode 100644 keyboards/cipulot/ec_tkl/post_rules.mk create mode 100644 keyboards/cipulot/ec_tkl/readme.md create mode 100644 keyboards/cipulot/ec_tkl/rules.mk diff --git a/keyboards/cipulot/ec_tkl/config.h b/keyboards/cipulot/ec_tkl/config.h new file mode 100644 index 00000000000..95a7f9137a1 --- /dev/null +++ b/keyboards/cipulot/ec_tkl/config.h @@ -0,0 +1,69 @@ +/* Copyright 2023 Cipulot + * + * 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 MATRIX_ROWS 6 +#define MATRIX_COLS 16 + +#define MATRIX_ROW_PINS \ + { B6, B5, B12, B10, B13, B7 } + +#define AMUX_COUNT 1 +#define AMUX_MAX_COLS_COUNT 16 + +#define AMUX_EN_PINS \ + { A8 } + +#define AMUX_SEL_PINS \ + { B14, B15, A9, A10 } + +#define AMUX_COL_CHANNELS_SIZES \ + { 16 } + +#define AMUX_0_COL_CHANNELS \ + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15} + +#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS + +#define DISCHARGE_PIN A4 +#define ANALOG_PORT A2 + +#define DEFAULT_ACTUATION_MODE 0 +#define DEFAULT_MODE_0_ACTUATION_LEVEL 550 +#define DEFAULT_MODE_0_RELEASE_LEVEL 500 +#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL +#define DEFAULT_MODE_1_ACTUATION_OFFSET 70 +#define DEFAULT_MODE_1_RELEASE_OFFSET 70 +#define DEFAULT_EXTREMUM 1023 +#define EXPECTED_NOISE_FLOOR 0 +#define NOISE_FLOOR_THRESHOLD 50 +#define BOTTOMING_CALIBRATION_THRESHOLD 50 +#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30 +#define DEFAULT_BOTTOMING_READING 1023 +#define DEFAULT_CALIBRATION_STARTER true + +#define DISCHARGE_TIME 10 + +// #define DEBUG_MATRIX_SCAN_RATE +#define EECONFIG_KB_DATA_SIZE 201 + +// PWM driver with direct memory access (DMA) support +#define WS2812_PWM_DRIVER PWMD3 +#define WS2812_PWM_CHANNEL 1 +#define WS2812_PWM_PAL_MODE 2 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_DMA_CHANNEL 5 diff --git a/keyboards/cipulot/ec_tkl/halconf.h b/keyboards/cipulot/ec_tkl/halconf.h new file mode 100644 index 00000000000..f2c22202313 --- /dev/null +++ b/keyboards/cipulot/ec_tkl/halconf.h @@ -0,0 +1,23 @@ +/* Copyright 2023 Cipulot + * + * 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_ADC TRUE +#define HAL_USE_PAL TRUE +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/cipulot/ec_tkl/info.json b/keyboards/cipulot/ec_tkl/info.json new file mode 100644 index 00000000000..0c56fb838d8 --- /dev/null +++ b/keyboards/cipulot/ec_tkl/info.json @@ -0,0 +1,433 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "EC TKL", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "eeprom": { + "wear_leveling": { + "backing_size": 4096 + } + }, + "features": { + "bootmagic": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "processor": "STM32F411", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "led_count": 22 + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6BC3", + "shared_endpoint": { + "keyboard": true + }, + "vid": "0x6369" + }, + "ws2812": { + "driver": "pwm", + "pin": "B4" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0}, + {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0}, + {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0}, + {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0}, + {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0}, + {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0}, + {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0}, + {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25}, + {"label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25}, + {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25}, + {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25}, + {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25}, + {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "2,13", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 0.75}, + {"label": "2,14", "matrix": [2, 14], "x": 14.25, "y": 2.25, "w": 0.75}, + {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25}, + {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25}, + {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25}, + {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"label": "3,13", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25}, + {"label": "4,13", "matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75}, + {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25}, + {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"label": "5,2", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "5,4", "matrix": [5, 4], "x": 4, "y": 5.25, "w": 1.5}, + {"label": "5,6", "matrix": [5, 6], "x": 5.5, "y": 5.25, "w": 2.5}, + {"label": "5,7", "matrix": [5, 7], "x": 8, "y": 5.25, "w": 1.5}, + {"label": "5,8", "matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 1.5}, + {"label": "5,9", "matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5}, + {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25}, + {"label": "5,11", "matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5}, + {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25}, + {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25}, + {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_tsangan": { + "layout": [ + {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0}, + {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0}, + {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0}, + {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0}, + {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0}, + {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0}, + {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0}, + {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "1,14", "matrix": [1, 14], "x": 13, "y": 1.25, "w": 2}, + {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25}, + {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25}, + {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25}, + {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "2,13", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25}, + {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25}, + {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25}, + {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "3,13", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "4,13", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25}, + {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"label": "5,2", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "5,6", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"label": "5,9", "matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5}, + {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25}, + {"label": "5,11", "matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5}, + {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25}, + {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25}, + {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_iso_tsangan": { + "layout": [ + {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0}, + {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0}, + {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0}, + {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0}, + {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0}, + {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0}, + {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0}, + {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "1,14", "matrix": [1, 14], "x": 13, "y": 1.25, "w": 2}, + {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25}, + {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25}, + {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25}, + {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "2,14", "matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25}, + {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25}, + {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25}, + {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "4,13", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25}, + {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"label": "5,2", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "5,6", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"label": "5,9", "matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5}, + {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25}, + {"label": "5,11", "matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5}, + {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25}, + {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25}, + {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_jis": { + "layout": [ + {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "0,1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "0,2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "0,3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "0,4", "matrix": [0, 4], "x": 5, "y": 0}, + {"label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0}, + {"label": "0,9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "0,10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "0,11", "matrix": [0, 11], "x": 13, "y": 0}, + {"label": "0,12", "matrix": [0, 12], "x": 14, "y": 0}, + {"label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0}, + {"label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0}, + {"label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0}, + {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25}, + {"label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25}, + {"label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25}, + {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25}, + {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25}, + {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "2,14", "matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25}, + {"label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25}, + {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25}, + {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25}, + {"label": "4,13", "matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75}, + {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25}, + {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"label": "5,2", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"label": "5,4", "matrix": [5, 4], "x": 4, "y": 5.25, "w": 1.5}, + {"label": "5,6", "matrix": [5, 6], "x": 5.5, "y": 5.25, "w": 2.5}, + {"label": "5,7", "matrix": [5, 7], "x": 8, "y": 5.25, "w": 1.5}, + {"label": "5,8", "matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 1.5}, + {"label": "5,9", "matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5}, + {"label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25}, + {"label": "5,11", "matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5}, + {"label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25}, + {"label": "5,13", "matrix": [5, 13], "x": 16.25, "y": 5.25}, + {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5.25} + ] + } + } +} diff --git a/keyboards/cipulot/ec_tkl/keymaps/default/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/default/keymap.c new file mode 100644 index 00000000000..983bdefe8a9 --- /dev/null +++ b/keyboards/cipulot/ec_tkl/keymaps/default/keymap.c @@ -0,0 +1,39 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +#include "keymap_japanese.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_all( + 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, JP_YEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_ENTER, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENTER, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_UNDS, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_KANA, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + + [1] = LAYOUT_all( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_tkl/keymaps/tkl_ansi_tsangan/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/tkl_ansi_tsangan/keymap.c new file mode 100644 index 00000000000..ba948b4fc12 --- /dev/null +++ b/keyboards/cipulot/ec_tkl/keymaps/tkl_ansi_tsangan/keymap.c @@ -0,0 +1,37 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_tkl_ansi_tsangan( + 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + + [1] = LAYOUT_tkl_ansi_tsangan( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_tkl/keymaps/tkl_iso_tsangan/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/tkl_iso_tsangan/keymap.c new file mode 100644 index 00000000000..1689d44d408 --- /dev/null +++ b/keyboards/cipulot/ec_tkl/keymaps/tkl_iso_tsangan/keymap.c @@ -0,0 +1,37 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_tkl_iso_tsangan( + 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + + [1] = LAYOUT_tkl_iso_tsangan( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_tkl/keymaps/tkl_jis/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/tkl_jis/keymap.c new file mode 100644 index 00000000000..e44575f74f9 --- /dev/null +++ b/keyboards/cipulot/ec_tkl/keymaps/tkl_jis/keymap.c @@ -0,0 +1,39 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +#include "keymap_japanese.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_tkl_jis( + 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + JP_ZKHK, JP_1, JP_2, JP_3, JP_4, JP_5, JP_6, JP_7, JP_8, JP_9, JP_0, JP_MINS, JP_CIRC, JP_YEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, JP_Q, JP_W, JP_E, JP_R, JP_T, JP_Y, JP_U, JP_I, JP_O, JP_P, JP_AT, JP_LBRC, KC_ENTER, KC_DEL, KC_END, KC_PGDN, + JP_EISU, JP_A, JP_S, JP_D, JP_F, JP_G, JP_H, JP_J, JP_K, JP_L, JP_SCLN, JP_COLN, JP_RBRC, + KC_LSFT, JP_Z, JP_X, JP_C, JP_V, JP_B, JP_N, JP_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + + [1] = LAYOUT_tkl_jis( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_tkl/keymaps/via/config.h b/keyboards/cipulot/ec_tkl/keymaps/via/config.h new file mode 100644 index 00000000000..1ab0d3d9aa2 --- /dev/null +++ b/keyboards/cipulot/ec_tkl/keymaps/via/config.h @@ -0,0 +1,20 @@ +/* Copyright 2023 Cipulot + * + * 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 + +// This is the firmware version for VIA support to avoid conflicts on menu fetching +#define VIA_FIRMWARE_VERSION 1 diff --git a/keyboards/cipulot/ec_tkl/keymaps/via/keymap.c b/keyboards/cipulot/ec_tkl/keymaps/via/keymap.c new file mode 100644 index 00000000000..983bdefe8a9 --- /dev/null +++ b/keyboards/cipulot/ec_tkl/keymaps/via/keymap.c @@ -0,0 +1,39 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +#include "keymap_japanese.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_all( + 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, JP_YEN, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_ENTER, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENTER, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_UNDS, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_KANA, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + + [1] = LAYOUT_all( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_tkl/keymaps/via/rules.mk b/keyboards/cipulot/ec_tkl/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/cipulot/ec_tkl/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cipulot/ec_tkl/mcuconf.h b/keyboards/cipulot/ec_tkl/mcuconf.h new file mode 100644 index 00000000000..206928272fb --- /dev/null +++ b/keyboards/cipulot/ec_tkl/mcuconf.h @@ -0,0 +1,25 @@ +/* Copyright 2023 Cipulot + * + * 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 + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE + +#undef STM32_PWM_USE_TIM3 +#define STM32_PWM_USE_TIM3 TRUE diff --git a/keyboards/cipulot/ec_tkl/post_rules.mk b/keyboards/cipulot/ec_tkl/post_rules.mk new file mode 100644 index 00000000000..d726a112a8c --- /dev/null +++ b/keyboards/cipulot/ec_tkl/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(VIA_ENABLE)), yes) + SRC += keyboards/cipulot/common/via_ec.c +endif diff --git a/keyboards/cipulot/ec_tkl/readme.md b/keyboards/cipulot/ec_tkl/readme.md new file mode 100644 index 00000000000..31467b94d74 --- /dev/null +++ b/keyboards/cipulot/ec_tkl/readme.md @@ -0,0 +1,26 @@ +# EC TKL + +![EC TKL PCB](https://i.imgur.com/jQTHGzBh.png) + +Universal TKL Electrostatic Capacitive PCB, with multi-layout support. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: EC TKL PCB Rev 1.1 +* Hardware Availability: TBD + +Make example for this keyboard (after setting up your build environment): + + make cipulot/ec_tkl:default + +Flashing example for this keyboard: + + make cipulot/ec_tkl: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). + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical reset**: Long short the exposed pins on the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/cipulot/ec_tkl/rules.mk b/keyboards/cipulot/ec_tkl/rules.mk new file mode 100644 index 00000000000..318e0215ce9 --- /dev/null +++ b/keyboards/cipulot/ec_tkl/rules.mk @@ -0,0 +1,5 @@ +CUSTOM_MATRIX = lite +ANALOG_DRIVER_REQUIRED = yes +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c +OPT = 2 From 3377813f5d2e08818474c4ea1b0029b776826be7 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 30 Apr 2024 19:38:12 +0200 Subject: [PATCH 213/333] Add EC660C (#23171) --- keyboards/cipulot/ec_660c/config.h | 66 +++++++++++ keyboards/cipulot/ec_660c/halconf.h | 21 ++++ keyboards/cipulot/ec_660c/info.json | 111 ++++++++++++++++++ .../cipulot/ec_660c/keymaps/default/keymap.c | 43 +++++++ .../cipulot/ec_660c/keymaps/via/keymap.c | 43 +++++++ .../cipulot/ec_660c/keymaps/via/rules.mk | 1 + keyboards/cipulot/ec_660c/mcuconf.h | 22 ++++ keyboards/cipulot/ec_660c/post_rules.mk | 3 + keyboards/cipulot/ec_660c/readme.md | 26 ++++ keyboards/cipulot/ec_660c/rules.mk | 5 + 10 files changed, 341 insertions(+) create mode 100644 keyboards/cipulot/ec_660c/config.h create mode 100644 keyboards/cipulot/ec_660c/halconf.h create mode 100644 keyboards/cipulot/ec_660c/info.json create mode 100644 keyboards/cipulot/ec_660c/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/ec_660c/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/ec_660c/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/ec_660c/mcuconf.h create mode 100644 keyboards/cipulot/ec_660c/post_rules.mk create mode 100644 keyboards/cipulot/ec_660c/readme.md create mode 100644 keyboards/cipulot/ec_660c/rules.mk diff --git a/keyboards/cipulot/ec_660c/config.h b/keyboards/cipulot/ec_660c/config.h new file mode 100644 index 00000000000..9e883c40da2 --- /dev/null +++ b/keyboards/cipulot/ec_660c/config.h @@ -0,0 +1,66 @@ +/* Copyright 2023 Cipulot + * + * 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 MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define MATRIX_ROW_PINS \ + { B1, B10, B0, A1, A0 } + +#define AMUX_COUNT 2 +#define AMUX_MAX_COLS_COUNT 8 + +#define AMUX_EN_PINS \ + { B7, B6 } + +#define AMUX_SEL_PINS \ + { B5, B4, B3 } + +#define AMUX_COL_CHANNELS_SIZES \ + { 8, 7 } + +#define AMUX_0_COL_CHANNELS \ + { 3, 0, 1, 2, 4, 6, 7, 5 } + +#define AMUX_1_COL_CHANNELS \ + { 3, 0, 1, 2, 4, 6, 7 } + +#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS + +#define DISCHARGE_PIN A5 +#define ANALOG_PORT A4 + +#define DEFAULT_ACTUATION_MODE 0 +#define DEFAULT_MODE_0_ACTUATION_LEVEL 550 +#define DEFAULT_MODE_0_RELEASE_LEVEL 500 +#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL +#define DEFAULT_MODE_1_ACTUATION_OFFSET 70 +#define DEFAULT_MODE_1_RELEASE_OFFSET 70 +#define DEFAULT_EXTREMUM 1023 +#define EXPECTED_NOISE_FLOOR 0 +#define NOISE_FLOOR_THRESHOLD 50 +#define BOTTOMING_CALIBRATION_THRESHOLD 100 +#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30 +#define DEFAULT_BOTTOMING_READING 1023 +#define DEFAULT_CALIBRATION_STARTER true + +#define DISCHARGE_TIME 10 + +// #define DEBUG_MATRIX_SCAN_RATE + +#define EECONFIG_KB_DATA_SIZE 159 diff --git a/keyboards/cipulot/ec_660c/halconf.h b/keyboards/cipulot/ec_660c/halconf.h new file mode 100644 index 00000000000..835d43b6a0a --- /dev/null +++ b/keyboards/cipulot/ec_660c/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2023 Cipulot + * + * 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_ADC TRUE + +#include_next diff --git a/keyboards/cipulot/ec_660c/info.json b/keyboards/cipulot/ec_660c/info.json new file mode 100644 index 00000000000..32ac397b6bf --- /dev/null +++ b/keyboards/cipulot/ec_660c/info.json @@ -0,0 +1,111 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "EC 660C", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "indicators": { + "caps_lock": "B14", + "scroll_lock": "B15" + }, + "processor": "STM32F401", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6BA6", + "shared_endpoint": { + "keyboard": true + }, + "vid": "0x6369" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "1,14", "matrix": [1, 14], "x": 15.5, "y": 0}, + {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "1,13", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "2,14", "matrix": [2, 14], "x": 15.5, "y": 1}, + {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2}, + {"label": "2,13", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3}, + {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "3,12", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25}, + {"label": "3,13", "matrix": [3, 13], "x": 14.5, "y": 3}, + {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "4,2", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "4,6", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6}, + {"label": "4,9", "matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25}, + {"label": "4,10", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.25}, + {"label": "4,11", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25}, + {"label": "4,12", "matrix": [4, 12], "x": 13.5, "y": 4}, + {"label": "4,13", "matrix": [4, 13], "x": 14.5, "y": 4}, + {"label": "4,14", "matrix": [4, 14], "x": 15.5, "y": 4} + ] + } + } +} diff --git a/keyboards/cipulot/ec_660c/keymaps/default/keymap.c b/keyboards/cipulot/ec_660c/keymaps/default/keymap.c new file mode 100644 index 00000000000..5d82bdc3abd --- /dev/null +++ b/keyboards/cipulot/ec_660c/keymaps/default/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [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, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, _______, _______, _______, + _______, _______, _______, _______, _______, MO(2), _______, _______, _______, _______ + ), + [2] = LAYOUT( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_660c/keymaps/via/keymap.c b/keyboards/cipulot/ec_660c/keymaps/via/keymap.c new file mode 100644 index 00000000000..5d82bdc3abd --- /dev/null +++ b/keyboards/cipulot/ec_660c/keymaps/via/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [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, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, _______, _______, _______, + _______, _______, _______, _______, _______, MO(2), _______, _______, _______, _______ + ), + [2] = LAYOUT( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_660c/keymaps/via/rules.mk b/keyboards/cipulot/ec_660c/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/cipulot/ec_660c/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cipulot/ec_660c/mcuconf.h b/keyboards/cipulot/ec_660c/mcuconf.h new file mode 100644 index 00000000000..fa3c955e0d8 --- /dev/null +++ b/keyboards/cipulot/ec_660c/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2023 Cipulot + * + * 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 + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/cipulot/ec_660c/post_rules.mk b/keyboards/cipulot/ec_660c/post_rules.mk new file mode 100644 index 00000000000..d726a112a8c --- /dev/null +++ b/keyboards/cipulot/ec_660c/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(VIA_ENABLE)), yes) + SRC += keyboards/cipulot/common/via_ec.c +endif diff --git a/keyboards/cipulot/ec_660c/readme.md b/keyboards/cipulot/ec_660c/readme.md new file mode 100644 index 00000000000..c01bb3252e0 --- /dev/null +++ b/keyboards/cipulot/ec_660c/readme.md @@ -0,0 +1,26 @@ +# EC660C + +![EC660C PCB](https://i.imgur.com/HfTvrkph.jpg) + +Replacement PCB for the Leopold FC660C. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: EC660C PCB +* Hardware Availability: TBD + +Make example for this keyboard (after setting up your build environment): + + make cipulot/ec_660c:default + +Flashing example for this keyboard: + + make cipulot/ec_660c: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). + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical reset**: Long short the exposed pads on the top of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/cipulot/ec_660c/rules.mk b/keyboards/cipulot/ec_660c/rules.mk new file mode 100644 index 00000000000..ce525670a68 --- /dev/null +++ b/keyboards/cipulot/ec_660c/rules.mk @@ -0,0 +1,5 @@ +CUSTOM_MATRIX = lite +ANALOG_DRIVER_REQUIRED = yes +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c +OPT = 3 From d21363325dcc197725ddbe77063527314452751e Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 30 Apr 2024 19:39:50 +0200 Subject: [PATCH 214/333] Add EC Dolice (#23178) --- keyboards/cipulot/ec_dolice/config.h | 66 ++++ keyboards/cipulot/ec_dolice/halconf.h | 21 ++ keyboards/cipulot/ec_dolice/info.json | 319 ++++++++++++++++++ .../ec_dolice/keymaps/default/keymap.c | 41 +++ .../cipulot/ec_dolice/keymaps/via/keymap.c | 41 +++ .../cipulot/ec_dolice/keymaps/via/rules.mk | 1 + keyboards/cipulot/ec_dolice/mcuconf.h | 22 ++ keyboards/cipulot/ec_dolice/post_rules.mk | 3 + keyboards/cipulot/ec_dolice/readme.md | 26 ++ keyboards/cipulot/ec_dolice/rules.mk | 5 + 10 files changed, 545 insertions(+) create mode 100644 keyboards/cipulot/ec_dolice/config.h create mode 100644 keyboards/cipulot/ec_dolice/halconf.h create mode 100644 keyboards/cipulot/ec_dolice/info.json create mode 100644 keyboards/cipulot/ec_dolice/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/ec_dolice/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/ec_dolice/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/ec_dolice/mcuconf.h create mode 100644 keyboards/cipulot/ec_dolice/post_rules.mk create mode 100644 keyboards/cipulot/ec_dolice/readme.md create mode 100644 keyboards/cipulot/ec_dolice/rules.mk diff --git a/keyboards/cipulot/ec_dolice/config.h b/keyboards/cipulot/ec_dolice/config.h new file mode 100644 index 00000000000..a5c56e79491 --- /dev/null +++ b/keyboards/cipulot/ec_dolice/config.h @@ -0,0 +1,66 @@ +/* Copyright 2023 Cipulot + * + * 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 MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define MATRIX_ROW_PINS \ + { B13, A8, B12, B14, B15 } + +#define AMUX_COUNT 2 +#define AMUX_MAX_COLS_COUNT 8 + +#define AMUX_EN_PINS \ + { B9, B8 } + +#define AMUX_SEL_PINS \ + { B7, B6, B5 } + +#define AMUX_COL_CHANNELS_SIZES \ + { 8, 7 } + +#define AMUX_0_COL_CHANNELS \ + { 3, 0, 1, 2, 4, 6, 7, 5 } + +#define AMUX_1_COL_CHANNELS \ + { 3, 0, 1, 2, 4, 6, 7 } + +#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS + +#define DISCHARGE_PIN A3 +#define ANALOG_PORT A2 + +#define DEFAULT_ACTUATION_MODE 0 +#define DEFAULT_MODE_0_ACTUATION_LEVEL 550 +#define DEFAULT_MODE_0_RELEASE_LEVEL 500 +#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL +#define DEFAULT_MODE_1_ACTUATION_OFFSET 70 +#define DEFAULT_MODE_1_RELEASE_OFFSET 70 +#define DEFAULT_EXTREMUM 1023 +#define EXPECTED_NOISE_FLOOR 0 +#define NOISE_FLOOR_THRESHOLD 50 +#define BOTTOMING_CALIBRATION_THRESHOLD 100 +#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30 +#define DEFAULT_BOTTOMING_READING 1023 +#define DEFAULT_CALIBRATION_STARTER true + +#define DISCHARGE_TIME 10 + +// #define DEBUG_MATRIX_SCAN_RATE + +#define EECONFIG_KB_DATA_SIZE 159 diff --git a/keyboards/cipulot/ec_dolice/halconf.h b/keyboards/cipulot/ec_dolice/halconf.h new file mode 100644 index 00000000000..835d43b6a0a --- /dev/null +++ b/keyboards/cipulot/ec_dolice/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2023 Cipulot + * + * 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_ADC TRUE + +#include_next diff --git a/keyboards/cipulot/ec_dolice/info.json b/keyboards/cipulot/ec_dolice/info.json new file mode 100644 index 00000000000..e81422e2c54 --- /dev/null +++ b/keyboards/cipulot/ec_dolice/info.json @@ -0,0 +1,319 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "Dolice EC", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "indicators": { + "caps_lock": "B4", + "num_lock": "A15", + "scroll_lock": "B3", + "on_state": 0 + }, + "processor": "STM32F411", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6BB9", + "shared_endpoint": { + "keyboard": true + }, + "vid": "0x6369" + }, + "layout_aliases": { + "LAYOUT_all": "LAYOUT_alice_split_bs" + }, + "layouts": { + "LAYOUT_alice": { + "layout": [ + {"matrix": [1, 0], "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [0, 2], "x": 3.25, "y": 0}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0}, + {"matrix": [0, 5], "x": 6.25, "y": 0}, + {"matrix": [0, 6], "x": 7.25, "y": 0}, + {"matrix": [0, 7], "x": 10.25, "y": 0}, + {"matrix": [0, 8], "x": 11.25, "y": 0}, + {"matrix": [0, 9], "x": 12.25, "y": 0}, + {"matrix": [0, 10], "x": 13.25, "y": 0}, + {"matrix": [0, 11], "x": 14.25, "y": 0}, + {"matrix": [0, 12], "x": 15.25, "y": 0}, + {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 9.75, "y": 1}, + {"matrix": [1, 8], "x": 10.75, "y": 1}, + {"matrix": [1, 9], "x": 11.75, "y": 1}, + {"matrix": [1, 10], "x": 12.75, "y": 1}, + {"matrix": [1, 11], "x": 13.75, "y": 1}, + {"matrix": [1, 12], "x": 14.75, "y": 1}, + {"matrix": [1, 13], "x": 15.75, "y": 1}, + {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 10, "y": 2}, + {"matrix": [2, 8], "x": 11, "y": 2}, + {"matrix": [2, 9], "x": 12, "y": 2}, + {"matrix": [2, 10], "x": 13, "y": 2}, + {"matrix": [2, 11], "x": 14, "y": 2}, + {"matrix": [2, 12], "x": 15, "y": 2}, + {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 3.5, "y": 3}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3}, + {"matrix": [3, 6], "x": 7.5, "y": 3}, + {"matrix": [3, 7], "x": 9.5, "y": 3}, + {"matrix": [3, 8], "x": 10.5, "y": 3}, + {"matrix": [3, 9], "x": 11.5, "y": 3}, + {"matrix": [3, 10], "x": 12.5, "y": 3}, + {"matrix": [3, 11], "x": 13.5, "y": 3}, + {"matrix": [3, 12], "x": 14.5, "y": 3}, + {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 17.25, "y": 3}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_alice_split_bs": { + "layout": [ + {"matrix": [1, 0], "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [0, 2], "x": 3.25, "y": 0}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0}, + {"matrix": [0, 5], "x": 6.25, "y": 0}, + {"matrix": [0, 6], "x": 7.25, "y": 0}, + {"matrix": [0, 7], "x": 10.25, "y": 0}, + {"matrix": [0, 8], "x": 11.25, "y": 0}, + {"matrix": [0, 9], "x": 12.25, "y": 0}, + {"matrix": [0, 10], "x": 13.25, "y": 0}, + {"matrix": [0, 11], "x": 14.25, "y": 0}, + {"matrix": [0, 12], "x": 15.25, "y": 0}, + {"matrix": [0, 13], "x": 16.25, "y": 0}, + {"matrix": [0, 14], "x": 17.25, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 9.75, "y": 1}, + {"matrix": [1, 8], "x": 10.75, "y": 1}, + {"matrix": [1, 9], "x": 11.75, "y": 1}, + {"matrix": [1, 10], "x": 12.75, "y": 1}, + {"matrix": [1, 11], "x": 13.75, "y": 1}, + {"matrix": [1, 12], "x": 14.75, "y": 1}, + {"matrix": [1, 13], "x": 15.75, "y": 1}, + {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 10, "y": 2}, + {"matrix": [2, 8], "x": 11, "y": 2}, + {"matrix": [2, 9], "x": 12, "y": 2}, + {"matrix": [2, 10], "x": 13, "y": 2}, + {"matrix": [2, 11], "x": 14, "y": 2}, + {"matrix": [2, 12], "x": 15, "y": 2}, + {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 3.5, "y": 3}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3}, + {"matrix": [3, 6], "x": 7.5, "y": 3}, + {"matrix": [3, 7], "x": 9.5, "y": 3}, + {"matrix": [3, 8], "x": 10.5, "y": 3}, + {"matrix": [3, 9], "x": 11.5, "y": 3}, + {"matrix": [3, 10], "x": 12.5, "y": 3}, + {"matrix": [3, 11], "x": 13.5, "y": 3}, + {"matrix": [3, 12], "x": 14.5, "y": 3}, + {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 17.25, "y": 3}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_long_rshift": { + "layout": [ + {"matrix": [1, 0], "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [0, 2], "x": 3.25, "y": 0}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0}, + {"matrix": [0, 5], "x": 6.25, "y": 0}, + {"matrix": [0, 6], "x": 7.25, "y": 0}, + {"matrix": [0, 7], "x": 10.25, "y": 0}, + {"matrix": [0, 8], "x": 11.25, "y": 0}, + {"matrix": [0, 9], "x": 12.25, "y": 0}, + {"matrix": [0, 10], "x": 13.25, "y": 0}, + {"matrix": [0, 11], "x": 14.25, "y": 0}, + {"matrix": [0, 12], "x": 15.25, "y": 0}, + {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 9.75, "y": 1}, + {"matrix": [1, 8], "x": 10.75, "y": 1}, + {"matrix": [1, 9], "x": 11.75, "y": 1}, + {"matrix": [1, 10], "x": 12.75, "y": 1}, + {"matrix": [1, 11], "x": 13.75, "y": 1}, + {"matrix": [1, 12], "x": 14.75, "y": 1}, + {"matrix": [1, 13], "x": 15.75, "y": 1}, + {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 10, "y": 2}, + {"matrix": [2, 8], "x": 11, "y": 2}, + {"matrix": [2, 9], "x": 12, "y": 2}, + {"matrix": [2, 10], "x": 13, "y": 2}, + {"matrix": [2, 11], "x": 14, "y": 2}, + {"matrix": [2, 12], "x": 15, "y": 2}, + {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 3.5, "y": 3}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3}, + {"matrix": [3, 6], "x": 7.5, "y": 3}, + {"matrix": [3, 7], "x": 9.5, "y": 3}, + {"matrix": [3, 8], "x": 10.5, "y": 3}, + {"matrix": [3, 9], "x": 11.5, "y": 3}, + {"matrix": [3, 10], "x": 12.5, "y": 3}, + {"matrix": [3, 11], "x": 13.5, "y": 3}, + {"matrix": [3, 12], "x": 14.5, "y": 3}, + {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_long_rshift_split_bs": { + "layout": [ + {"matrix": [1, 0], "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [0, 2], "x": 3.25, "y": 0}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0}, + {"matrix": [0, 5], "x": 6.25, "y": 0}, + {"matrix": [0, 6], "x": 7.25, "y": 0}, + {"matrix": [0, 7], "x": 10.25, "y": 0}, + {"matrix": [0, 8], "x": 11.25, "y": 0}, + {"matrix": [0, 9], "x": 12.25, "y": 0}, + {"matrix": [0, 10], "x": 13.25, "y": 0}, + {"matrix": [0, 11], "x": 14.25, "y": 0}, + {"matrix": [0, 12], "x": 15.25, "y": 0}, + {"matrix": [0, 13], "x": 16.25, "y": 0}, + {"matrix": [0, 14], "x": 17.25, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 9.75, "y": 1}, + {"matrix": [1, 8], "x": 10.75, "y": 1}, + {"matrix": [1, 9], "x": 11.75, "y": 1}, + {"matrix": [1, 10], "x": 12.75, "y": 1}, + {"matrix": [1, 11], "x": 13.75, "y": 1}, + {"matrix": [1, 12], "x": 14.75, "y": 1}, + {"matrix": [1, 13], "x": 15.75, "y": 1}, + {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 10, "y": 2}, + {"matrix": [2, 8], "x": 11, "y": 2}, + {"matrix": [2, 9], "x": 12, "y": 2}, + {"matrix": [2, 10], "x": 13, "y": 2}, + {"matrix": [2, 11], "x": 14, "y": 2}, + {"matrix": [2, 12], "x": 15, "y": 2}, + {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 3.5, "y": 3}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3}, + {"matrix": [3, 6], "x": 7.5, "y": 3}, + {"matrix": [3, 7], "x": 9.5, "y": 3}, + {"matrix": [3, 8], "x": 10.5, "y": 3}, + {"matrix": [3, 9], "x": 11.5, "y": 3}, + {"matrix": [3, 10], "x": 12.5, "y": 3}, + {"matrix": [3, 11], "x": 13.5, "y": 3}, + {"matrix": [3, 12], "x": 14.5, "y": 3}, + {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5} + ] + } + } +} diff --git a/keyboards/cipulot/ec_dolice/keymaps/default/keymap.c b/keyboards/cipulot/ec_dolice/keymaps/default/keymap.c new file mode 100644 index 00000000000..5a501e29823 --- /dev/null +++ b/keyboards/cipulot/ec_dolice/keymaps/default/keymap.c @@ -0,0 +1,41 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_PSCR, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL + ), + [1] = LAYOUT_all( + _______, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + _______, _______, KC_HOME, KC_UP, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, _______, _______, + _______, _______, _______, _______, _______, _______, MO(2) + ), + [2] = LAYOUT_all( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/cipulot/ec_dolice/keymaps/via/keymap.c b/keyboards/cipulot/ec_dolice/keymaps/via/keymap.c new file mode 100644 index 00000000000..5a501e29823 --- /dev/null +++ b/keyboards/cipulot/ec_dolice/keymaps/via/keymap.c @@ -0,0 +1,41 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_PSCR, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL + ), + [1] = LAYOUT_all( + _______, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + _______, _______, KC_HOME, KC_UP, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, _______, _______, + _______, _______, _______, _______, _______, _______, MO(2) + ), + [2] = LAYOUT_all( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/cipulot/ec_dolice/keymaps/via/rules.mk b/keyboards/cipulot/ec_dolice/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/cipulot/ec_dolice/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cipulot/ec_dolice/mcuconf.h b/keyboards/cipulot/ec_dolice/mcuconf.h new file mode 100644 index 00000000000..fa3c955e0d8 --- /dev/null +++ b/keyboards/cipulot/ec_dolice/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2023 Cipulot + * + * 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 + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/cipulot/ec_dolice/post_rules.mk b/keyboards/cipulot/ec_dolice/post_rules.mk new file mode 100644 index 00000000000..d726a112a8c --- /dev/null +++ b/keyboards/cipulot/ec_dolice/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(VIA_ENABLE)), yes) + SRC += keyboards/cipulot/common/via_ec.c +endif diff --git a/keyboards/cipulot/ec_dolice/readme.md b/keyboards/cipulot/ec_dolice/readme.md new file mode 100644 index 00000000000..a947df139c3 --- /dev/null +++ b/keyboards/cipulot/ec_dolice/readme.md @@ -0,0 +1,26 @@ +# Dolice EC + +![Dolice EC](https://i.imgur.com/uvM0G5v.png) + +The Dolice is a alice keyboard designed by Lx3 (Linworks) and yuktsi (TGR) and run by KLC. EC Version designed by Cipulot. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: Dolice EC +* Hardware availability: Groupbuys. Check the ongoing ones on [the KLC Discord](https://discord.gg/d2A72mGPRB) or [Webshop](https://klc-playground.com/). + +Make example for this keyboard (after setting up your build environment): + + make cipulot/ec_dolice:default + +Flashing example for this keyboard: + + make cipulot/ec_dolice: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). + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical reset**: Long short the exposed pads on the top of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/cipulot/ec_dolice/rules.mk b/keyboards/cipulot/ec_dolice/rules.mk new file mode 100644 index 00000000000..ce525670a68 --- /dev/null +++ b/keyboards/cipulot/ec_dolice/rules.mk @@ -0,0 +1,5 @@ +CUSTOM_MATRIX = lite +ANALOG_DRIVER_REQUIRED = yes +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c +OPT = 3 From 822ba1edfa0a4309eeb8304749fb31fd414d369c Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 30 Apr 2024 19:40:40 +0200 Subject: [PATCH 215/333] Add EC Vero (#23176) --- keyboards/cipulot/ec_vero/config.h | 61 +++++++ keyboards/cipulot/ec_vero/halconf.h | 21 +++ keyboards/cipulot/ec_vero/info.json | 165 ++++++++++++++++++ .../cipulot/ec_vero/keymaps/60_hhkb/keymap.c | 42 +++++ .../cipulot/ec_vero/keymaps/default/keymap.c | 42 +++++ .../cipulot/ec_vero/keymaps/via/keymap.c | 42 +++++ .../cipulot/ec_vero/keymaps/via/rules.mk | 1 + keyboards/cipulot/ec_vero/mcuconf.h | 22 +++ keyboards/cipulot/ec_vero/post_rules.mk | 3 + keyboards/cipulot/ec_vero/readme.md | 26 +++ keyboards/cipulot/ec_vero/rules.mk | 5 + 11 files changed, 430 insertions(+) create mode 100644 keyboards/cipulot/ec_vero/config.h create mode 100644 keyboards/cipulot/ec_vero/halconf.h create mode 100644 keyboards/cipulot/ec_vero/info.json create mode 100644 keyboards/cipulot/ec_vero/keymaps/60_hhkb/keymap.c create mode 100644 keyboards/cipulot/ec_vero/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/ec_vero/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/ec_vero/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/ec_vero/mcuconf.h create mode 100644 keyboards/cipulot/ec_vero/post_rules.mk create mode 100644 keyboards/cipulot/ec_vero/readme.md create mode 100644 keyboards/cipulot/ec_vero/rules.mk diff --git a/keyboards/cipulot/ec_vero/config.h b/keyboards/cipulot/ec_vero/config.h new file mode 100644 index 00000000000..89f7474b552 --- /dev/null +++ b/keyboards/cipulot/ec_vero/config.h @@ -0,0 +1,61 @@ +/* Copyright 2023 Cipulot + * + * 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 MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define MATRIX_ROW_PINS \ + { B7, B6, A9, A10, B3 } + +#define AMUX_COUNT 1 +#define AMUX_MAX_COLS_COUNT 15 + +#define AMUX_EN_PINS \ + { B14 } + +#define AMUX_SEL_PINS \ + { B13, B12, B15, A8 } + +#define AMUX_COL_CHANNELS_SIZES \ + { 15 } + +#define AMUX_0_COL_CHANNELS \ + { 1, 2, 3, 4, 5, 6, 7, 0, 8, 9, 10, 11, 13, 12, 14} + +#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS + +#define DISCHARGE_PIN A4 +#define ANALOG_PORT A2 + +#define DEFAULT_ACTUATION_MODE 0 +#define DEFAULT_MODE_0_ACTUATION_LEVEL 550 +#define DEFAULT_MODE_0_RELEASE_LEVEL 500 +#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL +#define DEFAULT_MODE_1_ACTUATION_OFFSET 70 +#define DEFAULT_MODE_1_RELEASE_OFFSET 70 +#define DEFAULT_EXTREMUM 1023 +#define EXPECTED_NOISE_FLOOR 0 +#define NOISE_FLOOR_THRESHOLD 50 +#define BOTTOMING_CALIBRATION_THRESHOLD 50 +#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30 +#define DEFAULT_BOTTOMING_READING 1023 +#define DEFAULT_CALIBRATION_STARTER true + +#define DISCHARGE_TIME 10 + +#define EECONFIG_KB_DATA_SIZE 159 diff --git a/keyboards/cipulot/ec_vero/halconf.h b/keyboards/cipulot/ec_vero/halconf.h new file mode 100644 index 00000000000..835d43b6a0a --- /dev/null +++ b/keyboards/cipulot/ec_vero/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2023 Cipulot + * + * 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_ADC TRUE + +#include_next diff --git a/keyboards/cipulot/ec_vero/info.json b/keyboards/cipulot/ec_vero/info.json new file mode 100644 index 00000000000..a2cc1e4a07d --- /dev/null +++ b/keyboards/cipulot/ec_vero/info.json @@ -0,0 +1,165 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "Vero EC", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "processor": "STM32F411", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6BC1", + "shared_endpoint": { + "keyboard": true + }, + "vid": "0x6369" + }, + "layouts": { + "LAYOUT_60_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 6}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4} + ] + }, + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 0.75}, + {"matrix": [1, 14], "x": 14.25, "y": 1, "w": 0.75}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 6}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4} + ] + } + } +} diff --git a/keyboards/cipulot/ec_vero/keymaps/60_hhkb/keymap.c b/keyboards/cipulot/ec_vero/keymaps/60_hhkb/keymap.c new file mode 100644 index 00000000000..bd4df694af9 --- /dev/null +++ b/keyboards/cipulot/ec_vero/keymaps/60_hhkb/keymap.c @@ -0,0 +1,42 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_hhkb( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT), + + [1] = LAYOUT_60_hhkb( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, KC_BSPC, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, + _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, MO(2)), + + [2] = LAYOUT_60_hhkb( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_vero/keymaps/default/keymap.c b/keyboards/cipulot/ec_vero/keymaps/default/keymap.c new file mode 100644 index 00000000000..06b3651d94a --- /dev/null +++ b/keyboards/cipulot/ec_vero/keymaps/default/keymap.c @@ -0,0 +1,42 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_ENTER, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENTER, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT), + + [1] = LAYOUT_all( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, KC_BSPC, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, MO(2)), + + [2] = LAYOUT_all( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_vero/keymaps/via/keymap.c b/keyboards/cipulot/ec_vero/keymaps/via/keymap.c new file mode 100644 index 00000000000..06b3651d94a --- /dev/null +++ b/keyboards/cipulot/ec_vero/keymaps/via/keymap.c @@ -0,0 +1,42 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_ENTER, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENTER, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT), + + [1] = LAYOUT_all( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, KC_BSPC, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, MO(2)), + + [2] = LAYOUT_all( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_vero/keymaps/via/rules.mk b/keyboards/cipulot/ec_vero/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/cipulot/ec_vero/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cipulot/ec_vero/mcuconf.h b/keyboards/cipulot/ec_vero/mcuconf.h new file mode 100644 index 00000000000..fa3c955e0d8 --- /dev/null +++ b/keyboards/cipulot/ec_vero/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2023 Cipulot + * + * 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 + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/cipulot/ec_vero/post_rules.mk b/keyboards/cipulot/ec_vero/post_rules.mk new file mode 100644 index 00000000000..d726a112a8c --- /dev/null +++ b/keyboards/cipulot/ec_vero/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(VIA_ENABLE)), yes) + SRC += keyboards/cipulot/common/via_ec.c +endif diff --git a/keyboards/cipulot/ec_vero/readme.md b/keyboards/cipulot/ec_vero/readme.md new file mode 100644 index 00000000000..590423fa023 --- /dev/null +++ b/keyboards/cipulot/ec_vero/readme.md @@ -0,0 +1,26 @@ +# Vero EC + +![Vero EC PCB](https://i.imgur.com/JV8pMaXh.jpg) + +EC version of the Vero R2 keyboard. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: Vero EC PCB +* Hardware Availability: [Antipode](https://www.antipode.no/) + +Make example for this keyboard (after setting up your build environment): + + make cipulot/ec_vero:default + +Flashing example for this keyboard: + + make cipulot/ec_vero: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). + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical reset**: Long short the exposed pads on the top of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/cipulot/ec_vero/rules.mk b/keyboards/cipulot/ec_vero/rules.mk new file mode 100644 index 00000000000..ce525670a68 --- /dev/null +++ b/keyboards/cipulot/ec_vero/rules.mk @@ -0,0 +1,5 @@ +CUSTOM_MATRIX = lite +ANALOG_DRIVER_REQUIRED = yes +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c +OPT = 3 From 900bec6211eb5c801c158bd30969397ff06b47fe Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 30 Apr 2024 19:41:29 +0200 Subject: [PATCH 216/333] Add EC Menhir (#23175) --- keyboards/cipulot/ec_menhir/config.h | 61 +++++++++++++ keyboards/cipulot/ec_menhir/halconf.h | 21 +++++ keyboards/cipulot/ec_menhir/info.json | 87 +++++++++++++++++++ .../ec_menhir/keymaps/default/keymap.c | 27 ++++++ .../cipulot/ec_menhir/keymaps/via/keymap.c | 27 ++++++ .../cipulot/ec_menhir/keymaps/via/rules.mk | 1 + keyboards/cipulot/ec_menhir/mcuconf.h | 22 +++++ keyboards/cipulot/ec_menhir/post_rules.mk | 3 + keyboards/cipulot/ec_menhir/readme.md | 26 ++++++ keyboards/cipulot/ec_menhir/rules.mk | 4 + 10 files changed, 279 insertions(+) create mode 100644 keyboards/cipulot/ec_menhir/config.h create mode 100644 keyboards/cipulot/ec_menhir/halconf.h create mode 100644 keyboards/cipulot/ec_menhir/info.json create mode 100644 keyboards/cipulot/ec_menhir/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/ec_menhir/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/ec_menhir/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/ec_menhir/mcuconf.h create mode 100644 keyboards/cipulot/ec_menhir/post_rules.mk create mode 100644 keyboards/cipulot/ec_menhir/readme.md create mode 100644 keyboards/cipulot/ec_menhir/rules.mk diff --git a/keyboards/cipulot/ec_menhir/config.h b/keyboards/cipulot/ec_menhir/config.h new file mode 100644 index 00000000000..bd0094c7f15 --- /dev/null +++ b/keyboards/cipulot/ec_menhir/config.h @@ -0,0 +1,61 @@ +/* Copyright 2023 Cipulot + * + * 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 MATRIX_ROWS 4 +#define MATRIX_COLS 12 + +#define MATRIX_ROW_PINS \ + { A0, A3, A2, A1 } + +#define AMUX_COUNT 1 +#define AMUX_MAX_COLS_COUNT 12 + +#define AMUX_EN_PINS \ + { C10 } + +#define AMUX_SEL_PINS \ + { C11, B3, A15, A14 } + +#define AMUX_COL_CHANNELS_SIZES \ + { 12 } + +#define AMUX_0_COL_CHANNELS \ + { 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10 } + +#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS + +#define DISCHARGE_PIN A4 +#define ANALOG_PORT A5 + +#define DEFAULT_ACTUATION_MODE 0 +#define DEFAULT_MODE_0_ACTUATION_LEVEL 550 +#define DEFAULT_MODE_0_RELEASE_LEVEL 500 +#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL +#define DEFAULT_MODE_1_ACTUATION_OFFSET 70 +#define DEFAULT_MODE_1_RELEASE_OFFSET 70 +#define DEFAULT_EXTREMUM 1023 +#define EXPECTED_NOISE_FLOOR 0 +#define NOISE_FLOOR_THRESHOLD 50 +#define BOTTOMING_CALIBRATION_THRESHOLD 50 +#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30 +#define DEFAULT_BOTTOMING_READING 1023 +#define DEFAULT_CALIBRATION_STARTER true + +#define DISCHARGE_TIME 10 + +#define EECONFIG_KB_DATA_SIZE 105 diff --git a/keyboards/cipulot/ec_menhir/halconf.h b/keyboards/cipulot/ec_menhir/halconf.h new file mode 100644 index 00000000000..835d43b6a0a --- /dev/null +++ b/keyboards/cipulot/ec_menhir/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2023 Cipulot + * + * 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_ADC TRUE + +#include_next diff --git a/keyboards/cipulot/ec_menhir/info.json b/keyboards/cipulot/ec_menhir/info.json new file mode 100644 index 00000000000..4cc6a845259 --- /dev/null +++ b/keyboards/cipulot/ec_menhir/info.json @@ -0,0 +1,87 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "EC Menhir", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "eeprom": { + "driver": "wear_leveling", + "wear_leveling": { + "driver": "embedded_flash", + "backing_size": 4096 + } + }, + "features": { + "bootmagic": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "processor": "STM32G431", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6BB8", + "shared_endpoint": { + "keyboard": true + }, + "vid": "0x6369" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0.5, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.5}, + {"matrix": [3, 1], "x": 1.75, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3, "w": 2}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3} + ] + } + } +} diff --git a/keyboards/cipulot/ec_menhir/keymaps/default/keymap.c b/keyboards/cipulot/ec_menhir/keymaps/default/keymap.c new file mode 100644 index 00000000000..e6780e6439f --- /dev/null +++ b/keyboards/cipulot/ec_menhir/keymaps/default/keymap.c @@ -0,0 +1,27 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, + KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LCTL) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_menhir/keymaps/via/keymap.c b/keyboards/cipulot/ec_menhir/keymaps/via/keymap.c new file mode 100644 index 00000000000..e6780e6439f --- /dev/null +++ b/keyboards/cipulot/ec_menhir/keymaps/via/keymap.c @@ -0,0 +1,27 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, + KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LCTL) + // clang-format on +}; diff --git a/keyboards/cipulot/ec_menhir/keymaps/via/rules.mk b/keyboards/cipulot/ec_menhir/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/cipulot/ec_menhir/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cipulot/ec_menhir/mcuconf.h b/keyboards/cipulot/ec_menhir/mcuconf.h new file mode 100644 index 00000000000..b120f145c5b --- /dev/null +++ b/keyboards/cipulot/ec_menhir/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2023 Cipulot + * + * 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 + +#undef STM32_ADC_USE_ADC2 +#define STM32_ADC_USE_ADC2 TRUE diff --git a/keyboards/cipulot/ec_menhir/post_rules.mk b/keyboards/cipulot/ec_menhir/post_rules.mk new file mode 100644 index 00000000000..d726a112a8c --- /dev/null +++ b/keyboards/cipulot/ec_menhir/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(VIA_ENABLE)), yes) + SRC += keyboards/cipulot/common/via_ec.c +endif diff --git a/keyboards/cipulot/ec_menhir/readme.md b/keyboards/cipulot/ec_menhir/readme.md new file mode 100644 index 00000000000..234b1ab9d0e --- /dev/null +++ b/keyboards/cipulot/ec_menhir/readme.md @@ -0,0 +1,26 @@ +# EC Menhir + +![EC Menhir](https://i.imgur.com/m0feb2Zh.png) + +EC version of the Menhir. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: EC Menhir +* Hardware Availability: [fruitykeeb](https://fruitykeeb.xyz/) + +Make example for this keyboard (after setting up your build environment): + + make cipulot/ec_menhir:default + +Flashing example for this keyboard: + + make cipulot/ec_menhir: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). + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/cipulot/ec_menhir/rules.mk b/keyboards/cipulot/ec_menhir/rules.mk new file mode 100644 index 00000000000..e7d73cefc98 --- /dev/null +++ b/keyboards/cipulot/ec_menhir/rules.mk @@ -0,0 +1,4 @@ +CUSTOM_MATRIX = lite +ANALOG_DRIVER_REQUIRED = yes +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c From 69acadf967ed9b8389a3087425c3d2a772c09495 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 30 Apr 2024 19:43:06 +0200 Subject: [PATCH 217/333] Add Chroma Support (#22889) Co-authored-by: Duncan Sutherland Co-authored-by: Drashna Jaelre --- keyboards/cipulot/chroma/info.json | 679 ++++++++++++++++++ .../chroma/keymaps/60_ansi_tsangan/keymap.c | 43 ++ .../chroma/keymaps/60_ansi_wkl/keymap.c | 43 ++ .../60_ansi_wkl_split_bs_rshift/keymap.c | 43 ++ .../chroma/keymaps/60_iso_tsangan/keymap.c | 43 ++ .../60_iso_tsangan_split_bs_rshift/keymap.c | 43 ++ .../chroma/keymaps/60_iso_wkl/keymap.c | 43 ++ .../60_iso_wkl_split_bs_rshift/keymap.c | 43 ++ .../cipulot/chroma/keymaps/default/keymap.c | 43 ++ keyboards/cipulot/chroma/keymaps/via/keymap.c | 43 ++ keyboards/cipulot/chroma/keymaps/via/rules.mk | 1 + keyboards/cipulot/chroma/readme.md | 27 + keyboards/cipulot/chroma/rules.mk | 0 13 files changed, 1094 insertions(+) create mode 100644 keyboards/cipulot/chroma/info.json create mode 100644 keyboards/cipulot/chroma/keymaps/60_ansi_tsangan/keymap.c create mode 100644 keyboards/cipulot/chroma/keymaps/60_ansi_wkl/keymap.c create mode 100644 keyboards/cipulot/chroma/keymaps/60_ansi_wkl_split_bs_rshift/keymap.c create mode 100644 keyboards/cipulot/chroma/keymaps/60_iso_tsangan/keymap.c create mode 100644 keyboards/cipulot/chroma/keymaps/60_iso_tsangan_split_bs_rshift/keymap.c create mode 100644 keyboards/cipulot/chroma/keymaps/60_iso_wkl/keymap.c create mode 100644 keyboards/cipulot/chroma/keymaps/60_iso_wkl_split_bs_rshift/keymap.c create mode 100644 keyboards/cipulot/chroma/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/chroma/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/chroma/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/chroma/readme.md create mode 100644 keyboards/cipulot/chroma/rules.mk diff --git a/keyboards/cipulot/chroma/info.json b/keyboards/cipulot/chroma/info.json new file mode 100644 index 00000000000..5d418fdce1f --- /dev/null +++ b/keyboards/cipulot/chroma/info.json @@ -0,0 +1,679 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "Chroma", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "features": { + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "A15", "B3", "B4", "B5", "B7", "B6"], + "rows": ["F0", "A2", "A3", "A4", "C15"] + }, + "processor": "STM32F072", + "usb": { + "device_version": "0.0.1", + "pid": "0x6BBF", + "shared_endpoint": { + "keyboard": true + }, + "vid": "0x6369" + }, + "community_layouts": ["60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"], + "layouts": { + "LAYOUT_60_ansi_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_iso_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_tsangan_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + } + } +} diff --git a/keyboards/cipulot/chroma/keymaps/60_ansi_tsangan/keymap.c b/keyboards/cipulot/chroma/keymaps/60_ansi_tsangan/keymap.c new file mode 100644 index 00000000000..df27a14861a --- /dev/null +++ b/keyboards/cipulot/chroma/keymaps/60_ansi_tsangan/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_ansi_tsangan( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL + ), + [1] = LAYOUT_60_ansi_tsangan( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_60_ansi_tsangan( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/chroma/keymaps/60_ansi_wkl/keymap.c b/keyboards/cipulot/chroma/keymaps/60_ansi_wkl/keymap.c new file mode 100644 index 00000000000..4bc80d1d24b --- /dev/null +++ b/keyboards/cipulot/chroma/keymaps/60_ansi_wkl/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_ansi_wkl( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL + ), + [1] = LAYOUT_60_ansi_wkl( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_60_ansi_wkl( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/chroma/keymaps/60_ansi_wkl_split_bs_rshift/keymap.c b/keyboards/cipulot/chroma/keymaps/60_ansi_wkl_split_bs_rshift/keymap.c new file mode 100644 index 00000000000..e9cdf26567f --- /dev/null +++ b/keyboards/cipulot/chroma/keymaps/60_ansi_wkl_split_bs_rshift/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_ansi_wkl_split_bs_rshift( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL + ), + [1] = LAYOUT_60_ansi_wkl_split_bs_rshift( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, + _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, MO(2) + ), + [2] = LAYOUT_60_ansi_wkl_split_bs_rshift( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/chroma/keymaps/60_iso_tsangan/keymap.c b/keyboards/cipulot/chroma/keymaps/60_iso_tsangan/keymap.c new file mode 100644 index 00000000000..55492c3e4d4 --- /dev/null +++ b/keyboards/cipulot/chroma/keymaps/60_iso_tsangan/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_iso_tsangan( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL + ), + [1] = LAYOUT_60_iso_tsangan( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_60_iso_tsangan( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/chroma/keymaps/60_iso_tsangan_split_bs_rshift/keymap.c b/keyboards/cipulot/chroma/keymaps/60_iso_tsangan_split_bs_rshift/keymap.c new file mode 100644 index 00000000000..3cce7112447 --- /dev/null +++ b/keyboards/cipulot/chroma/keymaps/60_iso_tsangan_split_bs_rshift/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_iso_tsangan_split_bs_rshift( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL + ), + [1] = LAYOUT_60_iso_tsangan_split_bs_rshift( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, + _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, MO(2) + ), + [2] = LAYOUT_60_iso_tsangan_split_bs_rshift( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/chroma/keymaps/60_iso_wkl/keymap.c b/keyboards/cipulot/chroma/keymaps/60_iso_wkl/keymap.c new file mode 100644 index 00000000000..01bb84f50d4 --- /dev/null +++ b/keyboards/cipulot/chroma/keymaps/60_iso_wkl/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_iso_wkl( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL + ), + [1] = LAYOUT_60_iso_wkl( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_60_iso_wkl( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/chroma/keymaps/60_iso_wkl_split_bs_rshift/keymap.c b/keyboards/cipulot/chroma/keymaps/60_iso_wkl_split_bs_rshift/keymap.c new file mode 100644 index 00000000000..d412f2a977d --- /dev/null +++ b/keyboards/cipulot/chroma/keymaps/60_iso_wkl_split_bs_rshift/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_iso_wkl_split_bs_rshift( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL + ), + [1] = LAYOUT_60_iso_wkl_split_bs_rshift( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, + _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, MO(2) + ), + [2] = LAYOUT_60_iso_wkl_split_bs_rshift( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/chroma/keymaps/default/keymap.c b/keyboards/cipulot/chroma/keymaps/default/keymap.c new file mode 100644 index 00000000000..c93d9110efe --- /dev/null +++ b/keyboards/cipulot/chroma/keymaps/default/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL + ), + [1] = LAYOUT_all( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, + _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, MO(2) + ), + [2] = LAYOUT_all( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/chroma/keymaps/via/keymap.c b/keyboards/cipulot/chroma/keymaps/via/keymap.c new file mode 100644 index 00000000000..c93d9110efe --- /dev/null +++ b/keyboards/cipulot/chroma/keymaps/via/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL + ), + [1] = LAYOUT_all( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, + _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, MO(2) + ), + [2] = LAYOUT_all( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/chroma/keymaps/via/rules.mk b/keyboards/cipulot/chroma/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/cipulot/chroma/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cipulot/chroma/readme.md b/keyboards/cipulot/chroma/readme.md new file mode 100644 index 00000000000..9a08bbecac1 --- /dev/null +++ b/keyboards/cipulot/chroma/readme.md @@ -0,0 +1,27 @@ +# Chroma + +![Chroma](https://i.imgur.com/clhRkDDh.png) + +A 60% hot swap PCB for MX switches. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: Chroma +* Hardware Availability: [Eloquent Clicks](https://eloquentclicks.com/) + +Make example for this keyboard (after setting up your build environment): + + make cipulot/chroma:default + +Flashing example for this keyboard: + + make cipulot/chroma: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is configured. +* **Physical reset button**: Long press the reset button soldered on the PCB. +* **Bootmagic reset**: Hold down the top left key and plug in the controller. diff --git a/keyboards/cipulot/chroma/rules.mk b/keyboards/cipulot/chroma/rules.mk new file mode 100644 index 00000000000..e69de29bb2d From 31c81d432cbe963a1132f231036d38aa908c9403 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Tue, 30 Apr 2024 20:32:08 +0200 Subject: [PATCH 218/333] Add EC980C (#23172) --- keyboards/cipulot/ec_980c/config.h | 86 +++ keyboards/cipulot/ec_980c/ec_980c.c | 116 ++++ keyboards/cipulot/ec_980c/ec_switch_matrix.c | 318 +++++++++++ keyboards/cipulot/ec_980c/ec_switch_matrix.h | 83 +++ keyboards/cipulot/ec_980c/halconf.h | 23 + keyboards/cipulot/ec_980c/info.json | 170 ++++++ .../cipulot/ec_980c/keymaps/default/keymap.c | 48 ++ .../cipulot/ec_980c/keymaps/via/keymap.c | 48 ++ .../cipulot/ec_980c/keymaps/via/rules.mk | 3 + .../ec_980c/keymaps/via/via_ec_indicators.c | 499 ++++++++++++++++++ keyboards/cipulot/ec_980c/matrix.c | 42 ++ keyboards/cipulot/ec_980c/mcuconf.h | 28 + keyboards/cipulot/ec_980c/readme.md | 26 + keyboards/cipulot/ec_980c/rules.mk | 4 + 14 files changed, 1494 insertions(+) create mode 100644 keyboards/cipulot/ec_980c/config.h create mode 100644 keyboards/cipulot/ec_980c/ec_980c.c create mode 100644 keyboards/cipulot/ec_980c/ec_switch_matrix.c create mode 100644 keyboards/cipulot/ec_980c/ec_switch_matrix.h create mode 100644 keyboards/cipulot/ec_980c/halconf.h create mode 100644 keyboards/cipulot/ec_980c/info.json create mode 100644 keyboards/cipulot/ec_980c/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/ec_980c/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/ec_980c/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/ec_980c/keymaps/via/via_ec_indicators.c create mode 100644 keyboards/cipulot/ec_980c/matrix.c create mode 100644 keyboards/cipulot/ec_980c/mcuconf.h create mode 100644 keyboards/cipulot/ec_980c/readme.md create mode 100644 keyboards/cipulot/ec_980c/rules.mk diff --git a/keyboards/cipulot/ec_980c/config.h b/keyboards/cipulot/ec_980c/config.h new file mode 100644 index 00000000000..e3723822e33 --- /dev/null +++ b/keyboards/cipulot/ec_980c/config.h @@ -0,0 +1,86 @@ +/* Copyright 2023 Cipulot + * + * 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 MATRIX_ROWS 6 +#define MATRIX_COLS 19 + +#define MATRIX_ROW_PINS \ + { B13, B12, B14, A9, B6, B7 } + +#define AMUX_COUNT 3 +#define AMUX_MAX_COLS_COUNT 8 + +#define AMUX_EN_PINS \ + { A0, A1, A8 } + +#define AMUX_SEL_PINS \ + { A4, A3, A2 } + +#define AMUX_COL_CHANNELS_SIZES \ + { 8, 7, 4 } + +#define AMUX_0_COL_CHANNELS \ + { 0, 3, 1, 2, 4, 6, 7, 5 } + +#define AMUX_1_COL_CHANNELS \ + { 1, 0, 3, 2, 4, 6, 7 } + +#define AMUX_2_COL_CHANNELS \ + { 4, 6, 7, 5 } + +#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS, AMUX_2_COL_CHANNELS + +#define DISCHARGE_PIN A6 +#define ANALOG_PORT A7 + +#define DEFAULT_ACTUATION_MODE 0 +#define DEFAULT_MODE_0_ACTUATION_LEVEL 550 +#define DEFAULT_MODE_0_RELEASE_LEVEL 500 +#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL +#define DEFAULT_MODE_1_ACTUATION_OFFSET 70 +#define DEFAULT_MODE_1_RELEASE_OFFSET 70 +#define DEFAULT_EXTREMUM 1023 +#define EXPECTED_NOISE_FLOOR 0 +#define NOISE_FLOOR_THRESHOLD 50 +#define BOTTOMING_CALIBRATION_THRESHOLD 100 +#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30 +#define DEFAULT_BOTTOMING_READING 1023 +#define DEFAULT_CALIBRATION_STARTER true + +#define DISCHARGE_TIME 10 + +//#define DEBUG_MATRIX_SCAN_RATE + +#define EECONFIG_KB_DATA_SIZE 249 + +// Indicators +// PWM driver with direct memory access (DMA) support +#define WS2812_PWM_COMPLEMENTARY_OUTPUT +#define WS2812_PWM_DRIVER PWMD1 +#define WS2812_PWM_CHANNEL 3 +#define WS2812_PWM_PAL_MODE 1 +#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_DMA_CHANNEL 6 + +#define NUM_INDICATOR_INDEX 0 +#define CAPS_INDICATOR_INDEX 1 +#define SCROLL_INDICATOR_INDEX 2 + +#define RGB_MATRIX_DEFAULT_VAL 60 +#define RGB_MATRIX_SLEEP +#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR diff --git a/keyboards/cipulot/ec_980c/ec_980c.c b/keyboards/cipulot/ec_980c/ec_980c.c new file mode 100644 index 00000000000..2b40d5a5e69 --- /dev/null +++ b/keyboards/cipulot/ec_980c/ec_980c.c @@ -0,0 +1,116 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include "ec_switch_matrix.h" +#include "quantum.h" + +void eeconfig_init_kb(void) { + // Default values + eeprom_ec_config.num.h = 0; + eeprom_ec_config.num.s = 0; + eeprom_ec_config.num.v = 60; + eeprom_ec_config.num.enabled = true; + eeprom_ec_config.caps.h = 0; + eeprom_ec_config.caps.s = 0; + eeprom_ec_config.caps.v = 60; + eeprom_ec_config.caps.enabled = true; + eeprom_ec_config.scroll.h = 0; + eeprom_ec_config.scroll.s = 0; + eeprom_ec_config.scroll.v = 60; + eeprom_ec_config.scroll.enabled = true; + eeprom_ec_config.actuation_mode = DEFAULT_ACTUATION_MODE; + eeprom_ec_config.mode_0_actuation_threshold = DEFAULT_MODE_0_ACTUATION_LEVEL; + eeprom_ec_config.mode_0_release_threshold = DEFAULT_MODE_0_RELEASE_LEVEL; + eeprom_ec_config.mode_1_initial_deadzone_offset = DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET; + eeprom_ec_config.mode_1_actuation_offset = DEFAULT_MODE_1_ACTUATION_OFFSET; + eeprom_ec_config.mode_1_release_offset = DEFAULT_MODE_1_RELEASE_OFFSET; + + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + eeprom_ec_config.bottoming_reading[row][col] = DEFAULT_BOTTOMING_READING; + } + } + // Write default value to EEPROM now + eeconfig_update_kb_datablock(&eeprom_ec_config); + + eeconfig_init_user(); +} + +// On Keyboard startup +void keyboard_post_init_kb(void) { + // Read custom menu variables from memory + eeconfig_read_kb_datablock(&eeprom_ec_config); + + // Set runtime values to EEPROM values + ec_config.actuation_mode = eeprom_ec_config.actuation_mode; + ec_config.mode_0_actuation_threshold = eeprom_ec_config.mode_0_actuation_threshold; + ec_config.mode_0_release_threshold = eeprom_ec_config.mode_0_release_threshold; + ec_config.mode_1_initial_deadzone_offset = eeprom_ec_config.mode_1_initial_deadzone_offset; + ec_config.mode_1_actuation_offset = eeprom_ec_config.mode_1_actuation_offset; + ec_config.mode_1_release_offset = eeprom_ec_config.mode_1_release_offset; + ec_config.bottoming_calibration = false; + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.bottoming_calibration_starter[row][col] = true; + ec_config.bottoming_reading[row][col] = eeprom_ec_config.bottoming_reading[row][col]; + ec_config.rescaled_mode_0_actuation_threshold[row][col] = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + ec_config.rescaled_mode_0_release_threshold[row][col] = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + } + + // Call the indicator callback to set the indicator color + rgb_matrix_indicators_kb(); + + keyboard_post_init_user(); +} + +// INDICATOR CALLBACK ------------------------------------------------------------------------------ +/* LED index to physical position + * + * LED0 | LED1 | LED2 + * -----+------+-------- + * Num | Caps | Scroll | + */ +bool rgb_matrix_indicators_kb(void) { + if (eeprom_ec_config.num.enabled) { + // The rgb_matrix_set_color function needs an RGB code to work, so first the indicator color is cast to an HSV value and then translated to RGB + HSV hsv_num_indicator_color = {eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v}; + RGB rgb_num_indicator_color = hsv_to_rgb(hsv_num_indicator_color); + if (host_keyboard_led_state().num_lock) + rgb_matrix_set_color(NUM_INDICATOR_INDEX, rgb_num_indicator_color.r, rgb_num_indicator_color.g, rgb_num_indicator_color.b); + else + rgb_matrix_set_color(NUM_INDICATOR_INDEX, 0, 0, 0); + } + if (eeprom_ec_config.caps.enabled) { + HSV hsv_caps_indicator_color = {eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v}; + RGB rgb_caps_indicator_color = hsv_to_rgb(hsv_caps_indicator_color); + if (host_keyboard_led_state().caps_lock) + rgb_matrix_set_color(CAPS_INDICATOR_INDEX, rgb_caps_indicator_color.r, rgb_caps_indicator_color.g, rgb_caps_indicator_color.b); + else + rgb_matrix_set_color(CAPS_INDICATOR_INDEX, 0, 0, 0); + } + if (eeprom_ec_config.scroll.enabled) { + HSV hsv_scroll_indicator_color = {eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v}; + RGB rgb_scroll_indicator_color = hsv_to_rgb(hsv_scroll_indicator_color); + if (host_keyboard_led_state().scroll_lock) + rgb_matrix_set_color(SCROLL_INDICATOR_INDEX, rgb_scroll_indicator_color.r, rgb_scroll_indicator_color.g, rgb_scroll_indicator_color.b); + else + rgb_matrix_set_color(SCROLL_INDICATOR_INDEX, 0, 0, 0); + } + + return true; +} diff --git a/keyboards/cipulot/ec_980c/ec_switch_matrix.c b/keyboards/cipulot/ec_980c/ec_switch_matrix.c new file mode 100644 index 00000000000..33123bd236e --- /dev/null +++ b/keyboards/cipulot/ec_980c/ec_switch_matrix.c @@ -0,0 +1,318 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include "ec_switch_matrix.h" +#include "analog.h" +#include "atomic_util.h" +#include "math.h" +#include "print.h" +#include "wait.h" + +#if defined(__AVR__) +# error "AVR platforms not supported due to a variety of reasons. Among them there are limited memory, limited number of pins and ADC not being able to give satisfactory results." +#endif + +#define OPEN_DRAIN_SUPPORT defined(PAL_MODE_OUTPUT_OPENDRAIN) + +eeprom_ec_config_t eeprom_ec_config; +ec_config_t ec_config; + +// Pin and port array +const pin_t row_pins[] = MATRIX_ROW_PINS; +const pin_t amux_sel_pins[] = AMUX_SEL_PINS; +const pin_t amux_en_pins[] = AMUX_EN_PINS; +const pin_t amux_n_col_sizes[] = AMUX_COL_CHANNELS_SIZES; +const pin_t amux_n_col_channels[][AMUX_MAX_COLS_COUNT] = {AMUX_COL_CHANNELS}; + +#define AMUX_SEL_PINS_COUNT ARRAY_SIZE(amux_sel_pins) +#define EXPECTED_AMUX_SEL_PINS_COUNT ceil(log2(AMUX_MAX_COLS_COUNT) +// Checks for the correctness of the configuration +_Static_assert(ARRAY_SIZE(amux_en_pins) == AMUX_COUNT, "AMUX_EN_PINS doesn't have the minimum number of bits required to enable all the multiplexers available"); +// Check that number of select pins is enough to select all the channels +_Static_assert(AMUX_SEL_PINS_COUNT == EXPECTED_AMUX_SEL_PINS_COUNT), "AMUX_SEL_PINS doesn't have the minimum number of bits required address all the channels"); +// Check that number of elements in AMUX_COL_CHANNELS_SIZES is enough to specify the number of channels for all the multiplexers available +_Static_assert(ARRAY_SIZE(amux_n_col_sizes) == AMUX_COUNT, "AMUX_COL_CHANNELS_SIZES doesn't have the minimum number of elements required to specify the number of channels for all the multiplexers available"); + +static uint16_t sw_value[MATRIX_ROWS][MATRIX_COLS]; + +static adc_mux adcMux; + +// Initialize the row pins +void init_row(void) { + // Set all row pins as output and low + for (uint8_t idx = 0; idx < MATRIX_ROWS; idx++) { + gpio_set_pin_output(row_pins[idx]); + gpio_write_pin_low(row_pins[idx]); + } +} + +// Initialize the multiplexers +void init_amux(void) { + for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) { + gpio_set_pin_output(amux_en_pins[idx]); + gpio_write_pin_low(amux_en_pins[idx]); + } + for (uint8_t idx = 0; idx < AMUX_SEL_PINS_COUNT; idx++) { + gpio_set_pin_output(amux_sel_pins[idx]); + } +} + +// Select the multiplexer channel of the specified multiplexer +void select_amux_channel(uint8_t channel, uint8_t col) { + // Get the channel for the specified multiplexer + uint8_t ch = amux_n_col_channels[channel][col]; + // momentarily disable specified multiplexer + gpio_write_pin_high(amux_en_pins[channel]); + // Select the multiplexer channel + for (uint8_t i = 0; i < AMUX_SEL_PINS_COUNT; i++) { + gpio_write_pin(amux_sel_pins[i], ch & (1 << i)); + } + // re enable specified multiplexer + gpio_write_pin_low(amux_en_pins[channel]); +} + +// Disable all the unused multiplexers +void disable_unused_amux(uint8_t channel) { + // disable all the other multiplexers apart from the current selected one + for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) { + if (idx != channel) { + gpio_write_pin_high(amux_en_pins[idx]); + } + } +} +// Discharge the peak hold capacitor +void discharge_capacitor(void) { +#ifdef OPEN_DRAIN_SUPPORT + gpio_write_pin_low(DISCHARGE_PIN); +#else + gpio_write_pin_low(DISCHARGE_PIN); + gpio_set_pin_output(DISCHARGE_PIN); +#endif +} + +// Charge the peak hold capacitor +void charge_capacitor(uint8_t row) { +#ifdef OPEN_DRAIN_SUPPORT + gpio_write_pin_high(DISCHARGE_PIN); +#else + gpio_set_pin_input(DISCHARGE_PIN); +#endif + gpio_write_pin_high(row_pins[row]); +} + +// Initialize the peripherals pins +int ec_init(void) { + // Initialize ADC + palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG); + adcMux = pinToMux(ANALOG_PORT); + + // Dummy call to make sure that adcStart() has been called in the appropriate state + adc_read(adcMux); + + // Initialize discharge pin as discharge mode + gpio_write_pin_low(DISCHARGE_PIN); +#ifdef OPEN_DRAIN_SUPPORT + gpio_set_pin_output_open_drain(DISCHARGE_PIN); +#else + gpio_set_pin_output(DISCHARGE_PIN); +#endif + + // Initialize drive lines + init_row(); + + // Initialize AMUXs + init_amux(); + + return 0; +} + +// Get the noise floor +void ec_noise_floor(void) { + // Initialize the noise floor + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.noise_floor[row][col] = 0; + } + } + + // Sample the noise floor + for (uint8_t i = 0; i < DEFAULT_NOISE_FLOOR_SAMPLING_COUNT; i++) { + for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) { + disable_unused_amux(amux); + for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) { + uint8_t sum = 0; + for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++) + sum += amux_n_col_sizes[i]; + uint8_t adjusted_col = col + sum; + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + ec_config.noise_floor[row][adjusted_col] += ec_readkey_raw(amux, row, col); + } + } + } + wait_ms(5); + } + + // Average the noise floor + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.noise_floor[row][col] /= DEFAULT_NOISE_FLOOR_SAMPLING_COUNT; + } + } +} + +// Scan key values and update matrix state +bool ec_matrix_scan(matrix_row_t current_matrix[]) { + bool updated = false; + + for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) { + disable_unused_amux(amux); + for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) { + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + uint8_t sum = 0; + for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++) + sum += amux_n_col_sizes[i]; + uint8_t adjusted_col = col + sum; + sw_value[row][adjusted_col] = ec_readkey_raw(amux, row, col); + + if (ec_config.bottoming_calibration) { + if (ec_config.bottoming_calibration_starter[row][adjusted_col]) { + ec_config.bottoming_reading[row][adjusted_col] = sw_value[row][adjusted_col]; + ec_config.bottoming_calibration_starter[row][adjusted_col] = false; + } else if (sw_value[row][adjusted_col] > ec_config.bottoming_reading[row][adjusted_col]) { + ec_config.bottoming_reading[row][adjusted_col] = sw_value[row][adjusted_col]; + } + } else { + updated |= ec_update_key(¤t_matrix[row], row, adjusted_col, sw_value[row][adjusted_col]); + } + } + } + } + + return ec_config.bottoming_calibration ? false : updated; +} + +// Read the capacitive sensor value +uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) { + uint16_t sw_value = 0; + + // Select the multiplexer + select_amux_channel(channel, col); + + // Set the row pin to low state to avoid ghosting + gpio_write_pin_low(row_pins[row]); + + ATOMIC_BLOCK_FORCEON { + // Set the row pin to high state and have capacitor charge + charge_capacitor(row); + // Read the ADC value + sw_value = adc_read(adcMux); + } + // Discharge peak hold capacitor + discharge_capacitor(); + // Waiting for the ghost capacitor to discharge fully + wait_us(DISCHARGE_TIME); + + return sw_value; +} + +// Update press/release state of key +bool ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) { + bool current_state = (*current_row >> col) & 1; + + // Real Time Noise Floor Calibration + if (sw_value < (ec_config.noise_floor[row][col] - NOISE_FLOOR_THRESHOLD)) { + uprintf("Noise Floor Change: %d, %d, %d\n", row, col, sw_value); + ec_config.noise_floor[row][col] = sw_value; + ec_config.rescaled_mode_0_actuation_threshold[row][col] = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + ec_config.rescaled_mode_0_release_threshold[row][col] = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + + // Normal board-wide APC + if (ec_config.actuation_mode == 0) { + if (current_state && sw_value < ec_config.rescaled_mode_0_release_threshold[row][col]) { + *current_row &= ~(1 << col); + uprintf("Key released: %d, %d, %d\n", row, col, sw_value); + return true; + } + if ((!current_state) && sw_value > ec_config.rescaled_mode_0_actuation_threshold[row][col]) { + *current_row |= (1 << col); + uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value); + return true; + } + } + // Rapid Trigger + else if (ec_config.actuation_mode == 1) { + // Is key in active zone? + if (sw_value > ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]) { + // Is key pressed while in active zone? + if (current_state) { + // Is the key still moving down? + if (sw_value > ec_config.extremum[row][col]) { + ec_config.extremum[row][col] = sw_value; + uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value); + } + // Has key moved up enough to be released? + else if (sw_value < ec_config.extremum[row][col] - ec_config.mode_1_release_offset) { + ec_config.extremum[row][col] = sw_value; + *current_row &= ~(1 << col); + uprintf("Key released: %d, %d, %d\n", row, col, sw_value); + return true; + } + } + // Key is not pressed while in active zone + else { + // Is the key still moving up? + if (sw_value < ec_config.extremum[row][col]) { + ec_config.extremum[row][col] = sw_value; + } + // Has key moved down enough to be pressed? + else if (sw_value > ec_config.extremum[row][col] + ec_config.mode_1_actuation_offset) { + ec_config.extremum[row][col] = sw_value; + *current_row |= (1 << col); + uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value); + return true; + } + } + } + // Key is not in active zone + else { + // Check to avoid key being stuck in pressed state near the active zone threshold + if (sw_value < ec_config.extremum[row][col]) { + ec_config.extremum[row][col] = sw_value; + *current_row &= ~(1 << col); + return true; + } + } + } + return false; +} + +// Print the matrix values +void ec_print_matrix(void) { + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", sw_value[row][col]); + } + uprintf("%4d\n", sw_value[row][MATRIX_COLS - 1]); + } + print("\n"); +} + +// Rescale the value to a different range +uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max) { + return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; +} diff --git a/keyboards/cipulot/ec_980c/ec_switch_matrix.h b/keyboards/cipulot/ec_980c/ec_switch_matrix.h new file mode 100644 index 00000000000..8a75b5de5fb --- /dev/null +++ b/keyboards/cipulot/ec_980c/ec_switch_matrix.h @@ -0,0 +1,83 @@ +/* Copyright 2023 Cipulot + * + * 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 +#include +#include "matrix.h" +#include "eeconfig.h" +#include "util.h" + +typedef struct _indicator_config_t { + uint8_t h; + uint8_t s; + uint8_t v; + bool enabled; +} indicator_config; + +typedef struct PACKED { + indicator_config num; + indicator_config caps; + indicator_config scroll; + uint8_t actuation_mode; // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point, 2: Rapid trigger from resting point + uint16_t mode_0_actuation_threshold; // threshold for key press in mode 0 + uint16_t mode_0_release_threshold; // threshold for key release in mode 0 + uint16_t mode_1_initial_deadzone_offset; // threshold for key press in mode 1 + uint8_t mode_1_actuation_offset; // offset for key press in mode 1 and 2 (1-255) + uint8_t mode_1_release_offset; // offset for key release in mode 1 and 2 (1-255) + uint16_t bottoming_reading[MATRIX_ROWS][MATRIX_COLS]; // bottoming reading +} eeprom_ec_config_t; + +typedef struct { + uint8_t actuation_mode; // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point (it can be very near that baseline noise and be "full travel") + uint16_t mode_0_actuation_threshold; // threshold for key press in mode 0 + uint16_t mode_0_release_threshold; // threshold for key release in mode 0 + uint16_t mode_1_initial_deadzone_offset; // threshold for key press in mode 1 (initial deadzone) + uint16_t rescaled_mode_0_actuation_threshold[MATRIX_ROWS][MATRIX_COLS]; // threshold for key press in mode 0 rescaled to actual scale + uint16_t rescaled_mode_0_release_threshold[MATRIX_ROWS][MATRIX_COLS]; // threshold for key release in mode 0 rescaled to actual scale + uint16_t rescaled_mode_1_initial_deadzone_offset[MATRIX_ROWS][MATRIX_COLS]; // threshold for key press in mode 1 (initial deadzone) rescaled to actual scale + uint8_t mode_1_actuation_offset; // offset for key press in mode 1 (1-255) + uint8_t mode_1_release_offset; // offset for key release in mode 1 (1-255) + uint16_t extremum[MATRIX_ROWS][MATRIX_COLS]; // extremum values for mode 1 + uint16_t noise_floor[MATRIX_ROWS][MATRIX_COLS]; // noise floor detected during startup + bool bottoming_calibration; // calibration mode for bottoming out values (true: calibration mode, false: normal mode) + bool bottoming_calibration_starter[MATRIX_ROWS][MATRIX_COLS]; // calibration mode for bottoming out values (true: calibration mode, false: normal mode) + uint16_t bottoming_reading[MATRIX_ROWS][MATRIX_COLS]; // bottoming reading +} ec_config_t; + +// Check if the size of the reserved persistent memory is the same as the size of struct eeprom_ec_config_t +_Static_assert(sizeof(eeprom_ec_config_t) == EECONFIG_KB_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); + +extern eeprom_ec_config_t eeprom_ec_config; + +extern ec_config_t ec_config; + +void init_row(void); +void init_amux(void); +void select_amux_channel(uint8_t channel, uint8_t col); +void disable_unused_amux(uint8_t channel); +void discharge_capacitor(void); +void charge_capacitor(uint8_t row); + +int ec_init(void); +void ec_noise_floor(void); +bool ec_matrix_scan(matrix_row_t current_matrix[]); +uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col); +bool ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value); +void ec_print_matrix(void); + +uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max); diff --git a/keyboards/cipulot/ec_980c/halconf.h b/keyboards/cipulot/ec_980c/halconf.h new file mode 100644 index 00000000000..24de0954858 --- /dev/null +++ b/keyboards/cipulot/ec_980c/halconf.h @@ -0,0 +1,23 @@ +/* Copyright 2023 Cipulot + * + * 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_ADC TRUE +#define HAL_USE_PWM TRUE +#define HAL_USE_PAL TRUE + +#include_next diff --git a/keyboards/cipulot/ec_980c/info.json b/keyboards/cipulot/ec_980c/info.json new file mode 100644 index 00000000000..6d3cb22719c --- /dev/null +++ b/keyboards/cipulot/ec_980c/info.json @@ -0,0 +1,170 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "EC 980C", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "eeprom": { + "wear_leveling": { + "backing_size": 4096 + } + }, + "features": { + "bootmagic": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "processor": "STM32F411", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "rgb_matrix": { + "animations": { + "breathing": true, + "cycle_left_right": true, + "solid_color": true + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 15], "x": 16.25, "y": 1, "flags": 4}, + {"matrix": [0, 16], "x": 17.25, "y": 1, "flags": 4}, + {"matrix": [0, 17], "x": 18.25, "y": 1, "flags": 4} + ], + "led_count": 3, + "max_brightness": 255 + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6BBE", + "shared_endpoint": { + "keyboard": true + }, + "vid": "0x6369" + }, + "ws2812": { + "driver": "pwm", + "pin": "B15" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15.5, "y": 0}, + {"matrix": [0, 16], "x": 16.5, "y": 0}, + {"matrix": [0, 17], "x": 17.5, "y": 0}, + {"matrix": [0, 18], "x": 18.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5}, + {"matrix": [1, 14], "x": 14, "y": 1.5}, + {"matrix": [1, 15], "x": 15.5, "y": 1.5}, + {"matrix": [1, 16], "x": 16.5, "y": 1.5}, + {"matrix": [1, 17], "x": 17.5, "y": 1.5}, + {"matrix": [1, 18], "x": 18.5, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 0.75}, + {"matrix": [2, 14], "x": 14.25, "y": 2.5, "w": 0.75}, + {"matrix": [2, 15], "x": 15.5, "y": 2.5}, + {"matrix": [2, 16], "x": 16.5, "y": 2.5}, + {"matrix": [2, 17], "x": 17.5, "y": 2.5}, + {"matrix": [2, 18], "x": 18.5, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5}, + {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25}, + {"matrix": [3, 15], "x": 15.5, "y": 3.5}, + {"matrix": [3, 16], "x": 16.5, "y": 3.5}, + {"matrix": [3, 17], "x": 17.5, "y": 3.5}, + {"matrix": [3, 18], "x": 18.5, "y": 3.5}, + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 14], "x": 14.25, "y": 4.75}, + {"matrix": [4, 15], "x": 15.5, "y": 4.5}, + {"matrix": [4, 16], "x": 16.5, "y": 4.5}, + {"matrix": [4, 17], "x": 17.5, "y": 4.5}, + {"matrix": [4, 18], "x": 18.5, "y": 4.5}, + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5}, + {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 3.5, "y": 5.5}, + {"matrix": [5, 5], "x": 4.5, "y": 5.5, "w": 2.5}, + {"matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25}, + {"matrix": [5, 8], "x": 8.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 9], "x": 9.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 10], "x": 10.75, "y": 5.5}, + {"matrix": [5, 11], "x": 11.75, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 13.25, "y": 5.75}, + {"matrix": [5, 14], "x": 14.25, "y": 5.75}, + {"matrix": [5, 15], "x": 15.25, "y": 5.75}, + {"matrix": [5, 16], "x": 16.5, "y": 5.5}, + {"matrix": [5, 17], "x": 17.5, "y": 5.5}, + {"matrix": [5, 18], "x": 18.5, "y": 5.5} + ] + } + } +} diff --git a/keyboards/cipulot/ec_980c/keymaps/default/keymap.c b/keyboards/cipulot/ec_980c/keymaps/default/keymap.c new file mode 100644 index 00000000000..c60db783528 --- /dev/null +++ b/keyboards/cipulot/ec_980c/keymaps/default/keymap.c @@ -0,0 +1,48 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +#include "keymap_japanese.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = 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_F12, KC_DEL, KC_INS, KC_PGUP, KC_PGDN, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, JP_YEN, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_ENT, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, _______, KC_SPC, KC_SPC, _______, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0, KC_PDOT, KC_PENT + ), + [1] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + // clang-format on +}; diff --git a/keyboards/cipulot/ec_980c/keymaps/via/keymap.c b/keyboards/cipulot/ec_980c/keymaps/via/keymap.c new file mode 100644 index 00000000000..c60db783528 --- /dev/null +++ b/keyboards/cipulot/ec_980c/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +#include "keymap_japanese.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = 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_F12, KC_DEL, KC_INS, KC_PGUP, KC_PGDN, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, JP_YEN, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_ENT, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, _______, KC_SPC, KC_SPC, _______, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0, KC_PDOT, KC_PENT + ), + [1] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + // clang-format on +}; diff --git a/keyboards/cipulot/ec_980c/keymaps/via/rules.mk b/keyboards/cipulot/ec_980c/keymaps/via/rules.mk new file mode 100644 index 00000000000..b870b6349c0 --- /dev/null +++ b/keyboards/cipulot/ec_980c/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes + +SRC += via_ec_indicators.c diff --git a/keyboards/cipulot/ec_980c/keymaps/via/via_ec_indicators.c b/keyboards/cipulot/ec_980c/keymaps/via/via_ec_indicators.c new file mode 100644 index 00000000000..f885e794357 --- /dev/null +++ b/keyboards/cipulot/ec_980c/keymaps/via/via_ec_indicators.c @@ -0,0 +1,499 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include "keyboards/cipulot/common/eeprom_tools.h" +#include "ec_switch_matrix.h" +#include "action.h" +#include "print.h" +#include "via.h" + +#ifdef VIA_ENABLE + +void ec_rescale_values(uint8_t item); +void ec_save_threshold_data(uint8_t option); +void ec_save_bottoming_reading(void); +void ec_show_calibration_data(void); +void ec_clear_bottoming_calibration_data(void); + +// Declaring enums for VIA config menu +enum via_enums { + // clang-format off + id_num_indicator_enabled = 1, + id_num_indicator_brightness = 2, + id_num_indicator_color = 3, + id_caps_indicator_enabled = 4, + id_caps_indicator_brightness = 5, + id_caps_indicator_color = 6, + id_scroll_indicator_enabled = 7, + id_scroll_indicator_brightness = 8, + id_scroll_indicator_color = 9, + id_actuation_mode = 10, + id_mode_0_actuation_threshold = 11, + id_mode_0_release_threshold = 12, + id_save_threshold_data = 13, + id_mode_1_initial_deadzone_offset = 14, + id_mode_1_actuation_offset = 15, + id_mode_1_release_offset = 16, + id_bottoming_calibration = 17, + id_noise_floor_calibration = 18, + id_show_calibration_data = 19, + id_clear_bottoming_calibration_data = 20 + // clang-format on +}; + +// Handle the data received by the keyboard from the VIA menus +void via_config_set_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_num_indicator_enabled: { + if (value_data[0] == 1) { + eeprom_ec_config.num.enabled = true; + uprintf("#########################\n"); + uprintf("# Num indicator enabled #\n"); + uprintf("#########################\n"); + } else { + eeprom_ec_config.num.enabled = false; + uprintf("##########################\n"); + uprintf("# Num indicator disabled #\n"); + uprintf("##########################\n"); + } + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.enabled); + break; + } + case id_num_indicator_brightness: { + eeprom_ec_config.num.v = value_data[0]; + uprintf("Num indicator brightness: %d\n", eeprom_ec_config.num.v); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.v); + break; + } + case id_num_indicator_color: { + eeprom_ec_config.num.h = value_data[0]; + eeprom_ec_config.num.s = value_data[1]; + uprintf("Num indicator color: %d, %d\n", eeprom_ec_config.num.h, eeprom_ec_config.num.s); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.h); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.s); + break; + } + case id_caps_indicator_enabled: { + if (value_data[0] == 1) { + eeprom_ec_config.caps.enabled = true; + uprintf("##########################\n"); + uprintf("# Caps indicator enabled #\n"); + uprintf("##########################\n"); + } else { + eeprom_ec_config.caps.enabled = false; + uprintf("###########################\n"); + uprintf("# Caps indicator disabled #\n"); + uprintf("###########################\n"); + } + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.enabled); + break; + } + case id_caps_indicator_brightness: { + eeprom_ec_config.caps.v = value_data[0]; + uprintf("Caps indicator brightness: %d\n", eeprom_ec_config.caps.v); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.v); + break; + } + case id_caps_indicator_color: { + eeprom_ec_config.caps.h = value_data[0]; + eeprom_ec_config.caps.s = value_data[1]; + uprintf("Caps indicator color: %d, %d\n", eeprom_ec_config.caps.h, eeprom_ec_config.caps.s); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.h); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.s); + break; + } + case id_scroll_indicator_enabled: { + if (value_data[0] == 1) { + eeprom_ec_config.scroll.enabled = true; + uprintf("############################\n"); + uprintf("# Scroll indicator enabled #\n"); + uprintf("############################\n"); + } else { + eeprom_ec_config.scroll.enabled = false; + uprintf("#############################\n"); + uprintf("# Scroll indicator disabled #\n"); + uprintf("#############################\n"); + } + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.enabled); + break; + } + case id_scroll_indicator_brightness: { + eeprom_ec_config.scroll.v = value_data[0]; + uprintf("Scroll indicator brightness: %d\n", eeprom_ec_config.scroll.v); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.v); + break; + } + case id_scroll_indicator_color: { + eeprom_ec_config.scroll.h = value_data[0]; + eeprom_ec_config.scroll.s = value_data[1]; + uprintf("Scroll indicator color: %d, %d\n", eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.h); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.s); + break; + } + case id_actuation_mode: { + eeprom_ec_config.actuation_mode = value_data[0]; + ec_config.actuation_mode = eeprom_ec_config.actuation_mode; + if (ec_config.actuation_mode == 0) { + uprintf("#########################\n"); + uprintf("# Actuation Mode: APC #\n"); + uprintf("#########################\n"); + } else if (ec_config.actuation_mode == 1) { + uprintf("#################################\n"); + uprintf("# Actuation Mode: Rapid Trigger #\n"); + uprintf("#################################\n"); + } + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, actuation_mode); + break; + } + case id_mode_0_actuation_threshold: { + ec_config.mode_0_actuation_threshold = value_data[1] | (value_data[0] << 8); + uprintf("APC Mode Actuation Threshold: %d\n", ec_config.mode_0_actuation_threshold); + break; + } + case id_mode_0_release_threshold: { + ec_config.mode_0_release_threshold = value_data[1] | (value_data[0] << 8); + uprintf("APC Mode Release Threshold: %d\n", ec_config.mode_0_release_threshold); + break; + } + case id_mode_1_initial_deadzone_offset: { + ec_config.mode_1_initial_deadzone_offset = value_data[1] | (value_data[0] << 8); + uprintf("Rapid Trigger Mode Initial Deadzone Offset: %d\n", ec_config.mode_1_initial_deadzone_offset); + break; + } + case id_mode_1_actuation_offset: { + ec_config.mode_1_actuation_offset = value_data[0]; + uprintf("Rapid Trigger Mode Actuation Offset: %d\n", ec_config.mode_1_actuation_offset); + break; + } + case id_mode_1_release_offset: { + ec_config.mode_1_release_offset = value_data[0]; + uprintf("Rapid Trigger Mode Release Offset: %d\n", ec_config.mode_1_release_offset); + break; + } + case id_bottoming_calibration: { + if (value_data[0] == 1) { + ec_config.bottoming_calibration = true; + uprintf("##############################\n"); + uprintf("# Bottoming calibration mode #\n"); + uprintf("##############################\n"); + } else { + ec_config.bottoming_calibration = false; + ec_save_bottoming_reading(); + uprintf("## Bottoming calibration done ##\n"); + ec_show_calibration_data(); + } + break; + } + case id_save_threshold_data: { + ec_save_threshold_data(value_data[0]); + break; + } + case id_noise_floor_calibration: { + if (value_data[0] == 0) { + ec_noise_floor(); + ec_rescale_values(0); + ec_rescale_values(1); + ec_rescale_values(2); + uprintf("#############################\n"); + uprintf("# Noise floor data acquired #\n"); + uprintf("#############################\n"); + break; + } + } + case id_show_calibration_data: { + if (value_data[0] == 0) { + ec_show_calibration_data(); + break; + } + } + case id_clear_bottoming_calibration_data: { + if (value_data[0] == 0) { + ec_clear_bottoming_calibration_data(); + } + } + default: { + // Unhandled value. + break; + } + } +} + +// Handle the data sent by the keyboard to the VIA menus +void via_config_get_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_num_indicator_enabled: { + value_data[0] = eeprom_ec_config.num.enabled; + break; + } + case id_num_indicator_brightness: { + value_data[0] = eeprom_ec_config.num.v; + break; + } + case id_num_indicator_color: { + value_data[0] = eeprom_ec_config.num.h; + value_data[1] = eeprom_ec_config.num.s; + break; + } + case id_caps_indicator_enabled: { + value_data[0] = eeprom_ec_config.caps.enabled; + break; + } + case id_caps_indicator_brightness: { + value_data[0] = eeprom_ec_config.caps.v; + break; + } + case id_caps_indicator_color: { + value_data[0] = eeprom_ec_config.caps.h; + value_data[1] = eeprom_ec_config.caps.s; + break; + } + case id_scroll_indicator_enabled: { + value_data[0] = eeprom_ec_config.scroll.enabled; + break; + } + case id_scroll_indicator_brightness: { + value_data[0] = eeprom_ec_config.scroll.v; + break; + } + case id_scroll_indicator_color: { + value_data[0] = eeprom_ec_config.scroll.h; + value_data[1] = eeprom_ec_config.scroll.s; + break; + } + case id_actuation_mode: { + value_data[0] = eeprom_ec_config.actuation_mode; + break; + } + case id_mode_0_actuation_threshold: { + value_data[0] = eeprom_ec_config.mode_0_actuation_threshold >> 8; + value_data[1] = eeprom_ec_config.mode_0_actuation_threshold & 0xFF; + break; + } + case id_mode_0_release_threshold: { + value_data[0] = eeprom_ec_config.mode_0_release_threshold >> 8; + value_data[1] = eeprom_ec_config.mode_0_release_threshold & 0xFF; + break; + } + case id_mode_1_initial_deadzone_offset: { + value_data[0] = eeprom_ec_config.mode_1_initial_deadzone_offset >> 8; + value_data[1] = eeprom_ec_config.mode_1_initial_deadzone_offset & 0xFF; + break; + } + case id_mode_1_actuation_offset: { + value_data[0] = eeprom_ec_config.mode_1_actuation_offset; + break; + } + case id_mode_1_release_offset: { + value_data[0] = eeprom_ec_config.mode_1_release_offset; + break; + } + default: { + // Unhandled value. + break; + } + } +} + +// Handle the commands sent and received by the keyboard with VIA +void via_custom_value_command_kb(uint8_t *data, uint8_t length) { + // data = [ command_id, channel_id, value_id, value_data ] + uint8_t *command_id = &(data[0]); + uint8_t *channel_id = &(data[1]); + uint8_t *value_id_and_data = &(data[2]); + + if (*channel_id == id_custom_channel) { + switch (*command_id) { + case id_custom_set_value: { + via_config_set_value(value_id_and_data); + break; + } + case id_custom_get_value: { + via_config_get_value(value_id_and_data); + break; + } + case id_custom_save: { + // Bypass the save function in favor of pinpointed saves + break; + } + default: { + // Unhandled message. + *command_id = id_unhandled; + break; + } + } + return; + } + + *command_id = id_unhandled; +} + +// Rescale the values received by VIA to fit the new range +void ec_rescale_values(uint8_t item) { + switch (item) { + // Rescale the APC mode actuation thresholds + case 0: + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.rescaled_mode_0_actuation_threshold[row][col] = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + } + break; + // Rescale the APC mode release thresholds + case 1: + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.rescaled_mode_0_release_threshold[row][col] = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + } + break; + // Rescale the Rapid Trigger mode initial deadzone offsets + case 2: + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + } + break; + + default: + // Unhandled item. + break; + } +} + +void ec_save_threshold_data(uint8_t option) { + // Save APC mode thresholds and rescale them for runtime usage + if (option == 0) { + eeprom_ec_config.mode_0_actuation_threshold = ec_config.mode_0_actuation_threshold; + eeprom_ec_config.mode_0_release_threshold = ec_config.mode_0_release_threshold; + ec_rescale_values(0); + ec_rescale_values(1); + } + // Save Rapid Trigger mode thresholds and rescale them for runtime usage + else if (option == 1) { + eeprom_ec_config.mode_1_initial_deadzone_offset = ec_config.mode_1_initial_deadzone_offset; + eeprom_ec_config.mode_1_actuation_offset = ec_config.mode_1_actuation_offset; + eeprom_ec_config.mode_1_release_offset = ec_config.mode_1_release_offset; + ec_rescale_values(2); + } + eeconfig_update_kb_datablock(&eeprom_ec_config); + uprintf("####################################\n"); + uprintf("# New thresholds applied and saved #\n"); + uprintf("####################################\n"); +} + +// Save the bottoming reading +void ec_save_bottoming_reading(void) { + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + // If the bottom reading doesn't go over the noise floor by BOTTOMING_CALIBRATION_THRESHOLD, it is likely that: + // 1. The key is not actually in the matrix + // 2. The key is on an alternative layout, therefore not being pressed + // 3. The key in in the current layout but not being pressed + if (ec_config.bottoming_reading[row][col] < (ec_config.noise_floor[row][col] + BOTTOMING_CALIBRATION_THRESHOLD)) { + eeprom_ec_config.bottoming_reading[row][col] = 1023; + } else { + eeprom_ec_config.bottoming_reading[row][col] = ec_config.bottoming_reading[row][col]; + } + } + } + // Rescale the values to fit the new range for runtime usage + ec_rescale_values(0); + ec_rescale_values(1); + ec_rescale_values(2); + eeconfig_update_kb_datablock(&eeprom_ec_config); +} + +// Show the calibration data +void ec_show_calibration_data(void) { + uprintf("\n###############\n"); + uprintf("# Noise Floor #\n"); + uprintf("###############\n"); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", ec_config.noise_floor[row][col]); + } + uprintf("%4d\n", ec_config.noise_floor[row][MATRIX_COLS - 1]); + } + + uprintf("\n######################\n"); + uprintf("# Bottoming Readings #\n"); + uprintf("######################\n"); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", eeprom_ec_config.bottoming_reading[row][col]); + } + uprintf("%4d\n", eeprom_ec_config.bottoming_reading[row][MATRIX_COLS - 1]); + } + + uprintf("\n######################################\n"); + uprintf("# Rescaled APC Mode Actuation Points #\n"); + uprintf("######################################\n"); + uprintf("Original APC Mode Actuation Point: %4d\n", ec_config.mode_0_actuation_threshold); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", ec_config.rescaled_mode_0_actuation_threshold[row][col]); + } + uprintf("%4d\n", ec_config.rescaled_mode_0_actuation_threshold[row][MATRIX_COLS - 1]); + } + + uprintf("\n######################################\n"); + uprintf("# Rescaled APC Mode Release Points #\n"); + uprintf("######################################\n"); + uprintf("Original APC Mode Release Point: %4d\n", ec_config.mode_0_release_threshold); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", ec_config.rescaled_mode_0_release_threshold[row][col]); + } + uprintf("%4d\n", ec_config.rescaled_mode_0_release_threshold[row][MATRIX_COLS - 1]); + } + + uprintf("\n#######################################################\n"); + uprintf("# Rescaled Rapid Trigger Mode Initial Deadzone Offset #\n"); + uprintf("#######################################################\n"); + uprintf("Original Rapid Trigger Mode Initial Deadzone Offset: %4d\n", ec_config.mode_1_initial_deadzone_offset); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]); + } + uprintf("%4d\n", ec_config.rescaled_mode_1_initial_deadzone_offset[row][MATRIX_COLS - 1]); + } + print("\n"); +} + +// Clear the calibration data +void ec_clear_bottoming_calibration_data(void) { + // Clear the EEPROM data + eeconfig_init_kb(); + + // Reset the runtime values to the EEPROM values + keyboard_post_init_kb(); + + uprintf("######################################\n"); + uprintf("# Bottoming calibration data cleared #\n"); + uprintf("######################################\n"); +} + +#endif // VIA_ENABLE diff --git a/keyboards/cipulot/ec_980c/matrix.c b/keyboards/cipulot/ec_980c/matrix.c new file mode 100644 index 00000000000..cfa2efe0506 --- /dev/null +++ b/keyboards/cipulot/ec_980c/matrix.c @@ -0,0 +1,42 @@ +/* Copyright 2023 Cipulot + * + * 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 . + */ + +#include "ec_switch_matrix.h" +#include "matrix.h" + +extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values +extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values + +// Custom matrix init function +void matrix_init_custom(void) { + // Initialize EC + ec_init(); + + // Get the noise floor at boot + ec_noise_floor(); +} + +// Custom matrix scan function +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + bool updated = ec_matrix_scan(current_matrix); + + return updated; +} + +// Bootmagic overriden to avoid conflicts with EC +void bootmagic_scan(void) { + ; +} diff --git a/keyboards/cipulot/ec_980c/mcuconf.h b/keyboards/cipulot/ec_980c/mcuconf.h new file mode 100644 index 00000000000..5f9ecca48dd --- /dev/null +++ b/keyboards/cipulot/ec_980c/mcuconf.h @@ -0,0 +1,28 @@ +/* Copyright 2023 Cipulot + * + * 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 + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE + +#undef STM32_PWM_USE_ADVANCED +#define STM32_PWM_USE_ADVANCED TRUE + +#undef STM32_PWM_USE_TIM1 +#define STM32_PWM_USE_TIM1 TRUE diff --git a/keyboards/cipulot/ec_980c/readme.md b/keyboards/cipulot/ec_980c/readme.md new file mode 100644 index 00000000000..20be2d4928b --- /dev/null +++ b/keyboards/cipulot/ec_980c/readme.md @@ -0,0 +1,26 @@ +# EC980C + +![EC980C PCB](https://i.imgur.com/KcnLdVFh.png) + +Replacement PCB for the Leopold FC980C. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: EC980C PCB +* Hardware Availability: TBD + +Make example for this keyboard (after setting up your build environment): + + make cipulot/ec_980c:default + +Flashing example for this keyboard: + + make cipulot/ec_980c: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). + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical reset**: Long short the exposed pads on the top of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/cipulot/ec_980c/rules.mk b/keyboards/cipulot/ec_980c/rules.mk new file mode 100644 index 00000000000..1ff311f102d --- /dev/null +++ b/keyboards/cipulot/ec_980c/rules.mk @@ -0,0 +1,4 @@ +CUSTOM_MATRIX = lite +ANALOG_DRIVER_REQUIRED = yes +SRC += matrix.c ec_switch_matrix.c +OPT = 2 From 54c1ae55bfb931a2b095aa97480cb49b3fccfd8f Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 1 May 2024 02:52:34 +0100 Subject: [PATCH 219/333] Align 'qmk lint' argument handling (#23297) --- lib/python/qmk/cli/lint.py | 35 +++++++++++++++-------------------- lib/python/qmk/keyboard.py | 2 ++ 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/lib/python/qmk/cli/lint.py b/lib/python/qmk/cli/lint.py index 7ebb0cf9c45..ba0c3f274cf 100644 --- a/lib/python/qmk/cli/lint.py +++ b/lib/python/qmk/cli/lint.py @@ -6,9 +6,9 @@ from milc import cli from qmk.decorators import automagic_keyboard, automagic_keymap from qmk.info import info_json -from qmk.keyboard import keyboard_completer, list_keyboards +from qmk.keyboard import keyboard_completer, keyboard_folder_or_all, is_all_keyboards, list_keyboards from qmk.keymap import locate_keymap, list_keymaps -from qmk.path import is_keyboard, keyboard +from qmk.path import keyboard from qmk.git import git_get_ignored_files from qmk.c_parse import c_source_files @@ -198,39 +198,34 @@ def keyboard_check(kb): @cli.argument('--strict', action='store_true', help='Treat warnings as errors') -@cli.argument('-kb', '--keyboard', completer=keyboard_completer, help='Comma separated list of keyboards to check') +@cli.argument('-kb', '--keyboard', action='append', type=keyboard_folder_or_all, completer=keyboard_completer, help='Keyboard to check. May be passed multiple times.') @cli.argument('-km', '--keymap', help='The keymap to check') -@cli.argument('--all-kb', action='store_true', arg_only=True, help='Check all keyboards') -@cli.argument('--all-km', action='store_true', arg_only=True, help='Check all keymaps') @cli.subcommand('Check keyboard and keymap for common mistakes.') @automagic_keyboard @automagic_keymap def lint(cli): """Check keyboard and keymap for common mistakes. """ - failed = [] - # Determine our keyboard list - if cli.args.all_kb: - if cli.args.keyboard: - cli.log.warning('Both --all-kb and --keyboard passed, --all-kb takes precedence.') - - keyboard_list = list_keyboards() - elif not cli.config.lint.keyboard: - cli.log.error('Missing required arguments: --keyboard or --all-kb') + if not cli.config.lint.keyboard: + cli.log.error('Missing required arguments: --keyboard') cli.print_help() return False + + if isinstance(cli.config.lint.keyboard, str): + # if provided via config - string not array + keyboard_list = [cli.config.lint.keyboard] + elif is_all_keyboards(cli.args.keyboard[0]): + keyboard_list = list_keyboards() else: - keyboard_list = cli.config.lint.keyboard.split(',') + keyboard_list = cli.config.lint.keyboard + + failed = [] # Lint each keyboard for kb in keyboard_list: - if not is_keyboard(kb): - cli.log.error('No such keyboard: %s', kb) - continue - # Determine keymaps to also check - if cli.args.all_km: + if cli.args.keymap == 'all': keymaps = list_keymaps(kb) elif cli.config.lint.keymap: keymaps = {cli.config.lint.keymap} diff --git a/lib/python/qmk/keyboard.py b/lib/python/qmk/keyboard.py index 0fcc2e868d1..fcf5b5b1588 100644 --- a/lib/python/qmk/keyboard.py +++ b/lib/python/qmk/keyboard.py @@ -99,6 +99,8 @@ def find_keyboard_from_dir(): keymap_index = len(current_path.parts) - current_path.parts.index('keymaps') - 1 current_path = current_path.parents[keymap_index] + current_path = resolve_keyboard(current_path) + if qmk.path.is_keyboard(current_path): return str(current_path) From 94e9bb406b5537c093db34dc791ff86eaec6317b Mon Sep 17 00:00:00 2001 From: Simon <68034180+rarepotato8de@users.noreply.github.com> Date: Wed, 1 May 2024 08:31:23 +0200 Subject: [PATCH 220/333] [Keyboard] 3x3macropad (#23594) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Duncan Sutherland --- .../rarepotato8de/3x3macropad/3x3macropad.c | 54 ++++++++++++++++ keyboards/rarepotato8de/3x3macropad/info.json | 63 +++++++++++++++++++ .../3x3macropad/keymaps/default/keymap.c | 25 ++++++++ keyboards/rarepotato8de/3x3macropad/readme.md | 28 +++++++++ keyboards/rarepotato8de/3x3macropad/rules.mk | 0 5 files changed, 170 insertions(+) create mode 100644 keyboards/rarepotato8de/3x3macropad/3x3macropad.c create mode 100644 keyboards/rarepotato8de/3x3macropad/info.json create mode 100644 keyboards/rarepotato8de/3x3macropad/keymaps/default/keymap.c create mode 100644 keyboards/rarepotato8de/3x3macropad/readme.md create mode 100644 keyboards/rarepotato8de/3x3macropad/rules.mk diff --git a/keyboards/rarepotato8de/3x3macropad/3x3macropad.c b/keyboards/rarepotato8de/3x3macropad/3x3macropad.c new file mode 100644 index 00000000000..ad7ad642158 --- /dev/null +++ b/keyboards/rarepotato8de/3x3macropad/3x3macropad.c @@ -0,0 +1,54 @@ +/* Copyright 2024 RarePotato8DE + * + * 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 . + */ + +#include "quantum.h" + +#ifdef OLED_ENABLE +static void render_bongo1(void) { + static const char PROGMEM data[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0x40, 0x60, 0x20, 0x30, 0x30, 0x18, 0x1c, 0x0e, 0x03, 0x01, 0x03, 0x07, 0x1c, 0x38, 0x30, 0x60, 0x60, 0x60, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0x30, 0x18, 0x18, 0x08, 0x18, 0x98, 0x30, 0x70, 0xf0, 0xb0, 0x18, 0x0c, 0x06, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x60, 0x60, 0x60, 0xc0, 0x60, 0x60, 0x30, 0x30, 0x30, 0xf8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x18, 0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x80, 0x80, 0xff, 0xff, 0xc0, 0x80, 0x80, 0x8e, 0x06, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x1e, 0x1e, 0x0e, 0x00, 0x10, 0x38, 0x70, 0x70, 0x70, 0x70, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf8, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x06, 0x06, 0x06, 0x06, 0x0c, 0x0c, 0x0c, 0x1c, 0x18, 0x18, 0x18, 0x38, 0x30, 0x30, 0x30, 0x30, 0x60, 0x60, 0x60, 0x60, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x87, 0xc7, 0xc7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x3c, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + oled_write_raw_P(data, sizeof(data)); +} + +static void render_bongo2(void) { + static const char PROGMEM data[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0x40, 0x60, 0x20, 0x20, 0x30, 0x10, 0x18, 0x0e, 0x07, 0x03, 0x01, 0x07, 0x0e, 0x1c, 0x30, 0x20, 0x60, 0x60, 0x40, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x70, 0x30, 0x18, 0x0c, 0x06, 0x06, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x06, 0x06, 0x06, 0x0c, 0x08, 0x18, 0x30, 0x30, 0x60, 0x60, 0xc0, 0x60, 0x60, 0x20, 0x30, 0x30, 0x18, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x18, 0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x80, 0x80, 0xc0, 0xe0, 0x38, 0x1c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x1f, 0x0e, 0x04, 0x00, 0x38, 0x30, 0x70, 0x30, 0x70, 0xe0, 0xe0, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0xc0, 0xe0, 0x60, 0x60, 0x70, 0x60, 0x60, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x30, 0x90, 0x00, 0x1f, 0x31, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x20, 0x30, 0x30, 0x10, 0x18, 0x18, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x38, 0x30, 0x30, 0x30, 0x30, 0x60, 0x60, 0x60, 0x60, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x03, 0x07, 0x07, 0x00, 0xff, 0xff, 0x00, 0x08, 0x01, 0x38, 0x38, 0x02, 0x00, 0x01, 0x03, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1c, 0x78, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + oled_write_raw_P(data, sizeof(data)); +} + +/* This code switches the shown image on the oled on every 350th call of this function */ +bool showBongo1 = true; +int calls = 0; +bool oled_task_kb(void) { + if (!oled_task_user()) { + return false; + } + if (calls++ > 350) { + showBongo1 = !showBongo1; + calls = 0; + } + if (showBongo1) { + render_bongo1(); + } else { + render_bongo2(); + } + return false; +} +#endif diff --git a/keyboards/rarepotato8de/3x3macropad/info.json b/keyboards/rarepotato8de/3x3macropad/info.json new file mode 100644 index 00000000000..607c6509966 --- /dev/null +++ b/keyboards/rarepotato8de/3x3macropad/info.json @@ -0,0 +1,63 @@ +{ + "manufacturer": "RarePotato8DE", + "keyboard_name": "3x3macropad", + "maintainer": "RarePotato8DE", + "development_board": "promicro", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "F4", "pin_b": "B1"} + ] + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, + "matrix_pins": { + "cols": ["D7", "B3", "B2"], + "rows": ["F7", "B5", "B6"] + }, + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "static_gradient": true + }, + "led_count": 6 + }, + "url": "https://github.com/rarepotato8de/3x3macropad", + "usb": { + "device_version": "0.0.1", + "pid": "0x0001", + "vid": "0x5353" + }, + "ws2812": { + "pin": "E6" + }, + "community_layouts": ["ortho_3x3"], + "layouts": { + "LAYOUT_ortho_3x3": { + "layout": [ + {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "k10", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "k20", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "k21", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "k22", "matrix": [2, 2], "x": 2, "y": 2} + ] + } + } +} diff --git a/keyboards/rarepotato8de/3x3macropad/keymaps/default/keymap.c b/keyboards/rarepotato8de/3x3macropad/keymaps/default/keymap.c new file mode 100644 index 00000000000..7f68e145e73 --- /dev/null +++ b/keyboards/rarepotato8de/3x3macropad/keymaps/default/keymap.c @@ -0,0 +1,25 @@ +/* Copyright 2024 RarePotato8DE + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_3x3( + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6, + KC_7, KC_8, KC_9 + ) +}; diff --git a/keyboards/rarepotato8de/3x3macropad/readme.md b/keyboards/rarepotato8de/3x3macropad/readme.md new file mode 100644 index 00000000000..60a5caa2220 --- /dev/null +++ b/keyboards/rarepotato8de/3x3macropad/readme.md @@ -0,0 +1,28 @@ +# 3x3macropad + +![3x3macropad](https://i.imgur.com/LMkcKOw.jpg) + +The 3x3macropad is a small macropad with a cool OLED screen and rotary encoder. +It was inspired by stacked FR4 keyboards like the Discipline65. + +* Keyboard Maintainer: [RarePotato8DE](https://github.com/rarepotato8de) +* Hardware Supported: 3x3macropad +* Hardware Availability: [Open source!](https://github.com/rarepotato8de/3x3macropad) + +Make example for this keyboard (after setting up your build environment): + + make rarepotato8de/3x3macropad:default + +Flashing example for this keyboard: + + make rarepotato8de/3x3macropad: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,1) in the matrix (the top left one below the OLED) and plug in the keyboard +* **Physical reset button**: Short the two through hole pins on the back of the PCB (positioned at the rotary encoder) +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file diff --git a/keyboards/rarepotato8de/3x3macropad/rules.mk b/keyboards/rarepotato8de/3x3macropad/rules.mk new file mode 100644 index 00000000000..e69de29bb2d From c5fb6b4348dc01aa02846bf7b56e1b0a8a11013c Mon Sep 17 00:00:00 2001 From: DavidSannier Date: Wed, 1 May 2024 08:31:53 +0200 Subject: [PATCH 221/333] Refactoring successive press() -> release() calls (#23573) --- tests/basic/test_one_shot_keys.cpp | 50 ++++++------------------------ 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/tests/basic/test_one_shot_keys.cpp b/tests/basic/test_one_shot_keys.cpp index 9748dad7daf..64a8673a5cd 100644 --- a/tests/basic/test_one_shot_keys.cpp +++ b/tests/basic/test_one_shot_keys.cpp @@ -32,10 +32,7 @@ TEST_F(OneShot, OSMWithoutAdditionalKeypressDoesNothing) { /* Press and release OSM key*/ EXPECT_NO_REPORT(driver); - osm_key.press(); - run_one_scan_loop(); - osm_key.release(); - run_one_scan_loop(); + tap_key(osm_key); VERIFY_AND_CLEAR(driver); /* OSM are added when an actual report is send */ @@ -88,10 +85,7 @@ TEST_P(OneShotParametrizedTestFixture, OSMWithAdditionalKeypress) { /* Press and release OSM */ EXPECT_NO_REPORT(driver); - osm_key.press(); - run_one_scan_loop(); - osm_key.release(); - run_one_scan_loop(); + tap_key(osm_key); VERIFY_AND_CLEAR(driver); /* Press regular key */ @@ -171,18 +165,12 @@ TEST_F(OneShot, OSMChainingTwoOSMs) { /* Press and release OSM1 */ EXPECT_NO_REPORT(driver); - osm_key1.press(); - run_one_scan_loop(); - osm_key1.release(); - run_one_scan_loop(); + tap_key(osm_key1); VERIFY_AND_CLEAR(driver); /* Press and relesea OSM2 */ EXPECT_NO_REPORT(driver); - osm_key2.press(); - run_one_scan_loop(); - osm_key2.release(); - run_one_scan_loop(); + tap_key(osm_key2); VERIFY_AND_CLEAR(driver); /* Press regular key */ @@ -209,22 +197,13 @@ TEST_F(OneShot, OSMDoubleTapNotLockingOSMs) { /* Press and release OSM1 */ EXPECT_NO_REPORT(driver); - osm_key1.press(); - run_one_scan_loop(); - osm_key1.release(); - run_one_scan_loop(); + tap_key(osm_key1); VERIFY_AND_CLEAR(driver); /* Press and release OSM2 twice */ EXPECT_NO_REPORT(driver); - osm_key2.press(); - run_one_scan_loop(); - osm_key2.release(); - run_one_scan_loop(); - osm_key2.press(); - run_one_scan_loop(); - osm_key2.release(); - run_one_scan_loop(); + tap_key(osm_key2); + tap_key(osm_key2); VERIFY_AND_CLEAR(driver); /* Press regular key */ @@ -263,10 +242,7 @@ TEST_F(OneShot, OSMHoldNotLockingOSMs) { /* Press and release OSM1 */ EXPECT_NO_REPORT(driver); - osm_key1.press(); - run_one_scan_loop(); - osm_key1.release(); - run_one_scan_loop(); + tap_key(osm_key1); VERIFY_AND_CLEAR(driver); /* Press and hold OSM2 */ @@ -279,10 +255,7 @@ TEST_F(OneShot, OSMHoldNotLockingOSMs) { /* Press and release regular key */ EXPECT_REPORT(driver, (osm_key1.report_code, osm_key2.report_code, regular_key.report_code)).Times(1); EXPECT_REPORT(driver, (osm_key2.report_code)).Times(1); - regular_key.press(); - run_one_scan_loop(); - regular_key.release(); - run_one_scan_loop(); + tap_key(regular_key); VERIFY_AND_CLEAR(driver); /* Release OSM2 */ @@ -362,10 +335,7 @@ TEST_F(OneShot, OSLWithOsmAndAdditionalKeypress) { /* Press and release OSM */ EXPECT_NO_REPORT(driver); - osm_key.press(); - run_one_scan_loop(); - osm_key.release(); - run_one_scan_loop(); + tap_key(osm_key); EXPECT_TRUE(layer_state_is(1)); VERIFY_AND_CLEAR(driver); From 9289d934b00ad5e522cfefe1a156baa77762dbf2 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 1 May 2024 10:32:35 +0400 Subject: [PATCH 222/333] [Keyboard] Add imi60 (#23570) Co-authored-by: Drashna Jaelre --- keyboards/keyten/imi60/info.json | 92 +++++++++++++++++++ .../keyten/imi60/keymaps/default/keymap.c | 22 +++++ keyboards/keyten/imi60/keymaps/via/keymap.c | 22 +++++ keyboards/keyten/imi60/keymaps/via/rules.mk | 1 + keyboards/keyten/imi60/readme.md | 27 ++++++ keyboards/keyten/imi60/rules.mk | 0 6 files changed, 164 insertions(+) create mode 100644 keyboards/keyten/imi60/info.json create mode 100644 keyboards/keyten/imi60/keymaps/default/keymap.c create mode 100644 keyboards/keyten/imi60/keymaps/via/keymap.c create mode 100644 keyboards/keyten/imi60/keymaps/via/rules.mk create mode 100644 keyboards/keyten/imi60/readme.md create mode 100644 keyboards/keyten/imi60/rules.mk diff --git a/keyboards/keyten/imi60/info.json b/keyboards/keyten/imi60/info.json new file mode 100644 index 00000000000..2ccf8314116 --- /dev/null +++ b/keyboards/keyten/imi60/info.json @@ -0,0 +1,92 @@ +{ + "manufacturer": "keyten", + "keyboard_name": "imi60", + "maintainer": "key10iq", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["A15", "A5", "F1", "A6", "F0", "A7", "C15", "B0", "C14", "B1", "C13", "B11", "B4", "B3"], + "rows": ["B10", "B2", "B7", "B6", "B5"] + }, + "processor": "STM32F072", + "usb": { + "device_version": "0.0.1", + "pid": "0x6005", + "vid": "0xEB69" + }, + "community_layouts": ["60_tsangan_hhkb"], + "layouts": { + "LAYOUT_60_tsangan_hhkb": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 13], "x": 14, "y": 0}, + {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1}, + {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2}, + {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "w": 1.5, "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4}, + {"matrix": [4, 6], "w": 7, "x": 4, "y": 4}, + {"matrix": [4, 10], "w": 1.5, "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4} + ] + } + } +} diff --git a/keyboards/keyten/imi60/keymaps/default/keymap.c b/keyboards/keyten/imi60/keymaps/default/keymap.c new file mode 100644 index 00000000000..36859fad550 --- /dev/null +++ b/keyboards/keyten/imi60/keymaps/default/keymap.c @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_60_tsangan_hhkb( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL + ), + + [1] = LAYOUT_60_tsangan_hhkb( + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, + KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/keyten/imi60/keymaps/via/keymap.c b/keyboards/keyten/imi60/keymaps/via/keymap.c new file mode 100644 index 00000000000..36859fad550 --- /dev/null +++ b/keyboards/keyten/imi60/keymaps/via/keymap.c @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_60_tsangan_hhkb( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL + ), + + [1] = LAYOUT_60_tsangan_hhkb( + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, + KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/keyten/imi60/keymaps/via/rules.mk b/keyboards/keyten/imi60/keymaps/via/rules.mk new file mode 100644 index 00000000000..036bd6d1c3e --- /dev/null +++ b/keyboards/keyten/imi60/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/keyten/imi60/readme.md b/keyboards/keyten/imi60/readme.md new file mode 100644 index 00000000000..0d4db774e09 --- /dev/null +++ b/keyboards/keyten/imi60/readme.md @@ -0,0 +1,27 @@ +# keyten imi60 + +imi60 - 60% PCB compatible with keyboards by La-Versa: Animi, Mirimi and Otsukimi + +![imi60](https://i.imgur.com/s37K4wY.png) + +* Keyboard Maintainer: [keyten](https://github.com/key10iq) +* Hardware Supported: keyten imi60 +* Hardware Availability: private GB + +Make example for this keyboard (after setting up your build environment): + + make keyten/imi60:default + +Flashing example for this keyboard: + + make keyten/imi60: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* Bootmagic reset: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* Keycode in layout: Press the key mapped to `QK_BOOT` if it is available +* Physical reset button: Hold the button on the back of the PCB diff --git a/keyboards/keyten/imi60/rules.mk b/keyboards/keyten/imi60/rules.mk new file mode 100644 index 00000000000..e69de29bb2d From 8129b73d8a79647ab7e0338ab006c58ecb4a958b Mon Sep 17 00:00:00 2001 From: josh-l-wang <22173775+josh-l-wang@users.noreply.github.com> Date: Wed, 1 May 2024 02:35:39 -0400 Subject: [PATCH 223/333] [Keyboard] add Bruce the keyboard (#23639) --- keyboards/jlw/bruce_the_keyboard/info.json | 68 +++++++++++++++++++ .../keymaps/default/keymap.c | 35 ++++++++++ keyboards/jlw/bruce_the_keyboard/readme.md | 29 ++++++++ keyboards/jlw/bruce_the_keyboard/rules.mk | 1 + 4 files changed, 133 insertions(+) create mode 100644 keyboards/jlw/bruce_the_keyboard/info.json create mode 100644 keyboards/jlw/bruce_the_keyboard/keymaps/default/keymap.c create mode 100644 keyboards/jlw/bruce_the_keyboard/readme.md create mode 100644 keyboards/jlw/bruce_the_keyboard/rules.mk diff --git a/keyboards/jlw/bruce_the_keyboard/info.json b/keyboards/jlw/bruce_the_keyboard/info.json new file mode 100644 index 00000000000..0405869d408 --- /dev/null +++ b/keyboards/jlw/bruce_the_keyboard/info.json @@ -0,0 +1,68 @@ +{ + "keyboard_name": "Bruce the Keyboard", + "manufacturer": "jlw", + "url": "https://github.com/josh-l-wang/Bruce-the-Keyboard-the-Resources", + "maintainer": "jlw", + "usb": { + "vid": "0x1209", + "pid": "0xA459", + "device_version": "3.0.0" + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["B1", "B0", "A7", "A4", "A3", "B7", "B6", "B5", "B4", "B3"], + "rows": ["B11", "B9", "A5", "A6"] + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "h":1.75}, + {"matrix": [0, 1], "x": 1, "y": 0, "h":1.5}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0, "h":1.25}, + {"matrix": [0, 4], "x": 4, "y": 0, "h":1.25}, + {"matrix": [0, 5], "x": 5, "y": 0, "h":1.25}, + {"matrix": [0, 6], "x": 6, "y": 0, "h":1.25}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0, "h":1.5}, + {"matrix": [0, 9], "x": 9, "y": 0, "h":1.75}, + + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2.75, "h":1.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5, "h":1.75}, + {"matrix": [2, 2], "x": 2, "y": 2, "h":1.25}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.25}, + {"matrix": [2, 7], "x": 7, "y": 2, "h":1.25}, + {"matrix": [2, 8], "x": 8, "y": 2.5, "h":1.75}, + {"matrix": [2, 9], "x": 9, "y": 2.75, "h":1.5}, + + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3.25, "w": 2}, + {"matrix": [3, 5], "x": 5, "y": 3.25, "w": 2}, + {"matrix": [3, 7], "x": 7, "y": 3.25}, + ] + } + + } +} diff --git a/keyboards/jlw/bruce_the_keyboard/keymaps/default/keymap.c b/keyboards/jlw/bruce_the_keyboard/keymaps/default/keymap.c new file mode 100644 index 00000000000..73ef2e0213c --- /dev/null +++ b/keyboards/jlw/bruce_the_keyboard/keymaps/default/keymap.c @@ -0,0 +1,35 @@ +// Copyright 2024 jlw +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, + LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), KC_T, KC_G, KC_M, KC_N, RCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), + KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, + LT(3, KC_TAB), SFT_T(KC_BSPC), LT(1, KC_SPC), LT(2,KC_ENT) + ), + + [1] = LAYOUT( + KC_GRAVE, KC_F2, XXXXXXX, KC_F4, KC_F5, KC_BSLS, KC_MINUS, KC_EQUAL, KC_LBRC, KC_RBRC, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + DF(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(1), XXXXXXX, _______, _______, KC_SCLN, + _______, _______, _______, _______ + ), + + [2] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11, KC_F12, XXXXXXX, XXXXXXX, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + DF(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(2), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + _______, _______, _______, _______ + ), + [3] = LAYOUT( + XXXXXXX, XXXXXXX, LSG(KC_4),LSG(KC_S),XXXXXXX, KC_HOME, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, + KC_LGUI, KC_LALT, KC_LCTL, KC_LGUI, XXXXXXX, KC_END, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, + DF(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(2), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + _______, _______, _______, _______ + ) +}; \ No newline at end of file diff --git a/keyboards/jlw/bruce_the_keyboard/readme.md b/keyboards/jlw/bruce_the_keyboard/readme.md new file mode 100644 index 00000000000..a12624c3705 --- /dev/null +++ b/keyboards/jlw/bruce_the_keyboard/readme.md @@ -0,0 +1,29 @@ +# Bruce the Keyboard + +Please note that Bruce is a keyboard, not a human. + +Bruce the Keyboard is a column staggered 34-key board created by [jlw](github.com/josh-l-wang) and whydobearsxplod with a single layout. + +![Bruce the Keyboard](https://i.imgur.com/HkbwkK0.jpeg) + +* Keyboard Maintainer: [jlw](https://github.com/josh-l-wang) +* Hardware Supported: [Bruce the Keyboard the PCB and the Cases](https://github.com/josh-l-wang/Bruce-the-Keyboard-the-Resources) +* Hardware Availability: [jlw-kb.com](https://jlw-kb.com) + +Make example for this keyboard (after setting up your build environment): + + make jlw/bruce_the_keyboard:default + +Flashing example for this keyboard: + + make jlw/bruce_the_keyboard: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the top left key) and plug in the keyboard +* **Physical reset button**: Hold button on the back of the PCB while plugging in the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/jlw/bruce_the_keyboard/rules.mk b/keyboards/jlw/bruce_the_keyboard/rules.mk new file mode 100644 index 00000000000..218d8921e51 --- /dev/null +++ b/keyboards/jlw/bruce_the_keyboard/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank. From 719c99afa1a5449edee4453cf5b1bf3c8e75e0eb Mon Sep 17 00:00:00 2001 From: Joy Lee Date: Wed, 1 May 2024 14:35:58 +0800 Subject: [PATCH 224/333] [Keyboard] Add skiller_sgk50_s4 keyboard (#23636) Co-authored-by: wb Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Duncan Sutherland --- keyboards/sharkoon/skiller_sgk50_s4/config.h | 13 + keyboards/sharkoon/skiller_sgk50_s4/halconf.h | 10 + keyboards/sharkoon/skiller_sgk50_s4/info.json | 356 ++++++++++++++++++ .../skiller_sgk50_s4/keymaps/default/keymap.c | 22 ++ .../skiller_sgk50_s4/keymaps/via/keymap.c | 22 ++ .../skiller_sgk50_s4/keymaps/via/rules.mk | 1 + keyboards/sharkoon/skiller_sgk50_s4/mcuconf.h | 9 + keyboards/sharkoon/skiller_sgk50_s4/readme.md | 24 ++ keyboards/sharkoon/skiller_sgk50_s4/rules.mk | 1 + 9 files changed, 458 insertions(+) create mode 100644 keyboards/sharkoon/skiller_sgk50_s4/config.h create mode 100644 keyboards/sharkoon/skiller_sgk50_s4/halconf.h create mode 100644 keyboards/sharkoon/skiller_sgk50_s4/info.json create mode 100644 keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c create mode 100644 keyboards/sharkoon/skiller_sgk50_s4/keymaps/via/keymap.c create mode 100644 keyboards/sharkoon/skiller_sgk50_s4/keymaps/via/rules.mk create mode 100644 keyboards/sharkoon/skiller_sgk50_s4/mcuconf.h create mode 100644 keyboards/sharkoon/skiller_sgk50_s4/readme.md create mode 100644 keyboards/sharkoon/skiller_sgk50_s4/rules.mk diff --git a/keyboards/sharkoon/skiller_sgk50_s4/config.h b/keyboards/sharkoon/skiller_sgk50_s4/config.h new file mode 100644 index 00000000000..1d0f8f9a901 --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s4/config.h @@ -0,0 +1,13 @@ +// Copyright 2024 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* SPI Config for spi flash*/ +#define SPI_DRIVER SPIDQ +#define SPI_SCK_PIN B3 +#define SPI_MOSI_PIN B5 +#define SPI_MISO_PIN B4 +#define SPI_MOSI_PAL_MODE 5 + +#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 diff --git a/keyboards/sharkoon/skiller_sgk50_s4/halconf.h b/keyboards/sharkoon/skiller_sgk50_s4/halconf.h new file mode 100644 index 00000000000..9d456a5106f --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s4/halconf.h @@ -0,0 +1,10 @@ +// Copyright 2024 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_SPI TRUE +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD + +#include_next diff --git a/keyboards/sharkoon/skiller_sgk50_s4/info.json b/keyboards/sharkoon/skiller_sgk50_s4/info.json new file mode 100644 index 00000000000..7d36616e52b --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s4/info.json @@ -0,0 +1,356 @@ +{ + "manufacturer": "Sharkoon Technologies GmbH", + "keyboard_name": "SKILLER SGK50 S4", + "maintainer": "JoyLee", + "bootloader": "wb32-dfu", + "diode_direction": "ROW2COL", + "eeprom": { + "driver": "wear_leveling", + "wear_leveling": { + "backing_size": 4096, + "driver": "spi_flash" + } + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "A6", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7"], + "rows": ["A0", "A1", "A2", "A3", "C13"] + }, + "processor": "WB32FQ95", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "default": { + "val": 80 + }, + "driver": "ws2812", + "layout": [ + {"matrix": [4, 6], "x": 103, "y": 64, "flags": 4}, + {"matrix": [4, 10], "x": 172, "y": 64, "flags": 4}, + {"matrix": [4, 11], "x": 190, "y": 64, "flags": 4}, + {"matrix": [4, 12], "x": 207, "y": 64, "flags": 4}, + {"matrix": [4, 13], "x": 224, "y": 64, "flags": 4}, + {"matrix": [3, 13], "x": 224, "y": 48, "flags": 4}, + {"matrix": [3, 11], "x": 190, "y": 48, "flags": 4}, + {"matrix": [3, 10], "x": 172, "y": 48, "flags": 4}, + {"matrix": [3, 9], "x": 155, "y": 48, "flags": 4}, + {"matrix": [3, 8], "x": 138, "y": 48, "flags": 4}, + {"matrix": [3, 7], "x": 121, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 103, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 86, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4}, + {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4}, + {"matrix": [3, 2], "x": 34, "y": 48, "flags": 4}, + {"matrix": [3, 1], "x": 17, "y": 48, "flags": 4}, + {"matrix": [4, 2], "x": 34, "y": 64, "flags": 4}, + {"matrix": [4, 1], "x": 17, "y": 64, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, + {"matrix": [2, 1], "x": 17, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 34, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 52, "y": 32, "flags": 4}, + {"matrix": [2, 4], "x": 69, "y": 32, "flags": 4}, + {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4}, + {"matrix": [2, 6], "x": 103, "y": 32, "flags": 4}, + {"matrix": [2, 7], "x": 121, "y": 32, "flags": 4}, + {"matrix": [2, 8], "x": 138, "y": 32, "flags": 4}, + {"matrix": [2, 9], "x": 155, "y": 32, "flags": 4}, + {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4}, + {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4}, + {"matrix": [2, 13], "x": 207, "y": 32, "flags": 4}, + {"matrix": [2, 12], "x": 224, "y": 16, "flags": 4}, + {"matrix": [1, 12], "x": 207, "y": 16, "flags": 4}, + {"matrix": [1, 11], "x": 190, "y": 16, "flags": 4}, + {"matrix": [1, 10], "x": 172, "y": 16, "flags": 4}, + {"matrix": [1, 9], "x": 155, "y": 16, "flags": 4}, + {"matrix": [1, 8], "x": 138, "y": 16, "flags": 4}, + {"matrix": [1, 7], "x": 121, "y": 16, "flags": 4}, + {"matrix": [1, 6], "x": 103, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 86, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 69, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 52, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 34, "y": 16, "flags": 4}, + {"matrix": [1, 1], "x": 17, "y": 16, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 17, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 34, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 52, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 69, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 86, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 103, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 121, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 138, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 155, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 172, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 190, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 207, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 224, "y": 0, "flags": 4} + ], + "max_brightness": 110, + "sleep": true, + "val_steps": 28 + }, + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x1020", + "suspend_wakeup_delay": 1000, + "vid": "0x6332" + }, + "ws2812": { + "pin": "A8" + }, + "community_layouts": ["60_ansi", "60_iso"], + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + } + } +} diff --git a/keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c new file mode 100644 index 00000000000..84e72510d79 --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c @@ -0,0 +1,22 @@ +// Copyright 2024 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL + ), + + [1] = LAYOUT_all( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, RGB_VAI, + _______, _______, _______, _______, _______, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, RGB_VAD, _______, + _______, GU_TOGG, _______, _______, _______, _______, RGB_HUI, RGB_MOD + ) +}; diff --git a/keyboards/sharkoon/skiller_sgk50_s4/keymaps/via/keymap.c b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/via/keymap.c new file mode 100644 index 00000000000..84e72510d79 --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/via/keymap.c @@ -0,0 +1,22 @@ +// Copyright 2024 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL + ), + + [1] = LAYOUT_all( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, RGB_VAI, + _______, _______, _______, _______, _______, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, RGB_VAD, _______, + _______, GU_TOGG, _______, _______, _______, _______, RGB_HUI, RGB_MOD + ) +}; diff --git a/keyboards/sharkoon/skiller_sgk50_s4/keymaps/via/rules.mk b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/sharkoon/skiller_sgk50_s4/mcuconf.h b/keyboards/sharkoon/skiller_sgk50_s4/mcuconf.h new file mode 100644 index 00000000000..ae7ee58001a --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s4/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2024 JoyLee (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef WB32_SPI_USE_QSPI +#define WB32_SPI_USE_QSPI TRUE diff --git a/keyboards/sharkoon/skiller_sgk50_s4/readme.md b/keyboards/sharkoon/skiller_sgk50_s4/readme.md new file mode 100644 index 00000000000..db6650546ed --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s4/readme.md @@ -0,0 +1,24 @@ +# SHARKOON SKILLER SGK50 S4 + +![ISO](https://i.imgur.com/4WDIMm0.png) + +* Keyboard Maintainer: [JoyLee](https://github.com/itarze) +* Hardware Supported: [SHARKOON SKILLER SGK50 S4 PCB](http://www.sharkoon.com/) + +Make example for this keyboard (after setting up your build environment): + + make sharkoon/skiller_sgk50_s4:default + +Flashing example for this keyboard: + + make sharkoon/skiller_sgk50_s4: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/sharkoon/skiller_sgk50_s4/rules.mk b/keyboards/sharkoon/skiller_sgk50_s4/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/sharkoon/skiller_sgk50_s4/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 8fbdc4564886d03680fb0b7321db34bb043c8cf1 Mon Sep 17 00:00:00 2001 From: Druah <54309603+Druah@users.noreply.github.com> Date: Wed, 1 May 2024 02:42:43 -0400 Subject: [PATCH 225/333] [Keyboard] Add DK Saver Redux (#23510) --- keyboards/druah/dk_saver_redux/info.json | 323 ++++++++++++++++++ .../dk_saver_redux/keymaps/default/keymap.c | 32 ++ .../druah/dk_saver_redux/keymaps/via/keymap.c | 32 ++ .../druah/dk_saver_redux/keymaps/via/rules.mk | 1 + keyboards/druah/dk_saver_redux/readme.md | 27 ++ keyboards/druah/dk_saver_redux/rules.mk | 1 + 6 files changed, 416 insertions(+) create mode 100644 keyboards/druah/dk_saver_redux/info.json create mode 100644 keyboards/druah/dk_saver_redux/keymaps/default/keymap.c create mode 100644 keyboards/druah/dk_saver_redux/keymaps/via/keymap.c create mode 100644 keyboards/druah/dk_saver_redux/keymaps/via/rules.mk create mode 100644 keyboards/druah/dk_saver_redux/readme.md create mode 100644 keyboards/druah/dk_saver_redux/rules.mk diff --git a/keyboards/druah/dk_saver_redux/info.json b/keyboards/druah/dk_saver_redux/info.json new file mode 100644 index 00000000000..6c76e107565 --- /dev/null +++ b/keyboards/druah/dk_saver_redux/info.json @@ -0,0 +1,323 @@ +{ + "manufacturer": "KBDMania", + "keyboard_name": "DK Saver", + "maintainer": "Druah", + "backlight": { + "breathing": true, + "levels": 10, + "pin": "B7" + }, + "bootloader": "atmel-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "indicators": { + "caps_lock": "C2", + "scroll_lock": "C1" + }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "A1", "A2", "B5", "B4", "B3", "B2", "F2", "F1", "F0", "F4", "B1", "C5", "C6", "C0"], + "rows": ["C3", "F3", "B6", "A0", "C7", "C4"] + }, + "processor": "at90usb646", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "url": "https://druah.moe", + "usb": { + "device_version": "1.0.0", + "pid": "0x0002", + "vid": "0x444E" + }, + "community_layouts": ["tkl_f13_ansi", "tkl_f13_ansi_tsangan"], + "layout_aliases": { + "LAYOUT_all": "LAYOUT_tkl_f13_ansi" + }, + "layouts": { + "LAYOUT_tkl_f13_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_f13_ansi_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 12], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_f13_ansi_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + } + } +} diff --git a/keyboards/druah/dk_saver_redux/keymaps/default/keymap.c b/keyboards/druah/dk_saver_redux/keymaps/default/keymap.c new file mode 100644 index 00000000000..cf959d606a8 --- /dev/null +++ b/keyboards/druah/dk_saver_redux/keymaps/default/keymap.c @@ -0,0 +1,32 @@ +// Copyright 2024 Druah (@Druah) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐ + * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13││PSc│Scr│Pse│ + * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp││Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ ││Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ │ ↑ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐ + * │Ctrl│GUI │Alt │ │ Alt│ GUI│Menu│Ctrl││ ← │ ↓ │ → │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘ + */ + [0] = LAYOUT_all( + 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_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/druah/dk_saver_redux/keymaps/via/keymap.c b/keyboards/druah/dk_saver_redux/keymaps/via/keymap.c new file mode 100644 index 00000000000..cf959d606a8 --- /dev/null +++ b/keyboards/druah/dk_saver_redux/keymaps/via/keymap.c @@ -0,0 +1,32 @@ +// Copyright 2024 Druah (@Druah) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐ + * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13││PSc│Scr│Pse│ + * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp││Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ ││Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ │ ↑ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐ + * │Ctrl│GUI │Alt │ │ Alt│ GUI│Menu│Ctrl││ ← │ ↓ │ → │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘ + */ + [0] = LAYOUT_all( + 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_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/druah/dk_saver_redux/keymaps/via/rules.mk b/keyboards/druah/dk_saver_redux/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/druah/dk_saver_redux/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/druah/dk_saver_redux/readme.md b/keyboards/druah/dk_saver_redux/readme.md new file mode 100644 index 00000000000..0929182b880 --- /dev/null +++ b/keyboards/druah/dk_saver_redux/readme.md @@ -0,0 +1,27 @@ +# DK Saver Redux + +![PCB](https://i.imgur.com/eEw8Yog.png) + +A replacement TKL PCB for the DK Saver keyboard + +* Keyboard Maintainer: [Druah](https://github.com/Druah) +* Hardware Supported: DK Saver Redux +* Hardware Availability: Private buy + +Make example for this keyboard (after setting up your build environment): + + make druah/dk_saver_redux:default + +Flashing example for this keyboard: + + make druah/dk_saver_redux: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the Escape/top left key) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB labelled with "RESET" +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/druah/dk_saver_redux/rules.mk b/keyboards/druah/dk_saver_redux/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/druah/dk_saver_redux/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 0a3c486476ce384bd292d7291d1ac6fd3427e735 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 30 Apr 2024 23:43:43 -0700 Subject: [PATCH 226/333] Epomaker Tide 65: Layout Data Cleanup (#23643) --- keyboards/epomaker/tide65/info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/epomaker/tide65/info.json b/keyboards/epomaker/tide65/info.json index 2715b923f47..60f1b46f708 100644 --- a/keyboards/epomaker/tide65/info.json +++ b/keyboards/epomaker/tide65/info.json @@ -184,7 +184,7 @@ {"matrix": [1, 11], "x": 11.5, "y": 1}, {"matrix": [1, 12], "x": 12.5, "y": 1}, {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [1, 14], "x": 15, "y": 1.25}, + {"matrix": [1, 14], "x": 15, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, {"matrix": [2, 1], "x": 1.75, "y": 2}, {"matrix": [2, 2], "x": 2.75, "y": 2}, @@ -197,8 +197,8 @@ {"matrix": [2, 9], "x": 9.75, "y": 2}, {"matrix": [2, 10], "x": 10.75, "y": 2}, {"matrix": [2, 11], "x": 11.75, "y": 2}, - {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 1.75}, - {"matrix": [2, 14], "x": 15, "y": 2.25}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, {"matrix": [3, 1], "x": 2.25, "y": 3}, {"matrix": [3, 2], "x": 3.25, "y": 3}, @@ -217,8 +217,8 @@ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25}, - {"matrix": [4, 5], "x": 6, "y": 3.75, "w": 1.25}, - {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25, "h": 0.5}, + {"matrix": [4, 4], "x": 6, "y": 4.5, "w": 1.25, "h": 0.5}, {"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.75}, {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, From 5f755b982266970ae586ba516c4120c6cc684310 Mon Sep 17 00:00:00 2001 From: era <73109780+eerraa@users.noreply.github.com> Date: Wed, 1 May 2024 15:50:53 +0900 Subject: [PATCH 227/333] [Keyboard] Add N87 (#23457) --- keyboards/era/linx3/n87/config.h | 8 + keyboards/era/linx3/n87/info.json | 455 ++++++++++++++++++ .../era/linx3/n87/keymaps/default/keymap.c | 24 + keyboards/era/linx3/n87/keymaps/via/keymap.c | 24 + keyboards/era/linx3/n87/keymaps/via/rules.mk | 1 + keyboards/era/linx3/n87/readme.md | 23 + keyboards/era/linx3/n87/rules.mk | 1 + 7 files changed, 536 insertions(+) create mode 100644 keyboards/era/linx3/n87/config.h create mode 100644 keyboards/era/linx3/n87/info.json create mode 100644 keyboards/era/linx3/n87/keymaps/default/keymap.c create mode 100644 keyboards/era/linx3/n87/keymaps/via/keymap.c create mode 100644 keyboards/era/linx3/n87/keymaps/via/rules.mk create mode 100644 keyboards/era/linx3/n87/readme.md create mode 100644 keyboards/era/linx3/n87/rules.mk diff --git a/keyboards/era/linx3/n87/config.h b/keyboards/era/linx3/n87/config.h new file mode 100644 index 00000000000..8b294dd91b1 --- /dev/null +++ b/keyboards/era/linx3/n87/config.h @@ -0,0 +1,8 @@ +// Copyright 2024 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Reset */ +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 2000U \ No newline at end of file diff --git a/keyboards/era/linx3/n87/info.json b/keyboards/era/linx3/n87/info.json new file mode 100644 index 00000000000..548a37faddb --- /dev/null +++ b/keyboards/era/linx3/n87/info.json @@ -0,0 +1,455 @@ +{ + "manufacturer": "eerraa", + "keyboard_name": "N87", + "maintainer": "eerraa", + "bootloader": "rp2040", + "build": { + "debounce_type": "sym_defer_pk" + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP20", "GP19", "GP18", "GP17", "GP16", "GP21", "GP11", "GP9", "GP5"], + "rows": ["GP3", "GP2", "GP1", "GP0", "GP10", "GP8"] + }, + "processor": "RP2040", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 16], "x": 224, "y": 0, "flags": 4}, + {"matrix": [0, 15], "x": 211, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 198, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 182, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 169, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 156, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 143, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 123, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 110, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 97, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 84, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 65, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 52, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 39, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 26, "y": 0, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}, + {"matrix": [1, 0], "x": 0, "y": 15, "flags": 4}, + {"matrix": [1, 1], "x": 13, "y": 15, "flags": 4}, + {"matrix": [1, 2], "x": 26, "y": 15, "flags": 4}, + {"matrix": [1, 3], "x": 39, "y": 15, "flags": 4}, + {"matrix": [1, 4], "x": 52, "y": 15, "flags": 4}, + {"matrix": [1, 5], "x": 65, "y": 15, "flags": 4}, + {"matrix": [1, 6], "x": 78, "y": 15, "flags": 4}, + {"matrix": [1, 7], "x": 91, "y": 15, "flags": 4}, + {"matrix": [1, 8], "x": 104, "y": 15, "flags": 4}, + {"matrix": [1, 9], "x": 117, "y": 15, "flags": 4}, + {"matrix": [1, 10], "x": 130, "y": 15, "flags": 4}, + {"matrix": [1, 11], "x": 143, "y": 15, "flags": 4}, + {"matrix": [1, 12], "x": 156, "y": 15, "flags": 4}, + {"matrix": [1, 13], "x": 175, "y": 15, "flags": 1}, + {"matrix": [2, 14], "x": 198, "y": 15, "flags": 4}, + {"matrix": [1, 15], "x": 211, "y": 15, "flags": 4}, + {"matrix": [1, 16], "x": 224, "y": 15, "flags": 4}, + {"matrix": [2, 16], "x": 224, "y": 27, "flags": 4}, + {"matrix": [2, 15], "x": 211, "y": 27, "flags": 4}, + {"matrix": [3, 14], "x": 198, "y": 27, "flags": 4}, + {"matrix": [2, 13], "x": 179, "y": 27, "flags": 4}, + {"matrix": [2, 12], "x": 162, "y": 27, "flags": 4}, + {"matrix": [2, 11], "x": 149, "y": 27, "flags": 4}, + {"matrix": [2, 10], "x": 136, "y": 27, "flags": 4}, + {"matrix": [2, 9], "x": 123, "y": 27, "flags": 4}, + {"matrix": [2, 8], "x": 110, "y": 27, "flags": 4}, + {"matrix": [2, 7], "x": 97, "y": 27, "flags": 4}, + {"matrix": [2, 6], "x": 84, "y": 27, "flags": 4}, + {"matrix": [2, 5], "x": 71, "y": 27, "flags": 4}, + {"matrix": [2, 4], "x": 58, "y": 27, "flags": 4}, + {"matrix": [2, 3], "x": 45, "y": 27, "flags": 4}, + {"matrix": [2, 2], "x": 32, "y": 27, "flags": 4}, + {"matrix": [2, 1], "x": 19, "y": 27, "flags": 4}, + {"matrix": [2, 0], "x": 3, "y": 27, "flags": 1}, + {"matrix": [3, 0], "x": 2, "y": 40, "flags": 1}, + {"matrix": [3, 1], "x": 23, "y": 40, "flags": 4}, + {"matrix": [3, 2], "x": 36, "y": 40, "flags": 4}, + {"matrix": [3, 3], "x": 49, "y": 40, "flags": 4}, + {"matrix": [3, 4], "x": 62, "y": 40, "flags": 4}, + {"matrix": [3, 5], "x": 75, "y": 40, "flags": 4}, + {"matrix": [3, 6], "x": 88, "y": 40, "flags": 4}, + {"matrix": [3, 7], "x": 101, "y": 40, "flags": 4}, + {"matrix": [3, 8], "x": 114, "y": 40, "flags": 4}, + {"matrix": [3, 9], "x": 127, "y": 40, "flags": 4}, + {"matrix": [3, 10], "x": 140, "y": 40, "flags": 4}, + {"matrix": [3, 11], "x": 153, "y": 40, "flags": 4}, + {"matrix": [3, 13], "x": 174, "y": 40, "flags": 1}, + {"matrix": [4, 15], "x": 211, "y": 52, "flags": 1}, + {"matrix": [4, 13], "x": 182, "y": 52, "flags": 4}, + {"matrix": [4, 12], "x": 170, "y": 52, "flags": 1}, + {"matrix": [4, 11], "x": 146, "y": 52, "flags": 4}, + {"matrix": [4, 10], "x": 133, "y": 52, "flags": 4}, + {"matrix": [4, 9], "x": 120, "y": 52, "flags": 4}, + {"matrix": [4, 8], "x": 107, "y": 52, "flags": 4}, + {"matrix": [4, 7], "x": 94, "y": 52, "flags": 4}, + {"matrix": [4, 6], "x": 81, "y": 52, "flags": 4}, + {"matrix": [4, 5], "x": 68, "y": 52, "flags": 4}, + {"matrix": [4, 4], "x": 55, "y": 52, "flags": 4}, + {"matrix": [4, 3], "x": 42, "y": 52, "flags": 4}, + {"matrix": [4, 2], "x": 29, "y": 52, "flags": 4}, + {"matrix": [4, 0], "x": 8, "y": 52, "flags": 1}, + {"matrix": [5, 0], "x": 2, "y": 64, "flags": 1}, + {"matrix": [5, 1], "x": 18, "y": 64, "flags": 1}, + {"matrix": [5, 2], "x": 34, "y": 64, "flags": 1}, + {"x": 57, "y": 64, "flags": 4}, + {"x": 70, "y": 64, "flags": 4}, + {"matrix": [5, 6], "x": 83, "y": 64, "flags": 4}, + {"x": 96, "y": 64, "flags": 4}, + {"x": 109, "y": 64, "flags": 4}, + {"matrix": [5, 10], "x": 131, "y": 64, "flags": 1}, + {"matrix": [5, 11], "x": 148, "y": 64, "flags": 1}, + {"matrix": [5, 12], "x": 164, "y": 64, "flags": 1}, + {"matrix": [5, 13], "x": 180, "y": 64, "flags": 1}, + {"matrix": [5, 14], "x": 198, "y": 64, "flags": 1}, + {"matrix": [5, 15], "x": 211, "y": 64, "flags": 1}, + {"matrix": [5, 16], "x": 224, "y": 64, "flags": 1} + ], + "sleep": true + }, + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0009", + "vid": "0x4552" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP4" + }, + "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift"], + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/era/linx3/n87/keymaps/default/keymap.c b/keyboards/era/linx3/n87/keymaps/default/keymap.c new file mode 100644 index 00000000000..a16e6a21105 --- /dev/null +++ b/keyboards/era/linx3/n87/keymaps/default/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2024 QMK (@qmk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + 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_F12 , KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END , KC_PGDN, + KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_UP , + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RGUI, MO(1) , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/linx3/n87/keymaps/via/keymap.c b/keyboards/era/linx3/n87/keymaps/via/keymap.c new file mode 100644 index 00000000000..a16e6a21105 --- /dev/null +++ b/keyboards/era/linx3/n87/keymaps/via/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2024 QMK (@qmk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + 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_F12 , KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END , KC_PGDN, + KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_UP , + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RGUI, MO(1) , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/linx3/n87/keymaps/via/rules.mk b/keyboards/era/linx3/n87/keymaps/via/rules.mk new file mode 100644 index 00000000000..036bd6d1c3e --- /dev/null +++ b/keyboards/era/linx3/n87/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/era/linx3/n87/readme.md b/keyboards/era/linx3/n87/readme.md new file mode 100644 index 00000000000..ff5b29d3bd1 --- /dev/null +++ b/keyboards/era/linx3/n87/readme.md @@ -0,0 +1,23 @@ +# N87 + +* Keyboard Maintainer: [ERA](https://github.com/eerraa) +* Hardware supported: Syryan & Linx3 +* Hardware availability: [Syryan](https://srind.mysoho.com/) & [Linx3](https://allthatkeyboard.com) + +Make example for this keyboard (after setting up your build environment): + + make era/linx3/n87:default + +Flashing example for this keyboard: + + make era/linx3/n87: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at ESC(0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly short the `RESET` and `GND` pads on the SWD header twice, or short the `BOOT` header and plug in keyboard +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file diff --git a/keyboards/era/linx3/n87/rules.mk b/keyboards/era/linx3/n87/rules.mk new file mode 100644 index 00000000000..7ff128fa692 --- /dev/null +++ b/keyboards/era/linx3/n87/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From 1fc4bfa3132d77bf21dbed71f63cdd1a06e04cf2 Mon Sep 17 00:00:00 2001 From: Pavel Kroupa <63880977+Tabonx@users.noreply.github.com> Date: Wed, 1 May 2024 08:53:30 +0200 Subject: [PATCH 228/333] Add MacOS Czech ISO and ANSI keymaps #23346 (#23412) --- .../keycodes_czech_mac_ansi_0.0.1.hjson | 580 ++++++++++++++++++ .../extras/keycodes_czech_mac_iso_0.0.1.hjson | 580 ++++++++++++++++++ docs/reference_keymap_extras.md | 2 + quantum/keymap_extras/keymap_czech_mac_ansi.h | 162 +++++ quantum/keymap_extras/keymap_czech_mac_iso.h | 162 +++++ .../keymap_extras/sendstring_czech_mac_ansi.h | 120 ++++ .../keymap_extras/sendstring_czech_mac_iso.h | 120 ++++ 7 files changed, 1726 insertions(+) create mode 100644 data/constants/keycodes/extras/keycodes_czech_mac_ansi_0.0.1.hjson create mode 100644 data/constants/keycodes/extras/keycodes_czech_mac_iso_0.0.1.hjson create mode 100644 quantum/keymap_extras/keymap_czech_mac_ansi.h create mode 100644 quantum/keymap_extras/keymap_czech_mac_iso.h create mode 100644 quantum/keymap_extras/sendstring_czech_mac_ansi.h create mode 100644 quantum/keymap_extras/sendstring_czech_mac_iso.h diff --git a/data/constants/keycodes/extras/keycodes_czech_mac_ansi_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_czech_mac_ansi_0.0.1.hjson new file mode 100644 index 00000000000..d0eb554126d --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_czech_mac_ansi_0.0.1.hjson @@ -0,0 +1,580 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ \ │ + │ ě │ š │ č │ ř │ ž │ ý │ á │ í │ é │ = │ ' │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ ú │ ) │ ¨ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ů │ § │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ + * │ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "KC_GRV": { + "key": "CZ_BSLS", + "label": "\\", + } + "KC_1": { + "key": "CZ_PLUS", + "label": "+", + } + "KC_2": { + "key": "CZ_ECAR", + "label": "ě", + } + "KC_3": { + "key": "CZ_SCAR", + "label": "š", + } + "KC_4": { + "key": "CZ_CCAR", + "label": "č", + } + "KC_5": { + "key": "CZ_RCAR", + "label": "ř", + } + "KC_6": { + "key": "CZ_ZCAR", + "label": "ž", + } + "KC_7": { + "key": "CZ_YACU", + "label": "ý", + } + "KC_8": { + "key": "CZ_AACU", + "label": "á", + } + "KC_9": { + "key": "CZ_IACU", + "label": "í", + } + "KC_0": { + "key": "CZ_EACU", + "label": "é", + } + "KC_MINS": { + "key": "CZ_EQL", + "label": "=", + } + "KC_EQL": { + "key": "CZ_ACUT", + "label": "' (dead)", + } + "KC_Q": { + "key": "CZ_Q", + "label": "Q", + } + "KC_W": { + "key": "CZ_W", + "label": "W", + } + "KC_E": { + "key": "CZ_E", + "label": "E", + } + "KC_R": { + "key": "CZ_R", + "label": "R", + } + "KC_T": { + "key": "CZ_T", + "label": "T", + } + "KC_Y": { + "key": "CZ_Z", + "label": "Z", + } + "KC_U": { + "key": "CZ_U", + "label": "U", + } + "KC_I": { + "key": "CZ_I", + "label": "I", + } + "KC_O": { + "key": "CZ_O", + "label": "O", + } + "KC_P": { + "key": "CZ_P", + "label": "P", + } + "KC_LBRC": { + "key": "CZ_UACU", + "label": "ú", + } + "KC_RBRC": { + "key": "CZ_RPRN", + "label": ")", + } + "KC_NUHS": { + "key": "CZ_DIAE", + "label": "¨ (dead)", + } + "KC_A": { + "key": "CZ_A", + "label": "A", + } + "KC_S": { + "key": "CZ_S", + "label": "S", + } + "KC_D": { + "key": "CZ_D", + "label": "D", + } + "KC_F": { + "key": "CZ_F", + "label": "F", + } + "KC_G": { + "key": "CZ_G", + "label": "G", + } + "KC_H": { + "key": "CZ_H", + "label": "H", + } + "KC_J": { + "key": "CZ_J", + "label": "J", + } + "KC_K": { + "key": "CZ_K", + "label": "K", + } + "KC_L": { + "key": "CZ_L", + "label": "L", + } + "KC_SCLN": { + "key": "CZ_URNG", + "label": "ů", + } + "KC_QUOT": { + "key": "CZ_SECT", + "label": "§", + } + "KC_Z": { + "key": "CZ_Y", + "label": "Y", + } + "KC_X": { + "key": "CZ_X", + "label": "X", + } + "KC_C": { + "key": "CZ_C", + "label": "C", + } + "KC_V": { + "key": "CZ_V", + "label": "V", + } + "KC_B": { + "key": "CZ_B", + "label": "B", + } + "KC_N": { + "key": "CZ_N", + "label": "N", + } + "KC_M": { + "key": "CZ_M", + "label": "M", + } + "KC_COMM": { + "key": "CZ_COMM", + "label": ",", + } + "KC_DOT": { + "key": "CZ_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "CZ_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ | │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ % │ ˇ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ / │ ( │ ` │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │ │ │ │ │ │ │ │ │ │ " │ ! │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ + * │ │ │ │ │ │ │ │ │ ? │ : │ _ │ │ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(CZ_BSLS)": { + "key": "CZ_PIPE", + "label": "|", + } + "S(CZ_PLUS)": { + "key": "CZ_1", + "label": "1", + } + "S(CZ_ECAR)": { + "key": "CZ_2", + "label": "2", + } + "S(CZ_SCAR)": { + "key": "CZ_3", + "label": "3", + } + "S(CZ_CCAR)": { + "key": "CZ_4", + "label": "4", + } + "S(CZ_RCAR)": { + "key": "CZ_5", + "label": "5", + } + "S(CZ_ZCAR)": { + "key": "CZ_6", + "label": "6", + } + "S(CZ_YACU)": { + "key": "CZ_7", + "label": "7", + } + "S(CZ_AACU)": { + "key": "CZ_8", + "label": "8", + } + "S(CZ_IACU)": { + "key": "CZ_9", + "label": "9", + } + "S(CZ_EACU)": { + "key": "CZ_0", + "label": "0", + } + "S(CZ_EQL)": { + "key": "CZ_PERC", + "label": "%", + } + "S(CZ_ACUT)": { + "key": "CZ_CARN", + "label": "ˇ (dead)", + } + "S(CZ_UACU)": { + "key": "CZ_SLSH", + "label": "/", + } + "S(CZ_RPRN)": { + "key": "CZ_LPRN", + "label": "(", + } + "S(CZ_DIAE)": { + "key": "CZ_GRV", + "label": "`", + } + "S(CZ_URNG)": { + "key": "CZ_DQUO", + "label": "\"", + } + "S(CZ_SECT)": { + "key": "CZ_EXLM", + "label": "!", + } + "S(CZ_COMM)": { + "key": "CZ_QUES", + "label": "?", + } + "S(CZ_DOT)": { + "key": "CZ_COLN", + "label": ":", + } + "S(CZ_MINS)": { + "key": "CZ_UNDS", + "label": "_", + } +/* Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ │ │ @ │ # │ $ │ ~ │ ^ │ & │ * │ { │ } │ ° │ ^ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ ė │ ę │ € │ │ │ │ │ │ │ [ │ ] │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │ ą │ ß │ ∂ │ │ │ ‘ │ ’ │ │ ł │ ; │ ' │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ + * │ │ │ │ │ │ │ ‚ │ │ < │ > │ – │ │ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "A(CZ_ECAR)": { + "key": "CZ_AT", + "label": "@", + } + "A(CZ_SCAR)": { + "key": "CZ_HASH", + "label": "#", + } + "A(CZ_CCAR)": { + "key": "CZ_DLR", + "label": "$", + } + "A(CZ_RCAR)": { + "key": "CZ_TILD", + "label": "~", + } + "A(CZ_ZCAR)": { + "key": "CZ_CIRC", + "label": "^", + } + "A(CZ_YACU)": { + "key": "CZ_AMPR", + "label": "&", + } + "A(CZ_AACU)": { + "key": "CZ_ASTR", + "label": "*", + } + "A(CZ_IACU)": { + "key": "CZ_LCBR", + "label": "{", + } + "A(CZ_EACU)": { + "key": "CZ_RCBR", + "label": "}", + } + "A(CZ_EQL)": { + "key": "CZ_RNGA", + "label": "° (dead)", + } + "A(CZ_ACUT)": { + "key": "CZ_DCIR", + "label": "^ (dead)", + } + "A(CZ_W)": { + "key": "CZ_LEDT", + "label": "ė", + } + "A(CZ_E)": { + "key": "CZ_LEOG", + "label": "ę", + } + "A(CZ_R)": { + "key": "CZ_EURO", + "label": "€", + } + "A(CZ_Z)": { + "key": "CZ_LZDT", + "label": "ż", + } + "A(CZ_UACU)": { + "key": "CZ_LBRC", + "label": "[", + } + "A(CZ_RPRN)": { + "key": "CZ_RBRC", + "label": "]", + } + "A(CZ_A)": { + "key": "CZ_LAOG", + "label": "ą", + } + "A(CZ_S)": { + "key": "CZ_SS", + "label": "ß", + } + "A(CZ_D)": { + "key": "CZ_PDIF", + "label": "∂", + } + "A(CZ_H)": { + "key": "CZ_LSQU", + "label": "‘", + } + "A(CZ_J)": { + "key": "CZ_RSQU", + "label": "’", + } + "A(CZ_L)": { + "key": "CZ_LLST", + "label": "ł", + } + "A(CZ_URNG)": { + "key": "CZ_SCLN", + "label": ";", + } + "A(CZ_SECT)": { + "key": "CZ_QUOT", + "label": "'", + } + "A(CZ_N)": { + "key": "CZ_SLQU", + "label": "‚", + } + "A(CZ_COMM)": { + "key": "CZ_LABK", + "label": "<", + } + "A(CZ_DOT)": { + "key": "CZ_RABK", + "label": ">", + } + "A(CZ_MINS)": { + "key": "CZ_NDSH", + "label": "–", + } +/* Shift+Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ │ ¬ │ • │ ≠ │ £ │ ◊ │ † │ ¶ │ ÷ │ « │ » │ , │ - │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ Ė │ Ę │ ® │ ™ │ Ż │ │ │ │ │ ‹ │ › │ " │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │ Ą │ ∑ │ ∆ │ │ │ “ │ ” │ │ Ł │ … │ ~ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤ + * │ │ │ │ © │ √ │ │ „ │ │ ≤ │ ≥ │ — │ │ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(A(CZ_1))": { + "key": "CZ_NOT", + "label": "¬", + } + "S(A(CZ_2))": { + "key": "CZ_BULT", + "label": "•", + } + "S(A(CZ_3))": { + "key": "CZ_NEQL", + "label": "≠", + } + "S(A(CZ_4))": { + "key": "CZ_PND", + "label": "£", + } + "S(A(CZ_5))": { + "key": "CZ_LOZN", + "label": "◊", + } + "S(A(CZ_6))": { + "key": "CZ_DAGG", + "label": "†", + } + "S(A(CZ_7))": { + "key": "CZ_PARA", + "label": "¶", + } + "S(A(CZ_8))": { + "key": "CZ_DIV", + "label": "÷", + } + "S(A(CZ_9))": { + "key": "CZ_LDAQ", + "label": "«", + } + "S(A(CZ_0))": { + "key": "CZ_RDAQ", + "label": "»", + } + "S(A(CZ_EQL))": { + "key": "CZ_DCOM", + "label": ", (dead)", + } + "S(A(CZ_ACUT))": { + "key": "CZ_DHPN", + "label": "- (dead)", + } + "S(A(CZ_W))": { + "key": "CZ_CEDT", + "label": "Ė", + } + "S(A(CZ_E))": { + "key": "CZ_CEOG", + "label": "Ę", + } + "S(A(CZ_R))": { + "key": "CZ_REGD", + "label": "®", + } + "S(A(CZ_T))": { + "key": "CZ_TM", + "label": "™", + } + "S(A(CZ_Z))": { + "key": "CZ_CZDT", + "label": "Ż", + } + "S(A(CZ_UACU))": { + "key": "CZ_LSAQ", + "label": "‹", + } + "S(A(CZ_RPRN))": { + "key": "CZ_RSAQ", + "label": "›", + } + "S(A(CZ_DIAE))": { + "key": "CZ_DDQT", + "label": "\" (dead)", + } + "S(A(CZ_A))": { + "key": "CZ_CAOG", + "label": "Ą", + } + "S(A(CZ_S))": { + "key": "CZ_NARS", + "label": "∑", + } + "S(A(CZ_D))": { + "key": "CZ_INCR", + "label": "∆", + } + "S(A(CZ_H))": { + "key": "CZ_LDQU", + "label": "“", + } + "S(A(CZ_J))": { + "key": "CZ_RDQU", + "label": "”", + } + "S(A(CZ_L))": { + "key": "CZ_CLST", + "label": "Ł", + } + "S(A(CZ_URNG))": { + "key": "CZ_ELLP", + "label": "…", + } + "S(A(CZ_SECT))": { + "key": "CZ_DTIL", + "label": "~ (dead)", + } + "S(A(CZ_C))": { + "key": "CZ_COPY", + "label": "©", + } + "S(A(CZ_V))": { + "key": "CZ_SQRT", + "label": "√", + } + "S(A(CZ_N))": { + "key": "CZ_DLQU", + "label": "„", + } + "S(A(CZ_COMM))": { + "key": "CZ_LEQL", + "label": "≤", + } + "S(A(CZ_DOT))": { + "key": "CZ_GEQL", + "label": "≥", + } + "S(A(CZ_MINS))": { + "key": "CZ_MDSH", + "label": "—", + } + } +} diff --git a/data/constants/keycodes/extras/keycodes_czech_mac_iso_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_czech_mac_iso_0.0.1.hjson new file mode 100644 index 00000000000..5158ea16d8d --- /dev/null +++ b/data/constants/keycodes/extras/keycodes_czech_mac_iso_0.0.1.hjson @@ -0,0 +1,580 @@ +{ + "aliases": { +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ │ + │ ě │ š │ č │ ř │ ž │ ý │ á │ í │ é │ = │ ' │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ ú │ ) │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ů │ § │ ¨ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ \ │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "KC_1": { + "key": "CZ_PLUS", + "label": "+", + } + "KC_2": { + "key": "CZ_ECAR", + "label": "ě", + } + "KC_3": { + "key": "CZ_SCAR", + "label": "š", + } + "KC_4": { + "key": "CZ_CCAR", + "label": "č", + } + "KC_5": { + "key": "CZ_RCAR", + "label": "ř", + } + "KC_6": { + "key": "CZ_ZCAR", + "label": "ž", + } + "KC_7": { + "key": "CZ_YACU", + "label": "ý", + } + "KC_8": { + "key": "CZ_AACU", + "label": "á", + } + "KC_9": { + "key": "CZ_IACU", + "label": "í", + } + "KC_0": { + "key": "CZ_EACU", + "label": "é", + } + "KC_MINS": { + "key": "CZ_EQL", + "label": "=", + } + "KC_EQL": { + "key": "CZ_ACUT", + "label": "' (dead)", + } + "KC_Q": { + "key": "CZ_Q", + "label": "Q", + } + "KC_W": { + "key": "CZ_W", + "label": "W", + } + "KC_E": { + "key": "CZ_E", + "label": "E", + } + "KC_R": { + "key": "CZ_R", + "label": "R", + } + "KC_T": { + "key": "CZ_T", + "label": "T", + } + "KC_Y": { + "key": "CZ_Z", + "label": "Z", + } + "KC_U": { + "key": "CZ_U", + "label": "U", + } + "KC_I": { + "key": "CZ_I", + "label": "I", + } + "KC_O": { + "key": "CZ_O", + "label": "O", + } + "KC_P": { + "key": "CZ_P", + "label": "P", + } + "KC_LBRC": { + "key": "CZ_UACU", + "label": "ú", + } + "KC_RBRC": { + "key": "CZ_RPRN", + "label": ")", + } + "KC_A": { + "key": "CZ_A", + "label": "A", + } + "KC_S": { + "key": "CZ_S", + "label": "S", + } + "KC_D": { + "key": "CZ_D", + "label": "D", + } + "KC_F": { + "key": "CZ_F", + "label": "F", + } + "KC_G": { + "key": "CZ_G", + "label": "G", + } + "KC_H": { + "key": "CZ_H", + "label": "H", + } + "KC_J": { + "key": "CZ_J", + "label": "J", + } + "KC_K": { + "key": "CZ_K", + "label": "K", + } + "KC_L": { + "key": "CZ_L", + "label": "L", + } + "KC_SCLN": { + "key": "CZ_URNG", + "label": "ů", + } + "KC_QUOT": { + "key": "CZ_SECT", + "label": "§", + } + "KC_NUHS": { + "key": "CZ_DIAE", + "label": "¨ (dead)", + } + "KC_NUBS": { + "key": "CZ_BSLS", + "label": "\\", + } + "KC_Z": { + "key": "CZ_Y", + "label": "Y", + } + "KC_X": { + "key": "CZ_X", + "label": "X", + } + "KC_C": { + "key": "CZ_C", + "label": "C", + } + "KC_V": { + "key": "CZ_V", + "label": "V", + } + "KC_B": { + "key": "CZ_B", + "label": "B", + } + "KC_N": { + "key": "CZ_N", + "label": "N", + } + "KC_M": { + "key": "CZ_M", + "label": "M", + } + "KC_COMM": { + "key": "CZ_COMM", + "label": ",", + } + "KC_DOT": { + "key": "CZ_DOT", + "label": ".", + } + "KC_SLSH": { + "key": "CZ_MINS", + "label": "-", + } +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ % │ ˇ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ / │ ( │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ │ │ │ │ │ │ │ │ │ " │ ! │ ` │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ | │ │ │ │ │ │ │ │ ? │ : │ _ │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(CZ_PLUS)": { + "key": "CZ_1", + "label": "1", + } + "S(CZ_ECAR)": { + "key": "CZ_2", + "label": "2", + } + "S(CZ_SCAR)": { + "key": "CZ_3", + "label": "3", + } + "S(CZ_CCAR)": { + "key": "CZ_4", + "label": "4", + } + "S(CZ_RCAR)": { + "key": "CZ_5", + "label": "5", + } + "S(CZ_ZCAR)": { + "key": "CZ_6", + "label": "6", + } + "S(CZ_YACU)": { + "key": "CZ_7", + "label": "7", + } + "S(CZ_AACU)": { + "key": "CZ_8", + "label": "8", + } + "S(CZ_IACU)": { + "key": "CZ_9", + "label": "9", + } + "S(CZ_EACU)": { + "key": "CZ_0", + "label": "0", + } + "S(CZ_EQL)": { + "key": "CZ_PERC", + "label": "%", + } + "S(CZ_ACUT)": { + "key": "CZ_CARN", + "label": "ˇ (dead)", + } + "S(CZ_UACU)": { + "key": "CZ_SLSH", + "label": "/", + } + "S(CZ_RPRN)": { + "key": "CZ_LPRN", + "label": "(", + } + "S(CZ_URNG)": { + "key": "CZ_DQUO", + "label": "\"", + } + "S(CZ_SECT)": { + "key": "CZ_EXLM", + "label": "!", + } + "S(CZ_DIAE)": { + "key": "CZ_GRV", + "label": "`", + } + "S(CZ_BSLS)": { + "key": "CZ_PIPE", + "label": "|", + } + "S(CZ_COMM)": { + "key": "CZ_QUES", + "label": "?", + } + "S(CZ_DOT)": { + "key": "CZ_COLN", + "label": ":", + } + "S(CZ_MINS)": { + "key": "CZ_UNDS", + "label": "_", + } +/* Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ │ │ @ │ # │ $ │ ~ │ ^ │ & │ * │ { │ } │ ° │ ^ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ ė │ ę │ € │ │ ż │ │ │ │ │ [ │ ] │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ ą │ ß │ ∂ │ │ │ ‘ │ ’ │ │ ł │ ; │ ' │ │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ │ │ │ │ │ │ ‚ │ │ < │ > │ – │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "A(CZ_ECAR)": { + "key": "CZ_AT", + "label": "@", + } + "A(CZ_SCAR)": { + "key": "CZ_HASH", + "label": "#", + } + "A(CZ_CCAR)": { + "key": "CZ_DLR", + "label": "$", + } + "A(CZ_RCAR)": { + "key": "CZ_TILD", + "label": "~", + } + "A(CZ_ZCAR)": { + "key": "CZ_CIRC", + "label": "^", + } + "A(CZ_YACU)": { + "key": "CZ_AMPR", + "label": "&", + } + "A(CZ_AACU)": { + "key": "CZ_ASTR", + "label": "*", + } + "A(CZ_IACU)": { + "key": "CZ_LCBR", + "label": "{", + } + "A(CZ_EACU)": { + "key": "CZ_RCBR", + "label": "}", + } + "A(CZ_EQL)": { + "key": "CZ_RNGA", + "label": "° (dead)", + } + "A(CZ_ACUT)": { + "key": "CZ_DCIR", + "label": "^ (dead)", + } + "A(CZ_W)": { + "key": "CZ_LEDT", + "label": "ė", + } + "A(CZ_E)": { + "key": "CZ_LEOG", + "label": "ę", + } + "A(CZ_R)": { + "key": "CZ_EURO", + "label": "€", + } + "A(CZ_Z)": { + "key": "CZ_LZDT", + "label": "ż", + } + "A(CZ_UACU)": { + "key": "CZ_LBRC", + "label": "[", + } + "A(CZ_RPRN)": { + "key": "CZ_RBRC", + "label": "]", + } + "A(CZ_A)": { + "key": "CZ_LAOG", + "label": "ą", + } + "A(CZ_S)": { + "key": "CZ_SS", + "label": "ß", + } + "A(CZ_D)": { + "key": "CZ_PDIF", + "label": "∂", + } + "A(CZ_H)": { + "key": "CZ_LSQU", + "label": "‘", + } + "A(CZ_J)": { + "key": "CZ_RSQU", + "label": "’", + } + "A(CZ_L)": { + "key": "CZ_LLST", + "label": "ł", + } + "A(CZ_URNG)": { + "key": "CZ_SCLN", + "label": ";", + } + "A(CZ_SECT)": { + "key": "CZ_QUOT", + "label": "'", + } + "A(CZ_N)": { + "key": "CZ_SLQU", + "label": "‚", + } + "A(CZ_COMM)": { + "key": "CZ_LABK", + "label": "<", + } + "A(CZ_DOT)": { + "key": "CZ_RABK", + "label": ">", + } + "A(CZ_MINS)": { + "key": "CZ_NDSH", + "label": "–", + } +/* Shift+Alted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │ │ ¬ │ • │ ≠ │ £ │ ◊ │ † │ ¶ │ ÷ │ « │ » │ , │ - │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤ + * │ │ │ Ė │ Ę │ ® │ ™ │ Ż │ │ │ │ │ ‹ │ › │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ + * │ │ Ą │ ∑ │ ∆ │ │ │ “ │ ” │ │ Ł │ … │ ~ │ " │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤ + * │ │ │ │ │ © │ √ │ │ „ │ │ ≤ │ ≥ │ — │ │ + * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤ + * │ │ │ │ │ │ │ │ + * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘ + */ + "S(A(CZ_1))": { + "key": "CZ_NOT", + "label": "¬", + } + "S(A(CZ_2))": { + "key": "CZ_BULT", + "label": "•", + } + "S(A(CZ_3))": { + "key": "CZ_NEQL", + "label": "≠", + } + "S(A(CZ_4))": { + "key": "CZ_PND", + "label": "£", + } + "S(A(CZ_5))": { + "key": "CZ_LOZN", + "label": "◊", + } + "S(A(CZ_6))": { + "key": "CZ_DAGG", + "label": "†", + } + "S(A(CZ_7))": { + "key": "CZ_PARA", + "label": "¶", + } + "S(A(CZ_8))": { + "key": "CZ_DIV", + "label": "÷", + } + "S(A(CZ_9))": { + "key": "CZ_LDAQ", + "label": "«", + } + "S(A(CZ_0))": { + "key": "CZ_RDAQ", + "label": "»", + } + "S(A(CZ_EQL))": { + "key": "CZ_DCOM", + "label": ", (dead)", + } + "S(A(CZ_ACUT))": { + "key": "CZ_DHPN", + "label": "- (dead)", + } + "S(A(CZ_W))": { + "key": "CZ_CEDT", + "label": "Ė", + } + "S(A(CZ_E))": { + "key": "CZ_CEOG", + "label": "Ę", + } + "S(A(CZ_R))": { + "key": "CZ_REGD", + "label": "®", + } + "S(A(CZ_T))": { + "key": "CZ_TM", + "label": "™", + } + "S(A(CZ_Z))": { + "key": "CZ_CZDT", + "label": "Ż", + } + "S(A(CZ_UACU))": { + "key": "CZ_LSAQ", + "label": "‹", + } + "S(A(CZ_RPRN))": { + "key": "CZ_RSAQ", + "label": "›", + } + "S(A(CZ_A))": { + "key": "CZ_CAOG", + "label": "Ą", + } + "S(A(CZ_S))": { + "key": "CZ_NARS", + "label": "∑", + } + "S(A(CZ_D))": { + "key": "CZ_INCR", + "label": "∆", + } + "S(A(CZ_H))": { + "key": "CZ_LDQU", + "label": "“", + } + "S(A(CZ_J))": { + "key": "CZ_RDQU", + "label": "”", + } + "S(A(CZ_L))": { + "key": "CZ_CLST", + "label": "Ł", + } + "S(A(CZ_URNG))": { + "key": "CZ_ELLP", + "label": "…", + } + "S(A(CZ_SECT))": { + "key": "CZ_DTIL", + "label": "~ (dead)", + } + "S(A(CZ_DIAE))": { + "key": "CZ_DDQT", + "label": "\" (dead)", + } + "S(A(CZ_C))": { + "key": "CZ_COPY", + "label": "©", + } + "S(A(CZ_V))": { + "key": "CZ_SQRT", + "label": "√", + } + "S(A(CZ_N))": { + "key": "CZ_DLQU", + "label": "„", + } + "S(A(CZ_COMM))": { + "key": "CZ_LEQL", + "label": "≤", + } + "S(A(CZ_DOT))": { + "key": "CZ_GEQL", + "label": "≥", + } + "S(A(CZ_MINS))": { + "key": "CZ_MDSH", + "label": "—", + } + } +} diff --git a/docs/reference_keymap_extras.md b/docs/reference_keymap_extras.md index cf2ab288761..191e0d4ea8d 100644 --- a/docs/reference_keymap_extras.md +++ b/docs/reference_keymap_extras.md @@ -23,6 +23,8 @@ These headers are located in [`quantum/keymap_extras/`](https://github.com/qmk/q |Canadian Multilingual (CSA) |`keymap_canadian_multilingual.h` |`sendstring_canadian_multilingual.h`| |Croatian |`keymap_croatian.h` |`sendstring_croatian.h` | |Czech |`keymap_czech.h` |`sendstring_czech.h` | +|Czech (macOS, ANSI) |`keymap_czech_mac_ansi.h` |`sendstring_czech_mac_ansi.h` | +|Czech (macOS, ISO) |`keymap_czech_mac_iso.h` |`sendstring_czech_mac_iso.h` | |Danish |`keymap_danish.h` |`sendstring_danish.h` | |Dutch (Belgium) |`keymap_belgian.h` |`sendstring_belgian.h` | |English (Ireland) |`keymap_irish.h` | | diff --git a/quantum/keymap_extras/keymap_czech_mac_ansi.h b/quantum/keymap_extras/keymap_czech_mac_ansi.h new file mode 100644 index 00000000000..ac2f078d980 --- /dev/null +++ b/quantum/keymap_extras/keymap_czech_mac_ansi.h @@ -0,0 +1,162 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ + +#pragma once +#include "keycodes.h" +// clang-format off + +// Aliases +#define CZ_BSLS KC_GRV // (backslash) +#define CZ_PLUS KC_1 // + +#define CZ_ECAR KC_2 // ě +#define CZ_SCAR KC_3 // š +#define CZ_CCAR KC_4 // č +#define CZ_RCAR KC_5 // ř +#define CZ_ZCAR KC_6 // ž +#define CZ_YACU KC_7 // ý +#define CZ_AACU KC_8 // á +#define CZ_IACU KC_9 // í +#define CZ_EACU KC_0 // é +#define CZ_EQL KC_MINS // = +#define CZ_ACUT KC_EQL // ' (dead) +#define CZ_Q KC_Q // Q +#define CZ_W KC_W // W +#define CZ_E KC_E // E +#define CZ_R KC_R // R +#define CZ_T KC_T // T +#define CZ_Z KC_Y // Z +#define CZ_U KC_U // U +#define CZ_I KC_I // I +#define CZ_O KC_O // O +#define CZ_P KC_P // P +#define CZ_UACU KC_LBRC // ú +#define CZ_RPRN KC_RBRC // ) +#define CZ_DIAE KC_NUHS // ¨ (dead) +#define CZ_A KC_A // A +#define CZ_S KC_S // S +#define CZ_D KC_D // D +#define CZ_F KC_F // F +#define CZ_G KC_G // G +#define CZ_H KC_H // H +#define CZ_J KC_J // J +#define CZ_K KC_K // K +#define CZ_L KC_L // L +#define CZ_URNG KC_SCLN // ů +#define CZ_SECT KC_QUOT // § +#define CZ_Y KC_Z // Y +#define CZ_X KC_X // X +#define CZ_C KC_C // C +#define CZ_V KC_V // V +#define CZ_B KC_B // B +#define CZ_N KC_N // N +#define CZ_M KC_M // M +#define CZ_COMM KC_COMM // , +#define CZ_DOT KC_DOT // . +#define CZ_MINS KC_SLSH // - +#define CZ_PIPE S(CZ_BSLS) // | +#define CZ_1 S(CZ_PLUS) // 1 +#define CZ_2 S(CZ_ECAR) // 2 +#define CZ_3 S(CZ_SCAR) // 3 +#define CZ_4 S(CZ_CCAR) // 4 +#define CZ_5 S(CZ_RCAR) // 5 +#define CZ_6 S(CZ_ZCAR) // 6 +#define CZ_7 S(CZ_YACU) // 7 +#define CZ_8 S(CZ_AACU) // 8 +#define CZ_9 S(CZ_IACU) // 9 +#define CZ_0 S(CZ_EACU) // 0 +#define CZ_PERC S(CZ_EQL) // % +#define CZ_CARN S(CZ_ACUT) // ˇ (dead) +#define CZ_SLSH S(CZ_UACU) // / +#define CZ_LPRN S(CZ_RPRN) // ( +#define CZ_GRV S(CZ_DIAE) // ` +#define CZ_DQUO S(CZ_URNG) // " +#define CZ_EXLM S(CZ_SECT) // ! +#define CZ_QUES S(CZ_COMM) // ? +#define CZ_COLN S(CZ_DOT) // : +#define CZ_UNDS S(CZ_MINS) // _ +#define CZ_AT A(CZ_ECAR) // @ +#define CZ_HASH A(CZ_SCAR) // # +#define CZ_DLR A(CZ_CCAR) // $ +#define CZ_TILD A(CZ_RCAR) // ~ +#define CZ_CIRC A(CZ_ZCAR) // ^ +#define CZ_AMPR A(CZ_YACU) // & +#define CZ_ASTR A(CZ_AACU) // * +#define CZ_LCBR A(CZ_IACU) // { +#define CZ_RCBR A(CZ_EACU) // } +#define CZ_RNGA A(CZ_EQL) // ° (dead) +#define CZ_DCIR A(CZ_ACUT) // ^ (dead) +#define CZ_LEDT A(CZ_W) // ė +#define CZ_LEOG A(CZ_E) // ę +#define CZ_EURO A(CZ_R) // € +#define CZ_LZDT A(CZ_Z) // ż +#define CZ_LBRC A(CZ_UACU) // [ +#define CZ_RBRC A(CZ_RPRN) // ] +#define CZ_LAOG A(CZ_A) // ą +#define CZ_SS A(CZ_S) // ß +#define CZ_PDIF A(CZ_D) // ∂ +#define CZ_LSQU A(CZ_H) // ‘ +#define CZ_RSQU A(CZ_J) // ’ +#define CZ_LLST A(CZ_L) // ł +#define CZ_SCLN A(CZ_URNG) // ; +#define CZ_QUOT A(CZ_SECT) // ' +#define CZ_SLQU A(CZ_N) // ‚ +#define CZ_LABK A(CZ_COMM) // < +#define CZ_RABK A(CZ_DOT) // > +#define CZ_NDSH A(CZ_MINS) // – +#define CZ_NOT S(A(CZ_1)) // ¬ +#define CZ_BULT S(A(CZ_2)) // • +#define CZ_NEQL S(A(CZ_3)) // ≠ +#define CZ_PND S(A(CZ_4)) // £ +#define CZ_LOZN S(A(CZ_5)) // ◊ +#define CZ_DAGG S(A(CZ_6)) // † +#define CZ_PARA S(A(CZ_7)) // ¶ +#define CZ_DIV S(A(CZ_8)) // ÷ +#define CZ_LDAQ S(A(CZ_9)) // « +#define CZ_RDAQ S(A(CZ_0)) // » +#define CZ_DCOM S(A(CZ_EQL)) // , (dead) +#define CZ_DHPN S(A(CZ_ACUT)) // - (dead) +#define CZ_CEDT S(A(CZ_W)) // Ė +#define CZ_CEOG S(A(CZ_E)) // Ę +#define CZ_REGD S(A(CZ_R)) // ® +#define CZ_TM S(A(CZ_T)) // ™ +#define CZ_CZDT S(A(CZ_Z)) // Ż +#define CZ_LSAQ S(A(CZ_UACU)) // ‹ +#define CZ_RSAQ S(A(CZ_RPRN)) // › +#define CZ_DDQT S(A(CZ_DIAE)) // " (dead) +#define CZ_CAOG S(A(CZ_A)) // Ą +#define CZ_NARS S(A(CZ_S)) // ∑ +#define CZ_INCR S(A(CZ_D)) // ∆ +#define CZ_LDQU S(A(CZ_H)) // “ +#define CZ_RDQU S(A(CZ_J)) // ” +#define CZ_CLST S(A(CZ_L)) // Ł +#define CZ_ELLP S(A(CZ_URNG)) // … +#define CZ_DTIL S(A(CZ_SECT)) // ~ (dead) +#define CZ_COPY S(A(CZ_C)) // © +#define CZ_SQRT S(A(CZ_V)) // √ +#define CZ_DLQU S(A(CZ_N)) // „ +#define CZ_LEQL S(A(CZ_COMM)) // ≤ +#define CZ_GEQL S(A(CZ_DOT)) // ≥ +#define CZ_MDSH S(A(CZ_MINS)) // — + diff --git a/quantum/keymap_extras/keymap_czech_mac_iso.h b/quantum/keymap_extras/keymap_czech_mac_iso.h new file mode 100644 index 00000000000..4b56e15df13 --- /dev/null +++ b/quantum/keymap_extras/keymap_czech_mac_iso.h @@ -0,0 +1,162 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +/******************************************************************************* + 88888888888 888 d8b .d888 d8b 888 d8b + 888 888 Y8P d88P" Y8P 888 Y8P + 888 888 888 888 + 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b + 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K + 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b. + 888 888 888 888 X88 888 888 888 Y8b. 888 X88 + 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P' + 888 888 + 888 888 + 888 888 + .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888 + d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888 + 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888 + Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888 + "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888 + 888 + Y8b d88P + "Y88P" +*******************************************************************************/ + +#pragma once +#include "keycodes.h" +// clang-format off + +// Aliases +#define CZ_PLUS KC_1 // + +#define CZ_ECAR KC_2 // ě +#define CZ_SCAR KC_3 // š +#define CZ_CCAR KC_4 // č +#define CZ_RCAR KC_5 // ř +#define CZ_ZCAR KC_6 // ž +#define CZ_YACU KC_7 // ý +#define CZ_AACU KC_8 // á +#define CZ_IACU KC_9 // í +#define CZ_EACU KC_0 // é +#define CZ_EQL KC_MINS // = +#define CZ_ACUT KC_EQL // ' (dead) +#define CZ_Q KC_Q // Q +#define CZ_W KC_W // W +#define CZ_E KC_E // E +#define CZ_R KC_R // R +#define CZ_T KC_T // T +#define CZ_Z KC_Y // Z +#define CZ_U KC_U // U +#define CZ_I KC_I // I +#define CZ_O KC_O // O +#define CZ_P KC_P // P +#define CZ_UACU KC_LBRC // ú +#define CZ_RPRN KC_RBRC // ) +#define CZ_A KC_A // A +#define CZ_S KC_S // S +#define CZ_D KC_D // D +#define CZ_F KC_F // F +#define CZ_G KC_G // G +#define CZ_H KC_H // H +#define CZ_J KC_J // J +#define CZ_K KC_K // K +#define CZ_L KC_L // L +#define CZ_URNG KC_SCLN // ů +#define CZ_SECT KC_QUOT // § +#define CZ_DIAE KC_NUHS // ¨ (dead) +#define CZ_BSLS KC_NUBS // (backslash) +#define CZ_Y KC_Z // Y +#define CZ_X KC_X // X +#define CZ_C KC_C // C +#define CZ_V KC_V // V +#define CZ_B KC_B // B +#define CZ_N KC_N // N +#define CZ_M KC_M // M +#define CZ_COMM KC_COMM // , +#define CZ_DOT KC_DOT // . +#define CZ_MINS KC_SLSH // - +#define CZ_1 S(CZ_PLUS) // 1 +#define CZ_2 S(CZ_ECAR) // 2 +#define CZ_3 S(CZ_SCAR) // 3 +#define CZ_4 S(CZ_CCAR) // 4 +#define CZ_5 S(CZ_RCAR) // 5 +#define CZ_6 S(CZ_ZCAR) // 6 +#define CZ_7 S(CZ_YACU) // 7 +#define CZ_8 S(CZ_AACU) // 8 +#define CZ_9 S(CZ_IACU) // 9 +#define CZ_0 S(CZ_EACU) // 0 +#define CZ_PERC S(CZ_EQL) // % +#define CZ_CARN S(CZ_ACUT) // ˇ (dead) +#define CZ_SLSH S(CZ_UACU) // / +#define CZ_LPRN S(CZ_RPRN) // ( +#define CZ_DQUO S(CZ_URNG) // " +#define CZ_EXLM S(CZ_SECT) // ! +#define CZ_GRV S(CZ_DIAE) // ` +#define CZ_PIPE S(CZ_BSLS) // | +#define CZ_QUES S(CZ_COMM) // ? +#define CZ_COLN S(CZ_DOT) // : +#define CZ_UNDS S(CZ_MINS) // _ +#define CZ_AT A(CZ_ECAR) // @ +#define CZ_HASH A(CZ_SCAR) // # +#define CZ_DLR A(CZ_CCAR) // $ +#define CZ_TILD A(CZ_RCAR) // ~ +#define CZ_CIRC A(CZ_ZCAR) // ^ +#define CZ_AMPR A(CZ_YACU) // & +#define CZ_ASTR A(CZ_AACU) // * +#define CZ_LCBR A(CZ_IACU) // { +#define CZ_RCBR A(CZ_EACU) // } +#define CZ_RNGA A(CZ_EQL) // ° (dead) +#define CZ_DCIR A(CZ_ACUT) // ^ (dead) +#define CZ_LEDT A(CZ_W) // ė +#define CZ_LEOG A(CZ_E) // ę +#define CZ_EURO A(CZ_R) // € +#define CZ_LZDT A(CZ_Z) // ż +#define CZ_LBRC A(CZ_UACU) // [ +#define CZ_RBRC A(CZ_RPRN) // ] +#define CZ_LAOG A(CZ_A) // ą +#define CZ_SS A(CZ_S) // ß +#define CZ_PDIF A(CZ_D) // ∂ +#define CZ_LSQU A(CZ_H) // ‘ +#define CZ_RSQU A(CZ_J) // ’ +#define CZ_LLST A(CZ_L) // ł +#define CZ_SCLN A(CZ_URNG) // ; +#define CZ_QUOT A(CZ_SECT) // ' +#define CZ_SLQU A(CZ_N) // ‚ +#define CZ_LABK A(CZ_COMM) // < +#define CZ_RABK A(CZ_DOT) // > +#define CZ_NDSH A(CZ_MINS) // – +#define CZ_NOT S(A(CZ_1)) // ¬ +#define CZ_BULT S(A(CZ_2)) // • +#define CZ_NEQL S(A(CZ_3)) // ≠ +#define CZ_PND S(A(CZ_4)) // £ +#define CZ_LOZN S(A(CZ_5)) // ◊ +#define CZ_DAGG S(A(CZ_6)) // † +#define CZ_PARA S(A(CZ_7)) // ¶ +#define CZ_DIV S(A(CZ_8)) // ÷ +#define CZ_LDAQ S(A(CZ_9)) // « +#define CZ_RDAQ S(A(CZ_0)) // » +#define CZ_DCOM S(A(CZ_EQL)) // , (dead) +#define CZ_DHPN S(A(CZ_ACUT)) // - (dead) +#define CZ_CEDT S(A(CZ_W)) // Ė +#define CZ_CEOG S(A(CZ_E)) // Ę +#define CZ_REGD S(A(CZ_R)) // ® +#define CZ_TM S(A(CZ_T)) // ™ +#define CZ_CZDT S(A(CZ_Z)) // Ż +#define CZ_LSAQ S(A(CZ_UACU)) // ‹ +#define CZ_RSAQ S(A(CZ_RPRN)) // › +#define CZ_CAOG S(A(CZ_A)) // Ą +#define CZ_NARS S(A(CZ_S)) // ∑ +#define CZ_INCR S(A(CZ_D)) // ∆ +#define CZ_LDQU S(A(CZ_H)) // “ +#define CZ_RDQU S(A(CZ_J)) // ” +#define CZ_CLST S(A(CZ_L)) // Ł +#define CZ_ELLP S(A(CZ_URNG)) // … +#define CZ_DTIL S(A(CZ_SECT)) // ~ (dead) +#define CZ_DDQT S(A(CZ_DIAE)) // " (dead) +#define CZ_COPY S(A(CZ_C)) // © +#define CZ_SQRT S(A(CZ_V)) // √ +#define CZ_DLQU S(A(CZ_N)) // „ +#define CZ_LEQL S(A(CZ_COMM)) // ≤ +#define CZ_GEQL S(A(CZ_DOT)) // ≥ +#define CZ_MDSH S(A(CZ_MINS)) // — + diff --git a/quantum/keymap_extras/sendstring_czech_mac_ansi.h b/quantum/keymap_extras/sendstring_czech_mac_ansi.h new file mode 100644 index 00000000000..a60faa3237b --- /dev/null +++ b/quantum/keymap_extras/sendstring_czech_mac_ansi.h @@ -0,0 +1,120 @@ +/* Copyright 2024 Tabonx + * + * 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 . + */ + +// Sendstring lookup tables for macOS Czech ANSI layouts + +#pragma once + +#include "keymap_czech_mac_ansi.h" +#include "send_string.h" + +// clang-format off + +const uint8_t ascii_to_shift_lut[16] PROGMEM = { + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + + KCLUT_ENTRY(0, 1, 1, 0, 0, 1, 0, 0), + KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 1), + KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1), + KCLUT_ENTRY(1, 1, 1, 0, 0, 0, 0, 1), + KCLUT_ENTRY(0, 1, 1, 1, 1, 1, 1, 1), + KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1), + KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1), + KCLUT_ENTRY(1, 1, 1, 0, 0, 0, 0, 1), + KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 1, 0, 0, 0) +}; + +const uint8_t ascii_to_altgr_lut[16] PROGMEM = { + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + + KCLUT_ENTRY(0, 0, 0, 1, 1, 0, 1, 1), + KCLUT_ENTRY(0, 0, 1, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 1, 1, 0, 1, 0), + KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 1, 0, 1, 1, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 1, 0, 1, 1, 0), +}; + +const uint8_t ascii_to_dead_lut[16] PROGMEM = { + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0) +}; + +const uint8_t ascii_to_keycode_lut[128] PROGMEM = { + // NUL SOH STX ETX EOT ENQ ACK BEL + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + // BS TAB LF VT FF CR SO SI + KC_BSPC, KC_TAB, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + // DLE DC1 DC2 DC3 DC4 NAK SYN ETB + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + // CAN EM SUB ESC FS GS RS US + XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + + // ! " # $ % & ' + KC_SPC, CZ_SECT, CZ_URNG, CZ_SCAR, CZ_CCAR, CZ_EQL, CZ_YACU, CZ_SECT, + // ( ) * + , - . / + CZ_RPRN, CZ_RPRN, CZ_AACU, CZ_PLUS, CZ_COMM, CZ_MINS, CZ_DOT, CZ_UACU, + // 0 1 2 3 4 5 6 7 + CZ_EACU, CZ_PLUS, CZ_ECAR, CZ_SCAR, CZ_CCAR, CZ_RCAR, CZ_ZCAR, CZ_YACU, + // 8 9 : ; < = > ? + CZ_AACU, CZ_IACU, CZ_DOT, CZ_URNG, CZ_COMM, CZ_EQL, CZ_DOT, CZ_COMM, + // @ A B C D E F G + CZ_ECAR, CZ_A, CZ_B, CZ_C, CZ_D, CZ_E, CZ_F, CZ_G, + // H I J K L M N O + CZ_H, CZ_I, CZ_J, CZ_K, CZ_L, CZ_M, CZ_N, CZ_O, + // P Q R S T U V W + CZ_P, CZ_Q, CZ_R, CZ_S, CZ_T, CZ_U, CZ_V, CZ_W, + // X Y Z [ \ ] ^ _ + CZ_X, CZ_Y, CZ_Z, CZ_UACU, CZ_BSLS, CZ_RPRN, CZ_ZCAR, CZ_MINS, + // ` a b c d e f g + CZ_DIAE, CZ_A, CZ_B, CZ_C, CZ_D, CZ_E, CZ_F, CZ_G, + // h i j k l m n o + CZ_H, CZ_I, CZ_J, CZ_K, CZ_L, CZ_M, CZ_N, CZ_O, + // p q r s t u v w + CZ_P, CZ_Q, CZ_R, CZ_S, CZ_T, CZ_U, CZ_V, CZ_W, + // x y z { | } ~ DEL + CZ_X, CZ_Y, CZ_Z, CZ_IACU, CZ_BSLS, CZ_EACU, CZ_RCAR, KC_DEL +}; diff --git a/quantum/keymap_extras/sendstring_czech_mac_iso.h b/quantum/keymap_extras/sendstring_czech_mac_iso.h new file mode 100644 index 00000000000..9d47087da05 --- /dev/null +++ b/quantum/keymap_extras/sendstring_czech_mac_iso.h @@ -0,0 +1,120 @@ +/* Copyright 2024 Tabonx + * + * 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 . + */ + +// Sendstring lookup tables for macOS Czech ISO layouts + +#pragma once + +#include "keymap_czech_mac_iso.h" +#include "send_string.h" + +// clang-format off + +const uint8_t ascii_to_shift_lut[16] PROGMEM = { + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + + KCLUT_ENTRY(0, 1, 1, 0, 0, 1, 0, 0), + KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 1), + KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1), + KCLUT_ENTRY(1, 1, 1, 0, 0, 0, 0, 1), + KCLUT_ENTRY(0, 1, 1, 1, 1, 1, 1, 1), + KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1), + KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1), + KCLUT_ENTRY(1, 1, 1, 0, 0, 0, 0, 1), + KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 1, 0, 0, 0) +}; + +const uint8_t ascii_to_altgr_lut[16] PROGMEM = { + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + + KCLUT_ENTRY(0, 0, 0, 1, 1, 0, 1, 1), + KCLUT_ENTRY(0, 0, 1, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 1, 1, 0, 1, 0), + KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 1, 0, 1, 1, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 1, 0, 1, 1, 0), +}; + +const uint8_t ascii_to_dead_lut[16] PROGMEM = { + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0) +}; + +const uint8_t ascii_to_keycode_lut[128] PROGMEM = { + // NUL SOH STX ETX EOT ENQ ACK BEL + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + // BS TAB LF VT FF CR SO SI + KC_BSPC, KC_TAB, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + // DLE DC1 DC2 DC3 DC4 NAK SYN ETB + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + // CAN EM SUB ESC FS GS RS US + XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + + // ! " # $ % & ' + KC_SPC, CZ_SECT, CZ_URNG, CZ_SCAR, CZ_CCAR, CZ_EQL, CZ_YACU, CZ_SECT, + // ( ) * + , - . / + CZ_RPRN, CZ_RPRN, CZ_AACU, CZ_PLUS, CZ_COMM, CZ_MINS, CZ_DOT, CZ_UACU, + // 0 1 2 3 4 5 6 7 + CZ_EACU, CZ_PLUS, CZ_ECAR, CZ_SCAR, CZ_CCAR, CZ_RCAR, CZ_ZCAR, CZ_YACU, + // 8 9 : ; < = > ? + CZ_AACU, CZ_IACU, CZ_DOT, CZ_URNG, CZ_COMM, CZ_EQL, CZ_DOT, CZ_COMM, + // @ A B C D E F G + CZ_ECAR, CZ_A, CZ_B, CZ_C, CZ_D, CZ_E, CZ_F, CZ_G, + // H I J K L M N O + CZ_H, CZ_I, CZ_J, CZ_K, CZ_L, CZ_M, CZ_N, CZ_O, + // P Q R S T U V W + CZ_P, CZ_Q, CZ_R, CZ_S, CZ_T, CZ_U, CZ_V, CZ_W, + // X Y Z [ \ ] ^ _ + CZ_X, CZ_Y, CZ_Z, CZ_UACU, CZ_BSLS, CZ_RPRN, CZ_ZCAR, CZ_MINS, + // ` a b c d e f g + CZ_DIAE, CZ_A, CZ_B, CZ_C, CZ_D, CZ_E, CZ_F, CZ_G, + // h i j k l m n o + CZ_H, CZ_I, CZ_J, CZ_K, CZ_L, CZ_M, CZ_N, CZ_O, + // p q r s t u v w + CZ_P, CZ_Q, CZ_R, CZ_S, CZ_T, CZ_U, CZ_V, CZ_W, + // x y z { | } ~ DEL + CZ_X, CZ_Y, CZ_Z, CZ_IACU, CZ_BSLS, CZ_EACU, CZ_RCAR, KC_DEL +}; From 4a0ffea41ed5f8836223367181abcf9561cb5dd0 Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Wed, 1 May 2024 02:58:36 -0400 Subject: [PATCH 229/333] refactor: mechwild/waka60 (#23423) --- keyboards/mechwild/waka60/config.h | 25 +- keyboards/mechwild/waka60/info.json | 1273 ++++++++++++++++- .../mechwild/waka60/keymaps/default/keymap.c | 36 +- .../mechwild/waka60/keymaps/via/keymap.c | 36 +- 4 files changed, 1247 insertions(+), 123 deletions(-) diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h index d9eed88676a..db91eb667e6 100644 --- a/keyboards/mechwild/waka60/config.h +++ b/keyboards/mechwild/waka60/config.h @@ -17,23 +17,10 @@ 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 AUDIO_PIN B5 +#define AUDIO_PWM_DRIVER PWMD1 +#define AUDIO_PWM_CHANNEL 1 +#define AUDIO_STATE_TIMER GPTD4 -/* - * 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 +#define AUDIO_CLICKY +#define AUDIO_INIT_DELAY diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json index f7a0300a6a9..f8b8cad5100 100644 --- a/keyboards/mechwild/waka60/info.json +++ b/keyboards/mechwild/waka60/info.json @@ -1,47 +1,12 @@ { - "keyboard_name": "Waka60", "manufacturer": "MechWild", - "url": "mechwild.com", + "keyboard_name": "Waka60", "maintainer": "Kyle McCreery", - "usb": { - "vid": "0x6D77", - "pid": "0x1709", - "device_version": "1.0.1" - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 3, - "sleep": true, - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } - }, - "ws2812": { - "pin": "A1" - }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "encoder": true, - "extrakey": true, - "mousekey": true, - "nkro": false, - "rgblight": true - }, - "matrix_pins": { - "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4"], - "rows": ["B8", "B4", "B3", "B9", "A15", "B12", "B13", "B14", "B15", "A8"] + "audio": { + "default": { + "clicky": false + }, + "driver": "pwm_software" }, "diode_direction": "COL2ROW", "encoder": { @@ -49,11 +14,84 @@ {"pin_a": "A3", "pin_b": "A2"} ] }, + "features": { + "audio": true, + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "rgblight": true + }, + "matrix_pins": { + "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4"], + "rows": ["B8", "B4", "B3", "B9", "A15", "B12", "B13", "B14", "B15", "A8"] + }, "qmk": { + "locking": { + "enabled": true, + "resync": true + }, "tap_keycode_delay": 10 }, + "rgb_matrix": { + "animations": { + "band_spiral_sat": true, + "band_spiral_val": true, + "breathing": true, + "cycle_all": true, + "cycle_out_in": true, + "cycle_up_down": true, + "gradient_up_down": true, + "hue_breathing": true, + "jellybean_raindrops": true, + "pixel_flow": true, + "pixel_rain": true, + "rainbow_beacon": true, + "raindrops": true + }, + "center_point": [112, 40], + "driver": "ws2812", + "layout": [ + {"x": 112, "y": 12, "flags": 8}, + {"x": 112, "y": 27, "flags": 8}, + {"x": 112, "y": 40, "flags": 8} + ], + "sat_steps": 8, + "sleep": true, + "val_steps": 8 + }, + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "brightness_steps": 8, + "led_count": 3, + "saturation_steps": 8, + "sleep": true + }, + "url": "mechwild.com", + "usb": { + "device_version": "1.0.1", + "pid": "0x1709", + "vid": "0x6D77" + }, + "ws2812": { + "pin": "A1" + }, + "layout_aliases": { + "LAYOUT": "LAYOUT_all" + }, "layouts": { - "LAYOUT": { + "LAYOUT_1u_1u_1u_1u_1u_2u": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -61,56 +99,1191 @@ {"matrix": [0, 3], "x": 3, "y": 0}, {"matrix": [0, 4], "x": 4, "y": 0}, {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [5, 0], "x": 7, "y": 0}, {"matrix": [5, 1], "x": 8, "y": 0}, {"matrix": [5, 2], "x": 9, "y": 0}, {"matrix": [5, 3], "x": 10, "y": 0}, {"matrix": [5, 4], "x": 11, "y": 0}, {"matrix": [5, 5], "x": 12, "y": 0}, - {"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 1], "x": 1, "y": 1}, {"matrix": [1, 2], "x": 2, "y": 1}, {"matrix": [1, 3], "x": 3, "y": 1}, {"matrix": [1, 4], "x": 4, "y": 1}, {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [6, 0], "x": 7, "y": 1}, {"matrix": [6, 1], "x": 8, "y": 1}, {"matrix": [6, 2], "x": 9, "y": 1}, {"matrix": [6, 3], "x": 10, "y": 1}, {"matrix": [6, 4], "x": 11, "y": 1}, {"matrix": [6, 5], "x": 12, "y": 1}, - {"matrix": [2, 0], "x": 0, "y": 2}, {"matrix": [2, 1], "x": 1, "y": 2}, {"matrix": [2, 2], "x": 2, "y": 2}, {"matrix": [2, 3], "x": 3, "y": 2}, {"matrix": [2, 4], "x": 4, "y": 2}, {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [7, 0], "x": 7, "y": 2}, {"matrix": [7, 1], "x": 8, "y": 2}, {"matrix": [7, 2], "x": 9, "y": 2}, {"matrix": [7, 3], "x": 10, "y": 2}, {"matrix": [7, 4], "x": 11, "y": 2}, {"matrix": [7, 5], "x": 12, "y": 2}, - {"matrix": [3, 0], "x": 0, "y": 3}, {"matrix": [3, 1], "x": 1, "y": 3}, {"matrix": [3, 2], "x": 2, "y": 3}, {"matrix": [3, 3], "x": 3, "y": 3}, {"matrix": [3, 4], "x": 4, "y": 3}, {"matrix": [3, 5], "x": 5, "y": 3}, - {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [9, 0], "x": 7, "y": 4}, + {"matrix": [9, 2], "x": 8, "y": 4, "w": 2}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_1u_1u_1u_1u_2u_1u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [9, 1], "x": 7, "y": 4, "w": 2}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_1u_1u_1u_1u_3u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [9, 1], "x": 7, "y": 4, "w": 3}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_1u_1u_3u_1u_1u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 6], "x": 5, "y": 4, "w": 3}, + {"matrix": [9, 1], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_1u_1u_3u_2u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 6], "x": 5, "y": 4, "w": 3}, + {"matrix": [9, 2], "x": 8, "y": 4, "w": 2}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_1u_2u_1u_1u_1u_1u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [9, 0], "x": 7, "y": 4}, + {"matrix": [9, 1], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_1u_2u_1u_2u_1u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [9, 1], "x": 7, "y": 4, "w": 2}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_1u_2u_1u_3u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [9, 1], "x": 7, "y": 4, "w": 3}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_2u_1u_1u_1u_1u_1u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 2}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [9, 0], "x": 7, "y": 4}, + {"matrix": [9, 1], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_2u_1u_1u_1u_2u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 2}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [9, 0], "x": 7, "y": 4}, + {"matrix": [9, 2], "x": 8, "y": 4, "w": 2}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_2u_1u_1u_3u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 2}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [9, 1], "x": 7, "y": 4, "w": 3}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_2u_3u_1u_1u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 5, "y": 4, "w": 3}, + {"matrix": [9, 1], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_2u_3u_2u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 5, "y": 4, "w": 3}, + {"matrix": [9, 2], "x": 8, "y": 4, "w": 2}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_3u_1u_1u_1u_1u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 4], "x": 3, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [9, 0], "x": 7, "y": 4}, + {"matrix": [9, 1], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_3u_1u_1u_2u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 4], "x": 3, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [9, 0], "x": 7, "y": 4}, + {"matrix": [9, 2], "x": 8, "y": 4, "w": 2}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_3u_1u_2u_1u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 4], "x": 3, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [9, 1], "x": 7, "y": 4, "w": 2}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_3u_1u_3u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 4], "x": 3, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [9, 1], "x": 7, "y": 4, "w": 3}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_7u": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 6], "x": 3, "y": 4, "w": 7}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] + }, + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3, "encoder": 0}, {"matrix": [8, 0], "x": 7, "y": 3}, {"matrix": [8, 1], "x": 8, "y": 3}, {"matrix": [8, 2], "x": 9, "y": 3}, {"matrix": [8, 3], "x": 10, "y": 3}, {"matrix": [8, 4], "x": 11, "y": 3}, {"matrix": [8, 5], "x": 12, "y": 3}, - {"matrix": [4, 0], "x": 0, "y": 4}, {"matrix": [4, 1], "x": 1, "y": 4}, {"matrix": [4, 2], "x": 2, "y": 4}, diff --git a/keyboards/mechwild/waka60/keymaps/default/keymap.c b/keyboards/mechwild/waka60/keymaps/default/keymap.c index beb2d9e9e2f..3a7df5d3280 100644 --- a/keyboards/mechwild/waka60/keymaps/default/keymap.c +++ b/keyboards/mechwild/waka60/keymaps/default/keymap.c @@ -19,48 +19,30 @@ // Defines names for use in layer keycodes and the keymap enum layer_names { _BASE, - _FN1, - _FN2, - _FN3 + _FN1 }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - [_BASE] = LAYOUT( + [_BASE] = LAYOUT_all( QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RALT, KC_RGUI, KC_RCTL ), - [_FN1] = LAYOUT( - KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, - KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [_FN2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [_FN3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + [_FN1] = LAYOUT_all( + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, + KC_TRNS, AU_TOGG, CK_UP, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, MU_TOGG, MU_NEXT, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, CK_TOGG, CK_DOWN, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; #ifdef ENCODER_MAP_ENABLE const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [_FN3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; #endif diff --git a/keyboards/mechwild/waka60/keymaps/via/keymap.c b/keyboards/mechwild/waka60/keymaps/via/keymap.c index 4d29baea78a..3a7df5d3280 100644 --- a/keyboards/mechwild/waka60/keymaps/via/keymap.c +++ b/keyboards/mechwild/waka60/keymaps/via/keymap.c @@ -19,48 +19,30 @@ // Defines names for use in layer keycodes and the keymap enum layer_names { _BASE, - _FN1, - _FN2, - _FN3 + _FN1 }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - [_BASE] = LAYOUT( + [_BASE] = LAYOUT_all( QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RALT, KC_RGUI, KC_RCTL ), - [_FN1] = LAYOUT( - KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, - KC_TRNS, AU_TOGG, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, MU_TOGG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, MU_NEXT, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [_FN2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [_FN3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + [_FN1] = LAYOUT_all( + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, + KC_TRNS, AU_TOGG, CK_UP, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, MU_TOGG, MU_NEXT, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, CK_TOGG, CK_DOWN, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; #ifdef ENCODER_MAP_ENABLE const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [_FN3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; #endif From 8753ae354be6a62965b3d0ab931e0877bf34ef77 Mon Sep 17 00:00:00 2001 From: josh-l-wang <22173775+josh-l-wang@users.noreply.github.com> Date: Wed, 1 May 2024 03:05:45 -0400 Subject: [PATCH 230/333] add Bruce le Clavier (#23640) --- keyboards/jlw/bruce_le_clavier/info.json | 82 +++++++++++++++++++ .../bruce_le_clavier/keymaps/default/keymap.c | 43 ++++++++++ keyboards/jlw/bruce_le_clavier/readme.md | 53 ++++++++++++ keyboards/jlw/bruce_le_clavier/rules.mk | 1 + 4 files changed, 179 insertions(+) create mode 100644 keyboards/jlw/bruce_le_clavier/info.json create mode 100644 keyboards/jlw/bruce_le_clavier/keymaps/default/keymap.c create mode 100644 keyboards/jlw/bruce_le_clavier/readme.md create mode 100644 keyboards/jlw/bruce_le_clavier/rules.mk diff --git a/keyboards/jlw/bruce_le_clavier/info.json b/keyboards/jlw/bruce_le_clavier/info.json new file mode 100644 index 00000000000..998140599dd --- /dev/null +++ b/keyboards/jlw/bruce_le_clavier/info.json @@ -0,0 +1,82 @@ +{ + "keyboard_name": "Bruce the Keyboard", + "manufacturer": "jlw", + "url": "https://github.com/josh-l-wang/Bruce-the-Keyboard-the-Resources", + "maintainer": "jlw", + "usb": { + "vid": "0x1209", + "pid": "0xA460", + "device_version": "0.0.1" + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["B1", "B0", "A7", "A4", "A3", "B7", "B6", "B5", "B4", "B3", "B14"], + "rows": ["B11", "B9", "A5", "A6", "B15"] + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "encoder": true + }, + "bootmagic": { + "matrix": [4, 10] + }, + "encoder": { + "rotary": [ + {"pin_a": "B12", "pin_b": "B13"} + ] + }, + "ws2812": { + "pin": "B8" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "h":1.75}, + {"matrix": [0, 1], "x": 1, "y": 0, "h":1.5}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0, "h":1.25}, + {"matrix": [0, 4], "x": 4, "y": 0, "h":1.25}, + + {"matrix": [4, 10], "x": 5.25, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0, "h":1.25}, + {"matrix": [0, 6], "x": 7.5, "y": 0, "h":1.25}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0, "h":1.5}, + {"matrix": [0, 9], "x": 10.5, "y": 0, "h":1.75}, + + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 6.5, "y": 1.25}, + {"matrix": [1, 6], "x": 7.5, "y": 1.25}, + {"matrix": [1, 7], "x": 8.5, "y": 1}, + {"matrix": [1, 8], "x": 9.5, "y": 1.5}, + {"matrix": [1, 9], "x": 10.5,"y": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2.75, "h":1.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5, "h":1.75}, + {"matrix": [2, 2], "x": 2, "y": 2, "h":1.25}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 6.5, "y": 2.25}, + {"matrix": [2, 6], "x": 7.5, "y": 2.25}, + {"matrix": [2, 7], "x": 8.5, "y": 2, "h":1.25}, + {"matrix": [2, 8], "x": 9.5, "y": 2.5, "h":1.75}, + {"matrix": [2, 9], "x": 10.5,"y": 2.75, "h":1.5}, + + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3.25, "w": 2}, + {"matrix": [3, 5], "x": 6.5, "y": 3.25, "w": 2}, + {"matrix": [3, 7], "x": 8.5, "y": 3.25} + ] + } + } +} diff --git a/keyboards/jlw/bruce_le_clavier/keymaps/default/keymap.c b/keyboards/jlw/bruce_le_clavier/keymaps/default/keymap.c new file mode 100644 index 00000000000..51a8f0939d4 --- /dev/null +++ b/keyboards/jlw/bruce_le_clavier/keymaps/default/keymap.c @@ -0,0 +1,43 @@ +// Copyright 2023 jlw +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_Q, KC_W, KC_F, KC_P, KC_B, QK_BOOT, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, + LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), KC_T, KC_G, KC_M, KC_N, RCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), + KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, + LT(3, KC_TAB), SFT_T(KC_BSPC), LT(1, KC_SPC), LT(2,KC_ENT) + ), + + [1] = LAYOUT( + KC_GRAVE, KC_F2, XXXXXXX, KC_F4, KC_F5, XXXXXXX, KC_BSLS, KC_MINUS, KC_EQUAL, KC_LBRC, KC_RBRC, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + DF(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(1), XXXXXXX, _______, _______, KC_SCLN, + _______, _______, _______, _______ + ), + + [2] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11, KC_F12, XXXXXXX, XXXXXXX, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + DF(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(2), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + _______, _______, _______, _______ + ), + [3] = LAYOUT( + XXXXXXX, XXXXXXX, LSG(KC_4),LSG(KC_S),XXXXXXX, XXXXXXX, KC_HOME, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, + KC_LGUI, KC_LALT, KC_LCTL, KC_LGUI, XXXXXXX, KC_END, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, + DF(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(2), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + _______, _______, _______, _______ + ) +}; + +// Encoder Map +#ifdef ENCODER_MAP_ENABLE + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(S(KC_F2), KC_F2) }, + [1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [2] = { ENCODER_CCW_CW(_______, _______) }, + [3] = { ENCODER_CCW_CW(_______, _______) } + }; +#endif diff --git a/keyboards/jlw/bruce_le_clavier/readme.md b/keyboards/jlw/bruce_le_clavier/readme.md new file mode 100644 index 00000000000..7bef2d5eef7 --- /dev/null +++ b/keyboards/jlw/bruce_le_clavier/readme.md @@ -0,0 +1,53 @@ +# Bruce le Clavier + +Please note that Bruce le Clavier is a keyboard, not a human, and is also not Bruce the Keyboard. + +Bruce the Keyboard is a column staggered unibody split 35-key board created by [jlw](github.com/josh-l-wang), with the option to replace the middle key for an EC11 rotary encoder (with or without switch function). + +This keyboard has RGB, 3.3V, and GND pins broken out if you wish to add an LED strip. + +![Bruce le Clavier](https://i.imgur.com/qL9WHW4.jpg) + +* Keyboard Maintainer: [jlw](https://github.com/josh-l-wang) +* Hardware Supported: [Bruce le Clavier and Cases](https://github.com/josh-l-wang/Bruce-the-Keyboard-the-Resources) +* Hardware Availability: [jlw-kb.com](https://jlw-kb.com) + +Make example for this keyboard (after setting up your build environment): + + make jlw/bruce_le_clavier:default + +Flashing example for this keyboard: + + make jlw/bruce_le_clavier: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the top left key) and plug in the keyboard +* **Physical reset button**: Hold button on the back of the PCB while plugging in the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available + + + + +# Ceci est le micrologiciel pour Bruce le clavier + +Notez bien que Bruce le clavier n'est pas un humain. + +Bruce le clavier est un clavier de 35 touches colonnaire créé par [jlw](github.com/josh-l-wang). Il y a une option d'utiliser un encodeur rotatif au centre. + +* Maintaineur de clavier: [jlw](https://github.com/josh-l-wang) +* Matériel supporté: [Bruce le Clavier and Cases](https://github.com/josh-l-wang/Bruce-the-Keyboard-the-Resources) +* Matériel disponibilité: [jlw-kb.com](https://jlw-kb.com) + +Exemple de « make » (après avoir installé votre environnement de développement): + + make jlw/bruce_le_clavier:default + +Exemple de flash pour ce clavier: + + make jlw/bruce_le_clavier:flash + \ No newline at end of file diff --git a/keyboards/jlw/bruce_le_clavier/rules.mk b/keyboards/jlw/bruce_le_clavier/rules.mk new file mode 100644 index 00000000000..d4f87a82781 --- /dev/null +++ b/keyboards/jlw/bruce_le_clavier/rules.mk @@ -0,0 +1 @@ +#This file intentionally left blank From 7b838f330f11a2dd3ffb49b2ffbea48020004b7c Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Wed, 1 May 2024 20:02:03 +0100 Subject: [PATCH 231/333] add tkl_(ansi|iso)_wkl* community layouts (#21809) * update layouts/default/readme.md * add tkl_wkl layouts to layouts/default * amend layouts/default/readme.md * `tsangan_wkl` to `wkl` * Update readme.md * update keymap.c * local testing corrections applied * add layouts/community readmes * minor text correction(s) * Apply suggestions from code review * further copyright header changes --- layouts/community/tkl_ansi_wkl/readme.md | 3 + .../tkl_ansi_wkl_split_bs_rshift/readme.md | 3 + layouts/community/tkl_f13_ansi_wkl/readme.md | 3 + .../readme.md | 3 + layouts/community/tkl_f13_iso_wkl/readme.md | 3 + .../tkl_f13_iso_wkl_split_bs_rshift/readme.md | 3 + layouts/community/tkl_iso_wkl/readme.md | 3 + .../tkl_iso_wkl_split_bs_rshift/readme.md | 3 + layouts/default/readme.md | 249 ++++++++++++++---- .../default_tkl_ansi_wkl/keymap.c | 32 +++ layouts/default/tkl_ansi_wkl/info.json | 105 ++++++++ layouts/default/tkl_ansi_wkl/layout.json | 6 + layouts/default/tkl_ansi_wkl/readme.md | 3 + .../keymap.c | 32 +++ .../tkl_ansi_wkl_split_bs_rshift/info.json | 107 ++++++++ .../tkl_ansi_wkl_split_bs_rshift/layout.json | 6 + .../tkl_ansi_wkl_split_bs_rshift/readme.md | 3 + .../default_tkl_f13_ansi_wkl/keymap.c | 32 +++ layouts/default/tkl_f13_ansi_wkl/info.json | 106 ++++++++ layouts/default/tkl_f13_ansi_wkl/layout.json | 6 + layouts/default/tkl_f13_ansi_wkl/readme.md | 3 + .../keymap.c | 32 +++ .../info.json | 108 ++++++++ .../layout.json | 6 + .../readme.md | 3 + .../default_tkl_f13_iso_wkl/keymap.c | 32 +++ layouts/default/tkl_f13_iso_wkl/info.json | 107 ++++++++ layouts/default/tkl_f13_iso_wkl/layout.json | 6 + layouts/default/tkl_f13_iso_wkl/readme.md | 3 + .../keymap.c | 32 +++ .../tkl_f13_iso_wkl_split_bs_rshift/info.json | 109 ++++++++ .../layout.json | 6 + .../tkl_f13_iso_wkl_split_bs_rshift/readme.md | 3 + .../tkl_iso_wkl/default_tkl_iso_wkl/keymap.c | 32 +++ layouts/default/tkl_iso_wkl/info.json | 106 ++++++++ layouts/default/tkl_iso_wkl/layout.json | 6 + layouts/default/tkl_iso_wkl/readme.md | 3 + .../keymap.c | 32 +++ .../tkl_iso_wkl_split_bs_rshift/info.json | 108 ++++++++ .../tkl_iso_wkl_split_bs_rshift/layout.json | 6 + .../tkl_iso_wkl_split_bs_rshift/readme.md | 3 + 41 files changed, 1404 insertions(+), 53 deletions(-) create mode 100644 layouts/community/tkl_ansi_wkl/readme.md create mode 100644 layouts/community/tkl_ansi_wkl_split_bs_rshift/readme.md create mode 100644 layouts/community/tkl_f13_ansi_wkl/readme.md create mode 100644 layouts/community/tkl_f13_ansi_wkl_split_bs_rshift/readme.md create mode 100644 layouts/community/tkl_f13_iso_wkl/readme.md create mode 100644 layouts/community/tkl_f13_iso_wkl_split_bs_rshift/readme.md create mode 100644 layouts/community/tkl_iso_wkl/readme.md create mode 100644 layouts/community/tkl_iso_wkl_split_bs_rshift/readme.md create mode 100644 layouts/default/tkl_ansi_wkl/default_tkl_ansi_wkl/keymap.c create mode 100644 layouts/default/tkl_ansi_wkl/info.json create mode 100644 layouts/default/tkl_ansi_wkl/layout.json create mode 100644 layouts/default/tkl_ansi_wkl/readme.md create mode 100644 layouts/default/tkl_ansi_wkl_split_bs_rshift/default_tkl_ansi_wkl_split_bs_rshift/keymap.c create mode 100644 layouts/default/tkl_ansi_wkl_split_bs_rshift/info.json create mode 100644 layouts/default/tkl_ansi_wkl_split_bs_rshift/layout.json create mode 100644 layouts/default/tkl_ansi_wkl_split_bs_rshift/readme.md create mode 100644 layouts/default/tkl_f13_ansi_wkl/default_tkl_f13_ansi_wkl/keymap.c create mode 100644 layouts/default/tkl_f13_ansi_wkl/info.json create mode 100644 layouts/default/tkl_f13_ansi_wkl/layout.json create mode 100644 layouts/default/tkl_f13_ansi_wkl/readme.md create mode 100644 layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c create mode 100644 layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/info.json create mode 100644 layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/layout.json create mode 100644 layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/readme.md create mode 100644 layouts/default/tkl_f13_iso_wkl/default_tkl_f13_iso_wkl/keymap.c create mode 100644 layouts/default/tkl_f13_iso_wkl/info.json create mode 100644 layouts/default/tkl_f13_iso_wkl/layout.json create mode 100644 layouts/default/tkl_f13_iso_wkl/readme.md create mode 100644 layouts/default/tkl_f13_iso_wkl_split_bs_rshift/default_tkl_f13_iso_wkl_split_bs_rshift/keymap.c create mode 100644 layouts/default/tkl_f13_iso_wkl_split_bs_rshift/info.json create mode 100644 layouts/default/tkl_f13_iso_wkl_split_bs_rshift/layout.json create mode 100644 layouts/default/tkl_f13_iso_wkl_split_bs_rshift/readme.md create mode 100644 layouts/default/tkl_iso_wkl/default_tkl_iso_wkl/keymap.c create mode 100644 layouts/default/tkl_iso_wkl/info.json create mode 100644 layouts/default/tkl_iso_wkl/layout.json create mode 100644 layouts/default/tkl_iso_wkl/readme.md create mode 100644 layouts/default/tkl_iso_wkl_split_bs_rshift/default_tkl_iso_wkl_split_bs_rshift/keymap.c create mode 100644 layouts/default/tkl_iso_wkl_split_bs_rshift/info.json create mode 100644 layouts/default/tkl_iso_wkl_split_bs_rshift/layout.json create mode 100644 layouts/default/tkl_iso_wkl_split_bs_rshift/readme.md diff --git a/layouts/community/tkl_ansi_wkl/readme.md b/layouts/community/tkl_ansi_wkl/readme.md new file mode 100644 index 00000000000..6541a0f23ab --- /dev/null +++ b/layouts/community/tkl_ansi_wkl/readme.md @@ -0,0 +1,3 @@ +# tkl_ansi_wkl + + LAYOUT_tkl_ansi_wkl diff --git a/layouts/community/tkl_ansi_wkl_split_bs_rshift/readme.md b/layouts/community/tkl_ansi_wkl_split_bs_rshift/readme.md new file mode 100644 index 00000000000..35235603728 --- /dev/null +++ b/layouts/community/tkl_ansi_wkl_split_bs_rshift/readme.md @@ -0,0 +1,3 @@ +# tkl_ansi_wkl_split_bs_rshift + + LAYOUT_tkl_ansi_wkl_split_bs_rshift diff --git a/layouts/community/tkl_f13_ansi_wkl/readme.md b/layouts/community/tkl_f13_ansi_wkl/readme.md new file mode 100644 index 00000000000..607692c2392 --- /dev/null +++ b/layouts/community/tkl_f13_ansi_wkl/readme.md @@ -0,0 +1,3 @@ +# tkl_f13_ansi_wkl + + LAYOUT_tkl_f13_ansi_wkl diff --git a/layouts/community/tkl_f13_ansi_wkl_split_bs_rshift/readme.md b/layouts/community/tkl_f13_ansi_wkl_split_bs_rshift/readme.md new file mode 100644 index 00000000000..614c0913f62 --- /dev/null +++ b/layouts/community/tkl_f13_ansi_wkl_split_bs_rshift/readme.md @@ -0,0 +1,3 @@ +# tkl_f13_ansi_wkl_split_bs_rshift + + LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift diff --git a/layouts/community/tkl_f13_iso_wkl/readme.md b/layouts/community/tkl_f13_iso_wkl/readme.md new file mode 100644 index 00000000000..46c44195923 --- /dev/null +++ b/layouts/community/tkl_f13_iso_wkl/readme.md @@ -0,0 +1,3 @@ +# tkl_f13_iso_wkl + + LAYOUT_tkl_f13_iso_wkl diff --git a/layouts/community/tkl_f13_iso_wkl_split_bs_rshift/readme.md b/layouts/community/tkl_f13_iso_wkl_split_bs_rshift/readme.md new file mode 100644 index 00000000000..a9059abfba2 --- /dev/null +++ b/layouts/community/tkl_f13_iso_wkl_split_bs_rshift/readme.md @@ -0,0 +1,3 @@ +# tkl_f13_iso_wkl_split_bs_rshift + + LAYOUT_tkl_f13_iso_wkl_split_bs_rshift diff --git a/layouts/community/tkl_iso_wkl/readme.md b/layouts/community/tkl_iso_wkl/readme.md new file mode 100644 index 00000000000..56fe1e91473 --- /dev/null +++ b/layouts/community/tkl_iso_wkl/readme.md @@ -0,0 +1,3 @@ +# tkl_iso_wkl + + LAYOUT_tkl_iso_wkl diff --git a/layouts/community/tkl_iso_wkl_split_bs_rshift/readme.md b/layouts/community/tkl_iso_wkl_split_bs_rshift/readme.md new file mode 100644 index 00000000000..ec820424a5b --- /dev/null +++ b/layouts/community/tkl_iso_wkl_split_bs_rshift/readme.md @@ -0,0 +1,3 @@ +# tkl_iso_wkl_split_bs_rshift + + LAYOUT_tkl_iso_split_bs_rshift diff --git a/layouts/default/readme.md b/layouts/default/readme.md index 892dbf1e034..fab13d47c55 100644 --- a/layouts/default/readme.md +++ b/layouts/default/readme.md @@ -641,6 +641,42 @@ LAYOUT_tkl_ansi_tsangan_split_bs_rshift └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘ ``` +``` +LAYOUT_tkl_ansi_wkl +┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐ +│ │ │ │ │ │ │ │ │ │ │ │ +└─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ +``` + +``` +LAYOUT_tkl_ansi_wkl_split_bs_rshift +┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐ +│ │ │ │ │ │ │ │ │ │ │ │ +└─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ +``` + ``` LAYOUT_tkl_iso ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ @@ -713,6 +749,42 @@ LAYOUT_tkl_iso_tsangan_split_bs_rshift └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘ ``` +``` +LAYOUT_tkl_iso_wkl +┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ └───┴───┴───┘ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ ┌───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐ +│ │ │ │ │ │ │ │ │ │ │ │ +└─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ +``` + +``` +LAYOUT_tkl_iso_wkl_split_bs_rshift +┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ └───┴───┴───┘ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ ┌───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐ +│ │ │ │ │ │ │ │ │ │ │ │ +└─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ +``` + ``` LAYOUT_tkl_jis ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ @@ -787,20 +859,56 @@ LAYOUT_tkl_f13_ansi_tsangan ``` LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift -┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐ -│ ││ │ │ │ ││ │ │ │ ││ │ │ │ ││ ││ │ │ │ -└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘ -┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ││ │ │ │ -├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ ││ │ │ │ -├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘ +┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ +│ ││ │ │ │ ││ │ │ │ ││ │ │ │ ││ │ │ │ │ │ +└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐ -│ │ │ │ │ │ │ ││ │ │ │ -└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘ +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐ +│ │ │ │ │ │ │ │ │ │ │ │ +└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘ +``` + +``` +LAYOUT_tkl_f13_ansi_wkl +┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ +│ ││ │ │ │ ││ │ │ │ ││ │ │ │ ││ │ │ │ │ │ +└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐ +│ │ │ │ │ │ │ │ │ │ │ │ +└─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ +``` + +``` +LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift +┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ +│ ││ │ │ │ ││ │ │ │ ││ │ │ │ ││ │ │ │ │ │ +└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐ +│ │ │ │ │ │ │ │ │ │ │ │ +└─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ ``` ``` @@ -823,20 +931,20 @@ LAYOUT_tkl_f13_iso ``` LAYOUT_tkl_f13_iso_split_bs_rshift -┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐ -│ ││ │ │ │ ││ │ │ │ ││ │ │ │ ││ ││ │ │ │ -└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘ -┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ││ │ │ │ -├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ ││ │ │ │ -├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │└───┴───┴───┘ +┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ +│ ││ │ │ │ ││ │ │ │ ││ │ │ │ ││ │ │ │ │ │ +└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ └───┴───┴───┘ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ ┌───┐ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐ -│ │ │ │ │ │ │ │ ││ │ │ │ -└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ ┌───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ +└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ ``` ``` @@ -859,39 +967,74 @@ LAYOUT_tkl_f13_iso_tsangan ``` LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift -┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐ -│ ││ │ │ │ ││ │ │ │ ││ │ │ │ ││ ││ │ │ │ -└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘ -┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ││ │ │ │ -├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ ││ │ │ │ -├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │└───┴───┴───┘ +┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ +│ ││ │ │ │ ││ │ │ │ ││ │ │ │ ││ │ │ │ │ │ +└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ └───┴───┴───┘ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ ┌───┐ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐ -│ │ │ │ │ │ │ ││ │ │ │ -└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ ┌───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐ +│ │ │ │ │ │ │ │ │ │ │ │ +└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘ +``` + +``` +LAYOUT_tkl_f13_iso_wkl +┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ +│ ││ │ │ │ ││ │ │ │ ││ │ │ │ ││ │ │ │ │ │ +└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ └───┴───┴───┘ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ ┌───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐ +│ │ │ │ │ │ │ │ │ │ │ │ +└─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ +``` + +``` +LAYOUT_tkl_f13_iso_wkl_split_bs_rshift +┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ +│ ││ │ │ │ ││ │ │ │ ││ │ │ │ ││ │ │ │ │ │ +└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ └───┴───┴───┘ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ ┌───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐ +│ │ │ │ │ │ │ │ │ │ │ │ +└─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ ``` ``` LAYOUT_tkl_f13_jis -┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐ -│ ││ │ │ │ ││ │ │ │ ││ │ │ │ ││ ││ │ │ │ -└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘ -┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ││ │ │ │ -├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ ││ │ │ │ -├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │└───┴───┴───┘ +┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ +│ ││ │ │ │ ││ │ │ │ ││ │ │ │ ││ │ │ │ │ │ +└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ └───┴───┴───┘ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ ┌───┐ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -├────┬───┴┬──┴─┬─┴──┬┴───┴───┴───┴─┬─┴──┬┴───┼───┴┬──┴─┬────┤┌───┼───┼───┐ -│ │ │ │ │ │ │ │ │ │ ││ │ │ │ -└────┴────┴────┴────┴──────────────┴────┴────┴────┴────┴────┘└───┴───┴───┘ - +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ ┌───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┬───┴┬──┴─┬─┴──┬┴───┴───┴───┴─┬─┴──┬┴───┼───┴┬──┴─┬────┤ ┌───┼───┼───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +└────┴────┴────┴────┴──────────────┴────┴────┴────┴────┴────┘ └───┴───┴───┘ ``` ``` diff --git a/layouts/default/tkl_ansi_wkl/default_tkl_ansi_wkl/keymap.c b/layouts/default/tkl_ansi_wkl/default_tkl_ansi_wkl/keymap.c new file mode 100644 index 00000000000..3d8cef64fc2 --- /dev/null +++ b/layouts/default/tkl_ansi_wkl/default_tkl_ansi_wkl/keymap.c @@ -0,0 +1,32 @@ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ + * │Esc│ │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│ + * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ │ ↑ │ + * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐ + * │Ctrl │ │Alt │ │ Alt│ │ Ctrl│ │ ← │ ↓ │ → │ + * └─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ + */ + [0] = LAYOUT_tkl_ansi_wkl( + 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/layouts/default/tkl_ansi_wkl/info.json b/layouts/default/tkl_ansi_wkl/info.json new file mode 100644 index 00000000000..eb08eacd370 --- /dev/null +++ b/layouts/default/tkl_ansi_wkl/info.json @@ -0,0 +1,105 @@ +{ + "keyboard_name": "Tenkeyless ANSI Windows keyless layout", + "url": "", + "maintainer": "qmk", + "layouts": { + "LAYOUT_tkl_ansi_wkl": { + "layout": [ + {"x":0, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6.5, "y":0}, + {"x":7.5, "y":0}, + {"x":8.5, "y":0}, + {"x":9.5, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + + {"x":15.25, "y":0}, + {"x":16.25, "y":0}, + {"x":17.25, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4, "y":1.25}, + {"x":5, "y":1.25}, + {"x":6, "y":1.25}, + {"x":7, "y":1.25}, + {"x":8, "y":1.25}, + {"x":9, "y":1.25}, + {"x":10, "y":1.25}, + {"x":11, "y":1.25}, + {"x":12, "y":1.25}, + {"x":13, "y":1.25, "w":2}, + + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25}, + {"x":17.25, "y":1.25}, + + {"x":0, "y":2.25, "w":1.5}, + {"x":1.5, "y":2.25}, + {"x":2.5, "y":2.25}, + {"x":3.5, "y":2.25}, + {"x":4.5, "y":2.25}, + {"x":5.5, "y":2.25}, + {"x":6.5, "y":2.25}, + {"x":7.5, "y":2.25}, + {"x":8.5, "y":2.25}, + {"x":9.5, "y":2.25}, + {"x":10.5, "y":2.25}, + {"x":11.5, "y":2.25}, + {"x":12.5, "y":2.25}, + {"x":13.5, "y":2.25, "w":1.5}, + + {"x":15.25, "y":2.25}, + {"x":16.25, "y":2.25}, + {"x":17.25, "y":2.25}, + + {"x":0, "y":3.25, "w":1.75}, + {"x":1.75, "y":3.25}, + {"x":2.75, "y":3.25}, + {"x":3.75, "y":3.25}, + {"x":4.75, "y":3.25}, + {"x":5.75, "y":3.25}, + {"x":6.75, "y":3.25}, + {"x":7.75, "y":3.25}, + {"x":8.75, "y":3.25}, + {"x":9.75, "y":3.25}, + {"x":10.75, "y":3.25}, + {"x":11.75, "y":3.25}, + {"x":12.75, "y":3.25, "w":2.25}, + + {"x":0, "y":4.25, "w":2.25}, + {"x":2.25, "y":4.25}, + {"x":3.25, "y":4.25}, + {"x":4.25, "y":4.25}, + {"x":5.25, "y":4.25}, + {"x":6.25, "y":4.25}, + {"x":7.25, "y":4.25}, + {"x":8.25, "y":4.25}, + {"x":9.25, "y":4.25}, + {"x":10.25, "y":4.25}, + {"x":11.25, "y":4.25}, + {"x":12.25, "y":4.25, "w":2.75}, + + {"x":16.25, "y":4.25}, + + {"x":0, "y":5.25, "w":1.5}, + {"x":2.5, "y":5.25, "w":1.5}, + {"x":4, "y":5.25, "w":7}, + {"x":11, "y":5.25, "w":1.5}, + {"x":13.5, "y":5.25, "w":1.5}, + + {"x":15.25, "y":5.25}, + {"x":16.25, "y":5.25}, + {"x":17.25, "y":5.25} + ] + } + } +} diff --git a/layouts/default/tkl_ansi_wkl/layout.json b/layouts/default/tkl_ansi_wkl/layout.json new file mode 100644 index 00000000000..b6d3505b159 --- /dev/null +++ b/layouts/default/tkl_ansi_wkl/layout.json @@ -0,0 +1,6 @@ +[{a:7},"",{x:1},"","","","",{x:0.5},"","","","",{x:0.5},"","","","",{x:0.25},"","",""], +[{y:0.25},"","","","","","","","","","","","","",{w:2},"",{x:0.25},"","",""], +[{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",{x:0.25},"","",""], +[{w:1.75},"","","","","","","","","","","","",{w:2.25},""], +[{w:2.25},"","","","","","","","","","","",{w:2.75},"",{x:1.25},""], +[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""] diff --git a/layouts/default/tkl_ansi_wkl/readme.md b/layouts/default/tkl_ansi_wkl/readme.md new file mode 100644 index 00000000000..6541a0f23ab --- /dev/null +++ b/layouts/default/tkl_ansi_wkl/readme.md @@ -0,0 +1,3 @@ +# tkl_ansi_wkl + + LAYOUT_tkl_ansi_wkl diff --git a/layouts/default/tkl_ansi_wkl_split_bs_rshift/default_tkl_ansi_wkl_split_bs_rshift/keymap.c b/layouts/default/tkl_ansi_wkl_split_bs_rshift/default_tkl_ansi_wkl_split_bs_rshift/keymap.c new file mode 100644 index 00000000000..a5b27ee42bb --- /dev/null +++ b/layouts/default/tkl_ansi_wkl_split_bs_rshift/default_tkl_ansi_wkl_split_bs_rshift/keymap.c @@ -0,0 +1,32 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ + * │Esc│ │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│ + * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Bsp│ │Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│Sft│ │ ↑ │ + * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐ + * │Ctrl │ │Alt │ │ Alt│ │ Ctrl│ │ ← │ ↓ │ → │ + * └─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ + */ + [0] = LAYOUT_tkl_ansi_wkl_split_bs_rshift( + 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/layouts/default/tkl_ansi_wkl_split_bs_rshift/info.json b/layouts/default/tkl_ansi_wkl_split_bs_rshift/info.json new file mode 100644 index 00000000000..62b48e3bc84 --- /dev/null +++ b/layouts/default/tkl_ansi_wkl_split_bs_rshift/info.json @@ -0,0 +1,107 @@ +{ + "keyboard_name": "Tenkeyless ANSI Windows keyless layout with split Backspace and split Right Shift", + "url": "", + "maintainer": "qmk", + "layouts": { + "LAYOUT_tkl_ansi_wkl_split_bs_rshift": { + "layout": [ + {"x":0, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6.5, "y":0}, + {"x":7.5, "y":0}, + {"x":8.5, "y":0}, + {"x":9.5, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + + {"x":15.25, "y":0}, + {"x":16.25, "y":0}, + {"x":17.25, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4, "y":1.25}, + {"x":5, "y":1.25}, + {"x":6, "y":1.25}, + {"x":7, "y":1.25}, + {"x":8, "y":1.25}, + {"x":9, "y":1.25}, + {"x":10, "y":1.25}, + {"x":11, "y":1.25}, + {"x":12, "y":1.25}, + {"x":13, "y":1.25}, + {"x":14, "y":1.25}, + + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25}, + {"x":17.25, "y":1.25}, + + {"x":0, "y":2.25, "w":1.5}, + {"x":1.5, "y":2.25}, + {"x":2.5, "y":2.25}, + {"x":3.5, "y":2.25}, + {"x":4.5, "y":2.25}, + {"x":5.5, "y":2.25}, + {"x":6.5, "y":2.25}, + {"x":7.5, "y":2.25}, + {"x":8.5, "y":2.25}, + {"x":9.5, "y":2.25}, + {"x":10.5, "y":2.25}, + {"x":11.5, "y":2.25}, + {"x":12.5, "y":2.25}, + {"x":13.5, "y":2.25, "w":1.5}, + + {"x":15.25, "y":2.25}, + {"x":16.25, "y":2.25}, + {"x":17.25, "y":2.25}, + + {"x":0, "y":3.25, "w":1.75}, + {"x":1.75, "y":3.25}, + {"x":2.75, "y":3.25}, + {"x":3.75, "y":3.25}, + {"x":4.75, "y":3.25}, + {"x":5.75, "y":3.25}, + {"x":6.75, "y":3.25}, + {"x":7.75, "y":3.25}, + {"x":8.75, "y":3.25}, + {"x":9.75, "y":3.25}, + {"x":10.75, "y":3.25}, + {"x":11.75, "y":3.25}, + {"x":12.75, "y":3.25, "w":2.25}, + + {"x":0, "y":4.25, "w":2.25}, + {"x":2.25, "y":4.25}, + {"x":3.25, "y":4.25}, + {"x":4.25, "y":4.25}, + {"x":5.25, "y":4.25}, + {"x":6.25, "y":4.25}, + {"x":7.25, "y":4.25}, + {"x":8.25, "y":4.25}, + {"x":9.25, "y":4.25}, + {"x":10.25, "y":4.25}, + {"x":11.25, "y":4.25}, + {"x":12.25, "y":4.25, "w":1.75}, + {"x":14, "y":4.25}, + + {"x":16.25, "y":4.25}, + + {"x":0, "y":5.25, "w":1.5}, + {"x":2.5, "y":5.25, "w":1.5}, + {"x":4, "y":5.25, "w":7}, + {"x":11, "y":5.25, "w":1.5}, + {"x":13.5, "y":5.25, "w":1.5}, + + {"x":15.25, "y":5.25}, + {"x":16.25, "y":5.25}, + {"x":17.25, "y":5.25} + ] + } + } +} diff --git a/layouts/default/tkl_ansi_wkl_split_bs_rshift/layout.json b/layouts/default/tkl_ansi_wkl_split_bs_rshift/layout.json new file mode 100644 index 00000000000..0fba13348bb --- /dev/null +++ b/layouts/default/tkl_ansi_wkl_split_bs_rshift/layout.json @@ -0,0 +1,6 @@ +[{a:7},"",{x:1},"","","","",{x:0.5},"","","","",{x:0.5},"","","","",{x:0.25},"","",""], +[{y:0.25},"","","","","","","","","","","","","","","",{x:0.25},"","",""], +[{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",{x:0.25},"","",""], +[{w:1.75},"","","","","","","","","","","","",{w:2.25},""], +[{w:2.25},"","","","","","","","","","","",{w:1.75},"","",{x:1.25},""], +[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""] diff --git a/layouts/default/tkl_ansi_wkl_split_bs_rshift/readme.md b/layouts/default/tkl_ansi_wkl_split_bs_rshift/readme.md new file mode 100644 index 00000000000..35235603728 --- /dev/null +++ b/layouts/default/tkl_ansi_wkl_split_bs_rshift/readme.md @@ -0,0 +1,3 @@ +# tkl_ansi_wkl_split_bs_rshift + + LAYOUT_tkl_ansi_wkl_split_bs_rshift diff --git a/layouts/default/tkl_f13_ansi_wkl/default_tkl_f13_ansi_wkl/keymap.c b/layouts/default/tkl_f13_ansi_wkl/default_tkl_f13_ansi_wkl/keymap.c new file mode 100644 index 00000000000..709988ac76d --- /dev/null +++ b/layouts/default/tkl_f13_ansi_wkl/default_tkl_f13_ansi_wkl/keymap.c @@ -0,0 +1,32 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ + * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13│ │PSc│Scr│Pse│ + * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ │ ↑ │ + * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐ + * │Ctrl │ │Alt │ │ Alt│ │ Ctrl│ │ ← │ ↓ │ → │ + * └─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ + */ + [0] = LAYOUT_tkl_f13_ansi_wkl( + 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_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/layouts/default/tkl_f13_ansi_wkl/info.json b/layouts/default/tkl_f13_ansi_wkl/info.json new file mode 100644 index 00000000000..ca03585d00a --- /dev/null +++ b/layouts/default/tkl_f13_ansi_wkl/info.json @@ -0,0 +1,106 @@ +{ + "keyboard_name": "Tenkeyless ANSI Windows keyless layout with F13 key", + "url": "", + "maintainer": "qmk", + "layouts": { + "LAYOUT_tkl_f13_ansi_wkl": { + "layout": [ + {"x":0, "y":0}, + {"x":1.25, "y":0}, + {"x":2.25, "y":0}, + {"x":3.25, "y":0}, + {"x":4.25, "y":0}, + {"x":5.5, "y":0}, + {"x":6.5, "y":0}, + {"x":7.5, "y":0}, + {"x":8.5, "y":0}, + {"x":9.75, "y":0}, + {"x":10.75, "y":0}, + {"x":11.75, "y":0}, + {"x":12.75, "y":0}, + {"x":14, "y":0}, + + {"x":15.25, "y":0}, + {"x":16.25, "y":0}, + {"x":17.25, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4, "y":1.25}, + {"x":5, "y":1.25}, + {"x":6, "y":1.25}, + {"x":7, "y":1.25}, + {"x":8, "y":1.25}, + {"x":9, "y":1.25}, + {"x":10, "y":1.25}, + {"x":11, "y":1.25}, + {"x":12, "y":1.25}, + {"x":13, "y":1.25, "w":2}, + + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25}, + {"x":17.25, "y":1.25}, + + {"x":0, "y":2.25, "w":1.5}, + {"x":1.5, "y":2.25}, + {"x":2.5, "y":2.25}, + {"x":3.5, "y":2.25}, + {"x":4.5, "y":2.25}, + {"x":5.5, "y":2.25}, + {"x":6.5, "y":2.25}, + {"x":7.5, "y":2.25}, + {"x":8.5, "y":2.25}, + {"x":9.5, "y":2.25}, + {"x":10.5, "y":2.25}, + {"x":11.5, "y":2.25}, + {"x":12.5, "y":2.25}, + {"x":13.5, "y":2.25, "w":1.5}, + + {"x":15.25, "y":2.25}, + {"x":16.25, "y":2.25}, + {"x":17.25, "y":2.25}, + + {"x":0, "y":3.25, "w":1.75}, + {"x":1.75, "y":3.25}, + {"x":2.75, "y":3.25}, + {"x":3.75, "y":3.25}, + {"x":4.75, "y":3.25}, + {"x":5.75, "y":3.25}, + {"x":6.75, "y":3.25}, + {"x":7.75, "y":3.25}, + {"x":8.75, "y":3.25}, + {"x":9.75, "y":3.25}, + {"x":10.75, "y":3.25}, + {"x":11.75, "y":3.25}, + {"x":12.75, "y":3.25, "w":2.25}, + + {"x":0, "y":4.25, "w":2.25}, + {"x":2.25, "y":4.25}, + {"x":3.25, "y":4.25}, + {"x":4.25, "y":4.25}, + {"x":5.25, "y":4.25}, + {"x":6.25, "y":4.25}, + {"x":7.25, "y":4.25}, + {"x":8.25, "y":4.25}, + {"x":9.25, "y":4.25}, + {"x":10.25, "y":4.25}, + {"x":11.25, "y":4.25}, + {"x":12.25, "y":4.25, "w":2.75}, + + {"x":16.25, "y":4.25}, + + {"x":0, "y":5.25, "w":1.5}, + {"x":2.5, "y":5.25, "w":1.5}, + {"x":4, "y":5.25, "w":7}, + {"x":11, "y":5.25, "w":1.5}, + {"x":13.5, "y":5.25, "w":1.5}, + + {"x":15.25, "y":5.25}, + {"x":16.25, "y":5.25}, + {"x":17.25, "y":5.25} + ] + } + } +} diff --git a/layouts/default/tkl_f13_ansi_wkl/layout.json b/layouts/default/tkl_f13_ansi_wkl/layout.json new file mode 100644 index 00000000000..850ffc9bdc9 --- /dev/null +++ b/layouts/default/tkl_f13_ansi_wkl/layout.json @@ -0,0 +1,6 @@ +[{a:7},"",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"",{x:0.25},"","",""], +[{y:0.25},"","","","","","","","","","","","","",{w:2},"",{x:0.25},"","",""], +[{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",{x:0.25},"","",""], +[{w:1.75},"","","","","","","","","","","","",{w:2.25},""], +[{w:2.25},"","","","","","","","","","","",{w:2.75},"",{x:1.25},""], +[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""] diff --git a/layouts/default/tkl_f13_ansi_wkl/readme.md b/layouts/default/tkl_f13_ansi_wkl/readme.md new file mode 100644 index 00000000000..607692c2392 --- /dev/null +++ b/layouts/default/tkl_f13_ansi_wkl/readme.md @@ -0,0 +1,3 @@ +# tkl_f13_ansi_wkl + + LAYOUT_tkl_f13_ansi_wkl diff --git a/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c new file mode 100644 index 00000000000..6089b7681f9 --- /dev/null +++ b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/default_tkl_f13_ansi_wkl_split_bs_rshift/keymap.c @@ -0,0 +1,32 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ + * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13│ │PSc│Scr│Pse│ + * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Bsp│ │Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Sft│ │ ↑ │ + * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐ + * │Ctrl │ │Alt │ │ Alt│ │ Ctrl│ │ ← │ ↓ │ → │ + * └─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ + */ + [0] = LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift( + 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_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/info.json b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/info.json new file mode 100644 index 00000000000..755e7a80d78 --- /dev/null +++ b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/info.json @@ -0,0 +1,108 @@ +{ + "keyboard_name": "Tenkeyless ANSI Windows keyless layout with F13 key, split Backspace, and split Right Shift", + "url": "", + "maintainer": "qmk", + "layouts": { + "LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift": { + "layout": [ + {"x":0, "y":0}, + {"x":1.25, "y":0}, + {"x":2.25, "y":0}, + {"x":3.25, "y":0}, + {"x":4.25, "y":0}, + {"x":5.5, "y":0}, + {"x":6.5, "y":0}, + {"x":7.5, "y":0}, + {"x":8.5, "y":0}, + {"x":9.75, "y":0}, + {"x":10.75, "y":0}, + {"x":11.75, "y":0}, + {"x":12.75, "y":0}, + {"x":14, "y":0}, + + {"x":15.25, "y":0}, + {"x":16.25, "y":0}, + {"x":17.25, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4, "y":1.25}, + {"x":5, "y":1.25}, + {"x":6, "y":1.25}, + {"x":7, "y":1.25}, + {"x":8, "y":1.25}, + {"x":9, "y":1.25}, + {"x":10, "y":1.25}, + {"x":11, "y":1.25}, + {"x":12, "y":1.25}, + {"x":13, "y":1.25}, + {"x":14, "y":1.25}, + + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25}, + {"x":17.25, "y":1.25}, + + {"x":0, "y":2.25, "w":1.5}, + {"x":1.5, "y":2.25}, + {"x":2.5, "y":2.25}, + {"x":3.5, "y":2.25}, + {"x":4.5, "y":2.25}, + {"x":5.5, "y":2.25}, + {"x":6.5, "y":2.25}, + {"x":7.5, "y":2.25}, + {"x":8.5, "y":2.25}, + {"x":9.5, "y":2.25}, + {"x":10.5, "y":2.25}, + {"x":11.5, "y":2.25}, + {"x":12.5, "y":2.25}, + {"x":13.5, "y":2.25, "w":1.5}, + + {"x":15.25, "y":2.25}, + {"x":16.25, "y":2.25}, + {"x":17.25, "y":2.25}, + + {"x":0, "y":3.25, "w":1.75}, + {"x":1.75, "y":3.25}, + {"x":2.75, "y":3.25}, + {"x":3.75, "y":3.25}, + {"x":4.75, "y":3.25}, + {"x":5.75, "y":3.25}, + {"x":6.75, "y":3.25}, + {"x":7.75, "y":3.25}, + {"x":8.75, "y":3.25}, + {"x":9.75, "y":3.25}, + {"x":10.75, "y":3.25}, + {"x":11.75, "y":3.25}, + {"x":12.75, "y":3.25, "w":2.25}, + + {"x":0, "y":4.25, "w":2.25}, + {"x":2.25, "y":4.25}, + {"x":3.25, "y":4.25}, + {"x":4.25, "y":4.25}, + {"x":5.25, "y":4.25}, + {"x":6.25, "y":4.25}, + {"x":7.25, "y":4.25}, + {"x":8.25, "y":4.25}, + {"x":9.25, "y":4.25}, + {"x":10.25, "y":4.25}, + {"x":11.25, "y":4.25}, + {"x":12.25, "y":4.25, "w":1.75}, + {"x":14, "y":4.25}, + + {"x":16.25, "y":4.25}, + + {"x":0, "y":5.25, "w":1.5}, + {"x":2.5, "y":5.25, "w":1.5}, + {"x":4, "y":5.25, "w":7}, + {"x":11, "y":5.25, "w":1.5}, + {"x":13.5, "y":5.25, "w":1.5}, + + {"x":15.25, "y":5.25}, + {"x":16.25, "y":5.25}, + {"x":17.25, "y":5.25} + ] + } + } +} diff --git a/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/layout.json b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/layout.json new file mode 100644 index 00000000000..6992dff912b --- /dev/null +++ b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/layout.json @@ -0,0 +1,6 @@ +[{a:7},"",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"",{x:0.25},"","",""], +[{y:0.25},"","","","","","","","","","","","","","","",{x:0.25},"","",""], +[{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",{x:0.25},"","",""], +[{w:1.75},"","","","","","","","","","","","",{w:2.25},""], +[{w:2.25},"","","","","","","","","","","",{w:1.75},"","",{x:1.25},""], +[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""] diff --git a/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/readme.md b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/readme.md new file mode 100644 index 00000000000..614c0913f62 --- /dev/null +++ b/layouts/default/tkl_f13_ansi_wkl_split_bs_rshift/readme.md @@ -0,0 +1,3 @@ +# tkl_f13_ansi_wkl_split_bs_rshift + + LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift diff --git a/layouts/default/tkl_f13_iso_wkl/default_tkl_f13_iso_wkl/keymap.c b/layouts/default/tkl_f13_iso_wkl/default_tkl_f13_iso_wkl/keymap.c new file mode 100644 index 00000000000..5a32e674e8d --- /dev/null +++ b/layouts/default/tkl_f13_iso_wkl/default_tkl_f13_iso_wkl/keymap.c @@ -0,0 +1,32 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ + * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13│ │PSc│Scr│Pse│ + * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │ │Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ ┌───┐ + * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ │ ↑ │ + * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐ + * │Ctrl │ │Alt │ │ Alt│ │ Ctrl│ │ ← │ ↓ │ → │ + * └─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ + */ + [0] = LAYOUT_tkl_f13_iso_wkl( + 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_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/layouts/default/tkl_f13_iso_wkl/info.json b/layouts/default/tkl_f13_iso_wkl/info.json new file mode 100644 index 00000000000..e597716b5dc --- /dev/null +++ b/layouts/default/tkl_f13_iso_wkl/info.json @@ -0,0 +1,107 @@ +{ + "keyboard_name": "Tenkeyless ISO Windows keyless layout", + "url": "", + "maintainer": "qmk", + "layouts": { + "LAYOUT_tkl_f13_iso_wkl": { + "layout": [ + {"x":0, "y":0}, + {"x":1.25, "y":0}, + {"x":2.25, "y":0}, + {"x":3.25, "y":0}, + {"x":4.25, "y":0}, + {"x":5.5, "y":0}, + {"x":6.5, "y":0}, + {"x":7.5, "y":0}, + {"x":8.5, "y":0}, + {"x":9.75, "y":0}, + {"x":10.75, "y":0}, + {"x":11.75, "y":0}, + {"x":12.75, "y":0}, + {"x":14, "y":0}, + + {"x":15.25, "y":0}, + {"x":16.25, "y":0}, + {"x":17.25, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4, "y":1.25}, + {"x":5, "y":1.25}, + {"x":6, "y":1.25}, + {"x":7, "y":1.25}, + {"x":8, "y":1.25}, + {"x":9, "y":1.25}, + {"x":10, "y":1.25}, + {"x":11, "y":1.25}, + {"x":12, "y":1.25}, + {"x":13, "y":1.25, "w":2}, + + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25}, + {"x":17.25, "y":1.25}, + + {"x":0, "y":2.25, "w":1.5}, + {"x":1.5, "y":2.25}, + {"x":2.5, "y":2.25}, + {"x":3.5, "y":2.25}, + {"x":4.5, "y":2.25}, + {"x":5.5, "y":2.25}, + {"x":6.5, "y":2.25}, + {"x":7.5, "y":2.25}, + {"x":8.5, "y":2.25}, + {"x":9.5, "y":2.25}, + {"x":10.5, "y":2.25}, + {"x":11.5, "y":2.25}, + {"x":12.5, "y":2.25}, + + {"x":15.25, "y":2.25}, + {"x":16.25, "y":2.25}, + {"x":17.25, "y":2.25}, + + {"x":0, "y":3.25, "w":1.75}, + {"x":1.75, "y":3.25}, + {"x":2.75, "y":3.25}, + {"x":3.75, "y":3.25}, + {"x":4.75, "y":3.25}, + {"x":5.75, "y":3.25}, + {"x":6.75, "y":3.25}, + {"x":7.75, "y":3.25}, + {"x":8.75, "y":3.25}, + {"x":9.75, "y":3.25}, + {"x":10.75, "y":3.25}, + {"x":11.75, "y":3.25}, + {"x":12.75, "y":3.25}, + {"x":13.75, "y":2.25, "w":1.25, "h":2}, + + {"x":0, "y":4.25, "w":1.25}, + {"x":1.25, "y":4.25}, + {"x":2.25, "y":4.25}, + {"x":3.25, "y":4.25}, + {"x":4.25, "y":4.25}, + {"x":5.25, "y":4.25}, + {"x":6.25, "y":4.25}, + {"x":7.25, "y":4.25}, + {"x":8.25, "y":4.25}, + {"x":9.25, "y":4.25}, + {"x":10.25, "y":4.25}, + {"x":11.25, "y":4.25}, + {"x":12.25, "y":4.25, "w":2.75}, + + {"x":16.25, "y":4.25}, + + {"x":0, "y":5.25, "w":1.5}, + {"x":2.5, "y":5.25, "w":1.5}, + {"x":4, "y":5.25, "w":7}, + {"x":11, "y":5.25, "w":1.5}, + {"x":13.5, "y":5.25, "w":1.5}, + + {"x":15.25, "y":5.25}, + {"x":16.25, "y":5.25}, + {"x":17.25, "y":5.25} + ] + } + } +} diff --git a/layouts/default/tkl_f13_iso_wkl/layout.json b/layouts/default/tkl_f13_iso_wkl/layout.json new file mode 100644 index 00000000000..0c6f178b452 --- /dev/null +++ b/layouts/default/tkl_f13_iso_wkl/layout.json @@ -0,0 +1,6 @@ +[{a:7},"",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"",{x:0.25},"","",""], +[{y:0.25},"","","","","","","","","","","","","",{w:2},"",{x:0.25},"","",""], +[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},"",{x:0.25},"","",""], +[{w:1.75},"","","","","","","","","","","","",""], +[{w:1.25},"","","","","","","","","","","","",{w:2.75},"",{x:1.25},""], +[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""] diff --git a/layouts/default/tkl_f13_iso_wkl/readme.md b/layouts/default/tkl_f13_iso_wkl/readme.md new file mode 100644 index 00000000000..46c44195923 --- /dev/null +++ b/layouts/default/tkl_f13_iso_wkl/readme.md @@ -0,0 +1,3 @@ +# tkl_f13_iso_wkl + + LAYOUT_tkl_f13_iso_wkl diff --git a/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/default_tkl_f13_iso_wkl_split_bs_rshift/keymap.c b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/default_tkl_f13_iso_wkl_split_bs_rshift/keymap.c new file mode 100644 index 00000000000..7642de46e2f --- /dev/null +++ b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/default_tkl_f13_iso_wkl_split_bs_rshift/keymap.c @@ -0,0 +1,32 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ + * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13│ │PSc│Scr│Pse│ + * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Bsp│ │Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │ │Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ ┌───┐ + * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│Sft│ │ ↑ │ + * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐ + * │Ctrl │ │Alt │ │ Alt│ │ Ctrl│ │ ← │ ↓ │ → │ + * └─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ + */ + [0] = LAYOUT_tkl_f13_iso_wkl_split_bs_rshift( + 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_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/info.json b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/info.json new file mode 100644 index 00000000000..4ccde283690 --- /dev/null +++ b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/info.json @@ -0,0 +1,109 @@ +{ + "keyboard_name": "Tenkeyless ISO Windows keyless layout with F13 key, split Backspace, and split Right Shift", + "url": "", + "maintainer": "qmk", + "layouts": { + "LAYOUT_tkl_f13_iso_wkl_split_bs_rshift": { + "layout": [ + {"x":0, "y":0}, + {"x":1.25, "y":0}, + {"x":2.25, "y":0}, + {"x":3.25, "y":0}, + {"x":4.25, "y":0}, + {"x":5.5, "y":0}, + {"x":6.5, "y":0}, + {"x":7.5, "y":0}, + {"x":8.5, "y":0}, + {"x":9.75, "y":0}, + {"x":10.75, "y":0}, + {"x":11.75, "y":0}, + {"x":12.75, "y":0}, + {"x":14, "y":0}, + + {"x":15.25, "y":0}, + {"x":16.25, "y":0}, + {"x":17.25, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4, "y":1.25}, + {"x":5, "y":1.25}, + {"x":6, "y":1.25}, + {"x":7, "y":1.25}, + {"x":8, "y":1.25}, + {"x":9, "y":1.25}, + {"x":10, "y":1.25}, + {"x":11, "y":1.25}, + {"x":12, "y":1.25}, + {"x":13, "y":1.25}, + {"x":14, "y":1.25}, + + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25}, + {"x":17.25, "y":1.25}, + + {"x":0, "y":2.25, "w":1.5}, + {"x":1.5, "y":2.25}, + {"x":2.5, "y":2.25}, + {"x":3.5, "y":2.25}, + {"x":4.5, "y":2.25}, + {"x":5.5, "y":2.25}, + {"x":6.5, "y":2.25}, + {"x":7.5, "y":2.25}, + {"x":8.5, "y":2.25}, + {"x":9.5, "y":2.25}, + {"x":10.5, "y":2.25}, + {"x":11.5, "y":2.25}, + {"x":12.5, "y":2.25}, + + {"x":15.25, "y":2.25}, + {"x":16.25, "y":2.25}, + {"x":17.25, "y":2.25}, + + {"x":0, "y":3.25, "w":1.75}, + {"x":1.75, "y":3.25}, + {"x":2.75, "y":3.25}, + {"x":3.75, "y":3.25}, + {"x":4.75, "y":3.25}, + {"x":5.75, "y":3.25}, + {"x":6.75, "y":3.25}, + {"x":7.75, "y":3.25}, + {"x":8.75, "y":3.25}, + {"x":9.75, "y":3.25}, + {"x":10.75, "y":3.25}, + {"x":11.75, "y":3.25}, + {"x":12.75, "y":3.25}, + {"x":13.75, "y":2.25, "w":1.25, "h":2}, + + {"x":0, "y":4.25, "w":1.25}, + {"x":1.25, "y":4.25}, + {"x":2.25, "y":4.25}, + {"x":3.25, "y":4.25}, + {"x":4.25, "y":4.25}, + {"x":5.25, "y":4.25}, + {"x":6.25, "y":4.25}, + {"x":7.25, "y":4.25}, + {"x":8.25, "y":4.25}, + {"x":9.25, "y":4.25}, + {"x":10.25, "y":4.25}, + {"x":11.25, "y":4.25}, + {"x":12.25, "y":4.25, "w":1.75}, + {"x":14, "y":4.25}, + + {"x":16.25, "y":4.25}, + + {"x":0, "y":5.25, "w":1.5}, + {"x":2.5, "y":5.25, "w":1.5}, + {"x":4, "y":5.25, "w":7}, + {"x":11, "y":5.25, "w":1.5}, + {"x":13.5, "y":5.25, "w":1.5}, + + {"x":15.25, "y":5.25}, + {"x":16.25, "y":5.25}, + {"x":17.25, "y":5.25} + ] + } + } +} diff --git a/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/layout.json b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/layout.json new file mode 100644 index 00000000000..a07a1307e77 --- /dev/null +++ b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/layout.json @@ -0,0 +1,6 @@ +[{a:7},"",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"","","","",{x:0.25},"",{x:0.25},"","",""], +[{y:0.25},"","","","","","","","","","","","","","","",{x:0.25},"","",""], +[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},"",{x:0.25},"","",""], +[{w:1.75},"","","","","","","","","","","","",""], +[{w:1.25},"","","","","","","","","","","","",{w:1.75},"","",{x:1.25},""], +[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""] diff --git a/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/readme.md b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/readme.md new file mode 100644 index 00000000000..a9059abfba2 --- /dev/null +++ b/layouts/default/tkl_f13_iso_wkl_split_bs_rshift/readme.md @@ -0,0 +1,3 @@ +# tkl_f13_iso_wkl_split_bs_rshift + + LAYOUT_tkl_f13_iso_wkl_split_bs_rshift diff --git a/layouts/default/tkl_iso_wkl/default_tkl_iso_wkl/keymap.c b/layouts/default/tkl_iso_wkl/default_tkl_iso_wkl/keymap.c new file mode 100644 index 00000000000..940c968917b --- /dev/null +++ b/layouts/default/tkl_iso_wkl/default_tkl_iso_wkl/keymap.c @@ -0,0 +1,32 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ + * │Esc│ │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│ + * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │ │Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ ┌───┐ + * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ │ ↑ │ + * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐ + * │Ctrl │ │Alt │ │ Alt│ │ Ctrl│ │ ← │ ↓ │ → │ + * └─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ + */ + [0] = LAYOUT_tkl_iso_wkl( + 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/layouts/default/tkl_iso_wkl/info.json b/layouts/default/tkl_iso_wkl/info.json new file mode 100644 index 00000000000..07f3311296d --- /dev/null +++ b/layouts/default/tkl_iso_wkl/info.json @@ -0,0 +1,106 @@ +{ + "keyboard_name": "Tenkeyless ISO Windows keyless layout", + "url": "", + "maintainer": "qmk", + "layouts": { + "LAYOUT_tkl_iso_wkl": { + "layout": [ + {"x":0, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6.5, "y":0}, + {"x":7.5, "y":0}, + {"x":8.5, "y":0}, + {"x":9.5, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + + {"x":15.25, "y":0}, + {"x":16.25, "y":0}, + {"x":17.25, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4, "y":1.25}, + {"x":5, "y":1.25}, + {"x":6, "y":1.25}, + {"x":7, "y":1.25}, + {"x":8, "y":1.25}, + {"x":9, "y":1.25}, + {"x":10, "y":1.25}, + {"x":11, "y":1.25}, + {"x":12, "y":1.25}, + {"x":13, "y":1.25, "w":2}, + + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25}, + {"x":17.25, "y":1.25}, + + {"x":0, "y":2.25, "w":1.5}, + {"x":1.5, "y":2.25}, + {"x":2.5, "y":2.25}, + {"x":3.5, "y":2.25}, + {"x":4.5, "y":2.25}, + {"x":5.5, "y":2.25}, + {"x":6.5, "y":2.25}, + {"x":7.5, "y":2.25}, + {"x":8.5, "y":2.25}, + {"x":9.5, "y":2.25}, + {"x":10.5, "y":2.25}, + {"x":11.5, "y":2.25}, + {"x":12.5, "y":2.25}, + + {"x":15.25, "y":2.25}, + {"x":16.25, "y":2.25}, + {"x":17.25, "y":2.25}, + + {"x":0, "y":3.25, "w":1.75}, + {"x":1.75, "y":3.25}, + {"x":2.75, "y":3.25}, + {"x":3.75, "y":3.25}, + {"x":4.75, "y":3.25}, + {"x":5.75, "y":3.25}, + {"x":6.75, "y":3.25}, + {"x":7.75, "y":3.25}, + {"x":8.75, "y":3.25}, + {"x":9.75, "y":3.25}, + {"x":10.75, "y":3.25}, + {"x":11.75, "y":3.25}, + {"x":12.75, "y":3.25}, + {"x":13.75, "y":2.25, "w":1.25, "h":2}, + + {"x":0, "y":4.25, "w":1.25}, + {"x":1.25, "y":4.25}, + {"x":2.25, "y":4.25}, + {"x":3.25, "y":4.25}, + {"x":4.25, "y":4.25}, + {"x":5.25, "y":4.25}, + {"x":6.25, "y":4.25}, + {"x":7.25, "y":4.25}, + {"x":8.25, "y":4.25}, + {"x":9.25, "y":4.25}, + {"x":10.25, "y":4.25}, + {"x":11.25, "y":4.25}, + {"x":12.25, "y":4.25, "w":2.75}, + + {"x":16.25, "y":4.25}, + + {"x":0, "y":5.25, "w":1.5}, + {"x":2.5, "y":5.25, "w":1.5}, + {"x":4, "y":5.25, "w":7}, + {"x":11, "y":5.25, "w":1.5}, + {"x":13.5, "y":5.25, "w":1.5}, + + {"x":15.25, "y":5.25}, + {"x":16.25, "y":5.25}, + {"x":17.25, "y":5.25} + ] + } + } +} diff --git a/layouts/default/tkl_iso_wkl/layout.json b/layouts/default/tkl_iso_wkl/layout.json new file mode 100644 index 00000000000..8d51a4064da --- /dev/null +++ b/layouts/default/tkl_iso_wkl/layout.json @@ -0,0 +1,6 @@ +[{a:7},"",{x:1},"","","","",{x:0.5},"","","","",{x:0.5},"","","","",{x:0.25},"","",""], +[{y:0.25},"","","","","","","","","","","","","",{w:2},"",{x:0.25},"","",""], +[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},"",{x:0.25},"","",""], +[{w:1.75},"","","","","","","","","","","","",""], +[{w:1.25},"","","","","","","","","","","","",{w:2.75},"",{x:1.25},""], +[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""] diff --git a/layouts/default/tkl_iso_wkl/readme.md b/layouts/default/tkl_iso_wkl/readme.md new file mode 100644 index 00000000000..56fe1e91473 --- /dev/null +++ b/layouts/default/tkl_iso_wkl/readme.md @@ -0,0 +1,3 @@ +# tkl_iso_wkl + + LAYOUT_tkl_iso_wkl diff --git a/layouts/default/tkl_iso_wkl_split_bs_rshift/default_tkl_iso_wkl_split_bs_rshift/keymap.c b/layouts/default/tkl_iso_wkl_split_bs_rshift/default_tkl_iso_wkl_split_bs_rshift/keymap.c new file mode 100644 index 00000000000..5b9474863bc --- /dev/null +++ b/layouts/default/tkl_iso_wkl_split_bs_rshift/default_tkl_iso_wkl_split_bs_rshift/keymap.c @@ -0,0 +1,32 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ + * │Esc│ │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│ + * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Bsp│ │Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │ │Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ ┌───┐ + * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│Sft│ │ ↑ │ + * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐ + * │Ctrl │ │Alt │ │ Alt│ │ Ctrl│ │ ← │ ↓ │ → │ + * └─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ └───┴───┴───┘ + */ + [0] = LAYOUT_tkl_iso_wkl_split_bs_rshift( + 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/layouts/default/tkl_iso_wkl_split_bs_rshift/info.json b/layouts/default/tkl_iso_wkl_split_bs_rshift/info.json new file mode 100644 index 00000000000..aa0ebce31ed --- /dev/null +++ b/layouts/default/tkl_iso_wkl_split_bs_rshift/info.json @@ -0,0 +1,108 @@ +{ + "keyboard_name": "Tenkeyless ISO Windows keyless layout with split Backspace and split Right Shift", + "url": "", + "maintainer": "qmk", + "layouts": { + "LAYOUT_tkl_iso_wkl_split_bs_rshift": { + "layout": [ + {"x":0, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6.5, "y":0}, + {"x":7.5, "y":0}, + {"x":8.5, "y":0}, + {"x":9.5, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0}, + {"x":14, "y":0}, + + {"x":15.25, "y":0}, + {"x":16.25, "y":0}, + {"x":17.25, "y":0}, + + {"x":0, "y":1.25}, + {"x":1, "y":1.25}, + {"x":2, "y":1.25}, + {"x":3, "y":1.25}, + {"x":4, "y":1.25}, + {"x":5, "y":1.25}, + {"x":6, "y":1.25}, + {"x":7, "y":1.25}, + {"x":8, "y":1.25}, + {"x":9, "y":1.25}, + {"x":10, "y":1.25}, + {"x":11, "y":1.25}, + {"x":12, "y":1.25}, + {"x":13, "y":1.25}, + {"x":14, "y":1.25}, + + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25}, + {"x":17.25, "y":1.25}, + + {"x":0, "y":2.25, "w":1.5}, + {"x":1.5, "y":2.25}, + {"x":2.5, "y":2.25}, + {"x":3.5, "y":2.25}, + {"x":4.5, "y":2.25}, + {"x":5.5, "y":2.25}, + {"x":6.5, "y":2.25}, + {"x":7.5, "y":2.25}, + {"x":8.5, "y":2.25}, + {"x":9.5, "y":2.25}, + {"x":10.5, "y":2.25}, + {"x":11.5, "y":2.25}, + {"x":12.5, "y":2.25}, + + {"x":15.25, "y":2.25}, + {"x":16.25, "y":2.25}, + {"x":17.25, "y":2.25}, + + {"x":0, "y":3.25, "w":1.75}, + {"x":1.75, "y":3.25}, + {"x":2.75, "y":3.25}, + {"x":3.75, "y":3.25}, + {"x":4.75, "y":3.25}, + {"x":5.75, "y":3.25}, + {"x":6.75, "y":3.25}, + {"x":7.75, "y":3.25}, + {"x":8.75, "y":3.25}, + {"x":9.75, "y":3.25}, + {"x":10.75, "y":3.25}, + {"x":11.75, "y":3.25}, + {"x":12.75, "y":3.25}, + {"x":13.75, "y":2.25, "w":1.25, "h":2}, + + {"x":0, "y":4.25, "w":1.25}, + {"x":1.25, "y":4.25}, + {"x":2.25, "y":4.25}, + {"x":3.25, "y":4.25}, + {"x":4.25, "y":4.25}, + {"x":5.25, "y":4.25}, + {"x":6.25, "y":4.25}, + {"x":7.25, "y":4.25}, + {"x":8.25, "y":4.25}, + {"x":9.25, "y":4.25}, + {"x":10.25, "y":4.25}, + {"x":11.25, "y":4.25}, + {"x":12.25, "y":4.25, "w":1.75}, + {"x":14, "y":4.25}, + + {"x":16.25, "y":4.25}, + + {"x":0, "y":5.25, "w":1.5}, + {"x":2.5, "y":5.25, "w":1.5}, + {"x":4, "y":5.25, "w":7}, + {"x":11, "y":5.25, "w":1.5}, + {"x":13.5, "y":5.25, "w":1.5}, + + {"x":15.25, "y":5.25}, + {"x":16.25, "y":5.25}, + {"x":17.25, "y":5.25} + ] + } + } +} diff --git a/layouts/default/tkl_iso_wkl_split_bs_rshift/layout.json b/layouts/default/tkl_iso_wkl_split_bs_rshift/layout.json new file mode 100644 index 00000000000..09c79e0f4a4 --- /dev/null +++ b/layouts/default/tkl_iso_wkl_split_bs_rshift/layout.json @@ -0,0 +1,6 @@ +[{a:7},"",{x:1},"","","","",{x:0.5},"","","","",{x:0.5},"","","","",{x:0.25},"","",""], +[{y:0.25},"","","","","","","","","","","","","","","",{x:0.25},"","",""], +[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},"",{x:0.25},"","",""], +[{w:1.75},"","","","","","","","","","","","",""], +[{w:1.25},"","","","","","","","","","","","",{w:1.75},"","",{x:1.25},""], +[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},"",{x:0.25},"","",""] diff --git a/layouts/default/tkl_iso_wkl_split_bs_rshift/readme.md b/layouts/default/tkl_iso_wkl_split_bs_rshift/readme.md new file mode 100644 index 00000000000..ec820424a5b --- /dev/null +++ b/layouts/default/tkl_iso_wkl_split_bs_rshift/readme.md @@ -0,0 +1,3 @@ +# tkl_iso_wkl_split_bs_rshift + + LAYOUT_tkl_iso_split_bs_rshift From 7220715dd1619dfb073db78cfc23998a67994655 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Wed, 1 May 2024 20:18:20 +0100 Subject: [PATCH 232/333] Remove 60_ansi_arrow_split_bs_7u_spc Community Layout (#23259) --- keyboards/dz60/keyboard.json | 2 +- keyboards/dztech/dz60v2/keyboard.json | 1 - .../krush/krush60/solder/keyboard.json | 2 +- .../60_ansi_arrow_split_bs_7u_spc/readme.md | 3 - .../keymap.c | 27 ------- .../60_ansi_arrow_split_bs_7u_spc/info.json | 78 ------------------- .../60_ansi_arrow_split_bs_7u_spc/layout.json | 5 -- .../60_ansi_arrow_split_bs_7u_spc/readme.md | 30 ------- layouts/default/readme.md | 15 ---- 9 files changed, 2 insertions(+), 161 deletions(-) delete mode 100644 layouts/community/60_ansi_arrow_split_bs_7u_spc/readme.md delete mode 100644 layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c delete mode 100644 layouts/default/60_ansi_arrow_split_bs_7u_spc/info.json delete mode 100644 layouts/default/60_ansi_arrow_split_bs_7u_spc/layout.json delete mode 100644 layouts/default/60_ansi_arrow_split_bs_7u_spc/readme.md diff --git a/keyboards/dz60/keyboard.json b/keyboards/dz60/keyboard.json index eb831143b79..a6beff0d63a 100644 --- a/keyboards/dz60/keyboard.json +++ b/keyboards/dz60/keyboard.json @@ -54,7 +54,7 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", - "community_layouts": ["60_ansi", "60_ansi_arrow_split_bs_7u_spc", "60_ansi_arrow", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_abnt2", "60_tsangan_hhkb"], + "community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_abnt2", "60_tsangan_hhkb"], "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dztech/dz60v2/keyboard.json b/keyboards/dztech/dz60v2/keyboard.json index bd1479b77c0..52889396089 100644 --- a/keyboards/dztech/dz60v2/keyboard.json +++ b/keyboards/dztech/dz60v2/keyboard.json @@ -51,7 +51,6 @@ "60_abnt2", "60_ansi", "60_ansi_arrow", - "60_ansi_arrow_split_bs_7u_spc", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_hhkb", diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keyboard.json b/keyboards/sawnsprojects/krush/krush60/solder/keyboard.json index b3d4f8f97c6..4f5ca808ceb 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/keyboard.json +++ b/keyboards/sawnsprojects/krush/krush60/solder/keyboard.json @@ -48,7 +48,7 @@ "LAYOUT_60_ansi_arrow_split_bs_7u_spc": "LAYOUT_60_ansi_arrow_tsangan_split_bs", "LAYOUT_60_ansi_arrow_7u_spc": "LAYOUT_60_ansi_arrow_tsangan" }, - "community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_arrow_split_bs_7u_spc"], + "community_layouts": ["60_ansi", "60_ansi_arrow"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/layouts/community/60_ansi_arrow_split_bs_7u_spc/readme.md b/layouts/community/60_ansi_arrow_split_bs_7u_spc/readme.md deleted file mode 100644 index d60387a000b..00000000000 --- a/layouts/community/60_ansi_arrow_split_bs_7u_spc/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# 60_ansi_arrow_split_bs_7u_spc - - LAYOUT_60_ansi_arrow_split_bs_7u_spc diff --git a/layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c b/layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c deleted file mode 100644 index 409f415318b..00000000000 --- a/layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2020 QMK / Sendy YK -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Esc│1 │2 │3 │4 │5 │6 │7 │8 │9 │0 │- │+ │\ │Del│ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │Tab │Q │W │E │R │T │Y │U │I │O │P │[ │] │Bspc │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │Caps │A │S │D │F │G │H │J │K │L │; │' │Enter │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤ - * │Shift │Z │X │C │V │B │N │M │, │. │Shift │↑ │/ │ - * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴──┬───┼───┼───┤ - * │Ctrl │GUI│Alt │Space │Alt│← │↓ │→ │ - * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘ - */ - [0] = LAYOUT_60_ansi_arrow_split_bs_7u_spc( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT - ) -}; diff --git a/layouts/default/60_ansi_arrow_split_bs_7u_spc/info.json b/layouts/default/60_ansi_arrow_split_bs_7u_spc/info.json deleted file mode 100644 index bf30205f3d3..00000000000 --- a/layouts/default/60_ansi_arrow_split_bs_7u_spc/info.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "keyboard_name": "60% ANSI Arrow Split Backspace & 7U Space Layout", - "url": "https://mr.sendyyk.com", - "maintainer": "Sendy YK ", - "layouts": { - "LAYOUT_60_ansi_arrow_split_bs_7u_spc": { - "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - - {"x": 0, "y": 1, "w": 1.5}, - {"x": 1.5, "y": 1}, - {"x": 2.5, "y": 1}, - {"x": 3.5, "y": 1}, - {"x": 4.5, "y": 1}, - {"x": 5.5, "y": 1}, - {"x": 6.5, "y": 1}, - {"x": 7.5, "y": 1}, - {"x": 8.5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 10.5, "y": 1}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 13.5, "y": 1, "w": 1.5}, - - {"x": 0, "y": 2, "w": 1.75}, - {"x": 1.75, "y": 2}, - {"x": 2.75, "y": 2}, - {"x": 3.75, "y": 2}, - {"x": 4.75, "y": 2}, - {"x": 5.75, "y": 2}, - {"x": 6.75, "y": 2}, - {"x": 7.75, "y": 2}, - {"x": 8.75, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 2}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2, "w": 2.25}, - - {"x": 0, "y": 3, "w": 2.25}, - {"x": 2.25, "y": 3}, - {"x": 3.25, "y": 3}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3}, - {"x": 6.25, "y": 3}, - {"x": 7.25, "y": 3}, - {"x": 8.25, "y": 3}, - {"x": 9.25, "y": 3}, - {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3, "w": 1.75}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, - - {"x": 0, "y": 4, "w": 1.5}, - {"x": 1.5, "y": 4}, - {"x": 2.5, "y": 4, "w": 1.5}, - {"x": 4, "y": 4, "w": 7}, - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4} - ] - } - } -} diff --git a/layouts/default/60_ansi_arrow_split_bs_7u_spc/layout.json b/layouts/default/60_ansi_arrow_split_bs_7u_spc/layout.json deleted file mode 100644 index db9c8d167b5..00000000000 --- a/layouts/default/60_ansi_arrow_split_bs_7u_spc/layout.json +++ /dev/null @@ -1,5 +0,0 @@ -[{a:7},"","","","","","","","","","","","","","",""], -[{w:1.5},"","","","","","","","","","","","","",{w:1.5},""], -[{w:1.75},"","","","","","","","","","","","",{w:2.25},""], -[{w:2.25},"","","","","","","","","","",{w:1.75},"","",""], -[{w:1.5},"","",{w:1.5},"",{w:7},"","","","",""] diff --git a/layouts/default/60_ansi_arrow_split_bs_7u_spc/readme.md b/layouts/default/60_ansi_arrow_split_bs_7u_spc/readme.md deleted file mode 100644 index 30292abb90d..00000000000 --- a/layouts/default/60_ansi_arrow_split_bs_7u_spc/readme.md +++ /dev/null @@ -1,30 +0,0 @@ -# 60_ansi_arrow_split_bs_7u_spc Keymap - -Default 60 ANSI Arrow Split Backspace & 7U Space Keymap by [Sendy YK](https://mr.sendyyk.com). - -```c - /* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Esc│1 │2 │3 │4 │5 │6 │7 │8 │9 │0 │- │+ │\ │Del│ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │Tab │Q │W │E │R │T │Y │U │I │O │P │[ │] │Bspc │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │Caps │A │S │D │F │G │H │J │K │L │; │' │Enter │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤ - * │Shift │Z │X │C │V │B │N │M │, │. │Shift │↑ │/ │ - * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴──┬───┼───┼───┤ - * │Ctrl │GUI│Alt │Space │Alt│← │↓ │→ │ - * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘ - */ -``` - -## Build The Firmware - -Make example for keyboard (after setting up your build environment): - - make :default_60_ansi_arrow_split_bs_7u_spc - -More information: -* [Setting Up Your QMK Environment](https://docs.qmk.fm/#/getting_started_build_tools) -* [More Detailed make Instructions](https://docs.qmk.fm/#/getting_started_make_guide) -* [The Complete Newbs Guide To QMK](https://docs.qmk.fm/#/newbs) diff --git a/layouts/default/readme.md b/layouts/default/readme.md index fab13d47c55..159b339383f 100644 --- a/layouts/default/readme.md +++ b/layouts/default/readme.md @@ -49,21 +49,6 @@ LAYOUT_60_ansi_arrow └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘ ``` -``` -LAYOUT_60_ansi_arrow_split_bs_7u_spc -┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ -├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ -├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴──┬───┼───┼───┤ -│ │ │ │ │ │ │ │ │ -└─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘ -``` - ``` LAYOUT_60_ansi_split_bs_rshift ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ From 337776105dc614a08d2d3a0db66c7c5be34afc4c Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Wed, 1 May 2024 20:27:40 +0100 Subject: [PATCH 233/333] add 60_iso_arrow and arrow_split_bs Community Layouts (#22556) --- .../60_ansi_arrow_split_bs/readme.md | 3 + layouts/community/60_iso_arrow/readme.md | 3 + .../community/60_iso_arrow_split_bs/readme.md | 3 + .../default_60_ansi_arrow/keymap.c | 10 +-- .../default_60_ansi_arrow_split_bs/keymap.c | 27 +++++++ .../default/60_ansi_arrow_split_bs/info.json | 79 ++++++++++++++++++ .../60_ansi_arrow_split_bs/layout.json | 5 ++ .../default/60_ansi_arrow_split_bs/readme.md | 3 + .../default_60_iso_arrow/keymap.c | 27 +++++++ layouts/default/60_iso_arrow/info.json | 79 ++++++++++++++++++ layouts/default/60_iso_arrow/layout.json | 5 ++ layouts/default/60_iso_arrow/readme.md | 3 + .../default_60_iso_arrow_split_bs/keymap.c | 27 +++++++ .../default/60_iso_arrow_split_bs/info.json | 80 +++++++++++++++++++ .../default/60_iso_arrow_split_bs/layout.json | 5 ++ .../default/60_iso_arrow_split_bs/readme.md | 3 + layouts/default/readme.md | 45 +++++++++++ 17 files changed, 402 insertions(+), 5 deletions(-) create mode 100644 layouts/community/60_ansi_arrow_split_bs/readme.md create mode 100644 layouts/community/60_iso_arrow/readme.md create mode 100644 layouts/community/60_iso_arrow_split_bs/readme.md create mode 100644 layouts/default/60_ansi_arrow_split_bs/default_60_ansi_arrow_split_bs/keymap.c create mode 100644 layouts/default/60_ansi_arrow_split_bs/info.json create mode 100644 layouts/default/60_ansi_arrow_split_bs/layout.json create mode 100644 layouts/default/60_ansi_arrow_split_bs/readme.md create mode 100644 layouts/default/60_iso_arrow/default_60_iso_arrow/keymap.c create mode 100644 layouts/default/60_iso_arrow/info.json create mode 100644 layouts/default/60_iso_arrow/layout.json create mode 100644 layouts/default/60_iso_arrow/readme.md create mode 100644 layouts/default/60_iso_arrow_split_bs/default_60_iso_arrow_split_bs/keymap.c create mode 100644 layouts/default/60_iso_arrow_split_bs/info.json create mode 100644 layouts/default/60_iso_arrow_split_bs/layout.json create mode 100644 layouts/default/60_iso_arrow_split_bs/readme.md diff --git a/layouts/community/60_ansi_arrow_split_bs/readme.md b/layouts/community/60_ansi_arrow_split_bs/readme.md new file mode 100644 index 00000000000..c008b4a6dec --- /dev/null +++ b/layouts/community/60_ansi_arrow_split_bs/readme.md @@ -0,0 +1,3 @@ +# 60_ansi_arrow_split_bs + + LAYOUT_60_ansi_arrow_split_bs diff --git a/layouts/community/60_iso_arrow/readme.md b/layouts/community/60_iso_arrow/readme.md new file mode 100644 index 00000000000..73015ab248e --- /dev/null +++ b/layouts/community/60_iso_arrow/readme.md @@ -0,0 +1,3 @@ +# 60_iso_arrow + + LAYOUT_60_iso_arrow diff --git a/layouts/community/60_iso_arrow_split_bs/readme.md b/layouts/community/60_iso_arrow_split_bs/readme.md new file mode 100644 index 00000000000..8f47644fe23 --- /dev/null +++ b/layouts/community/60_iso_arrow_split_bs/readme.md @@ -0,0 +1,3 @@ +# 60_iso_arrow_split_bs + + LAYOUT_60_iso_arrow_split_bs diff --git a/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c b/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c index c0baf9f47a7..5ad94501d06 100644 --- a/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c +++ b/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c @@ -6,15 +6,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │Esc│1 │2 │3 │4 │5 │6 │7 │8 │9 │0 │- │+ │Bspc │ + * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │Tab │Q │W │E │R │T │Y │U │I │O │P │[ │] │\ │ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │Caps │A │S │D │F │G │H │J │K │L │; │' │Enter │ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤ - * │Shift │Z │X │C │V │B │N │M │, │. │Shift │↑ │/ │ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ Shift│ ↑ │ / │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤ - * │Ctrl│GUI │Alt │Space │Alt│GUI│← │↓ │→ │ + * │Ctrl│GUI │Alt │Space │Alt│GUI│ ← │ ↓ │ → │ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘ */ [0] = LAYOUT_60_ansi_arrow( diff --git a/layouts/default/60_ansi_arrow_split_bs/default_60_ansi_arrow_split_bs/keymap.c b/layouts/default/60_ansi_arrow_split_bs/default_60_ansi_arrow_split_bs/keymap.c new file mode 100644 index 00000000000..e95baa6f4db --- /dev/null +++ b/layouts/default/60_ansi_arrow_split_bs/default_60_ansi_arrow_split_bs/keymap.c @@ -0,0 +1,27 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ + │ \ │ ` │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ Bspc│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ Shift│ ↑ │ / │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤ + * │Ctrl│GUI │Alt │ │Alt│GUI│ ← │ ↓ │ → │ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘ + */ + [0] = LAYOUT_60_ansi_arrow_split_bs( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/layouts/default/60_ansi_arrow_split_bs/info.json b/layouts/default/60_ansi_arrow_split_bs/info.json new file mode 100644 index 00000000000..23e4b6937d4 --- /dev/null +++ b/layouts/default/60_ansi_arrow_split_bs/info.json @@ -0,0 +1,79 @@ +{ + "keyboard_name": "60% ANSI Arrow Layout with Split Backspace", + "url": "", + "maintainer": "qmk", + "layouts": { + "LAYOUT_60_ansi_arrow_split_bs": { + "layout": [ + {"x": 0, "y": 0}, + {"x": 1, "y": 0}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0}, + {"x": 5, "y": 0}, + {"x": 6, "y": 0}, + {"x": 7, "y": 0}, + {"x": 8, "y": 0}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0}, + {"x": 11, "y": 0}, + {"x": 12, "y": 0}, + {"x": 13, "y": 0}, + {"x": 14, "y": 0}, + + {"x": 0, "y": 1, "w": 1.5}, + {"x": 1.5, "y": 1}, + {"x": 2.5, "y": 1}, + {"x": 3.5, "y": 1}, + {"x": 4.5, "y": 1}, + {"x": 5.5, "y": 1}, + {"x": 6.5, "y": 1}, + {"x": 7.5, "y": 1}, + {"x": 8.5, "y": 1}, + {"x": 9.5, "y": 1}, + {"x": 10.5, "y": 1}, + {"x": 11.5, "y": 1}, + {"x": 12.5, "y": 1}, + {"x": 13.5, "y": 1, "w": 1.5}, + + {"x": 0, "y": 2, "w": 1.75}, + {"x": 1.75, "y": 2}, + {"x": 2.75, "y": 2}, + {"x": 3.75, "y": 2}, + {"x": 4.75, "y": 2}, + {"x": 5.75, "y": 2}, + {"x": 6.75, "y": 2}, + {"x": 7.75, "y": 2}, + {"x": 8.75, "y": 2}, + {"x": 9.75, "y": 2}, + {"x": 10.75, "y": 2}, + {"x": 11.75, "y": 2}, + {"x": 12.75, "y": 2, "w": 2.25}, + + {"x": 0, "y": 3, "w": 2.25}, + {"x": 2.25, "y": 3}, + {"x": 3.25, "y": 3}, + {"x": 4.25, "y": 3}, + {"x": 5.25, "y": 3}, + {"x": 6.25, "y": 3}, + {"x": 7.25, "y": 3}, + {"x": 8.25, "y": 3}, + {"x": 9.25, "y": 3}, + {"x": 10.25, "y": 3}, + {"x": 11.25, "y": 3, "w": 1.75}, + {"x": 13, "y": 3}, + {"x": 14, "y": 3}, + + {"x": 0, "y": 4, "w": 1.25}, + {"x": 1.25, "y": 4, "w": 1.25}, + {"x": 2.5, "y": 4, "w": 1.25}, + {"x": 3.75, "y": 4, "w": 6.25}, + {"x": 10, "y": 4}, + {"x": 11, "y": 4}, + {"x": 12, "y": 4}, + {"x": 13, "y": 4}, + {"x": 14, "y": 4} + ] + } + } +} diff --git a/layouts/default/60_ansi_arrow_split_bs/layout.json b/layouts/default/60_ansi_arrow_split_bs/layout.json new file mode 100644 index 00000000000..595b88bb558 --- /dev/null +++ b/layouts/default/60_ansi_arrow_split_bs/layout.json @@ -0,0 +1,5 @@ +[{a:7},"","","","","","","","","","","","","","",""], +[{w:1.5},"","","","","","","","","","","","","",{w:1.5},""], +[{w:1.75},"","","","","","","","","","","","",{w:2.25},""], +[{w:2.25},"","","","","","","","","","",{w:1.75},"","",""], +[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","",""] diff --git a/layouts/default/60_ansi_arrow_split_bs/readme.md b/layouts/default/60_ansi_arrow_split_bs/readme.md new file mode 100644 index 00000000000..c008b4a6dec --- /dev/null +++ b/layouts/default/60_ansi_arrow_split_bs/readme.md @@ -0,0 +1,3 @@ +# 60_ansi_arrow_split_bs + + LAYOUT_60_ansi_arrow_split_bs diff --git a/layouts/default/60_iso_arrow/default_60_iso_arrow/keymap.c b/layouts/default/60_iso_arrow/default_60_iso_arrow/keymap.c new file mode 100644 index 00000000000..d3eaa478685 --- /dev/null +++ b/layouts/default/60_iso_arrow/default_60_iso_arrow/keymap.c @@ -0,0 +1,27 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ + │ Backsp│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬──┴┬───┤ + * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ Shift│ ↑ │ / │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤ + * │Ctrl│GUI │Alt │ │Alt│GUI│ ← │ ↓ │ → │ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘ + */ + [0] = LAYOUT_60_iso_arrow( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/layouts/default/60_iso_arrow/info.json b/layouts/default/60_iso_arrow/info.json new file mode 100644 index 00000000000..a14008b14f7 --- /dev/null +++ b/layouts/default/60_iso_arrow/info.json @@ -0,0 +1,79 @@ +{ + "keyboard_name": "60% ISO Arrow Layout", + "url": "", + "maintainer": "qmk", + "layouts": { + "LAYOUT_60_iso_arrow": { + "layout": [ + {"x": 0, "y": 0}, + {"x": 1, "y": 0}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0}, + {"x": 5, "y": 0}, + {"x": 6, "y": 0}, + {"x": 7, "y": 0}, + {"x": 8, "y": 0}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0}, + {"x": 11, "y": 0}, + {"x": 12, "y": 0}, + {"x": 13, "y": 0, "w": 2}, + + {"x": 0, "y": 1, "w": 1.5}, + {"x": 1.5, "y": 1}, + {"x": 2.5, "y": 1}, + {"x": 3.5, "y": 1}, + {"x": 4.5, "y": 1}, + {"x": 5.5, "y": 1}, + {"x": 6.5, "y": 1}, + {"x": 7.5, "y": 1}, + {"x": 8.5, "y": 1}, + {"x": 9.5, "y": 1}, + {"x": 10.5, "y": 1}, + {"x": 11.5, "y": 1}, + {"x": 12.5, "y": 1}, + + {"x": 0, "y": 2, "w": 1.75}, + {"x": 1.75, "y": 2}, + {"x": 2.75, "y": 2}, + {"x": 3.75, "y": 2}, + {"x": 4.75, "y": 2}, + {"x": 5.75, "y": 2}, + {"x": 6.75, "y": 2}, + {"x": 7.75, "y": 2}, + {"x": 8.75, "y": 2}, + {"x": 9.75, "y": 2}, + {"x": 10.75, "y": 2}, + {"x": 11.75, "y": 2}, + {"x": 12.75, "y": 2}, + {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"x": 0, "y": 3, "w": 1.25}, + {"x": 1.25, "y": 3}, + {"x": 2.25, "y": 3}, + {"x": 3.25, "y": 3}, + {"x": 4.25, "y": 3}, + {"x": 5.25, "y": 3}, + {"x": 6.25, "y": 3}, + {"x": 7.25, "y": 3}, + {"x": 8.25, "y": 3}, + {"x": 9.25, "y": 3}, + {"x": 10.25, "y": 3}, + {"x": 11.25, "y": 3, "w": 1.75}, + {"x": 13, "y": 3}, + {"x": 14, "y": 3}, + + {"x": 0, "y": 4, "w": 1.25}, + {"x": 1.25, "y": 4, "w": 1.25}, + {"x": 2.5, "y": 4, "w": 1.25}, + {"x": 3.75, "y": 4, "w": 6.25}, + {"x": 10, "y": 4}, + {"x": 11, "y": 4}, + {"x": 12, "y": 4}, + {"x": 13, "y": 4}, + {"x": 14, "y": 4} + ] + } + } +} diff --git a/layouts/default/60_iso_arrow/layout.json b/layouts/default/60_iso_arrow/layout.json new file mode 100644 index 00000000000..90f25c3ca8c --- /dev/null +++ b/layouts/default/60_iso_arrow/layout.json @@ -0,0 +1,5 @@ +[{a:7},"","","","","","","","","","","","","",{w:2},""], +[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},""], +[{w:1.75},"","","","","","","","","","","","",""], +[{w:1.25},"","","","","","","","","","","",{w:1.75},"","",""], +[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","",""] diff --git a/layouts/default/60_iso_arrow/readme.md b/layouts/default/60_iso_arrow/readme.md new file mode 100644 index 00000000000..73015ab248e --- /dev/null +++ b/layouts/default/60_iso_arrow/readme.md @@ -0,0 +1,3 @@ +# 60_iso_arrow + + LAYOUT_60_iso_arrow diff --git a/layouts/default/60_iso_arrow_split_bs/default_60_iso_arrow_split_bs/keymap.c b/layouts/default/60_iso_arrow_split_bs/default_60_iso_arrow_split_bs/keymap.c new file mode 100644 index 00000000000..651c97366c2 --- /dev/null +++ b/layouts/default/60_iso_arrow_split_bs/default_60_iso_arrow_split_bs/keymap.c @@ -0,0 +1,27 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ + │Bsp│Del│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │ │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬──┴┬───┤ + * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ Shift│ ↑ │ / │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤ + * │Ctrl│GUI │Alt │ │Alt│GUI│ ← │ ↓ │ → │ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘ + */ + [0] = LAYOUT_60_iso_arrow_split_bs( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/layouts/default/60_iso_arrow_split_bs/info.json b/layouts/default/60_iso_arrow_split_bs/info.json new file mode 100644 index 00000000000..5a7b78e40d5 --- /dev/null +++ b/layouts/default/60_iso_arrow_split_bs/info.json @@ -0,0 +1,80 @@ +{ + "keyboard_name": "60% ISO Arrow Layout with Split Backspace", + "url": "", + "maintainer": "qmk", + "layouts": { + "LAYOUT_60_iso_arrow_split_bs": { + "layout": [ + {"x": 0, "y": 0}, + {"x": 1, "y": 0}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0}, + {"x": 5, "y": 0}, + {"x": 6, "y": 0}, + {"x": 7, "y": 0}, + {"x": 8, "y": 0}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0}, + {"x": 11, "y": 0}, + {"x": 12, "y": 0}, + {"x": 13, "y": 0}, + {"x": 14, "y": 0}, + + {"x": 0, "y": 1, "w": 1.5}, + {"x": 1.5, "y": 1}, + {"x": 2.5, "y": 1}, + {"x": 3.5, "y": 1}, + {"x": 4.5, "y": 1}, + {"x": 5.5, "y": 1}, + {"x": 6.5, "y": 1}, + {"x": 7.5, "y": 1}, + {"x": 8.5, "y": 1}, + {"x": 9.5, "y": 1}, + {"x": 10.5, "y": 1}, + {"x": 11.5, "y": 1}, + {"x": 12.5, "y": 1}, + + {"x": 0, "y": 2, "w": 1.75}, + {"x": 1.75, "y": 2}, + {"x": 2.75, "y": 2}, + {"x": 3.75, "y": 2}, + {"x": 4.75, "y": 2}, + {"x": 5.75, "y": 2}, + {"x": 6.75, "y": 2}, + {"x": 7.75, "y": 2}, + {"x": 8.75, "y": 2}, + {"x": 9.75, "y": 2}, + {"x": 10.75, "y": 2}, + {"x": 11.75, "y": 2}, + {"x": 12.75, "y": 2}, + {"x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"x": 0, "y": 3, "w": 1.25}, + {"x": 1.25, "y": 3}, + {"x": 2.25, "y": 3}, + {"x": 3.25, "y": 3}, + {"x": 4.25, "y": 3}, + {"x": 5.25, "y": 3}, + {"x": 6.25, "y": 3}, + {"x": 7.25, "y": 3}, + {"x": 8.25, "y": 3}, + {"x": 9.25, "y": 3}, + {"x": 10.25, "y": 3}, + {"x": 11.25, "y": 3, "w": 1.75}, + {"x": 13, "y": 3}, + {"x": 14, "y": 3}, + + {"x": 0, "y": 4, "w": 1.25}, + {"x": 1.25, "y": 4, "w": 1.25}, + {"x": 2.5, "y": 4, "w": 1.25}, + {"x": 3.75, "y": 4, "w": 6.25}, + {"x": 10, "y": 4}, + {"x": 11, "y": 4}, + {"x": 12, "y": 4}, + {"x": 13, "y": 4}, + {"x": 14, "y": 4} + ] + } + } +} diff --git a/layouts/default/60_iso_arrow_split_bs/layout.json b/layouts/default/60_iso_arrow_split_bs/layout.json new file mode 100644 index 00000000000..bf494ab25f1 --- /dev/null +++ b/layouts/default/60_iso_arrow_split_bs/layout.json @@ -0,0 +1,5 @@ +[{a:7},"","","","","","","","","","","","","","",""], +[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},""], +[{w:1.75},"","","","","","","","","","","","",""], +[{w:1.25},"","","","","","","","","","","",{w:1.75},"","",""], +[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","",""] diff --git a/layouts/default/60_iso_arrow_split_bs/readme.md b/layouts/default/60_iso_arrow_split_bs/readme.md new file mode 100644 index 00000000000..8f47644fe23 --- /dev/null +++ b/layouts/default/60_iso_arrow_split_bs/readme.md @@ -0,0 +1,3 @@ +# 60_iso_arrow_split_bs + + LAYOUT_60_iso_arrow_split_bs diff --git a/layouts/default/readme.md b/layouts/default/readme.md index fab13d47c55..2460f64701f 100644 --- a/layouts/default/readme.md +++ b/layouts/default/readme.md @@ -49,6 +49,21 @@ LAYOUT_60_ansi_arrow └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘ ``` +``` +LAYOUT_60_ansi_arrow_split_bs +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ +└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘ +``` + ``` LAYOUT_60_ansi_arrow_split_bs_7u_spc ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -154,6 +169,36 @@ LAYOUT_60_iso └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ ``` +``` +LAYOUT_60_iso_arrow +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬──┴┬───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ +└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘ +``` + +``` +LAYOUT_60_iso_arrow_split_bs +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬──┴┬───┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ +└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘ +``` + ``` LAYOUT_60_iso_split_bs_rshift ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ From 61c7c1f74cc5365501a3038181df551df11f719e Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 2 May 2024 19:48:49 +1000 Subject: [PATCH 234/333] Convert some AVR GPIO operations to macros (#23424) --- keyboards/40percentclub/ut47/led.c | 14 +- keyboards/40percentclub/ut47/matrix.c | 44 ++++--- keyboards/amjkeyboard/amj96/matrix.c | 63 ++++----- keyboards/bajjak/bajjak.c | 10 +- keyboards/bpiphany/sixshooter/sixshooter.h | 61 +++++++-- keyboards/ckeys/obelus/obelus.c | 4 +- keyboards/clueboard/66/rev2/rev2.c | 24 ++-- keyboards/clueboard/66/rev3/rev3.c | 24 ++-- .../66_hotswap/prototype/prototype.c | 24 ++-- keyboards/converter/hp_46010a/matrix.c | 31 ++--- keyboards/converter/sun_usb/matrix.c | 6 +- keyboards/crawlpad/keymaps/default/keymap.c | 35 ++--- keyboards/do60/do60.h | 21 ++- keyboards/ergodox_ez/ergodox_ez.c | 17 +-- keyboards/ergodox_ez/ergodox_ez.h | 42 ++++-- keyboards/gboards/ergotaco/ergotaco.c | 29 +++-- keyboards/gboards/georgi/georgi.c | 17 ++- keyboards/gboards/gergo/gergo.c | 17 ++- keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c | 1 - keyboards/gh80_3000/keymaps/default/keymap.c | 1 - .../gh80_3000/keymaps/iso_default/keymap.c | 1 - keyboards/gh80_3000/keymaps/iso_std/keymap.c | 1 - keyboards/gh80_3000/keymaps/iso_wkl/keymap.c | 1 - .../glenpickle/chimera_ergo/chimera_ergo.c | 10 +- .../glenpickle/chimera_ergo/chimera_ergo.h | 40 ++---- keyboards/glenpickle/chimera_ls/chimera_ls.c | 10 +- keyboards/glenpickle/chimera_ls/chimera_ls.h | 40 ++---- .../glenpickle/chimera_ortho/chimera_ortho.c | 10 +- .../glenpickle/chimera_ortho/chimera_ortho.h | 40 ++---- .../chimera_ortho_plus/chimera_ortho_plus.c | 12 +- .../chimera_ortho_plus/chimera_ortho_plus.h | 16 ++- .../arrow_pad/keymaps/default/keymap.c | 14 +- .../arrow_pad/keymaps/pad_21/keymap.c | 16 +-- .../arrow_pad/keymaps/pad_24/keymap.c | 14 +- keyboards/handwired/atreus50/atreus50.c | 4 +- keyboards/handwired/datahand/matrix.c | 16 +-- keyboards/handwired/frenchdev/frenchdev.c | 11 +- keyboards/handwired/frenchdev/frenchdev.h | 42 ++++-- keyboards/handwired/frenchdev/matrix.c | 54 ++++---- keyboards/handwired/gamenum/gamenum.c | 8 +- .../gamenum/keymaps/default/keymap.c | 8 +- keyboards/handwired/retro_refit/retro_refit.c | 4 +- keyboards/hotdox/hotdox.h | 45 +++++-- keyboards/hotdox/matrix.c | 45 ++++--- keyboards/keyboardio/model01/leds.c | 7 +- keyboards/keyboardio/model01/matrix.c | 4 +- keyboards/kira/kira75/kira75.h | 23 +++- keyboards/kmini/matrix.c | 104 ++++++++------- .../mini/keymaps/default-gsm-newbs/keymap.c | 120 +++++++++--------- keyboards/knops/mini/keymaps/default/keymap.c | 120 +++++++++--------- keyboards/lazydesigners/the50/the50.c | 7 +- keyboards/mitosis/mitosis.c | 10 +- keyboards/mitosis/mitosis.h | 40 ++---- .../noxary/268/keymaps/sixtyeight/keymap.c | 5 +- keyboards/org60/org60.h | 21 ++- keyboards/planck/light/light.c | 4 +- .../comet46/keymaps/default-rgbled/keymap.c | 22 ++-- keyboards/sirius/uni660/rev1/rev1.c | 12 +- keyboards/sirius/uni660/rev1/rev1.h | 40 ++---- keyboards/sirius/uni660/rev2/rev2.c | 12 +- keyboards/sirius/uni660/rev2/rev2.h | 40 ++---- keyboards/sirius/unigo66/main.c | 20 +-- keyboards/sixkeyboard/matrix.c | 13 +- keyboards/sixkeyboard/sixkeyboard.c | 29 ++--- keyboards/tmo50/tmo50.c | 40 ++---- keyboards/v60_type_r/config.h | 6 +- keyboards/v60_type_r/v60_type_r.c | 16 ++- .../omnikey_bh/keymaps/default/keymap.c | 23 +--- keyboards/wilba_tech/wt_rgb_backlight.c | 9 +- keyboards/xiudi/xd60/xd60.h | 21 ++- keyboards/ydkb/yd68/keymaps/default/keymap.c | 2 +- 71 files changed, 877 insertions(+), 840 deletions(-) diff --git a/keyboards/40percentclub/ut47/led.c b/keyboards/40percentclub/ut47/led.c index 867a6e2e2a3..fa431de760c 100644 --- a/keyboards/40percentclub/ut47/led.c +++ b/keyboards/40percentclub/ut47/led.c @@ -25,16 +25,14 @@ bool led_update_kb(led_t led_state) if (res) { if (led_state.caps_lock) { // output low - DDRB |= (1<<0); - PORTB &= ~(1<<0); - DDRD |= (1<<5); - PORTD &= ~(1<<5); + gpio_set_pin_output(B0); + gpio_write_pin_low(B0); + gpio_set_pin_output(D5); + gpio_write_pin_low(D5); } else { // Hi-Z - DDRB &= ~(1<<0); - PORTB &= ~(1<<0); - DDRD &= ~(1<<5); - PORTD &= ~(1<<5); + gpio_set_pin_input(B0); + gpio_set_pin_input(D5); } } return false; diff --git a/keyboards/40percentclub/ut47/matrix.c b/keyboards/40percentclub/ut47/matrix.c index 02ed88b7091..d803f11c5e4 100644 --- a/keyboards/40percentclub/ut47/matrix.c +++ b/keyboards/40percentclub/ut47/matrix.c @@ -126,14 +126,18 @@ void matrix_print(void) static void init_cols(void) { // Input with pull-up(DDR:0, PORT:1) - DDRF &= ~(1<<4 | 1<<5 | 1<<6 | 1<<7); - PORTF |= (1<<4 | 1<<5 | 1<<6 | 1<<7); - DDRE &= ~(1<<6); - PORTE |= (1<<6); - DDRD &= ~(1<<7); - PORTD |= (1<<7); - DDRB &= ~(1<<1 | 1<<2 | 1<<3 | 1<<4 | 1<<5 | 1<<6); - PORTB |= (1<<1 | 1<<2 | 1<<3 | 1<<4 | 1<<5 | 1<<6); + gpio_set_pin_input_high(F4); + gpio_set_pin_input_high(F5); + gpio_set_pin_input_high(F6); + gpio_set_pin_input_high(F7); + gpio_set_pin_input_high(E6); + gpio_set_pin_input_high(D7); + gpio_set_pin_input_high(B1); + gpio_set_pin_input_high(B2); + gpio_set_pin_input_high(B3); + gpio_set_pin_input_high(B4); + gpio_set_pin_input_high(B5); + gpio_set_pin_input_high(B6); } static matrix_row_t read_cols(void) @@ -160,10 +164,10 @@ static matrix_row_t read_cols(void) static void unselect_rows(void) { // Hi-Z(DDR:0, PORT:0) to unselect - DDRD &= ~0b00010011; - PORTD &= ~0b00010011; - DDRC &= ~0b01000000; - PORTC &= ~0b01000000; + gpio_set_pin_input(C6); + gpio_set_pin_input(D0); + gpio_set_pin_input(D1); + gpio_set_pin_input(D4); } static void select_row(uint8_t row) @@ -171,20 +175,20 @@ static void select_row(uint8_t row) // Output low(DDR:1, PORT:0) to select switch (row) { case 0: - DDRD |= (1<<1); - PORTD &= ~(1<<1); + gpio_set_pin_output(D1); + gpio_write_pin_low(D1); break; case 1: - DDRD |= (1<<0); - PORTD &= ~(1<<0); + gpio_set_pin_output(D0); + gpio_write_pin_low(D0); break; case 2: - DDRD |= (1<<4); - PORTD &= ~(1<<4); + gpio_set_pin_output(D4); + gpio_write_pin_low(D4); break; case 3: - DDRC |= (1<<6); - PORTC &= ~(1<<6); + gpio_set_pin_output(C6); + gpio_write_pin_low(C6); break; } } diff --git a/keyboards/amjkeyboard/amj96/matrix.c b/keyboards/amjkeyboard/amj96/matrix.c index 7faf40d4fe7..448508971fb 100644 --- a/keyboards/amjkeyboard/amj96/matrix.c +++ b/keyboards/amjkeyboard/amj96/matrix.c @@ -65,8 +65,8 @@ void matrix_init(void) #endif // 85 REST - DDRD |= _BV(PD7); - PORTD |= _BV(PD7); + gpio_set_pin_output(D7); + gpio_write_pin_high(D7); // initialize row and col init_rows(); @@ -143,36 +143,35 @@ static void init_cols(void) DDRD &= 0b00011100; PORTD |= 0b11100011; - DDRB &= ~(_BV(PB6) | _BV(PB7)| _BV(PB0)); - PORTB |= (_BV(PB6) | _BV(PB7)| _BV(PB0)); + gpio_set_pin_input_high(B0); + gpio_set_pin_input_high(B6); + gpio_set_pin_input_high(B7); - DDRE &= ~_BV(PE6); - PORTE |= _BV(PE6); + gpio_set_pin_input_high(E6); - DDRC &= ~_BV(PC7); - PORTC |= _BV(PC7); + gpio_set_pin_input_high(C7); } static matrix_row_t read_cols(void) { - return (PINF&_BV(PF7) ? 0 : (1<<0)) | - (PINF&_BV(PF6) ? 0 : (1<<1)) | - (PINF&_BV(PF5) ? 0 : (1<<2)) | - (PINF&_BV(PF4) ? 0 : (1<<3)) | - (PINF&_BV(PF1) ? 0 : (1<<4)) | - (PINF&_BV(PF0) ? 0 : (1<<5)) | - (PINE&_BV(PE6) ? 0 : (1<<6)) | - (PIND&_BV(PD7) ? 0 : (1<<7)) | - (PIND&_BV(PD6) ? 0 : (1<<8)) | - (PIND&_BV(PD5) ? 0 : (1<<9)) | - (PIND&_BV(PD1) ? 0 : (1<<10)) | - (PIND&_BV(PD0) ? 0 : (1<<11)) | - (PINB&_BV(PB7) ? 0 : (1<<12)) | - (PINB&_BV(PB6) ? 0 : (1<<13)) | - (PINB&_BV(PB0) ? 0 : (1<<14)) | - (PINC&_BV(PC7) ? 0 : (1<<15)); + return (gpio_read_pin(F7) ? 0 : (1<<0)) | + (gpio_read_pin(F6) ? 0 : (1<<1)) | + (gpio_read_pin(F5) ? 0 : (1<<2)) | + (gpio_read_pin(F4) ? 0 : (1<<3)) | + (gpio_read_pin(F1) ? 0 : (1<<4)) | + (gpio_read_pin(F0) ? 0 : (1<<5)) | + (gpio_read_pin(E6) ? 0 : (1<<6)) | + (gpio_read_pin(D7) ? 0 : (1<<7)) | + (gpio_read_pin(D6) ? 0 : (1<<8)) | + (gpio_read_pin(D5) ? 0 : (1<<9)) | + (gpio_read_pin(D1) ? 0 : (1<<10)) | + (gpio_read_pin(D0) ? 0 : (1<<11)) | + (gpio_read_pin(B7) ? 0 : (1<<12)) | + (gpio_read_pin(B6) ? 0 : (1<<13)) | + (gpio_read_pin(B0) ? 0 : (1<<14)) | + (gpio_read_pin(C7) ? 0 : (1<<15)); } /* Row pin configuration @@ -184,21 +183,23 @@ static matrix_row_t read_cols(void) static void init_rows(void) { - DDRB |= (1<> bit ; } @@ -138,18 +138,19 @@ void Matrix_ThrowByte(void) { void matrix_init (void) { // debug_matrix = 1; // PB0 (SS) and PB1 (SCLK) set to outputs - DDRB |= RESET | SCLK ; + gpio_set_pin_output(HP_46010A_RESET_PIN); + gpio_set_pin_output(HP_46010A_SCLK_PIN); // PB2, is unused, and PB3 is our serial input - DDRB &= ~SDATA ; + gpio_set_pin_input(HP_46010A_SDATA_PIN); // SS is reset for this board, and is active High // SCLK is the serial clock and is active High - PORTB &= ~RESET ; - PORTB |= SCLK ; + gpio_write_pin_low(HP_46010A_RESET_PIN); + gpio_write_pin_high(HP_46010A_SCLK_PIN); // led pin - DDRD |= LED ; - PORTD &= ~LED ; + gpio_set_pin_output(HP_46010A_LED_PIN); + gpio_write_pin_low(HP_46010A_LED_PIN); matrix_init_kb(); diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c index 6d52d5cd6c5..93354ee114b 100644 --- a/keyboards/converter/sun_usb/matrix.c +++ b/keyboards/converter/sun_usb/matrix.c @@ -74,8 +74,8 @@ uint8_t matrix_cols(void) void matrix_init(void) { - /* DDRD |= (1<<6); */ - /* PORTD |= (1<<6); */ + /* gpio_set_pin_output(D6); */ + /* gpio_write_pin_high(D6); */ debug_enable = true; uart_init(1200); @@ -99,7 +99,7 @@ void matrix_init(void) /* } */ /* print(" Done\n"); */ - /* PORTD &= ~(1<<6); */ + /* gpio_write_pin_low(D6) */ matrix_init_kb(); return; diff --git a/keyboards/crawlpad/keymaps/default/keymap.c b/keyboards/crawlpad/keymaps/default/keymap.c index 547132bb7dd..306ade6e5f8 100755 --- a/keyboards/crawlpad/keymaps/default/keymap.c +++ b/keyboards/crawlpad/keymaps/default/keymap.c @@ -40,32 +40,16 @@ void set_led(int idx, bool enable) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case BL1: - if (record->event.pressed) { - PORTB |= (1 << 4); - } else { - PORTB &= ~(1 << 4); - } + gpio_write_pin(B4, record->event.pressed); return false; case BL2: - if (record->event.pressed) { - PORTB |= (1 << 5); - } else { - PORTB &= ~(1 << 5); - } + gpio_write_pin(B5, record->event.pressed); return false; case BL3: - if (record->event.pressed) { - PORTB |= (1 << 6); - } else { - PORTB &= ~(1 << 6); - } + gpio_write_pin(B6, record->event.pressed); return false; case BL4: - if (record->event.pressed) { - PORTB |= (1 << 7); - } else { - PORTB &= ~(1 << 7); - } + gpio_write_pin(B7, record->event.pressed); return false; } return true; @@ -73,6 +57,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { void matrix_init_user(void) { /* set LED row pins to output and low */ - DDRB |= (1 << 4) | (1 << 5) | (1 << 6) | (1 << 7); - PORTB &= ~(1 << 4) & ~(1 << 5) & ~(1 << 6) & ~(1 << 7); + gpio_set_pin_output(B4); + gpio_set_pin_output(B5); + gpio_set_pin_output(B6); + gpio_set_pin_output(B7); + + gpio_write_pin_low(B4); + gpio_write_pin_low(B5); + gpio_write_pin_low(B6); + gpio_write_pin_low(B7); } diff --git a/keyboards/do60/do60.h b/keyboards/do60/do60.h index de64b8f134d..5aa9c17f2ea 100644 --- a/keyboards/do60/do60.h +++ b/keyboards/do60/do60.h @@ -2,6 +2,9 @@ #include "quantum.h" +#define DO60_CAPS_LOCK_LED_PIN B2 +#define DO60_BACKLIGHT_PIN F4 + /* DO60 LEDs * GPIO pads * 0 F7 not connected @@ -13,11 +16,21 @@ */ /* -inline void do60_caps_led_on(void) { DDRB |= (1<<2); PORTB &= ~(1<<2); } -inline void do60_bl_led_on(void) { DDRF |= (1<<4); PORTF &= ~(1<<4); } +inline void do60_caps_led_on(void) { + gpio_set_pin_output(DO60_CAPS_LOCK_LED_PIN); + gpio_write_pin_low(DO60_CAPS_LOCK_LED_PIN); +} +inline void do60_bl_led_on(void) { + gpio_set_pin_output(DO60_BACKLIGHT_PIN); + gpio_write_pin_low(DO60_BACKLIGHT_PIN); +} -inline void do60_caps_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } -inline void do60_bl_led_off(void) { DDRF &= ~(1<<4); PORTF &= ~(1<<4); } +inline void do60_caps_led_off(void) { + gpio_set_pin_input(DO60_CAPS_LOCK_LED_PIN); +} +inline void do60_bl_led_off(void) { + gpio_set_pin_input(DO60_BACKLIGHT_PIN); +} */ inline void setdefaultrgb(void){ rgblight_sethsv(100,100,100); } diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c index 5270738f86d..5fc173917fd 100644 --- a/keyboards/ergodox_ez/ergodox_ez.c +++ b/keyboards/ergodox_ez/ergodox_ez.c @@ -24,13 +24,11 @@ extern inline void ergodox_board_led_on(void); extern inline void ergodox_right_led_1_on(void); extern inline void ergodox_right_led_2_on(void); extern inline void ergodox_right_led_3_on(void); -extern inline void ergodox_right_led_on(uint8_t led); extern inline void ergodox_board_led_off(void); extern inline void ergodox_right_led_1_off(void); extern inline void ergodox_right_led_2_off(void); extern inline void ergodox_right_led_3_off(void); -extern inline void ergodox_right_led_off(uint8_t led); extern inline void ergodox_led_all_on(void); extern inline void ergodox_led_all_off(void); @@ -53,17 +51,14 @@ void matrix_init_kb(void) { TCCR1B = 0b00001001; // set and configure fast PWM // (tied to Vcc for hardware convenience) - DDRB &= ~(1 << 4); // set B(4) as input - PORTB &= ~(1 << 4); // set B(4) internal pull-up disabled + gpio_set_pin_input(B4); // set B(4) as input, internal pull-up disabled - // unused pins - C7, D4, D5, D7, E6 + // unused pins - C7, D4, D5, E6 // set as input with internal pull-up enabled - DDRC &= ~(1 << 7); - DDRD &= ~(1 << 5 | 1 << 4); - DDRE &= ~(1 << 6); - PORTC |= (1 << 7); - PORTD |= (1 << 5 | 1 << 4); - PORTE |= (1 << 6); + gpio_set_pin_input_high(C7); + gpio_set_pin_input_high(D4); + gpio_set_pin_input_high(D5); + gpio_set_pin_input_high(E6); keyboard_config.raw = eeconfig_read_kb(); ergodox_led_all_set((uint8_t)keyboard_config.led_level * 255 / 4); diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h index df2dbed7157..3938ff49f16 100644 --- a/keyboards/ergodox_ez/ergodox_ez.h +++ b/keyboards/ergodox_ez/ergodox_ez.h @@ -51,18 +51,40 @@ uint8_t ergodox_left_leds_update(void); #define LED_BRIGHTNESS_HI 255 #endif +#define ERGODOX_EZ_BOARD_LED_PIN D6 +#define ERGODOX_EZ_RIGHT_LED_1_PIN B5 +#define ERGODOX_EZ_RIGHT_LED_2_PIN B6 +#define ERGODOX_EZ_RIGHT_LED_3_PIN B7 -inline void ergodox_board_led_on(void) { DDRD |= (1<<6); PORTD |= (1<<6); } -inline void ergodox_right_led_1_on(void) { DDRB |= (1<<5); PORTB |= (1<<5); } -inline void ergodox_right_led_2_on(void) { DDRB |= (1<<6); PORTB |= (1<<6); } -inline void ergodox_right_led_3_on(void) { DDRB |= (1<<7); PORTB |= (1<<7); } -inline void ergodox_right_led_on(uint8_t led) { DDRB |= (1<<(led+4)); PORTB |= (1<<(led+4)); } +inline void ergodox_board_led_on(void) { + gpio_set_pin_output(ERGODOX_EZ_BOARD_LED_PIN); + gpio_write_pin_high(ERGODOX_EZ_BOARD_LED_PIN); +} +inline void ergodox_right_led_1_on(void) { + gpio_set_pin_output(ERGODOX_EZ_RIGHT_LED_1_PIN); + gpio_write_pin_high(ERGODOX_EZ_RIGHT_LED_1_PIN); +} +inline void ergodox_right_led_2_on(void) { + gpio_set_pin_output(ERGODOX_EZ_RIGHT_LED_2_PIN); + gpio_write_pin_high(ERGODOX_EZ_RIGHT_LED_2_PIN); +} +inline void ergodox_right_led_3_on(void) { + gpio_set_pin_output(ERGODOX_EZ_RIGHT_LED_3_PIN); + gpio_write_pin_high(ERGODOX_EZ_RIGHT_LED_3_PIN); +} -inline void ergodox_board_led_off(void) { DDRD &= ~(1<<6); PORTD &= ~(1<<6); } -inline void ergodox_right_led_1_off(void) { DDRB &= ~(1<<5); PORTB &= ~(1<<5); } -inline void ergodox_right_led_2_off(void) { DDRB &= ~(1<<6); PORTB &= ~(1<<6); } -inline void ergodox_right_led_3_off(void) { DDRB &= ~(1<<7); PORTB &= ~(1<<7); } -inline void ergodox_right_led_off(uint8_t led) { DDRB &= ~(1<<(led+4)); PORTB &= ~(1<<(led+4)); } +inline void ergodox_board_led_off(void) { + gpio_set_pin_input(ERGODOX_EZ_BOARD_LED_PIN); +} +inline void ergodox_right_led_1_off(void) { + gpio_set_pin_input(ERGODOX_EZ_RIGHT_LED_1_PIN); +} +inline void ergodox_right_led_2_off(void) { + gpio_set_pin_input(ERGODOX_EZ_RIGHT_LED_2_PIN); +} +inline void ergodox_right_led_3_off(void) { + gpio_set_pin_input(ERGODOX_EZ_RIGHT_LED_3_PIN); +} #ifdef LEFT_LEDS bool ergodox_left_led_1; diff --git a/keyboards/gboards/ergotaco/ergotaco.c b/keyboards/gboards/ergotaco/ergotaco.c index 6795dfde4f2..1e526f15e29 100644 --- a/keyboards/gboards/ergotaco/ergotaco.c +++ b/keyboards/gboards/ergotaco/ergotaco.c @@ -5,25 +5,30 @@ i2c_status_t mcp23018_status = 0x20; void matrix_init_kb(void) { // (tied to Vcc for hardware convenience) - //DDRB &= ~(1<<4); // set B(4) as input - //PORTB &= ~(1<<4); // set B(4) internal pull-up disabled + //gpio_set_pin_input(B4); // set B(4) as input, internal pull-up disabled // unused pins // set as input with internal pull-up enabled - DDRB &= ~(1<<4 | 1<<5 | 1<<6 | 1<<7); - PORTB |= (1<<4 | 1<<5 | 1<<6 | 1<<7); + gpio_set_pin_input_high(B4); + gpio_set_pin_input_high(B5); + gpio_set_pin_input_high(B6); + gpio_set_pin_input_high(B7); - DDRC &= ~(1<<7 | 1<<6); - PORTC |= (1<<7 | 1<<6); + gpio_set_pin_input_high(C6); + gpio_set_pin_input_high(C7); - DDRD &= ~(1<<4 | 1<<5 | 1<<6 | 1<<7); - PORTD |= (1<<4 | 1<<5 | 1<<6 | 1<<7); + gpio_set_pin_input_high(D4); + gpio_set_pin_input_high(D5); + gpio_set_pin_input_high(D6); + gpio_set_pin_input_high(D7); - DDRE &= ~(1<<6); - PORTE |= (1<<6); + gpio_set_pin_input_high(E6); - DDRF &= ~(1<<0 | 1<<1 | 1<<4 | 1<<6 | 1<<7); - PORTF |= (1<<0 | 1<<1 | 1<<4 | 1<<6 | 1<<7); + gpio_set_pin_input_high(D0); + gpio_set_pin_input_high(D1); + gpio_set_pin_input_high(D4); + gpio_set_pin_input_high(D6); + gpio_set_pin_input_high(D7); matrix_init_user(); } diff --git a/keyboards/gboards/georgi/georgi.c b/keyboards/gboards/georgi/georgi.c index 44b7067b475..da88e6ed8ba 100644 --- a/keyboards/gboards/georgi/georgi.c +++ b/keyboards/gboards/georgi/georgi.c @@ -7,17 +7,16 @@ void matrix_init_kb(void) { steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT // (tied to Vcc for hardware convenience) - //DDRB &= ~(1<<4); // set B(4) as input - //PORTB &= ~(1<<4); // set B(4) internal pull-up disabled + //gpio_set_pin_input(B4); // set B(4) as input, internal pull-up disabled - // unused pins - C7, D4, D5, D7, E6 + // unused pins - C7, D4, D5, D6, D7, E6 // set as input with internal pull-up enabled - DDRC &= ~(1<<7); - DDRD &= ~(1<<5 | 1<<4 | 1<<6 | 1<<7); - DDRE &= ~(1<<6); - PORTC |= (1<<7); - PORTD |= (1<<5 | 1<<4 | 1<<6 | 1<<7); - PORTE |= (1<<6); + gpio_set_pin_input_high(C7); + gpio_set_pin_input_high(D4); + gpio_set_pin_input_high(D5); + gpio_set_pin_input_high(D6); + gpio_set_pin_input_high(D7); + gpio_set_pin_input_high(E6); matrix_init_user(); } diff --git a/keyboards/gboards/gergo/gergo.c b/keyboards/gboards/gergo/gergo.c index fa73c4b42f5..1ec6105eeb6 100644 --- a/keyboards/gboards/gergo/gergo.c +++ b/keyboards/gboards/gergo/gergo.c @@ -5,17 +5,16 @@ i2c_status_t mcp23018_status = 0x20; void matrix_init_kb(void) { // (tied to Vcc for hardware convenience) - //DDRB &= ~(1<<4); // set B(4) as input - //PORTB &= ~(1<<4); // set B(4) internal pull-up disabled + //gpio_set_pin_input(B4); // set B(4) as input, internal pull-up disabled - // unused pins - C7, D4, D5, D7, E6 + // unused pins - C7, D4, D5, D6, D7, E6 // set as input with internal pull-up enabled - DDRC &= ~(1<<7); - DDRD &= ~(1<<5 | 1<<4 | 1<<6 | 1<<7); - DDRE &= ~(1<<6); - PORTC |= (1<<7); - PORTD |= (1<<5 | 1<<4 | 1<<6 | 1<<7); - PORTE |= (1<<6); + gpio_set_pin_input_high(C7); + gpio_set_pin_input_high(D4); + gpio_set_pin_input_high(D5); + gpio_set_pin_input_high(D6); + gpio_set_pin_input_high(D7); + gpio_set_pin_input_high(E6); matrix_init_user(); } diff --git a/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c b/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c index a949b11941e..54fdb3400d3 100644 --- a/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c +++ b/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c @@ -11,4 +11,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ) }; - diff --git a/keyboards/gh80_3000/keymaps/default/keymap.c b/keyboards/gh80_3000/keymaps/default/keymap.c index 08f43c1d685..4a54df83cc0 100644 --- a/keyboards/gh80_3000/keymaps/default/keymap.c +++ b/keyboards/gh80_3000/keymaps/default/keymap.c @@ -11,4 +11,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PCMM, KC_PDOT, KC_PENT ) }; - diff --git a/keyboards/gh80_3000/keymaps/iso_default/keymap.c b/keyboards/gh80_3000/keymaps/iso_default/keymap.c index ff2b373a544..b3433eb21a5 100644 --- a/keyboards/gh80_3000/keymaps/iso_default/keymap.c +++ b/keyboards/gh80_3000/keymaps/iso_default/keymap.c @@ -11,4 +11,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PCMM, KC_PDOT, KC_PENT ) }; - diff --git a/keyboards/gh80_3000/keymaps/iso_std/keymap.c b/keyboards/gh80_3000/keymaps/iso_std/keymap.c index 7783aae0a9f..26fbb855e83 100644 --- a/keyboards/gh80_3000/keymaps/iso_std/keymap.c +++ b/keyboards/gh80_3000/keymaps/iso_std/keymap.c @@ -11,4 +11,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ) }; - diff --git a/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c b/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c index 9108f6aba41..4d20f5a402e 100644 --- a/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c +++ b/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c @@ -11,4 +11,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ) }; - diff --git a/keyboards/glenpickle/chimera_ergo/chimera_ergo.c b/keyboards/glenpickle/chimera_ergo/chimera_ergo.c index 47653c2e4b6..40748e0b3d2 100644 --- a/keyboards/glenpickle/chimera_ergo/chimera_ergo.c +++ b/keyboards/glenpickle/chimera_ergo/chimera_ergo.c @@ -1,10 +1,12 @@ #include "chimera_ergo.h" void led_init(void) { - DDRD |= (1<<1); - PORTD |= (1<<1); - DDRF |= (1<<4) | (1<<5); - PORTF |= (1<<4) | (1<<5); + gpio_set_pin_output(CHIMERA_ERGO_GREEN_LED_PIN); + gpio_write_pin_high(CHIMERA_ERGO_GREEN_LED_PIN); + gpio_set_pin_output(CHIMERA_ERGO_BLUE_LED_PIN); + gpio_write_pin_high(CHIMERA_ERGO_BLUE_LED_PIN); + gpio_set_pin_output(CHIMERA_ERGO_RED_LED_PIN); + gpio_write_pin_high(CHIMERA_ERGO_RED_LED_PIN); } diff --git a/keyboards/glenpickle/chimera_ergo/chimera_ergo.h b/keyboards/glenpickle/chimera_ergo/chimera_ergo.h index 04ef56503ff..46f0b931e8a 100644 --- a/keyboards/glenpickle/chimera_ergo/chimera_ergo.h +++ b/keyboards/glenpickle/chimera_ergo/chimera_ergo.h @@ -2,12 +2,16 @@ #include "quantum.h" -#define red_led_off PORTF |= (1<<5) -#define red_led_on PORTF &= ~(1<<5) -#define blu_led_off PORTF |= (1<<4) -#define blu_led_on PORTF &= ~(1<<4) -#define grn_led_off PORTD |= (1<<1) -#define grn_led_on PORTD &= ~(1<<1) +#define CHIMERA_ERGO_RED_LED_PIN F5 +#define CHIMERA_ERGO_GREEN_LED_PIN D1 +#define CHIMERA_ERGO_BLUE_LED_PIN F4 + +#define red_led_off gpio_write_pin_high(CHIMERA_ERGO_RED_LED_PIN) +#define red_led_on gpio_write_pin_low(CHIMERA_ERGO_RED_LED_PIN) +#define blu_led_off gpio_write_pin_high(CHIMERA_ERGO_BLUE_LED_PIN) +#define blu_led_on gpio_write_pin_low(CHIMERA_ERGO_BLUE_LED_PIN) +#define grn_led_off gpio_write_pin_high(CHIMERA_ERGO_GREEN_LED_PIN) +#define grn_led_on gpio_write_pin_low(CHIMERA_ERGO_GREEN_LED_PIN) #define set_led_off red_led_off; grn_led_off; blu_led_off #define set_led_red red_led_on; grn_led_off; blu_led_off @@ -17,27 +21,3 @@ #define set_led_magenta red_led_on; grn_led_off; blu_led_on #define set_led_cyan red_led_off; grn_led_on; blu_led_on #define set_led_white red_led_on; grn_led_on; blu_led_on - -/* -#define LED_B 5 -#define LED_R 6 -#define LED_G 7 - -#define all_leds_off PORTF &= ~(1<event.pressed) { - PORTC |= (1 << 6); // PC6 goes high + gpio_write_pin_high(C6); } return true; case TO(OSY): if (record->event.pressed) { - PORTC &= ~(1 << 6); // PC6 goes high - PORTD |= (1<<4); + gpio_write_pin_low(C6); + gpio_write_pin_high(D4); } return true; case TO(DEF): if (record->event.pressed) { - PORTD &= ~(1 << 4); // PC6 goes high + gpio_write_pin_low(D4); } return true; diff --git a/keyboards/handwired/retro_refit/retro_refit.c b/keyboards/handwired/retro_refit/retro_refit.c index b7e1ec03fa2..f23ef1fd404 100644 --- a/keyboards/handwired/retro_refit/retro_refit.c +++ b/keyboards/handwired/retro_refit/retro_refit.c @@ -6,8 +6,8 @@ void matrix_init_kb(void) { // runs once when the firmware starts up // Disable status LED on KB, enable status LED on Teensy (KB_STATUS = !TEENSY_STATUS) - DDRD |= (1<<6); - PORTD |= (1<<6); + gpio_set_pin_output(D6); + gpio_write_pin_high(D6); matrix_init_user(); }; diff --git a/keyboards/hotdox/hotdox.h b/keyboards/hotdox/hotdox.h index b9333444393..d0b6c401f94 100644 --- a/keyboards/hotdox/hotdox.h +++ b/keyboards/hotdox/hotdox.h @@ -4,17 +4,46 @@ #include #include +#define HOTDOX_BOARD_LED_PIN B7 +#define HOTDOX_RIGHT_LED_1_PIN B5 +#define HOTDOX_RIGHT_LED_2_PIN B6 +#define HOTDOX_RIGHT_LED_3_PIN B4 + void init_ergodox(void); -inline void ergodox_board_led_on(void) { DDRB |= (1< #include #include -#include // LUFA #include "lufa.h" @@ -9,6 +7,8 @@ #include "sendchar.h" #include "debug.h" #include "keyboard.h" +#include "gpio.h" +#include "wait.h" #include "led.h" /* LED ping configuration */ @@ -16,16 +16,16 @@ //#define LEONARDO_LED #if defined(TMK_LED) // For TMK converter and Teensy -#define LED_TX_INIT (DDRD |= (1<<6)) -#define LED_TX_ON (PORTD |= (1<<6)) -#define LED_TX_OFF (PORTD &= ~(1<<6)) -#define LED_TX_TOGGLE (PORTD ^= (1<<6)) +#define LED_TX_INIT gpio_set_pin_output(D6) +#define LED_TX_ON gpio_write_pin_high(D6) +#define LED_TX_OFF gpio_write_pin_low(D6) +#define LED_TX_TOGGLE gpio_toggle_pin(D6) #elif defined(LEONARDO_LED) // For Leonardo(TX LED) -#define LED_TX_INIT (DDRD |= (1<<5)) -#define LED_TX_ON (PORTD &= ~(1<<5)) -#define LED_TX_OFF (PORTD |= (1<<5)) -#define LED_TX_TOGGLE (PORTD ^= (1<<5)) +#define LED_TX_INIT gpio_set_pin_output(D5) +#define LED_TX_ON gpio_write_pin_low(D5) +#define LED_TX_OFF gpio_write_pin_high(D5) +#define LED_TX_TOGGLE gpio_toggle_pin(D5) #else #define LED_TX_INIT #define LED_TX_ON diff --git a/keyboards/sixkeyboard/matrix.c b/keyboards/sixkeyboard/matrix.c index ddbd41ac553..24cb647297e 100644 --- a/keyboards/sixkeyboard/matrix.c +++ b/keyboards/sixkeyboard/matrix.c @@ -71,13 +71,12 @@ uint8_t matrix_cols(void) void matrix_init(void) { - - DDRC &= ~(1<<7); - PORTC |= (1<<7); - DDRB &= ~(1<<7 | 1<<5); - PORTB |= (1<<7 | 1<<5); - DDRD &= ~(1<<6 | 1<<4 | 1<<1); - PORTD |= (1<<6 | 1<<4 | 1<<1); + gpio_set_pin_input_high(C7); + gpio_set_pin_input_high(B5); + gpio_set_pin_input_high(B7); + gpio_set_pin_input_high(D1); + gpio_set_pin_input_high(D4); + gpio_set_pin_input_high(D6); for (uint8_t i=0; i < MATRIX_ROWS; i++) { matrix[i] = 0; diff --git a/keyboards/sixkeyboard/sixkeyboard.c b/keyboards/sixkeyboard/sixkeyboard.c index 7667ee7f44b..5a5c818d13f 100644 --- a/keyboards/sixkeyboard/sixkeyboard.c +++ b/keyboards/sixkeyboard/sixkeyboard.c @@ -4,27 +4,26 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - DDRC |= (1<<4); - PORTC &= ~(1<<4); + gpio_set_pin_output(C4); + gpio_write_pin_low(C4); + gpio_set_pin_output(C6); + gpio_write_pin_low(C6); - DDRC |= (1<<6); - PORTC &= ~(1<<6); + gpio_set_pin_output(B6); + gpio_write_pin_low(B6); - DDRB |= (1<<6); - PORTB &= ~(1<<6); + gpio_set_pin_output(B4); + gpio_write_pin_low(B4); - DDRB |= (1<<4); - PORTB &= ~(1<<4); + gpio_set_pin_output(D5); + gpio_write_pin_low(D5); - DDRD |= (1<<5); - PORTD &= ~(1<<5); + gpio_set_pin_output(D2); + gpio_write_pin_low(D2); - DDRD |= (1<<2); - PORTD &= ~(1<<2); - - DDRD |= (1<<3); - PORTD &= ~(1<<3); + gpio_set_pin_output(D3); + gpio_write_pin_low(D3); matrix_init_user(); }; \ No newline at end of file diff --git a/keyboards/tmo50/tmo50.c b/keyboards/tmo50/tmo50.c index 80eb286f45c..635b9db0036 100644 --- a/keyboards/tmo50/tmo50.c +++ b/keyboards/tmo50/tmo50.c @@ -19,14 +19,14 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - DDRB |= (1 << PB0); //init B0 - PORTB &= ~(1 << PB0); //turn on B0 - DDRB |= (1 << PB1); - PORTB |= (1<. #define RGB_STEP 16 -#define RGB_RED_PIN PF6 -#define RGB_GREEN_PIN PF5 -#define RGB_BLUE_PIN PF4 +#define RGB_RED_PIN F6 +#define RGB_GREEN_PIN F5 +#define RGB_BLUE_PIN F4 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/v60_type_r/v60_type_r.c b/keyboards/v60_type_r/v60_type_r.c index 540c5ec6ecf..6bace804e2b 100644 --- a/keyboards/v60_type_r/v60_type_r.c +++ b/keyboards/v60_type_r/v60_type_r.c @@ -115,18 +115,22 @@ void rgb_timer_init(void) { } void rgb_init(void) { - DDRF |= (_BV(PF6) | _BV(PF5) | _BV(PF4)); - PORTF |= (_BV(PF6) | _BV(PF5) | _BV(PF4)); + gpio_set_pin_output(F4); + gpio_set_pin_output(F5); + gpio_set_pin_output(F6); + gpio_write_pin_high(F4); + gpio_write_pin_high(F5); + gpio_write_pin_high(F6); rgb_timer_init(); } -void set_rgb_pin_on(uint8_t pin) { - PORTF &= ~_BV(pin); +void set_rgb_pin_on(pin_t pin) { + gpio_write_pin_low(pin); } -void set_rgb_pin_off(uint8_t pin) { - PORTF |= _BV(pin); +void set_rgb_pin_off(pin_t pin) { + gpio_write_pin_high(pin); } ISR(TIMER3_COMPA_vect) diff --git a/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c b/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c index e5fb6bf9025..ad63d050233 100644 --- a/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c +++ b/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c @@ -23,24 +23,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; bool led_update_user(led_t led_state) { - DDRB |= (1 << 4) | (1 << 5) | (1 << 6); + gpio_set_pin_output(B4); + gpio_set_pin_output(B5); + gpio_set_pin_output(B6); - if (led_state.num_lock) { - PORTB |= (1 << 4); - } else { - PORTB &= ~(1 << 4); - } + gpio_write_pin(B4, led_state.num_lock); + gpio_write_pin(B5, led_state.caps_lock); + gpio_write_pin(B6, led_state.scroll_lock); - if (led_state.caps_lock) { - PORTB |= (1 << 5); - } else { - PORTB &= ~(1 << 5); - } - - if (led_state.scroll_lock) { - PORTB |= (1 << 6); - } else { - PORTB &= ~(1 << 6); - } return false; } diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c index 02bcdd610be..936286c2eef 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight.c +++ b/keyboards/wilba_tech/wt_rgb_backlight.c @@ -2629,15 +2629,12 @@ void backlight_debug_led( bool state ) { if (state) { - // Output high. - DDRE |= (1<<6); - PORTE |= (1<<6); + gpio_set_pin_output(E6); + gpio_write_pin_high(E6); } else { - // Output low. - DDRE &= ~(1<<6); - PORTE &= ~(1<<6); + gpio_set_pin_input(E6); } } #endif // defined(RGB_DEBUGGING_ONLY) diff --git a/keyboards/xiudi/xd60/xd60.h b/keyboards/xiudi/xd60/xd60.h index 3d3c1ae885c..c399b2965d3 100644 --- a/keyboards/xiudi/xd60/xd60.h +++ b/keyboards/xiudi/xd60/xd60.h @@ -2,6 +2,9 @@ #include "quantum.h" +#define XD60_CAPS_LOCK_LED_PIN B2 +#define XD60_BACKLIGHT_PIN F5 + /* XD60 LEDs * GPIO pads * 0 F7 not connected @@ -11,8 +14,18 @@ * B2 Capslock LED * B0 not connected */ -inline void xd60_caps_led_on(void) { DDRB |= (1<<2); PORTB &= ~(1<<2); } -inline void xd60_bl_led_on(void) { DDRF |= (1<<5); PORTF &= ~(1<<5); } +inline void xd60_caps_led_on(void) { + gpio_set_pin_output(XD60_CAPS_LOCK_LED_PIN); + gpio_write_pin_low(XD60_CAPS_LOCK_LED_PIN); +} +inline void xd60_bl_led_on(void) { + gpio_set_pin_output(XD60_BACKLIGHT_PIN); + gpio_write_pin_low(XD60_BACKLIGHT_PIN); +} -inline void xd60_caps_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } -inline void xd60_bl_led_off(void) { DDRF &= ~(1<<5); PORTF &= ~(1<<5); } +inline void xd60_caps_led_off(void) { + gpio_set_pin_input(XD60_CAPS_LOCK_LED_PIN); +} +inline void xd60_bl_led_off(void) { + gpio_set_pin_input(XD60_BACKLIGHT_PIN); +} diff --git a/keyboards/ydkb/yd68/keymaps/default/keymap.c b/keyboards/ydkb/yd68/keymaps/default/keymap.c index 45b3144b9c1..44fe57da6af 100644 --- a/keyboards/ydkb/yd68/keymaps/default/keymap.c +++ b/keyboards/ydkb/yd68/keymaps/default/keymap.c @@ -43,7 +43,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case YD68_RGB_PWR: if (record->event.pressed) { // when keycode YD68_RGB_PWR is pressed - PORTE ^= (1<<2); + gpio_toggle_pin(E2); } else { // when keycode YD68_RGB_PWR is released } From 29a4e5c50b9cc828ea0a14a7c2cbe8d309a19079 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 2 May 2024 03:02:38 -0700 Subject: [PATCH 235/333] N86: Layout Data Correction (#23644) * Correct `LAYOUT_all` data Corrects incorrect key sizes and positioning. * Correct `LAYOUT_tkl_ansi_tsangan` data Corrects incorrect matrix assignments on the bottom row. * Correct `LAYOUT_tkl_ansi_tsangan_split_bs_rshift` data Corrects incorrect matrix assignments on the bottom row. * Set `LAYOUT_all` as an alias Sets `LAYOUT_all` as an alias for `LAYOUT_tkl_ansi_tsangan_split_bs_rshift`, because the layout and matrix data for these two macros is identical. --- keyboards/era/linx3/n86/info.json | 109 +++--------------------------- 1 file changed, 10 insertions(+), 99 deletions(-) diff --git a/keyboards/era/linx3/n86/info.json b/keyboards/era/linx3/n86/info.json index 40e1f78baaa..c0b8b5525a1 100644 --- a/keyboards/era/linx3/n86/info.json +++ b/keyboards/era/linx3/n86/info.json @@ -171,100 +171,11 @@ "driver": "vendor", "pin": "GP4" }, + "layout_aliases": { + "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan_split_bs_rshift" + }, "community_layouts": ["tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift"], "layouts": { - "LAYOUT_all": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 2], "x": 2.25, "y": 0}, - {"matrix": [0, 3], "x": 3.25, "y": 0}, - {"matrix": [0, 4], "x": 4.25, "y": 0}, - {"matrix": [0, 5], "x": 5.5, "y": 0}, - {"matrix": [0, 6], "x": 6.5, "y": 0}, - {"matrix": [0, 7], "x": 7.5, "y": 0}, - {"matrix": [0, 8], "x": 8.5, "y": 0}, - {"matrix": [0, 9], "x": 9.75, "y": 0}, - {"matrix": [0, 10], "x": 10.75, "y": 0}, - {"matrix": [0, 11], "x": 11.75, "y": 0}, - {"matrix": [0, 12], "x": 12.75, "y": 0}, - {"matrix": [0, 13], "x": 14, "y": 0}, - {"matrix": [0, 14], "x": 15.25, "y": 0}, - {"matrix": [0, 15], "x": 16.25, "y": 0}, - {"matrix": [0, 16], "x": 17.25, "y": 0}, - {"matrix": [1, 0], "x": 0, "y": 1.25}, - {"matrix": [1, 1], "x": 1, "y": 1.25}, - {"matrix": [1, 2], "x": 2, "y": 1.25}, - {"matrix": [1, 3], "x": 3, "y": 1.25}, - {"matrix": [1, 4], "x": 4, "y": 1.25}, - {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"matrix": [1, 6], "x": 6, "y": 1.25}, - {"matrix": [1, 7], "x": 7, "y": 1.25}, - {"matrix": [1, 8], "x": 8, "y": 1.25}, - {"matrix": [1, 9], "x": 9, "y": 1.25}, - {"matrix": [1, 10], "x": 10, "y": 1.25}, - {"matrix": [1, 11], "x": 11, "y": 1.25}, - {"matrix": [1, 12], "x": 12, "y": 1.25}, - {"matrix": [1, 13], "x": 13, "y": 1.25}, - {"matrix": [1, 14], "x": 14, "y": 1.25}, - {"matrix": [2, 14], "x": 15.25, "y": 1.25}, - {"matrix": [1, 15], "x": 16.25, "y": 1.25}, - {"matrix": [1, 16], "x": 17.25, "y": 1.25}, - {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, - {"matrix": [2, 1], "x": 1.5, "y": 2.25}, - {"matrix": [2, 2], "x": 2.5, "y": 2.25}, - {"matrix": [2, 3], "x": 3.5, "y": 2.25}, - {"matrix": [2, 4], "x": 4.5, "y": 2.25}, - {"matrix": [2, 5], "x": 5.5, "y": 2.25}, - {"matrix": [2, 6], "x": 6.5, "y": 2.25}, - {"matrix": [2, 7], "x": 7.5, "y": 2.25}, - {"matrix": [2, 8], "x": 8.5, "y": 2.25}, - {"matrix": [2, 9], "x": 9.5, "y": 2.25}, - {"matrix": [2, 10], "x": 10.5, "y": 2.25}, - {"matrix": [2, 11], "x": 11.5, "y": 2.25}, - {"matrix": [2, 12], "x": 12.5, "y": 2.25}, - {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, - {"matrix": [3, 14], "x": 15.25, "y": 2.25}, - {"matrix": [2, 15], "x": 16.25, "y": 2.25}, - {"matrix": [2, 16], "x": 17.25, "y": 2.25}, - {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, - {"matrix": [3, 1], "x": 1.75, "y": 3.25}, - {"matrix": [3, 2], "x": 2.75, "y": 3.25}, - {"matrix": [3, 3], "x": 3.75, "y": 3.25}, - {"matrix": [3, 4], "x": 4.75, "y": 3.25}, - {"matrix": [3, 5], "x": 5.75, "y": 3.25}, - {"matrix": [3, 6], "x": 6.75, "y": 3.25}, - {"matrix": [3, 7], "x": 7.75, "y": 3.25}, - {"matrix": [3, 8], "x": 8.75, "y": 3.25}, - {"matrix": [3, 9], "x": 9.75, "y": 3.25}, - {"matrix": [3, 10], "x": 11.75, "y": 3.25}, - {"matrix": [3, 11], "x": 12.75, "y": 3.25}, - {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, - {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, - {"matrix": [4, 2], "x": 2.25, "y": 4.25}, - {"matrix": [4, 3], "x": 3.25, "y": 4.25}, - {"matrix": [4, 4], "x": 4.25, "y": 4.25}, - {"matrix": [4, 5], "x": 5.25, "y": 4.25}, - {"matrix": [4, 6], "x": 6.25, "y": 4.25}, - {"matrix": [4, 7], "x": 7.25, "y": 4.25}, - {"matrix": [4, 8], "x": 8.25, "y": 4.25}, - {"matrix": [4, 9], "x": 9.25, "y": 4.25}, - {"matrix": [4, 10], "x": 10.25, "y": 4.25}, - {"matrix": [4, 11], "x": 11.25, "y": 4.25}, - {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, - {"matrix": [4, 13], "x": 14, "y": 4.25}, - {"matrix": [4, 15], "x": 16.25, "y": 4.25}, - {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, - {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1}, - {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, - {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7}, - {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5}, - {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1}, - {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, - {"matrix": [5, 14], "x": 15.25, "y": 5.25}, - {"matrix": [5, 15], "x": 16.25, "y": 5.25}, - {"matrix": [5, 16], "x": 17.25, "y": 5.25} - ] - }, "LAYOUT_tkl_ansi_tsangan": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, @@ -346,9 +257,9 @@ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, {"matrix": [5, 1], "x": 1.5, "y": 5.25}, {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, - {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, - {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, - {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 12], "x": 12.5, "y": 5.25}, {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, {"matrix": [5, 14], "x": 15.25, "y": 5.25}, {"matrix": [5, 15], "x": 16.25, "y": 5.25}, @@ -438,9 +349,9 @@ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, {"matrix": [5, 1], "x": 1.5, "y": 5.25}, {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, - {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, - {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, - {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 12], "x": 12.5, "y": 5.25}, {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, {"matrix": [5, 14], "x": 15.25, "y": 5.25}, {"matrix": [5, 15], "x": 16.25, "y": 5.25}, @@ -448,4 +359,4 @@ ] } } -} \ No newline at end of file +} From 9a4f39b7388745b6e395710e020cce8835f0d781 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Thu, 2 May 2024 20:08:41 +1000 Subject: [PATCH 236/333] clangd enhancements. (#23310) --- .clangd | 2 +- .../qmk/cli/generate/compilation_database.py | 34 ++++++++++++++++--- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/.clangd b/.clangd index 2be2d817fc7..6133ae7229d 100644 --- a/.clangd +++ b/.clangd @@ -1,4 +1,4 @@ CompileFlags: Add: [-Wno-unknown-attributes, -Wno-maybe-uninitialized, -Wno-unknown-warning-option] - Remove: [-W*, -mcall-prologues] + Remove: [-W*, -mmcu=*, -mcpu=*, -mfpu=*, -mfloat-abi=*, -mno-unaligned-access, -mno-thumb-interwork, -mcall-prologues] Compiler: clang diff --git a/lib/python/qmk/cli/generate/compilation_database.py b/lib/python/qmk/cli/generate/compilation_database.py index a2190fee66c..b9c716bf0c5 100755 --- a/lib/python/qmk/cli/generate/compilation_database.py +++ b/lib/python/qmk/cli/generate/compilation_database.py @@ -25,7 +25,6 @@ def system_libs(binary: str) -> List[Path]: """Find the system include directory that the given build tool uses. """ cli.log.debug("searching for system library directory for binary: %s", binary) - bin_path = shutil.which(binary) # Actually query xxxxxx-gcc to find its include paths. if binary.endswith("gcc") or binary.endswith("g++"): @@ -37,7 +36,31 @@ def system_libs(binary: str) -> List[Path]: paths.append(Path(line.strip()).resolve()) return paths - return list(Path(bin_path).resolve().parent.parent.glob("*/include")) if bin_path else [] + return list(Path(binary).resolve().parent.parent.glob("*/include")) if binary else [] + + +@lru_cache(maxsize=10) +def cpu_defines(binary: str, compiler_args: str) -> List[str]: + cli.log.debug("gathering definitions for compilation: %s %s", binary, compiler_args) + if binary.endswith("gcc") or binary.endswith("g++"): + invocation = [binary, '-dM', '-E'] + if binary.endswith("gcc"): + invocation.extend(['-x', 'c']) + elif binary.endswith("g++"): + invocation.extend(['-x', 'c++']) + compiler_args = shlex.split(compiler_args) + invocation.extend(compiler_args) + invocation.append('-') + result = cli.run(invocation, capture_output=True, check=True, stdin=None, input='\n') + define_args = [] + for line in result.stdout.splitlines(): + line_args = line.split(' ', 2) + if len(line_args) == 3 and line_args[0] == '#define': + define_args.append(f'-D{line_args[1]}={line_args[2]}') + elif len(line_args) == 2 and line_args[0] == '#define': + define_args.append(f'-D{line_args[1]}') + return list(sorted(set(define_args))) + return [] file_re = re.compile(r'printf "Compiling: ([^"]+)') @@ -68,9 +91,12 @@ def parse_make_n(f: Iterator[str]) -> List[Dict[str, str]]: # we have a hit! this_cmd = m.group(1) args = shlex.split(this_cmd) - for s in system_libs(args[0]): + binary = shutil.which(args[0]) + compiler_args = set(filter(lambda x: x.startswith('-m') or x.startswith('-f'), args)) + for s in system_libs(binary): args += ['-isystem', '%s' % s] - new_cmd = ' '.join(shlex.quote(s) for s in args if s != '-mno-thumb-interwork') + args.extend(cpu_defines(binary, ' '.join(shlex.quote(s) for s in compiler_args))) + new_cmd = ' '.join(shlex.quote(s) for s in args) records.append({"directory": str(QMK_FIRMWARE.resolve()), "command": new_cmd, "file": this_file}) state = 'start' From 26d444c6162c2bffc5e715cc451690d9c7b49b05 Mon Sep 17 00:00:00 2001 From: yiancar Date: Thu, 2 May 2024 15:21:01 -0700 Subject: [PATCH 237/333] [Keyboard] NK Classic TKL (#23435) * First commit * Fix keycode range and color on indicator * bit of cleanup * prettify * Update keyboards/novelkeys/nk_classic_tkl/keymaps/default/keymap.c Co-authored-by: Joel Challis * Update keyboards/novelkeys/nk_classic_tkl/info.json Co-authored-by: Joel Challis * Update keyboards/novelkeys/nk_classic_tkl/info.json Co-authored-by: Joel Challis * readme fix --------- Co-authored-by: yiancar Co-authored-by: Joel Challis --- keyboards/novelkeys/nk_classic_tkl/config.h | 25 ++ keyboards/novelkeys/nk_classic_tkl/halconf.h | 21 ++ keyboards/novelkeys/nk_classic_tkl/info.json | 270 ++++++++++++++++++ .../nk_classic_tkl/keymaps/default/keymap.c | 69 +++++ .../nk_classic_tkl/keymaps/via/keymap.c | 69 +++++ .../nk_classic_tkl/keymaps/via/rules.mk | 1 + keyboards/novelkeys/nk_classic_tkl/mcuconf.h | 22 ++ keyboards/novelkeys/nk_classic_tkl/readme.md | 32 +++ keyboards/novelkeys/nk_classic_tkl/rules.mk | 2 + 9 files changed, 511 insertions(+) create mode 100644 keyboards/novelkeys/nk_classic_tkl/config.h create mode 100644 keyboards/novelkeys/nk_classic_tkl/halconf.h create mode 100755 keyboards/novelkeys/nk_classic_tkl/info.json create mode 100644 keyboards/novelkeys/nk_classic_tkl/keymaps/default/keymap.c create mode 100644 keyboards/novelkeys/nk_classic_tkl/keymaps/via/keymap.c create mode 100644 keyboards/novelkeys/nk_classic_tkl/keymaps/via/rules.mk create mode 100644 keyboards/novelkeys/nk_classic_tkl/mcuconf.h create mode 100644 keyboards/novelkeys/nk_classic_tkl/readme.md create mode 100644 keyboards/novelkeys/nk_classic_tkl/rules.mk diff --git a/keyboards/novelkeys/nk_classic_tkl/config.h b/keyboards/novelkeys/nk_classic_tkl/config.h new file mode 100644 index 00000000000..62744a2589b --- /dev/null +++ b/keyboards/novelkeys/nk_classic_tkl/config.h @@ -0,0 +1,25 @@ +/* Copyright 2024 Yiancar-Designs + * + * 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 + +/* RGB options */ + +#define WS2812_PWM_DRIVER PWMD3 +#define WS2812_PWM_CHANNEL 3 +#define WS2812_PWM_PAL_MODE 1 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_DMA_CHANNEL 3 diff --git a/keyboards/novelkeys/nk_classic_tkl/halconf.h b/keyboards/novelkeys/nk_classic_tkl/halconf.h new file mode 100644 index 00000000000..c7f5bab5c85 --- /dev/null +++ b/keyboards/novelkeys/nk_classic_tkl/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2024 Yiancar-Designs + * + * 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 + +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/novelkeys/nk_classic_tkl/info.json b/keyboards/novelkeys/nk_classic_tkl/info.json new file mode 100755 index 00000000000..53d10ce32ae --- /dev/null +++ b/keyboards/novelkeys/nk_classic_tkl/info.json @@ -0,0 +1,270 @@ +{ + "manufacturer": "Yiancar-Designs", + "keyboard_name": "NK_ Classic TKL", + "maintainer": "Yiancar", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["B12", "B13", "B14", "B15", "A8", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1"], + "rows": ["B11", "B10", "B2", "B1", "A9", "A5"] + }, + "processor": "STM32F072", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}, + {"matrix": [0, 1], "x": 26, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 38, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 51, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 83, "y": 0, "flags": 1}, + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 1}, + {"matrix": [0, 7], "x": 109, "y": 0, "flags": 1}, + {"matrix": [0, 8], "x": 122, "y": 0, "flags": 1}, + {"matrix": [0, 9], "x": 141, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 154, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 166, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 195, "y": 0, "flags": 1}, + {"matrix": [0, 15], "x": 208, "y": 0, "flags": 1}, + {"matrix": [0, 16], "x": 221, "y": 0, "flags": 1}, + {"matrix": [1, 16], "x": 221, "y": 15, "flags": 1}, + {"matrix": [1, 15], "x": 208, "y": 15, "flags": 1}, + {"matrix": [1, 14], "x": 195, "y": 15, "flags": 1}, + {"matrix": [1, 13], "x": 173, "y": 15, "flags": 1}, + {"matrix": [1, 12], "x": 154, "y": 15, "flags": 4}, + {"matrix": [1, 11], "x": 141, "y": 15, "flags": 4}, + {"matrix": [1, 10], "x": 128, "y": 15, "flags": 4}, + {"matrix": [1, 9], "x": 115, "y": 15, "flags": 4}, + {"matrix": [1, 8], "x": 102, "y": 15, "flags": 4}, + {"matrix": [1, 7], "x": 90, "y": 15, "flags": 4}, + {"matrix": [1, 6], "x": 77, "y": 15, "flags": 4}, + {"matrix": [1, 5], "x": 64, "y": 15, "flags": 4}, + {"matrix": [1, 4], "x": 51, "y": 15, "flags": 4}, + {"matrix": [1, 3], "x": 38, "y": 15, "flags": 4}, + {"matrix": [1, 2], "x": 26, "y": 15, "flags": 4}, + {"matrix": [1, 1], "x": 13, "y": 15, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 15, "flags": 4}, + {"matrix": [2, 0], "x": 3, "y": 27, "flags": 1}, + {"matrix": [2, 1], "x": 19, "y": 27, "flags": 4}, + {"matrix": [2, 2], "x": 32, "y": 27, "flags": 4}, + {"matrix": [2, 3], "x": 45, "y": 27, "flags": 4}, + {"matrix": [2, 4], "x": 58, "y": 27, "flags": 4}, + {"matrix": [2, 5], "x": 70, "y": 27, "flags": 4}, + {"matrix": [2, 6], "x": 83, "y": 27, "flags": 4}, + {"matrix": [2, 7], "x": 96, "y": 27, "flags": 4}, + {"matrix": [2, 8], "x": 109, "y": 27, "flags": 4}, + {"matrix": [2, 9], "x": 122, "y": 27, "flags": 4}, + {"matrix": [2, 10], "x": 134, "y": 27, "flags": 4}, + {"matrix": [2, 11], "x": 147, "y": 27, "flags": 4}, + {"matrix": [2, 12], "x": 160, "y": 27, "flags": 4}, + {"matrix": [3, 12], "x": 176, "y": 27, "flags": 4}, + {"matrix": [2, 14], "x": 195, "y": 27, "flags": 1}, + {"matrix": [2, 15], "x": 208, "y": 27, "flags": 1}, + {"matrix": [2, 16], "x": 221, "y": 27, "flags": 1}, + {"x": 224, "y": 34, "flags": 9}, + {"x": 218, "y": 34, "flags": 9}, + {"x": 211, "y": 34, "flags": 9}, + {"x": 205, "y": 34, "flags": 9}, + {"x": 198, "y": 34, "flags": 9}, + {"x": 192, "y": 34, "flags": 9}, + {"matrix": [3, 13], "x": 171, "y": 40, "flags": 1}, + {"matrix": [3, 11], "x": 150, "y": 40, "flags": 4}, + {"matrix": [3, 10], "x": 138, "y": 40, "flags": 4}, + {"matrix": [3, 9], "x": 125, "y": 40, "flags": 4}, + {"matrix": [3, 8], "x": 112, "y": 40, "flags": 4}, + {"matrix": [3, 7], "x": 99, "y": 40, "flags": 4}, + {"matrix": [3, 6], "x": 86, "y": 40, "flags": 4}, + {"matrix": [3, 5], "x": 74, "y": 40, "flags": 4}, + {"matrix": [3, 4], "x": 61, "y": 40, "flags": 4}, + {"matrix": [3, 3], "x": 48, "y": 40, "flags": 4}, + {"matrix": [3, 2], "x": 35, "y": 40, "flags": 4}, + {"matrix": [3, 1], "x": 22, "y": 40, "flags": 4}, + {"matrix": [3, 0], "x": 5, "y": 40, "flags": 1}, + {"matrix": [4, 0], "x": 8, "y": 52, "flags": 1}, + {"matrix": [4, 2], "x": 29, "y": 52, "flags": 4}, + {"matrix": [4, 3], "x": 42, "y": 52, "flags": 4}, + {"matrix": [4, 4], "x": 54, "y": 52, "flags": 4}, + {"matrix": [4, 5], "x": 67, "y": 52, "flags": 4}, + {"matrix": [4, 6], "x": 80, "y": 52, "flags": 4}, + {"matrix": [4, 7], "x": 93, "y": 52, "flags": 4}, + {"matrix": [4, 8], "x": 106, "y": 52, "flags": 4}, + {"matrix": [4, 9], "x": 118, "y": 52, "flags": 4}, + {"matrix": [4, 10], "x": 131, "y": 52, "flags": 4}, + {"matrix": [4, 11], "x": 144, "y": 52, "flags": 4}, + {"matrix": [4, 12], "x": 168, "y": 52, "flags": 1}, + {"matrix": [4, 15], "x": 208, "y": 52, "flags": 1}, + {"matrix": [5, 16], "x": 221, "y": 64, "flags": 1}, + {"matrix": [5, 15], "x": 208, "y": 64, "flags": 1}, + {"matrix": [5, 14], "x": 195, "y": 64, "flags": 1}, + {"matrix": [5, 13], "x": 176, "y": 64, "flags": 1}, + {"matrix": [5, 12], "x": 160, "y": 64, "flags": 1}, + {"matrix": [5, 11], "x": 144, "y": 64, "flags": 1}, + {"matrix": [5, 6], "x": 90, "y": 64, "flags": 4}, + {"matrix": [5, 2], "x": 35, "y": 64, "flags": 1}, + {"matrix": [5, 1], "x": 19, "y": 64, "flags": 1}, + {"matrix": [5, 0], "x": 3, "y": 64, "flags": 1} + ], + "max_brightness": 120, + "sleep": true + }, + "url": "www.yiancar-designs.com", + "usb": { + "device_version": "0.0.1", + "pid": "0x4E54", + "vid": "0x8968" + }, + "ws2812": { + "driver": "pwm", + "pin": "B0" + }, + "layout_aliases": { + "LAYOUT": "LAYOUT_tkl_ansi_tsangan" + }, + "layouts": { + "LAYOUT_tkl_ansi_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 12], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + } + } +} diff --git a/keyboards/novelkeys/nk_classic_tkl/keymaps/default/keymap.c b/keyboards/novelkeys/nk_classic_tkl/keymaps/default/keymap.c new file mode 100644 index 00000000000..a99350ef7fc --- /dev/null +++ b/keyboards/novelkeys/nk_classic_tkl/keymaps/default/keymap.c @@ -0,0 +1,69 @@ +/* Copyright 2024 Yiancar-Designs + * + * 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 . + */ +#include QMK_KEYBOARD_H + +enum my_keycodes { + RETRO_RGB = QK_USER_0 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_tkl_ansi_tsangan( /* Base */ + 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + +[1] = LAYOUT_tkl_ansi_tsangan( /* FN */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_VOLD, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, _______, _______, + _______, _______, _______, RETRO_RGB, _______, _______, _______, _______, _______, _______), + +}; + +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + if (host_keyboard_led_state().caps_lock) { + for (uint8_t i = 50; i <= 55; i++) { + rgb_matrix_set_color(i, 255, 86, 0); + } + } + return false; +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case RETRO_RGB: + if (record->event.pressed) { + switch (rgb_matrix_get_flags()) { + case LED_FLAG_ALL: { + rgb_matrix_set_flags(LED_FLAG_INDICATOR); + } + break; + default: { + rgb_matrix_set_flags(LED_FLAG_ALL); + } + break; + } + } + return false; // Skip all further processing of this key + default: + return true; // Process all other keycodes normally + } +} diff --git a/keyboards/novelkeys/nk_classic_tkl/keymaps/via/keymap.c b/keyboards/novelkeys/nk_classic_tkl/keymaps/via/keymap.c new file mode 100644 index 00000000000..cc3ed86d2f2 --- /dev/null +++ b/keyboards/novelkeys/nk_classic_tkl/keymaps/via/keymap.c @@ -0,0 +1,69 @@ +/* Copyright 2024 Yiancar-Designs + * + * 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 . + */ +#include QMK_KEYBOARD_H + +enum my_keycodes { + RETRO_RGB = QK_KB_0 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_tkl_ansi_tsangan( /* Base */ + 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + +[1] = LAYOUT_tkl_ansi_tsangan( /* FN */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_VOLD, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, _______, _______, + _______, _______, _______, RETRO_RGB, _______, _______, _______, _______, _______, _______), + +}; + +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + if (host_keyboard_led_state().caps_lock) { + for (uint8_t i = 50; i <= 55; i++) { + rgb_matrix_set_color(i, 255, 86, 0); + } + } + return false; +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case RETRO_RGB: + if (record->event.pressed) { + switch (rgb_matrix_get_flags()) { + case LED_FLAG_ALL: { + rgb_matrix_set_flags(LED_FLAG_INDICATOR); + } + break; + default: { + rgb_matrix_set_flags(LED_FLAG_ALL); + } + break; + } + } + return false; // Skip all further processing of this key + default: + return true; // Process all other keycodes normally + } +} diff --git a/keyboards/novelkeys/nk_classic_tkl/keymaps/via/rules.mk b/keyboards/novelkeys/nk_classic_tkl/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/novelkeys/nk_classic_tkl/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/novelkeys/nk_classic_tkl/mcuconf.h b/keyboards/novelkeys/nk_classic_tkl/mcuconf.h new file mode 100644 index 00000000000..ec984442ed0 --- /dev/null +++ b/keyboards/novelkeys/nk_classic_tkl/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2024 Yiancar-Designs + * + * 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 + +#include_next + +#undef STM32_PWM_USE_TIM3 +#define STM32_PWM_USE_TIM3 TRUE diff --git a/keyboards/novelkeys/nk_classic_tkl/readme.md b/keyboards/novelkeys/nk_classic_tkl/readme.md new file mode 100644 index 00000000000..61f4f0cd9e5 --- /dev/null +++ b/keyboards/novelkeys/nk_classic_tkl/readme.md @@ -0,0 +1,32 @@ +# NK Classic TKL + +This is a TKL PCB. It supports VIA and full per-key RGB. + +* Keyboard Maintainer: [Yiancar](https://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar) +* Hardware Supported: A TKL keyboard with STM32F072CB or APM compatible +* Hardware Availability: https://novelkeys.com/ + +## Instructions + +### Build + +Make example for this keyboard (after setting up your build environment): + + make novelkeys/nk_classic_tkl:default + +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). + +### Reset + +- Unplug +- Hold Escape +- Plug In +- Unplug +- Release Escape + +### Flash + +- Unplug +- Hold Escape +- Plug In +- Flash using QMK Toolbox or dfu-util (`make novelkeys/nk_classic_tkl::dfu-util`) diff --git a/keyboards/novelkeys/nk_classic_tkl/rules.mk b/keyboards/novelkeys/nk_classic_tkl/rules.mk new file mode 100644 index 00000000000..0ab54aaaf71 --- /dev/null +++ b/keyboards/novelkeys/nk_classic_tkl/rules.mk @@ -0,0 +1,2 @@ +# Wildcard to allow APM32 MCU +DFU_SUFFIX_ARGS = -v FFFF -p FFFF From e3fed98ecb93123cede36c1b8326882856347690 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Thu, 2 May 2024 20:42:33 -0400 Subject: [PATCH 238/333] [Keyboard] Add Petrichor Keyboard (#23413) Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/cannonkeys/petrichor/config.h | 9 + keyboards/cannonkeys/petrichor/info.json | 394 ++++++++++++++++++ .../petrichor/keymaps/default/keymap.c | 24 ++ .../cannonkeys/petrichor/keymaps/via/keymap.c | 24 ++ .../cannonkeys/petrichor/keymaps/via/rules.mk | 1 + keyboards/cannonkeys/petrichor/petrichor.c | 40 ++ keyboards/cannonkeys/petrichor/readme.md | 28 ++ keyboards/cannonkeys/petrichor/rules.mk | 1 + 8 files changed, 521 insertions(+) create mode 100644 keyboards/cannonkeys/petrichor/config.h create mode 100644 keyboards/cannonkeys/petrichor/info.json create mode 100644 keyboards/cannonkeys/petrichor/keymaps/default/keymap.c create mode 100644 keyboards/cannonkeys/petrichor/keymaps/via/keymap.c create mode 100644 keyboards/cannonkeys/petrichor/keymaps/via/rules.mk create mode 100644 keyboards/cannonkeys/petrichor/petrichor.c create mode 100644 keyboards/cannonkeys/petrichor/readme.md create mode 100644 keyboards/cannonkeys/petrichor/rules.mk diff --git a/keyboards/cannonkeys/petrichor/config.h b/keyboards/cannonkeys/petrichor/config.h new file mode 100644 index 00000000000..ea5c26b6c72 --- /dev/null +++ b/keyboards/cannonkeys/petrichor/config.h @@ -0,0 +1,9 @@ +// Copyright 2024 Andrew Kannan +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U + +#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64 \ No newline at end of file diff --git a/keyboards/cannonkeys/petrichor/info.json b/keyboards/cannonkeys/petrichor/info.json new file mode 100644 index 00000000000..ecec61e7cf2 --- /dev/null +++ b/keyboards/cannonkeys/petrichor/info.json @@ -0,0 +1,394 @@ +{ + "manufacturer": "CannonKeys", + "keyboard_name": "Petrichor", + "maintainer": "awkannan", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "matrix_pins": { + "cols": ["GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP9", "GP6", "GP5", "GP4", "GP3"], + "rows": ["GP13", "GP12", "GP11", "GP10", "GP8"] + }, + "processor": "RP2040", + "rgblight": { + "animations": { + "rainbow_mood": true, + "rainbow_swirl": true, + "static_gradient": true, + "twinkle": true + }, + "led_count": 3, + "layers": { + "enabled": true, + "override_rgb": false + }, + "default": { + "animation": "rainbow_swirl" + } + }, + "url": "https://cannonkeys.com", + "usb": { + "device_version": "0.0.1", + "pid": "0x0029", + "vid": "0xCA04" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP7" + }, + "layouts": { + "LAYOUT_7u_no_split": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15.5, "y": 1}, + {"matrix": [1, 15], "x": 16.5, "y": 1}, + {"matrix": [1, 16], "x": 17.5, "y": 1}, + {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15.5, "y": 2}, + {"matrix": [2, 15], "x": 16.5, "y": 2}, + {"matrix": [2, 16], "x": 17.5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14.25, "y": 3.25}, + {"matrix": [3, 14], "x": 15.5, "y": 3}, + {"matrix": [3, 15], "x": 16.5, "y": 3}, + {"matrix": [3, 16], "x": 17.5, "y": 3}, + {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 3, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25}, + {"matrix": [4, 15], "x": 16.5, "y": 4}, + {"matrix": [4, 16], "x": 17.5, "y": 4} + ] + }, + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15.5, "y": 1}, + {"matrix": [1, 15], "x": 16.5, "y": 1}, + {"matrix": [1, 16], "x": 17.5, "y": 1}, + {"matrix": [1, 17], "x": 18.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15.5, "y": 2}, + {"matrix": [2, 15], "x": 16.5, "y": 2}, + {"matrix": [2, 16], "x": 17.5, "y": 2}, + {"matrix": [2, 17], "x": 18.5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14.25, "y": 3.25}, + {"matrix": [3, 14], "x": 15.5, "y": 3}, + {"matrix": [3, 15], "x": 16.5, "y": 3}, + {"matrix": [3, 16], "x": 17.5, "y": 3}, + {"matrix": [3, 17], "x": 18.5, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6}, + {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 10.75, "y": 4}, + {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25}, + {"matrix": [4, 15], "x": 16.5, "y": 4}, + {"matrix": [4, 16], "x": 17.5, "y": 4}, + {"matrix": [4, 17], "x": 18.5, "y": 4} + ] + }, + "LAYOUT_default": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15.5, "y": 1}, + {"matrix": [1, 15], "x": 16.5, "y": 1}, + {"matrix": [1, 16], "x": 17.5, "y": 1}, + {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15.5, "y": 2}, + {"matrix": [2, 15], "x": 16.5, "y": 2}, + {"matrix": [2, 16], "x": 17.5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14.25, "y": 3.25}, + {"matrix": [3, 14], "x": 15.5, "y": 3}, + {"matrix": [3, 15], "x": 16.5, "y": 3}, + {"matrix": [3, 16], "x": 17.5, "y": 3}, + {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25}, + {"matrix": [4, 15], "x": 16.5, "y": 4}, + {"matrix": [4, 16], "x": 17.5, "y": 4} + ] + }, + "LAYOUT_iso_6u_split_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [1, 14], "x": 15.5, "y": 1}, + {"matrix": [1, 15], "x": 16.5, "y": 1}, + {"matrix": [1, 16], "x": 17.5, "y": 1}, + {"matrix": [1, 17], "x": 18.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 15.5, "y": 2}, + {"matrix": [2, 15], "x": 16.5, "y": 2}, + {"matrix": [2, 16], "x": 17.5, "y": 2}, + {"matrix": [2, 17], "x": 18.5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14.25, "y": 3.25}, + {"matrix": [3, 14], "x": 15.5, "y": 3}, + {"matrix": [3, 15], "x": 16.5, "y": 3}, + {"matrix": [3, 16], "x": 17.5, "y": 3}, + {"matrix": [3, 17], "x": 18.5, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6}, + {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 10.75, "y": 4}, + {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25}, + {"matrix": [4, 15], "x": 16.5, "y": 4}, + {"matrix": [4, 16], "x": 17.5, "y": 4}, + {"matrix": [4, 17], "x": 18.5, "y": 4} + ] + } + } +} diff --git a/keyboards/cannonkeys/petrichor/keymaps/default/keymap.c b/keyboards/cannonkeys/petrichor/keymaps/default/keymap.c new file mode 100644 index 00000000000..8f2a516b732 --- /dev/null +++ b/keyboards/cannonkeys/petrichor/keymaps/default/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2024 Andrew Kannan +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( /* Base */ + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT + ), + + [1] = LAYOUT_all( /* Function Layer */ + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______ + ), + +}; \ No newline at end of file diff --git a/keyboards/cannonkeys/petrichor/keymaps/via/keymap.c b/keyboards/cannonkeys/petrichor/keymaps/via/keymap.c new file mode 100644 index 00000000000..8f2a516b732 --- /dev/null +++ b/keyboards/cannonkeys/petrichor/keymaps/via/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2024 Andrew Kannan +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( /* Base */ + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT + ), + + [1] = LAYOUT_all( /* Function Layer */ + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______ + ), + +}; \ No newline at end of file diff --git a/keyboards/cannonkeys/petrichor/keymaps/via/rules.mk b/keyboards/cannonkeys/petrichor/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/cannonkeys/petrichor/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cannonkeys/petrichor/petrichor.c b/keyboards/cannonkeys/petrichor/petrichor.c new file mode 100644 index 00000000000..a80036c7b3a --- /dev/null +++ b/keyboards/cannonkeys/petrichor/petrichor.c @@ -0,0 +1,40 @@ +// Copyright 2023 Andrew Kannan +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "quantum.h" + +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {2, 1, HSV_PURPLE} +); +const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {1, 1, HSV_GREEN} +); +const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 1, HSV_BLUE} +); + +const rgblight_segment_t* const PROGMEM enabled_rgb_layers[] = RGBLIGHT_LAYERS_LIST( + my_capslock_layer, + my_numlock_layer, + my_layer1_layer +); + +void keyboard_post_init_kb(void) { + keyboard_post_init_user(); + rgblight_layers = enabled_rgb_layers; +} + +bool led_update_kb(led_t led_state) { + if(!led_update_user(led_state)){ + return false; + } + rgblight_set_layer_state(0, led_state.caps_lock); + rgblight_set_layer_state(1, led_state.num_lock); + return true; +} + +layer_state_t layer_state_set_kb(layer_state_t state) { + state = layer_state_set_user(state); + rgblight_set_layer_state(2, layer_state_cmp(state, 1)); + return state; +} diff --git a/keyboards/cannonkeys/petrichor/readme.md b/keyboards/cannonkeys/petrichor/readme.md new file mode 100644 index 00000000000..5eb1c96e48f --- /dev/null +++ b/keyboards/cannonkeys/petrichor/readme.md @@ -0,0 +1,28 @@ +# Petrichor PCB + +Petrichor PCB from CannonKeys for the AKB Petrichor keyboard +(This firmware is used for both the hotswap and solderable variant) + +* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan) +* Hardware Supported: RP2040 +* Hardware Availability: [CannonKeys](https://cannonkeys.com) + + +Make example for this keyboard (after setting up your build environment): + + make cannonkeys/petrichor:default + +Flashing example for this keyboard: + + make cannonkeys/petrichor: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). + +## Bootloader + +Enter the bootloader in 4 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Hold the "BOOTSEL" button on the back of the PCB and briefly press the "REBOOT" button on the back of the PCB. +* **Top side reboot pads**: Bridge the reboot pads on the top of the PCB with a pair of tweezers twice in a row, quickly. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/cannonkeys/petrichor/rules.mk b/keyboards/cannonkeys/petrichor/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/cannonkeys/petrichor/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 257319f9ffc07a34ca101de7adfb83970d2811e6 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 2 May 2024 21:07:43 -0700 Subject: [PATCH 239/333] Tomak: Layout Data Correction (#23649) Corrects the key size and positioning for position [8, 7] on all layouts. --- keyboards/era/sirind/tomak/info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/era/sirind/tomak/info.json b/keyboards/era/sirind/tomak/info.json index da7d12e94d1..58025e67a18 100644 --- a/keyboards/era/sirind/tomak/info.json +++ b/keyboards/era/sirind/tomak/info.json @@ -260,7 +260,7 @@ {"matrix": [8, 4], "x": 13, "y": 2.5}, {"matrix": [8, 5], "x": 14, "y": 2.5}, {"matrix": [8, 6], "x": 15, "y": 2.5}, - {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25}, + {"matrix": [8, 7], "x": 16, "y": 2.5, "w": 1.5}, {"matrix": [8, 8], "x": 17.75, "y": 2.5}, {"matrix": [8, 9], "x": 18.75, "y": 2.5}, {"matrix": [8, 10], "x": 19.75, "y": 2.5}, @@ -359,7 +359,7 @@ {"matrix": [8, 4], "x": 13, "y": 2.5}, {"matrix": [8, 5], "x": 14, "y": 2.5}, {"matrix": [8, 6], "x": 15, "y": 2.5}, - {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25}, + {"matrix": [8, 7], "x": 16, "y": 2.5, "w": 1.5}, {"matrix": [8, 8], "x": 17.75, "y": 2.5}, {"matrix": [8, 9], "x": 18.75, "y": 2.5}, {"matrix": [8, 10], "x": 19.75, "y": 2.5}, @@ -457,7 +457,7 @@ {"matrix": [8, 4], "x": 13, "y": 2.5}, {"matrix": [8, 5], "x": 14, "y": 2.5}, {"matrix": [8, 6], "x": 15, "y": 2.5}, - {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25}, + {"matrix": [8, 7], "x": 16, "y": 2.5, "w": 1.5}, {"matrix": [8, 8], "x": 17.75, "y": 2.5}, {"matrix": [8, 9], "x": 18.75, "y": 2.5}, {"matrix": [8, 10], "x": 19.75, "y": 2.5}, @@ -557,7 +557,7 @@ {"matrix": [8, 4], "x": 13, "y": 2.5}, {"matrix": [8, 5], "x": 14, "y": 2.5}, {"matrix": [8, 6], "x": 15, "y": 2.5}, - {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25}, + {"matrix": [8, 7], "x": 16, "y": 2.5, "w": 1.5}, {"matrix": [8, 8], "x": 17.75, "y": 2.5}, {"matrix": [8, 9], "x": 18.75, "y": 2.5}, {"matrix": [8, 10], "x": 19.75, "y": 2.5}, @@ -657,7 +657,7 @@ {"matrix": [8, 4], "x": 13, "y": 2.5}, {"matrix": [8, 5], "x": 14, "y": 2.5}, {"matrix": [8, 6], "x": 15, "y": 2.5}, - {"matrix": [8, 7], "x": 16.25, "y": 2.5, "w": 1.25}, + {"matrix": [8, 7], "x": 16, "y": 2.5, "w": 1.5}, {"matrix": [8, 8], "x": 17.75, "y": 2.5}, {"matrix": [8, 9], "x": 18.75, "y": 2.5}, {"matrix": [8, 10], "x": 19.75, "y": 2.5}, @@ -707,4 +707,4 @@ ] } } -} \ No newline at end of file +} From 8075003e6068d6f8fa5396972c2a17d39d14c584 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 2 May 2024 22:11:23 -0700 Subject: [PATCH 240/333] ZSA Voyager Layout Fix (#23651) --- keyboards/zsa/voyager/info.json | 72 ++++++++++++++++----------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/keyboards/zsa/voyager/info.json b/keyboards/zsa/voyager/info.json index 14e7584f5cc..3a7e7865ea9 100644 --- a/keyboards/zsa/voyager/info.json +++ b/keyboards/zsa/voyager/info.json @@ -161,52 +161,52 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "matrix": [0, 1], "x": 3, "y": 0}, - {"label": "k01", "matrix": [0, 2], "x": 12, "y": 0}, + {"label": "k00", "matrix": [0, 1], "x": 0, "y": 0.5}, + {"label": "k01", "matrix": [0, 2], "x": 1, "y": 0.5}, {"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": "k03", "matrix": [0, 4], "x": 3, "y": 0}, + {"label": "k04", "matrix": [0, 5], "x": 4, "y": 0.25}, + {"label": "k05", "matrix": [0, 6], "x": 5, "y": 0.5}, + {"label": "k26", "matrix": [6, 0], "x": 10, "y": 0.5}, + {"label": "k27", "matrix": [6, 1], "x": 11, "y": 0.25}, + {"label": "k28", "matrix": [6, 2], "x": 12, "y": 0}, + {"label": "k29", "matrix": [6, 3], "x": 13, "y": 0.25}, {"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": "k06", "matrix": [1, 1], "x": 0, "y": 1.5}, + {"label": "k07", "matrix": [1, 2], "x": 1, "y": 1.5}, {"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": "k09", "matrix": [1, 4], "x": 3, "y": 1}, + {"label": "k10", "matrix": [1, 5], "x": 4, "y": 1.25}, + {"label": "k11", "matrix": [1, 6], "x": 5, "y": 1.5}, + {"label": "k32", "matrix": [7, 0], "x": 10, "y": 1.5}, + {"label": "k33", "matrix": [7, 1], "x": 11, "y": 1.25}, + {"label": "k34", "matrix": [7, 2], "x": 12, "y": 1}, + {"label": "k35", "matrix": [7, 3], "x": 13, "y": 1.25}, {"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": "k12", "matrix": [2, 1], "x": 0, "y": 2.5}, + {"label": "k13", "matrix": [2, 2], "x": 1, "y": 2.5}, {"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": "k15", "matrix": [2, 4], "x": 3, "y": 2}, + {"label": "k16", "matrix": [2, 5], "x": 4, "y": 2.25}, + {"label": "k17", "matrix": [2, 6], "x": 5, "y": 2.5}, + {"label": "k38", "matrix": [8, 0], "x": 10, "y": 2.5}, + {"label": "k39", "matrix": [8, 1], "x": 11, "y": 2.25}, + {"label": "k40", "matrix": [8, 2], "x": 12, "y": 2}, + {"label": "k41", "matrix": [8, 3], "x": 13, "y": 2.25}, {"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": "k18", "matrix": [3, 1], "x": 0, "y": 3.5}, + {"label": "k19", "matrix": [3, 2], "x": 1, "y": 3.5}, {"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": "k21", "matrix": [3, 4], "x": 3, "y": 3}, + {"label": "k22", "matrix": [3, 5], "x": 4, "y": 3.25}, + {"label": "k23", "matrix": [4, 4], "x": 5, "y": 3.5}, + {"label": "k44", "matrix": [10, 2], "x": 10, "y": 3.5}, + {"label": "k45", "matrix": [9, 1], "x": 11, "y": 3.25}, + {"label": "k46", "matrix": [9, 2], "x": 12, "y": 3}, + {"label": "k47", "matrix": [9, 3], "x": 13, "y": 3.25}, {"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}, From d09a06a1b354760fd0e64a453abade972900e885 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 3 May 2024 15:21:29 +1000 Subject: [PATCH 241/333] Update GPIO API usage in keyboard code (#23361) --- keyboards/3w6/rev1/matrix.c | 14 +- keyboards/3w6/rev2/matrix.c | 14 +- keyboards/40percentclub/4pack/4pack.c | 4 +- keyboards/40percentclub/sixpack/sixpack.c | 6 +- .../4pplet/eagle_viper_rep/rev_a/rev_a.c | 94 ++--- .../4pplet/eagle_viper_rep/rev_b/rev_b.c | 30 +- keyboards/acheron/apollo/87h/delta/delta.c | 4 +- keyboards/acheron/apollo/87htsc/87htsc.c | 4 +- keyboards/acheron/athena/alpha/alpha.c | 8 +- keyboards/acheron/athena/beta/beta.c | 8 +- keyboards/acheron/austin/austin.c | 12 +- keyboards/acheron/elongate/delta/delta.c | 32 +- keyboards/acheron/shark/beta/beta.c | 4 +- keyboards/aeboards/ext65/rev1/rev1.c | 18 +- keyboards/aeboards/ext65/rev2/rev2.c | 18 +- keyboards/aeboards/ext65/rev3/rev3.c | 6 +- keyboards/ai03/orbit/orbit.c | 24 +- keyboards/ai03/vega/vega.c | 8 +- keyboards/akko/5087/5087.c | 12 +- keyboards/akko/5108/5108.c | 6 +- keyboards/al1/matrix.c | 4 +- keyboards/anavi/knob1/knob1.c | 4 +- keyboards/anavi/knobs3/knobs3.c | 4 +- keyboards/argyle/matrix.c | 12 +- keyboards/artifact/lvl/rev_hs01/rev_hs01.c | 2 +- keyboards/atlantis/ps17/ps17.c | 18 +- keyboards/atomic/atomic.c | 4 +- keyboards/bajjak/bajjak.h | 20 +- keyboards/bajjak/matrix.c | 56 +-- keyboards/bandominedoni/bandominedoni.c | 14 +- keyboards/barleycorn_smd/matrix.c | 12 +- keyboards/bastardkb/charybdis/charybdis.c | 4 +- keyboards/bear_face/v1/v1.c | 4 +- keyboards/bear_face/v2/v2.c | 4 +- keyboards/bioi/g60/g60.c | 6 +- keyboards/bioi/morgan65/morgan65.c | 6 +- keyboards/bioi/s65/s65.c | 6 +- keyboards/blu/vimclutch/vimclutch.c | 4 +- keyboards/bobpad/bobpad.c | 2 +- keyboards/bpiphany/ghost_squid/ghost_squid.c | 4 +- keyboards/bpiphany/ghost_squid/ghost_squid.h | 4 +- keyboards/bpiphany/ghost_squid/matrix.c | 28 +- keyboards/capsunlocked/cu75/cu75.c | 8 +- keyboards/capsunlocked/cu80/v2/v2.c | 2 +- keyboards/centromere/centromere.c | 24 +- keyboards/centromere/centromere.h | 20 +- keyboards/cheshire/curiosity/curiosity.c | 12 +- keyboards/cipulot/common/ec_switch_matrix.c | 38 +-- keyboards/clueboard/2x1800/2019/2019.c | 24 +- keyboards/clueboard/2x1800/2021/max7219.c | 4 +- keyboards/clueboard/66/rev4/rev4.c | 24 +- keyboards/converter/palm_usb/matrix.c | 36 +- keyboards/converter/siemens_tastatur/matrix.c | 48 +-- keyboards/converter/xt_usb/config.h | 6 +- keyboards/converter/xt_usb/xt.h | 20 +- keyboards/custommk/evo70_r2/matrix.c | 20 +- keyboards/cutie_club/wraith/wraith.c | 2 +- keyboards/dark/magnum_ergo_1/magnum_ergo_1.c | 44 +-- .../kd83a_bfg_edition/kd83a_bfg_edition.c | 12 +- .../kd87a_bfg_edition/kd87a_bfg_edition.c | 12 +- keyboards/dekunukem/duckypad/duckypad.c | 8 +- keyboards/dichotomy/dichotomy.c | 12 +- keyboards/dichotomy/dichotomy.h | 12 +- keyboards/dinofizz/fnrow/v1/v1.c | 10 +- keyboards/dk60/dk60.c | 4 +- keyboards/dk60/dk60.h | 8 +- keyboards/dm9records/lain/lain.c | 6 +- keyboards/doppelganger/doppelganger.c | 14 +- keyboards/dp60/matrix.c | 144 ++++---- keyboards/drop/lib/mux.c | 12 +- keyboards/duck/orion/v3/matrix.c | 6 +- keyboards/duck/orion/v3/v3.c | 6 +- keyboards/dumbpad/v0x/v0x.c | 20 +- .../dumbpad/v0x_dualencoder/v0x_dualencoder.c | 20 +- keyboards/dumbpad/v0x_right/v0x_right.c | 20 +- keyboards/dumbpad/v1x/v1x.c | 30 +- .../dumbpad/v1x_dualencoder/v1x_dualencoder.c | 30 +- keyboards/dumbpad/v1x_right/v1x_right.c | 30 +- keyboards/dumbpad/v3x/v3x.c | 30 +- keyboards/durgod/dgk6x/dgk6x.c | 20 +- keyboards/durgod/k310/k310.c | 36 +- keyboards/durgod/k320/k320.c | 36 +- keyboards/dztech/bocc/bocc.c | 4 +- keyboards/ealdin/quadrant/quadrant.c | 4 +- keyboards/edda/edda.c | 30 +- .../commissions/mini1800/mini1800.c | 10 +- keyboards/ergodox_ez/matrix.c | 54 +-- keyboards/evyd13/gh80_3700/gh80_3700.c | 22 +- keyboards/evyd13/gud70/gud70.c | 4 +- keyboards/evyd13/pockettype/pockettype.c | 14 +- keyboards/evyd13/wasdat/matrix.c | 14 +- keyboards/evyd13/wasdat_code/matrix.c | 14 +- keyboards/exclusive/e6v2/oe/oe.c | 8 +- keyboards/exclusive/e85/hotswap/hotswap.c | 8 +- keyboards/exclusive/e85/soldered/soldered.c | 8 +- keyboards/ferris/0_1/matrix.c | 14 +- keyboards/ferris/0_2/matrix.c | 12 +- keyboards/fjlabs/bolsa65/bolsa65.c | 4 +- keyboards/flx/virgo/virgo.c | 8 +- keyboards/gboards/gergoplex/matrix.c | 10 +- keyboards/geistmaschine/macropod/matrix.c | 4 +- keyboards/geonworks/ee_at/ee_at.c | 12 +- keyboards/geonworks/w1_at/w1_at.c | 12 +- keyboards/gh60/revc/revc.h | 20 +- keyboards/ghs/rar/rar.c | 8 +- keyboards/gl516/a52gl/matrix.c | 24 +- keyboards/gl516/j73gl/matrix.c | 24 +- keyboards/gl516/n51gl/matrix.c | 24 +- .../chimera_ortho_plus/chimera_ortho_plus.c | 1 - keyboards/gmmk/gmmk2/p96/ansi/ansi.c | 6 +- keyboards/gmmk/gmmk2/p96/iso/iso.c | 6 +- keyboards/gmmk/numpad/matrix.c | 12 +- keyboards/gmmk/numpad/numpad.c | 4 +- keyboards/gray_studio/think65/solder/solder.c | 4 +- keyboards/halfcliff/matrix.c | 10 +- keyboards/handwired/2x5keypad/2x5keypad.c | 14 +- keyboards/handwired/aek64/aek64.c | 6 +- .../battleship_gamepad/battleship_gamepad.c | 2 +- keyboards/handwired/colorlice/colorlice.c | 8 +- keyboards/handwired/dqz11n1g/matrix.c | 12 +- keyboards/handwired/evk/v1_3/v1_3.c | 8 +- keyboards/handwired/jopr/jopr.c | 6 +- keyboards/handwired/jotanck/jotanck.c | 4 +- keyboards/handwired/jotpad16/jotpad16.c | 4 +- .../handwired/jtallbean/split_65/split_65.c | 8 +- keyboards/handwired/lagrange/lagrange.c | 4 +- keyboards/handwired/lagrange/transport.c | 16 +- keyboards/handwired/owlet60/matrix.c | 36 +- .../handwired/prime_exl_plus/prime_exl_plus.c | 22 +- keyboards/handwired/retro_refit/retro_refit.c | 6 +- keyboards/handwired/selene/selene.c | 12 +- keyboards/handwired/sono1/sono1.c | 26 +- .../symmetric70_proto/debug_config.h | 12 +- .../symmetric70_proto/matrix_debug/matrix.c | 30 +- .../matrix_fast/matrix_extension_74hc15x.c | 6 +- .../tractyl_manuform/5x6_right/f411/f411.c | 10 +- keyboards/handwired/traveller/traveller.c | 4 +- keyboards/handwired/woodpad/woodpad.c | 6 +- keyboards/handwired/z150/z150.c | 18 +- .../hardwareabstraction/handwire/handwire.c | 10 +- keyboards/hazel/bad_wings/matrix.c | 12 +- keyboards/heliar/wm1_hotswap/wm1_hotswap.c | 18 +- keyboards/hhkb/yang/matrix.c | 20 +- keyboards/hhkb/yang/yang.c | 62 ++-- keyboards/hineybush/h10/h10.c | 4 +- keyboards/hineybush/h60/h60.c | 4 +- keyboards/hineybush/h87a/h87a.c | 8 +- keyboards/hineybush/h88/h88.c | 8 +- keyboards/hineybush/hbcp/matrix.c | 20 +- keyboards/hineybush/physix/physix.c | 10 +- .../ibm/model_m/ashpil_usbc/ashpil_usbc.c | 18 +- keyboards/ibm/model_m/modelh/modelh.c | 4 +- keyboards/ibm/model_m/mschwingen/matrix.c | 12 +- keyboards/ibm/model_m/mschwingen/mschwingen.c | 36 +- keyboards/ibm/model_m/teensypp/teensypp.c | 18 +- keyboards/ibm/model_m/yugo_m/yugo_m.c | 12 +- keyboards/idb/idb_60/idb_60.c | 12 +- keyboards/ilumkb/volcano660/volcano660.c | 12 +- keyboards/ingrained/matrix.c | 14 +- keyboards/input_club/k_type/is31fl3733-dual.c | 4 +- keyboards/jae/j01/j01.c | 4 +- keyboards/jels/jels88/jels88.c | 8 +- keyboards/jian/nsrev2/config.h | 28 +- keyboards/jian/nsrev2/nsrev2.c | 6 +- keyboards/jian/rev1/config.h | 28 +- keyboards/jian/rev1/rev1.c | 6 +- keyboards/jian/rev2/config.h | 28 +- keyboards/jian/rev2/rev2.c | 6 +- keyboards/jones/v03/matrix.c | 12 +- keyboards/jones/v03_1/matrix.c | 12 +- keyboards/joshajohnson/hub16/matrix.c | 20 +- keyboards/jukaie/jk01/jk01.c | 12 +- keyboards/kabedon/kabedon980/kabedon980.c | 2 +- keyboards/kagizaraya/chidori/board.c | 16 +- keyboards/kakunpc/angel64/alpha/matrix.c | 24 +- keyboards/kakunpc/angel64/rev1/matrix.c | 24 +- keyboards/kakunpc/choc_taro/matrix.c | 24 +- keyboards/kakunpc/thedogkeyboard/matrix.c | 24 +- keyboards/kbdfans/bella/soldered/soldered.c | 4 +- keyboards/kbdfans/kbd19x/kbd19x.h | 12 +- keyboards/kbdfans/kbd8x/kbd8x.h | 12 +- .../kbdfans/maja_soldered/maja_soldered.c | 4 +- keyboards/kbdfans/niu_mini/niu_mini.c | 4 +- keyboards/kbdfans/phaseone/phaseone.c | 2 +- keyboards/kbdmania/kmac/kmac.c | 30 +- keyboards/kbdmania/kmac/matrix.c | 24 +- keyboards/kbdmania/kmac_pad/kmac_pad.c | 4 +- keyboards/kbdmania/kmac_pad/matrix.c | 12 +- keyboards/kc60/kc60.c | 4 +- keyboards/kc60se/kc60se.c | 4 +- keyboards/keebio/kbo5000/rev1/rev1.c | 4 +- keyboards/keebio/quefrency/rev2/rev2.c | 4 +- keyboards/keebio/quefrency/rev3/rev3.c | 4 +- keyboards/keebio/sinc/sinc.c | 2 +- keyboards/keychron/c2_pro/matrix.c | 30 +- keyboards/keychron/q10/matrix.c | 12 +- keyboards/keychron/q11/q11.c | 8 +- keyboards/keychron/q12/matrix.c | 12 +- keyboards/keychron/q1v2/matrix.c | 12 +- keyboards/keychron/q3/matrix.c | 12 +- keyboards/keychron/q5/matrix.c | 12 +- keyboards/keychron/q6/matrix.c | 12 +- keyboards/keychron/q65/matrix.c | 44 +-- keyboards/keychron/v1/matrix.c | 44 +-- keyboards/keychron/v10/matrix.c | 44 +-- keyboards/keychron/v3/matrix.c | 44 +-- keyboards/keychron/v5/matrix.c | 44 +-- keyboards/keychron/v6/matrix.c | 44 +-- keyboards/keyhive/honeycomb/honeycomb.c | 12 +- keyboards/keyhive/honeycomb/honeycomb.h | 12 +- keyboards/keyhive/lattice60/lattice60.c | 6 +- keyboards/keyhive/navi10/rev0/rev0.c | 4 +- keyboards/keyhive/navi10/rev2/rev2.c | 4 +- keyboards/keyhive/navi10/rev3/rev3.c | 4 +- keyboards/kin80/blackpill103/blackpill103.c | 4 +- keyboards/kin80/blackpill401/blackpill401.c | 4 +- keyboards/kin80/blackpill411/blackpill411.c | 4 +- keyboards/kin80/micro/micro.c | 4 +- keyboards/kinesis/kint36/kint36.c | 4 +- keyboards/kinesis/kint41/kint41.c | 4 +- keyboards/kinesis/kintlc/kintlc.c | 4 +- keyboards/kinesis/kintwin/kintwin.c | 18 +- keyboards/kinesis/nguyenvietyen/matrix.c | 32 +- keyboards/kkatano/wallaby/wallaby.c | 4 +- keyboards/kkatano/yurei/yurei.c | 4 +- keyboards/kopibeng/mnk88/mnk88.c | 8 +- keyboards/kopibeng/typ65/typ65.c | 42 +-- keyboards/kopibeng/xt8x/xt8x.c | 12 +- keyboards/ktec/ergodone/ergodox_compat.h | 16 +- keyboards/ktec/ergodone/matrix.c | 100 +++--- keyboards/ktec/staryu/backlight_staryu.h | 4 +- keyboards/kv/revt/revt.c | 4 +- .../dimple/staggered/staggered.c | 4 +- keyboards/lfkeyboards/lfk78/lfk78.c | 4 +- keyboards/lfkeyboards/lfk87/lfk87.c | 4 +- keyboards/lfkeyboards/mini1800/mini1800.c | 4 +- keyboards/lfkeyboards/smk65/revb/revb.c | 8 +- keyboards/lz/erghost/matrix.c | 288 ++++++++-------- keyboards/machkeyboards/mach3/mach3.c | 4 +- keyboards/macrocat/macrocat.c | 4 +- keyboards/makeymakey/makeymakey.c | 78 ++--- keyboards/mariorion_v25/mariorion_v25.c | 42 +-- keyboards/marksard/leftover30/leftover30.c | 8 +- .../masterworks/classy_tkl/rev_a/rev_a.c | 8 +- keyboards/matrix/cain_re/cain_re.c | 12 +- keyboards/matrix/falcon/falcon.c | 8 +- keyboards/matrix/m12og/rev1/matrix.c | 12 +- keyboards/matrix/m12og/rev1/rev1.c | 2 +- keyboards/matrix/m12og/rev2/rev2.c | 18 +- keyboards/mc_76k/mc_76k.c | 6 +- .../adelais/standard_led/avr/rev1/matrix.c | 268 +++++++-------- keyboards/mechlovin/hannah910/hannah910.c | 22 +- keyboards/mechlovin/infinity87/rev2/matrix.c | 292 ++++++++-------- keyboards/mechlovin/infinity875/matrix.c | 292 ++++++++-------- keyboards/mechlovin/infinityce/infinityce.c | 4 +- keyboards/mechlovin/kanu/kanu.c | 16 +- keyboards/mechlovin/kay65/kay65.c | 2 +- keyboards/mechlovin/olly/bb/bb.c | 20 +- keyboards/mechlovin/olly/bb/matrix.c | 304 ++++++++--------- keyboards/mechlovin/olly/jf/rev1/matrix.c | 320 +++++++++--------- keyboards/mechlovin/olly/jf/rev1/rev1.c | 26 +- keyboards/mechlovin/olly/orion/orion.c | 20 +- keyboards/mechlovin/serratus/matrix.c | 292 ++++++++-------- .../no_backlight/wearhaus66/wearhaus66.c | 2 +- keyboards/mechwild/puckbuddy/puckbuddy.c | 2 +- keyboards/mechwild/sugarglider/sugarglider.c | 24 +- keyboards/mexsistor/ludmila/matrix.c | 16 +- keyboards/miiiw/blackio83/rev_0100/matrix.c | 24 +- keyboards/miiiw/blackio83/rev_0100/rev_0100.c | 34 +- keyboards/miiiw/common/shift_register.c | 36 +- keyboards/mlego/m48/m48.h | 6 +- keyboards/mlego/m60/m60.h | 6 +- keyboards/mlego/m60_split/m60_split.h | 6 +- keyboards/mlego/m65/m65.h | 16 +- keyboards/mode/m65ha_alpha/m65ha_alpha.c | 6 +- keyboards/mode/m65hi_alpha/m65hi_alpha.c | 6 +- keyboards/mode/m65s/m65s.c | 6 +- keyboards/monsgeek/m3/m3.c | 14 +- keyboards/monsgeek/m5/m5.c | 6 +- .../monstargear/xo87/solderable/solderable.c | 62 ++-- keyboards/neson_design/700e/700e.c | 6 +- keyboards/neson_design/n6/n6.c | 6 +- .../kastenwagen1840/kastenwagen1840.c | 24 +- .../kastenwagen48/kastenwagen48.c | 24 +- keyboards/novelkeys/nk65b/nk65b.c | 4 +- keyboards/novelkeys/nk87b/nk87b.c | 4 +- keyboards/noxary/220/220.c | 4 +- keyboards/noxary/268_2/268_2.c | 4 +- keyboards/noxary/280/280.c | 8 +- keyboards/noxary/x268/x268.c | 4 +- keyboards/nullbitsco/common/bitc_led.c | 10 +- keyboards/nullbitsco/nibble/big_led.c | 24 +- keyboards/nullbitsco/nibble/matrix.c | 10 +- keyboards/nullbitsco/scramble/v1/v1.c | 10 +- keyboards/nullbitsco/snap/matrix.c | 14 +- keyboards/om60/matrix.c | 24 +- keyboards/opendeck/32/rev1/rev1.c | 6 +- keyboards/ortho5by12/ortho5by12.c | 8 +- keyboards/peej/lumberjack/lumberjack.c | 4 +- keyboards/peej/rosaline/rosaline.c | 4 +- keyboards/percent/canoe_gen2/canoe_gen2.c | 8 +- keyboards/pica40/rev2/rev2.c | 14 +- keyboards/planck/planck.c | 4 +- keyboards/planck/rev6_drop/matrix.c | 12 +- keyboards/planck/rev7/matrix.c | 26 +- keyboards/pom_keyboards/tnln95/tnln95.c | 12 +- keyboards/preonic/rev1/rev1.c | 4 +- keyboards/preonic/rev2/rev2.c | 4 +- keyboards/primekb/meridian/meridian.c | 4 +- .../65/projectd_65_ansi/projectd_65_ansi.c | 6 +- keyboards/projectd/75/ansi/ansi.c | 6 +- keyboards/projectkb/alice/alice.c | 12 +- .../protozoa/event_horizon/event_horizon.c | 2 +- keyboards/punk75/punk75.c | 4 +- keyboards/quad_h/lb75/lb75.c | 8 +- keyboards/qvex/lynepad/lynepad.c | 24 +- keyboards/qvex/lynepad2/matrix.c | 36 +- keyboards/rart/rartlite/rartlite.c | 4 +- keyboards/rate/pistachio_pro/matrix.c | 10 +- keyboards/redox/wireless/wireless.c | 16 +- keyboards/redox/wireless/wireless.h | 16 +- keyboards/redscarf_i/redscarf_i.c | 26 +- keyboards/redscarf_iiplus/verb/matrix.c | 76 ++--- keyboards/redscarf_iiplus/verc/matrix.c | 76 ++--- keyboards/redscarf_iiplus/verd/matrix.c | 76 ++--- keyboards/rmi_kb/wete/v1/v1.c | 12 +- keyboards/rookiebwoy/neopad/rev1/rev1.c | 20 +- keyboards/rubi/rubi.c | 2 +- keyboards/ryanskidmore/rskeys100/matrix.c | 42 +-- keyboards/sekigon/grs_70ec/ec_switch_matrix.c | 26 +- keyboards/sekigon/grs_70ec/grs_70ec.c | 10 +- .../sergiopoverony/creator_pro/creator_pro.c | 14 +- keyboards/skyloong/gk61/pro/pro.c | 4 +- keyboards/skyloong/gk61/pro_48/pro_48.c | 4 +- keyboards/skyloong/gk61/v1/v1.c | 4 +- keyboards/smithrune/iron165r2/iron165r2.c | 6 +- keyboards/sneakbox/aliceclone/aliceclone.c | 12 +- keyboards/snes_macropad/matrix.c | 60 ++-- keyboards/splitkb/aurora/helix/rev1/rev1.c | 4 +- keyboards/sthlmkb/lagom/matrix.c | 10 +- keyboards/strech/soulstone/soulstone.c | 6 +- .../switchplate/southpaw_65/southpaw_65.c | 4 +- .../southpaw_fullsize/southpaw_fullsize.c | 12 +- keyboards/team0110/p1800fl/p1800fl.c | 6 +- keyboards/technika/technika.c | 6 +- keyboards/telophase/telophase.c | 12 +- keyboards/telophase/telophase.h | 12 +- keyboards/tkc/m0lly/m0lly.c | 8 +- keyboards/tkc/osav2/osav2.c | 12 +- keyboards/tkc/tkc1800/tkc1800.c | 8 +- keyboards/torn/matrix.c | 12 +- keyboards/touchpad/matrix.c | 68 ++-- keyboards/tr60w/tr60w.c | 6 +- keyboards/tzarc/djinn/djinn.c | 44 +-- keyboards/tzarc/djinn/djinn_portscan_matrix.c | 26 +- keyboards/tzarc/ghoul/ghoul.c | 12 +- .../overnumpad_1xb/overnumpad_1xb.c | 10 +- .../overnumpad_1xb/overnumpad_1xb.c | 10 +- keyboards/viktus/minne_topre/ec.c | 26 +- keyboards/viktus/osav2_numpad_topre/ec.c | 26 +- keyboards/viktus/osav2_topre/ec.c | 26 +- keyboards/viktus/sp111/matrix.c | 12 +- keyboards/viktus/sp111/sp111.c | 16 +- keyboards/viktus/sp111_v2/sp111_v2.c | 4 +- keyboards/viktus/sp_mini/sp_mini.c | 4 +- keyboards/viktus/styrka_topre/ec.c | 26 +- keyboards/vitamins_included/rev2/rev2.c | 6 +- keyboards/westfoxtrot/cypher/rev1/rev1.c | 8 +- keyboards/westfoxtrot/cypher/rev5/rev5.c | 8 +- keyboards/westfoxtrot/prophet/prophet.c | 8 +- keyboards/wilba_tech/wt60_xt/wt60_xt.c | 4 +- keyboards/wilba_tech/wt69_a/wt69_a.c | 4 +- keyboards/wilba_tech/wt70_jb/wt70_jb.c | 4 +- keyboards/wolfmarkclub/wm1/wm1.c | 12 +- keyboards/work_louder/micro/matrix.c | 12 +- keyboards/work_louder/micro/micro.c | 24 +- keyboards/work_louder/work_board/work_board.c | 12 +- keyboards/wsk/g4m3ralpha/g4m3ralpha.c | 18 +- keyboards/wuque/ikki68/ikki68.c | 4 +- keyboards/xiudi/xd75/xd75.c | 18 +- keyboards/ydkb/grape/matrix.c | 4 +- keyboards/ydkb/yd68/yd68.c | 16 +- .../yiancardesigns/barleycorn/barleycorn.c | 10 +- keyboards/yiancardesigns/barleycorn/matrix.c | 12 +- keyboards/yiancardesigns/gingham/matrix.c | 12 +- keyboards/yiancardesigns/seigaiha/matrix.c | 12 +- keyboards/ymdk/yd60mq/yd60mq.c | 8 +- keyboards/zsa/moonlander/matrix.c | 64 ++-- keyboards/zsa/moonlander/moonlander.c | 12 +- keyboards/zsa/moonlander/moonlander.h | 6 +- 390 files changed, 3912 insertions(+), 3913 deletions(-) diff --git a/keyboards/3w6/rev1/matrix.c b/keyboards/3w6/rev1/matrix.c index aa3e43fbe05..0c06a743a18 100644 --- a/keyboards/3w6/rev1/matrix.c +++ b/keyboards/3w6/rev1/matrix.c @@ -165,8 +165,8 @@ static void init_cols(void) { pin_t matrix_col_pins_mcu[MATRIX_COLS_PER_SIDE] = MATRIX_COL_PINS_L; for (int pin_index = 0; pin_index < MATRIX_COLS_PER_SIDE; pin_index++) { pin_t pin = matrix_col_pins_mcu[pin_index]; - setPinInput(pin); - writePinHigh(pin); + gpio_set_pin_input(pin); + gpio_write_pin_high(pin); } } @@ -177,7 +177,7 @@ static matrix_row_t read_cols(uint8_t row) { // For each col... for (uint8_t col_index = 0; col_index < MATRIX_COLS_PER_SIDE; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(matrix_col_pins_mcu[col_index]); + uint8_t pin_state = gpio_read_pin(matrix_col_pins_mcu[col_index]); // Populate the matrix row with the state of the col pin current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); @@ -223,8 +223,8 @@ static void unselect_rows(void) { pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_L; for (int pin_index = 0; pin_index < MATRIX_ROWS_PER_SIDE; pin_index++) { pin_t pin = matrix_row_pins_mcu[pin_index]; - setPinInput(pin); - writePinLow(pin); + gpio_set_pin_input(pin); + gpio_write_pin_low(pin); } } @@ -236,8 +236,8 @@ static void select_row(uint8_t row) { // select on atmega32u4 pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_L; pin_t pin = matrix_row_pins_mcu[row]; - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } else { // select on tca9555 if (tca9555_status) { // if there was an error diff --git a/keyboards/3w6/rev2/matrix.c b/keyboards/3w6/rev2/matrix.c index da7a5344e5f..8c628215aaf 100644 --- a/keyboards/3w6/rev2/matrix.c +++ b/keyboards/3w6/rev2/matrix.c @@ -165,8 +165,8 @@ static void init_cols(void) { pin_t matrix_col_pins_mcu[MATRIX_COLS_PER_SIDE] = MATRIX_COL_PINS_L; for (int pin_index = 0; pin_index < MATRIX_COLS_PER_SIDE; pin_index++) { pin_t pin = matrix_col_pins_mcu[pin_index]; - setPinInput(pin); - writePinHigh(pin); + gpio_set_pin_input(pin); + gpio_write_pin_high(pin); } } @@ -177,7 +177,7 @@ static matrix_row_t read_cols(uint8_t row) { // For each col... for (uint8_t col_index = 0; col_index < MATRIX_COLS_PER_SIDE; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(matrix_col_pins_mcu[col_index]); + uint8_t pin_state = gpio_read_pin(matrix_col_pins_mcu[col_index]); // Populate the matrix row with the state of the col pin current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); @@ -221,8 +221,8 @@ static void unselect_rows(void) { pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_L; for (int pin_index = 0; pin_index < MATRIX_ROWS_PER_SIDE; pin_index++) { pin_t pin = matrix_row_pins_mcu[pin_index]; - setPinInput(pin); - writePinLow(pin); + gpio_set_pin_input(pin); + gpio_write_pin_low(pin); } } @@ -233,8 +233,8 @@ static void select_row(uint8_t row) { // select on atmega32u4 pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_L; pin_t pin = matrix_row_pins_mcu[row]; - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } else { // select on tca9555 if (tca9555_status) { // if there was an error diff --git a/keyboards/40percentclub/4pack/4pack.c b/keyboards/40percentclub/4pack/4pack.c index bd2efa56209..044ce456818 100644 --- a/keyboards/40percentclub/4pack/4pack.c +++ b/keyboards/40percentclub/4pack/4pack.c @@ -23,8 +23,8 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(F4); // cathodes - setPinOutput(F5); // cathodes + gpio_set_pin_output(F4); // cathodes + gpio_set_pin_output(F5); // cathodes // Do the rest matrix_init_user(); diff --git a/keyboards/40percentclub/sixpack/sixpack.c b/keyboards/40percentclub/sixpack/sixpack.c index c8c7bad4442..fa7609c97f7 100644 --- a/keyboards/40percentclub/sixpack/sixpack.c +++ b/keyboards/40percentclub/sixpack/sixpack.c @@ -16,9 +16,9 @@ #include "quantum.h" void matrix_init_kb(void) { - setPinOutput(B6); // Backlight cathodes Col.3 - setPinOutput(F6); // Backlight cathodes Col.2 - setPinOutput(F7); // Backlight cathodes Col.1 + gpio_set_pin_output(B6); // Backlight cathodes Col.3 + gpio_set_pin_output(F6); // Backlight cathodes Col.2 + gpio_set_pin_output(F7); // Backlight cathodes Col.1 matrix_init_user(); } diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c b/keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c index 2971460bd21..4586044a94c 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c @@ -17,9 +17,9 @@ along with this program. If not, see . #include "rev_a.h" void board_init(void) { - setPinInputHigh(CAPS_PIN); - setPinInputHigh(SCROLL_PIN); - setPinInputHigh(NUM_PIN); + gpio_set_pin_input_high(CAPS_PIN); + gpio_set_pin_input_high(SCROLL_PIN); + gpio_set_pin_input_high(NUM_PIN); } /* Set indicator leds to indicate lock states */ @@ -27,23 +27,23 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res && LOCK_LIGHTS) { if(led_state.caps_lock){ - setPinOutput(CAPS_PIN); - writePin(CAPS_PIN, 0); + gpio_set_pin_output(CAPS_PIN); + gpio_write_pin(CAPS_PIN, 0); } else - setPinInputHigh(CAPS_PIN); + gpio_set_pin_input_high(CAPS_PIN); if(led_state.scroll_lock){ - setPinOutput(SCROLL_PIN); - writePin(SCROLL_PIN, 0); + gpio_set_pin_output(SCROLL_PIN); + gpio_write_pin(SCROLL_PIN, 0); } else - setPinInputHigh(SCROLL_PIN); + gpio_set_pin_input_high(SCROLL_PIN); if(led_state.num_lock){ - setPinOutput(NUM_PIN); - writePin(NUM_PIN, 0); + gpio_set_pin_output(NUM_PIN); + gpio_write_pin(NUM_PIN, 0); } else - setPinInputHigh(NUM_PIN); + gpio_set_pin_input_high(NUM_PIN); } return res; } @@ -59,50 +59,50 @@ layer_state_t layer_state_set_kb(layer_state_t state) { void setLayerLed(layer_state_t state){ switch(get_highest_layer(state)){ case 0 : - setPinOutput(LAYER_1); - writePin(LAYER_1, 0); - setPinInputHigh(LAYER_2); - setPinInputHigh(LAYER_3); - setPinInputHigh(LAYER_4); - setPinInputHigh(LAYER_5); + gpio_set_pin_output(LAYER_1); + gpio_write_pin(LAYER_1, 0); + gpio_set_pin_input_high(LAYER_2); + gpio_set_pin_input_high(LAYER_3); + gpio_set_pin_input_high(LAYER_4); + gpio_set_pin_input_high(LAYER_5); break; case 1 : - setPinOutput(LAYER_2); - writePin(LAYER_2, 0); - setPinInputHigh(LAYER_1); - setPinInputHigh(LAYER_3); - setPinInputHigh(LAYER_4); - setPinInputHigh(LAYER_5); + gpio_set_pin_output(LAYER_2); + gpio_write_pin(LAYER_2, 0); + gpio_set_pin_input_high(LAYER_1); + gpio_set_pin_input_high(LAYER_3); + gpio_set_pin_input_high(LAYER_4); + gpio_set_pin_input_high(LAYER_5); break; case 2 : - setPinOutput(LAYER_3); - writePin(LAYER_3, 0); - setPinInputHigh(LAYER_1); - setPinInputHigh(LAYER_2); - setPinInputHigh(LAYER_4); - setPinInputHigh(LAYER_5); + gpio_set_pin_output(LAYER_3); + gpio_write_pin(LAYER_3, 0); + gpio_set_pin_input_high(LAYER_1); + gpio_set_pin_input_high(LAYER_2); + gpio_set_pin_input_high(LAYER_4); + gpio_set_pin_input_high(LAYER_5); break; case 3 : - writePin(LAYER_4, 0); - setPinInputHigh(LAYER_5); - setPinInputHigh(LAYER_1); - setPinInputHigh(LAYER_2); - setPinInputHigh(LAYER_3); - setPinOutput(LAYER_4); + gpio_write_pin(LAYER_4, 0); + gpio_set_pin_input_high(LAYER_5); + gpio_set_pin_input_high(LAYER_1); + gpio_set_pin_input_high(LAYER_2); + gpio_set_pin_input_high(LAYER_3); + gpio_set_pin_output(LAYER_4); break; case 4 : - setPinOutput(LAYER_5); - writePin(LAYER_5, 0); - setPinInputHigh(LAYER_1); - setPinInputHigh(LAYER_2); - setPinInputHigh(LAYER_3); - setPinInputHigh(LAYER_4); + gpio_set_pin_output(LAYER_5); + gpio_write_pin(LAYER_5, 0); + gpio_set_pin_input_high(LAYER_1); + gpio_set_pin_input_high(LAYER_2); + gpio_set_pin_input_high(LAYER_3); + gpio_set_pin_input_high(LAYER_4); break; default : - setPinInputHigh(LAYER_1); - setPinInputHigh(LAYER_2); - setPinInputHigh(LAYER_3); - setPinInputHigh(LAYER_4); - setPinInputHigh(LAYER_5); + gpio_set_pin_input_high(LAYER_1); + gpio_set_pin_input_high(LAYER_2); + gpio_set_pin_input_high(LAYER_3); + gpio_set_pin_input_high(LAYER_4); + gpio_set_pin_input_high(LAYER_5); } } diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.c b/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.c index 2e71e34a267..ab052790c3e 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.c +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.c @@ -17,11 +17,11 @@ along with this program. If not, see . #include "rev_b.h" void keyboard_pre_init_kb(void) { - setPinOutput(LAYER_1); - setPinOutput(LAYER_2); - setPinOutput(LAYER_3); - setPinOutput(LAYER_4); - setPinOutput(LAYER_5); + gpio_set_pin_output(LAYER_1); + gpio_set_pin_output(LAYER_2); + gpio_set_pin_output(LAYER_3); + gpio_set_pin_output(LAYER_4); + gpio_set_pin_output(LAYER_5); keyboard_pre_init_user(); } @@ -32,26 +32,26 @@ layer_state_t layer_state_set_kb(layer_state_t state) { } /* Set indicator leds to indicate which layer is active */ void setLayerLed(layer_state_t state){ - writePinLow(LAYER_1); - writePinLow(LAYER_2); - writePinLow(LAYER_3); - writePinLow(LAYER_4); - writePinLow(LAYER_5); + gpio_write_pin_low(LAYER_1); + gpio_write_pin_low(LAYER_2); + gpio_write_pin_low(LAYER_3); + gpio_write_pin_low(LAYER_4); + gpio_write_pin_low(LAYER_5); switch (get_highest_layer(state)) { case 0: - writePinHigh(LAYER_1); + gpio_write_pin_high(LAYER_1); break; case 1: - writePinHigh(LAYER_2); + gpio_write_pin_high(LAYER_2); break; case 2: - writePinHigh(LAYER_3); + gpio_write_pin_high(LAYER_3); break; case 3: - writePinHigh(LAYER_4); + gpio_write_pin_high(LAYER_4); break; case 4: - writePinHigh(LAYER_5); + gpio_write_pin_high(LAYER_5); break; } } diff --git a/keyboards/acheron/apollo/87h/delta/delta.c b/keyboards/acheron/apollo/87h/delta/delta.c index 1e79584a9c0..b17fce5c3a3 100644 --- a/keyboards/acheron/apollo/87h/delta/delta.c +++ b/keyboards/acheron/apollo/87h/delta/delta.c @@ -18,8 +18,8 @@ along with this program. If not, see . #include "quantum.h" void board_init(void) { - setPinInput(B9); - setPinInput(B10); + gpio_set_pin_input(B9); + gpio_set_pin_input(B10); } led_config_t g_led_config = { { diff --git a/keyboards/acheron/apollo/87htsc/87htsc.c b/keyboards/acheron/apollo/87htsc/87htsc.c index de66897f72c..4225c34971f 100644 --- a/keyboards/acheron/apollo/87htsc/87htsc.c +++ b/keyboards/acheron/apollo/87htsc/87htsc.c @@ -18,8 +18,8 @@ along with this program. If not, see . #include "quantum.h" void board_init(void) { - setPinInput(B9); - setPinInput(B10); + gpio_set_pin_input(B9); + gpio_set_pin_input(B10); } led_config_t g_led_config = { { diff --git a/keyboards/acheron/athena/alpha/alpha.c b/keyboards/acheron/athena/alpha/alpha.c index 9e4f82f7ad1..8fe47eff821 100644 --- a/keyboards/acheron/athena/alpha/alpha.c +++ b/keyboards/acheron/athena/alpha/alpha.c @@ -17,8 +17,8 @@ #include "quantum.h" void board_init(void) { - setPinInput(B6); - setPinInput(B7); + gpio_set_pin_input(B6); + gpio_set_pin_input(B7); } void keyboard_post_init_kb(void){ @@ -34,10 +34,10 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); #ifdef CAPSLOCK_INDICATOR if(res) { - writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); } #else - writePin(LED_CAPS_LOCK_PIN, 0); + gpio_write_pin(LED_CAPS_LOCK_PIN, 0); #endif return res; } diff --git a/keyboards/acheron/athena/beta/beta.c b/keyboards/acheron/athena/beta/beta.c index 9ad9c71cc88..fe221284371 100644 --- a/keyboards/acheron/athena/beta/beta.c +++ b/keyboards/acheron/athena/beta/beta.c @@ -17,18 +17,18 @@ #include "quantum.h" void board_init(void) { - setPinInput(B6); - setPinInput(B7); + gpio_set_pin_input(B6); + gpio_set_pin_input(B7); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); #ifdef CAPSLOCK_INDICATOR if(res) { - writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, led_state.caps_lock); } #else - writePin(LED_CAPS_LOCK_PIN, 0); + gpio_write_pin(LED_CAPS_LOCK_PIN, 0); #endif return res; } diff --git a/keyboards/acheron/austin/austin.c b/keyboards/acheron/austin/austin.c index 5c0a4f642d7..9a69d1c0865 100644 --- a/keyboards/acheron/austin/austin.c +++ b/keyboards/acheron/austin/austin.c @@ -1,18 +1,18 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(A0); - setPinOutput(A1); - setPinOutput(A2); + gpio_set_pin_output(A0); + gpio_set_pin_output(A1); + gpio_set_pin_output(A2); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { - writePin(A2, led_state.num_lock); - writePin(A0, led_state.caps_lock); - writePin(A1, led_state.scroll_lock); + gpio_write_pin(A2, led_state.num_lock); + gpio_write_pin(A0, led_state.caps_lock); + gpio_write_pin(A1, led_state.scroll_lock); } return true; } diff --git a/keyboards/acheron/elongate/delta/delta.c b/keyboards/acheron/elongate/delta/delta.c index e621b4495b5..98b60bae614 100755 --- a/keyboards/acheron/elongate/delta/delta.c +++ b/keyboards/acheron/elongate/delta/delta.c @@ -30,18 +30,18 @@ void led_init_ports(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(LED1_PIN, !led_state.num_lock); - writePin(LED2_PIN, !led_state.caps_lock); - writePin(LED3_PIN, !led_state.scroll_lock); + gpio_write_pin(LED1_PIN, !led_state.num_lock); + gpio_write_pin(LED2_PIN, !led_state.caps_lock); + gpio_write_pin(LED3_PIN, !led_state.scroll_lock); } return res; } // Turns off all bottom LEDs void turn_off_bottom_leds(void){ - writePin(LED4_PIN, 1); - writePin(LED5_PIN, 1); - writePin(LED6_PIN, 1); + gpio_write_pin(LED4_PIN, 1); + gpio_write_pin(LED5_PIN, 1); + gpio_write_pin(LED6_PIN, 1); } /* @@ -53,19 +53,19 @@ layer_state_t layer_state_set_kb(layer_state_t state) { switch (get_highest_layer(state)) { // The base layer, or layer zero, will be handled by the default case. case 1: - writePin(LED4_PIN, 1); - writePin(LED5_PIN, 0); - writePin(LED6_PIN, 1); + gpio_write_pin(LED4_PIN, 1); + gpio_write_pin(LED5_PIN, 0); + gpio_write_pin(LED6_PIN, 1); break; case 2: - writePin(LED4_PIN, 1); - writePin(LED5_PIN, 1); - writePin(LED6_PIN, 0); + gpio_write_pin(LED4_PIN, 1); + gpio_write_pin(LED5_PIN, 1); + gpio_write_pin(LED6_PIN, 0); break; default: - writePin(LED4_PIN, 0); - writePin(LED5_PIN, 1); - writePin(LED6_PIN, 1); + gpio_write_pin(LED4_PIN, 0); + gpio_write_pin(LED5_PIN, 1); + gpio_write_pin(LED6_PIN, 1); break; } return state; @@ -73,5 +73,5 @@ layer_state_t layer_state_set_kb(layer_state_t state) { // Since the keyboard starts at layer 0, the init function starts LED4 as lit up. void keyboard_post_init_kb(void){ - writePin(LED4_PIN, 0); + gpio_write_pin(LED4_PIN, 0); } diff --git a/keyboards/acheron/shark/beta/beta.c b/keyboards/acheron/shark/beta/beta.c index 5592353ad76..647dac60b73 100644 --- a/keyboards/acheron/shark/beta/beta.c +++ b/keyboards/acheron/shark/beta/beta.c @@ -17,6 +17,6 @@ #include "quantum.h" void board_init(void) { - setPinInput(B6); - setPinInput(B7); + gpio_set_pin_input(B6); + gpio_set_pin_input(B7); } diff --git a/keyboards/aeboards/ext65/rev1/rev1.c b/keyboards/aeboards/ext65/rev1/rev1.c index adbae948161..344a2bcb322 100644 --- a/keyboards/aeboards/ext65/rev1/rev1.c +++ b/keyboards/aeboards/ext65/rev1/rev1.c @@ -19,18 +19,18 @@ void keyboard_pre_init_user(void) { // Call the keyboard pre init code. // Set our LED pins as output - setPinOutput(D5); - setPinOutput(D3); - setPinOutput(D2); - setPinOutput(D1); + gpio_set_pin_output(D5); + gpio_set_pin_output(D3); + gpio_set_pin_output(D2); + gpio_set_pin_output(D1); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(D5, led_state.num_lock); - writePin(D3, led_state.caps_lock); - writePin(D2, led_state.scroll_lock); + gpio_write_pin(D5, led_state.num_lock); + gpio_write_pin(D3, led_state.caps_lock); + gpio_write_pin(D2, led_state.scroll_lock); } return res; } @@ -38,10 +38,10 @@ bool led_update_kb(led_t led_state) { layer_state_t layer_state_set_kb(layer_state_t state) { switch (get_highest_layer(state)) { case 1: - writePinHigh(D1); + gpio_write_pin_high(D1); break; default: // for any other layers, or the default layer - writePinLow(D1); + gpio_write_pin_low(D1); break; } return layer_state_set_user(state); diff --git a/keyboards/aeboards/ext65/rev2/rev2.c b/keyboards/aeboards/ext65/rev2/rev2.c index 934553abcfe..5922b601cd1 100644 --- a/keyboards/aeboards/ext65/rev2/rev2.c +++ b/keyboards/aeboards/ext65/rev2/rev2.c @@ -71,10 +71,10 @@ bool oled_task_kb(void) { void keyboard_pre_init_kb(void) { // Call the keyboard pre init code. // Set our LED pins as output - setPinOutput(B4); - setPinOutput(B3); - setPinOutput(A15); - setPinOutput(A14); + gpio_set_pin_output(B4); + gpio_set_pin_output(B3); + gpio_set_pin_output(A15); + gpio_set_pin_output(A14); keyboard_pre_init_user(); } @@ -82,9 +82,9 @@ void keyboard_pre_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - writePin(B4, led_state.num_lock); - writePin(B3, led_state.caps_lock); - writePin(A15, led_state.scroll_lock); + gpio_write_pin(B4, led_state.num_lock); + gpio_write_pin(B3, led_state.caps_lock); + gpio_write_pin(A15, led_state.scroll_lock); } return res; } @@ -92,10 +92,10 @@ bool led_update_kb(led_t led_state) { layer_state_t layer_state_set_kb(layer_state_t state) { switch (get_highest_layer(state)) { case 1: - writePinHigh(A14); + gpio_write_pin_high(A14); break; default: // for any other layers, or the default layer - writePinLow(A14); + gpio_write_pin_low(A14); break; } return layer_state_set_user(state); diff --git a/keyboards/aeboards/ext65/rev3/rev3.c b/keyboards/aeboards/ext65/rev3/rev3.c index b5e27756ec5..f8fc2ef5023 100644 --- a/keyboards/aeboards/ext65/rev3/rev3.c +++ b/keyboards/aeboards/ext65/rev3/rev3.c @@ -22,16 +22,16 @@ void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); } void keyboard_pre_init_user(void) { // Call the keyboard pre init code. // Set our LED pins as output - setPinOutput(LED_LAYERS_PIN); + gpio_set_pin_output(LED_LAYERS_PIN); } layer_state_t layer_state_set_kb(layer_state_t state) { switch (get_highest_layer(state)) { case 1: - writePinHigh(LED_LAYERS_PIN); + gpio_write_pin_high(LED_LAYERS_PIN); break; default: // for any other layers, or the default layer - writePinLow(LED_LAYERS_PIN); + gpio_write_pin_low(LED_LAYERS_PIN); break; } return layer_state_set_user(state); diff --git a/keyboards/ai03/orbit/orbit.c b/keyboards/ai03/orbit/orbit.c index 5097f9cd90a..0c1e0dc32ee 100644 --- a/keyboards/ai03/orbit/orbit.c +++ b/keyboards/ai03/orbit/orbit.c @@ -19,13 +19,13 @@ void led_init_ports(void) { // Initialize indicator LEDs to output if (isLeftHand) { - setPinOutput(C6); - setPinOutput(B6); - setPinOutput(B5); + gpio_set_pin_output(C6); + gpio_set_pin_output(B6); + gpio_set_pin_output(B5); } else { - setPinOutput(F6); - setPinOutput(F7); - setPinOutput(C7); + gpio_set_pin_output(F6); + gpio_set_pin_output(F7); + gpio_set_pin_output(C7); } set_layer_indicators(0); @@ -40,15 +40,15 @@ void led_toggle(uint8_t id, bool on) { switch (id) { case 0: // Left hand C6 - writePin(C6, on); + gpio_write_pin(C6, on); break; case 1: // Left hand B6 - writePin(B6, on); + gpio_write_pin(B6, on); break; case 2: // Left hand B5 - writePin(B5, on); + gpio_write_pin(B5, on); break; default: break; @@ -57,15 +57,15 @@ void led_toggle(uint8_t id, bool on) { switch (id) { case 3: // Right hand F6 - writePin(F6, on); + gpio_write_pin(F6, on); break; case 4: // Right hand F7 - writePin(F7, on); + gpio_write_pin(F7, on); break; case 5: // Right hand C7 - writePin(C7, on); + gpio_write_pin(C7, on); break; default: break; diff --git a/keyboards/ai03/vega/vega.c b/keyboards/ai03/vega/vega.c index 6ed1651e508..44ded2c85c4 100644 --- a/keyboards/ai03/vega/vega.c +++ b/keyboards/ai03/vega/vega.c @@ -19,8 +19,8 @@ void matrix_init_kb(void) { // Initialize indicator LEDs to output - setPinOutput(B7); // Caps - setPinOutput(A5); // Slck + gpio_set_pin_output(B7); // Caps + gpio_set_pin_output(A5); // Slck matrix_init_user(); } @@ -30,8 +30,8 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B7, !led_state.caps_lock); - writePin(A5, !led_state.scroll_lock); + gpio_write_pin(B7, !led_state.caps_lock); + gpio_write_pin(A5, !led_state.scroll_lock); } return res; } \ No newline at end of file diff --git a/keyboards/akko/5087/5087.c b/keyboards/akko/5087/5087.c index 7dd614b4565..746a9a78161 100644 --- a/keyboards/akko/5087/5087.c +++ b/keyboards/akko/5087/5087.c @@ -137,17 +137,17 @@ enum __layers { // clang-format on void matrix_init_kb(void) { - setPinOutput(LED_MAC_OS_PIN); // LDE2 MAC\WIN - writePinLow(LED_MAC_OS_PIN); - setPinOutput(LED_WIN_LOCK_PIN); // LED3 Win Lock - writePinLow(LED_WIN_LOCK_PIN); + gpio_set_pin_output(LED_MAC_OS_PIN); // LDE2 MAC\WIN + gpio_write_pin_low(LED_MAC_OS_PIN); + gpio_set_pin_output(LED_WIN_LOCK_PIN); // LED3 Win Lock + gpio_write_pin_low(LED_WIN_LOCK_PIN); matrix_init_user(); } void housekeeping_task_kb(void){ - writePin(LED_MAC_OS_PIN, (get_highest_layer(default_layer_state) == 3)); - writePin(LED_WIN_LOCK_PIN, keymap_config.no_gui); + gpio_write_pin(LED_MAC_OS_PIN, (get_highest_layer(default_layer_state) == 3)); + gpio_write_pin(LED_WIN_LOCK_PIN, keymap_config.no_gui); } bool process_record_kb(uint16_t keycode, keyrecord_t* record) { diff --git a/keyboards/akko/5108/5108.c b/keyboards/akko/5108/5108.c index 91526289b67..7330707f453 100644 --- a/keyboards/akko/5108/5108.c +++ b/keyboards/akko/5108/5108.c @@ -148,15 +148,15 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { #endif void keyboard_pre_init_kb(void) { - setPinOutput(LED_WIN_LOCK_PIN); // LED3 Win Lock - writePinLow(LED_WIN_LOCK_PIN); + gpio_set_pin_output(LED_WIN_LOCK_PIN); // LED3 Win Lock + gpio_write_pin_low(LED_WIN_LOCK_PIN); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - writePin(LED_WIN_LOCK_PIN, keymap_config.no_gui); + gpio_write_pin(LED_WIN_LOCK_PIN, keymap_config.no_gui); } return res; } diff --git a/keyboards/al1/matrix.c b/keyboards/al1/matrix.c index e3d7971f1c2..508a2b5ea9a 100644 --- a/keyboards/al1/matrix.c +++ b/keyboards/al1/matrix.c @@ -48,7 +48,7 @@ static void select_col(uint8_t col) { static void init_pins(void) { for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -65,7 +65,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col); } else { diff --git a/keyboards/anavi/knob1/knob1.c b/keyboards/anavi/knob1/knob1.c index bb6f1e38bfd..5e63ef4f32c 100644 --- a/keyboards/anavi/knob1/knob1.c +++ b/keyboards/anavi/knob1/knob1.c @@ -6,8 +6,8 @@ void keyboard_post_init_kb(void) { // Enable RGB LED - setPinOutput(GP11); - writePinHigh(GP11); + gpio_set_pin_output(GP11); + gpio_write_pin_high(GP11); rgblight_enable(); // Offload to the user func diff --git a/keyboards/anavi/knobs3/knobs3.c b/keyboards/anavi/knobs3/knobs3.c index efae0101636..01b3b60c6f4 100644 --- a/keyboards/anavi/knobs3/knobs3.c +++ b/keyboards/anavi/knobs3/knobs3.c @@ -6,8 +6,8 @@ void keyboard_post_init_kb(void) { // Enable RGB LED - setPinOutput(GP11); - writePinHigh(GP11); + gpio_set_pin_output(GP11); + gpio_write_pin_high(GP11); rgblight_enable(); // Offload to the user func diff --git a/keyboards/argyle/matrix.c b/keyboards/argyle/matrix.c index d723392a013..d435b368c22 100644 --- a/keyboards/argyle/matrix.c +++ b/keyboards/argyle/matrix.c @@ -26,27 +26,27 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return (readPin(pin) == 0) ? 0 : 1; + return (gpio_read_pin(pin) == 0) ? 0 : 1; } else { return 1; } diff --git a/keyboards/artifact/lvl/rev_hs01/rev_hs01.c b/keyboards/artifact/lvl/rev_hs01/rev_hs01.c index 6266ef69ad5..fdbfa8f2727 100755 --- a/keyboards/artifact/lvl/rev_hs01/rev_hs01.c +++ b/keyboards/artifact/lvl/rev_hs01/rev_hs01.c @@ -17,5 +17,5 @@ void led_init_ports(void) { // Set our LED pins as open drain outputs - setPinOutputOpenDrain(LED_CAPS_LOCK_PIN); + gpio_set_pin_output_open_drain(LED_CAPS_LOCK_PIN); } diff --git a/keyboards/atlantis/ps17/ps17.c b/keyboards/atlantis/ps17/ps17.c index d660bdee6a9..8caf8a2e8fc 100644 --- a/keyboards/atlantis/ps17/ps17.c +++ b/keyboards/atlantis/ps17/ps17.c @@ -5,26 +5,26 @@ layer_state_t layer_state_set_kb(layer_state_t state) { /* Display current layer using indicator LEDs */ - writePin(LED_INDICATOR_0_PIN, !IS_LAYER_ON_STATE(state, 1)); - writePin(LED_INDICATOR_1_PIN, !IS_LAYER_ON_STATE(state, 2)); - writePin(LED_INDICATOR_2_PIN, !IS_LAYER_ON_STATE(state, 3)); + gpio_write_pin(LED_INDICATOR_0_PIN, !IS_LAYER_ON_STATE(state, 1)); + gpio_write_pin(LED_INDICATOR_1_PIN, !IS_LAYER_ON_STATE(state, 2)); + gpio_write_pin(LED_INDICATOR_2_PIN, !IS_LAYER_ON_STATE(state, 3)); return layer_state_set_user(state); } void keyboard_pre_init_kb(void) { /* Set indicator LEDs as outputs */ - setPinOutput(LED_INDICATOR_0_PIN); - setPinOutput(LED_INDICATOR_1_PIN); - setPinOutput(LED_INDICATOR_2_PIN); + gpio_set_pin_output(LED_INDICATOR_0_PIN); + gpio_set_pin_output(LED_INDICATOR_1_PIN); + gpio_set_pin_output(LED_INDICATOR_2_PIN); keyboard_pre_init_user(); } #ifdef RGB_MATRIX_ENABLE void suspend_power_down_kb(void) { /* Disable indicator LEDs when going to sleep */ - writePin(LED_INDICATOR_0_PIN, 1); - writePin(LED_INDICATOR_1_PIN, 1); - writePin(LED_INDICATOR_2_PIN, 1); + gpio_write_pin(LED_INDICATOR_0_PIN, 1); + gpio_write_pin(LED_INDICATOR_1_PIN, 1); + gpio_write_pin(LED_INDICATOR_2_PIN, 1); suspend_power_down_user(); } diff --git a/keyboards/atomic/atomic.c b/keyboards/atomic/atomic.c index 68f3ce97640..8bfe706da0b 100644 --- a/keyboards/atomic/atomic.c +++ b/keyboards/atomic/atomic.c @@ -21,8 +21,8 @@ void matrix_init_kb(void) { // runs once when the firmware starts up // Turn status LED on - setPinOutput(E6); - writePinHigh(E6); + gpio_set_pin_output(E6); + gpio_write_pin_high(E6); matrix_init_user(); } diff --git a/keyboards/bajjak/bajjak.h b/keyboards/bajjak/bajjak.h index c2d2d77ef61..cd4ae500535 100644 --- a/keyboards/bajjak/bajjak.h +++ b/keyboards/bajjak/bajjak.h @@ -53,17 +53,17 @@ uint8_t bajjak_left_leds_update(void); #endif -inline void bajjak_board_led_on(void) { setPinOutput(D6); writePinHigh(D6); } -inline void bajjak_right_led_1_on(void) { setPinOutput(B5); writePinHigh(B5); } -inline void bajjak_right_led_2_on(void) { setPinOutput(B6); writePinHigh(B6); } -inline void bajjak_right_led_3_on(void) { setPinOutput(B7); writePinHigh(B7); } -inline void bajjak_right_led_on(uint8_t led) { setPinOutput(led+4); writePinHigh(led+4); } +inline void bajjak_board_led_on(void) { gpio_set_pin_output(D6); gpio_write_pin_high(D6); } +inline void bajjak_right_led_1_on(void) { gpio_set_pin_output(B5); gpio_write_pin_high(B5); } +inline void bajjak_right_led_2_on(void) { gpio_set_pin_output(B6); gpio_write_pin_high(B6); } +inline void bajjak_right_led_3_on(void) { gpio_set_pin_output(B7); gpio_write_pin_high(B7); } +inline void bajjak_right_led_on(uint8_t led) { gpio_set_pin_output(led+4); gpio_write_pin_high(led+4); } -inline void bajjak_board_led_off(void) { setPinInput(D6); writePinLow(D6); } -inline void bajjak_right_led_1_off(void) { setPinInput(B5); writePinLow(B5); } -inline void bajjak_right_led_2_off(void) { setPinInput(B6); writePinLow(B6); } -inline void bajjak_right_led_3_off(void) { setPinInput(B7); writePinLow(B7); } -inline void bajjak_right_led_off(uint8_t led) { setPinInput(led+4); writePinLow(led+4); } +inline void bajjak_board_led_off(void) { gpio_set_pin_input(D6); gpio_write_pin_low(D6); } +inline void bajjak_right_led_1_off(void) { gpio_set_pin_input(B5); gpio_write_pin_low(B5); } +inline void bajjak_right_led_2_off(void) { gpio_set_pin_input(B6); gpio_write_pin_low(B6); } +inline void bajjak_right_led_3_off(void) { gpio_set_pin_input(B7); gpio_write_pin_low(B7); } +inline void bajjak_right_led_off(uint8_t led) { gpio_set_pin_input(led+4); gpio_write_pin_low(led+4); } #ifdef LEFT_LEDS bool bajjak_left_led_1; diff --git a/keyboards/bajjak/matrix.c b/keyboards/bajjak/matrix.c index b0d1ab531f3..5451bf787dc 100644 --- a/keyboards/bajjak/matrix.c +++ b/keyboards/bajjak/matrix.c @@ -128,13 +128,13 @@ static void init_cols(void) { // not needed, already done as part of init_mcp23018() // init on teensy - setPinInputHigh(F0); - setPinInputHigh(F1); - setPinInputHigh(F4); - setPinInputHigh(F5); - setPinInputHigh(F6); - setPinInputHigh(F7); - setPinInputHigh(D7); + gpio_set_pin_input_high(F0); + gpio_set_pin_input_high(F1); + gpio_set_pin_input_high(F4); + gpio_set_pin_input_high(F5); + gpio_set_pin_input_high(F6); + gpio_set_pin_input_high(F7); + gpio_set_pin_input_high(D7); } static matrix_row_t read_cols(uint8_t row) { @@ -175,13 +175,13 @@ static void unselect_rows(void) { // direction // unselect on teensy - setPinInput(B0); - setPinInput(B1); - setPinInput(B2); - setPinInput(B3); - setPinInput(D2); - setPinInput(D3); - setPinInput(C6); + gpio_set_pin_input(B0); + gpio_set_pin_input(B1); + gpio_set_pin_input(B2); + gpio_set_pin_input(B3); + gpio_set_pin_input(D2); + gpio_set_pin_input(D3); + gpio_set_pin_input(C6); } static void select_row(uint8_t row) { @@ -200,32 +200,32 @@ static void select_row(uint8_t row) { // Output low(DDR:1, PORT:0) to select switch (row) { case 7: - setPinOutput(B0); - writePinLow(B0); + gpio_set_pin_output(B0); + gpio_write_pin_low(B0); break; case 8: - setPinOutput(B1); - writePinLow(B1); + gpio_set_pin_output(B1); + gpio_write_pin_low(B1); break; case 9: - setPinOutput(B2); - writePinLow(B2); + gpio_set_pin_output(B2); + gpio_write_pin_low(B2); break; case 10: - setPinOutput(B3); - writePinLow(B3); + gpio_set_pin_output(B3); + gpio_write_pin_low(B3); break; case 11: - setPinOutput(D2); - writePinLow(D2); + gpio_set_pin_output(D2); + gpio_write_pin_low(D2); break; case 12: - setPinOutput(D3); - writePinLow(D3); + gpio_set_pin_output(D3); + gpio_write_pin_low(D3); break; case 13: - setPinOutput(C6); - writePinLow(C6); + gpio_set_pin_output(C6); + gpio_write_pin_low(C6); break; } } diff --git a/keyboards/bandominedoni/bandominedoni.c b/keyboards/bandominedoni/bandominedoni.c index 2884e41c9c1..76d9e6cb3b6 100644 --- a/keyboards/bandominedoni/bandominedoni.c +++ b/keyboards/bandominedoni/bandominedoni.c @@ -70,14 +70,14 @@ led_config_t g_led_config = { #if defined(SPLIT_HAND_MATRIX_GRID) static uint8_t peek_matrix_intersection(pin_t out_pin, pin_t in_pin) { - setPinInputHigh(in_pin); - setPinOutput(out_pin); - writePinLow(out_pin); + gpio_set_pin_input_high(in_pin); + gpio_set_pin_output(out_pin); + gpio_write_pin_low(out_pin); // It's almost unnecessary, but wait until it's down to low, just in case. wait_us(1); - uint8_t pin_state = readPin(in_pin); + uint8_t pin_state = gpio_read_pin(in_pin); // Set out_pin to a setting that is less susceptible to noise. - setPinInputHigh(out_pin); + gpio_set_pin_input_high(out_pin); matrix_io_delay(); // Wait for the pull-up to go HIGH. return pin_state; } @@ -93,8 +93,8 @@ static enum { UNKNOWN, LEFT, RIGHT } hand_side = UNKNOWN; if (hand_side == UNKNOWN) { #if defined(SPLIT_HAND_PIN) // Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand - setPinInput(SPLIT_HAND_PIN); - hand_side = readPin(SPLIT_HAND_PIN) ? LEFT : RIGHT; + gpio_set_pin_input(SPLIT_HAND_PIN); + hand_side = gpio_read_pin(SPLIT_HAND_PIN) ? LEFT : RIGHT; return (hand_side == LEFT); #elif defined(SPLIT_HAND_MATRIX_GRID) # ifdef SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT diff --git a/keyboards/barleycorn_smd/matrix.c b/keyboards/barleycorn_smd/matrix.c index d8880364b66..f64e8fcd7fc 100644 --- a/keyboards/barleycorn_smd/matrix.c +++ b/keyboards/barleycorn_smd/matrix.c @@ -23,17 +23,17 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static void unselect_rows(void) { for(uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void init_pins(void) { @@ -46,7 +46,7 @@ static void init_pins(void) { for (uint8_t x = 0; x < MATRIX_COLS; x++) { if ( x < 8 ) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } } @@ -111,7 +111,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) pin_state = port_expander_col_buffer[1] & (1 << 1); break; default : - pin_state = readPin(col_pins[col_index]); + pin_state = gpio_read_pin(col_pins[col_index]); } // Populate the matrix row with the state of the col pin diff --git a/keyboards/bastardkb/charybdis/charybdis.c b/keyboards/bastardkb/charybdis/charybdis.c index c9f0e631728..0ee5c3eed97 100644 --- a/keyboards/bastardkb/charybdis/charybdis.c +++ b/keyboards/bastardkb/charybdis/charybdis.c @@ -371,12 +371,12 @@ void housekeeping_task_kb(void) { #if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill) || defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill) void keyboard_pre_init_kb(void) { - setPinInputHigh(A0); + gpio_set_pin_input_high(A0); keyboard_pre_init_user(); } void matrix_scan_kb(void) { - if (!readPin(A0)) { + if (!gpio_read_pin(A0)) { reset_keyboard(); } matrix_scan_user(); diff --git a/keyboards/bear_face/v1/v1.c b/keyboards/bear_face/v1/v1.c index f4960d91786..b64a63f0b43 100644 --- a/keyboards/bear_face/v1/v1.c +++ b/keyboards/bear_face/v1/v1.c @@ -19,7 +19,7 @@ along with this program. If not, see . void keyboard_pre_init_kb(void) { //Sets LED pin as output - setPinOutput(F7); + gpio_set_pin_output(F7); keyboard_pre_init_user(); } @@ -28,7 +28,7 @@ bool led_update_kb(led_t led_state) { // Caps Lock LED indicator toggling code here bool res = led_update_user(led_state); if(res) { - writePin(F7, led_state.caps_lock); + gpio_write_pin(F7, led_state.caps_lock); } return res; } diff --git a/keyboards/bear_face/v2/v2.c b/keyboards/bear_face/v2/v2.c index f4960d91786..b64a63f0b43 100644 --- a/keyboards/bear_face/v2/v2.c +++ b/keyboards/bear_face/v2/v2.c @@ -19,7 +19,7 @@ along with this program. If not, see . void keyboard_pre_init_kb(void) { //Sets LED pin as output - setPinOutput(F7); + gpio_set_pin_output(F7); keyboard_pre_init_user(); } @@ -28,7 +28,7 @@ bool led_update_kb(led_t led_state) { // Caps Lock LED indicator toggling code here bool res = led_update_user(led_state); if(res) { - writePin(F7, led_state.caps_lock); + gpio_write_pin(F7, led_state.caps_lock); } return res; } diff --git a/keyboards/bioi/g60/g60.c b/keyboards/bioi/g60/g60.c index 3b387b87608..3fdfef8897a 100644 --- a/keyboards/bioi/g60/g60.c +++ b/keyboards/bioi/g60/g60.c @@ -15,14 +15,14 @@ along with this program. If not, see . #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(F0); - writePinHigh(F0); + gpio_set_pin_output(F0); + gpio_write_pin_high(F0); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { - writePin(F0, !led_state.caps_lock); + gpio_write_pin(F0, !led_state.caps_lock); } return true; } diff --git a/keyboards/bioi/morgan65/morgan65.c b/keyboards/bioi/morgan65/morgan65.c index 3b387b87608..3fdfef8897a 100644 --- a/keyboards/bioi/morgan65/morgan65.c +++ b/keyboards/bioi/morgan65/morgan65.c @@ -15,14 +15,14 @@ along with this program. If not, see . #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(F0); - writePinHigh(F0); + gpio_set_pin_output(F0); + gpio_write_pin_high(F0); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { - writePin(F0, !led_state.caps_lock); + gpio_write_pin(F0, !led_state.caps_lock); } return true; } diff --git a/keyboards/bioi/s65/s65.c b/keyboards/bioi/s65/s65.c index 1bd6b843479..e632f31eeb6 100644 --- a/keyboards/bioi/s65/s65.c +++ b/keyboards/bioi/s65/s65.c @@ -14,14 +14,14 @@ along with this program. If not, see . #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(F0); - writePinHigh(F0); + gpio_set_pin_output(F0); + gpio_write_pin_high(F0); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { - writePin(F0, !led_state.caps_lock); + gpio_write_pin(F0, !led_state.caps_lock); } return true; } diff --git a/keyboards/blu/vimclutch/vimclutch.c b/keyboards/blu/vimclutch/vimclutch.c index 5add11ee4f4..6dc8cf765e3 100644 --- a/keyboards/blu/vimclutch/vimclutch.c +++ b/keyboards/blu/vimclutch/vimclutch.c @@ -18,8 +18,8 @@ along with this program. If not, see . void keyboard_pre_init_kb(void) { - setPinOutput(F4); - setPinOutput(F5); + gpio_set_pin_output(F4); + gpio_set_pin_output(F5); keyboard_pre_init_user(); }; diff --git a/keyboards/bobpad/bobpad.c b/keyboards/bobpad/bobpad.c index 67b124ace20..83b4dbaad00 100644 --- a/keyboards/bobpad/bobpad.c +++ b/keyboards/bobpad/bobpad.c @@ -19,7 +19,7 @@ bool led_update_kb(led_t led_state) { if (!led_update_user(led_state)) { return false; } - writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, led_state.caps_lock); return true; }; diff --git a/keyboards/bpiphany/ghost_squid/ghost_squid.c b/keyboards/bpiphany/ghost_squid/ghost_squid.c index 3ecac66f7a7..8ecced34e71 100644 --- a/keyboards/bpiphany/ghost_squid/ghost_squid.c +++ b/keyboards/bpiphany/ghost_squid/ghost_squid.c @@ -18,8 +18,8 @@ along with this program. If not, see . #include "ghost_squid.h" void keyboard_pre_init_kb(void) { - setPinOutput(D0); - writePinLow(D0); + gpio_set_pin_output(D0); + gpio_write_pin_low(D0); fn_led_off(); keyboard_pre_init_user(); diff --git a/keyboards/bpiphany/ghost_squid/ghost_squid.h b/keyboards/bpiphany/ghost_squid/ghost_squid.h index 63d3ea0d5ea..a227a876025 100644 --- a/keyboards/bpiphany/ghost_squid/ghost_squid.h +++ b/keyboards/bpiphany/ghost_squid/ghost_squid.h @@ -19,5 +19,5 @@ along with this program. If not, see . #include "quantum.h" -#define fn_led_on() writePinLow(D0) -#define fn_led_off() writePinHigh(D0) +#define fn_led_on() gpio_write_pin_low(D0) +#define fn_led_off() gpio_write_pin_high(D0) diff --git a/keyboards/bpiphany/ghost_squid/matrix.c b/keyboards/bpiphany/ghost_squid/matrix.c index 802d365cb89..ae48f5fc94d 100644 --- a/keyboards/bpiphany/ghost_squid/matrix.c +++ b/keyboards/bpiphany/ghost_squid/matrix.c @@ -55,22 +55,22 @@ void select_col(uint8_t col) { void matrix_init_custom(void) { /* Column output pins */ - setPinOutput(D1); - setPinOutput(D2); - setPinOutput(D3); - setPinOutput(D4); - setPinOutput(D5); - setPinOutput(D6); + gpio_set_pin_output(D1); + gpio_set_pin_output(D2); + gpio_set_pin_output(D3); + gpio_set_pin_output(D4); + gpio_set_pin_output(D5); + gpio_set_pin_output(D6); /* Row input pins */ - writePinHigh(B0); - writePinHigh(B1); - writePinHigh(B2); - writePinHigh(B3); - writePinHigh(B4); - writePinHigh(B5); - writePinHigh(B6); - writePinHigh(C2); + gpio_write_pin_high(B0); + gpio_write_pin_high(B1); + gpio_write_pin_high(B2); + gpio_write_pin_high(B3); + gpio_write_pin_high(B4); + gpio_write_pin_high(B5); + gpio_write_pin_high(B6); + gpio_write_pin_high(C2); } bool matrix_scan_custom(matrix_row_t current_matrix[]) { diff --git a/keyboards/capsunlocked/cu75/cu75.c b/keyboards/capsunlocked/cu75/cu75.c index f980b0d9e13..e04dd74bc8b 100644 --- a/keyboards/capsunlocked/cu75/cu75.c +++ b/keyboards/capsunlocked/cu75/cu75.c @@ -20,12 +20,12 @@ void matrix_init_kb(void) audio_init(); PLAY_SONG(test_sound); // Fix port B5 - setPinInput(B5); - writePinHigh(B5); + gpio_set_pin_input(B5); + gpio_write_pin_high(B5); #else // If we're not using the audio pin, drive it low - setPinOutput(C6); - writePinLow(C6); + gpio_set_pin_output(C6); + gpio_write_pin_low(C6); #endif } diff --git a/keyboards/capsunlocked/cu80/v2/v2.c b/keyboards/capsunlocked/cu80/v2/v2.c index e450082ba23..4e0e8cad767 100644 --- a/keyboards/capsunlocked/cu80/v2/v2.c +++ b/keyboards/capsunlocked/cu80/v2/v2.c @@ -3,7 +3,7 @@ #include "quantum.h" void matrix_init_kb(void) { - setPinOutput(E6); + gpio_set_pin_output(E6); matrix_init_user(); } diff --git a/keyboards/centromere/centromere.c b/keyboards/centromere/centromere.c index 8d46520e38e..61b9e073f37 100644 --- a/keyboards/centromere/centromere.c +++ b/keyboards/centromere/centromere.c @@ -2,23 +2,23 @@ void led_init(void) { #if MCU == atmega32u2 - setPinOutput(C4); // Set red LED pin as output - setPinOutput(C5); // Set blue LED pin as output - setPinOutput(D1); // Set green LED pin as output + gpio_set_pin_output(C4); // Set red LED pin as output + gpio_set_pin_output(C5); // Set blue LED pin as output + gpio_set_pin_output(D1); // Set green LED pin as output - writePinHigh(C4); // Turn off red LED pin - writePinHigh(C5); // Turn off blue LED pin - writePinHigh(D1); // Turn off green LED pin + gpio_write_pin_high(C4); // Turn off red LED pin + gpio_write_pin_high(C5); // Turn off blue LED pin + gpio_write_pin_high(D1); // Turn off green LED pin #else - setPinOutput(F4); // Set red LED pin as output - setPinOutput(F5); // Set blue LED pin as output - setPinOutput(D1); // Set green LED pin as output + gpio_set_pin_output(F4); // Set red LED pin as output + gpio_set_pin_output(F5); // Set blue LED pin as output + gpio_set_pin_output(D1); // Set green LED pin as output - writePinHigh(F4); // Turn off red LED pin - writePinHigh(F5); // Turn off blue LED pin - writePinHigh(D1); // Turn off green LED pin + gpio_write_pin_high(F4); // Turn off red LED pin + gpio_write_pin_high(F5); // Turn off blue LED pin + gpio_write_pin_high(D1); // Turn off green LED pin #endif diff --git a/keyboards/centromere/centromere.h b/keyboards/centromere/centromere.h index 078cdca07f1..32c2ae6e161 100644 --- a/keyboards/centromere/centromere.h +++ b/keyboards/centromere/centromere.h @@ -3,21 +3,21 @@ #include "quantum.h" #if MCU == atmega32u2 -#define red_led_off writePinHigh(C5) -#define red_led_on writePinLow(C5) -#define blu_led_off writePinHigh(C4) -#define blu_led_on writePinLow(C4) +#define red_led_off gpio_write_pin_high(C5) +#define red_led_on gpio_write_pin_low(C5) +#define blu_led_off gpio_write_pin_high(C4) +#define blu_led_on gpio_write_pin_low(C4) #else -#define red_led_off writePinHigh(F5) -#define red_led_on writePinLow(F5) -#define blu_led_off writePinHigh(F4) -#define blu_led_on writePinLow(F4) +#define red_led_off gpio_write_pin_high(F5) +#define red_led_on gpio_write_pin_low(F5) +#define blu_led_off gpio_write_pin_high(F4) +#define blu_led_on gpio_write_pin_low(F4) #endif -#define grn_led_off writePinHigh(D1) -#define grn_led_on writePinLow(D1) +#define grn_led_off gpio_write_pin_high(D1) +#define grn_led_on gpio_write_pin_low(D1) #define set_led_off red_led_off; blu_led_off #define set_led_red red_led_on; grn_led_off; blu_led_off diff --git a/keyboards/cheshire/curiosity/curiosity.c b/keyboards/cheshire/curiosity/curiosity.c index 9db2651e941..2813cff9b4a 100644 --- a/keyboards/cheshire/curiosity/curiosity.c +++ b/keyboards/cheshire/curiosity/curiosity.c @@ -1,17 +1,17 @@ #include "quantum.h" void matrix_init_board(void){ - setPinOutput(A8); - setPinOutput(A9); - setPinOutput(A10); + gpio_set_pin_output(A8); + gpio_set_pin_output(A9); + gpio_set_pin_output(A10); } bool led_update_kb(led_t led_state) { bool runDefault = led_update_user(led_state); if (runDefault) { - writePin(A8, !led_state.num_lock); - writePin(A9, !led_state.caps_lock); - writePin(A10, !led_state.scroll_lock); + gpio_write_pin(A8, !led_state.num_lock); + gpio_write_pin(A9, !led_state.caps_lock); + gpio_write_pin(A10, !led_state.scroll_lock); } return runDefault; } diff --git a/keyboards/cipulot/common/ec_switch_matrix.c b/keyboards/cipulot/common/ec_switch_matrix.c index 845ef99d223..33123bd236e 100644 --- a/keyboards/cipulot/common/ec_switch_matrix.c +++ b/keyboards/cipulot/common/ec_switch_matrix.c @@ -54,19 +54,19 @@ static adc_mux adcMux; void init_row(void) { // Set all row pins as output and low for (uint8_t idx = 0; idx < MATRIX_ROWS; idx++) { - setPinOutput(row_pins[idx]); - writePinLow(row_pins[idx]); + gpio_set_pin_output(row_pins[idx]); + gpio_write_pin_low(row_pins[idx]); } } // Initialize the multiplexers void init_amux(void) { for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) { - setPinOutput(amux_en_pins[idx]); - writePinLow(amux_en_pins[idx]); + gpio_set_pin_output(amux_en_pins[idx]); + gpio_write_pin_low(amux_en_pins[idx]); } for (uint8_t idx = 0; idx < AMUX_SEL_PINS_COUNT; idx++) { - setPinOutput(amux_sel_pins[idx]); + gpio_set_pin_output(amux_sel_pins[idx]); } } @@ -75,13 +75,13 @@ void select_amux_channel(uint8_t channel, uint8_t col) { // Get the channel for the specified multiplexer uint8_t ch = amux_n_col_channels[channel][col]; // momentarily disable specified multiplexer - writePinHigh(amux_en_pins[channel]); + gpio_write_pin_high(amux_en_pins[channel]); // Select the multiplexer channel for (uint8_t i = 0; i < AMUX_SEL_PINS_COUNT; i++) { - writePin(amux_sel_pins[i], ch & (1 << i)); + gpio_write_pin(amux_sel_pins[i], ch & (1 << i)); } // re enable specified multiplexer - writePinLow(amux_en_pins[channel]); + gpio_write_pin_low(amux_en_pins[channel]); } // Disable all the unused multiplexers @@ -89,28 +89,28 @@ void disable_unused_amux(uint8_t channel) { // disable all the other multiplexers apart from the current selected one for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) { if (idx != channel) { - writePinHigh(amux_en_pins[idx]); + gpio_write_pin_high(amux_en_pins[idx]); } } } // Discharge the peak hold capacitor void discharge_capacitor(void) { #ifdef OPEN_DRAIN_SUPPORT - writePinLow(DISCHARGE_PIN); + gpio_write_pin_low(DISCHARGE_PIN); #else - writePinLow(DISCHARGE_PIN); - setPinOutput(DISCHARGE_PIN); + gpio_write_pin_low(DISCHARGE_PIN); + gpio_set_pin_output(DISCHARGE_PIN); #endif } // Charge the peak hold capacitor void charge_capacitor(uint8_t row) { #ifdef OPEN_DRAIN_SUPPORT - writePinHigh(DISCHARGE_PIN); + gpio_write_pin_high(DISCHARGE_PIN); #else - setPinInput(DISCHARGE_PIN); + gpio_set_pin_input(DISCHARGE_PIN); #endif - writePinHigh(row_pins[row]); + gpio_write_pin_high(row_pins[row]); } // Initialize the peripherals pins @@ -123,11 +123,11 @@ int ec_init(void) { adc_read(adcMux); // Initialize discharge pin as discharge mode - writePinLow(DISCHARGE_PIN); + gpio_write_pin_low(DISCHARGE_PIN); #ifdef OPEN_DRAIN_SUPPORT - setPinOutputOpenDrain(DISCHARGE_PIN); + gpio_set_pin_output_open_drain(DISCHARGE_PIN); #else - setPinOutput(DISCHARGE_PIN); + gpio_set_pin_output(DISCHARGE_PIN); #endif // Initialize drive lines @@ -212,7 +212,7 @@ uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) { select_amux_channel(channel, col); // Set the row pin to low state to avoid ghosting - writePinLow(row_pins[row]); + gpio_write_pin_low(row_pins[row]); ATOMIC_BLOCK_FORCEON { // Set the row pin to high state and have capacitor charge diff --git a/keyboards/clueboard/2x1800/2019/2019.c b/keyboards/clueboard/2x1800/2019/2019.c index 40032cd6697..8b0ba6a71e1 100644 --- a/keyboards/clueboard/2x1800/2019/2019.c +++ b/keyboards/clueboard/2x1800/2019/2019.c @@ -17,14 +17,14 @@ void matrix_init_kb(void) { // Set our LED pins as output - setPinOutput(D6); - setPinOutput(B4); - setPinOutput(B5); - setPinOutput(B6); + gpio_set_pin_output(D6); + gpio_set_pin_output(B4); + gpio_set_pin_output(B5); + gpio_set_pin_output(B6); // Set our Tilt Sensor pins as input - setPinInputHigh(SHAKE_PIN_A); - setPinInputHigh(SHAKE_PIN_B); + gpio_set_pin_input_high(SHAKE_PIN_A); + gpio_set_pin_input_high(SHAKE_PIN_B); // Run the keymap level init matrix_init_user(); @@ -43,12 +43,12 @@ void check_encoder_buttons(void) { if (drawing_mode) { dprintf("Turning drawing mode off.\n"); drawing_mode = false; - writePinLow(D6); + gpio_write_pin_low(D6); unregister_code(KC_BTN1); } else { dprintf("Turning drawing mode on.\n"); drawing_mode = true; - writePinHigh(D6); + gpio_write_pin_high(D6); register_code(KC_BTN1); } } @@ -65,7 +65,7 @@ void matrix_scan_kb(void) { #ifdef SHAKE_ENABLE // Read the current state of the tilt sensor. It is physically // impossible for both pins to register a low state at the same time. - uint8_t tilt_read = (readPin(SHAKE_PIN_A) << 4) | readPin(SHAKE_PIN_B); + uint8_t tilt_read = (gpio_read_pin(SHAKE_PIN_A) << 4) | gpio_read_pin(SHAKE_PIN_B); // Check to see if the tilt sensor has changed state since our last read if (tilt_state != tilt_read) { @@ -136,9 +136,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B4, !led_state.num_lock); - writePin(B5, !led_state.caps_lock); - writePin(B6, !led_state.scroll_lock); + gpio_write_pin(B4, !led_state.num_lock); + gpio_write_pin(B5, !led_state.caps_lock); + gpio_write_pin(B6, !led_state.scroll_lock); } return res; diff --git a/keyboards/clueboard/2x1800/2021/max7219.c b/keyboards/clueboard/2x1800/2021/max7219.c index 81d26b9a518..849889a52e0 100644 --- a/keyboards/clueboard/2x1800/2021/max7219.c +++ b/keyboards/clueboard/2x1800/2021/max7219.c @@ -206,8 +206,8 @@ void max7219_init(void) { wait_ms(1500); dprintf("max7219_init()\n"); - setPinOutput(MAX7219_LOAD); - writePinHigh(MAX7219_LOAD); + gpio_set_pin_output(MAX7219_LOAD); + gpio_write_pin_high(MAX7219_LOAD); spi_init(); for (int i=0; i. /* hard reset: low pulse for 500ms and after that HiZ for safety */ #define XT_RESET() do { \ - writePinLow(XT_RST_PIN); \ - setPinOutput(XT_RST_PIN); \ + gpio_write_pin_low(XT_RST_PIN); \ + gpio_set_pin_output(XT_RST_PIN); \ wait_ms(500); \ - setPinInput(XT_RST_PIN); \ + gpio_set_pin_input(XT_RST_PIN); \ } while (0) /* INT1 for falling edge of clock line */ diff --git a/keyboards/converter/xt_usb/xt.h b/keyboards/converter/xt_usb/xt.h index e9c1c7751d8..09363d75b3f 100644 --- a/keyboards/converter/xt_usb/xt.h +++ b/keyboards/converter/xt_usb/xt.h @@ -43,30 +43,30 @@ POSSIBILITY OF SUCH DAMAGE. #define XT_DATA_IN() \ do { \ - setPinInput(XT_DATA_PIN); \ - writePinHigh(XT_DATA_PIN); \ + gpio_set_pin_input(XT_DATA_PIN); \ + gpio_write_pin_high(XT_DATA_PIN); \ } while (0) -#define XT_DATA_READ() readPin(XT_DATA_PIN) +#define XT_DATA_READ() gpio_read_pin(XT_DATA_PIN) #define XT_DATA_LO() \ do { \ - writePinLow(XT_DATA_PIN); \ - setPinOutput(XT_DATA_PIN); \ + gpio_write_pin_low(XT_DATA_PIN); \ + gpio_set_pin_output(XT_DATA_PIN); \ } while (0) #define XT_CLOCK_IN() \ do { \ - setPinInput(XT_CLOCK_PIN); \ - writePinHigh(XT_CLOCK_PIN); \ + gpio_set_pin_input(XT_CLOCK_PIN); \ + gpio_write_pin_high(XT_CLOCK_PIN); \ } while (0) -#define XT_CLOCK_READ() readPin(XT_CLOCK_PIN) +#define XT_CLOCK_READ() gpio_read_pin(XT_CLOCK_PIN) #define XT_CLOCK_LO() \ do { \ - writePinLow(XT_CLOCK_PIN); \ - setPinOutput(XT_CLOCK_PIN); \ + gpio_write_pin_low(XT_CLOCK_PIN); \ + gpio_set_pin_output(XT_CLOCK_PIN); \ } while (0) void xt_host_init(void); diff --git a/keyboards/custommk/evo70_r2/matrix.c b/keyboards/custommk/evo70_r2/matrix.c index 99c3428d802..5ee93a5c7d5 100644 --- a/keyboards/custommk/evo70_r2/matrix.c +++ b/keyboards/custommk/evo70_r2/matrix.c @@ -10,7 +10,7 @@ void matrix_wait_for_pin(pin_t pin, uint8_t target_state) { rtcnt_t start = chSysGetRealtimeCounterX(); rtcnt_t end = start + 5000; while (chSysIsCounterWithinX(chSysGetRealtimeCounterX(), start, end)) { - if (readPin(pin) == target_state) { + if (gpio_read_pin(pin) == target_state) { break; } } @@ -27,22 +27,22 @@ void matrix_wait_for_port(stm32_gpio_t *port, uint32_t target_bitmask) { } void shift_pulse_clock(void) { - writePinHigh(COL_SHIFT_CLK_PIN); + gpio_write_pin_high(COL_SHIFT_CLK_PIN); matrix_wait_for_pin(COL_SHIFT_CLK_PIN, 1); - writePinLow(COL_SHIFT_CLK_PIN); + gpio_write_pin_low(COL_SHIFT_CLK_PIN); } void matrix_init_custom(void) { //set all row pins as input with pullups for (int i = 0; i < MATRIX_ROWS; ++i) { - writePinHigh(row_pins[i]); - setPinInputHigh(row_pins[i]); + gpio_write_pin_high(row_pins[i]); + gpio_set_pin_input_high(row_pins[i]); } //set all column pins high in ROW2COL matrix - setPinOutput(COL_SHIFT_IN_PIN); - setPinOutput(COL_SHIFT_CLK_PIN); - writePinHigh(COL_SHIFT_IN_PIN); + gpio_set_pin_output(COL_SHIFT_IN_PIN); + gpio_set_pin_output(COL_SHIFT_CLK_PIN); + gpio_write_pin_high(COL_SHIFT_IN_PIN); matrix_wait_for_pin(COL_SHIFT_IN_PIN, 1); for (int i = 0; i < MATRIX_COLS; ++i) { @@ -54,13 +54,13 @@ void matrix_init_custom(void) { bool matrix_scan_custom(matrix_row_t current_matrix[]) { static matrix_row_t temp_matrix[MATRIX_ROWS] = {0}; - writePinLow(COL_SHIFT_IN_PIN); + gpio_write_pin_low(COL_SHIFT_IN_PIN); matrix_wait_for_pin(COL_SHIFT_IN_PIN, 0); // Setup the output column pin shift_pulse_clock(); - writePinHigh(COL_SHIFT_IN_PIN); + gpio_write_pin_high(COL_SHIFT_IN_PIN); for (int current_col = 0; current_col < MATRIX_COLS; ++current_col) { // Read the column ports diff --git a/keyboards/cutie_club/wraith/wraith.c b/keyboards/cutie_club/wraith/wraith.c index 799ac318e65..799648846c0 100644 --- a/keyboards/cutie_club/wraith/wraith.c +++ b/keyboards/cutie_club/wraith/wraith.c @@ -16,7 +16,7 @@ #include "quantum.h" void matrix_init_kb(void) { - setPinOutput(B0); + gpio_set_pin_output(B0); matrix_init_user(); } diff --git a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c index 9125410df05..879d73e0f9a 100644 --- a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c +++ b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c @@ -17,34 +17,34 @@ #include "quantum.h" void keyoard_post_init_kb(void) { - setPinOutput(LED_CAPS_LOCK_PIN); - setPinOutput(LED_INDICATOR_1); - setPinOutput(LED_INDICATOR_2); - setPinOutput(LED_INDICATOR_3); - setPinOutput(LED_INDICATOR_4); - setPinOutput(LED_INDICATOR_5); + gpio_set_pin_output(LED_CAPS_LOCK_PIN); + gpio_set_pin_output(LED_INDICATOR_1); + gpio_set_pin_output(LED_INDICATOR_2); + gpio_set_pin_output(LED_INDICATOR_3); + gpio_set_pin_output(LED_INDICATOR_4); + gpio_set_pin_output(LED_INDICATOR_5); #ifndef LED_CAPS_LOCK_PIN - writePin(LED_CAPS_LOCK_PIN, 0); + gpio_write_pin(LED_CAPS_LOCK_PIN, 0); #endif #ifndef LED_INDICATOR_1 - writePin(LED_INDICATOR_1, 0); + gpio_write_pin(LED_INDICATOR_1, 0); #endif #ifndef LED_INDICATOR_2 - writePin(LED_INDICATOR_2, 0); + gpio_write_pin(LED_INDICATOR_2, 0); #endif #ifndef LED_INDICATOR_3 - writePin(LED_INDICATOR_3, 0); + gpio_write_pin(LED_INDICATOR_3, 0); #endif #ifndef LED_INDICATOR_4 - writePin(LED_INDICATOR_4, 0); + gpio_write_pin(LED_INDICATOR_4, 0); #endif #ifndef LED_INDICATOR_5 - writePin(LED_INDICATOR_5, 0); + gpio_write_pin(LED_INDICATOR_5, 0); #endif keyboard_post_init_user(); } @@ -53,39 +53,39 @@ layer_state_t layer_state_set_kb(layer_state_t state) { switch (get_highest_layer(state)) { case 1: #ifdef LED_INDICATOR_4 - writePin(LED_INDICATOR_4, 1); + gpio_write_pin(LED_INDICATOR_4, 1); #endif #ifdef LED_INDICATOR_5 - writePin(LED_INDICATOR_5, 1); + gpio_write_pin(LED_INDICATOR_5, 1); #endif break; case 2: #ifdef LED_INDICATOR_1 - writePin(LED_INDICATOR_1, 1); + gpio_write_pin(LED_INDICATOR_1, 1); #endif #ifdef LED_INDICATOR_2 - writePin(LED_INDICATOR_2, 1); + gpio_write_pin(LED_INDICATOR_2, 1); #endif #ifdef LED_INDICATOR_3 - writePin(LED_INDICATOR_3, 1); + gpio_write_pin(LED_INDICATOR_3, 1); #endif break; default: #ifdef LED_INDICATOR_1 - writePin(LED_INDICATOR_1, 0); + gpio_write_pin(LED_INDICATOR_1, 0); #endif #ifdef LED_INDICATOR_2 - writePin(LED_INDICATOR_2, 0); + gpio_write_pin(LED_INDICATOR_2, 0); #endif #ifdef LED_INDICATOR_3 - writePin(LED_INDICATOR_3, 0); + gpio_write_pin(LED_INDICATOR_3, 0); #endif #ifdef LED_INDICATOR_4 - writePin(LED_INDICATOR_4, 0); + gpio_write_pin(LED_INDICATOR_4, 0); #endif #ifdef LED_INDICATOR_5 - writePin(LED_INDICATOR_5, 0); + gpio_write_pin(LED_INDICATOR_5, 0); #endif break; } diff --git a/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c b/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c index f21aeeb38d3..00521bc2bea 100644 --- a/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c +++ b/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c @@ -132,9 +132,9 @@ void spi_init(void) { is_initialised = true; // Try releasing special pins for a short time - setPinInput(SPI_SCK_PIN); - setPinInput(SPI_MOSI_PIN); - setPinInput(SPI_MISO_PIN); + gpio_set_pin_input(SPI_SCK_PIN); + gpio_set_pin_input(SPI_MOSI_PIN); + gpio_set_pin_input(SPI_MISO_PIN); chThdSleepMilliseconds(10); @@ -147,12 +147,12 @@ void spi_init(void) { #endif void keyboard_pre_init_kb(void) { - setPinOutput(C0); - setPinOutput(C15); + gpio_set_pin_output(C0); + gpio_set_pin_output(C15); keyboard_pre_init_user(); }; void housekeeping_task_kb(void) { - writePin(C15, keymap_config.no_gui); + gpio_write_pin(C15, keymap_config.no_gui); }; bool process_record_kb(uint16_t keycode, keyrecord_t *record) { diff --git a/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c index 20a46e343ea..05c2be542be 100644 --- a/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c +++ b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c @@ -133,9 +133,9 @@ void spi_init(void) { is_initialised = true; // Try releasing special pins for a short time - setPinInput(SPI_SCK_PIN); - setPinInput(SPI_MOSI_PIN); - setPinInput(SPI_MISO_PIN); + gpio_set_pin_input(SPI_SCK_PIN); + gpio_set_pin_input(SPI_MOSI_PIN); + gpio_set_pin_input(SPI_MISO_PIN); chThdSleepMilliseconds(10); @@ -148,12 +148,12 @@ void spi_init(void) { #endif void keyboard_pre_init_kb(void) { - setPinOutput(C0); - setPinOutput(C15); + gpio_set_pin_output(C0); + gpio_set_pin_output(C15); keyboard_pre_init_user(); }; void housekeeping_task_kb(void) { - writePin(C15, keymap_config.no_gui); + gpio_write_pin(C15, keymap_config.no_gui); }; bool process_record_kb(uint16_t keycode, keyrecord_t *record) { diff --git a/keyboards/dekunukem/duckypad/duckypad.c b/keyboards/dekunukem/duckypad/duckypad.c index 7e486c45507..b56f2d12e92 100644 --- a/keyboards/dekunukem/duckypad/duckypad.c +++ b/keyboards/dekunukem/duckypad/duckypad.c @@ -21,11 +21,11 @@ along with this program. If not, see . #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(A0); - writePinHigh(A0); - writePinLow(A0); + gpio_set_pin_output(A0); + gpio_write_pin_high(A0); + gpio_write_pin_low(A0); wait_ms(10); - writePinHigh(A0); + gpio_write_pin_high(A0); keyboard_pre_init_user(); } diff --git a/keyboards/dichotomy/dichotomy.c b/keyboards/dichotomy/dichotomy.c index 4301d9b67d0..584151fdd3d 100755 --- a/keyboards/dichotomy/dichotomy.c +++ b/keyboards/dichotomy/dichotomy.c @@ -60,13 +60,13 @@ bool pointing_device_task(void){ } void led_init(void) { - setPinOutput(D1); - setPinOutput(F5); - setPinOutput(F6); + gpio_set_pin_output(D1); + gpio_set_pin_output(F5); + gpio_set_pin_output(F6); - writePinHigh(D1); - writePinHigh(F5); - writePinHigh(F6); + gpio_write_pin_high(D1); + gpio_write_pin_high(F5); + gpio_write_pin_high(F6); } diff --git a/keyboards/dichotomy/dichotomy.h b/keyboards/dichotomy/dichotomy.h index f62ed49aa07..5783bd637bc 100755 --- a/keyboards/dichotomy/dichotomy.h +++ b/keyboards/dichotomy/dichotomy.h @@ -4,12 +4,12 @@ #include "pointing_device.h" #include "quantum.h" -#define red_led_off() writePinHigh(F6) -#define red_led_on() writePinLow(F6) -#define blu_led_off() writePinHigh(F5) -#define blu_led_on() writePinLow(F5) -#define grn_led_off() writePinHigh(D1) -#define grn_led_on() writePinLow(D1) +#define red_led_off() gpio_write_pin_high(F6) +#define red_led_on() gpio_write_pin_low(F6) +#define blu_led_off() gpio_write_pin_high(F5) +#define blu_led_on() gpio_write_pin_low(F5) +#define grn_led_off() gpio_write_pin_high(D1) +#define grn_led_on() gpio_write_pin_low(D1) #define red_led(flag) if (flag) red_led_on(); else red_led_off() #define blu_led(flag) if (flag) blu_led_on(); else blu_led_off() diff --git a/keyboards/dinofizz/fnrow/v1/v1.c b/keyboards/dinofizz/fnrow/v1/v1.c index d2a5cd71208..546051acfca 100644 --- a/keyboards/dinofizz/fnrow/v1/v1.c +++ b/keyboards/dinofizz/fnrow/v1/v1.c @@ -17,8 +17,8 @@ void keyboard_pre_init_kb(void) { // Immediately set the LED pin as an output and set it ON - setPinOutput(A15); - writePinHigh(A15); + gpio_set_pin_output(A15); + gpio_write_pin_high(A15); keyboard_pre_init_user(); } @@ -26,11 +26,11 @@ void keyboard_pre_init_kb(void) { void keyboard_post_init_kb(void) { // Blink the LED so we know everything is running OK // Finish with LED OFF - writePinLow(A15); + gpio_write_pin_low(A15); wait_ms(100); - writePinHigh(A15); + gpio_write_pin_high(A15); wait_ms(100); - writePinLow(A15); + gpio_write_pin_low(A15); keyboard_post_init_user(); } diff --git a/keyboards/dk60/dk60.c b/keyboards/dk60/dk60.c index 382404c0326..5bc9d5cd5c3 100644 --- a/keyboards/dk60/dk60.c +++ b/keyboards/dk60/dk60.c @@ -40,8 +40,8 @@ void matrix_init_kb(void) { } void led_init_ports(void) { - setPinOutput(E6); - setPinOutput(F0); + gpio_set_pin_output(E6); + gpio_set_pin_output(F0); } void led_update_ports(led_t led_state) { diff --git a/keyboards/dk60/dk60.h b/keyboards/dk60/dk60.h index 05e790d5253..e2406876615 100644 --- a/keyboards/dk60/dk60.h +++ b/keyboards/dk60/dk60.h @@ -19,11 +19,11 @@ along with this program. If not, see . #include "quantum.h" -inline void dk60_caps_led_on(void) { writePinHigh(E6); } -inline void dk60_esc_led_on(void) { writePinHigh(F0); } +inline void dk60_caps_led_on(void) { gpio_write_pin_high(E6); } +inline void dk60_esc_led_on(void) { gpio_write_pin_high(F0); } -inline void dk60_caps_led_off(void) { writePinLow(E6); } -inline void dk60_esc_led_off(void) { writePinLow(F0); } +inline void dk60_caps_led_off(void) { gpio_write_pin_low(E6); } +inline void dk60_esc_led_off(void) { gpio_write_pin_low(F0); } inline void dk60_led_all_on(void) { dk60_caps_led_on(); diff --git a/keyboards/dm9records/lain/lain.c b/keyboards/dm9records/lain/lain.c index cb8354e5c2a..bdea60f90f7 100644 --- a/keyboards/dm9records/lain/lain.c +++ b/keyboards/dm9records/lain/lain.c @@ -12,7 +12,7 @@ void lain_eeconfig_update_kb(void) { eeconfig_update_kb(lain_config.raw); } void lain_set_led(uint8_t no, bool flag) { led_states[no] = flag; - writePin(leds[no], lain_config.led_enabled ? flag : false); + gpio_write_pin(leds[no], lain_config.led_enabled ? flag : false); } void lain_enable_leds(bool flag) { @@ -20,7 +20,7 @@ void lain_enable_leds(bool flag) { lain_eeconfig_update_kb(); for (int i = 0; i < LED_NUM; i++) { - writePin(leds[i], lain_config.led_enabled ? led_states[i] : false); + gpio_write_pin(leds[i], lain_config.led_enabled ? led_states[i] : false); } } @@ -28,7 +28,7 @@ void lain_enable_leds_toggle(void) { lain_enable_leds(!lain_config.led_enabled); void led_init_ports(void) { for (uint8_t i = 0; i < LED_NUM; i++) { - setPinOutput(leds[i]); + gpio_set_pin_output(leds[i]); lain_set_led(leds[i], 0); } } diff --git a/keyboards/doppelganger/doppelganger.c b/keyboards/doppelganger/doppelganger.c index 9a9fc0679f2..4a62fdf45f1 100644 --- a/keyboards/doppelganger/doppelganger.c +++ b/keyboards/doppelganger/doppelganger.c @@ -16,30 +16,30 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(C6); - setPinOutput(B0); + gpio_set_pin_output(C6); + gpio_set_pin_output(B0); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - // writePin sets the pin high for 1 and low for 0. + // gpio_write_pin sets the pin high for 1 and low for 0. // In this example the pins are inverted, setting // it low/0 turns it on, and high/1 turns the LED off. // This behavior depends on whether the LED is between the pin // and VCC or the pin and GND. - writePin(C6, !led_state.caps_lock); + gpio_write_pin(C6, !led_state.caps_lock); } return res; } __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { - writePin(B0, !(state & (1UL << 1))); + gpio_write_pin(B0, !(state & (1UL << 1))); return state; } // Override core logic as we reuse SPLIT_HAND_PIN within matrix pins bool is_keyboard_left(void) { - setPinInput(SPLIT_HAND_PIN); - return readPin(SPLIT_HAND_PIN); + gpio_set_pin_input(SPLIT_HAND_PIN); + return gpio_read_pin(SPLIT_HAND_PIN); } diff --git a/keyboards/dp60/matrix.c b/keyboards/dp60/matrix.c index 22156745f17..998efd59fe9 100644 --- a/keyboards/dp60/matrix.c +++ b/keyboards/dp60/matrix.c @@ -54,10 +54,10 @@ void matrix_scan_user(void) {} void matrix_init(void) { - //setPinOutput(F0); - //writePinHigh(F0); - setPinOutput(B4); - writePinLow(B4); + //gpio_set_pin_output(F0); + //gpio_write_pin_high(F0); + gpio_set_pin_output(B4); + gpio_write_pin_low(B4); init_cols(); init_rows(); @@ -123,20 +123,20 @@ void matrix_print(void) */ static void init_rows(void) { - setPinInputHigh(E6); - setPinInputHigh(F6); - setPinInputHigh(F7); - setPinInputHigh(B7); - setPinInputHigh(D4); + gpio_set_pin_input_high(E6); + gpio_set_pin_input_high(F6); + gpio_set_pin_input_high(F7); + gpio_set_pin_input_high(B7); + gpio_set_pin_input_high(D4); } static uint8_t read_rows(void) { - return ((readPin(E6) ? 0 : (1 << 0)) | - (readPin(F6) ? 0 : (1 << 1)) | - (readPin(F7) ? 0 : (1 << 2)) | - (readPin(B7) ? 0 : (1 << 3)) | - (readPin(D4) ? 0 : (1 << 4))); + return ((gpio_read_pin(E6) ? 0 : (1 << 0)) | + (gpio_read_pin(F6) ? 0 : (1 << 1)) | + (gpio_read_pin(F7) ? 0 : (1 << 2)) | + (gpio_read_pin(B7) ? 0 : (1 << 3)) | + (gpio_read_pin(D4) ? 0 : (1 << 4))); } /* @@ -164,104 +164,104 @@ static uint8_t read_rows(void) */ static void init_cols(void) { - setPinOutput(F0); - setPinOutput(F1); - setPinOutput(F4); - setPinOutput(F5); + gpio_set_pin_output(F0); + gpio_set_pin_output(F1); + gpio_set_pin_output(F4); + gpio_set_pin_output(F5); - setPinOutput(D2); - setPinOutput(D3); - setPinOutput(D5); - setPinOutput(D6); + gpio_set_pin_output(D2); + gpio_set_pin_output(D3); + gpio_set_pin_output(D5); + gpio_set_pin_output(D6); unselect_cols(); } static void unselect_cols(void) { - writePinHigh(F0); - writePinHigh(F1); - writePinHigh(F4); - writePinHigh(F5); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); + gpio_write_pin_high(F4); + gpio_write_pin_high(F5); - writePinHigh(D2); - writePinHigh(D3); - writePinHigh(D5); - writePinHigh(D6); + gpio_write_pin_high(D2); + gpio_write_pin_high(D3); + gpio_write_pin_high(D5); + gpio_write_pin_high(D6); } static void select_col(uint8_t col) { switch (col) { case 0: - writePinLow(F0); - writePinLow(F1); - writePinLow(F4); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); + gpio_write_pin_low(F4); break; case 1: - writePinHigh(F0); - writePinLow(F1); - writePinLow(F4); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); + gpio_write_pin_low(F4); break; case 2: - writePinLow(F0); - writePinHigh(F1); - writePinLow(F4); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); + gpio_write_pin_low(F4); break; case 3: - writePinHigh(F0); - writePinHigh(F1); - writePinLow(F4); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); + gpio_write_pin_low(F4); break; case 4: - writePinLow(F0); - writePinLow(F1); - writePinHigh(F4); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); + gpio_write_pin_high(F4); break; case 5: - writePinHigh(F0); - writePinLow(F1); - writePinHigh(F4); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); + gpio_write_pin_high(F4); break; case 6: - writePinLow(F0); - writePinHigh(F1); - writePinHigh(F4); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); + gpio_write_pin_high(F4); break; case 7: - writePinLow(D2); - writePinLow(D3); - writePinLow(D5); + gpio_write_pin_low(D2); + gpio_write_pin_low(D3); + gpio_write_pin_low(D5); break; case 8: - writePinHigh(D2); - writePinLow(D3); - writePinLow(D5); + gpio_write_pin_high(D2); + gpio_write_pin_low(D3); + gpio_write_pin_low(D5); break; case 9: - writePinLow(D2); - writePinHigh(D3); - writePinLow(D5); + gpio_write_pin_low(D2); + gpio_write_pin_high(D3); + gpio_write_pin_low(D5); break; case 10: - writePinHigh(D2); - writePinHigh(D3); - writePinLow(D5); + gpio_write_pin_high(D2); + gpio_write_pin_high(D3); + gpio_write_pin_low(D5); break; case 11: - writePinLow(D2); - writePinLow(D3); - writePinHigh(D5); + gpio_write_pin_low(D2); + gpio_write_pin_low(D3); + gpio_write_pin_high(D5); break; case 12: - writePinHigh(D2); - writePinLow(D3); - writePinHigh(D5); + gpio_write_pin_high(D2); + gpio_write_pin_low(D3); + gpio_write_pin_high(D5); break; case 13: - writePinLow(D2); - writePinHigh(D3); - writePinHigh(D5); + gpio_write_pin_low(D2); + gpio_write_pin_high(D3); + gpio_write_pin_high(D5); break; } } diff --git a/keyboards/drop/lib/mux.c b/keyboards/drop/lib/mux.c index 85a657544f6..3941552686f 100644 --- a/keyboards/drop/lib/mux.c +++ b/keyboards/drop/lib/mux.c @@ -22,8 +22,8 @@ #define C2_B5_SENSE B0 static inline void digital_write(pin_t pin, uint8_t level) { - setPinOutput(pin); - writePin(pin, level); + gpio_set_pin_output(pin); + gpio_write_pin(pin, level); } uint16_t v_con_1 = 0; @@ -42,10 +42,10 @@ void keyboard_USB_enable(void) { digital_write(SRC_1, 1); digital_write(SRC_2, 1); - setPinInput(C1_A5_SENSE); - setPinInput(C1_B5_SENSE); - setPinInput(C2_A5_SENSE); - setPinInput(C2_B5_SENSE); + gpio_set_pin_input(C1_A5_SENSE); + gpio_set_pin_input(C1_B5_SENSE); + gpio_set_pin_input(C2_A5_SENSE); + gpio_set_pin_input(C2_B5_SENSE); // reset hub digital_write(HUB_RESET_N, 0); diff --git a/keyboards/duck/orion/v3/matrix.c b/keyboards/duck/orion/v3/matrix.c index f392b9b1909..1dd07a65670 100644 --- a/keyboards/duck/orion/v3/matrix.c +++ b/keyboards/duck/orion/v3/matrix.c @@ -56,13 +56,13 @@ void matrix_scan_user(void) { void indicator_init_ports(void) { // Num LED - setPinOutput(B4); + gpio_set_pin_output(B4); // Caps Lock - setPinOutput(B0); + gpio_set_pin_output(B0); // Scroll Lock - setPinOutput(D7); + gpio_set_pin_output(D7); } void matrix_init(void) { diff --git a/keyboards/duck/orion/v3/v3.c b/keyboards/duck/orion/v3/v3.c index 87e3cc0f370..c0ca9ddd06a 100644 --- a/keyboards/duck/orion/v3/v3.c +++ b/keyboards/duck/orion/v3/v3.c @@ -31,9 +31,9 @@ // of the Escape key. bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(B0, !led_state.caps_lock); - writePin(B4, !led_state.num_lock); - writePin(D7, !led_state.scroll_lock); + gpio_write_pin(B0, !led_state.caps_lock); + gpio_write_pin(B4, !led_state.num_lock); + gpio_write_pin(D7, !led_state.scroll_lock); } return true; } diff --git a/keyboards/dumbpad/v0x/v0x.c b/keyboards/dumbpad/v0x/v0x.c index d7e3841d760..8625bb12c25 100644 --- a/keyboards/dumbpad/v0x/v0x.c +++ b/keyboards/dumbpad/v0x/v0x.c @@ -17,8 +17,8 @@ void keyboard_pre_init_kb(void) { // Set LED IO as outputs - setPinOutput(LED_00); - setPinOutput(LED_01); + gpio_set_pin_output(LED_00); + gpio_set_pin_output(LED_01); keyboard_pre_init_user(); } @@ -27,16 +27,16 @@ bool shutdown_kb(bool jump_to_bootloader) { return false; } // Shutdown LEDs - writePinLow(LED_00); - writePinLow(LED_01); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); return true; } layer_state_t layer_state_set_kb(layer_state_t state) { // Layer LEDs act as binary indication of current layer uint8_t layer = get_highest_layer(state); - writePin(LED_00, layer & 0b1); - writePin(LED_01, (layer >> 1) & 0b1); + gpio_write_pin(LED_00, layer & 0b1); + gpio_write_pin(LED_01, (layer >> 1) & 0b1); return layer_state_set_user(state); } @@ -49,11 +49,11 @@ void matrix_init_kb(void) { // runs once when the firmware starts up uint8_t led_delay_ms = 80; for (int i = 0; i < 2; i++) { - writePinHigh(LED_00); - writePinHigh(LED_01); + gpio_write_pin_high(LED_00); + gpio_write_pin_high(LED_01); wait_ms(led_delay_ms); - writePinLow(LED_00); - writePinLow(LED_01); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); if (i < 1) { wait_ms(led_delay_ms); } diff --git a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c index d7e3841d760..8625bb12c25 100644 --- a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c +++ b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c @@ -17,8 +17,8 @@ void keyboard_pre_init_kb(void) { // Set LED IO as outputs - setPinOutput(LED_00); - setPinOutput(LED_01); + gpio_set_pin_output(LED_00); + gpio_set_pin_output(LED_01); keyboard_pre_init_user(); } @@ -27,16 +27,16 @@ bool shutdown_kb(bool jump_to_bootloader) { return false; } // Shutdown LEDs - writePinLow(LED_00); - writePinLow(LED_01); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); return true; } layer_state_t layer_state_set_kb(layer_state_t state) { // Layer LEDs act as binary indication of current layer uint8_t layer = get_highest_layer(state); - writePin(LED_00, layer & 0b1); - writePin(LED_01, (layer >> 1) & 0b1); + gpio_write_pin(LED_00, layer & 0b1); + gpio_write_pin(LED_01, (layer >> 1) & 0b1); return layer_state_set_user(state); } @@ -49,11 +49,11 @@ void matrix_init_kb(void) { // runs once when the firmware starts up uint8_t led_delay_ms = 80; for (int i = 0; i < 2; i++) { - writePinHigh(LED_00); - writePinHigh(LED_01); + gpio_write_pin_high(LED_00); + gpio_write_pin_high(LED_01); wait_ms(led_delay_ms); - writePinLow(LED_00); - writePinLow(LED_01); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); if (i < 1) { wait_ms(led_delay_ms); } diff --git a/keyboards/dumbpad/v0x_right/v0x_right.c b/keyboards/dumbpad/v0x_right/v0x_right.c index d7e3841d760..8625bb12c25 100644 --- a/keyboards/dumbpad/v0x_right/v0x_right.c +++ b/keyboards/dumbpad/v0x_right/v0x_right.c @@ -17,8 +17,8 @@ void keyboard_pre_init_kb(void) { // Set LED IO as outputs - setPinOutput(LED_00); - setPinOutput(LED_01); + gpio_set_pin_output(LED_00); + gpio_set_pin_output(LED_01); keyboard_pre_init_user(); } @@ -27,16 +27,16 @@ bool shutdown_kb(bool jump_to_bootloader) { return false; } // Shutdown LEDs - writePinLow(LED_00); - writePinLow(LED_01); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); return true; } layer_state_t layer_state_set_kb(layer_state_t state) { // Layer LEDs act as binary indication of current layer uint8_t layer = get_highest_layer(state); - writePin(LED_00, layer & 0b1); - writePin(LED_01, (layer >> 1) & 0b1); + gpio_write_pin(LED_00, layer & 0b1); + gpio_write_pin(LED_01, (layer >> 1) & 0b1); return layer_state_set_user(state); } @@ -49,11 +49,11 @@ void matrix_init_kb(void) { // runs once when the firmware starts up uint8_t led_delay_ms = 80; for (int i = 0; i < 2; i++) { - writePinHigh(LED_00); - writePinHigh(LED_01); + gpio_write_pin_high(LED_00); + gpio_write_pin_high(LED_01); wait_ms(led_delay_ms); - writePinLow(LED_00); - writePinLow(LED_01); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); if (i < 1) { wait_ms(led_delay_ms); } diff --git a/keyboards/dumbpad/v1x/v1x.c b/keyboards/dumbpad/v1x/v1x.c index 1022ad06053..cdbaff54aa1 100644 --- a/keyboards/dumbpad/v1x/v1x.c +++ b/keyboards/dumbpad/v1x/v1x.c @@ -17,9 +17,9 @@ void keyboard_pre_init_kb(void) { // Set LED IO as outputs - setPinOutput(LED_00); - setPinOutput(LED_01); - setPinOutput(LED_02); + gpio_set_pin_output(LED_00); + gpio_set_pin_output(LED_01); + gpio_set_pin_output(LED_02); keyboard_pre_init_user(); } @@ -28,17 +28,17 @@ bool shutdown_kb(bool jump_to_bootloader) { return false; } // Shutdown LEDs - writePinLow(LED_00); - writePinLow(LED_01); - writePinLow(LED_02); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); + gpio_write_pin_low(LED_02); return true; } layer_state_t layer_state_set_kb(layer_state_t state) { // Layer LEDs act as binary indication of current layer uint8_t layer = get_highest_layer(state); - writePin(LED_00, layer & 0b1); - writePin(LED_01, (layer >> 1) & 0b1); + gpio_write_pin(LED_00, layer & 0b1); + gpio_write_pin(LED_01, (layer >> 1) & 0b1); return layer_state_set_user(state); } @@ -51,13 +51,13 @@ void matrix_init_kb(void) { // runs once when the firmware starts up uint8_t led_delay_ms = 80; for (int i = 0; i < 2; i++) { - writePinHigh(LED_00); - writePinHigh(LED_01); - writePinHigh(LED_02); + gpio_write_pin_high(LED_00); + gpio_write_pin_high(LED_01); + gpio_write_pin_high(LED_02); wait_ms(led_delay_ms); - writePinLow(LED_00); - writePinLow(LED_01); - writePinLow(LED_02); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); + gpio_write_pin_low(LED_02); if (i < 1) { wait_ms(led_delay_ms); } @@ -69,7 +69,7 @@ void matrix_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(LED_02, !led_state.num_lock); + gpio_write_pin(LED_02, !led_state.num_lock); } return res; } diff --git a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c index 1022ad06053..cdbaff54aa1 100644 --- a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c +++ b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c @@ -17,9 +17,9 @@ void keyboard_pre_init_kb(void) { // Set LED IO as outputs - setPinOutput(LED_00); - setPinOutput(LED_01); - setPinOutput(LED_02); + gpio_set_pin_output(LED_00); + gpio_set_pin_output(LED_01); + gpio_set_pin_output(LED_02); keyboard_pre_init_user(); } @@ -28,17 +28,17 @@ bool shutdown_kb(bool jump_to_bootloader) { return false; } // Shutdown LEDs - writePinLow(LED_00); - writePinLow(LED_01); - writePinLow(LED_02); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); + gpio_write_pin_low(LED_02); return true; } layer_state_t layer_state_set_kb(layer_state_t state) { // Layer LEDs act as binary indication of current layer uint8_t layer = get_highest_layer(state); - writePin(LED_00, layer & 0b1); - writePin(LED_01, (layer >> 1) & 0b1); + gpio_write_pin(LED_00, layer & 0b1); + gpio_write_pin(LED_01, (layer >> 1) & 0b1); return layer_state_set_user(state); } @@ -51,13 +51,13 @@ void matrix_init_kb(void) { // runs once when the firmware starts up uint8_t led_delay_ms = 80; for (int i = 0; i < 2; i++) { - writePinHigh(LED_00); - writePinHigh(LED_01); - writePinHigh(LED_02); + gpio_write_pin_high(LED_00); + gpio_write_pin_high(LED_01); + gpio_write_pin_high(LED_02); wait_ms(led_delay_ms); - writePinLow(LED_00); - writePinLow(LED_01); - writePinLow(LED_02); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); + gpio_write_pin_low(LED_02); if (i < 1) { wait_ms(led_delay_ms); } @@ -69,7 +69,7 @@ void matrix_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(LED_02, !led_state.num_lock); + gpio_write_pin(LED_02, !led_state.num_lock); } return res; } diff --git a/keyboards/dumbpad/v1x_right/v1x_right.c b/keyboards/dumbpad/v1x_right/v1x_right.c index 1022ad06053..cdbaff54aa1 100644 --- a/keyboards/dumbpad/v1x_right/v1x_right.c +++ b/keyboards/dumbpad/v1x_right/v1x_right.c @@ -17,9 +17,9 @@ void keyboard_pre_init_kb(void) { // Set LED IO as outputs - setPinOutput(LED_00); - setPinOutput(LED_01); - setPinOutput(LED_02); + gpio_set_pin_output(LED_00); + gpio_set_pin_output(LED_01); + gpio_set_pin_output(LED_02); keyboard_pre_init_user(); } @@ -28,17 +28,17 @@ bool shutdown_kb(bool jump_to_bootloader) { return false; } // Shutdown LEDs - writePinLow(LED_00); - writePinLow(LED_01); - writePinLow(LED_02); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); + gpio_write_pin_low(LED_02); return true; } layer_state_t layer_state_set_kb(layer_state_t state) { // Layer LEDs act as binary indication of current layer uint8_t layer = get_highest_layer(state); - writePin(LED_00, layer & 0b1); - writePin(LED_01, (layer >> 1) & 0b1); + gpio_write_pin(LED_00, layer & 0b1); + gpio_write_pin(LED_01, (layer >> 1) & 0b1); return layer_state_set_user(state); } @@ -51,13 +51,13 @@ void matrix_init_kb(void) { // runs once when the firmware starts up uint8_t led_delay_ms = 80; for (int i = 0; i < 2; i++) { - writePinHigh(LED_00); - writePinHigh(LED_01); - writePinHigh(LED_02); + gpio_write_pin_high(LED_00); + gpio_write_pin_high(LED_01); + gpio_write_pin_high(LED_02); wait_ms(led_delay_ms); - writePinLow(LED_00); - writePinLow(LED_01); - writePinLow(LED_02); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); + gpio_write_pin_low(LED_02); if (i < 1) { wait_ms(led_delay_ms); } @@ -69,7 +69,7 @@ void matrix_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(LED_02, !led_state.num_lock); + gpio_write_pin(LED_02, !led_state.num_lock); } return res; } diff --git a/keyboards/dumbpad/v3x/v3x.c b/keyboards/dumbpad/v3x/v3x.c index 89f13684f26..181e9d4a0d9 100644 --- a/keyboards/dumbpad/v3x/v3x.c +++ b/keyboards/dumbpad/v3x/v3x.c @@ -48,9 +48,9 @@ led_config_t g_led_config = {{// Key Matrix to LED Index void keyboard_pre_init_kb(void) { // Set LED IO as outputs - setPinOutput(LED_00); - setPinOutput(LED_01); - setPinOutput(LED_02); + gpio_set_pin_output(LED_00); + gpio_set_pin_output(LED_01); + gpio_set_pin_output(LED_02); keyboard_pre_init_user(); } @@ -59,17 +59,17 @@ bool shutdown_kb(bool jump_to_bootloader) { return false; } // Shutdown LEDs - writePinLow(LED_00); - writePinLow(LED_01); - writePinLow(LED_02); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); + gpio_write_pin_low(LED_02); return true; } layer_state_t layer_state_set_kb(layer_state_t state) { // Layer LEDs act as binary indication of current layer uint8_t layer = get_highest_layer(state); - writePin(LED_00, layer & 0b1); - writePin(LED_01, (layer >> 1) & 0b1); + gpio_write_pin(LED_00, layer & 0b1); + gpio_write_pin(LED_01, (layer >> 1) & 0b1); uprintf("%d string", layer); return layer_state_set_user(state); } @@ -83,13 +83,13 @@ void matrix_init_kb(void) { // runs once when the firmware starts up uint8_t led_delay_ms = 80; for (int i = 0; i < 2; i++) { - writePinHigh(LED_00); - writePinHigh(LED_01); - writePinHigh(LED_02); + gpio_write_pin_high(LED_00); + gpio_write_pin_high(LED_01); + gpio_write_pin_high(LED_02); wait_ms(led_delay_ms); - writePinLow(LED_00); - writePinLow(LED_01); - writePinLow(LED_02); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); + gpio_write_pin_low(LED_02); if (i < 1) { wait_ms(led_delay_ms); } @@ -101,6 +101,6 @@ void matrix_init_kb(void) { bool led_update_kb(led_t led_state) { if (!led_update_user(led_state)) return false; // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - writePin(LED_02, !led_state.num_lock); + gpio_write_pin(LED_02, !led_state.num_lock); return true; } diff --git a/keyboards/durgod/dgk6x/dgk6x.c b/keyboards/durgod/dgk6x/dgk6x.c index b7f1da778d9..4db54859de1 100644 --- a/keyboards/durgod/dgk6x/dgk6x.c +++ b/keyboards/durgod/dgk6x/dgk6x.c @@ -18,22 +18,22 @@ /* Private Functions */ void off_all_leds(void) { - writePinHigh(LED_CAPS_LOCK_PIN); - writePinHigh(LED_WIN_LOCK_PIN); - writePinHigh(LED_MR_LOCK_PIN); + gpio_write_pin_high(LED_CAPS_LOCK_PIN); + gpio_write_pin_high(LED_WIN_LOCK_PIN); + gpio_write_pin_high(LED_MR_LOCK_PIN); } void on_all_leds(void) { - writePinLow(LED_CAPS_LOCK_PIN); - writePinLow(LED_WIN_LOCK_PIN); - writePinLow(LED_MR_LOCK_PIN); + gpio_write_pin_low(LED_CAPS_LOCK_PIN); + gpio_write_pin_low(LED_WIN_LOCK_PIN); + gpio_write_pin_low(LED_MR_LOCK_PIN); } /* WinLock and MR LEDs are non-standard. Need to override led init */ void led_init_ports(void) { - setPinOutput(LED_CAPS_LOCK_PIN); - setPinOutput(LED_WIN_LOCK_PIN); - setPinOutput(LED_MR_LOCK_PIN); + gpio_set_pin_output(LED_CAPS_LOCK_PIN); + gpio_set_pin_output(LED_WIN_LOCK_PIN); + gpio_set_pin_output(LED_MR_LOCK_PIN); off_all_leds(); } @@ -44,7 +44,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { case GU_TOGG: if (record->event.pressed) { // Toggle LED on key press - togglePin(LED_WIN_LOCK_PIN); + gpio_toggle_pin(LED_WIN_LOCK_PIN); } break; } diff --git a/keyboards/durgod/k310/k310.c b/keyboards/durgod/k310/k310.c index a88100be20b..7879b13f4ea 100644 --- a/keyboards/durgod/k310/k310.c +++ b/keyboards/durgod/k310/k310.c @@ -22,33 +22,33 @@ /* Private Functions */ void off_all_leds(void) { #ifdef LED_NUM_LOCK_PIN - writePinHigh(LED_NUM_LOCK_PIN); + gpio_write_pin_high(LED_NUM_LOCK_PIN); #endif - writePinHigh(LED_CAPS_LOCK_PIN); - writePinHigh(LED_SCROLL_LOCK_PIN); - writePinHigh(LED_WIN_LOCK_PIN); - writePinHigh(LED_MR_LOCK_PIN); + gpio_write_pin_high(LED_CAPS_LOCK_PIN); + gpio_write_pin_high(LED_SCROLL_LOCK_PIN); + gpio_write_pin_high(LED_WIN_LOCK_PIN); + gpio_write_pin_high(LED_MR_LOCK_PIN); } void on_all_leds(void) { #ifdef LED_NUM_LOCK_PIN - writePinLow(LED_NUM_LOCK_PIN); + gpio_write_pin_low(LED_NUM_LOCK_PIN); #endif - writePinLow(LED_CAPS_LOCK_PIN); - writePinLow(LED_SCROLL_LOCK_PIN); - writePinLow(LED_WIN_LOCK_PIN); - writePinLow(LED_MR_LOCK_PIN); + gpio_write_pin_low(LED_CAPS_LOCK_PIN); + gpio_write_pin_low(LED_SCROLL_LOCK_PIN); + gpio_write_pin_low(LED_WIN_LOCK_PIN); + gpio_write_pin_low(LED_MR_LOCK_PIN); } /* WinLock and MR LEDs are non-standard. Need to override led init */ void led_init_ports(void) { #ifdef LED_NUM_LOCK_PIN - setPinOutput(LED_NUM_LOCK_PIN); + gpio_set_pin_output(LED_NUM_LOCK_PIN); #endif - setPinOutput(LED_CAPS_LOCK_PIN); - setPinOutput(LED_SCROLL_LOCK_PIN); - setPinOutput(LED_WIN_LOCK_PIN); - setPinOutput(LED_MR_LOCK_PIN); + gpio_set_pin_output(LED_CAPS_LOCK_PIN); + gpio_set_pin_output(LED_SCROLL_LOCK_PIN); + gpio_set_pin_output(LED_WIN_LOCK_PIN); + gpio_set_pin_output(LED_MR_LOCK_PIN); off_all_leds(); } @@ -58,7 +58,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { case GU_TOGG: if (record->event.pressed) { // Toggle LED on key press - togglePin(LED_WIN_LOCK_PIN); + gpio_toggle_pin(LED_WIN_LOCK_PIN); } break; } @@ -75,7 +75,7 @@ static void hardware_reset_cb(void *arg) { #endif void keyboard_pre_init_kb(void) { - setPinInputHigh(HARDWARE_RESET_PIN); + gpio_set_pin_input_high(HARDWARE_RESET_PIN); #ifndef HW_RESET_PIN_DISABLED /* Jump to bootloader when the hardware reset button is pressed */ @@ -83,7 +83,7 @@ void keyboard_pre_init_kb(void) { palSetPadCallback(PAL_PORT(HARDWARE_RESET_PIN), PAL_PAD(HARDWARE_RESET_PIN), hardware_reset_cb, NULL); /* The interrupt is edge-triggered so check that it's not already pressed */ - if (!readPin(HARDWARE_RESET_PIN)) { + if (!gpio_read_pin(HARDWARE_RESET_PIN)) { bootloader_jump(); } #endif diff --git a/keyboards/durgod/k320/k320.c b/keyboards/durgod/k320/k320.c index c1b9701d7b7..0a544fe3189 100644 --- a/keyboards/durgod/k320/k320.c +++ b/keyboards/durgod/k320/k320.c @@ -22,33 +22,33 @@ /* Private Functions */ void off_all_leds(void) { #ifdef LED_NUM_LOCK_PIN - writePinHigh(LED_NUM_LOCK_PIN); + gpio_write_pin_high(LED_NUM_LOCK_PIN); #endif - writePinHigh(LED_CAPS_LOCK_PIN); - writePinHigh(LED_SCROLL_LOCK_PIN); - writePinHigh(LED_WIN_LOCK_PIN); - writePinHigh(LED_MR_LOCK_PIN); + gpio_write_pin_high(LED_CAPS_LOCK_PIN); + gpio_write_pin_high(LED_SCROLL_LOCK_PIN); + gpio_write_pin_high(LED_WIN_LOCK_PIN); + gpio_write_pin_high(LED_MR_LOCK_PIN); } void on_all_leds(void) { #ifdef LED_NUM_LOCK_PIN - writePinLow(LED_NUM_LOCK_PIN); + gpio_write_pin_low(LED_NUM_LOCK_PIN); #endif - writePinLow(LED_CAPS_LOCK_PIN); - writePinLow(LED_SCROLL_LOCK_PIN); - writePinLow(LED_WIN_LOCK_PIN); - writePinLow(LED_MR_LOCK_PIN); + gpio_write_pin_low(LED_CAPS_LOCK_PIN); + gpio_write_pin_low(LED_SCROLL_LOCK_PIN); + gpio_write_pin_low(LED_WIN_LOCK_PIN); + gpio_write_pin_low(LED_MR_LOCK_PIN); } /* WinLock and MR LEDs are non-standard. Need to override led init */ void led_init_ports(void) { #ifdef LED_NUM_LOCK_PIN - setPinOutput(LED_NUM_LOCK_PIN); + gpio_set_pin_output(LED_NUM_LOCK_PIN); #endif - setPinOutput(LED_CAPS_LOCK_PIN); - setPinOutput(LED_SCROLL_LOCK_PIN); - setPinOutput(LED_WIN_LOCK_PIN); - setPinOutput(LED_MR_LOCK_PIN); + gpio_set_pin_output(LED_CAPS_LOCK_PIN); + gpio_set_pin_output(LED_SCROLL_LOCK_PIN); + gpio_set_pin_output(LED_WIN_LOCK_PIN); + gpio_set_pin_output(LED_MR_LOCK_PIN); off_all_leds(); } @@ -58,7 +58,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { case GU_TOGG: if (record->event.pressed) { // Toggle LED on key press - togglePin(LED_WIN_LOCK_PIN); + gpio_toggle_pin(LED_WIN_LOCK_PIN); } break; } @@ -75,7 +75,7 @@ static void hardware_reset_cb(void *arg) { #endif void keyboard_pre_init_kb(void) { - setPinInputHigh(HARDWARE_RESET_PIN); + gpio_set_pin_input_high(HARDWARE_RESET_PIN); #ifndef HW_RESET_PIN_DISABLED /* Jump to bootloader when the hardware reset button is pressed */ @@ -83,7 +83,7 @@ void keyboard_pre_init_kb(void) { palSetPadCallback(PAL_PORT(HARDWARE_RESET_PIN), PAL_PAD(HARDWARE_RESET_PIN), hardware_reset_cb, NULL); /* The interrupt is edge-triggered so check that it's not already pressed */ - if (!readPin(HARDWARE_RESET_PIN)) { + if (!gpio_read_pin(HARDWARE_RESET_PIN)) { bootloader_jump(); } #endif diff --git a/keyboards/dztech/bocc/bocc.c b/keyboards/dztech/bocc/bocc.c index fc2eb8d6eb3..646a7861f83 100644 --- a/keyboards/dztech/bocc/bocc.c +++ b/keyboards/dztech/bocc/bocc.c @@ -16,14 +16,14 @@ #include "quantum.h" void matrix_init_kb(void) { - setPinOutput(E6); + gpio_set_pin_output(E6); matrix_init_user(); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(E6, !led_state.caps_lock); + gpio_write_pin(E6, !led_state.caps_lock); } return res; } diff --git a/keyboards/ealdin/quadrant/quadrant.c b/keyboards/ealdin/quadrant/quadrant.c index f98cafd7503..23be00b96f0 100644 --- a/keyboards/ealdin/quadrant/quadrant.c +++ b/keyboards/ealdin/quadrant/quadrant.c @@ -54,14 +54,14 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { } void keyboard_pre_init_kb(void) { - setPinOutput(F0); + gpio_set_pin_output(F0); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { - writePin(F0, led_state.caps_lock); + gpio_write_pin(F0, led_state.caps_lock); } return true; } diff --git a/keyboards/edda/edda.c b/keyboards/edda/edda.c index 38d1d5ddab7..b5f169abe6c 100644 --- a/keyboards/edda/edda.c +++ b/keyboards/edda/edda.c @@ -18,32 +18,32 @@ void keyboard_pre_init_kb(void) { keyboard_pre_init_user(); // Set our LED pins as output - setPinOutput(B2); - setPinOutput(B1); - setPinOutput(B0); + gpio_set_pin_output(B2); + gpio_set_pin_output(B1); + gpio_set_pin_output(B0); } __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case 1: - writePin(B2, 1); - writePin(B1, 0); - writePin(B0, 0); + gpio_write_pin(B2, 1); + gpio_write_pin(B1, 0); + gpio_write_pin(B0, 0); break; case 2: - writePin(B2, 1); - writePin(B1, 1); - writePin(B0, 0); + gpio_write_pin(B2, 1); + gpio_write_pin(B1, 1); + gpio_write_pin(B0, 0); break; case 3: - writePin(B2, 1); - writePin(B1, 1); - writePin(B0, 1); + gpio_write_pin(B2, 1); + gpio_write_pin(B1, 1); + gpio_write_pin(B0, 1); break; default: // for any other layers, or the default layer - writePin(B2, 0); - writePin(B1, 0); - writePin(B0, 0); + gpio_write_pin(B2, 0); + gpio_write_pin(B1, 0); + gpio_write_pin(B0, 0); break; } return state; diff --git a/keyboards/enviousdesign/commissions/mini1800/mini1800.c b/keyboards/enviousdesign/commissions/mini1800/mini1800.c index f35be22d134..86757dab8af 100644 --- a/keyboards/enviousdesign/commissions/mini1800/mini1800.c +++ b/keyboards/enviousdesign/commissions/mini1800/mini1800.c @@ -3,15 +3,15 @@ #include "quantum.h" void matrix_init_user(void) { - setPinOutput(GP9); //init gpio - writePinLow(GP9); - setPinOutput(GP11); //init and turn off inverted power led - writePinHigh(GP11); + gpio_set_pin_output(GP9); //init gpio + gpio_write_pin_low(GP9); + gpio_set_pin_output(GP11); //init and turn off inverted power led + gpio_write_pin_high(GP11); } //layer, capslock and numlock layer_state_t layer_state_set_user(layer_state_t state) { - writePin(GP9, layer_state_cmp(state, 1)); + gpio_write_pin(GP9, layer_state_cmp(state, 1)); return state; } diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c index 9013c0785f8..4d1645943b3 100644 --- a/keyboards/ergodox_ez/matrix.c +++ b/keyboards/ergodox_ez/matrix.c @@ -130,12 +130,12 @@ static void init_cols(void) { // not needed, already done as part of init_mcp23018() // init on teensy - setPinInputHigh(F0); - setPinInputHigh(F1); - setPinInputHigh(F4); - setPinInputHigh(F5); - setPinInputHigh(F6); - setPinInputHigh(F7); + gpio_set_pin_input_high(F0); + gpio_set_pin_input_high(F1); + gpio_set_pin_input_high(F4); + gpio_set_pin_input_high(F5); + gpio_set_pin_input_high(F6); + gpio_set_pin_input_high(F7); } static matrix_row_t read_cols(uint8_t row) { @@ -176,13 +176,13 @@ static void unselect_rows(void) { // direction // unselect on teensy - setPinInput(B0); - setPinInput(B1); - setPinInput(B2); - setPinInput(B3); - setPinInput(D2); - setPinInput(D3); - setPinInput(C6); + gpio_set_pin_input(B0); + gpio_set_pin_input(B1); + gpio_set_pin_input(B2); + gpio_set_pin_input(B3); + gpio_set_pin_input(D2); + gpio_set_pin_input(D3); + gpio_set_pin_input(C6); } static void select_row(uint8_t row) { @@ -200,32 +200,32 @@ static void select_row(uint8_t row) { // Output low(DDR:1, PORT:0) to select switch (row) { case 7: - setPinOutput(B0); - writePinLow(B0); + gpio_set_pin_output(B0); + gpio_write_pin_low(B0); break; case 8: - setPinOutput(B1); - writePinLow(B1); + gpio_set_pin_output(B1); + gpio_write_pin_low(B1); break; case 9: - setPinOutput(B2); - writePinLow(B2); + gpio_set_pin_output(B2); + gpio_write_pin_low(B2); break; case 10: - setPinOutput(B3); - writePinLow(B3); + gpio_set_pin_output(B3); + gpio_write_pin_low(B3); break; case 11: - setPinOutput(D2); - writePinLow(D2); + gpio_set_pin_output(D2); + gpio_write_pin_low(D2); break; case 12: - setPinOutput(D3); - writePinLow(D3); + gpio_set_pin_output(D3); + gpio_write_pin_low(D3); break; case 13: - setPinOutput(C6); - writePinLow(C6); + gpio_set_pin_output(C6); + gpio_write_pin_low(C6); break; } } diff --git a/keyboards/evyd13/gh80_3700/gh80_3700.c b/keyboards/evyd13/gh80_3700/gh80_3700.c index 617de50d5dd..6d903e48e1c 100644 --- a/keyboards/evyd13/gh80_3700/gh80_3700.c +++ b/keyboards/evyd13/gh80_3700/gh80_3700.c @@ -16,22 +16,22 @@ #include "quantum.h" void led_init_ports(void) { - setPinOutput(E6); - setPinOutput(B1); - setPinOutput(D0); - setPinOutput(D1); - setPinOutput(F0); + gpio_set_pin_output(E6); + gpio_set_pin_output(B1); + gpio_set_pin_output(D0); + gpio_set_pin_output(D1); + gpio_set_pin_output(F0); - writePinHigh(E6); - writePinHigh(B1); - writePinHigh(D0); - writePinHigh(D1); - writePinHigh(F0); + gpio_write_pin_high(E6); + gpio_write_pin_high(B1); + gpio_write_pin_high(D0); + gpio_write_pin_high(D1); + gpio_write_pin_high(F0); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(E6, !led_state.num_lock); + gpio_write_pin(E6, !led_state.num_lock); } return true; diff --git a/keyboards/evyd13/gud70/gud70.c b/keyboards/evyd13/gud70/gud70.c index f9b5050ea70..5c400455211 100644 --- a/keyboards/evyd13/gud70/gud70.c +++ b/keyboards/evyd13/gud70/gud70.c @@ -17,6 +17,6 @@ void keyboard_pre_init_kb(void) { // Enable top LED - setPinOutput(B3); - writePinLow(B3); + gpio_set_pin_output(B3); + gpio_write_pin_low(B3); } diff --git a/keyboards/evyd13/pockettype/pockettype.c b/keyboards/evyd13/pockettype/pockettype.c index b9aee694967..7e372363fa0 100644 --- a/keyboards/evyd13/pockettype/pockettype.c +++ b/keyboards/evyd13/pockettype/pockettype.c @@ -17,20 +17,20 @@ void led_init_ports(void) { // * Enable LED anodes (Vbus pin is replaced by B0 on some boards) - setPinOutput(B0); - writePinHigh(B0); + gpio_set_pin_output(B0); + gpio_write_pin_high(B0); // * Set our LED pins as output and high - setPinOutput(F5); - writePinHigh(F5); + gpio_set_pin_output(F5); + gpio_write_pin_high(F5); - setPinOutput(F4); - writePinLow(F4); + gpio_set_pin_output(F4); + gpio_write_pin_low(F4); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(F5, !led_state.caps_lock); + gpio_write_pin(F5, !led_state.caps_lock); } return true; diff --git a/keyboards/evyd13/wasdat/matrix.c b/keyboards/evyd13/wasdat/matrix.c index ae4bb6cb3a3..b83f2b900ab 100644 --- a/keyboards/evyd13/wasdat/matrix.c +++ b/keyboards/evyd13/wasdat/matrix.c @@ -46,7 +46,7 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; */ static void select_col(uint8_t col) { if (col_pins[col] != NO_PIN) { - writePinLow(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } else { sn74x138_set_addr(13 - col); } @@ -54,8 +54,8 @@ static void select_col(uint8_t col) { static void unselect_col(uint8_t col) { if (col_pins[col] != NO_PIN) { - setPinOutput(col_pins[col]); - writePinHigh(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_high(col_pins[col]); } else { sn74x138_set_addr(0); } @@ -65,8 +65,8 @@ static void unselect_cols(void) { // Native for (uint8_t x = 0; x < MATRIX_COLS; x++) { if (col_pins[x] != NO_PIN) { - setPinOutput(col_pins[x]); - writePinHigh(col_pins[x]); + gpio_set_pin_output(col_pins[x]); + gpio_write_pin_high(col_pins[x]); } } @@ -77,7 +77,7 @@ static void unselect_cols(void) { static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -94,7 +94,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col); } else { diff --git a/keyboards/evyd13/wasdat_code/matrix.c b/keyboards/evyd13/wasdat_code/matrix.c index d392a31d7c7..5c3f1191580 100644 --- a/keyboards/evyd13/wasdat_code/matrix.c +++ b/keyboards/evyd13/wasdat_code/matrix.c @@ -48,7 +48,7 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; */ static void select_col(uint8_t col) { if (col_pins[col] != NO_PIN) { - writePinLow(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } else { sn74x138_set_addr((col == 6) ? 7 : 15 - col); sn74x138_set_enabled(true); @@ -57,8 +57,8 @@ static void select_col(uint8_t col) { static void unselect_col(uint8_t col) { if (col_pins[col] != NO_PIN) { - setPinOutput(col_pins[col]); - writePinHigh(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_high(col_pins[col]); } else { sn74x138_set_enabled(false); } @@ -68,8 +68,8 @@ static void unselect_cols(void) { // Native for (uint8_t x = 0; x < MATRIX_COLS; x++) { if (col_pins[x] != NO_PIN) { - setPinOutput(col_pins[x]); - writePinHigh(col_pins[x]); + gpio_set_pin_output(col_pins[x]); + gpio_write_pin_high(col_pins[x]); } } @@ -80,7 +80,7 @@ static void unselect_cols(void) { static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -97,7 +97,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col); } else { diff --git a/keyboards/exclusive/e6v2/oe/oe.c b/keyboards/exclusive/e6v2/oe/oe.c index 6869a52c974..b15fa32ab05 100644 --- a/keyboards/exclusive/e6v2/oe/oe.c +++ b/keyboards/exclusive/e6v2/oe/oe.c @@ -1,15 +1,15 @@ #include "quantum.h" void led_init_ports(void) { - setPinOutput(B2); - setPinOutput(B6); + gpio_set_pin_output(B2); + gpio_set_pin_output(B6); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B2, !led_state.caps_lock); - writePin(B6, led_state.raw == 0); + gpio_write_pin(B2, !led_state.caps_lock); + gpio_write_pin(B6, led_state.raw == 0); } return res; } diff --git a/keyboards/exclusive/e85/hotswap/hotswap.c b/keyboards/exclusive/e85/hotswap/hotswap.c index a6d50b1f773..18ca30b44cd 100644 --- a/keyboards/exclusive/e85/hotswap/hotswap.c +++ b/keyboards/exclusive/e85/hotswap/hotswap.c @@ -17,16 +17,16 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(C7); - setPinOutput(B5); + gpio_set_pin_output(C7); + gpio_set_pin_output(B5); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { - writePin(C7, led_state.caps_lock); - writePin(B5, led_state.scroll_lock); + gpio_write_pin(C7, led_state.caps_lock); + gpio_write_pin(B5, led_state.scroll_lock); } return true; } diff --git a/keyboards/exclusive/e85/soldered/soldered.c b/keyboards/exclusive/e85/soldered/soldered.c index 81ae1f00ceb..bdee95c26c6 100644 --- a/keyboards/exclusive/e85/soldered/soldered.c +++ b/keyboards/exclusive/e85/soldered/soldered.c @@ -17,16 +17,16 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(C7); - setPinOutput(B5); + gpio_set_pin_output(C7); + gpio_set_pin_output(B5); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { - writePin(C7, led_state.caps_lock); - writePin(B5, led_state.scroll_lock); + gpio_write_pin(C7, led_state.caps_lock); + gpio_write_pin(B5, led_state.scroll_lock); } return true; } diff --git a/keyboards/ferris/0_1/matrix.c b/keyboards/ferris/0_1/matrix.c index 154a275d7a0..a3e2bebba6c 100644 --- a/keyboards/ferris/0_1/matrix.c +++ b/keyboards/ferris/0_1/matrix.c @@ -182,8 +182,8 @@ static void init_cols(void) { pin_t matrix_col_pins_mcu[MATRIX_COLS_PER_SIDE] = MATRIX_COL_PINS_MCU; for (int pin_index = 0; pin_index < MATRIX_COLS_PER_SIDE; pin_index++) { pin_t pin = matrix_col_pins_mcu[pin_index]; - setPinInput(pin); - writePinHigh(pin); + gpio_set_pin_input(pin); + gpio_write_pin_high(pin); } } @@ -194,7 +194,7 @@ static matrix_row_t read_cols(uint8_t row) { // For each col... for (uint8_t col_index = 0; col_index < MATRIX_COLS_PER_SIDE; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(matrix_col_pins_mcu[col_index]); + uint8_t pin_state = gpio_read_pin(matrix_col_pins_mcu[col_index]); // Populate the matrix row with the state of the col pin current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); @@ -229,8 +229,8 @@ static void unselect_rows(void) { pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_MCU; for (int pin_index = 0; pin_index < MATRIX_ROWS_PER_SIDE; pin_index++) { pin_t pin = matrix_row_pins_mcu[pin_index]; - setPinInput(pin); - writePinLow(pin); + gpio_set_pin_input(pin); + gpio_write_pin_low(pin); } } @@ -239,8 +239,8 @@ static void select_row(uint8_t row) { // select on atmega32u4 pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_MCU; pin_t pin = matrix_row_pins_mcu[row]; - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } else { // select on mcp23017 if (mcp23017_status) { // if there was an error diff --git a/keyboards/ferris/0_2/matrix.c b/keyboards/ferris/0_2/matrix.c index 41b100b659a..74fab717a1a 100644 --- a/keyboards/ferris/0_2/matrix.c +++ b/keyboards/ferris/0_2/matrix.c @@ -173,7 +173,7 @@ static matrix_row_t read_cols(uint8_t row) { // For each col... for (uint8_t col_index = 0; col_index < MATRIX_COLS_PER_SIDE; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(matrix_col_pins_mcu[col_index]); + uint8_t pin_state = gpio_read_pin(matrix_col_pins_mcu[col_index]); // Populate the matrix row with the state of the col pin current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); @@ -199,7 +199,7 @@ static matrix_row_t read_cols(uint8_t row) { static void unselect_row(uint8_t row) { pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_MCU; - setPinInputHigh(matrix_row_pins_mcu[row]); + gpio_set_pin_input_high(matrix_row_pins_mcu[row]); } static void unselect_rows(void) { @@ -211,14 +211,14 @@ static void unselect_rows(void) { pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_MCU; for (int pin_index = 0; pin_index < MATRIX_ROWS_PER_SIDE; pin_index++) { pin_t pin = matrix_row_pins_mcu[pin_index]; - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static void unselect_cols(void) { pin_t matrix_col_pins_mcu[MATRIX_COLS_PER_SIDE] = MATRIX_COL_PINS_MCU; for (int pin_index = 0; pin_index < MATRIX_COLS_PER_SIDE; pin_index++) { pin_t pin = matrix_col_pins_mcu[pin_index]; - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } @@ -227,8 +227,8 @@ static void select_row(uint8_t row) { // select on MCU pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_MCU; pin_t pin = matrix_row_pins_mcu[row]; - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } else { // select on mcp23017 if (mcp23017_status) { // if there was an error diff --git a/keyboards/fjlabs/bolsa65/bolsa65.c b/keyboards/fjlabs/bolsa65/bolsa65.c index 1c65ca1a3df..669404192c0 100644 --- a/keyboards/fjlabs/bolsa65/bolsa65.c +++ b/keyboards/fjlabs/bolsa65/bolsa65.c @@ -15,14 +15,14 @@ along with this program. If not, see . void matrix_init_kb(void) { // Initialize indicator LEDs to output - setPinOutput(F7); // Caps + gpio_set_pin_output(F7); // Caps matrix_init_user(); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(F7, led_state.caps_lock); + gpio_write_pin(F7, led_state.caps_lock); } return res; } diff --git a/keyboards/flx/virgo/virgo.c b/keyboards/flx/virgo/virgo.c index 5260e153223..2f875531d0f 100644 --- a/keyboards/flx/virgo/virgo.c +++ b/keyboards/flx/virgo/virgo.c @@ -20,15 +20,15 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(E6); - setPinOutput(B2); + gpio_set_pin_output(E6); + gpio_set_pin_output(B2); matrix_init_user(); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(E6, !led_state.caps_lock); - writePin(B2, !led_state.scroll_lock); + gpio_write_pin(E6, !led_state.caps_lock); + gpio_write_pin(B2, !led_state.scroll_lock); } return true; } diff --git a/keyboards/gboards/gergoplex/matrix.c b/keyboards/gboards/gergoplex/matrix.c index 9abe9a83b39..3ea6a13385a 100644 --- a/keyboards/gboards/gergoplex/matrix.c +++ b/keyboards/gboards/gergoplex/matrix.c @@ -168,7 +168,7 @@ void matrix_print(void) { // Remember this means ROWS static void init_cols(void) { for (uint8_t col = 0; col < MATRIX_COLS; col++) { - setPinInputHigh(col_pins[col]); + gpio_set_pin_input_high(col_pins[col]); } } @@ -195,8 +195,8 @@ static void unselect_rows(void) { // the other row bits high, and it's not changing to a different direction for (uint8_t row = 0; row < MATRIX_ROWS_PER_SIDE; row++) { - setPinInput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_input(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } } @@ -211,7 +211,7 @@ static void select_row(uint8_t row) { } } else { - setPinOutput(row_pins[row - MATRIX_ROWS_PER_SIDE]); - writePinLow(row_pins[row - MATRIX_ROWS_PER_SIDE]); + gpio_set_pin_output(row_pins[row - MATRIX_ROWS_PER_SIDE]); + gpio_write_pin_low(row_pins[row - MATRIX_ROWS_PER_SIDE]); } } diff --git a/keyboards/geistmaschine/macropod/matrix.c b/keyboards/geistmaschine/macropod/matrix.c index 98796133f12..5cd35b47d4f 100644 --- a/keyboards/geistmaschine/macropod/matrix.c +++ b/keyboards/geistmaschine/macropod/matrix.c @@ -38,7 +38,7 @@ void pca9555_setup(void) { void matrix_init_custom(void) { // Encoder pushbutton on the MCU is connected to PD2 - setPinInputHigh(D2); + gpio_set_pin_input_high(D2); pca9555_setup(); } @@ -79,7 +79,7 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { } // Shift pin states by 1 to make room for the switch connected to the MCU, then OR them together and invert (as QMK uses inverted logic compared to the electrical levels) - matrix_row_t data = ~(pin_states << 1 | readPin(D2)); + matrix_row_t data = ~(pin_states << 1 | gpio_read_pin(D2)); bool changed = current_matrix[0] != data; current_matrix[0] = data; diff --git a/keyboards/geonworks/ee_at/ee_at.c b/keyboards/geonworks/ee_at/ee_at.c index b2e6320851b..099fbf315d9 100644 --- a/keyboards/geonworks/ee_at/ee_at.c +++ b/keyboards/geonworks/ee_at/ee_at.c @@ -17,14 +17,14 @@ void led_init_ports(void) { // Set our LED pins as open drain outputs - setPinOutputOpenDrain(LED_CAPS_LOCK_PIN); - setPinOutputOpenDrain(LED_NUM_LOCK_PIN); - setPinOutputOpenDrain(LED_SCROLL_LOCK_PIN); - setPinOutputOpenDrain(LED_KANA_PIN); - setPinOutputOpenDrain(A14); + gpio_set_pin_output_open_drain(LED_CAPS_LOCK_PIN); + gpio_set_pin_output_open_drain(LED_NUM_LOCK_PIN); + gpio_set_pin_output_open_drain(LED_SCROLL_LOCK_PIN); + gpio_set_pin_output_open_drain(LED_KANA_PIN); + gpio_set_pin_output_open_drain(A14); } layer_state_t layer_state_set_kb(layer_state_t state) { - writePin(A14, !layer_state_cmp(state, 1)); + gpio_write_pin(A14, !layer_state_cmp(state, 1)); return layer_state_set_user(state); } diff --git a/keyboards/geonworks/w1_at/w1_at.c b/keyboards/geonworks/w1_at/w1_at.c index 9858561bc58..114574455b2 100644 --- a/keyboards/geonworks/w1_at/w1_at.c +++ b/keyboards/geonworks/w1_at/w1_at.c @@ -17,14 +17,14 @@ void led_init_ports(void) { // Set our LED pins as open drain outputs - setPinOutputOpenDrain(LED_CAPS_LOCK_PIN); - setPinOutputOpenDrain(LED_NUM_LOCK_PIN); - setPinOutputOpenDrain(LED_SCROLL_LOCK_PIN); - setPinOutputOpenDrain(LED_KANA_PIN); - setPinOutputOpenDrain(A14); + gpio_set_pin_output_open_drain(LED_CAPS_LOCK_PIN); + gpio_set_pin_output_open_drain(LED_NUM_LOCK_PIN); + gpio_set_pin_output_open_drain(LED_SCROLL_LOCK_PIN); + gpio_set_pin_output_open_drain(LED_KANA_PIN); + gpio_set_pin_output_open_drain(A14); } layer_state_t layer_state_set_kb(layer_state_t state) { - writePin(A14, !layer_state_cmp(state, 1)); + gpio_write_pin(A14, !layer_state_cmp(state, 1)); return layer_state_set_user(state); } diff --git a/keyboards/gh60/revc/revc.h b/keyboards/gh60/revc/revc.h index 0ddc9aa3443..e42c370562e 100644 --- a/keyboards/gh60/revc/revc.h +++ b/keyboards/gh60/revc/revc.h @@ -12,14 +12,14 @@ * B2 Capslock LED * B0 not connected */ -static inline void gh60_caps_led_on(void) { setPinOutput(B2); writePinLow(B2); } -static inline void gh60_poker_leds_on(void) { setPinOutput(F4); writePinLow(F4); } -static inline void gh60_fn_led_on(void) { setPinOutput(F5); writePinLow(F5); } -static inline void gh60_esc_led_on(void) { setPinOutput(F6); writePinLow(F6); } -static inline void gh60_wasd_leds_on(void) { setPinOutput(F7); writePinLow(F7); } +static inline void gh60_caps_led_on(void) { gpio_set_pin_output(B2); gpio_write_pin_low(B2); } +static inline void gh60_poker_leds_on(void) { gpio_set_pin_output(F4); gpio_write_pin_low(F4); } +static inline void gh60_fn_led_on(void) { gpio_set_pin_output(F5); gpio_write_pin_low(F5); } +static inline void gh60_esc_led_on(void) { gpio_set_pin_output(F6); gpio_write_pin_low(F6); } +static inline void gh60_wasd_leds_on(void) { gpio_set_pin_output(F7); gpio_write_pin_low(F7); } -static inline void gh60_caps_led_off(void) { setPinInput(B2); } -static inline void gh60_poker_leds_off(void) { setPinInput(F4); } -static inline void gh60_fn_led_off(void) { setPinInput(F5); } -static inline void gh60_esc_led_off(void) { setPinInput(F6); } -static inline void gh60_wasd_leds_off(void) { setPinInput(F7); } +static inline void gh60_caps_led_off(void) { gpio_set_pin_input(B2); } +static inline void gh60_poker_leds_off(void) { gpio_set_pin_input(F4); } +static inline void gh60_fn_led_off(void) { gpio_set_pin_input(F5); } +static inline void gh60_esc_led_off(void) { gpio_set_pin_input(F6); } +static inline void gh60_wasd_leds_off(void) { gpio_set_pin_input(F7); } diff --git a/keyboards/ghs/rar/rar.c b/keyboards/ghs/rar/rar.c index 481a2a0c410..591932c99c2 100644 --- a/keyboards/ghs/rar/rar.c +++ b/keyboards/ghs/rar/rar.c @@ -18,8 +18,8 @@ void keyboard_pre_init_kb(void) { // Set our LED pins as output. - setPinOutput(B1); - setPinOutput(B3); + gpio_set_pin_output(B1); + gpio_set_pin_output(B3); keyboard_pre_init_user(); } @@ -28,8 +28,8 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - writePin(B1, led_state.caps_lock); - writePin(B3, led_state.scroll_lock); + gpio_write_pin(B1, led_state.caps_lock); + gpio_write_pin(B3, led_state.scroll_lock); } return res; diff --git a/keyboards/gl516/a52gl/matrix.c b/keyboards/gl516/a52gl/matrix.c index af13768b08e..1e2948f716f 100644 --- a/keyboards/gl516/a52gl/matrix.c +++ b/keyboards/gl516/a52gl/matrix.c @@ -21,37 +21,37 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for(uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } static void unselect_col(uint8_t col) { - setPinInputHigh(col_pins[col]); + gpio_set_pin_input_high(col_pins[col]); } static void unselect_cols(void) { for(uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -59,10 +59,10 @@ static void init_pins(void) { unselect_rows(); unselect_cols(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -82,7 +82,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); @@ -110,7 +110,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[tmp]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[tmp] |= (MATRIX_ROW_SHIFTER << current_col); diff --git a/keyboards/gl516/j73gl/matrix.c b/keyboards/gl516/j73gl/matrix.c index af13768b08e..1e2948f716f 100644 --- a/keyboards/gl516/j73gl/matrix.c +++ b/keyboards/gl516/j73gl/matrix.c @@ -21,37 +21,37 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for(uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } static void unselect_col(uint8_t col) { - setPinInputHigh(col_pins[col]); + gpio_set_pin_input_high(col_pins[col]); } static void unselect_cols(void) { for(uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -59,10 +59,10 @@ static void init_pins(void) { unselect_rows(); unselect_cols(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -82,7 +82,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); @@ -110,7 +110,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[tmp]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[tmp] |= (MATRIX_ROW_SHIFTER << current_col); diff --git a/keyboards/gl516/n51gl/matrix.c b/keyboards/gl516/n51gl/matrix.c index af13768b08e..1e2948f716f 100644 --- a/keyboards/gl516/n51gl/matrix.c +++ b/keyboards/gl516/n51gl/matrix.c @@ -21,37 +21,37 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for(uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } static void unselect_col(uint8_t col) { - setPinInputHigh(col_pins[col]); + gpio_set_pin_input_high(col_pins[col]); } static void unselect_cols(void) { for(uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -59,10 +59,10 @@ static void init_pins(void) { unselect_rows(); unselect_cols(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -82,7 +82,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); @@ -110,7 +110,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[tmp]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[tmp] |= (MATRIX_ROW_SHIFTER << current_col); diff --git a/keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.c b/keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.c index 6f32d1fb558..b75fff9634f 100644 --- a/keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.c +++ b/keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.c @@ -9,7 +9,6 @@ void led_init(void) { gpio_write_pin_high(CHIMERA_ORTHO_PLUS_RED_LED_PIN); } - void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up diff --git a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c index d60b9e2254f..5b2b5893f71 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c +++ b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c @@ -317,9 +317,9 @@ void spi_init(void) { is_initialised = true; // Try releasing special pins for a short time - setPinInput(SPI_SCK_PIN); - setPinInput(SPI_MOSI_PIN); - setPinInput(SPI_MISO_PIN); + gpio_set_pin_input(SPI_SCK_PIN); + gpio_set_pin_input(SPI_MOSI_PIN); + gpio_set_pin_input(SPI_MISO_PIN); chThdSleepMilliseconds(10); diff --git a/keyboards/gmmk/gmmk2/p96/iso/iso.c b/keyboards/gmmk/gmmk2/p96/iso/iso.c index af2ee17c4ae..9a5c357307d 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/iso.c +++ b/keyboards/gmmk/gmmk2/p96/iso/iso.c @@ -313,9 +313,9 @@ void spi_init(void) { is_initialised = true; // Try releasing special pins for a short time - setPinInput(SPI_SCK_PIN); - setPinInput(SPI_MOSI_PIN); - setPinInput(SPI_MISO_PIN); + gpio_set_pin_input(SPI_SCK_PIN); + gpio_set_pin_input(SPI_MOSI_PIN); + gpio_set_pin_input(SPI_MISO_PIN); chThdSleepMilliseconds(10); diff --git a/keyboards/gmmk/numpad/matrix.c b/keyboards/gmmk/numpad/matrix.c index 68d4ab65242..4ec41bdb732 100644 --- a/keyboards/gmmk/numpad/matrix.c +++ b/keyboards/gmmk/numpad/matrix.c @@ -21,27 +21,27 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } diff --git a/keyboards/gmmk/numpad/numpad.c b/keyboards/gmmk/numpad/numpad.c index 5a2bbdb1f61..cdbc4b871a8 100644 --- a/keyboards/gmmk/numpad/numpad.c +++ b/keyboards/gmmk/numpad/numpad.c @@ -111,8 +111,8 @@ led_config_t g_led_config = {{ void keyboard_pre_init_user(void) { wait_ms(2000); - setPinOutput(AW20216S_PW_EN_PIN); - writePinHigh(AW20216S_PW_EN_PIN); + gpio_set_pin_output(AW20216S_PW_EN_PIN); + gpio_write_pin_high(AW20216S_PW_EN_PIN); } # endif diff --git a/keyboards/gray_studio/think65/solder/solder.c b/keyboards/gray_studio/think65/solder/solder.c index f97a005218c..84267b9db07 100644 --- a/keyboards/gray_studio/think65/solder/solder.c +++ b/keyboards/gray_studio/think65/solder/solder.c @@ -24,13 +24,13 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(C7); + gpio_set_pin_output(C7); matrix_init_user(); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(C7, !led_state.caps_lock); + gpio_write_pin(C7, !led_state.caps_lock); } return true; } diff --git a/keyboards/halfcliff/matrix.c b/keyboards/halfcliff/matrix.c index 99598dc1b78..ad3ad6ba094 100644 --- a/keyboards/halfcliff/matrix.c +++ b/keyboards/halfcliff/matrix.c @@ -52,13 +52,13 @@ void matrix_print(void) {} static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { - ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); } + ATOMIC_BLOCK_FORCEON { gpio_set_pin_input_high(pin); } } // matrix code @@ -83,7 +83,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) // For each col... for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); @@ -138,7 +138,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t current_row_value = last_row_value; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_row_value |= (MATRIX_ROW_SHIFTER << current_col); } else { diff --git a/keyboards/handwired/2x5keypad/2x5keypad.c b/keyboards/handwired/2x5keypad/2x5keypad.c index 873c579a179..cbd4c519b05 100644 --- a/keyboards/handwired/2x5keypad/2x5keypad.c +++ b/keyboards/handwired/2x5keypad/2x5keypad.c @@ -5,21 +5,21 @@ void matrix_init_kb(void) { matrix_init_user(); - setPinOutput(RED_LED); - setPinOutput(BLUE_LED); - setPinOutput(GREEN_LED); + gpio_set_pin_output(RED_LED); + gpio_set_pin_output(BLUE_LED); + gpio_set_pin_output(GREEN_LED); } void turn_off_leds(void) { - writePinLow(RED_LED); - writePinLow(BLUE_LED); - writePinLow(GREEN_LED); + gpio_write_pin_low(RED_LED); + gpio_write_pin_low(BLUE_LED); + gpio_write_pin_low(GREEN_LED); } void turn_on_led(pin_t pin) { - writePinHigh(pin); + gpio_write_pin_high(pin); } diff --git a/keyboards/handwired/aek64/aek64.c b/keyboards/handwired/aek64/aek64.c index 0646d308d0e..130d014616c 100644 --- a/keyboards/handwired/aek64/aek64.c +++ b/keyboards/handwired/aek64/aek64.c @@ -24,13 +24,13 @@ void keyboard_pre_init_user(void) { // Call the keyboard pre init code. // Set our LED pins as output - setPinOutput(C3); + gpio_set_pin_output(C3); } void matrix_init_kb(void) { // Flash the led 1 sec on startup. - writePinHigh(C3); + gpio_write_pin_high(C3); wait_ms(1000); - writePinLow(C3); + gpio_write_pin_low(C3); } diff --git a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c index 048500da8c7..cccc03a2872 100644 --- a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c +++ b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c @@ -24,5 +24,5 @@ joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = { /* joystick button code (thumbstick pressed) */ void keyboard_pre_init_kb(void) { - setPinInputHigh(F6); + gpio_set_pin_input_high(F6); } diff --git a/keyboards/handwired/colorlice/colorlice.c b/keyboards/handwired/colorlice/colorlice.c index 736db8d4651..ede3fba82fb 100644 --- a/keyboards/handwired/colorlice/colorlice.c +++ b/keyboards/handwired/colorlice/colorlice.c @@ -55,14 +55,14 @@ void suspend_wakeup_init_kb(void) bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - // writePin sets the pin high for 1 and low for 0. + // gpio_write_pin sets the pin high for 1 and low for 0. // In this example the pins are inverted, setting // it low/0 turns it on, and high/1 turns the LED off. // This behavior depends on whether the LED is between the pin // and VCC or the pin and GND. - writePin(B2, !led_state.num_lock); - writePin(C6, !led_state.caps_lock); - writePin(B7, !led_state.scroll_lock); + gpio_write_pin(B2, !led_state.num_lock); + gpio_write_pin(C6, !led_state.caps_lock); + gpio_write_pin(B7, !led_state.scroll_lock); } return res; } diff --git a/keyboards/handwired/dqz11n1g/matrix.c b/keyboards/handwired/dqz11n1g/matrix.c index 398f961aa5f..49b3c2da81d 100644 --- a/keyboards/handwired/dqz11n1g/matrix.c +++ b/keyboards/handwired/dqz11n1g/matrix.c @@ -25,7 +25,7 @@ static void unselect_rows(void); void matrix_init_custom(void) { /* initialize row pins */ for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - setPinOutput(row_pins[row]); + gpio_set_pin_output(row_pins[row]); } unselect_rows(); @@ -47,20 +47,20 @@ void matrix_init_custom(void) { spi_start(slavePin, lsbFirst, mode, divisor); /* Initialize pin controlling the shift register's SH/~LD pin */ - setPinOutput(ROW_SHIFT_PIN); + gpio_set_pin_output(ROW_SHIFT_PIN); } static void select_row(uint8_t row) { pin_t pin = row_pins[row]; if (pin != NO_PIN) { - writePinHigh(pin); + gpio_write_pin_high(pin); } } static void unselect_row(uint8_t row) { pin_t pin = row_pins[row]; if (pin != NO_PIN) { - writePinLow(pin); + gpio_write_pin_low(pin); } } @@ -75,12 +75,12 @@ bool matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) matrix_row_t current_row_value = 0; /* Set shift register SH/~LD pin to "load" mode */ - writePinLow(ROW_SHIFT_PIN); + gpio_write_pin_low(ROW_SHIFT_PIN); select_row(current_row); matrix_output_select_delay(); /* Set shift register SH/~LD pin to "shift" mode */ - writePinHigh(ROW_SHIFT_PIN); + gpio_write_pin_high(ROW_SHIFT_PIN); /* For each octet of columns... */ for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index += 8) { diff --git a/keyboards/handwired/evk/v1_3/v1_3.c b/keyboards/handwired/evk/v1_3/v1_3.c index 7c688939683..a568ba3f866 100644 --- a/keyboards/handwired/evk/v1_3/v1_3.c +++ b/keyboards/handwired/evk/v1_3/v1_3.c @@ -23,22 +23,22 @@ along with this program. If not, see . // runs once when the firmware starts up void matrix_init_kb(void) { // Set the LEDs pins - setPinOutput(D5); // Layer 1 Status LED + gpio_set_pin_output(D5); // Layer 1 Status LED matrix_init_user(); } // Set LED based on layer __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { - writePin(D5, layer_state_cmp(state, 1)); + gpio_write_pin(D5, layer_state_cmp(state, 1)); return state; } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - // writePin sets the pin high for 1 and low for 0. - writePin(D4, led_state.caps_lock); + // gpio_write_pin sets the pin high for 1 and low for 0. + gpio_write_pin(D4, led_state.caps_lock); } return res; } diff --git a/keyboards/handwired/jopr/jopr.c b/keyboards/handwired/jopr/jopr.c index e6d6f05dd28..cb155ecb4b8 100644 --- a/keyboards/handwired/jopr/jopr.c +++ b/keyboards/handwired/jopr/jopr.c @@ -1,7 +1,7 @@ #include "quantum.h" void led_init_ports(void) { - setPinOutput(F0); - setPinOutput(F1); - setPinOutput(F4); + gpio_set_pin_output(F0); + gpio_set_pin_output(F1); + gpio_set_pin_output(F4); } \ No newline at end of file diff --git a/keyboards/handwired/jotanck/jotanck.c b/keyboards/handwired/jotanck/jotanck.c index c0b54bb64d5..6a982d2fcfc 100644 --- a/keyboards/handwired/jotanck/jotanck.c +++ b/keyboards/handwired/jotanck/jotanck.c @@ -17,8 +17,8 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(JOTANCK_LED1); - setPinOutput(JOTANCK_LED2); + gpio_set_pin_output(JOTANCK_LED1); + gpio_set_pin_output(JOTANCK_LED2); keyboard_pre_init_user(); } diff --git a/keyboards/handwired/jotpad16/jotpad16.c b/keyboards/handwired/jotpad16/jotpad16.c index 02b4daafd65..7acb31b0df4 100644 --- a/keyboards/handwired/jotpad16/jotpad16.c +++ b/keyboards/handwired/jotpad16/jotpad16.c @@ -1,8 +1,8 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(JOTPAD16_LED1); - setPinOutput(JOTPAD16_LED2); + gpio_set_pin_output(JOTPAD16_LED1); + gpio_set_pin_output(JOTPAD16_LED2); keyboard_pre_init_user(); } diff --git a/keyboards/handwired/jtallbean/split_65/split_65.c b/keyboards/handwired/jtallbean/split_65/split_65.c index d408f5577b6..b75b12137f9 100644 --- a/keyboards/handwired/jtallbean/split_65/split_65.c +++ b/keyboards/handwired/jtallbean/split_65/split_65.c @@ -25,8 +25,8 @@ void matrix_init_kb(void) { // runs once when the firmware starts up // Set our LED pins as output - setPinOutput(B0); - writePinLow(B0); + gpio_set_pin_output(B0); + gpio_write_pin_low(B0); matrix_init_user(); } @@ -36,8 +36,8 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - // writePin sets the pin high for 1 and low for 0. - writePin(B0, led_state.caps_lock); + // gpio_write_pin sets the pin high for 1 and low for 0. + gpio_write_pin(B0, led_state.caps_lock); } return res; } diff --git a/keyboards/handwired/lagrange/lagrange.c b/keyboards/handwired/lagrange/lagrange.c index 0c76512c578..4b80752518c 100644 --- a/keyboards/handwired/lagrange/lagrange.c +++ b/keyboards/handwired/lagrange/lagrange.c @@ -35,7 +35,7 @@ bool is_keyboard_master(void) { static int8_t is_master = -1; if (is_master < 0) { - while (readPin(SPI_SS_PIN)) { + while (gpio_read_pin(SPI_SS_PIN)) { if (USB_Device_IsAddressSet()) { is_master = 1; return is_master; @@ -53,7 +53,7 @@ bool is_keyboard_master(void) { } void keyboard_pre_init_kb(void) { - setPinInputHigh(SPI_SS_PIN); + gpio_set_pin_input_high(SPI_SS_PIN); keyboard_pre_init_user(); } diff --git a/keyboards/handwired/lagrange/transport.c b/keyboards/handwired/lagrange/transport.c index ec91cff3068..3ff2e9f409e 100644 --- a/keyboards/handwired/lagrange/transport.c +++ b/keyboards/handwired/lagrange/transport.c @@ -53,7 +53,7 @@ bool shake_hands(bool master) { * alignment. */ if (master) { - writePinLow(SPI_SS_PIN); + gpio_write_pin_low(SPI_SS_PIN); } for (i = 0 ; i < 8 ; i += 1) { @@ -64,7 +64,7 @@ bool shake_hands(bool master) { } if (master) { - writePinHigh(SPI_SS_PIN); + gpio_write_pin_high(SPI_SS_PIN); } } while (i < 8); @@ -176,8 +176,8 @@ void transport_master_init(void) { * above depends on it and the SPI master driver won't do it * before we call spi_start(). */ - writePinHigh(SPI_SS_PIN); - setPinOutput(SPI_SS_PIN); + gpio_write_pin_high(SPI_SS_PIN); + gpio_set_pin_output(SPI_SS_PIN); spi_init(); @@ -195,10 +195,10 @@ void transport_slave_init(void) { * they're asserted making the MISO pin an output on both ends and * leading to potential shorts. */ - setPinInputHigh(SPI_SS_PIN); - setPinInput(SPI_SCK_PIN); - setPinInput(SPI_MOSI_PIN); - setPinOutput(SPI_MISO_PIN); + gpio_set_pin_input_high(SPI_SS_PIN); + gpio_set_pin_input(SPI_SCK_PIN); + gpio_set_pin_input(SPI_MOSI_PIN); + gpio_set_pin_output(SPI_MISO_PIN); SPCR = _BV(SPE); diff --git a/keyboards/handwired/owlet60/matrix.c b/keyboards/handwired/owlet60/matrix.c index b233dd7a526..43895468e9d 100644 --- a/keyboards/handwired/owlet60/matrix.c +++ b/keyboards/handwired/owlet60/matrix.c @@ -129,19 +129,19 @@ void matrix_print(void) // uses standard row code static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for(uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -149,10 +149,10 @@ static void init_pins(void) { // still need some fixing, this might not work unselect_rows(); // with the loop /* for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } */ - setPinInputHigh(dat_pin); + gpio_set_pin_input_high(dat_pin); } static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) @@ -173,7 +173,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) // Select the col pin to read (active low) select_col_analog(col_index); wait_us(30); - uint8_t pin_state = readPin(dat_pin); + uint8_t pin_state = gpio_read_pin(dat_pin); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index); @@ -201,8 +201,8 @@ void matrix_init(void) { matrix_init_kb(); - setPinInput(D5); - setPinInput(B0); + gpio_set_pin_input(D5); + gpio_set_pin_input(B0); } // modified for per col read matrix scan @@ -273,27 +273,27 @@ static void select_col_analog(uint8_t col) { static void mux_pin_control(const uint8_t binary[]) { // set pin0 - setPinOutput(col_select_pins[0]); + gpio_set_pin_output(col_select_pins[0]); if(binary[2] == 0) { - writePinLow(col_select_pins[0]); + gpio_write_pin_low(col_select_pins[0]); } else { - writePinHigh(col_select_pins[0]); + gpio_write_pin_high(col_select_pins[0]); } // set pin1 - setPinOutput(col_select_pins[1]); + gpio_set_pin_output(col_select_pins[1]); if(binary[1] == 0) { - writePinLow(col_select_pins[1]); + gpio_write_pin_low(col_select_pins[1]); } else { - writePinHigh(col_select_pins[1]); + gpio_write_pin_high(col_select_pins[1]); } // set pin2 - setPinOutput(col_select_pins[2]); + gpio_set_pin_output(col_select_pins[2]); if(binary[0] == 0) { - writePinLow(col_select_pins[2]); + gpio_write_pin_low(col_select_pins[2]); } else { - writePinHigh(col_select_pins[2]); + gpio_write_pin_high(col_select_pins[2]); } } diff --git a/keyboards/handwired/prime_exl_plus/prime_exl_plus.c b/keyboards/handwired/prime_exl_plus/prime_exl_plus.c index cc7f5de31ef..1865b6c5025 100644 --- a/keyboards/handwired/prime_exl_plus/prime_exl_plus.c +++ b/keyboards/handwired/prime_exl_plus/prime_exl_plus.c @@ -17,22 +17,22 @@ void matrix_init_kb(void) { // set CapsLock LED to output and low - setPinOutput(B0); - writePinLow(B0); + gpio_set_pin_output(B0); + gpio_write_pin_low(B0); // set NumLock LED to output and low - setPinOutput(B1); - writePinLow(B1); + gpio_set_pin_output(B1); + gpio_write_pin_low(B1); // set ScrollLock LED to output and low - setPinOutput(B2); - writePinLow(B2); + gpio_set_pin_output(B2); + gpio_write_pin_low(B2); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B1, led_state.num_lock); - writePin(B0, led_state.caps_lock); - //writePin(B2, led_state.scroll_lock); + gpio_write_pin(B1, led_state.num_lock); + gpio_write_pin(B0, led_state.caps_lock); + //gpio_write_pin(B2, led_state.scroll_lock); } return res; } @@ -41,9 +41,9 @@ bool led_update_kb(led_t led_state) { layer_state_t layer_state_set_kb(layer_state_t state) { if (get_highest_layer(state) == 1) { - writePinHigh(B2); + gpio_write_pin_high(B2); } else { - writePinLow(B2); + gpio_write_pin_low(B2); } return layer_state_set_user(state); } diff --git a/keyboards/handwired/retro_refit/retro_refit.c b/keyboards/handwired/retro_refit/retro_refit.c index f23ef1fd404..b62d94d7418 100644 --- a/keyboards/handwired/retro_refit/retro_refit.c +++ b/keyboards/handwired/retro_refit/retro_refit.c @@ -15,9 +15,9 @@ void matrix_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(D0, !led_state.caps_lock); - writePin(D1, !led_state.num_lock); - writePin(C6, !led_state.scroll_lock); + gpio_write_pin(D0, !led_state.caps_lock); + gpio_write_pin(D1, !led_state.num_lock); + gpio_write_pin(C6, !led_state.scroll_lock); } return res; diff --git a/keyboards/handwired/selene/selene.c b/keyboards/handwired/selene/selene.c index a3702ce02e3..b0924c06f49 100644 --- a/keyboards/handwired/selene/selene.c +++ b/keyboards/handwired/selene/selene.c @@ -18,9 +18,9 @@ #include "selene.h" void matrix_init_kb(void){ - setPinOutput(NUM_LOCK_PIN); - setPinOutput(CAPS_LOCK_PIN); - setPinOutput(SCROLL_LOCK_PIN); + gpio_set_pin_output(NUM_LOCK_PIN); + gpio_set_pin_output(CAPS_LOCK_PIN); + gpio_set_pin_output(SCROLL_LOCK_PIN); } void keyboard_post_init_user(void) { @@ -30,9 +30,9 @@ void keyboard_post_init_user(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(NUM_LOCK_PIN, led_state.num_lock); - writePin(CAPS_LOCK_PIN, led_state.caps_lock); - writePin(SCROLL_LOCK_PIN, led_state.scroll_lock); + gpio_write_pin(NUM_LOCK_PIN, led_state.num_lock); + gpio_write_pin(CAPS_LOCK_PIN, led_state.caps_lock); + gpio_write_pin(SCROLL_LOCK_PIN, led_state.scroll_lock); } return res; } diff --git a/keyboards/handwired/sono1/sono1.c b/keyboards/handwired/sono1/sono1.c index d19f188a191..449289a1e99 100644 --- a/keyboards/handwired/sono1/sono1.c +++ b/keyboards/handwired/sono1/sono1.c @@ -18,17 +18,17 @@ void matrix_init_kb(void) { /* LED pins setup */ - setPinOutput(LED_KANA_PIN); - setPinOutput(LED_CAPS_LOCK_PIN); - setPinOutput(LED_CTRL_XFER_PIN); - setPinOutput(LED_NUM_LOCK_PIN); - setPinOutput(LED_KB_LOCK_PIN); + gpio_set_pin_output(LED_KANA_PIN); + gpio_set_pin_output(LED_CAPS_LOCK_PIN); + gpio_set_pin_output(LED_CTRL_XFER_PIN); + gpio_set_pin_output(LED_NUM_LOCK_PIN); + gpio_set_pin_output(LED_KB_LOCK_PIN); - writePinHigh(LED_KANA_PIN); - writePinHigh(LED_CAPS_LOCK_PIN); - writePinHigh(LED_CTRL_XFER_PIN); - writePinHigh(LED_NUM_LOCK_PIN); - writePinHigh(LED_KB_LOCK_PIN); + gpio_write_pin_high(LED_KANA_PIN); + gpio_write_pin_high(LED_CAPS_LOCK_PIN); + gpio_write_pin_high(LED_CTRL_XFER_PIN); + gpio_write_pin_high(LED_NUM_LOCK_PIN); + gpio_write_pin_high(LED_KB_LOCK_PIN); matrix_init_user(); } @@ -36,9 +36,9 @@ void matrix_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(LED_NUM_LOCK_PIN, !led_state.num_lock); - writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); - writePin(LED_CTRL_XFER_PIN, !led_state.scroll_lock); + gpio_write_pin(LED_NUM_LOCK_PIN, !led_state.num_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); + gpio_write_pin(LED_CTRL_XFER_PIN, !led_state.scroll_lock); } return res; } diff --git a/keyboards/handwired/symmetric70_proto/debug_config.h b/keyboards/handwired/symmetric70_proto/debug_config.h index cba99e402fa..5a575eb479e 100644 --- a/keyboards/handwired/symmetric70_proto/debug_config.h +++ b/keyboards/handwired/symmetric70_proto/debug_config.h @@ -8,23 +8,23 @@ #include static inline void setDebugPinOutput_Low(void) { - setPinOutput(MATRIX_DEBUG_PIN); - writePinLow(MATRIX_DEBUG_PIN); + gpio_set_pin_output(MATRIX_DEBUG_PIN); + gpio_write_pin_low(MATRIX_DEBUG_PIN); } #define MATRIX_DEBUG_PIN_INIT() setDebugPinOutput_Low() #ifdef MATRIX_DEBUG_SCAN -# define MATRIX_DEBUG_SCAN_START() writePinHigh(MATRIX_DEBUG_PIN) -# define MATRIX_DEBUG_SCAN_END() writePinLow(MATRIX_DEBUG_PIN) +# define MATRIX_DEBUG_SCAN_START() gpio_write_pin_high(MATRIX_DEBUG_PIN) +# define MATRIX_DEBUG_SCAN_END() gpio_write_pin_low(MATRIX_DEBUG_PIN) #else # define MATRIX_DEBUG_SCAN_START() # define MATRIX_DEBUG_SCAN_END() #endif #ifdef MATRIX_DEBUG_DELAY -# define MATRIX_DEBUG_DELAY_START() writePinHigh(MATRIX_DEBUG_PIN) -# define MATRIX_DEBUG_DELAY_END() writePinLow(MATRIX_DEBUG_PIN) +# define MATRIX_DEBUG_DELAY_START() gpio_write_pin_high(MATRIX_DEBUG_PIN) +# define MATRIX_DEBUG_DELAY_END() gpio_write_pin_low(MATRIX_DEBUG_PIN) #else # define MATRIX_DEBUG_DELAY_START() # define MATRIX_DEBUG_DELAY_END() diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c index d6fcb0f7939..786c1b4a73b 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c +++ b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c @@ -62,13 +62,13 @@ extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { - ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); } + ATOMIC_BLOCK_FORCEON { gpio_set_pin_input_high(pin); } } // matrix code @@ -80,7 +80,7 @@ static void init_pins(void) { for (int col = 0; col < MATRIX_COLS; col++) { pin_t pin = direct_pins[row][col]; if (pin != NO_PIN) { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } } @@ -93,7 +93,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { pin_t pin = direct_pins[current_row][col_index]; if (pin != NO_PIN) { - current_row_value |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); + current_row_value |= gpio_read_pin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); } } @@ -120,8 +120,8 @@ static void unselect_rows(void) { static void init_pins(void) { # ifdef MATRIX_MUL_SELECT - setPinOutput(MATRIX_MUL_SELECT); - writePinLow(MATRIX_MUL_SELECT); + gpio_set_pin_output(MATRIX_MUL_SELECT); + gpio_write_pin_low(MATRIX_MUL_SELECT); # endif unselect_rows(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { @@ -141,10 +141,10 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) # ifdef MATRIX_MUL_SELECT - writePin(MATRIX_MUL_SELECT, col_sel[col_index]); + gpio_write_pin(MATRIX_MUL_SELECT, col_sel[col_index]); waitInputPinDelay(); # endif - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); @@ -160,7 +160,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) is_pressed = false; for (uint8_t i = 0; i < ARRAY_SIZE(delay_ports); i++) { # ifdef MATRIX_IO_DELAY_MULSEL - writePin(MATRIX_MUL_SELECT, delay_sel[i]); + gpio_write_pin(MATRIX_MUL_SELECT, delay_sel[i]); waitInputPinDelay(); # endif is_pressed |= ((readPort(delay_ports[i]) & delay_masks[i]) != delay_masks[i]); @@ -174,10 +174,10 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { MATRIX_DEBUG_DELAY_START(); # ifdef MATRIX_MUL_SELECT - writePin(MATRIX_MUL_SELECT, col_sel[col_index]); + gpio_write_pin(MATRIX_MUL_SELECT, col_sel[col_index]); waitInputPinDelay(); # endif - while (readPin(col_pins[col_index]) == 0) { + while (gpio_read_pin(col_pins[col_index]) == 0) { } MATRIX_DEBUG_DELAY_END(); } @@ -193,10 +193,10 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) MATRIX_DEBUG_DELAY_END(); MATRIX_DEBUG_DELAY_START(); # ifdef MATRIX_MUL_SELECT - writePin(MATRIX_MUL_SELECT, col_sel[col_index]); + gpio_write_pin(MATRIX_MUL_SELECT, col_sel[col_index]); waitInputPinDelay(); # endif - state |= (readPin(col_pins[col_index]) == 0); + state |= (gpio_read_pin(col_pins[col_index]) == 0); } MATRIX_DEBUG_DELAY_END(); } while (state); @@ -250,7 +250,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t current_row_value = last_row_value; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_row_value |= (MATRIX_ROW_SHIFTER << current_col); key_pressed = true; diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c index 202454a2215..25ecc668e57 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c @@ -51,9 +51,9 @@ static const pin_t sel_pins[] = { MATRIX_EXT_74HC15x }; LOCAL_FUNC ALWAYS_INLINE void select74HC15x(uint8_t devid); LOCAL_FUNC void select74HC15x(uint8_t devid) { - writePin(sel_pins[0], devid&1); + gpio_write_pin(sel_pins[0], devid&1); #if defined(MATRIX_EXTENSION_74HC153) - writePin(sel_pins[1], devid&2); + gpio_write_pin(sel_pins[1], devid&2); #endif } @@ -67,7 +67,7 @@ LOCAL_FUNC port_width_t readPortMultiplexer(uint8_t devid, pin_t port) { #define readMatrixPort(dev, port) \ ((dev) == MCU_GPIO)? readPort(port): (IS_74HC15x(dev))? readPortMultiplexer((dev)-MCU_GPIOa, port):0 -#define INIT_74HC15X(x) setPinOutput(x); writePinLow(x); +#define INIT_74HC15X(x) gpio_set_pin_output(x); gpio_write_pin_low(x); LOCAL_FUNC void init_74hc15x(void) { MAP(INIT_74HC15X, MATRIX_EXT_74HC15x) diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c index 24263fa832c..dbacb1685c4 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c @@ -16,10 +16,10 @@ #include "tractyl_manuform.h" -void keyboard_pre_init_sub(void) { setPinInputHigh(A0); } +void keyboard_pre_init_sub(void) { gpio_set_pin_input_high(A0); } void matrix_scan_sub_kb(void) { - if (!readPin(A0)) { + if (!gpio_read_pin(A0)) { reset_keyboard(); } } @@ -44,7 +44,7 @@ __attribute__((weak)) void bootmagic_scan(void) { } #endif - if (matrix_get_row(row) & (1 << col) || !readPin(A0)) { + if (matrix_get_row(row) & (1 << col) || !gpio_read_pin(A0)) { eeconfig_disable(); bootloader_jump(); } @@ -53,9 +53,9 @@ __attribute__((weak)) void bootmagic_scan(void) { #ifdef USB_VBUS_PIN bool usb_vbus_state(void) { - setPinInputLow(USB_VBUS_PIN); + gpio_set_pin_input_low(USB_VBUS_PIN); wait_us(5); - return readPin(USB_VBUS_PIN); + return gpio_read_pin(USB_VBUS_PIN); } #endif diff --git a/keyboards/handwired/traveller/traveller.c b/keyboards/handwired/traveller/traveller.c index 91c6f603b1a..f18a64ca869 100644 --- a/keyboards/handwired/traveller/traveller.c +++ b/keyboards/handwired/traveller/traveller.c @@ -11,8 +11,8 @@ void matrix_init_kb(void) { #endif // Turn status LED on - setPinOutput(C7); - writePinHigh(C7); + gpio_set_pin_output(C7); + gpio_write_pin_high(C7); matrix_init_user(); } diff --git a/keyboards/handwired/woodpad/woodpad.c b/keyboards/handwired/woodpad/woodpad.c index 71bc0ba71e8..92b3131e7bf 100644 --- a/keyboards/handwired/woodpad/woodpad.c +++ b/keyboards/handwired/woodpad/woodpad.c @@ -17,14 +17,14 @@ #include "woodpad.h" void keyboard_pre_init_kb(void) { - setPinOutput(F7); + gpio_set_pin_output(F7); keyboard_pre_init_user(); } inline void numlock_led_on(void) { - writePinHigh(F7); + gpio_write_pin_high(F7); } inline void numlock_led_off(void) { - writePinLow(F7); + gpio_write_pin_low(F7); } diff --git a/keyboards/handwired/z150/z150.c b/keyboards/handwired/z150/z150.c index a887a95bfd2..ab6709eed75 100644 --- a/keyboards/handwired/z150/z150.c +++ b/keyboards/handwired/z150/z150.c @@ -17,13 +17,13 @@ #include "quantum.h" void matrix_init_kb(void) { - setPinOutput(NUM_LOCK_LED_PIN); - setPinOutput(CAPS_LOCK_LED_PIN); - setPinOutput(SCROLL_LOCK_LED_PIN); + gpio_set_pin_output(NUM_LOCK_LED_PIN); + gpio_set_pin_output(CAPS_LOCK_LED_PIN); + gpio_set_pin_output(SCROLL_LOCK_LED_PIN); - writePinLow(NUM_LOCK_LED_PIN); - writePinLow(CAPS_LOCK_LED_PIN); - writePinLow(SCROLL_LOCK_LED_PIN); + gpio_write_pin_low(NUM_LOCK_LED_PIN); + gpio_write_pin_low(CAPS_LOCK_LED_PIN); + gpio_write_pin_low(SCROLL_LOCK_LED_PIN); matrix_init_user(); } @@ -31,9 +31,9 @@ void matrix_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(NUM_LOCK_LED_PIN, !led_state.num_lock); - writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock); - writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock); + gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock); + gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock); + gpio_write_pin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock); } return res; } diff --git a/keyboards/hardwareabstraction/handwire/handwire.c b/keyboards/hardwareabstraction/handwire/handwire.c index 4981e703e40..d5ebd6ac136 100644 --- a/keyboards/hardwareabstraction/handwire/handwire.c +++ b/keyboards/hardwareabstraction/handwire/handwire.c @@ -28,7 +28,7 @@ enum custom_keycodes{ // Documentation: custom_quantum_functions.md void keyboard_post_init_kb(void){ - setPinOutput(BUZZER_PIN); + gpio_set_pin_output(BUZZER_PIN); keyboard_post_init_user(); } @@ -36,7 +36,7 @@ void housekeeping_task_kb(void){ if(buzzer_on){ if(buzzer_active && timer_elapsed(buzzer_timer) > buzzer_dwell){ buzzer_active = false; - writePinLow(BUZZER_PIN); + gpio_write_pin_low(BUZZER_PIN); } } housekeeping_task_user(); @@ -50,7 +50,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { if(!buzzer_active){ buzzer_active = true; buzzer_timer = timer_read(); - writePinHigh(BUZZER_PIN); + gpio_write_pin_high(BUZZER_PIN); } } @@ -94,10 +94,10 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { if(buzzer_on == true){ buzzer_active = true; buzzer_timer = timer_read(); - writePinHigh(BUZZER_PIN); + gpio_write_pin_high(BUZZER_PIN); } else{ - writePinLow(BUZZER_PIN); + gpio_write_pin_low(BUZZER_PIN); } break; diff --git a/keyboards/hazel/bad_wings/matrix.c b/keyboards/hazel/bad_wings/matrix.c index 8a56a927c15..4a05e132f7b 100644 --- a/keyboards/hazel/bad_wings/matrix.c +++ b/keyboards/hazel/bad_wings/matrix.c @@ -48,11 +48,11 @@ bool sr_74hc595_spi_start(void) { bool sr_74hc595_spi_send_byte(uint8_t data) { sr_74hc595_spi_start(); - writePinLow(SHIFTREG_MATRIX_COL_CS); + gpio_write_pin_low(SHIFTREG_MATRIX_COL_CS); matrix_io_delay(); spi_write(data); matrix_io_delay(); - writePinHigh(SHIFTREG_MATRIX_COL_CS); + gpio_write_pin_high(SHIFTREG_MATRIX_COL_CS); sr_74hc595_spi_stop(); return true; } @@ -82,12 +82,12 @@ void matrix_init_custom(void) { // Set up the initial states for all the row pins for (int r = 0; r < SHIFTREG_ROWS; r++) { // Note: This needs to use the internal pull down resistors, and atmegas do *not* support that - setPinInputLow(rowPinsSR[r]); + gpio_set_pin_input_low(rowPinsSR[r]); } // Set the CS to low by default, and specify as an output pin - writePinHigh(SHIFTREG_MATRIX_COL_CS); // should be high when using SPI? - setPinOutput(SHIFTREG_MATRIX_COL_CS); + gpio_write_pin_high(SHIFTREG_MATRIX_COL_CS); // should be high when using SPI? + gpio_set_pin_output(SHIFTREG_MATRIX_COL_CS); // Since it's the init, deactivate all the columns. We'll activate once we get to the matrix scan clearColumns(); @@ -116,7 +116,7 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { matrix_io_delay(); for (int r = 0; r < SHIFTREG_ROWS; r++) { - current_matrix[r] |= ((readPin(rowPinsSR[r]) ? 1 : 0) << c); + current_matrix[r] |= ((gpio_read_pin(rowPinsSR[r]) ? 1 : 0) << c); } } diff --git a/keyboards/heliar/wm1_hotswap/wm1_hotswap.c b/keyboards/heliar/wm1_hotswap/wm1_hotswap.c index 846729a3f0a..d2d10b0b1f1 100644 --- a/keyboards/heliar/wm1_hotswap/wm1_hotswap.c +++ b/keyboards/heliar/wm1_hotswap/wm1_hotswap.c @@ -19,20 +19,20 @@ void keyboard_pre_init_kb(void) { - setPinOutput(D7); - writePinHigh(D7); - setPinOutput(D6); - writePinHigh(D6); - setPinOutput(D4); - writePinHigh(D4); + gpio_set_pin_output(D7); + gpio_write_pin_high(D7); + gpio_set_pin_output(D6); + gpio_write_pin_high(D6); + gpio_set_pin_output(D4); + gpio_write_pin_high(D4); } bool led_update_kb(led_t led_state) { if (led_update_user(led_state)){ - writePin(D7, !led_state.num_lock); - writePin(D6, !led_state.caps_lock); - writePin(D4, !led_state.scroll_lock); + gpio_write_pin(D7, !led_state.num_lock); + gpio_write_pin(D6, !led_state.caps_lock); + gpio_write_pin(D4, !led_state.scroll_lock); } return true; diff --git a/keyboards/hhkb/yang/matrix.c b/keyboards/hhkb/yang/matrix.c index c82c77bed34..d82aaf5a0c1 100644 --- a/keyboards/hhkb/yang/matrix.c +++ b/keyboards/hhkb/yang/matrix.c @@ -34,12 +34,12 @@ uint8_t power_save_level; static uint32_t matrix_last_modified = 0; -static inline void key_strobe_high(void) { writePinLow(B6); } -static inline void key_strobe_low(void) { writePinHigh(B6); } -static inline bool key_state(void) { return readPin(D7); } -static inline void key_prev_on(void) { writePinHigh(B7); } -static inline void key_prev_off(void) { writePinLow(B7); } -static inline bool key_power_state(void) { return !readPin(D6); } +static inline void key_strobe_high(void) { gpio_write_pin_low(B6); } +static inline void key_strobe_low(void) { gpio_write_pin_high(B6); } +static inline bool key_state(void) { return gpio_read_pin(D7); } +static inline void key_prev_on(void) { gpio_write_pin_high(B7); } +static inline void key_prev_off(void) { gpio_write_pin_low(B7); } +static inline bool key_power_state(void) { return !gpio_read_pin(D6); } static inline void suspend_power_down_longer(void) { uint8_t times = 60; @@ -52,8 +52,8 @@ void matrix_power_up(void) { DDRB = 0xFF; PORTB = 0x40; // switch MOS FET on - setPinOutput(D6); - writePinLow(D6); + gpio_set_pin_output(D6); + gpio_write_pin_low(D6); } void matrix_power_down(void) { @@ -62,8 +62,8 @@ void matrix_power_down(void) { DDRB = 0x00; PORTB = 0xFF; // switch MOS FET off - setPinOutput(D6); - writePinHigh(D6); + gpio_set_pin_output(D6); + gpio_write_pin_high(D6); } static inline void key_select_row(uint8_t row) { PORTB = (PORTB & 0b11111000) | ((row)&0b111); } diff --git a/keyboards/hhkb/yang/yang.c b/keyboards/hhkb/yang/yang.c index 548f0dd734b..3aba711b1f4 100644 --- a/keyboards/hhkb/yang/yang.c +++ b/keyboards/hhkb/yang/yang.c @@ -21,13 +21,13 @@ extern uint8_t power_save_level; void hhkb_led_on(uint8_t led) { switch (led) { case 1: - writePinHigh(F4); + gpio_write_pin_high(F4); break; case 2: - writePinHigh(F2); + gpio_write_pin_high(F2); break; case 3: - writePinHigh(F0); + gpio_write_pin_high(F0); break; } } @@ -35,55 +35,55 @@ void hhkb_led_on(uint8_t led) { void hhkb_led_off(uint8_t led) { switch (led) { case 1: - writePinLow(F4); + gpio_write_pin_low(F4); break; case 2: - writePinLow(F2); + gpio_write_pin_low(F2); break; case 3: - writePinLow(F0); + gpio_write_pin_low(F0); break; } } void keyboard_pre_init_kb(void) { // BT power up - setPinOutput(D5); - writePinLow(D5); + gpio_set_pin_output(D5); + gpio_write_pin_low(D5); // Row selectors - setPinOutput(B0); - setPinOutput(B1); - setPinOutput(B2); + gpio_set_pin_output(B0); + gpio_set_pin_output(B1); + gpio_set_pin_output(B2); // Col selectors - setPinOutput(B3); - setPinOutput(B4); - setPinOutput(B5); + gpio_set_pin_output(B3); + gpio_set_pin_output(B4); + gpio_set_pin_output(B5); // Key strobe - setPinOutput(B6); - writePinHigh(B6); + gpio_set_pin_output(B6); + gpio_write_pin_high(B6); // Key: input with pull-up - setPinInputHigh(D7); + gpio_set_pin_input_high(D7); // Unused pins on Pro2 ANSI // Input with pull up to save power - setPinInputHigh(C6); - setPinInputHigh(C7); + gpio_set_pin_input_high(C6); + gpio_set_pin_input_high(C7); // LED pin configuration - setPinOutput(F0); - setPinOutput(F1); - setPinOutput(F4); - writePinLow(F0); - writePinLow(F1); - writePinLow(F4); + gpio_set_pin_output(F0); + gpio_set_pin_output(F1); + gpio_set_pin_output(F4); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); + gpio_write_pin_low(F4); // Turn on switch PCB - setPinOutput(D6); - writePinLow(D6); + gpio_set_pin_output(D6); + gpio_write_pin_low(D6); keyboard_pre_init_user(); } @@ -93,7 +93,7 @@ void suspend_power_down_kb(void) { // Disable UART TX to avoid current leakage UCSR1B &= ~_BV(TXEN1); // Power down BLE module - writePinHigh(D5); + gpio_write_pin_high(D5); } suspend_power_down_user(); @@ -101,7 +101,7 @@ void suspend_power_down_kb(void) { void suspend_wakeup_init_kb(void) { // Power up BLE module - writePinLow(D5); + gpio_write_pin_low(D5); // Enable UART TX UCSR1B |= _BV(TXEN1); @@ -111,8 +111,8 @@ void suspend_wakeup_init_kb(void) { layer_state_t layer_state_set_kb(layer_state_t state) { state = layer_state_set_user(state); - writePin(F1, IS_LAYER_ON_STATE(state, 1)); - writePin(F0, IS_LAYER_ON_STATE(state, 2)); + gpio_write_pin(F1, IS_LAYER_ON_STATE(state, 1)); + gpio_write_pin(F0, IS_LAYER_ON_STATE(state, 2)); return state; } diff --git a/keyboards/hineybush/h10/h10.c b/keyboards/hineybush/h10/h10.c index 81f5bdfbf25..2170a8b2d7b 100644 --- a/keyboards/hineybush/h10/h10.c +++ b/keyboards/hineybush/h10/h10.c @@ -23,12 +23,12 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(F7); + gpio_set_pin_output(F7); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(F7, !led_state.num_lock); + gpio_write_pin(F7, !led_state.num_lock); } return true; } diff --git a/keyboards/hineybush/h60/h60.c b/keyboards/hineybush/h60/h60.c index 4373157996a..472b99d8ba1 100644 --- a/keyboards/hineybush/h60/h60.c +++ b/keyboards/hineybush/h60/h60.c @@ -19,12 +19,12 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(C6); + gpio_set_pin_output(C6); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(C6, !led_state.caps_lock); + gpio_write_pin(C6, !led_state.caps_lock); } return true; } diff --git a/keyboards/hineybush/h87a/h87a.c b/keyboards/hineybush/h87a/h87a.c index bf4213a2001..f2d0c62813e 100644 --- a/keyboards/hineybush/h87a/h87a.c +++ b/keyboards/hineybush/h87a/h87a.c @@ -18,15 +18,15 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(D5); - setPinOutput(E6); + gpio_set_pin_output(D5); + gpio_set_pin_output(E6); matrix_init_user(); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(D5, !led_state.caps_lock); - writePin(E6, !led_state.scroll_lock); + gpio_write_pin(D5, !led_state.caps_lock); + gpio_write_pin(E6, !led_state.scroll_lock); } return true; } diff --git a/keyboards/hineybush/h88/h88.c b/keyboards/hineybush/h88/h88.c index 9abeccd1d5c..a916609d75e 100644 --- a/keyboards/hineybush/h88/h88.c +++ b/keyboards/hineybush/h88/h88.c @@ -18,15 +18,15 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(D5); - setPinOutput(E6); + gpio_set_pin_output(D5); + gpio_set_pin_output(E6); matrix_init_user(); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(D5, !led_state.caps_lock); - writePin(E6, !led_state.scroll_lock); + gpio_write_pin(D5, !led_state.caps_lock); + gpio_write_pin(E6, !led_state.scroll_lock); } return true; } diff --git a/keyboards/hineybush/hbcp/matrix.c b/keyboards/hineybush/hbcp/matrix.c index 69ae6ab7b78..c4cfc9edb36 100644 --- a/keyboards/hineybush/hbcp/matrix.c +++ b/keyboards/hineybush/hbcp/matrix.c @@ -27,11 +27,11 @@ static matrix_row_t last_matrix[MATRIX_ROWS]; // raw values of last scan // matrix code void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } - void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); } + void unselect_row(uint8_t row) { gpio_set_pin_input_high(row_pins[row]); } bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) { // Store last value of row prior to reading @@ -47,7 +47,7 @@ static matrix_row_t last_matrix[MATRIX_ROWS]; // raw values of last scan // For each col... for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); @@ -60,11 +60,11 @@ static matrix_row_t last_matrix[MATRIX_ROWS]; // raw values of last scan } void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } - void unselect_col(uint8_t col) { setPinInputHigh(col_pins[col]); } + void unselect_col(uint8_t col) { gpio_set_pin_input_high(col_pins[col]); } bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { bool matrix_changed = false; @@ -79,7 +79,7 @@ static matrix_row_t last_matrix[MATRIX_ROWS]; // raw values of last scan matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col); } @@ -98,13 +98,13 @@ static matrix_row_t last_matrix[MATRIX_ROWS]; // raw values of last scan void unselect_rows(void) { for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } void unselect_cols(void) { for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } diff --git a/keyboards/hineybush/physix/physix.c b/keyboards/hineybush/physix/physix.c index c118b30d2e0..cd920a72b30 100644 --- a/keyboards/hineybush/physix/physix.c +++ b/keyboards/hineybush/physix/physix.c @@ -24,8 +24,8 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(D3); - setPinOutput(D5); + gpio_set_pin_output(D3); + gpio_set_pin_output(D5); matrix_init_user(); } @@ -33,13 +33,13 @@ bool led_update_kb(led_t led_state) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here bool res = led_update_user(led_state); if(res) { - // writePin sets the pin high for 1 and low for 0. + // gpio_write_pin sets the pin high for 1 and low for 0. // In this example the pins are inverted, setting // it low/0 turns it on, and high/1 turns the LED off. // This behavior depends on whether the LED is between the pin // and VCC or the pin and GND. - writePin(D3, led_state.caps_lock); - writePin(D5, led_state.scroll_lock); + gpio_write_pin(D3, led_state.caps_lock); + gpio_write_pin(D5, led_state.scroll_lock); } return res; return led_update_user(led_state); diff --git a/keyboards/ibm/model_m/ashpil_usbc/ashpil_usbc.c b/keyboards/ibm/model_m/ashpil_usbc/ashpil_usbc.c index 92b577635c8..8bdcfe070ae 100644 --- a/keyboards/ibm/model_m/ashpil_usbc/ashpil_usbc.c +++ b/keyboards/ibm/model_m/ashpil_usbc/ashpil_usbc.c @@ -18,19 +18,19 @@ void keyboard_pre_init_kb(void) { /* Setting status LEDs pins to output and +5V (off) */ - setPinOutput(D5); - setPinOutput(D6); - setPinOutput(D7); - writePinHigh(D5); - writePinHigh(D6); - writePinHigh(D7); + gpio_set_pin_output(D5); + gpio_set_pin_output(D6); + gpio_set_pin_output(D7); + gpio_write_pin_high(D5); + gpio_write_pin_high(D6); + gpio_write_pin_high(D7); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(D5, !led_state.num_lock); - writePin(D6, !led_state.caps_lock); - writePin(D7, !led_state.scroll_lock); + gpio_write_pin(D5, !led_state.num_lock); + gpio_write_pin(D6, !led_state.caps_lock); + gpio_write_pin(D7, !led_state.scroll_lock); } return true; } diff --git a/keyboards/ibm/model_m/modelh/modelh.c b/keyboards/ibm/model_m/modelh/modelh.c index 5384b373385..4bf3d12e6a3 100644 --- a/keyboards/ibm/model_m/modelh/modelh.c +++ b/keyboards/ibm/model_m/modelh/modelh.c @@ -18,8 +18,8 @@ void keyboard_pre_init_kb(void) { - setPinOutput(MODELH_STATUS_LED); - writePin(MODELH_STATUS_LED, 0); + gpio_set_pin_output(MODELH_STATUS_LED); + gpio_write_pin(MODELH_STATUS_LED, 0); keyboard_pre_init_user(); } diff --git a/keyboards/ibm/model_m/mschwingen/matrix.c b/keyboards/ibm/model_m/mschwingen/matrix.c index 85df5e5d6fa..ae032a00a01 100644 --- a/keyboards/ibm/model_m/mschwingen/matrix.c +++ b/keyboards/ibm/model_m/mschwingen/matrix.c @@ -31,15 +31,15 @@ static uint16_t row_bits[MATRIX_ROWS] = { static const pin_t col_pins[MATRIX_COLS] = {D1, D4, D7, B4, F7, F6, F5, F4}; static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } -static void unselect_col(uint8_t col) { setPinInputHigh(col_pins[col]); } +static void unselect_col(uint8_t col) { gpio_set_pin_input_high(col_pins[col]); } static void unselect_cols(void) { for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -51,8 +51,8 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) select_col(current_col); matrix_io_delay(); - writePinLow(SR_LOAD_PIN); - writePinHigh(SR_LOAD_PIN); + gpio_write_pin_low(SR_LOAD_PIN); + gpio_write_pin_high(SR_LOAD_PIN); row_data = spi_read() << 8; row_data |= spi_read(); diff --git a/keyboards/ibm/model_m/mschwingen/mschwingen.c b/keyboards/ibm/model_m/mschwingen/mschwingen.c index 6a8a0ec8fcd..7112ab63a57 100644 --- a/keyboards/ibm/model_m/mschwingen/mschwingen.c +++ b/keyboards/ibm/model_m/mschwingen/mschwingen.c @@ -74,12 +74,12 @@ void sleep_led_toggle(void) {} void sleep_led_disable(void) { suspend_active = false; - writePinHigh(MODELM_STATUS_LED); + gpio_write_pin_high(MODELM_STATUS_LED); } void sleep_led_enable(void) { suspend_active = true; - writePinLow(MODELM_STATUS_LED); + gpio_write_pin_low(MODELM_STATUS_LED); #ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812 led[0] = black; led[1] = black; @@ -94,15 +94,15 @@ void keyboard_pre_init_kb(void) { ws2812_setleds(led, RGBLIGHT_LED_COUNT); #else /* Set status LEDs pins to output and Low (on) */ - setPinOutput(MODELM_LED_CAPSLOCK); - setPinOutput(MODELM_LED_SCROLLOCK); - setPinOutput(MODELM_LED_NUMLOCK); - writePinLow(MODELM_LED_CAPSLOCK); - writePinLow(MODELM_LED_SCROLLOCK); - writePinLow(MODELM_LED_NUMLOCK); + gpio_set_pin_output(MODELM_LED_CAPSLOCK); + gpio_set_pin_output(MODELM_LED_SCROLLOCK); + gpio_set_pin_output(MODELM_LED_NUMLOCK); + gpio_write_pin_low(MODELM_LED_CAPSLOCK); + gpio_write_pin_low(MODELM_LED_SCROLLOCK); + gpio_write_pin_low(MODELM_LED_NUMLOCK); #endif - setPinOutput(MODELM_STATUS_LED); - writePinHigh(MODELM_STATUS_LED); + gpio_set_pin_output(MODELM_STATUS_LED); + gpio_write_pin_high(MODELM_STATUS_LED); _delay_ms(50); #ifdef UART_DEBUG uart_init(115200); @@ -110,10 +110,10 @@ void keyboard_pre_init_kb(void) { uprintf("\r\nHello world!\r\n"); #endif - setPinOutput(SR_LOAD_PIN); - setPinOutput(SR_CLK_PIN); - setPinOutput(SR_DOUT_PIN); // MOSI - unused - writePinLow(SR_CLK_PIN); + gpio_set_pin_output(SR_LOAD_PIN); + gpio_set_pin_output(SR_CLK_PIN); + gpio_set_pin_output(SR_DOUT_PIN); // MOSI - unused + gpio_write_pin_low(SR_CLK_PIN); } #ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812 @@ -187,9 +187,9 @@ bool led_update_kb(led_t led_state) { dprintf("LED Update: %d %d %d", led_state.num_lock, led_state.caps_lock, led_state.scroll_lock); if (led_update_user(led_state)) { - if (!isRecording) writePin(MODELM_LED_NUMLOCK, !led_state.num_lock); - writePin(MODELM_LED_CAPSLOCK, !led_state.caps_lock); - writePin(MODELM_LED_SCROLLOCK, !led_state.scroll_lock); + if (!isRecording) gpio_write_pin(MODELM_LED_NUMLOCK, !led_state.num_lock); + gpio_write_pin(MODELM_LED_CAPSLOCK, !led_state.caps_lock); + gpio_write_pin(MODELM_LED_SCROLLOCK, !led_state.scroll_lock); } return true; } @@ -198,7 +198,7 @@ void update_layer_leds(void) { if (isRecording && timer_elapsed(blink_cycle_timer) > 150) { blink_state = !blink_state; blink_cycle_timer = timer_read(); - writePin(MODELM_LED_NUMLOCK, blink_state); + gpio_write_pin(MODELM_LED_NUMLOCK, blink_state); } } diff --git a/keyboards/ibm/model_m/teensypp/teensypp.c b/keyboards/ibm/model_m/teensypp/teensypp.c index fa8669dc810..aac85424bf7 100644 --- a/keyboards/ibm/model_m/teensypp/teensypp.c +++ b/keyboards/ibm/model_m/teensypp/teensypp.c @@ -17,20 +17,20 @@ void led_init_ports(void) { /* Setting status LEDs pins to output and +5V (off) */ - setPinOutput(B4); - setPinOutput(B5); - setPinOutput(B6); - writePinHigh(B4); - writePinHigh(B5); - writePinHigh(B6); + gpio_set_pin_output(B4); + gpio_set_pin_output(B5); + gpio_set_pin_output(B6); + gpio_write_pin_high(B4); + gpio_write_pin_high(B5); + gpio_write_pin_high(B6); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B4, !led_state.num_lock); - writePin(B6, !led_state.caps_lock); - writePin(B5, !led_state.scroll_lock); + gpio_write_pin(B4, !led_state.num_lock); + gpio_write_pin(B6, !led_state.caps_lock); + gpio_write_pin(B5, !led_state.scroll_lock); } return res; } diff --git a/keyboards/ibm/model_m/yugo_m/yugo_m.c b/keyboards/ibm/model_m/yugo_m/yugo_m.c index 542043d5dc6..a725a3657bc 100644 --- a/keyboards/ibm/model_m/yugo_m/yugo_m.c +++ b/keyboards/ibm/model_m/yugo_m/yugo_m.c @@ -17,9 +17,9 @@ void keyboard_pre_init_kb(void) { // Set our LED pins as output - setPinOutput(A2); - setPinOutput(A1); - setPinOutput(A0); + gpio_set_pin_output(A2); + gpio_set_pin_output(A1); + gpio_set_pin_output(A0); keyboard_pre_init_user(); } @@ -27,9 +27,9 @@ void keyboard_pre_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(A2, !led_state.num_lock); - writePin(A1, !led_state.caps_lock); - writePin(A0, !led_state.scroll_lock); + gpio_write_pin(A2, !led_state.num_lock); + gpio_write_pin(A1, !led_state.caps_lock); + gpio_write_pin(A0, !led_state.scroll_lock); } return res; } diff --git a/keyboards/idb/idb_60/idb_60.c b/keyboards/idb/idb_60/idb_60.c index 1ca4b8796f5..77485a42734 100644 --- a/keyboards/idb/idb_60/idb_60.c +++ b/keyboards/idb/idb_60/idb_60.c @@ -1,24 +1,24 @@ #include "idb_60.h" void keyboard_pre_init_kb(void) { - setPinOutput(C4); - setPinOutput(C5); + gpio_set_pin_output(C4); + gpio_set_pin_output(C5); } inline void _idb_60_caps_led_on(void) { - writePinLow(C5); + gpio_write_pin_low(C5); } inline void _idb_60_fn_led_on(void) { - writePinLow(C4); + gpio_write_pin_low(C4); } inline void _idb_60_caps_led_off(void) { - writePinHigh(C5); + gpio_write_pin_high(C5); } inline void _idb_60_fn_led_off(void) { - writePinHigh(C4); + gpio_write_pin_high(C4); } // Capslock LED indicator diff --git a/keyboards/ilumkb/volcano660/volcano660.c b/keyboards/ilumkb/volcano660/volcano660.c index d6c004987e5..5e6d67c9ba9 100644 --- a/keyboards/ilumkb/volcano660/volcano660.c +++ b/keyboards/ilumkb/volcano660/volcano660.c @@ -16,18 +16,18 @@ #include "quantum.h" void matrix_init_kb(void) { - setPinOutput(D0); - setPinOutput(D1); - setPinOutput(D2); + gpio_set_pin_output(D0); + gpio_set_pin_output(D1); + gpio_set_pin_output(D2); matrix_init_user(); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(D0, !led_state.num_lock); - writePin(D2, !led_state.caps_lock); - writePin(D1, !led_state.scroll_lock); + gpio_write_pin(D0, !led_state.num_lock); + gpio_write_pin(D2, !led_state.caps_lock); + gpio_write_pin(D1, !led_state.scroll_lock); } return res; diff --git a/keyboards/ingrained/matrix.c b/keyboards/ingrained/matrix.c index 3ba9d8dcf3b..92b024cdc2c 100644 --- a/keyboards/ingrained/matrix.c +++ b/keyboards/ingrained/matrix.c @@ -180,8 +180,8 @@ static void init_cols(void) { pin_t matrix_col_pins_mcu[MATRIX_COLS_PER_SIDE] = MATRIX_COL_PINS_MCU; for (int pin_index = 0; pin_index < MATRIX_COLS_PER_SIDE; pin_index++) { pin_t pin = matrix_col_pins_mcu[pin_index]; - setPinInput(pin); - writePinHigh(pin); + gpio_set_pin_input(pin); + gpio_write_pin_high(pin); } } @@ -192,7 +192,7 @@ static matrix_row_t read_cols(uint8_t row) { // For each col... for (uint8_t col_index = 0; col_index < MATRIX_COLS_PER_SIDE; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(matrix_col_pins_mcu[col_index]); + uint8_t pin_state = gpio_read_pin(matrix_col_pins_mcu[col_index]); // Populate the matrix row with the state of the col pin current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); @@ -227,8 +227,8 @@ static void unselect_rows(void) { pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_MCU; for (int pin_index = 0; pin_index < MATRIX_ROWS_PER_SIDE; pin_index++) { pin_t pin = matrix_row_pins_mcu[pin_index]; - setPinInput(pin); - writePinLow(pin); + gpio_set_pin_input(pin); + gpio_write_pin_low(pin); } } @@ -237,8 +237,8 @@ static void select_row(uint8_t row) { // select on atmega32u4 pin_t matrix_row_pins_mcu[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS_MCU; pin_t pin = matrix_row_pins_mcu[row]; - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } else { // select on mcp23017 if (mcp23017_status) { // if there was an error diff --git a/keyboards/input_club/k_type/is31fl3733-dual.c b/keyboards/input_club/k_type/is31fl3733-dual.c index 9e1e6b57f76..fab898dce43 100644 --- a/keyboards/input_club/k_type/is31fl3733-dual.c +++ b/keyboards/input_club/k_type/is31fl3733-dual.c @@ -128,8 +128,8 @@ void is31fl3733_write_pwm_buffer(uint8_t bus, uint8_t index) { void is31fl3733_init_drivers(void) { #if defined(IS31FL3733_SDB_PIN) - setPinOutput(IS31FL3733_SDB_PIN); - writePinHigh(IS31FL3733_SDB_PIN); + gpio_set_pin_output(IS31FL3733_SDB_PIN); + gpio_write_pin_high(IS31FL3733_SDB_PIN); #endif i2c_init(&I2CD1, I2C1_SCL_PIN, I2C1_SDA_PIN); diff --git a/keyboards/jae/j01/j01.c b/keyboards/jae/j01/j01.c index 95f3e9b042b..4d3f8ced46c 100644 --- a/keyboards/jae/j01/j01.c +++ b/keyboards/jae/j01/j01.c @@ -26,12 +26,12 @@ void matrix_init_kb(void) { // runs once when the firmware starts up matrix_init_user(); - setPinOutput(E6); + gpio_set_pin_output(E6); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(E6, !led_state.caps_lock); + gpio_write_pin(E6, !led_state.caps_lock); } return true; diff --git a/keyboards/jels/jels88/jels88.c b/keyboards/jels/jels88/jels88.c index 8e9c12aced3..ceb187ab176 100644 --- a/keyboards/jels/jels88/jels88.c +++ b/keyboards/jels/jels88/jels88.c @@ -23,16 +23,16 @@ #define SCROLL_LED D4 void keyboard_pre_init_kb(void) { - setPinOutput(CAPS_LED); - setPinOutput(SCROLL_LED); + gpio_set_pin_output(CAPS_LED); + gpio_set_pin_output(SCROLL_LED); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - writePin(CAPS_LED, led_state.caps_lock); - writePin(SCROLL_LED, led_state.scroll_lock); + gpio_write_pin(CAPS_LED, led_state.caps_lock); + gpio_write_pin(SCROLL_LED, led_state.scroll_lock); } return res; } diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h index 7df400367fc..48d76bd8a3a 100644 --- a/keyboards/jian/nsrev2/config.h +++ b/keyboards/jian/nsrev2/config.h @@ -57,33 +57,33 @@ along with this program. If not, see . // (Doesn't work on mac. There is no num lock, so it will be always off and lit) #ifdef NUM_NMOSFET -#define RESET_NUM_LOCK_LED() writePinLow(NUM_LOCK_LED_PIN) +#define RESET_NUM_LOCK_LED() gpio_write_pin_low(NUM_LOCK_LED_PIN) #ifdef NUM_INVERT -#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, !led_state.num_lock) +#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock) #else -#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, led_state.num_lock) +#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, led_state.num_lock) #endif // NUM_INVERT #else -#define RESET_NUM_LOCK_LED() writePinHigh(NUM_LOCK_LED_PIN) +#define RESET_NUM_LOCK_LED() gpio_write_pin_high(NUM_LOCK_LED_PIN) #ifdef NUM_INVERT -#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, led_state.num_lock) +#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, led_state.num_lock) #else -#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, !led_state.num_lock) +#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock) #endif // NUM_INVERT #endif // NUM_NMOSFET #ifdef CAPS_NMOSFET -#define RESET_CAPS_LOCK_LED() writePinLow(CAPS_LOCK_LED_PIN) -#define UPDATE_CAPS_LOCK_LED() writePin(CAPS_LOCK_LED_PIN, led_state.caps_lock) +#define RESET_CAPS_LOCK_LED() gpio_write_pin_low(CAPS_LOCK_LED_PIN) +#define UPDATE_CAPS_LOCK_LED() gpio_write_pin(CAPS_LOCK_LED_PIN, led_state.caps_lock) #else -#define RESET_CAPS_LOCK_LED() writePinHigh(CAPS_LOCK_LED_PIN) -#define UPDATE_CAPS_LOCK_LED() writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock) +#define RESET_CAPS_LOCK_LED() gpio_write_pin_high(CAPS_LOCK_LED_PIN) +#define UPDATE_CAPS_LOCK_LED() gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock) #endif // CAPS_NMOSFET #ifdef SCROLL_NMOSFET -#define RESET_SCROLL_LOCK_LED() writePinLow(SCROLL_LOCK_LED_PIN) -#define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock) +#define RESET_SCROLL_LOCK_LED() gpio_write_pin_low(SCROLL_LOCK_LED_PIN) +#define UPDATE_SCROLL_LOCK_LED() gpio_write_pin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock) #else -#define RESET_SCROLL_LOCK_LED() writePinHigh(SCROLL_LOCK_LED_PIN) -#define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock) +#define RESET_SCROLL_LOCK_LED() gpio_write_pin_high(SCROLL_LOCK_LED_PIN) +#define UPDATE_SCROLL_LOCK_LED() gpio_write_pin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock) #endif // SCROLL_NMOSFET diff --git a/keyboards/jian/nsrev2/nsrev2.c b/keyboards/jian/nsrev2/nsrev2.c index 1b65d4f0166..50883ff211b 100644 --- a/keyboards/jian/nsrev2/nsrev2.c +++ b/keyboards/jian/nsrev2/nsrev2.c @@ -36,15 +36,15 @@ void suspend_wakeup_init_kb(void) { void led_init_kb(void) { #ifdef NUM_LOCK_LED_PIN - setPinOutput(NUM_LOCK_LED_PIN); + gpio_set_pin_output(NUM_LOCK_LED_PIN); RESET_NUM_LOCK_LED(); #endif // NUM_LOCK_LED_PIN #ifdef CAPS_LOCK_LED_PIN - setPinOutput(CAPS_LOCK_LED_PIN); + gpio_set_pin_output(CAPS_LOCK_LED_PIN); RESET_CAPS_LOCK_LED(); #endif // CAPS_LOCK_LED_PIN #ifdef SCROLL_LOCK_LED_PIN - setPinOutput(SCROLL_LOCK_LED_PIN); + gpio_set_pin_output(SCROLL_LOCK_LED_PIN); RESET_SCROLL_LOCK_LED(); #endif // SCROLL_LOCK_LED_PIN } diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h index fcdf59f0446..7ee2effd511 100644 --- a/keyboards/jian/rev1/config.h +++ b/keyboards/jian/rev1/config.h @@ -39,35 +39,35 @@ along with this program. If not, see . // (Doesn't work on mac. There is no num lock, so it will be always off and lit) #ifdef NUM_NMOSFET -#define RESET_NUM_LOCK_LED() writePinLow(NUM_LOCK_LED_PIN) +#define RESET_NUM_LOCK_LED() gpio_write_pin_low(NUM_LOCK_LED_PIN) #ifdef NUM_INVERT -#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, !led_state.num_lock) +#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock) #else -#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, led_state.num_lock) +#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, led_state.num_lock) #endif // NUM_INVERT #else -#define RESET_NUM_LOCK_LED() writePinHigh(NUM_LOCK_LED_PIN) +#define RESET_NUM_LOCK_LED() gpio_write_pin_high(NUM_LOCK_LED_PIN) #ifdef NUM_INVERT -#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, led_state.num_lock) +#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, led_state.num_lock) #else -#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, !led_state.num_lock) +#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock) #endif // NUM_INVERT #endif // NUM_NMOSFET #ifdef CAPS_NMOSFET -#define RESET_CAPS_LOCK_LED() writePinLow(CAPS_LOCK_LED_PIN) -#define UPDATE_CAPS_LOCK_LED() writePin(CAPS_LOCK_LED_PIN, led_state.caps_lock) +#define RESET_CAPS_LOCK_LED() gpio_write_pin_low(CAPS_LOCK_LED_PIN) +#define UPDATE_CAPS_LOCK_LED() gpio_write_pin(CAPS_LOCK_LED_PIN, led_state.caps_lock) #else -#define RESET_CAPS_LOCK_LED() writePinHigh(CAPS_LOCK_LED_PIN) -#define UPDATE_CAPS_LOCK_LED() writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock) +#define RESET_CAPS_LOCK_LED() gpio_write_pin_high(CAPS_LOCK_LED_PIN) +#define UPDATE_CAPS_LOCK_LED() gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock) #endif // CAPS_NMOSFET #ifdef SCROLL_NMOSFET -#define RESET_SCROLL_LOCK_LED() writePinLow(SCROLL_LOCK_LED_PIN) -#define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock) +#define RESET_SCROLL_LOCK_LED() gpio_write_pin_low(SCROLL_LOCK_LED_PIN) +#define UPDATE_SCROLL_LOCK_LED() gpio_write_pin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock) #else -#define RESET_SCROLL_LOCK_LED() writePinHigh(SCROLL_LOCK_LED_PIN) -#define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock) +#define RESET_SCROLL_LOCK_LED() gpio_write_pin_high(SCROLL_LOCK_LED_PIN) +#define UPDATE_SCROLL_LOCK_LED() gpio_write_pin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock) #endif // SCROLL_NMOSFET #define RGBLIGHT_TIMER diff --git a/keyboards/jian/rev1/rev1.c b/keyboards/jian/rev1/rev1.c index 1b77aa53c41..1563c40916c 100644 --- a/keyboards/jian/rev1/rev1.c +++ b/keyboards/jian/rev1/rev1.c @@ -36,15 +36,15 @@ void suspend_wakeup_init_kb(void) { void led_init_kb(void) { #ifdef NUM_LOCK_LED_PIN - setPinOutput(NUM_LOCK_LED_PIN); + gpio_set_pin_output(NUM_LOCK_LED_PIN); RESET_NUM_LOCK_LED(); #endif // NUM_LOCK_LED_PIN #ifdef CAPS_LOCK_LED_PIN - setPinOutput(CAPS_LOCK_LED_PIN); + gpio_set_pin_output(CAPS_LOCK_LED_PIN); RESET_CAPS_LOCK_LED(); #endif // CAPS_LOCK_LED_PIN #ifdef SCROLL_LOCK_LED_PIN - setPinOutput(SCROLL_LOCK_LED_PIN); + gpio_set_pin_output(SCROLL_LOCK_LED_PIN); RESET_SCROLL_LOCK_LED(); #endif // SCROLL_LOCK_LED_PIN } diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h index 091605665e6..33ba0ecbc50 100644 --- a/keyboards/jian/rev2/config.h +++ b/keyboards/jian/rev2/config.h @@ -45,33 +45,33 @@ along with this program. If not, see . // (Doesn't work on mac. There is no num lock, so it will be always off and lit) #ifdef NUM_NMOSFET -#define RESET_NUM_LOCK_LED() writePinLow(NUM_LOCK_LED_PIN) +#define RESET_NUM_LOCK_LED() gpio_write_pin_low(NUM_LOCK_LED_PIN) #ifdef NUM_INVERT -#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, !led_state.num_lock) +#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock) #else -#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, led_state.num_lock) +#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, led_state.num_lock) #endif // NUM_INVERT #else -#define RESET_NUM_LOCK_LED() writePinHigh(NUM_LOCK_LED_PIN) +#define RESET_NUM_LOCK_LED() gpio_write_pin_high(NUM_LOCK_LED_PIN) #ifdef NUM_INVERT -#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, led_state.num_lock) +#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, led_state.num_lock) #else -#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, !led_state.num_lock) +#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock) #endif // NUM_INVERT #endif // NUM_NMOSFET #ifdef CAPS_NMOSFET -#define RESET_CAPS_LOCK_LED() writePinLow(CAPS_LOCK_LED_PIN) -#define UPDATE_CAPS_LOCK_LED() writePin(CAPS_LOCK_LED_PIN, led_state.caps_lock) +#define RESET_CAPS_LOCK_LED() gpio_write_pin_low(CAPS_LOCK_LED_PIN) +#define UPDATE_CAPS_LOCK_LED() gpio_write_pin(CAPS_LOCK_LED_PIN, led_state.caps_lock) #else -#define RESET_CAPS_LOCK_LED() writePinHigh(CAPS_LOCK_LED_PIN) -#define UPDATE_CAPS_LOCK_LED() writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock) +#define RESET_CAPS_LOCK_LED() gpio_write_pin_high(CAPS_LOCK_LED_PIN) +#define UPDATE_CAPS_LOCK_LED() gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock) #endif // CAPS_NMOSFET #ifdef SCROLL_NMOSFET -#define RESET_SCROLL_LOCK_LED() writePinLow(SCROLL_LOCK_LED_PIN) -#define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock) +#define RESET_SCROLL_LOCK_LED() gpio_write_pin_low(SCROLL_LOCK_LED_PIN) +#define UPDATE_SCROLL_LOCK_LED() gpio_write_pin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock) #else -#define RESET_SCROLL_LOCK_LED() writePinHigh(SCROLL_LOCK_LED_PIN) -#define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock) +#define RESET_SCROLL_LOCK_LED() gpio_write_pin_high(SCROLL_LOCK_LED_PIN) +#define UPDATE_SCROLL_LOCK_LED() gpio_write_pin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock) #endif // SCROLL_NMOSFET diff --git a/keyboards/jian/rev2/rev2.c b/keyboards/jian/rev2/rev2.c index 1b65d4f0166..50883ff211b 100644 --- a/keyboards/jian/rev2/rev2.c +++ b/keyboards/jian/rev2/rev2.c @@ -36,15 +36,15 @@ void suspend_wakeup_init_kb(void) { void led_init_kb(void) { #ifdef NUM_LOCK_LED_PIN - setPinOutput(NUM_LOCK_LED_PIN); + gpio_set_pin_output(NUM_LOCK_LED_PIN); RESET_NUM_LOCK_LED(); #endif // NUM_LOCK_LED_PIN #ifdef CAPS_LOCK_LED_PIN - setPinOutput(CAPS_LOCK_LED_PIN); + gpio_set_pin_output(CAPS_LOCK_LED_PIN); RESET_CAPS_LOCK_LED(); #endif // CAPS_LOCK_LED_PIN #ifdef SCROLL_LOCK_LED_PIN - setPinOutput(SCROLL_LOCK_LED_PIN); + gpio_set_pin_output(SCROLL_LOCK_LED_PIN); RESET_SCROLL_LOCK_LED(); #endif // SCROLL_LOCK_LED_PIN } diff --git a/keyboards/jones/v03/matrix.c b/keyboards/jones/v03/matrix.c index 445c1acdc07..5663f1a8fcc 100644 --- a/keyboards/jones/v03/matrix.c +++ b/keyboards/jones/v03/matrix.c @@ -22,24 +22,24 @@ static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void init_pins(void) { unselect_rows(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -60,7 +60,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) // skip reading when index equals (= pin itself) if (col_index != current_row) { // Check col pin pin_state - if (readPin(col_pins[col_index]) == 0) { + if (gpio_read_pin(col_pins[col_index]) == 0) { // Pin LO, set col bit current_matrix[current_row] |= (ROW_SHIFTER << col_index); } else { diff --git a/keyboards/jones/v03_1/matrix.c b/keyboards/jones/v03_1/matrix.c index 445c1acdc07..5663f1a8fcc 100644 --- a/keyboards/jones/v03_1/matrix.c +++ b/keyboards/jones/v03_1/matrix.c @@ -22,24 +22,24 @@ static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void init_pins(void) { unselect_rows(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -60,7 +60,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) // skip reading when index equals (= pin itself) if (col_index != current_row) { // Check col pin pin_state - if (readPin(col_pins[col_index]) == 0) { + if (gpio_read_pin(col_pins[col_index]) == 0) { // Pin LO, set col bit current_matrix[current_row] |= (ROW_SHIFTER << col_index); } else { diff --git a/keyboards/joshajohnson/hub16/matrix.c b/keyboards/joshajohnson/hub16/matrix.c index 0fe1d41dad8..26222cf15ac 100644 --- a/keyboards/joshajohnson/hub16/matrix.c +++ b/keyboards/joshajohnson/hub16/matrix.c @@ -31,22 +31,22 @@ extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } -static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); } +static void unselect_row(uint8_t row) { gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void init_pins(void) { unselect_rows(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -64,7 +64,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) // For each col... for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); @@ -79,8 +79,8 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) void matrix_init_custom(void) { // initialize key pins - setPinInput(SWITCH_1); - setPinInput(SWITCH_2); + gpio_set_pin_input(SWITCH_1); + gpio_set_pin_input(SWITCH_2); init_pins(); } @@ -112,8 +112,8 @@ static bool read_encoder_switches(matrix_row_t current_matrix[], uint8_t current bool btn_2_rise = 0; btn_1_array <<= 1; btn_2_array <<= 1; - btn_1_array |= readPin(SWITCH_1); - btn_2_array |= readPin(SWITCH_2); + btn_1_array |= gpio_read_pin(SWITCH_1); + btn_2_array |= gpio_read_pin(SWITCH_2); (btn_1_array == 0b01111111) ? (btn_1_rise = 1) : (btn_1_rise = 0); (btn_2_array == 0b01111111) ? (btn_2_rise = 1) : (btn_2_rise = 0); diff --git a/keyboards/jukaie/jk01/jk01.c b/keyboards/jukaie/jk01/jk01.c index 913e77a55e7..3c6daabf027 100644 --- a/keyboards/jukaie/jk01/jk01.c +++ b/keyboards/jukaie/jk01/jk01.c @@ -132,9 +132,9 @@ void spi_init(void) { is_initialised = true; // Try releasing special pins for a short time - setPinInput(SPI_SCK_PIN); - setPinInput(SPI_MOSI_PIN); - setPinInput(SPI_MISO_PIN); + gpio_set_pin_input(SPI_SCK_PIN); + gpio_set_pin_input(SPI_MOSI_PIN); + gpio_set_pin_input(SPI_MISO_PIN); chThdSleepMilliseconds(10); @@ -147,12 +147,12 @@ void spi_init(void) { #endif void keyboard_pre_init_kb(void) { - setPinOutput(C0); - setPinOutput(C15); + gpio_set_pin_output(C0); + gpio_set_pin_output(C15); keyboard_pre_init_user(); }; void housekeeping_task_kb(void) { - writePin(C15, keymap_config.no_gui); + gpio_write_pin(C15, keymap_config.no_gui); }; bool process_record_user(uint16_t keycode, keyrecord_t *record) { diff --git a/keyboards/kabedon/kabedon980/kabedon980.c b/keyboards/kabedon/kabedon980/kabedon980.c index 0614972f5e0..7024a2eaa99 100644 --- a/keyboards/kabedon/kabedon980/kabedon980.c +++ b/keyboards/kabedon/kabedon980/kabedon980.c @@ -2,7 +2,7 @@ bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { - writePin(E6, !led_state.caps_lock); + gpio_write_pin(E6, !led_state.caps_lock); } return true; } diff --git a/keyboards/kagizaraya/chidori/board.c b/keyboards/kagizaraya/chidori/board.c index 2834f7625b8..07bdcf165e2 100644 --- a/keyboards/kagizaraya/chidori/board.c +++ b/keyboards/kagizaraya/chidori/board.c @@ -60,8 +60,8 @@ static board_interface_t* get_interface(board_info_t* board) { static void board_set_master_led(board_info_t* board, uint8_t led_index, bool status) { pin_t pin = board->led_pins[led_index]; board->led_status[led_index] = status; - setPinOutput(pin); - status ? writePinHigh(pin) : writePinLow(pin); + gpio_set_pin_output(pin); + status ? gpio_write_pin_high(pin) : gpio_write_pin_low(pin); } static void board_set_slave_led(board_info_t* board, uint8_t led_index, bool status) { @@ -254,18 +254,18 @@ static bool board_read_cols_on_slave_row(board_info_t* board, matrix_row_t curre // Functions for master board // static void board_select_master_row(board_info_t* board, uint8_t board_row) { - setPinOutput(board->row_pins[board_row]); - writePinLow(board->row_pins[board_row]); + gpio_set_pin_output(board->row_pins[board_row]); + gpio_write_pin_low(board->row_pins[board_row]); } -static void board_unselect_master_row(board_info_t* board, uint8_t board_row) { setPinInputHigh(board->row_pins[board_row]); } +static void board_unselect_master_row(board_info_t* board, uint8_t board_row) { gpio_set_pin_input_high(board->row_pins[board_row]); } static void board_unselect_master_rows(board_info_t* board) { if (!board) { return; } for (uint8_t x = 0; x < NUM_ROWS; x++) { - setPinInput(board->row_pins[x]); + gpio_set_pin_input(board->row_pins[x]); } } @@ -281,7 +281,7 @@ static bool board_read_cols_on_master_row(board_info_t* board, matrix_row_t curr wait_us(30); for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { - uint8_t pin_state = readPin(board->col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(board->col_pins[col_index]); current_matrix[row] |= pin_state ? 0 : (1 << col_index); } board_unselect_master_row(board, board_row); @@ -295,7 +295,7 @@ static void board_master_init(void) { return; } for (uint8_t x = 0; x < NUM_COLS; x++) { - setPinInputHigh(board->col_pins[x]); + gpio_set_pin_input_high(board->col_pins[x]); } board->initialized = true; } diff --git a/keyboards/kakunpc/angel64/alpha/matrix.c b/keyboards/kakunpc/angel64/alpha/matrix.c index 5d731b10683..ff2b8a801ef 100644 --- a/keyboards/kakunpc/angel64/alpha/matrix.c +++ b/keyboards/kakunpc/angel64/alpha/matrix.c @@ -105,37 +105,37 @@ void matrix_print(void) static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for(uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } static void unselect_col(uint8_t col) { - setPinInputHigh(col_pins[col]); + gpio_set_pin_input_high(col_pins[col]); } static void unselect_cols(void) { for(uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -143,10 +143,10 @@ static void init_pins(void) { unselect_rows(); unselect_cols(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -166,7 +166,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index); @@ -194,7 +194,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[tmp]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[tmp] |= (ROW_SHIFTER << current_col); diff --git a/keyboards/kakunpc/angel64/rev1/matrix.c b/keyboards/kakunpc/angel64/rev1/matrix.c index 5d731b10683..ff2b8a801ef 100644 --- a/keyboards/kakunpc/angel64/rev1/matrix.c +++ b/keyboards/kakunpc/angel64/rev1/matrix.c @@ -105,37 +105,37 @@ void matrix_print(void) static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for(uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } static void unselect_col(uint8_t col) { - setPinInputHigh(col_pins[col]); + gpio_set_pin_input_high(col_pins[col]); } static void unselect_cols(void) { for(uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -143,10 +143,10 @@ static void init_pins(void) { unselect_rows(); unselect_cols(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -166,7 +166,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index); @@ -194,7 +194,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[tmp]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[tmp] |= (ROW_SHIFTER << current_col); diff --git a/keyboards/kakunpc/choc_taro/matrix.c b/keyboards/kakunpc/choc_taro/matrix.c index 4547f1a0479..20cdf9de85f 100644 --- a/keyboards/kakunpc/choc_taro/matrix.c +++ b/keyboards/kakunpc/choc_taro/matrix.c @@ -28,32 +28,32 @@ static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } static void unselect_col(uint8_t col) { - setPinInputHigh(col_pins[col]); + gpio_set_pin_input_high(col_pins[col]); } static void unselect_cols(void) { for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -62,11 +62,11 @@ static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -85,7 +85,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index); @@ -111,7 +111,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[tmp]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[tmp] |= (ROW_SHIFTER << current_col); } else { diff --git a/keyboards/kakunpc/thedogkeyboard/matrix.c b/keyboards/kakunpc/thedogkeyboard/matrix.c index 5d731b10683..ff2b8a801ef 100644 --- a/keyboards/kakunpc/thedogkeyboard/matrix.c +++ b/keyboards/kakunpc/thedogkeyboard/matrix.c @@ -105,37 +105,37 @@ void matrix_print(void) static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for(uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } static void unselect_col(uint8_t col) { - setPinInputHigh(col_pins[col]); + gpio_set_pin_input_high(col_pins[col]); } static void unselect_cols(void) { for(uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -143,10 +143,10 @@ static void init_pins(void) { unselect_rows(); unselect_cols(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -166,7 +166,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index); @@ -194,7 +194,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[tmp]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[tmp] |= (ROW_SHIFTER << current_col); diff --git a/keyboards/kbdfans/bella/soldered/soldered.c b/keyboards/kbdfans/bella/soldered/soldered.c index 65809c3c2f0..bfe9f8f5d44 100755 --- a/keyboards/kbdfans/bella/soldered/soldered.c +++ b/keyboards/kbdfans/bella/soldered/soldered.c @@ -15,14 +15,14 @@ */ #include "quantum.h" void matrix_init_kb(void) { - setPinOutput(E6); + gpio_set_pin_output(E6); matrix_init_user(); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(E6, !led_state.caps_lock); + gpio_write_pin(E6, !led_state.caps_lock); } return res; } diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h index 33bebeb882f..e4453f438d7 100644 --- a/keyboards/kbdfans/kbd19x/kbd19x.h +++ b/keyboards/kbdfans/kbd19x/kbd19x.h @@ -20,11 +20,11 @@ along with this program. If not, see . #include "quantum.h" #include "led.h" -inline void kbd19x_caps_led_on(void) { writePinHigh(LED_CAPS_LOCK_PIN); } -inline void kbd19x_caps_led_off(void) { writePinLow(LED_CAPS_LOCK_PIN); } +inline void kbd19x_caps_led_on(void) { gpio_write_pin_high(LED_CAPS_LOCK_PIN); } +inline void kbd19x_caps_led_off(void) { gpio_write_pin_low(LED_CAPS_LOCK_PIN); } -inline void kbd19x_sclk_led_on(void) { writePinHigh(LED_SCROLL_LOCK_PIN); } -inline void kbd19x_sclk_led_off(void) { writePinLow(LED_SCROLL_LOCK_PIN); } +inline void kbd19x_sclk_led_on(void) { gpio_write_pin_high(LED_SCROLL_LOCK_PIN); } +inline void kbd19x_sclk_led_off(void) { gpio_write_pin_low(LED_SCROLL_LOCK_PIN); } -inline void kbd19x_nmlk_led_on(void) { writePinHigh(LED_NUM_LOCK_PIN); } -inline void kbd19x_nmlk_led_off(void) { writePinLow(LED_NUM_LOCK_PIN); } +inline void kbd19x_nmlk_led_on(void) { gpio_write_pin_high(LED_NUM_LOCK_PIN); } +inline void kbd19x_nmlk_led_off(void) { gpio_write_pin_low(LED_NUM_LOCK_PIN); } diff --git a/keyboards/kbdfans/kbd8x/kbd8x.h b/keyboards/kbdfans/kbd8x/kbd8x.h index a0a1ac73904..a7d72904cb6 100644 --- a/keyboards/kbdfans/kbd8x/kbd8x.h +++ b/keyboards/kbdfans/kbd8x/kbd8x.h @@ -19,11 +19,11 @@ #include "led.h" // Functions for setting LEDs on toggle keys -inline void caps_led_on(void) { writePinHigh(LED_CAPS_LOCK_PIN); } -inline void caps_led_off(void) { writePinLow(LED_CAPS_LOCK_PIN); } +inline void caps_led_on(void) { gpio_write_pin_high(LED_CAPS_LOCK_PIN); } +inline void caps_led_off(void) { gpio_write_pin_low(LED_CAPS_LOCK_PIN); } -inline void num_led_on(void) { writePinHigh(LED_NUM_LOCK_PIN); } -inline void num_led_off(void) { writePinLow(LED_NUM_LOCK_PIN); } +inline void num_led_on(void) { gpio_write_pin_high(LED_NUM_LOCK_PIN); } +inline void num_led_off(void) { gpio_write_pin_low(LED_NUM_LOCK_PIN); } -inline void scroll_led_on(void) { writePinHigh(LED_SCROLL_LOCK_PIN); } -inline void scroll_led_off(void) { writePinLow(LED_SCROLL_LOCK_PIN); } +inline void scroll_led_on(void) { gpio_write_pin_high(LED_SCROLL_LOCK_PIN); } +inline void scroll_led_off(void) { gpio_write_pin_low(LED_SCROLL_LOCK_PIN); } diff --git a/keyboards/kbdfans/maja_soldered/maja_soldered.c b/keyboards/kbdfans/maja_soldered/maja_soldered.c index c7740277806..41d80e2cc8c 100755 --- a/keyboards/kbdfans/maja_soldered/maja_soldered.c +++ b/keyboards/kbdfans/maja_soldered/maja_soldered.c @@ -16,14 +16,14 @@ #include "quantum.h" void matrix_init_kb(void) { - setPinOutput(D4); + gpio_set_pin_output(D4); matrix_init_user(); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(D4, !led_state.caps_lock); + gpio_write_pin(D4, !led_state.caps_lock); } return res; } diff --git a/keyboards/kbdfans/niu_mini/niu_mini.c b/keyboards/kbdfans/niu_mini/niu_mini.c index 02b2ca6590f..1bde1ba5d0a 100644 --- a/keyboards/kbdfans/niu_mini/niu_mini.c +++ b/keyboards/kbdfans/niu_mini/niu_mini.c @@ -12,8 +12,8 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { void matrix_init_kb(void) { // Turn status LED on - setPinOutput(E6); - writePinHigh(E6); + gpio_set_pin_output(E6); + gpio_write_pin_high(E6); matrix_init_user(); } diff --git a/keyboards/kbdfans/phaseone/phaseone.c b/keyboards/kbdfans/phaseone/phaseone.c index ded75ac8ed0..a44e5011090 100644 --- a/keyboards/kbdfans/phaseone/phaseone.c +++ b/keyboards/kbdfans/phaseone/phaseone.c @@ -17,5 +17,5 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(D4); + gpio_set_pin_output(D4); } diff --git a/keyboards/kbdmania/kmac/kmac.c b/keyboards/kbdmania/kmac/kmac.c index 29f70910846..c3f06349d8c 100644 --- a/keyboards/kbdmania/kmac/kmac.c +++ b/keyboards/kbdmania/kmac/kmac.c @@ -19,11 +19,11 @@ #define WASD_MASK 0b10 void backlight_init_ports(void) { - setPinOutput(B1); - setPinOutput(B2); - setPinOutput(B3); - setPinOutput(B4); - setPinOutput(D7); + gpio_set_pin_output(B1); + gpio_set_pin_output(B2); + gpio_set_pin_output(B3); + gpio_set_pin_output(B4); + gpio_set_pin_output(D7); } /* Backlight pin configuration @@ -36,21 +36,21 @@ void backlight_init_ports(void) { void backlight_set(uint8_t level) { // F-row if (level & F_ROW_MASK) { - writePinHigh(B1); + gpio_write_pin_high(B1); } else { - writePinLow(B1); + gpio_write_pin_low(B1); } // WASD if (level & WASD_MASK) { - writePinLow(B2); - writePinLow(B3); - writePinLow(B4); - writePinLow(D7); + gpio_write_pin_low(B2); + gpio_write_pin_low(B3); + gpio_write_pin_low(B4); + gpio_write_pin_low(D7); } else { - writePinHigh(B2); - writePinHigh(B3); - writePinHigh(B4); - writePinHigh(D7); + gpio_write_pin_high(B2); + gpio_write_pin_high(B3); + gpio_write_pin_high(B4); + gpio_write_pin_high(D7); } } diff --git a/keyboards/kbdmania/kmac/matrix.c b/keyboards/kbdmania/kmac/matrix.c index 1843d19fd29..ea149c49ada 100644 --- a/keyboards/kbdmania/kmac/matrix.c +++ b/keyboards/kbdmania/kmac/matrix.c @@ -94,8 +94,8 @@ void matrix_print(void) { */ static void unselect_cols(void) { for (uint8_t x = 0; x < 6; x++) { - setPinOutput(col_pins[x]); - writePinLow(col_pins[x]); + gpio_set_pin_output(col_pins[x]); + gpio_write_pin_low(col_pins[x]); } } @@ -103,13 +103,13 @@ static void select_col(uint8_t col) { if (col < 16) { uint8_t c = col + 8; - writePin(B6, c & 0b10000); - writePin(C6, c & 0b01000); - writePin(C7, c & 0b00100); - writePin(F1, c & 0b00010); - writePin(F0, c & 0b00001); + gpio_write_pin(B6, c & 0b10000); + gpio_write_pin(C6, c & 0b01000); + gpio_write_pin(C7, c & 0b00100); + gpio_write_pin(F1, c & 0b00010); + gpio_write_pin(F0, c & 0b00001); } else { - writePinHigh(B5); + gpio_write_pin_high(B5); } } @@ -122,10 +122,10 @@ static void select_col(uint8_t col) { static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } - setPinInputHigh(E2); + gpio_set_pin_input_high(E2); } static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { @@ -143,7 +143,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) // Check row pin state // Use the otherwise unused row: 3, col: 0 for caps lock if (row_index == 3 && current_col == 0) { - if (readPin(E2) == 0) { + if (gpio_read_pin(E2) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (ROW_SHIFTER << current_col); } else { @@ -151,7 +151,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) current_matrix[row_index] &= ~(ROW_SHIFTER << current_col); } } else { - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin HI, clear col bit current_matrix[row_index] &= ~(ROW_SHIFTER << current_col); } else { diff --git a/keyboards/kbdmania/kmac_pad/kmac_pad.c b/keyboards/kbdmania/kmac_pad/kmac_pad.c index 3de2cb711eb..064502710f3 100644 --- a/keyboards/kbdmania/kmac_pad/kmac_pad.c +++ b/keyboards/kbdmania/kmac_pad/kmac_pad.c @@ -23,7 +23,7 @@ void keyboard_pre_init_kb(void) { * FN Pin PB3 * PAD Pin PB1 */ - setPinOutput(B3); - setPinOutput(B1); + gpio_set_pin_output(B3); + gpio_set_pin_output(B1); keyboard_pre_init_user(); } diff --git a/keyboards/kbdmania/kmac_pad/matrix.c b/keyboards/kbdmania/kmac_pad/matrix.c index ad7919e33cf..1fe0502311a 100644 --- a/keyboards/kbdmania/kmac_pad/matrix.c +++ b/keyboards/kbdmania/kmac_pad/matrix.c @@ -30,13 +30,13 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; */ static void unselect_cols(void) { for (uint8_t col = 0; col < MATRIX_COLS; col++) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } } static void select_col(uint8_t col) { - writePinHigh(col_pins[col]); + gpio_write_pin_high(col_pins[col]); } static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { @@ -50,7 +50,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) if (current_col == 0) { matrix_row_t last_row_value = current_matrix[0]; - if (readPin(row_pins[0]) == 0) { + if (gpio_read_pin(row_pins[0]) == 0) { // Pin LO, set col bit current_matrix[0] |= (1 << current_col); } else { @@ -68,7 +68,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) for (uint8_t row_index = 1; row_index < MATRIX_ROWS; row_index++) { matrix_row_t last_row_value = current_matrix[row_index]; - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin HI, clear col bit current_matrix[row_index] &= ~(1 << current_col); } else { @@ -95,7 +95,7 @@ void matrix_init_custom(void) { // initialize key pins for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { - setPinInputHigh(row_pins[row_index]); + gpio_set_pin_input_high(row_pins[row_index]); } } diff --git a/keyboards/kc60/kc60.c b/keyboards/kc60/kc60.c index 22ce217b520..143148a224b 100644 --- a/keyboards/kc60/kc60.c +++ b/keyboards/kc60/kc60.c @@ -2,8 +2,8 @@ void led_update_ports(led_t led_state) { if (led_state.caps_lock) { - setPinOutput(B2); + gpio_set_pin_output(B2); } else { - setPinInput(B2); + gpio_set_pin_input(B2); } } diff --git a/keyboards/kc60se/kc60se.c b/keyboards/kc60se/kc60se.c index 660b9201b37..a7d60079b2e 100644 --- a/keyboards/kc60se/kc60se.c +++ b/keyboards/kc60se/kc60se.c @@ -17,13 +17,13 @@ #include "quantum.h" void matrix_init_kb(void){ - setPinOutput(B2); + gpio_set_pin_output(B2); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B2, !led_state.caps_lock); + gpio_write_pin(B2, !led_state.caps_lock); } return res; } diff --git a/keyboards/keebio/kbo5000/rev1/rev1.c b/keyboards/keebio/kbo5000/rev1/rev1.c index 45443becbe6..8aa227deba9 100644 --- a/keyboards/keebio/kbo5000/rev1/rev1.c +++ b/keyboards/keebio/kbo5000/rev1/rev1.c @@ -2,14 +2,14 @@ #include "split_util.h" void matrix_init_kb(void) { - setPinOutput(CAPS_LOCK_LED_PIN); + gpio_set_pin_output(CAPS_LOCK_LED_PIN); matrix_init_user(); } bool led_update_kb(led_t led_state) { // Only update if left half if (isLeftHand && led_update_user(led_state)) { - writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock); + gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock); } return true; } diff --git a/keyboards/keebio/quefrency/rev2/rev2.c b/keyboards/keebio/quefrency/rev2/rev2.c index a3bc2ca1ef5..f0320597f73 100644 --- a/keyboards/keebio/quefrency/rev2/rev2.c +++ b/keyboards/keebio/quefrency/rev2/rev2.c @@ -2,14 +2,14 @@ #include "split_util.h" void matrix_init_kb(void) { - setPinOutput(CAPS_LOCK_LED_PIN); + gpio_set_pin_output(CAPS_LOCK_LED_PIN); matrix_init_user(); } bool led_update_kb(led_t led_state) { // Only update if left half if (isLeftHand && led_update_user(led_state)) { - writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock); + gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock); } return true; } diff --git a/keyboards/keebio/quefrency/rev3/rev3.c b/keyboards/keebio/quefrency/rev3/rev3.c index d3ada3076ff..74d68723f5e 100644 --- a/keyboards/keebio/quefrency/rev3/rev3.c +++ b/keyboards/keebio/quefrency/rev3/rev3.c @@ -18,14 +18,14 @@ along with this program. If not, see . #include "split_util.h" void matrix_init_kb(void) { - setPinOutput(CAPS_LOCK_LED_PIN); + gpio_set_pin_output(CAPS_LOCK_LED_PIN); matrix_init_user(); } bool led_update_kb(led_t led_state) { // Only update if left half if (led_update_user(led_state) && isLeftHand) { - writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock); + gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock); } return true; } diff --git a/keyboards/keebio/sinc/sinc.c b/keyboards/keebio/sinc/sinc.c index d50eb820191..c1ebd1a206b 100644 --- a/keyboards/keebio/sinc/sinc.c +++ b/keyboards/keebio/sinc/sinc.c @@ -22,7 +22,7 @@ bool led_update_kb(led_t led_state) { if (!led_update_user(led_state)) { return false; } // Only update if left half if (isLeftHand && led_update_user(led_state)) { - writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); } return true; } diff --git a/keyboards/keychron/c2_pro/matrix.c b/keyboards/keychron/c2_pro/matrix.c index 8c954c73d08..7d5b3e4e791 100644 --- a/keyboards/keychron/c2_pro/matrix.c +++ b/keyboards/keychron/c2_pro/matrix.c @@ -43,27 +43,27 @@ pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInput_high(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } @@ -81,13 +81,13 @@ static void HC595_output(SIZE_T data, uint8_t bit) { ATOMIC_BLOCK_FORCEON { for (uint8_t i = 0; i < (SHIFT_COL_END - SHIFT_COL_START + 1); i++) { if (data & 0x1) { - writePinHigh(HC595_DS); + gpio_write_pin_high(HC595_DS); } else { - writePinLow(HC595_DS); + gpio_write_pin_low(HC595_DS); } - writePinHigh(HC595_SHCP); + gpio_write_pin_high(HC595_SHCP); HC595_delay(n); - writePinLow(HC595_SHCP); + gpio_write_pin_low(HC595_SHCP); HC595_delay(n); if (bit) { break; @@ -95,9 +95,9 @@ static void HC595_output(SIZE_T data, uint8_t bit) { data = data >> 1; } } - writePinHigh(HC595_STCP); + gpio_write_pin_high(HC595_STCP); HC595_delay(n); - writePinLow(HC595_STCP); + gpio_write_pin_low(HC595_STCP); HC595_delay(n); } } @@ -175,9 +175,9 @@ static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t curre } void matrix_init_custom(void) { - setPinOutput(HC595_DS); - setPinOutput(HC595_STCP); - setPinOutput(HC595_SHCP); + gpio_set_pin_output(HC595_DS); + gpio_set_pin_output(HC595_STCP); + gpio_set_pin_output(HC595_SHCP); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { if (row_pins[x] != NO_PIN) { diff --git a/keyboards/keychron/q10/matrix.c b/keyboards/keychron/q10/matrix.c index 2c2d2ccc378..b772fd78899 100644 --- a/keyboards/keychron/q10/matrix.c +++ b/keyboards/keychron/q10/matrix.c @@ -36,27 +36,27 @@ static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } diff --git a/keyboards/keychron/q11/q11.c b/keyboards/keychron/q11/q11.c index f643113ea3b..8d018e2a631 100755 --- a/keyboards/keychron/q11/q11.c +++ b/keyboards/keychron/q11/q11.c @@ -130,12 +130,12 @@ void keyboard_post_init_kb(void) { // and disable USB connectivity when the ADC value exceeds 1000, // to avoid affecting the serial usart communication between the left hand and the right hand. if (is_keyboard_left()) { - setPinOutput(A0); - writePinHigh(A0); + gpio_set_pin_output(A0); + gpio_write_pin_high(A0); } else { if ((analogReadPin_my(B0) > 1000) || (analogReadPin_my(B1) > 1000)) { - setPinInput(A11); - setPinInput(A12); + gpio_set_pin_input(A11); + gpio_set_pin_input(A12); } } diff --git a/keyboards/keychron/q12/matrix.c b/keyboards/keychron/q12/matrix.c index cf8361bd23e..9d5e9c4d393 100644 --- a/keyboards/keychron/q12/matrix.c +++ b/keyboards/keychron/q12/matrix.c @@ -36,27 +36,27 @@ static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } diff --git a/keyboards/keychron/q1v2/matrix.c b/keyboards/keychron/q1v2/matrix.c index 2bdf4bdec7b..8e01bdb73e0 100644 --- a/keyboards/keychron/q1v2/matrix.c +++ b/keyboards/keychron/q1v2/matrix.c @@ -36,27 +36,27 @@ static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } diff --git a/keyboards/keychron/q3/matrix.c b/keyboards/keychron/q3/matrix.c index 188156789b3..25b3f6ed4ee 100644 --- a/keyboards/keychron/q3/matrix.c +++ b/keyboards/keychron/q3/matrix.c @@ -36,27 +36,27 @@ static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } diff --git a/keyboards/keychron/q5/matrix.c b/keyboards/keychron/q5/matrix.c index 4809b20677c..e7f69d98216 100644 --- a/keyboards/keychron/q5/matrix.c +++ b/keyboards/keychron/q5/matrix.c @@ -36,27 +36,27 @@ static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } diff --git a/keyboards/keychron/q6/matrix.c b/keyboards/keychron/q6/matrix.c index c59b229cfa6..95e00405b44 100644 --- a/keyboards/keychron/q6/matrix.c +++ b/keyboards/keychron/q6/matrix.c @@ -48,27 +48,27 @@ static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } diff --git a/keyboards/keychron/q65/matrix.c b/keyboards/keychron/q65/matrix.c index 206e3012267..c9f98886894 100644 --- a/keyboards/keychron/q65/matrix.c +++ b/keyboards/keychron/q65/matrix.c @@ -36,32 +36,32 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void writePinLow_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - writePinLow(pin); + gpio_write_pin_low(pin); } } static inline void writePinHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - writePinHigh(pin); + gpio_write_pin_high(pin); } } static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } @@ -76,20 +76,20 @@ static void shiftOut(uint8_t dataOut) { for (uint8_t i = 0; i < 8; i++) { compiler_barrier(); if (dataOut & 0x1) { - writePinHigh(DATA_PIN); + gpio_write_pin_high(DATA_PIN); } else { - writePinLow(DATA_PIN); + gpio_write_pin_low(DATA_PIN); } dataOut = dataOut >> 1; compiler_barrier(); - writePinHigh(CLOCK_PIN); + gpio_write_pin_high(CLOCK_PIN); small_delay(); - writePinLow(CLOCK_PIN); + gpio_write_pin_low(CLOCK_PIN); } compiler_barrier(); - writePinHigh(LATCH_PIN); + gpio_write_pin_high(LATCH_PIN); small_delay(); - writePinLow(LATCH_PIN); + gpio_write_pin_low(LATCH_PIN); compiler_barrier(); } } @@ -98,18 +98,18 @@ static void shiftout_single(uint8_t data) { ATOMIC_BLOCK_FORCEON { compiler_barrier(); if (data & 0x1) { - writePinHigh(DATA_PIN); + gpio_write_pin_high(DATA_PIN); } else { - writePinLow(DATA_PIN); + gpio_write_pin_low(DATA_PIN); } compiler_barrier(); - writePinHigh(CLOCK_PIN); + gpio_write_pin_high(CLOCK_PIN); small_delay(); - writePinLow(CLOCK_PIN); + gpio_write_pin_low(CLOCK_PIN); compiler_barrier(); - writePinHigh(LATCH_PIN); + gpio_write_pin_high(LATCH_PIN); small_delay(); - writePinLow(LATCH_PIN); + gpio_write_pin_low(LATCH_PIN); compiler_barrier(); } } @@ -165,13 +165,13 @@ static void unselect_cols(void) { } static void matrix_init_pins(void) { - setPinOutput(DATA_PIN); - setPinOutput(CLOCK_PIN); - setPinOutput(LATCH_PIN); + gpio_set_pin_output(DATA_PIN); + gpio_set_pin_output(CLOCK_PIN); + gpio_set_pin_output(LATCH_PIN); #ifdef MATRIX_UNSELECT_DRIVE_HIGH for (uint8_t x = 0; x < MATRIX_COLS; x++) { if (col_pins[x] != NO_PIN) { - setPinOutput(col_pins[x]); + gpio_set_pin_output(col_pins[x]); } } #endif diff --git a/keyboards/keychron/v1/matrix.c b/keyboards/keychron/v1/matrix.c index 7b9136d4904..32d9cfdbb06 100644 --- a/keyboards/keychron/v1/matrix.c +++ b/keyboards/keychron/v1/matrix.c @@ -36,27 +36,27 @@ static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } @@ -71,20 +71,20 @@ static void shiftOut(uint8_t dataOut) { for (uint8_t i = 0; i < 8; i++) { compiler_barrier(); if (dataOut & 0x1) { - writePinHigh(DATA_PIN); + gpio_write_pin_high(DATA_PIN); } else { - writePinLow(DATA_PIN); + gpio_write_pin_low(DATA_PIN); } dataOut = dataOut >> 1; compiler_barrier(); - writePinHigh(CLOCK_PIN); + gpio_write_pin_high(CLOCK_PIN); small_delay(); - writePinLow(CLOCK_PIN); + gpio_write_pin_low(CLOCK_PIN); } compiler_barrier(); - writePinHigh(LATCH_PIN); + gpio_write_pin_high(LATCH_PIN); small_delay(); - writePinLow(LATCH_PIN); + gpio_write_pin_low(LATCH_PIN); compiler_barrier(); } } @@ -93,18 +93,18 @@ static void shiftOut_single(uint8_t data) { ATOMIC_BLOCK_FORCEON { compiler_barrier(); if (data & 0x1) { - writePinHigh(DATA_PIN); + gpio_write_pin_high(DATA_PIN); } else { - writePinLow(DATA_PIN); + gpio_write_pin_low(DATA_PIN); } compiler_barrier(); - writePinHigh(CLOCK_PIN); + gpio_write_pin_high(CLOCK_PIN); small_delay(); - writePinLow(CLOCK_PIN); + gpio_write_pin_low(CLOCK_PIN); compiler_barrier(); - writePinHigh(LATCH_PIN); + gpio_write_pin_high(LATCH_PIN); small_delay(); - writePinLow(LATCH_PIN); + gpio_write_pin_low(LATCH_PIN); compiler_barrier(); } } @@ -156,13 +156,13 @@ static void unselect_cols(void) { } static void matrix_init_pins(void) { - setPinOutput(DATA_PIN); - setPinOutput(CLOCK_PIN); - setPinOutput(LATCH_PIN); + gpio_set_pin_output(DATA_PIN); + gpio_set_pin_output(CLOCK_PIN); + gpio_set_pin_output(LATCH_PIN); #ifdef MATRIX_UNSELECT_DRIVE_HIGH for (uint8_t x = 0; x < MATRIX_COLS; x++) { if (col_pins[x] != NO_PIN) { - setPinOutput(col_pins[x]); + gpio_set_pin_output(col_pins[x]); } } #endif diff --git a/keyboards/keychron/v10/matrix.c b/keyboards/keychron/v10/matrix.c index 87cda1774ad..bb6504fa78f 100644 --- a/keyboards/keychron/v10/matrix.c +++ b/keyboards/keychron/v10/matrix.c @@ -36,27 +36,27 @@ static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } @@ -70,34 +70,34 @@ static void shiftOut(uint16_t dataOut) { ATOMIC_BLOCK_FORCEON { for (uint8_t i = 0; i < PIN_USED_74HC595; i++) { if (dataOut & 0x1) { - writePinHigh(DATA_PIN_74HC595); + gpio_write_pin_high(DATA_PIN_74HC595); } else { - writePinLow(DATA_PIN_74HC595); + gpio_write_pin_low(DATA_PIN_74HC595); } dataOut = dataOut >> 1; - writePinHigh(CLOCK_PIN_74HC595); + gpio_write_pin_high(CLOCK_PIN_74HC595); small_delay(2); - writePinLow(CLOCK_PIN_74HC595); + gpio_write_pin_low(CLOCK_PIN_74HC595); } - writePinHigh(LATCH_PIN_74HC595); + gpio_write_pin_high(LATCH_PIN_74HC595); small_delay(2); - writePinLow(LATCH_PIN_74HC595); + gpio_write_pin_low(LATCH_PIN_74HC595); } } static void shiftOut_single(uint8_t data) { ATOMIC_BLOCK_FORCEON { if (data & 0x1) { - writePinHigh(DATA_PIN_74HC595); + gpio_write_pin_high(DATA_PIN_74HC595); } else { - writePinLow(DATA_PIN_74HC595); + gpio_write_pin_low(DATA_PIN_74HC595); } - writePinHigh(CLOCK_PIN_74HC595); + gpio_write_pin_high(CLOCK_PIN_74HC595); small_delay(2); - writePinLow(CLOCK_PIN_74HC595); - writePinHigh(LATCH_PIN_74HC595); + gpio_write_pin_low(CLOCK_PIN_74HC595); + gpio_write_pin_high(LATCH_PIN_74HC595); small_delay(2); - writePinLow(LATCH_PIN_74HC595); + gpio_write_pin_low(LATCH_PIN_74HC595); } } @@ -149,13 +149,13 @@ static void unselect_cols(void) { } static void matrix_init_pins(void) { - setPinOutput(DATA_PIN_74HC595); - setPinOutput(CLOCK_PIN_74HC595); - setPinOutput(LATCH_PIN_74HC595); + gpio_set_pin_output(DATA_PIN_74HC595); + gpio_set_pin_output(CLOCK_PIN_74HC595); + gpio_set_pin_output(LATCH_PIN_74HC595); #ifdef MATRIX_UNSELECT_DRIVE_HIGH for (uint8_t x = 0; x < MATRIX_COLS; x++) { if (col_pins[x] != NO_PIN) { - setPinOutput(col_pins[x]); + gpio_set_pin_output(col_pins[x]); } } #endif diff --git a/keyboards/keychron/v3/matrix.c b/keyboards/keychron/v3/matrix.c index c0c39d5b5fd..5ee860afd2e 100644 --- a/keyboards/keychron/v3/matrix.c +++ b/keyboards/keychron/v3/matrix.c @@ -36,27 +36,27 @@ static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } @@ -71,20 +71,20 @@ static void shiftOut(uint8_t dataOut) { for (uint8_t i = 0; i < 8; i++) { compiler_barrier(); if (dataOut & 0x1) { - writePinHigh(DATA_PIN); + gpio_write_pin_high(DATA_PIN); } else { - writePinLow(DATA_PIN); + gpio_write_pin_low(DATA_PIN); } dataOut = dataOut >> 1; compiler_barrier(); - writePinHigh(CLOCK_PIN); + gpio_write_pin_high(CLOCK_PIN); small_delay(); - writePinLow(CLOCK_PIN); + gpio_write_pin_low(CLOCK_PIN); } compiler_barrier(); - writePinHigh(LATCH_PIN); + gpio_write_pin_high(LATCH_PIN); small_delay(); - writePinLow(LATCH_PIN); + gpio_write_pin_low(LATCH_PIN); compiler_barrier(); } } @@ -93,18 +93,18 @@ static void shiftOut_single(uint8_t data) { ATOMIC_BLOCK_FORCEON { compiler_barrier(); if (data & 0x1) { - writePinHigh(DATA_PIN); + gpio_write_pin_high(DATA_PIN); } else { - writePinLow(DATA_PIN); + gpio_write_pin_low(DATA_PIN); } compiler_barrier(); - writePinHigh(CLOCK_PIN); + gpio_write_pin_high(CLOCK_PIN); small_delay(); - writePinLow(CLOCK_PIN); + gpio_write_pin_low(CLOCK_PIN); compiler_barrier(); - writePinHigh(LATCH_PIN); + gpio_write_pin_high(LATCH_PIN); small_delay(); - writePinLow(LATCH_PIN); + gpio_write_pin_low(LATCH_PIN); compiler_barrier(); } } @@ -156,13 +156,13 @@ static void unselect_cols(void) { } static void matrix_init_pins(void) { - setPinOutput(DATA_PIN); - setPinOutput(CLOCK_PIN); - setPinOutput(LATCH_PIN); + gpio_set_pin_output(DATA_PIN); + gpio_set_pin_output(CLOCK_PIN); + gpio_set_pin_output(LATCH_PIN); #ifdef MATRIX_UNSELECT_DRIVE_HIGH for (uint8_t x = 0; x < MATRIX_COLS; x++) { if (col_pins[x] != NO_PIN) { - setPinOutput(col_pins[x]); + gpio_set_pin_output(col_pins[x]); } } #endif diff --git a/keyboards/keychron/v5/matrix.c b/keyboards/keychron/v5/matrix.c index fc3a1c4c2c4..255201af12a 100644 --- a/keyboards/keychron/v5/matrix.c +++ b/keyboards/keychron/v5/matrix.c @@ -36,27 +36,27 @@ static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } @@ -71,20 +71,20 @@ static void shiftOut(uint8_t dataOut) { for (uint8_t i = 0; i < 8; i++) { compiler_barrier(); if (dataOut & 0x1) { - writePinHigh(DATA_PIN); + gpio_write_pin_high(DATA_PIN); } else { - writePinLow(DATA_PIN); + gpio_write_pin_low(DATA_PIN); } dataOut = dataOut >> 1; compiler_barrier(); - writePinHigh(CLOCK_PIN); + gpio_write_pin_high(CLOCK_PIN); small_delay(); - writePinLow(CLOCK_PIN); + gpio_write_pin_low(CLOCK_PIN); } compiler_barrier(); - writePinHigh(LATCH_PIN); + gpio_write_pin_high(LATCH_PIN); small_delay(); - writePinLow(LATCH_PIN); + gpio_write_pin_low(LATCH_PIN); compiler_barrier(); } } @@ -93,18 +93,18 @@ static void shiftOut_single(uint8_t data) { ATOMIC_BLOCK_FORCEON { compiler_barrier(); if (data & 0x1) { - writePinHigh(DATA_PIN); + gpio_write_pin_high(DATA_PIN); } else { - writePinLow(DATA_PIN); + gpio_write_pin_low(DATA_PIN); } compiler_barrier(); - writePinHigh(CLOCK_PIN); + gpio_write_pin_high(CLOCK_PIN); small_delay(); - writePinLow(CLOCK_PIN); + gpio_write_pin_low(CLOCK_PIN); compiler_barrier(); - writePinHigh(LATCH_PIN); + gpio_write_pin_high(LATCH_PIN); small_delay(); - writePinLow(LATCH_PIN); + gpio_write_pin_low(LATCH_PIN); compiler_barrier(); } } @@ -156,13 +156,13 @@ static void unselect_cols(void) { } static void matrix_init_pins(void) { - setPinOutput(DATA_PIN); - setPinOutput(CLOCK_PIN); - setPinOutput(LATCH_PIN); + gpio_set_pin_output(DATA_PIN); + gpio_set_pin_output(CLOCK_PIN); + gpio_set_pin_output(LATCH_PIN); #ifdef MATRIX_UNSELECT_DRIVE_HIGH for (uint8_t x = 0; x < MATRIX_COLS; x++) { if (col_pins[x] != NO_PIN) { - setPinOutput(col_pins[x]); + gpio_set_pin_output(col_pins[x]); } } #endif diff --git a/keyboards/keychron/v6/matrix.c b/keyboards/keychron/v6/matrix.c index 87cda1774ad..bb6504fa78f 100644 --- a/keyboards/keychron/v6/matrix.c +++ b/keyboards/keychron/v6/matrix.c @@ -36,27 +36,27 @@ static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } @@ -70,34 +70,34 @@ static void shiftOut(uint16_t dataOut) { ATOMIC_BLOCK_FORCEON { for (uint8_t i = 0; i < PIN_USED_74HC595; i++) { if (dataOut & 0x1) { - writePinHigh(DATA_PIN_74HC595); + gpio_write_pin_high(DATA_PIN_74HC595); } else { - writePinLow(DATA_PIN_74HC595); + gpio_write_pin_low(DATA_PIN_74HC595); } dataOut = dataOut >> 1; - writePinHigh(CLOCK_PIN_74HC595); + gpio_write_pin_high(CLOCK_PIN_74HC595); small_delay(2); - writePinLow(CLOCK_PIN_74HC595); + gpio_write_pin_low(CLOCK_PIN_74HC595); } - writePinHigh(LATCH_PIN_74HC595); + gpio_write_pin_high(LATCH_PIN_74HC595); small_delay(2); - writePinLow(LATCH_PIN_74HC595); + gpio_write_pin_low(LATCH_PIN_74HC595); } } static void shiftOut_single(uint8_t data) { ATOMIC_BLOCK_FORCEON { if (data & 0x1) { - writePinHigh(DATA_PIN_74HC595); + gpio_write_pin_high(DATA_PIN_74HC595); } else { - writePinLow(DATA_PIN_74HC595); + gpio_write_pin_low(DATA_PIN_74HC595); } - writePinHigh(CLOCK_PIN_74HC595); + gpio_write_pin_high(CLOCK_PIN_74HC595); small_delay(2); - writePinLow(CLOCK_PIN_74HC595); - writePinHigh(LATCH_PIN_74HC595); + gpio_write_pin_low(CLOCK_PIN_74HC595); + gpio_write_pin_high(LATCH_PIN_74HC595); small_delay(2); - writePinLow(LATCH_PIN_74HC595); + gpio_write_pin_low(LATCH_PIN_74HC595); } } @@ -149,13 +149,13 @@ static void unselect_cols(void) { } static void matrix_init_pins(void) { - setPinOutput(DATA_PIN_74HC595); - setPinOutput(CLOCK_PIN_74HC595); - setPinOutput(LATCH_PIN_74HC595); + gpio_set_pin_output(DATA_PIN_74HC595); + gpio_set_pin_output(CLOCK_PIN_74HC595); + gpio_set_pin_output(LATCH_PIN_74HC595); #ifdef MATRIX_UNSELECT_DRIVE_HIGH for (uint8_t x = 0; x < MATRIX_COLS; x++) { if (col_pins[x] != NO_PIN) { - setPinOutput(col_pins[x]); + gpio_set_pin_output(col_pins[x]); } } #endif diff --git a/keyboards/keyhive/honeycomb/honeycomb.c b/keyboards/keyhive/honeycomb/honeycomb.c index 6acc649e0d9..b890ee08bf6 100755 --- a/keyboards/keyhive/honeycomb/honeycomb.c +++ b/keyboards/keyhive/honeycomb/honeycomb.c @@ -60,12 +60,12 @@ bool pointing_device_task(void){ } void led_init(void) { - setPinOutput(D1); - writePinHigh(D1); - setPinOutput(F4); - writePinHigh(F4); - setPinOutput(F5); - writePinHigh(F5); + gpio_set_pin_output(D1); + gpio_write_pin_high(D1); + gpio_set_pin_output(F4); + gpio_write_pin_high(F4); + gpio_set_pin_output(F5); + gpio_write_pin_high(F5); } void matrix_init_kb(void) { diff --git a/keyboards/keyhive/honeycomb/honeycomb.h b/keyboards/keyhive/honeycomb/honeycomb.h index 0418dee767d..3551e4a3af1 100755 --- a/keyboards/keyhive/honeycomb/honeycomb.h +++ b/keyboards/keyhive/honeycomb/honeycomb.h @@ -2,12 +2,12 @@ #include "quantum.h" -#define RED_LED_OFF() writePinHigh(F6) -#define RED_LED_ON() writePinLow(F6) -#define BLU_LED_OFF() writePinHigh(F5) -#define BLU_LED_ON() writePinLow(F5) -#define GRN_LED_OFF() writePinHigh(D1) -#define GRN_LED_ON() writePinLow(D1) +#define RED_LED_OFF() gpio_write_pin_high(F6) +#define RED_LED_ON() gpio_write_pin_low(F6) +#define BLU_LED_OFF() gpio_write_pin_high(F5) +#define BLU_LED_ON() gpio_write_pin_low(F5) +#define GRN_LED_OFF() gpio_write_pin_high(D1) +#define GRN_LED_ON() gpio_write_pin_low(D1) #define SET_LED_OFF (RED_LED_OFF(); GRN_LED_OFF(); BLU_LED_OFF(); ) #define SET_LED_RED (RED_LED_ON(); GRN_LED_OFF(); BLU_LED_OFF(); ) diff --git a/keyboards/keyhive/lattice60/lattice60.c b/keyboards/keyhive/lattice60/lattice60.c index 7a5450a6783..ab5f1880d58 100644 --- a/keyboards/keyhive/lattice60/lattice60.c +++ b/keyboards/keyhive/lattice60/lattice60.c @@ -21,8 +21,8 @@ void keyboard_pre_init_kb(void){ //init the LED pins as outputs - setPinOutput(LED1_PIN); - setPinOutput(LED2_PIN); + gpio_set_pin_output(LED1_PIN); + gpio_set_pin_output(LED2_PIN); //call any user initialization code keyboard_pre_init_user(); } @@ -31,7 +31,7 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res){ //write the CAPS LOCK state on LED1 - writePin(LED1_PIN, led_state.caps_lock); + gpio_write_pin(LED1_PIN, led_state.caps_lock); } return res; } diff --git a/keyboards/keyhive/navi10/rev0/rev0.c b/keyboards/keyhive/navi10/rev0/rev0.c index 1eefa5cd913..d8c0e813489 100644 --- a/keyboards/keyhive/navi10/rev0/rev0.c +++ b/keyboards/keyhive/navi10/rev0/rev0.c @@ -20,9 +20,9 @@ void matrix_init_kb(void) { // runs once when the firmware starts up //set the indicator LED pin to Output - setPinOutput(B5); + gpio_set_pin_output(B5); //set HIGH for off. - writePinHigh(B5); + gpio_write_pin_high(B5); //call any user functions matrix_init_user(); diff --git a/keyboards/keyhive/navi10/rev2/rev2.c b/keyboards/keyhive/navi10/rev2/rev2.c index 1eefa5cd913..d8c0e813489 100644 --- a/keyboards/keyhive/navi10/rev2/rev2.c +++ b/keyboards/keyhive/navi10/rev2/rev2.c @@ -20,9 +20,9 @@ void matrix_init_kb(void) { // runs once when the firmware starts up //set the indicator LED pin to Output - setPinOutput(B5); + gpio_set_pin_output(B5); //set HIGH for off. - writePinHigh(B5); + gpio_write_pin_high(B5); //call any user functions matrix_init_user(); diff --git a/keyboards/keyhive/navi10/rev3/rev3.c b/keyboards/keyhive/navi10/rev3/rev3.c index 1eefa5cd913..d8c0e813489 100644 --- a/keyboards/keyhive/navi10/rev3/rev3.c +++ b/keyboards/keyhive/navi10/rev3/rev3.c @@ -20,9 +20,9 @@ void matrix_init_kb(void) { // runs once when the firmware starts up //set the indicator LED pin to Output - setPinOutput(B5); + gpio_set_pin_output(B5); //set HIGH for off. - writePinHigh(B5); + gpio_write_pin_high(B5); //call any user functions matrix_init_user(); diff --git a/keyboards/kin80/blackpill103/blackpill103.c b/keyboards/kin80/blackpill103/blackpill103.c index e06ad44748f..b532a728694 100644 --- a/keyboards/kin80/blackpill103/blackpill103.c +++ b/keyboards/kin80/blackpill103/blackpill103.c @@ -18,8 +18,8 @@ void matrix_init_kb(void) { /* LED pins setup */ - setPinOutput(LED4_PIN); - writePinLow(LED4_PIN); + gpio_set_pin_output(LED4_PIN); + gpio_write_pin_low(LED4_PIN); matrix_init_user(); } diff --git a/keyboards/kin80/blackpill401/blackpill401.c b/keyboards/kin80/blackpill401/blackpill401.c index e06ad44748f..b532a728694 100644 --- a/keyboards/kin80/blackpill401/blackpill401.c +++ b/keyboards/kin80/blackpill401/blackpill401.c @@ -18,8 +18,8 @@ void matrix_init_kb(void) { /* LED pins setup */ - setPinOutput(LED4_PIN); - writePinLow(LED4_PIN); + gpio_set_pin_output(LED4_PIN); + gpio_write_pin_low(LED4_PIN); matrix_init_user(); } diff --git a/keyboards/kin80/blackpill411/blackpill411.c b/keyboards/kin80/blackpill411/blackpill411.c index 012a434e412..21e4b917054 100644 --- a/keyboards/kin80/blackpill411/blackpill411.c +++ b/keyboards/kin80/blackpill411/blackpill411.c @@ -18,8 +18,8 @@ void matrix_init_kb(void) { /* LED pins setup */ - setPinOutput(LED4_PIN); - writePinLow(LED4_PIN); + gpio_set_pin_output(LED4_PIN); + gpio_write_pin_low(LED4_PIN); matrix_init_user(); } diff --git a/keyboards/kin80/micro/micro.c b/keyboards/kin80/micro/micro.c index e06ad44748f..b532a728694 100644 --- a/keyboards/kin80/micro/micro.c +++ b/keyboards/kin80/micro/micro.c @@ -18,8 +18,8 @@ void matrix_init_kb(void) { /* LED pins setup */ - setPinOutput(LED4_PIN); - writePinLow(LED4_PIN); + gpio_set_pin_output(LED4_PIN); + gpio_write_pin_low(LED4_PIN); matrix_init_user(); } diff --git a/keyboards/kinesis/kint36/kint36.c b/keyboards/kinesis/kint36/kint36.c index b3ae9b570c6..c6f399d6dc1 100644 --- a/keyboards/kinesis/kint36/kint36.c +++ b/keyboards/kinesis/kint36/kint36.c @@ -22,6 +22,6 @@ void matrix_init_kb(void) { matrix_init_user(); // Turn on the Teensy 3.6 Power LED: - setPinOutput(LED_POWER); - writePinHigh(LED_POWER); + gpio_set_pin_output(LED_POWER); + gpio_write_pin_high(LED_POWER); } diff --git a/keyboards/kinesis/kint41/kint41.c b/keyboards/kinesis/kint41/kint41.c index 6d339497eed..8f8f7dfc59d 100644 --- a/keyboards/kinesis/kint41/kint41.c +++ b/keyboards/kinesis/kint41/kint41.c @@ -22,8 +22,8 @@ void matrix_init_kb(void) { matrix_init_user(); // Turn on the Teensy 4.x Power LED: - setPinOutput(LED_POWER); - writePinHigh(LED_POWER); + gpio_set_pin_output(LED_POWER); + gpio_write_pin_high(LED_POWER); } // delay_inline sleeps for |cycles| (e.g. sleeping for F_CPU will sleep 1s). diff --git a/keyboards/kinesis/kintlc/kintlc.c b/keyboards/kinesis/kintlc/kintlc.c index 9623d04fe02..6904adc6ad3 100644 --- a/keyboards/kinesis/kintlc/kintlc.c +++ b/keyboards/kinesis/kintlc/kintlc.c @@ -22,6 +22,6 @@ void matrix_init_kb(void) { matrix_init_user(); // Turn on the Teensy LC Power LED: - setPinOutput(LED_POWER); - writePinHigh(LED_POWER); + gpio_set_pin_output(LED_POWER); + gpio_write_pin_high(LED_POWER); } diff --git a/keyboards/kinesis/kintwin/kintwin.c b/keyboards/kinesis/kintwin/kintwin.c index 0e2e7a57928..e0c3ab4880d 100644 --- a/keyboards/kinesis/kintwin/kintwin.c +++ b/keyboards/kinesis/kintwin/kintwin.c @@ -8,22 +8,22 @@ void matrix_init_kb(void) { uint8_t led_delay_ms = 80; /* LED pins setup */ - setPinOutput(LED_CAPS_LOCK_PIN); - writePinLow(LED_CAPS_LOCK_PIN); + gpio_set_pin_output(LED_CAPS_LOCK_PIN); + gpio_write_pin_low(LED_CAPS_LOCK_PIN); wait_ms(led_delay_ms); - setPinOutput(LED_NUM_LOCK_PIN); - writePinLow(LED_NUM_LOCK_PIN); + gpio_set_pin_output(LED_NUM_LOCK_PIN); + gpio_write_pin_low(LED_NUM_LOCK_PIN); wait_ms(led_delay_ms); - setPinOutput(LED_SCROLL_LOCK_PIN); - writePinLow(LED_SCROLL_LOCK_PIN); + gpio_set_pin_output(LED_SCROLL_LOCK_PIN); + gpio_write_pin_low(LED_SCROLL_LOCK_PIN); wait_ms(led_delay_ms); - setPinOutput(LED_COMPOSE_PIN); - writePinLow(LED_COMPOSE_PIN); + gpio_set_pin_output(LED_COMPOSE_PIN); + gpio_write_pin_low(LED_COMPOSE_PIN); wait_ms(led_delay_ms); - writePinHigh(LED_COMPOSE_PIN); + gpio_write_pin_high(LED_COMPOSE_PIN); matrix_init_user(); } \ No newline at end of file diff --git a/keyboards/kinesis/nguyenvietyen/matrix.c b/keyboards/kinesis/nguyenvietyen/matrix.c index 4e4ca6f55cc..06b57c7c0bb 100644 --- a/keyboards/kinesis/nguyenvietyen/matrix.c +++ b/keyboards/kinesis/nguyenvietyen/matrix.c @@ -8,10 +8,10 @@ static matrix_row_t read_row(uint8_t row) { // keypad and program buttons if (row == 12) { - return ~(readPin(B4) | (readPin(B5) << 1) | 0b11111100); + return ~(gpio_read_pin(B4) | (gpio_read_pin(B5) << 1) | 0b11111100); } - return ~(readPin(B6) | readPin(B2) << 1 | readPin(B3) << 2 | readPin(B1) << 3 | readPin(F7) << 4 | readPin(F6) << 5 | readPin(F5) << 6 | readPin(F4) << 7); + return ~(gpio_read_pin(B6) | gpio_read_pin(B2) << 1 | gpio_read_pin(B3) << 2 | gpio_read_pin(B1) << 3 | gpio_read_pin(F7) << 4 | gpio_read_pin(F6) << 5 | gpio_read_pin(F5) << 6 | gpio_read_pin(F4) << 7); } static void unselect_rows(void) { @@ -26,24 +26,24 @@ static void select_rows(uint8_t row) { void matrix_init_custom(void) { // output low (multiplexers) - setPinOutput(D0); - setPinOutput(D1); - setPinOutput(D2); - setPinOutput(D3); + gpio_set_pin_output(D0); + gpio_set_pin_output(D1); + gpio_set_pin_output(D2); + gpio_set_pin_output(D3); // input with pullup (matrix) - setPinInputHigh(B6); - setPinInputHigh(B2); - setPinInputHigh(B3); - setPinInputHigh(B1); - setPinInputHigh(F7); - setPinInputHigh(F6); - setPinInputHigh(F5); - setPinInputHigh(F4); + gpio_set_pin_input_high(B6); + gpio_set_pin_input_high(B2); + gpio_set_pin_input_high(B3); + gpio_set_pin_input_high(B1); + gpio_set_pin_input_high(F7); + gpio_set_pin_input_high(F6); + gpio_set_pin_input_high(F5); + gpio_set_pin_input_high(F4); // input with pullup (program and keypad buttons) - setPinInputHigh(B4); - setPinInputHigh(B5); + gpio_set_pin_input_high(B4); + gpio_set_pin_input_high(B5); // initialize row and col unselect_rows(); diff --git a/keyboards/kkatano/wallaby/wallaby.c b/keyboards/kkatano/wallaby/wallaby.c index 4d619bec8e2..de2583903bb 100644 --- a/keyboards/kkatano/wallaby/wallaby.c +++ b/keyboards/kkatano/wallaby/wallaby.c @@ -18,8 +18,8 @@ bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { - writePin(B6, led_state.caps_lock); - writePin(B7, led_state.scroll_lock); + gpio_write_pin(B6, led_state.caps_lock); + gpio_write_pin(B7, led_state.scroll_lock); } return true; } diff --git a/keyboards/kkatano/yurei/yurei.c b/keyboards/kkatano/yurei/yurei.c index 457a6ce48c0..283726a884f 100644 --- a/keyboards/kkatano/yurei/yurei.c +++ b/keyboards/kkatano/yurei/yurei.c @@ -18,8 +18,8 @@ bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { - writePin(B6, led_state.caps_lock); - writePin(B7, led_state.scroll_lock); + gpio_write_pin(B6, led_state.caps_lock); + gpio_write_pin(B7, led_state.scroll_lock); } return true; } diff --git a/keyboards/kopibeng/mnk88/mnk88.c b/keyboards/kopibeng/mnk88/mnk88.c index cb53d315794..efe32f8bfd5 100644 --- a/keyboards/kopibeng/mnk88/mnk88.c +++ b/keyboards/kopibeng/mnk88/mnk88.c @@ -18,8 +18,8 @@ void matrix_init_kb(void) { - setPinOutput(LED_CAPS_LOCK_PIN); - setPinOutput(LED_SCROLL_LOCK_PIN); + gpio_set_pin_output(LED_CAPS_LOCK_PIN); + gpio_set_pin_output(LED_SCROLL_LOCK_PIN); matrix_init_user(); } @@ -29,8 +29,8 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); - writePin(LED_SCROLL_LOCK_PIN, led_state.scroll_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, led_state.caps_lock); + gpio_write_pin(LED_SCROLL_LOCK_PIN, led_state.scroll_lock); } return res; } diff --git a/keyboards/kopibeng/typ65/typ65.c b/keyboards/kopibeng/typ65/typ65.c index 246a8c13af5..53af0ba97d1 100644 --- a/keyboards/kopibeng/typ65/typ65.c +++ b/keyboards/kopibeng/typ65/typ65.c @@ -17,9 +17,9 @@ #include "quantum.h" void keyboard_pre_init_kb (void) { - setPinOutput(INDICATOR_0); - setPinOutput(INDICATOR_1); - setPinOutput(INDICATOR_2); + gpio_set_pin_output(INDICATOR_0); + gpio_set_pin_output(INDICATOR_1); + gpio_set_pin_output(INDICATOR_2); keyboard_pre_init_user(); } @@ -27,41 +27,41 @@ void keyboard_pre_init_kb (void) { __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case 1: - writePinHigh(INDICATOR_0); - writePinLow(INDICATOR_1); - writePinLow(INDICATOR_2); + gpio_write_pin_high(INDICATOR_0); + gpio_write_pin_low(INDICATOR_1); + gpio_write_pin_low(INDICATOR_2); break; case 2: - writePinLow(INDICATOR_0); - writePinHigh(INDICATOR_1); - writePinLow(INDICATOR_2); + gpio_write_pin_low(INDICATOR_0); + gpio_write_pin_high(INDICATOR_1); + gpio_write_pin_low(INDICATOR_2); break; case 3: - writePinLow(INDICATOR_0); - writePinLow(INDICATOR_1); - writePinHigh(INDICATOR_2); + gpio_write_pin_low(INDICATOR_0); + gpio_write_pin_low(INDICATOR_1); + gpio_write_pin_high(INDICATOR_2); break; default: - writePinHigh(INDICATOR_0); - writePinHigh(INDICATOR_1); - writePinHigh(INDICATOR_2); + gpio_write_pin_high(INDICATOR_0); + gpio_write_pin_high(INDICATOR_1); + gpio_write_pin_high(INDICATOR_2); break; } return state; } void suspend_power_down_kb(void) { - writePinLow(INDICATOR_0); - writePinLow(INDICATOR_1); - writePinLow(INDICATOR_2); + gpio_write_pin_low(INDICATOR_0); + gpio_write_pin_low(INDICATOR_1); + gpio_write_pin_low(INDICATOR_2); suspend_power_down_user(); } void suspend_wakeup_init_kb(void) { - writePinHigh(INDICATOR_0); - writePinHigh(INDICATOR_1); - writePinHigh(INDICATOR_2); + gpio_write_pin_high(INDICATOR_0); + gpio_write_pin_high(INDICATOR_1); + gpio_write_pin_high(INDICATOR_2); suspend_wakeup_init_user(); } \ No newline at end of file diff --git a/keyboards/kopibeng/xt8x/xt8x.c b/keyboards/kopibeng/xt8x/xt8x.c index 870a075e5b3..2c4f246b6a2 100644 --- a/keyboards/kopibeng/xt8x/xt8x.c +++ b/keyboards/kopibeng/xt8x/xt8x.c @@ -19,9 +19,9 @@ void matrix_init_kb(void) { // Initialize indicator LEDs to output - setPinOutput(LED_CAPS_LOCK_PIN); // Caps - setPinOutput(LED_SCROLL_LOCK_PIN); // Scroll lock - setPinOutput(INDICATOR_PIN_0); // Layer indicator on F13 + gpio_set_pin_output(LED_CAPS_LOCK_PIN); // Caps + gpio_set_pin_output(LED_SCROLL_LOCK_PIN); // Scroll lock + gpio_set_pin_output(INDICATOR_PIN_0); // Layer indicator on F13 matrix_init_user(); } @@ -31,13 +31,13 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); - writePin(LED_SCROLL_LOCK_PIN, led_state.scroll_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, led_state.caps_lock); + gpio_write_pin(LED_SCROLL_LOCK_PIN, led_state.scroll_lock); } return res; } __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { - writePin(INDICATOR_PIN_0, layer_state_cmp(state, 1)); + gpio_write_pin(INDICATOR_PIN_0, layer_state_cmp(state, 1)); return state; } diff --git a/keyboards/ktec/ergodone/ergodox_compat.h b/keyboards/ktec/ergodone/ergodox_compat.h index de6ee4a211d..b566e6cc94e 100644 --- a/keyboards/ktec/ergodone/ergodox_compat.h +++ b/keyboards/ktec/ergodone/ergodox_compat.h @@ -15,12 +15,12 @@ #endif #define LED_BRIGHTNESS_LO 15 #define LED_BRIGHTNESS_HI 255 -static inline void ergodox_right_led_1_off(void) { setPinOutput(LED_NUM_LOCK_PIN); writePin(LED_NUM_LOCK_PIN, 0); } -static inline void ergodox_right_led_1_on(void) { setPinOutput(LED_NUM_LOCK_PIN); writePin(LED_NUM_LOCK_PIN, 1); } -static inline void ergodox_right_led_2_off(void) { setPinOutput(LED_CAPS_LOCK_PIN); writePin(LED_CAPS_LOCK_PIN, 0); } -static inline void ergodox_right_led_2_on(void) { setPinOutput(LED_CAPS_LOCK_PIN); writePin(LED_CAPS_LOCK_PIN, 1); } -static inline void ergodox_right_led_3_off(void) { setPinOutput(LED_SCROLL_LOCK_PIN); writePin(LED_SCROLL_LOCK_PIN, 0); } -static inline void ergodox_right_led_3_on(void) { setPinOutput(LED_SCROLL_LOCK_PIN); writePin(LED_SCROLL_LOCK_PIN, 1); } +static inline void ergodox_right_led_1_off(void) { gpio_set_pin_output(LED_NUM_LOCK_PIN); gpio_write_pin(LED_NUM_LOCK_PIN, 0); } +static inline void ergodox_right_led_1_on(void) { gpio_set_pin_output(LED_NUM_LOCK_PIN); gpio_write_pin(LED_NUM_LOCK_PIN, 1); } +static inline void ergodox_right_led_2_off(void) { gpio_set_pin_output(LED_CAPS_LOCK_PIN); gpio_write_pin(LED_CAPS_LOCK_PIN, 0); } +static inline void ergodox_right_led_2_on(void) { gpio_set_pin_output(LED_CAPS_LOCK_PIN); gpio_write_pin(LED_CAPS_LOCK_PIN, 1); } +static inline void ergodox_right_led_3_off(void) { gpio_set_pin_output(LED_SCROLL_LOCK_PIN); gpio_write_pin(LED_SCROLL_LOCK_PIN, 0); } +static inline void ergodox_right_led_3_on(void) { gpio_set_pin_output(LED_SCROLL_LOCK_PIN); gpio_write_pin(LED_SCROLL_LOCK_PIN, 1); } static inline void ergodox_right_led_on(uint8_t l) { switch (l) { case 1: @@ -51,8 +51,8 @@ static inline void ergodox_right_led_off(uint8_t l) { break; } } -static inline void ergodox_board_led_off(void) { setPinOutput(D5); writePin(D5, !ERGODOX_BOARD_LED_ON_STATE); } -static inline void ergodox_board_led_on(void) { setPinOutput(D5); writePin(D5, ERGODOX_BOARD_LED_ON_STATE); } +static inline void ergodox_board_led_off(void) { gpio_set_pin_output(D5); gpio_write_pin(D5, !ERGODOX_BOARD_LED_ON_STATE); } +static inline void ergodox_board_led_on(void) { gpio_set_pin_output(D5); gpio_write_pin(D5, ERGODOX_BOARD_LED_ON_STATE); } static inline void ergodox_led_all_on(void) { ergodox_right_led_1_on(); ergodox_right_led_2_on(); diff --git a/keyboards/ktec/ergodone/matrix.c b/keyboards/ktec/ergodone/matrix.c index a9a517f2f12..f034e1f2db1 100644 --- a/keyboards/ktec/ergodone/matrix.c +++ b/keyboards/ktec/ergodone/matrix.c @@ -82,13 +82,13 @@ static void expander_scan(void) { */ static void init_cols(void) { // Pro Micro - setPinInputHigh(E6); - setPinInputHigh(D2); - setPinInputHigh(D3); - setPinInputHigh(D4); - setPinInputHigh(D7); - setPinInputHigh(C6); - setPinInputHigh(B4); + gpio_set_pin_input_high(E6); + gpio_set_pin_input_high(D2); + gpio_set_pin_input_high(D3); + gpio_set_pin_input_high(D4); + gpio_set_pin_input_high(D7); + gpio_set_pin_input_high(C6); + gpio_set_pin_input_high(B4); // Expander expander_init_cols(); @@ -97,13 +97,13 @@ static void init_cols(void) { static matrix_row_t read_cols(void) { // clang-format off return expander_read_row() | - (readPin(D3) ? 0 : (1<<6)) | - (readPin(D2) ? 0 : (1<<5)) | - (readPin(D4) ? 0 : (1<<4)) | - (readPin(C6) ? 0 : (1<<3)) | - (readPin(D7) ? 0 : (1<<2)) | - (readPin(E6) ? 0 : (1<<1)) | - (readPin(B4) ? 0 : (1<<0)) ; + (gpio_read_pin(D3) ? 0 : (1<<6)) | + (gpio_read_pin(D2) ? 0 : (1<<5)) | + (gpio_read_pin(D4) ? 0 : (1<<4)) | + (gpio_read_pin(C6) ? 0 : (1<<3)) | + (gpio_read_pin(D7) ? 0 : (1<<2)) | + (gpio_read_pin(E6) ? 0 : (1<<1)) | + (gpio_read_pin(B4) ? 0 : (1<<0)) ; // clang-format on } @@ -116,18 +116,18 @@ static matrix_row_t read_cols(void) { */ static void unselect_rows(void) { // Pro Micro - setPinInput(B1); - setPinInput(B2); - setPinInput(F4); - setPinInput(F5); - setPinInput(F6); - setPinInput(F7); - writePinLow(B1); - writePinLow(B2); - writePinLow(F4); - writePinLow(F5); - writePinLow(F6); - writePinLow(F7); + gpio_set_pin_input(B1); + gpio_set_pin_input(B2); + gpio_set_pin_input(F4); + gpio_set_pin_input(F5); + gpio_set_pin_input(F6); + gpio_set_pin_input(F7); + gpio_write_pin_low(B1); + gpio_write_pin_low(B2); + gpio_write_pin_low(F4); + gpio_write_pin_low(F5); + gpio_write_pin_low(F6); + gpio_write_pin_low(F7); // Expander expander_unselect_rows(); @@ -137,28 +137,28 @@ static void unselect_row(uint8_t row) { // Pro Micro switch (row) { case 0: - setPinInput(F4); - writePinLow(F4); + gpio_set_pin_input(F4); + gpio_write_pin_low(F4); break; case 1: - setPinInput(F5); - writePinLow(F5); + gpio_set_pin_input(F5); + gpio_write_pin_low(F5); break; case 2: - setPinInput(F6); - writePinLow(F6); + gpio_set_pin_input(F6); + gpio_write_pin_low(F6); break; case 3: - setPinInput(F7); - writePinLow(F7); + gpio_set_pin_input(F7); + gpio_write_pin_low(F7); break; case 4: - setPinInput(B1); - writePinLow(B1); + gpio_set_pin_input(B1); + gpio_write_pin_low(B1); break; case 5: - setPinInput(B2); - writePinLow(B2); + gpio_set_pin_input(B2); + gpio_write_pin_low(B2); break; } @@ -170,28 +170,28 @@ static void select_row(uint8_t row) { // Pro Micro switch (row) { case 0: - setPinOutput(F4); - writePinLow(F4); + gpio_set_pin_output(F4); + gpio_write_pin_low(F4); break; case 1: - setPinOutput(F5); - writePinLow(F5); + gpio_set_pin_output(F5); + gpio_write_pin_low(F5); break; case 2: - setPinOutput(F6); - writePinLow(F6); + gpio_set_pin_output(F6); + gpio_write_pin_low(F6); break; case 3: - setPinOutput(F7); - writePinLow(F7); + gpio_set_pin_output(F7); + gpio_write_pin_low(F7); break; case 4: - setPinOutput(B1); - writePinLow(B1); + gpio_set_pin_output(B1); + gpio_write_pin_low(B1); break; case 5: - setPinOutput(B2); - writePinLow(B2); + gpio_set_pin_output(B2); + gpio_write_pin_low(B2); break; } diff --git a/keyboards/ktec/staryu/backlight_staryu.h b/keyboards/ktec/staryu/backlight_staryu.h index 34511da5c19..aa0092c3c10 100644 --- a/keyboards/ktec/staryu/backlight_staryu.h +++ b/keyboards/ktec/staryu/backlight_staryu.h @@ -20,9 +20,9 @@ along with this program. If not, see . static inline void backlight_set_value(uint8_t index, uint8_t level) { static const uint8_t backlight_pins[] = BACKLIGHT_PINS; if (level) { - setPinOutput(backlight_pins[index]); + gpio_set_pin_output(backlight_pins[index]); } else { - setPinInput(backlight_pins[index]); + gpio_set_pin_input(backlight_pins[index]); } } diff --git a/keyboards/kv/revt/revt.c b/keyboards/kv/revt/revt.c index fba4582c263..df74ca626b8 100644 --- a/keyboards/kv/revt/revt.c +++ b/keyboards/kv/revt/revt.c @@ -18,8 +18,8 @@ void matrix_init_kb(void) { // Turn status LED on - setPinOutput(C14); - writePinHigh(C14); + gpio_set_pin_output(C14); + gpio_write_pin_high(C14); matrix_init_user(); } diff --git a/keyboards/lazydesigners/dimple/staggered/staggered.c b/keyboards/lazydesigners/dimple/staggered/staggered.c index b871868afa7..c354283780b 100644 --- a/keyboards/lazydesigners/dimple/staggered/staggered.c +++ b/keyboards/lazydesigners/dimple/staggered/staggered.c @@ -15,9 +15,9 @@ */ #include "staggered.h" void dimple_led_on(void) { - writePinLow(E6); + gpio_write_pin_low(E6); } void dimple_led_off(void) { - writePinHigh(E6); + gpio_write_pin_high(E6); } diff --git a/keyboards/lfkeyboards/lfk78/lfk78.c b/keyboards/lfkeyboards/lfk78/lfk78.c index 50f1505050b..3bf7c40d15a 100644 --- a/keyboards/lfkeyboards/lfk78/lfk78.c +++ b/keyboards/lfkeyboards/lfk78/lfk78.c @@ -10,8 +10,8 @@ void matrix_init_kb(void) { #ifndef AUDIO_ENABLE // If we're not using the audio pin, drive it low - setPinOutput(C6); - writePinLow(C6); + gpio_set_pin_output(C6); + gpio_write_pin_low(C6); #endif #ifdef WATCHDOG_ENABLE diff --git a/keyboards/lfkeyboards/lfk87/lfk87.c b/keyboards/lfkeyboards/lfk87/lfk87.c index 849f0ebcc56..480a44ea84d 100644 --- a/keyboards/lfkeyboards/lfk87/lfk87.c +++ b/keyboards/lfkeyboards/lfk87/lfk87.c @@ -12,8 +12,8 @@ void matrix_init_kb(void) matrix_init_user(); #ifndef AUDIO_ENABLE // If we're not using the audio pin, drive it low - setPinOutput(C6); - writePinLow(C6); + gpio_set_pin_output(C6); + gpio_write_pin_low(C6); #endif #ifdef WATCHDOG_ENABLE // This is done after turning the layer LED red, if we're caught in a loop diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c index 2ca87cfdb6b..6ac615f871a 100644 --- a/keyboards/lfkeyboards/mini1800/mini1800.c +++ b/keyboards/lfkeyboards/mini1800/mini1800.c @@ -13,8 +13,8 @@ void matrix_init_kb(void) matrix_init_user(); #ifndef AUDIO_ENABLE // If we're not using the audio pin, drive it low - setPinOutput(C6); - writePinLow(C6); + gpio_set_pin_output(C6); + gpio_write_pin_low(C6); #endif _delay_ms(500); #ifdef WATCHDOG_ENABLE diff --git a/keyboards/lfkeyboards/smk65/revb/revb.c b/keyboards/lfkeyboards/smk65/revb/revb.c index 8eb9b9afe20..f519b413b58 100644 --- a/keyboards/lfkeyboards/smk65/revb/revb.c +++ b/keyboards/lfkeyboards/smk65/revb/revb.c @@ -27,12 +27,12 @@ void matrix_init_kb(void) #ifdef AUDIO_ENABLE // audio_init() sets PB5 to output and drives it low, which breaks our matrix // so reset PB5 to input - setPinInput(B5); - writePinHigh(B5); + gpio_set_pin_input(B5); + gpio_write_pin_high(B5); #else // If we're not using the audio pin, drive it low - setPinOutput(C6); - writePinLow(C6); + gpio_set_pin_output(C6); + gpio_write_pin_low(C6); #endif } diff --git a/keyboards/lz/erghost/matrix.c b/keyboards/lz/erghost/matrix.c index 6b7d091cb7e..dd9bb1e1ba2 100644 --- a/keyboards/lz/erghost/matrix.c +++ b/keyboards/lz/erghost/matrix.c @@ -63,103 +63,103 @@ static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static void select_col(uint8_t col) { switch (col) { case 0: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 1: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 2: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 3: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 4: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 5: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 6: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 7: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 8: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 9: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 10: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 11: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 12: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 13: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 14: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 15: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 16: - writePinLow(E6); + gpio_write_pin_low(E6); break; } } @@ -167,130 +167,130 @@ static void select_col(uint8_t col) { static void unselect_col(uint8_t col) { switch (col) { case 0: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 1: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 2: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 3: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 4: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 5: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 6: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 7: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 8: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 9: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 10: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 11: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 12: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 13: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 14: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 15: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 16: - writePinHigh(E6); + gpio_write_pin_high(E6); break; } } static void unselect_cols(void) { //Native - writePinHigh(E6); + gpio_write_pin_high(E6); //Demultiplexer - writePinLow(B0); - writePinLow(F1); - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); + gpio_write_pin_low(B0); + gpio_write_pin_low(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); } static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } - setPinOutput(B5); - setPinOutput(B7); - setPinOutput(F0); - setPinOutput(B0); - setPinOutput(F1); - setPinOutput(E6); + gpio_set_pin_output(B5); + gpio_set_pin_output(B7); + gpio_set_pin_output(F0); + gpio_set_pin_output(B0); + gpio_set_pin_output(F1); + gpio_set_pin_output(E6); } static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { @@ -306,7 +306,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col); } else { diff --git a/keyboards/machkeyboards/mach3/mach3.c b/keyboards/machkeyboards/mach3/mach3.c index 2a417b0a02d..948df5a0667 100644 --- a/keyboards/machkeyboards/mach3/mach3.c +++ b/keyboards/machkeyboards/mach3/mach3.c @@ -35,8 +35,8 @@ led_config_t g_led_config = { { #endif void keyboard_pre_init_kb(void) { - setPinOutput(F5); - writePinHigh(F5); + gpio_set_pin_output(F5); + gpio_write_pin_high(F5); keyboard_pre_init_user(); } diff --git a/keyboards/macrocat/macrocat.c b/keyboards/macrocat/macrocat.c index f00bb014101..0369a130dc0 100644 --- a/keyboards/macrocat/macrocat.c +++ b/keyboards/macrocat/macrocat.c @@ -129,11 +129,11 @@ void encoder_triple_click(void) { void matrix_init_kb(void) { matrix_init_user(); - setPinInputHigh(ENCODER_SWITCH); + gpio_set_pin_input_high(ENCODER_SWITCH); } void matrix_scan_kb(void) { matrix_scan_user(); - if (readPin(ENCODER_SWITCH)) { + if (gpio_read_pin(ENCODER_SWITCH)) { if (encoder_pressed) { // release switch encoder_pressed = 0; encoder_press_combo += 1; diff --git a/keyboards/makeymakey/makeymakey.c b/keyboards/makeymakey/makeymakey.c index 5b8edd46556..bfc8788375f 100644 --- a/keyboards/makeymakey/makeymakey.c +++ b/keyboards/makeymakey/makeymakey.c @@ -26,7 +26,7 @@ void keyboard_post_init_kb(void) { { for(uint8_t col = 0; col < MATRIX_COLS; col++) { - writePinLow(pins[row][col]); //Disable internal pull-up resistors + gpio_write_pin_low(pins[row][col]); //Disable internal pull-up resistors } } @@ -35,8 +35,8 @@ void keyboard_post_init_kb(void) { void cycle_leds(void) { for(uint8_t i = 0; i < 3; i++) { - setPinInput(led_pins[i]); - writePinLow(led_pins[i]); + gpio_set_pin_input(led_pins[i]); + gpio_write_pin_low(led_pins[i]); } led_cycle_counter++; @@ -45,62 +45,62 @@ void cycle_leds(void) { switch (led_cycle_counter) { case 0: if (led_state[0]) { // Up Arrow - setPinInput(led_pins[0]); - writePinLow(led_pins[0]); - setPinOutput(led_pins[1]); - writePinHigh(led_pins[1]); - setPinOutput(led_pins[2]); - writePinLow(led_pins[2]); + gpio_set_pin_input(led_pins[0]); + gpio_write_pin_low(led_pins[0]); + gpio_set_pin_output(led_pins[1]); + gpio_write_pin_high(led_pins[1]); + gpio_set_pin_output(led_pins[2]); + gpio_write_pin_low(led_pins[2]); } break; case 1: if (led_state[1]) { // Down Arrow - setPinOutput(led_pins[0]); - writePinHigh(led_pins[0]); - setPinOutput(led_pins[1]); - writePinLow(led_pins[1]); - setPinInput(led_pins[2]); - writePinLow(led_pins[2]); + gpio_set_pin_output(led_pins[0]); + gpio_write_pin_high(led_pins[0]); + gpio_set_pin_output(led_pins[1]); + gpio_write_pin_low(led_pins[1]); + gpio_set_pin_input(led_pins[2]); + gpio_write_pin_low(led_pins[2]); } break; case 2: if (led_state[2]) { // Left Arrow - setPinOutput(led_pins[0]); - writePinLow(led_pins[0]); - setPinOutput(led_pins[1]); - writePinHigh(led_pins[1]); - setPinInput(led_pins[2]); - writePinLow(led_pins[2]); + gpio_set_pin_output(led_pins[0]); + gpio_write_pin_low(led_pins[0]); + gpio_set_pin_output(led_pins[1]); + gpio_write_pin_high(led_pins[1]); + gpio_set_pin_input(led_pins[2]); + gpio_write_pin_low(led_pins[2]); } break; case 3: if (led_state[3]) { // Right Arrow - setPinInput(led_pins[0]); - writePinLow(led_pins[0]); - setPinOutput(led_pins[1]); - writePinLow(led_pins[1]); - setPinOutput(led_pins[2]); - writePinHigh(led_pins[2]); + gpio_set_pin_input(led_pins[0]); + gpio_write_pin_low(led_pins[0]); + gpio_set_pin_output(led_pins[1]); + gpio_write_pin_low(led_pins[1]); + gpio_set_pin_output(led_pins[2]); + gpio_write_pin_high(led_pins[2]); } break; case 4: if (led_state[4]) { // Space - setPinOutput(led_pins[0]); - writePinLow(led_pins[0]); - setPinInput(led_pins[1]); - writePinLow(led_pins[1]); - setPinOutput(led_pins[2]); - writePinHigh(led_pins[2]); + gpio_set_pin_output(led_pins[0]); + gpio_write_pin_low(led_pins[0]); + gpio_set_pin_input(led_pins[1]); + gpio_write_pin_low(led_pins[1]); + gpio_set_pin_output(led_pins[2]); + gpio_write_pin_high(led_pins[2]); } break; case 5: if (led_state[5]) { // Right Click - setPinOutput(led_pins[0]); - writePinHigh(led_pins[0]); - setPinInput(led_pins[1]); - writePinLow(led_pins[1]); - setPinOutput(led_pins[2]); - writePinLow(led_pins[2]); + gpio_set_pin_output(led_pins[0]); + gpio_write_pin_high(led_pins[0]); + gpio_set_pin_input(led_pins[1]); + gpio_write_pin_low(led_pins[1]); + gpio_set_pin_output(led_pins[2]); + gpio_write_pin_low(led_pins[2]); } break; default: diff --git a/keyboards/mariorion_v25/mariorion_v25.c b/keyboards/mariorion_v25/mariorion_v25.c index 7c57c29dfd1..07a19999159 100644 --- a/keyboards/mariorion_v25/mariorion_v25.c +++ b/keyboards/mariorion_v25/mariorion_v25.c @@ -23,50 +23,50 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(INDICATOR_0); - setPinOutput(INDICATOR_1); - setPinOutput(INDICATOR_2); + gpio_set_pin_output(INDICATOR_0); + gpio_set_pin_output(INDICATOR_1); + gpio_set_pin_output(INDICATOR_2); matrix_init_user(); } layer_state_t layer_state_set_kb(layer_state_t state) { switch (get_highest_layer(state)) { case 1: - writePinHigh(INDICATOR_0); - writePinLow(INDICATOR_1); - writePinLow(INDICATOR_2); + gpio_write_pin_high(INDICATOR_0); + gpio_write_pin_low(INDICATOR_1); + gpio_write_pin_low(INDICATOR_2); break; case 2: - writePinLow(INDICATOR_0); - writePinHigh(INDICATOR_1); - writePinLow(INDICATOR_2); + gpio_write_pin_low(INDICATOR_0); + gpio_write_pin_high(INDICATOR_1); + gpio_write_pin_low(INDICATOR_2); break; case 3: - writePinLow(INDICATOR_0); - writePinLow(INDICATOR_1); - writePinHigh(INDICATOR_2); + gpio_write_pin_low(INDICATOR_0); + gpio_write_pin_low(INDICATOR_1); + gpio_write_pin_high(INDICATOR_2); break; default: - writePinHigh(INDICATOR_0); - writePinHigh(INDICATOR_1); - writePinHigh(INDICATOR_2); + gpio_write_pin_high(INDICATOR_0); + gpio_write_pin_high(INDICATOR_1); + gpio_write_pin_high(INDICATOR_2); break; } return layer_state_set_user(state); } void suspend_power_down_kb(void) { - writePinLow(INDICATOR_0); - writePinLow(INDICATOR_1); - writePinLow(INDICATOR_2); + gpio_write_pin_low(INDICATOR_0); + gpio_write_pin_low(INDICATOR_1); + gpio_write_pin_low(INDICATOR_2); suspend_power_down_user(); } void suspend_wakeup_init_kb(void) { - writePinHigh(INDICATOR_0); - writePinHigh(INDICATOR_1); - writePinHigh(INDICATOR_2); + gpio_write_pin_high(INDICATOR_0); + gpio_write_pin_high(INDICATOR_1); + gpio_write_pin_high(INDICATOR_2); suspend_wakeup_init_user(); } diff --git a/keyboards/marksard/leftover30/leftover30.c b/keyboards/marksard/leftover30/leftover30.c index 6d8b64cd906..cea0de703ab 100644 --- a/keyboards/marksard/leftover30/leftover30.c +++ b/keyboards/marksard/leftover30/leftover30.c @@ -22,16 +22,16 @@ void keyboard_pre_init_user(void) { /* Set CAPSLOCK indicator pin as output */ - setPinOutput(D1); + gpio_set_pin_output(D1); /* Set NUMLOCK indicator pin as output */ - setPinOutput(D2); + gpio_set_pin_output(D2); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(D2, led_state.num_lock); - writePin(D1, led_state.caps_lock); + gpio_write_pin(D2, led_state.num_lock); + gpio_write_pin(D1, led_state.caps_lock); } return res; } diff --git a/keyboards/masterworks/classy_tkl/rev_a/rev_a.c b/keyboards/masterworks/classy_tkl/rev_a/rev_a.c index 3a3446d7ae9..6e01c217d2d 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/rev_a.c +++ b/keyboards/masterworks/classy_tkl/rev_a/rev_a.c @@ -26,8 +26,8 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(CAPS_PIN); - setPinOutput(SCROLL_PIN); + gpio_set_pin_output(CAPS_PIN); + gpio_set_pin_output(SCROLL_PIN); matrix_init_user(); } @@ -35,8 +35,8 @@ void matrix_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(CAPS_PIN, led_state.caps_lock); - writePin(SCROLL_PIN, led_state.scroll_lock); + gpio_write_pin(CAPS_PIN, led_state.caps_lock); + gpio_write_pin(SCROLL_PIN, led_state.scroll_lock); } return res; } diff --git a/keyboards/matrix/cain_re/cain_re.c b/keyboards/matrix/cain_re/cain_re.c index 5151f021bac..6dc24f22926 100644 --- a/keyboards/matrix/cain_re/cain_re.c +++ b/keyboards/matrix/cain_re/cain_re.c @@ -21,9 +21,9 @@ void matrix_init_kb(void) { - setPinOutput(NUM_PIN); - setPinOutput(CAPS_PIN); - setPinOutput(SCROLL_PIN); + gpio_set_pin_output(NUM_PIN); + gpio_set_pin_output(CAPS_PIN); + gpio_set_pin_output(SCROLL_PIN); matrix_init_user(); } @@ -32,9 +32,9 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - writePin(NUM_PIN, led_state.num_lock); - writePin(CAPS_PIN, led_state.caps_lock); - writePin(SCROLL_PIN, led_state.scroll_lock); + gpio_write_pin(NUM_PIN, led_state.num_lock); + gpio_write_pin(CAPS_PIN, led_state.caps_lock); + gpio_write_pin(SCROLL_PIN, led_state.scroll_lock); } return res; } diff --git a/keyboards/matrix/falcon/falcon.c b/keyboards/matrix/falcon/falcon.c index 33d05a8a295..74677ab0d1f 100644 --- a/keyboards/matrix/falcon/falcon.c +++ b/keyboards/matrix/falcon/falcon.c @@ -18,11 +18,11 @@ void matrix_init_kb(void) { // enable charge - setPinOutput(CHG_EN_PIN); - writePinHigh(CHG_EN_PIN); + gpio_set_pin_output(CHG_EN_PIN); + gpio_write_pin_high(CHG_EN_PIN); // enable led power - setPinOutput(LED_POWER_PIN); - writePinHigh(LED_POWER_PIN); + gpio_set_pin_output(LED_POWER_PIN); + gpio_write_pin_high(LED_POWER_PIN); } diff --git a/keyboards/matrix/m12og/rev1/matrix.c b/keyboards/matrix/m12og/rev1/matrix.c index c127aa35b90..3317abbe290 100644 --- a/keyboards/matrix/m12og/rev1/matrix.c +++ b/keyboards/matrix/m12og/rev1/matrix.c @@ -22,22 +22,22 @@ static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinHigh(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_high(col_pins[col]); } -static void unselect_col(uint8_t col) { setPinInputLow(col_pins[col]); } +static void unselect_col(uint8_t col) { gpio_set_pin_input_low(col_pins[col]); } static void unselect_cols(void) { for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputLow(col_pins[x]); + gpio_set_pin_input_low(col_pins[x]); } } static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputLow(row_pins[x]); + gpio_set_pin_input_low(row_pins[x]); } } @@ -55,7 +55,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t current_row_value = last_row_value; // Check row pin state - if (readPin(row_pins[row_index]) != 0) { + if (gpio_read_pin(row_pins[row_index]) != 0) { // Pin LO, set col bit current_row_value |= (MATRIX_ROW_SHIFTER << current_col); } else { diff --git a/keyboards/matrix/m12og/rev1/rev1.c b/keyboards/matrix/m12og/rev1/rev1.c index f517703c605..7506edc8e9a 100644 --- a/keyboards/matrix/m12og/rev1/rev1.c +++ b/keyboards/matrix/m12og/rev1/rev1.c @@ -17,7 +17,7 @@ #include "quantum.h" void board_init(void) { - writePinLow(A8); + gpio_write_pin_low(A8); } void bootloader_jump(void) { diff --git a/keyboards/matrix/m12og/rev2/rev2.c b/keyboards/matrix/m12og/rev2/rev2.c index fb424b164fb..bf6129c8063 100644 --- a/keyboards/matrix/m12og/rev2/rev2.c +++ b/keyboards/matrix/m12og/rev2/rev2.c @@ -4,20 +4,20 @@ #include "quantum.h" -void matrix_init_kb(void) { - setPinOutput(C6); - setPinOutput(B2); - setPinOutput(B1); - - matrix_init_user(); +void matrix_init_user(void) { + gpio_set_pin_output(C6); + gpio_set_pin_output(B2); + gpio_set_pin_output(B1); + + matrix_init_user(); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - writePin(B1, !led_state.num_lock); - writePin(C6, !led_state.caps_lock); - writePin(B2, !led_state.scroll_lock); + gpio_write_pin(B1, !led_state.num_lock); + gpio_write_pin(C6, !led_state.caps_lock); + gpio_write_pin(B2, !led_state.scroll_lock); } return res; } diff --git a/keyboards/mc_76k/mc_76k.c b/keyboards/mc_76k/mc_76k.c index 51e9d554064..44d2374b1c2 100644 --- a/keyboards/mc_76k/mc_76k.c +++ b/keyboards/mc_76k/mc_76k.c @@ -17,18 +17,18 @@ #include "quantum.h" void keyboard_pre_init_kb (void) { - setPinOutput(D2); + gpio_set_pin_output(D2); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - // writePin sets the pin high for 1 and low for 0. + // gpio_write_pin sets the pin high for 1 and low for 0. // In this example the pins are inverted, setting // it low/0 turns it on, and high/1 turns the LED off. // This behavior depends on whether the LED is between the pin // and VCC or the pin and GND. - writePin(D2, !led_state.caps_lock); + gpio_write_pin(D2, !led_state.caps_lock); } return res; } diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c b/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c index 864de5e6603..c7807bbc903 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c @@ -37,7 +37,7 @@ static void init_pins(void) { for (int col = 0; col < MATRIX_COLS; col++) { pin_t pin = direct_pins[row][col]; if (pin != NO_PIN) { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } } @@ -50,7 +50,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { pin_t pin = direct_pins[current_row][col_index]; if (pin != NO_PIN) { - current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); + current_matrix[current_row] |= gpio_read_pin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); } } @@ -97,94 +97,94 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) static void select_col(uint8_t col) { switch (col) { case 0: - writePinLow(F4); - writePinLow(F1); - writePinHigh(F0); - writePinHigh(F5); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F5); break; case 1: - writePinLow(F4); - writePinHigh(F1); - writePinLow(F0); - writePinHigh(F5); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_low(F0); + gpio_write_pin_high(F5); break; case 2: - writePinLow(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinHigh(F5); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F5); break; case 3: - writePinHigh(F4); - writePinLow(F1); - writePinLow(F0); - writePinHigh(F5); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_high(F5); break; case 4: - writePinHigh(F4); - writePinLow(F1); - writePinHigh(F0); - writePinHigh(F5); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F5); break; case 5: - writePinHigh(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinHigh(F5); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F5); break; case 6: - writePinHigh(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinHigh(F6); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F6); break; case 7: - writePinLow(F4); - writePinLow(F1); - writePinLow(F0); - writePinHigh(F6); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_high(F6); break; case 8: - writePinLow(F4); - writePinLow(F1); - writePinHigh(F0); - writePinHigh(F6); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F6); break; case 9: - writePinLow(F4); - writePinHigh(F1); - writePinLow(F0); - writePinHigh(F6); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_low(F0); + gpio_write_pin_high(F6); break; case 10: - writePinLow(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinHigh(F6); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F6); break; case 11: - writePinHigh(F4); - writePinLow(F1); - writePinLow(F0); - writePinHigh(F6); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_high(F6); break; case 12: - writePinHigh(F4); - writePinLow(F1); - writePinHigh(F0); - writePinHigh(F6); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_high(F0); + gpio_write_pin_high(F6); break; case 13: - writePinHigh(F4); - writePinHigh(F1); - writePinLow(F0); - writePinHigh(F6); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_low(F0); + gpio_write_pin_high(F6); break; case 14: - writePinLow(F4); - writePinLow(F1); - writePinLow(F0); - writePinHigh(F5); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_high(F5); break; } } @@ -192,94 +192,94 @@ static void select_col(uint8_t col) { static void unselect_col(uint8_t col) { switch (col) { case 0: - writePinHigh(F4); - writePinHigh(F1); - writePinLow(F0); - writePinLow(F5); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F5); break; case 1: - writePinHigh(F4); - writePinLow(F1); - writePinHigh(F0); - writePinLow(F5); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_high(F0); + gpio_write_pin_low(F5); break; case 2: - writePinHigh(F4); - writePinLow(F1); - writePinLow(F0); - writePinLow(F5); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F5); break; case 3: - writePinLow(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinLow(F5); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_low(F5); break; case 4: - writePinLow(F4); - writePinHigh(F1); - writePinLow(F0); - writePinLow(F5); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F5); break; case 5: - writePinLow(F4); - writePinLow(F1); - writePinLow(F0); - writePinLow(F5); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F5); break; case 6: - writePinLow(F4); - writePinLow(F1); - writePinLow(F0); - writePinLow(F6); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F6); break; case 7: - writePinHigh(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinLow(F6); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_low(F6); break; case 8: - writePinHigh(F4); - writePinHigh(F1); - writePinLow(F0); - writePinLow(F6); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F6); break; case 9: - writePinHigh(F4); - writePinLow(F1); - writePinHigh(F0); - writePinLow(F6); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_high(F0); + gpio_write_pin_low(F6); break; case 10: - writePinHigh(F4); - writePinLow(F1); - writePinLow(F0); - writePinLow(F6); + gpio_write_pin_high(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F6); break; case 11: - writePinLow(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinLow(F6); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_low(F6); break; case 12: - writePinLow(F4); - writePinHigh(F1); - writePinLow(F0); - writePinLow(F6); + gpio_write_pin_low(F4); + gpio_write_pin_high(F1); + gpio_write_pin_low(F0); + gpio_write_pin_low(F6); break; case 13: - writePinLow(F4); - writePinLow(F1); - writePinHigh(F0); - writePinLow(F6); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_high(F0); + gpio_write_pin_low(F6); break; case 14: - writePinHigh(F4); - writePinHigh(F1); - writePinHigh(F0); - writePinLow(F5); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F0); + gpio_write_pin_low(F5); break; } } @@ -287,23 +287,23 @@ static void unselect_col(uint8_t col) { static void unselect_cols(void) { //Demultiplexer - writePinHigh(F0); - writePinHigh(F1); - writePinHigh(F4); - writePinLow(F5); - writePinLow(F6); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); + gpio_write_pin_high(F4); + gpio_write_pin_low(F5); + gpio_write_pin_low(F6); } static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } - setPinOutput(F0); - setPinOutput(F1); - setPinOutput(F4); - setPinOutput(F5); - setPinOutput(F6); + gpio_set_pin_output(F0); + gpio_set_pin_output(F1); + gpio_set_pin_output(F4); + gpio_set_pin_output(F5); + gpio_set_pin_output(F6); } static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { @@ -319,7 +319,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col); } else { diff --git a/keyboards/mechlovin/hannah910/hannah910.c b/keyboards/mechlovin/hannah910/hannah910.c index 0208e163482..c372c98ce07 100644 --- a/keyboards/mechlovin/hannah910/hannah910.c +++ b/keyboards/mechlovin/hannah910/hannah910.c @@ -16,17 +16,17 @@ #include "quantum.h" void led_init_ports(void) { - setPinOutput(B2); - setPinOutput(D0); - setPinOutput(D1); - setPinOutput(D2); + gpio_set_pin_output(B2); + gpio_set_pin_output(D0); + gpio_set_pin_output(D1); + gpio_set_pin_output(D2); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B2, led_state.caps_lock); + gpio_write_pin(B2, led_state.caps_lock); } return res; } @@ -35,22 +35,22 @@ layer_state_t layer_state_set_user(layer_state_t state) { // if on layer 1, turn on D2 LED, otherwise off. if (get_highest_layer(state) == 1) { - writePinHigh(D2); + gpio_write_pin_high(D2); } else { - writePinLow(D2); + gpio_write_pin_low(D2); } // if on layer 2, turn on D1 LED, otherwise off. if (get_highest_layer(state) == 2) { - writePinHigh(D1); + gpio_write_pin_high(D1); } else { - writePinLow(D1); + gpio_write_pin_low(D1); } // if on layer 3, turn on D0 LED, otherwise off. if (get_highest_layer(state) == 3) { - writePinHigh(D0); + gpio_write_pin_high(D0); } else { - writePinLow(D0); + gpio_write_pin_low(D0); } return state; diff --git a/keyboards/mechlovin/infinity87/rev2/matrix.c b/keyboards/mechlovin/infinity87/rev2/matrix.c index 62a56f687cb..16bee61ad0e 100644 --- a/keyboards/mechlovin/infinity87/rev2/matrix.c +++ b/keyboards/mechlovin/infinity87/rev2/matrix.c @@ -37,7 +37,7 @@ static void init_pins(void) { for (int col = 0; col < MATRIX_COLS; col++) { pin_t pin = direct_pins[row][col]; if (pin != NO_PIN) { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } } @@ -50,7 +50,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { pin_t pin = direct_pins[current_row][col_index]; if (pin != NO_PIN) { - current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); + current_matrix[current_row] |= gpio_read_pin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); } } @@ -101,103 +101,103 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) static void select_col(uint8_t col) { switch (col) { case 0: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 1: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 2: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 3: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 4: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 5: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 6: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 7: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 8: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 9: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 10: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 11: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 12: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 13: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 14: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 15: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 16: - writePinLow(E6); + gpio_write_pin_low(E6); break; } } @@ -205,130 +205,130 @@ static void select_col(uint8_t col) { static void unselect_col(uint8_t col) { switch (col) { case 0: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 1: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 2: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 3: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 4: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 5: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 6: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 7: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 8: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 9: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 10: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 11: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 12: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 13: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 14: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 15: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 16: - writePinHigh(E6); + gpio_write_pin_high(E6); break; } } static void unselect_cols(void) { //Native - writePinHigh(E6); + gpio_write_pin_high(E6); //Demultiplexer - writePinLow(B0); - writePinLow(F1); - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); + gpio_write_pin_low(B0); + gpio_write_pin_low(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); } static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } - setPinOutput(B5); - setPinOutput(B7); - setPinOutput(F0); - setPinOutput(B0); - setPinOutput(F1); - setPinOutput(E6); + gpio_set_pin_output(B5); + gpio_set_pin_output(B7); + gpio_set_pin_output(F0); + gpio_set_pin_output(B0); + gpio_set_pin_output(F1); + gpio_set_pin_output(E6); } static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { @@ -344,7 +344,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col); } else { diff --git a/keyboards/mechlovin/infinity875/matrix.c b/keyboards/mechlovin/infinity875/matrix.c index 62a56f687cb..16bee61ad0e 100644 --- a/keyboards/mechlovin/infinity875/matrix.c +++ b/keyboards/mechlovin/infinity875/matrix.c @@ -37,7 +37,7 @@ static void init_pins(void) { for (int col = 0; col < MATRIX_COLS; col++) { pin_t pin = direct_pins[row][col]; if (pin != NO_PIN) { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } } @@ -50,7 +50,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { pin_t pin = direct_pins[current_row][col_index]; if (pin != NO_PIN) { - current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); + current_matrix[current_row] |= gpio_read_pin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); } } @@ -101,103 +101,103 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) static void select_col(uint8_t col) { switch (col) { case 0: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 1: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 2: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 3: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 4: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 5: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 6: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 7: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 8: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 9: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 10: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 11: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 12: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 13: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 14: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 15: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 16: - writePinLow(E6); + gpio_write_pin_low(E6); break; } } @@ -205,130 +205,130 @@ static void select_col(uint8_t col) { static void unselect_col(uint8_t col) { switch (col) { case 0: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 1: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 2: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 3: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 4: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 5: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 6: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 7: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 8: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 9: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 10: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 11: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 12: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 13: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 14: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 15: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 16: - writePinHigh(E6); + gpio_write_pin_high(E6); break; } } static void unselect_cols(void) { //Native - writePinHigh(E6); + gpio_write_pin_high(E6); //Demultiplexer - writePinLow(B0); - writePinLow(F1); - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); + gpio_write_pin_low(B0); + gpio_write_pin_low(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); } static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } - setPinOutput(B5); - setPinOutput(B7); - setPinOutput(F0); - setPinOutput(B0); - setPinOutput(F1); - setPinOutput(E6); + gpio_set_pin_output(B5); + gpio_set_pin_output(B7); + gpio_set_pin_output(F0); + gpio_set_pin_output(B0); + gpio_set_pin_output(F1); + gpio_set_pin_output(E6); } static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { @@ -344,7 +344,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col); } else { diff --git a/keyboards/mechlovin/infinityce/infinityce.c b/keyboards/mechlovin/infinityce/infinityce.c index 36f533fc2ac..f1a9181a963 100644 --- a/keyboards/mechlovin/infinityce/infinityce.c +++ b/keyboards/mechlovin/infinityce/infinityce.c @@ -18,12 +18,12 @@ void led_init_ports(void) { // * Set our LED pins as output - setPinOutput(B3); + gpio_set_pin_output(B3); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B3, led_state.caps_lock); + gpio_write_pin(B3, led_state.caps_lock); rgblight_set_effect_range(1, 30); if (led_state.scroll_lock) { rgblight_setrgb_at(255, 255, 255, 0); diff --git a/keyboards/mechlovin/kanu/kanu.c b/keyboards/mechlovin/kanu/kanu.c index 67bf8f88fb7..8622a38a22c 100644 --- a/keyboards/mechlovin/kanu/kanu.c +++ b/keyboards/mechlovin/kanu/kanu.c @@ -17,15 +17,15 @@ #include "quantum.h" void led_init_ports(void) { - setPinOutput(B2); - setPinOutput(D0); - setPinOutput(D1); - setPinOutput(D2); + gpio_set_pin_output(B2); + gpio_set_pin_output(D0); + gpio_set_pin_output(D1); + gpio_set_pin_output(D2); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(B2, led_state.caps_lock); + gpio_write_pin(B2, led_state.caps_lock); } return true; @@ -34,10 +34,10 @@ bool led_update_kb(led_t led_state) { __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { // if on layer 1, turn on D2 LED, otherwise off. - writePin(D2, get_highest_layer(state) == 1); + gpio_write_pin(D2, get_highest_layer(state) == 1); // if on layer 2, turn on D1 LED, otherwise off. - writePin(D1, get_highest_layer(state) == 2); + gpio_write_pin(D1, get_highest_layer(state) == 2); // if on layer 3, turn on D0 LED, otherwise off. - writePin(D0, get_highest_layer(state) == 3); + gpio_write_pin(D0, get_highest_layer(state) == 3); return state; } diff --git a/keyboards/mechlovin/kay65/kay65.c b/keyboards/mechlovin/kay65/kay65.c index 591c618c6c8..f59f23e13d9 100644 --- a/keyboards/mechlovin/kay65/kay65.c +++ b/keyboards/mechlovin/kay65/kay65.c @@ -21,5 +21,5 @@ void keyboard_pre_init_user(void) { // Call the keyboard pre init code. // Set our LED pins as output - setPinOutput(D7); + gpio_set_pin_output(D7); } diff --git a/keyboards/mechlovin/olly/bb/bb.c b/keyboards/mechlovin/olly/bb/bb.c index dac77ff6236..f9dcf211a15 100644 --- a/keyboards/mechlovin/olly/bb/bb.c +++ b/keyboards/mechlovin/olly/bb/bb.c @@ -17,19 +17,19 @@ #include "quantum.h" void led_init_ports(void) { - setPinOutput(C0); - setPinOutput(D0); - setPinOutput(D1); - setPinOutput(C1); - setPinOutput(C6); + gpio_set_pin_output(C0); + gpio_set_pin_output(D0); + gpio_set_pin_output(D1); + gpio_set_pin_output(C1); + gpio_set_pin_output(C6); } __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { - writePin(D1, layer_state_cmp(state, 1)); - writePin(D0, layer_state_cmp(state, 2)); - writePin(C1, layer_state_cmp(state, 3)); - writePin(C0, layer_state_cmp(state, 4)); - writePin(C6, layer_state_cmp(state, 5)); + gpio_write_pin(D1, layer_state_cmp(state, 1)); + gpio_write_pin(D0, layer_state_cmp(state, 2)); + gpio_write_pin(C1, layer_state_cmp(state, 3)); + gpio_write_pin(C0, layer_state_cmp(state, 4)); + gpio_write_pin(C6, layer_state_cmp(state, 5)); return state; } diff --git a/keyboards/mechlovin/olly/bb/matrix.c b/keyboards/mechlovin/olly/bb/matrix.c index e045299bae2..ecb6cf9e746 100644 --- a/keyboards/mechlovin/olly/bb/matrix.c +++ b/keyboards/mechlovin/olly/bb/matrix.c @@ -67,109 +67,109 @@ static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static void select_col(uint8_t col) { switch (col) { case 0: - writePinLow(A0); - writePinLow(A1); - writePinLow(A2); - writePinHigh(B4); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(B4); break; case 1: - writePinLow(A0); - writePinLow(A1); - writePinHigh(A2); - writePinHigh(B4); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(B4); break; case 2: - writePinLow(A0); - writePinHigh(A1); - writePinLow(A2); - writePinHigh(B4); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(B4); break; case 3: - writePinLow(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinHigh(B4); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(B4); break; case 4: - writePinHigh(A0); - writePinLow(A1); - writePinLow(A2); - writePinHigh(B4); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(B4); break; case 5: - writePinHigh(A0); - writePinLow(A1); - writePinHigh(A2); - writePinHigh(B4); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(B4); break; case 6: - writePinHigh(A0); - writePinHigh(A1); - writePinLow(A2); - writePinHigh(B4); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(B4); break; case 7: - writePinHigh(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinHigh(B4); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(B4); break; case 8: - writePinHigh(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinHigh(C7); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(C7); break; case 9: - writePinLow(A0); - writePinLow(A1); - writePinLow(A2); - writePinHigh(C7); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(C7); break; case 10: - writePinLow(A0); - writePinLow(A1); - writePinHigh(A2); - writePinHigh(C7); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(C7); break; case 11: - writePinLow(A0); - writePinHigh(A1); - writePinLow(A2); - writePinHigh(C7); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(C7); break; case 12: - writePinLow(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinHigh(C7); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(C7); break; case 13: - writePinHigh(A0); - writePinLow(A1); - writePinLow(A2); - writePinHigh(C7); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(C7); break; case 14: - writePinHigh(A0); - writePinLow(A1); - writePinHigh(A2); - writePinHigh(C7); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(C7); break; case 15: - writePinHigh(A0); - writePinHigh(A1); - writePinLow(A2); - writePinHigh(C7); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(C7); break; case 16: - writePinLow(C2); + gpio_write_pin_low(C2); break; case 17: - writePinLow(C3); + gpio_write_pin_low(C3); break; case 18: - writePinLow(C5); + gpio_write_pin_low(C5); break; } } @@ -177,140 +177,140 @@ static void select_col(uint8_t col) { static void unselect_col(uint8_t col) { switch (col) { case 0: - writePinHigh(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinLow(B4); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(B4); break; case 1: - writePinHigh(A0); - writePinHigh(A1); - writePinLow(A2); - writePinLow(B4); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(B4); break; case 2: - writePinHigh(A0); - writePinLow(A1); - writePinHigh(A2); - writePinLow(B4); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(B4); break; case 3: - writePinHigh(A0); - writePinLow(A1); - writePinLow(A2); - writePinLow(B4); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(B4); break; case 4: - writePinLow(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinLow(B4); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(B4); break; case 5: - writePinLow(A0); - writePinHigh(A1); - writePinLow(A2); - writePinLow(B4); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(B4); break; case 6: - writePinLow(A0); - writePinLow(A1); - writePinHigh(A2); - writePinLow(B4); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(B4); break; case 7: - writePinLow(A0); - writePinLow(A1); - writePinLow(A2); - writePinLow(B4); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(B4); break; case 8: - writePinLow(A0); - writePinLow(A1); - writePinLow(A2); - writePinLow(C7); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(C7); break; case 9: - writePinHigh(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinLow(C7); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(C7); break; case 10: - writePinHigh(A0); - writePinHigh(A1); - writePinLow(A2); - writePinLow(C7); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(C7); break; case 11: - writePinHigh(A0); - writePinLow(A1); - writePinHigh(A2); - writePinLow(C7); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(C7); break; case 12: - writePinHigh(A0); - writePinLow(A1); - writePinLow(A2); - writePinLow(C7); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(C7); break; case 13: - writePinLow(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinLow(C7); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(C7); break; case 14: - writePinLow(A0); - writePinHigh(A1); - writePinLow(A2); - writePinLow(C7); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(C7); break; case 15: - writePinLow(A0); - writePinLow(A1); - writePinHigh(A2); - writePinLow(C7); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(C7); break; case 16: - writePinHigh(C2); + gpio_write_pin_high(C2); break; case 17: - writePinHigh(C3); + gpio_write_pin_high(C3); break; case 18: - writePinHigh(C5); + gpio_write_pin_high(C5); break; } } static void unselect_cols(void) { //Native - writePinHigh(C2); - writePinHigh(C3); - writePinHigh(C5); + gpio_write_pin_high(C2); + gpio_write_pin_high(C3); + gpio_write_pin_high(C5); //Demultiplexer - writePinLow(B4); - writePinLow(C7); - writePinHigh(A0); - writePinHigh(A1); - writePinHigh(A2); + gpio_write_pin_low(B4); + gpio_write_pin_low(C7); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); } static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } - setPinOutput(A0); - setPinOutput(A1); - setPinOutput(A2); - setPinOutput(B4); - setPinOutput(C7); - setPinOutput(C2); - setPinOutput(C3); - setPinOutput(C5); + gpio_set_pin_output(A0); + gpio_set_pin_output(A1); + gpio_set_pin_output(A2); + gpio_set_pin_output(B4); + gpio_set_pin_output(C7); + gpio_set_pin_output(C2); + gpio_set_pin_output(C3); + gpio_set_pin_output(C5); } static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { @@ -326,7 +326,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col); } else { diff --git a/keyboards/mechlovin/olly/jf/rev1/matrix.c b/keyboards/mechlovin/olly/jf/rev1/matrix.c index 2abda55d0e8..8d1f80ea71b 100644 --- a/keyboards/mechlovin/olly/jf/rev1/matrix.c +++ b/keyboards/mechlovin/olly/jf/rev1/matrix.c @@ -37,7 +37,7 @@ static void init_pins(void) { for (int col = 0; col < MATRIX_COLS; col++) { pin_t pin = direct_pins[row][col]; if (pin != NO_PIN) { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } } @@ -50,7 +50,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { pin_t pin = direct_pins[current_row][col_index]; if (pin != NO_PIN) { - current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); + current_matrix[current_row] |= gpio_read_pin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); } } @@ -60,22 +60,22 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) #elif (DIODE_DIRECTION == COL2ROW) static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } -static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); } +static void unselect_row(uint8_t row) { gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void init_pins(void) { unselect_rows(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -94,7 +94,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); @@ -154,109 +154,109 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) static void select_col(uint8_t col) { switch (col) { case 0: - writePinLow(A0); - writePinLow(A1); - writePinLow(A2); - writePinHigh(B4); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(B4); break; case 1: - writePinLow(A0); - writePinLow(A1); - writePinHigh(A2); - writePinHigh(B4); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(B4); break; case 2: - writePinLow(A0); - writePinHigh(A1); - writePinLow(A2); - writePinHigh(B4); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(B4); break; case 3: - writePinLow(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinHigh(B4); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(B4); break; case 4: - writePinHigh(A0); - writePinLow(A1); - writePinLow(A2); - writePinHigh(B4); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(B4); break; case 5: - writePinHigh(A0); - writePinLow(A1); - writePinHigh(A2); - writePinHigh(B4); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(B4); break; case 6: - writePinHigh(A0); - writePinHigh(A1); - writePinLow(A2); - writePinHigh(B4); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(B4); break; case 7: - writePinHigh(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinHigh(B4); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(B4); break; case 8: - writePinHigh(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinHigh(C7); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(C7); break; case 9: - writePinLow(A0); - writePinLow(A1); - writePinLow(A2); - writePinHigh(C7); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(C7); break; case 10: - writePinLow(A0); - writePinLow(A1); - writePinHigh(A2); - writePinHigh(C7); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(C7); break; case 11: - writePinLow(A0); - writePinHigh(A1); - writePinLow(A2); - writePinHigh(C7); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(C7); break; case 12: - writePinLow(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinHigh(C7); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(C7); break; case 13: - writePinHigh(A0); - writePinLow(A1); - writePinLow(A2); - writePinHigh(C7); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(C7); break; case 14: - writePinHigh(A0); - writePinLow(A1); - writePinHigh(A2); - writePinHigh(C7); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_high(C7); break; case 15: - writePinHigh(A0); - writePinHigh(A1); - writePinLow(A2); - writePinHigh(C7); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_high(C7); break; case 16: - writePinLow(C2); + gpio_write_pin_low(C2); break; case 17: - writePinLow(C3); + gpio_write_pin_low(C3); break; case 18: - writePinLow(C5); + gpio_write_pin_low(C5); break; } } @@ -264,140 +264,140 @@ static void select_col(uint8_t col) { static void unselect_col(uint8_t col) { switch (col) { case 0: - writePinHigh(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinLow(B4); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(B4); break; case 1: - writePinHigh(A0); - writePinHigh(A1); - writePinLow(A2); - writePinLow(B4); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(B4); break; case 2: - writePinHigh(A0); - writePinLow(A1); - writePinHigh(A2); - writePinLow(B4); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(B4); break; case 3: - writePinHigh(A0); - writePinLow(A1); - writePinLow(A2); - writePinLow(B4); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(B4); break; case 4: - writePinLow(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinLow(B4); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(B4); break; case 5: - writePinLow(A0); - writePinHigh(A1); - writePinLow(A2); - writePinLow(B4); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(B4); break; case 6: - writePinLow(A0); - writePinLow(A1); - writePinHigh(A2); - writePinLow(B4); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(B4); break; case 7: - writePinLow(A0); - writePinLow(A1); - writePinLow(A2); - writePinLow(B4); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(B4); break; case 8: - writePinLow(A0); - writePinLow(A1); - writePinLow(A2); - writePinLow(C7); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(C7); break; case 9: - writePinHigh(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinLow(C7); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(C7); break; case 10: - writePinHigh(A0); - writePinHigh(A1); - writePinLow(A2); - writePinLow(C7); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(C7); break; case 11: - writePinHigh(A0); - writePinLow(A1); - writePinHigh(A2); - writePinLow(C7); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(C7); break; case 12: - writePinHigh(A0); - writePinLow(A1); - writePinLow(A2); - writePinLow(C7); + gpio_write_pin_high(A0); + gpio_write_pin_low(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(C7); break; case 13: - writePinLow(A0); - writePinHigh(A1); - writePinHigh(A2); - writePinLow(C7); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(C7); break; case 14: - writePinLow(A0); - writePinHigh(A1); - writePinLow(A2); - writePinLow(C7); + gpio_write_pin_low(A0); + gpio_write_pin_high(A1); + gpio_write_pin_low(A2); + gpio_write_pin_low(C7); break; case 15: - writePinLow(A0); - writePinLow(A1); - writePinHigh(A2); - writePinLow(C7); + gpio_write_pin_low(A0); + gpio_write_pin_low(A1); + gpio_write_pin_high(A2); + gpio_write_pin_low(C7); break; case 16: - writePinHigh(C2); + gpio_write_pin_high(C2); break; case 17: - writePinHigh(C3); + gpio_write_pin_high(C3); break; case 18: - writePinHigh(C5); + gpio_write_pin_high(C5); break; } } static void unselect_cols(void) { //Native - writePinHigh(C2); - writePinHigh(C3); - writePinHigh(C5); + gpio_write_pin_high(C2); + gpio_write_pin_high(C3); + gpio_write_pin_high(C5); //Demultiplexer - writePinLow(B4); - writePinLow(C7); - writePinHigh(A0); - writePinHigh(A1); - writePinHigh(A2); + gpio_write_pin_low(B4); + gpio_write_pin_low(C7); + gpio_write_pin_high(A0); + gpio_write_pin_high(A1); + gpio_write_pin_high(A2); } static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } - setPinOutput(A0); - setPinOutput(A1); - setPinOutput(A2); - setPinOutput(B4); - setPinOutput(C7); - setPinOutput(C2); - setPinOutput(C3); - setPinOutput(C5); + gpio_set_pin_output(A0); + gpio_set_pin_output(A1); + gpio_set_pin_output(A2); + gpio_set_pin_output(B4); + gpio_set_pin_output(C7); + gpio_set_pin_output(C2); + gpio_set_pin_output(C3); + gpio_set_pin_output(C5); } static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { @@ -413,7 +413,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col); } else { diff --git a/keyboards/mechlovin/olly/jf/rev1/rev1.c b/keyboards/mechlovin/olly/jf/rev1/rev1.c index 3d18d7bb5ab..591c28dd44b 100644 --- a/keyboards/mechlovin/olly/jf/rev1/rev1.c +++ b/keyboards/mechlovin/olly/jf/rev1/rev1.c @@ -18,22 +18,22 @@ void led_init_ports(void) { - setPinOutput(C0); - setPinOutput(D0); - setPinOutput(D1); - setPinOutput(C1); - setPinOutput(C6); - setPinOutput(B0); - setPinOutput(B1); - setPinOutput(B2); + gpio_set_pin_output(C0); + gpio_set_pin_output(D0); + gpio_set_pin_output(D1); + gpio_set_pin_output(C1); + gpio_set_pin_output(C6); + gpio_set_pin_output(B0); + gpio_set_pin_output(B1); + gpio_set_pin_output(B2); } layer_state_t layer_state_set_user(layer_state_t state) { - writePin(D1, layer_state_cmp(state, 1)); - writePin(D0, layer_state_cmp(state, 2)); - writePin(C1, layer_state_cmp(state, 3)); - writePin(C0, layer_state_cmp(state, 4)); - writePin(C6, layer_state_cmp(state, 5)); + gpio_write_pin(D1, layer_state_cmp(state, 1)); + gpio_write_pin(D0, layer_state_cmp(state, 2)); + gpio_write_pin(C1, layer_state_cmp(state, 3)); + gpio_write_pin(C0, layer_state_cmp(state, 4)); + gpio_write_pin(C6, layer_state_cmp(state, 5)); return state; } diff --git a/keyboards/mechlovin/olly/orion/orion.c b/keyboards/mechlovin/olly/orion/orion.c index 9fc89a6d023..4dcc15cf77f 100644 --- a/keyboards/mechlovin/olly/orion/orion.c +++ b/keyboards/mechlovin/olly/orion/orion.c @@ -22,20 +22,20 @@ void board_init(void) { } void keyboard_pre_init_kb(void) { - setPinOutput(B5); - setPinOutput(B6); - setPinOutput(B7); - setPinOutput(B8); - setPinOutput(B9); + gpio_set_pin_output(B5); + gpio_set_pin_output(B6); + gpio_set_pin_output(B7); + gpio_set_pin_output(B8); + gpio_set_pin_output(B9); keyboard_pre_init_user(); } layer_state_t layer_state_set_kb(layer_state_t state) { state = layer_state_set_user(state); - writePin(B7, layer_state_cmp(state, 0)); - writePin(B6, layer_state_cmp(state, 1)); - writePin(B5, layer_state_cmp(state, 2)); - writePin(B8, layer_state_cmp(state, 3)); - writePin(B9, layer_state_cmp(state, 4)); + gpio_write_pin(B7, layer_state_cmp(state, 0)); + gpio_write_pin(B6, layer_state_cmp(state, 1)); + gpio_write_pin(B5, layer_state_cmp(state, 2)); + gpio_write_pin(B8, layer_state_cmp(state, 3)); + gpio_write_pin(B9, layer_state_cmp(state, 4)); return state; } diff --git a/keyboards/mechlovin/serratus/matrix.c b/keyboards/mechlovin/serratus/matrix.c index 62a56f687cb..16bee61ad0e 100644 --- a/keyboards/mechlovin/serratus/matrix.c +++ b/keyboards/mechlovin/serratus/matrix.c @@ -37,7 +37,7 @@ static void init_pins(void) { for (int col = 0; col < MATRIX_COLS; col++) { pin_t pin = direct_pins[row][col]; if (pin != NO_PIN) { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } } @@ -50,7 +50,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { pin_t pin = direct_pins[current_row][col_index]; if (pin != NO_PIN) { - current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); + current_matrix[current_row] |= gpio_read_pin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index); } } @@ -101,103 +101,103 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) static void select_col(uint8_t col) { switch (col) { case 0: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 1: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 2: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 3: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 4: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 5: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 6: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(B0); break; case 7: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(B0); break; case 8: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 9: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 10: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 11: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 12: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 13: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 14: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_high(F1); break; case 15: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinHigh(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_high(F1); break; case 16: - writePinLow(E6); + gpio_write_pin_low(E6); break; } } @@ -205,130 +205,130 @@ static void select_col(uint8_t col) { static void unselect_col(uint8_t col) { switch (col) { case 0: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 1: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 2: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 3: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 4: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 5: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 6: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(B0); break; case 7: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(B0); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(B0); break; case 8: - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 9: - writePinHigh(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 10: - writePinHigh(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 11: - writePinHigh(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_high(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 12: - writePinLow(B5); - writePinHigh(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 13: - writePinLow(B5); - writePinHigh(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_high(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 14: - writePinLow(B5); - writePinLow(B7); - writePinLow(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_low(F0); + gpio_write_pin_low(F1); break; case 15: - writePinLow(B5); - writePinLow(B7); - writePinHigh(F0); - writePinLow(F1); + gpio_write_pin_low(B5); + gpio_write_pin_low(B7); + gpio_write_pin_high(F0); + gpio_write_pin_low(F1); break; case 16: - writePinHigh(E6); + gpio_write_pin_high(E6); break; } } static void unselect_cols(void) { //Native - writePinHigh(E6); + gpio_write_pin_high(E6); //Demultiplexer - writePinLow(B0); - writePinLow(F1); - writePinHigh(B5); - writePinHigh(B7); - writePinHigh(F0); + gpio_write_pin_low(B0); + gpio_write_pin_low(F1); + gpio_write_pin_high(B5); + gpio_write_pin_high(B7); + gpio_write_pin_high(F0); } static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } - setPinOutput(B5); - setPinOutput(B7); - setPinOutput(F0); - setPinOutput(B0); - setPinOutput(F1); - setPinOutput(E6); + gpio_set_pin_output(B5); + gpio_set_pin_output(B7); + gpio_set_pin_output(F0); + gpio_set_pin_output(B0); + gpio_set_pin_output(F1); + gpio_set_pin_output(E6); } static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { @@ -344,7 +344,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col); } else { diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/wearhaus66.c b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/wearhaus66.c index 091373e3875..a6942a2cb82 100644 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/wearhaus66.c +++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/wearhaus66.c @@ -20,5 +20,5 @@ along with this program. If not, see . void keyboard_pre_init_user(void) { // Call the keyboard pre init code. // Set our LED pins as output - setPinOutput(B7); + gpio_set_pin_output(B7); } diff --git a/keyboards/mechwild/puckbuddy/puckbuddy.c b/keyboards/mechwild/puckbuddy/puckbuddy.c index 5cf2d79b368..d386cf050e7 100644 --- a/keyboards/mechwild/puckbuddy/puckbuddy.c +++ b/keyboards/mechwild/puckbuddy/puckbuddy.c @@ -21,7 +21,7 @@ uint16_t dpi_array[] = GLIDEPOINT_DPI_OPTIONS; void board_init(void) { // B9 is configured as I2C1_SDA in the board file; that function must be // disabled before using B7 as I2C1_SDA. - setPinInputHigh(B9); + gpio_set_pin_input_high(B9); } #ifdef DYNAMIC_TAPPING_TERM_ENABLE diff --git a/keyboards/mechwild/sugarglider/sugarglider.c b/keyboards/mechwild/sugarglider/sugarglider.c index 76c6d298320..086294470ec 100644 --- a/keyboards/mechwild/sugarglider/sugarglider.c +++ b/keyboards/mechwild/sugarglider/sugarglider.c @@ -19,14 +19,14 @@ uint16_t dpi_array[] = GLIDEPOINT_DPI_OPTIONS; void board_init(void) { // B9 is configured as I2C1_SDA in the board file; that function must be // disabled before using B7 as I2C1_SDA. - setPinInputHigh(B9); - setPinOutput(B12); - setPinOutput(B13); - setPinOutput(B14); - writePinLow(B12); - writePinLow(B13); - writePinLow(B14); - setPinOutput(C13); + gpio_set_pin_input_high(B9); + gpio_set_pin_output(B12); + gpio_set_pin_output(B13); + gpio_set_pin_output(B14); + gpio_write_pin_low(B12); + gpio_write_pin_low(B13); + gpio_write_pin_low(B14); + gpio_set_pin_output(C13); } #ifdef DYNAMIC_TAPPING_TERM_ENABLE @@ -110,10 +110,10 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B12, led_state.num_lock); // Updates status LEDs - writePin(B13, led_state.caps_lock); // Updates status LEDs - writePin(B14, led_state.scroll_lock); // Updates status LEDs - writePin(C13, !led_state.caps_lock); // Updates status LEDs, this is the LED on the blackpill itself + gpio_write_pin(B12, led_state.num_lock); // Updates status LEDs + gpio_write_pin(B13, led_state.caps_lock); // Updates status LEDs + gpio_write_pin(B14, led_state.scroll_lock); // Updates status LEDs + gpio_write_pin(C13, !led_state.caps_lock); // Updates status LEDs, this is the LED on the blackpill itself } return res; } diff --git a/keyboards/mexsistor/ludmila/matrix.c b/keyboards/mexsistor/ludmila/matrix.c index 5d27ec683fa..fd197f366d2 100644 --- a/keyboards/mexsistor/ludmila/matrix.c +++ b/keyboards/mexsistor/ludmila/matrix.c @@ -31,22 +31,22 @@ extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } -static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); } +static void unselect_row(uint8_t row) { gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void init_pins(void) { unselect_rows(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -64,7 +64,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) // For each col... for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); @@ -79,7 +79,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) void matrix_init_custom(void) { // initialize key pins - setPinInput(ENC_SW); + gpio_set_pin_input(ENC_SW); init_pins(); } @@ -108,7 +108,7 @@ static bool read_encoder_switches(matrix_row_t current_matrix[], uint8_t current static uint8_t btn_1_array; bool btn_1_pressed = 0; btn_1_array <<= 1; - btn_1_array |= readPin(ENC_SW); + btn_1_array |= gpio_read_pin(ENC_SW); (btn_1_array == 0b11111111) ? (btn_1_pressed = 1) : (btn_1_pressed = 0); // Populate the matrix row with the state of the encoder diff --git a/keyboards/miiiw/blackio83/rev_0100/matrix.c b/keyboards/miiiw/blackio83/rev_0100/matrix.c index ab252f919b2..11a5aa97e63 100644 --- a/keyboards/miiiw/blackio83/rev_0100/matrix.c +++ b/keyboards/miiiw/blackio83/rev_0100/matrix.c @@ -34,7 +34,7 @@ static pin_t dip_switch_pad[] = DIP_SWITCH_PINS; void matrix_init_custom(void) { for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - setPinInputLow(row_pins[row]); + gpio_set_pin_input_low(row_pins[row]); } shift_init(); @@ -65,12 +65,12 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { void matrix_power_up(void) { for (uint8_t row = 0; row < MATRIX_ROWS; row++) { palDisableLineEvent(row_pins[row]); - setPinInputLow(row_pins[row]); + gpio_set_pin_input_low(row_pins[row]); } init_cols(); #ifdef DIP_SWITCH_PINS for (uint8_t i = 1; i < NUMBER_OF_DIP_SWITCHES; i++) { - setPinInputHigh(dip_switch_pad[i]); + gpio_set_pin_input_high(dip_switch_pad[i]); } #endif } @@ -78,12 +78,12 @@ void matrix_power_up(void) { void matrix_power_down(void) { unselect_cols(); for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - setPinInputLow(row_pins[row]); + gpio_set_pin_input_low(row_pins[row]); palEnableLineEvent(row_pins[row], PAL_EVENT_MODE_RISING_EDGE); } #ifdef DIP_SWITCH_PINS for (uint8_t i = 1; i < NUMBER_OF_DIP_SWITCHES; i++) { - setPinInputLow(dip_switch_pad[i]); + gpio_set_pin_input_low(dip_switch_pad[i]); } #endif } @@ -91,7 +91,7 @@ void matrix_power_down(void) { static uint8_t read_rows(void) { uint8_t row_value = 0; for(uint8_t row = 0; row < MATRIX_ROWS; row++) { - row_value |= (readPin(row_pins[row]) << row); + row_value |= (gpio_read_pin(row_pins[row]) << row); } return row_value; } @@ -100,15 +100,15 @@ static void init_cols(void) { shift_writeAll(0); for(uint8_t col = 0; col < MATRIX_COLS; col++) { if(col_pins[col] < H0) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } } } static void select_col(uint8_t col) { if(col_pins[col] < H0){ - writePinHigh(col_pins[col]); + gpio_write_pin_high(col_pins[col]); waitInputPinDelay(); waitInputPinDelay(); waitInputPinDelay(); @@ -122,7 +122,7 @@ static void select_col(uint8_t col) { static void unselect_col(uint8_t col) { if(col_pins[col] < H0){ - writePinLow(col_pins[col]); + gpio_write_pin_low(col_pins[col]); }else{ shift_writePin(col_pins[col], 0); } @@ -132,8 +132,8 @@ static void unselect_cols(void) { shift_writeAll(1); for(uint8_t col = 0; col < MATRIX_COLS; col++) { if(col_pins[col] < H0) { - setPinOutput(col_pins[col]); - writePinHigh(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_high(col_pins[col]); } } } diff --git a/keyboards/miiiw/blackio83/rev_0100/rev_0100.c b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c index 7af6861f535..18f4c86510e 100644 --- a/keyboards/miiiw/blackio83/rev_0100/rev_0100.c +++ b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c @@ -49,25 +49,25 @@ void ws2812_poweron(void) { if(p_setup) return; p_setup = true; s_init = false; - setPinOutput(RGB_EN_PIN); - writePinHigh(RGB_EN_PIN); + gpio_set_pin_output(RGB_EN_PIN); + gpio_write_pin_high(RGB_EN_PIN); } void ws2812_poweroff(void) { if(!p_setup) return; p_setup = false; - setPinInputLow(WS2812_DI_PIN); - writePinLow(RGB_EN_PIN); + gpio_set_pin_input_low(WS2812_DI_PIN); + gpio_write_pin_low(RGB_EN_PIN); } void keyboard_pre_init_kb() { keyboard_pre_init_user(); - setPinInputLow(MWPROTO_STATUS_PIN); - setPinOutput(MWPROTO_WAKEUP_PIN); - writePinLow(MWPROTO_WAKEUP_PIN); + gpio_set_pin_input_low(MWPROTO_STATUS_PIN); + gpio_set_pin_output(MWPROTO_WAKEUP_PIN); + gpio_write_pin_low(MWPROTO_WAKEUP_PIN); wait_ms(2); - writePinHigh(MWPROTO_WAKEUP_PIN); + gpio_write_pin_high(MWPROTO_WAKEUP_PIN); palSetLineMode(MWPROTO_TX_PIN, PAL_MODE_ALTERNATE(MWPROTO_TX_PAL_MODE) | PAL_OUTPUT_TYPE_OPENDRAIN); sdStart(&MWPROTO_DRIVER, &mwproto_uart_config); @@ -84,14 +84,14 @@ void keyboard_post_init_kb(void) { "BUILD: " __DATE__ "\n" ); /* clang-format on */ - writePinLow(MWPROTO_WAKEUP_PIN); + gpio_write_pin_low(MWPROTO_WAKEUP_PIN); wait_ms(50); sdPutI(&MWPROTO_DRIVER, 0xA5); sdPutI(&MWPROTO_DRIVER, 0x12); sdPutI(&MWPROTO_DRIVER, 0x01); sdPutI(&MWPROTO_DRIVER, 0x02); sdPutI(&MWPROTO_DRIVER, 0xB4); - writePinHigh(MWPROTO_WAKEUP_PIN); + gpio_write_pin_high(MWPROTO_WAKEUP_PIN); ws2812_poweron(); loop10hz_token = defer_exec(LOOP_10HZ_PERIOD, loop_10Hz, NULL); @@ -117,7 +117,7 @@ bool dip_switch_update_mask_kb(uint32_t state) { usbDisconnectBus(&USB_DRIVER); usbStop(&USB_DRIVER); shutdown_user(true); - setPinInputHigh(POWER_SWITCH_PIN); + gpio_set_pin_input_high(POWER_SWITCH_PIN); palEnableLineEvent(POWER_SWITCH_PIN, PAL_EVENT_MODE_RISING_EDGE); POWER_EnterSleep(); } @@ -132,8 +132,8 @@ uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg) { static uint32_t pmu_timer = 0; if(timer_elapsed32(pmu_timer) > 3000) { pmu_timer = timer_read32(); - writePinLow(MWPROTO_WAKEUP_PIN); - if(readPin(MWPROTO_STATUS_PIN)) + gpio_write_pin_low(MWPROTO_WAKEUP_PIN); + if(gpio_read_pin(MWPROTO_STATUS_PIN)) wait_us(500); else wait_us(1500); @@ -141,7 +141,7 @@ uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg) { sdPutI(&MWPROTO_DRIVER, 0x28); sdPutI(&MWPROTO_DRIVER, 0x00); sdPutI(&MWPROTO_DRIVER, 0x8D); - writePinHigh(MWPROTO_WAKEUP_PIN); + gpio_write_pin_high(MWPROTO_WAKEUP_PIN); } } @@ -151,8 +151,8 @@ uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg) { matrix[2] == 0 && matrix[3] == 0 && matrix[4] == 0 && matrix[5] == 0x201) { if(restore_tick++ > 50) { restore_tick = 0; - writePinLow(MWPROTO_WAKEUP_PIN); - if(readPin(MWPROTO_STATUS_PIN)) + gpio_write_pin_low(MWPROTO_WAKEUP_PIN); + if(gpio_read_pin(MWPROTO_STATUS_PIN)) wait_us(500); else wait_us(1500); @@ -161,7 +161,7 @@ uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg) { sdPutI(&MWPROTO_DRIVER, 0x01); sdPutI(&MWPROTO_DRIVER, 0x0F); sdPutI(&MWPROTO_DRIVER, 0xB4); - writePinHigh(MWPROTO_WAKEUP_PIN); + gpio_write_pin_high(MWPROTO_WAKEUP_PIN); wait_ms(50); eeconfig_init(); #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/miiiw/common/shift_register.c b/keyboards/miiiw/common/shift_register.c index 2c9259180ea..5f82fc6442c 100644 --- a/keyboards/miiiw/common/shift_register.c +++ b/keyboards/miiiw/common/shift_register.c @@ -23,30 +23,30 @@ static uint8_t shift_values[SHR_SERIES_NUM] = {0}; void shift_init(void) { #ifdef SHR_OE_PIN - setPinOutput(SHR_OE_PIN); - writePinHigh(SHR_OE_PIN); + gpio_set_pin_output(SHR_OE_PIN); + gpio_write_pin_high(SHR_OE_PIN); #endif - setPinOutput(SHR_DATA_PIN); - setPinOutput(SHR_LATCH_PIN); - setPinOutput(SHR_CLOCK_PIN); + gpio_set_pin_output(SHR_DATA_PIN); + gpio_set_pin_output(SHR_LATCH_PIN); + gpio_set_pin_output(SHR_CLOCK_PIN); } void shift_enable(void) { #ifdef SHR_OE_PIN - writePinLow(SHR_OE_PIN); + gpio_write_pin_low(SHR_OE_PIN); #endif - writePinLow(SHR_DATA_PIN); - writePinLow(SHR_LATCH_PIN); - writePinLow(SHR_CLOCK_PIN); + gpio_write_pin_low(SHR_DATA_PIN); + gpio_write_pin_low(SHR_LATCH_PIN); + gpio_write_pin_low(SHR_CLOCK_PIN); } void shift_disable(void) { #ifdef SHR_OE_PIN - writePinHigh(SHR_OE_PIN); + gpio_write_pin_high(SHR_OE_PIN); #endif - writePinLow(SHR_DATA_PIN); - writePinLow(SHR_LATCH_PIN); - writePinLow(SHR_CLOCK_PIN); + gpio_write_pin_low(SHR_DATA_PIN); + gpio_write_pin_low(SHR_LATCH_PIN); + gpio_write_pin_low(SHR_CLOCK_PIN); } void shift_writePin(pin_t pin, int level) { @@ -78,13 +78,13 @@ void shift_writeAll(int level) { static void shift_out(void) { uint8_t n = SHR_SERIES_NUM; - writePinLow(SHR_LATCH_PIN); + gpio_write_pin_low(SHR_LATCH_PIN); while(n--){ for (uint8_t i = 0; i < 8; i++) { - writePinLow(SHR_CLOCK_PIN); - writePin(SHR_DATA_PIN, shift_values[n] & (0x80 >> i)); - writePinHigh(SHR_CLOCK_PIN); + gpio_write_pin_low(SHR_CLOCK_PIN); + gpio_write_pin(SHR_DATA_PIN, shift_values[n] & (0x80 >> i)); + gpio_write_pin_high(SHR_CLOCK_PIN); } } - writePinHigh(SHR_LATCH_PIN); + gpio_write_pin_high(SHR_LATCH_PIN); } diff --git a/keyboards/mlego/m48/m48.h b/keyboards/mlego/m48/m48.h index 5acc5c4590b..1d183bbd6d2 100644 --- a/keyboards/mlego/m48/m48.h +++ b/keyboards/mlego/m48/m48.h @@ -21,18 +21,18 @@ along with this program. If not, see . static inline void led_lwr(const bool on) { #ifdef LED_NUM_LOCK_PIN - writePin(LED_NUM_LOCK_PIN, on); + gpio_write_pin(LED_NUM_LOCK_PIN, on); #endif } static inline void led_rse(const bool on) { #ifdef LED_SCROLL_LOCK_PIN - writePin(LED_SCROLL_LOCK_PIN, on); + gpio_write_pin(LED_SCROLL_LOCK_PIN, on); #endif } static inline void led_caps(const bool on) { #ifdef LED_CAPS_LOCK_PIN - writePin(LED_CAPS_LOCK_PIN, !on); + gpio_write_pin(LED_CAPS_LOCK_PIN, !on); #endif } diff --git a/keyboards/mlego/m60/m60.h b/keyboards/mlego/m60/m60.h index 13a56f3ff0d..44245f5e1e3 100644 --- a/keyboards/mlego/m60/m60.h +++ b/keyboards/mlego/m60/m60.h @@ -21,18 +21,18 @@ along with this program. If not, see . static inline void led_lwr(const bool on) { #ifdef LED_NUM_LOCK_PIN - writePin(LED_NUM_LOCK_PIN, on); + gpio_write_pin(LED_NUM_LOCK_PIN, on); #endif } static inline void led_rse(const bool on) { #ifdef LED_SCROLL_LOCK_PIN - writePin(LED_SCROLL_LOCK_PIN, on); + gpio_write_pin(LED_SCROLL_LOCK_PIN, on); #endif } static inline void led_caps(const bool on) { #ifdef LED_CAPS_LOCK_PIN - writePin(LED_CAPS_LOCK_PIN, !on); + gpio_write_pin(LED_CAPS_LOCK_PIN, !on); #endif } diff --git a/keyboards/mlego/m60_split/m60_split.h b/keyboards/mlego/m60_split/m60_split.h index 10be6662c46..203514244fc 100644 --- a/keyboards/mlego/m60_split/m60_split.h +++ b/keyboards/mlego/m60_split/m60_split.h @@ -19,19 +19,19 @@ static inline void led_lwr(const bool on) { #ifdef LED_NUM_LOCK_PIN - writePin(LED_NUM_LOCK_PIN, on); + gpio_write_pin(LED_NUM_LOCK_PIN, on); #endif } static inline void led_rse(const bool on) { #ifdef LED_SCROLL_LOCK_PIN - writePin(LED_SCROLL_LOCK_PIN, on); + gpio_write_pin(LED_SCROLL_LOCK_PIN, on); #endif } static inline void led_caps(const bool on) { #ifdef LED_CAPS_LOCK_PIN - writePin(LED_CAPS_LOCK_PIN, !on); + gpio_write_pin(LED_CAPS_LOCK_PIN, !on); #endif } diff --git a/keyboards/mlego/m65/m65.h b/keyboards/mlego/m65/m65.h index 1c5589c1114..0ce073cfc69 100644 --- a/keyboards/mlego/m65/m65.h +++ b/keyboards/mlego/m65/m65.h @@ -30,14 +30,14 @@ void set_led_toggle(const uint8_t, const bool); static inline void init_lwr_rse_led(void) { #if defined(LED_LWR_PIN) - setPinOutput(LED_LWR_PIN); - writePin(LED_LWR_PIN, false); + gpio_set_pin_output(LED_LWR_PIN); + gpio_write_pin(LED_LWR_PIN, false); wait_ms(30); #endif #if defined(LED_RSE_PIN) - setPinOutput(LED_RSE_PIN); - writePin(LED_RSE_PIN, false); + gpio_set_pin_output(LED_RSE_PIN); + gpio_write_pin(LED_RSE_PIN, false); wait_ms(30); #endif } @@ -46,9 +46,9 @@ static inline void led_lwr(const bool on) { #if defined(LED_LWR_PIN) if ((PRODUCT_ID == 0x6064) || (PRODUCT_ID == 0x6065) || (PRODUCT_ID == 0x6066) || (PRODUCT_ID == 0x6067)) { - writePin(LED_LWR_PIN, !on); + gpio_write_pin(LED_LWR_PIN, !on); }else{ - writePin(LED_LWR_PIN, on); + gpio_write_pin(LED_LWR_PIN, on); } #endif } @@ -57,9 +57,9 @@ static inline void led_rse(const bool on) { #if defined(LED_RSE_PIN) if ((PRODUCT_ID == 0x6064) || (PRODUCT_ID == 0x6065) || (PRODUCT_ID == 0x6066) || (PRODUCT_ID == 0x6067)) { - writePin(LED_RSE_PIN, !on); + gpio_write_pin(LED_RSE_PIN, !on); }else{ - writePin(LED_RSE_PIN, on); + gpio_write_pin(LED_RSE_PIN, on); } #endif } diff --git a/keyboards/mode/m65ha_alpha/m65ha_alpha.c b/keyboards/mode/m65ha_alpha/m65ha_alpha.c index afb093058f7..0d438b02de9 100644 --- a/keyboards/mode/m65ha_alpha/m65ha_alpha.c +++ b/keyboards/mode/m65ha_alpha/m65ha_alpha.c @@ -18,7 +18,7 @@ along with this program. If not, see . #include "quantum.h" void board_init(void) { - setPinInput(B10); + gpio_set_pin_input(B10); } void led_init_ports(void) { @@ -54,12 +54,12 @@ void led_init_ports(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - // writePin sets the pin high for 1 and low for 0. + // gpio_write_pin sets the pin high for 1 and low for 0. // In this example the pins are inverted, setting // it low/0 turns it on, and high/1 turns the LED off. // This behavior depends on whether the LED is between the pin // and VCC or the pin and GND. - writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); } return res; } diff --git a/keyboards/mode/m65hi_alpha/m65hi_alpha.c b/keyboards/mode/m65hi_alpha/m65hi_alpha.c index afb093058f7..0d438b02de9 100644 --- a/keyboards/mode/m65hi_alpha/m65hi_alpha.c +++ b/keyboards/mode/m65hi_alpha/m65hi_alpha.c @@ -18,7 +18,7 @@ along with this program. If not, see . #include "quantum.h" void board_init(void) { - setPinInput(B10); + gpio_set_pin_input(B10); } void led_init_ports(void) { @@ -54,12 +54,12 @@ void led_init_ports(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - // writePin sets the pin high for 1 and low for 0. + // gpio_write_pin sets the pin high for 1 and low for 0. // In this example the pins are inverted, setting // it low/0 turns it on, and high/1 turns the LED off. // This behavior depends on whether the LED is between the pin // and VCC or the pin and GND. - writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); } return res; } diff --git a/keyboards/mode/m65s/m65s.c b/keyboards/mode/m65s/m65s.c index 954644310be..13f2ea40ff7 100644 --- a/keyboards/mode/m65s/m65s.c +++ b/keyboards/mode/m65s/m65s.c @@ -18,7 +18,7 @@ along with this program. If not, see . #include "quantum.h" void board_init(void) { - setPinInput(B10); + gpio_set_pin_input(B10); } void led_init_ports(void) { @@ -55,12 +55,12 @@ void led_init_ports(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - // writePin sets the pin high for 1 and low for 0. + // gpio_write_pin sets the pin high for 1 and low for 0. // In this example the pins are inverted, setting // it low/0 turns it on, and high/1 turns the LED off. // This behavior depends on whether the LED is between the pin // and VCC or the pin and GND. - writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); } return res; } diff --git a/keyboards/monsgeek/m3/m3.c b/keyboards/monsgeek/m3/m3.c index 9a93a7d7d4e..04a9f0ca96f 100644 --- a/keyboards/monsgeek/m3/m3.c +++ b/keyboards/monsgeek/m3/m3.c @@ -136,15 +136,15 @@ enum __layers { }; void matrix_init_kb(void) { - setPinOutput(LED_MAC_OS_PIN); // LDE2 MAC\WIN - writePinLow(LED_MAC_OS_PIN); - setPinOutput(LED_WIN_LOCK_PIN); // LED3 Win Lock - writePinLow(LED_WIN_LOCK_PIN); + gpio_set_pin_output(LED_MAC_OS_PIN); // LDE2 MAC\WIN + gpio_write_pin_low(LED_MAC_OS_PIN); + gpio_set_pin_output(LED_WIN_LOCK_PIN); // LED3 Win Lock + gpio_write_pin_low(LED_WIN_LOCK_PIN); } void housekeeping_task_kb(void){ - writePin(LED_MAC_OS_PIN, (get_highest_layer(default_layer_state) == 3)); - writePin(LED_WIN_LOCK_PIN, keymap_config.no_gui); + gpio_write_pin(LED_MAC_OS_PIN, (get_highest_layer(default_layer_state) == 3)); + gpio_write_pin(LED_WIN_LOCK_PIN, keymap_config.no_gui); } bool process_record_kb(uint16_t keycode, keyrecord_t* record) { @@ -166,7 +166,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) { return false; case GU_TOGG: if (record->event.pressed) { - writePin(LED_WIN_LOCK_PIN, !keymap_config.no_gui); + gpio_write_pin(LED_WIN_LOCK_PIN, !keymap_config.no_gui); } return true; case RGB_TOG: diff --git a/keyboards/monsgeek/m5/m5.c b/keyboards/monsgeek/m5/m5.c index 822214a05ca..3e1d752581c 100644 --- a/keyboards/monsgeek/m5/m5.c +++ b/keyboards/monsgeek/m5/m5.c @@ -149,15 +149,15 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { #endif void keyboard_pre_init_kb(void) { - setPinOutput(LED_WIN_LOCK_PIN); // LED3 Win Lock - writePinLow(LED_WIN_LOCK_PIN); + gpio_set_pin_output(LED_WIN_LOCK_PIN); // LED3 Win Lock + gpio_write_pin_low(LED_WIN_LOCK_PIN); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - writePin(LED_WIN_LOCK_PIN, keymap_config.no_gui); + gpio_write_pin(LED_WIN_LOCK_PIN, keymap_config.no_gui); } return res; } diff --git a/keyboards/monstargear/xo87/solderable/solderable.c b/keyboards/monstargear/xo87/solderable/solderable.c index cb4da24a3ac..56f3c524ea6 100644 --- a/keyboards/monstargear/xo87/solderable/solderable.c +++ b/keyboards/monstargear/xo87/solderable/solderable.c @@ -23,28 +23,28 @@ #define ledCapSP (80+8) void backlight_init_ports(void) { - setPinOutput(Lseg0); - setPinOutput(Lseg1); - setPinOutput(Lseg2); - setPinOutput(Lseg3); - setPinOutput(Lseg4); - setPinOutput(Lseg5); - setPinOutput(Lcom0); - setPinOutput(Lcom1); - setPinOutput(Lcom2); - setPinOutput(Lcom3); - setPinOutput(Lcom4); - setPinOutput(Lcom5); - setPinOutput(Lcom6); - setPinOutput(Lcom7); - setPinOutput(Lcom8); - setPinOutput(Lcom9); - setPinOutput(Lcom10); - setPinOutput(Lcom11); - setPinOutput(Lcom12); - setPinOutput(Lcom13); - setPinOutput(Lcom14); - setPinOutput(Lcom15); + gpio_set_pin_output(Lseg0); + gpio_set_pin_output(Lseg1); + gpio_set_pin_output(Lseg2); + gpio_set_pin_output(Lseg3); + gpio_set_pin_output(Lseg4); + gpio_set_pin_output(Lseg5); + gpio_set_pin_output(Lcom0); + gpio_set_pin_output(Lcom1); + gpio_set_pin_output(Lcom2); + gpio_set_pin_output(Lcom3); + gpio_set_pin_output(Lcom4); + gpio_set_pin_output(Lcom5); + gpio_set_pin_output(Lcom6); + gpio_set_pin_output(Lcom7); + gpio_set_pin_output(Lcom8); + gpio_set_pin_output(Lcom9); + gpio_set_pin_output(Lcom10); + gpio_set_pin_output(Lcom11); + gpio_set_pin_output(Lcom12); + gpio_set_pin_output(Lcom13); + gpio_set_pin_output(Lcom14); + gpio_set_pin_output(Lcom15); } void backlight_set(uint8_t level) { @@ -54,22 +54,22 @@ void backlight_task(void) { // This is a temporary workaround to get the status LEDs working until we can figure out the LED matrix led_t host_leds = host_keyboard_led_state(); if (host_leds.scroll_lock) { - writePinHigh(Lcom3); - writePinHigh(Lseg5); + gpio_write_pin_high(Lcom3); + gpio_write_pin_high(Lseg5); } else { - writePinLow(Lcom3); + gpio_write_pin_low(Lcom3); } if (host_leds.num_lock) { - writePinHigh(Lcom7); - writePinHigh(Lseg5); + gpio_write_pin_high(Lcom7); + gpio_write_pin_high(Lseg5); } else { - writePinLow(Lcom7); + gpio_write_pin_low(Lcom7); } if (host_leds.caps_lock) { - writePinHigh(Lcom8); - writePinHigh(Lseg5); + gpio_write_pin_high(Lcom8); + gpio_write_pin_high(Lseg5); } else { - writePinLow(Lcom8); + gpio_write_pin_low(Lcom8); } } diff --git a/keyboards/neson_design/700e/700e.c b/keyboards/neson_design/700e/700e.c index a9bcbee2885..cdcd90d3e07 100644 --- a/keyboards/neson_design/700e/700e.c +++ b/keyboards/neson_design/700e/700e.c @@ -292,8 +292,8 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { void matrix_init_kb(void) { - setPinOutput(LED_CAPS_LOCK_PIN); - writePinLow(LED_CAPS_LOCK_PIN); + gpio_set_pin_output(LED_CAPS_LOCK_PIN); + gpio_write_pin_low(LED_CAPS_LOCK_PIN); is31fl3731_init_drivers(); @@ -363,7 +363,7 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, led_state.caps_lock); if (rgb_state.state != SELF_TESTING) { if (led_state.caps_lock) { diff --git a/keyboards/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c index f257735acc8..fc34400b1c4 100644 --- a/keyboards/neson_design/n6/n6.c +++ b/keyboards/neson_design/n6/n6.c @@ -296,8 +296,8 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { void matrix_init_kb(void) { - setPinOutput(LED_CAPS_LOCK_PIN); - writePinLow(LED_CAPS_LOCK_PIN); + gpio_set_pin_output(LED_CAPS_LOCK_PIN); + gpio_write_pin_low(LED_CAPS_LOCK_PIN); is31fl3731_init_drivers(); @@ -358,7 +358,7 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, led_state.caps_lock); if (rgb_state.state != SELF_TESTING) { if (led_state.caps_lock) { diff --git a/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.c b/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.c index 01eb8f39034..995434bb2c0 100644 --- a/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.c +++ b/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.c @@ -19,29 +19,29 @@ #ifndef LAYER_LED_DISABLE void keyboard_pre_init_kb(void) { - setPinOutput(LED_INDICATOR_TOP); - setPinOutput(LED_INDICATOR_MID); - setPinOutput(LED_INDICATOR_BOT); + gpio_set_pin_output(LED_INDICATOR_TOP); + gpio_set_pin_output(LED_INDICATOR_MID); + gpio_set_pin_output(LED_INDICATOR_BOT); keyboard_pre_init_user(); } __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { - writePinHigh(LED_INDICATOR_TOP); - writePinHigh(LED_INDICATOR_MID); - writePinHigh(LED_INDICATOR_BOT); + gpio_write_pin_high(LED_INDICATOR_TOP); + gpio_write_pin_high(LED_INDICATOR_MID); + gpio_write_pin_high(LED_INDICATOR_BOT); switch(get_highest_layer(state) % 4) { case 1: - writePinLow(LED_INDICATOR_TOP); - writePinLow(LED_INDICATOR_MID); + gpio_write_pin_low(LED_INDICATOR_TOP); + gpio_write_pin_low(LED_INDICATOR_MID); break; case 2: - writePinLow(LED_INDICATOR_TOP); - writePinLow(LED_INDICATOR_BOT); + gpio_write_pin_low(LED_INDICATOR_TOP); + gpio_write_pin_low(LED_INDICATOR_BOT); break; case 3: - writePinLow(LED_INDICATOR_MID); - writePinLow(LED_INDICATOR_BOT); + gpio_write_pin_low(LED_INDICATOR_MID); + gpio_write_pin_low(LED_INDICATOR_BOT); break; } return state; diff --git a/keyboards/nopunin10did/kastenwagen48/kastenwagen48.c b/keyboards/nopunin10did/kastenwagen48/kastenwagen48.c index 01eb8f39034..995434bb2c0 100644 --- a/keyboards/nopunin10did/kastenwagen48/kastenwagen48.c +++ b/keyboards/nopunin10did/kastenwagen48/kastenwagen48.c @@ -19,29 +19,29 @@ #ifndef LAYER_LED_DISABLE void keyboard_pre_init_kb(void) { - setPinOutput(LED_INDICATOR_TOP); - setPinOutput(LED_INDICATOR_MID); - setPinOutput(LED_INDICATOR_BOT); + gpio_set_pin_output(LED_INDICATOR_TOP); + gpio_set_pin_output(LED_INDICATOR_MID); + gpio_set_pin_output(LED_INDICATOR_BOT); keyboard_pre_init_user(); } __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { - writePinHigh(LED_INDICATOR_TOP); - writePinHigh(LED_INDICATOR_MID); - writePinHigh(LED_INDICATOR_BOT); + gpio_write_pin_high(LED_INDICATOR_TOP); + gpio_write_pin_high(LED_INDICATOR_MID); + gpio_write_pin_high(LED_INDICATOR_BOT); switch(get_highest_layer(state) % 4) { case 1: - writePinLow(LED_INDICATOR_TOP); - writePinLow(LED_INDICATOR_MID); + gpio_write_pin_low(LED_INDICATOR_TOP); + gpio_write_pin_low(LED_INDICATOR_MID); break; case 2: - writePinLow(LED_INDICATOR_TOP); - writePinLow(LED_INDICATOR_BOT); + gpio_write_pin_low(LED_INDICATOR_TOP); + gpio_write_pin_low(LED_INDICATOR_BOT); break; case 3: - writePinLow(LED_INDICATOR_MID); - writePinLow(LED_INDICATOR_BOT); + gpio_write_pin_low(LED_INDICATOR_MID); + gpio_write_pin_low(LED_INDICATOR_BOT); break; } return state; diff --git a/keyboards/novelkeys/nk65b/nk65b.c b/keyboards/novelkeys/nk65b/nk65b.c index 370814aabdf..369bab262fd 100755 --- a/keyboards/novelkeys/nk65b/nk65b.c +++ b/keyboards/novelkeys/nk65b/nk65b.c @@ -24,8 +24,8 @@ void led_init_ports(void) { } layer_state_t layer_state_set_kb(layer_state_t state) { - writePin(A15, !layer_state_cmp(state, 1)); - writePin(B3, !layer_state_cmp(state, 2)); + gpio_write_pin(A15, !layer_state_cmp(state, 1)); + gpio_write_pin(B3, !layer_state_cmp(state, 2)); return layer_state_set_user(state); } diff --git a/keyboards/novelkeys/nk87b/nk87b.c b/keyboards/novelkeys/nk87b/nk87b.c index a0686d5b090..125b5d74049 100644 --- a/keyboards/novelkeys/nk87b/nk87b.c +++ b/keyboards/novelkeys/nk87b/nk87b.c @@ -25,8 +25,8 @@ void led_init_ports(void) { } layer_state_t layer_state_set_kb(layer_state_t state) { - writePin(A3, !layer_state_cmp(state, 1)); - writePin(A4, !layer_state_cmp(state, 2)); + gpio_write_pin(A3, !layer_state_cmp(state, 1)); + gpio_write_pin(A4, !layer_state_cmp(state, 2)); return layer_state_set_user(state); } diff --git a/keyboards/noxary/220/220.c b/keyboards/noxary/220/220.c index caeb13a799d..c5affa4344d 100644 --- a/keyboards/noxary/220/220.c +++ b/keyboards/noxary/220/220.c @@ -22,13 +22,13 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(C6); + gpio_set_pin_output(C6); matrix_init_user(); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(C6, led_state.num_lock); + gpio_write_pin(C6, led_state.num_lock); } return true; } \ No newline at end of file diff --git a/keyboards/noxary/268_2/268_2.c b/keyboards/noxary/268_2/268_2.c index 60d54a681c5..56b42d2343d 100644 --- a/keyboards/noxary/268_2/268_2.c +++ b/keyboards/noxary/268_2/268_2.c @@ -18,13 +18,13 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(B0); + gpio_set_pin_output(B0); matrix_init_user(); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(B0, led_state.caps_lock); + gpio_write_pin(B0, led_state.caps_lock); } return true; } diff --git a/keyboards/noxary/280/280.c b/keyboards/noxary/280/280.c index 8bece8dee18..0f29df178f4 100644 --- a/keyboards/noxary/280/280.c +++ b/keyboards/noxary/280/280.c @@ -23,15 +23,15 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(D5); - setPinOutput(D0); + gpio_set_pin_output(D5); + gpio_set_pin_output(D0); matrix_init_user(); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(D5, led_state.caps_lock); - writePin(D0, led_state.scroll_lock); + gpio_write_pin(D5, led_state.caps_lock); + gpio_write_pin(D0, led_state.scroll_lock); } return true; } \ No newline at end of file diff --git a/keyboards/noxary/x268/x268.c b/keyboards/noxary/x268/x268.c index 54c37b2079c..67d6dff89df 100644 --- a/keyboards/noxary/x268/x268.c +++ b/keyboards/noxary/x268/x268.c @@ -22,13 +22,13 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(B0); + gpio_set_pin_output(B0); matrix_init_user(); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(B0, led_state.caps_lock); + gpio_write_pin(B0, led_state.caps_lock); } return true; } diff --git a/keyboards/nullbitsco/common/bitc_led.c b/keyboards/nullbitsco/common/bitc_led.c index 64d7c7160a7..8f91e665f8e 100644 --- a/keyboards/nullbitsco/common/bitc_led.c +++ b/keyboards/nullbitsco/common/bitc_led.c @@ -18,17 +18,17 @@ void set_bitc_LED(uint8_t mode) { switch(mode) { case LED_ON: - setPinOutput(PIN_LED); - writePin(PIN_LED, GPIO_STATE_HIGH); + gpio_set_pin_output(PIN_LED); + gpio_write_pin(PIN_LED, GPIO_STATE_HIGH); break; case LED_DIM: - setPinInput(PIN_LED); + gpio_set_pin_input(PIN_LED); break; case LED_OFF: - setPinOutput(PIN_LED); - writePin(PIN_LED, GPIO_STATE_LOW); + gpio_set_pin_output(PIN_LED); + gpio_write_pin(PIN_LED, GPIO_STATE_LOW); break; default: diff --git a/keyboards/nullbitsco/nibble/big_led.c b/keyboards/nullbitsco/nibble/big_led.c index d66a8081539..0e61b440b6d 100644 --- a/keyboards/nullbitsco/nibble/big_led.c +++ b/keyboards/nullbitsco/nibble/big_led.c @@ -24,13 +24,13 @@ void set_big_LED_rgb(uint8_t r_mode, uint8_t g_mode, uint8_t b_mode) { void set_big_LED_r(uint8_t mode) { switch(mode) { case LED_ON: - setPinOutput(BIG_LED_R_PIN); - writePin(BIG_LED_R_PIN, GPIO_STATE_HIGH); + gpio_set_pin_output(BIG_LED_R_PIN); + gpio_write_pin(BIG_LED_R_PIN, GPIO_STATE_HIGH); break; case LED_OFF: - setPinOutput(BIG_LED_R_PIN); - writePin(BIG_LED_R_PIN, GPIO_STATE_LOW); + gpio_set_pin_output(BIG_LED_R_PIN); + gpio_write_pin(BIG_LED_R_PIN, GPIO_STATE_LOW); break; default: @@ -41,13 +41,13 @@ void set_big_LED_r(uint8_t mode) { void set_big_LED_g(uint8_t mode) { switch(mode) { case LED_ON: - setPinOutput(BIG_LED_G_PIN); - writePin(BIG_LED_G_PIN, GPIO_STATE_HIGH); + gpio_set_pin_output(BIG_LED_G_PIN); + gpio_write_pin(BIG_LED_G_PIN, GPIO_STATE_HIGH); break; case LED_OFF: - setPinOutput(BIG_LED_G_PIN); - writePin(BIG_LED_G_PIN, GPIO_STATE_LOW); + gpio_set_pin_output(BIG_LED_G_PIN); + gpio_write_pin(BIG_LED_G_PIN, GPIO_STATE_LOW); break; default: @@ -58,13 +58,13 @@ void set_big_LED_g(uint8_t mode) { void set_big_LED_b(uint8_t mode) { switch(mode) { case LED_ON: - setPinOutput(BIG_LED_B_PIN); - writePin(BIG_LED_B_PIN, GPIO_STATE_HIGH); + gpio_set_pin_output(BIG_LED_B_PIN); + gpio_write_pin(BIG_LED_B_PIN, GPIO_STATE_HIGH); break; case LED_OFF: - setPinOutput(BIG_LED_B_PIN); - writePin(BIG_LED_B_PIN, GPIO_STATE_LOW); + gpio_set_pin_output(BIG_LED_B_PIN); + gpio_write_pin(BIG_LED_B_PIN, GPIO_STATE_LOW); break; default: diff --git a/keyboards/nullbitsco/nibble/matrix.c b/keyboards/nullbitsco/nibble/matrix.c index 6508b704e9c..7ea5a6c4707 100644 --- a/keyboards/nullbitsco/nibble/matrix.c +++ b/keyboards/nullbitsco/nibble/matrix.c @@ -27,17 +27,17 @@ static const uint8_t col_pins[MATRIX_MUX_COLS] = MATRIX_COL_MUX_PINS; static void init_pins(void) { // Set cols to outputs, low for (uint8_t pin = 0; pin < MATRIX_MUX_COLS; pin++) { - setPinOutput(col_pins[pin]); + gpio_set_pin_output(col_pins[pin]); } // Unselect cols for (uint8_t bit = 0; bit < MATRIX_MUX_COLS; bit++) { - writePinLow(col_pins[bit]); + gpio_write_pin_low(col_pins[bit]); } // Set rows to input, pullup for (uint8_t pin = 0; pin < MATRIX_ROWS; pin++) { - setPinInputHigh(row_pins[pin]); + gpio_set_pin_input_high(row_pins[pin]); } } @@ -45,7 +45,7 @@ static void select_col(uint8_t col) { for (uint8_t bit = 0; bit < MATRIX_MUX_COLS; bit++) { uint8_t state = (col & (0b1 << bit)) >> bit; - writePin(col_pins[bit], state); + gpio_write_pin(col_pins[bit], state); } } @@ -60,7 +60,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { matrix_row_t last_row_value = current_matrix[row_index]; - if (!readPin(row_pins[row_index])) + if (!gpio_read_pin(row_pins[row_index])) { current_matrix[row_index] |= (COL_SHIFTER << current_col); } diff --git a/keyboards/nullbitsco/scramble/v1/v1.c b/keyboards/nullbitsco/scramble/v1/v1.c index 4b5e8e3e671..3a85dce192d 100644 --- a/keyboards/nullbitsco/scramble/v1/v1.c +++ b/keyboards/nullbitsco/scramble/v1/v1.c @@ -6,17 +6,17 @@ void set_scramble_LED(uint8_t mode) { switch(mode) { case LED_ON: - setPinOutput(PIN_LED); - writePin(PIN_LED, GPIO_STATE_HIGH); + gpio_set_pin_output(PIN_LED); + gpio_write_pin(PIN_LED, GPIO_STATE_HIGH); break; case LED_DIM: - setPinInput(PIN_LED); + gpio_set_pin_input(PIN_LED); break; case LED_OFF: - setPinOutput(PIN_LED); - writePin(PIN_LED, GPIO_STATE_LOW); + gpio_set_pin_output(PIN_LED); + gpio_write_pin(PIN_LED, GPIO_STATE_LOW); break; default: diff --git a/keyboards/nullbitsco/snap/matrix.c b/keyboards/nullbitsco/snap/matrix.c index 3cd3f5c37e3..64b451641d3 100644 --- a/keyboards/nullbitsco/snap/matrix.c +++ b/keyboards/nullbitsco/snap/matrix.c @@ -37,23 +37,23 @@ static uint8_t* col_pins = col_pins_left; static void init_pins(void) { // Set cols to outputs, low for (uint8_t pin = 0; pin < MATRIX_MUX_COLS; pin++) { - setPinOutput(col_pins[pin]); + gpio_set_pin_output(col_pins[pin]); } // Unselect cols for (uint8_t bit = 0; bit < MATRIX_MUX_COLS; bit++) { - writePinLow(col_pins[bit]); + gpio_write_pin_low(col_pins[bit]); } // Set rows to input, pullup for (uint8_t pin = 0; pin < ROWS_PER_HAND; pin++) { - setPinInputHigh(row_pins[pin]); + gpio_set_pin_input_high(row_pins[pin]); } // Set extended pin (only on right side) if (!isLeftHand) { // Set extended pin to input, pullup - setPinInputHigh(MATRIX_EXT_PIN_RIGHT); + gpio_set_pin_input_high(MATRIX_EXT_PIN_RIGHT); } } @@ -61,7 +61,7 @@ static void select_col(uint8_t col) { // Drive demux with correct column address for (uint8_t bit = 0; bit < MATRIX_MUX_COLS; bit++) { uint8_t state = (col & (0b1 << bit)) >> bit; - writePin(col_pins[bit], !state); + gpio_write_pin(col_pins[bit], !state); } } @@ -71,7 +71,7 @@ static void read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) // Read each row sequentially for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) { - if (readPin(row_pins[row_index]) == 0) { + if (gpio_read_pin(row_pins[row_index]) == 0) { current_matrix[row_index] |= (COL_SHIFTER << current_col); } else { current_matrix[row_index] &= ~(COL_SHIFTER << current_col); @@ -82,7 +82,7 @@ static void read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) static void read_ext_pin(matrix_row_t current_matrix[]) { // Read the state of the extended matrix pin if (!isLeftHand) { - if (readPin(MATRIX_EXT_PIN_RIGHT) == 0) { + if (gpio_read_pin(MATRIX_EXT_PIN_RIGHT) == 0) { current_matrix[EXT_PIN_ROW] |= (COL_SHIFTER << EXT_PIN_COL); } else { current_matrix[EXT_PIN_ROW] &= ~(COL_SHIFTER << EXT_PIN_COL); diff --git a/keyboards/om60/matrix.c b/keyboards/om60/matrix.c index b0e252ec458..837abcdca19 100644 --- a/keyboards/om60/matrix.c +++ b/keyboards/om60/matrix.c @@ -31,37 +31,37 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for(uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } static void unselect_col(uint8_t col) { - setPinInputHigh(col_pins[col]); + gpio_set_pin_input_high(col_pins[col]); } static void unselect_cols(void) { for(uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -69,10 +69,10 @@ static void init_pins(void) { unselect_rows(); unselect_cols(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -92,7 +92,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index); @@ -120,7 +120,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[tmp]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[tmp] |= (ROW_SHIFTER << current_col); diff --git a/keyboards/opendeck/32/rev1/rev1.c b/keyboards/opendeck/32/rev1/rev1.c index 8b3f9c02222..ca05d12243a 100644 --- a/keyboards/opendeck/32/rev1/rev1.c +++ b/keyboards/opendeck/32/rev1/rev1.c @@ -90,12 +90,12 @@ led_config_t g_led_config = { void keyboard_pre_init_kb(void) { // Light power LED - setPinOutput(POWER_LED_PIN); - writePinLow(POWER_LED_PIN); + gpio_set_pin_output(POWER_LED_PIN); + gpio_write_pin_low(POWER_LED_PIN); // We don't use this feature of the IS31FL3731 but it is electrically connected // Make sure not to drive it - setPinInput(IS31FL3731_IRQ_PIN); + gpio_set_pin_input(IS31FL3731_IRQ_PIN); keyboard_pre_init_user(); } diff --git a/keyboards/ortho5by12/ortho5by12.c b/keyboards/ortho5by12/ortho5by12.c index 29173749aed..d0d9ce9102d 100644 --- a/keyboards/ortho5by12/ortho5by12.c +++ b/keyboards/ortho5by12/ortho5by12.c @@ -16,15 +16,15 @@ #include "quantum.h" void matrix_init_kb(void) { - setPinOutput(C4); - setPinOutput(C5); + gpio_set_pin_output(C4); + gpio_set_pin_output(C5); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(C4, led_state.num_lock); - writePin(C5, led_state.caps_lock); + gpio_write_pin(C4, led_state.num_lock); + gpio_write_pin(C5, led_state.caps_lock); } return res; } diff --git a/keyboards/peej/lumberjack/lumberjack.c b/keyboards/peej/lumberjack/lumberjack.c index 111092d5792..fce14ac7de5 100644 --- a/keyboards/peej/lumberjack/lumberjack.c +++ b/keyboards/peej/lumberjack/lumberjack.c @@ -17,8 +17,8 @@ #include "lumberjack.h" void keyboard_pre_init_kb() { - setPinOutput(LED1); - setPinOutput(LED2); + gpio_set_pin_output(LED1); + gpio_set_pin_output(LED2); keyboard_pre_init_user(); } diff --git a/keyboards/peej/rosaline/rosaline.c b/keyboards/peej/rosaline/rosaline.c index df0594da44b..0ebcb76660f 100644 --- a/keyboards/peej/rosaline/rosaline.c +++ b/keyboards/peej/rosaline/rosaline.c @@ -17,13 +17,13 @@ #include "quantum.h" bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - writePin(LED1, record->event.pressed); + gpio_write_pin(LED1, record->event.pressed); return process_record_user(keycode, record); } layer_state_t layer_state_set_kb(layer_state_t state) { - writePin(LED2, state); + gpio_write_pin(LED2, state); return layer_state_set_user(state); } diff --git a/keyboards/percent/canoe_gen2/canoe_gen2.c b/keyboards/percent/canoe_gen2/canoe_gen2.c index d174d01876c..ea091c34744 100644 --- a/keyboards/percent/canoe_gen2/canoe_gen2.c +++ b/keyboards/percent/canoe_gen2/canoe_gen2.c @@ -18,15 +18,15 @@ along with this program. If not, see . #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(E6); - writePinHigh(E6); - + gpio_set_pin_output(E6); + gpio_write_pin_high(E6); + keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(E6, !led_state.caps_lock); + gpio_write_pin(E6, !led_state.caps_lock); } return true; diff --git a/keyboards/pica40/rev2/rev2.c b/keyboards/pica40/rev2/rev2.c index 2ee73dcc6b8..0ba9a537341 100644 --- a/keyboards/pica40/rev2/rev2.c +++ b/keyboards/pica40/rev2/rev2.c @@ -11,7 +11,7 @@ // custom handler that returns encoder B pin status from slave side void encoder_sync_slave_handler(uint8_t in_buflen, const void *in_data, uint8_t out_buflen, void *out_data) { - *(uint8_t *)out_data = readPin(ENCODER_PIN_B) ? 1 : 0; + *(uint8_t *)out_data = gpio_read_pin(ENCODER_PIN_B) ? 1 : 0; } void encoder_quadrature_init_pin(uint8_t index, bool pad_b) {} @@ -22,7 +22,7 @@ uint8_t encoder_quadrature_read_pin(uint8_t index, bool pad_b) { transaction_rpc_recv(ENCODER_SYNC, sizeof(data), &data); return data; } - return readPin(ENCODER_PIN_A) ? 1 : 0; + return gpio_read_pin(ENCODER_PIN_A) ? 1 : 0; } #endif // ENCODER_ENABLE @@ -53,11 +53,11 @@ bool should_set_rgblight = false; #endif // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS) void keyboard_post_init_kb(void) { - setPinOutput(PICA40_RGB_POWER_PIN); + gpio_set_pin_output(PICA40_RGB_POWER_PIN); #ifdef ENCODER_ENABLE - setPinInputHigh(ENCODER_PIN_A); - setPinInputHigh(ENCODER_PIN_B); + gpio_set_pin_input_high(ENCODER_PIN_A); + gpio_set_pin_input_high(ENCODER_PIN_B); transaction_register_rpc(ENCODER_SYNC, encoder_sync_slave_handler); #endif // ENCODER_ENABLE @@ -113,9 +113,9 @@ void housekeeping_task_kb(void) { should_set_rgblight = true; if (is_layer_active) { - writePinHigh(PICA40_RGB_POWER_PIN); + gpio_write_pin_high(PICA40_RGB_POWER_PIN); } else { - writePinLow(PICA40_RGB_POWER_PIN); + gpio_write_pin_low(PICA40_RGB_POWER_PIN); } } } diff --git a/keyboards/planck/planck.c b/keyboards/planck/planck.c index 660be55babe..9410b71a97d 100644 --- a/keyboards/planck/planck.c +++ b/keyboards/planck/planck.c @@ -4,8 +4,8 @@ __attribute__ ((weak)) void matrix_init_kb(void) { // Turn status LED on, with the exception of THK #if defined(__AVR_ATmega32U4__) - setPinOutput(E6); - writePinHigh(E6); + gpio_set_pin_output(E6); + gpio_write_pin_high(E6); #endif matrix_init_user(); diff --git a/keyboards/planck/rev6_drop/matrix.c b/keyboards/planck/rev6_drop/matrix.c index d1403567388..4d535fbb037 100644 --- a/keyboards/planck/rev6_drop/matrix.c +++ b/keyboards/planck/rev6_drop/matrix.c @@ -27,13 +27,13 @@ static matrix_row_t matrix_inverted[MATRIX_COLS]; void matrix_init_custom(void) { // actual matrix setup - cols for (int i = 0; i < MATRIX_COLS; i++) { - setPinOutput(matrix_col_pins[i]); - writePinLow(matrix_col_pins[i]); + gpio_set_pin_output(matrix_col_pins[i]); + gpio_write_pin_low(matrix_col_pins[i]); } // rows for (int i = 0; i < MATRIX_ROWS; i++) { - setPinInputLow(matrix_row_pins[i]); + gpio_set_pin_input_low(matrix_row_pins[i]); } } @@ -45,18 +45,18 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { matrix_row_t data = 0; // strobe col - writePinHigh(matrix_col_pins[col]); + gpio_write_pin_high(matrix_col_pins[col]); // need wait to settle pin state wait_us(20); // read row data for (int row = 0; row < MATRIX_ROWS; row++) { - data |= (readPin(matrix_row_pins[row]) << row); + data |= (gpio_read_pin(matrix_row_pins[row]) << row); } // unstrobe col - writePinLow(matrix_col_pins[col]); + gpio_write_pin_low(matrix_col_pins[col]); if (matrix_inverted[col] != data) { matrix_inverted[col] = data; diff --git a/keyboards/planck/rev7/matrix.c b/keyboards/planck/rev7/matrix.c index 8cadfa5e8d5..777bd6a7fe8 100644 --- a/keyboards/planck/rev7/matrix.c +++ b/keyboards/planck/rev7/matrix.c @@ -44,18 +44,18 @@ static matrix_row_t matrix_inverted[MATRIX_COLS]; void matrix_init_custom(void) { // actual matrix setup - cols for (int i = 0; i < MATRIX_COLS; i++) { - setPinOutput(matrix_col_pins[i]); - writePinLow(matrix_col_pins[i]); + gpio_set_pin_output(matrix_col_pins[i]); + gpio_write_pin_low(matrix_col_pins[i]); } // rows for (int i = 0; i < MATRIX_ROWS; i++) { - setPinInputLow(matrix_row_pins[i]); + gpio_set_pin_input_low(matrix_row_pins[i]); } // encoder A & B setup - setPinInputLow(B12); - setPinInputLow(B13); + gpio_set_pin_input_low(B12); + gpio_set_pin_input_low(B13); #ifndef PLANCK_WATCHDOG_DISABLE wdgInit(); @@ -81,18 +81,18 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { matrix_row_t data = 0; // strobe col - writePinHigh(matrix_col_pins[col]); + gpio_write_pin_high(matrix_col_pins[col]); // need wait to settle pin state wait_us(20); // read row data for (int row = 0; row < MATRIX_ROWS; row++) { - data |= (readPin(matrix_row_pins[row]) << row); + data |= (gpio_read_pin(matrix_row_pins[row]) << row); } // unstrobe col - writePinLow(matrix_col_pins[col]); + gpio_write_pin_low(matrix_col_pins[col]); if (matrix_inverted[col] != data) { matrix_inverted[col] = data; @@ -113,11 +113,11 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { uint8_t encoder_quadrature_read_pin(uint8_t index, bool pad_b) { pin_t pin = pad_b ? B13: B12; - setPinInputHigh(pin); - writePinLow(matrix_row_pins[index]); + gpio_set_pin_input_high(pin); + gpio_write_pin_low(matrix_row_pins[index]); wait_us(10); - uint8_t ret = readPin(pin) ? 1 : 0; - setPinInputLow(matrix_row_pins[index]); - setPinInputLow(pin); + uint8_t ret = gpio_read_pin(pin) ? 1 : 0; + gpio_set_pin_input_low(matrix_row_pins[index]); + gpio_set_pin_input_low(pin); return ret; } diff --git a/keyboards/pom_keyboards/tnln95/tnln95.c b/keyboards/pom_keyboards/tnln95/tnln95.c index 12651327eae..b8ab8ff7a7e 100644 --- a/keyboards/pom_keyboards/tnln95/tnln95.c +++ b/keyboards/pom_keyboards/tnln95/tnln95.c @@ -16,11 +16,11 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(B1); - setPinOutput(B2); + gpio_set_pin_output(B1); + gpio_set_pin_output(B2); /* I will add function to these later */ - // setPinOutput(B3); - // setPinOutput(E2); + // gpio_set_pin_output(B3); + // gpio_set_pin_output(E2); keyboard_pre_init_user(); } @@ -28,8 +28,8 @@ void keyboard_pre_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B1, led_state.num_lock); - writePin(B2, led_state.caps_lock); + gpio_write_pin(B1, led_state.num_lock); + gpio_write_pin(B2, led_state.caps_lock); } return res; } diff --git a/keyboards/preonic/rev1/rev1.c b/keyboards/preonic/rev1/rev1.c index eed51f2d845..8613da79eeb 100644 --- a/keyboards/preonic/rev1/rev1.c +++ b/keyboards/preonic/rev1/rev1.c @@ -18,8 +18,8 @@ void matrix_init_kb(void) { // Turn status LED on - setPinOutput(E6); - writePinHigh(E6); + gpio_set_pin_output(E6); + gpio_write_pin_high(E6); matrix_init_user(); }; diff --git a/keyboards/preonic/rev2/rev2.c b/keyboards/preonic/rev2/rev2.c index eed51f2d845..8613da79eeb 100644 --- a/keyboards/preonic/rev2/rev2.c +++ b/keyboards/preonic/rev2/rev2.c @@ -18,8 +18,8 @@ void matrix_init_kb(void) { // Turn status LED on - setPinOutput(E6); - writePinHigh(E6); + gpio_set_pin_output(E6); + gpio_write_pin_high(E6); matrix_init_user(); }; diff --git a/keyboards/primekb/meridian/meridian.c b/keyboards/primekb/meridian/meridian.c index c2f740dd145..585769e4628 100644 --- a/keyboards/primekb/meridian/meridian.c +++ b/keyboards/primekb/meridian/meridian.c @@ -19,7 +19,7 @@ along with this program. If not, see . //Initialize B12 for in-switch caps lock void keyboard_pre_init_kb(void){ - setPinOutput(B12); + gpio_set_pin_output(B12); keyboard_pre_init_user(); } @@ -35,7 +35,7 @@ void keyboard_post_init_user(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator + // gpio_write_pin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator if (led_state.caps_lock) { rgblight_setrgb_at(0, 255, 0, 0); //green } else { diff --git a/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c b/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c index e2a85a75c39..7d7989fdde5 100644 --- a/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c +++ b/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c @@ -118,9 +118,9 @@ void spi_init(void) { is_initialised = true; // Try releasing special pins for a short time - setPinInput(SPI_SCK_PIN); - setPinInput(SPI_MOSI_PIN); - setPinInput(SPI_MISO_PIN); + gpio_set_pin_input(SPI_SCK_PIN); + gpio_set_pin_input(SPI_MOSI_PIN); + gpio_set_pin_input(SPI_MISO_PIN); chThdSleepMilliseconds(10); diff --git a/keyboards/projectd/75/ansi/ansi.c b/keyboards/projectd/75/ansi/ansi.c index f32bf369a90..8257cf39c26 100644 --- a/keyboards/projectd/75/ansi/ansi.c +++ b/keyboards/projectd/75/ansi/ansi.c @@ -134,9 +134,9 @@ void spi_init(void) { is_initialised = true; // Try releasing special pins for a short time - setPinInput(SPI_SCK_PIN); - setPinInput(SPI_MOSI_PIN); - setPinInput(SPI_MISO_PIN); + gpio_set_pin_input(SPI_SCK_PIN); + gpio_set_pin_input(SPI_MOSI_PIN); + gpio_set_pin_input(SPI_MISO_PIN); chThdSleepMilliseconds(10); diff --git a/keyboards/projectkb/alice/alice.c b/keyboards/projectkb/alice/alice.c index 5e5687f7e8b..8ec5f16736f 100644 --- a/keyboards/projectkb/alice/alice.c +++ b/keyboards/projectkb/alice/alice.c @@ -1,9 +1,9 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(INDICATOR_PIN_0); - setPinOutput(INDICATOR_PIN_1); - setPinOutput(INDICATOR_PIN_2); + gpio_set_pin_output(INDICATOR_PIN_0); + gpio_set_pin_output(INDICATOR_PIN_1); + gpio_set_pin_output(INDICATOR_PIN_2); keyboard_pre_init_user(); } @@ -12,9 +12,9 @@ void keyboard_pre_init_kb(void) { bool led_update_kb(led_t led_state) { bool runDefault = led_update_user(led_state); if (runDefault) { - writePin(INDICATOR_PIN_0, !led_state.num_lock); - writePin(INDICATOR_PIN_1, !led_state.caps_lock); - writePin(INDICATOR_PIN_2, !led_state.scroll_lock); + gpio_write_pin(INDICATOR_PIN_0, !led_state.num_lock); + gpio_write_pin(INDICATOR_PIN_1, !led_state.caps_lock); + gpio_write_pin(INDICATOR_PIN_2, !led_state.scroll_lock); } return runDefault; } diff --git a/keyboards/protozoa/event_horizon/event_horizon.c b/keyboards/protozoa/event_horizon/event_horizon.c index 544d7c32b27..a8977a0e030 100644 --- a/keyboards/protozoa/event_horizon/event_horizon.c +++ b/keyboards/protozoa/event_horizon/event_horizon.c @@ -17,5 +17,5 @@ void led_init_ports(void) { // Set our LED pins as open drain outputs - setPinOutputOpenDrain(LED_CAPS_LOCK_PIN); + gpio_set_pin_output_open_drain(LED_CAPS_LOCK_PIN); } diff --git a/keyboards/punk75/punk75.c b/keyboards/punk75/punk75.c index aaabefb5aa3..8d9d09d43c4 100644 --- a/keyboards/punk75/punk75.c +++ b/keyboards/punk75/punk75.c @@ -18,7 +18,7 @@ void matrix_init_kb(void) { // Set our LED pin as output - setPinOutput(LED); + gpio_set_pin_output(LED); matrix_init_user(); } @@ -26,7 +26,7 @@ void matrix_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(LED, !led_state.caps_lock); + gpio_write_pin(LED, !led_state.caps_lock); } return res; } diff --git a/keyboards/quad_h/lb75/lb75.c b/keyboards/quad_h/lb75/lb75.c index 4c8e4f929bf..ef716092b9f 100644 --- a/keyboards/quad_h/lb75/lb75.c +++ b/keyboards/quad_h/lb75/lb75.c @@ -20,8 +20,8 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - setPinOutput(B1); - setPinOutput(B2); + gpio_set_pin_output(B1); + gpio_set_pin_output(B2); matrix_init_user(); } @@ -30,8 +30,8 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B1, !led_state.caps_lock); - writePin(B2, !led_state.scroll_lock); + gpio_write_pin(B1, !led_state.caps_lock); + gpio_write_pin(B2, !led_state.scroll_lock); } return res; diff --git a/keyboards/qvex/lynepad/lynepad.c b/keyboards/qvex/lynepad/lynepad.c index cc69e12240c..0e715e68bce 100644 --- a/keyboards/qvex/lynepad/lynepad.c +++ b/keyboards/qvex/lynepad/lynepad.c @@ -15,12 +15,12 @@ along with this program. If not, see . void keyboard_pre_init_kb(void) { // Encoder pins - setPinInput(PIN_TW_SW); - setPinInput(PIN_RJ_SW); - setPinInput(PIN_RJ_DIR_A); - setPinInput(PIN_RJ_DIR_C); - setPinInput(PIN_RJ_DIR_B); - setPinInput(PIN_RJ_DIR_D); + gpio_set_pin_input(PIN_TW_SW); + gpio_set_pin_input(PIN_RJ_SW); + gpio_set_pin_input(PIN_RJ_DIR_A); + gpio_set_pin_input(PIN_RJ_DIR_C); + gpio_set_pin_input(PIN_RJ_DIR_B); + gpio_set_pin_input(PIN_RJ_DIR_D); keyboard_pre_init_user(); } @@ -40,18 +40,18 @@ int16_t enc2RightPrev = 1; void matrix_scan_kb(void) { enc1CenterPrev = enc1Center; - enc1Center = readPin(PIN_TW_SW); + enc1Center = gpio_read_pin(PIN_TW_SW); enc2CenterPrev = enc2Center; - enc2Center = readPin(PIN_RJ_SW); + enc2Center = gpio_read_pin(PIN_RJ_SW); enc2UpPrev = enc2Up; - enc2Up = readPin(PIN_RJ_DIR_A); + enc2Up = gpio_read_pin(PIN_RJ_DIR_A); enc2DownPrev = enc2Down; - enc2Down = readPin(PIN_RJ_DIR_C); + enc2Down = gpio_read_pin(PIN_RJ_DIR_C); enc2LeftPrev = enc2Left; - enc2Left = readPin(PIN_RJ_DIR_B); + enc2Left = gpio_read_pin(PIN_RJ_DIR_B); enc2RightPrev = enc2Right; - enc2Right = readPin(PIN_RJ_DIR_D); + enc2Right = gpio_read_pin(PIN_RJ_DIR_D); // Ensure any user customizations are called (for some reason this wasn't happening by default) matrix_scan_user(); diff --git a/keyboards/qvex/lynepad2/matrix.c b/keyboards/qvex/lynepad2/matrix.c index 89c56b8d406..23b22cdb69d 100644 --- a/keyboards/qvex/lynepad2/matrix.c +++ b/keyboards/qvex/lynepad2/matrix.c @@ -24,31 +24,31 @@ extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void init_pins(void) { unselect_rows(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } - setPinInputHigh(PIN_JU); - setPinInputHigh(PIN_JD); - setPinInputHigh(PIN_JL); - setPinInputHigh(PIN_JR); - setPinInputHigh(PIN_JC); - setPinInputHigh(PIN_TC); + gpio_set_pin_input_high(PIN_JU); + gpio_set_pin_input_high(PIN_JD); + gpio_set_pin_input_high(PIN_JL); + gpio_set_pin_input_high(PIN_JR); + gpio_set_pin_input_high(PIN_JC); + gpio_set_pin_input_high(PIN_TC); } static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) { @@ -62,7 +62,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) wait_us(30); for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); } @@ -78,16 +78,16 @@ static bool read_encoder_switches(matrix_row_t current_matrix[]) { current_matrix[3] = 0; current_matrix[4] = 0; - current_matrix[4] |= !readPin(PIN_TC) ? (1 << 1) : 0; + current_matrix[4] |= !gpio_read_pin(PIN_TC) ? (1 << 1) : 0; - if (!readPin(PIN_JC)) { - if (!readPin(PIN_JU)) { + if (!gpio_read_pin(PIN_JC)) { + if (!gpio_read_pin(PIN_JU)) { current_matrix[3] |= (1 << 0); - } else if (!readPin(PIN_JD)) { + } else if (!gpio_read_pin(PIN_JD)) { current_matrix[3] |= (1 << 1); - } else if (!readPin(PIN_JL)) { + } else if (!gpio_read_pin(PIN_JL)) { current_matrix[3] |= (1 << 2); - } else if (!readPin(PIN_JR)) { + } else if (!gpio_read_pin(PIN_JR)) { current_matrix[3] |= (1 << 3); } else { current_matrix[4] |= (1 << 0); diff --git a/keyboards/rart/rartlite/rartlite.c b/keyboards/rart/rartlite/rartlite.c index 691c68253e1..f0ca27151ef 100644 --- a/keyboards/rart/rartlite/rartlite.c +++ b/keyboards/rart/rartlite/rartlite.c @@ -15,12 +15,12 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(B1); + gpio_set_pin_output(B1); keyboard_pre_init_user(); } layer_state_t layer_state_set_kb(layer_state_t state) { - writePin(B1, layer_state_cmp(state, 1)); + gpio_write_pin(B1, layer_state_cmp(state, 1)); return layer_state_set_user(state); } diff --git a/keyboards/rate/pistachio_pro/matrix.c b/keyboards/rate/pistachio_pro/matrix.c index bb962c76e22..f235c65f56f 100644 --- a/keyboards/rate/pistachio_pro/matrix.c +++ b/keyboards/rate/pistachio_pro/matrix.c @@ -22,13 +22,13 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { - ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); } + ATOMIC_BLOCK_FORCEON { gpio_set_pin_input_high(pin); } } static void select_row(uint8_t row) { @@ -81,7 +81,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) // For each col... for (uint8_t col_index = 0; col_index < MATRIX_COLS / 2; col_index++) { // Check row pin state - if (readPin(col_pins[col_index])) { + if (gpio_read_pin(col_pins[col_index])) { // Pin HI, clear col bit current_matrix[current_row] &= ~(MATRIX_ROW_SHIFTER << col_index); } else { @@ -109,7 +109,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index])) { + if (gpio_read_pin(row_pins[row_index])) { // Pin HI, clear col bit current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << ( current_col + MATRIX_COLS/2)); } else { diff --git a/keyboards/redox/wireless/wireless.c b/keyboards/redox/wireless/wireless.c index 30cefd9f4ea..a82afbf603f 100644 --- a/keyboards/redox/wireless/wireless.c +++ b/keyboards/redox/wireless/wireless.c @@ -18,15 +18,15 @@ along with this program. If not, see . #include "wireless.h" void led_init(void) { - setPinOutput(D0); - setPinOutput(D1); - setPinOutput(F4); - setPinOutput(F5); + gpio_set_pin_output(D0); + gpio_set_pin_output(D1); + gpio_set_pin_output(F4); + gpio_set_pin_output(F5); - writePinHigh(D0); - writePinHigh(D1); - writePinHigh(F4); - writePinHigh(F5); + gpio_write_pin_high(D0); + gpio_write_pin_high(D1); + gpio_write_pin_high(F4); + gpio_write_pin_high(F5); } diff --git a/keyboards/redox/wireless/wireless.h b/keyboards/redox/wireless/wireless.h index a0ba09aff31..f752e0b13f0 100644 --- a/keyboards/redox/wireless/wireless.h +++ b/keyboards/redox/wireless/wireless.h @@ -19,14 +19,14 @@ along with this program. If not, see . #include "quantum.h" -#define red_led_off writePinHigh(F5) -#define red_led_on writePinLow(F5) -#define blu_led_off writePinHigh(F4) -#define blu_led_on writePinLow(F4) -#define grn_led_off writePinHigh(D1) -#define grn_led_on writePinLow(D1) -#define wht_led_off writePinHigh(D0) -#define wht_led_on writePinLow(D0) +#define red_led_off gpio_write_pin_high(F5) +#define red_led_on gpio_write_pin_low(F5) +#define blu_led_off gpio_write_pin_high(F4) +#define blu_led_on gpio_write_pin_low(F4) +#define grn_led_off gpio_write_pin_high(D1) +#define grn_led_on gpio_write_pin_low(D1) +#define wht_led_off gpio_write_pin_high(D0) +#define wht_led_on gpio_write_pin_low(D0) #define set_led_off red_led_off; grn_led_off; blu_led_off; wht_led_off #define set_led_red red_led_on; grn_led_off; blu_led_off; wht_led_off diff --git a/keyboards/redscarf_i/redscarf_i.c b/keyboards/redscarf_i/redscarf_i.c index fac3e245fb7..949bc362ad2 100644 --- a/keyboards/redscarf_i/redscarf_i.c +++ b/keyboards/redscarf_i/redscarf_i.c @@ -18,19 +18,19 @@ void keyboard_pre_init_kb(void) { // initialize top row leds - setPinOutput(F7); - setPinOutput(F6); - setPinOutput(F5); + gpio_set_pin_output(F7); + gpio_set_pin_output(F6); + gpio_set_pin_output(F5); // and then turn them off - writePinHigh(F7); - writePinHigh(F6); - writePinHigh(F5); + gpio_write_pin_high(F7); + gpio_write_pin_high(F6); + gpio_write_pin_high(F5); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(F7, !led_state.num_lock); + gpio_write_pin(F7, !led_state.num_lock); } return res; } @@ -38,16 +38,16 @@ bool led_update_kb(led_t led_state) { layer_state_t layer_state_set_kb(layer_state_t state) { switch (get_highest_layer(state)) { case 1: - writePinHigh(F6); - writePinLow(F5); + gpio_write_pin_high(F6); + gpio_write_pin_low(F5); break; case 2: - writePinLow(F6); - writePinHigh(F5); + gpio_write_pin_low(F6); + gpio_write_pin_high(F5); break; default: - writePinHigh(F6); - writePinHigh(F5); + gpio_write_pin_high(F6); + gpio_write_pin_high(F5); break; } return state; diff --git a/keyboards/redscarf_iiplus/verb/matrix.c b/keyboards/redscarf_iiplus/verb/matrix.c index 391a923f165..886704f9efb 100755 --- a/keyboards/redscarf_iiplus/verb/matrix.c +++ b/keyboards/redscarf_iiplus/verb/matrix.c @@ -114,7 +114,7 @@ static void init_pins(void) { for (int col = 0; col < MATRIX_COLS; col++) { pin_t pin = direct_pins[row][col]; if (pin != NO_PIN) { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } } @@ -127,7 +127,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { pin_t pin = direct_pins[current_row][col_index]; if (pin != NO_PIN) { - current_matrix[current_row] |= readPin(pin) ? 0 : (ROW_SHIFTER << col_index); + current_matrix[current_row] |= gpio_read_pin(pin) ? 0 : (ROW_SHIFTER << col_index); } } @@ -150,27 +150,27 @@ static void select_row(uint8_t col) { switch (col) { case 0: - writePinLow(B0); - writePinLow(B1); - writePinLow(B2); + gpio_write_pin_low(B0); + gpio_write_pin_low(B1); + gpio_write_pin_low(B2); break; case 1: - writePinLow(B0); - writePinLow(B1); + gpio_write_pin_low(B0); + gpio_write_pin_low(B1); break; case 2: - writePinLow(B0); - writePinLow(B2); + gpio_write_pin_low(B0); + gpio_write_pin_low(B2); break; case 3: - writePinLow(B0); + gpio_write_pin_low(B0); break; case 4: - writePinLow(B1); - writePinLow(B2); + gpio_write_pin_low(B1); + gpio_write_pin_low(B2); break; case 5: - writePinLow(B1); + gpio_write_pin_low(B1); break; } } @@ -179,46 +179,46 @@ static void unselect_row(uint8_t col) { switch (col) { case 0: - writePinHigh(B0); - writePinHigh(B1); - writePinHigh(B2); + gpio_write_pin_high(B0); + gpio_write_pin_high(B1); + gpio_write_pin_high(B2); break; case 1: - writePinHigh(B0); - writePinHigh(B1); + gpio_write_pin_high(B0); + gpio_write_pin_high(B1); break; case 2: - writePinHigh(B0); - writePinHigh(B2); + gpio_write_pin_high(B0); + gpio_write_pin_high(B2); break; case 3: - writePinHigh(B0); + gpio_write_pin_high(B0); break; case 4: - writePinHigh(B1); - writePinHigh(B2); + gpio_write_pin_high(B1); + gpio_write_pin_high(B2); break; case 5: - writePinHigh(B1); + gpio_write_pin_high(B1); break; } } static void unselect_rows(void) { - setPinOutput(B0); - setPinOutput(B1); - setPinOutput(B2); + gpio_set_pin_output(B0); + gpio_set_pin_output(B1); + gpio_set_pin_output(B2); // make all pins high to select Y7, nothing is connected to that (otherwise the first row will act weird) - writePinHigh(B0); - writePinHigh(B1); - writePinHigh(B2); + gpio_write_pin_high(B0); + gpio_write_pin_high(B1); + gpio_write_pin_high(B2); } static void init_pins(void) { unselect_rows(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -238,7 +238,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index); @@ -254,26 +254,26 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } static void unselect_col(uint8_t col) { - setPinInputHigh(col_pins[col]); + gpio_set_pin_input_high(col_pins[col]); } static void unselect_cols(void) { for(uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -293,7 +293,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (ROW_SHIFTER << current_col); diff --git a/keyboards/redscarf_iiplus/verc/matrix.c b/keyboards/redscarf_iiplus/verc/matrix.c index 391a923f165..886704f9efb 100755 --- a/keyboards/redscarf_iiplus/verc/matrix.c +++ b/keyboards/redscarf_iiplus/verc/matrix.c @@ -114,7 +114,7 @@ static void init_pins(void) { for (int col = 0; col < MATRIX_COLS; col++) { pin_t pin = direct_pins[row][col]; if (pin != NO_PIN) { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } } @@ -127,7 +127,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { pin_t pin = direct_pins[current_row][col_index]; if (pin != NO_PIN) { - current_matrix[current_row] |= readPin(pin) ? 0 : (ROW_SHIFTER << col_index); + current_matrix[current_row] |= gpio_read_pin(pin) ? 0 : (ROW_SHIFTER << col_index); } } @@ -150,27 +150,27 @@ static void select_row(uint8_t col) { switch (col) { case 0: - writePinLow(B0); - writePinLow(B1); - writePinLow(B2); + gpio_write_pin_low(B0); + gpio_write_pin_low(B1); + gpio_write_pin_low(B2); break; case 1: - writePinLow(B0); - writePinLow(B1); + gpio_write_pin_low(B0); + gpio_write_pin_low(B1); break; case 2: - writePinLow(B0); - writePinLow(B2); + gpio_write_pin_low(B0); + gpio_write_pin_low(B2); break; case 3: - writePinLow(B0); + gpio_write_pin_low(B0); break; case 4: - writePinLow(B1); - writePinLow(B2); + gpio_write_pin_low(B1); + gpio_write_pin_low(B2); break; case 5: - writePinLow(B1); + gpio_write_pin_low(B1); break; } } @@ -179,46 +179,46 @@ static void unselect_row(uint8_t col) { switch (col) { case 0: - writePinHigh(B0); - writePinHigh(B1); - writePinHigh(B2); + gpio_write_pin_high(B0); + gpio_write_pin_high(B1); + gpio_write_pin_high(B2); break; case 1: - writePinHigh(B0); - writePinHigh(B1); + gpio_write_pin_high(B0); + gpio_write_pin_high(B1); break; case 2: - writePinHigh(B0); - writePinHigh(B2); + gpio_write_pin_high(B0); + gpio_write_pin_high(B2); break; case 3: - writePinHigh(B0); + gpio_write_pin_high(B0); break; case 4: - writePinHigh(B1); - writePinHigh(B2); + gpio_write_pin_high(B1); + gpio_write_pin_high(B2); break; case 5: - writePinHigh(B1); + gpio_write_pin_high(B1); break; } } static void unselect_rows(void) { - setPinOutput(B0); - setPinOutput(B1); - setPinOutput(B2); + gpio_set_pin_output(B0); + gpio_set_pin_output(B1); + gpio_set_pin_output(B2); // make all pins high to select Y7, nothing is connected to that (otherwise the first row will act weird) - writePinHigh(B0); - writePinHigh(B1); - writePinHigh(B2); + gpio_write_pin_high(B0); + gpio_write_pin_high(B1); + gpio_write_pin_high(B2); } static void init_pins(void) { unselect_rows(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -238,7 +238,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index); @@ -254,26 +254,26 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } static void unselect_col(uint8_t col) { - setPinInputHigh(col_pins[col]); + gpio_set_pin_input_high(col_pins[col]); } static void unselect_cols(void) { for(uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -293,7 +293,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (ROW_SHIFTER << current_col); diff --git a/keyboards/redscarf_iiplus/verd/matrix.c b/keyboards/redscarf_iiplus/verd/matrix.c index b2046db2cef..133898b6522 100644 --- a/keyboards/redscarf_iiplus/verd/matrix.c +++ b/keyboards/redscarf_iiplus/verd/matrix.c @@ -114,7 +114,7 @@ static void init_pins(void) { for (int col = 0; col < MATRIX_COLS; col++) { pin_t pin = direct_pins[row][col]; if (pin != NO_PIN) { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } } @@ -127,7 +127,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { pin_t pin = direct_pins[current_row][col_index]; if (pin != NO_PIN) { - current_matrix[current_row] |= readPin(pin) ? 0 : (ROW_SHIFTER << col_index); + current_matrix[current_row] |= gpio_read_pin(pin) ? 0 : (ROW_SHIFTER << col_index); } } @@ -150,27 +150,27 @@ static void select_row(uint8_t col) { switch (col) { case 0: - writePinLow(B0); - writePinLow(B1); - writePinLow(B2); + gpio_write_pin_low(B0); + gpio_write_pin_low(B1); + gpio_write_pin_low(B2); break; case 1: - writePinLow(B0); - writePinLow(B1); + gpio_write_pin_low(B0); + gpio_write_pin_low(B1); break; case 2: - writePinLow(B0); - writePinLow(B2); + gpio_write_pin_low(B0); + gpio_write_pin_low(B2); break; case 3: - writePinLow(B0); + gpio_write_pin_low(B0); break; case 4: - writePinLow(B1); - writePinLow(B2); + gpio_write_pin_low(B1); + gpio_write_pin_low(B2); break; case 5: - writePinLow(B1); + gpio_write_pin_low(B1); break; } } @@ -179,46 +179,46 @@ static void unselect_row(uint8_t col) { switch (col) { case 0: - writePinHigh(B0); - writePinHigh(B1); - writePinHigh(B2); + gpio_write_pin_high(B0); + gpio_write_pin_high(B1); + gpio_write_pin_high(B2); break; case 1: - writePinHigh(B0); - writePinHigh(B1); + gpio_write_pin_high(B0); + gpio_write_pin_high(B1); break; case 2: - writePinHigh(B0); - writePinHigh(B2); + gpio_write_pin_high(B0); + gpio_write_pin_high(B2); break; case 3: - writePinHigh(B0); + gpio_write_pin_high(B0); break; case 4: - writePinHigh(B1); - writePinHigh(B2); + gpio_write_pin_high(B1); + gpio_write_pin_high(B2); break; case 5: - writePinHigh(B1); + gpio_write_pin_high(B1); break; } } static void unselect_rows(void) { - setPinOutput(B0); - setPinOutput(B1); - setPinOutput(B2); + gpio_set_pin_output(B0); + gpio_set_pin_output(B1); + gpio_set_pin_output(B2); // make all pins high to select Y7, nothing is connected to that (otherwise the first row will act weird) - writePinHigh(B0); - writePinHigh(B1); - writePinHigh(B2); + gpio_write_pin_high(B0); + gpio_write_pin_high(B1); + gpio_write_pin_high(B2); } static void init_pins(void) { unselect_rows(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -238,7 +238,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index); @@ -254,26 +254,26 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } static void unselect_col(uint8_t col) { - setPinInputHigh(col_pins[col]); + gpio_set_pin_input_high(col_pins[col]); } static void unselect_cols(void) { for(uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -293,7 +293,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state - if (readPin(row_pins[row_index]) == 0) + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= (ROW_SHIFTER << current_col); diff --git a/keyboards/rmi_kb/wete/v1/v1.c b/keyboards/rmi_kb/wete/v1/v1.c index 088ca3c6b70..34a09174684 100644 --- a/keyboards/rmi_kb/wete/v1/v1.c +++ b/keyboards/rmi_kb/wete/v1/v1.c @@ -18,17 +18,17 @@ void keyboard_pre_init_user(void) { // Initialize indicator LED pins - setPinOutput(A14); // Num Lock - setPinOutput(A15); // Scroll Lock - setPinOutput(B3); // Caps Lock + gpio_set_pin_output(A14); // Num Lock + gpio_set_pin_output(A15); // Scroll Lock + gpio_set_pin_output(B3); // Caps Lock } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - writePin(A14, !led_state.num_lock); - writePin(A15, !led_state.scroll_lock); - writePin(B3, !led_state.caps_lock); + gpio_write_pin(A14, !led_state.num_lock); + gpio_write_pin(A15, !led_state.scroll_lock); + gpio_write_pin(B3, !led_state.caps_lock); } return res; diff --git a/keyboards/rookiebwoy/neopad/rev1/rev1.c b/keyboards/rookiebwoy/neopad/rev1/rev1.c index c8216f4e702..3b527794c0b 100755 --- a/keyboards/rookiebwoy/neopad/rev1/rev1.c +++ b/keyboards/rookiebwoy/neopad/rev1/rev1.c @@ -17,8 +17,8 @@ void keyboard_pre_init_kb(void) { // Set LED IO as outputs - setPinOutput(LED_00); - setPinOutput(LED_01); + gpio_set_pin_output(LED_00); + gpio_set_pin_output(LED_01); keyboard_pre_init_user(); } @@ -27,8 +27,8 @@ bool shutdown_kb(bool jump_to_bootloader) { return false; } // Shutdown LEDs - writePinLow(LED_00); - writePinLow(LED_01); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); return true; } @@ -37,8 +37,8 @@ layer_state_t layer_state_set_kb(layer_state_t state) { // Layer LEDs act as binary indication of current layer uint8_t layer = get_highest_layer(state); - writePin(LED_00, layer & 0b1); - writePin(LED_01, (layer >> 1) & 0b1); + gpio_write_pin(LED_00, layer & 0b1); + gpio_write_pin(LED_01, (layer >> 1) & 0b1); return state; } @@ -51,11 +51,11 @@ void matrix_init_kb(void) { // runs once when the firmware starts up uint8_t led_delay_ms = 80; for (int i = 0; i < 2; i++) { - writePinHigh(LED_00); - writePinHigh(LED_01); + gpio_write_pin_high(LED_00); + gpio_write_pin_high(LED_01); wait_ms(led_delay_ms); - writePinLow(LED_00); - writePinLow(LED_01); + gpio_write_pin_low(LED_00); + gpio_write_pin_low(LED_01); if (i < 1) { wait_ms(led_delay_ms); } diff --git a/keyboards/rubi/rubi.c b/keyboards/rubi/rubi.c index b125ff34a5e..89bf9caa6d4 100644 --- a/keyboards/rubi/rubi.c +++ b/keyboards/rubi/rubi.c @@ -68,7 +68,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - writePin(C6, led_state.num_lock); + gpio_write_pin(C6, led_state.num_lock); } return true; } diff --git a/keyboards/ryanskidmore/rskeys100/matrix.c b/keyboards/ryanskidmore/rskeys100/matrix.c index 2ab9eafd7f5..53ad18ee482 100644 --- a/keyboards/ryanskidmore/rskeys100/matrix.c +++ b/keyboards/ryanskidmore/rskeys100/matrix.c @@ -30,16 +30,16 @@ static void shift_out_single(uint8_t value); static void shift_out(uint32_t value); void matrix_init_custom(void) { - setPinInput(ROW_A); - setPinInput(ROW_B); - setPinInput(ROW_C); - setPinInput(ROW_D); - setPinInput(ROW_E); - setPinInput(ROW_F); + gpio_set_pin_input(ROW_A); + gpio_set_pin_input(ROW_B); + gpio_set_pin_input(ROW_C); + gpio_set_pin_input(ROW_D); + gpio_set_pin_input(ROW_E); + gpio_set_pin_input(ROW_F); - setPinOutput(SHR_DATA); - setPinOutput(SHR_LATCH); - setPinOutput(SHR_CLOCK); + gpio_set_pin_output(SHR_DATA); + gpio_set_pin_output(SHR_LATCH); + gpio_set_pin_output(SHR_CLOCK); } bool matrix_scan_custom(matrix_row_t current_matrix[]) { @@ -63,12 +63,12 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { } static uint8_t read_rows(void) { - return (readPin(ROW_F) << 5) - | (readPin(ROW_E) << 4) - | (readPin(ROW_D) << 3) - | (readPin(ROW_C) << 2) - | (readPin(ROW_B) << 1) - | (readPin(ROW_A) ); + return (gpio_read_pin(ROW_F) << 5) + | (gpio_read_pin(ROW_E) << 4) + | (gpio_read_pin(ROW_D) << 3) + | (gpio_read_pin(ROW_C) << 2) + | (gpio_read_pin(ROW_B) << 1) + | (gpio_read_pin(ROW_A) ); } static void select_col(uint8_t col) { @@ -76,7 +76,7 @@ static void select_col(uint8_t col) { } static void shift_out(uint32_t value) { - writePinLow(SHR_LATCH); + gpio_write_pin_low(SHR_LATCH); uint8_t first_byte = (value >> 16) & 0xFF; uint8_t second_byte = (value >> 8) & 0xFF; uint8_t third_byte = (uint8_t)(value & 0xFF); @@ -84,7 +84,7 @@ static void shift_out(uint32_t value) { shift_out_single(first_byte); shift_out_single(second_byte); shift_out_single(third_byte); - writePinHigh(SHR_LATCH); + gpio_write_pin_high(SHR_LATCH); /* We delay here to prevent multiple consecutive keys being triggered with a single switch press */ _delay_us(10); } @@ -92,9 +92,9 @@ static void shift_out(uint32_t value) { static void shift_out_single(uint8_t value) { for (uint8_t i = 0; i < 8; i++) { if (value & 0b10000000) { - writePinHigh(SHR_DATA); + gpio_write_pin_high(SHR_DATA); } else { - writePinLow(SHR_DATA); + gpio_write_pin_low(SHR_DATA); } shift_pulse(); @@ -103,6 +103,6 @@ static void shift_out_single(uint8_t value) { } static inline void shift_pulse(void) { - writePinHigh(SHR_CLOCK); - writePinLow(SHR_CLOCK); + gpio_write_pin_high(SHR_CLOCK); + gpio_write_pin_low(SHR_CLOCK); } \ No newline at end of file diff --git a/keyboards/sekigon/grs_70ec/ec_switch_matrix.c b/keyboards/sekigon/grs_70ec/ec_switch_matrix.c index 9c474695a11..0583da79d77 100644 --- a/keyboards/sekigon/grs_70ec/ec_switch_matrix.c +++ b/keyboards/sekigon/grs_70ec/ec_switch_matrix.c @@ -29,35 +29,35 @@ _Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS"); static ecsm_config_t config; static uint16_t ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS]; -static inline void discharge_capacitor(void) { setPinOutput(DISCHARGE_PIN); } +static inline void discharge_capacitor(void) { gpio_set_pin_output(DISCHARGE_PIN); } static inline void charge_capacitor(uint8_t row) { - setPinInput(DISCHARGE_PIN); - writePinHigh(row_pins[row]); + gpio_set_pin_input(DISCHARGE_PIN); + gpio_write_pin_high(row_pins[row]); } static inline void clear_all_row_pins(void) { for (int row = 0; row < sizeof(row_pins); row++) { - writePinLow(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } } static inline void init_mux_sel(void) { for (int idx = 0; idx < sizeof(mux_sel_pins); idx++) { - setPinOutput(mux_sel_pins[idx]); + gpio_set_pin_output(mux_sel_pins[idx]); } } static inline void select_mux(uint8_t col) { uint8_t ch = col_channels[col]; - writePin(mux_sel_pins[0], ch & 1); - writePin(mux_sel_pins[1], ch & 2); - writePin(mux_sel_pins[2], ch & 4); + gpio_write_pin(mux_sel_pins[0], ch & 1); + gpio_write_pin(mux_sel_pins[1], ch & 2); + gpio_write_pin(mux_sel_pins[2], ch & 4); } static inline void init_row(void) { for (int idx = 0; idx < sizeof(row_pins); idx++) { - setPinOutput(row_pins[idx]); - writePinLow(row_pins[idx]); + gpio_set_pin_output(row_pins[idx]); + gpio_write_pin_low(row_pins[idx]); } } @@ -67,8 +67,8 @@ int ecsm_init(ecsm_config_t const* const ecsm_config) { config = *ecsm_config; // initialize discharge pin as discharge mode - writePinLow(DISCHARGE_PIN); - setPinOutput(DISCHARGE_PIN); + gpio_write_pin_low(DISCHARGE_PIN); + gpio_set_pin_output(DISCHARGE_PIN); // set analog reference analogReference(ADC_REF_POWER); @@ -80,7 +80,7 @@ int ecsm_init(ecsm_config_t const* const ecsm_config) { init_mux_sel(); // set discharge pin to charge mode - setPinInput(DISCHARGE_PIN); + gpio_set_pin_input(DISCHARGE_PIN); return 0; } diff --git a/keyboards/sekigon/grs_70ec/grs_70ec.c b/keyboards/sekigon/grs_70ec/grs_70ec.c index e855a80dcff..9f20e9784a3 100644 --- a/keyboards/sekigon/grs_70ec/grs_70ec.c +++ b/keyboards/sekigon/grs_70ec/grs_70ec.c @@ -17,11 +17,11 @@ #include "grs_70ec.h" void led_on(void) { - setPinOutput(D2); - writePinHigh(D2); + gpio_set_pin_output(D2); + gpio_write_pin_high(D2); } -void led_off(void) { writePinLow(D2); } +void led_off(void) { gpio_write_pin_low(D2); } void keyboard_post_init_kb(void) { led_on(); @@ -31,8 +31,8 @@ void keyboard_post_init_kb(void) { void keyboard_pre_init_kb(void) { // Turn on extern circuit - setPinOutput(F7); - writePinHigh(F7); + gpio_set_pin_output(F7); + gpio_write_pin_high(F7); keyboard_pre_init_user(); } diff --git a/keyboards/sergiopoverony/creator_pro/creator_pro.c b/keyboards/sergiopoverony/creator_pro/creator_pro.c index 55c0497df24..acb99fdfc75 100644 --- a/keyboards/sergiopoverony/creator_pro/creator_pro.c +++ b/keyboards/sergiopoverony/creator_pro/creator_pro.c @@ -19,15 +19,15 @@ void matrix_init_kb(void) { matrix_init_user(); /* led pins */ - setPinOutput(RED_LED); - setPinOutput(BLUE_LED); - setPinOutput(GREEN_LED); + gpio_set_pin_output(RED_LED); + gpio_set_pin_output(BLUE_LED); + gpio_set_pin_output(GREEN_LED); } void turn_off_leds(void) { - writePinLow(RED_LED); - writePinLow(BLUE_LED); - writePinLow(GREEN_LED); + gpio_write_pin_low(RED_LED); + gpio_write_pin_low(BLUE_LED); + gpio_write_pin_low(GREEN_LED); } void turn_on_led(pin_t pin) { - writePinHigh(pin); + gpio_write_pin_high(pin); } diff --git a/keyboards/skyloong/gk61/pro/pro.c b/keyboards/skyloong/gk61/pro/pro.c index 06d9ce721d8..49841b2ee5b 100644 --- a/keyboards/skyloong/gk61/pro/pro.c +++ b/keyboards/skyloong/gk61/pro/pro.c @@ -213,14 +213,14 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { void suspend_power_down_kb() { # ifdef RGB_MATRIX_ENABLE - writePinLow(IS31FL3743A_SDB_PIN); + gpio_write_pin_low(IS31FL3743A_SDB_PIN); # endif suspend_power_down_user(); } void suspend_wakeup_init_kb() { # ifdef RGB_MATRIX_ENABLE - writePinHigh(IS31FL3743A_SDB_PIN); + gpio_write_pin_high(IS31FL3743A_SDB_PIN); # endif suspend_wakeup_init_user(); } diff --git a/keyboards/skyloong/gk61/pro_48/pro_48.c b/keyboards/skyloong/gk61/pro_48/pro_48.c index c5758ffcf4c..ff49f5d22f0 100644 --- a/keyboards/skyloong/gk61/pro_48/pro_48.c +++ b/keyboards/skyloong/gk61/pro_48/pro_48.c @@ -149,12 +149,12 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { void suspend_power_down_kb(void) { - writePinLow(IS31FL3743A_SDB_PIN); + gpio_write_pin_low(IS31FL3743A_SDB_PIN); suspend_power_down_user(); } void suspend_wakeup_init_kb(void) { - writePinHigh(IS31FL3743A_SDB_PIN); + gpio_write_pin_high(IS31FL3743A_SDB_PIN); suspend_wakeup_init_user(); } #endif diff --git a/keyboards/skyloong/gk61/v1/v1.c b/keyboards/skyloong/gk61/v1/v1.c index 01e6b6c6ae6..0e8b7691c37 100644 --- a/keyboards/skyloong/gk61/v1/v1.c +++ b/keyboards/skyloong/gk61/v1/v1.c @@ -102,13 +102,13 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { #endif // RGB_MATRIX_ENABLE void suspend_power_down_kb() { - writePinLow(SNLED27351_SDB_PIN); + gpio_write_pin_low(SNLED27351_SDB_PIN); suspend_power_down_user(); } void suspend_wakeup_init_kb() { - writePinHigh(SNLED27351_SDB_PIN); + gpio_write_pin_high(SNLED27351_SDB_PIN); suspend_wakeup_init_user(); } diff --git a/keyboards/smithrune/iron165r2/iron165r2.c b/keyboards/smithrune/iron165r2/iron165r2.c index 6f1606f89d3..428494f4088 100644 --- a/keyboards/smithrune/iron165r2/iron165r2.c +++ b/keyboards/smithrune/iron165r2/iron165r2.c @@ -17,8 +17,8 @@ #include "quantum.h" void board_init(void) { - setPinInput(B6); - setPinInput(B7); + gpio_set_pin_input(B6); + gpio_set_pin_input(B7); #if defined (LINE_RGBS) rgblight_set_effect_range(0,16); #elif defined (RUNE_RGBS) @@ -30,6 +30,6 @@ void board_init(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); - if(res) writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); + if(res) gpio_write_pin(LED_CAPS_LOCK_PIN, led_state.caps_lock); return res; } diff --git a/keyboards/sneakbox/aliceclone/aliceclone.c b/keyboards/sneakbox/aliceclone/aliceclone.c index 9ddc198db87..74d19e515c1 100644 --- a/keyboards/sneakbox/aliceclone/aliceclone.c +++ b/keyboards/sneakbox/aliceclone/aliceclone.c @@ -18,9 +18,9 @@ along with this program. If not, see . #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(D7); - setPinOutput(D6); - setPinOutput(D4); + gpio_set_pin_output(D7); + gpio_set_pin_output(D6); + gpio_set_pin_output(D4); keyboard_pre_init_user(); } @@ -28,9 +28,9 @@ void keyboard_pre_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(D7, led_state.num_lock); - writePin(D6, led_state.caps_lock); - writePin(D4, led_state.scroll_lock); + gpio_write_pin(D7, led_state.num_lock); + gpio_write_pin(D6, led_state.caps_lock); + gpio_write_pin(D4, led_state.scroll_lock); } return res; } diff --git a/keyboards/snes_macropad/matrix.c b/keyboards/snes_macropad/matrix.c index 28d036aca9c..af7e3db9517 100644 --- a/keyboards/snes_macropad/matrix.c +++ b/keyboards/snes_macropad/matrix.c @@ -36,48 +36,48 @@ static const int kbd_pin_map[] = { void matrix_init_custom(void) { // init snes controller - setPinInputHigh(SNES_D0); + gpio_set_pin_input_high(SNES_D0); // todo: look into protocol for other strange snes controllers that use D1 and IO - // setPinInputHigh(SNES_D1); - // setPinInputHigh(SNES_IO); - setPinOutput(SNES_CLOCK); - setPinOutput(SNES_LATCH); - writePinLow(SNES_CLOCK); - writePinLow(SNES_LATCH); + // gpio_set_pin_input_high(SNES_D1); + // gpio_set_pin_input_high(SNES_IO); + gpio_set_pin_output(SNES_CLOCK); + gpio_set_pin_output(SNES_LATCH); + gpio_write_pin_low(SNES_CLOCK); + gpio_write_pin_low(SNES_LATCH); // init rows - setPinOutput(KBD_ROW0); - setPinOutput(KBD_ROW1); - setPinOutput(KBD_ROW2); - writePinHigh(KBD_ROW0); - writePinHigh(KBD_ROW1); - writePinHigh(KBD_ROW2); + gpio_set_pin_output(KBD_ROW0); + gpio_set_pin_output(KBD_ROW1); + gpio_set_pin_output(KBD_ROW2); + gpio_write_pin_high(KBD_ROW0); + gpio_write_pin_high(KBD_ROW1); + gpio_write_pin_high(KBD_ROW2); // init columns - setPinInputHigh(KBD_COL0); - setPinInputHigh(KBD_COL1); - setPinInputHigh(KBD_COL2); - setPinInputHigh(KBD_COL3); + gpio_set_pin_input_high(KBD_COL0); + gpio_set_pin_input_high(KBD_COL1); + gpio_set_pin_input_high(KBD_COL2); + gpio_set_pin_input_high(KBD_COL3); } static matrix_row_t readRow(size_t row, int setupDelay) { const int pin = kbd_pin_map[row]; // select the row - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); wait_us(setupDelay); // read the column data const matrix_row_t ret = - (readPin(KBD_COL0) ? 0 : 1 << 0) - | (readPin(KBD_COL1) ? 0 : 1 << 1) - | (readPin(KBD_COL2) ? 0 : 1 << 2) - | (readPin(KBD_COL3) ? 0 : 1 << 3); + (gpio_read_pin(KBD_COL0) ? 0 : 1 << 0) + | (gpio_read_pin(KBD_COL1) ? 0 : 1 << 1) + | (gpio_read_pin(KBD_COL2) ? 0 : 1 << 2) + | (gpio_read_pin(KBD_COL3) ? 0 : 1 << 3); // deselect the row - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); return ret; } @@ -103,7 +103,7 @@ static matrix_row_t getBits(uint16_t value, size_t bit0, size_t bit1, size_t bit static void readSnesController(matrix_row_t current_matrix[]) { uint16_t controller = 0; - writePinHigh(SNES_LATCH); + gpio_write_pin_high(SNES_LATCH); for (size_t bit = 0; bit < SNES_DATA_BITS; ++bit) { // Wait for shift register to setup the data line @@ -111,16 +111,16 @@ static void readSnesController(matrix_row_t current_matrix[]) { // Shift accumulated data and read data pin controller <<= 1; - controller |= readPin(SNES_D0) ? 0 : 1; + controller |= gpio_read_pin(SNES_D0) ? 0 : 1; // todo: maybe read D1 and IO here too // Shift next bit in - writePinHigh(SNES_CLOCK); + gpio_write_pin_high(SNES_CLOCK); wait_us(SNES_CLOCK_PULSE_DURATION); - writePinLow(SNES_CLOCK); + gpio_write_pin_low(SNES_CLOCK); } - writePinLow(SNES_LATCH); + gpio_write_pin_low(SNES_LATCH); controller >>= 4; diff --git a/keyboards/splitkb/aurora/helix/rev1/rev1.c b/keyboards/splitkb/aurora/helix/rev1/rev1.c index da24934eef7..0a478a5c735 100644 --- a/keyboards/splitkb/aurora/helix/rev1/rev1.c +++ b/keyboards/splitkb/aurora/helix/rev1/rev1.c @@ -24,8 +24,8 @@ static enum { UNKNOWN, LEFT, RIGHT } hand_side = UNKNOWN; if (hand_side == UNKNOWN) { #if defined(SPLIT_HAND_PIN) // Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand - setPinInput(SPLIT_HAND_PIN); - hand_side = readPin(SPLIT_HAND_PIN) ? LEFT : RIGHT; + gpio_set_pin_input(SPLIT_HAND_PIN); + hand_side = gpio_read_pin(SPLIT_HAND_PIN) ? LEFT : RIGHT; return (hand_side == LEFT); #endif hand_side = is_keyboard_master() ? LEFT : RIGHT; diff --git a/keyboards/sthlmkb/lagom/matrix.c b/keyboards/sthlmkb/lagom/matrix.c index 6a16722ad08..177cda2354a 100644 --- a/keyboards/sthlmkb/lagom/matrix.c +++ b/keyboards/sthlmkb/lagom/matrix.c @@ -27,17 +27,17 @@ static const uint8_t col_pins[MATRIX_MUX_COLS] = MATRIX_COL_MUX_PINS; static void init_pins(void) { // Set cols to outputs, low for (uint8_t pin = 0; pin < MATRIX_MUX_COLS; pin++) { - setPinOutput(col_pins[pin]); + gpio_set_pin_output(col_pins[pin]); } // Unselect cols for (uint8_t bit = 0; bit < MATRIX_MUX_COLS; bit++) { - writePinLow(col_pins[bit]); + gpio_write_pin_low(col_pins[bit]); } // Set rows to input, pullup for (uint8_t pin = 0; pin < MATRIX_ROWS; pin++) { - setPinInputHigh(row_pins[pin]); + gpio_set_pin_input_high(row_pins[pin]); } } @@ -45,7 +45,7 @@ static void select_col(uint8_t col) { for (uint8_t bit = 0; bit < MATRIX_MUX_COLS; bit++) { uint8_t state = (col & (0b1 << bit)) >> bit; - writePin(col_pins[bit], state); + gpio_write_pin(col_pins[bit], state); } } @@ -60,7 +60,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { matrix_row_t last_row_value = current_matrix[row_index]; - if (!readPin(row_pins[row_index])) + if (!gpio_read_pin(row_pins[row_index])) { current_matrix[row_index] |= (COL_SHIFTER << current_col); } diff --git a/keyboards/strech/soulstone/soulstone.c b/keyboards/strech/soulstone/soulstone.c index 4a951aff9d2..e6457a5271d 100644 --- a/keyboards/strech/soulstone/soulstone.c +++ b/keyboards/strech/soulstone/soulstone.c @@ -18,13 +18,13 @@ // Prepare layer indicator LED void keyboard_post_init_kb(void) { - setPinOutput(LAYER_INDICATOR_LED_PIN); - writePinLow(LAYER_INDICATOR_LED_PIN); + gpio_set_pin_output(LAYER_INDICATOR_LED_PIN); + gpio_write_pin_low(LAYER_INDICATOR_LED_PIN); keyboard_post_init_user(); } // Function for layer indicator LED layer_state_t layer_state_set_kb(layer_state_t state) { - writePin(LAYER_INDICATOR_LED_PIN, !layer_state_cmp(state, 0)); + gpio_write_pin(LAYER_INDICATOR_LED_PIN, !layer_state_cmp(state, 0)); return layer_state_set_user(state); } diff --git a/keyboards/switchplate/southpaw_65/southpaw_65.c b/keyboards/switchplate/southpaw_65/southpaw_65.c index d75c9b101df..dfe3665928b 100644 --- a/keyboards/switchplate/southpaw_65/southpaw_65.c +++ b/keyboards/switchplate/southpaw_65/southpaw_65.c @@ -16,7 +16,7 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(B6); + gpio_set_pin_output(B6); keyboard_pre_init_user(); } @@ -24,7 +24,7 @@ void keyboard_pre_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B6, !led_state.caps_lock); + gpio_write_pin(B6, !led_state.caps_lock); } return res; } diff --git a/keyboards/switchplate/southpaw_fullsize/southpaw_fullsize.c b/keyboards/switchplate/southpaw_fullsize/southpaw_fullsize.c index f631e1d95a7..3d77e8722e6 100644 --- a/keyboards/switchplate/southpaw_fullsize/southpaw_fullsize.c +++ b/keyboards/switchplate/southpaw_fullsize/southpaw_fullsize.c @@ -30,9 +30,9 @@ void matrix_init_kb(void) { // runs once when the firmware starts up // D3 Numlock, D4 Capslock, D5 Scrlock - setPinOutput(INDICATOR_NUM); - setPinOutput(INDICATOR_CAPS); - setPinOutput(INDICATOR_SCR); + gpio_set_pin_output(INDICATOR_NUM); + gpio_set_pin_output(INDICATOR_CAPS); + gpio_set_pin_output(INDICATOR_SCR); matrix_init_user(); } @@ -42,9 +42,9 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - writePin(INDICATOR_NUM, !led_state.num_lock); - writePin(INDICATOR_CAPS, !led_state.caps_lock); - writePin(INDICATOR_SCR, !led_state.scroll_lock); + gpio_write_pin(INDICATOR_NUM, !led_state.num_lock); + gpio_write_pin(INDICATOR_CAPS, !led_state.caps_lock); + gpio_write_pin(INDICATOR_SCR, !led_state.scroll_lock); } return res; } diff --git a/keyboards/team0110/p1800fl/p1800fl.c b/keyboards/team0110/p1800fl/p1800fl.c index c82507ec27a..9f47b8a5c44 100644 --- a/keyboards/team0110/p1800fl/p1800fl.c +++ b/keyboards/team0110/p1800fl/p1800fl.c @@ -19,9 +19,9 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(D3, led_state.num_lock); - writePin(D5, led_state.caps_lock); - writePin(C6, led_state.scroll_lock); + gpio_write_pin(D3, led_state.num_lock); + gpio_write_pin(D5, led_state.caps_lock); + gpio_write_pin(C6, led_state.scroll_lock); } return res; } diff --git a/keyboards/technika/technika.c b/keyboards/technika/technika.c index cc60debe9f2..65dc9e0d31a 100644 --- a/keyboards/technika/technika.c +++ b/keyboards/technika/technika.c @@ -18,9 +18,9 @@ along with this program. If not, see . #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(A15); - setPinOutput(B3); - setPinOutput(B4); + gpio_set_pin_output(A15); + gpio_set_pin_output(B3); + gpio_set_pin_output(B4); keyboard_pre_init_user(); } diff --git a/keyboards/telophase/telophase.c b/keyboards/telophase/telophase.c index 334cc7697b7..cea18abec55 100644 --- a/keyboards/telophase/telophase.c +++ b/keyboards/telophase/telophase.c @@ -18,12 +18,12 @@ along with this program. If not, see . #include "telophase.h" void led_init(void) { - setPinOutput(D1); - setPinOutput(F4); - setPinOutput(F5); - writePinHigh(D1); - writePinHigh(F4); - writePinHigh(F5); + gpio_set_pin_output(D1); + gpio_set_pin_output(F4); + gpio_set_pin_output(F5); + gpio_write_pin_high(D1); + gpio_write_pin_high(F4); + gpio_write_pin_high(F5); } void matrix_init_kb(void) { diff --git a/keyboards/telophase/telophase.h b/keyboards/telophase/telophase.h index 112ba79504a..52771ce0718 100644 --- a/keyboards/telophase/telophase.h +++ b/keyboards/telophase/telophase.h @@ -19,12 +19,12 @@ along with this program. If not, see . #include "quantum.h" -#define red_led_off writePinHigh(F5) -#define red_led_on writePinLow(F5) -#define blu_led_off writePinHigh(F4) -#define blu_led_on writePinLow(F4) -#define grn_led_off writePinHigh(D1) -#define grn_led_on writePinLow(D1) +#define red_led_off gpio_write_pin_high(F5) +#define red_led_on gpio_write_pin_low(F5) +#define blu_led_off gpio_write_pin_high(F4) +#define blu_led_on gpio_write_pin_low(F4) +#define grn_led_off gpio_write_pin_high(D1) +#define grn_led_on gpio_write_pin_low(D1) #define set_led_off red_led_off; grn_led_off; blu_led_off #define set_led_red red_led_on; grn_led_off; blu_led_off diff --git a/keyboards/tkc/m0lly/m0lly.c b/keyboards/tkc/m0lly/m0lly.c index 2f76952b1f8..ceb03e4543a 100644 --- a/keyboards/tkc/m0lly/m0lly.c +++ b/keyboards/tkc/m0lly/m0lly.c @@ -17,11 +17,11 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinInputHigh(D0); - setPinInputHigh(D1); + gpio_set_pin_input_high(D0); + gpio_set_pin_input_high(D1); - setPinOutput(B7); - writePinHigh(B7); + gpio_set_pin_output(B7); + gpio_write_pin_high(B7); keyboard_pre_init_user(); } diff --git a/keyboards/tkc/osav2/osav2.c b/keyboards/tkc/osav2/osav2.c index 51f4ac0e04f..99660464865 100644 --- a/keyboards/tkc/osav2/osav2.c +++ b/keyboards/tkc/osav2/osav2.c @@ -16,18 +16,18 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(C7); - setPinOutput(C6); - setPinOutput(B6); + gpio_set_pin_output(C7); + gpio_set_pin_output(C6); + gpio_set_pin_output(B6); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { - writePin(C7, led_state.num_lock); - writePin(C6, led_state.caps_lock); - writePin(B6, led_state.scroll_lock); + gpio_write_pin(C7, led_state.num_lock); + gpio_write_pin(C6, led_state.caps_lock); + gpio_write_pin(B6, led_state.scroll_lock); } return true; } diff --git a/keyboards/tkc/tkc1800/tkc1800.c b/keyboards/tkc/tkc1800/tkc1800.c index b5b4cf0887f..815c1d62084 100644 --- a/keyboards/tkc/tkc1800/tkc1800.c +++ b/keyboards/tkc/tkc1800/tkc1800.c @@ -16,11 +16,11 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinInputHigh(D0); - setPinInputHigh(D1); + gpio_set_pin_input_high(D0); + gpio_set_pin_input_high(D1); - setPinOutput(B7); - writePinHigh(B7); + gpio_set_pin_output(B7); + gpio_write_pin_high(B7); keyboard_pre_init_user(); } diff --git a/keyboards/torn/matrix.c b/keyboards/torn/matrix.c index b674f21d57f..64a808534c1 100644 --- a/keyboards/torn/matrix.c +++ b/keyboards/torn/matrix.c @@ -30,15 +30,15 @@ static const mcp23018_pin_t secondary_row_pins[MATRIX_ROWS] = SECONDARY_RO static const mcp23018_pin_t secondary_col_pins[SPLIT_MATRIX_COLS] = SECONDARY_COL_PINS; static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } -static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); } +static void unselect_row(uint8_t row) { gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } @@ -50,7 +50,7 @@ static void select_secondary_row(uint8_t row) { static void init_pins(void) { unselect_rows(); for (uint8_t x = 0; x < SPLIT_MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -60,7 +60,7 @@ static matrix_row_t read_cols(void) { // For each col... for (uint8_t col_index = 0; col_index < SPLIT_MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin state |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); diff --git a/keyboards/touchpad/matrix.c b/keyboards/touchpad/matrix.c index 7929e0969b5..afe14cf542d 100644 --- a/keyboards/touchpad/matrix.c +++ b/keyboards/touchpad/matrix.c @@ -127,32 +127,32 @@ void matrix_init(void) { i2c_init(); //Motor enable - setPinOutput(E6); + gpio_set_pin_output(E6); //Motor PWM - setPinOutput(D7); + gpio_set_pin_output(D7); //Power LED - setPinOutput(B7); - writePinHigh(B7); + gpio_set_pin_output(B7); + gpio_write_pin_high(B7); //LEDs Columns - setPinOutput(F7); - setPinOutput(F6); - setPinOutput(F5); - setPinOutput(F4); - setPinOutput(F1); - setPinOutput(F0); + gpio_set_pin_output(F7); + gpio_set_pin_output(F6); + gpio_set_pin_output(F5); + gpio_set_pin_output(F4); + gpio_set_pin_output(F1); + gpio_set_pin_output(F0); //LEDs Rows - setPinOutput(D6); - setPinOutput(B4); - setPinOutput(B5); - setPinOutput(B6); - setPinOutput(C6); - setPinOutput(C7); + gpio_set_pin_output(D6); + gpio_set_pin_output(B4); + gpio_set_pin_output(B5); + gpio_set_pin_output(B6); + gpio_set_pin_output(C6); + gpio_set_pin_output(C7); //Capacitive Interrupt - setPinInput(D2); + gpio_set_pin_input(D2); capSetup(); writeDataToTS(0x06, 0x12); //Calibrate capacitive touch IC @@ -208,7 +208,7 @@ void touchClearCurrentDetections(void) { //Check interrupt pin uint8_t isTouchChangeDetected(void) { - return !readPin(D2); + return !gpio_read_pin(D2); } uint8_t matrix_scan(void) { @@ -232,34 +232,34 @@ uint8_t matrix_scan(void) { for (uint8_t c = 0; c < 6; c++) { for (uint8_t r = 0; r < 6; r++) { switch (r) { - case 0: writePin(D6, matrix_is_on(r, c)); break; - case 1: writePin(B4, matrix_is_on(r, c)); break; - case 2: writePin(B5, matrix_is_on(r, c)); break; - case 3: writePin(B6, matrix_is_on(r, c)); break; - case 4: writePin(C6, matrix_is_on(r, c)); break; - case 5: writePin(C7, matrix_is_on(r, c)); break; + case 0: gpio_write_pin(D6, matrix_is_on(r, c)); break; + case 1: gpio_write_pin(B4, matrix_is_on(r, c)); break; + case 2: gpio_write_pin(B5, matrix_is_on(r, c)); break; + case 3: gpio_write_pin(B6, matrix_is_on(r, c)); break; + case 4: gpio_write_pin(C6, matrix_is_on(r, c)); break; + case 5: gpio_write_pin(C7, matrix_is_on(r, c)); break; } switch (c) { - case 0: writePin(F5, !matrix_is_on(r, c)); break; - case 1: writePin(F4, !matrix_is_on(r, c)); break; - case 2: writePin(F1, !matrix_is_on(r, c)); break; - case 3: writePin(F0, !matrix_is_on(r, c)); break; - case 4: writePin(F6, !matrix_is_on(r, c)); break; - case 5: writePin(F7, !matrix_is_on(r, c)); break; + case 0: gpio_write_pin(F5, !matrix_is_on(r, c)); break; + case 1: gpio_write_pin(F4, !matrix_is_on(r, c)); break; + case 2: gpio_write_pin(F1, !matrix_is_on(r, c)); break; + case 3: gpio_write_pin(F0, !matrix_is_on(r, c)); break; + case 4: gpio_write_pin(F6, !matrix_is_on(r, c)); break; + case 5: gpio_write_pin(F7, !matrix_is_on(r, c)); break; } } } if (vibrate == VIBRATE_LENGTH) { - writePinHigh(E6); - writePinHigh(D7); + gpio_write_pin_high(E6); + gpio_write_pin_high(D7); vibrate--; } else if (vibrate > 0) { vibrate--; } else if (vibrate == 0) { - writePinLow(D7); - writePinLow(E6); + gpio_write_pin_low(D7); + gpio_write_pin_low(E6); } matrix_scan_kb(); diff --git a/keyboards/tr60w/tr60w.c b/keyboards/tr60w/tr60w.c index 2bc0648241f..ebf48cb1c7b 100644 --- a/keyboards/tr60w/tr60w.c +++ b/keyboards/tr60w/tr60w.c @@ -3,9 +3,9 @@ bool led_update_kb(led_t led_state) { bool runDefault = led_update_user(led_state); if (runDefault) { - writePin(B1, !led_state.num_lock); - writePin(B2, !led_state.caps_lock); - writePin(B3, !led_state.scroll_lock); + gpio_write_pin(B1, !led_state.num_lock); + gpio_write_pin(B2, !led_state.caps_lock); + gpio_write_pin(B3, !led_state.scroll_lock); } return runDefault; } diff --git a/keyboards/tzarc/djinn/djinn.c b/keyboards/tzarc/djinn/djinn.c index 8d6e2ec92e2..a104710b038 100644 --- a/keyboards/tzarc/djinn/djinn.c +++ b/keyboards/tzarc/djinn/djinn.c @@ -46,23 +46,23 @@ void keyboard_post_init_kb(void) { memset(&kb_state, 0, sizeof(kb_state)); // Turn off increased current limits - setPinOutput(RGB_CURR_1500mA_OK_PIN); - writePinLow(RGB_CURR_1500mA_OK_PIN); - setPinOutput(RGB_CURR_3000mA_OK_PIN); - writePinLow(RGB_CURR_3000mA_OK_PIN); + gpio_set_pin_output(RGB_CURR_1500mA_OK_PIN); + gpio_write_pin_low(RGB_CURR_1500mA_OK_PIN); + gpio_set_pin_output(RGB_CURR_3000mA_OK_PIN); + gpio_write_pin_low(RGB_CURR_3000mA_OK_PIN); // Turn on the RGB - setPinOutput(RGB_POWER_ENABLE_PIN); - writePinHigh(RGB_POWER_ENABLE_PIN); + gpio_set_pin_output(RGB_POWER_ENABLE_PIN); + gpio_write_pin_high(RGB_POWER_ENABLE_PIN); #ifdef EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN - setPinOutput(EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN); - writePinHigh(EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN); + gpio_set_pin_output(EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN); + gpio_write_pin_high(EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN); #endif // EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN // Turn on the LCD - setPinOutput(LCD_POWER_ENABLE_PIN); - writePinHigh(LCD_POWER_ENABLE_PIN); + gpio_set_pin_output(LCD_POWER_ENABLE_PIN); + gpio_write_pin_high(LCD_POWER_ENABLE_PIN); // Let the LCD get some power... wait_ms(150); @@ -148,16 +148,16 @@ void housekeeping_task_kb(void) { switch (current_setting) { default: case USBPD_500MA: - writePinLow(RGB_CURR_1500mA_OK_PIN); - writePinLow(RGB_CURR_3000mA_OK_PIN); + gpio_write_pin_low(RGB_CURR_1500mA_OK_PIN); + gpio_write_pin_low(RGB_CURR_3000mA_OK_PIN); break; case USBPD_1500MA: - writePinHigh(RGB_CURR_1500mA_OK_PIN); - writePinLow(RGB_CURR_3000mA_OK_PIN); + gpio_write_pin_high(RGB_CURR_1500mA_OK_PIN); + gpio_write_pin_low(RGB_CURR_3000mA_OK_PIN); break; case USBPD_3000MA: - writePinHigh(RGB_CURR_1500mA_OK_PIN); - writePinHigh(RGB_CURR_3000mA_OK_PIN); + gpio_write_pin_high(RGB_CURR_1500mA_OK_PIN); + gpio_write_pin_high(RGB_CURR_3000mA_OK_PIN); break; } #else @@ -166,12 +166,12 @@ void housekeeping_task_kb(void) { default: case USBPD_500MA: case USBPD_1500MA: - writePinLow(RGB_CURR_1500mA_OK_PIN); - writePinLow(RGB_CURR_3000mA_OK_PIN); + gpio_write_pin_low(RGB_CURR_1500mA_OK_PIN); + gpio_write_pin_low(RGB_CURR_3000mA_OK_PIN); break; case USBPD_3000MA: - writePinHigh(RGB_CURR_1500mA_OK_PIN); - writePinLow(RGB_CURR_3000mA_OK_PIN); + gpio_write_pin_high(RGB_CURR_1500mA_OK_PIN); + gpio_write_pin_low(RGB_CURR_3000mA_OK_PIN); break; } #endif @@ -189,7 +189,7 @@ void housekeeping_task_kb(void) { // Enable/disable RGB if (peripherals_on) { // Turn on RGB - writePinHigh(RGB_POWER_ENABLE_PIN); + gpio_write_pin_high(RGB_POWER_ENABLE_PIN); // Modify the RGB state if different to the LCD state if (rgb_matrix_is_enabled() != peripherals_on) { // Wait for a small amount of time to allow the RGB capacitors to charge, before enabling RGB output @@ -199,7 +199,7 @@ void housekeeping_task_kb(void) { } } else { // Turn off RGB - writePinLow(RGB_POWER_ENABLE_PIN); + gpio_write_pin_low(RGB_POWER_ENABLE_PIN); // Disable the PWM output for the RGB if (rgb_matrix_is_enabled() != peripherals_on) { rgb_matrix_disable_noeeprom(); diff --git a/keyboards/tzarc/djinn/djinn_portscan_matrix.c b/keyboards/tzarc/djinn/djinn_portscan_matrix.c index 63f480be270..3506f3b8ac8 100644 --- a/keyboards/tzarc/djinn/djinn_portscan_matrix.c +++ b/keyboards/tzarc/djinn/djinn_portscan_matrix.c @@ -16,7 +16,7 @@ void matrix_wait_for_pin(pin_t pin, uint8_t target_state) { rtcnt_t start = chSysGetRealtimeCounterX(); rtcnt_t end = start + 5000; while (chSysIsCounterWithinX(chSysGetRealtimeCounterX(), start, end)) { - if (readPin(pin) == target_state) { + if (gpio_read_pin(pin) == target_state) { break; } } @@ -36,10 +36,10 @@ static void dummy_vt_callback(virtual_timer_t *vtp, void *p) {} void matrix_init_custom(void) { for (int i = 0; i < MATRIX_ROWS; ++i) { - setPinInputHigh(row_pins[i]); + gpio_set_pin_input_high(row_pins[i]); } for (int i = 0; i < MATRIX_COLS; ++i) { - setPinInputHigh(col_pins[i]); + gpio_set_pin_input_high(col_pins[i]); } // Start a virtual timer so we'll still get periodic wakeups, now that USB SOF doesn't wake up the main loop @@ -56,8 +56,8 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { pin_t curr_col_pin = col_pins[current_col]; // Setup the output column pin - setPinOutput(curr_col_pin); - writePinLow(curr_col_pin); + gpio_set_pin_output(curr_col_pin); + gpio_write_pin_low(curr_col_pin); matrix_wait_for_pin(curr_col_pin, 0); // Read the row ports @@ -65,7 +65,7 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { uint32_t gpio_c = palReadPort(GPIOC); // Unselect the row pin - setPinInputHigh(curr_col_pin); + gpio_set_pin_input_high(curr_col_pin); // Construct the packed bitmask for the pins uint32_t readback = ~(((gpio_b & GPIOB_BITMASK) >> GPIOB_OFFSET) | (((gpio_c & GPIOC_BITMASK) >> GPIOC_OFFSET) << GPIOB_COUNT)); @@ -98,11 +98,11 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { void matrix_wait_for_interrupt(void) { // Set up row/col pins and attach callback for (int i = 0; i < ARRAY_SIZE(col_pins); ++i) { - setPinOutput(col_pins[i]); - writePinLow(col_pins[i]); + gpio_set_pin_output(col_pins[i]); + gpio_write_pin_low(col_pins[i]); } for (int i = 0; i < ARRAY_SIZE(row_pins); ++i) { - setPinInputHigh(row_pins[i]); + gpio_set_pin_input_high(row_pins[i]); palEnableLineEvent(row_pins[i], PAL_EVENT_MODE_BOTH_EDGES); } @@ -112,11 +112,11 @@ void matrix_wait_for_interrupt(void) { // Now that the interrupt has woken us up, reset all the row/col pins back to defaults for (int i = 0; i < ARRAY_SIZE(row_pins); ++i) { palDisableLineEvent(row_pins[i]); - writePinHigh(row_pins[i]); - setPinInputHigh(row_pins[i]); + gpio_write_pin_high(row_pins[i]); + gpio_set_pin_input_high(row_pins[i]); } for (int i = 0; i < ARRAY_SIZE(col_pins); ++i) { - writePinHigh(col_pins[i]); - setPinInputHigh(col_pins[i]); + gpio_write_pin_high(col_pins[i]); + gpio_set_pin_input_high(col_pins[i]); } } diff --git a/keyboards/tzarc/ghoul/ghoul.c b/keyboards/tzarc/ghoul/ghoul.c index a97399110c2..bbd536dfdb2 100644 --- a/keyboards/tzarc/ghoul/ghoul.c +++ b/keyboards/tzarc/ghoul/ghoul.c @@ -6,8 +6,8 @@ void keyboard_post_init_kb(void) { // Enable RGB current limiter and wait for a bit before allowing RGB to continue - setPinOutput(RGB_ENABLE_PIN); - writePinHigh(RGB_ENABLE_PIN); + gpio_set_pin_output(RGB_ENABLE_PIN); + gpio_write_pin_high(RGB_ENABLE_PIN); wait_ms(20); // Offload to the user func @@ -16,12 +16,12 @@ void keyboard_post_init_kb(void) { void matrix_init_custom(void) { // SPI Matrix - setPinOutput(SPI_MATRIX_CHIP_SELECT_PIN); - writePinHigh(SPI_MATRIX_CHIP_SELECT_PIN); + gpio_set_pin_output(SPI_MATRIX_CHIP_SELECT_PIN); + gpio_write_pin_high(SPI_MATRIX_CHIP_SELECT_PIN); spi_init(); // Encoder pushbutton - setPinInputLow(ENCODER_PUSHBUTTON_PIN); + gpio_set_pin_input_low(ENCODER_PUSHBUTTON_PIN); } bool matrix_scan_custom(matrix_row_t current_matrix[]) { @@ -33,7 +33,7 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { spi_stop(); // Read from the encoder pushbutton - temp_matrix[5] = readPin(ENCODER_PUSHBUTTON_PIN) ? 1 : 0; + temp_matrix[5] = gpio_read_pin(ENCODER_PUSHBUTTON_PIN) ? 1 : 0; // Check if we've changed, return the last-read data bool changed = memcmp(current_matrix, temp_matrix, sizeof(temp_matrix)) != 0; diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/overnumpad_1xb.c b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/overnumpad_1xb.c index f0c1161cfe3..f441285c9ad 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/overnumpad_1xb.c +++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/overnumpad_1xb.c @@ -20,19 +20,19 @@ void keyboard_post_init_kb(void) { // Led pins: // C12 is the left-most led, normally Num Lock, but on Spacesaver M it's Caps Lock. Configured in info.json - setPinOutput(C11); // middle led, always off on Spacesaver M - writePin(C11, 0); - setPinOutput(C10); // right-most led, normally Scroll Lock, but on Spacesaver M indicates function layer + gpio_set_pin_output(C11); // middle led, always off on Spacesaver M + gpio_write_pin(C11, 0); + gpio_set_pin_output(C10); // right-most led, normally Scroll Lock, but on Spacesaver M indicates function layer } layer_state_t layer_state_set_kb(layer_state_t state) { switch (get_highest_layer(state)) { case 0: - writePin(C10, 0); + gpio_write_pin(C10, 0); break; default: - writePin(C10, 1); + gpio_write_pin(C10, 1); break; } return layer_state_set_user(state); diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/overnumpad_1xb.c b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/overnumpad_1xb.c index 517df0035a3..bad0c76e433 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/overnumpad_1xb.c +++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/overnumpad_1xb.c @@ -20,18 +20,18 @@ void keyboard_post_init_kb(void) { // Led pins: // C12 is the left-most led, normally Num Lock, but on Spacesaver M it's Caps Lock. Configured in info.json - setPinOutput(C11); // middle led, always off on Spacesaver M - writePin(C11, 0); - setPinOutput(C10); // right-most led, normally Scroll Lock, but on Spacesaver M indicates function layer + gpio_set_pin_output(C11); // middle led, always off on Spacesaver M + gpio_write_pin(C11, 0); + gpio_set_pin_output(C10); // right-most led, normally Scroll Lock, but on Spacesaver M indicates function layer } layer_state_t layer_state_set_kb(layer_state_t state) { switch (get_highest_layer(state)) { case 0: - writePin(C10, 0); + gpio_write_pin(C10, 0); break; default: - writePin(C10, 1); + gpio_write_pin(C10, 1); break; } return layer_state_set_user(state); diff --git a/keyboards/viktus/minne_topre/ec.c b/keyboards/viktus/minne_topre/ec.c index edd5f9a31db..12ca8a3c80d 100644 --- a/keyboards/viktus/minne_topre/ec.c +++ b/keyboards/viktus/minne_topre/ec.c @@ -48,35 +48,35 @@ _Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS"); static ec_config_t config; static uint16_t ec_sw_value[MATRIX_COLS][MATRIX_ROWS]; -static inline void discharge_capacitor(void) { setPinOutput(DISCHARGE_PIN); } +static inline void discharge_capacitor(void) { gpio_set_pin_output(DISCHARGE_PIN); } static inline void charge_capacitor(uint8_t col) { - setPinInput(DISCHARGE_PIN); - writePinHigh(col_pins[col]); + gpio_set_pin_input(DISCHARGE_PIN); + gpio_write_pin_high(col_pins[col]); } static inline void clear_all_col_pins(void) { for (int col = 0; col < sizeof(col_pins); col++) { - writePinLow(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } } void init_mux_sel(void) { for (int idx = 0; idx < sizeof(mux_sel_pins); idx++) { - setPinOutput(mux_sel_pins[idx]); + gpio_set_pin_output(mux_sel_pins[idx]); } } void select_mux(uint8_t row) { uint8_t ch = row_channels[row]; - writePin(mux_sel_pins[0], ch & 1); - writePin(mux_sel_pins[1], ch & 2); - writePin(mux_sel_pins[2], ch & 4); + gpio_write_pin(mux_sel_pins[0], ch & 1); + gpio_write_pin(mux_sel_pins[1], ch & 2); + gpio_write_pin(mux_sel_pins[2], ch & 4); } void init_col(void) { for (int idx = 0; idx < sizeof(col_pins); idx++) { - setPinOutput(col_pins[idx]); - writePinLow(col_pins[idx]); + gpio_set_pin_output(col_pins[idx]); + gpio_write_pin_low(col_pins[idx]); } } @@ -85,8 +85,8 @@ void ec_init(ec_config_t const* const ec_config) { config = *ec_config; // initialize discharge pin as discharge mode - writePinLow(DISCHARGE_PIN); - setPinOutput(DISCHARGE_PIN); + gpio_write_pin_low(DISCHARGE_PIN); + gpio_set_pin_output(DISCHARGE_PIN); // set analog reference analogReference(ADC_REF_POWER); @@ -98,7 +98,7 @@ void ec_init(ec_config_t const* const ec_config) { init_mux_sel(); // set discharge pin to charge mode - setPinInput(DISCHARGE_PIN); + gpio_set_pin_input(DISCHARGE_PIN); } uint16_t ec_readkey_raw(uint8_t col, uint8_t row) { diff --git a/keyboards/viktus/osav2_numpad_topre/ec.c b/keyboards/viktus/osav2_numpad_topre/ec.c index 93e698412a0..f5890db50bb 100644 --- a/keyboards/viktus/osav2_numpad_topre/ec.c +++ b/keyboards/viktus/osav2_numpad_topre/ec.c @@ -48,35 +48,35 @@ _Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS"); static ec_config_t config; static uint16_t ec_sw_value[MATRIX_COLS][MATRIX_ROWS]; -static inline void discharge_capacitor(void) { setPinOutput(DISCHARGE_PIN); } +static inline void discharge_capacitor(void) { gpio_set_pin_output(DISCHARGE_PIN); } static inline void charge_capacitor(uint8_t col) { - setPinInput(DISCHARGE_PIN); - writePinHigh(col_pins[col]); + gpio_set_pin_input(DISCHARGE_PIN); + gpio_write_pin_high(col_pins[col]); } static inline void clear_all_col_pins(void) { for (int col = 0; col < sizeof(col_pins); col++) { - writePinLow(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } } void init_mux_sel(void) { for (int idx = 0; idx < sizeof(mux_sel_pins); idx++) { - setPinOutput(mux_sel_pins[idx]); + gpio_set_pin_output(mux_sel_pins[idx]); } } void select_mux(uint8_t row) { uint8_t ch = row_channels[row]; - writePin(mux_sel_pins[0], ch & 1); - writePin(mux_sel_pins[1], ch & 2); - writePin(mux_sel_pins[2], ch & 4); + gpio_write_pin(mux_sel_pins[0], ch & 1); + gpio_write_pin(mux_sel_pins[1], ch & 2); + gpio_write_pin(mux_sel_pins[2], ch & 4); } void init_col(void) { for (int idx = 0; idx < sizeof(col_pins); idx++) { - setPinOutput(col_pins[idx]); - writePinLow(col_pins[idx]); + gpio_set_pin_output(col_pins[idx]); + gpio_write_pin_low(col_pins[idx]); } } @@ -85,8 +85,8 @@ void ec_init(ec_config_t const* const ec_config) { config = *ec_config; // initialize discharge pin as discharge mode - writePinLow(DISCHARGE_PIN); - setPinOutput(DISCHARGE_PIN); + gpio_write_pin_low(DISCHARGE_PIN); + gpio_set_pin_output(DISCHARGE_PIN); // set analog reference analogReference(ADC_REF_POWER); @@ -98,7 +98,7 @@ void ec_init(ec_config_t const* const ec_config) { init_mux_sel(); // set discharge pin to charge mode - setPinInput(DISCHARGE_PIN); + gpio_set_pin_input(DISCHARGE_PIN); } uint16_t ec_readkey_raw(uint8_t col, uint8_t row) { diff --git a/keyboards/viktus/osav2_topre/ec.c b/keyboards/viktus/osav2_topre/ec.c index 13d9fde654c..702af681a2a 100644 --- a/keyboards/viktus/osav2_topre/ec.c +++ b/keyboards/viktus/osav2_topre/ec.c @@ -48,35 +48,35 @@ _Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS"); static ec_config_t config; static uint16_t ec_sw_value[MATRIX_COLS][MATRIX_ROWS]; -static inline void discharge_capacitor(void) { setPinOutput(DISCHARGE_PIN); } +static inline void discharge_capacitor(void) { gpio_set_pin_output(DISCHARGE_PIN); } static inline void charge_capacitor(uint8_t col) { - setPinInput(DISCHARGE_PIN); - writePinHigh(col_pins[col]); + gpio_set_pin_input(DISCHARGE_PIN); + gpio_write_pin_high(col_pins[col]); } static inline void clear_all_col_pins(void) { for (int col = 0; col < sizeof(col_pins); col++) { - writePinLow(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } } void init_mux_sel(void) { for (int idx = 0; idx < sizeof(mux_sel_pins); idx++) { - setPinOutput(mux_sel_pins[idx]); + gpio_set_pin_output(mux_sel_pins[idx]); } } void select_mux(uint8_t row) { uint8_t ch = row_channels[row]; - writePin(mux_sel_pins[0], ch & 1); - writePin(mux_sel_pins[1], ch & 2); - writePin(mux_sel_pins[2], ch & 4); + gpio_write_pin(mux_sel_pins[0], ch & 1); + gpio_write_pin(mux_sel_pins[1], ch & 2); + gpio_write_pin(mux_sel_pins[2], ch & 4); } void init_col(void) { for (int idx = 0; idx < sizeof(col_pins); idx++) { - setPinOutput(col_pins[idx]); - writePinLow(col_pins[idx]); + gpio_set_pin_output(col_pins[idx]); + gpio_write_pin_low(col_pins[idx]); } } @@ -85,8 +85,8 @@ void ec_init(ec_config_t const* const ec_config) { config = *ec_config; // initialize discharge pin as discharge mode - writePinLow(DISCHARGE_PIN); - setPinOutput(DISCHARGE_PIN); + gpio_write_pin_low(DISCHARGE_PIN); + gpio_set_pin_output(DISCHARGE_PIN); // set analog reference analogReference(ADC_REF_POWER); @@ -98,7 +98,7 @@ void ec_init(ec_config_t const* const ec_config) { init_mux_sel(); // set discharge pin to charge mode - setPinInput(DISCHARGE_PIN); + gpio_set_pin_input(DISCHARGE_PIN); } uint16_t ec_readkey_raw(uint8_t col, uint8_t row) { diff --git a/keyboards/viktus/sp111/matrix.c b/keyboards/viktus/sp111/matrix.c index 35a1a740fc3..5ead5355937 100644 --- a/keyboards/viktus/sp111/matrix.c +++ b/keyboards/viktus/sp111/matrix.c @@ -33,22 +33,22 @@ static const pin_t col_pins[MATRIX_COLS] = {F5, F6, F7, C7, C6, B6, B5, D3, //_____REGULAR funcs____________________________________________________________ static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } -static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); } +static void unselect_row(uint8_t row) { gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for (uint8_t x = 0; x < MATRIX_ROWS / 2; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void init_pins(void) { unselect_rows(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -66,7 +66,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) // For each col... for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); diff --git a/keyboards/viktus/sp111/sp111.c b/keyboards/viktus/sp111/sp111.c index 523666ed734..1626683804f 100644 --- a/keyboards/viktus/sp111/sp111.c +++ b/keyboards/viktus/sp111/sp111.c @@ -17,16 +17,16 @@ void keyboard_pre_init_kb(void) { // enable built in pullups to avoid timeouts when right hand not connected - setPinInputHigh(D0); - setPinInputHigh(D1); + gpio_set_pin_input_high(D0); + gpio_set_pin_input_high(D1); keyboard_pre_init_user(); } void matrix_init_kb(void) { - setPinOutput(F0); - setPinOutput(F1); - setPinOutput(F4); + gpio_set_pin_output(F0); + gpio_set_pin_output(F1); + gpio_set_pin_output(F4); matrix_init_user(); } @@ -34,9 +34,9 @@ void matrix_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - writePin(F0, led_state.num_lock); - writePin(F1, led_state.caps_lock); - writePin(F4, led_state.scroll_lock); + gpio_write_pin(F0, led_state.num_lock); + gpio_write_pin(F1, led_state.caps_lock); + gpio_write_pin(F4, led_state.scroll_lock); } return res; } diff --git a/keyboards/viktus/sp111_v2/sp111_v2.c b/keyboards/viktus/sp111_v2/sp111_v2.c index 96a9aaa5fe4..9d749ccbac3 100644 --- a/keyboards/viktus/sp111_v2/sp111_v2.c +++ b/keyboards/viktus/sp111_v2/sp111_v2.c @@ -5,8 +5,8 @@ void keyboard_pre_init_kb(void) { // enable built in pullups to avoid timeouts when right hand not connected - setPinInputHigh(D0); - setPinInputHigh(D1); + gpio_set_pin_input_high(D0); + gpio_set_pin_input_high(D1); keyboard_pre_init_user(); } diff --git a/keyboards/viktus/sp_mini/sp_mini.c b/keyboards/viktus/sp_mini/sp_mini.c index ffae6c5c548..1554dd34690 100644 --- a/keyboards/viktus/sp_mini/sp_mini.c +++ b/keyboards/viktus/sp_mini/sp_mini.c @@ -18,8 +18,8 @@ void keyboard_pre_init_kb(void) { // enable built in pullups to avoid timeouts when right hand not connected - setPinInputHigh(D0); - setPinInputHigh(D1); + gpio_set_pin_input_high(D0); + gpio_set_pin_input_high(D1); keyboard_pre_init_user(); } diff --git a/keyboards/viktus/styrka_topre/ec.c b/keyboards/viktus/styrka_topre/ec.c index 078723f691e..4a8ce5ca290 100644 --- a/keyboards/viktus/styrka_topre/ec.c +++ b/keyboards/viktus/styrka_topre/ec.c @@ -49,35 +49,35 @@ _Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS"); static ec_config_t config; static uint16_t ec_sw_value[MATRIX_COLS][MATRIX_ROWS]; -static inline void discharge_capacitor(void) { setPinOutput(DISCHARGE_PIN); } +static inline void discharge_capacitor(void) { gpio_set_pin_output(DISCHARGE_PIN); } static inline void charge_capacitor(uint8_t col) { - setPinInput(DISCHARGE_PIN); - writePinHigh(col_pins[col]); + gpio_set_pin_input(DISCHARGE_PIN); + gpio_write_pin_high(col_pins[col]); } static inline void clear_all_col_pins(void) { for (int col = 0; col < sizeof(col_pins); col++) { - writePinLow(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } } void init_mux_sel(void) { for (int idx = 0; idx < sizeof(mux_sel_pins); idx++) { - setPinOutput(mux_sel_pins[idx]); + gpio_set_pin_output(mux_sel_pins[idx]); } } void select_mux(uint8_t row) { uint8_t ch = row_channels[row]; - writePin(mux_sel_pins[0], ch & 1); - writePin(mux_sel_pins[1], ch & 2); - writePin(mux_sel_pins[2], ch & 4); + gpio_write_pin(mux_sel_pins[0], ch & 1); + gpio_write_pin(mux_sel_pins[1], ch & 2); + gpio_write_pin(mux_sel_pins[2], ch & 4); } void init_col(void) { for (int idx = 0; idx < sizeof(col_pins); idx++) { - setPinOutput(col_pins[idx]); - writePinLow(col_pins[idx]); + gpio_set_pin_output(col_pins[idx]); + gpio_write_pin_low(col_pins[idx]); } } @@ -86,8 +86,8 @@ void ec_init(ec_config_t const* const ec_config) { config = *ec_config; // initialize discharge pin as discharge mode - writePinLow(DISCHARGE_PIN); - setPinOutput(DISCHARGE_PIN); + gpio_write_pin_low(DISCHARGE_PIN); + gpio_set_pin_output(DISCHARGE_PIN); // set analog reference analogReference(ADC_REF_POWER); @@ -99,7 +99,7 @@ void ec_init(ec_config_t const* const ec_config) { init_mux_sel(); // set discharge pin to charge mode - setPinInput(DISCHARGE_PIN); + gpio_set_pin_input(DISCHARGE_PIN); } uint16_t ec_readkey_raw(uint8_t col, uint8_t row) { diff --git a/keyboards/vitamins_included/rev2/rev2.c b/keyboards/vitamins_included/rev2/rev2.c index d34cdb4fc14..e445a3da456 100644 --- a/keyboards/vitamins_included/rev2/rev2.c +++ b/keyboards/vitamins_included/rev2/rev2.c @@ -7,9 +7,9 @@ bool is_keyboard_left(void) { return !is_keyboard_master(); #elif defined(SPLIT_HAND_PIN) // Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand - setPinInputHigh(SPLIT_HAND_PIN); - bool x = !readPin(SPLIT_HAND_PIN); - setPinInput(SPLIT_HAND_PIN); + gpio_set_pin_input_high(SPLIT_HAND_PIN); + bool x = !gpio_read_pin(SPLIT_HAND_PIN); + gpio_set_pin_input(SPLIT_HAND_PIN); return x; #elif defined(EE_HANDS) return eeprom_read_byte(EECONFIG_HANDEDNESS); diff --git a/keyboards/westfoxtrot/cypher/rev1/rev1.c b/keyboards/westfoxtrot/cypher/rev1/rev1.c index b6736f97a74..eeaa7b4a4cf 100644 --- a/keyboards/westfoxtrot/cypher/rev1/rev1.c +++ b/keyboards/westfoxtrot/cypher/rev1/rev1.c @@ -18,14 +18,14 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - // writePin sets the pin high for 1 and low for 0. + // gpio_write_pin sets the pin high for 1 and low for 0. // In this example the pins are inverted, setting // it low/0 turns it on, and high/1 turns the LED off. // This behavior depends on whether the LED is between the pin // and VCC or the pin and GND. - writePin(F4, led_state.num_lock); - writePin(F1, led_state.caps_lock); - writePin(F5, led_state.scroll_lock); + gpio_write_pin(F4, led_state.num_lock); + gpio_write_pin(F1, led_state.caps_lock); + gpio_write_pin(F5, led_state.scroll_lock); } return res; } diff --git a/keyboards/westfoxtrot/cypher/rev5/rev5.c b/keyboards/westfoxtrot/cypher/rev5/rev5.c index 477e1298af6..37ca9cf3c16 100644 --- a/keyboards/westfoxtrot/cypher/rev5/rev5.c +++ b/keyboards/westfoxtrot/cypher/rev5/rev5.c @@ -18,14 +18,14 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - // writePin sets the pin high for 1 and low for 0. + // gpio_write_pin sets the pin high for 1 and low for 0. // In this example the pins are inverted, setting // it low/0 turns it on, and high/1 turns the LED off. // This behavior depends on whether the LED is between the pin // and VCC or the pin and GND. - writePin(D3, led_state.num_lock); - writePin(D5, led_state.caps_lock); - writePin(D2, led_state.scroll_lock); + gpio_write_pin(D3, led_state.num_lock); + gpio_write_pin(D5, led_state.caps_lock); + gpio_write_pin(D2, led_state.scroll_lock); } return res; } diff --git a/keyboards/westfoxtrot/prophet/prophet.c b/keyboards/westfoxtrot/prophet/prophet.c index 4284fa81a6c..3ef0a3f9288 100644 --- a/keyboards/westfoxtrot/prophet/prophet.c +++ b/keyboards/westfoxtrot/prophet/prophet.c @@ -1,19 +1,19 @@ #include "quantum.h" void keyboard_pre_init_kb (void) { - setPinOutput(B12); - setPinOutput(B13); + gpio_set_pin_output(B12); + gpio_set_pin_output(B13); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B13, led_state.caps_lock); + gpio_write_pin(B13, led_state.caps_lock); } return res; } __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { - writePin(B12, layer_state_cmp(state, 1)); + gpio_write_pin(B12, layer_state_cmp(state, 1)); return state; } diff --git a/keyboards/wilba_tech/wt60_xt/wt60_xt.c b/keyboards/wilba_tech/wt60_xt/wt60_xt.c index 87527e7edff..7c6a2fafc43 100644 --- a/keyboards/wilba_tech/wt60_xt/wt60_xt.c +++ b/keyboards/wilba_tech/wt60_xt/wt60_xt.c @@ -51,14 +51,14 @@ void eeconfig_init_kb(void) { #endif // AUDIO_CLICKY void keyboard_pre_init_kb(void) { - setPinOutput(F1); + gpio_set_pin_output(F1); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { - writePin(F1, led_state.caps_lock); + gpio_write_pin(F1, led_state.caps_lock); } #ifdef AUDIO_ENABLE diff --git a/keyboards/wilba_tech/wt69_a/wt69_a.c b/keyboards/wilba_tech/wt69_a/wt69_a.c index 718bb0d32f9..842b62a4d12 100644 --- a/keyboards/wilba_tech/wt69_a/wt69_a.c +++ b/keyboards/wilba_tech/wt69_a/wt69_a.c @@ -17,14 +17,14 @@ #include "quantum.h" void keyboard_pre_init_kb(void) { - setPinOutput(F1); + gpio_set_pin_output(F1); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { - writePin(F1, led_state.caps_lock); + gpio_write_pin(F1, led_state.caps_lock); } return true; } diff --git a/keyboards/wilba_tech/wt70_jb/wt70_jb.c b/keyboards/wilba_tech/wt70_jb/wt70_jb.c index 7a879207d60..ae9b5dcbec0 100644 --- a/keyboards/wilba_tech/wt70_jb/wt70_jb.c +++ b/keyboards/wilba_tech/wt70_jb/wt70_jb.c @@ -18,14 +18,14 @@ bool g_first_execution = false; void keyboard_pre_init_kb(void) { - setPinOutput(F1); + gpio_set_pin_output(F1); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { - writePin(F1, led_state.caps_lock); + gpio_write_pin(F1, led_state.caps_lock); } return true; } diff --git a/keyboards/wolfmarkclub/wm1/wm1.c b/keyboards/wolfmarkclub/wm1/wm1.c index 370f9c7cfa5..9c4fb090c88 100644 --- a/keyboards/wolfmarkclub/wm1/wm1.c +++ b/keyboards/wolfmarkclub/wm1/wm1.c @@ -6,17 +6,17 @@ void bootloader_jump(void) { } void matrix_init_kb(void) { - setPinOutput(B1); // Top Indicator LED - setPinOutput(B0); // Middle Indicator LED - setPinOutput(C5); // Bottom Indicator LED + gpio_set_pin_output(B1); // Top Indicator LED + gpio_set_pin_output(B0); // Middle Indicator LED + gpio_set_pin_output(C5); // Bottom Indicator LED matrix_init_user(); } bool led_update_kb(led_t led_state) { if(led_update_user(led_state)) { - writePin(B1, led_state.caps_lock); - writePin(B0, led_state.num_lock); - writePin(C5, led_state.scroll_lock); + gpio_write_pin(B1, led_state.caps_lock); + gpio_write_pin(B0, led_state.num_lock); + gpio_write_pin(C5, led_state.scroll_lock); } return true; } diff --git a/keyboards/work_louder/micro/matrix.c b/keyboards/work_louder/micro/matrix.c index 743c788662c..3cfbf17dadd 100644 --- a/keyboards/work_louder/micro/matrix.c +++ b/keyboards/work_louder/micro/matrix.c @@ -22,27 +22,27 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } diff --git a/keyboards/work_louder/micro/micro.c b/keyboards/work_louder/micro/micro.c index d845a62250c..07ab92f7a79 100644 --- a/keyboards/work_louder/micro/micro.c +++ b/keyboards/work_louder/micro/micro.c @@ -49,29 +49,29 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { #endif void work_louder_micro_led_1_on(void) { - setPinOutput(WORK_LOUDER_LED_PIN_1); - writePin(WORK_LOUDER_LED_PIN_1, true); + gpio_set_pin_output(WORK_LOUDER_LED_PIN_1); + gpio_write_pin(WORK_LOUDER_LED_PIN_1, true); } void work_louder_micro_led_2_on(void) { - setPinOutput(WORK_LOUDER_LED_PIN_2); - writePin(WORK_LOUDER_LED_PIN_2, true); + gpio_set_pin_output(WORK_LOUDER_LED_PIN_2); + gpio_write_pin(WORK_LOUDER_LED_PIN_2, true); } void work_louder_micro_led_3_on(void) { - setPinOutput(WORK_LOUDER_LED_PIN_3); - writePin(WORK_LOUDER_LED_PIN_3, true); + gpio_set_pin_output(WORK_LOUDER_LED_PIN_3); + gpio_write_pin(WORK_LOUDER_LED_PIN_3, true); } void work_louder_micro_led_1_off(void) { - setPinInput(WORK_LOUDER_LED_PIN_1); - writePin(WORK_LOUDER_LED_PIN_1, false); + gpio_set_pin_input(WORK_LOUDER_LED_PIN_1); + gpio_write_pin(WORK_LOUDER_LED_PIN_1, false); } void work_louder_micro_led_2_off(void) { - setPinInput(WORK_LOUDER_LED_PIN_2); - writePin(WORK_LOUDER_LED_PIN_2, false); + gpio_set_pin_input(WORK_LOUDER_LED_PIN_2); + gpio_write_pin(WORK_LOUDER_LED_PIN_2, false); } void work_louder_micro_led_3_off(void) { - setPinInput(WORK_LOUDER_LED_PIN_3); - writePin(WORK_LOUDER_LED_PIN_3, false); + gpio_set_pin_input(WORK_LOUDER_LED_PIN_3); + gpio_write_pin(WORK_LOUDER_LED_PIN_3, false); } void work_louder_micro_led_all_on(void) { diff --git a/keyboards/work_louder/work_board/work_board.c b/keyboards/work_louder/work_board/work_board.c index 157504216df..975c7aa794c 100644 --- a/keyboards/work_louder/work_board/work_board.c +++ b/keyboards/work_louder/work_board/work_board.c @@ -111,13 +111,13 @@ bool rgb_matrix_indicators_kb(void) { } void keyboard_pre_init_kb(void) { - setPinOutput(B2); - setPinOutput(B3); - setPinOutput(B7); + gpio_set_pin_output(B2); + gpio_set_pin_output(B3); + gpio_set_pin_output(B7); - writePinLow(B2); - writePinLow(B3); - writePinLow(B7); + gpio_write_pin_low(B2); + gpio_write_pin_low(B3); + gpio_write_pin_low(B7); keyboard_pre_init_user(); } diff --git a/keyboards/wsk/g4m3ralpha/g4m3ralpha.c b/keyboards/wsk/g4m3ralpha/g4m3ralpha.c index fb9344a1bfb..3c039a173fe 100644 --- a/keyboards/wsk/g4m3ralpha/g4m3ralpha.c +++ b/keyboards/wsk/g4m3ralpha/g4m3ralpha.c @@ -18,12 +18,12 @@ void matrix_init_kb(void) { - setPinOutput(D3); - writePinLow(D3); - setPinOutput(D2); - writePinLow(D2); - setPinOutput(D0); - writePinLow(D0); + gpio_set_pin_output(D3); + gpio_write_pin_low(D3); + gpio_set_pin_output(D2); + gpio_write_pin_low(D2); + gpio_set_pin_output(D0); + gpio_write_pin_low(D0); matrix_init_user(); }; @@ -31,9 +31,9 @@ void matrix_init_kb(void) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(D3, led_state.num_lock); - writePin(D0, led_state.caps_lock); - writePin(D2, led_state.scroll_lock); + gpio_write_pin(D3, led_state.num_lock); + gpio_write_pin(D0, led_state.caps_lock); + gpio_write_pin(D2, led_state.scroll_lock); } return res; } diff --git a/keyboards/wuque/ikki68/ikki68.c b/keyboards/wuque/ikki68/ikki68.c index a61ddf3a565..382ec00251b 100644 --- a/keyboards/wuque/ikki68/ikki68.c +++ b/keyboards/wuque/ikki68/ikki68.c @@ -17,14 +17,14 @@ #include "quantum.h" void matrix_init_kb(void) { - setPinOutput(C6); + gpio_set_pin_output(C6); matrix_init_user(); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(C6, !led_state.caps_lock); + gpio_write_pin(C6, !led_state.caps_lock); } return res; } diff --git a/keyboards/xiudi/xd75/xd75.c b/keyboards/xiudi/xd75/xd75.c index b016643572a..47bfd6d3dd5 100644 --- a/keyboards/xiudi/xd75/xd75.c +++ b/keyboards/xiudi/xd75/xd75.c @@ -29,40 +29,40 @@ void matrix_init_kb(void) { } void capslock_led_init(void) { - setPinOutput(XD75_CAPSLOCK_LED); + gpio_set_pin_output(XD75_CAPSLOCK_LED); capslock_led_off(); } void capslock_led_off(void) { - writePinHigh(XD75_CAPSLOCK_LED); + gpio_write_pin_high(XD75_CAPSLOCK_LED); } void capslock_led_on(void) { - writePinLow(XD75_CAPSLOCK_LED); + gpio_write_pin_low(XD75_CAPSLOCK_LED); } void gp100_led_init(void) { - setPinOutput(XD75_GP100_LED); + gpio_set_pin_output(XD75_GP100_LED); gp100_led_off(); } void gp100_led_off(void) { - writePinHigh(XD75_GP100_LED); + gpio_write_pin_high(XD75_GP100_LED); } void gp100_led_on(void) { - writePinLow(XD75_GP100_LED); + gpio_write_pin_low(XD75_GP100_LED); } void gp103_led_init(void) { - setPinOutput(XD75_GP103_LED); + gpio_set_pin_output(XD75_GP103_LED); gp103_led_off(); } void gp103_led_off(void) { - writePinLow(XD75_GP103_LED); + gpio_write_pin_low(XD75_GP103_LED); } void gp103_led_on(void) { - writePinHigh(XD75_GP103_LED); + gpio_write_pin_high(XD75_GP103_LED); } diff --git a/keyboards/ydkb/grape/matrix.c b/keyboards/ydkb/grape/matrix.c index 3e070f8d7d5..49e55fe329d 100644 --- a/keyboards/ydkb/grape/matrix.c +++ b/keyboards/ydkb/grape/matrix.c @@ -38,7 +38,7 @@ static void select_row(uint8_t row) { static void init_pins(void) { for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } @@ -60,7 +60,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (row_shifter << col_index); diff --git a/keyboards/ydkb/yd68/yd68.c b/keyboards/ydkb/yd68/yd68.c index 0e6d5b82d50..1054a8673ed 100644 --- a/keyboards/ydkb/yd68/yd68.c +++ b/keyboards/ydkb/yd68/yd68.c @@ -17,20 +17,20 @@ void keyboard_pre_init_kb(void) { //Backlight LEDs Output Low - setPinOutput(D6); - writePinLow(D6); + gpio_set_pin_output(D6); + gpio_write_pin_low(D6); //RGB power output low - setPinOutput(E2); - writePinLow(E2); + gpio_set_pin_output(E2); + gpio_write_pin_low(E2); //Bluetooth power output high - setPinOutput(B2); - writePinLow(B2); + gpio_set_pin_output(B2); + gpio_write_pin_low(B2); //RGB data output low - setPinOutput(B3); - writePinLow(B3); + gpio_set_pin_output(B3); + gpio_write_pin_low(B3); keyboard_pre_init_user(); } diff --git a/keyboards/yiancardesigns/barleycorn/barleycorn.c b/keyboards/yiancardesigns/barleycorn/barleycorn.c index 9bd5d84d2b5..c73c1559c20 100644 --- a/keyboards/yiancardesigns/barleycorn/barleycorn.c +++ b/keyboards/yiancardesigns/barleycorn/barleycorn.c @@ -17,21 +17,21 @@ void keyboard_pre_init_kb(void) { // Set our LED pins as output - setPinOutput(B5); - setPinOutput(C0); + gpio_set_pin_output(B5); + gpio_set_pin_output(C0); keyboard_pre_init_user(); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - // writePin sets the pin high for 1 and low for 0. + // gpio_write_pin sets the pin high for 1 and low for 0. // In this example the pins are inverted, setting // it low/0 turns it on, and high/1 turns the LED off. // This behavior depends on whether the LED is between the pin // and VCC or the pin and GND. - writePin(B5, led_state.caps_lock); - writePin(C0, led_state.num_lock); + gpio_write_pin(B5, led_state.caps_lock); + gpio_write_pin(C0, led_state.num_lock); } return res; } diff --git a/keyboards/yiancardesigns/barleycorn/matrix.c b/keyboards/yiancardesigns/barleycorn/matrix.c index 008f096266d..02fdb6c7b4f 100644 --- a/keyboards/yiancardesigns/barleycorn/matrix.c +++ b/keyboards/yiancardesigns/barleycorn/matrix.c @@ -23,17 +23,17 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static void unselect_rows(void) { for(uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void init_pins(void) { @@ -46,7 +46,7 @@ static void init_pins(void) { for (uint8_t x = 0; x < MATRIX_COLS; x++) { if ( x < 8 ) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } } @@ -111,7 +111,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) pin_state = port_expander_col_buffer[1] & (1 << 1); break; default : - pin_state = readPin(col_pins[col_index]); + pin_state = gpio_read_pin(col_pins[col_index]); } // Populate the matrix row with the state of the col pin diff --git a/keyboards/yiancardesigns/gingham/matrix.c b/keyboards/yiancardesigns/gingham/matrix.c index 4e6319b52bc..48719e14bc2 100644 --- a/keyboards/yiancardesigns/gingham/matrix.c +++ b/keyboards/yiancardesigns/gingham/matrix.c @@ -23,17 +23,17 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static void unselect_rows(void) { for(uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void init_pins(void) { @@ -46,7 +46,7 @@ static void init_pins(void) { for (uint8_t x = 0; x < MATRIX_COLS; x++) { if ( (x > 0) && (x < 12) ) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } } @@ -90,7 +90,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) pin_state = pin_state & (1 << 1); break; default : - pin_state = readPin(col_pins[col_index]); + pin_state = gpio_read_pin(col_pins[col_index]); } // Populate the matrix row with the state of the col pin diff --git a/keyboards/yiancardesigns/seigaiha/matrix.c b/keyboards/yiancardesigns/seigaiha/matrix.c index dc80c4becf9..16041754eb3 100644 --- a/keyboards/yiancardesigns/seigaiha/matrix.c +++ b/keyboards/yiancardesigns/seigaiha/matrix.c @@ -23,17 +23,17 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static void unselect_rows(void) { for(uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void init_pins(void) { @@ -46,7 +46,7 @@ static void init_pins(void) { for (uint8_t x = 0; x < MATRIX_COLS; x++) { if ( x < 10 ) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } } } @@ -96,7 +96,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) pin_state = port_expander_col_buffer & (1 << 4); break; default : - pin_state = readPin(col_pins[col_index]); + pin_state = gpio_read_pin(col_pins[col_index]); } // Populate the matrix row with the state of the col pin diff --git a/keyboards/ymdk/yd60mq/yd60mq.c b/keyboards/ymdk/yd60mq/yd60mq.c index 1a14040907f..40c899c46f8 100644 --- a/keyboards/ymdk/yd60mq/yd60mq.c +++ b/keyboards/ymdk/yd60mq/yd60mq.c @@ -2,20 +2,20 @@ __attribute__((weak)) void matrix_init_kb(void){ - setPinOutput(F4); - writePinHigh(F4); + gpio_set_pin_output(F4); + gpio_write_pin_high(F4); } __attribute__((weak)) bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - // writePin sets the pin high for 1 and low for 0. + // gpio_write_pin sets the pin high for 1 and low for 0. // In this example the pins are inverted, setting // it low/0 turns it on, and high/1 turns the LED off. // This behavior depends on whether the LED is between the pin // and VCC or the pin and GND. - writePin(F4, !led_state.caps_lock); + gpio_write_pin(F4, !led_state.caps_lock); } return res; } diff --git a/keyboards/zsa/moonlander/matrix.c b/keyboards/zsa/moonlander/matrix.c index aa97d0721ff..2c9edd417cd 100644 --- a/keyboards/zsa/moonlander/matrix.c +++ b/keyboards/zsa/moonlander/matrix.c @@ -71,21 +71,21 @@ void matrix_init_custom(void) { dprintf("matrix init\n"); // debug_matrix = true; // outputs - setPinOutput(B10); - setPinOutput(B11); - setPinOutput(B12); - setPinOutput(B13); - setPinOutput(B14); - setPinOutput(B15); + 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 - setPinInputLow(A0); - setPinInputLow(A1); - setPinInputLow(A2); - setPinInputLow(A3); - setPinInputLow(A6); - setPinInputLow(A7); - setPinInputLow(B0); + 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(); } @@ -117,12 +117,12 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { for (uint8_t row = 0; row <= ROWS_PER_HAND; row++) { // strobe row switch (row) { - case 0: writePinHigh(B10); break; - case 1: writePinHigh(B11); break; - case 2: writePinHigh(B12); break; - case 3: writePinHigh(B13); break; - case 4: writePinHigh(B14); break; - case 5: writePinHigh(B15); break; + 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 } @@ -170,22 +170,22 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { } // 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 ) + (gpio_read_pin(A0) << 0 ) | + (gpio_read_pin(A1) << 1 ) | + (gpio_read_pin(A2) << 2 ) | + (gpio_read_pin(A3) << 3 ) | + (gpio_read_pin(A6) << 4 ) | + (gpio_read_pin(A7) << 5 ) | + (gpio_read_pin(B0) << 6 ) ); // unstrobe row switch (row) { - case 0: writePinLow(B10); break; - case 1: writePinLow(B11); break; - case 2: writePinLow(B12); break; - case 3: writePinLow(B13); break; - case 4: writePinLow(B14); break; - case 5: writePinLow(B15); break; + 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; } diff --git a/keyboards/zsa/moonlander/moonlander.c b/keyboards/zsa/moonlander/moonlander.c index dad795d3150..02c64f4b968 100644 --- a/keyboards/zsa/moonlander/moonlander.c +++ b/keyboards/zsa/moonlander/moonlander.c @@ -95,13 +95,13 @@ static THD_FUNCTION(LEDThread, arg) { } void keyboard_pre_init_kb(void) { - setPinOutput(B5); - setPinOutput(B4); - setPinOutput(B3); + gpio_set_pin_output(B5); + gpio_set_pin_output(B4); + gpio_set_pin_output(B3); - writePinLow(B5); - writePinLow(B4); - writePinLow(B3); + gpio_write_pin_low(B5); + gpio_write_pin_low(B4); + gpio_write_pin_low(B3); chThdCreateStatic(waLEDThread, sizeof(waLEDThread), NORMALPRIO - 16, LEDThread, NULL); diff --git a/keyboards/zsa/moonlander/moonlander.h b/keyboards/zsa/moonlander/moonlander.h index 0e5282c511a..3e1f39ad964 100644 --- a/keyboards/zsa/moonlander/moonlander.h +++ b/keyboards/zsa/moonlander/moonlander.h @@ -26,9 +26,9 @@ extern bool mcp23018_leds[]; #define MCP23018_DEFAULT_ADDRESS 0b0100000 -#define ML_LED_1(status) writePin(B5, (bool)status) -#define ML_LED_2(status) writePin(B4, (bool)status) -#define ML_LED_3(status) writePin(B3, (bool)status) +#define ML_LED_1(status) gpio_write_pin(B5, (bool)status) +#define ML_LED_2(status) gpio_write_pin(B4, (bool)status) +#define ML_LED_3(status) gpio_write_pin(B3, (bool)status) #define ML_LED_4(status) mcp23018_leds[0] = (bool)status #define ML_LED_5(status) mcp23018_leds[1] = (bool)status From 4c2bdf7ab0e170af68f6de91d3851b1dc4113fea Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 3 May 2024 16:13:43 +0100 Subject: [PATCH 242/333] Migrate build target markers to keyboard.json - Misc (#23653) --- keyboards/cannonkeys/petrichor/{info.json => keyboard.json} | 0 keyboards/cannonkeys/petrichor/rules.mk | 1 - keyboards/chew/{info.json => keyboard.json} | 0 keyboards/cipulot/chroma/{info.json => keyboard.json} | 0 keyboards/cipulot/chroma/rules.mk | 0 keyboards/cipulot/ec_660c/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_980c/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_dolice/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_menhir/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_tkl/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_typeb/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_vero/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_virgo/{info.json => keyboard.json} | 0 keyboards/dcpedit/masonry/{info.json => keyboard.json} | 0 keyboards/dcpedit/masonry/rules.mk | 1 - keyboards/druah/dk_saver_redux/{info.json => keyboard.json} | 0 keyboards/druah/dk_saver_redux/rules.mk | 1 - keyboards/era/linx3/n87/{info.json => keyboard.json} | 0 keyboards/era/linx3/n87/rules.mk | 1 - keyboards/era/sirind/tomak/{info.json => keyboard.json} | 0 keyboards/fatotesa/{info.json => keyboard.json} | 0 keyboards/fatotesa/rules.mk | 1 - keyboards/jaykeeb/jk65/{info.json => keyboard.json} | 0 keyboards/jaykeeb/jk65/rules.mk | 1 - keyboards/jlw/bruce_le_clavier/{info.json => keyboard.json} | 0 keyboards/jlw/bruce_le_clavier/rules.mk | 1 - keyboards/jlw/bruce_the_keyboard/{info.json => keyboard.json} | 0 keyboards/jlw/bruce_the_keyboard/rules.mk | 1 - keyboards/jlw/vault35_wkl_universal/{info.json => keyboard.json} | 0 keyboards/jlw/vault35_wkl_universal/rules.mk | 1 - keyboards/keyten/imi60/{info.json => keyboard.json} | 0 keyboards/keyten/imi60/rules.mk | 0 keyboards/mechwild/bb65/f401/{info.json => keyboard.json} | 0 keyboards/mechwild/bb65/f401/rules.mk | 1 - keyboards/mechwild/bb65/f411/{info.json => keyboard.json} | 0 keyboards/mechwild/bb65/f411/rules.mk | 1 - keyboards/novelkeys/nk_classic_tkl/{info.json => keyboard.json} | 0 keyboards/rarepotato8de/3x3macropad/{info.json => keyboard.json} | 0 keyboards/rarepotato8de/3x3macropad/rules.mk | 0 keyboards/scottokeebs/scottowing/{info.json => keyboard.json} | 0 keyboards/scottokeebs/scottowing/rules.mk | 1 - keyboards/sharkoon/skiller_sgk50_s4/{info.json => keyboard.json} | 0 keyboards/sharkoon/skiller_sgk50_s4/rules.mk | 1 - keyboards/ymdk/ymd62/{info.json => keyboard.json} | 0 44 files changed, 13 deletions(-) rename keyboards/cannonkeys/petrichor/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cannonkeys/petrichor/rules.mk rename keyboards/chew/{info.json => keyboard.json} (100%) rename keyboards/cipulot/chroma/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/cipulot/chroma/rules.mk rename keyboards/cipulot/ec_660c/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_980c/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_dolice/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_menhir/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_tkl/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_typeb/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_vero/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_virgo/{info.json => keyboard.json} (100%) rename keyboards/dcpedit/masonry/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/dcpedit/masonry/rules.mk rename keyboards/druah/dk_saver_redux/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/druah/dk_saver_redux/rules.mk rename keyboards/era/linx3/n87/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/era/linx3/n87/rules.mk rename keyboards/era/sirind/tomak/{info.json => keyboard.json} (100%) rename keyboards/fatotesa/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/fatotesa/rules.mk rename keyboards/jaykeeb/jk65/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jaykeeb/jk65/rules.mk rename keyboards/jlw/bruce_le_clavier/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jlw/bruce_le_clavier/rules.mk rename keyboards/jlw/bruce_the_keyboard/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jlw/bruce_the_keyboard/rules.mk rename keyboards/jlw/vault35_wkl_universal/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/jlw/vault35_wkl_universal/rules.mk rename keyboards/keyten/imi60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/keyten/imi60/rules.mk rename keyboards/mechwild/bb65/f401/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechwild/bb65/f401/rules.mk rename keyboards/mechwild/bb65/f411/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/mechwild/bb65/f411/rules.mk rename keyboards/novelkeys/nk_classic_tkl/{info.json => keyboard.json} (100%) rename keyboards/rarepotato8de/3x3macropad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/rarepotato8de/3x3macropad/rules.mk rename keyboards/scottokeebs/scottowing/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/scottokeebs/scottowing/rules.mk rename keyboards/sharkoon/skiller_sgk50_s4/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sharkoon/skiller_sgk50_s4/rules.mk rename keyboards/ymdk/ymd62/{info.json => keyboard.json} (100%) diff --git a/keyboards/cannonkeys/petrichor/info.json b/keyboards/cannonkeys/petrichor/keyboard.json similarity index 100% rename from keyboards/cannonkeys/petrichor/info.json rename to keyboards/cannonkeys/petrichor/keyboard.json diff --git a/keyboards/cannonkeys/petrichor/rules.mk b/keyboards/cannonkeys/petrichor/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/cannonkeys/petrichor/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/chew/info.json b/keyboards/chew/keyboard.json similarity index 100% rename from keyboards/chew/info.json rename to keyboards/chew/keyboard.json diff --git a/keyboards/cipulot/chroma/info.json b/keyboards/cipulot/chroma/keyboard.json similarity index 100% rename from keyboards/cipulot/chroma/info.json rename to keyboards/cipulot/chroma/keyboard.json diff --git a/keyboards/cipulot/chroma/rules.mk b/keyboards/cipulot/chroma/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/cipulot/ec_660c/info.json b/keyboards/cipulot/ec_660c/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_660c/info.json rename to keyboards/cipulot/ec_660c/keyboard.json diff --git a/keyboards/cipulot/ec_980c/info.json b/keyboards/cipulot/ec_980c/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_980c/info.json rename to keyboards/cipulot/ec_980c/keyboard.json diff --git a/keyboards/cipulot/ec_dolice/info.json b/keyboards/cipulot/ec_dolice/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_dolice/info.json rename to keyboards/cipulot/ec_dolice/keyboard.json diff --git a/keyboards/cipulot/ec_menhir/info.json b/keyboards/cipulot/ec_menhir/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_menhir/info.json rename to keyboards/cipulot/ec_menhir/keyboard.json diff --git a/keyboards/cipulot/ec_tkl/info.json b/keyboards/cipulot/ec_tkl/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_tkl/info.json rename to keyboards/cipulot/ec_tkl/keyboard.json diff --git a/keyboards/cipulot/ec_typeb/info.json b/keyboards/cipulot/ec_typeb/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_typeb/info.json rename to keyboards/cipulot/ec_typeb/keyboard.json diff --git a/keyboards/cipulot/ec_vero/info.json b/keyboards/cipulot/ec_vero/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_vero/info.json rename to keyboards/cipulot/ec_vero/keyboard.json diff --git a/keyboards/cipulot/ec_virgo/info.json b/keyboards/cipulot/ec_virgo/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_virgo/info.json rename to keyboards/cipulot/ec_virgo/keyboard.json diff --git a/keyboards/dcpedit/masonry/info.json b/keyboards/dcpedit/masonry/keyboard.json similarity index 100% rename from keyboards/dcpedit/masonry/info.json rename to keyboards/dcpedit/masonry/keyboard.json diff --git a/keyboards/dcpedit/masonry/rules.mk b/keyboards/dcpedit/masonry/rules.mk deleted file mode 100644 index cfa2d9632f9..00000000000 --- a/keyboards/dcpedit/masonry/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# Intentionally left blank \ No newline at end of file diff --git a/keyboards/druah/dk_saver_redux/info.json b/keyboards/druah/dk_saver_redux/keyboard.json similarity index 100% rename from keyboards/druah/dk_saver_redux/info.json rename to keyboards/druah/dk_saver_redux/keyboard.json diff --git a/keyboards/druah/dk_saver_redux/rules.mk b/keyboards/druah/dk_saver_redux/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/druah/dk_saver_redux/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/era/linx3/n87/info.json b/keyboards/era/linx3/n87/keyboard.json similarity index 100% rename from keyboards/era/linx3/n87/info.json rename to keyboards/era/linx3/n87/keyboard.json diff --git a/keyboards/era/linx3/n87/rules.mk b/keyboards/era/linx3/n87/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/era/linx3/n87/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/era/sirind/tomak/info.json b/keyboards/era/sirind/tomak/keyboard.json similarity index 100% rename from keyboards/era/sirind/tomak/info.json rename to keyboards/era/sirind/tomak/keyboard.json diff --git a/keyboards/fatotesa/info.json b/keyboards/fatotesa/keyboard.json similarity index 100% rename from keyboards/fatotesa/info.json rename to keyboards/fatotesa/keyboard.json diff --git a/keyboards/fatotesa/rules.mk b/keyboards/fatotesa/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/fatotesa/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/jaykeeb/jk65/info.json b/keyboards/jaykeeb/jk65/keyboard.json similarity index 100% rename from keyboards/jaykeeb/jk65/info.json rename to keyboards/jaykeeb/jk65/keyboard.json diff --git a/keyboards/jaykeeb/jk65/rules.mk b/keyboards/jaykeeb/jk65/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/jaykeeb/jk65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/jlw/bruce_le_clavier/info.json b/keyboards/jlw/bruce_le_clavier/keyboard.json similarity index 100% rename from keyboards/jlw/bruce_le_clavier/info.json rename to keyboards/jlw/bruce_le_clavier/keyboard.json diff --git a/keyboards/jlw/bruce_le_clavier/rules.mk b/keyboards/jlw/bruce_le_clavier/rules.mk deleted file mode 100644 index d4f87a82781..00000000000 --- a/keyboards/jlw/bruce_le_clavier/rules.mk +++ /dev/null @@ -1 +0,0 @@ -#This file intentionally left blank diff --git a/keyboards/jlw/bruce_the_keyboard/info.json b/keyboards/jlw/bruce_the_keyboard/keyboard.json similarity index 100% rename from keyboards/jlw/bruce_the_keyboard/info.json rename to keyboards/jlw/bruce_the_keyboard/keyboard.json diff --git a/keyboards/jlw/bruce_the_keyboard/rules.mk b/keyboards/jlw/bruce_the_keyboard/rules.mk deleted file mode 100644 index 218d8921e51..00000000000 --- a/keyboards/jlw/bruce_the_keyboard/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank. diff --git a/keyboards/jlw/vault35_wkl_universal/info.json b/keyboards/jlw/vault35_wkl_universal/keyboard.json similarity index 100% rename from keyboards/jlw/vault35_wkl_universal/info.json rename to keyboards/jlw/vault35_wkl_universal/keyboard.json diff --git a/keyboards/jlw/vault35_wkl_universal/rules.mk b/keyboards/jlw/vault35_wkl_universal/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/jlw/vault35_wkl_universal/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keyten/imi60/info.json b/keyboards/keyten/imi60/keyboard.json similarity index 100% rename from keyboards/keyten/imi60/info.json rename to keyboards/keyten/imi60/keyboard.json diff --git a/keyboards/keyten/imi60/rules.mk b/keyboards/keyten/imi60/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/mechwild/bb65/f401/info.json b/keyboards/mechwild/bb65/f401/keyboard.json similarity index 100% rename from keyboards/mechwild/bb65/f401/info.json rename to keyboards/mechwild/bb65/f401/keyboard.json diff --git a/keyboards/mechwild/bb65/f401/rules.mk b/keyboards/mechwild/bb65/f401/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mechwild/bb65/f401/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/mechwild/bb65/f411/info.json b/keyboards/mechwild/bb65/f411/keyboard.json similarity index 100% rename from keyboards/mechwild/bb65/f411/info.json rename to keyboards/mechwild/bb65/f411/keyboard.json diff --git a/keyboards/mechwild/bb65/f411/rules.mk b/keyboards/mechwild/bb65/f411/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/mechwild/bb65/f411/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/novelkeys/nk_classic_tkl/info.json b/keyboards/novelkeys/nk_classic_tkl/keyboard.json similarity index 100% rename from keyboards/novelkeys/nk_classic_tkl/info.json rename to keyboards/novelkeys/nk_classic_tkl/keyboard.json diff --git a/keyboards/rarepotato8de/3x3macropad/info.json b/keyboards/rarepotato8de/3x3macropad/keyboard.json similarity index 100% rename from keyboards/rarepotato8de/3x3macropad/info.json rename to keyboards/rarepotato8de/3x3macropad/keyboard.json diff --git a/keyboards/rarepotato8de/3x3macropad/rules.mk b/keyboards/rarepotato8de/3x3macropad/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/scottokeebs/scottowing/info.json b/keyboards/scottokeebs/scottowing/keyboard.json similarity index 100% rename from keyboards/scottokeebs/scottowing/info.json rename to keyboards/scottokeebs/scottowing/keyboard.json diff --git a/keyboards/scottokeebs/scottowing/rules.mk b/keyboards/scottokeebs/scottowing/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/scottokeebs/scottowing/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/sharkoon/skiller_sgk50_s4/info.json b/keyboards/sharkoon/skiller_sgk50_s4/keyboard.json similarity index 100% rename from keyboards/sharkoon/skiller_sgk50_s4/info.json rename to keyboards/sharkoon/skiller_sgk50_s4/keyboard.json diff --git a/keyboards/sharkoon/skiller_sgk50_s4/rules.mk b/keyboards/sharkoon/skiller_sgk50_s4/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/sharkoon/skiller_sgk50_s4/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ymdk/ymd62/info.json b/keyboards/ymdk/ymd62/keyboard.json similarity index 100% rename from keyboards/ymdk/ymd62/info.json rename to keyboards/ymdk/ymd62/keyboard.json From c8d1b6fefa09d57df72b60f10d3096c56529f9bb Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 4 May 2024 04:44:43 +0100 Subject: [PATCH 243/333] xiudi/xd75 - Fix backlight compilation issues (#23655) --- keyboards/xiudi/xd75/keyboard.json | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/xiudi/xd75/keyboard.json b/keyboards/xiudi/xd75/keyboard.json index a928b43f9b7..5086134cf1a 100644 --- a/keyboards/xiudi/xd75/keyboard.json +++ b/keyboards/xiudi/xd75/keyboard.json @@ -23,6 +23,7 @@ }, "diode_direction": "COL2ROW", "backlight": { + "driver": "timer", "pin": "F5", "levels": 6, "on_state": 0 From b7d5a6c50b6a7cd2009d1eab120487b4f2cee670 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 4 May 2024 16:49:19 +1000 Subject: [PATCH 244/333] Add new set of keycodes for RGB Matrix (#23463) --- .../keycodes/keycodes_0.0.4_lighting.hjson | 92 +++++++++++++++++++ .../bm68hsrgb/rev2/keymaps/via/keymap.c | 34 +++---- quantum/keycodes.h | 28 ++++++ tests/test_common/keycode_table.cpp | 13 +++ 4 files changed, 150 insertions(+), 17 deletions(-) diff --git a/data/constants/keycodes/keycodes_0.0.4_lighting.hjson b/data/constants/keycodes/keycodes_0.0.4_lighting.hjson index d7b27230f30..89ec80bd975 100644 --- a/data/constants/keycodes/keycodes_0.0.4_lighting.hjson +++ b/data/constants/keycodes/keycodes_0.0.4_lighting.hjson @@ -62,6 +62,98 @@ "aliases": [ "LM_SPDD" ] + }, + + "0x7840": { + "group": "rgb_matrix", + "key": "QK_RGB_MATRIX_ON", + "aliases": [ + "RM_ON" + ] + }, + "0x7841": { + "group": "rgb_matrix", + "key": "QK_RGB_MATRIX_OFF", + "aliases": [ + "RM_OFF" + ] + }, + "0x7842": { + "group": "rgb_matrix", + "key": "QK_RGB_MATRIX_TOGGLE", + "aliases": [ + "RM_TOGG" + ] + }, + "0x7843": { + "group": "rgb_matrix", + "key": "QK_RGB_MATRIX_MODE_NEXT", + "aliases": [ + "RM_NEXT" + ] + }, + "0x7844": { + "group": "rgb_matrix", + "key": "QK_RGB_MATRIX_MODE_PREVIOUS", + "aliases": [ + "RM_PREV" + ] + }, + "0x7845": { + "group": "rgb_matrix", + "key": "QK_RGB_MATRIX_HUE_UP", + "aliases": [ + "RM_HUEU" + ] + }, + "0x7846": { + "group": "rgb_matrix", + "key": "QK_RGB_MATRIX_HUE_DOWN", + "aliases": [ + "RM_HUED" + ] + }, + "0x7847": { + "group": "rgb_matrix", + "key": "QK_RGB_MATRIX_SATURATION_UP", + "aliases": [ + "RM_SATU" + ] + }, + "0x7848": { + "group": "rgb_matrix", + "key": "QK_RGB_MATRIX_SATURATION_DOWN", + "aliases": [ + "RM_SATD" + ] + }, + "0x7849": { + "group": "rgb_matrix", + "key": "QK_RGB_MATRIX_VALUE_UP", + "aliases": [ + "RM_VALU" + ] + }, + "0x784A": { + "group": "rgb_matrix", + "key": "QK_RGB_MATRIX_VALUE_DOWN", + "aliases": [ + "RM_VALD" + ] + }, + "0x784B": { + "group": "rgb_matrix", + "key": "QK_RGB_MATRIX_SPEED_UP", + "aliases": [ + "RM_SPDU" + ] + }, + "0x784C": { + "group": "rgb_matrix", + "key": "QK_RGB_MATRIX_SPEED_DOWN", + "aliases": [ + "RM_SPDD" + ] } } } diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c index 3db3a9a7af0..1be08067714 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c +++ b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c @@ -15,53 +15,53 @@ */ #include QMK_KEYBOARD_H enum my_keycodes { - RM_TOGG = SAFE_RANGE, - RM_MOD, - RM_HUI, - RM_HUD, - RM_SAI, - RM_SAD, - RM_VAI, - RM_VAD + RMT = SAFE_RANGE, + RMS, + RMIH, + RMDH, + RMIS, + RMDS, + RMIV, + RMDV }; bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case RM_TOGG: + case RMT: if (record->event.pressed) {rgb_matrix_toggle(); } return false; - case RM_MOD: + case RMS: if (record->event.pressed) {rgb_matrix_step(); } return false; - case RM_HUI: + case RMIH: if (record->event.pressed) {rgb_matrix_increase_hue(); } return false; - case RM_HUD: + case RMDH: if (record->event.pressed) {rgb_matrix_decrease_hue(); } return false; - case RM_SAI: + case RMIS: if (record->event.pressed) {rgb_matrix_increase_sat(); } return false; - case RM_SAD: + case RMDS: if (record->event.pressed) {rgb_matrix_decrease_sat(); } return false; - case RM_VAI: + case RMIV: if (record->event.pressed) {rgb_matrix_increase_val(); } return false; - case RM_VAD: + case RMDV: if (record->event.pressed) {rgb_matrix_decrease_val(); } @@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______, _______, - KC_CAPS, RM_TOGG, RM_MOD, RM_HUI, RM_HUD, RM_SAI, RM_SAD, RM_VAI, RM_VAD, _______, _______, _______, _______, _______, + KC_CAPS, RMT, RMS, RMIH, RMDH, RMIS, RMDS, RMIV, RMDV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______ ), diff --git a/quantum/keycodes.h b/quantum/keycodes.h index da1012cf12b..415c7155b3a 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -657,6 +657,19 @@ enum qk_keycode_defines { RGB_MODE_GRADIENT = 0x7832, RGB_MODE_RGBTEST = 0x7833, RGB_MODE_TWINKLE = 0x7834, + QK_RGB_MATRIX_ON = 0x7840, + QK_RGB_MATRIX_OFF = 0x7841, + QK_RGB_MATRIX_TOGGLE = 0x7842, + QK_RGB_MATRIX_MODE_NEXT = 0x7843, + QK_RGB_MATRIX_MODE_PREVIOUS = 0x7844, + QK_RGB_MATRIX_HUE_UP = 0x7845, + QK_RGB_MATRIX_HUE_DOWN = 0x7846, + QK_RGB_MATRIX_SATURATION_UP = 0x7847, + QK_RGB_MATRIX_SATURATION_DOWN = 0x7848, + QK_RGB_MATRIX_VALUE_UP = 0x7849, + QK_RGB_MATRIX_VALUE_DOWN = 0x784A, + QK_RGB_MATRIX_SPEED_UP = 0x784B, + QK_RGB_MATRIX_SPEED_DOWN = 0x784C, QK_BOOTLOADER = 0x7C00, QK_REBOOT = 0x7C01, QK_DEBUG_TOGGLE = 0x7C02, @@ -1311,6 +1324,19 @@ enum qk_keycode_defines { RGB_M_G = RGB_MODE_GRADIENT, RGB_M_T = RGB_MODE_RGBTEST, RGB_M_TW = RGB_MODE_TWINKLE, + RM_ON = QK_RGB_MATRIX_ON, + RM_OFF = QK_RGB_MATRIX_OFF, + RM_TOGG = QK_RGB_MATRIX_TOGGLE, + RM_NEXT = QK_RGB_MATRIX_MODE_NEXT, + RM_PREV = QK_RGB_MATRIX_MODE_PREVIOUS, + RM_HUEU = QK_RGB_MATRIX_HUE_UP, + RM_HUED = QK_RGB_MATRIX_HUE_DOWN, + RM_SATU = QK_RGB_MATRIX_SATURATION_UP, + RM_SATD = QK_RGB_MATRIX_SATURATION_DOWN, + RM_VALU = QK_RGB_MATRIX_VALUE_UP, + RM_VALD = QK_RGB_MATRIX_VALUE_DOWN, + RM_SPDU = QK_RGB_MATRIX_SPEED_UP, + RM_SPDD = QK_RGB_MATRIX_SPEED_DOWN, QK_BOOT = QK_BOOTLOADER, QK_RBT = QK_REBOOT, DB_TOGG = QK_DEBUG_TOGGLE, @@ -1436,6 +1462,7 @@ enum qk_keycode_defines { #define IS_BACKLIGHT_KEYCODE(code) ((code) >= QK_BACKLIGHT_ON && (code) <= QK_BACKLIGHT_TOGGLE_BREATHING) #define IS_LED_MATRIX_KEYCODE(code) ((code) >= QK_LED_MATRIX_ON && (code) <= QK_LED_MATRIX_SPEED_DOWN) #define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE) +#define IS_RGB_MATRIX_KEYCODE(code) ((code) >= QK_RGB_MATRIX_ON && (code) <= QK_RGB_MATRIX_SPEED_DOWN) #define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_ALT_REPEAT_KEY) #define IS_KB_KEYCODE(code) ((code) >= QK_KB_0 && (code) <= QK_KB_31) #define IS_USER_KEYCODE(code) ((code) >= QK_USER_0 && (code) <= QK_USER_31) @@ -1459,6 +1486,7 @@ enum qk_keycode_defines { #define BACKLIGHT_KEYCODE_RANGE QK_BACKLIGHT_ON ... QK_BACKLIGHT_TOGGLE_BREATHING #define LED_MATRIX_KEYCODE_RANGE QK_LED_MATRIX_ON ... QK_LED_MATRIX_SPEED_DOWN #define RGB_KEYCODE_RANGE RGB_TOG ... RGB_MODE_TWINKLE +#define RGB_MATRIX_KEYCODE_RANGE QK_RGB_MATRIX_ON ... QK_RGB_MATRIX_SPEED_DOWN #define QUANTUM_KEYCODE_RANGE QK_BOOTLOADER ... QK_ALT_REPEAT_KEY #define KB_KEYCODE_RANGE QK_KB_0 ... QK_KB_31 #define USER_KEYCODE_RANGE QK_USER_0 ... QK_USER_31 diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp index 06064e77f91..52817804a25 100644 --- a/tests/test_common/keycode_table.cpp +++ b/tests/test_common/keycode_table.cpp @@ -599,6 +599,19 @@ std::map KEYCODE_ID_TABLE = { {RGB_MODE_GRADIENT, "RGB_MODE_GRADIENT"}, {RGB_MODE_RGBTEST, "RGB_MODE_RGBTEST"}, {RGB_MODE_TWINKLE, "RGB_MODE_TWINKLE"}, + {QK_RGB_MATRIX_ON, "QK_RGB_MATRIX_ON"}, + {QK_RGB_MATRIX_OFF, "QK_RGB_MATRIX_OFF"}, + {QK_RGB_MATRIX_TOGGLE, "QK_RGB_MATRIX_TOGGLE"}, + {QK_RGB_MATRIX_MODE_NEXT, "QK_RGB_MATRIX_MODE_NEXT"}, + {QK_RGB_MATRIX_MODE_PREVIOUS, "QK_RGB_MATRIX_MODE_PREVIOUS"}, + {QK_RGB_MATRIX_HUE_UP, "QK_RGB_MATRIX_HUE_UP"}, + {QK_RGB_MATRIX_HUE_DOWN, "QK_RGB_MATRIX_HUE_DOWN"}, + {QK_RGB_MATRIX_SATURATION_UP, "QK_RGB_MATRIX_SATURATION_UP"}, + {QK_RGB_MATRIX_SATURATION_DOWN, "QK_RGB_MATRIX_SATURATION_DOWN"}, + {QK_RGB_MATRIX_VALUE_UP, "QK_RGB_MATRIX_VALUE_UP"}, + {QK_RGB_MATRIX_VALUE_DOWN, "QK_RGB_MATRIX_VALUE_DOWN"}, + {QK_RGB_MATRIX_SPEED_UP, "QK_RGB_MATRIX_SPEED_UP"}, + {QK_RGB_MATRIX_SPEED_DOWN, "QK_RGB_MATRIX_SPEED_DOWN"}, {QK_BOOTLOADER, "QK_BOOTLOADER"}, {QK_REBOOT, "QK_REBOOT"}, {QK_DEBUG_TOGGLE, "QK_DEBUG_TOGGLE"}, From 5f9917856a5774570e0c2d0b790768c040e901d1 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 4 May 2024 10:59:41 +0100 Subject: [PATCH 245/333] Fix iris via keymap (#23652) --- keyboards/keebio/iris/keymaps/via/keymap.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/keyboards/keebio/iris/keymaps/via/keymap.c b/keyboards/keebio/iris/keymaps/via/keymap.c index 04ebf000b8b..c99809b3976 100644 --- a/keyboards/keebio/iris/keymaps/via/keymap.c +++ b/keyboards/keebio/iris/keymaps/via/keymap.c @@ -7,6 +7,7 @@ enum custom_layer { _MAIN, _FN1, _FN2, + _FN3, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -51,6 +52,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ _______, _______, _______, _______, _______, _______ // └────────┴────────┴────────┘ └────────┴────────┴────────┘ + ), + + [_FN3] = LAYOUT( + //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ + _______, _______, _______, _______, _______, _______ + // └────────┴────────┴────────┘ └────────┴────────┴────────┘ ) }; From 5c90facf936688de8e05b6894a06c2b1d6fd347d Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Sat, 4 May 2024 21:36:08 -0400 Subject: [PATCH 246/333] refactor: mechwild/bbs (#23373) --- keyboards/mechwild/bbs/config.h | 23 +------ keyboards/mechwild/bbs/halconf.h | 8 +++ keyboards/mechwild/bbs/keyboard.json | 66 +++++++++++++------ .../mechwild/bbs/keymaps/default/keymap.c | 13 +--- keyboards/mechwild/bbs/mcuconf.h | 9 +++ keyboards/mechwild/bbs/readme.md | 3 +- keyboards/mechwild/bbs/rules.mk | 17 ----- 7 files changed, 69 insertions(+), 70 deletions(-) create mode 100644 keyboards/mechwild/bbs/halconf.h create mode 100644 keyboards/mechwild/bbs/mcuconf.h delete mode 100644 keyboards/mechwild/bbs/rules.mk diff --git a/keyboards/mechwild/bbs/config.h b/keyboards/mechwild/bbs/config.h index b626e5590d4..1858b6b9a6d 100644 --- a/keyboards/mechwild/bbs/config.h +++ b/keyboards/mechwild/bbs/config.h @@ -3,23 +3,6 @@ #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 +#define WS2812_PWM_DRIVER PWMD4 +#define WS2812_PWM_CHANNEL 4 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 diff --git a/keyboards/mechwild/bbs/halconf.h b/keyboards/mechwild/bbs/halconf.h new file mode 100644 index 00000000000..6d3deb6a24f --- /dev/null +++ b/keyboards/mechwild/bbs/halconf.h @@ -0,0 +1,8 @@ +// Copyright 2024 QMK Contributors (@qmk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/mechwild/bbs/keyboard.json b/keyboards/mechwild/bbs/keyboard.json index c0ba888d9ab..8985c4526a3 100644 --- a/keyboards/mechwild/bbs/keyboard.json +++ b/keyboards/mechwild/bbs/keyboard.json @@ -1,29 +1,60 @@ { - "keyboard_name": "BB Steno", "manufacturer": "MechWild", + "keyboard_name": "BB Steno", "maintainer": "kylemccreery", - "url": "https://mechwild.com/product/bb-steno/", - "usb": { - "vid": "0x6D77", - "pid": "0x170E", - "device_version": "0.0.1", - "force_nkro": true - }, - "matrix_pins": { - "cols": ["B0", "A7", "A6", "A5", "A4", "A3"], - "rows": ["B12", "B10", "B13", "B1", "B14"] - }, + "bootloader_instructions": "Hold down the BOOT button, then tap the NRST button on the BlackPill. Avoid touching the A11 and A12 pins.", + "development_board": "blackpill_f401", "diode_direction": "COL2ROW", "dip_switch": { "pins": ["A0"] }, + "features": { + "bootmagic": true, + "dip_switch": true, + "nkro": true, + "rgblight": true, + "steno": true + }, "indicators": { "caps_lock": "C13", "on_state": 0 }, - "processor": "STM32F401", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F401", + "matrix_pins": { + "cols": ["B0", "A7", "A6", "A5", "A4", "A3"], + "rows": ["B12", "B10", "B13", "B1", "B14"] + }, + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "brightness_steps": 8, + "led_count": 6, + "saturation_steps": 8, + "sleep": true + }, + "url": "https://mechwild.com/product/bb-steno/", + "usb": { + "device_version": "1.1.0", + "force_nkro": true, + "pid": "0x170E", + "shared_endpoint": { + "keyboard": true + }, + "vid": "0x6D77" + }, + "ws2812": { + "driver": "pwm", + "pin": "B9" + }, "layouts": { "LAYOUT": { "layout": [ @@ -33,32 +64,27 @@ {"matrix": [0, 3], "x": 3, "y": 0}, {"matrix": [0, 4], "x": 4, "y": 0.125}, {"matrix": [0, 5], "x": 5, "y": 0.125}, - {"matrix": [1, 0], "x": 6.75, "y": 0.125}, {"matrix": [1, 1], "x": 7.75, "y": 0.125}, {"matrix": [1, 2], "x": 8.75, "y": 0}, {"matrix": [1, 3], "x": 9.75, "y": 0.125}, {"matrix": [1, 4], "x": 10.75, "y": 0.375}, {"matrix": [1, 5], "x": 11.75, "y": 0.375}, - {"matrix": [2, 0], "x": 0, "y": 1.375}, {"matrix": [2, 1], "x": 1, "y": 1.375}, {"matrix": [2, 2], "x": 2, "y": 1.125}, {"matrix": [2, 3], "x": 3, "y": 1}, {"matrix": [2, 4], "x": 4, "y": 1.125}, {"matrix": [2, 5], "x": 5, "y": 1.125}, - {"matrix": [3, 0], "x": 6.75, "y": 1.125}, {"matrix": [3, 1], "x": 7.75, "y": 1.125}, {"matrix": [3, 2], "x": 8.75, "y": 1}, {"matrix": [3, 3], "x": 9.75, "y": 1.125}, {"matrix": [3, 4], "x": 10.75, "y": 1.375}, {"matrix": [3, 5], "x": 11.75, "y": 1.375}, - {"matrix": [4, 3], "x": 2.75, "y": 3.125, "h": 1.5}, {"matrix": [4, 4], "x": 3.75, "y": 3.125, "h": 1.5}, {"matrix": [4, 5], "x": 4.75, "y": 2.875, "h": 1.5}, - {"matrix": [4, 0], "x": 7, "y": 2.875, "h": 1.5}, {"matrix": [4, 1], "x": 8, "y": 3.125, "h": 1.5}, {"matrix": [4, 2], "x": 9, "y": 3.125, "h": 1.5} diff --git a/keyboards/mechwild/bbs/keymaps/default/keymap.c b/keyboards/mechwild/bbs/keymaps/default/keymap.c index 146099fba79..a37c6705902 100644 --- a/keyboards/mechwild/bbs/keymaps/default/keymap.c +++ b/keyboards/mechwild/bbs/keymaps/default/keymap.c @@ -3,22 +3,11 @@ #include QMK_KEYBOARD_H -// Defines names for use in layer keycodes and the keymap -enum layer_names { - _BASE, - _FN1 -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - [_BASE] = LAYOUT( + [0] = LAYOUT( STN_RES1, STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR, STN_RES2, STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR, STN_A, STN_O, STN_N1, STN_N2, STN_E, STN_U - ), - [_FN1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/mechwild/bbs/mcuconf.h b/keyboards/mechwild/bbs/mcuconf.h new file mode 100644 index 00000000000..4902b4a1200 --- /dev/null +++ b/keyboards/mechwild/bbs/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2024 QMK Contributors (@qmk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef STM32_PWM_USE_TIM4 +#define STM32_PWM_USE_TIM4 TRUE diff --git a/keyboards/mechwild/bbs/readme.md b/keyboards/mechwild/bbs/readme.md index 530717b800c..d606e90cb50 100644 --- a/keyboards/mechwild/bbs/readme.md +++ b/keyboards/mechwild/bbs/readme.md @@ -5,7 +5,8 @@ A bare-bones stenography keyboard. No bells or whistles. Simple, cheap, effective, steno. * Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery) -* Hardware Supported: BBS v0.1 +* Hardware Supported: BBS v0.1, v1.1 + * v0.1 PCBs were miswired for WS2812 RGB LED strips. As the data pin is the same, a strip could still be added with some handwiring. * Hardware Availability: [BBS on MechWild](https://mechwild.com/product/bb-steno/) Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/mechwild/bbs/rules.mk b/keyboards/mechwild/bbs/rules.mk deleted file mode 100644 index 6dbff620b83..00000000000 --- a/keyboards/mechwild/bbs/rules.mk +++ /dev/null @@ -1,17 +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 -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes # Dip Switch Enabled - -# Necessary for stenography functionality -STENO_ENABLE = yes # Enable stenography endpoint -NKRO_ENABLE = yes # Enable N-Key Rollover -KEYBOARD_SHARED_EP = yes # Needed to free up an endpoint in blackpill \ No newline at end of file From e3e587fc7491e56c77fecd0c5c91f0c10027f1a1 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Sun, 5 May 2024 01:38:32 +0000 Subject: [PATCH 247/333] Add support for Smart 68 keyboard (#23043) --- keyboards/smart68/info.json | 328 +++++++++++++++++++++ keyboards/smart68/keymaps/default/keymap.c | 55 ++++ keyboards/smart68/keymaps/default/rules.mk | 1 + keyboards/smart68/readme.md | 34 +++ keyboards/smart68/rules.mk | 1 + 5 files changed, 419 insertions(+) create mode 100644 keyboards/smart68/info.json create mode 100644 keyboards/smart68/keymaps/default/keymap.c create mode 100644 keyboards/smart68/keymaps/default/rules.mk create mode 100644 keyboards/smart68/readme.md create mode 100644 keyboards/smart68/rules.mk diff --git a/keyboards/smart68/info.json b/keyboards/smart68/info.json new file mode 100644 index 00000000000..f97c347ed51 --- /dev/null +++ b/keyboards/smart68/info.json @@ -0,0 +1,328 @@ +{ + "manufacturer": "DeeLonG", + "keyboard_name": "Smart 68", + "maintainer": "Shados", + "backlight": { + "pin": "B7" + }, + "bootloader": "atmel-dfu", + "bootmagic": { + "matrix": [3, 5] + }, + "diode_direction": "COL2ROW", + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "indicators": { + "caps_lock": "B2", + "on_state": 0 + }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F7"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "processor": "atmega32u4", + "url": "https://web.archive.org/web/20180703134842/https://geekhack.org/index.php?topic=83442.0", + "usb": { + "device_version": "1.0.0", + "pid": "0x6868", + "vid": "0x444C" + }, + "layout_aliases": { + "LAYOUT": "LAYOUT_all", + "LAYOUT_v1_a": "LAYOUT_all" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 13], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [3, 13], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4.25, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4}, + {"matrix": [4, 6], "x": 5.5, "y": 5, "w": 5, "h": 0.5} + ] + }, + "LAYOUT_v1_b": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 13], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [3, 13], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4.25, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4}, + {"matrix": [4, 6], "x": 5.5, "y": 5, "w": 5, "h": 0.5} + ] + }, + "LAYOUT_v2_a": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 13], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [3, 13], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4}, + {"matrix": [4, 6], "x": 5.5, "y": 5, "w": 5, "h": 0.5} + ] + }, + "LAYOUT_v2_b": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 13], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [3, 13], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 3, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4}, + {"matrix": [4, 6], "x": 5.5, "y": 5, "w": 5, "h": 0.5} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/smart68/keymaps/default/keymap.c b/keyboards/smart68/keymaps/default/keymap.c new file mode 100644 index 00000000000..fd92dc79012 --- /dev/null +++ b/keyboards/smart68/keymaps/default/keymap.c @@ -0,0 +1,55 @@ +// Copyright 2024 Alexei Robyn (@Shados) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backspc│` │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │Del│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │PgU│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │PgD│ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴──┬───┼───┼───┤ + * │Ctrl │GUI │Alt │ │Alt │Ctrl│ ← │ ↓ │ → │ + * └─────┴────┴─────┴────────────────────────┴────┴────┴───┴───┴───┘ + * ┌───────────────────┐ + * │ Fn │ + * └───────────────────┘ + */ + [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, KC_EQL, KC_BSPC, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT, + MO(1) + ), + /* FN Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │Mut│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│QK_BOOT│ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ │ │ ↑ │ │ │ │ │ │ │ │Psc│Slk│Pau│ Ins │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ ← │ ↓ │ → │ │ │ │ │ │ │ │ │BL_TOGG │Hom│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │VoU│End│ + * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴──┬───┼───┼───┤ + * │ │ │ │ │ │ │BL-│VoD│BL+│ + * └─────┴────┴─────┴────────────────────────┴────┴────┴───┴───┴───┘ + * ┌───────────────────┐ + * │ │ + * └───────────────────┘ + */ + [1] = LAYOUT( + KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, KC_HOME, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_END, + _______, _______, _______, _______, _______, _______, BL_DOWN, KC_VOLD, BL_UP, + _______ + ), +}; diff --git a/keyboards/smart68/keymaps/default/rules.mk b/keyboards/smart68/keymaps/default/rules.mk new file mode 100644 index 00000000000..0288e8f5c1a --- /dev/null +++ b/keyboards/smart68/keymaps/default/rules.mk @@ -0,0 +1 @@ +COMMAND_ENABLE = yes diff --git a/keyboards/smart68/readme.md b/keyboards/smart68/readme.md new file mode 100644 index 00000000000..a8a7a5410f7 --- /dev/null +++ b/keyboards/smart68/readme.md @@ -0,0 +1,34 @@ +# Smart 68 + +![Smart 68 V1 and V2](https://i.imgur.com/Ed2e083h.jpg) +![Smart 68 front shot](https://i.imgur.com/0NgcWqyh.jpg) + +A 68% keyboard with hot-swappable switches & backlight LEDs, and a +front-mounted Fn key/bar using an Omron switch. + +* Keyboard Maintainer: [Shados](https://github.com/Shados) +* Hardware Supported: Smart 68 PCB +* Hardware Availability: [A 2016 Geekhack group buy](https://web.archive.org/web/20180703134842/https://geekhack.org/index.php?topic=83442.0) + +Make example for this keyboard (after setting up your build environment): + + make smart68:default + +Flashing example for this keyboard: + + make smart68: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). + +## Bootloader + +You can enter the bootloader in three different ways: + +1. **Bootmagic reset**: Hold down the key at (3,5) in the matrix (the 'B' key + in qwerty layouts) and plug in the keyboard. This will also work if the + board is still running its original TMK firmware. +2. **Physical reset button**: Briefly press the button on the back of the PCB. + This will also work if the board is still running its original TMK firmware. +3. **Keycode in layout**: Press the key mapped to `QK_BOOT` (Fn + Backspace, in + the default layout). This will *not* work if the board is still running its + original TMK firmware. diff --git a/keyboards/smart68/rules.mk b/keyboards/smart68/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/smart68/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 5daae4bee9622c58d13a901981540c7d95d5bbca Mon Sep 17 00:00:00 2001 From: Stefan Kerkmann Date: Sun, 5 May 2024 09:17:22 +0200 Subject: [PATCH 248/333] split_util: rename `usbIsActive` to `usb_bus_detected` (#23657) split_util: rename usbIsActive to usb_bus_detected This follows the style rules and better reflects the intent. Signed-off-by: Stefan Kerkmann --- quantum/split_common/split_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c index 96f19bfd840..9af3c29d752 100644 --- a/quantum/split_common/split_util.c +++ b/quantum/split_common/split_util.c @@ -63,7 +63,7 @@ static struct { #if defined(SPLIT_USB_DETECT) _Static_assert((SPLIT_USB_TIMEOUT / SPLIT_USB_TIMEOUT_POLL) <= UINT16_MAX, "Please lower SPLIT_USB_TIMEOUT and/or increase SPLIT_USB_TIMEOUT_POLL."); -static bool usbIsActive(void) { +static bool usb_bus_detected(void) { for (uint16_t i = 0; i < (SPLIT_USB_TIMEOUT / SPLIT_USB_TIMEOUT_POLL); i++) { // This will return true if a USB connection has been established if (usb_connected_state()) { @@ -74,7 +74,7 @@ static bool usbIsActive(void) { return false; } #else -static inline bool usbIsActive(void) { +static inline bool usb_bus_detected(void) { return usb_vbus_state(); } #endif @@ -179,7 +179,7 @@ __attribute__((weak)) bool is_keyboard_left_impl(void) { } __attribute__((weak)) bool is_keyboard_master_impl(void) { - bool is_master = usbIsActive(); + bool is_master = usb_bus_detected(); // Avoid NO_USB_STARTUP_CHECK - Disable USB as the previous checks seem to enable it somehow if (!is_master) { From 7fc552632eb41b031d9557fe317f71e43377dde7 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sun, 5 May 2024 20:38:31 +1000 Subject: [PATCH 249/333] Add page for capabilties used by docs site. (#23428) --- docs/__capabilities.md | 257 +++++++++++++++++++++++++++++++++++++++++ docs/flashing.md | 2 +- docs/newbs.md | 2 +- 3 files changed, 259 insertions(+), 2 deletions(-) create mode 100644 docs/__capabilities.md diff --git a/docs/__capabilities.md b/docs/__capabilities.md new file mode 100644 index 00000000000..469da462eb1 --- /dev/null +++ b/docs/__capabilities.md @@ -0,0 +1,257 @@ +# Documentation Capabilities + +This page lays out the capabilities used by the QMK Firmware documentation, in order to aid future transitions to other page generators. Focuses mainly on things other than normal Markdown, as it's assumed that markdown generators should still function accordingly. + +## Overall capabilities + +Unrelated to styling, high-level tech. + +* I18n -- translations to other languages: [_langs.md](_langs.md) +* Sidebar -- listing of pages by category: [_summary.md](_summary.md) +* Title anchors -- `:id=some-anchor-name`, used for direct linking to sections + * Links to anchors: + * Style 1: [early initialization](platformdev_chibios_earlyinit.md?id=board-init) + * Style 2: [early initialization](platformdev_chibios_earlyinit.md#board-init) + * Links to anchors on the same page, i.e. [Emoji](#emoji) +* Specifying CNAME for root domain -- `docs.qmk.fm` +* Moved pages, see `index.html` +* Text search +* Footnotes [like this][1] + + + + + + +### Dividing lines + +--- + +
+ +
+ +### Images + +![QMK Color Wheel with HSV Values](https://i.imgur.com/vkYVo66.jpg) + +HSV Color Wheel + +### Lists + +Newlines with `
`: + +Line one
+Line two
+Line three + +Nested dotted: + +* The PR is complete and ready to merge +* GitHub checks for the PR are green whenever possible + * A "red" check may be disregarded by maintainers if the items flagged are unrelated to the change proposed in the PR + * Modifications to existing files should not need to add license headers to pass lint, for instance. + * If it's not directly related to your PR's functionality, prefer avoiding making a change. + +Nested dashed: + +- The PR is complete and ready to merge +- GitHub checks for the PR are green whenever possible + - A "red" check may be disregarded by maintainers if the items flagged are unrelated to the change proposed in the PR + - Modifications to existing files should not need to add license headers to pass lint, for instance. + - If it's not directly related to your PR's functionality, prefer avoiding making a change. + +Nested numbered: + +1. The PR is complete and ready to merge +1. GitHub checks for the PR are green whenever possible + 1. A "red" check may be disregarded by maintainers if the items flagged are unrelated to the change proposed in the PR + 1. Modifications to existing files should not need to add license headers to pass lint, for instance. + 1. If it's not directly related to your PR's functionality, prefer avoiding making a change. + +Nested mixed: + +1. Add it to the schema in `data/schemas/keyboards.jsonschema` +1. Add a mapping in `data/maps` +1. (optional and discouraged) Add code to extract/generate it to: + * `lib/python/qmk/info.py` + * `lib/python/qmk/cli/generate/config_h.py` + * `lib/python/qmk/cli/generate/rules_mk.py` + +### Emoji :id=emoji + +#### Direct: + +👍🎉 First off, thanks for taking the time to read this and contribute! 🎉👍 + +#### As colon-name-colon: + +:heavy_check_mark: : works and was tested + +:o: : does not apply + +:x: : not supported by MCU + +### XML Entities + +[`clueboard`](https://github.com/qmk/qmk_firmware/tree/master/keyboards/clueboard) ← This is the organization folder, there's no `rules.mk` file + +1–4 + +Command+` + +## Styling + +### CSS-ish + +This is 150% of normal sizing, and bold! + + +### Tables + +| Column A | Column B | +|----------|----------| +| Left | Right | + +### Indented sections + +> Indent without any sort of marker + +?> Query, this? + +!> Notification, damnit! + +### Keyboard keys + +, + +Right Alt+Right Shift + +1. Click File > New > Makefile Project with Existing Code + +1. Click File > Preferences > > Settings + +1. Hit Ctrl-` (Grave) to bring up the terminal or go to View > Terminal (command `workbench.action.terminal.toggleTerminal`). A new terminal will be opened if there isn‘t one already. + + This should start the terminal in the workspace's folder (so the `qmk_firmware` folder), and then you can compile your keyboard. + + +### Code Blocks + +Inline code with tag: test + +Inline code with backticks: `test` + + This is preformatted + Indented by 4 spaces + The letters lined up + +```c +int c_code(void) { + return -1; +} +``` + +```makefile +ifeq ($(BUILD),) + CHUNDER_REQUIRED = yes +endif +``` + +```python +from pathlib import Path + +p = Path('/path/to/qmk_firmware') +``` + +```json +{ + "a": "b", + "c": 4, + "d": { + "e": [ + 0, 1, 2, 3 + ] + } +} +``` + +```diff + #undef RGBLIGHT_LED_COUNT ++#undef RGBLIGHT_EFFECT_STATIC_GRADIENT ++#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL + #define RGBLIGHT_LED_COUNT 12 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 +``` + +Indented code as part of a list: + +* [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI) +* [Teensy Loader](https://www.pjrc.com/teensy/loader.html) +* [Teensy Loader Command Line](https://www.pjrc.com/teensy/loader_cli.html) / `:teensy` target in QMK (recommended command line) + ``` + teensy_loader_cli -v -mmcu= + ``` + + +### Sub/Superscript + +This is subscripted, apparently. + +This is superscripted, apparently. + +I2C + +T0H, T0L + +### Tabs + +Tabs are based on section headers, with `**` enclosing the tab title. + + + +#### ** Tab one ** + +Content one + + + +##### ** Nested one ** + +Nested content one + +##### ** Nested two ** + +Nested content two + + + +#### ** Tab two ** + +Content two + +#### ** Tab three ** + +Content three + + + +## Details sections + +Expandable: + +
+ Some summary text that shows up before expanding + +!> Embedded notification! + +This is some inner content. +
+ + [1]: https://en.wikipedia.org/wiki/Eclipse_(software) diff --git a/docs/flashing.md b/docs/flashing.md index 95b36804100..4867c20bec8 100644 --- a/docs/flashing.md +++ b/docs/flashing.md @@ -236,7 +236,7 @@ Flashing sequence: ## STM32/APM32 DFU -All STM32 and APM32 MCUs, except for F103 (see the [STM32duino section](#stm32duino)) come preloaded with a factory bootloader that cannot be modified nor deleted. +All USB-capable STM32 and APM32 MCUs, except for a small handful (such as STM32F103 -- see the [STM32duino section](#stm32duino)) come preloaded with a factory bootloader that cannot be modified nor deleted. To ensure compatibility with the STM32-DFU bootloader, make sure this block is present in your `rules.mk` (optionally with `apm32-dfu` instead): diff --git a/docs/newbs.md b/docs/newbs.md index 2763b261227..b4d14947946 100644 --- a/docs/newbs.md +++ b/docs/newbs.md @@ -7,7 +7,7 @@ QMK tries to put a lot of power into your hands by making easy things easy, and Not sure if your keyboard can run QMK? If it's a mechanical keyboard you built yourself chances are good it can. We support a [large number of hobbyist boards](https://qmk.fm/keyboards/). If your current keyboard can't run QMK there are a lot of choices out there for boards that do. ?> **Is This Guide For Me?**
-If the thought of programming intimidates you, please [take a look at our online GUI](newbs_building_firmware_configurator.md) instead. +If the thought of programming intimidates you, please [take a look at our online GUI](newbs_building_firmware_configurator.md) instead. ## Overview From dca7c3f86ff70a6a410fc86ad9961aa21512702a Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Mon, 6 May 2024 17:24:53 +1000 Subject: [PATCH 250/333] Reworked CI builds for `master`/`develop`. (#23182) --- .github/workflows/ci_build_major_branch.yml | 122 ++++++++++++ .../ci_build_major_branch_keymap.yml | 181 ++++++++++++++++++ 2 files changed, 303 insertions(+) create mode 100644 .github/workflows/ci_build_major_branch.yml create mode 100644 .github/workflows/ci_build_major_branch_keymap.yml diff --git a/.github/workflows/ci_build_major_branch.yml b/.github/workflows/ci_build_major_branch.yml new file mode 100644 index 00000000000..608e266ce4b --- /dev/null +++ b/.github/workflows/ci_build_major_branch.yml @@ -0,0 +1,122 @@ +name: CI Build Major Branch + +permissions: + contents: read + actions: write + +on: + push: + branches: [master, develop] + workflow_dispatch: + inputs: + branch: + type: choice + description: "Branch to build" + options: [master, develop] + +env: + # https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration#usage-limits + # We've decreased it from 20 to 15 to allow for other GHA to run unimpeded + CONCURRENT_JOBS: 15 + +# Ensure we only have one build running at a time, cancelling any active builds if a new commit is pushed to the respective branch +concurrency: + group: ci_build-${{ github.event.inputs.branch || github.ref_name }} + cancel-in-progress: true + +jobs: + determine_concurrency: + name: "Determine concurrency" + if: github.repository == 'qmk/qmk_firmware' + runs-on: ubuntu-latest + container: ghcr.io/qmk/qmk_cli + + outputs: + slice_length: ${{ steps.generate_slice_length.outputs.slice_length }} + + steps: + - name: Install prerequisites + run: | + apt-get update + apt-get install -y jq + + - name: Disable safe.directory check + run: | + git config --global --add safe.directory '*' + + - name: Checkout QMK Firmware + uses: actions/checkout@v4 + + - name: Determine concurrency + id: generate_slice_length + run: | + target_count=$( { + qmk find -km default 2>/dev/null + qmk find -km via 2>/dev/null + } | sort | uniq | wc -l) + slice_length=$((target_count / ($CONCURRENT_JOBS - 1))) # Err on the side of caution as we're splitting default and via + echo "slice_length=$slice_length" >> $GITHUB_OUTPUT + + build_targets: + name: "Compile keymap ${{ matrix.keymap }}" + needs: determine_concurrency + strategy: + fail-fast: false + matrix: + keymap: [default, via] + uses: ./.github/workflows/ci_build_major_branch_keymap.yml + with: + branch: ${{ inputs.branch || github.ref_name }} + keymap: ${{ matrix.keymap }} + slice_length: ${{ needs.determine_concurrency.outputs.slice_length }} + + rollup_tasks: + name: "Housekeeping" + needs: build_targets + runs-on: ubuntu-latest + + steps: + - name: Download firmwares + uses: actions/download-artifact@v4 + with: + pattern: firmware-* + path: firmwares + merge-multiple: true + + - name: Upload to https://ci.qmk.fm/${{ inputs.branch || github.ref_name }}/${{ github.sha }} + uses: jakejarvis/s3-sync-action@master + with: + args: --acl public-read --follow-symlinks --delete + env: + AWS_S3_BUCKET: qmk-ci + AWS_ACCESS_KEY_ID: ${{ secrets.CI_QMK_FM_SPACES_KEY }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_QMK_FM_SPACES_SECRET }} + AWS_REGION: nyc3 + AWS_S3_ENDPOINT: nyc3.digitaloceanspaces.com + SOURCE_DIR: firmwares + DEST_DIR: ${{ inputs.branch || github.ref_name }}/${{ github.sha }} + + - name: Upload to https://ci.qmk.fm/${{ inputs.branch || github.ref_name }}/latest + uses: jakejarvis/s3-sync-action@master + with: + args: --acl public-read --follow-symlinks --delete + env: + AWS_S3_BUCKET: qmk-ci + AWS_ACCESS_KEY_ID: ${{ secrets.CI_QMK_FM_SPACES_KEY }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_QMK_FM_SPACES_SECRET }} + AWS_REGION: nyc3 + AWS_S3_ENDPOINT: nyc3.digitaloceanspaces.com + SOURCE_DIR: firmwares + DEST_DIR: ${{ inputs.branch || github.ref_name }}/latest + + - name: Check if failure marker file exists + id: check_failure_marker + uses: andstor/file-existence-action@v3 + with: + files: firmwares/.failed + + - name: Fail build if needed + if: steps.check_failure_marker.outputs.exists == 'true' + run: | + # Exit with failure if the compilation stage failed + exit 1 diff --git a/.github/workflows/ci_build_major_branch_keymap.yml b/.github/workflows/ci_build_major_branch_keymap.yml new file mode 100644 index 00000000000..f722f9f1069 --- /dev/null +++ b/.github/workflows/ci_build_major_branch_keymap.yml @@ -0,0 +1,181 @@ +name: CI Build Major Branch Keymap + +permissions: + contents: read + actions: write + +on: + workflow_call: + inputs: + branch: + type: string + required: true + keymap: + type: string + required: true + slice_length: + type: string + required: true + +jobs: + generate_targets: + name: "Generate targets (${{ inputs.keymap }})" + runs-on: ubuntu-latest + container: ghcr.io/qmk/qmk_cli + + outputs: + targets: ${{ steps.generate_targets.outputs.targets }} + + steps: + - name: Install prerequisites + run: | + apt-get update + apt-get install -y jq + + - name: Disable safe.directory check + run: | + git config --global --add safe.directory '*' + + - name: Checkout QMK Firmware + uses: actions/checkout@v4 + + - name: Generate build targets + id: generate_targets + run: | + { # Intentionally use `shuf` here so that we share manufacturers across all build groups -- some have a lot of ARM-based boards which inherently take longer + counter=0 + echo -n '{' + qmk find -km ${{ inputs.keymap }} 2>/dev/null | sort | uniq | shuf | xargs -L${{ inputs.slice_length }} | while IFS=$'\n' read target ; do + if [ $counter -gt 0 ]; then + echo -n ',' + fi + counter=$((counter+1)) + printf "\"group %02d\":{" $counter + echo -n '"targets":"' + echo $target | tr ' ' '\n' | sort | uniq | xargs echo -n + echo -n '"}' + done + echo -n '}' + } | sed -e 's@\n@@g' > targets.json + + # Output the target keys as a variable + echo "targets=$(jq -c 'keys' targets.json)" >> $GITHUB_OUTPUT + + - name: Upload targets json + uses: actions/upload-artifact@v4 + with: + name: targets-${{ inputs.keymap }} + path: targets.json + + build_targets: + name: "Compile ${{ matrix.target }} (${{ inputs.keymap }})" + needs: generate_targets + runs-on: ubuntu-latest + container: ghcr.io/qmk/qmk_cli + continue-on-error: true + + strategy: + matrix: + target: ${{ fromJson(needs.generate_targets.outputs.targets) }} + + steps: + - name: Install prerequisites + run: | + apt-get update + apt-get install -y jq + + - name: Disable safe.directory check + run: | + git config --global --add safe.directory '*' + + - name: Checkout QMK Firmware + uses: actions/checkout@v4 + + - name: Get target definitions + uses: actions/download-artifact@v4 + with: + name: targets-${{ inputs.keymap }} + path: . + + - name: Deploy submodules + run: | + qmk git-submodule -f + + - name: Dump targets + run: | + jq -r '.["${{ matrix.target }}"].targets' targets.json | tr ' ' '\n' | sort + + - name: Build targets + continue-on-error: true + run: | + export NCPUS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) + qmk mass-compile -t -j $NCPUS -e DUMP_CI_METADATA=yes $(jq -r '.["${{ matrix.target }}"].targets' targets.json) || touch .failed + + - name: Upload binaries + uses: actions/upload-artifact@v4 + with: + name: firmware-${{ inputs.keymap }}-${{ matrix.target }} + if-no-files-found: ignore + path: | + *.bin + *.hex + *.uf2 + .build/failed.* + .failed + + - name: Fail build if any group failed + run: | + # Exit with failure if the compilation stage failed + [ ! -f .failed ] || exit 1 + + repack_firmware: + if: always() + name: "Repack artifacts" + needs: build_targets + runs-on: ubuntu-latest + + steps: + - name: Checkout QMK Firmware + uses: actions/checkout@v4 + + - name: Download firmwares + uses: actions/download-artifact@v4 + with: + pattern: firmware-${{ inputs.keymap }}-* + path: . + merge-multiple: true + + - name: Upload all firmwares + uses: actions/upload-artifact@v4 + with: + name: firmware-${{ inputs.keymap }} + if-no-files-found: ignore + path: | + *.bin + *.hex + *.uf2 + .build/failed.* + .failed + + - name: Generate output logs + run: | + # Generate the step summary markdown + ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true + # Truncate to a maximum of 1MB to deal with GitHub workflow limit + truncate --size='<960K' $GITHUB_STEP_SUMMARY || true + + - name: Delete temporary build artifacts + uses: geekyeggo/delete-artifact@v4 + with: + name: | + firmware-${{ inputs.keymap }}-* + targets-${{ inputs.keymap }} + + - name: 'CI Discord Notification' + if: always() + working-directory: util/ci/ + env: + DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }} + run: | + python3 -m pip install -r requirements.txt + python3 ./discord-results.py --branch ${{ inputs.branch || github.ref_name }} --keymap ${{ inputs.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} From 834d03b57748c774a71ac957823b74f2aae1846c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 21:00:27 +0100 Subject: [PATCH 251/333] Bump geekyeggo/delete-artifact from 4 to 5 (#23674) Bumps [geekyeggo/delete-artifact](https://github.com/geekyeggo/delete-artifact) from 4 to 5. - [Release notes](https://github.com/geekyeggo/delete-artifact/releases) - [Changelog](https://github.com/GeekyEggo/delete-artifact/blob/main/CHANGELOG.md) - [Commits](https://github.com/geekyeggo/delete-artifact/compare/v4...v5) --- updated-dependencies: - dependency-name: geekyeggo/delete-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci_build_major_branch_keymap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_build_major_branch_keymap.yml b/.github/workflows/ci_build_major_branch_keymap.yml index f722f9f1069..c38d0458d7a 100644 --- a/.github/workflows/ci_build_major_branch_keymap.yml +++ b/.github/workflows/ci_build_major_branch_keymap.yml @@ -165,7 +165,7 @@ jobs: truncate --size='<960K' $GITHUB_STEP_SUMMARY || true - name: Delete temporary build artifacts - uses: geekyeggo/delete-artifact@v4 + uses: geekyeggo/delete-artifact@v5 with: name: | firmware-${{ inputs.keymap }}-* From 02737307ff9bfa785aace33d32fc8fa620c2643b Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 7 May 2024 08:45:17 +1000 Subject: [PATCH 252/333] [CI] Allow secrets to propagate from parent to child workflow. (#23675) --- .github/workflows/ci_build_major_branch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_build_major_branch.yml b/.github/workflows/ci_build_major_branch.yml index 608e266ce4b..2717e7cdcc2 100644 --- a/.github/workflows/ci_build_major_branch.yml +++ b/.github/workflows/ci_build_major_branch.yml @@ -69,6 +69,7 @@ jobs: branch: ${{ inputs.branch || github.ref_name }} keymap: ${{ matrix.keymap }} slice_length: ${{ needs.determine_concurrency.outputs.slice_length }} + secrets: inherit rollup_tasks: name: "Housekeeping" From a58906ceb3aedcc12b2c3e808f8f5a14a944d582 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 7 May 2024 12:23:56 +1000 Subject: [PATCH 253/333] [CI] Use existing repo variables instead (#23676) --- .github/workflows/ci_build_major_branch.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_build_major_branch.yml b/.github/workflows/ci_build_major_branch.yml index 2717e7cdcc2..f1c586599a7 100644 --- a/.github/workflows/ci_build_major_branch.yml +++ b/.github/workflows/ci_build_major_branch.yml @@ -72,7 +72,7 @@ jobs: secrets: inherit rollup_tasks: - name: "Housekeeping" + name: "Consolidation" needs: build_targets runs-on: ubuntu-latest @@ -89,11 +89,11 @@ jobs: with: args: --acl public-read --follow-symlinks --delete env: - AWS_S3_BUCKET: qmk-ci + AWS_S3_BUCKET: ${{ vars.CI_QMK_FM_SPACES_BUCKET }} AWS_ACCESS_KEY_ID: ${{ secrets.CI_QMK_FM_SPACES_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_QMK_FM_SPACES_SECRET }} - AWS_REGION: nyc3 - AWS_S3_ENDPOINT: nyc3.digitaloceanspaces.com + AWS_REGION: ${{ vars.CI_QMK_FM_SPACES_REGION }} + AWS_S3_ENDPOINT: ${{ vars.CI_QMK_FM_SPACES_ENDPOINT }} SOURCE_DIR: firmwares DEST_DIR: ${{ inputs.branch || github.ref_name }}/${{ github.sha }} @@ -102,11 +102,11 @@ jobs: with: args: --acl public-read --follow-symlinks --delete env: - AWS_S3_BUCKET: qmk-ci + AWS_S3_BUCKET: ${{ vars.CI_QMK_FM_SPACES_BUCKET }} AWS_ACCESS_KEY_ID: ${{ secrets.CI_QMK_FM_SPACES_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_QMK_FM_SPACES_SECRET }} - AWS_REGION: nyc3 - AWS_S3_ENDPOINT: nyc3.digitaloceanspaces.com + AWS_REGION: ${{ vars.CI_QMK_FM_SPACES_REGION }} + AWS_S3_ENDPOINT: ${{ vars.CI_QMK_FM_SPACES_ENDPOINT }} SOURCE_DIR: firmwares DEST_DIR: ${{ inputs.branch || github.ref_name }}/latest From 224ff1d262402a48d1d04912be10d22074d78ced Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 7 May 2024 18:36:50 +1000 Subject: [PATCH 254/333] Normalise RGBLight (underglow) keycodes (#23656) --- .../keycodes/keycodes_0.0.4_lighting.hjson | 80 +++++++++++++++++++ quantum/keycodes.h | 41 ++++++---- quantum/process_keycode/process_rgb.c | 22 ++--- quantum/quantum_keycodes_legacy.h | 13 +++ tests/test_common/keycode_table.cpp | 22 ++--- 5 files changed, 141 insertions(+), 37 deletions(-) diff --git a/data/constants/keycodes/keycodes_0.0.4_lighting.hjson b/data/constants/keycodes/keycodes_0.0.4_lighting.hjson index 89ec80bd975..b341c664bd8 100644 --- a/data/constants/keycodes/keycodes_0.0.4_lighting.hjson +++ b/data/constants/keycodes/keycodes_0.0.4_lighting.hjson @@ -64,6 +64,86 @@ ] }, + "0x7820": { + "group": "underglow", + "key": "QK_UNDERGLOW_TOGGLE", + "aliases": [ + "UG_TOGG" + ] + }, + "0x7821": { + "group": "underglow", + "key": "QK_UNDERGLOW_MODE_NEXT", + "aliases": [ + "!reset!", + "UG_NEXT" + ] + }, + "0x7822": { + "group": "underglow", + "key": "QK_UNDERGLOW_MODE_PREVIOUS", + "aliases": [ + "!reset!", + "UG_PREV" + ] + }, + "0x7823": { + "group": "underglow", + "key": "QK_UNDERGLOW_HUE_UP", + "aliases": [ + "UG_HUEU" + ] + }, + "0x7824": { + "group": "underglow", + "key": "QK_UNDERGLOW_HUE_DOWN", + "aliases": [ + "UG_HUED" + ] + }, + "0x7825": { + "group": "underglow", + "key": "QK_UNDERGLOW_SATURATION_UP", + "aliases": [ + "UG_SATU" + ] + }, + "0x7826": { + "group": "underglow", + "key": "QK_UNDERGLOW_SATURATION_DOWN", + "aliases": [ + "UG_SATD" + ] + }, + "0x7827": { + "group": "underglow", + "key": "QK_UNDERGLOW_VALUE_UP", + "aliases": [ + "UG_VALU" + ] + }, + "0x7828": { + "group": "underglow", + "key": "QK_UNDERGLOW_VALUE_DOWN", + "aliases": [ + "UG_VALD" + ] + }, + "0x7829": { + "group": "underglow", + "key": "QK_UNDERGLOW_SPEED_UP", + "aliases": [ + "UG_SPDU" + ] + }, + "0x782A": { + "group": "underglow", + "key": "QK_UNDERGLOW_SPEED_DOWN", + "aliases": [ + "UG_SPDD" + ] + }, + "0x7840": { "group": "rgb_matrix", "key": "QK_RGB_MATRIX_ON", diff --git a/quantum/keycodes.h b/quantum/keycodes.h index 415c7155b3a..c92028ab439 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -636,17 +636,17 @@ enum qk_keycode_defines { QK_LED_MATRIX_BRIGHTNESS_DOWN = 0x7816, QK_LED_MATRIX_SPEED_UP = 0x7817, QK_LED_MATRIX_SPEED_DOWN = 0x7818, - RGB_TOG = 0x7820, - RGB_MODE_FORWARD = 0x7821, - RGB_MODE_REVERSE = 0x7822, - RGB_HUI = 0x7823, - RGB_HUD = 0x7824, - RGB_SAI = 0x7825, - RGB_SAD = 0x7826, - RGB_VAI = 0x7827, - RGB_VAD = 0x7828, - RGB_SPI = 0x7829, - RGB_SPD = 0x782A, + QK_UNDERGLOW_TOGGLE = 0x7820, + QK_UNDERGLOW_MODE_NEXT = 0x7821, + QK_UNDERGLOW_MODE_PREVIOUS = 0x7822, + QK_UNDERGLOW_HUE_UP = 0x7823, + QK_UNDERGLOW_HUE_DOWN = 0x7824, + QK_UNDERGLOW_SATURATION_UP = 0x7825, + QK_UNDERGLOW_SATURATION_DOWN = 0x7826, + QK_UNDERGLOW_VALUE_UP = 0x7827, + QK_UNDERGLOW_VALUE_DOWN = 0x7828, + QK_UNDERGLOW_SPEED_UP = 0x7829, + QK_UNDERGLOW_SPEED_DOWN = 0x782A, RGB_MODE_PLAIN = 0x782B, RGB_MODE_BREATHE = 0x782C, RGB_MODE_RAINBOW = 0x782D, @@ -1312,8 +1312,17 @@ enum qk_keycode_defines { LM_BRID = QK_LED_MATRIX_BRIGHTNESS_DOWN, LM_SPDU = QK_LED_MATRIX_SPEED_UP, LM_SPDD = QK_LED_MATRIX_SPEED_DOWN, - RGB_MOD = RGB_MODE_FORWARD, - RGB_RMOD = RGB_MODE_REVERSE, + UG_TOGG = QK_UNDERGLOW_TOGGLE, + UG_NEXT = QK_UNDERGLOW_MODE_NEXT, + UG_PREV = QK_UNDERGLOW_MODE_PREVIOUS, + UG_HUEU = QK_UNDERGLOW_HUE_UP, + UG_HUED = QK_UNDERGLOW_HUE_DOWN, + UG_SATU = QK_UNDERGLOW_SATURATION_UP, + UG_SATD = QK_UNDERGLOW_SATURATION_DOWN, + UG_VALU = QK_UNDERGLOW_VALUE_UP, + UG_VALD = QK_UNDERGLOW_VALUE_DOWN, + UG_SPDU = QK_UNDERGLOW_SPEED_UP, + UG_SPDD = QK_UNDERGLOW_SPEED_DOWN, RGB_M_P = RGB_MODE_PLAIN, RGB_M_B = RGB_MODE_BREATHE, RGB_M_R = RGB_MODE_RAINBOW, @@ -1461,7 +1470,8 @@ enum qk_keycode_defines { #define IS_MACRO_KEYCODE(code) ((code) >= QK_MACRO_0 && (code) <= QK_MACRO_31) #define IS_BACKLIGHT_KEYCODE(code) ((code) >= QK_BACKLIGHT_ON && (code) <= QK_BACKLIGHT_TOGGLE_BREATHING) #define IS_LED_MATRIX_KEYCODE(code) ((code) >= QK_LED_MATRIX_ON && (code) <= QK_LED_MATRIX_SPEED_DOWN) -#define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE) +#define IS_UNDERGLOW_KEYCODE(code) ((code) >= QK_UNDERGLOW_TOGGLE && (code) <= QK_UNDERGLOW_SPEED_DOWN) +#define IS_RGB_KEYCODE(code) ((code) >= RGB_MODE_PLAIN && (code) <= RGB_MODE_TWINKLE) #define IS_RGB_MATRIX_KEYCODE(code) ((code) >= QK_RGB_MATRIX_ON && (code) <= QK_RGB_MATRIX_SPEED_DOWN) #define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_ALT_REPEAT_KEY) #define IS_KB_KEYCODE(code) ((code) >= QK_KB_0 && (code) <= QK_KB_31) @@ -1485,7 +1495,8 @@ enum qk_keycode_defines { #define MACRO_KEYCODE_RANGE QK_MACRO_0 ... QK_MACRO_31 #define BACKLIGHT_KEYCODE_RANGE QK_BACKLIGHT_ON ... QK_BACKLIGHT_TOGGLE_BREATHING #define LED_MATRIX_KEYCODE_RANGE QK_LED_MATRIX_ON ... QK_LED_MATRIX_SPEED_DOWN -#define RGB_KEYCODE_RANGE RGB_TOG ... RGB_MODE_TWINKLE +#define UNDERGLOW_KEYCODE_RANGE QK_UNDERGLOW_TOGGLE ... QK_UNDERGLOW_SPEED_DOWN +#define RGB_KEYCODE_RANGE RGB_MODE_PLAIN ... RGB_MODE_TWINKLE #define RGB_MATRIX_KEYCODE_RANGE QK_RGB_MATRIX_ON ... QK_RGB_MATRIX_SPEED_DOWN #define QUANTUM_KEYCODE_RANGE QK_BOOTLOADER ... QK_ALT_REPEAT_KEY #define KB_KEYCODE_RANGE QK_KB_0 ... QK_KB_31 diff --git a/quantum/process_keycode/process_rgb.c b/quantum/process_keycode/process_rgb.c index 4e63bf3ca84..b113d1c1e7f 100644 --- a/quantum/process_keycode/process_rgb.c +++ b/quantum/process_keycode/process_rgb.c @@ -69,7 +69,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { uint8_t shifted = get_mods() & MOD_MASK_SHIFT; #endif switch (keycode) { - case RGB_TOG: + case QK_UNDERGLOW_TOGGLE: #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) rgblight_toggle(); #endif @@ -77,7 +77,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { rgb_matrix_toggle(); #endif return false; - case RGB_MODE_FORWARD: + case QK_UNDERGLOW_MODE_NEXT: #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) handleKeycodeRGB(shifted, rgblight_step, rgblight_step_reverse); #endif @@ -85,7 +85,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { handleKeycodeRGB(shifted, rgb_matrix_step, rgb_matrix_step_reverse); #endif return false; - case RGB_MODE_REVERSE: + case QK_UNDERGLOW_MODE_PREVIOUS: #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) handleKeycodeRGB(shifted, rgblight_step_reverse, rgblight_step); #endif @@ -93,7 +93,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { handleKeycodeRGB(shifted, rgb_matrix_step_reverse, rgb_matrix_step); #endif return false; - case RGB_HUI: + case QK_UNDERGLOW_HUE_UP: #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) handleKeycodeRGB(shifted, rgblight_increase_hue, rgblight_decrease_hue); #endif @@ -101,7 +101,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { handleKeycodeRGB(shifted, rgb_matrix_increase_hue, rgb_matrix_decrease_hue); #endif return false; - case RGB_HUD: + case QK_UNDERGLOW_HUE_DOWN: #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) handleKeycodeRGB(shifted, rgblight_decrease_hue, rgblight_increase_hue); #endif @@ -109,7 +109,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { handleKeycodeRGB(shifted, rgb_matrix_decrease_hue, rgb_matrix_increase_hue); #endif return false; - case RGB_SAI: + case QK_UNDERGLOW_SATURATION_UP: #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) handleKeycodeRGB(shifted, rgblight_increase_sat, rgblight_decrease_sat); #endif @@ -117,7 +117,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { handleKeycodeRGB(shifted, rgb_matrix_increase_sat, rgb_matrix_decrease_sat); #endif return false; - case RGB_SAD: + case QK_UNDERGLOW_SATURATION_DOWN: #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) handleKeycodeRGB(shifted, rgblight_decrease_sat, rgblight_increase_sat); #endif @@ -125,7 +125,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { handleKeycodeRGB(shifted, rgb_matrix_decrease_sat, rgb_matrix_increase_sat); #endif return false; - case RGB_VAI: + case QK_UNDERGLOW_VALUE_UP: #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) handleKeycodeRGB(shifted, rgblight_increase_val, rgblight_decrease_val); #endif @@ -133,7 +133,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { handleKeycodeRGB(shifted, rgb_matrix_increase_val, rgb_matrix_decrease_val); #endif return false; - case RGB_VAD: + case QK_UNDERGLOW_VALUE_DOWN: #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) handleKeycodeRGB(shifted, rgblight_decrease_val, rgblight_increase_val); #endif @@ -141,7 +141,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { handleKeycodeRGB(shifted, rgb_matrix_decrease_val, rgb_matrix_increase_val); #endif return false; - case RGB_SPI: + case QK_UNDERGLOW_SPEED_UP: #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) handleKeycodeRGB(shifted, rgblight_increase_speed, rgblight_decrease_speed); #endif @@ -149,7 +149,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { handleKeycodeRGB(shifted, rgb_matrix_increase_speed, rgb_matrix_decrease_speed); #endif return false; - case RGB_SPD: + case QK_UNDERGLOW_SPEED_DOWN: #if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) handleKeycodeRGB(shifted, rgblight_decrease_speed, rgblight_increase_speed); #endif diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h index 51ec77bae0f..6ea5e13f3a9 100644 --- a/quantum/quantum_keycodes_legacy.h +++ b/quantum/quantum_keycodes_legacy.h @@ -3,3 +3,16 @@ // clang-format off // Deprecated Quantum keycodes +#define RGB_TOG QK_UNDERGLOW_TOGGLE +#define RGB_MOD QK_UNDERGLOW_MODE_NEXT +#define RGB_MODE_FORWARD QK_UNDERGLOW_MODE_NEXT +#define RGB_RMOD QK_UNDERGLOW_MODE_PREVIOUS +#define RGB_MODE_REVERSE QK_UNDERGLOW_MODE_PREVIOUS +#define RGB_HUI QK_UNDERGLOW_HUE_UP +#define RGB_HUD QK_UNDERGLOW_HUE_DOWN +#define RGB_SAI QK_UNDERGLOW_SATURATION_UP +#define RGB_SAD QK_UNDERGLOW_SATURATION_DOWN +#define RGB_VAI QK_UNDERGLOW_VALUE_UP +#define RGB_VAD QK_UNDERGLOW_VALUE_DOWN +#define RGB_SPI QK_UNDERGLOW_SPEED_UP +#define RGB_SPD QK_UNDERGLOW_SPEED_DOWN diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp index 52817804a25..18dd5360277 100644 --- a/tests/test_common/keycode_table.cpp +++ b/tests/test_common/keycode_table.cpp @@ -578,17 +578,17 @@ std::map KEYCODE_ID_TABLE = { {QK_LED_MATRIX_BRIGHTNESS_DOWN, "QK_LED_MATRIX_BRIGHTNESS_DOWN"}, {QK_LED_MATRIX_SPEED_UP, "QK_LED_MATRIX_SPEED_UP"}, {QK_LED_MATRIX_SPEED_DOWN, "QK_LED_MATRIX_SPEED_DOWN"}, - {RGB_TOG, "RGB_TOG"}, - {RGB_MODE_FORWARD, "RGB_MODE_FORWARD"}, - {RGB_MODE_REVERSE, "RGB_MODE_REVERSE"}, - {RGB_HUI, "RGB_HUI"}, - {RGB_HUD, "RGB_HUD"}, - {RGB_SAI, "RGB_SAI"}, - {RGB_SAD, "RGB_SAD"}, - {RGB_VAI, "RGB_VAI"}, - {RGB_VAD, "RGB_VAD"}, - {RGB_SPI, "RGB_SPI"}, - {RGB_SPD, "RGB_SPD"}, + {QK_UNDERGLOW_TOGGLE, "QK_UNDERGLOW_TOGGLE"}, + {QK_UNDERGLOW_MODE_NEXT, "QK_UNDERGLOW_MODE_NEXT"}, + {QK_UNDERGLOW_MODE_PREVIOUS, "QK_UNDERGLOW_MODE_PREVIOUS"}, + {QK_UNDERGLOW_HUE_UP, "QK_UNDERGLOW_HUE_UP"}, + {QK_UNDERGLOW_HUE_DOWN, "QK_UNDERGLOW_HUE_DOWN"}, + {QK_UNDERGLOW_SATURATION_UP, "QK_UNDERGLOW_SATURATION_UP"}, + {QK_UNDERGLOW_SATURATION_DOWN, "QK_UNDERGLOW_SATURATION_DOWN"}, + {QK_UNDERGLOW_VALUE_UP, "QK_UNDERGLOW_VALUE_UP"}, + {QK_UNDERGLOW_VALUE_DOWN, "QK_UNDERGLOW_VALUE_DOWN"}, + {QK_UNDERGLOW_SPEED_UP, "QK_UNDERGLOW_SPEED_UP"}, + {QK_UNDERGLOW_SPEED_DOWN, "QK_UNDERGLOW_SPEED_DOWN"}, {RGB_MODE_PLAIN, "RGB_MODE_PLAIN"}, {RGB_MODE_BREATHE, "RGB_MODE_BREATHE"}, {RGB_MODE_RAINBOW, "RGB_MODE_RAINBOW"}, From 69640365f81c23d189a1d2266b772b536049aa25 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 7 May 2024 19:02:16 +1000 Subject: [PATCH 255/333] [CI] Fail workflow if there were build failures (#23678) More whack-a-mole --- .github/workflows/ci_build_major_branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_build_major_branch.yml b/.github/workflows/ci_build_major_branch.yml index f1c586599a7..77755ba71f4 100644 --- a/.github/workflows/ci_build_major_branch.yml +++ b/.github/workflows/ci_build_major_branch.yml @@ -117,7 +117,7 @@ jobs: files: firmwares/.failed - name: Fail build if needed - if: steps.check_failure_marker.outputs.exists == 'true' + if: steps.check_failure_marker.outputs.files_exists == 'true' run: | # Exit with failure if the compilation stage failed exit 1 From 16557f9975abf693675e2cc246f3d1b1f73faf96 Mon Sep 17 00:00:00 2001 From: Alexandr <37986872+sannoization@users.noreply.github.com> Date: Tue, 7 May 2024 14:51:46 +0300 Subject: [PATCH 256/333] add example for c2json command (#23061) --- docs/cli_commands.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/cli_commands.md b/docs/cli_commands.md index cf174949afb..685fad43b73 100644 --- a/docs/cli_commands.md +++ b/docs/cli_commands.md @@ -322,6 +322,18 @@ Creates a keymap.json from a keymap.c. qmk c2json -km KEYMAP -kb KEYBOARD [-q] [--no-cpp] [-o OUTPUT] filename ``` +**Examples**: + +``` +qmk c2json -km default -kb handwired/dactyl_promicro +``` + +or with filename: + +``` +qmk c2json keyboards/handwired/dactyl_promicro/keymaps/default/keymap.c +``` + ## `qmk lint` Checks over a keyboard and/or keymap and highlights common errors, problems, and anti-patterns. From 42a37577e155554734efb7622e23e67dc55f99ad Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 9 May 2024 12:06:21 +0100 Subject: [PATCH 257/333] Remove redundant keymap templates (#23685) --- keyboards/dumbpad/v0x/templates/keymap.c | 26 ----------- keyboards/dumbpad/v0x/v0x.c | 25 +++++++++++ .../v0x_dualencoder/templates/keymap.c | 44 ------------------- .../dumbpad/v0x_dualencoder/v0x_dualencoder.c | 43 ++++++++++++++++++ .../dumbpad/v0x_right/templates/keymap.c | 26 ----------- keyboards/dumbpad/v0x_right/v0x_right.c | 25 +++++++++++ keyboards/dumbpad/v1x/templates/keymap.c | 26 ----------- keyboards/dumbpad/v1x/v1x.c | 25 +++++++++++ .../v1x_dualencoder/templates/keymap.c | 44 ------------------- .../dumbpad/v1x_dualencoder/v1x_dualencoder.c | 43 ++++++++++++++++++ .../dumbpad/v1x_right/templates/keymap.c | 26 ----------- keyboards/dumbpad/v1x_right/v1x_right.c | 25 +++++++++++ 12 files changed, 186 insertions(+), 192 deletions(-) delete mode 100644 keyboards/dumbpad/v0x/templates/keymap.c delete mode 100644 keyboards/dumbpad/v0x_dualencoder/templates/keymap.c delete mode 100644 keyboards/dumbpad/v0x_right/templates/keymap.c delete mode 100644 keyboards/dumbpad/v1x/templates/keymap.c delete mode 100644 keyboards/dumbpad/v1x_dualencoder/templates/keymap.c delete mode 100644 keyboards/dumbpad/v1x_right/templates/keymap.c diff --git a/keyboards/dumbpad/v0x/templates/keymap.c b/keyboards/dumbpad/v0x/templates/keymap.c deleted file mode 100644 index 6f862b82256..00000000000 --- a/keyboards/dumbpad/v0x/templates/keymap.c +++ /dev/null @@ -1,26 +0,0 @@ -#include QMK_KEYBOARD_H -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__}; - - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - switch (get_highest_layer(layer_state)) { - case 0: - if (clockwise) { - tap_code(KC_MS_R); - } else { - tap_code(KC_MS_L); - } - break; - - default: - if (clockwise) { - tap_code(KC_EQL); - } else { - tap_code(KC_MINS); - } - break; - } - } - return true; -} diff --git a/keyboards/dumbpad/v0x/v0x.c b/keyboards/dumbpad/v0x/v0x.c index 8625bb12c25..5a610966066 100644 --- a/keyboards/dumbpad/v0x/v0x.c +++ b/keyboards/dumbpad/v0x/v0x.c @@ -61,3 +61,28 @@ void matrix_init_kb(void) { matrix_init_user(); } + +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + + if (index == 0) { + switch (get_highest_layer(layer_state)) { + case 0: + if (clockwise) { + tap_code(KC_MS_R); + } else { + tap_code(KC_MS_L); + } + break; + + default: + if (clockwise) { + tap_code(KC_EQL); + } else { + tap_code(KC_MINS); + } + break; + } + } + return true; +} diff --git a/keyboards/dumbpad/v0x_dualencoder/templates/keymap.c b/keyboards/dumbpad/v0x_dualencoder/templates/keymap.c deleted file mode 100644 index c602269ed3e..00000000000 --- a/keyboards/dumbpad/v0x_dualencoder/templates/keymap.c +++ /dev/null @@ -1,44 +0,0 @@ -#include QMK_KEYBOARD_H -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__}; - - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - switch (get_highest_layer(layer_state)) { - case 0: - if (clockwise) { - tap_code(KC_MS_R); - } else { - tap_code(KC_MS_L); - } - break; - - default: - if (clockwise) { - tap_code(KC_EQL); - } else { - tap_code(KC_MINS); - } - break; - } - } else if (index == 1) { - switch (get_highest_layer(layer_state)) { - case 0: - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - break; - - default: - if (clockwise) { - tap_code(KC_RIGHT); - } else { - tap_code(KC_LEFT); - } - break; - } - } - return true; -} diff --git a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c index 8625bb12c25..1c622f7bf4e 100644 --- a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c +++ b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c @@ -61,3 +61,46 @@ void matrix_init_kb(void) { matrix_init_user(); } + +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + + if (index == 0) { + switch (get_highest_layer(layer_state)) { + case 0: + if (clockwise) { + tap_code(KC_MS_R); + } else { + tap_code(KC_MS_L); + } + break; + + default: + if (clockwise) { + tap_code(KC_EQL); + } else { + tap_code(KC_MINS); + } + break; + } + } else if (index == 1) { + switch (get_highest_layer(layer_state)) { + case 0: + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + break; + + default: + if (clockwise) { + tap_code(KC_RIGHT); + } else { + tap_code(KC_LEFT); + } + break; + } + } + return true; +} diff --git a/keyboards/dumbpad/v0x_right/templates/keymap.c b/keyboards/dumbpad/v0x_right/templates/keymap.c deleted file mode 100644 index 6f862b82256..00000000000 --- a/keyboards/dumbpad/v0x_right/templates/keymap.c +++ /dev/null @@ -1,26 +0,0 @@ -#include QMK_KEYBOARD_H -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__}; - - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - switch (get_highest_layer(layer_state)) { - case 0: - if (clockwise) { - tap_code(KC_MS_R); - } else { - tap_code(KC_MS_L); - } - break; - - default: - if (clockwise) { - tap_code(KC_EQL); - } else { - tap_code(KC_MINS); - } - break; - } - } - return true; -} diff --git a/keyboards/dumbpad/v0x_right/v0x_right.c b/keyboards/dumbpad/v0x_right/v0x_right.c index 8625bb12c25..5a610966066 100644 --- a/keyboards/dumbpad/v0x_right/v0x_right.c +++ b/keyboards/dumbpad/v0x_right/v0x_right.c @@ -61,3 +61,28 @@ void matrix_init_kb(void) { matrix_init_user(); } + +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + + if (index == 0) { + switch (get_highest_layer(layer_state)) { + case 0: + if (clockwise) { + tap_code(KC_MS_R); + } else { + tap_code(KC_MS_L); + } + break; + + default: + if (clockwise) { + tap_code(KC_EQL); + } else { + tap_code(KC_MINS); + } + break; + } + } + return true; +} diff --git a/keyboards/dumbpad/v1x/templates/keymap.c b/keyboards/dumbpad/v1x/templates/keymap.c deleted file mode 100644 index 6f862b82256..00000000000 --- a/keyboards/dumbpad/v1x/templates/keymap.c +++ /dev/null @@ -1,26 +0,0 @@ -#include QMK_KEYBOARD_H -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__}; - - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - switch (get_highest_layer(layer_state)) { - case 0: - if (clockwise) { - tap_code(KC_MS_R); - } else { - tap_code(KC_MS_L); - } - break; - - default: - if (clockwise) { - tap_code(KC_EQL); - } else { - tap_code(KC_MINS); - } - break; - } - } - return true; -} diff --git a/keyboards/dumbpad/v1x/v1x.c b/keyboards/dumbpad/v1x/v1x.c index cdbaff54aa1..3fec6cb7e68 100644 --- a/keyboards/dumbpad/v1x/v1x.c +++ b/keyboards/dumbpad/v1x/v1x.c @@ -73,3 +73,28 @@ bool led_update_kb(led_t led_state) { } return res; } + +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + + if (index == 0) { + switch (get_highest_layer(layer_state)) { + case 0: + if (clockwise) { + tap_code(KC_MS_R); + } else { + tap_code(KC_MS_L); + } + break; + + default: + if (clockwise) { + tap_code(KC_EQL); + } else { + tap_code(KC_MINS); + } + break; + } + } + return true; +} diff --git a/keyboards/dumbpad/v1x_dualencoder/templates/keymap.c b/keyboards/dumbpad/v1x_dualencoder/templates/keymap.c deleted file mode 100644 index c602269ed3e..00000000000 --- a/keyboards/dumbpad/v1x_dualencoder/templates/keymap.c +++ /dev/null @@ -1,44 +0,0 @@ -#include QMK_KEYBOARD_H -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__}; - - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - switch (get_highest_layer(layer_state)) { - case 0: - if (clockwise) { - tap_code(KC_MS_R); - } else { - tap_code(KC_MS_L); - } - break; - - default: - if (clockwise) { - tap_code(KC_EQL); - } else { - tap_code(KC_MINS); - } - break; - } - } else if (index == 1) { - switch (get_highest_layer(layer_state)) { - case 0: - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - break; - - default: - if (clockwise) { - tap_code(KC_RIGHT); - } else { - tap_code(KC_LEFT); - } - break; - } - } - return true; -} diff --git a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c index cdbaff54aa1..31137ce7754 100644 --- a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c +++ b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c @@ -73,3 +73,46 @@ bool led_update_kb(led_t led_state) { } return res; } + +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + + if (index == 0) { + switch (get_highest_layer(layer_state)) { + case 0: + if (clockwise) { + tap_code(KC_MS_R); + } else { + tap_code(KC_MS_L); + } + break; + + default: + if (clockwise) { + tap_code(KC_EQL); + } else { + tap_code(KC_MINS); + } + break; + } + } else if (index == 1) { + switch (get_highest_layer(layer_state)) { + case 0: + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + break; + + default: + if (clockwise) { + tap_code(KC_RIGHT); + } else { + tap_code(KC_LEFT); + } + break; + } + } + return true; +} diff --git a/keyboards/dumbpad/v1x_right/templates/keymap.c b/keyboards/dumbpad/v1x_right/templates/keymap.c deleted file mode 100644 index 6f862b82256..00000000000 --- a/keyboards/dumbpad/v1x_right/templates/keymap.c +++ /dev/null @@ -1,26 +0,0 @@ -#include QMK_KEYBOARD_H -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__}; - - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - switch (get_highest_layer(layer_state)) { - case 0: - if (clockwise) { - tap_code(KC_MS_R); - } else { - tap_code(KC_MS_L); - } - break; - - default: - if (clockwise) { - tap_code(KC_EQL); - } else { - tap_code(KC_MINS); - } - break; - } - } - return true; -} diff --git a/keyboards/dumbpad/v1x_right/v1x_right.c b/keyboards/dumbpad/v1x_right/v1x_right.c index cdbaff54aa1..3fec6cb7e68 100644 --- a/keyboards/dumbpad/v1x_right/v1x_right.c +++ b/keyboards/dumbpad/v1x_right/v1x_right.c @@ -73,3 +73,28 @@ bool led_update_kb(led_t led_state) { } return res; } + +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + + if (index == 0) { + switch (get_highest_layer(layer_state)) { + case 0: + if (clockwise) { + tap_code(KC_MS_R); + } else { + tap_code(KC_MS_L); + } + break; + + default: + if (clockwise) { + tap_code(KC_EQL); + } else { + tap_code(KC_MINS); + } + break; + } + } + return true; +} From ef0734b7a6b2a7650f2170631d840dbca7106bbd Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 10 May 2024 11:54:44 +0100 Subject: [PATCH 258/333] Remove 'split.transport.protocol=serial_usart' (#23668) --- data/schemas/keyboard.jsonschema | 2 +- docs/reference_info_json.md | 2 +- keyboards/era/sirind/tomak/keyboard.json | 1 - keyboards/keychron/q11/info.json | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index de01809b43d..b699f862770 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -805,7 +805,7 @@ "properties": { "protocol": { "type": "string", - "enum": ["custom", "i2c", "serial", "serial_usart"] + "enum": ["custom", "i2c", "serial"] }, "sync": { "type": "object", diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md index 5b06e9a3268..8a2ded95f75 100644 --- a/docs/reference_info_json.md +++ b/docs/reference_info_json.md @@ -739,7 +739,7 @@ Configures the [Split Keyboard](feature_split_keyboard.md) feature. * Default: `1` * `transport` * `protocol` - * The split transport protocol to use. Must be one of `custom`, `i2c`, `serial`, `serial_usart`. + * The split transport protocol to use. Must be one of `custom`, `i2c`, `serial`. * `sync` * `activity` * Mirror the activity timestamps to the secondary half. diff --git a/keyboards/era/sirind/tomak/keyboard.json b/keyboards/era/sirind/tomak/keyboard.json index 58025e67a18..1d0d5b79b2c 100644 --- a/keyboards/era/sirind/tomak/keyboard.json +++ b/keyboards/era/sirind/tomak/keyboard.json @@ -183,7 +183,6 @@ } }, "transport": { - "protocol": "serial_usart", "sync": { "indicators": true, "layer_state": true, diff --git a/keyboards/keychron/q11/info.json b/keyboards/keychron/q11/info.json index db70d2b7b68..51a8e5937e4 100755 --- a/keyboards/keychron/q11/info.json +++ b/keyboards/keychron/q11/info.json @@ -54,7 +54,6 @@ } }, "transport": { - "protocol": "serial_usart", "sync" :{ "matrix_state": true } From af4a806e3f1d338402f2ec828120ebc3ba43b3c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 May 2024 19:03:16 +1000 Subject: [PATCH 259/333] `qmk find`: Fix typo in filter logging (#23693) --- lib/python/qmk/search.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/python/qmk/search.py b/lib/python/qmk/search.py index 33550a3db27..2afb3033fcc 100644 --- a/lib/python/qmk/search.py +++ b/lib/python/qmk/search.py @@ -222,8 +222,8 @@ def _filter_keymap_targets(target_list: List[Tuple[str, str]], filters: List[str continue valid_keymaps = filter(filter_class.apply, valid_keymaps) - value_str = f", {{fg_cyan}}{value}{{fg_reset}})" if value is not None else "" - cli.log.info(f'Filtering on condition: {{fg_green}}{func_name}{{fg_reset}}({{fg_cyan}}{key}{{fg_reset}}{value_str}...') + value_str = f", {{fg_cyan}}{value}{{fg_reset}}" if value is not None else "" + cli.log.info(f'Filtering on condition: {{fg_green}}{func_name}{{fg_reset}}({{fg_cyan}}{key}{{fg_reset}}{value_str})...') elif equals_match is not None: key = equals_match.group('key') From 2d4832f57ae392a57567e9a126d38cde44399d91 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 11 May 2024 13:11:50 +0100 Subject: [PATCH 260/333] Align RGBKB keyboards to current standards (#23663) --- keyboards/rgbkb/mun/mun.c | 25 -- keyboards/rgbkb/mun/mun.h | 16 -- keyboards/rgbkb/mun/{ => rev1}/config.h | 1 + keyboards/rgbkb/mun/{ => rev1}/halconf.h | 0 keyboards/rgbkb/mun/rev1/keyboard.json | 13 + keyboards/rgbkb/mun/{ => rev1}/mcuconf.h | 0 keyboards/rgbkb/mun/rev1/rev1.c | 15 ++ keyboards/rgbkb/mun/rev1/rev1.h | 2 +- keyboards/rgbkb/mun/rev1/rules.mk | 8 + keyboards/rgbkb/mun/rules.mk | 30 --- keyboards/rgbkb/pan/info.json | 9 + keyboards/rgbkb/pan/keymaps/default/rules.mk | 3 - .../rgbkb/pan/keymaps/default_eee/rules.mk | 3 - .../rgbkb/pan/keymaps/default_sss/rules.mk | 3 - keyboards/rgbkb/pan/post_rules.mk | 8 +- keyboards/rgbkb/pan/rev1/32a/post_rules.mk | 22 -- .../rgbkb/pan/rev1/proton_c/post_rules.mk | 22 -- keyboards/rgbkb/pan/rules.mk | 21 +- keyboards/rgbkb/sol/common/glcdfont.c | 231 ------------------ keyboards/rgbkb/sol/config.h | 2 + keyboards/rgbkb/sol/keymaps/default/rules.mk | 4 - keyboards/rgbkb/sol/rev1/keyboard.json | 10 + keyboards/rgbkb/sol/rev1/post_rules.mk | 6 +- keyboards/rgbkb/sol/rev1/rules.mk | 26 -- keyboards/rgbkb/sol/rev2/keyboard.json | 13 + keyboards/rgbkb/sol/rev2/post_rules.mk | 17 +- keyboards/rgbkb/sol/rev2/rules.mk | 34 --- keyboards/rgbkb/sol/rules.mk | 5 - keyboards/rgbkb/sol3/{ => rev1}/config.h | 1 + keyboards/rgbkb/sol3/{ => rev1}/halconf.h | 0 keyboards/rgbkb/sol3/rev1/keyboard.json | 19 ++ keyboards/rgbkb/sol3/{ => rev1}/mcuconf.h | 0 keyboards/rgbkb/sol3/rev1/rev1.c | 13 + keyboards/rgbkb/sol3/rev1/rev1.h | 4 +- keyboards/rgbkb/sol3/rev1/rules.mk | 8 + keyboards/rgbkb/sol3/rules.mk | 33 --- keyboards/rgbkb/sol3/sol3.c | 38 --- keyboards/rgbkb/sol3/sol3.h | 18 -- keyboards/rgbkb/zen/info.json | 5 - keyboards/rgbkb/zen/rev1/keyboard.json | 9 + keyboards/rgbkb/zen/rev2/config.h | 2 + keyboards/rgbkb/zen/rev2/keyboard.json | 10 + keyboards/rgbkb/zen/rev2/post_rules.mk | 5 - keyboards/rgbkb/zen/rev2/rules.mk | 3 - keyboards/rgbkb/zen/rules.mk | 12 - keyboards/rgbkb/zygomorph/rev1/keyboard.json | 71 +++++- keyboards/rgbkb/zygomorph/rev1/rev1.c | 43 ---- keyboards/rgbkb/zygomorph/rev1/rules.mk | 3 + keyboards/rgbkb/zygomorph/rules.mk | 17 -- 49 files changed, 238 insertions(+), 625 deletions(-) delete mode 100644 keyboards/rgbkb/mun/mun.c delete mode 100644 keyboards/rgbkb/mun/mun.h rename keyboards/rgbkb/mun/{ => rev1}/config.h (97%) rename keyboards/rgbkb/mun/{ => rev1}/halconf.h (100%) rename keyboards/rgbkb/mun/{ => rev1}/mcuconf.h (100%) create mode 100644 keyboards/rgbkb/mun/rev1/rules.mk delete mode 100644 keyboards/rgbkb/pan/rev1/32a/post_rules.mk delete mode 100644 keyboards/rgbkb/pan/rev1/proton_c/post_rules.mk delete mode 100644 keyboards/rgbkb/sol/common/glcdfont.c delete mode 100644 keyboards/rgbkb/sol/rev1/rules.mk delete mode 100644 keyboards/rgbkb/sol/rev2/rules.mk rename keyboards/rgbkb/sol3/{ => rev1}/config.h (97%) rename keyboards/rgbkb/sol3/{ => rev1}/halconf.h (100%) rename keyboards/rgbkb/sol3/{ => rev1}/mcuconf.h (100%) create mode 100644 keyboards/rgbkb/sol3/rev1/rules.mk delete mode 100644 keyboards/rgbkb/sol3/sol3.c delete mode 100644 keyboards/rgbkb/sol3/sol3.h delete mode 100644 keyboards/rgbkb/zen/info.json delete mode 100644 keyboards/rgbkb/zen/rev2/post_rules.mk delete mode 100644 keyboards/rgbkb/zen/rev2/rules.mk delete mode 100644 keyboards/rgbkb/zygomorph/rev1/rev1.c create mode 100644 keyboards/rgbkb/zygomorph/rev1/rules.mk diff --git a/keyboards/rgbkb/mun/mun.c b/keyboards/rgbkb/mun/mun.c deleted file mode 100644 index f64de3342c7..00000000000 --- a/keyboards/rgbkb/mun/mun.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * wrote this file. As long as you retain this - * notice you can do whatever you want with this stuff. If we meet some day, and - * you think this stuff is worth it, you can buy me a beer in return. David Rauseo - * ---------------------------------------------------------------------------- - */ - -#include "mun.h" -#include "touch_encoder.h" -#include "common_oled.h" -#include - -void keyboard_post_init_kb(void) { - touch_encoder_init(); - transaction_register_rpc(TOUCH_ENCODER_SYNC, touch_encoder_slave_sync); - transaction_register_rpc(RGB_MENU_SYNC, rgb_menu_slave_sync); - keyboard_post_init_user(); -} - -void housekeeping_task_kb(void) { - touch_encoder_update(TOUCH_ENCODER_SYNC); - rgb_menu_update(RGB_MENU_SYNC); -} diff --git a/keyboards/rgbkb/mun/mun.h b/keyboards/rgbkb/mun/mun.h deleted file mode 100644 index beb132f0ec7..00000000000 --- a/keyboards/rgbkb/mun/mun.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * wrote this file. As long as you retain this - * notice you can do whatever you want with this stuff. If we meet some day, and - * you think this stuff is worth it, you can buy me a beer in return. David Rauseo - * ---------------------------------------------------------------------------- - */ - -#pragma once - -#if defined(KEYBOARD_rgbkb_mun_rev1) -# include "rev1.h" -#endif - -#include "quantum.h" \ No newline at end of file diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/rev1/config.h similarity index 97% rename from keyboards/rgbkb/mun/config.h rename to keyboards/rgbkb/mun/rev1/config.h index 74db14c0611..38314e13cda 100644 --- a/keyboards/rgbkb/mun/config.h +++ b/keyboards/rgbkb/mun/rev1/config.h @@ -59,3 +59,4 @@ #define TOUCH_UPDATE_INTERVAL 33 #define OLED_UPDATE_INTERVAL 33 +#define OLED_FONT_H "keyboards/rgbkb/common/glcdfont.c" diff --git a/keyboards/rgbkb/mun/halconf.h b/keyboards/rgbkb/mun/rev1/halconf.h similarity index 100% rename from keyboards/rgbkb/mun/halconf.h rename to keyboards/rgbkb/mun/rev1/halconf.h diff --git a/keyboards/rgbkb/mun/rev1/keyboard.json b/keyboards/rgbkb/mun/rev1/keyboard.json index 98265c6dd90..daed72b4d2d 100644 --- a/keyboards/rgbkb/mun/rev1/keyboard.json +++ b/keyboards/rgbkb/mun/rev1/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x3505", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "oled": true, + "rgb_matrix": true, + "rgblight": false + }, "rgblight": { "led_count": 98, "split_count": [49, 49], diff --git a/keyboards/rgbkb/mun/mcuconf.h b/keyboards/rgbkb/mun/rev1/mcuconf.h similarity index 100% rename from keyboards/rgbkb/mun/mcuconf.h rename to keyboards/rgbkb/mun/rev1/mcuconf.h diff --git a/keyboards/rgbkb/mun/rev1/rev1.c b/keyboards/rgbkb/mun/rev1/rev1.c index 986916b4a98..206a30d6549 100644 --- a/keyboards/rgbkb/mun/rev1/rev1.c +++ b/keyboards/rgbkb/mun/rev1/rev1.c @@ -8,6 +8,9 @@ */ #include "rev1.h" +#include "touch_encoder.h" +#include "common_oled.h" +#include "transactions.h" #define NUMBER_OF_TOUCH_ENCODERS 2 #define TOUCH_ENCODER_OPTIONS TOUCH_SEGMENTS + 2 @@ -85,3 +88,15 @@ led_config_t g_led_config = { { } }; // clang-format on #endif + +void keyboard_post_init_kb(void) { + touch_encoder_init(); + transaction_register_rpc(TOUCH_ENCODER_SYNC, touch_encoder_slave_sync); + transaction_register_rpc(RGB_MENU_SYNC, rgb_menu_slave_sync); + keyboard_post_init_user(); +} + +void housekeeping_task_kb(void) { + touch_encoder_update(TOUCH_ENCODER_SYNC); + rgb_menu_update(RGB_MENU_SYNC); +} diff --git a/keyboards/rgbkb/mun/rev1/rev1.h b/keyboards/rgbkb/mun/rev1/rev1.h index 291428c0fbb..51e6f2140f6 100644 --- a/keyboards/rgbkb/mun/rev1/rev1.h +++ b/keyboards/rgbkb/mun/rev1/rev1.h @@ -9,5 +9,5 @@ #pragma once -#include "mun.h" +#include "quantum.h" #include "touch_encoder.h" diff --git a/keyboards/rgbkb/mun/rev1/rules.mk b/keyboards/rgbkb/mun/rev1/rules.mk new file mode 100644 index 00000000000..dad85ac4838 --- /dev/null +++ b/keyboards/rgbkb/mun/rev1/rules.mk @@ -0,0 +1,8 @@ +# Touch encoder needs +VPATH += keyboards/rgbkb/common +SRC += touch_encoder.c +SRC += common_oled.c +I2C_DRIVER_REQUIRED = yes + +SERIAL_DRIVER = usart +OPT = 3 diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk index 04d4c554ad5..317c4d5a870 100644 --- a/keyboards/rgbkb/mun/rules.mk +++ b/keyboards/rgbkb/mun/rules.mk @@ -1,31 +1 @@ -# Touch encoder needs -VPATH += keyboards/rgbkb/common -SRC += touch_encoder.c -SRC += common_oled.c -I2C_DRIVER_REQUIRED = yes - -# 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 -AUDIO_ENABLE = no # Audio output - -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -RGB_MATRIX_ENABLE = yes - -OLED_ENABLE = yes - -ENCODER_ENABLE = yes - -SERIAL_DRIVER = usart -LTO_ENABLE = yes -OPT = 3 - -OPT_DEFS += -DOLED_FONT_H=\"keyboards/rgbkb/common/glcdfont.c\" - DEFAULT_FOLDER = rgbkb/mun/rev1 diff --git a/keyboards/rgbkb/pan/info.json b/keyboards/rgbkb/pan/info.json index 60c4431d340..0abdc7a6ecc 100644 --- a/keyboards/rgbkb/pan/info.json +++ b/keyboards/rgbkb/pan/info.json @@ -8,6 +8,15 @@ "pid": "0x8C9C", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/rgbkb/pan/keymaps/default/rules.mk b/keyboards/rgbkb/pan/keymaps/default/rules.mk index 9ad29c645c0..c4f4ee04dad 100644 --- a/keyboards/rgbkb/pan/keymaps/default/rules.mk +++ b/keyboards/rgbkb/pan/keymaps/default/rules.mk @@ -1,6 +1,3 @@ # RGB layout selection RGB_ENCODERS = yes # For RGB encoders, solder on both WS2811 chips STAGGERED_LAYOUT = no # If you soldered R1-A12 and R4-A12, enable this. - -# Do not edit past here -include keyboards/$(KEYBOARD)/post_rules.mk diff --git a/keyboards/rgbkb/pan/keymaps/default_eee/rules.mk b/keyboards/rgbkb/pan/keymaps/default_eee/rules.mk index 9ad29c645c0..c4f4ee04dad 100644 --- a/keyboards/rgbkb/pan/keymaps/default_eee/rules.mk +++ b/keyboards/rgbkb/pan/keymaps/default_eee/rules.mk @@ -1,6 +1,3 @@ # RGB layout selection RGB_ENCODERS = yes # For RGB encoders, solder on both WS2811 chips STAGGERED_LAYOUT = no # If you soldered R1-A12 and R4-A12, enable this. - -# Do not edit past here -include keyboards/$(KEYBOARD)/post_rules.mk diff --git a/keyboards/rgbkb/pan/keymaps/default_sss/rules.mk b/keyboards/rgbkb/pan/keymaps/default_sss/rules.mk index 9ad29c645c0..c4f4ee04dad 100644 --- a/keyboards/rgbkb/pan/keymaps/default_sss/rules.mk +++ b/keyboards/rgbkb/pan/keymaps/default_sss/rules.mk @@ -1,6 +1,3 @@ # RGB layout selection RGB_ENCODERS = yes # For RGB encoders, solder on both WS2811 chips STAGGERED_LAYOUT = no # If you soldered R1-A12 and R4-A12, enable this. - -# Do not edit past here -include keyboards/$(KEYBOARD)/post_rules.mk diff --git a/keyboards/rgbkb/pan/post_rules.mk b/keyboards/rgbkb/pan/post_rules.mk index 7947d1d9bfe..afa3b555b2c 100644 --- a/keyboards/rgbkb/pan/post_rules.mk +++ b/keyboards/rgbkb/pan/post_rules.mk @@ -1,4 +1,10 @@ -# As long as the users rules.mk has include $(KEYBOARD)/post_rules.mk this will be run after to properly setup any keyboard features and defines +RGB_MATRIX_KEYPRESSES ?= no # Enable reactive per-key effects. +RGB_MATRIX_FRAMEBUFFER_EFFECTS ?= no # Enable frame buffer effects like the typing heatmap. + +# RGB layout selection +STAGGERED_LAYOUT ?= no # If you soldered R1-A12 and R4-A12, enable this. +RGB_ENCODERS ?= yes # For RGB encoders, solder on both WS2811 chips + ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes) OPT_DEFS += -DRGB_MATRIX_KEYPRESSES endif diff --git a/keyboards/rgbkb/pan/rev1/32a/post_rules.mk b/keyboards/rgbkb/pan/rev1/32a/post_rules.mk deleted file mode 100644 index 7947d1d9bfe..00000000000 --- a/keyboards/rgbkb/pan/rev1/32a/post_rules.mk +++ /dev/null @@ -1,22 +0,0 @@ -# As long as the users rules.mk has include $(KEYBOARD)/post_rules.mk this will be run after to properly setup any keyboard features and defines -ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes) - OPT_DEFS += -DRGB_MATRIX_KEYPRESSES -endif - -ifeq ($(strip $(RGB_MATRIX_FRAMEBUFFER)), yes) - OPT_DEFS += -DRGB_MATRIX_FRAMEBUFFER_EFFECTS -endif - -ifeq ($(strip $(STAGGERED_LAYOUT)), yes) - OPT_DEFS += -DSTAGGERED_LAYOUT -endif - -ifeq ($(strip $(RGB_ENCODERS)), yes) - OPT_DEFS += -DRGB_ENCODERS -endif - -ifeq ($(strip $(RGB_ENCODERS)), yes) - ifeq ($(strip $(STAGGERED_LAYOUT)), yes) - OPT_DEFS += -DSTAGGERED_RGB_ENCODERS=$(strip $(STAGGERED_RGB_ENCODERS)) - endif -endif diff --git a/keyboards/rgbkb/pan/rev1/proton_c/post_rules.mk b/keyboards/rgbkb/pan/rev1/proton_c/post_rules.mk deleted file mode 100644 index 7947d1d9bfe..00000000000 --- a/keyboards/rgbkb/pan/rev1/proton_c/post_rules.mk +++ /dev/null @@ -1,22 +0,0 @@ -# As long as the users rules.mk has include $(KEYBOARD)/post_rules.mk this will be run after to properly setup any keyboard features and defines -ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes) - OPT_DEFS += -DRGB_MATRIX_KEYPRESSES -endif - -ifeq ($(strip $(RGB_MATRIX_FRAMEBUFFER)), yes) - OPT_DEFS += -DRGB_MATRIX_FRAMEBUFFER_EFFECTS -endif - -ifeq ($(strip $(STAGGERED_LAYOUT)), yes) - OPT_DEFS += -DSTAGGERED_LAYOUT -endif - -ifeq ($(strip $(RGB_ENCODERS)), yes) - OPT_DEFS += -DRGB_ENCODERS -endif - -ifeq ($(strip $(RGB_ENCODERS)), yes) - ifeq ($(strip $(STAGGERED_LAYOUT)), yes) - OPT_DEFS += -DSTAGGERED_RGB_ENCODERS=$(strip $(STAGGERED_RGB_ENCODERS)) - endif -endif diff --git a/keyboards/rgbkb/pan/rules.mk b/keyboards/rgbkb/pan/rules.mk index 3f1097a7e86..b6f1d46a653 100644 --- a/keyboards/rgbkb/pan/rules.mk +++ b/keyboards/rgbkb/pan/rules.mk @@ -1,22 +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 -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes -ENCODER_ENABLE = yes -OLED_ENABLE = yes +WS2812_DRIVER_REQUIRED = yes -# RGB layout selection -RGB_ENCODERS = yes # For RGB encoders, solder on both WS2811 chips -STAGGERED_LAYOUT = no # If you soldered R1-A12 and R4-A12, enable this. - -# Default to revision 1 DEFAULT_FOLDER = rgbkb/pan/rev1 - -WS2812_DRIVER_REQUIRED := yes diff --git a/keyboards/rgbkb/sol/common/glcdfont.c b/keyboards/rgbkb/sol/common/glcdfont.c deleted file mode 100644 index 6b75af8483c..00000000000 --- a/keyboards/rgbkb/sol/common/glcdfont.c +++ /dev/null @@ -1,231 +0,0 @@ -#include "progmem.h" - -// Helidox 8x6 font with RGBKB SOL Logo -// Online editor: http://teripom.x0.com/ - -static const unsigned char font[] PROGMEM = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, - 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, - 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, - 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, - 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, - 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, - 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, - 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, - 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, - 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, - 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, - 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, - 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, - 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, - 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, - 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, - 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, - 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, - 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, - 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, - 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, - 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, - 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, - 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, - 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, - 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, - 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, - 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, - 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, - 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, - 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, - 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, - 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, - 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, - 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, - 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, - 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, - 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, - 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, - 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, - 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, - 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, - 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, - 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, - 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, - 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, - 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, - 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, - 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, - 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, - 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, - 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, - 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, - 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, - 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, - 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, - 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, - 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, - 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, - 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, - 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, - 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, - 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, - 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, - 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, - 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, - 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, - 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, - 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, - 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, - 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, - 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, - 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, - 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, - 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, - 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, - 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, - 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, - 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, - 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, - 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, - 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, - 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, - 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, - 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, - 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, - 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, - 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, - 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, - 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, - 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, - 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, - 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, - 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, - 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, - 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, - 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, - 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, - 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, - 0x18, 0xA4, 0xA4, 0x9C, 0x78, 0x00, - 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, - 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, - 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, - 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, - 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, - 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, - 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, - 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, - 0xFC, 0x18, 0x24, 0x24, 0x18, 0x00, - 0x18, 0x24, 0x24, 0x18, 0xFC, 0x00, - 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, - 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, - 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, - 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, - 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, - 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, - 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, - 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, - 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, - 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, - 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, - 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, - 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, - 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, - 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, - 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x80, 0x00, 0x00, 0x0C, 0x90, - 0xB0, 0xE0, 0x72, 0x31, 0x9B, 0xDE, - 0xCE, 0xEC, 0xEE, 0xE9, 0xE9, 0xEC, - 0xCF, 0xDA, 0x99, 0x3E, 0x62, 0xE4, - 0xC4, 0x70, 0x10, 0x10, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, - 0xC0, 0xC0, 0x80, 0x80, 0x02, 0x85, - 0x85, 0x87, 0x85, 0x89, 0x89, 0x92, - 0xEA, 0xC6, 0xC4, 0x48, 0x50, 0x60, - 0x40, 0x40, 0x40, 0x40, 0xC0, 0xE0, - 0x50, 0x28, 0x10, 0x10, 0x60, 0xC0, - 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, - 0x80, 0x80, 0x80, 0xE0, 0xF8, 0xFC, - 0xF8, 0xF0, 0x00, 0x00, 0x00, 0x00, - 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC, - 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, - 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, - 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, - 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, - 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, - 0x00, 0x00, 0xF0, 0xF4, 0xEC, 0xDE, - 0xDE, 0xBE, 0x3E, 0x3E, 0x3F, 0x3F, - 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x3F, - 0x3F, 0x3E, 0x3E, 0xBE, 0xDE, 0xDE, - 0xEC, 0xF4, 0xF0, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7F, 0x80, 0x80, - 0x80, 0x70, 0x0F, 0x00, 0x00, 0x80, - 0x7F, 0x00, 0x00, 0x7F, 0x80, 0x80, - 0x80, 0x80, 0x80, 0x80, 0x80, 0x7F, - 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, - 0x80, 0x80, 0x80, 0xFF, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x40, 0x21, 0x33, 0x3B, 0x7B, - 0xFF, 0x00, 0x7C, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x7C, 0x01, - 0xFF, 0xDE, 0x8C, 0x04, 0x0C, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x01, 0x01, 0x7F, 0x80, - 0x80, 0xBE, 0xBE, 0x80, 0x80, 0x80, - 0xC1, 0xFF, 0x80, 0x04, 0x32, 0x5E, - 0x1C, 0x3D, 0x26, 0x10, 0xC1, 0xFF, - 0x3E, 0x00, 0x00, 0x08, 0x36, 0xC1, - 0x08, 0x08, 0x14, 0x77, 0x94, 0x94, - 0x94, 0xF7, 0x94, 0xF7, 0x9C, 0x9C, - 0xFF, 0xFF, 0x1E, 0x00, 0x00, 0x00, - 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, - 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, - 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, - 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, - 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, - 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, - 0x00, 0x00, 0x01, 0x0F, 0x3F, 0xFF, - 0xFF, 0xFF, 0xFC, 0xE0, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x80, 0xE0, 0xFC, 0xFF, 0xFF, 0xFF, - 0x3F, 0x0F, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x06, 0x02, 0x06, - 0x4D, 0x4F, 0x8C, 0xF9, 0x73, 0x37, - 0x27, 0x2F, 0x2F, 0xAF, 0xEF, 0x6F, - 0x77, 0x17, 0x33, 0x79, 0xCC, 0x1F, - 0x31, 0x20, 0x21, 0x02, 0x02, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0xE0, - 0xA0, 0xA0, 0xD0, 0x90, 0x48, 0x48, - 0x25, 0x2B, 0x11, 0x09, 0x05, 0x03, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x03, 0x02, 0x04, 0x03, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x03, 0x0F, 0x1F, - 0x0F, 0x03, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, - 0xFE, 0xFC, 0x00, 0xFC, 0xFE, 0x7F, - 0x3F, 0x1F, 0x0F, 0x07, 0x03, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h index fb608c724c3..e064c0525c5 100644 --- a/keyboards/rgbkb/sol/config.h +++ b/keyboards/rgbkb/sol/config.h @@ -62,3 +62,5 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT + +#define OLED_FONT_H "keyboards/rgbkb/common/glcdfont.c" diff --git a/keyboards/rgbkb/sol/keymaps/default/rules.mk b/keyboards/rgbkb/sol/keymaps/default/rules.mk index 7efa721e327..7476e020a2a 100644 --- a/keyboards/rgbkb/sol/keymaps/default/rules.mk +++ b/keyboards/rgbkb/sol/keymaps/default/rules.mk @@ -5,7 +5,3 @@ # EXTRAKEY_ENABLE = no # Audio control and System control # # To keep things clean and tidy, as well as make upgrades easier, only place overrides from the defaults in this file. - - -# Do not edit past here -include keyboards/$(KEYBOARD)/post_rules.mk diff --git a/keyboards/rgbkb/sol/rev1/keyboard.json b/keyboards/rgbkb/sol/rev1/keyboard.json index 16b61d9e020..937ed97ce1b 100644 --- a/keyboards/rgbkb/sol/rev1/keyboard.json +++ b/keyboards/rgbkb/sol/rev1/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": false, + "rgb_matrix": false, + "rgblight": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/rgbkb/sol/rev1/post_rules.mk b/keyboards/rgbkb/sol/rev1/post_rules.mk index ede37a1ad7b..172fcdc70e5 100644 --- a/keyboards/rgbkb/sol/rev1/post_rules.mk +++ b/keyboards/rgbkb/sol/rev1/post_rules.mk @@ -1,4 +1,8 @@ -# As long as the users rules.mk has include $(KEYBOARD)/post_rules.mk this will be run after to properly setup any keyboard features and defines +IOS_DEVICE_ENABLE ?= no # Limit max brightness to connect to IOS device (iPad,iPhone) +RGBLIGHT_FULL_POWER ?= no # Allow maximum RGB brightness for RGBLIGHT or RGB_MATRIX. Otherwise, limited to a safe level for a normal USB-A port +RGB_MATRIX_KEYPRESSES ?= no # Enable reactive per-key effects. +RGB_MATRIX_FRAMEBUFFER_EFFECTS ?= no # Enable frame buffer effects like the typing heatmap. +LED_MIRRORED ?= yes # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master) ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) OPT_DEFS += -DIOS_DEVICE_ENABLE diff --git a/keyboards/rgbkb/sol/rev1/rules.mk b/keyboards/rgbkb/sol/rev1/rules.mk deleted file mode 100644 index af9b588b7a5..00000000000 --- a/keyboards/rgbkb/sol/rev1/rules.mk +++ /dev/null @@ -1,26 +0,0 @@ -# RGBKB Sol Rev1 Defaults - -# Keycode Options -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -NKRO_ENABLE = no # Enable N-Key Rollover - -# Debug Options -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration - -# RGB Options -RGBLIGHT_ENABLE = yes # Enable global lighting effects. Do not enable with RGB Matrix -LED_MIRRORED = yes # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master) - -RGB_MATRIX_ENABLE = no # Enable per-key coordinate based RGB effects. Do not enable with RGBlight -RGB_MATRIX_KEYPRESSES = no # Enable reactive per-key effects. -RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typing heatmap. - -RGBLIGHT_FULL_POWER = no # Allow maximum RGB brightness for RGBLIGHT or RGB_MATRIX. Otherwise, limited to a safe level for a normal USB-A port -IOS_DEVICE_ENABLE = no # Limit max brightness to connect to IOS device (iPad,iPhone) - -# Misc -OLED_ENABLE = no # Enable the OLED Driver -SWAP_HANDS_ENABLE = no # Enable one-hand typing diff --git a/keyboards/rgbkb/sol/rev2/keyboard.json b/keyboards/rgbkb/sol/rev2/keyboard.json index f7ec84cfce3..b080319f174 100644 --- a/keyboards/rgbkb/sol/rev2/keyboard.json +++ b/keyboards/rgbkb/sol/rev2/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x3060", "device_version": "0.0.2" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": false, + "rgb_matrix": true, + "rgblight": false + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/rgbkb/sol/rev2/post_rules.mk b/keyboards/rgbkb/sol/rev2/post_rules.mk index feaa2ac1f2b..9c5db1443b4 100644 --- a/keyboards/rgbkb/sol/rev2/post_rules.mk +++ b/keyboards/rgbkb/sol/rev2/post_rules.mk @@ -1,4 +1,17 @@ -# As long as the users rules.mk has include $(KEYBOARD)/post_rules.mk this will be run after to properly setup any keyboard features and defines +IOS_DEVICE_ENABLE ?= no # Limit max brightness to connect to IOS device (iPad,iPhone) +RGBLIGHT_FULL_POWER ?= no # Allow maximum RGB brightness for RGBLIGHT or RGB_MATRIX. Otherwise, limited to a safe level for a normal USB-A port +RGB_MATRIX_KEYPRESSES ?= no # Enable reactive per-key effects. +RGB_MATRIX_FRAMEBUFFER_EFFECTS ?= no # Enable frame buffer effects like the typing heatmap. +LED_MIRRORED ?= no # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master) +FULLHAND_ENABLE ?= no # Enables the additional 24 Full Hand LEDs +SF_ENABLE ?= no # Enables the additional 38 Starfighter LEDs + +EXTRA_ENCODERS_ENABLE ?= no # Enables 3 encoders per side (up from 1, not compatible with OLED_ENABLE) + +# Special RGB Matrix, OLED, & Encoder Control Menu! +RGB_OLED_MENU ?= no # Enabled by setting this to the encoder index (0-5) you wish to use to control the menu. + # Use the RGB_MENU keycode in the keymap for the encoder to advance the menu to the next option. + ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) OPT_DEFS += -DIOS_DEVICE_ENABLE @@ -30,7 +43,7 @@ endif ifeq ($(strip $(OLED_ENABLE)), yes) ifeq ($(strip $(ENCODER_ENABLE)), yes) - ifneq ($(strip $(RGB_MATRIX_ENABLE)), no) + ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes) ifneq ($(strip $(RGB_OLED_MENU)), no) OPT_DEFS += -DRGB_OLED_MENU=$(strip $(RGB_OLED_MENU)) endif diff --git a/keyboards/rgbkb/sol/rev2/rules.mk b/keyboards/rgbkb/sol/rev2/rules.mk deleted file mode 100644 index 53aeba76ae7..00000000000 --- a/keyboards/rgbkb/sol/rev2/rules.mk +++ /dev/null @@ -1,34 +0,0 @@ -# RGBKB Sol Rev2 Defaults - -# Keycode Options -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -NKRO_ENABLE = no # Enable N-Key Rollover - -# Debug Options -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration - -# RGB Options -RGBLIGHT_ENABLE = no # Enable global lighting effects. Do not enable with RGB Matrix -LED_MIRRORED = no # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master) - -RGB_MATRIX_ENABLE = yes # Enable per-key coordinate based RGB effects. Do not enable with RGBlight -RGB_MATRIX_KEYPRESSES = no # Enable reactive per-key effects. -RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typing heatmap. - -RGBLIGHT_FULL_POWER = no # Allow maximum RGB brightness for RGBLIGHT or RGB_MATRIX. Otherwise, limited to a safe level for a normal USB-A port -FULLHAND_ENABLE = no # Enables the additional 24 Full Hand LEDs -SF_ENABLE = no # Enables the additional 38 Starfighter LEDs -IOS_DEVICE_ENABLE = no # Limit max brightness to connect to IOS device (iPad,iPhone) - -# Misc -OLED_ENABLE = no # Enable the OLED Driver -EXTRA_ENCODERS_ENABLE = no # Enables 3 encoders per side (up from 1, not compatible with OLED_ENABLE) -SWAP_HANDS_ENABLE = no # Enable one-hand typing -LTO_ENABLE = yes # Enable Link Time Optimizations greatly reducing firmware size by disabling the old Macros and Functions features - -# Special RGB Matrix, OLED, & Encoder Control Menu! -RGB_OLED_MENU = no # Enabled by setting this to the encoder index (0-5) you wish to use to control the menu. - # Use the RGB_MENU keycode in the keymap for the encoder to advance the menu to the next option. diff --git a/keyboards/rgbkb/sol/rules.mk b/keyboards/rgbkb/sol/rules.mk index c956bb9f5f1..f8325017f98 100644 --- a/keyboards/rgbkb/sol/rules.mk +++ b/keyboards/rgbkb/sol/rules.mk @@ -1,6 +1 @@ -# Custom local font file -OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" - -ENCODER_ENABLE = yes - DEFAULT_FOLDER = rgbkb/sol/rev2 diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/rev1/config.h similarity index 97% rename from keyboards/rgbkb/sol3/config.h rename to keyboards/rgbkb/sol3/rev1/config.h index 8348b44f96e..a99cbd5fff4 100644 --- a/keyboards/rgbkb/sol3/config.h +++ b/keyboards/rgbkb/sol3/rev1/config.h @@ -51,6 +51,7 @@ #define TOUCH_UPDATE_INTERVAL 33 #define OLED_UPDATE_INTERVAL 33 +#define OLED_FONT_H "keyboards/rgbkb/common/glcdfont.c" /* Audio Configuration */ #define AUDIO_PIN A4 diff --git a/keyboards/rgbkb/sol3/halconf.h b/keyboards/rgbkb/sol3/rev1/halconf.h similarity index 100% rename from keyboards/rgbkb/sol3/halconf.h rename to keyboards/rgbkb/sol3/rev1/halconf.h diff --git a/keyboards/rgbkb/sol3/rev1/keyboard.json b/keyboards/rgbkb/sol3/rev1/keyboard.json index 83e0a7a9275..0df040e6e08 100644 --- a/keyboards/rgbkb/sol3/rev1/keyboard.json +++ b/keyboards/rgbkb/sol3/rev1/keyboard.json @@ -8,6 +8,22 @@ "pid": "0x3510", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "bootmagic": true, + "dip_switch": true, + "dynamic_macro": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgb_matrix": true, + "rgblight": false + }, "rgblight": { "led_count": 156, "split_count": [78, 78], @@ -25,6 +41,9 @@ } }, "audio": { + "default": { + "clicky": false + }, "driver": "dac_additive" }, "ws2812": { diff --git a/keyboards/rgbkb/sol3/mcuconf.h b/keyboards/rgbkb/sol3/rev1/mcuconf.h similarity index 100% rename from keyboards/rgbkb/sol3/mcuconf.h rename to keyboards/rgbkb/sol3/rev1/mcuconf.h diff --git a/keyboards/rgbkb/sol3/rev1/rev1.c b/keyboards/rgbkb/sol3/rev1/rev1.c index e853ed9b986..7d264eb17f2 100644 --- a/keyboards/rgbkb/sol3/rev1/rev1.c +++ b/keyboards/rgbkb/sol3/rev1/rev1.c @@ -8,6 +8,7 @@ */ #include "rev1.h" +#include "transactions.h" #include "split_util.h" #define NUMBER_OF_TOUCH_ENCODERS 2 @@ -256,3 +257,15 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } return true; }; + +void keyboard_post_init_kb(void) { + touch_encoder_init(); + transaction_register_rpc(TOUCH_ENCODER_SYNC, touch_encoder_slave_sync); + transaction_register_rpc(RGB_MENU_SYNC, rgb_menu_slave_sync); + keyboard_post_init_user(); +} + +void housekeeping_task_kb(void) { + touch_encoder_update(TOUCH_ENCODER_SYNC); + rgb_menu_update(RGB_MENU_SYNC); +} diff --git a/keyboards/rgbkb/sol3/rev1/rev1.h b/keyboards/rgbkb/sol3/rev1/rev1.h index 2ed720fcc3e..6f08563e795 100644 --- a/keyboards/rgbkb/sol3/rev1/rev1.h +++ b/keyboards/rgbkb/sol3/rev1/rev1.h @@ -9,7 +9,9 @@ #pragma once -#include "sol3.h" +#include "quantum.h" +#include "touch_encoder.h" +#include "common_oled.h" // weak functions overridable by the user void render_layer_status(void); diff --git a/keyboards/rgbkb/sol3/rev1/rules.mk b/keyboards/rgbkb/sol3/rev1/rules.mk new file mode 100644 index 00000000000..dad85ac4838 --- /dev/null +++ b/keyboards/rgbkb/sol3/rev1/rules.mk @@ -0,0 +1,8 @@ +# Touch encoder needs +VPATH += keyboards/rgbkb/common +SRC += touch_encoder.c +SRC += common_oled.c +I2C_DRIVER_REQUIRED = yes + +SERIAL_DRIVER = usart +OPT = 3 diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk index 0c48b5d30e4..74804682a26 100644 --- a/keyboards/rgbkb/sol3/rules.mk +++ b/keyboards/rgbkb/sol3/rules.mk @@ -1,34 +1 @@ -# Touch encoder needs -VPATH += keyboards/rgbkb/common -SRC += touch_encoder.c -SRC += common_oled.c -I2C_DRIVER_REQUIRED = yes - -# 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 -AUDIO_ENABLE = yes # Audio output - -DYNAMIC_MACRO_ENABLE = yes -DIP_SWITCH_ENABLE = yes - -RGBLIGHT_ENABLE = no -RGB_MATRIX_ENABLE = yes - -OLED_ENABLE = yes - -ENCODER_ENABLE = yes - -SERIAL_DRIVER = usart -LTO_ENABLE = yes -OPT = 3 - -OPT_DEFS += -DOLED_FONT_H=\"keyboards/rgbkb/common/glcdfont.c\" - DEFAULT_FOLDER = rgbkb/sol3/rev1 diff --git a/keyboards/rgbkb/sol3/sol3.c b/keyboards/rgbkb/sol3/sol3.c deleted file mode 100644 index 97ae5bc5de3..00000000000 --- a/keyboards/rgbkb/sol3/sol3.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * wrote this file. As long as you retain this - * notice you can do whatever you want with this stuff. If we meet some day, and - * you think this stuff is worth it, you can buy me a beer in return. David Rauseo - * ---------------------------------------------------------------------------- - */ - -#include "sol3.h" -#include "eeconfig.h" -#include "audio.h" -#include - -extern audio_config_t audio_config; - -void keyboard_post_init_kb(void) { - touch_encoder_init(); - transaction_register_rpc(TOUCH_ENCODER_SYNC, touch_encoder_slave_sync); - transaction_register_rpc(RGB_MENU_SYNC, rgb_menu_slave_sync); - keyboard_post_init_user(); -} - -void eeconfig_init_kb(void) { - // Reset Keyboard EEPROM value to blank, rather than to a set value - eeconfig_update_kb(0); - - audio_config.raw = eeconfig_read_audio(); - audio_config.clicky_enable = false; - eeconfig_update_audio(audio_config.raw); - - eeconfig_init_user(); -} - -void housekeeping_task_kb(void) { - touch_encoder_update(TOUCH_ENCODER_SYNC); - rgb_menu_update(RGB_MENU_SYNC); -} diff --git a/keyboards/rgbkb/sol3/sol3.h b/keyboards/rgbkb/sol3/sol3.h deleted file mode 100644 index 06d5dcdea0c..00000000000 --- a/keyboards/rgbkb/sol3/sol3.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * wrote this file. As long as you retain this - * notice you can do whatever you want with this stuff. If we meet some day, and - * you think this stuff is worth it, you can buy me a beer in return. David Rauseo - * ---------------------------------------------------------------------------- - */ - -#pragma once - -#if defined(KEYBOARD_rgbkb_sol3_rev1) -# include "rev1.h" -#endif - -#include "quantum.h" -#include "touch_encoder.h" -#include "common_oled.h" diff --git a/keyboards/rgbkb/zen/info.json b/keyboards/rgbkb/zen/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/rgbkb/zen/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/rgbkb/zen/rev1/keyboard.json b/keyboards/rgbkb/zen/rev1/keyboard.json index 81370b916dd..fd552b8f900 100644 --- a/keyboards/rgbkb/zen/rev1/keyboard.json +++ b/keyboards/rgbkb/zen/rev1/keyboard.json @@ -8,12 +8,21 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B2", "B3", "B1", "F7", "F6", "D4", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h index 1578432cf80..a06ddd9d3ca 100644 --- a/keyboards/rgbkb/zen/rev2/config.h +++ b/keyboards/rgbkb/zen/rev2/config.h @@ -37,3 +37,5 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT + +#define OLED_FONT_H "common/glcdfont.c" diff --git a/keyboards/rgbkb/zen/rev2/keyboard.json b/keyboards/rgbkb/zen/rev2/keyboard.json index 8d486e53b87..2c8e25deb3f 100644 --- a/keyboards/rgbkb/zen/rev2/keyboard.json +++ b/keyboards/rgbkb/zen/rev2/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x3061", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "command": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B3", "B1", "B2"], "rows": ["C6", "E6", "B5", "D7", "B4"] @@ -19,6 +28,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D3" }, "rgblight": { diff --git a/keyboards/rgbkb/zen/rev2/post_rules.mk b/keyboards/rgbkb/zen/rev2/post_rules.mk deleted file mode 100644 index 2a4397e980d..00000000000 --- a/keyboards/rgbkb/zen/rev2/post_rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# Setup so that OLED can be turned on/off easily -ifeq ($(strip $(OLED_ENABLE)), yes) - # Custom local font file - OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" -endif diff --git a/keyboards/rgbkb/zen/rev2/rules.mk b/keyboards/rgbkb/zen/rev2/rules.mk deleted file mode 100644 index 6dd9d2e2700..00000000000 --- a/keyboards/rgbkb/zen/rev2/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -ENCODER_ENABLE = yes - -OLED_ENABLE = no diff --git a/keyboards/rgbkb/zen/rules.mk b/keyboards/rgbkb/zen/rules.mk index 28653a7d5f8..ee94832d4d2 100644 --- a/keyboards/rgbkb/zen/rules.mk +++ b/keyboards/rgbkb/zen/rules.mk @@ -1,13 +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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight - DEFAULT_FOLDER = rgbkb/zen/rev2 diff --git a/keyboards/rgbkb/zygomorph/rev1/keyboard.json b/keyboards/rgbkb/zygomorph/rev1/keyboard.json index 851842d0815..fc92e0746d3 100644 --- a/keyboards/rgbkb/zygomorph/rev1/keyboard.json +++ b/keyboards/rgbkb/zygomorph/rev1/keyboard.json @@ -8,9 +8,78 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "rgb_matrix": { "driver": "ws2812", - "split_count": [30, 30] + "split_count": [30, 30], + "layout": [ + {"matrix": [0, 5], "x": 102, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 81, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 61, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 41, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}, + {"matrix": [1, 5], "x": 102, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 81, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 61, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 41, "y": 16, "flags": 4}, + {"matrix": [1, 1], "x": 20, "y": 16, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 1}, + {"matrix": [2, 5], "x": 102, "y": 32, "flags": 4}, + {"matrix": [2, 4], "x": 81, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4}, + {"matrix": [2, 1], "x": 20, "y": 32, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 1}, + {"matrix": [3, 5], "x": 102, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 81, "y": 48, "flags": 4}, + {"matrix": [3, 3], "x": 61, "y": 48, "flags": 4}, + {"matrix": [3, 2], "x": 41, "y": 48, "flags": 4}, + {"matrix": [3, 1], "x": 20, "y": 48, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 48, "flags": 1}, + {"matrix": [4, 5], "x": 102, "y": 64, "flags": 1}, + {"matrix": [4, 4], "x": 81, "y": 64, "flags": 1}, + {"matrix": [4, 3], "x": 61, "y": 64, "flags": 1}, + {"matrix": [4, 2], "x": 41, "y": 64, "flags": 1}, + {"matrix": [4, 1], "x": 20, "y": 64, "flags": 1}, + {"matrix": [4, 0], "x": 0, "y": 64, "flags": 1}, + {"matrix": [5, 5], "x": 224, "y": 0, "flags": 4}, + {"matrix": [5, 4], "x": 204, "y": 0, "flags": 4}, + {"matrix": [5, 3], "x": 183, "y": 0, "flags": 4}, + {"matrix": [5, 2], "x": 163, "y": 0, "flags": 4}, + {"matrix": [5, 1], "x": 143, "y": 0, "flags": 4}, + {"matrix": [5, 0], "x": 122, "y": 0, "flags": 4}, + {"matrix": [6, 5], "x": 224, "y": 16, "flags": 1}, + {"matrix": [6, 4], "x": 204, "y": 16, "flags": 4}, + {"matrix": [6, 3], "x": 183, "y": 16, "flags": 4}, + {"matrix": [6, 2], "x": 163, "y": 16, "flags": 4}, + {"matrix": [6, 1], "x": 143, "y": 16, "flags": 4}, + {"matrix": [6, 0], "x": 122, "y": 16, "flags": 4}, + {"matrix": [7, 5], "x": 224, "y": 32, "flags": 1}, + {"matrix": [7, 4], "x": 204, "y": 32, "flags": 4}, + {"matrix": [7, 3], "x": 183, "y": 32, "flags": 4}, + {"matrix": [7, 2], "x": 163, "y": 32, "flags": 4}, + {"matrix": [7, 1], "x": 143, "y": 32, "flags": 4}, + {"matrix": [7, 0], "x": 122, "y": 32, "flags": 4}, + {"matrix": [8, 5], "x": 224, "y": 48, "flags": 1}, + {"matrix": [8, 4], "x": 204, "y": 48, "flags": 4}, + {"matrix": [8, 3], "x": 183, "y": 48, "flags": 4}, + {"matrix": [8, 2], "x": 163, "y": 48, "flags": 4}, + {"matrix": [8, 1], "x": 143, "y": 48, "flags": 4}, + {"matrix": [8, 0], "x": 122, "y": 48, "flags": 4}, + {"matrix": [9, 5], "x": 224, "y": 64, "flags": 1}, + {"matrix": [9, 4], "x": 204, "y": 64, "flags": 1}, + {"matrix": [9, 3], "x": 183, "y": 64, "flags": 1}, + {"matrix": [9, 2], "x": 163, "y": 64, "flags": 1}, + {"matrix": [9, 1], "x": 143, "y": 64, "flags": 1}, + {"matrix": [9, 0], "x": 122, "y": 64, "flags": 1} + ] }, "matrix_pins": { "cols": ["F4", "F6", "C7", "C6", "B6", "D4"], diff --git a/keyboards/rgbkb/zygomorph/rev1/rev1.c b/keyboards/rgbkb/zygomorph/rev1/rev1.c deleted file mode 100644 index 7588ffc75f6..00000000000 --- a/keyboards/rgbkb/zygomorph/rev1/rev1.c +++ /dev/null @@ -1,43 +0,0 @@ -#include "quantum.h" - - -#ifdef RGB_MATRIX_ENABLE -led_config_t g_led_config = { { - { 5, 4, 3, 2, 1, 0 }, - { 11, 10, 9, 8, 7, 6 }, - { 17, 16, 15, 14, 13, 12 }, - { 23, 22, 21, 20, 19, 18 }, - { 29, 28, 27, 26, 25, 24 }, - { 35, 34, 33, 32, 31, 30 }, - { 41, 40, 39, 38, 37, 36 }, - { 47, 46, 45, 44, 43, 42 }, - { 53, 52, 51, 50, 49, 48 }, - { 59, 58, 57, 56, 55, 54 } -}, { -// Left Hand - { 102, 0 }, { 81, 0 }, { 61, 0 }, { 41, 0 }, { 20, 0 }, { 0, 0 }, - { 102, 16 }, { 81, 16 }, { 61, 16 }, { 41, 16 }, { 20, 16 }, { 0, 16 }, - { 102, 32 }, { 81, 32 }, { 61, 32 }, { 41, 32 }, { 20, 32 }, { 0, 32 }, - { 102, 48 }, { 81, 48 }, { 61, 48 }, { 41, 48 }, { 20, 48 }, { 0, 48 }, - { 102, 64 }, { 81, 64 }, { 61, 64 }, { 41, 64 }, { 20, 64 }, { 0, 64 }, -// Right Hand - { 224, 0 }, { 204, 0 }, { 183, 0 }, { 163, 0 }, { 143, 0 }, { 122, 0 }, - { 224, 16 }, { 204, 16 }, { 183, 16 }, { 163, 16 }, { 143, 16 }, { 122, 16 }, - { 224, 32 }, { 204, 32 }, { 183, 32 }, { 163, 32 }, { 143, 32 }, { 122, 32 }, - { 224, 48 }, { 204, 48 }, { 183, 48 }, { 163, 48 }, { 143, 48 }, { 122, 48 }, - { 224, 64 }, { 204, 64 }, { 183, 64 }, { 163, 64 }, { 143, 64 }, { 122, 64 } -}, { -// Left Hand - 4, 4, 4, 4, 4, 1, - 4, 4, 4, 4, 4, 1, - 4, 4, 4, 4, 4, 1, - 4, 4, 4, 4, 4, 1, - 1, 1, 1, 1, 1, 1, -// Right Hand - 4, 4, 4, 4, 4, 4, - 1, 4, 4, 4, 4, 4, - 1, 4, 4, 4, 4, 4, - 1, 4, 4, 4, 4, 4, - 1, 1, 1, 1, 1, 1 -} }; -#endif diff --git a/keyboards/rgbkb/zygomorph/rev1/rules.mk b/keyboards/rgbkb/zygomorph/rev1/rules.mk new file mode 100644 index 00000000000..4df55cd2206 --- /dev/null +++ b/keyboards/rgbkb/zygomorph/rev1/rules.mk @@ -0,0 +1,3 @@ +# Disable unsupported hardware +AUDIO_SUPPORTED = no +BACKLIGHT_SUPPORTED = no diff --git a/keyboards/rgbkb/zygomorph/rules.mk b/keyboards/rgbkb/zygomorph/rules.mk index dfdffe3c3a8..8544e8767d5 100644 --- a/keyboards/rgbkb/zygomorph/rules.mk +++ b/keyboards/rgbkb/zygomorph/rules.mk @@ -1,18 +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 = no # Audio output - DEFAULT_FOLDER = rgbkb/zygomorph/rev1 - -# Disable unsupported hardware -AUDIO_SUPPORTED = no -BACKLIGHT_SUPPORTED = no From 1184e0d9beb7322b0cea017e805d36d11e4f47f2 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 12 May 2024 01:50:48 +1000 Subject: [PATCH 261/333] Adjust keycode alignment around `QK_BOOT` (#23697) --- keyboards/0_sixty/keymaps/default/keymap.c | 2 +- keyboards/0_sixty/keymaps/via/keymap.c | 2 +- keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c | 2 +- keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c | 2 +- keyboards/25keys/aleth42/keymaps/default/keymap.c | 2 +- keyboards/25keys/aleth42/keymaps/via/keymap.c | 2 +- keyboards/25keys/zinc/keymaps/default/keymap.c | 2 +- keyboards/25keys/zinc/keymaps/via/keymap.c | 4 ++-- keyboards/30wer/keymaps/default/keymap.c | 2 +- keyboards/40percentclub/4x4/keymaps/default/keymap.c | 2 +- keyboards/40percentclub/4x4/keymaps/via/keymap.c | 2 +- keyboards/40percentclub/5x5/keymaps/default/keymap.c | 2 +- keyboards/40percentclub/5x5/keymaps/via/keymap.c | 2 +- keyboards/40percentclub/foobar/keymaps/default/keymap.c | 2 +- keyboards/40percentclub/gherkin/keymaps/default/keymap.c | 2 +- keyboards/40percentclub/nein/keymaps/default/keymap.c | 2 +- keyboards/40percentclub/nein/keymaps/via/keymap.c | 2 +- keyboards/40percentclub/nori/keymaps/default/keymap.c | 2 +- keyboards/40percentclub/tomato/keymaps/default/keymap.c | 2 +- keyboards/45_ats/keymaps/default/keymap.c | 2 +- keyboards/45_ats/keymaps/via/keymap.c | 2 +- keyboards/4pplet/aekiso60/keymaps/default/keymap.c | 2 +- keyboards/4pplet/aekiso60/keymaps/via/keymap.c | 2 +- keyboards/4pplet/bootleg/keymaps/default/keymap.c | 2 +- keyboards/4pplet/bootleg/keymaps/via/keymap.c | 2 +- .../4pplet/eagle_viper_rep/rev_a/keymaps/default/keymap.c | 2 +- keyboards/4pplet/eagle_viper_rep/rev_a/keymaps/via/keymap.c | 2 +- keyboards/4pplet/perk60_iso/keymaps/default/keymap.c | 2 +- keyboards/4pplet/perk60_iso/keymaps/via/keymap.c | 2 +- keyboards/4pplet/waffling60/rev_a/keymaps/default/keymap.c | 2 +- keyboards/4pplet/waffling60/rev_a/keymaps/via/keymap.c | 2 +- keyboards/4pplet/waffling60/rev_b/keymaps/default/keymap.c | 2 +- keyboards/4pplet/waffling60/rev_b/keymaps/via/keymap.c | 2 +- keyboards/4pplet/waffling60/rev_c/keymaps/default/keymap.c | 2 +- keyboards/4pplet/waffling60/rev_c/keymaps/via/keymap.c | 2 +- keyboards/4pplet/waffling60/rev_d/keymaps/via/keymap.c | 2 +- keyboards/4pplet/waffling80/keymaps/via/keymap.c | 6 +++--- keyboards/4pplet/yakiimo/keymaps/default/keymap.c | 2 +- keyboards/4pplet/yakiimo/keymaps/via/keymap.c | 6 +++--- keyboards/8pack/keymaps/default/keymap.c | 2 +- keyboards/acekeyboard/titan60/keymaps/default/keymap.c | 2 +- keyboards/acekeyboard/titan60/keymaps/iso/keymap.c | 2 +- keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c | 2 +- keyboards/acheron/shark/alpha/keymaps/default/keymap.c | 2 +- keyboards/acheron/shark/alpha/keymaps/via/keymap.c | 2 +- keyboards/ada/ada1800mini/keymaps/default/keymap.c | 2 +- keyboards/adpenrose/kintsugi/keymaps/default/keymap.c | 2 +- keyboards/adpenrose/kintsugi/keymaps/via/keymap.c | 2 +- keyboards/afternoonlabs/breeze/keymaps/default/keymap.c | 2 +- keyboards/afternoonlabs/breeze/keymaps/via/keymap.c | 2 +- .../afternoonlabs/oceanbreeze/keymaps/default/keymap.c | 2 +- .../afternoonlabs/southern_breeze/keymaps/default/keymap.c | 2 +- .../afternoonlabs/southern_breeze/keymaps/via/keymap.c | 2 +- .../afternoonlabs/summer_breeze/keymaps/default/keymap.c | 2 +- keyboards/afternoonlabs/summer_breeze/keymaps/via/keymap.c | 2 +- keyboards/ai03/jp60/keymaps/default/keymap.c | 2 +- keyboards/ai03/jp60/keymaps/via/keymap.c | 2 +- keyboards/ai03/lunar/keymaps/default/keymap.c | 2 +- keyboards/ai03/lunar/keymaps/via/keymap.c | 2 +- keyboards/ai03/orbit_x/keymaps/default/keymap.c | 2 +- keyboards/ai03/orbit_x/keymaps/via/keymap.c | 2 +- keyboards/ai03/polaris/keymaps/default/keymap.c | 2 +- .../ai03/polaris/keymaps/default_ansi_tsangan/keymap.c | 2 +- keyboards/ai03/quasar/keymaps/default/keymap.c | 2 +- keyboards/ai03/vega/keymaps/default/keymap.c | 2 +- keyboards/ai03/vega/keymaps/via/keymap.c | 2 +- keyboards/ai03/voyager60_alps/keymaps/via/keymap.c | 2 +- keyboards/al1/keymaps/default/keymap.c | 2 +- keyboards/al1/keymaps/via/keymap.c | 2 +- keyboards/amjkeyboard/amj40/keymaps/default/keymap.c | 2 +- .../amjkeyboard/amj40/keymaps/default_625u_space/keymap.c | 2 +- .../amj40/keymaps/default_ortho_275u_space/keymap.c | 2 +- .../amj40/keymaps/default_ortho_600u_space/keymap.c | 2 +- keyboards/amjkeyboard/amj66/keymaps/default/keymap.c | 2 +- keyboards/amjkeyboard/amj96/keymaps/default/keymap.c | 2 +- keyboards/anomalykb/a65i/keymaps/default/keymap.c | 2 +- keyboards/anomalykb/a65i/keymaps/iso/keymap.c | 2 +- keyboards/anomalykb/a65i/keymaps/iso_splitbs/keymap.c | 2 +- keyboards/anomalykb/a65i/keymaps/via/keymap.c | 2 +- keyboards/aos/tkl/keymaps/default/keymap.c | 2 +- keyboards/aos/tkl/keymaps/via/keymap.c | 2 +- keyboards/aozora/keymaps/default/keymap.c | 2 +- keyboards/arisu/keymaps/default/keymap.c | 2 +- keyboards/arisu/keymaps/via/keymap.c | 2 +- keyboards/atlas_65/keymaps/default/keymap.c | 2 +- keyboards/atlas_65/keymaps/via/keymap.c | 2 +- keyboards/atreus/keymaps/default/keymap.c | 2 +- keyboards/atreus/keymaps/via/keymap.c | 2 +- keyboards/atxkb/1894/keymaps/default/keymap.c | 2 +- keyboards/atxkb/1894/keymaps/default_ansi_tsangan/keymap.c | 2 +- .../axolstudio/foundation_gamma/keymaps/default/keymap.c | 2 +- keyboards/axolstudio/foundation_gamma/keymaps/via/keymap.c | 6 +++--- keyboards/b_sides/rev41lp/keymaps/default/keymap.c | 2 +- keyboards/b_sides/rev41lp/keymaps/via/keymap.c | 2 +- keyboards/bacca70/keymaps/default/keymap.c | 2 +- keyboards/bacca70/keymaps/via/keymap.c | 6 +++--- keyboards/baguette/keymaps/default/keymap.c | 2 +- keyboards/baguette/keymaps/iso/keymap.c | 2 +- keyboards/barleycorn_smd/keymaps/default/keymap.c | 2 +- keyboards/barleycorn_smd/keymaps/iso/keymap.c | 2 +- keyboards/barleycorn_smd/keymaps/via/keymap.c | 2 +- keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c | 2 +- keyboards/basketweave/keymaps/default/keymap.c | 2 +- keyboards/basketweave/keymaps/via/keymap.c | 2 +- keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c | 2 +- keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c | 2 +- keyboards/bastardkb/tbk/keymaps/default/keymap.c | 2 +- keyboards/bear_face/v1/keymaps/default/keymap.c | 4 ++-- keyboards/bear_face/v2/keymaps/default/keymap.c | 4 ++-- keyboards/bear_face/v2/keymaps/default_iso/keymap.c | 4 ++-- keyboards/bemeier/bmek/keymaps/default/keymap.c | 4 ++-- keyboards/bemeier/bmek/keymaps/via/keymap.c | 4 ++-- .../biacco42/ergo42/keymaps/default-underglow/keymap.c | 2 +- keyboards/biacco42/ergo42/keymaps/default/keymap.c | 2 +- keyboards/bioi/g60ble/keymaps/via/keymap.c | 2 +- keyboards/blank/blank01/keymaps/default/keymap.c | 2 +- keyboards/blank/blank01/keymaps/via/keymap.c | 2 +- keyboards/blank_tehnologii/manibus/keymaps/default/keymap.c | 2 +- keyboards/blank_tehnologii/manibus/keymaps/via/keymap.c | 2 +- keyboards/boardrun/bizarre/keymaps/default/keymap.c | 4 ++-- keyboards/boardrun/bizarre/keymaps/via/keymap.c | 4 ++-- keyboards/boardrun/classic/keymaps/default/keymap.c | 4 ++-- keyboards/boardsource/4x12/keymaps/default/keymap.c | 2 +- keyboards/boardsource/4x12/keymaps/via/keymap.c | 2 +- keyboards/boardsource/5x12/keymaps/default/keymap.c | 4 ++-- keyboards/boardsource/5x12/keymaps/via/keymap.c | 4 ++-- keyboards/boardsource/microdox/keymaps/via/keymap.c | 2 +- keyboards/boardsource/technik_o/keymaps/default/keymap.c | 2 +- keyboards/boardsource/technik_o/keymaps/via/keymap.c | 2 +- keyboards/boardsource/technik_s/keymaps/default/keymap.c | 2 +- keyboards/boardsource/technik_s/keymaps/via/keymap.c | 2 +- keyboards/boardsource/the_mark/keymaps/default/keymap.c | 2 +- .../boardsource/the_mark/keymaps/default_ansi/keymap.c | 2 +- .../the_mark/keymaps/default_ansi_split_bs_space/keymap.c | 2 +- keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c | 2 +- .../the_mark/keymaps/default_iso_split_bs_space/keymap.c | 2 +- keyboards/boardsource/the_mark/keymaps/via/keymap.c | 2 +- keyboards/boardwalk/keymaps/default_2u_arrow/keymap.c | 2 +- keyboards/boardwalk/keymaps/default_625u_arrow/keymap.c | 2 +- keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c | 2 +- keyboards/bpiphany/pegasushoof/keymaps/via/keymap.c | 2 +- keyboards/buildakb/mw60/keymaps/default/keymap.c | 2 +- keyboards/buildakb/mw60/keymaps/via/keymap.c | 2 +- keyboards/buildakb/potato65/keymaps/default/keymap.c | 2 +- keyboards/buildakb/potato65/keymaps/via/keymap.c | 2 +- keyboards/caffeinated/serpent65/keymaps/default/keymap.c | 2 +- keyboards/caffeinated/serpent65/keymaps/via/keymap.c | 2 +- keyboards/cannonkeys/atlas/keymaps/default/keymap.c | 2 +- keyboards/cannonkeys/atlas/keymaps/via/keymap.c | 2 +- keyboards/cannonkeys/atlas_alps/keymaps/default/keymap.c | 4 ++-- keyboards/cannonkeys/atlas_alps/keymaps/via/keymap.c | 4 ++-- keyboards/cannonkeys/brutalv2_65/keymaps/default/keymap.c | 2 +- keyboards/cannonkeys/brutalv2_65/keymaps/via/keymap.c | 2 +- keyboards/cannonkeys/cloudline/keymaps/default/keymap.c | 2 +- keyboards/cannonkeys/cloudline/keymaps/via/keymap.c | 2 +- keyboards/cannonkeys/gentoo/keymaps/default/keymap.c | 2 +- keyboards/cannonkeys/gentoo/keymaps/via/keymap.c | 2 +- .../cannonkeys/malicious_ergo/keymaps/default/keymap.c | 2 +- keyboards/cannonkeys/malicious_ergo/keymaps/via/keymap.c | 2 +- keyboards/cannonkeys/ortho48/keymaps/default/keymap.c | 2 +- keyboards/cannonkeys/ortho48/keymaps/via/keymap.c | 2 +- keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c | 2 +- keyboards/cannonkeys/ortho48v2/keymaps/via/keymap.c | 2 +- keyboards/cannonkeys/ortho60/keymaps/default/keymap.c | 2 +- keyboards/cannonkeys/ortho60/keymaps/via/keymap.c | 2 +- keyboards/cannonkeys/ortho60v2/keymaps/default/keymap.c | 2 +- keyboards/cannonkeys/ortho60v2/keymaps/via/keymap.c | 2 +- keyboards/cannonkeys/ortho75/keymaps/default/keymap.c | 2 +- keyboards/cannonkeys/ripple/keymaps/default/keymap.c | 2 +- keyboards/cannonkeys/ripple/keymaps/via/keymap.c | 2 +- keyboards/cannonkeys/ripple_hs/keymaps/default/keymap.c | 2 +- keyboards/cannonkeys/ripple_hs/keymaps/via/keymap.c | 2 +- keyboards/capsunlocked/cu65/keymaps/default/keymap.c | 2 +- keyboards/capsunlocked/cu65/keymaps/iso/keymap.c | 2 +- keyboards/capsunlocked/cu65/keymaps/iso_split_bs/keymap.c | 2 +- keyboards/capsunlocked/cu65/keymaps/via/keymap.c | 2 +- keyboards/capsunlocked/cu75/keymaps/default/keymap.c | 2 +- keyboards/capsunlocked/cu75/keymaps/iso/keymap.c | 2 +- .../capsunlocked/cu80/v2/ansi/keymaps/default/keymap.c | 2 +- keyboards/capsunlocked/cu80/v2/ansi/keymaps/via/keymap.c | 2 +- keyboards/capsunlocked/cu80/v2/iso/keymaps/default/keymap.c | 2 +- keyboards/capsunlocked/cu80/v2/iso/keymaps/via/keymap.c | 2 +- keyboards/cest73/tkm/keymaps/default/keymap.c | 2 +- keyboards/chalice/keymaps/default/keymap.c | 2 +- keyboards/chalice/keymaps/via/keymap.c | 2 +- keyboards/charue/charon/keymaps/via/keymap.c | 2 +- keyboards/charue/sunsetter_r2/keymaps/default/keymap.c | 2 +- keyboards/charue/sunsetter_r2/keymaps/via/keymap.c | 2 +- keyboards/checkerboards/axon40/keymaps/default/keymap.c | 2 +- keyboards/checkerboards/axon40/keymaps/via/keymap.c | 4 ++-- .../checkerboards/phoenix45_ortho/keymaps/2x3u/keymap.c | 2 +- .../checkerboards/phoenix45_ortho/keymaps/default/keymap.c | 2 +- .../checkerboards/phoenix45_ortho/keymaps/via/keymap.c | 4 ++-- keyboards/checkerboards/plexus75/keymaps/default/keymap.c | 2 +- .../checkerboards/plexus75/keymaps/default_3u/keymap.c | 6 +++--- .../checkerboards/plexus75/keymaps/default_7u/keymap.c | 2 +- keyboards/checkerboards/plexus75/keymaps/via/keymap.c | 2 +- keyboards/checkerboards/plexus75_he/keymaps/2x2u/keymap.c | 2 +- keyboards/checkerboards/plexus75_he/keymaps/7u/keymap.c | 2 +- .../checkerboards/plexus75_he/keymaps/default/keymap.c | 2 +- keyboards/checkerboards/pursuit40/keymaps/default/keymap.c | 2 +- keyboards/checkerboards/pursuit40/keymaps/via/keymap.c | 2 +- keyboards/checkerboards/quark/keymaps/default/keymap.c | 2 +- keyboards/checkerboards/quark/keymaps/default_4x12/keymap.c | 2 +- .../quark/keymaps/default_4x12_2x225u/keymap.c | 2 +- .../checkerboards/quark/keymaps/default_4x12_2x3u/keymap.c | 2 +- .../checkerboards/quark/keymaps/default_5x12_2x3u/keymap.c | 2 +- keyboards/checkerboards/quark/keymaps/default_mit/keymap.c | 2 +- keyboards/checkerboards/quark/keymaps/via/keymap.c | 2 +- keyboards/checkerboards/quark_lp/keymaps/2x2u/keymap.c | 2 +- keyboards/checkerboards/quark_lp/keymaps/default/keymap.c | 2 +- keyboards/checkerboards/quark_lp/keymaps/via/keymap.c | 4 ++-- keyboards/checkerboards/quark_plus/keymaps/default/keymap.c | 2 +- keyboards/checkerboards/quark_plus/keymaps/via/keymap.c | 4 ++-- .../checkerboards/quark_squared/keymaps/default/keymap.c | 2 +- keyboards/checkerboards/quark_squared/keymaps/via/keymap.c | 4 ++-- .../checkerboards/ud40_ortho_alt/keymaps/2x3u_alt/keymap.c | 4 ++-- .../checkerboards/ud40_ortho_alt/keymaps/default/keymap.c | 2 +- keyboards/checkerboards/ud40_ortho_alt/keymaps/via/keymap.c | 2 +- keyboards/cherrybstudio/cb1800/keymaps/default/keymap.c | 2 +- keyboards/cherrybstudio/cb1800/keymaps/via/keymap.c | 2 +- keyboards/cherrybstudio/cb87rgb/keymaps/default/keymap.c | 2 +- keyboards/chickenman/ciel/keymaps/default/keymap.c | 2 +- keyboards/chickenman/ciel/keymaps/via/keymap.c | 2 +- keyboards/chickenman/ciel65/keymaps/default/keymap.c | 2 +- keyboards/chickenman/ciel65/keymaps/via/keymap.c | 2 +- keyboards/cipulot/kallos/keymaps/default/keymap.c | 2 +- keyboards/cipulot/kallos/keymaps/via/keymap.c | 2 +- keyboards/citrus/erdnuss65/keymaps/default/keymap.c | 2 +- keyboards/citrus/erdnuss65/keymaps/via/keymap.c | 2 +- keyboards/ckeys/handwire_101/keymaps/default/keymap.c | 2 +- keyboards/ckeys/thedora/keymaps/default/keymap.c | 2 +- keyboards/clawsome/coupe/keymaps/default/keymap.c | 2 +- keyboards/clawsome/sedan/keymaps/default/keymap.c | 2 +- keyboards/clueboard/60/keymaps/default/keymap.c | 2 +- keyboards/clueboard/60/keymaps/default_aek/keymap.c | 2 +- keyboards/clueboard/66/keymaps/66_ansi/keymap.c | 2 +- keyboards/clueboard/66/keymaps/66_iso/keymap.c | 2 +- keyboards/clueboard/66/keymaps/colemak/keymap.c | 2 +- keyboards/clueboard/66/keymaps/default/keymap.c | 2 +- keyboards/clueboard/66/keymaps/via/keymap.c | 2 +- .../clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c | 2 +- .../clueboard/66_hotswap/gen1/keymaps/default/keymap.c | 2 +- .../clueboard/66_hotswap/prototype/keymaps/66_ansi/keymap.c | 2 +- .../clueboard/66_hotswap/prototype/keymaps/default/keymap.c | 2 +- keyboards/coarse/cordillera/keymaps/default/keymap.c | 2 +- keyboards/coarse/cordillera/keymaps/via/keymap.c | 2 +- keyboards/coarse/ixora/keymaps/default/keymap.c | 2 +- keyboards/coarse/vinta/keymaps/default/keymap.c | 2 +- keyboards/compound/keymaps/default/keymap.c | 2 +- keyboards/compound/keymaps/via/keymap.c | 2 +- keyboards/contender/keymaps/default/keymap.c | 2 +- .../coseyfannitutti/discipline/keymaps/default/keymap.c | 2 +- keyboards/coseyfannitutti/discipline/keymaps/iso/keymap.c | 2 +- keyboards/coseyfannitutti/discipline/keymaps/via/keymap.c | 2 +- keyboards/coseyfannitutti/mullet/keymaps/default/keymap.c | 2 +- .../coseyfannitutti/mysterium/keymaps/ansi_7u/keymap.c | 2 +- .../coseyfannitutti/mysterium/keymaps/default/keymap.c | 2 +- keyboards/coseyfannitutti/mysterium/keymaps/iso/keymap.c | 2 +- keyboards/coseyfannitutti/mysterium/keymaps/via/keymap.c | 2 +- keyboards/craftwalk/keymaps/default/keymap.c | 2 +- keyboards/crawlpad/keymaps/default/keymap.c | 2 +- keyboards/crazy_keyboard_68/keymaps/default/keymap.c | 2 +- keyboards/creatkeebs/glacier/keymaps/via/keymap.c | 6 +++--- keyboards/crin/keymaps/default/keymap.c | 2 +- keyboards/crin/keymaps/via/keymap.c | 2 +- keyboards/custommk/evo70/keymaps/default/keymap.c | 2 +- keyboards/custommk/evo70/keymaps/via/keymap.c | 2 +- keyboards/cutie_club/borsdorf/keymaps/default/keymap.c | 2 +- keyboards/cutie_club/borsdorf/keymaps/via/keymap.c | 2 +- keyboards/cutie_club/wraith/keymaps/default/keymap.c | 2 +- keyboards/daji/seis_cinco/keymaps/default/keymap.c | 2 +- keyboards/daji/seis_cinco/keymaps/via/keymap.c | 2 +- keyboards/delikeeb/waaffle/keymaps/default/keymap.c | 2 +- keyboards/delikeeb/waaffle/keymaps/via/keymap.c | 2 +- keyboards/dm9records/lain/keymaps/default/keymap.c | 2 +- keyboards/dm9records/lain/keymaps/via/keymap.c | 2 +- keyboards/do60/keymaps/default/keymap.c | 2 +- keyboards/do60/keymaps/via/keymap.c | 2 +- keyboards/doodboard/duckboard/keymaps/default/keymap.c | 2 +- keyboards/doodboard/duckboard_r2/keymaps/default/keymap.c | 4 ++-- keyboards/doodboard/duckboard_r2/keymaps/via/keymap.c | 4 ++-- keyboards/doro67/multi/keymaps/default/keymap.c | 2 +- keyboards/doro67/multi/keymaps/default_iso/keymap.c | 2 +- keyboards/doro67/multi/keymaps/default_multi/keymap.c | 2 +- keyboards/doro67/multi/keymaps/via/keymap.c | 2 +- keyboards/doro67/regular/keymaps/default/keymap.c | 2 +- keyboards/doro67/regular/keymaps/via/keymap.c | 2 +- keyboards/doro67/rgb/keymaps/default/keymap.c | 2 +- keyboards/doro67/rgb/keymaps/via/keymap.c | 2 +- keyboards/dp60/keymaps/default/keymap.c | 2 +- keyboards/dp60/keymaps/via/keymap.c | 2 +- keyboards/draculad/keymaps/default/keymap.c | 2 +- keyboards/draytronics/elise/keymaps/default/keymap.c | 2 +- keyboards/draytronics/elise/keymaps/default_iso/keymap.c | 2 +- keyboards/draytronics/elise_v2/keymaps/default/keymap.c | 2 +- keyboards/draytronics/elise_v2/keymaps/default_iso/keymap.c | 2 +- keyboards/drewkeys/iskar/keymaps/via/keymap.c | 2 +- keyboards/duck/eagle_viper/v2/keymaps/default/keymap.c | 2 +- keyboards/duck/eagle_viper/v2/keymaps/via/keymap.c | 2 +- keyboards/duck/octagon/keymaps/default/keymap.c | 2 +- keyboards/duck/orion/v3/keymaps/default/keymap.c | 2 +- keyboards/duck/tcv3/keymaps/default/keymap.c | 2 +- keyboards/duck/tcv3/keymaps/via/keymap.c | 2 +- keyboards/dz60/keymaps/iso_de_root/keymap.c | 2 +- keyboards/dz60/keymaps/iso_vim_arrow/keymap.c | 2 +- keyboards/dz60/keymaps/iso_vim_arrow_split_rs/keymap.c | 2 +- keyboards/dztech/duo_s/keymaps/default/keymap.c | 2 +- keyboards/dztech/duo_s/keymaps/via/keymap.c | 2 +- keyboards/dztech/dz65rgb/keymaps/via/keymap.c | 2 +- keyboards/dztech/dz96/keymaps/default/keymap.c | 2 +- keyboards/dztech/dz96/keymaps/iso/keymap.c | 2 +- keyboards/dztech/dz96/keymaps/via/keymap.c | 2 +- keyboards/dztech/tofu/ii/keymaps/default/keymap.c | 2 +- keyboards/dztech/tofu/ii/keymaps/via/keymap.c | 2 +- keyboards/dztech/tofu/jr/keymaps/via/keymap.c | 2 +- keyboards/ealdin/quadrant/keymaps/default/keymap.c | 2 +- keyboards/ealdin/quadrant/keymaps/via/keymap.c | 2 +- keyboards/eason/capsule65/keymaps/default/keymap.c | 2 +- keyboards/eason/capsule65/keymaps/via/keymap.c | 6 +++--- keyboards/edi/hardlight/mk1/keymaps/default/keymap.c | 2 +- keyboards/edi/hardlight/mk2/keymaps/default/keymap.c | 2 +- keyboards/edinburgh41/keymaps/default/keymap.c | 2 +- keyboards/eek/keymaps/default/keymap.c | 2 +- keyboards/emajesty/eiri/keymaps/default/keymap.c | 2 +- keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c | 2 +- keyboards/ergoslab/keymaps/default/keymap.c | 2 +- keyboards/esca/getawayvan/keymaps/7u/keymap.c | 2 +- keyboards/esca/getawayvan/keymaps/default/keymap.c | 2 +- keyboards/esca/getawayvan/keymaps/via/keymap.c | 2 +- keyboards/esca/getawayvan_f042/keymaps/7u/keymap.c | 2 +- keyboards/esca/getawayvan_f042/keymaps/default/keymap.c | 2 +- keyboards/eternal_keypad/keymaps/default/keymap.c | 2 +- keyboards/eternal_keypad/keymaps/via/keymap.c | 2 +- keyboards/eve/meteor/keymaps/default/keymap.c | 2 +- keyboards/eve/meteor/keymaps/via/keymap.c | 2 +- keyboards/evyd13/atom47/keymaps/default/keymap.c | 2 +- keyboards/evyd13/atom47/keymaps/via/keymap.c | 2 +- keyboards/evyd13/eon65/keymaps/default/keymap.c | 2 +- keyboards/evyd13/eon65/keymaps/via/keymap.c | 2 +- keyboards/evyd13/eon75/keymaps/default/keymap.c | 2 +- keyboards/evyd13/eon75/keymaps/via/keymap.c | 2 +- keyboards/evyd13/eon95/keymaps/default/keymap.c | 2 +- keyboards/evyd13/eon95/keymaps/via/keymap.c | 2 +- keyboards/evyd13/gud70/keymaps/default/keymap.c | 2 +- keyboards/evyd13/gud70/keymaps/via/keymap.c | 2 +- keyboards/evyd13/quackfire/keymaps/default/keymap.c | 2 +- keyboards/evyd13/quackfire/keymaps/via/keymap.c | 2 +- keyboards/evyd13/solheim68/keymaps/default/keymap.c | 2 +- keyboards/evyd13/ta65/keymaps/default/keymap.c | 2 +- keyboards/evyd13/wasdat/keymaps/via/keymap.c | 2 +- keyboards/evyd13/wasdat_code/keymaps/default/keymap.c | 2 +- keyboards/evyd13/wasdat_code/keymaps/via/keymap.c | 2 +- .../e6_rgb/keymaps/60_ansi_split_bs_rshift/keymap.c | 2 +- keyboards/exclusive/e6_rgb/keymaps/60_tsangan_hhkb/keymap.c | 2 +- keyboards/exclusive/e6_rgb/keymaps/default/keymap.c | 2 +- keyboards/exclusive/e6_rgb/keymaps/via/keymap.c | 2 +- keyboards/exent/keymaps/default/keymap.c | 2 +- keyboards/exent/keymaps/via/keymap.c | 2 +- .../eyeohdesigns/theboulevard/keymaps/default/keymap.c | 2 +- keyboards/fallacy/keymaps/default/keymap.c | 2 +- keyboards/fallacy/keymaps/default_split_bs/keymap.c | 2 +- keyboards/fallacy/keymaps/via/keymap.c | 2 +- keyboards/feels/feels65/keymaps/default/keymap.c | 2 +- keyboards/feels/feels65/keymaps/via/keymap.c | 2 +- keyboards/fjlabs/ad65/keymaps/default/keymap.c | 2 +- keyboards/fjlabs/ad65/keymaps/via/keymap.c | 2 +- keyboards/fjlabs/bks65solder/keymaps/default/keymap.c | 2 +- keyboards/fjlabs/bks65solder/keymaps/via/keymap.c | 2 +- keyboards/fleuron/keymaps/default/keymap.c | 2 +- keyboards/flx/virgo/keymaps/default/keymap.c | 2 +- keyboards/flx/virgo/keymaps/via/keymap.c | 2 +- keyboards/for_science/keymaps/default/keymap.c | 2 +- keyboards/forever65/keymaps/via/keymap.c | 2 +- keyboards/foxlab/key65/hotswap/keymaps/default/keymap.c | 2 +- keyboards/foxlab/key65/hotswap/keymaps/via/keymap.c | 2 +- keyboards/foxlab/key65/universal/keymaps/default/keymap.c | 2 +- keyboards/foxlab/key65/universal/keymaps/via/keymap.c | 2 +- keyboards/foxlab/time80/keymaps/default/keymap.c | 2 +- keyboards/foxlab/time_re/hotswap/keymaps/default/keymap.c | 2 +- keyboards/foxlab/time_re/hotswap/keymaps/via/keymap.c | 2 +- keyboards/foxlab/time_re/universal/keymaps/default/keymap.c | 2 +- keyboards/foxlab/time_re/universal/keymaps/via/keymap.c | 2 +- keyboards/gami_studio/lex60/keymaps/default/keymap.c | 2 +- .../ggkeyboards/genesis/hotswap/keymaps/default/keymap.c | 2 +- keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c | 2 +- .../ggkeyboards/genesis/solder/keymaps/default/keymap.c | 2 +- keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c | 2 +- keyboards/gh60/revc/keymaps/via/keymap.c | 2 +- keyboards/gh60/satan/keymaps/iso_split_rshift/keymap.c | 2 +- keyboards/gh60/satan/keymaps/via/keymap.c | 2 +- keyboards/gh60/v1p3/keymaps/default/keymap.c | 2 +- keyboards/gh60/v1p3/keymaps/default_ansi/keymap.c | 2 +- keyboards/gkeyboard/gkb_m16/keymaps/via/keymap.c | 2 +- keyboards/gl516/a52gl/keymaps/default/keymap.c | 2 +- keyboards/gl516/a52gl/keymaps/via/keymap.c | 2 +- keyboards/gl516/j73gl/keymaps/default/keymap.c | 2 +- keyboards/gl516/j73gl/keymaps/via/keymap.c | 2 +- keyboards/gl516/n51gl/keymaps/default/keymap.c | 2 +- keyboards/gl516/n51gl/keymaps/via/keymap.c | 2 +- keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c | 2 +- keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c | 2 +- keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c | 2 +- keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c | 2 +- keyboards/gon/nerd60/keymaps/default/keymap.c | 2 +- keyboards/gon/nerd60/keymaps/via/keymap.c | 2 +- keyboards/gon/nerdtkl/keymaps/default/keymap.c | 2 +- keyboards/gray_studio/apollo80/keymaps/default/keymap.c | 2 +- keyboards/gray_studio/apollo80/keymaps/via/keymap.c | 2 +- keyboards/gray_studio/space65/keymaps/iso/keymap.c | 2 +- keyboards/gray_studio/space65/keymaps/via/keymap.c | 2 +- .../gray_studio/think65/hotswap/keymaps/default/keymap.c | 2 +- keyboards/gray_studio/think65/hotswap/keymaps/via/keymap.c | 2 +- .../gray_studio/think65/solder/keymaps/default/keymap.c | 2 +- keyboards/gray_studio/think65/solder/keymaps/via/keymap.c | 2 +- keyboards/gregandcin/teaqueen/keymaps/default/keymap.c | 2 +- keyboards/gregandcin/teaqueen/keymaps/via/keymap.c | 2 +- keyboards/hadron/ver2/keymaps/default/keymap.c | 2 +- keyboards/halokeys/elemental75/keymaps/default/keymap.c | 2 +- keyboards/halokeys/elemental75/keymaps/via/keymap.c | 2 +- keyboards/han60/keymaps/via/keymap.c | 2 +- keyboards/handwired/3dfoxc/keymaps/default/keymap.c | 2 +- keyboards/handwired/amigopunk/keymaps/default/keymap.c | 2 +- keyboards/handwired/arrow_pad/keymaps/default/keymap.c | 2 +- keyboards/handwired/baredev/rev1/keymaps/default/keymap.c | 2 +- keyboards/handwired/baredev/rev1/keymaps/via/keymap.c | 2 +- .../boss566y/redragon_vara/keymaps/default/keymap.c | 4 ++-- .../handwired/boss566y/redragon_vara/keymaps/via/keymap.c | 4 ++-- keyboards/handwired/carpolly/keymaps/default/keymap.c | 2 +- keyboards/handwired/co60/keymaps/default/keymap.c | 2 +- keyboards/handwired/dactyl/keymaps/default/keymap.c | 2 +- keyboards/handwired/dactyl/keymaps/dvorak/keymap.c | 2 +- .../handwired/dactyl_manuform/4x6/keymaps/default/keymap.c | 4 ++-- .../handwired/dactyl_manuform/4x6/keymaps/via/keymap.c | 4 ++-- .../dactyl_manuform/4x6_5/keymaps/default/keymap.c | 4 ++-- .../dactyl_manuform/5x6_6/keymaps/default/keymap.c | 2 +- keyboards/handwired/ddg_56/keymaps/default/keymap.c | 2 +- keyboards/handwired/dmote/keymaps/default/keymap.c | 2 +- keyboards/handwired/frenchdev/keymaps/default/keymap.c | 2 +- keyboards/handwired/hnah108/keymaps/default/keymap.c | 2 +- keyboards/handwired/hnah40rgb/keymaps/ansi/keymap.c | 2 +- keyboards/handwired/hnah40rgb/keymaps/default/keymap.c | 2 +- .../handwired/ibm_wheelwriter/keymaps/default/keymap.c | 2 +- keyboards/handwired/ibm_wheelwriter/keymaps/via/keymap.c | 2 +- keyboards/handwired/jn68m/keymaps/default/keymap.c | 2 +- keyboards/handwired/jot50/keymaps/default/keymap.c | 2 +- keyboards/handwired/jotanck/keymaps/default/keymap.c | 2 +- keyboards/handwired/macroboard/keymaps/default/keymap.c | 2 +- keyboards/handwired/macroboard/keymaps/via/keymap.c | 2 +- .../handwired/obuwunkunubi/spaget/keymaps/default/keymap.c | 2 +- keyboards/handwired/ortho5x13/keymaps/default/keymap.c | 2 +- keyboards/handwired/ortho5x14/keymaps/default/keymap.c | 2 +- keyboards/handwired/p65rgb/keymaps/default/keymap.c | 2 +- keyboards/handwired/pilcrow/keymaps/default/keymap.c | 2 +- keyboards/handwired/polly40/keymaps/default/keymap.c | 2 +- keyboards/handwired/polly40/keymaps/via/keymap.c | 2 +- keyboards/handwired/prkl30/keymaps/default/keymap.c | 2 +- keyboards/handwired/pterodactyl/keymaps/default/keymap.c | 2 +- keyboards/handwired/pteron38/keymaps/default/keymap.c | 2 +- keyboards/handwired/pteron44/keymaps/default/keymap.c | 2 +- keyboards/handwired/reclined/keymaps/default/keymap.c | 2 +- keyboards/handwired/sono1/keymaps/default/keymap.c | 2 +- keyboards/handwired/space_oddity/keymaps/default/keymap.c | 2 +- .../handwired/swiftrax/digicarp65/keymaps/default/keymap.c | 2 +- .../handwired/swiftrax/digicarp65/keymaps/via/keymap.c | 2 +- .../handwired/swiftrax/digicarpice/keymaps/default/keymap.c | 2 +- .../handwired/swiftrax/digicarpice/keymaps/via/keymap.c | 2 +- .../handwired/swiftrax/equator/keymaps/default/keymap.c | 2 +- keyboards/handwired/swiftrax/equator/keymaps/via/keymap.c | 2 +- .../handwired/swiftrax/walter/keymaps/default/keymap.c | 2 +- keyboards/handwired/swiftrax/walter/keymaps/via/keymap.c | 2 +- .../tractyl_manuform/4x6_right/keymaps/default/keymap.c | 4 ++-- keyboards/handwired/tritium_numpad/keymaps/default/keymap.c | 2 +- keyboards/handwired/videowriter/keymaps/default/keymap.c | 2 +- keyboards/handwired/videowriter/keymaps/oleg/keymap.c | 2 +- keyboards/handwired/wulkan/keymaps/default/keymap.c | 2 +- keyboards/hardlineworks/otd_plus/keymaps/default/keymap.c | 2 +- keyboards/heliar/wm1_hotswap/keymaps/default/keymap.c | 2 +- keyboards/helix/pico/keymaps/default/keymap.c | 2 +- keyboards/helix/rev2/keymaps/default/keymap.c | 2 +- keyboards/helix/rev3_4rows/keymaps/via/keymap.c | 2 +- keyboards/helix/rev3_5rows/keymaps/via/keymap.c | 2 +- keyboards/hhkb_lite_2/keymaps/default/keymap.c | 2 +- keyboards/hhkb_lite_2/keymaps/via/keymap.c | 2 +- keyboards/hidtech/bastyl/keymaps/default/keymap.c | 2 +- keyboards/hineybush/h101/keymaps/default/keymap.c | 2 +- keyboards/hineybush/h101/keymaps/via/keymap.c | 2 +- keyboards/hineybush/h60/keymaps/default/keymap.c | 2 +- keyboards/hineybush/h65/keymaps/default/keymap.c | 2 +- keyboards/hineybush/h65/keymaps/via/keymap.c | 2 +- keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c | 2 +- keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c | 2 +- keyboards/hineybush/h660s/keymaps/default/keymap.c | 2 +- keyboards/hineybush/h660s/keymaps/via/keymap.c | 2 +- keyboards/hineybush/h75_singa/keymaps/default/keymap.c | 2 +- keyboards/hineybush/h75_singa/keymaps/via/keymap.c | 2 +- keyboards/hineybush/h87a/keymaps/default/keymap.c | 2 +- keyboards/hineybush/h87a/keymaps/via/keymap.c | 6 +++--- keyboards/hineybush/h87a/keymaps/wkl/keymap.c | 2 +- keyboards/hineybush/h88/keymaps/default/keymap.c | 2 +- keyboards/hineybush/h88/keymaps/via/keymap.c | 2 +- keyboards/hineybush/h88/keymaps/wkl/keymap.c | 2 +- keyboards/hineybush/physix/keymaps/via/keymap.c | 2 +- keyboards/hineybush/sm68/keymaps/default/keymap.c | 2 +- keyboards/hineybush/sm68/keymaps/via/keymap.c | 2 +- keyboards/hnahkb/freyr/keymaps/default/keymap.c | 2 +- keyboards/hnahkb/stella/keymaps/default/keymap.c | 2 +- keyboards/horrortroll/paws60/keymaps/default/keymap.c | 2 +- keyboards/horrortroll/paws60/keymaps/via/keymap.c | 2 +- keyboards/hp69/keymaps/default/keymap.c | 2 +- keyboards/hp69/keymaps/via/keymap.c | 2 +- keyboards/hs60/v2/ansi/keymaps/default/keymap.c | 2 +- keyboards/hs60/v2/ansi/keymaps/via/keymap.c | 2 +- keyboards/hs60/v2/hhkb/keymaps/default/keymap.c | 2 +- keyboards/hs60/v2/hhkb/keymaps/via/keymap.c | 2 +- keyboards/hs60/v2/iso/keymaps/iso_andys8/keymap.c | 2 +- .../ibm/model_m_122/m122_3270/keymaps/default/keymap.c | 2 +- keyboards/ibnuda/alicia_cook/keymaps/default/keymap.c | 2 +- keyboards/ibnuda/gurindam/keymaps/default/keymap.c | 2 +- keyboards/ibnuda/gurindam/keymaps/via/keymap.c | 2 +- keyboards/ibnuda/squiggle/keymaps/default/keymap.c | 2 +- keyboards/ibnuda/squiggle/keymaps/default38/keymap.c | 2 +- keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c | 2 +- keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c | 2 +- keyboards/idb/idb_60/keymaps/default/keymap.c | 2 +- keyboards/idb/idb_60/keymaps/via/keymap.c | 2 +- keyboards/idobao/id75/keymaps/default75/keymap.c | 2 +- keyboards/idobao/id87/v1/keymaps/default/keymap.c | 2 +- keyboards/idobao/id87/v1/keymaps/via/keymap.c | 2 +- keyboards/idobao/id96/keymaps/default/keymap.c | 2 +- keyboards/idobao/id96/keymaps/via/keymap.c | 2 +- keyboards/idobao/montex/v1/keymaps/default/keymap.c | 2 +- keyboards/idobao/montex/v1/keymaps/via/keymap.c | 2 +- keyboards/illusion/rosa/keymaps/via/keymap.c | 2 +- keyboards/ilumkb/primus75/keymaps/default/keymap.c | 2 +- keyboards/ilumkb/primus75/keymaps/via/keymap.c | 2 +- keyboards/inett_studio/sqx/hotswap/keymaps/default/keymap.c | 2 +- keyboards/inett_studio/sqx/hotswap/keymaps/via/keymap.c | 2 +- .../inett_studio/sqx/universal/keymaps/default/keymap.c | 2 +- keyboards/inett_studio/sqx/universal/keymaps/via/keymap.c | 2 +- keyboards/irene/keymaps/default/keymap.c | 2 +- keyboards/irene/keymaps/via/keymap.c | 2 +- keyboards/iriskeyboards/keymaps/default/keymap.c | 2 +- keyboards/iriskeyboards/keymaps/via/keymap.c | 2 +- keyboards/j80/keymaps/default/keymap.c | 2 +- keyboards/j80/keymaps/default_iso/keymap.c | 2 +- keyboards/jacky_studio/bear_65/keymaps/default/keymap.c | 2 +- keyboards/jacky_studio/bear_65/keymaps/via/keymap.c | 2 +- .../jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c | 2 +- .../jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c | 2 +- keyboards/jae/j01/keymaps/default/keymap.c | 2 +- keyboards/jiran/keymaps/default/keymap.c | 2 +- keyboards/jiran/keymaps/via/keymap.c | 2 +- keyboards/jkeys_design/gentleman65/keymaps/default/keymap.c | 2 +- keyboards/jkeys_design/gentleman65/keymaps/via/keymap.c | 2 +- keyboards/jones/v03/keymaps/default_jp/keymap.c | 2 +- keyboards/joshajohnson/hub16/keymaps/default/keymap.c | 2 +- keyboards/joshajohnson/hub16/keymaps/via/keymap.c | 2 +- keyboards/joshajohnson/hub20/keymaps/default/keymap.c | 2 +- .../joshajohnson/hub20/keymaps/left_hand_numpad/keymap.c | 2 +- .../joshajohnson/hub20/keymaps/right_hand_numpad/keymap.c | 2 +- keyboards/joshajohnson/hub20/keymaps/via/keymap.c | 2 +- keyboards/kagizaraya/chidori/keymaps/default/keymap.c | 2 +- keyboards/kagizaraya/halberd/keymaps/default/keymap.c | 2 +- keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c | 2 +- keyboards/kapcave/paladinpad/keymaps/via/keymap.c | 2 +- keyboards/karlb/kbic65/keymaps/default/keymap.c | 2 +- keyboards/karlb/kbic65/keymaps/default_iso/keymap.c | 2 +- .../karlb/kbic65/keymaps/default_iso_split_bs/keymap.c | 2 +- keyboards/karlb/kbic65/keymaps/via/keymap.c | 2 +- keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c | 6 +++--- keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c | 6 +++--- .../kbdfans/baguette66/soldered/keymaps/default/keymap.c | 6 +++--- keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c | 6 +++--- .../kbdfans/bounce/75/soldered/keymaps/default/keymap.c | 6 +++--- .../bounce/75/soldered/keymaps/default_ansi/keymap.c | 6 +++--- .../75/soldered/keymaps/default_ansi_split_bs/keymap.c | 6 +++--- .../kbdfans/bounce/75/soldered/keymaps/default_iso/keymap.c | 6 +++--- .../75/soldered/keymaps/default_iso_split_bs/keymap.c | 6 +++--- keyboards/kbdfans/bounce/75/soldered/keymaps/via/keymap.c | 6 +++--- keyboards/kbdfans/epoch80/keymaps/default/keymap.c | 2 +- keyboards/kbdfans/epoch80/keymaps/iso/keymap.c | 2 +- keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c | 2 +- keyboards/kbdfans/epoch80/keymaps/via/keymap.c | 6 +++--- keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c | 2 +- keyboards/kbdfans/kbd19x/keymaps/default/keymap.c | 2 +- keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c | 2 +- keyboards/kbdfans/kbd19x/keymaps/via/keymap.c | 2 +- keyboards/kbdfans/kbd67/hotswap/keymaps/default/keymap.c | 2 +- keyboards/kbdfans/kbd67/hotswap/keymaps/via/keymap.c | 2 +- keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/keymap.c | 2 +- .../kbdfans/kbd67/mkii_soldered/keymaps/default/keymap.c | 2 +- keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/keymap.c | 2 +- keyboards/kbdfans/kbd67/mkii_soldered/keymaps/via/keymap.c | 2 +- keyboards/kbdfans/kbd6x/keymaps/via/keymap.c | 2 +- keyboards/kbdfans/kbd75/keymaps/default/keymap.c | 2 +- keyboards/kbdfans/kbd75/keymaps/iso/keymap.c | 2 +- keyboards/kbdfans/kbd75/keymaps/via/keymap.c | 2 +- keyboards/kbdfans/kbd75hs/keymaps/default/keymap.c | 6 +++--- keyboards/kbdfans/kbd75hs/keymaps/via/keymap.c | 6 +++--- keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c | 6 +++--- keyboards/kbdfans/kbd75rgb/keymaps/via/keymap.c | 6 +++--- keyboards/kbdfans/kbd8x/keymaps/default/keymap.c | 2 +- .../kbdfans/kbd8x/keymaps/default_backlighting/keymap.c | 2 +- keyboards/kbdfans/niu_mini/keymaps/default/keymap.c | 2 +- keyboards/kbdfans/niu_mini/keymaps/via/keymap.c | 4 ++-- keyboards/kbnordic/nordic60/keymaps/default/keymap.c | 2 +- keyboards/kbnordic/nordic60/keymaps/default_ansi/keymap.c | 2 +- keyboards/kbnordic/nordic60/keymaps/via/keymap.c | 2 +- keyboards/keebio/dilly/keymaps/default/keymap.c | 2 +- keyboards/keebio/dsp40/keymaps/default/keymap.c | 2 +- keyboards/keebio/dsp40/keymaps/via/keymap.c | 2 +- keyboards/keebio/foldkb/keymaps/default/keymap.c | 2 +- keyboards/keebio/foldkb/keymaps/via/keymap.c | 2 +- keyboards/keebio/fourier/keymaps/default/keymap.c | 2 +- keyboards/keebio/fourier/keymaps/via/keymap.c | 2 +- keyboards/keebio/laplace/keymaps/default/keymap.c | 2 +- keyboards/keebio/levinson/keymaps/default/keymap.c | 2 +- keyboards/keebio/rorschach/keymaps/default/keymap.c | 2 +- keyboards/keebio/wavelet/keymaps/default/keymap.c | 2 +- keyboards/keebwerk/mega/ansi/keymaps/default/keymap.c | 2 +- keyboards/keebwerk/mega/ansi/keymaps/via/keymap.c | 2 +- keyboards/keebzdotnet/fme/keymaps/default/keymap.c | 2 +- keyboards/keebzdotnet/fme/keymaps/via/keymap.c | 2 +- keyboards/keybage/radpad/keymaps/default/keymap.c | 2 +- keyboards/keyboardio/atreus/keymaps/default/keymap.c | 2 +- keyboards/keyboardio/atreus/keymaps/via/keymap.c | 2 +- keyboards/keycapsss/kimiko/keymaps/default/keymap.c | 2 +- keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c | 2 +- keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c | 2 +- keyboards/keyhive/absinthe/keymaps/ansi/keymap.c | 2 +- keyboards/keyhive/absinthe/keymaps/default/keymap.c | 2 +- keyboards/keyprez/unicorn/keymaps/default/keymap.c | 2 +- keyboards/kin80/keymaps/default/keymap.c | 2 +- keyboards/kingly_keys/little_foot/keymaps/default/keymap.c | 2 +- keyboards/kira/kira80/keymaps/ansi/keymap.c | 2 +- keyboards/kira/kira80/keymaps/default/keymap.c | 2 +- keyboards/kira/kira80/keymaps/iso/keymap.c | 2 +- keyboards/kira/kira80/keymaps/via/keymap.c | 2 +- keyboards/kiwikey/borderland/keymaps/default/keymap.c | 2 +- keyboards/kiwikey/borderland/keymaps/via/keymap.c | 2 +- keyboards/kiwikey/wanderland/keymaps/default/keymap.c | 2 +- keyboards/kiwikey/wanderland/keymaps/via/keymap.c | 2 +- keyboards/kkatano/bakeneko60/keymaps/default/keymap.c | 2 +- keyboards/kkatano/bakeneko60/keymaps/via/keymap.c | 2 +- keyboards/kkatano/bakeneko65/rev2/keymaps/default/keymap.c | 2 +- keyboards/kkatano/bakeneko65/rev2/keymaps/via/keymap.c | 2 +- keyboards/kkatano/bakeneko65/rev3/keymaps/default/keymap.c | 2 +- keyboards/kkatano/bakeneko65/rev3/keymaps/via/keymap.c | 2 +- keyboards/kkatano/bakeneko80/keymaps/default/keymap.c | 2 +- keyboards/kmini/keymaps/default/keymap.c | 2 +- keyboards/kopibeng/mnk60/keymaps/default/keymap.c | 2 +- keyboards/kopibeng/mnk60/keymaps/via/keymap.c | 2 +- keyboards/kopibeng/mnk88/keymaps/default/keymap.c | 2 +- keyboards/kopibeng/mnk88/keymaps/via/keymap.c | 2 +- keyboards/kopibeng/xt60/keymaps/default/keymap.c | 2 +- keyboards/kopibeng/xt60/keymaps/via/keymap.c | 2 +- keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c | 2 +- keyboards/kopibeng/xt60_singa/keymaps/via/keymap.c | 2 +- keyboards/kopibeng/xt87/keymaps/default/keymap.c | 2 +- keyboards/kopibeng/xt87/keymaps/via/keymap.c | 2 +- keyboards/kopibeng/xt8x/keymaps/default/keymap.c | 2 +- keyboards/kopibeng/xt8x/keymaps/via/keymap.c | 2 +- keyboards/kprepublic/bm16a/v1/keymaps/via/keymap.c | 2 +- keyboards/kprepublic/bm16s/keymaps/default/keymap.c | 2 +- keyboards/kprepublic/bm16s/keymaps/via/keymap.c | 2 +- keyboards/kprepublic/bm40hsrgb/rev2/keymaps/via/keymap.c | 2 +- keyboards/kprepublic/bm43a/keymaps/default/keymap.c | 2 +- keyboards/kprepublic/bm43hsrgb/keymaps/default/keymap.c | 2 +- .../kprepublic/bm60hsrgb/rev1/keymaps/default/keymap.c | 2 +- keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/keymap.c | 2 +- .../kprepublic/bm60hsrgb_ec/rev1/keymaps/default/keymap.c | 2 +- keyboards/kprepublic/bm60hsrgb_ec/rev1/keymaps/via/keymap.c | 6 +++--- .../kprepublic/bm60hsrgb_ec/rev2/keymaps/default/keymap.c | 2 +- keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/via/keymap.c | 2 +- .../kprepublic/bm60hsrgb_iso/rev1/keymaps/default/keymap.c | 2 +- .../bm60hsrgb_poker/rev1/keymaps/default/keymap.c | 2 +- .../kprepublic/bm60hsrgb_poker/rev1/keymaps/via/keymap.c | 2 +- .../kprepublic/bm65hsrgb_iso/rev1/keymaps/default/keymap.c | 2 +- .../kprepublic/bm65hsrgb_iso/rev1/keymaps/via/keymap.c | 2 +- keyboards/kprepublic/bm80v2/keymaps/default/keymap.c | 2 +- keyboards/kprepublic/bm80v2/keymaps/via/keymap.c | 2 +- keyboards/kprepublic/bm80v2_iso/keymaps/default/keymap.c | 2 +- keyboards/kprepublic/bm80v2_iso/keymaps/via/keymap.c | 2 +- keyboards/kprepublic/cospad/keymaps/default/keymap.c | 2 +- keyboards/kprepublic/cospad/keymaps/via/keymap.c | 2 +- keyboards/kprepublic/jj4x4/keymaps/via/keymap.c | 2 +- keyboards/kprepublic/jj50/keymaps/default/keymap.c | 2 +- keyboards/kprepublic/jj50/keymaps/via/keymap.c | 2 +- keyboards/kradoindustries/krado66/keymaps/default/keymap.c | 4 ++-- keyboards/kradoindustries/krado66/keymaps/via/keymap.c | 4 ++-- keyboards/ktec/daisy/keymaps/default/keymap.c | 2 +- keyboards/ktec/daisy/keymaps/via/keymap.c | 2 +- keyboards/ky01/keymaps/default/keymap.c | 2 +- keyboards/lazydesigners/bolt/keymaps/default/keymap.c | 4 ++-- keyboards/lazydesigners/bolt/keymaps/via/keymap.c | 4 ++-- keyboards/lazydesigners/cassette8/keymaps/default/keymap.c | 2 +- keyboards/lazydesigners/cassette8/keymaps/via/keymap.c | 2 +- .../lazydesigners/dimple/ortho/keymaps/default/keymap.c | 2 +- keyboards/lazydesigners/dimple/ortho/keymaps/via/keymap.c | 2 +- .../dimple/staggered/rev3/keymaps/default/keymap.c | 2 +- keyboards/lazydesigners/dimpleplus/keymaps/default/keymap.c | 2 +- .../lazydesigners/dimpleplus/keymaps/default_7u/keymap.c | 2 +- keyboards/lazydesigners/dimpleplus/keymaps/via/keymap.c | 2 +- keyboards/lazydesigners/the30/keymaps/via/keymap.c | 2 +- keyboards/lazydesigners/the40/keymaps/default/keymap.c | 2 +- keyboards/lazydesigners/the40/keymaps/via/keymap.c | 2 +- keyboards/lazydesigners/the60/rev2/keymaps/default/keymap.c | 2 +- keyboards/lazydesigners/the60/rev2/keymaps/via/keymap.c | 2 +- keyboards/leeku/finger65/keymaps/default/keymap.c | 2 +- keyboards/lets_split/keymaps/default/keymap.c | 2 +- keyboards/lets_split/keymaps/via/keymap.c | 4 ++-- keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c | 2 +- keyboards/lime/keymaps/default/keymap.c | 2 +- keyboards/linworks/fave87/keymaps/default/keymap.c | 2 +- keyboards/linworks/fave87/keymaps/via/keymap.c | 2 +- keyboards/lm_keyboard/lm60n/keymaps/default/keymap.c | 2 +- keyboards/lm_keyboard/lm60n/keymaps/via/keymap.c | 2 +- keyboards/lucid/alexa/keymaps/default/keymap.c | 2 +- keyboards/lucid/alexa/keymaps/via/keymap.c | 2 +- keyboards/lucid/alexa_solder/keymaps/default/keymap.c | 2 +- keyboards/lucid/alexa_solder/keymaps/via/keymap.c | 2 +- keyboards/lucid/phantom_solder/keymaps/default/keymap.c | 2 +- keyboards/lucid/phantom_solder/keymaps/via/keymap.c | 2 +- keyboards/lyso1/lck75/keymaps/7u/keymap.c | 2 +- keyboards/lyso1/lck75/keymaps/7u_iso/keymap.c | 2 +- keyboards/lyso1/lck75/keymaps/7u_sbs/keymap.c | 2 +- keyboards/lyso1/lck75/keymaps/default/keymap.c | 2 +- keyboards/lyso1/lck75/keymaps/iso/keymap.c | 2 +- keyboards/lyso1/lck75/keymaps/iso_sbs/keymap.c | 2 +- keyboards/lyso1/lck75/keymaps/via/keymap.c | 6 +++--- keyboards/lyso1/lefishe/keymaps/default/keymap.c | 2 +- keyboards/lyso1/lefishe/keymaps/wkl/keymap.c | 2 +- keyboards/makenova/omega/omega4/keymaps/default/keymap.c | 2 +- .../makenova/omega/omega4/keymaps/default_6u_bar/keymap.c | 2 +- keyboards/maple_computing/minidox/keymaps/default/keymap.c | 2 +- keyboards/marksard/leftover30/keymaps/default/keymap.c | 2 +- .../marksard/leftover30/keymaps/default_isoenter/keymap.c | 2 +- keyboards/marksard/rhymestone/keymaps/default/keymap.c | 2 +- keyboards/marksard/treadstone32/keymaps/default/keymap.c | 2 +- keyboards/marksard/treadstone48/keymaps/default/keymap.c | 2 +- keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c | 2 +- .../marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c | 2 +- keyboards/matrix/abelx/keymaps/default/keymap.c | 2 +- keyboards/matrix/abelx/keymaps/iso/keymap.c | 2 +- keyboards/matrix/cain_re/keymaps/default/keymap.c | 2 +- keyboards/matrix/falcon/keymaps/default/keymap.c | 2 +- keyboards/matrix/m12og/rev1/keymaps/default/keymap.c | 2 +- keyboards/matrix/m12og/rev2/keymaps/default/keymap.c | 2 +- keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c | 2 +- keyboards/matrix/m12og/rev2/keymaps/via/keymap.c | 2 +- keyboards/matrix/m20add/keymaps/default/keymap.c | 2 +- keyboards/matrix/m20add/keymaps/iso/keymap.c | 2 +- keyboards/mb44/keymaps/default/keymap.c | 2 +- keyboards/mb44/keymaps/via/keymap.c | 2 +- keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c | 2 +- keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c | 2 +- keyboards/mechanickeys/undead60m/keymaps/default/keymap.c | 2 +- keyboards/mechanickeys/undead60m/keymaps/via/keymap.c | 2 +- keyboards/mechkeys/espectro/keymaps/default/keymap.c | 2 +- keyboards/mechkeys/espectro/keymaps/iso/keymap.c | 2 +- keyboards/mechkeys/mk60/keymaps/default/keymap.c | 2 +- .../mechwild/mokulua/mirrored/keymaps/default/keymap.c | 2 +- keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c | 2 +- keyboards/mehkee96/keymaps/default/keymap.c | 2 +- keyboards/melgeek/mach80/keymaps/default/keymap.c | 2 +- keyboards/melgeek/mach80/keymaps/via/keymap.c | 2 +- keyboards/melgeek/mach80/keymaps/wkl/keymap.c | 2 +- keyboards/meow65/keymaps/default/keymap.c | 2 +- keyboards/meow65/keymaps/via/keymap.c | 2 +- keyboards/meson/keymaps/default/keymap.c | 2 +- keyboards/miuni32/keymaps/default/keymap.c | 2 +- keyboards/mlego/m60/keymaps/via/keymap.c | 2 +- keyboards/mntre/keymaps/default/keymap.c | 2 +- keyboards/mode/m80v1/m80h/keymaps/default/keymap.c | 2 +- keyboards/mode/m80v1/m80h/keymaps/via/keymap.c | 2 +- keyboards/mode/m80v1/m80s/keymaps/default/keymap.c | 2 +- keyboards/mode/m80v1/m80s/keymaps/via/keymap.c | 2 +- keyboards/mokey/ginkgo65/keymaps/default/keymap.c | 2 +- keyboards/mokey/ginkgo65/keymaps/via/keymap.c | 2 +- keyboards/mokey/ginkgo65hot/keymaps/via/keymap.c | 2 +- keyboards/momoka_ergo/keymaps/default/keymap.c | 2 +- keyboards/momoka_ergo/keymaps/via/keymap.c | 2 +- keyboards/monarch/keymaps/default/keymap.c | 2 +- keyboards/monarch/keymaps/iso/keymap.c | 2 +- keyboards/monarch/keymaps/via/keymap.c | 2 +- keyboards/montsinger/rebound/rev1/keymaps/default/keymap.c | 2 +- keyboards/montsinger/rebound/rev2/keymaps/default/keymap.c | 2 +- keyboards/montsinger/rebound/rev3/keymaps/default/keymap.c | 2 +- keyboards/montsinger/rebound/rev4/keymaps/default/keymap.c | 2 +- keyboards/montsinger/rebound/rev4/keymaps/via/keymap.c | 2 +- keyboards/montsinger/rewind/keymaps/default/keymap.c | 2 +- keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c | 2 +- keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c | 2 +- keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c | 2 +- keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c | 2 +- keyboards/mt/blocked65/keymaps/default/keymap.c | 4 ++-- keyboards/mt/blocked65/keymaps/via/keymap.c | 4 ++-- keyboards/mt/mt980/keymaps/default/keymap.c | 4 ++-- keyboards/mwstudio/alicekk/keymaps/default/keymap.c | 2 +- keyboards/mwstudio/alicekk/keymaps/via/keymap.c | 2 +- keyboards/mwstudio/mw65_black/keymaps/default/keymap.c | 2 +- keyboards/mwstudio/mw65_black/keymaps/via/keymap.c | 2 +- keyboards/mwstudio/mw75r2/keymaps/default/keymap.c | 2 +- keyboards/mwstudio/mw75r2/keymaps/via/keymap.c | 2 +- keyboards/mwstudio/mw80/keymaps/default/keymap.c | 2 +- keyboards/mwstudio/mw80/keymaps/via/keymap.c | 2 +- keyboards/mysticworks/wyvern/keymaps/default/keymap.c | 2 +- keyboards/mysticworks/wyvern/keymaps/via/keymap.c | 2 +- keyboards/neokeys/g67/element_hs/keymaps/default/keymap.c | 2 +- keyboards/neokeys/g67/element_hs/keymaps/via/keymap.c | 2 +- keyboards/neokeys/g67/hotswap/keymaps/default/keymap.c | 2 +- keyboards/neokeys/g67/hotswap/keymaps/via/keymap.c | 2 +- keyboards/neokeys/g67/soldered/keymaps/default/keymap.c | 2 +- keyboards/neokeys/g67/soldered/keymaps/via/keymap.c | 2 +- keyboards/neson_design/n6/keymaps/default/keymap.c | 2 +- keyboards/neson_design/n6/keymaps/via/keymap.c | 2 +- .../nightingale_studios/hailey/keymaps/default/keymap.c | 2 +- keyboards/nightingale_studios/hailey/keymaps/via/keymap.c | 2 +- .../nightly_boards/alter/rev1/keymaps/default/keymap.c | 2 +- .../nightly_boards/alter_lite/keymaps/default/keymap.c | 2 +- keyboards/nightly_boards/alter_lite/keymaps/via/keymap.c | 2 +- keyboards/nightly_boards/n60_s/keymaps/default/keymap.c | 2 +- keyboards/nightly_boards/n60_s/keymaps/tsangan/keymap.c | 2 +- keyboards/nightly_boards/n60_s/keymaps/via/keymap.c | 2 +- keyboards/nightly_boards/paraluman/keymaps/default/keymap.c | 2 +- keyboards/nightly_boards/paraluman/keymaps/tsangan/keymap.c | 2 +- keyboards/nightly_boards/paraluman/keymaps/via/keymap.c | 6 +++--- keyboards/nightly_boards/ph_arisu/keymaps/default/keymap.c | 2 +- keyboards/nightly_boards/ph_arisu/keymaps/via/keymap.c | 2 +- keyboards/nix_studio/n60_a/keymaps/default/keymap.c | 2 +- keyboards/nix_studio/n60_a/keymaps/via/keymap.c | 2 +- keyboards/nix_studio/oxalys80/keymaps/default/keymap.c | 2 +- keyboards/nix_studio/oxalys80/keymaps/via/keymap.c | 6 +++--- keyboards/novelkeys/nk65/keymaps/default/keymap.c | 2 +- keyboards/novelkeys/nk65/keymaps/via/keymap.c | 2 +- keyboards/novelkeys/nk87/keymaps/default/keymap.c | 2 +- keyboards/novelkeys/nk87/keymaps/via/keymap.c | 2 +- keyboards/noxary/260/keymaps/default/keymap.c | 2 +- keyboards/noxary/260/keymaps/via/keymap.c | 2 +- keyboards/noxary/268/keymaps/ansi/keymap.c | 2 +- keyboards/noxary/268/keymaps/default/keymap.c | 2 +- keyboards/noxary/268/keymaps/iso/keymap.c | 2 +- keyboards/noxary/268/keymaps/via/keymap.c | 2 +- keyboards/noxary/268_2/keymaps/default/keymap.c | 2 +- keyboards/noxary/268_2/keymaps/via/keymap.c | 2 +- keyboards/noxary/268_2_rgb/keymaps/default/keymap.c | 2 +- keyboards/noxary/268_2_rgb/keymaps/via/keymap.c | 2 +- keyboards/noxary/280/keymaps/default/keymap.c | 2 +- keyboards/noxary/280/keymaps/via/keymap.c | 2 +- keyboards/noxary/vulcan/keymaps/default/keymap.c | 2 +- keyboards/noxary/x268/keymaps/default/keymap.c | 2 +- keyboards/noxary/x268/keymaps/via/keymap.c | 2 +- keyboards/nullbitsco/nibble/keymaps/default/keymap.c | 2 +- keyboards/nullbitsco/nibble/keymaps/iso/keymap.c | 2 +- keyboards/nullbitsco/nibble/keymaps/via/keymap.c | 2 +- keyboards/numatreus/keymaps/default/keymap.c | 2 +- keyboards/obosob/arch_36/keymaps/default/keymap.c | 2 +- keyboards/ogre/ergo_single/keymaps/default/keymap.c | 2 +- keyboards/ogre/ergo_split/keymaps/default/keymap.c | 2 +- keyboards/ok60/keymaps/default/keymap.c | 2 +- keyboards/ok60/keymaps/via/keymap.c | 2 +- keyboards/omkbd/runner3680/3x6/keymaps/default/keymap.c | 2 +- keyboards/omkbd/runner3680/3x7/keymaps/default/keymap.c | 2 +- keyboards/omkbd/runner3680/3x8/keymaps/default/keymap.c | 2 +- keyboards/omkbd/runner3680/4x6/keymaps/default/keymap.c | 2 +- keyboards/omkbd/runner3680/4x7/keymaps/default/keymap.c | 2 +- keyboards/omkbd/runner3680/4x8/keymaps/default/keymap.c | 2 +- keyboards/omkbd/runner3680/5x6/keymaps/default/keymap.c | 2 +- keyboards/omkbd/runner3680/5x7/keymaps/default/keymap.c | 2 +- keyboards/omkbd/runner3680/5x8/keymaps/default/keymap.c | 2 +- keyboards/omnikeyish/keymaps/default/keymap.c | 2 +- keyboards/orange75/keymaps/default/keymap.c | 2 +- keyboards/org60/keymaps/default/keymap.c | 2 +- keyboards/orthocode/keymaps/default/keymap.c | 2 +- keyboards/orthocode/keymaps/via/keymap.c | 2 +- .../owlab/jelly_epoch/hotswap/keymaps/default/keymap.c | 2 +- keyboards/owlab/jelly_epoch/hotswap/keymaps/via/keymap.c | 2 +- .../owlab/jelly_epoch/soldered/keymaps/default/keymap.c | 2 +- keyboards/owlab/jelly_epoch/soldered/keymaps/via/keymap.c | 2 +- keyboards/owlab/suit80/ansi/keymaps/default/keymap.c | 2 +- keyboards/owlab/suit80/ansi/keymaps/via/keymap.c | 2 +- keyboards/owlab/suit80/iso/keymaps/default/keymap.c | 2 +- keyboards/owlab/suit80/iso/keymaps/via/keymap.c | 2 +- keyboards/p3d/synapse/keymaps/7u_space/keymap.c | 2 +- keyboards/p3d/synapse/keymaps/default/keymap.c | 2 +- keyboards/panc40/keymaps/default/keymap.c | 2 +- keyboards/panc40/keymaps/default_minorca/keymap.c | 2 +- keyboards/panc40/keymaps/default_sebright/keymap.c | 2 +- keyboards/pearlboards/pandora/keymaps/default/keymap.c | 2 +- keyboards/pearlboards/pandora/keymaps/via/keymap.c | 2 +- keyboards/pearlboards/zeuspad/keymaps/default/keymap.c | 2 +- keyboards/pearlboards/zeuspad/keymaps/via/keymap.c | 2 +- keyboards/pegasus/keymaps/default/keymap.c | 2 +- keyboards/percent/canoe/keymaps/default/keymap.c | 2 +- keyboards/percent/canoe/keymaps/via/keymap.c | 2 +- keyboards/percent/canoe_gen2/keymaps/default/keymap.c | 2 +- keyboards/percent/canoe_gen2/keymaps/via/keymap.c | 2 +- .../picolab/frusta_fundamental/keymaps/default/keymap.c | 2 +- keyboards/picolab/frusta_fundamental/keymaps/via/keymap.c | 2 +- keyboards/pixelspace/capsule65i/keymaps/default/keymap.c | 2 +- keyboards/pixelspace/capsule65i/keymaps/via/keymap.c | 6 +++--- keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c | 2 +- .../pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c | 2 +- .../pizza65/keymaps/iso_blocker_split_bs/keymap.c | 2 +- keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c | 2 +- keyboards/playkbtw/ca66/keymaps/default/keymap.c | 2 +- keyboards/playkbtw/helen80/keymaps/default/keymap.c | 2 +- keyboards/playkbtw/helen80/keymaps/via/keymap.c | 2 +- keyboards/playkbtw/pk60/keymaps/default/keymap.c | 2 +- keyboards/plut0nium/0x3e/keymaps/default/keymap.c | 2 +- keyboards/poker87c/keymaps/default/keymap.c | 2 +- keyboards/poker87c/keymaps/via/keymap.c | 2 +- keyboards/poker87d/keymaps/default/keymap.c | 2 +- keyboards/poker87d/keymaps/via/keymap.c | 2 +- keyboards/polycarbdiet/s20/keymaps/default/keymap.c | 2 +- keyboards/portal_66/hotswap/keymaps/default/keymap.c | 2 +- keyboards/portal_66/hotswap/keymaps/via/keymap.c | 2 +- keyboards/portal_66/soldered/keymaps/default/keymap.c | 2 +- keyboards/portal_66/soldered/keymaps/via/keymap.c | 2 +- keyboards/pos78/keymaps/default/keymap.c | 2 +- keyboards/primekb/meridian/keymaps/default/keymap.c | 2 +- keyboards/primekb/meridian/keymaps/via/keymap.c | 2 +- keyboards/primekb/meridian_rgb/keymaps/default/keymap.c | 2 +- keyboards/primekb/meridian_rgb/keymaps/via/keymap.c | 2 +- keyboards/program_yoink/ortho/keymaps/default/keymap.c | 2 +- keyboards/program_yoink/staggered/keymaps/default/keymap.c | 2 +- keyboards/program_yoink/staggered/keymaps/via/keymap.c | 4 ++-- keyboards/projectkb/signature65/keymaps/default/keymap.c | 2 +- keyboards/projectkb/signature65/keymaps/via/keymap.c | 2 +- keyboards/projectkb/signature87/keymaps/default/keymap.c | 2 +- keyboards/projectkb/signature87/keymaps/via/keymap.c | 2 +- keyboards/prototypist/allison/keymaps/default/keymap.c | 2 +- keyboards/prototypist/allison/keymaps/via/keymap.c | 2 +- keyboards/punk75/keymaps/default/keymap.c | 2 +- keyboards/punk75/keymaps/via/keymap.c | 2 +- keyboards/qpockets/eggman/keymaps/default/keymap.c | 2 +- .../qpockets/space_space/rev1/keymaps/default/keymap.c | 2 +- .../qpockets/space_space/rev2/keymaps/default/keymap.c | 2 +- keyboards/qpockets/wanten/keymaps/default/keymap.c | 2 +- keyboards/quarkeys/z60/solder/keymaps/default/keymap.c | 2 +- keyboards/quarkeys/z60/solder/keymaps/via/keymap.c | 2 +- keyboards/rart/rart45/keymaps/default/keymap.c | 2 +- keyboards/rart/rart45/keymaps/via/keymap.c | 2 +- keyboards/rart/rartand/keymaps/default/keymap.c | 2 +- keyboards/rart/rartand/keymaps/via/keymap.c | 2 +- keyboards/rart/rartland/keymaps/default/keymap.c | 2 +- keyboards/rart/rartland/keymaps/via/keymap.c | 2 +- keyboards/rart/rartlice/keymaps/via/keymap.c | 2 +- keyboards/rart/rartpad/keymaps/default/keymap.c | 2 +- keyboards/recompile_keys/mio/keymaps/default/keymap.c | 2 +- keyboards/recompile_keys/mio/keymaps/via/keymap.c | 2 +- keyboards/redscarf_iiplus/verb/keymaps/default/keymap.c | 2 +- keyboards/redscarf_iiplus/verc/keymaps/default/keymap.c | 2 +- keyboards/retro_75/keymaps/default/keymap.c | 2 +- keyboards/reviung/reviung33/keymaps/default/keymap.c | 2 +- keyboards/reviung/reviung33/keymaps/default_jp/keymap.c | 2 +- keyboards/reviung/reviung34/keymaps/default/keymap.c | 2 +- keyboards/reviung/reviung34/keymaps/default_2u/keymap.c | 2 +- keyboards/reviung/reviung34/keymaps/default_jp/keymap.c | 2 +- keyboards/reviung/reviung34/keymaps/default_rgb/keymap.c | 2 +- keyboards/reviung/reviung34/keymaps/default_rgb2u/keymap.c | 2 +- keyboards/reviung/reviung34/keymaps/via/keymap.c | 2 +- keyboards/reviung/reviung39/keymaps/default/keymap.c | 2 +- keyboards/reviung/reviung39/keymaps/default_s/keymap.c | 2 +- keyboards/reviung/reviung39/keymaps/via/keymap.c | 2 +- keyboards/reviung/reviung41/keymaps/default/keymap.c | 2 +- keyboards/reviung/reviung41/keymaps/via/keymap.c | 2 +- keyboards/reviung/reviung61/keymaps/default/keymap.c | 2 +- keyboards/reviung/reviung61/keymaps/default_rgb/keymap.c | 2 +- keyboards/rgbkb/mun/keymaps/default/keymap.c | 2 +- keyboards/rgbkb/mun/keymaps/via/keymap.c | 2 +- keyboards/rgbkb/pan/keymaps/default/keymap.c | 2 +- keyboards/rgbkb/sol3/keymaps/default/keymap.c | 2 +- keyboards/rgbkb/sol3/keymaps/via/keymap.c | 2 +- keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c | 2 +- keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c | 2 +- keyboards/rgbkb/zygomorph/keymaps/default/keymap.c | 2 +- keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c | 2 +- keyboards/rmi_kb/aelith/keymaps/default/keymap.c | 2 +- keyboards/rmi_kb/aelith/keymaps/via/keymap.c | 2 +- keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c | 2 +- keyboards/rmi_kb/mona/v1/keymaps/via/keymap.c | 2 +- keyboards/rmi_kb/mona/v1_1/keymaps/via/keymap.c | 2 +- keyboards/rmi_kb/mona/v32a/keymaps/via/keymap.c | 2 +- keyboards/rmi_kb/squishy65/keymaps/default/keymap.c | 2 +- keyboards/rmi_kb/squishy65/keymaps/iso/keymap.c | 2 +- keyboards/rmi_kb/squishy65/keymaps/via/keymap.c | 2 +- keyboards/rmi_kb/squishyfrl/keymaps/via/keymap.c | 2 +- keyboards/rocketboard_16/keymaps/default/keymap.c | 2 +- keyboards/rocketboard_16/keymaps/via/keymap.c | 2 +- keyboards/rominronin/katana60/rev1/keymaps/default/keymap.c | 2 +- keyboards/rominronin/katana60/rev2/keymaps/default/keymap.c | 2 +- keyboards/rominronin/katana60/rev2/keymaps/via/keymap.c | 2 +- keyboards/roseslite/keymaps/default/keymap.c | 2 +- keyboards/roseslite/keymaps/via/keymap.c | 6 +++--- keyboards/rot13labs/hackboard/keymaps/default/keymap.c | 2 +- keyboards/rpiguy9907/southpaw66/keymaps/default/keymap.c | 2 +- keyboards/rpiguy9907/southpaw66/keymaps/via/keymap.c | 2 +- keyboards/salicylic_acid3/naked48/keymaps/default/keymap.c | 2 +- .../naked48/keymaps/default_with_nafuda/keymap.c | 2 +- .../naked48/keymaps/default_with_setta21/keymap.c | 2 +- keyboards/salicylic_acid3/naked48/keymaps/via/keymap.c | 2 +- keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c | 2 +- .../naked60/keymaps/default_with_nafuda/keymap.c | 2 +- .../naked60/keymaps/default_with_setta21/keymap.c | 2 +- keyboards/salicylic_acid3/naked64/keymaps/default/keymap.c | 2 +- .../naked64/keymaps/default_with_setta21/keymap.c | 2 +- keyboards/salicylic_acid3/nknl7en/keymaps/default/keymap.c | 2 +- keyboards/salicylic_acid3/nknl7en/keymaps/via/keymap.c | 2 +- keyboards/sandwich/keeb68/keymaps/default/keymap.c | 2 +- keyboards/satt/comet46/keymaps/default-rgbled/keymap.c | 2 +- keyboards/satt/comet46/keymaps/default/keymap.c | 2 +- keyboards/satt/vision/keymaps/default/keymap.c | 2 +- keyboards/satt/vision/keymaps/via/keymap.c | 2 +- .../sawnsprojects/vcl65/solder/keymaps/default/keymap.c | 2 +- keyboards/sawnsprojects/vcl65/solder/keymaps/via/keymap.c | 2 +- keyboards/sentraq/s65_plus/keymaps/default/keymap.c | 2 +- keyboards/sentraq/s65_plus/keymaps/iso/keymap.c | 2 +- keyboards/sets3n/kk980/keymaps/default/keymap.c | 2 +- keyboards/sets3n/kk980/keymaps/via/keymap.c | 2 +- keyboards/singa/keymaps/default/keymap.c | 2 +- keyboards/singa/keymaps/via/keymap.c | 2 +- keyboards/smk60/keymaps/60_ansi/keymap.c | 2 +- keyboards/smk60/keymaps/60_ansi_split_bs_shift/keymap.c | 2 +- keyboards/smk60/keymaps/60_iso/keymap.c | 2 +- keyboards/smk60/keymaps/default/keymap.c | 2 +- keyboards/sneakbox/aliceclone/keymaps/default/keymap.c | 2 +- keyboards/sneakbox/aliceclone/keymaps/via/keymap.c | 2 +- keyboards/sneakbox/aliceclonergb/keymaps/default/keymap.c | 2 +- keyboards/sneakbox/aliceclonergb/keymaps/via/keymap.c | 2 +- keyboards/sneakbox/ava/keymaps/default/keymap.c | 2 +- keyboards/sneakbox/ava/keymaps/via/keymap.c | 2 +- keyboards/spaceholdings/nebula68/keymaps/default/keymap.c | 2 +- keyboards/spaceholdings/nebula68/keymaps/via/keymap.c | 2 +- keyboards/spaceman/pancake/rev1/keymaps/default/keymap.c | 2 +- keyboards/spaceman/pancake/rev1/keymaps/via/keymap.c | 2 +- keyboards/spiderisland/split78/keymaps/default/keymap.c | 2 +- keyboards/splitkb/zima/keymaps/default/keymap.c | 2 +- keyboards/splitkb/zima/keymaps/via/keymap.c | 2 +- keyboards/stello65/hs_rev1/keymaps/default/keymap.c | 2 +- keyboards/stello65/hs_rev1/keymaps/via/keymap.c | 2 +- keyboards/stello65/sl_rev1/keymaps/default/keymap.c | 2 +- keyboards/stello65/sl_rev1/keymaps/via/keymap.c | 2 +- keyboards/studiokestra/bourgeau/keymaps/default/keymap.c | 2 +- keyboards/studiokestra/bourgeau/keymaps/via/keymap.c | 6 +++--- keyboards/studiokestra/cascade/keymaps/default/keymap.c | 2 +- .../cascade/keymaps/default_tsangan_hhkb/keymap.c | 2 +- keyboards/studiokestra/cascade/keymaps/via/keymap.c | 2 +- keyboards/studiokestra/nue/keymaps/default/keymap.c | 2 +- keyboards/studiokestra/nue/keymaps/via/keymap.c | 2 +- keyboards/suavity/ehan/keymaps/default/keymap.c | 2 +- keyboards/suavity/ehan/keymaps/default_iso/keymap.c | 2 +- keyboards/suavity/ehan/keymaps/via/keymap.c | 2 +- keyboards/switchplate/southpaw_65/keymaps/default/keymap.c | 2 +- .../switchplate/southpaw_65/keymaps/default_ansi/keymap.c | 2 +- .../switchplate/southpaw_fullsize/keymaps/default/keymap.c | 2 +- .../southpaw_fullsize/keymaps/default_wkl/keymap.c | 2 +- keyboards/sx60/keymaps/default/keymap.c | 2 +- keyboards/sx60/keymaps/via/keymap.c | 2 +- keyboards/system76/launch_1/keymaps/default/keymap.c | 2 +- keyboards/tanuki/keymaps/default/keymap.c | 2 +- keyboards/tenki/keymaps/default/keymap.c | 2 +- keyboards/tenki/keymaps/via/keymap.c | 2 +- keyboards/terrazzo/keymaps/default/keymap.c | 2 +- keyboards/tgr/910/keymaps/default/keymap.c | 2 +- keyboards/tgr/910/keymaps/via/keymap.c | 2 +- keyboards/tgr/tris/keymaps/default/keymap.c | 2 +- keyboards/tgr/tris/keymaps/via/keymap.c | 2 +- keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c | 2 +- keyboards/tkc/godspeed75/keymaps/default/keymap.c | 2 +- keyboards/tkc/godspeed75/keymaps/via/keymap.c | 6 +++--- keyboards/tkc/tkc1800/keymaps/default/keymap.c | 2 +- keyboards/tkc/tkc1800/keymaps/via/keymap.c | 6 +++--- keyboards/tkc/tkc1800/keymaps/wkl/keymap.c | 2 +- keyboards/tkw/stoutgat/v1/keymaps/default/keymap.c | 2 +- keyboards/tkw/stoutgat/v2/keymaps/ansi/keymap.c | 2 +- keyboards/tmo50/keymaps/default/keymap.c | 2 +- keyboards/tmo50/keymaps/via/keymap.c | 2 +- keyboards/tominabox1/bigboy/keymaps/default/keymap.c | 2 +- keyboards/tominabox1/bigboy/keymaps/default_2u/keymap.c | 2 +- keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c | 2 +- .../tominabox1/underscore33/rev1/keymaps/default/keymap.c | 2 +- .../underscore33/rev1/keymaps/default_big_space/keymap.c | 2 +- .../tominabox1/underscore33/rev2/keymaps/default/keymap.c | 2 +- keyboards/tr60w/keymaps/default/keymap.c | 2 +- keyboards/trashman/ketch/keymaps/default/keymap.c | 2 +- keyboards/treasure/type9s2/keymaps/default/keymap.c | 2 +- keyboards/treasure/type9s3/keymaps/default/keymap.c | 2 +- keyboards/treasure/type9s3/keymaps/via/keymap.c | 2 +- keyboards/tszaboo/ortho4exent/keymaps/default/keymap.c | 2 +- keyboards/uk78/keymaps/default/keymap.c | 2 +- keyboards/ungodly/launch_pad/keymaps/default/keymap.c | 2 +- keyboards/ungodly/launch_pad/keymaps/via/keymap.c | 2 +- keyboards/ungodly/nines/keymaps/default/keymap.c | 2 +- keyboards/ungodly/nines/keymaps/via/keymap.c | 2 +- keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c | 4 ++-- keyboards/unikorn/keymaps/default/keymap.c | 2 +- keyboards/unikorn/keymaps/tsangan/keymap.c | 2 +- keyboards/unikorn/keymaps/via/keymap.c | 2 +- keyboards/viktus/at101_bh/keymaps/default/keymap.c | 2 +- keyboards/viktus/omnikey_bh/keymaps/default/keymap.c | 2 +- keyboards/viktus/smolka/keymaps/default/keymap.c | 2 +- keyboards/viktus/smolka/keymaps/via/keymap.c | 2 +- keyboards/viktus/sp_mini/keymaps/default/keymap.c | 2 +- keyboards/viktus/sp_mini/keymaps/via/keymap.c | 2 +- keyboards/viktus/styrka/keymaps/default/keymap.c | 2 +- keyboards/viktus/styrka/keymaps/via/keymap.c | 2 +- keyboards/viktus/z150_bh/keymaps/default/keymap.c | 2 +- keyboards/viktus/z150_bh/keymaps/default_tkl/keymap.c | 2 +- keyboards/vitamins_included/keymaps/default/keymap.c | 2 +- keyboards/vitamins_included/keymaps/via/keymap.c | 4 ++-- keyboards/waldo/keymaps/default/keymap.c | 2 +- keyboards/waldo/keymaps/via/keymap.c | 2 +- keyboards/wavtype/foundation/keymaps/default/keymap.c | 2 +- .../keymaps/default_ansi_tsangan_split_bs/keymap.c | 2 +- .../foundation/keymaps/default_iso_split_bs_rshift/keymap.c | 2 +- .../keymaps/default_iso_tsangan_split_bs_rshift/keymap.c | 2 +- keyboards/wavtype/foundation/keymaps/via/keymap.c | 2 +- keyboards/wavtype/p01_ultra/keymaps/default/keymap.c | 2 +- keyboards/wavtype/p01_ultra/keymaps/via/keymap.c | 2 +- keyboards/wekey/polaris/keymaps/default/keymap.c | 2 +- keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c | 2 +- keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c | 2 +- keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c | 2 +- keyboards/westfoxtrot/cyclops/keymaps/default/keymap.c | 2 +- keyboards/westfoxtrot/cypher/rev5/keymaps/via/keymap.c | 2 +- keyboards/westfoxtrot/prophet/keymaps/default/keymap.c | 2 +- keyboards/westfoxtrot/prophet/keymaps/via/keymap.c | 2 +- keyboards/wolf/kuku65/keymaps/default/keymap.c | 2 +- keyboards/wolf/kuku65/keymaps/via/keymap.c | 2 +- keyboards/wolf/ryujin/keymaps/default/keymap.c | 2 +- keyboards/wolf/ryujin/keymaps/via/keymap.c | 2 +- keyboards/wolf/sabre/keymaps/default/keymap.c | 2 +- keyboards/wolf/sabre/keymaps/via/keymap.c | 2 +- keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c | 2 +- keyboards/woodkeys/meira/keymaps/default/keymap.c | 2 +- keyboards/work_louder/loop/keymaps/default/keymap.c | 4 ++-- keyboards/work_louder/loop/keymaps/via/keymap.c | 4 ++-- keyboards/wsk/gothic70/keymaps/via/keymap.c | 2 +- keyboards/wsk/sl40/keymaps/default/keymap.c | 2 +- keyboards/wsk/tkl30/keymaps/default/keymap.c | 2 +- keyboards/xelus/dharma/keymaps/default/keymap.c | 4 ++-- keyboards/xelus/dharma/keymaps/via/keymap.c | 4 ++-- keyboards/xelus/la_plus/keymaps/default/keymap.c | 2 +- keyboards/xelus/la_plus/keymaps/via/keymap.c | 2 +- keyboards/xelus/ninjin/keymaps/default/keymap.c | 2 +- keyboards/xelus/ninjin/keymaps/via/keymap.c | 2 +- keyboards/xelus/pachi/mini_32u4/keymaps/default/keymap.c | 2 +- keyboards/xelus/pachi/mini_32u4/keymaps/via/keymap.c | 2 +- keyboards/xelus/pachi/rev1/keymaps/default/keymap.c | 2 +- keyboards/xelus/pachi/rev1/keymaps/via/keymap.c | 2 +- keyboards/xelus/rs108/keymaps/default/keymap.c | 2 +- keyboards/xelus/rs108/keymaps/via/keymap.c | 2 +- keyboards/xelus/valor/rev1/keymaps/default/keymap.c | 2 +- keyboards/xelus/valor/rev1/keymaps/via/keymap.c | 2 +- keyboards/xelus/valor/rev2/keymaps/default/keymap.c | 2 +- keyboards/xelus/valor/rev2/keymaps/via/keymap.c | 2 +- keyboards/xiudi/xd60/keymaps/default/keymap.c | 2 +- keyboards/xiudi/xd60/keymaps/iso/keymap.c | 2 +- keyboards/xiudi/xd60/keymaps/via/keymap.c | 2 +- keyboards/xiudi/xd68/keymaps/default/keymap.c | 2 +- keyboards/xiudi/xd68/keymaps/default_iso/keymap.c | 2 +- keyboards/xiudi/xd68/keymaps/via/keymap.c | 2 +- keyboards/xiudi/xd75/keymaps/default/keymap.c | 2 +- keyboards/xiudi/xd75/keymaps/via/keymap.c | 2 +- keyboards/yampad/keymaps/default/keymap.c | 2 +- keyboards/yampad/keymaps/via/keymap.c | 2 +- keyboards/yanghu/unicorne/keymaps/default/keymap.c | 2 +- .../yiancardesigns/barleycorn/keymaps/default/keymap.c | 2 +- keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c | 2 +- keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c | 2 +- keyboards/yiancardesigns/gingham/keymaps/default/keymap.c | 2 +- keyboards/ymdk/melody96/soldered/keymaps/default/keymap.c | 2 +- .../soldered/keymaps/default_96_with60_split_num0/keymap.c | 2 +- keyboards/ymdk/melody96/soldered/keymaps/via/keymap.c | 2 +- keyboards/ymdk/wings/keymaps/via/keymap.c | 2 +- keyboards/ymdk/wingshs/keymaps/via/keymap.c | 2 +- keyboards/ymdk/yd60mq/keymaps/default/keymap.c | 2 +- keyboards/ymdk/yd60mq/keymaps/via/keymap.c | 2 +- keyboards/ymdk/ym68/keymaps/default/keymap.c | 2 +- keyboards/ymdk/ymd40/v2/keymaps/default/keymap.c | 2 +- keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c | 2 +- keyboards/ymdk/ymd75/rev1/keymaps/default_iso/keymap.c | 2 +- keyboards/ymdk/ymd75/rev2/keymaps/default_iso/keymap.c | 2 +- keyboards/ymdk/ymd75/rev3/keymaps/default_iso/keymap.c | 2 +- keyboards/yoichiro/lunakey_macro/keymaps/default/keymap.c | 2 +- keyboards/yoichiro/lunakey_mini/keymaps/default/keymap.c | 2 +- keyboards/yoichiro/lunakey_mini/keymaps/via/keymap.c | 2 +- keyboards/yoichiro/lunakey_pico/keymaps/default/keymap.c | 2 +- keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c | 2 +- keyboards/yosino58/keymaps/default/keymap.c | 2 +- keyboards/yushakobo/quick17/keymaps/default/keymap.c | 2 +- keyboards/yushakobo/quick17/keymaps/via/keymap.c | 2 +- keyboards/yushakobo/quick7/keymaps/default/keymap.c | 2 +- keyboards/yushakobo/quick7/keymaps/via/keymap.c | 2 +- keyboards/zj68/keymaps/default/keymap.c | 2 +- keyboards/zlant/keymaps/default/keymap.c | 2 +- keyboards/ztboards/after/keymaps/default/keymap.c | 2 +- keyboards/ztboards/noon/keymaps/default/keymap.c | 2 +- keyboards/ztboards/noon/keymaps/via/keymap.c | 2 +- 1201 files changed, 1308 insertions(+), 1308 deletions(-) diff --git a/keyboards/0_sixty/keymaps/default/keymap.c b/keyboards/0_sixty/keymaps/default/keymap.c index 1dd0ee7738c..af465be0a4d 100644 --- a/keyboards/0_sixty/keymaps/default/keymap.c +++ b/keyboards/0_sixty/keymaps/default/keymap.c @@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT_ortho_5x12( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/0_sixty/keymaps/via/keymap.c b/keyboards/0_sixty/keymaps/via/keymap.c index 74accc10ad4..d308956ee7d 100644 --- a/keyboards/0_sixty/keymaps/via/keymap.c +++ b/keyboards/0_sixty/keymaps/via/keymap.c @@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT_ortho_5x12( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c index ec7440588dc..9d46809b2b3 100644 --- a/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_60_tsangan_hhkb( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_CAPS, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP, _______, KC_CLR, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, RGB_VAD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, KC_END, KC_PGDN, KC_DOWN, _______, _______, diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c index 243df19de9b..7f9a3d26c7d 100644 --- a/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_60_tsangan_hhkb( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_CAPS, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP, _______, KC_CLR, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, RGB_VAD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, KC_END, KC_PGDN, KC_DOWN, _______, _______, diff --git a/keyboards/25keys/aleth42/keymaps/default/keymap.c b/keyboards/25keys/aleth42/keymaps/default/keymap.c index e078e731d7a..27987555f0c 100644 --- a/keyboards/25keys/aleth42/keymaps/default/keymap.c +++ b/keyboards/25keys/aleth42/keymaps/default/keymap.c @@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, BL_TOGG, BL_STEP, BL_UP, AG_NORM, RGB_TOG, RGB_HUI, AG_SWAP, RGB_SAI, RGB_VAI, KC_F12, - KC_CAPS, QK_BOOT, BL_BRTG, BL_DOWN, _______, RGB_MOD, RGB_HUD, _______, RGB_SAD, RGB_VAD, _______, + KC_CAPS, QK_BOOT, BL_BRTG, BL_DOWN, _______, RGB_MOD, RGB_HUD, _______, RGB_SAD, RGB_VAD, _______, KC_SLEP, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/25keys/aleth42/keymaps/via/keymap.c b/keyboards/25keys/aleth42/keymaps/via/keymap.c index 707d8439507..d7b8be65d63 100644 --- a/keyboards/25keys/aleth42/keymaps/via/keymap.c +++ b/keyboards/25keys/aleth42/keymaps/via/keymap.c @@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, BL_TOGG, BL_STEP, BL_UP, AG_NORM, RGB_TOG, RGB_HUI, AG_SWAP, RGB_SAI, RGB_VAI, KC_F12, - KC_CAPS, QK_BOOT, BL_BRTG, BL_DOWN, _______, RGB_MOD, RGB_HUD, _______, RGB_SAD, RGB_VAD, _______, + KC_CAPS, QK_BOOT, BL_BRTG, BL_DOWN, _______, RGB_MOD, RGB_HUD, _______, RGB_SAD, RGB_VAD, _______, KC_SLEP, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/25keys/zinc/keymaps/default/keymap.c b/keyboards/25keys/zinc/keymaps/default/keymap.c index 4673b8071bc..2b523b4cde1 100644 --- a/keyboards/25keys/zinc/keymaps/default/keymap.c +++ b/keyboards/25keys/zinc/keymaps/default/keymap.c @@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------' `-----------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, RGBRST, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_INS, + _______, QK_BOOT, RGBRST, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_INS, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SCRL, KC_PAUS, RGB_RMOD,RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, EISU, EISU, EISU, KANA, KANA, KANA, KC_HOME, KC_PGDN, KC_END diff --git a/keyboards/25keys/zinc/keymaps/via/keymap.c b/keyboards/25keys/zinc/keymaps/via/keymap.c index 22e362c2575..18de3e74fbe 100644 --- a/keyboards/25keys/zinc/keymaps/via/keymap.c +++ b/keyboards/25keys/zinc/keymaps/via/keymap.c @@ -134,14 +134,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------' `-----------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, RGBRST, _______, _______, _______, _______, QWERTY, _______, _______, _______, KC_INS, + _______, QK_BOOT, RGBRST, _______, _______, _______, _______, QWERTY, _______, _______, _______, KC_INS, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SCRL, KC_PAUS, RGB_RMOD,RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, EISU, EISU, EISU, KANA, KANA, KANA, KC_HOME, KC_PGDN, KC_END ), [_ADJUST2] = LAYOUT_ortho_4x12( - _______, QK_BOOT, RGBRST, _______, _______, _______, _______, QWERTY, _______, _______, _______, KC_INS, + _______, QK_BOOT, RGBRST, _______, _______, _______, _______, QWERTY, _______, _______, _______, KC_INS, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SCRL, KC_PAUS, RGB_RMOD,RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, EISU, EISU, EISU, KANA, KANA, KANA, KC_HOME, KC_PGDN, KC_END diff --git a/keyboards/30wer/keymaps/default/keymap.c b/keyboards/30wer/keymaps/default/keymap.c index 2f1dbd28629..41f0e0a757c 100644 --- a/keyboards/30wer/keymaps/default/keymap.c +++ b/keyboards/30wer/keymaps/default/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_UP, KC_DEL, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, KC_LALT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______ ), diff --git a/keyboards/40percentclub/4x4/keymaps/default/keymap.c b/keyboards/40percentclub/4x4/keymaps/default/keymap.c index e1e897d05e1..dc4e34eea56 100644 --- a/keyboards/40percentclub/4x4/keymaps/default/keymap.c +++ b/keyboards/40percentclub/4x4/keymaps/default/keymap.c @@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [DIR] = LAYOUT_ortho_4x16( - QK_BOOT, KC_TAB, KC_UP, _______, KC_INS, KC_LCTL, KC_LSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL, KC_DEL, _______, _______, _______, _______, + QK_BOOT, KC_TAB, KC_UP, _______, KC_INS, KC_LCTL, KC_LSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL, KC_DEL, _______, _______, _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PSCR, KC_LSFT, KC_LCTL, KC_PGDN, KC_END, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______, _______, KC_PAUS, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, _______, _______, _______, _______, _______, _______, DF(PAD), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/40percentclub/4x4/keymaps/via/keymap.c b/keyboards/40percentclub/4x4/keymaps/via/keymap.c index 1f216d3aca4..6c340e3eac8 100644 --- a/keyboards/40percentclub/4x4/keymaps/via/keymap.c +++ b/keyboards/40percentclub/4x4/keymaps/via/keymap.c @@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [DIR] = LAYOUT_ortho_4x16( - QK_BOOT, KC_TAB, KC_UP, _______, KC_INS, KC_LCTL, KC_LSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL, KC_DEL, _______, _______, _______, _______, + QK_BOOT, KC_TAB, KC_UP, _______, KC_INS, KC_LCTL, KC_LSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL, KC_DEL, _______, _______, _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PSCR, KC_LSFT, KC_LCTL, KC_PGDN, KC_END, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______, _______, KC_PAUS, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, _______, _______, _______, _______, _______, _______, DF(PAD), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/40percentclub/5x5/keymaps/default/keymap.c b/keyboards/40percentclub/5x5/keymaps/default/keymap.c index f5be1f9c66e..20c0ed8aee4 100644 --- a/keyboards/40percentclub/5x5/keymaps/default/keymap.c +++ b/keyboards/40percentclub/5x5/keymaps/default/keymap.c @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [DIR] = LAYOUT_ortho_5x15( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, KC_TAB, KC_UP, _______, KC_INS, KC_LCTL, KC_LSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL, KC_DEL, _______, _______, _______, + QK_BOOT, KC_TAB, KC_UP, _______, KC_INS, KC_LCTL, KC_LSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL, KC_DEL, _______, _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PSCR, KC_LSFT, KC_LCTL, KC_PGDN, KC_END, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______, KC_PAUS, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, _______, _______, _______, _______, _______, DF(PAD), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/40percentclub/5x5/keymaps/via/keymap.c b/keyboards/40percentclub/5x5/keymaps/via/keymap.c index 680630476e3..95f385e1358 100644 --- a/keyboards/40percentclub/5x5/keymaps/via/keymap.c +++ b/keyboards/40percentclub/5x5/keymaps/via/keymap.c @@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [DIR] = LAYOUT_ortho_5x15( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, KC_TAB, KC_UP, _______, KC_INS, KC_LCTL, KC_LSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL, KC_DEL, _______, _______, _______, + QK_BOOT, KC_TAB, KC_UP, _______, KC_INS, KC_LCTL, KC_LSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL, KC_DEL, _______, _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PSCR, KC_LSFT, KC_LCTL, KC_PGDN, KC_END, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______, KC_PAUS, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, _______, _______, _______, _______, _______, DF(PAD), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/40percentclub/foobar/keymaps/default/keymap.c b/keyboards/40percentclub/foobar/keymaps/default/keymap.c index 26bbd8a3cae..2366c43cca9 100644 --- a/keyboards/40percentclub/foobar/keymaps/default/keymap.c +++ b/keyboards/40percentclub/foobar/keymaps/default/keymap.c @@ -70,6 +70,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [FN5] = LAYOUT_split( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______ + _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______ ), }; diff --git a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c index 420890a1083..8c28b68afa3 100644 --- a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c +++ b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [5] = LAYOUT_ortho_3x10( KC_CALC, KC_WHOM, KC_MAIL, KC_MYCM, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______ + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/40percentclub/nein/keymaps/default/keymap.c b/keyboards/40percentclub/nein/keymaps/default/keymap.c index 4d8351000c7..3275b1b746c 100644 --- a/keyboards/40percentclub/nein/keymaps/default/keymap.c +++ b/keyboards/40percentclub/nein/keymaps/default/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_ortho_3x3( - QK_BOOT, _______, KC_STOP, + QK_BOOT, _______, KC_STOP, _______, _______, RGB_MOD, KC_MPRV, _______, KC_MNXT ), diff --git a/keyboards/40percentclub/nein/keymaps/via/keymap.c b/keyboards/40percentclub/nein/keymaps/via/keymap.c index 2fecb3965c0..463788718b6 100644 --- a/keyboards/40percentclub/nein/keymaps/via/keymap.c +++ b/keyboards/40percentclub/nein/keymaps/via/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_ortho_3x3( - QK_BOOT, _______, KC_STOP, + QK_BOOT, _______, KC_STOP, _______, _______, RGB_MOD, KC_MPRV, _______, KC_MNXT ), diff --git a/keyboards/40percentclub/nori/keymaps/default/keymap.c b/keyboards/40percentclub/nori/keymaps/default/keymap.c index f7760a268f9..03f8c157878 100644 --- a/keyboards/40percentclub/nori/keymaps/default/keymap.c +++ b/keyboards/40percentclub/nori/keymaps/default/keymap.c @@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/40percentclub/tomato/keymaps/default/keymap.c b/keyboards/40percentclub/tomato/keymaps/default/keymap.c index 5ccf1df6619..728dc25a9a5 100644 --- a/keyboards/40percentclub/tomato/keymaps/default/keymap.c +++ b/keyboards/40percentclub/tomato/keymaps/default/keymap.c @@ -94,6 +94,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT_ortho_3x10 ( KC_CALC,KC_WSCH,KC_MAIL,KC_MYCM,_______,_______,_______,_______,_______,_______ , RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,XXXXXXX,XXXXXXX,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD - , _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______ + , _______,_______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______ ), }; diff --git a/keyboards/45_ats/keymaps/default/keymap.c b/keyboards/45_ats/keymaps/default/keymap.c index 455506a3303..3208614b329 100644 --- a/keyboards/45_ats/keymaps/default/keymap.c +++ b/keyboards/45_ats/keymaps/default/keymap.c @@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLU, KC_SLEP, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_WAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/45_ats/keymaps/via/keymap.c b/keyboards/45_ats/keymaps/via/keymap.c index 455506a3303..3208614b329 100644 --- a/keyboards/45_ats/keymaps/via/keymap.c +++ b/keyboards/45_ats/keymaps/via/keymap.c @@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLU, KC_SLEP, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_WAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/4pplet/aekiso60/keymaps/default/keymap.c b/keyboards/4pplet/aekiso60/keymaps/default/keymap.c index 8749569a9d9..2059b3a187d 100644 --- a/keyboards/4pplet/aekiso60/keymaps/default/keymap.c +++ b/keyboards/4pplet/aekiso60/keymaps/default/keymap.c @@ -15,6 +15,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_BSPC, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_INS, KC_PENT, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______ + QK_BOOT, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______ ) }; diff --git a/keyboards/4pplet/aekiso60/keymaps/via/keymap.c b/keyboards/4pplet/aekiso60/keymaps/via/keymap.c index d90c6d4ff1a..7fda2345c35 100644 --- a/keyboards/4pplet/aekiso60/keymaps/via/keymap.c +++ b/keyboards/4pplet/aekiso60/keymaps/via/keymap.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_BSPC, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_MUTE, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_INS, KC_PENT, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_PPLS, KC_PMNS, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______ + QK_BOOT, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______ ), [2] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/4pplet/bootleg/keymaps/default/keymap.c b/keyboards/4pplet/bootleg/keymaps/default/keymap.c index 2e19443054b..81d81e980ff 100644 --- a/keyboards/4pplet/bootleg/keymaps/default/keymap.c +++ b/keyboards/4pplet/bootleg/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), // basic function layer [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/bootleg/keymaps/via/keymap.c b/keyboards/4pplet/bootleg/keymaps/via/keymap.c index 3a095c1d10b..3a817590e97 100644 --- a/keyboards/4pplet/bootleg/keymaps/via/keymap.c +++ b/keyboards/4pplet/bootleg/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), // basic function layer [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/keymaps/default/keymap.c b/keyboards/4pplet/eagle_viper_rep/rev_a/keymaps/default/keymap.c index bafdeed53e0..0cb6dccd76b 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/keymaps/default/keymap.c +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_NO, KC_RALT, KC_RGUI, MO(1)), // basic function layer [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/keymaps/via/keymap.c b/keyboards/4pplet/eagle_viper_rep/rev_a/keymaps/via/keymap.c index ebd478053a2..d8aa29c890b 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/keymaps/via/keymap.c +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_NO, KC_RALT, KC_RGUI, MO(1)), // basic function layer [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/perk60_iso/keymaps/default/keymap.c b/keyboards/4pplet/perk60_iso/keymaps/default/keymap.c index d4923023448..c6e1f14d0b3 100644 --- a/keyboards/4pplet/perk60_iso/keymaps/default/keymap.c +++ b/keyboards/4pplet/perk60_iso/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL), // basic function layer [1] = LAYOUT_60_iso( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/perk60_iso/keymaps/via/keymap.c b/keyboards/4pplet/perk60_iso/keymaps/via/keymap.c index 22436397bdb..da28173b0a2 100644 --- a/keyboards/4pplet/perk60_iso/keymaps/via/keymap.c +++ b/keyboards/4pplet/perk60_iso/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL), // basic function layer [1] = LAYOUT_60_iso( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/waffling60/rev_a/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/rev_a/keymaps/default/keymap.c index 6310f09749c..e124c04d1c1 100644 --- a/keyboards/4pplet/waffling60/rev_a/keymaps/default/keymap.c +++ b/keyboards/4pplet/waffling60/rev_a/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), // basic function layer [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/waffling60/rev_a/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/rev_a/keymaps/via/keymap.c index 0560eb8c0c6..ce9a461e77a 100644 --- a/keyboards/4pplet/waffling60/rev_a/keymaps/via/keymap.c +++ b/keyboards/4pplet/waffling60/rev_a/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), // basic function layer [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/waffling60/rev_b/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/rev_b/keymaps/default/keymap.c index 6310f09749c..e124c04d1c1 100644 --- a/keyboards/4pplet/waffling60/rev_b/keymaps/default/keymap.c +++ b/keyboards/4pplet/waffling60/rev_b/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), // basic function layer [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/waffling60/rev_b/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/rev_b/keymaps/via/keymap.c index 0560eb8c0c6..ce9a461e77a 100644 --- a/keyboards/4pplet/waffling60/rev_b/keymaps/via/keymap.c +++ b/keyboards/4pplet/waffling60/rev_b/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), // basic function layer [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/waffling60/rev_c/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/rev_c/keymaps/default/keymap.c index 6310f09749c..e124c04d1c1 100644 --- a/keyboards/4pplet/waffling60/rev_c/keymaps/default/keymap.c +++ b/keyboards/4pplet/waffling60/rev_c/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), // basic function layer [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/waffling60/rev_c/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/rev_c/keymaps/via/keymap.c index 0560eb8c0c6..ce9a461e77a 100644 --- a/keyboards/4pplet/waffling60/rev_c/keymaps/via/keymap.c +++ b/keyboards/4pplet/waffling60/rev_c/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), // basic function layer [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/waffling60/rev_d/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/rev_d/keymaps/via/keymap.c index c24c5f27d1c..8035665ce45 100644 --- a/keyboards/4pplet/waffling60/rev_d/keymaps/via/keymap.c +++ b/keyboards/4pplet/waffling60/rev_d/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), // basic function layer [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/waffling80/keymaps/via/keymap.c b/keyboards/4pplet/waffling80/keymaps/via/keymap.c index aead3550bd5..843c93d70d0 100644 --- a/keyboards/4pplet/waffling80/keymaps/via/keymap.c +++ b/keyboards/4pplet/waffling80/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(1), MO(1)), // extra keys for alps dual action switches // basic function layer [1] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS), // extra keys for alps dual action switches [2] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS), // extra keys for alps dual action switches [3] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/yakiimo/keymaps/default/keymap.c b/keyboards/4pplet/yakiimo/keymaps/default/keymap.c index bf399dc60e9..416c1f50e99 100644 --- a/keyboards/4pplet/yakiimo/keymaps/default/keymap.c +++ b/keyboards/4pplet/yakiimo/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), // basic function layer [1] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/4pplet/yakiimo/keymaps/via/keymap.c b/keyboards/4pplet/yakiimo/keymaps/via/keymap.c index df6b1118c6a..6255c4bcf9d 100644 --- a/keyboards/4pplet/yakiimo/keymaps/via/keymap.c +++ b/keyboards/4pplet/yakiimo/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), // basic function layer [1] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), // extra layer for VIA [2] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // extra layer for VIA [3] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/8pack/keymaps/default/keymap.c b/keyboards/8pack/keymaps/default/keymap.c index e327d009e84..a50ad14a0a1 100644 --- a/keyboards/8pack/keymaps/default/keymap.c +++ b/keyboards/8pack/keymaps/default/keymap.c @@ -7,6 +7,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( RGB_TOG, RGB_RMOD, RGB_MOD, KC_NO, - QK_BOOT, BL_DOWN, BL_UP, BL_TOGG + QK_BOOT, BL_DOWN, BL_UP, BL_TOGG ) }; diff --git a/keyboards/acekeyboard/titan60/keymaps/default/keymap.c b/keyboards/acekeyboard/titan60/keymaps/default/keymap.c index a6742db9bb8..bd3bc0d6ed1 100644 --- a/keyboards/acekeyboard/titan60/keymaps/default/keymap.c +++ b/keyboards/acekeyboard/titan60/keymaps/default/keymap.c @@ -43,6 +43,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_TOG, RGB_RMOD,KC_UP, RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, BS_SWAP, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END, KC_PGDN, KC_TRNS, - KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c b/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c index 02f6a1cda0d..fce3fb3feb6 100644 --- a/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c +++ b/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c @@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_TOG, RGB_RMOD,KC_UP, RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, BS_SWAP, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, - KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c b/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c index eb4006a99b7..f73b2db5fb9 100644 --- a/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c +++ b/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c @@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_TOG, RGB_RMOD, RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_CLR, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_CALC, KC_MPLY, KC_MNXT, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, - KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_STOP, KC_TRNS, KC_TRNS + KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_STOP, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/acheron/shark/alpha/keymaps/default/keymap.c b/keyboards/acheron/shark/alpha/keymaps/default/keymap.c index 612355ec450..7238d8b49e0 100644 --- a/keyboards/acheron/shark/alpha/keymaps/default/keymap.c +++ b/keyboards/acheron/shark/alpha/keymaps/default/keymap.c @@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_UP, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/acheron/shark/alpha/keymaps/via/keymap.c b/keyboards/acheron/shark/alpha/keymaps/via/keymap.c index 2d3123cccf8..1f006a79222 100644 --- a/keyboards/acheron/shark/alpha/keymaps/via/keymap.c +++ b/keyboards/acheron/shark/alpha/keymaps/via/keymap.c @@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_UP, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ada/ada1800mini/keymaps/default/keymap.c b/keyboards/ada/ada1800mini/keymaps/default/keymap.c index 30b6326ecd7..ae77741f68e 100644 --- a/keyboards/ada/ada1800mini/keymaps/default/keymap.c +++ b/keyboards/ada/ada1800mini/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_DEL, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_DEL, _______, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_SCLN, KC_QUOT, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, KC_COMM, KC_DOT, KC_SLSH, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______ diff --git a/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c index fb1fb0aa967..4fc3ed45f27 100644 --- a/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c +++ b/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c index 7d6af4f0eae..3631b485cc7 100644 --- a/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c +++ b/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/afternoonlabs/breeze/keymaps/default/keymap.c b/keyboards/afternoonlabs/breeze/keymaps/default/keymap.c index 10fbfe660a5..be3d1555c11 100644 --- a/keyboards/afternoonlabs/breeze/keymaps/default/keymap.c +++ b/keyboards/afternoonlabs/breeze/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐ - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤ diff --git a/keyboards/afternoonlabs/breeze/keymaps/via/keymap.c b/keyboards/afternoonlabs/breeze/keymaps/via/keymap.c index aeb91b11132..be295ac502e 100644 --- a/keyboards/afternoonlabs/breeze/keymaps/via/keymap.c +++ b/keyboards/afternoonlabs/breeze/keymaps/via/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐ - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤ diff --git a/keyboards/afternoonlabs/oceanbreeze/keymaps/default/keymap.c b/keyboards/afternoonlabs/oceanbreeze/keymaps/default/keymap.c index 61f41c1e857..e26c0bfcadb 100644 --- a/keyboards/afternoonlabs/oceanbreeze/keymaps/default/keymap.c +++ b/keyboards/afternoonlabs/oceanbreeze/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐ - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤ diff --git a/keyboards/afternoonlabs/southern_breeze/keymaps/default/keymap.c b/keyboards/afternoonlabs/southern_breeze/keymaps/default/keymap.c index f6de8b5b8c0..fbd18d12822 100644 --- a/keyboards/afternoonlabs/southern_breeze/keymaps/default/keymap.c +++ b/keyboards/afternoonlabs/southern_breeze/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( //┌────────┬────────┬────────┐┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_MUTE, KC_VOLD, KC_VOLU, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_MUTE, KC_VOLD, KC_VOLU, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┤├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┤├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ diff --git a/keyboards/afternoonlabs/southern_breeze/keymaps/via/keymap.c b/keyboards/afternoonlabs/southern_breeze/keymaps/via/keymap.c index a1888bfb68e..6c079861ad8 100644 --- a/keyboards/afternoonlabs/southern_breeze/keymaps/via/keymap.c +++ b/keyboards/afternoonlabs/southern_breeze/keymaps/via/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( //┌────────┬────────┬────────┐┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_MUTE, KC_VOLD, KC_VOLU, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_MUTE, KC_VOLD, KC_VOLU, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┤├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┤├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ diff --git a/keyboards/afternoonlabs/summer_breeze/keymaps/default/keymap.c b/keyboards/afternoonlabs/summer_breeze/keymaps/default/keymap.c index 3468b86467b..d65d1193380 100644 --- a/keyboards/afternoonlabs/summer_breeze/keymaps/default/keymap.c +++ b/keyboards/afternoonlabs/summer_breeze/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( //┌────────┬────────┬────────┐┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐ - _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, + _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, //├────────┼────────┼────────┤├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤ _______, KC_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┤├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤ diff --git a/keyboards/afternoonlabs/summer_breeze/keymaps/via/keymap.c b/keyboards/afternoonlabs/summer_breeze/keymaps/via/keymap.c index 6190aa66a29..2f725b5eeac 100644 --- a/keyboards/afternoonlabs/summer_breeze/keymaps/via/keymap.c +++ b/keyboards/afternoonlabs/summer_breeze/keymaps/via/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( //┌────────┬────────┬────────┐┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐ - _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, + _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, //├────────┼────────┼────────┤├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤ _______, KC_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┤├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤ diff --git a/keyboards/ai03/jp60/keymaps/default/keymap.c b/keyboards/ai03/jp60/keymaps/default/keymap.c index a6423ef834a..edff10dc7e1 100644 --- a/keyboards/ai03/jp60/keymaps/default/keymap.c +++ b/keyboards/ai03/jp60/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, JP_ZKHK, JP_EISU ), [_FN] = LAYOUT( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/ai03/jp60/keymaps/via/keymap.c b/keyboards/ai03/jp60/keymaps/via/keymap.c index 9930e8e753e..9b88fd5b763 100644 --- a/keyboards/ai03/jp60/keymaps/via/keymap.c +++ b/keyboards/ai03/jp60/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, KC_GRV, KC_CAPS ), [_FN1] = LAYOUT( /* FN1 */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/ai03/lunar/keymaps/default/keymap.c b/keyboards/ai03/lunar/keymaps/default/keymap.c index f709e688c0a..e7362da8773 100644 --- a/keyboards/ai03/lunar/keymaps/default/keymap.c +++ b/keyboards/ai03/lunar/keymaps/default/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, MANUAL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, MANUAL, KC_CAPS, _______, KC_UP, _______, _______, _______, KC_NUM, KC_P7, KC_P8, KC_P9, KC_MPRV, KC_MPLY, KC_MNXT, _______, SWPLURL, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_VOLD, KC_VOLU, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______, _______, KC_RCTL, KC_RGUI, KC_RALT, _______, _______, KC_P0, KC_P1, KC_P2, KC_P3, _______, _______, KC_PGUP, _______, diff --git a/keyboards/ai03/lunar/keymaps/via/keymap.c b/keyboards/ai03/lunar/keymaps/via/keymap.c index a200c568033..919e2902d82 100644 --- a/keyboards/ai03/lunar/keymaps/via/keymap.c +++ b/keyboards/ai03/lunar/keymaps/via/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______, KC_CAPS, _______, KC_UP, _______, _______, _______, KC_NUM, KC_P7, KC_P8, KC_P9, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_VOLD, KC_VOLU, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______, _______, KC_RCTL, KC_RGUI, KC_RALT, _______, _______, KC_P0, KC_P1, KC_P2, KC_P3, _______, _______, KC_PGUP, _______, diff --git a/keyboards/ai03/orbit_x/keymaps/default/keymap.c b/keyboards/ai03/orbit_x/keymaps/default/keymap.c index 8b62eb9eb4f..2d9525c3a33 100644 --- a/keyboards/ai03/orbit_x/keymaps/default/keymap.c +++ b/keyboards/ai03/orbit_x/keymaps/default/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_FN] = LAYOUT( - QK_BOOT, XXXXXXX, KC_F1, KC_F2, KC_F3, XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, XXXXXXX, QK_BOOT, + QK_BOOT, XXXXXXX, KC_F1, KC_F2, KC_F3, XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, XXXXXXX, QK_BOOT, _______, XXXXXXX, KC_F4, KC_F5, KC_F6, XXXXXXX, XXXXXXX, KC_F10, KC_F11, KC_F12, XXXXXXX, _______, _______, XXXXXXX, KC_VOLD, XXXXXXX, KC_VOLU, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ai03/orbit_x/keymaps/via/keymap.c b/keyboards/ai03/orbit_x/keymaps/via/keymap.c index 417533590d8..4a49280c0ce 100644 --- a/keyboards/ai03/orbit_x/keymaps/via/keymap.c +++ b/keyboards/ai03/orbit_x/keymaps/via/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_FN] = LAYOUT( - QK_BOOT, XXXXXXX, KC_F1, KC_F2, KC_F3, XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, XXXXXXX, QK_BOOT, + QK_BOOT, XXXXXXX, KC_F1, KC_F2, KC_F3, XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, XXXXXXX, QK_BOOT, _______, XXXXXXX, KC_F4, KC_F5, KC_F6, XXXXXXX, XXXXXXX, KC_F10, KC_F11, KC_F12, XXXXXXX, _______, _______, XXXXXXX, KC_VOLD, XXXXXXX, KC_VOLU, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ai03/polaris/keymaps/default/keymap.c b/keyboards/ai03/polaris/keymaps/default/keymap.c index c53c3a7226e..5c137002efd 100644 --- a/keyboards/ai03/polaris/keymaps/default/keymap.c +++ b/keyboards/ai03/polaris/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), [_FN] = LAYOUT_all( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, BL_STEP, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_PSCR, _______, diff --git a/keyboards/ai03/polaris/keymaps/default_ansi_tsangan/keymap.c b/keyboards/ai03/polaris/keymaps/default_ansi_tsangan/keymap.c index e6126b1ff9d..510c4aed7f7 100644 --- a/keyboards/ai03/polaris/keymaps/default_ansi_tsangan/keymap.c +++ b/keyboards/ai03/polaris/keymaps/default_ansi_tsangan/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ), [_FN] = LAYOUT_60_tsangan_hhkb( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, BL_STEP, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_PSCR, _______, diff --git a/keyboards/ai03/quasar/keymaps/default/keymap.c b/keyboards/ai03/quasar/keymaps/default/keymap.c index 7f6563edf54..45a5ef0e11f 100644 --- a/keyboards/ai03/quasar/keymaps/default/keymap.c +++ b/keyboards/ai03/quasar/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( /* FN */ - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/ai03/vega/keymaps/default/keymap.c b/keyboards/ai03/vega/keymaps/default/keymap.c index 432edc18133..138d71478a9 100644 --- a/keyboards/ai03/vega/keymaps/default/keymap.c +++ b/keyboards/ai03/vega/keymaps/default/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, diff --git a/keyboards/ai03/vega/keymaps/via/keymap.c b/keyboards/ai03/vega/keymaps/via/keymap.c index db450dd297f..de97d9891f5 100644 --- a/keyboards/ai03/vega/keymaps/via/keymap.c +++ b/keyboards/ai03/vega/keymaps/via/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, diff --git a/keyboards/ai03/voyager60_alps/keymaps/via/keymap.c b/keyboards/ai03/voyager60_alps/keymaps/via/keymap.c index 136f75de911..166b19a04bf 100644 --- a/keyboards/ai03/voyager60_alps/keymaps/via/keymap.c +++ b/keyboards/ai03/voyager60_alps/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, _______, KC_RGUI, KC_RALT, KC_RCTL ), [1] = LAYOUT( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/al1/keymaps/default/keymap.c b/keyboards/al1/keymaps/default/keymap.c index 9ea79868e40..ad5593bb121 100644 --- a/keyboards/al1/keymaps/default/keymap.c +++ b/keyboards/al1/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP, _______, _______ diff --git a/keyboards/al1/keymaps/via/keymap.c b/keyboards/al1/keymaps/via/keymap.c index a5539d526a5..865f407cb8c 100644 --- a/keyboards/al1/keymaps/via/keymap.c +++ b/keyboards/al1/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c index 41532c5d055..0cc5dfabf1d 100755 --- a/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c +++ b/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c @@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------' */ [_ADJUST] = LAYOUT( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_SLEP, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c index 23ccc2b2abb..696c2d1a0cc 100644 --- a/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c +++ b/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [2] = LAYOUT_625u_space( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, KC_PWR, _______, _______, KC_PSCR, KC_PAUS, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, _______, + QK_BOOT, KC_PWR, _______, _______, KC_PSCR, KC_PAUS, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, _______, KC_UP, KC_MINS, KC_EQL, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_LPRN, KC_RPRN, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______ ), diff --git a/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c index e32bafc4c7d..4532f95c7fa 100644 --- a/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c +++ b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c @@ -35,6 +35,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c index 07e1713b668..5f62db66033 100644 --- a/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c +++ b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT_ortho_600u_space( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/amjkeyboard/amj66/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj66/keymaps/default/keymap.c index 6f2f00b8004..c063551873f 100644 --- a/keyboards/amjkeyboard/amj66/keymaps/default/keymap.c +++ b/keyboards/amjkeyboard/amj66/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, KC_BSPC, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_DEL, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, BL_STEP, KC_SLEP, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), diff --git a/keyboards/amjkeyboard/amj96/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj96/keymaps/default/keymap.c index c61b0bd9a36..9fabb96d600 100644 --- a/keyboards/amjkeyboard/amj96/keymaps/default/keymap.c +++ b/keyboards/amjkeyboard/amj96/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/anomalykb/a65i/keymaps/default/keymap.c b/keyboards/anomalykb/a65i/keymaps/default/keymap.c index ccd7a9b8f98..b620124b937 100644 --- a/keyboards/anomalykb/a65i/keymaps/default/keymap.c +++ b/keyboards/anomalykb/a65i/keymaps/default/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_65_ansi_blocker( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/anomalykb/a65i/keymaps/iso/keymap.c b/keyboards/anomalykb/a65i/keymaps/iso/keymap.c index 8d6a7bab17e..6c631644ae2 100644 --- a/keyboards/anomalykb/a65i/keymaps/iso/keymap.c +++ b/keyboards/anomalykb/a65i/keymaps/iso/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_65_iso_blocker( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/anomalykb/a65i/keymaps/iso_splitbs/keymap.c b/keyboards/anomalykb/a65i/keymaps/iso_splitbs/keymap.c index fe50f9394b1..c8cf0a17873 100644 --- a/keyboards/anomalykb/a65i/keymaps/iso_splitbs/keymap.c +++ b/keyboards/anomalykb/a65i/keymaps/iso_splitbs/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_65_iso_blocker_split_bs( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/anomalykb/a65i/keymaps/via/keymap.c b/keyboards/anomalykb/a65i/keymaps/via/keymap.c index ccd7a9b8f98..b620124b937 100644 --- a/keyboards/anomalykb/a65i/keymaps/via/keymap.c +++ b/keyboards/anomalykb/a65i/keymaps/via/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_65_ansi_blocker( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/aos/tkl/keymaps/default/keymap.c b/keyboards/aos/tkl/keymaps/default/keymap.c index aa1a8dd1a4c..5893d12af46 100644 --- a/keyboards/aos/tkl/keymaps/default/keymap.c +++ b/keyboards/aos/tkl/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAI diff --git a/keyboards/aos/tkl/keymaps/via/keymap.c b/keyboards/aos/tkl/keymaps/via/keymap.c index 4d5d8fbad02..748a921180f 100644 --- a/keyboards/aos/tkl/keymaps/via/keymap.c +++ b/keyboards/aos/tkl/keymaps/via/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAI diff --git a/keyboards/aozora/keymaps/default/keymap.c b/keyboards/aozora/keymaps/default/keymap.c index c610438c3bd..870e0b3f7d3 100644 --- a/keyboards/aozora/keymaps/default/keymap.c +++ b/keyboards/aozora/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/arisu/keymaps/default/keymap.c b/keyboards/arisu/keymaps/default/keymap.c index 157da7eddc3..73d59bb5956 100644 --- a/keyboards/arisu/keymaps/default/keymap.c +++ b/keyboards/arisu/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/arisu/keymaps/via/keymap.c b/keyboards/arisu/keymaps/via/keymap.c index 9e50d247205..d19f4ad3b4e 100644 --- a/keyboards/arisu/keymaps/via/keymap.c +++ b/keyboards/arisu/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/atlas_65/keymaps/default/keymap.c b/keyboards/atlas_65/keymaps/default/keymap.c index f36a71c518d..d27abb6a57f 100644 --- a/keyboards/atlas_65/keymaps/default/keymap.c +++ b/keyboards/atlas_65/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/atlas_65/keymaps/via/keymap.c b/keyboards/atlas_65/keymaps/via/keymap.c index ec4b042329c..81e538d3100 100644 --- a/keyboards/atlas_65/keymaps/via/keymap.c +++ b/keyboards/atlas_65/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/atreus/keymaps/default/keymap.c b/keyboards/atreus/keymaps/default/keymap.c index a2fdc75ac77..ca1333230c9 100644 --- a/keyboards/atreus/keymaps/default/keymap.c +++ b/keyboards/atreus/keymaps/default/keymap.c @@ -39,6 +39,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LW] = LAYOUT( /* [> LOWER <] */ KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 , KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 , - KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 , + KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 , KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS ) }; diff --git a/keyboards/atreus/keymaps/via/keymap.c b/keyboards/atreus/keymaps/via/keymap.c index 355e08ac2f2..52740c5bad9 100644 --- a/keyboards/atreus/keymaps/via/keymap.c +++ b/keyboards/atreus/keymaps/via/keymap.c @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LW] = LAYOUT( /* [> LOWER <] */ KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 , KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 , - KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 , + KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 , KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS ), [_EM] = LAYOUT( /* [> EMPTY <] */ diff --git a/keyboards/atxkb/1894/keymaps/default/keymap.c b/keyboards/atxkb/1894/keymaps/default/keymap.c index c53c3a7226e..5c137002efd 100644 --- a/keyboards/atxkb/1894/keymaps/default/keymap.c +++ b/keyboards/atxkb/1894/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), [_FN] = LAYOUT_all( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, BL_STEP, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_PSCR, _______, diff --git a/keyboards/atxkb/1894/keymaps/default_ansi_tsangan/keymap.c b/keyboards/atxkb/1894/keymaps/default_ansi_tsangan/keymap.c index e6126b1ff9d..510c4aed7f7 100644 --- a/keyboards/atxkb/1894/keymaps/default_ansi_tsangan/keymap.c +++ b/keyboards/atxkb/1894/keymaps/default_ansi_tsangan/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ), [_FN] = LAYOUT_60_tsangan_hhkb( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, BL_STEP, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_PSCR, _______, diff --git a/keyboards/axolstudio/foundation_gamma/keymaps/default/keymap.c b/keyboards/axolstudio/foundation_gamma/keymaps/default/keymap.c index ac080e61653..72727ad6796 100644 --- a/keyboards/axolstudio/foundation_gamma/keymaps/default/keymap.c +++ b/keyboards/axolstudio/foundation_gamma/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_f13_ansi_tsangan( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/axolstudio/foundation_gamma/keymaps/via/keymap.c b/keyboards/axolstudio/foundation_gamma/keymaps/via/keymap.c index bc4d2c2e4d5..affa97de92c 100644 --- a/keyboards/axolstudio/foundation_gamma/keymaps/via/keymap.c +++ b/keyboards/axolstudio/foundation_gamma/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/b_sides/rev41lp/keymaps/default/keymap.c b/keyboards/b_sides/rev41lp/keymaps/default/keymap.c index a873433953c..73f03cf342c 100644 --- a/keyboards/b_sides/rev41lp/keymaps/default/keymap.c +++ b/keyboards/b_sides/rev41lp/keymaps/default/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_TOGG, BL_BRTG, BL_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/b_sides/rev41lp/keymaps/via/keymap.c b/keyboards/b_sides/rev41lp/keymaps/via/keymap.c index a873433953c..73f03cf342c 100644 --- a/keyboards/b_sides/rev41lp/keymaps/via/keymap.c +++ b/keyboards/b_sides/rev41lp/keymaps/via/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_TOGG, BL_BRTG, BL_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/bacca70/keymaps/default/keymap.c b/keyboards/bacca70/keymaps/default/keymap.c index 812116a953b..cf52d0eda53 100644 --- a/keyboards/bacca70/keymaps/default/keymap.c +++ b/keyboards/bacca70/keymaps/default/keymap.c @@ -33,6 +33,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS ) }; diff --git a/keyboards/bacca70/keymaps/via/keymap.c b/keyboards/bacca70/keymaps/via/keymap.c index 3365bf47595..cb9af18a5e6 100644 --- a/keyboards/bacca70/keymaps/via/keymap.c +++ b/keyboards/bacca70/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS ), [2] = LAYOUT_default( @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS ), [3] = LAYOUT_default( @@ -51,6 +51,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS ) }; diff --git a/keyboards/baguette/keymaps/default/keymap.c b/keyboards/baguette/keymaps/default/keymap.c index 5f168c3d5b5..ae1926c6029 100644 --- a/keyboards/baguette/keymaps/default/keymap.c +++ b/keyboards/baguette/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi( /* FN */ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/baguette/keymaps/iso/keymap.c b/keyboards/baguette/keymaps/iso/keymap.c index b372f71111c..6d6b569260c 100644 --- a/keyboards/baguette/keymaps/iso/keymap.c +++ b/keyboards/baguette/keymaps/iso/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_iso( /* FN */ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/barleycorn_smd/keymaps/default/keymap.c b/keyboards/barleycorn_smd/keymaps/default/keymap.c index 9775a961ad3..e95a201f9e3 100644 --- a/keyboards/barleycorn_smd/keymaps/default/keymap.c +++ b/keyboards/barleycorn_smd/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/barleycorn_smd/keymaps/iso/keymap.c b/keyboards/barleycorn_smd/keymaps/iso/keymap.c index 69460023fbc..9bef4bf8f00 100644 --- a/keyboards/barleycorn_smd/keymaps/iso/keymap.c +++ b/keyboards/barleycorn_smd/keymaps/iso/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_iso( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/barleycorn_smd/keymaps/via/keymap.c b/keyboards/barleycorn_smd/keymaps/via/keymap.c index 5f406174a93..df48cf36059 100644 --- a/keyboards/barleycorn_smd/keymaps/via/keymap.c +++ b/keyboards/barleycorn_smd/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c index 8fc93cdc989..492f46be447 100644 --- a/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c +++ b/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_all( /* Base */ //,------------------------------------------------------------------------| |--------------------------------------------------------------------------------------. - XXXXXXX,TG(_ADJUST), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, + XXXXXXX,TG(_ADJUST), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| diff --git a/keyboards/basketweave/keymaps/default/keymap.c b/keyboards/basketweave/keymaps/default/keymap.c index efe70b32ec6..a9108061e61 100644 --- a/keyboards/basketweave/keymaps/default/keymap.c +++ b/keyboards/basketweave/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* esc ` 1 2 3 4 5 6 7 8 9 0 - = bspc */ KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, /* ins tab Q W E R T Y U I O P [ ] \ rotary */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, /* del caps A S D F G H J K L ; ' enter */ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, /* shift Z X C V B B N M , . / shift up */ diff --git a/keyboards/basketweave/keymaps/via/keymap.c b/keyboards/basketweave/keymaps/via/keymap.c index dd89371aea9..fbbca6a7899 100644 --- a/keyboards/basketweave/keymaps/via/keymap.c +++ b/keyboards/basketweave/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* esc ` 1 2 3 4 5 6 7 8 9 0 - = bspc */ KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, /* ins tab Q W E R T Y U I O P [ ] \ rotary */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, /* del caps A S D F G H J K L ; ' enter */ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, /* shift Z X C V B B N M , . / shift up */ diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c index 4185bba7d99..a86d0bb7ba1 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤ KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, KC_VOLD, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤ - QK_BOOT, EE_CLR, KC_MPRV, KC_MNXT, KC_MPLY, XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX, KC_ENT, + QK_BOOT, EE_CLR, KC_MPRV, KC_MNXT, KC_MPLY, XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX, KC_ENT, // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯ XXXXXXX, _______, KC_LSFT, KC_SPC, _______, KC_ESC // ╰───────────────────────────╯ ╰──────────────────────────╯ diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c index dacef2231ef..70c89647d11 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c @@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /** \brief Mouse emulation and pointer functions. */ [LAYER_POINTER] = LAYOUT_split_3x5_3( - QK_BOOT, EE_CLR, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX, EE_CLR, QK_BOOT, + QK_BOOT, EE_CLR, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX, EE_CLR, QK_BOOT, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, _______, DRGSCRL, SNIPING, KC_BTN3, XXXXXXX, XXXXXXX, KC_BTN3, SNIPING, DRGSCRL, _______, KC_BTN3, KC_BTN2, KC_BTN1, KC_BTN1, KC_BTN2, KC_BTN3 diff --git a/keyboards/bastardkb/tbk/keymaps/default/keymap.c b/keyboards/bastardkb/tbk/keymaps/default/keymap.c index f9a699f11fa..3227076c076 100644 --- a/keyboards/bastardkb/tbk/keymaps/default/keymap.c +++ b/keyboards/bastardkb/tbk/keymaps/default/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_split_4x6_5( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, //---------------------------------------------------------//-----------------------------------------------------------// - QK_BOOT, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, _______, KC_PLUS, + QK_BOOT, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, _______, KC_PLUS, //---------------------------------------------------------//-----------------------------------------------------------// _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END, KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE, //---------------------------------------------------------//-----------------------------------------------------------// diff --git a/keyboards/bear_face/v1/keymaps/default/keymap.c b/keyboards/bear_face/v1/keymaps/default/keymap.c index ccebb7d0839..fc92c783dbe 100644 --- a/keyboards/bear_face/v1/keymaps/default/keymap.c +++ b/keyboards/bear_face/v1/keymaps/default/keymap.c @@ -64,8 +64,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_83_ansi( _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, BASE_QWER, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, BASE_COLE, - _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BASE_DVOR, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, BASE_COLE, + _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BASE_DVOR, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/bear_face/v2/keymaps/default/keymap.c b/keyboards/bear_face/v2/keymaps/default/keymap.c index 08df949b8cd..0d536b68f38 100644 --- a/keyboards/bear_face/v2/keymaps/default/keymap.c +++ b/keyboards/bear_face/v2/keymaps/default/keymap.c @@ -64,8 +64,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_83_ansi( _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, BASE_QWER, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, BASE_COLE, - _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BASE_DVOR, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, BASE_COLE, + _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BASE_DVOR, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/bear_face/v2/keymaps/default_iso/keymap.c b/keyboards/bear_face/v2/keymaps/default_iso/keymap.c index 347b84d2bda..e9e6c837f4d 100644 --- a/keyboards/bear_face/v2/keymaps/default_iso/keymap.c +++ b/keyboards/bear_face/v2/keymaps/default_iso/keymap.c @@ -64,8 +64,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_84_iso( _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, BASE_QWER, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, BASE_COLE, - _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BASE_DVOR, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, BASE_COLE, + _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BASE_DVOR, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/bemeier/bmek/keymaps/default/keymap.c b/keyboards/bemeier/bmek/keymaps/default/keymap.c index 8526399379a..5ca4a3c8b21 100755 --- a/keyboards/bemeier/bmek/keymaps/default/keymap.c +++ b/keyboards/bemeier/bmek/keymaps/default/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │ │ │ │ │ │ │ │ └─────┴──────┴────────────────┘ └────────────────┴──────┴─────┘ */ - QK_BOOT, KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + QK_BOOT, KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, _______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, _______, _______, _______, _______, TG(2), _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, @@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │ │ │ │ │ │ │ │ └─────┴──────┴────────────────┘ └────────────────┴──────┴─────┘ */ - QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SPI, RGB_SPD, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(2), RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, diff --git a/keyboards/bemeier/bmek/keymaps/via/keymap.c b/keyboards/bemeier/bmek/keymaps/via/keymap.c index f072a7ec7cd..b8e72975470 100755 --- a/keyboards/bemeier/bmek/keymaps/via/keymap.c +++ b/keyboards/bemeier/bmek/keymaps/via/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │ │ │ │ │ │ │ │ └─────┴──────┴────────────────┘ └────────────────┴──────┴─────┘ */ - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, _______, _______, KC_END, KC_UP, KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLD, KC_VOLU, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, TG(4), XXXXXXX, XXXXXXX, TG(2), XXXXXXX, XXXXXXX, LCTL(LGUI(KC_LEFT)), LCTL(LGUI(KC_RGHT)), KC_MUTE, _______, _______, @@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │ │ │ │ │ │ │ │ └─────┴──────┴────────────────┘ └────────────────┴──────┴─────┘ */ - QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SPI, RGB_SPD, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(4), RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, diff --git a/keyboards/biacco42/ergo42/keymaps/default-underglow/keymap.c b/keyboards/biacco42/ergo42/keymaps/default-underglow/keymap.c index 4d61c6291e9..0710cd1ebea 100644 --- a/keyboards/biacco42/ergo42/keymaps/default-underglow/keymap.c +++ b/keyboards/biacco42/ergo42/keymaps/default-underglow/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `------------------------------------------------' `------------------------------------------------' */ [META] = LAYOUT( - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LBRC, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LBRC, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, KC_F1, XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, _______, _______, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, S(KC_LBRC), S(KC_RBRC), KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX diff --git a/keyboards/biacco42/ergo42/keymaps/default/keymap.c b/keyboards/biacco42/ergo42/keymaps/default/keymap.c index 815ea92bf4f..4cc9bf02843 100644 --- a/keyboards/biacco42/ergo42/keymaps/default/keymap.c +++ b/keyboards/biacco42/ergo42/keymaps/default/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `------------------------------------------------' `------------------------------------------------' */ [META] = LAYOUT( - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LBRC, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LBRC, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, KC_F1, XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, _______, _______, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, S(KC_LBRC), S(KC_RBRC), KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX diff --git a/keyboards/bioi/g60ble/keymaps/via/keymap.c b/keyboards/bioi/g60ble/keymaps/via/keymap.c index 860d1df6160..784ac7d2906 100644 --- a/keyboards/bioi/g60ble/keymaps/via/keymap.c +++ b/keyboards/bioi/g60ble/keymaps/via/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, - KC_CAPS, QK_BOOT, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, + KC_CAPS, QK_BOOT, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, _______, KC_ASTR, KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, RGB_MOD, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, KC_PLUS, KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, BL_STEP, _______, RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, BL_TOGG diff --git a/keyboards/blank/blank01/keymaps/default/keymap.c b/keyboards/blank/blank01/keymaps/default/keymap.c index cf7f5583c88..2e2a863f278 100644 --- a/keyboards/blank/blank01/keymaps/default/keymap.c +++ b/keyboards/blank/blank01/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_60_tsangan_hhkb( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/blank/blank01/keymaps/via/keymap.c b/keyboards/blank/blank01/keymaps/via/keymap.c index 88ab48b1510..7f42ff0e358 100644 --- a/keyboards/blank/blank01/keymaps/via/keymap.c +++ b/keyboards/blank/blank01/keymaps/via/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_60_tsangan_hhkb( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/blank_tehnologii/manibus/keymaps/default/keymap.c b/keyboards/blank_tehnologii/manibus/keymaps/default/keymap.c index 769d96bf462..8a400f49816 100644 --- a/keyboards/blank_tehnologii/manibus/keymaps/default/keymap.c +++ b/keyboards/blank_tehnologii/manibus/keymaps/default/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, // ├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, KC_UP, _______, KC_MPLY, KC_F12, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, KC_UP, _______, KC_MPLY, KC_F12, // ├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC_VOLD, KC_VOLU, // ├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ diff --git a/keyboards/blank_tehnologii/manibus/keymaps/via/keymap.c b/keyboards/blank_tehnologii/manibus/keymaps/via/keymap.c index 3d5385aa3e0..3ce379f8de1 100644 --- a/keyboards/blank_tehnologii/manibus/keymaps/via/keymap.c +++ b/keyboards/blank_tehnologii/manibus/keymaps/via/keymap.c @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, // ├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, KC_UP, _______, KC_MPLY, KC_F12, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, KC_UP, _______, KC_MPLY, KC_F12, // ├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC_VOLD, KC_VOLU, // ├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ diff --git a/keyboards/boardrun/bizarre/keymaps/default/keymap.c b/keyboards/boardrun/bizarre/keymaps/default/keymap.c index 91a1ab1084e..545318f1a42 100644 --- a/keyboards/boardrun/bizarre/keymaps/default/keymap.c +++ b/keyboards/boardrun/bizarre/keymaps/default/keymap.c @@ -62,8 +62,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FNBIZARRE] = LAYOUT_all( - QK_BOOT, _______,_______,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, - _______, _______, _______, _______,_______,QK_BOOT, _______, _______,_______,KC_INS ,_______, KC_PSCR,_______,_______,_______, + QK_BOOT, _______,_______,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, + _______, _______, _______, _______,_______,QK_BOOT,_______, _______,_______,KC_INS ,_______, KC_PSCR,_______,_______,_______, _______, _______, KC_SCRL,_______,_______,_______, _______,_______,_______,_______, _______,_______,_______,_______, _______, _______,_______, _______,_______,_______,KC_PAUS,KC_RGUI, _______,_______,KC_MENU,_______,_______, _______,_______, KC_PGUP, _______, _______, _______, KC_RALT, _______, KC_HOME,KC_PGDN,KC_END diff --git a/keyboards/boardrun/bizarre/keymaps/via/keymap.c b/keyboards/boardrun/bizarre/keymaps/via/keymap.c index 878962f239d..d36fefca85b 100644 --- a/keyboards/boardrun/bizarre/keymaps/via/keymap.c +++ b/keyboards/boardrun/bizarre/keymaps/via/keymap.c @@ -54,8 +54,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_all( - QK_BOOT, _______,_______,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, - _______, _______, _______, _______,_______,QK_BOOT, _______, _______,_______,KC_INS ,_______, KC_PSCR,_______,_______,_______, + QK_BOOT, _______,_______,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, + _______, _______, _______, _______,_______,QK_BOOT,_______, _______,_______,KC_INS ,_______, KC_PSCR,_______,_______,_______, _______, _______, KC_SCRL,_______,_______,_______, _______,_______,_______,_______, _______,_______,_______,_______, _______, _______,_______, _______,_______,_______,KC_PAUS,KC_RGUI, _______,_______,KC_MENU,_______,_______, _______,_______, KC_PGUP, _______, _______, _______, KC_RALT, _______, KC_HOME,KC_PGDN,KC_END diff --git a/keyboards/boardrun/classic/keymaps/default/keymap.c b/keyboards/boardrun/classic/keymaps/default/keymap.c index 9b98128040d..8f7df2f5bdc 100644 --- a/keyboards/boardrun/classic/keymaps/default/keymap.c +++ b/keyboards/boardrun/classic/keymaps/default/keymap.c @@ -64,8 +64,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * '--------------------------------------------------------------------------------------------------------------------' */ [_FNCLASSIC] = LAYOUT_classic( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, - _______, _______, KC_APP, _______, QK_BOOT, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + _______, _______, KC_APP, _______, QK_BOOT, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, KC_CAPS, _______, KC_SCRL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RCTL, _LSNUBS, _______, _______, _______, _______, KC_PAUS, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_RGUI, _______, _______, KC_RALT, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/boardsource/4x12/keymaps/default/keymap.c b/keyboards/boardsource/4x12/keymaps/default/keymap.c index bb192c613d8..6b321795375 100644 --- a/keyboards/boardsource/4x12/keymaps/default/keymap.c +++ b/keyboards/boardsource/4x12/keymaps/default/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [_LOWER] = LAYOUT_ortho_4x12( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, diff --git a/keyboards/boardsource/4x12/keymaps/via/keymap.c b/keyboards/boardsource/4x12/keymaps/via/keymap.c index 6a9621e5083..34887694875 100644 --- a/keyboards/boardsource/4x12/keymaps/via/keymap.c +++ b/keyboards/boardsource/4x12/keymaps/via/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [_LOWER] = LAYOUT_ortho_4x12( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, diff --git a/keyboards/boardsource/5x12/keymaps/default/keymap.c b/keyboards/boardsource/5x12/keymaps/default/keymap.c index 829da5be7f7..281fcbd6d68 100644 --- a/keyboards/boardsource/5x12/keymaps/default/keymap.c +++ b/keyboards/boardsource/5x12/keymaps/default/keymap.c @@ -24,13 +24,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, KC_4, KC_5, KC_6, KC_PLUS, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, KC_ENT, KC_7, KC_8, KC_9, KC_MINS, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [_LOWER] = LAYOUT_ortho_5x12( 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_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ) }; diff --git a/keyboards/boardsource/5x12/keymaps/via/keymap.c b/keyboards/boardsource/5x12/keymaps/via/keymap.c index d820b614271..bc67eae18e4 100644 --- a/keyboards/boardsource/5x12/keymaps/via/keymap.c +++ b/keyboards/boardsource/5x12/keymaps/via/keymap.c @@ -24,14 +24,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, KC_4, KC_5, KC_6, KC_PLUS, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, KC_ENT, KC_7, KC_8, KC_9, KC_MINS, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [_LOWER] = LAYOUT_ortho_5x12( 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_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [3] = LAYOUT_ortho_5x12( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/boardsource/microdox/keymaps/via/keymap.c b/keyboards/boardsource/microdox/keymaps/via/keymap.c index d561feea520..644fd0de41a 100644 --- a/keyboards/boardsource/microdox/keymaps/via/keymap.c +++ b/keyboards/boardsource/microdox/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PGDN, KC_TRNS, KC_SPC, KC_ENT, KC_TRNS, KC_PGUP ), [3] = LAYOUT_split_3x5_3( - QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_VAD, RGB_VAI, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX diff --git a/keyboards/boardsource/technik_o/keymaps/default/keymap.c b/keyboards/boardsource/technik_o/keymaps/default/keymap.c index 9df43c88db3..a43d930c4f3 100644 --- a/keyboards/boardsource/technik_o/keymaps/default/keymap.c +++ b/keyboards/boardsource/technik_o/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [_LOWER] = LAYOUT_ortho_4x12( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, diff --git a/keyboards/boardsource/technik_o/keymaps/via/keymap.c b/keyboards/boardsource/technik_o/keymaps/via/keymap.c index c04898f0aaf..3070e1ef531 100644 --- a/keyboards/boardsource/technik_o/keymaps/via/keymap.c +++ b/keyboards/boardsource/technik_o/keymaps/via/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [_LOWER] = LAYOUT_ortho_4x12( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, diff --git a/keyboards/boardsource/technik_s/keymaps/default/keymap.c b/keyboards/boardsource/technik_s/keymaps/default/keymap.c index d79470e4d18..bae6438d15c 100644 --- a/keyboards/boardsource/technik_s/keymaps/default/keymap.c +++ b/keyboards/boardsource/technik_s/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, RGB_MOD, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD ), [_LOWER] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, diff --git a/keyboards/boardsource/technik_s/keymaps/via/keymap.c b/keyboards/boardsource/technik_s/keymaps/via/keymap.c index bf02f130e89..efdc1fd44ae 100644 --- a/keyboards/boardsource/technik_s/keymaps/via/keymap.c +++ b/keyboards/boardsource/technik_s/keymaps/via/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, RGB_MOD, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD ), [_LOWER] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, diff --git a/keyboards/boardsource/the_mark/keymaps/default/keymap.c b/keyboards/boardsource/the_mark/keymaps/default/keymap.c index 8e4b5caed76..a50367b140a 100644 --- a/keyboards/boardsource/the_mark/keymaps/default/keymap.c +++ b/keyboards/boardsource/the_mark/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c index 75db90f23f0..69f15cfea03 100644 --- a/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c +++ b/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_ansi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, _______, KC_END, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c index 6bef05a7c1e..bb9fd272a73 100644 --- a/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c +++ b/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_ansi_split_bs_space( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, _______, KC_END, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c index 68c664aa96b..9892e3d60a8 100644 --- a/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c +++ b/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_END, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c index 676b9b45757..c6dccc08e84 100644 --- a/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c +++ b/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_iso_split_bs_space( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_END, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/boardsource/the_mark/keymaps/via/keymap.c b/keyboards/boardsource/the_mark/keymaps/via/keymap.c index 3cf3b45d567..60e65bc60c3 100644 --- a/keyboards/boardsource/the_mark/keymaps/via/keymap.c +++ b/keyboards/boardsource/the_mark/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/boardwalk/keymaps/default_2u_arrow/keymap.c b/keyboards/boardwalk/keymaps/default_2u_arrow/keymap.c index 1e76670612b..201eb70de71 100644 --- a/keyboards/boardwalk/keymaps/default_2u_arrow/keymap.c +++ b/keyboards/boardwalk/keymaps/default_2u_arrow/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_END, - _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ ) }; diff --git a/keyboards/boardwalk/keymaps/default_625u_arrow/keymap.c b/keyboards/boardwalk/keymaps/default_625u_arrow/keymap.c index 115a0cccfaf..8fb02ec82e4 100644 --- a/keyboards/boardwalk/keymaps/default_625u_arrow/keymap.c +++ b/keyboards/boardwalk/keymaps/default_625u_arrow/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_END, - _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ + _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ ) }; diff --git a/keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c index 2dcf6de8674..cad6f605cd6 100644 --- a/keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c +++ b/keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c @@ -37,6 +37,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, - _______, _______, _______, _______, _______, _______, QK_BOOT, _______, KC_MPRV, KC_MSTP, KC_MNXT + _______, _______, _______, _______, _______, _______, QK_BOOT, _______, KC_MPRV, KC_MSTP, KC_MNXT ) }; \ No newline at end of file diff --git a/keyboards/bpiphany/pegasushoof/keymaps/via/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/via/keymap.c index b57a9fa0a80..74d46aa2097 100644 --- a/keyboards/bpiphany/pegasushoof/keymaps/via/keymap.c +++ b/keyboards/bpiphany/pegasushoof/keymaps/via/keymap.c @@ -38,6 +38,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, - _______, _______, _______, _______, _______, _______, QK_BOOT, _______, KC_MPRV, KC_MSTP, KC_MNXT + _______, _______, _______, _______, _______, _______, QK_BOOT, _______, KC_MPRV, KC_MSTP, KC_MNXT ) }; diff --git a/keyboards/buildakb/mw60/keymaps/default/keymap.c b/keyboards/buildakb/mw60/keymaps/default/keymap.c index efd37afe26d..0a5cd98fc5d 100644 --- a/keyboards/buildakb/mw60/keymaps/default/keymap.c +++ b/keyboards/buildakb/mw60/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL), [1] = LAYOUT_all( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/buildakb/mw60/keymaps/via/keymap.c b/keyboards/buildakb/mw60/keymaps/via/keymap.c index 3a04af81134..4ad7d753ea5 100644 --- a/keyboards/buildakb/mw60/keymaps/via/keymap.c +++ b/keyboards/buildakb/mw60/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL), [1] = LAYOUT_all( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/buildakb/potato65/keymaps/default/keymap.c b/keyboards/buildakb/potato65/keymaps/default/keymap.c index 56fe7af72a9..6ee7a2cb3d8 100644 --- a/keyboards/buildakb/potato65/keymaps/default/keymap.c +++ b/keyboards/buildakb/potato65/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT_65_ansi_split_bs( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/buildakb/potato65/keymaps/via/keymap.c b/keyboards/buildakb/potato65/keymaps/via/keymap.c index 28aeda2a50a..30df13dbc96 100644 --- a/keyboards/buildakb/potato65/keymaps/via/keymap.c +++ b/keyboards/buildakb/potato65/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN1] = LAYOUT_65_ansi_split_bs( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/caffeinated/serpent65/keymaps/default/keymap.c b/keyboards/caffeinated/serpent65/keymaps/default/keymap.c index 7449aca90e8..bfcab0f0967 100644 --- a/keyboards/caffeinated/serpent65/keymaps/default/keymap.c +++ b/keyboards/caffeinated/serpent65/keymaps/default/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( /* Serpent65 Base */ - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/caffeinated/serpent65/keymaps/via/keymap.c b/keyboards/caffeinated/serpent65/keymaps/via/keymap.c index e6010c96de0..db5cc8fdd53 100644 --- a/keyboards/caffeinated/serpent65/keymaps/via/keymap.c +++ b/keyboards/caffeinated/serpent65/keymaps/via/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( /* Serpent65 Base */ - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/cannonkeys/atlas/keymaps/default/keymap.c b/keyboards/cannonkeys/atlas/keymaps/default/keymap.c index b52c0056c05..80843524772 100644 --- a/keyboards/cannonkeys/atlas/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/atlas/keymaps/default/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), /* Raise diff --git a/keyboards/cannonkeys/atlas/keymaps/via/keymap.c b/keyboards/cannonkeys/atlas/keymaps/via/keymap.c index 1513b119a48..821756b0f36 100644 --- a/keyboards/cannonkeys/atlas/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/atlas/keymaps/via/keymap.c @@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), /* Raise diff --git a/keyboards/cannonkeys/atlas_alps/keymaps/default/keymap.c b/keyboards/cannonkeys/atlas_alps/keymaps/default/keymap.c index 1070a8a2c80..7c4a9e5c574 100644 --- a/keyboards/cannonkeys/atlas_alps/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/atlas_alps/keymaps/default/keymap.c @@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* 3 @@ -102,6 +102,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/cannonkeys/atlas_alps/keymaps/via/keymap.c b/keyboards/cannonkeys/atlas_alps/keymaps/via/keymap.c index c867a835bae..ca28cda8fa1 100644 --- a/keyboards/cannonkeys/atlas_alps/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/atlas_alps/keymaps/via/keymap.c @@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* 3 @@ -102,6 +102,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/cannonkeys/brutalv2_65/keymaps/default/keymap.c b/keyboards/cannonkeys/brutalv2_65/keymaps/default/keymap.c index 0778109f0c3..aac9ec28bbc 100644 --- a/keyboards/cannonkeys/brutalv2_65/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/brutalv2_65/keymaps/default/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, diff --git a/keyboards/cannonkeys/brutalv2_65/keymaps/via/keymap.c b/keyboards/cannonkeys/brutalv2_65/keymaps/via/keymap.c index 60ac843ce0d..8a1ccb3b741 100644 --- a/keyboards/cannonkeys/brutalv2_65/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/brutalv2_65/keymaps/via/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, diff --git a/keyboards/cannonkeys/cloudline/keymaps/default/keymap.c b/keyboards/cannonkeys/cloudline/keymaps/default/keymap.c index 6170ce88800..30d97fae9bb 100644 --- a/keyboards/cannonkeys/cloudline/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/cloudline/keymaps/default/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/cannonkeys/cloudline/keymaps/via/keymap.c b/keyboards/cannonkeys/cloudline/keymaps/via/keymap.c index ec06f2fc71b..b704943f492 100644 --- a/keyboards/cannonkeys/cloudline/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/cloudline/keymaps/via/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/cannonkeys/gentoo/keymaps/default/keymap.c b/keyboards/cannonkeys/gentoo/keymaps/default/keymap.c index c809f75d0ba..2f79dfb8dc1 100644 --- a/keyboards/cannonkeys/gentoo/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/gentoo/keymaps/default/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, diff --git a/keyboards/cannonkeys/gentoo/keymaps/via/keymap.c b/keyboards/cannonkeys/gentoo/keymaps/via/keymap.c index 1ac9367483f..f626e06728c 100644 --- a/keyboards/cannonkeys/gentoo/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/gentoo/keymaps/via/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, diff --git a/keyboards/cannonkeys/malicious_ergo/keymaps/default/keymap.c b/keyboards/cannonkeys/malicious_ergo/keymaps/default/keymap.c index 819f6530ecc..85d912760ea 100644 --- a/keyboards/cannonkeys/malicious_ergo/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/malicious_ergo/keymaps/default/keymap.c @@ -37,6 +37,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_MOD, _______, _______, KC_UP, _______, _______, _______, RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______, _______, RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN, BL_TOGG, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ + _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ ) }; diff --git a/keyboards/cannonkeys/malicious_ergo/keymaps/via/keymap.c b/keyboards/cannonkeys/malicious_ergo/keymaps/via/keymap.c index 31d88100ccf..21129dfdda4 100644 --- a/keyboards/cannonkeys/malicious_ergo/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/malicious_ergo/keymaps/via/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_MOD, _______, _______, KC_UP, _______, _______, _______, RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______, _______, RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN, BL_TOGG, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ + _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ ), [_FN2] = LAYOUT_default( diff --git a/keyboards/cannonkeys/ortho48/keymaps/default/keymap.c b/keyboards/cannonkeys/ortho48/keymaps/default/keymap.c index c23ad896fa6..8c03c43f9f8 100644 --- a/keyboards/cannonkeys/ortho48/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/ortho48/keymaps/default/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), /* Raise diff --git a/keyboards/cannonkeys/ortho48/keymaps/via/keymap.c b/keyboards/cannonkeys/ortho48/keymaps/via/keymap.c index 7189fa08c08..4562482e07b 100644 --- a/keyboards/cannonkeys/ortho48/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/ortho48/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [2] = LAYOUT_ortho_4x12( diff --git a/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c b/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c index 0448c07355c..1c2f38355eb 100644 --- a/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), /* Raise diff --git a/keyboards/cannonkeys/ortho48v2/keymaps/via/keymap.c b/keyboards/cannonkeys/ortho48v2/keymaps/via/keymap.c index 5d137c746df..c0a823f9f8f 100644 --- a/keyboards/cannonkeys/ortho48v2/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/ortho48v2/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [2] = LAYOUT_ortho_4x12( diff --git a/keyboards/cannonkeys/ortho60/keymaps/default/keymap.c b/keyboards/cannonkeys/ortho60/keymaps/default/keymap.c index 4d35614f699..c120a615fe5 100644 --- a/keyboards/cannonkeys/ortho60/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/ortho60/keymaps/default/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), /* Raise diff --git a/keyboards/cannonkeys/ortho60/keymaps/via/keymap.c b/keyboards/cannonkeys/ortho60/keymaps/via/keymap.c index 04accef9a10..a5d88980dcd 100644 --- a/keyboards/cannonkeys/ortho60/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/ortho60/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [2] = LAYOUT_ortho_5x12( diff --git a/keyboards/cannonkeys/ortho60v2/keymaps/default/keymap.c b/keyboards/cannonkeys/ortho60v2/keymaps/default/keymap.c index b6bd8b24ba9..9b9f11ab052 100644 --- a/keyboards/cannonkeys/ortho60v2/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/ortho60v2/keymaps/default/keymap.c @@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), /* Raise diff --git a/keyboards/cannonkeys/ortho60v2/keymaps/via/keymap.c b/keyboards/cannonkeys/ortho60v2/keymaps/via/keymap.c index 04accef9a10..a5d88980dcd 100644 --- a/keyboards/cannonkeys/ortho60v2/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/ortho60v2/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [2] = LAYOUT_ortho_5x12( diff --git a/keyboards/cannonkeys/ortho75/keymaps/default/keymap.c b/keyboards/cannonkeys/ortho75/keymaps/default/keymap.c index 211c7830431..baf581442f3 100644 --- a/keyboards/cannonkeys/ortho75/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/ortho75/keymaps/default/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NUM, KC_SLSH, KC_ASTR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7, KC_P8, KC_P9, KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, - KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, + KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_APP, RGB_VAD, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0, _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______ ) diff --git a/keyboards/cannonkeys/ripple/keymaps/default/keymap.c b/keyboards/cannonkeys/ripple/keymaps/default/keymap.c index 9b6d73b5bcd..7310c1f426c 100644 --- a/keyboards/cannonkeys/ripple/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/ripple/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/cannonkeys/ripple/keymaps/via/keymap.c b/keyboards/cannonkeys/ripple/keymaps/via/keymap.c index 17c5f13e859..99fa04f5528 100644 --- a/keyboards/cannonkeys/ripple/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/ripple/keymaps/via/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/cannonkeys/ripple_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/ripple_hs/keymaps/default/keymap.c index 3c6410edc56..d7d05641193 100644 --- a/keyboards/cannonkeys/ripple_hs/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/ripple_hs/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_tkl_f13_ansi_tsangan( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/cannonkeys/ripple_hs/keymaps/via/keymap.c b/keyboards/cannonkeys/ripple_hs/keymaps/via/keymap.c index a2e37ae772a..d4b94f0defa 100644 --- a/keyboards/cannonkeys/ripple_hs/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/ripple_hs/keymaps/via/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_tkl_f13_ansi_tsangan( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/capsunlocked/cu65/keymaps/default/keymap.c b/keyboards/capsunlocked/cu65/keymaps/default/keymap.c index 0de6615f3bd..02d47dee4d6 100644 --- a/keyboards/capsunlocked/cu65/keymaps/default/keymap.c +++ b/keyboards/capsunlocked/cu65/keymaps/default/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/capsunlocked/cu65/keymaps/iso/keymap.c b/keyboards/capsunlocked/cu65/keymaps/iso/keymap.c index 31f4fbc4f4b..5fce0e75a21 100644 --- a/keyboards/capsunlocked/cu65/keymaps/iso/keymap.c +++ b/keyboards/capsunlocked/cu65/keymaps/iso/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/capsunlocked/cu65/keymaps/iso_split_bs/keymap.c b/keyboards/capsunlocked/cu65/keymaps/iso_split_bs/keymap.c index 5ca55e2efb1..4dafb341a09 100644 --- a/keyboards/capsunlocked/cu65/keymaps/iso_split_bs/keymap.c +++ b/keyboards/capsunlocked/cu65/keymaps/iso_split_bs/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/capsunlocked/cu65/keymaps/via/keymap.c b/keyboards/capsunlocked/cu65/keymaps/via/keymap.c index 74ff136004d..472f38e2c40 100644 --- a/keyboards/capsunlocked/cu65/keymaps/via/keymap.c +++ b/keyboards/capsunlocked/cu65/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/capsunlocked/cu75/keymaps/default/keymap.c b/keyboards/capsunlocked/cu75/keymaps/default/keymap.c index 85e7b1a3ed8..2afc7399e8f 100644 --- a/keyboards/capsunlocked/cu75/keymaps/default/keymap.c +++ b/keyboards/capsunlocked/cu75/keymaps/default/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, RGB_MOD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI ), diff --git a/keyboards/capsunlocked/cu75/keymaps/iso/keymap.c b/keyboards/capsunlocked/cu75/keymaps/iso/keymap.c index f6d7cc5281b..95f742db4b3 100644 --- a/keyboards/capsunlocked/cu75/keymaps/iso/keymap.c +++ b/keyboards/capsunlocked/cu75/keymaps/iso/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, RGB_MOD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI ), diff --git a/keyboards/capsunlocked/cu80/v2/ansi/keymaps/default/keymap.c b/keyboards/capsunlocked/cu80/v2/ansi/keymaps/default/keymap.c index 5e13e10d153..b0270d17f90 100644 --- a/keyboards/capsunlocked/cu80/v2/ansi/keymaps/default/keymap.c +++ b/keyboards/capsunlocked/cu80/v2/ansi/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_tkl_ansi( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, diff --git a/keyboards/capsunlocked/cu80/v2/ansi/keymaps/via/keymap.c b/keyboards/capsunlocked/cu80/v2/ansi/keymaps/via/keymap.c index aeef5a12559..4af55ef4b50 100644 --- a/keyboards/capsunlocked/cu80/v2/ansi/keymaps/via/keymap.c +++ b/keyboards/capsunlocked/cu80/v2/ansi/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_tkl_ansi( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, diff --git a/keyboards/capsunlocked/cu80/v2/iso/keymaps/default/keymap.c b/keyboards/capsunlocked/cu80/v2/iso/keymaps/default/keymap.c index cf5886f457c..4bae95ed076 100644 --- a/keyboards/capsunlocked/cu80/v2/iso/keymaps/default/keymap.c +++ b/keyboards/capsunlocked/cu80/v2/iso/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_tkl_iso( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, diff --git a/keyboards/capsunlocked/cu80/v2/iso/keymaps/via/keymap.c b/keyboards/capsunlocked/cu80/v2/iso/keymaps/via/keymap.c index 947a0bd97a4..01fd6c1ff5e 100644 --- a/keyboards/capsunlocked/cu80/v2/iso/keymaps/via/keymap.c +++ b/keyboards/capsunlocked/cu80/v2/iso/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_tkl_iso( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, diff --git a/keyboards/cest73/tkm/keymaps/default/keymap.c b/keyboards/cest73/tkm/keymaps/default/keymap.c index a0f2692fa88..0b3a1f7d7b3 100644 --- a/keyboards/cest73/tkm/keymaps/default/keymap.c +++ b/keyboards/cest73/tkm/keymaps/default/keymap.c @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PENT, KC_PDOT, KC_PCMM, KC_P0, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/chalice/keymaps/default/keymap.c b/keyboards/chalice/keymaps/default/keymap.c index a29803cbf98..79b4670e6ff 100644 --- a/keyboards/chalice/keymaps/default/keymap.c +++ b/keyboards/chalice/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_default( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, diff --git a/keyboards/chalice/keymaps/via/keymap.c b/keyboards/chalice/keymaps/via/keymap.c index a29803cbf98..79b4670e6ff 100644 --- a/keyboards/chalice/keymaps/via/keymap.c +++ b/keyboards/chalice/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_default( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, diff --git a/keyboards/charue/charon/keymaps/via/keymap.c b/keyboards/charue/charon/keymaps/via/keymap.c index 78b1542ac1b..901ae7f6115 100644 --- a/keyboards/charue/charon/keymaps/via/keymap.c +++ b/keyboards/charue/charon/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [2] = LAYOUT_all( diff --git a/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c b/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c index dbd330632d7..9d973f6480c 100644 --- a/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c +++ b/keyboards/charue/sunsetter_r2/keymaps/default/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT ), [_FN] = LAYOUT_all( - KC_F11, KC_F12, QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_VOLU, + KC_F11, KC_F12, QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_VOLU, KC_F13, KC_F14, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_VOLD, KC_F15, KC_F16, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_MUTE, KC_F17, KC_F18, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_MNXT, diff --git a/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c b/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c index 4671f534135..3a2947932e7 100644 --- a/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c +++ b/keyboards/charue/sunsetter_r2/keymaps/via/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, MO(_FN0), KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT ), [_FN0] = LAYOUT_all( - KC_F11, KC_F12, QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_VOLU, + KC_F11, KC_F12, QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_VOLU, KC_F13, KC_F14, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_VOLD, KC_F15, KC_F16, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_MUTE, KC_F17, KC_F18, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_MNXT, diff --git a/keyboards/checkerboards/axon40/keymaps/default/keymap.c b/keyboards/checkerboards/axon40/keymaps/default/keymap.c index c997edb01f4..b466a746b5c 100644 --- a/keyboards/checkerboards/axon40/keymaps/default/keymap.c +++ b/keyboards/checkerboards/axon40/keymaps/default/keymap.c @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_HUI, RGB_SAI, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, RGB_VAI, RGB_HUD, RGB_SAD, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, RGB_VAD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, RGB_TOG, _______, _______, RGB_MOD, RGB_RMOD + QK_BOOT, RGB_TOG, _______, _______, RGB_MOD, RGB_RMOD ), }; diff --git a/keyboards/checkerboards/axon40/keymaps/via/keymap.c b/keyboards/checkerboards/axon40/keymaps/via/keymap.c index dac5e22039d..dc37bf540cf 100644 --- a/keyboards/checkerboards/axon40/keymaps/via/keymap.c +++ b/keyboards/checkerboards/axon40/keymaps/via/keymap.c @@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_HUI, RGB_SAI, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, RGB_VAI, RGB_HUD, RGB_SAD, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, RGB_VAD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, RGB_TOG, _______, _______, RGB_MOD, RGB_RMOD + QK_BOOT, RGB_TOG, _______, _______, RGB_MOD, RGB_RMOD ), /* 2 @@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_HUI, RGB_SAI, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, RGB_VAI, RGB_HUD, RGB_SAD, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, RGB_VAD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, RGB_TOG, _______, _______, RGB_MOD, RGB_RMOD + QK_BOOT, RGB_TOG, _______, _______, RGB_MOD, RGB_RMOD ), }; diff --git a/keyboards/checkerboards/phoenix45_ortho/keymaps/2x3u/keymap.c b/keyboards/checkerboards/phoenix45_ortho/keymaps/2x3u/keymap.c index 81ccfcdffc2..013b4ffe0b1 100644 --- a/keyboards/checkerboards/phoenix45_ortho/keymaps/2x3u/keymap.c +++ b/keyboards/checkerboards/phoenix45_ortho/keymaps/2x3u/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/phoenix45_ortho/keymaps/default/keymap.c b/keyboards/checkerboards/phoenix45_ortho/keymaps/default/keymap.c index feea2372c4a..183564e7fa2 100644 --- a/keyboards/checkerboards/phoenix45_ortho/keymaps/default/keymap.c +++ b/keyboards/checkerboards/phoenix45_ortho/keymaps/default/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/phoenix45_ortho/keymaps/via/keymap.c b/keyboards/checkerboards/phoenix45_ortho/keymaps/via/keymap.c index 0b8792be551..6d359f392d2 100644 --- a/keyboards/checkerboards/phoenix45_ortho/keymaps/via/keymap.c +++ b/keyboards/checkerboards/phoenix45_ortho/keymaps/via/keymap.c @@ -40,13 +40,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ ), [3] = LAYOUT_ortho_2x225u( _______, _______, _______, KC_UP, _______, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/plexus75/keymaps/default/keymap.c b/keyboards/checkerboards/plexus75/keymaps/default/keymap.c index 05adefc1513..cca717764c7 100644 --- a/keyboards/checkerboards/plexus75/keymaps/default/keymap.c +++ b/keyboards/checkerboards/plexus75/keymaps/default/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_2x2u( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_DEL, _______, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/checkerboards/plexus75/keymaps/default_3u/keymap.c b/keyboards/checkerboards/plexus75/keymaps/default_3u/keymap.c index 874916f6057..91b6eeb99da 100644 --- a/keyboards/checkerboards/plexus75/keymaps/default_3u/keymap.c +++ b/keyboards/checkerboards/plexus75/keymaps/default_3u/keymap.c @@ -61,9 +61,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_2x3u( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_DEL, _______, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ ), /* 2nd Function Layer @@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, _______, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______, - QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/checkerboards/plexus75/keymaps/default_7u/keymap.c b/keyboards/checkerboards/plexus75/keymaps/default_7u/keymap.c index 7188a88bc25..d8cfc23e6cc 100644 --- a/keyboards/checkerboards/plexus75/keymaps/default_7u/keymap.c +++ b/keyboards/checkerboards/plexus75/keymaps/default_7u/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_7u( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_DEL, _______, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/checkerboards/plexus75/keymaps/via/keymap.c b/keyboards/checkerboards/plexus75/keymaps/via/keymap.c index 83651fc11d5..8a38b9b555d 100644 --- a/keyboards/checkerboards/plexus75/keymaps/via/keymap.c +++ b/keyboards/checkerboards/plexus75/keymaps/via/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_2x2u( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_DEL, _______, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/checkerboards/plexus75_he/keymaps/2x2u/keymap.c b/keyboards/checkerboards/plexus75_he/keymaps/2x2u/keymap.c index 4fc0ba925ad..df02fe07553 100644 --- a/keyboards/checkerboards/plexus75_he/keymaps/2x2u/keymap.c +++ b/keyboards/checkerboards/plexus75_he/keymaps/2x2u/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_2x2u( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_DEL, _______, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/checkerboards/plexus75_he/keymaps/7u/keymap.c b/keyboards/checkerboards/plexus75_he/keymaps/7u/keymap.c index d47d354c09a..6c0d2c2b6ee 100644 --- a/keyboards/checkerboards/plexus75_he/keymaps/7u/keymap.c +++ b/keyboards/checkerboards/plexus75_he/keymaps/7u/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_7u( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_DEL, _______, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/checkerboards/plexus75_he/keymaps/default/keymap.c b/keyboards/checkerboards/plexus75_he/keymaps/default/keymap.c index c1855707ddc..447a589cda0 100644 --- a/keyboards/checkerboards/plexus75_he/keymaps/default/keymap.c +++ b/keyboards/checkerboards/plexus75_he/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_2x3u( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_DEL, _______, _______, KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/checkerboards/pursuit40/keymaps/default/keymap.c b/keyboards/checkerboards/pursuit40/keymaps/default/keymap.c index 38f4493a584..1b80a880e7e 100644 --- a/keyboards/checkerboards/pursuit40/keymaps/default/keymap.c +++ b/keyboards/checkerboards/pursuit40/keymaps/default/keymap.c @@ -75,6 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______ + QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/pursuit40/keymaps/via/keymap.c b/keyboards/checkerboards/pursuit40/keymaps/via/keymap.c index 29510c468da..cebca52889f 100644 --- a/keyboards/checkerboards/pursuit40/keymaps/via/keymap.c +++ b/keyboards/checkerboards/pursuit40/keymaps/via/keymap.c @@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ), /* [3] diff --git a/keyboards/checkerboards/quark/keymaps/default/keymap.c b/keyboards/checkerboards/quark/keymaps/default/keymap.c index 01e916bfe4c..4f1d6544aa1 100644 --- a/keyboards/checkerboards/quark/keymaps/default/keymap.c +++ b/keyboards/checkerboards/quark/keymaps/default/keymap.c @@ -81,6 +81,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/quark/keymaps/default_4x12/keymap.c b/keyboards/checkerboards/quark/keymaps/default_4x12/keymap.c index e9fe5184e03..1e3ca5a0899 100644 --- a/keyboards/checkerboards/quark/keymaps/default_4x12/keymap.c +++ b/keyboards/checkerboards/quark/keymaps/default_4x12/keymap.c @@ -75,6 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/quark/keymaps/default_4x12_2x225u/keymap.c b/keyboards/checkerboards/quark/keymaps/default_4x12_2x225u/keymap.c index 6bde720f493..564480c2909 100644 --- a/keyboards/checkerboards/quark/keymaps/default_4x12_2x225u/keymap.c +++ b/keyboards/checkerboards/quark/keymaps/default_4x12_2x225u/keymap.c @@ -75,6 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/quark/keymaps/default_4x12_2x3u/keymap.c b/keyboards/checkerboards/quark/keymaps/default_4x12_2x3u/keymap.c index 52b0fe8eb10..8e7c00921fe 100644 --- a/keyboards/checkerboards/quark/keymaps/default_4x12_2x3u/keymap.c +++ b/keyboards/checkerboards/quark/keymaps/default_4x12_2x3u/keymap.c @@ -75,6 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/quark/keymaps/default_5x12_2x3u/keymap.c b/keyboards/checkerboards/quark/keymaps/default_5x12_2x3u/keymap.c index e395a7122ad..ed22a1bc11a 100644 --- a/keyboards/checkerboards/quark/keymaps/default_5x12_2x3u/keymap.c +++ b/keyboards/checkerboards/quark/keymaps/default_5x12_2x3u/keymap.c @@ -81,6 +81,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/quark/keymaps/default_mit/keymap.c b/keyboards/checkerboards/quark/keymaps/default_mit/keymap.c index f9284ef8a5a..def09bbd332 100644 --- a/keyboards/checkerboards/quark/keymaps/default_mit/keymap.c +++ b/keyboards/checkerboards/quark/keymaps/default_mit/keymap.c @@ -75,6 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/quark/keymaps/via/keymap.c b/keyboards/checkerboards/quark/keymaps/via/keymap.c index fa03adf796d..2919de1b473 100644 --- a/keyboards/checkerboards/quark/keymaps/via/keymap.c +++ b/keyboards/checkerboards/quark/keymaps/via/keymap.c @@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/quark_lp/keymaps/2x2u/keymap.c b/keyboards/checkerboards/quark_lp/keymaps/2x2u/keymap.c index fd8374634be..ab3cffa7040 100644 --- a/keyboards/checkerboards/quark_lp/keymaps/2x2u/keymap.c +++ b/keyboards/checkerboards/quark_lp/keymaps/2x2u/keymap.c @@ -75,6 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/quark_lp/keymaps/default/keymap.c b/keyboards/checkerboards/quark_lp/keymaps/default/keymap.c index d81df83dd05..271462f7b7c 100644 --- a/keyboards/checkerboards/quark_lp/keymaps/default/keymap.c +++ b/keyboards/checkerboards/quark_lp/keymaps/default/keymap.c @@ -75,6 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/quark_lp/keymaps/via/keymap.c b/keyboards/checkerboards/quark_lp/keymaps/via/keymap.c index 2353af65978..deffa92827a 100644 --- a/keyboards/checkerboards/quark_lp/keymaps/via/keymap.c +++ b/keyboards/checkerboards/quark_lp/keymaps/via/keymap.c @@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* [3] @@ -94,6 +94,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/quark_plus/keymaps/default/keymap.c b/keyboards/checkerboards/quark_plus/keymaps/default/keymap.c index 6cbebc4243a..5ba255cf6a2 100644 --- a/keyboards/checkerboards/quark_plus/keymaps/default/keymap.c +++ b/keyboards/checkerboards/quark_plus/keymaps/default/keymap.c @@ -77,6 +77,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/checkerboards/quark_plus/keymaps/via/keymap.c b/keyboards/checkerboards/quark_plus/keymaps/via/keymap.c index 30bb50a8253..b9c6f21c2c3 100644 --- a/keyboards/checkerboards/quark_plus/keymaps/via/keymap.c +++ b/keyboards/checkerboards/quark_plus/keymaps/via/keymap.c @@ -77,13 +77,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [3] = LAYOUT_grid( _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/checkerboards/quark_squared/keymaps/default/keymap.c b/keyboards/checkerboards/quark_squared/keymaps/default/keymap.c index 7def35eb7d6..6c6dbb938f9 100644 --- a/keyboards/checkerboards/quark_squared/keymaps/default/keymap.c +++ b/keyboards/checkerboards/quark_squared/keymaps/default/keymap.c @@ -75,6 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/quark_squared/keymaps/via/keymap.c b/keyboards/checkerboards/quark_squared/keymaps/via/keymap.c index b0b6300b7b9..9191f517baa 100644 --- a/keyboards/checkerboards/quark_squared/keymaps/via/keymap.c +++ b/keyboards/checkerboards/quark_squared/keymaps/via/keymap.c @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ), /* [3] @@ -97,6 +97,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/ud40_ortho_alt/keymaps/2x3u_alt/keymap.c b/keyboards/checkerboards/ud40_ortho_alt/keymaps/2x3u_alt/keymap.c index 840955b9d3d..b837f2c5689 100644 --- a/keyboards/checkerboards/ud40_ortho_alt/keymaps/2x3u_alt/keymap.c +++ b/keyboards/checkerboards/ud40_ortho_alt/keymaps/2x3u_alt/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, CTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - QK_BOOT, KC_LALT, TT(1), LT(2, KC_SPC), KC_LGUI, KC_CAPS + QK_BOOT, KC_LALT, TT(1), LT(2, KC_SPC), KC_LGUI, KC_CAPS ), /* [1] @@ -75,6 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, QK_BOOT, _______, _______, _______, _______ + QK_BOOT, QK_BOOT, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/ud40_ortho_alt/keymaps/default/keymap.c b/keyboards/checkerboards/ud40_ortho_alt/keymaps/default/keymap.c index 8141d8fca79..aa9d00e8374 100644 --- a/keyboards/checkerboards/ud40_ortho_alt/keymaps/default/keymap.c +++ b/keyboards/checkerboards/ud40_ortho_alt/keymaps/default/keymap.c @@ -75,6 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______ + QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/checkerboards/ud40_ortho_alt/keymaps/via/keymap.c b/keyboards/checkerboards/ud40_ortho_alt/keymaps/via/keymap.c index 4859afb464c..68475b159b2 100644 --- a/keyboards/checkerboards/ud40_ortho_alt/keymaps/via/keymap.c +++ b/keyboards/checkerboards/ud40_ortho_alt/keymaps/via/keymap.c @@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_UP, _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ), /* [3] diff --git a/keyboards/cherrybstudio/cb1800/keymaps/default/keymap.c b/keyboards/cherrybstudio/cb1800/keymaps/default/keymap.c index 36702762d73..7369987f2d4 100644 --- a/keyboards/cherrybstudio/cb1800/keymaps/default/keymap.c +++ b/keyboards/cherrybstudio/cb1800/keymaps/default/keymap.c @@ -15,7 +15,7 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - 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_F12, QK_BOOT, KC_INS, KC_HOME, KC_PGUP, KC_PSCR, + 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_F12, QK_BOOT, KC_INS, KC_HOME, KC_PGUP, KC_PSCR, KC_DEL, KC_END, KC_PGDN, KC_SCRL, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PAUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, diff --git a/keyboards/cherrybstudio/cb1800/keymaps/via/keymap.c b/keyboards/cherrybstudio/cb1800/keymaps/via/keymap.c index b9150188421..3bcf7c5b7a4 100644 --- a/keyboards/cherrybstudio/cb1800/keymaps/via/keymap.c +++ b/keyboards/cherrybstudio/cb1800/keymaps/via/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - 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_F12, QK_BOOT, KC_INS, KC_HOME, KC_PGUP, KC_PSCR, + 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_F12, QK_BOOT, KC_INS, KC_HOME, KC_PGUP, KC_PSCR, KC_DEL, KC_END, KC_PGDN, KC_SCRL, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PAUS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, diff --git a/keyboards/cherrybstudio/cb87rgb/keymaps/default/keymap.c b/keyboards/cherrybstudio/cb87rgb/keymaps/default/keymap.c index fab5685c21b..b766c36f344 100644 --- a/keyboards/cherrybstudio/cb87rgb/keymaps/default/keymap.c +++ b/keyboards/cherrybstudio/cb87rgb/keymaps/default/keymap.c @@ -15,7 +15,7 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - 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_F12, QK_BOOT, KC_PSCR, KC_SCRL, KC_PAUS, + 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_F12, QK_BOOT,KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, diff --git a/keyboards/chickenman/ciel/keymaps/default/keymap.c b/keyboards/chickenman/ciel/keymaps/default/keymap.c index c00e7fb050f..b3147b81d35 100644 --- a/keyboards/chickenman/ciel/keymaps/default/keymap.c +++ b/keyboards/chickenman/ciel/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), [_FN] = LAYOUT_60_ansi_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/chickenman/ciel/keymaps/via/keymap.c b/keyboards/chickenman/ciel/keymaps/via/keymap.c index 516ad4dc81b..55f0b6bd264 100644 --- a/keyboards/chickenman/ciel/keymaps/via/keymap.c +++ b/keyboards/chickenman/ciel/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), [_L1] = LAYOUT_60_ansi_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/chickenman/ciel65/keymaps/default/keymap.c b/keyboards/chickenman/ciel65/keymaps/default/keymap.c index 25142bac15e..8b519641142 100644 --- a/keyboards/chickenman/ciel65/keymaps/default/keymap.c +++ b/keyboards/chickenman/ciel65/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_INS, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/chickenman/ciel65/keymaps/via/keymap.c b/keyboards/chickenman/ciel65/keymaps/via/keymap.c index 9cf5426447c..3ff0f37bda3 100644 --- a/keyboards/chickenman/ciel65/keymaps/via/keymap.c +++ b/keyboards/chickenman/ciel65/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT ), [_L1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_INS, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/cipulot/kallos/keymaps/default/keymap.c b/keyboards/cipulot/kallos/keymaps/default/keymap.c index 6331b4ef704..f09cf850f97 100644 --- a/keyboards/cipulot/kallos/keymaps/default/keymap.c +++ b/keyboards/cipulot/kallos/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_RCTL, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT ), [1] = LAYOUT_default( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/cipulot/kallos/keymaps/via/keymap.c b/keyboards/cipulot/kallos/keymaps/via/keymap.c index 6331b4ef704..f09cf850f97 100644 --- a/keyboards/cipulot/kallos/keymaps/via/keymap.c +++ b/keyboards/cipulot/kallos/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_RCTL, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT ), [1] = LAYOUT_default( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/citrus/erdnuss65/keymaps/default/keymap.c b/keyboards/citrus/erdnuss65/keymaps/default/keymap.c index fdc36ae65e5..8de7e0229b4 100644 --- a/keyboards/citrus/erdnuss65/keymaps/default/keymap.c +++ b/keyboards/citrus/erdnuss65/keymaps/default/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPRV, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, QK_BOOT, KC_MNXT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, QK_BOOT, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MYCM, KC_VOLU, KC_END, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY diff --git a/keyboards/citrus/erdnuss65/keymaps/via/keymap.c b/keyboards/citrus/erdnuss65/keymaps/via/keymap.c index 3014b72cfe8..55ce4b8677c 100644 --- a/keyboards/citrus/erdnuss65/keymaps/via/keymap.c +++ b/keyboards/citrus/erdnuss65/keymaps/via/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPRV, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, QK_BOOT, KC_MNXT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, QK_BOOT, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MYCM, KC_VOLU, KC_END, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY diff --git a/keyboards/ckeys/handwire_101/keymaps/default/keymap.c b/keyboards/ckeys/handwire_101/keymaps/default/keymap.c index aa4bfdf9b7c..0b26d613221 100755 --- a/keyboards/ckeys/handwire_101/keymaps/default/keymap.c +++ b/keyboards/ckeys/handwire_101/keymaps/default/keymap.c @@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------' */ [_ADMIN] = LAYOUT_ortho_4x4( - QK_BOOT, _______, _______, _______, + QK_BOOT, _______, _______, _______, CKEYS_ABOUT, _______, _______, _______, _______, _______, _______, CK_OFF, _______, _______, _______, CK_ON diff --git a/keyboards/ckeys/thedora/keymaps/default/keymap.c b/keyboards/ckeys/thedora/keymaps/default/keymap.c index afe2e027930..96b83b1c469 100755 --- a/keyboards/ckeys/thedora/keymaps/default/keymap.c +++ b/keyboards/ckeys/thedora/keymaps/default/keymap.c @@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // └─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ [_ADMIN] = LAYOUT( - QK_BOOT, _______, _______, _______, TG(_ADMIN), + QK_BOOT, _______, _______, _______, TG(_ADMIN), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/clawsome/coupe/keymaps/default/keymap.c b/keyboards/clawsome/coupe/keymaps/default/keymap.c index c03d35f0740..55a71e0157f 100644 --- a/keyboards/clawsome/coupe/keymaps/default/keymap.c +++ b/keyboards/clawsome/coupe/keymaps/default/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_HOME, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/clawsome/sedan/keymaps/default/keymap.c b/keyboards/clawsome/sedan/keymaps/default/keymap.c index 165b6ceb4a7..174777d8f8e 100644 --- a/keyboards/clawsome/sedan/keymaps/default/keymap.c +++ b/keyboards/clawsome/sedan/keymaps/default/keymap.c @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/clueboard/60/keymaps/default/keymap.c b/keyboards/clueboard/60/keymaps/default/keymap.c index 80e2329a83f..76a5369e898 100644 --- a/keyboards/clueboard/60/keymaps/default/keymap.c +++ b/keyboards/clueboard/60/keymaps/default/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______,_______,_______, _______, _______, _______, MO(_FL), _______), [_CL] = LAYOUT_all( BL_STEP,S_BSKTC,S_ODEJY,S_RCKBY,S_DOEDR,S_SCALE,S_ONEUP,S_COIN, S_SONIC,S_ZELDA,_______,_______,_______,_______,_______, - _______, _______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, + _______, _______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, _______, MO(_FL), _______) diff --git a/keyboards/clueboard/60/keymaps/default_aek/keymap.c b/keyboards/clueboard/60/keymaps/default_aek/keymap.c index d3b25e555ad..9594ff76cb3 100644 --- a/keyboards/clueboard/60/keymaps/default_aek/keymap.c +++ b/keyboards/clueboard/60/keymaps/default_aek/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, MO(_FL), _______), [_CL] = LAYOUT_aek( BL_STEP,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, - _______, _______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, + _______, _______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, MO(_FL), _______) diff --git a/keyboards/clueboard/66/keymaps/66_ansi/keymap.c b/keyboards/clueboard/66/keymaps/66_ansi/keymap.c index 6fbdb79bc91..748f1263a62 100644 --- a/keyboards/clueboard/66/keymaps/66_ansi/keymap.c +++ b/keyboards/clueboard/66/keymaps/66_ansi/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_CL] = LAYOUT_66_ansi( BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI, - _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, + _______,_______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, _______,_______,_______, RGB_MOD, _______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), diff --git a/keyboards/clueboard/66/keymaps/66_iso/keymap.c b/keyboards/clueboard/66/keymaps/66_iso/keymap.c index 20a57a15640..e80a0796e89 100644 --- a/keyboards/clueboard/66/keymaps/66_iso/keymap.c +++ b/keyboards/clueboard/66/keymaps/66_iso/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_CL] = LAYOUT_66_iso( BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI, - _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, + _______,_______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, MO(_FL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, _______,_______,_______, RGB_MOD, _______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), diff --git a/keyboards/clueboard/66/keymaps/colemak/keymap.c b/keyboards/clueboard/66/keymaps/colemak/keymap.c index c271a23493d..854ace81dc5 100644 --- a/keyboards/clueboard/66/keymaps/colemak/keymap.c +++ b/keyboards/clueboard/66/keymaps/colemak/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_CL] = LAYOUT( BL_STEP, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, - _______, _______, _______,_______,QK_BOOT, _______,_______,_______,_______,_______, _______, _______, _______, _______, RGB_VAD, + _______, _______, _______,_______,QK_BOOT,_______,_______,_______,_______,_______, _______, _______, _______, _______, RGB_VAD, _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, RGB_SAI, _______, _______, _______,_______, RGB_MOD, RGB_MOD, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI), diff --git a/keyboards/clueboard/66/keymaps/default/keymap.c b/keyboards/clueboard/66/keymaps/default/keymap.c index be350fe874e..d0c39f774a1 100644 --- a/keyboards/clueboard/66/keymaps/default/keymap.c +++ b/keyboards/clueboard/66/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_CL] = LAYOUT( BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,_______,RGB_TOG, RGB_VAI, - _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, + _______,_______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, MO(_FL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_SAI, _______,_______,_______,_______, RGB_MOD, RGB_MOD, _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), diff --git a/keyboards/clueboard/66/keymaps/via/keymap.c b/keyboards/clueboard/66/keymaps/via/keymap.c index 1e9781af4b6..d9585c8c70d 100644 --- a/keyboards/clueboard/66/keymaps/via/keymap.c +++ b/keyboards/clueboard/66/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_CL] = LAYOUT_66_ansi( BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI, - _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, + _______,_______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, _______,_______,_______, RGB_MOD, _______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c index 9bd7f227dc1..4dcc09c913f 100644 --- a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c +++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_CL] = LAYOUT_66_ansi( LM_NEXT,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI, - _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, + _______,_______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, _______,_______,_______, RGB_MOD, _______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c index 07f7d0f7dea..507aa80f7ce 100644 --- a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c +++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_CL] = LAYOUT( LM_NEXT,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, LM_TOGG, LM_BRIU, - _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, LM_BRID, + _______,_______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______, LM_BRID, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, _______,_______,_______, _______,_______, _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), diff --git a/keyboards/clueboard/66_hotswap/prototype/keymaps/66_ansi/keymap.c b/keyboards/clueboard/66_hotswap/prototype/keymaps/66_ansi/keymap.c index 4dfa570cbcc..07bfe643ae3 100644 --- a/keyboards/clueboard/66_hotswap/prototype/keymaps/66_ansi/keymap.c +++ b/keyboards/clueboard/66_hotswap/prototype/keymaps/66_ansi/keymap.c @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_CL] = LAYOUT_66_ansi( BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI, - _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, + _______,_______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, _______,_______,_______, RGB_MOD, _______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), diff --git a/keyboards/clueboard/66_hotswap/prototype/keymaps/default/keymap.c b/keyboards/clueboard/66_hotswap/prototype/keymaps/default/keymap.c index a5bc772abde..53335ef60dc 100644 --- a/keyboards/clueboard/66_hotswap/prototype/keymaps/default/keymap.c +++ b/keyboards/clueboard/66_hotswap/prototype/keymaps/default/keymap.c @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_CL] = LAYOUT( BL_STEP,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, BL_TOGG, BL_UP, - _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DOWN, + _______,_______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DOWN, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_SAI, _______,_______,_______, BL_BRTG,BL_BRTG, _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), diff --git a/keyboards/coarse/cordillera/keymaps/default/keymap.c b/keyboards/coarse/cordillera/keymaps/default/keymap.c index b96629ddee3..e7520ff5a42 100755 --- a/keyboards/coarse/cordillera/keymaps/default/keymap.c +++ b/keyboards/coarse/cordillera/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL ), [1] = LAYOUT_alice( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/coarse/cordillera/keymaps/via/keymap.c b/keyboards/coarse/cordillera/keymaps/via/keymap.c index a644c42a779..dd74be4d469 100644 --- a/keyboards/coarse/cordillera/keymaps/via/keymap.c +++ b/keyboards/coarse/cordillera/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL ), [1] = LAYOUT_alice( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/coarse/ixora/keymaps/default/keymap.c b/keyboards/coarse/ixora/keymaps/default/keymap.c index 38e16af41ff..3188c3da119 100644 --- a/keyboards/coarse/ixora/keymaps/default/keymap.c +++ b/keyboards/coarse/ixora/keymaps/default/keymap.c @@ -25,6 +25,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------' */ [0] = LAYOUT_full( - QK_BOOT, KC_2, KC_3, + QK_BOOT, KC_2, KC_3, KC_CAPS, KC_NUM, KC_SCRL) }; diff --git a/keyboards/coarse/vinta/keymaps/default/keymap.c b/keyboards/coarse/vinta/keymaps/default/keymap.c index 858b6d478d0..d79910b07e9 100644 --- a/keyboards/coarse/vinta/keymaps/default/keymap.c +++ b/keyboards/coarse/vinta/keymaps/default/keymap.c @@ -35,5 +35,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT, QK_BOOT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT, QK_BOOT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), }; diff --git a/keyboards/compound/keymaps/default/keymap.c b/keyboards/compound/keymaps/default/keymap.c index a41410412fe..74682f25016 100644 --- a/keyboards/compound/keymaps/default/keymap.c +++ b/keyboards/compound/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL), [_FN] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, diff --git a/keyboards/compound/keymaps/via/keymap.c b/keyboards/compound/keymaps/via/keymap.c index fbf244df7a0..3b820ab65fb 100644 --- a/keyboards/compound/keymaps/via/keymap.c +++ b/keyboards/compound/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL), [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, diff --git a/keyboards/contender/keymaps/default/keymap.c b/keyboards/contender/keymaps/default/keymap.c index a7f9d7049dd..e4c74f90df9 100644 --- a/keyboards/contender/keymaps/default/keymap.c +++ b/keyboards/contender/keymaps/default/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Function */ [_FUNCTION] = LAYOUT( - QK_BOOT, KC_NO, KC_NO, KC_NO, + QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RGB_RMOD, RGB_MOD, KC_NO, KC_NO, diff --git a/keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c index 203529b4b30..802ccd8ec72 100644 --- a/keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c +++ b/keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* esc 1 2 3 4 5 6 7 8 9 0 - = bkspc `~ */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PSCR, /* tab Q W E R T Y U I O P [ ] \ delete*/ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS, /* caps A S D F G H J K L ; ' enter pg up*/ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, /* shift Z X C V B N M , . / shift up pg dn*/ diff --git a/keyboards/coseyfannitutti/discipline/keymaps/iso/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/iso/keymap.c index 652d4cc56ed..1de39d5ac91 100644 --- a/keyboards/coseyfannitutti/discipline/keymaps/iso/keymap.c +++ b/keyboards/coseyfannitutti/discipline/keymaps/iso/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* esc 1 2 3 4 5 6 7 8 9 0 - = bkspc `~ */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PSCR, /* tab Q W E R T Y U I O P [ ] delete*/ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, /* caps A S D F G H J K L ; ' # enter pg up*/ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_HOME, /* shift \ Z X C V B N M , . / shift up pg dn*/ diff --git a/keyboards/coseyfannitutti/discipline/keymaps/via/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/via/keymap.c index 8cffb36432e..786d261a1dd 100644 --- a/keyboards/coseyfannitutti/discipline/keymaps/via/keymap.c +++ b/keyboards/coseyfannitutti/discipline/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* esc 1 2 3 4 5 6 7 8 9 0 - = bkspc `~ */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PSCR, /* tab Q W E R T Y U I O P [ ] \ delete*/ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, /* caps A S D F G H J K L ; ' enter pg up*/ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_HOME, /* shift Z X C V B N M , . / shift up pg dn*/ diff --git a/keyboards/coseyfannitutti/mullet/keymaps/default/keymap.c b/keyboards/coseyfannitutti/mullet/keymaps/default/keymap.c index dc1e36539b3..7460c78d249 100644 --- a/keyboards/coseyfannitutti/mullet/keymaps/default/keymap.c +++ b/keyboards/coseyfannitutti/mullet/keymaps/default/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* esc 1 2 3 4 5 6 7 8 9 0 - = bkspc insert*/ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PSCR, /* tab Q W E R T Y U I O P [ ] \ delete*/ - KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_BSLS, KC_TRNS, + KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_BSLS, KC_TRNS, /* caps A S D F G H J K L ; ' enter pg up*/ KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, /* shift Z X C V B N M , . / shift up pg dn*/ diff --git a/keyboards/coseyfannitutti/mysterium/keymaps/ansi_7u/keymap.c b/keyboards/coseyfannitutti/mysterium/keymaps/ansi_7u/keymap.c index 3f7b20fbd9f..f470b3bbd40 100644 --- a/keyboards/coseyfannitutti/mysterium/keymaps/ansi_7u/keymap.c +++ b/keyboards/coseyfannitutti/mysterium/keymaps/ansi_7u/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi_7u( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS) diff --git a/keyboards/coseyfannitutti/mysterium/keymaps/default/keymap.c b/keyboards/coseyfannitutti/mysterium/keymaps/default/keymap.c index 42dd9645298..202ccc90fdb 100644 --- a/keyboards/coseyfannitutti/mysterium/keymaps/default/keymap.c +++ b/keyboards/coseyfannitutti/mysterium/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS) diff --git a/keyboards/coseyfannitutti/mysterium/keymaps/iso/keymap.c b/keyboards/coseyfannitutti/mysterium/keymaps/iso/keymap.c index 6d8b25e36d1..f49641f9a3f 100644 --- a/keyboards/coseyfannitutti/mysterium/keymaps/iso/keymap.c +++ b/keyboards/coseyfannitutti/mysterium/keymaps/iso/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_iso( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS) diff --git a/keyboards/coseyfannitutti/mysterium/keymaps/via/keymap.c b/keyboards/coseyfannitutti/mysterium/keymaps/via/keymap.c index b13d33794df..59b0f3dba4c 100644 --- a/keyboards/coseyfannitutti/mysterium/keymaps/via/keymap.c +++ b/keyboards/coseyfannitutti/mysterium/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_iso( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS), diff --git a/keyboards/craftwalk/keymaps/default/keymap.c b/keyboards/craftwalk/keymaps/default/keymap.c index 8c86e11204b..ceb01d1e2be 100644 --- a/keyboards/craftwalk/keymaps/default/keymap.c +++ b/keyboards/craftwalk/keymaps/default/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Adjust */ [_ADJUST] = LAYOUT( RGB_HUI, RGB_SAI, RGB_VAI, - QK_BOOT, RGB_HUD, RGB_SAD, RGB_VAD, + QK_BOOT, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_T, KC_TRNS, RGB_MOD, RGB_RMOD,RGB_TOG, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/crawlpad/keymaps/default/keymap.c b/keyboards/crawlpad/keymaps/default/keymap.c index 306ade6e5f8..7786029a40a 100755 --- a/keyboards/crawlpad/keymaps/default/keymap.c +++ b/keyboards/crawlpad/keymaps/default/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ortho_4x4( KC_NUM, BL1, KC_TRNS, KC_PSLS, - QK_BOOT, BL2, KC_TRNS, KC_TRNS, + QK_BOOT, BL2, KC_TRNS, KC_TRNS, KC_TRNS, BL3, KC_TRNS, KC_TRNS, KC_TRNS, BL4, KC_TRNS, KC_TRNS ), diff --git a/keyboards/crazy_keyboard_68/keymaps/default/keymap.c b/keyboards/crazy_keyboard_68/keymaps/default/keymap.c index 970d67e2f12..12e1c1bf0c1 100644 --- a/keyboards/crazy_keyboard_68/keymaps/default/keymap.c +++ b/keyboards/crazy_keyboard_68/keymaps/default/keymap.c @@ -61,6 +61,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END, _______, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, _______, _______, KC_INS, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/creatkeebs/glacier/keymaps/via/keymap.c b/keyboards/creatkeebs/glacier/keymaps/via/keymap.c index a78795af155..b13d0a11796 100644 --- a/keyboards/creatkeebs/glacier/keymaps/via/keymap.c +++ b/keyboards/creatkeebs/glacier/keymaps/via/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_f13_ansi_tsangan( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_tkl_f13_ansi_tsangan( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_tkl_f13_ansi_tsangan( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/crin/keymaps/default/keymap.c b/keyboards/crin/keymaps/default/keymap.c index 96cad77e763..4c2c771175d 100644 --- a/keyboards/crin/keymaps/default/keymap.c +++ b/keyboards/crin/keymaps/default/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_ansi_tsangan( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSCR, KC_SCRL, KC_PAUS, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/crin/keymaps/via/keymap.c b/keyboards/crin/keymaps/via/keymap.c index 96cad77e763..4c2c771175d 100644 --- a/keyboards/crin/keymaps/via/keymap.c +++ b/keyboards/crin/keymaps/via/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_ansi_tsangan( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSCR, KC_SCRL, KC_PAUS, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/custommk/evo70/keymaps/default/keymap.c b/keyboards/custommk/evo70/keymaps/default/keymap.c index b577b885b23..2c0b1475f49 100644 --- a/keyboards/custommk/evo70/keymaps/default/keymap.c +++ b/keyboards/custommk/evo70/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F9, KC_F10, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/custommk/evo70/keymaps/via/keymap.c b/keyboards/custommk/evo70/keymaps/via/keymap.c index bff3309e639..2fc0380fb00 100644 --- a/keyboards/custommk/evo70/keymaps/via/keymap.c +++ b/keyboards/custommk/evo70/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F9, KC_F10, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/cutie_club/borsdorf/keymaps/default/keymap.c b/keyboards/cutie_club/borsdorf/keymaps/default/keymap.c index 3427775deba..146c4b4b05b 100644 --- a/keyboards/cutie_club/borsdorf/keymaps/default/keymap.c +++ b/keyboards/cutie_club/borsdorf/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RIGHT ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/cutie_club/borsdorf/keymaps/via/keymap.c b/keyboards/cutie_club/borsdorf/keymaps/via/keymap.c index 152fddd404c..42538035fe1 100644 --- a/keyboards/cutie_club/borsdorf/keymaps/via/keymap.c +++ b/keyboards/cutie_club/borsdorf/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RIGHT ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/cutie_club/wraith/keymaps/default/keymap.c b/keyboards/cutie_club/wraith/keymaps/default/keymap.c index c3f7c41354a..60477c58d28 100644 --- a/keyboards/cutie_club/wraith/keymaps/default/keymap.c +++ b/keyboards/cutie_club/wraith/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( - QK_BOOT, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_TRNS, + QK_BOOT, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_TRNS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/daji/seis_cinco/keymaps/default/keymap.c b/keyboards/daji/seis_cinco/keymaps/default/keymap.c index c13d5a2220c..6ca2e8f217b 100644 --- a/keyboards/daji/seis_cinco/keymaps/default/keymap.c +++ b/keyboards/daji/seis_cinco/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT_default( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/daji/seis_cinco/keymaps/via/keymap.c b/keyboards/daji/seis_cinco/keymaps/via/keymap.c index 1ede5396f9b..0475a05b17d 100644 --- a/keyboards/daji/seis_cinco/keymaps/via/keymap.c +++ b/keyboards/daji/seis_cinco/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/delikeeb/waaffle/keymaps/default/keymap.c b/keyboards/delikeeb/waaffle/keymaps/default/keymap.c index ee2a8b99063..742cf855542 100644 --- a/keyboards/delikeeb/waaffle/keymaps/default/keymap.c +++ b/keyboards/delikeeb/waaffle/keymaps/default/keymap.c @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT_ortho_5x16( - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DB_TOGG, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DB_TOGG, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CAPS, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/delikeeb/waaffle/keymaps/via/keymap.c b/keyboards/delikeeb/waaffle/keymaps/via/keymap.c index 0d8566db80a..e3113f3bc80 100644 --- a/keyboards/delikeeb/waaffle/keymaps/via/keymap.c +++ b/keyboards/delikeeb/waaffle/keymaps/via/keymap.c @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT_ortho_5x16( - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DB_TOGG, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DB_TOGG, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CAPS, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/dm9records/lain/keymaps/default/keymap.c b/keyboards/dm9records/lain/keymaps/default/keymap.c index b05150fa5ab..5da2e43e9aa 100644 --- a/keyboards/dm9records/lain/keymaps/default/keymap.c +++ b/keyboards/dm9records/lain/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [CONF] = LAYOUT( - QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LED_EN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX diff --git a/keyboards/dm9records/lain/keymaps/via/keymap.c b/keyboards/dm9records/lain/keymaps/via/keymap.c index d900ffb3a26..d534f006970 100644 --- a/keyboards/dm9records/lain/keymaps/via/keymap.c +++ b/keyboards/dm9records/lain/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [CONF] = LAYOUT( - QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_USER_0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX diff --git a/keyboards/do60/keymaps/default/keymap.c b/keyboards/do60/keymaps/default/keymap.c index 56be63b7253..0d9f4ef13dd 100644 --- a/keyboards/do60/keymaps/default/keymap.c +++ b/keyboards/do60/keymaps/default/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // 1: Function Layer [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, BL_TOGG,BL_ON, BL_UP, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL, KC_NO, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, BL_STEP,BL_OFF, BL_DOWN,KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_NO, KC_ENT, KC_LSFT, KC_NO, KC_NO, KC_APP, BL_STEP, KC_NO, KC_NO, KC_VOLD,KC_VOLU,KC_MUTE, KC_END, KC_RSFT, KC_NO , KC_PGUP, KC_INS, diff --git a/keyboards/do60/keymaps/via/keymap.c b/keyboards/do60/keymaps/via/keymap.c index 9d930d3dac1..70d0a2a6347 100644 --- a/keyboards/do60/keymaps/via/keymap.c +++ b/keyboards/do60/keymaps/via/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // 1: Function Layer [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, BL_TOGG,BL_ON, BL_UP, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL, KC_NO, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, BL_STEP,BL_OFF, BL_DOWN,KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_NO, KC_ENT, KC_LSFT, KC_NO, KC_NO, KC_APP, BL_STEP, KC_NO, KC_NO, KC_VOLD,KC_VOLU,KC_MUTE, KC_END, KC_RSFT, KC_NO , KC_PGUP, KC_INS, diff --git a/keyboards/doodboard/duckboard/keymaps/default/keymap.c b/keyboards/doodboard/duckboard/keymaps/default/keymap.c index ff0458234ac..e75d90d906f 100644 --- a/keyboards/doodboard/duckboard/keymaps/default/keymap.c +++ b/keyboards/doodboard/duckboard/keymaps/default/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - TG(2), QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS), + TG(2), QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS), }; bool encoder_update_user(uint8_t index, bool clockwise) { diff --git a/keyboards/doodboard/duckboard_r2/keymaps/default/keymap.c b/keyboards/doodboard/duckboard_r2/keymaps/default/keymap.c index df2f44a6b01..ac2b586d328 100644 --- a/keyboards/doodboard/duckboard_r2/keymaps/default/keymap.c +++ b/keyboards/doodboard/duckboard_r2/keymaps/default/keymap.c @@ -34,8 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - TG(2), QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS), + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + TG(2), QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS), }; bool encoder_update_user(uint8_t index, bool clockwise) { diff --git a/keyboards/doodboard/duckboard_r2/keymaps/via/keymap.c b/keyboards/doodboard/duckboard_r2/keymaps/via/keymap.c index 26d13d8e37c..c8309d7f86c 100644 --- a/keyboards/doodboard/duckboard_r2/keymaps/via/keymap.c +++ b/keyboards/doodboard/duckboard_r2/keymaps/via/keymap.c @@ -34,8 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - TG(2), QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS), + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + TG(2), QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS), [3] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/doro67/multi/keymaps/default/keymap.c b/keyboards/doro67/multi/keymaps/default/keymap.c index 87a42768438..58df494e456 100644 --- a/keyboards/doro67/multi/keymaps/default/keymap.c +++ b/keyboards/doro67/multi/keymaps/default/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - BL_TOGG, BL_STEP, BL_DOWN, BL_UP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_TOGG, BL_STEP, BL_DOWN, BL_UP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/doro67/multi/keymaps/default_iso/keymap.c b/keyboards/doro67/multi/keymaps/default_iso/keymap.c index b683bced7ef..45955fba3b7 100644 --- a/keyboards/doro67/multi/keymaps/default_iso/keymap.c +++ b/keyboards/doro67/multi/keymaps/default_iso/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - BL_TOGG, BL_STEP, BL_DOWN, BL_UP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_TOGG, BL_STEP, BL_DOWN, BL_UP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/doro67/multi/keymaps/default_multi/keymap.c b/keyboards/doro67/multi/keymaps/default_multi/keymap.c index 5a2900cfddb..918ac3936bd 100644 --- a/keyboards/doro67/multi/keymaps/default_multi/keymap.c +++ b/keyboards/doro67/multi/keymaps/default_multi/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_multi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - BL_TOGG, BL_STEP, BL_DOWN, BL_UP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_TOGG, BL_STEP, BL_DOWN, BL_UP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/doro67/multi/keymaps/via/keymap.c b/keyboards/doro67/multi/keymaps/via/keymap.c index c6082150ad4..4e5cde752dc 100644 --- a/keyboards/doro67/multi/keymaps/via/keymap.c +++ b/keyboards/doro67/multi/keymaps/via/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - BL_TOGG, BL_STEP, BL_DOWN, BL_UP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_TOGG, BL_STEP, BL_DOWN, BL_UP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/doro67/regular/keymaps/default/keymap.c b/keyboards/doro67/regular/keymaps/default/keymap.c index 342357ab2dc..a86075c616d 100644 --- a/keyboards/doro67/regular/keymaps/default/keymap.c +++ b/keyboards/doro67/regular/keymaps/default/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/doro67/regular/keymaps/via/keymap.c b/keyboards/doro67/regular/keymaps/via/keymap.c index bec67a9a52d..7dd5feb8971 100644 --- a/keyboards/doro67/regular/keymaps/via/keymap.c +++ b/keyboards/doro67/regular/keymaps/via/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/doro67/rgb/keymaps/default/keymap.c b/keyboards/doro67/rgb/keymaps/default/keymap.c index 0f793234a24..ca9ec2e6121 100644 --- a/keyboards/doro67/rgb/keymaps/default/keymap.c +++ b/keyboards/doro67/rgb/keymaps/default/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - QMKBEST, QMKURL, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QMKBEST, QMKURL, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/doro67/rgb/keymaps/via/keymap.c b/keyboards/doro67/rgb/keymaps/via/keymap.c index 27cf18585dc..4d65743ed2b 100644 --- a/keyboards/doro67/rgb/keymaps/via/keymap.c +++ b/keyboards/doro67/rgb/keymaps/via/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/dp60/keymaps/default/keymap.c b/keyboards/dp60/keymaps/default/keymap.c index bcdfee0ffbf..3d49bd268fe 100644 --- a/keyboards/dp60/keymaps/default/keymap.c +++ b/keyboards/dp60/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_ansi_split_bs_rshift( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR, - QK_BOOT, RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, + QK_BOOT, RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME,KC_END,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______, _______,_______,TG(0),_______), diff --git a/keyboards/dp60/keymaps/via/keymap.c b/keyboards/dp60/keymaps/via/keymap.c index fab799e08a4..6a8ec48a8c6 100644 --- a/keyboards/dp60/keymaps/via/keymap.c +++ b/keyboards/dp60/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_DEL, - QK_BOOT, _______,KC_UP,_______,_______,_______,_______,_______,KC_PAUS,KC_SCRL,KC_PSCR,KC_PGUP,_______,KC_INS, + QK_BOOT, _______,KC_UP,_______,_______,_______,_______,_______,KC_PAUS,KC_SCRL,KC_PSCR,KC_PGUP,_______,KC_INS, _______, KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______, _______,_______,KC_HOME,KC_END,_______, _______, _______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PGDN,_______,_______, _______,_______,_______, _______, _______,MO(2),TG(0),_______), diff --git a/keyboards/draculad/keymaps/default/keymap.c b/keyboards/draculad/keymaps/default/keymap.c index e83811df73e..7a06ced3476 100644 --- a/keyboards/draculad/keymaps/default/keymap.c +++ b/keyboards/draculad/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUM] = LAYOUT( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TAB, XXXXXXX, KC_VOLD, KC_VOLU, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_QUOT, - KC_LSFT, XXXXXXX, XXXXXXX, KC_MUTE, QK_BOOT, KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_RSFT, + KC_LSFT, XXXXXXX, XXXXXXX, KC_MUTE, QK_BOOT, KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_RSFT, XXXXXXX, KC_NO, XXXXXXX, KC_LALT, XXXXXXX, _______, KC_ENT, KC_NO ), diff --git a/keyboards/draytronics/elise/keymaps/default/keymap.c b/keyboards/draytronics/elise/keymaps/default/keymap.c index abf60037816..ecafbf13c95 100644 --- a/keyboards/draytronics/elise/keymaps/default/keymap.c +++ b/keyboards/draytronics/elise/keymaps/default/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL] = LAYOUT_65_ansi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, - QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE, RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, _______, KC_TRNS, _______, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/draytronics/elise/keymaps/default_iso/keymap.c b/keyboards/draytronics/elise/keymaps/default_iso/keymap.c index b0b8a7491ed..02f4b9c1cc8 100644 --- a/keyboards/draytronics/elise/keymaps/default_iso/keymap.c +++ b/keyboards/draytronics/elise/keymaps/default_iso/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL] = LAYOUT_65_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, - QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE, RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/draytronics/elise_v2/keymaps/default/keymap.c b/keyboards/draytronics/elise_v2/keymaps/default/keymap.c index 86ca97b1b67..1989f22f97c 100644 --- a/keyboards/draytronics/elise_v2/keymaps/default/keymap.c +++ b/keyboards/draytronics/elise_v2/keymaps/default/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL] = LAYOUT_65_ansi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, - QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE, RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, _______, KC_TRNS, _______, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/draytronics/elise_v2/keymaps/default_iso/keymap.c b/keyboards/draytronics/elise_v2/keymaps/default_iso/keymap.c index b0b8a7491ed..02f4b9c1cc8 100644 --- a/keyboards/draytronics/elise_v2/keymaps/default_iso/keymap.c +++ b/keyboards/draytronics/elise_v2/keymaps/default_iso/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL] = LAYOUT_65_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, - QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE, RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/drewkeys/iskar/keymaps/via/keymap.c b/keyboards/drewkeys/iskar/keymaps/via/keymap.c index df0d3a5e162..046a330b7b9 100644 --- a/keyboards/drewkeys/iskar/keymaps/via/keymap.c +++ b/keyboards/drewkeys/iskar/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] LAYOUT( - KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, QK_BOOT, KC_TRNS, + KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, QK_BOOT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/duck/eagle_viper/v2/keymaps/default/keymap.c b/keyboards/duck/eagle_viper/v2/keymaps/default/keymap.c index 667dae87595..750eedeab8b 100644 --- a/keyboards/duck/eagle_viper/v2/keymaps/default/keymap.c +++ b/keyboards/duck/eagle_viper/v2/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( _______, RGB_TOG, RGB_MOD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/duck/eagle_viper/v2/keymaps/via/keymap.c b/keyboards/duck/eagle_viper/v2/keymaps/via/keymap.c index 59073ba5e7a..4610bb172ac 100644 --- a/keyboards/duck/eagle_viper/v2/keymaps/via/keymap.c +++ b/keyboards/duck/eagle_viper/v2/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( _______, RGB_TOG, RGB_MOD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/duck/octagon/keymaps/default/keymap.c b/keyboards/duck/octagon/keymaps/default/keymap.c index 12024c918b3..3b8fbdc5329 100644 --- a/keyboards/duck/octagon/keymaps/default/keymap.c +++ b/keyboards/duck/octagon/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FL] = LAYOUT_75_ansi( KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/duck/orion/v3/keymaps/default/keymap.c b/keyboards/duck/orion/v3/keymaps/default/keymap.c index bff90880f7c..670c3ac33f0 100644 --- a/keyboards/duck/orion/v3/keymaps/default/keymap.c +++ b/keyboards/duck/orion/v3/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - BL_TOGG, BL_STEP, BL_UP, BL_DOWN, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + BL_TOGG, BL_STEP, BL_UP, BL_DOWN, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/duck/tcv3/keymaps/default/keymap.c b/keyboards/duck/tcv3/keymaps/default/keymap.c index 4144e5b8eb7..f232c6b0931 100644 --- a/keyboards/duck/tcv3/keymaps/default/keymap.c +++ b/keyboards/duck/tcv3/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FL] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/duck/tcv3/keymaps/via/keymap.c b/keyboards/duck/tcv3/keymaps/via/keymap.c index 7e309d024c9..3ce47d41d98 100644 --- a/keyboards/duck/tcv3/keymaps/via/keymap.c +++ b/keyboards/duck/tcv3/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/dz60/keymaps/iso_de_root/keymap.c b/keyboards/dz60/keymaps/iso_de_root/keymap.c index f3fb169dc02..231e4301a54 100644 --- a/keyboards/dz60/keymaps/iso_de_root/keymap.c +++ b/keyboards/dz60/keymaps/iso_de_root/keymap.c @@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [FN1] = LAYOUT_60_iso_5x1u_split_rshift( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - _______, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, + _______, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TO(NUM), XXXXXXX, XXXXXXX, KC_INS, KC_DEL, KC_NUM, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, KC_RSFT, XXXXXXX, _______, _______, _______, KC_LCTL, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END diff --git a/keyboards/dz60/keymaps/iso_vim_arrow/keymap.c b/keyboards/dz60/keymaps/iso_vim_arrow/keymap.c index 3a1da6a9d75..d21db888657 100644 --- a/keyboards/dz60/keymaps/iso_vim_arrow/keymap.c +++ b/keyboards/dz60/keymaps/iso_vim_arrow/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT_60_iso_5x1u( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_PSCR, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_END, KC_DEL, KC_NO, KC_NO, KC_LSFT, BL_TOGG, KC_APP, KC_PAUS, KC_INS, KC_NO, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC, KC_DEL, KC_HOME, KC_PGDN, KC_PGUP, KC_END diff --git a/keyboards/dz60/keymaps/iso_vim_arrow_split_rs/keymap.c b/keyboards/dz60/keymaps/iso_vim_arrow_split_rs/keymap.c index e2e393af444..6c9bc682114 100644 --- a/keyboards/dz60/keymaps/iso_vim_arrow_split_rs/keymap.c +++ b/keyboards/dz60/keymaps/iso_vim_arrow_split_rs/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/dztech/duo_s/keymaps/default/keymap.c b/keyboards/dztech/duo_s/keymaps/default/keymap.c index 5ed06246b2a..e3c2deab9fa 100644 --- a/keyboards/dztech/duo_s/keymaps/default/keymap.c +++ b/keyboards/dztech/duo_s/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_65_ansi_blocker( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, BL_UP, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, BL_UP, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, RGB_MOD, diff --git a/keyboards/dztech/duo_s/keymaps/via/keymap.c b/keyboards/dztech/duo_s/keymaps/via/keymap.c index 7608f22c095..efc3446664a 100644 --- a/keyboards/dztech/duo_s/keymaps/via/keymap.c +++ b/keyboards/dztech/duo_s/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_65_ansi_blocker( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, BL_UP, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, BL_UP, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, RGB_MOD, diff --git a/keyboards/dztech/dz65rgb/keymaps/via/keymap.c b/keyboards/dztech/dz65rgb/keymaps/via/keymap.c index 3d1772e3b2d..215ea47875f 100644 --- a/keyboards/dztech/dz65rgb/keymaps/via/keymap.c +++ b/keyboards/dztech/dz65rgb/keymaps/via/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_65_ansi( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, CTL_T(KC_CAPS), RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, KC_PGDN, KC_LSFT, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/dztech/dz96/keymaps/default/keymap.c b/keyboards/dztech/dz96/keymaps/default/keymap.c index 920ef85b3c7..16d79d5a564 100644 --- a/keyboards/dztech/dz96/keymaps/default/keymap.c +++ b/keyboards/dztech/dz96/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_default( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, BL_TOGG, BL_UP, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/dztech/dz96/keymaps/iso/keymap.c b/keyboards/dztech/dz96/keymaps/iso/keymap.c index 6de4fcf5c52..fe6218a3236 100644 --- a/keyboards/dztech/dz96/keymaps/iso/keymap.c +++ b/keyboards/dztech/dz96/keymaps/iso/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_iso( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, BL_TOGG, BL_UP, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/dztech/dz96/keymaps/via/keymap.c b/keyboards/dztech/dz96/keymaps/via/keymap.c index 11b9bbd7e00..4a357efd1a4 100644 --- a/keyboards/dztech/dz96/keymaps/via/keymap.c +++ b/keyboards/dztech/dz96/keymaps/via/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_default( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, BL_TOGG, BL_UP, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c index 0acfb4df9e7..2f5a6316e41 100644 --- a/keyboards/dztech/tofu/ii/keymaps/default/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_PGDN, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), diff --git a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c index 35b8e6fe937..d2fa4f2018a 100644 --- a/keyboards/dztech/tofu/ii/keymaps/via/keymap.c +++ b/keyboards/dztech/tofu/ii/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_PGDN, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), diff --git a/keyboards/dztech/tofu/jr/keymaps/via/keymap.c b/keyboards/dztech/tofu/jr/keymaps/via/keymap.c index 929fc62b26f..406c8f7fd5a 100644 --- a/keyboards/dztech/tofu/jr/keymaps/via/keymap.c +++ b/keyboards/dztech/tofu/jr/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_65_ansi( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, KC_PGDN, KC_LSFT, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/ealdin/quadrant/keymaps/default/keymap.c b/keyboards/ealdin/quadrant/keymaps/default/keymap.c index dfa9732b17b..cc95cf91c96 100644 --- a/keyboards/ealdin/quadrant/keymaps/default/keymap.c +++ b/keyboards/ealdin/quadrant/keymaps/default/keymap.c @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCRL + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCRL ), [2] = LAYOUT_ortho_5x14( diff --git a/keyboards/ealdin/quadrant/keymaps/via/keymap.c b/keyboards/ealdin/quadrant/keymaps/via/keymap.c index 915e9345682..1eabaf5d213 100644 --- a/keyboards/ealdin/quadrant/keymaps/via/keymap.c +++ b/keyboards/ealdin/quadrant/keymaps/via/keymap.c @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCRL + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCRL ), [2] = LAYOUT_ortho_5x14( diff --git a/keyboards/eason/capsule65/keymaps/default/keymap.c b/keyboards/eason/capsule65/keymaps/default/keymap.c index 856faf6bccf..e62ed6c2be5 100644 --- a/keyboards/eason/capsule65/keymaps/default/keymap.c +++ b/keyboards/eason/capsule65/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, diff --git a/keyboards/eason/capsule65/keymaps/via/keymap.c b/keyboards/eason/capsule65/keymaps/via/keymap.c index 32728c5ca30..ea3c4733571 100644 --- a/keyboards/eason/capsule65/keymaps/via/keymap.c +++ b/keyboards/eason/capsule65/keymaps/via/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c b/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c index 4ebe59d947e..5aaefc295e3 100644 --- a/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c +++ b/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c @@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_SET] = LAYOUT_ortho_4x16( _______, KC_CAPS, KC_SCRL, KC_NUM, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_M_P, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_M_SW, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_K, _______, QK_BOOT, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_K, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c b/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c index fc611fcf0e0..8be97924d3d 100644 --- a/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c +++ b/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c @@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_SET] = LAYOUT_ortho_4x16( _______, KC_CAPS, KC_SCRL, KC_NUM, VK_TOGG, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_P, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_M_SW,_______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_K, _______, QK_BOOT, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_K, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/edinburgh41/keymaps/default/keymap.c b/keyboards/edinburgh41/keymaps/default/keymap.c index b39a1758bcb..d567c62815a 100644 --- a/keyboards/edinburgh41/keymaps/default/keymap.c +++ b/keyboards/edinburgh41/keymaps/default/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, _______, _______ ), }; diff --git a/keyboards/eek/keymaps/default/keymap.c b/keyboards/eek/keymaps/default/keymap.c index 0d9b2fe1372..7fe969c1525 100644 --- a/keyboards/eek/keymaps/default/keymap.c +++ b/keyboards/eek/keymaps/default/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_split_3x5_3( RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, RGB_TOG, _______, KC_F9, KC_F10, KC_F11, KC_F12, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD, _______, _______, KC_F5, KC_F6, KC_F7, KC_F8, - _______, _______, _______, _______, _______, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, + _______, _______, _______, _______, _______, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/emajesty/eiri/keymaps/default/keymap.c b/keyboards/emajesty/eiri/keymaps/default/keymap.c index c3db9e1b469..2cf793dc9e4 100644 --- a/keyboards/emajesty/eiri/keymaps/default/keymap.c +++ b/keyboards/emajesty/eiri/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), [2] = LAYOUT( - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) diff --git a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c index b033c0ca1c5..31911c5d6ff 100644 --- a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c +++ b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [SYMB] = LAYOUT_ergodox( // left hand VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, - QK_BOOT, KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, + QK_BOOT,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, EPRM,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, diff --git a/keyboards/ergoslab/keymaps/default/keymap.c b/keyboards/ergoslab/keymaps/default/keymap.c index e2a9f0b3223..d7fe6c40395 100644 --- a/keyboards/ergoslab/keymaps/default/keymap.c +++ b/keyboards/ergoslab/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, KC_F11, KC_F12, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, KC_MUTE, - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, _______, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/esca/getawayvan/keymaps/7u/keymap.c b/keyboards/esca/getawayvan/keymaps/7u/keymap.c index beeac2bffbc..d6d0c880dbf 100644 --- a/keyboards/esca/getawayvan/keymaps/7u/keymap.c +++ b/keyboards/esca/getawayvan/keymaps/7u/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [3] = LAYOUT( /* LAYER 3 */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS diff --git a/keyboards/esca/getawayvan/keymaps/default/keymap.c b/keyboards/esca/getawayvan/keymaps/default/keymap.c index 16a09cc34e4..64a9b42d866 100644 --- a/keyboards/esca/getawayvan/keymaps/default/keymap.c +++ b/keyboards/esca/getawayvan/keymaps/default/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT ), [3] = LAYOUT( /* LAYER 3 */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/esca/getawayvan/keymaps/via/keymap.c b/keyboards/esca/getawayvan/keymaps/via/keymap.c index 22e315b558d..55314b1ed97 100644 --- a/keyboards/esca/getawayvan/keymaps/via/keymap.c +++ b/keyboards/esca/getawayvan/keymaps/via/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT ), [3] = LAYOUT( /* LAYER 3 */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/esca/getawayvan_f042/keymaps/7u/keymap.c b/keyboards/esca/getawayvan_f042/keymaps/7u/keymap.c index beeac2bffbc..d6d0c880dbf 100644 --- a/keyboards/esca/getawayvan_f042/keymaps/7u/keymap.c +++ b/keyboards/esca/getawayvan_f042/keymaps/7u/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [3] = LAYOUT( /* LAYER 3 */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS diff --git a/keyboards/esca/getawayvan_f042/keymaps/default/keymap.c b/keyboards/esca/getawayvan_f042/keymaps/default/keymap.c index 22e315b558d..55314b1ed97 100644 --- a/keyboards/esca/getawayvan_f042/keymaps/default/keymap.c +++ b/keyboards/esca/getawayvan_f042/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT ), [3] = LAYOUT( /* LAYER 3 */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/eternal_keypad/keymaps/default/keymap.c b/keyboards/eternal_keypad/keymaps/default/keymap.c index d94b0781f6f..5d59ae2f1cf 100644 --- a/keyboards/eternal_keypad/keymaps/default/keymap.c +++ b/keyboards/eternal_keypad/keymaps/default/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_UP, _______, RGB_TOG, RGB_HUI, RGB_HUD, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_RMOD, - QK_BOOT, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______ ), /* Function Layer * ,-------------------------------------. diff --git a/keyboards/eternal_keypad/keymaps/via/keymap.c b/keyboards/eternal_keypad/keymaps/via/keymap.c index f5b2796aac4..83c1dfb022d 100644 --- a/keyboards/eternal_keypad/keymaps/via/keymap.c +++ b/keyboards/eternal_keypad/keymaps/via/keymap.c @@ -102,6 +102,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/eve/meteor/keymaps/default/keymap.c b/keyboards/eve/meteor/keymaps/default/keymap.c index 598421ddf4f..5550e1f5609 100644 --- a/keyboards/eve/meteor/keymaps/default/keymap.c +++ b/keyboards/eve/meteor/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/eve/meteor/keymaps/via/keymap.c b/keyboards/eve/meteor/keymaps/via/keymap.c index 72a50723363..f9e3a96646a 100644 --- a/keyboards/eve/meteor/keymaps/via/keymap.c +++ b/keyboards/eve/meteor/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/evyd13/atom47/keymaps/default/keymap.c b/keyboards/evyd13/atom47/keymaps/default/keymap.c index 7ab806391ad..bba4b999298 100644 --- a/keyboards/evyd13/atom47/keymaps/default/keymap.c +++ b/keyboards/evyd13/atom47/keymaps/default/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, MO(_PN), KC_SPC, KC_SPC, MO(_FN), KC_RALT, KC_APP, KC_RCTL), [_FN] = LAYOUT_split_space( - _______, KC_VOLD, KC_VOLU, KC_MUTE, QK_BOOT, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, + _______, KC_VOLD, KC_VOLU, KC_MUTE, QK_BOOT, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), diff --git a/keyboards/evyd13/atom47/keymaps/via/keymap.c b/keyboards/evyd13/atom47/keymaps/via/keymap.c index acaf076e08b..67c96f2a483 100644 --- a/keyboards/evyd13/atom47/keymaps/via/keymap.c +++ b/keyboards/evyd13/atom47/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, MO(3), KC_SPC, KC_SPC, MO(1), KC_RALT, KC_APP, KC_RCTL), [1] = LAYOUT_split_space( - _______, KC_VOLD, KC_VOLU, KC_MUTE, QK_BOOT, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, + _______, KC_VOLD, KC_VOLU, KC_MUTE, QK_BOOT, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), diff --git a/keyboards/evyd13/eon65/keymaps/default/keymap.c b/keyboards/evyd13/eon65/keymaps/default/keymap.c index b5b3de82b90..2a55a12d6d9 100644 --- a/keyboards/evyd13/eon65/keymaps/default/keymap.c +++ b/keyboards/evyd13/eon65/keymaps/default/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/evyd13/eon65/keymaps/via/keymap.c b/keyboards/evyd13/eon65/keymaps/via/keymap.c index 552a8660a9b..0e62e489c92 100644 --- a/keyboards/evyd13/eon65/keymaps/via/keymap.c +++ b/keyboards/evyd13/eon65/keymaps/via/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/evyd13/eon75/keymaps/default/keymap.c b/keyboards/evyd13/eon75/keymaps/default/keymap.c index f6b2641b24a..24a88830059 100644 --- a/keyboards/evyd13/eon75/keymaps/default/keymap.c +++ b/keyboards/evyd13/eon75/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/evyd13/eon75/keymaps/via/keymap.c b/keyboards/evyd13/eon75/keymaps/via/keymap.c index 1b30f1b87d9..b7983f0a5cd 100644 --- a/keyboards/evyd13/eon75/keymaps/via/keymap.c +++ b/keyboards/evyd13/eon75/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/evyd13/eon95/keymaps/default/keymap.c b/keyboards/evyd13/eon95/keymaps/default/keymap.c index 2ac385027e6..779f5927843 100644 --- a/keyboards/evyd13/eon95/keymaps/default/keymap.c +++ b/keyboards/evyd13/eon95/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/evyd13/eon95/keymaps/via/keymap.c b/keyboards/evyd13/eon95/keymaps/via/keymap.c index f46e33399f7..9827951243d 100644 --- a/keyboards/evyd13/eon95/keymaps/via/keymap.c +++ b/keyboards/evyd13/eon95/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/evyd13/gud70/keymaps/default/keymap.c b/keyboards/evyd13/gud70/keymaps/default/keymap.c index 281af662f65..075f54c0353 100644 --- a/keyboards/evyd13/gud70/keymaps/default/keymap.c +++ b/keyboards/evyd13/gud70/keymaps/default/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/evyd13/gud70/keymaps/via/keymap.c b/keyboards/evyd13/gud70/keymaps/via/keymap.c index 49abab8eb7c..5d54232ae65 100644 --- a/keyboards/evyd13/gud70/keymaps/via/keymap.c +++ b/keyboards/evyd13/gud70/keymaps/via/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/evyd13/quackfire/keymaps/default/keymap.c b/keyboards/evyd13/quackfire/keymaps/default/keymap.c index f144ffdb5b2..909763e0de3 100644 --- a/keyboards/evyd13/quackfire/keymaps/default/keymap.c +++ b/keyboards/evyd13/quackfire/keymaps/default/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), LAYOUT_tkl_ansi( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_TOGG, _______, _______, KC_MUTE, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_TOGG, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, diff --git a/keyboards/evyd13/quackfire/keymaps/via/keymap.c b/keyboards/evyd13/quackfire/keymaps/via/keymap.c index 04528cc963f..471c506da01 100644 --- a/keyboards/evyd13/quackfire/keymaps/via/keymap.c +++ b/keyboards/evyd13/quackfire/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_TOGG, _______, _______, KC_MUTE, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_TOGG, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, diff --git a/keyboards/evyd13/solheim68/keymaps/default/keymap.c b/keyboards/evyd13/solheim68/keymaps/default/keymap.c index c2cd539e8c4..39e509803c7 100644 --- a/keyboards/evyd13/solheim68/keymaps/default/keymap.c +++ b/keyboards/evyd13/solheim68/keymaps/default/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_PSCR, KC_PGUP, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_PSCR, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, diff --git a/keyboards/evyd13/ta65/keymaps/default/keymap.c b/keyboards/evyd13/ta65/keymaps/default/keymap.c index 60128039b13..697215510b9 100644 --- a/keyboards/evyd13/ta65/keymaps/default/keymap.c +++ b/keyboards/evyd13/ta65/keymaps/default/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/evyd13/wasdat/keymaps/via/keymap.c b/keyboards/evyd13/wasdat/keymaps/via/keymap.c index 366747ab0c3..d5aee0c9ea4 100644 --- a/keyboards/evyd13/wasdat/keymaps/via/keymap.c +++ b/keyboards/evyd13/wasdat/keymaps/via/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘ */ LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/evyd13/wasdat_code/keymaps/default/keymap.c b/keyboards/evyd13/wasdat_code/keymaps/default/keymap.c index e10116f9a5a..f964019c935 100644 --- a/keyboards/evyd13/wasdat_code/keymaps/default/keymap.c +++ b/keyboards/evyd13/wasdat_code/keymaps/default/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), LAYOUT_fullsize_ansi( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_TOGG, _______, _______, KC_MUTE, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_TOGG, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, _______, _______, _______, _______, diff --git a/keyboards/evyd13/wasdat_code/keymaps/via/keymap.c b/keyboards/evyd13/wasdat_code/keymaps/via/keymap.c index c39ab38008d..f6218223926 100644 --- a/keyboards/evyd13/wasdat_code/keymaps/via/keymap.c +++ b/keyboards/evyd13/wasdat_code/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_TOGG, _______, _______, KC_MUTE, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_TOGG, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, _______, _______, _______, _______, diff --git a/keyboards/exclusive/e6_rgb/keymaps/60_ansi_split_bs_rshift/keymap.c b/keyboards/exclusive/e6_rgb/keymaps/60_ansi_split_bs_rshift/keymap.c index 7cb58ac1235..21d2a8fede4 100644 --- a/keyboards/exclusive/e6_rgb/keymaps/60_ansi_split_bs_rshift/keymap.c +++ b/keyboards/exclusive/e6_rgb/keymaps/60_ansi_split_bs_rshift/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_60_ansi_split_bs_rshift( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSCR, - QK_BOOT, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, + QK_BOOT, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/exclusive/e6_rgb/keymaps/60_tsangan_hhkb/keymap.c b/keyboards/exclusive/e6_rgb/keymaps/60_tsangan_hhkb/keymap.c index 7842cf317a8..8bc3be4c0fe 100644 --- a/keyboards/exclusive/e6_rgb/keymaps/60_tsangan_hhkb/keymap.c +++ b/keyboards/exclusive/e6_rgb/keymaps/60_tsangan_hhkb/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_60_tsangan_hhkb( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSCR, - QK_BOOT, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, + QK_BOOT, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/exclusive/e6_rgb/keymaps/default/keymap.c b/keyboards/exclusive/e6_rgb/keymaps/default/keymap.c index 0633b84c83d..73d2eb56829 100644 --- a/keyboards/exclusive/e6_rgb/keymaps/default/keymap.c +++ b/keyboards/exclusive/e6_rgb/keymaps/default/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_60_ansi( 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_F12, _______, - QK_BOOT, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/exclusive/e6_rgb/keymaps/via/keymap.c b/keyboards/exclusive/e6_rgb/keymaps/via/keymap.c index 90ff3e34438..8bc5f599444 100644 --- a/keyboards/exclusive/e6_rgb/keymaps/via/keymap.c +++ b/keyboards/exclusive/e6_rgb/keymaps/via/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_60_ansi_split_bs_rshift( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSCR, - QK_BOOT, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, + QK_BOOT, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/exent/keymaps/default/keymap.c b/keyboards/exent/keymaps/default/keymap.c index 724878a09e6..8531184ab24 100644 --- a/keyboards/exent/keymaps/default/keymap.c +++ b/keyboards/exent/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_65_ansi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, - BL_TOGG, BL_STEP, BL_UP, BL_DOWN, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_TOGG, BL_STEP, BL_UP, BL_DOWN, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/exent/keymaps/via/keymap.c b/keyboards/exent/keymaps/via/keymap.c index 478b150183f..e4d3a08a8b5 100644 --- a/keyboards/exent/keymaps/via/keymap.c +++ b/keyboards/exent/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_65_ansi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, - BL_TOGG, BL_STEP, BL_UP, BL_DOWN, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_TOGG, BL_STEP, BL_UP, BL_DOWN, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/default/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/default/keymap.c index be203959c00..d899ad3df0b 100644 --- a/keyboards/eyeohdesigns/theboulevard/keymaps/default/keymap.c +++ b/keyboards/eyeohdesigns/theboulevard/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FUNCTN] = LAYOUT_ortho1( - QK_BOOT, RGB_TOG, RGB_HUD, RGB_VAD, RGB_SAD, + QK_BOOT, RGB_TOG, RGB_HUD, RGB_VAD, RGB_SAD, KC_F5, KC_TAB, KC_Q, KC_PGUP, KC_E, KC_R, KC_T, KC_QUOT, KC_U, KC_UP, KC_O, KC_P, KC_BSPC, KC_F6, KC_CAPS, KC_HOME, KC_PGDN, KC_END, KC_F, KC_MINS, KC_EQL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_SCLN, KC_ENT, KC_F7, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_LBRC, KC_RBRC, KC_M, KC_COMM, KC_DOT, KC_BSLS, KC_RSFT, diff --git a/keyboards/fallacy/keymaps/default/keymap.c b/keyboards/fallacy/keymaps/default/keymap.c index 27a37ca8dfa..383ee3b049d 100755 --- a/keyboards/fallacy/keymaps/default/keymap.c +++ b/keyboards/fallacy/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL), [1] = LAYOUT_alice( - KC_TRNS, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/fallacy/keymaps/default_split_bs/keymap.c b/keyboards/fallacy/keymaps/default_split_bs/keymap.c index e336cbed9e0..04c95cf0a9a 100755 --- a/keyboards/fallacy/keymaps/default_split_bs/keymap.c +++ b/keyboards/fallacy/keymaps/default_split_bs/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL), [1] = LAYOUT_all( - KC_TRNS, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/fallacy/keymaps/via/keymap.c b/keyboards/fallacy/keymaps/via/keymap.c index 41279f88c7d..8dcaf77a43c 100755 --- a/keyboards/fallacy/keymaps/via/keymap.c +++ b/keyboards/fallacy/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL), [1] = LAYOUT_all( - KC_TRNS, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/feels/feels65/keymaps/default/keymap.c b/keyboards/feels/feels65/keymaps/default/keymap.c index 4f79e8184b5..ee139dfd6e0 100644 --- a/keyboards/feels/feels65/keymaps/default/keymap.c +++ b/keyboards/feels/feels65/keymaps/default/keymap.c @@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, - QK_BOOT, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END + QK_BOOT, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), }; diff --git a/keyboards/feels/feels65/keymaps/via/keymap.c b/keyboards/feels/feels65/keymaps/via/keymap.c index 33ccabd0999..4d043596dd2 100644 --- a/keyboards/feels/feels65/keymaps/via/keymap.c +++ b/keyboards/feels/feels65/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, - QK_BOOT, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END + QK_BOOT, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), [2] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/fjlabs/ad65/keymaps/default/keymap.c b/keyboards/fjlabs/ad65/keymaps/default/keymap.c index ab4d9067cfc..bc3faa86aad 100644 --- a/keyboards/fjlabs/ad65/keymaps/default/keymap.c +++ b/keyboards/fjlabs/ad65/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, KC_DEL, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/fjlabs/ad65/keymaps/via/keymap.c b/keyboards/fjlabs/ad65/keymaps/via/keymap.c index 6d44018a698..7dd247fa098 100644 --- a/keyboards/fjlabs/ad65/keymaps/via/keymap.c +++ b/keyboards/fjlabs/ad65/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, KC_DEL, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/fjlabs/bks65solder/keymaps/default/keymap.c b/keyboards/fjlabs/bks65solder/keymaps/default/keymap.c index 88ff28f4751..abe776d859d 100644 --- a/keyboards/fjlabs/bks65solder/keymaps/default/keymap.c +++ b/keyboards/fjlabs/bks65solder/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_HOME, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/fjlabs/bks65solder/keymaps/via/keymap.c b/keyboards/fjlabs/bks65solder/keymaps/via/keymap.c index ee17d22ea3c..d7fbdacf2f4 100644 --- a/keyboards/fjlabs/bks65solder/keymaps/via/keymap.c +++ b/keyboards/fjlabs/bks65solder/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_LAYER1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_HOME, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/fleuron/keymaps/default/keymap.c b/keyboards/fleuron/keymaps/default/keymap.c index 5d24ba5cb81..02fc34b89c8 100644 --- a/keyboards/fleuron/keymaps/default/keymap.c +++ b/keyboards/fleuron/keymaps/default/keymap.c @@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |RGBtog| | | | | | | | Home | PgUp | PgDn | End | | | | | * `---------------------------------------------------------------------------------------------------------------' */ - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/flx/virgo/keymaps/default/keymap.c b/keyboards/flx/virgo/keymaps/default/keymap.c index 8c577b9df2a..b249c67492c 100644 --- a/keyboards/flx/virgo/keymaps/default/keymap.c +++ b/keyboards/flx/virgo/keymaps/default/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/flx/virgo/keymaps/via/keymap.c b/keyboards/flx/virgo/keymaps/via/keymap.c index 71db611ac94..aa590e97baa 100644 --- a/keyboards/flx/virgo/keymaps/via/keymap.c +++ b/keyboards/flx/virgo/keymaps/via/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/for_science/keymaps/default/keymap.c b/keyboards/for_science/keymaps/default/keymap.c index 15b1a01d474..491d9e63799 100644 --- a/keyboards/for_science/keymaps/default/keymap.c +++ b/keyboards/for_science/keymaps/default/keymap.c @@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FUNCT] = LAYOUT_split_4x5_3( - QK_BOOT, _______, _______, _______, LOCK, MAC_LCK, _______, _______, _______, AG_LSWP, + QK_BOOT, _______, _______, _______, LOCK, MAC_LCK, _______, _______, _______, AG_LSWP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/forever65/keymaps/via/keymap.c b/keyboards/forever65/keymaps/via/keymap.c index 20e2f55b630..5696cdd3098 100644 --- a/keyboards/forever65/keymaps/via/keymap.c +++ b/keyboards/forever65/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/foxlab/key65/hotswap/keymaps/default/keymap.c b/keyboards/foxlab/key65/hotswap/keymaps/default/keymap.c index 1f35b8448d4..5e0d935f19f 100644 --- a/keyboards/foxlab/key65/hotswap/keymaps/default/keymap.c +++ b/keyboards/foxlab/key65/hotswap/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/foxlab/key65/hotswap/keymaps/via/keymap.c b/keyboards/foxlab/key65/hotswap/keymaps/via/keymap.c index e869f1b7995..d5261f85c69 100644 --- a/keyboards/foxlab/key65/hotswap/keymaps/via/keymap.c +++ b/keyboards/foxlab/key65/hotswap/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/foxlab/key65/universal/keymaps/default/keymap.c b/keyboards/foxlab/key65/universal/keymaps/default/keymap.c index 4077b3e5e79..b2f957d2267 100644 --- a/keyboards/foxlab/key65/universal/keymaps/default/keymap.c +++ b/keyboards/foxlab/key65/universal/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/foxlab/key65/universal/keymaps/via/keymap.c b/keyboards/foxlab/key65/universal/keymaps/via/keymap.c index ffbadd48551..2eec898dd5d 100644 --- a/keyboards/foxlab/key65/universal/keymaps/via/keymap.c +++ b/keyboards/foxlab/key65/universal/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/foxlab/time80/keymaps/default/keymap.c b/keyboards/foxlab/time80/keymaps/default/keymap.c index 863c9068e9f..659cbca028a 100644 --- a/keyboards/foxlab/time80/keymaps/default/keymap.c +++ b/keyboards/foxlab/time80/keymaps/default/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LALT, KC_LALT, KC_LGUI, XXXXXXX, _______, _______, MO(4), MO(4), XXXXXXX, XXXXXXX, XXXXXXX ), [4] = LAYOUT_all( - QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(1), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, diff --git a/keyboards/foxlab/time_re/hotswap/keymaps/default/keymap.c b/keyboards/foxlab/time_re/hotswap/keymaps/default/keymap.c index 073053198f9..46c1427a510 100644 --- a/keyboards/foxlab/time_re/hotswap/keymaps/default/keymap.c +++ b/keyboards/foxlab/time_re/hotswap/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), _______, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/foxlab/time_re/hotswap/keymaps/via/keymap.c b/keyboards/foxlab/time_re/hotswap/keymaps/via/keymap.c index ba8940f7c28..bad19bc31d3 100644 --- a/keyboards/foxlab/time_re/hotswap/keymaps/via/keymap.c +++ b/keyboards/foxlab/time_re/hotswap/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), _______, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/foxlab/time_re/universal/keymaps/default/keymap.c b/keyboards/foxlab/time_re/universal/keymaps/default/keymap.c index 242d359b83c..25f0414e697 100644 --- a/keyboards/foxlab/time_re/universal/keymaps/default/keymap.c +++ b/keyboards/foxlab/time_re/universal/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/foxlab/time_re/universal/keymaps/via/keymap.c b/keyboards/foxlab/time_re/universal/keymaps/via/keymap.c index b00798abcfc..4e06aaf15a5 100644 --- a/keyboards/foxlab/time_re/universal/keymaps/via/keymap.c +++ b/keyboards/foxlab/time_re/universal/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/gami_studio/lex60/keymaps/default/keymap.c b/keyboards/gami_studio/lex60/keymaps/default/keymap.c index 48e6d0a14f9..ebc7bc1b83c 100644 --- a/keyboards/gami_studio/lex60/keymaps/default/keymap.c +++ b/keyboards/gami_studio/lex60/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, LT(2, KC_ENT), KC_RGUI, KC_RALT, KC_APP, KC_RCTL), [_FIRMWARE] = LAYOUT( - QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_DOWN, BL_TOGG, BL_UP, XXXXXXX, XXXXXXX, TG(1), + QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_DOWN, BL_TOGG, BL_UP, XXXXXXX, XXXXXXX, TG(1), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, diff --git a/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c b/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c index 19d601e787d..6f191e55d70 100644 --- a/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c +++ b/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c b/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c index 889db30ebe7..28d72790554 100644 --- a/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c +++ b/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c b/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c index d1af8230464..d98c4a34d02 100644 --- a/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c +++ b/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c b/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c index d62ff83fa91..d60e04c46ce 100644 --- a/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c +++ b/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/gh60/revc/keymaps/via/keymap.c b/keyboards/gh60/revc/keymaps/via/keymap.c index 53f47514ad0..4ee69dc30e9 100644 --- a/keyboards/gh60/revc/keymaps/via/keymap.c +++ b/keyboards/gh60/revc/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( /* 1: fn */ 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_F12, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/gh60/satan/keymaps/iso_split_rshift/keymap.c b/keyboards/gh60/satan/keymaps/iso_split_rshift/keymap.c index 653ae67c55b..8e3817356f2 100644 --- a/keyboards/gh60/satan/keymaps/iso_split_rshift/keymap.c +++ b/keyboards/gh60/satan/keymaps/iso_split_rshift/keymap.c @@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------' */ [_SFX] = LAYOUT_60_iso_split_rshift( - QK_BOOT, _______, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, _______, _______, _______, KC_BSPC, + QK_BOOT, _______, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, _______, _______, _______, KC_BSPC, _______, _______, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, KC_1, KC_2, KC_3, _______, _______, XXXXXXX, KC_ENT, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_0, _______, KC_SLSH, KC_UP, _______, diff --git a/keyboards/gh60/satan/keymaps/via/keymap.c b/keyboards/gh60/satan/keymaps/via/keymap.c index c571008346c..b493eee74b4 100644 --- a/keyboards/gh60/satan/keymaps/via/keymap.c +++ b/keyboards/gh60/satan/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( /* 1: fn */ 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_F12, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/gh60/v1p3/keymaps/default/keymap.c b/keyboards/gh60/v1p3/keymaps/default/keymap.c index 8a31e89aef0..644376dcea7 100644 --- a/keyboards/gh60/v1p3/keymaps/default/keymap.c +++ b/keyboards/gh60/v1p3/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_SPI, RGB_SPD, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, RGB_VAI, RGB_SAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_NO, - KC_NO, KC_NO, QK_BOOT, BL_DOWN, BL_ON, BL_UP, KC_NO, KC_VOLD, KC_MUTE, KC_VOLU, KC_END, KC_PGDN, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, QK_BOOT, BL_DOWN, BL_ON, BL_UP, KC_NO, KC_VOLD, KC_MUTE, KC_VOLU, KC_END, KC_PGDN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO ), }; diff --git a/keyboards/gh60/v1p3/keymaps/default_ansi/keymap.c b/keyboards/gh60/v1p3/keymaps/default_ansi/keymap.c index d1ca8bf0a14..1b832bac2d4 100644 --- a/keyboards/gh60/v1p3/keymaps/default_ansi/keymap.c +++ b/keyboards/gh60/v1p3/keymaps/default_ansi/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_60_ansi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - _______, _______, _______, _______, QK_BOOT, _______, KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS, + _______, _______, _______, _______, QK_BOOT, _______, KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/gkeyboard/gkb_m16/keymaps/via/keymap.c b/keyboards/gkeyboard/gkb_m16/keymaps/via/keymap.c index e31679485b8..55ddcb9813b 100644 --- a/keyboards/gkeyboard/gkb_m16/keymaps/via/keymap.c +++ b/keyboards/gkeyboard/gkb_m16/keymaps/via/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(1), KC_VOLD, KC_MUTE, KC_MNXT ), [1] = LAYOUT_ortho_4x4( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/gl516/a52gl/keymaps/default/keymap.c b/keyboards/gl516/a52gl/keymaps/default/keymap.c index ae6ea538879..1bad7be0a60 100644 --- a/keyboards/gl516/a52gl/keymaps/default/keymap.c +++ b/keyboards/gl516/a52gl/keymaps/default/keymap.c @@ -39,7 +39,7 @@ LT(_FN,KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J ), [_FN] = LAYOUT( //,-----------------------------------------------------| |--------------------------------------------------------------. - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| diff --git a/keyboards/gl516/a52gl/keymaps/via/keymap.c b/keyboards/gl516/a52gl/keymaps/via/keymap.c index 66c5dacdec7..db15b92be57 100644 --- a/keyboards/gl516/a52gl/keymaps/via/keymap.c +++ b/keyboards/gl516/a52gl/keymaps/via/keymap.c @@ -31,7 +31,7 @@ LT(1,KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J ), [1] = LAYOUT( //,-----------------------------------------------------| |--------------------------------------------------------------. - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| diff --git a/keyboards/gl516/j73gl/keymaps/default/keymap.c b/keyboards/gl516/j73gl/keymaps/default/keymap.c index bf149ce6525..35d940ac04f 100644 --- a/keyboards/gl516/j73gl/keymaps/default/keymap.c +++ b/keyboards/gl516/j73gl/keymaps/default/keymap.c @@ -42,7 +42,7 @@ LT(_FN,JP_ZKHK), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, ), [_FN] = LAYOUT( //,-----------------------------------------------------+--------------------------------------------------------------------------------. - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, KC_PSCR, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, KC_PSCR, //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| diff --git a/keyboards/gl516/j73gl/keymaps/via/keymap.c b/keyboards/gl516/j73gl/keymaps/via/keymap.c index 0feb67e6352..b6e07b66e5c 100644 --- a/keyboards/gl516/j73gl/keymaps/via/keymap.c +++ b/keyboards/gl516/j73gl/keymaps/via/keymap.c @@ -34,7 +34,7 @@ LT(1,JP_ZKHK), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, ), [1] = LAYOUT( //,-----------------------------------------------------+--------------------------------------------------------------------------------. - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, KC_PSCR, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, KC_PSCR, //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| diff --git a/keyboards/gl516/n51gl/keymaps/default/keymap.c b/keyboards/gl516/n51gl/keymaps/default/keymap.c index 4104c7caf89..d4e969862a5 100644 --- a/keyboards/gl516/n51gl/keymaps/default/keymap.c +++ b/keyboards/gl516/n51gl/keymaps/default/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT( //,--------------------------------------------------------------| |--------------------------------------------------------------. - _______, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + _______, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| diff --git a/keyboards/gl516/n51gl/keymaps/via/keymap.c b/keyboards/gl516/n51gl/keymaps/via/keymap.c index 10980c6ad0c..d378ba2702d 100644 --- a/keyboards/gl516/n51gl/keymaps/via/keymap.c +++ b/keyboards/gl516/n51gl/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( //,--------------------------------------------------------------| |--------------------------------------------------------------. - _______, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + _______, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c index d3c00ad364f..95f82d9a3d9 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c index 663c827439b..f60369ad38f 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c index cd0861309a1..49752bf6a0b 100644 --- a/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c +++ b/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, - _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, RGB_MOD, _______, diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c index bc2134e3de7..45625ef85c9 100644 --- a/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c +++ b/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, - _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, RGB_MOD, _______, diff --git a/keyboards/gon/nerd60/keymaps/default/keymap.c b/keyboards/gon/nerd60/keymaps/default/keymap.c index 3d616269f5a..ec1a06b4ba8 100644 --- a/keyboards/gon/nerd60/keymaps/default/keymap.c +++ b/keyboards/gon/nerd60/keymaps/default/keymap.c @@ -15,6 +15,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, KC_DEL, _______, _______, _______, KC_APP, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/gon/nerd60/keymaps/via/keymap.c b/keyboards/gon/nerd60/keymaps/via/keymap.c index 1fdbf5c3a3d..bc7411c0155 100644 --- a/keyboards/gon/nerd60/keymaps/via/keymap.c +++ b/keyboards/gon/nerd60/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, KC_DEL, _______, _______, _______, KC_APP, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT_all( diff --git a/keyboards/gon/nerdtkl/keymaps/default/keymap.c b/keyboards/gon/nerdtkl/keymaps/default/keymap.c index ed92ea81a82..d9b7e22b3ff 100644 --- a/keyboards/gon/nerdtkl/keymaps/default/keymap.c +++ b/keyboards/gon/nerdtkl/keymaps/default/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_tkl( - QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, diff --git a/keyboards/gray_studio/apollo80/keymaps/default/keymap.c b/keyboards/gray_studio/apollo80/keymaps/default/keymap.c index de69d21712c..660c5656ba5 100644 --- a/keyboards/gray_studio/apollo80/keymaps/default/keymap.c +++ b/keyboards/gray_studio/apollo80/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/gray_studio/apollo80/keymaps/via/keymap.c b/keyboards/gray_studio/apollo80/keymaps/via/keymap.c index 94786cf30c6..7a2326ad3e3 100644 --- a/keyboards/gray_studio/apollo80/keymaps/via/keymap.c +++ b/keyboards/gray_studio/apollo80/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/gray_studio/space65/keymaps/iso/keymap.c b/keyboards/gray_studio/space65/keymaps/iso/keymap.c index 3c6b66530a9..ae6002f61dd 100644 --- a/keyboards/gray_studio/space65/keymaps/iso/keymap.c +++ b/keyboards/gray_studio/space65/keymaps/iso/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_TOG, RGB_M_P, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/gray_studio/space65/keymaps/via/keymap.c b/keyboards/gray_studio/space65/keymaps/via/keymap.c index 302c25a4b33..d093f92e698 100644 --- a/keyboards/gray_studio/space65/keymaps/via/keymap.c +++ b/keyboards/gray_studio/space65/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/gray_studio/think65/hotswap/keymaps/default/keymap.c b/keyboards/gray_studio/think65/hotswap/keymaps/default/keymap.c index 479d822e11f..bfcf7ff15be 100644 --- a/keyboards/gray_studio/think65/hotswap/keymaps/default/keymap.c +++ b/keyboards/gray_studio/think65/hotswap/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_65_ansi_blocker( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/gray_studio/think65/hotswap/keymaps/via/keymap.c b/keyboards/gray_studio/think65/hotswap/keymaps/via/keymap.c index 77e91438df2..2bcce9c73b7 100644 --- a/keyboards/gray_studio/think65/hotswap/keymaps/via/keymap.c +++ b/keyboards/gray_studio/think65/hotswap/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_65_ansi_blocker( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/gray_studio/think65/solder/keymaps/default/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/default/keymap.c index 479d822e11f..bfcf7ff15be 100644 --- a/keyboards/gray_studio/think65/solder/keymaps/default/keymap.c +++ b/keyboards/gray_studio/think65/solder/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_65_ansi_blocker( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/gray_studio/think65/solder/keymaps/via/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/via/keymap.c index be14b55e20e..ce6d76e1358 100644 --- a/keyboards/gray_studio/think65/solder/keymaps/via/keymap.c +++ b/keyboards/gray_studio/think65/solder/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/gregandcin/teaqueen/keymaps/default/keymap.c b/keyboards/gregandcin/teaqueen/keymaps/default/keymap.c index 2bcc085b777..adc3d89f398 100644 --- a/keyboards/gregandcin/teaqueen/keymaps/default/keymap.c +++ b/keyboards/gregandcin/teaqueen/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT), + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT), [_NAV] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/gregandcin/teaqueen/keymaps/via/keymap.c b/keyboards/gregandcin/teaqueen/keymaps/via/keymap.c index 2bcc085b777..adc3d89f398 100644 --- a/keyboards/gregandcin/teaqueen/keymaps/via/keymap.c +++ b/keyboards/gregandcin/teaqueen/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT), + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT), [_NAV] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/hadron/ver2/keymaps/default/keymap.c b/keyboards/hadron/ver2/keymaps/default/keymap.c index 44291f46cae..27ed7adfa0b 100644 --- a/keyboards/hadron/ver2/keymaps/default/keymap.c +++ b/keyboards/hadron/ver2/keymaps/default/keymap.c @@ -187,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL, + QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, AG_SWAP, QWERTY, COLEMAK, _______, _______, _______, _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, BL_DOWN, BL_UP, BL_STEP, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/halokeys/elemental75/keymaps/default/keymap.c b/keyboards/halokeys/elemental75/keymaps/default/keymap.c index 1dd7ea78621..95f43859b77 100644 --- a/keyboards/halokeys/elemental75/keymaps/default/keymap.c +++ b/keyboards/halokeys/elemental75/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/halokeys/elemental75/keymaps/via/keymap.c b/keyboards/halokeys/elemental75/keymaps/via/keymap.c index 69f27796816..086daa80f8f 100644 --- a/keyboards/halokeys/elemental75/keymaps/via/keymap.c +++ b/keyboards/halokeys/elemental75/keymaps/via/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/han60/keymaps/via/keymap.c b/keyboards/han60/keymaps/via/keymap.c index fb378140934..0e05c8dc4a0 100644 --- a/keyboards/han60/keymaps/via/keymap.c +++ b/keyboards/han60/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* LAYER 2 */ [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/handwired/3dfoxc/keymaps/default/keymap.c b/keyboards/handwired/3dfoxc/keymaps/default/keymap.c index c4ea6fbcc51..fb12640474f 100644 --- a/keyboards/handwired/3dfoxc/keymaps/default/keymap.c +++ b/keyboards/handwired/3dfoxc/keymaps/default/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `--------------------------------------------------''-----------' */ [_FL] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, QK_BOOT, _______, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, KC_DEL, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, KC_END, diff --git a/keyboards/handwired/amigopunk/keymaps/default/keymap.c b/keyboards/handwired/amigopunk/keymaps/default/keymap.c index ce8fe2cc442..023be5d628d 100644 --- a/keyboards/handwired/amigopunk/keymaps/default/keymap.c +++ b/keyboards/handwired/amigopunk/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LGUI, KC_LALT, KC_SPC, XXXXXXX, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, KC_PSCR, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, diff --git a/keyboards/handwired/arrow_pad/keymaps/default/keymap.c b/keyboards/handwired/arrow_pad/keymaps/default/keymap.c index 635667a0806..986442e6454 100644 --- a/keyboards/handwired/arrow_pad/keymaps/default/keymap.c +++ b/keyboards/handwired/arrow_pad/keymaps/default/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, - QK_BOOT, _______, _______, _______ ), + QK_BOOT, _______, _______, _______ ), }; diff --git a/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c index 3bdae41a241..74b92cf97e6 100644 --- a/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c +++ b/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [LAYER_FUNCTIONS] = LAYOUT( /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */ - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */ diff --git a/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c index cd8c970800f..3bfe9a100b3 100644 --- a/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c +++ b/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [LAYER_FUNCTIONS] = LAYOUT( /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */ - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */ diff --git a/keyboards/handwired/boss566y/redragon_vara/keymaps/default/keymap.c b/keyboards/handwired/boss566y/redragon_vara/keymaps/default/keymap.c index d480cd56671..4dfaf813fb4 100644 --- a/keyboards/handwired/boss566y/redragon_vara/keymaps/default/keymap.c +++ b/keyboards/handwired/boss566y/redragon_vara/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), MO(2), RGUI_T(KC_APP), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [1] = LAYOUT_fullsize_ansi( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, C(KC_HOME), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CAPS, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT_fullsize_ansi( - QK_BOOT, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/handwired/boss566y/redragon_vara/keymaps/via/keymap.c b/keyboards/handwired/boss566y/redragon_vara/keymaps/via/keymap.c index 291a4d5b33b..574a1956d59 100644 --- a/keyboards/handwired/boss566y/redragon_vara/keymaps/via/keymap.c +++ b/keyboards/handwired/boss566y/redragon_vara/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), MO(2), KC_RGUI, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [1] = LAYOUT_fullsize_ansi( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CAPS, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT_fullsize_ansi( - QK_BOOT, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/handwired/carpolly/keymaps/default/keymap.c b/keyboards/handwired/carpolly/keymaps/default/keymap.c index 7f08aeb5886..1a704a70b25 100644 --- a/keyboards/handwired/carpolly/keymaps/default/keymap.c +++ b/keyboards/handwired/carpolly/keymaps/default/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [2] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_INS, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RSFT, _______, _______, _______, _______, _______, _______, KC_DEL, KC_INS diff --git a/keyboards/handwired/co60/keymaps/default/keymap.c b/keyboards/handwired/co60/keymaps/default/keymap.c index a492137cb9e..a8acf685691 100644 --- a/keyboards/handwired/co60/keymaps/default/keymap.c +++ b/keyboards/handwired/co60/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_L2), KC_RCTL ), [_L2] = LAYOUT_60_ansi( /* Base */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_GRV, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_GRV, _______, BL_TOGG, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, KC_INSERT, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_HOME, KC_END, _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, diff --git a/keyboards/handwired/dactyl/keymaps/default/keymap.c b/keyboards/handwired/dactyl/keymaps/default/keymap.c index caaac726415..33a3d727d13 100644 --- a/keyboards/handwired/dactyl/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl/keymaps/default/keymap.c @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c index 8d980f7818a..ad962a1d1b8 100644 --- a/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c +++ b/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c index e218c65d426..942128d3f25 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_LOWER] = LAYOUT( - _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, QK_BOOT, KC_PLUS, + _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, QK_BOOT, KC_PLUS, _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE, _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS, _______, KC_PSCR, _______, KC_P0, @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_RAISE] = LAYOUT( - _______, QK_BOOT, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE, + _______, QK_BOOT, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE, _______, KC_LEFT, KC_UP , KC_DOWN, KC_RGHT, KC_LPRN, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______, _______, KC_EQL, _______, diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/keymap.c index 3e70e664af8..2ccce241faa 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/keymap.c +++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/keymap.c @@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_LOWER] = LAYOUT( - _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, QK_BOOT, KC_PLUS, + _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, QK_BOOT, KC_PLUS, _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE, _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS, _______, KC_PSCR, _______, KC_P0, @@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_RAISE] = LAYOUT( - _______, QK_BOOT, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE, + _______, QK_BOOT, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE, _______, KC_LEFT, KC_UP , KC_DOWN, KC_RGHT, KC_LPRN, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______, _______, KC_EQL, _______, diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/keymap.c index 0518e5dd5a4..af5bdfb9ad0 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_LOWER] = LAYOUT( - _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, QK_BOOT, KC_PLUS, + _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, QK_BOOT, KC_PLUS, _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE, _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS, _______, KC_PSCR, _______, KC_P0, @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_RAISE] = LAYOUT( - _______, QK_BOOT, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE, + _______, QK_BOOT, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE, _______, KC_LEFT, KC_UP , KC_DOWN, KC_RGHT, KC_LPRN, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______, _______, KC_EQL, _______, diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c index 013c9867386..4ad78cd5fb5 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, KC_TRNS, KC_TRNS, KC_PSCR, KC_DOWN, KC_UP, KC_HOME, KC_END, KC_LEFT, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), LCTL(KC_C), KC_TRNS, MO(1), KC_TRNS, LCTL(KC_V), KC_TRNS, KC_TRNS ) diff --git a/keyboards/handwired/ddg_56/keymaps/default/keymap.c b/keyboards/handwired/ddg_56/keymaps/default/keymap.c index 2a569ec49c2..42a7742ffbc 100644 --- a/keyboards/handwired/ddg_56/keymaps/default/keymap.c +++ b/keyboards/handwired/ddg_56/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT), [_LOWER] = LAYOUT( - QK_BOOT, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, diff --git a/keyboards/handwired/dmote/keymaps/default/keymap.c b/keyboards/handwired/dmote/keymaps/default/keymap.c index 59a5b51f1ba..a724236f203 100644 --- a/keyboards/handwired/dmote/keymaps/default/keymap.c +++ b/keyboards/handwired/dmote/keymaps/default/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_NUMERIC] = LAYOUT( - LAYER_C, KC_INS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, QK_BOOT, KC_WAKE, // * + LAYER_C, KC_INS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, QK_BOOT, KC_WAKE, // * KC_F12, KC_F1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_F10, KC_F11, _______, KC_1, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_APP, KC_0, PASTE, KC_GRV, KC_EXLM, KC_BTN1, KC_WH_U, KC_BTN2, KC_MS_L, KC_MS_U, KC_MS_R, KC_PSCR, RGB_TOG, diff --git a/keyboards/handwired/frenchdev/keymaps/default/keymap.c b/keyboards/handwired/frenchdev/keymaps/default/keymap.c index 60e355f290e..67c0072a080 100644 --- a/keyboards/handwired/frenchdev/keymaps/default/keymap.c +++ b/keyboards/handwired/frenchdev/keymaps/default/keymap.c @@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * */ [_MEDIA] = LAYOUT( - QK_BOOT, KC_SCRL, KC_PAUS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_VOLD, KC_VOLU, KC_PSCR, KC_CALC, KC_NUM, + QK_BOOT, KC_SCRL, KC_PAUS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_VOLD, KC_VOLU, KC_PSCR, KC_CALC, KC_NUM, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_MPRV, KC_MNXT, KC_MPLY, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, KC_TRNS, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_U, KC_TRNS, KC_BTN4, KC_BTN5, KC_BTN4, KC_BTN5, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_D, KC_BTN3, KC_BTN2, KC_BTN1, KC_BTN1, KC_BTN2, KC_KP_4, KC_KP_5, KC_KP_6, KC_PAST, KC_TRNS, diff --git a/keyboards/handwired/hnah108/keymaps/default/keymap.c b/keyboards/handwired/hnah108/keymaps/default/keymap.c index 53315f8169d..d2f86a7de9c 100644 --- a/keyboards/handwired/hnah108/keymaps/default/keymap.c +++ b/keyboards/handwired/hnah108/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_all( - QK_BOOT, BL_STEP, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, BL_STEP, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/handwired/hnah40rgb/keymaps/ansi/keymap.c b/keyboards/handwired/hnah40rgb/keymaps/ansi/keymap.c index f94642c3fb5..9732c74cfc4 100644 --- a/keyboards/handwired/hnah40rgb/keymaps/ansi/keymap.c +++ b/keyboards/handwired/hnah40rgb/keymaps/ansi/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, L1, KC_RCTL ), [_L1] = LAYOUT_ansi(/* Base */ - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/handwired/hnah40rgb/keymaps/default/keymap.c b/keyboards/handwired/hnah40rgb/keymaps/default/keymap.c index 6fa2916b384..7af40caae72 100644 --- a/keyboards/handwired/hnah40rgb/keymaps/default/keymap.c +++ b/keyboards/handwired/hnah40rgb/keymaps/default/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_SPACE, KC_RALT, L1, KC_RCTL ), [_L1] = LAYOUT_all(/* Base */ - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/handwired/ibm_wheelwriter/keymaps/default/keymap.c b/keyboards/handwired/ibm_wheelwriter/keymaps/default/keymap.c index faad04468e5..a96d9580de7 100644 --- a/keyboards/handwired/ibm_wheelwriter/keymaps/default/keymap.c +++ b/keyboards/handwired/ibm_wheelwriter/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LGUI, KC_SPC, KC_SPC, KC_RALT, KC_RCTL ), [1] = LAYOUT( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/handwired/ibm_wheelwriter/keymaps/via/keymap.c b/keyboards/handwired/ibm_wheelwriter/keymaps/via/keymap.c index 85db40c0d58..28ca84bf88a 100644 --- a/keyboards/handwired/ibm_wheelwriter/keymaps/via/keymap.c +++ b/keyboards/handwired/ibm_wheelwriter/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LGUI, KC_SPC, KC_SPC, KC_RALT, KC_RCTL ), [1] = LAYOUT( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/handwired/jn68m/keymaps/default/keymap.c b/keyboards/handwired/jn68m/keymaps/default/keymap.c index 295aa63365b..9665a74026a 100644 --- a/keyboards/handwired/jn68m/keymaps/default/keymap.c +++ b/keyboards/handwired/jn68m/keymaps/default/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_APP, KC_TRNS, KC_TRNS, KC_TRNS + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_APP, KC_TRNS, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/handwired/jot50/keymaps/default/keymap.c b/keyboards/handwired/jot50/keymaps/default/keymap.c index c1981aa4a26..763118532cd 100644 --- a/keyboards/handwired/jot50/keymaps/default/keymap.c +++ b/keyboards/handwired/jot50/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_ortho_5x12 ( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/handwired/jotanck/keymaps/default/keymap.c b/keyboards/handwired/jotanck/keymaps/default/keymap.c index 6c94b667e21..6c3e757cecd 100644 --- a/keyboards/handwired/jotanck/keymaps/default/keymap.c +++ b/keyboards/handwired/jotanck/keymaps/default/keymap.c @@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT_ortho_4x12 ( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/handwired/macroboard/keymaps/default/keymap.c b/keyboards/handwired/macroboard/keymaps/default/keymap.c index ef09904fc18..02f544d038d 100644 --- a/keyboards/handwired/macroboard/keymaps/default/keymap.c +++ b/keyboards/handwired/macroboard/keymaps/default/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, - KC_LCTL, KC_LGUI, RGB_TOG, KC_LALT, QK_BOOT, KC_SPC + KC_LCTL, KC_LGUI, RGB_TOG, KC_LALT, QK_BOOT, KC_SPC ) }; diff --git a/keyboards/handwired/macroboard/keymaps/via/keymap.c b/keyboards/handwired/macroboard/keymaps/via/keymap.c index 63d2768e275..1afcda31bc3 100644 --- a/keyboards/handwired/macroboard/keymaps/via/keymap.c +++ b/keyboards/handwired/macroboard/keymaps/via/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, - KC_LCTL, KC_LGUI, RGB_TOG, RGB_MODE_FORWARD, QK_BOOT, KC_SPC + KC_LCTL, KC_LGUI, RGB_TOG, RGB_MODE_FORWARD, QK_BOOT, KC_SPC ), [1] = LAYOUT_ortho_5x6( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c b/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c index afd1eb399eb..ccc445be42b 100644 --- a/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c +++ b/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c @@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------' */ [ONE] = LAYOUT( - QK_BOOT, KC_CAD, + QK_BOOT, KC_CAD, TO(BASE), TO(TWO), MAKE1, MAKE2, DIR, MAIL1, MAIL2, OBUWUN, SELWP, KC_AF4, SELWN, diff --git a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c index 0cf3573a072..6be520c2c72 100644 --- a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c +++ b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c @@ -153,7 +153,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 , _______, - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , _______, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , _______, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c index d3fd18ec4ed..3c0720e1b09 100644 --- a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c +++ b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c @@ -198,7 +198,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL, + XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, _______,_______,_______, _______, _______ diff --git a/keyboards/handwired/p65rgb/keymaps/default/keymap.c b/keyboards/handwired/p65rgb/keymaps/default/keymap.c index 1467ff53367..235a9191301 100644 --- a/keyboards/handwired/p65rgb/keymaps/default/keymap.c +++ b/keyboards/handwired/p65rgb/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_APP, KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT( /* FN */ QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_INS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_HOME, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_HOME, CTL_T(KC_CAPS),RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_END, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), diff --git a/keyboards/handwired/pilcrow/keymaps/default/keymap.c b/keyboards/handwired/pilcrow/keymaps/default/keymap.c index d4a8657938a..34b75c417a7 100644 --- a/keyboards/handwired/pilcrow/keymaps/default/keymap.c +++ b/keyboards/handwired/pilcrow/keymaps/default/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [3] = LAYOUT( - QK_BOOT, KC_UP, _______, _______, _______, _______, _______, KC_WH_D, KC_MS_U, KC_WH_U, + QK_BOOT, KC_UP, _______, _______, _______, _______, _______, KC_WH_D, KC_MS_U, KC_WH_U, KC_LEFT, KC_DOWN, KC_RGHT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, KC_MS_L, KC_MS_D, KC_MS_R, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______ diff --git a/keyboards/handwired/polly40/keymaps/default/keymap.c b/keyboards/handwired/polly40/keymaps/default/keymap.c index b1ef23bc289..ae738dfe91d 100644 --- a/keyboards/handwired/polly40/keymaps/default/keymap.c +++ b/keyboards/handwired/polly40/keymaps/default/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, _______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_SLSH, KC_RSFT, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/handwired/polly40/keymaps/via/keymap.c b/keyboards/handwired/polly40/keymaps/via/keymap.c index a7139d5d753..56c0d083790 100644 --- a/keyboards/handwired/polly40/keymaps/via/keymap.c +++ b/keyboards/handwired/polly40/keymaps/via/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, _______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_SLSH, KC_RSFT, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/handwired/prkl30/keymaps/default/keymap.c b/keyboards/handwired/prkl30/keymaps/default/keymap.c index 6a72afebf9a..074f53ec1d5 100644 --- a/keyboards/handwired/prkl30/keymaps/default/keymap.c +++ b/keyboards/handwired/prkl30/keymaps/default/keymap.c @@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `------+------+------+------+------+------+------+------+------+------+------+------' */ [_FN] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_M_P, RGB_HUD, RGB_HUI, KC_VOLD, KC_MPRV, KC_MNXT, KC_VOLU, _______, _______, _______, PRKL, _______, RGB_MOD, RGB_VAD, RGB_VAI, RGB_TOG, _______, KC_MPLY, _______, _______, _______, _______, LCA(KC_DEL), _______ ), diff --git a/keyboards/handwired/pterodactyl/keymaps/default/keymap.c b/keyboards/handwired/pterodactyl/keymaps/default/keymap.c index fece9116316..fd8fc812888 100644 --- a/keyboards/handwired/pterodactyl/keymaps/default/keymap.c +++ b/keyboards/handwired/pterodactyl/keymaps/default/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, KC_TRNS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/handwired/pteron38/keymaps/default/keymap.c b/keyboards/handwired/pteron38/keymaps/default/keymap.c index 5f149add6d0..79743242735 100644 --- a/keyboards/handwired/pteron38/keymaps/default/keymap.c +++ b/keyboards/handwired/pteron38/keymaps/default/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_split_3x5_4( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, - _______,_______,_______,KC_F11, KC_F12, KC_INS, _______,QK_BOOT, _______,_______, + _______,_______,_______,KC_F11, KC_F12, KC_INS, _______,QK_BOOT,_______,_______, _______,_______,_______,_______, _______,_______,KC_RCTL,KC_RALT ) }; diff --git a/keyboards/handwired/pteron44/keymaps/default/keymap.c b/keyboards/handwired/pteron44/keymaps/default/keymap.c index 41d18c4a7d2..2116e01c1db 100644 --- a/keyboards/handwired/pteron44/keymaps/default/keymap.c +++ b/keyboards/handwired/pteron44/keymaps/default/keymap.c @@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, DB_TOGG, QK_BOOT, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, DB_TOGG, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/handwired/reclined/keymaps/default/keymap.c b/keyboards/handwired/reclined/keymaps/default/keymap.c index b3b411d60b1..2f3fb1160f5 100644 --- a/keyboards/handwired/reclined/keymaps/default/keymap.c +++ b/keyboards/handwired/reclined/keymaps/default/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , - KC_LCTL, KC_LGUI, KC_LALT, QK_BOOT, KC_TAB, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + KC_LCTL, KC_LGUI, KC_LALT, QK_BOOT, KC_TAB, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), }; diff --git a/keyboards/handwired/sono1/keymaps/default/keymap.c b/keyboards/handwired/sono1/keymaps/default/keymap.c index c0524b0d966..a3bf8b71066 100644 --- a/keyboards/handwired/sono1/keymaps/default/keymap.c +++ b/keyboards/handwired/sono1/keymaps/default/keymap.c @@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { `-------------' */ [_FN] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_LSCR, KC_PAUS, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_LSCR, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, KC_HOME, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, KC_END, KC_PGDN, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/handwired/space_oddity/keymaps/default/keymap.c b/keyboards/handwired/space_oddity/keymaps/default/keymap.c index 5b614823445..c278953f464 100644 --- a/keyboards/handwired/space_oddity/keymaps/default/keymap.c +++ b/keyboards/handwired/space_oddity/keymaps/default/keymap.c @@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_BTN1, KC_BTN3, KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG(2) ) }; diff --git a/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c index d2b9a6eb5ab..4921420b56f 100644 --- a/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c +++ b/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), [2] = LAYOUT_65_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c index e95b64988db..b32d41a540e 100644 --- a/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c +++ b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), [2] = LAYOUT_65_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/handwired/swiftrax/digicarpice/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/digicarpice/keymaps/default/keymap.c index 1365d7b4a36..773889b68f2 100644 --- a/keyboards/handwired/swiftrax/digicarpice/keymaps/default/keymap.c +++ b/keyboards/handwired/swiftrax/digicarpice/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_split_bs( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, diff --git a/keyboards/handwired/swiftrax/digicarpice/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/digicarpice/keymaps/via/keymap.c index 4ee34ebfe33..b63c597d7cb 100644 --- a/keyboards/handwired/swiftrax/digicarpice/keymaps/via/keymap.c +++ b/keyboards/handwired/swiftrax/digicarpice/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_split_bs( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, diff --git a/keyboards/handwired/swiftrax/equator/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/equator/keymaps/default/keymap.c index 2752ee625a3..6b2a2671af3 100644 --- a/keyboards/handwired/swiftrax/equator/keymaps/default/keymap.c +++ b/keyboards/handwired/swiftrax/equator/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_RGUI, KC_RCTL ), [1] = LAYOUT_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, diff --git a/keyboards/handwired/swiftrax/equator/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/equator/keymaps/via/keymap.c index a500ddb3d26..01a2ed7fba3 100644 --- a/keyboards/handwired/swiftrax/equator/keymaps/via/keymap.c +++ b/keyboards/handwired/swiftrax/equator/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_RGUI, KC_RCTL ), [1] = LAYOUT_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, diff --git a/keyboards/handwired/swiftrax/walter/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/walter/keymaps/default/keymap.c index 9c0475ac564..ac694c5fb6f 100644 --- a/keyboards/handwired/swiftrax/walter/keymaps/default/keymap.c +++ b/keyboards/handwired/swiftrax/walter/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), [2] = LAYOUT_65_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/handwired/swiftrax/walter/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/walter/keymaps/via/keymap.c index 240bf085d2a..ec8cd7654be 100644 --- a/keyboards/handwired/swiftrax/walter/keymaps/via/keymap.c +++ b/keyboards/handwired/swiftrax/walter/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), [2] = LAYOUT_65_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/default/keymap.c b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/default/keymap.c index 4e943bb40c2..f458c53327e 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/default/keymap.c +++ b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/default/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_LOWER] = LAYOUT_4x6_right( - _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, QK_BOOT, KC_PLUS, + _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, QK_BOOT,KC_PLUS, _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS,KC_PIPE, _______,_______,_______,_______,_______,_______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS, _______,KC_PSCR, _______, KC_P0, @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_RAISE] = LAYOUT_4x6_right( - _______,QK_BOOT, _______,_______,_______,KC_LBRC, KC_RBRC,_______,KC_NUM,KC_INS, KC_SCRL,KC_MUTE, + _______,QK_BOOT,_______,_______,_______,KC_LBRC, KC_RBRC,_______,KC_NUM,KC_INS, KC_SCRL,KC_MUTE, _______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, _______,_______, KC_EQL ,_______, diff --git a/keyboards/handwired/tritium_numpad/keymaps/default/keymap.c b/keyboards/handwired/tritium_numpad/keymaps/default/keymap.c index afe5a930a35..7fb58029e63 100644 --- a/keyboards/handwired/tritium_numpad/keymaps/default/keymap.c +++ b/keyboards/handwired/tritium_numpad/keymaps/default/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_TAB, KC_BSPC, KC_PEQL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_P7, KC_P8, KC_P9, - KC_P4, KC_P5, KC_P6, QK_BOOT, + KC_P4, KC_P5, KC_P6, QK_BOOT, KC_P1, KC_P2, KC_P3, KC_P0, LT(_FL,KC_PDOT), KC_PENT ), diff --git a/keyboards/handwired/videowriter/keymaps/default/keymap.c b/keyboards/handwired/videowriter/keymaps/default/keymap.c index 4e8c161c808..7bdf45e7aba 100644 --- a/keyboards/handwired/videowriter/keymaps/default/keymap.c +++ b/keyboards/handwired/videowriter/keymaps/default/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `------------------------------------------------------------------' */ [_FN1] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, _______, KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, diff --git a/keyboards/handwired/videowriter/keymaps/oleg/keymap.c b/keyboards/handwired/videowriter/keymaps/oleg/keymap.c index 94e3fbcfe1f..db6b843e6ad 100644 --- a/keyboards/handwired/videowriter/keymaps/oleg/keymap.c +++ b/keyboards/handwired/videowriter/keymaps/oleg/keymap.c @@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FN1] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_PAUS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_PAUS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U ,_______, _______, _______, KC_UP, _______, _______, _______, _______, KC_RCTL, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, diff --git a/keyboards/handwired/wulkan/keymaps/default/keymap.c b/keyboards/handwired/wulkan/keymaps/default/keymap.c index 3a333198a44..e38c0322c96 100644 --- a/keyboards/handwired/wulkan/keymaps/default/keymap.c +++ b/keyboards/handwired/wulkan/keymaps/default/keymap.c @@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, KC_WH_U, _______, _______, KC_MS_U, _______, _______, UP(SE_ARNG_LOW, SE_ARNG_HIGH), KC_DEL, + _______, QK_BOOT, _______, _______, KC_WH_U, _______, _______, KC_MS_U, _______, _______, UP(SE_ARNG_LOW, SE_ARNG_HIGH), KC_DEL, _______, _______, _______, _______, KC_WH_D, _______, KC_MS_L, KC_MS_D, KC_MS_R, UP(SE_ODIA_LOW, SE_ODIA_HIGH), UP(SE_ADIA_LOW, SE_ADIA_HIGH), _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, KC_BTN1, _______, KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/hardlineworks/otd_plus/keymaps/default/keymap.c b/keyboards/hardlineworks/otd_plus/keymaps/default/keymap.c index f1a4b2eaea7..7827f00197c 100644 --- a/keyboards/hardlineworks/otd_plus/keymaps/default/keymap.c +++ b/keyboards/hardlineworks/otd_plus/keymaps/default/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_tkl_ansi_wkl( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/heliar/wm1_hotswap/keymaps/default/keymap.c b/keyboards/heliar/wm1_hotswap/keymaps/default/keymap.c index d7ca30798b9..469f3dac422 100644 --- a/keyboards/heliar/wm1_hotswap/keymaps/default/keymap.c +++ b/keyboards/heliar/wm1_hotswap/keymaps/default/keymap.c @@ -16,7 +16,7 @@ KC_LCTL, KC_LALT,KC_LGUI,KC_SPC, LT(_FN,KC_SPC), KC_RA [_FN] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, -QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), diff --git a/keyboards/helix/pico/keymaps/default/keymap.c b/keyboards/helix/pico/keymaps/default/keymap.c index 6684890f72b..c947c3d931c 100644 --- a/keyboards/helix/pico/keymaps/default/keymap.c +++ b/keyboards/helix/pico/keymaps/default/keymap.c @@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-------------------------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT( - _______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, AU_ON, AU_OFF, MU_TOGG, MU_NEXT, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, CK_TOGG, CK_RST, CK_UP, CK_DOWN, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD diff --git a/keyboards/helix/rev2/keymaps/default/keymap.c b/keyboards/helix/rev2/keymaps/default/keymap.c index 15bf4e86af6..0074153ccf1 100644 --- a/keyboards/helix/rev2/keymaps/default/keymap.c +++ b/keyboards/helix/rev2/keymaps/default/keymap.c @@ -171,7 +171,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD diff --git a/keyboards/helix/rev3_4rows/keymaps/via/keymap.c b/keyboards/helix/rev3_4rows/keymaps/via/keymap.c index 45729991e93..8db27d1f49c 100644 --- a/keyboards/helix/rev3_4rows/keymaps/via/keymap.c +++ b/keyboards/helix/rev3_4rows/keymaps/via/keymap.c @@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD ) diff --git a/keyboards/helix/rev3_5rows/keymaps/via/keymap.c b/keyboards/helix/rev3_5rows/keymaps/via/keymap.c index d832393ccc8..eb080a9cfdf 100644 --- a/keyboards/helix/rev3_5rows/keymaps/via/keymap.c +++ b/keyboards/helix/rev3_5rows/keymaps/via/keymap.c @@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD diff --git a/keyboards/hhkb_lite_2/keymaps/default/keymap.c b/keyboards/hhkb_lite_2/keymaps/default/keymap.c index 3ac980333b9..477529a1d95 100644 --- a/keyboards/hhkb_lite_2/keymaps/default/keymap.c +++ b/keyboards/hhkb_lite_2/keymaps/default/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_DOWN, KC_RGHT ), LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, diff --git a/keyboards/hhkb_lite_2/keymaps/via/keymap.c b/keyboards/hhkb_lite_2/keymaps/via/keymap.c index 80822d3dfd9..4cec6c109ee 100644 --- a/keyboards/hhkb_lite_2/keymaps/via/keymap.c +++ b/keyboards/hhkb_lite_2/keymaps/via/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_DOWN, KC_RGHT ), LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, diff --git a/keyboards/hidtech/bastyl/keymaps/default/keymap.c b/keyboards/hidtech/bastyl/keymaps/default/keymap.c index 056287263d7..5eb8aa0b0b0 100644 --- a/keyboards/hidtech/bastyl/keymaps/default/keymap.c +++ b/keyboards/hidtech/bastyl/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, //---------------------------------------------------------//-----------------------------------------------------------// - QK_BOOT, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, _______, KC_PLUS, + QK_BOOT, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, _______, KC_PLUS, //---------------------------------------------------------//-----------------------------------------------------------// _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END, KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE, //---------------------------------------------------------//-----------------------------------------------------------// diff --git a/keyboards/hineybush/h101/keymaps/default/keymap.c b/keyboards/hineybush/h101/keymaps/default/keymap.c index bc035200364..30ee6b48ed3 100644 --- a/keyboards/hineybush/h101/keymaps/default/keymap.c +++ b/keyboards/hineybush/h101/keymaps/default/keymap.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_f13_tsangan( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/hineybush/h101/keymaps/via/keymap.c b/keyboards/hineybush/h101/keymaps/via/keymap.c index 020042b13a6..2121c0d27e4 100644 --- a/keyboards/hineybush/h101/keymaps/via/keymap.c +++ b/keyboards/hineybush/h101/keymaps/via/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/hineybush/h60/keymaps/default/keymap.c b/keyboards/hineybush/h60/keymaps/default/keymap.c index d7cd9b6d169..3003d69b227 100644 --- a/keyboards/hineybush/h60/keymaps/default/keymap.c +++ b/keyboards/hineybush/h60/keymaps/default/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_60_ansi( KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/hineybush/h65/keymaps/default/keymap.c b/keyboards/hineybush/h65/keymaps/default/keymap.c index 1d6d0410530..6a69d4b5e78 100644 --- a/keyboards/hineybush/h65/keymaps/default/keymap.c +++ b/keyboards/hineybush/h65/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_all( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/hineybush/h65/keymaps/via/keymap.c b/keyboards/hineybush/h65/keymaps/via/keymap.c index a2f7d371eb8..2de5167a112 100644 --- a/keyboards/hineybush/h65/keymaps/via/keymap.c +++ b/keyboards/hineybush/h65/keymaps/via/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_all( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c b/keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c index 1d6d0410530..6a69d4b5e78 100644 --- a/keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c +++ b/keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_all( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c b/keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c index a2f7d371eb8..2de5167a112 100644 --- a/keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c +++ b/keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_all( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/hineybush/h660s/keymaps/default/keymap.c b/keyboards/hineybush/h660s/keymaps/default/keymap.c index 257184cf121..17826ae6abb 100644 --- a/keyboards/hineybush/h660s/keymaps/default/keymap.c +++ b/keyboards/hineybush/h660s/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [_FN] = LAYOUT_66_ansi_rwkl( KC_TRNS, RGB_TOG, RGB_MOD, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/hineybush/h660s/keymaps/via/keymap.c b/keyboards/hineybush/h660s/keymaps/via/keymap.c index 5cb4f6a9b7e..536d5dfdeca 100644 --- a/keyboards/hineybush/h660s/keymaps/via/keymap.c +++ b/keyboards/hineybush/h660s/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [_FN] = LAYOUT_all( KC_TRNS, RGB_TOG, RGB_MOD, BL_TOGG, BL_DOWN,BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/hineybush/h75_singa/keymaps/default/keymap.c b/keyboards/hineybush/h75_singa/keymaps/default/keymap.c index 75726c5cdb3..e40c2694b5d 100644 --- a/keyboards/hineybush/h75_singa/keymaps/default/keymap.c +++ b/keyboards/hineybush/h75_singa/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_TOG, - KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_MOD, + KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_MOD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS diff --git a/keyboards/hineybush/h75_singa/keymaps/via/keymap.c b/keyboards/hineybush/h75_singa/keymaps/via/keymap.c index 71a96396de5..64bad7c4d2c 100644 --- a/keyboards/hineybush/h75_singa/keymaps/via/keymap.c +++ b/keyboards/hineybush/h75_singa/keymaps/via/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_TOG, - KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_MOD, + KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_MOD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS diff --git a/keyboards/hineybush/h87a/keymaps/default/keymap.c b/keyboards/hineybush/h87a/keymaps/default/keymap.c index fc33945cea2..5e06f04d53d 100644 --- a/keyboards/hineybush/h87a/keymaps/default/keymap.c +++ b/keyboards/hineybush/h87a/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/hineybush/h87a/keymaps/via/keymap.c b/keyboards/hineybush/h87a/keymaps/via/keymap.c index fc9e9275991..69db9c89079 100644 --- a/keyboards/hineybush/h87a/keymaps/via/keymap.c +++ b/keyboards/hineybush/h87a/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/hineybush/h87a/keymaps/wkl/keymap.c b/keyboards/hineybush/h87a/keymaps/wkl/keymap.c index 80f0d86c24c..f83b8a5f226 100644 --- a/keyboards/hineybush/h87a/keymaps/wkl/keymap.c +++ b/keyboards/hineybush/h87a/keymaps/wkl/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi_wkl( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/hineybush/h88/keymaps/default/keymap.c b/keyboards/hineybush/h88/keymaps/default/keymap.c index 129c8705717..9437f7c8318 100644 --- a/keyboards/hineybush/h88/keymaps/default/keymap.c +++ b/keyboards/hineybush/h88/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/hineybush/h88/keymaps/via/keymap.c b/keyboards/hineybush/h88/keymaps/via/keymap.c index 43660f94b3c..2d92d110aeb 100644 --- a/keyboards/hineybush/h88/keymaps/via/keymap.c +++ b/keyboards/hineybush/h88/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/hineybush/h88/keymaps/wkl/keymap.c b/keyboards/hineybush/h88/keymaps/wkl/keymap.c index f2f59a87571..2a40a244ac8 100644 --- a/keyboards/hineybush/h88/keymaps/wkl/keymap.c +++ b/keyboards/hineybush/h88/keymaps/wkl/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi_wkl( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/hineybush/physix/keymaps/via/keymap.c b/keyboards/hineybush/physix/keymaps/via/keymap.c index 0a4a3c75793..d448be684fb 100644 --- a/keyboards/hineybush/physix/keymaps/via/keymap.c +++ b/keyboards/hineybush/physix/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_split_bksp_275_rspace( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_INS, - KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, + KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, BL_BRTG, BL_TOGG, BL_UP, BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/hineybush/sm68/keymaps/default/keymap.c b/keyboards/hineybush/sm68/keymaps/default/keymap.c index ea484bbc498..4e552cd5826 100644 --- a/keyboards/hineybush/sm68/keymaps/default/keymap.c +++ b/keyboards/hineybush/sm68/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_68_ansi_split_rshift( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RGB_TOG, RGB_MOD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/hineybush/sm68/keymaps/via/keymap.c b/keyboards/hineybush/sm68/keymaps/via/keymap.c index b893308af77..429e12b5ec5 100644 --- a/keyboards/hineybush/sm68/keymaps/via/keymap.c +++ b/keyboards/hineybush/sm68/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_68_ansi_split_rshift( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RGB_TOG, RGB_MOD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/hnahkb/freyr/keymaps/default/keymap.c b/keyboards/hnahkb/freyr/keymaps/default/keymap.c index b0163db413b..37faf7e62b3 100644 --- a/keyboards/hnahkb/freyr/keymaps/default/keymap.c +++ b/keyboards/hnahkb/freyr/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_APP, LOWER, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_LOWER] = LAYOUT_tkl_iso( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/hnahkb/stella/keymaps/default/keymap.c b/keyboards/hnahkb/stella/keymaps/default/keymap.c index 31b878f282f..ebfaeea152f 100644 --- a/keyboards/hnahkb/stella/keymaps/default/keymap.c +++ b/keyboards/hnahkb/stella/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_APP, LOWER, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_LOWER] = LAYOUT_tkl_iso( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/horrortroll/paws60/keymaps/default/keymap.c b/keyboards/horrortroll/paws60/keymaps/default/keymap.c index 1343528b48f..54868e05eef 100644 --- a/keyboards/horrortroll/paws60/keymaps/default/keymap.c +++ b/keyboards/horrortroll/paws60/keymaps/default/keymap.c @@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 */ [_FN] = LAYOUT_60_ansi_split_bs_rshift( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, - QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, _______, + QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/horrortroll/paws60/keymaps/via/keymap.c b/keyboards/horrortroll/paws60/keymaps/via/keymap.c index 1343528b48f..54868e05eef 100644 --- a/keyboards/horrortroll/paws60/keymaps/via/keymap.c +++ b/keyboards/horrortroll/paws60/keymaps/via/keymap.c @@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 */ [_FN] = LAYOUT_60_ansi_split_bs_rshift( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, - QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, _______, + QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/hp69/keymaps/default/keymap.c b/keyboards/hp69/keymaps/default/keymap.c index b0fe42d1e8b..88a4e608d28 100644 --- a/keyboards/hp69/keymaps/default/keymap.c +++ b/keyboards/hp69/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MODE_FORWARD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MODE_RGBTEST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/hp69/keymaps/via/keymap.c b/keyboards/hp69/keymaps/via/keymap.c index 69b52090729..fac033bdabf 100644 --- a/keyboards/hp69/keymaps/via/keymap.c +++ b/keyboards/hp69/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, RGB_TOG, RGB_MODE_FORWARD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MODE_RGBTEST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/hs60/v2/ansi/keymaps/default/keymap.c b/keyboards/hs60/v2/ansi/keymaps/default/keymap.c index 27cb8d8bf6a..cdf4c9094ed 100644 --- a/keyboards/hs60/v2/ansi/keymaps/default/keymap.c +++ b/keyboards/hs60/v2/ansi/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_ansi( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL , - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/hs60/v2/ansi/keymaps/via/keymap.c b/keyboards/hs60/v2/ansi/keymaps/via/keymap.c index 27cb8d8bf6a..cdf4c9094ed 100644 --- a/keyboards/hs60/v2/ansi/keymaps/via/keymap.c +++ b/keyboards/hs60/v2/ansi/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_ansi( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL , - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/hs60/v2/hhkb/keymaps/default/keymap.c b/keyboards/hs60/v2/hhkb/keymaps/default/keymap.c index 767920882cf..4d3d7b8ac84 100644 --- a/keyboards/hs60/v2/hhkb/keymaps/default/keymap.c +++ b/keyboards/hs60/v2/hhkb/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ), [1] = LAYOUT_60_hhkb( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_UP, KC_TRNS, KC_DEL, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, diff --git a/keyboards/hs60/v2/hhkb/keymaps/via/keymap.c b/keyboards/hs60/v2/hhkb/keymaps/via/keymap.c index 767920882cf..4d3d7b8ac84 100644 --- a/keyboards/hs60/v2/hhkb/keymaps/via/keymap.c +++ b/keyboards/hs60/v2/hhkb/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ), [1] = LAYOUT_60_hhkb( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_UP, KC_TRNS, KC_DEL, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, diff --git a/keyboards/hs60/v2/iso/keymaps/iso_andys8/keymap.c b/keyboards/hs60/v2/iso/keymaps/iso_andys8/keymap.c index 193f965aef1..3b3ac052e55 100644 --- a/keyboards/hs60/v2/iso/keymaps/iso_andys8/keymap.c +++ b/keyboards/hs60/v2/iso/keymaps/iso_andys8/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_iso( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL , - KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_PSCR, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_END, KC_DEL, KC_NO, KC_NO, KC_LSFT, KC_NO, KC_APP, KC_PAUS, KC_INS, KC_NO, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), diff --git a/keyboards/ibm/model_m_122/m122_3270/keymaps/default/keymap.c b/keyboards/ibm/model_m_122/m122_3270/keymaps/default/keymap.c index 4ade8fe6ee5..d4aad6a9ee6 100644 --- a/keyboards/ibm/model_m_122/m122_3270/keymaps/default/keymap.c +++ b/keyboards/ibm/model_m_122/m122_3270/keymaps/default/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, EE_CLR, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, EE_CLR, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ibnuda/alicia_cook/keymaps/default/keymap.c b/keyboards/ibnuda/alicia_cook/keymaps/default/keymap.c index 88adf9c8b27..7e0936f908a 100644 --- a/keyboards/ibnuda/alicia_cook/keymaps/default/keymap.c +++ b/keyboards/ibnuda/alicia_cook/keymaps/default/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_all( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_LCTL,KC_EXLM,KC_AT, KC_HASH,KC_DLR, KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN, KC_SCLN, - KC_LSFT,KC_Z, KC_X, KC_C, KC_V, QK_BOOT, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(1), + KC_LSFT,KC_Z, KC_X, KC_C, KC_V, QK_BOOT, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(1), KC_LGUI,KC_LALT, KC_LGUI,LW_BSPC,SFT_ESC, ALT_ENT,RS_SPC, KC_LALT, KC_RGUI,KC_RCTL ), }; diff --git a/keyboards/ibnuda/gurindam/keymaps/default/keymap.c b/keyboards/ibnuda/gurindam/keymaps/default/keymap.c index 89cc729a61b..d4110d20436 100644 --- a/keyboards/ibnuda/gurindam/keymaps/default/keymap.c +++ b/keyboards/ibnuda/gurindam/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, QK_BOOT, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,RGB_M_SN,_______, _______, _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ibnuda/gurindam/keymaps/via/keymap.c b/keyboards/ibnuda/gurindam/keymaps/via/keymap.c index 9e50d247205..d19f4ad3b4e 100644 --- a/keyboards/ibnuda/gurindam/keymaps/via/keymap.c +++ b/keyboards/ibnuda/gurindam/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ibnuda/squiggle/keymaps/default/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c index 47269b07ffc..1678ff89b9d 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c @@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( _______,EXPLR, KC_UP, PRVTAB, PRVWIN, NXTWIN, NXTTAB, _______,_______,LCKGUI, TSKMGR, KC_LEFT,KC_DOWN,KC_RGHT,UPTAB, DNTAB, KC_ENT, KC_LGUI,_______,CALDL, - _______,CLSGUI, _______,CONPST, QK_BOOT, _______,_______,_______,_______,_______, + _______,CLSGUI, _______,CONPST, QK_BOOT, _______,_______,_______,_______,_______, _______,_______, _______,_______ ), }; diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c index 8e4685757c9..d6950d0035d 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c @@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_thumbrow( _______,EXPLR, KC_UP, PRVTAB, PRVWIN, NXTWIN, NXTTAB, _______,_______,LCKGUI, TSKMGR, KC_LEFT,KC_DOWN,KC_RGHT,UPTAB, DNTAB, KC_ENT, KC_LGUI,_______,CALDL, - _______,CLSGUI, _______,CONPST, QK_BOOT, _______,_______,_______,_______,_______, + _______,CLSGUI, _______,CONPST, QK_BOOT, _______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______ ), }; diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c index 0d56ef08a8a..804d013c06a 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c @@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_full( _______,EXPLR, KC_UP, PRVTAB, PRVWIN, NXTWIN, NXTTAB, _______,_______,LCKGUI, TSKMGR, KC_LEFT,KC_DOWN,KC_RGHT,UPTAB, DNTAB, KC_ENT, KC_LGUI,_______,CALDL, - _______,CLSGUI, _______,CONPST, QK_BOOT, _______,_______,_______,_______,_______, + _______,CLSGUI, _______,CONPST, QK_BOOT, _______,_______,_______,_______,_______, _______,_______,_______,_______,_______, _______,_______,_______,_______,_______ ), }; diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c index 171f1a373e8..01038f8e721 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c @@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_split_3x5_3( _______,EXPLR, KC_UP, PRVTAB, PRVWIN, NXTWIN, NXTTAB, _______,_______,LCKGUI, TSKMGR, KC_LEFT,KC_DOWN,KC_RGHT,UPTAB, DNTAB, KC_ENT, KC_LGUI,_______,CALDL, - _______,CLSGUI, _______,CONPST, QK_BOOT, _______,_______,_______,_______,_______, + _______,CLSGUI, _______,CONPST, QK_BOOT, _______,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______ ), }; diff --git a/keyboards/idb/idb_60/keymaps/default/keymap.c b/keyboards/idb/idb_60/keymaps/default/keymap.c index 1519608659f..fef00f73e92 100644 --- a/keyboards/idb/idb_60/keymaps/default/keymap.c +++ b/keyboards/idb/idb_60/keymaps/default/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL ), [1] = LAYOUT_60_ansi_wkl_split_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/idb/idb_60/keymaps/via/keymap.c b/keyboards/idb/idb_60/keymaps/via/keymap.c index 1519608659f..fef00f73e92 100644 --- a/keyboards/idb/idb_60/keymaps/via/keymap.c +++ b/keyboards/idb/idb_60/keymaps/via/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL ), [1] = LAYOUT_60_ansi_wkl_split_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/idobao/id75/keymaps/default75/keymap.c b/keyboards/idobao/id75/keymaps/default75/keymap.c index d87e7e49e27..69865b0c0a0 100644 --- a/keyboards/idobao/id75/keymaps/default75/keymap.c +++ b/keyboards/idobao/id75/keymaps/default75/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NUM, KC_SLSH, KC_ASTR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7, KC_P8, KC_P9, KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, - KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, + KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_APP, RGB_VAD, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0, _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______ ), diff --git a/keyboards/idobao/id87/v1/keymaps/default/keymap.c b/keyboards/idobao/id87/v1/keymaps/default/keymap.c index b10de73848e..e614402094b 100644 --- a/keyboards/idobao/id87/v1/keymaps/default/keymap.c +++ b/keyboards/idobao/id87/v1/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_tkl_ansi( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______, _______, BL_TOGG, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/idobao/id87/v1/keymaps/via/keymap.c b/keyboards/idobao/id87/v1/keymaps/via/keymap.c index 759a02813c2..f6d7afcfe82 100644 --- a/keyboards/idobao/id87/v1/keymaps/via/keymap.c +++ b/keyboards/idobao/id87/v1/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_tkl_ansi( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______, _______, BL_TOGG, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/idobao/id96/keymaps/default/keymap.c b/keyboards/idobao/id96/keymaps/default/keymap.c index 90fdc03d161..e672a2ca893 100644 --- a/keyboards/idobao/id96/keymaps/default/keymap.c +++ b/keyboards/idobao/id96/keymaps/default/keymap.c @@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [LAYER_1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/idobao/id96/keymaps/via/keymap.c b/keyboards/idobao/id96/keymaps/via/keymap.c index b42ae53c6d8..3445cea789e 100644 --- a/keyboards/idobao/id96/keymaps/via/keymap.c +++ b/keyboards/idobao/id96/keymaps/via/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT), [LAYER_1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/idobao/montex/v1/keymaps/default/keymap.c b/keyboards/idobao/montex/v1/keymaps/default/keymap.c index a3a7a54d869..bb95fb80983 100644 --- a/keyboards/idobao/montex/v1/keymaps/default/keymap.c +++ b/keyboards/idobao/montex/v1/keymaps/default/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └───┴───────┴───┘───┘ */ [1] = LAYOUT_numpad_6x5( - QK_BOOT, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_UP, KC_PGUP, _______, KC_LEFT, XXXXXXX, KC_RGHT, _______, diff --git a/keyboards/idobao/montex/v1/keymaps/via/keymap.c b/keyboards/idobao/montex/v1/keymaps/via/keymap.c index d17656fca2d..122beac484d 100644 --- a/keyboards/idobao/montex/v1/keymaps/via/keymap.c +++ b/keyboards/idobao/montex/v1/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_P0, KC_PDOT, KC_PENT ), [1] = LAYOUT_numpad_6x5( - QK_BOOT, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_UP, KC_PGUP, _______, KC_LEFT, XXXXXXX, KC_RGHT, _______, diff --git a/keyboards/illusion/rosa/keymaps/via/keymap.c b/keyboards/illusion/rosa/keymaps/via/keymap.c index 1f3f4b62735..557f94ee9bd 100644 --- a/keyboards/illusion/rosa/keymaps/via/keymap.c +++ b/keyboards/illusion/rosa/keymaps/via/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT_60_ansi_tsangan( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/ilumkb/primus75/keymaps/default/keymap.c b/keyboards/ilumkb/primus75/keymaps/default/keymap.c index e0571ddaa71..b7c27bb8692 100644 --- a/keyboards/ilumkb/primus75/keymaps/default/keymap.c +++ b/keyboards/ilumkb/primus75/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/ilumkb/primus75/keymaps/via/keymap.c b/keyboards/ilumkb/primus75/keymaps/via/keymap.c index ddcff9630ad..9aadcb4f602 100644 --- a/keyboards/ilumkb/primus75/keymaps/via/keymap.c +++ b/keyboards/ilumkb/primus75/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/inett_studio/sqx/hotswap/keymaps/default/keymap.c b/keyboards/inett_studio/sqx/hotswap/keymaps/default/keymap.c index ea4fd79d271..4c32519ed82 100644 --- a/keyboards/inett_studio/sqx/hotswap/keymaps/default/keymap.c +++ b/keyboards/inett_studio/sqx/hotswap/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_tsangan_hhkb( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR, - QK_BOOT, RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, + QK_BOOT,RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______, _______,_______,_______), diff --git a/keyboards/inett_studio/sqx/hotswap/keymaps/via/keymap.c b/keyboards/inett_studio/sqx/hotswap/keymaps/via/keymap.c index 80c8e7535f5..9c7f857cfae 100644 --- a/keyboards/inett_studio/sqx/hotswap/keymaps/via/keymap.c +++ b/keyboards/inett_studio/sqx/hotswap/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_tsangan_hhkb( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR, - QK_BOOT, RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, + QK_BOOT,RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______, _______, TG(0),_______), diff --git a/keyboards/inett_studio/sqx/universal/keymaps/default/keymap.c b/keyboards/inett_studio/sqx/universal/keymaps/default/keymap.c index d8816f72891..a17f3c9b22c 100644 --- a/keyboards/inett_studio/sqx/universal/keymaps/default/keymap.c +++ b/keyboards/inett_studio/sqx/universal/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_ansi_split_bs_rshift( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR, - QK_BOOT, RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, + QK_BOOT,RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______, _______,_______,TG(0),_______), diff --git a/keyboards/inett_studio/sqx/universal/keymaps/via/keymap.c b/keyboards/inett_studio/sqx/universal/keymaps/via/keymap.c index 9815da842b5..2415e0703b8 100644 --- a/keyboards/inett_studio/sqx/universal/keymaps/via/keymap.c +++ b/keyboards/inett_studio/sqx/universal/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_ansi_split_bs_rshift( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR, - QK_BOOT, RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, + QK_BOOT,RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______, _______,_______, TG(0),_______), diff --git a/keyboards/irene/keymaps/default/keymap.c b/keyboards/irene/keymaps/default/keymap.c index 1e12a2051cd..fc9ed485205 100644 --- a/keyboards/irene/keymaps/default/keymap.c +++ b/keyboards/irene/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL ), [1] = LAYOUT_alice_split_bs( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, KC_HOME, _______, _______, KC_UP, _______, _______, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_VAI, _______, _______, _______, KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/irene/keymaps/via/keymap.c b/keyboards/irene/keymaps/via/keymap.c index 1e12a2051cd..fc9ed485205 100644 --- a/keyboards/irene/keymaps/via/keymap.c +++ b/keyboards/irene/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL ), [1] = LAYOUT_alice_split_bs( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, KC_HOME, _______, _______, KC_UP, _______, _______, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_VAI, _______, _______, _______, KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/iriskeyboards/keymaps/default/keymap.c b/keyboards/iriskeyboards/keymaps/default/keymap.c index 8df65da140a..9106e9b119b 100644 --- a/keyboards/iriskeyboards/keymaps/default/keymap.c +++ b/keyboards/iriskeyboards/keymaps/default/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/iriskeyboards/keymaps/via/keymap.c b/keyboards/iriskeyboards/keymaps/via/keymap.c index 4c6beeecde8..56654a5667e 100644 --- a/keyboards/iriskeyboards/keymaps/via/keymap.c +++ b/keyboards/iriskeyboards/keymaps/via/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/j80/keymaps/default/keymap.c b/keyboards/j80/keymaps/default/keymap.c index cbaf2ae4810..e1d90dd6e18 100644 --- a/keyboards/j80/keymaps/default/keymap.c +++ b/keyboards/j80/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [_FN] = LAYOUT_tkl_ansi_split_rshift( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QMKBEST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/j80/keymaps/default_iso/keymap.c b/keyboards/j80/keymaps/default_iso/keymap.c index 8be1261291f..f45d83119f1 100644 --- a/keyboards/j80/keymaps/default_iso/keymap.c +++ b/keyboards/j80/keymaps/default_iso/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [_FN] = LAYOUT_tkl_iso_split_rshift( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QMKBEST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/jacky_studio/bear_65/keymaps/default/keymap.c b/keyboards/jacky_studio/bear_65/keymaps/default/keymap.c index 45ae589854f..6e7f6edf0e2 100644 --- a/keyboards/jacky_studio/bear_65/keymaps/default/keymap.c +++ b/keyboards/jacky_studio/bear_65/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT_all( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, RGB_MOD, _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, RGB_TOG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/jacky_studio/bear_65/keymaps/via/keymap.c b/keyboards/jacky_studio/bear_65/keymaps/via/keymap.c index d09fda12831..ebc656ea4aa 100644 --- a/keyboards/jacky_studio/bear_65/keymaps/via/keymap.c +++ b/keyboards/jacky_studio/bear_65/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_full_bs( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_MOD, _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, RGB_TOG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c b/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c index b4261696ad4..3c9f4b15e77 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c +++ b/keyboards/jacky_studio/s7_elephant/rev1/keymaps/default/keymap.c @@ -60,7 +60,7 @@ KC_F5, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, */ [_FN] = LAYOUT_ansi( -QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, +QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, diff --git a/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c b/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c index 4a4b37151d4..d31ae4af4ce 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c +++ b/keyboards/jacky_studio/s7_elephant/rev2/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FN] = LAYOUT_ansi_1u( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, diff --git a/keyboards/jae/j01/keymaps/default/keymap.c b/keyboards/jae/j01/keymaps/default/keymap.c index 0a70bc037cb..3142771ce0b 100644 --- a/keyboards/jae/j01/keymaps/default/keymap.c +++ b/keyboards/jae/j01/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_ansi( - KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_UP, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS, BL_BRTG, BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/jiran/keymaps/default/keymap.c b/keyboards/jiran/keymaps/default/keymap.c index d45467eb6a6..ca96497cc21 100644 --- a/keyboards/jiran/keymaps/default/keymap.c +++ b/keyboards/jiran/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQL, // ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ - KC_F11, KC_TAB, RGB_HUI, KC_HOME, QK_BOOT, RGB_SAI, RGB_VAI, KC_VOLU, KC_PGUP, QK_BOOT, KC_HOME, KC_INS, KC_DEL, KC_F12, + KC_F11, KC_TAB, RGB_HUI, KC_HOME, QK_BOOT, RGB_SAI, RGB_VAI, KC_VOLU, KC_PGUP, QK_BOOT, KC_HOME, KC_INS, KC_DEL, KC_F12, // └────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┘ KC_LSFT, RGB_HUD, KC_LEFT, KC_UP, KC_RGHT, RGB_VAD, KC_MUTE, KC_LEFT, KC_UP, KC_RGHT, KC_PSCR, KC_SLSF, // ├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ diff --git a/keyboards/jiran/keymaps/via/keymap.c b/keyboards/jiran/keymaps/via/keymap.c index bda28f4bb5a..2874be83ef2 100644 --- a/keyboards/jiran/keymaps/via/keymap.c +++ b/keyboards/jiran/keymaps/via/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQL, // ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ - KC_F11, KC_TAB, RGB_HUI, KC_HOME, QK_BOOT, RGB_SAI, RGB_VAI, KC_VOLU, KC_PGUP, QK_BOOT, KC_HOME, KC_INS, KC_DEL, KC_F12, + KC_F11, KC_TAB, RGB_HUI, KC_HOME, QK_BOOT, RGB_SAI, RGB_VAI, KC_VOLU, KC_PGUP, QK_BOOT, KC_HOME, KC_INS, KC_DEL, KC_F12, // └────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┘ KC_LSFT, RGB_HUD, KC_LEFT, KC_UP, KC_RGHT, RGB_VAD, KC_MUTE, KC_LEFT, KC_UP, KC_RGHT, KC_PSCR, RSFT_T(KC_LSCR), // ├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ diff --git a/keyboards/jkeys_design/gentleman65/keymaps/default/keymap.c b/keyboards/jkeys_design/gentleman65/keymaps/default/keymap.c index 1a494d3f459..5047cb5c9a0 100644 --- a/keyboards/jkeys_design/gentleman65/keymaps/default/keymap.c +++ b/keyboards/jkeys_design/gentleman65/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_VAD, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_SAI + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_SAI ), }; diff --git a/keyboards/jkeys_design/gentleman65/keymaps/via/keymap.c b/keyboards/jkeys_design/gentleman65/keymaps/via/keymap.c index c8b6036bccc..82da042c09d 100644 --- a/keyboards/jkeys_design/gentleman65/keymaps/via/keymap.c +++ b/keyboards/jkeys_design/gentleman65/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_VAD, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_SAI + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_SAI ), [2] = LAYOUT_65_ansi_rwkl_split_bs( diff --git a/keyboards/jones/v03/keymaps/default_jp/keymap.c b/keyboards/jones/v03/keymaps/default_jp/keymap.c index dd7e878170a..1e2ecb73162 100644 --- a/keyboards/jones/v03/keymaps/default_jp/keymap.c +++ b/keyboards/jones/v03/keymaps/default_jp/keymap.c @@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT_jp( _______,RGB_HUI,RGB_SAI,RGB_VAI,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, - _______, _______,WIN, _______,QK_BOOT, _______,RGB_HUI,RGB_SAI,RGB_VAI,_______,RGB_RMOD, _______,_______, + _______, _______,WIN, _______,QK_BOOT,_______,RGB_HUI,RGB_SAI,RGB_VAI,_______,RGB_RMOD, _______,_______, _______, _______,_______,_______,_______,_______,RGB_HUD,RGB_SAD,RGB_VAD,RGB_TOG,RGB_MOD,_______, _______,_______, _______, _______,_______,_______,_______,_______,NUM, MAC, _______,_______,_______,_______,_______,_______, _______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______ diff --git a/keyboards/joshajohnson/hub16/keymaps/default/keymap.c b/keyboards/joshajohnson/hub16/keymaps/default/keymap.c index efe10d3743d..fbcb5a5a5db 100755 --- a/keyboards/joshajohnson/hub16/keymaps/default/keymap.c +++ b/keyboards/joshajohnson/hub16/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_MOD, RGB_RMOD, RGB_TOG, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, - _______, _______, QK_BOOT, _______ + _______, _______, QK_BOOT, _______ ), }; diff --git a/keyboards/joshajohnson/hub16/keymaps/via/keymap.c b/keyboards/joshajohnson/hub16/keymaps/via/keymap.c index 1f5a4d4b120..760ac0bc65a 100755 --- a/keyboards/joshajohnson/hub16/keymaps/via/keymap.c +++ b/keyboards/joshajohnson/hub16/keymaps/via/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_MOD, RGB_RMOD, RGB_TOG, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, - _______, _______, QK_BOOT, _______ + _______, _______, QK_BOOT, _______ ), [2] = LAYOUT( diff --git a/keyboards/joshajohnson/hub20/keymaps/default/keymap.c b/keyboards/joshajohnson/hub20/keymaps/default/keymap.c index e943780258b..fe6dd37d051 100644 --- a/keyboards/joshajohnson/hub20/keymaps/default/keymap.c +++ b/keyboards/joshajohnson/hub20/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PENT, KC_PDOT, KC_P0, KC_P0 ), [1] = LAYOUT_all( - QK_BOOT, _______, + QK_BOOT, _______, RGB_TOG, RGB_RMOD, RGB_MOD, _______, _______, RGB_VAD, RGB_VAI, _______, _______, RGB_HUD, RGB_HUI, _______, diff --git a/keyboards/joshajohnson/hub20/keymaps/left_hand_numpad/keymap.c b/keyboards/joshajohnson/hub20/keymaps/left_hand_numpad/keymap.c index fe848d7c33d..a7853accc5f 100644 --- a/keyboards/joshajohnson/hub20/keymaps/left_hand_numpad/keymap.c +++ b/keyboards/joshajohnson/hub20/keymaps/left_hand_numpad/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PENT, KC_PDOT, KC_P0 ), [1] = LAYOUT_left_handed( - QK_BOOT, _______, + QK_BOOT, _______, RGB_TOG, RGB_RMOD, RGB_MOD, _______, _______, RGB_VAD, RGB_VAI, _______, RGB_HUD, RGB_HUI, _______, diff --git a/keyboards/joshajohnson/hub20/keymaps/right_hand_numpad/keymap.c b/keyboards/joshajohnson/hub20/keymaps/right_hand_numpad/keymap.c index 71168069fbe..78198ab951d 100644 --- a/keyboards/joshajohnson/hub20/keymaps/right_hand_numpad/keymap.c +++ b/keyboards/joshajohnson/hub20/keymaps/right_hand_numpad/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P0, KC_PDOT, KC_PENT ), [1] = LAYOUT_right_handed( - QK_BOOT, _______, + QK_BOOT, _______, RGB_TOG, RGB_RMOD, RGB_MOD, _______, _______, RGB_VAD, RGB_VAI, _______, RGB_HUD, RGB_HUI, _______, diff --git a/keyboards/joshajohnson/hub20/keymaps/via/keymap.c b/keyboards/joshajohnson/hub20/keymaps/via/keymap.c index b8d7e6fdc8c..3dfdd4dbd94 100644 --- a/keyboards/joshajohnson/hub20/keymaps/via/keymap.c +++ b/keyboards/joshajohnson/hub20/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PENT, KC_PDOT, KC_P0, KC_P0 ), [1] = LAYOUT_all( - QK_BOOT, _______, + QK_BOOT, _______, RGB_TOG, RGB_RMOD, RGB_MOD, _______, _______, RGB_VAD, RGB_VAI, _______, _______, RGB_HUD, RGB_HUI, _______, diff --git a/keyboards/kagizaraya/chidori/keymaps/default/keymap.c b/keyboards/kagizaraya/chidori/keymaps/default/keymap.c index ac9055c6340..bd52119d968 100644 --- a/keyboards/kagizaraya/chidori/keymaps/default/keymap.c +++ b/keyboards/kagizaraya/chidori/keymaps/default/keymap.c @@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------' `-----------------------------------------' */ [_ADJUST] = LAYOUT( - _______, QK_BOOT, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_INS, + _______, QK_BOOT, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_INS, KC_CAPS, _______, _______, _______, _______, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END diff --git a/keyboards/kagizaraya/halberd/keymaps/default/keymap.c b/keyboards/kagizaraya/halberd/keymaps/default/keymap.c index 27f54ce7c12..139c4f6c987 100644 --- a/keyboards/kagizaraya/halberd/keymaps/default/keymap.c +++ b/keyboards/kagizaraya/halberd/keymaps/default/keymap.c @@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_RMOD, RGB_SAI, RGB_SAD, _______, RGB_VAI, RGB_VAD, _______, _______, _______, - QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, + QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c b/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c index 1957c0276ce..307426ecca6 100644 --- a/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c +++ b/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c @@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_split_3x5_3( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, + QK_BOOT, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/kapcave/paladinpad/keymaps/via/keymap.c b/keyboards/kapcave/paladinpad/keymaps/via/keymap.c index 95686f8a94d..ae614aff1b8 100644 --- a/keyboards/kapcave/paladinpad/keymaps/via/keymap.c +++ b/keyboards/kapcave/paladinpad/keymaps/via/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, QK_BOOT, KC_NUM), + KC_TRNS, KC_TRNS, QK_BOOT, KC_NUM), /* FUNCTION */ [_FN2] = LAYOUT_ortho_5x4( diff --git a/keyboards/karlb/kbic65/keymaps/default/keymap.c b/keyboards/karlb/kbic65/keymaps/default/keymap.c index dd5346e2bcc..fa1bf7ba23e 100644 --- a/keyboards/karlb/kbic65/keymaps/default/keymap.c +++ b/keyboards/karlb/kbic65/keymaps/default/keymap.c @@ -17,6 +17,6 @@ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, KC_INS, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, -_______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, KC_PGUP, _______, +_______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END) }; diff --git a/keyboards/karlb/kbic65/keymaps/default_iso/keymap.c b/keyboards/karlb/kbic65/keymaps/default_iso/keymap.c index 111b66ff4b2..8a99083c06a 100644 --- a/keyboards/karlb/kbic65/keymaps/default_iso/keymap.c +++ b/keyboards/karlb/kbic65/keymaps/default_iso/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, _______, - _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, KC_PGUP, _______, + _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END) }; diff --git a/keyboards/karlb/kbic65/keymaps/default_iso_split_bs/keymap.c b/keyboards/karlb/kbic65/keymaps/default_iso_split_bs/keymap.c index a80fd50f9d5..3593eda754b 100644 --- a/keyboards/karlb/kbic65/keymaps/default_iso_split_bs/keymap.c +++ b/keyboards/karlb/kbic65/keymaps/default_iso_split_bs/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, KC_INS, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, _______, - _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, KC_PGUP, _______, + _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END) }; diff --git a/keyboards/karlb/kbic65/keymaps/via/keymap.c b/keyboards/karlb/kbic65/keymaps/via/keymap.c index dd5346e2bcc..fa1bf7ba23e 100644 --- a/keyboards/karlb/kbic65/keymaps/via/keymap.c +++ b/keyboards/karlb/kbic65/keymaps/via/keymap.c @@ -17,6 +17,6 @@ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, KC_INS, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, -_______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, KC_PGUP, _______, +_______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END) }; diff --git a/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c b/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c index 589aa786360..cc93228ad02 100644 --- a/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c +++ b/keyboards/kbdfans/baguette66/rgb/keymaps/default/keymap.c @@ -25,19 +25,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT,KC_DOWN, KC_RIGHT), [1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRAVE, KC_PGUP, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), [2] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRAVE, KC_PGUP, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), [3] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRAVE, KC_PGUP, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), diff --git a/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c b/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c index 0029103cc8d..eefda15f523 100644 --- a/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c +++ b/keyboards/kbdfans/baguette66/rgb/keymaps/via/keymap.c @@ -25,19 +25,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT,KC_DOWN, KC_RIGHT), [1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRAVE, KC_PGUP, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), [2] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRAVE, KC_PGUP, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), [3] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRAVE, KC_PGUP, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), diff --git a/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c b/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c index 5b85eb2150e..87879b109a9 100644 --- a/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c +++ b/keyboards/kbdfans/baguette66/soldered/keymaps/default/keymap.c @@ -25,19 +25,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT,KC_DOWN, KC_RIGHT), [1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRAVE, KC_PGUP, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), [2] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRAVE, KC_PGUP, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), [3] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRAVE, KC_PGUP, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), diff --git a/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c b/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c index 5b85eb2150e..87879b109a9 100644 --- a/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c +++ b/keyboards/kbdfans/baguette66/soldered/keymaps/via/keymap.c @@ -25,19 +25,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT,KC_DOWN, KC_RIGHT), [1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRAVE, KC_PGUP, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), [2] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRAVE, KC_PGUP, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), [3] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_GRAVE, KC_PGUP, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), diff --git a/keyboards/kbdfans/bounce/75/soldered/keymaps/default/keymap.c b/keyboards/kbdfans/bounce/75/soldered/keymaps/default/keymap.c index 40cb4ad5429..b562c9942da 100644 --- a/keyboards/kbdfans/bounce/75/soldered/keymaps/default/keymap.c +++ b/keyboards/kbdfans/bounce/75/soldered/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi/keymap.c b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi/keymap.c index 96a02608665..13694ecbe4b 100644 --- a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi/keymap.c +++ b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi_split_bs/keymap.c b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi_split_bs/keymap.c index 56827e45d1f..2d1d89564bb 100644 --- a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi_split_bs/keymap.c +++ b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_ansi_split_bs/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi_split_bs( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_ansi_split_bs( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_ansi_split_bs( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso/keymap.c b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso/keymap.c index e7f07d0af15..d716353c2b8 100644 --- a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso/keymap.c +++ b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_iso( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_iso( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_iso( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso_split_bs/keymap.c b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso_split_bs/keymap.c index 8a76d6c9fd7..fe2c21ed7a2 100644 --- a/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso_split_bs/keymap.c +++ b/keyboards/kbdfans/bounce/75/soldered/keymaps/default_iso_split_bs/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_iso_split_bs( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_iso_split_bs( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_iso_split_bs( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/bounce/75/soldered/keymaps/via/keymap.c b/keyboards/kbdfans/bounce/75/soldered/keymaps/via/keymap.c index 40cb4ad5429..b562c9942da 100644 --- a/keyboards/kbdfans/bounce/75/soldered/keymaps/via/keymap.c +++ b/keyboards/kbdfans/bounce/75/soldered/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/epoch80/keymaps/default/keymap.c b/keyboards/kbdfans/epoch80/keymaps/default/keymap.c index 8fa715e675f..86b5995da48 100644 --- a/keyboards/kbdfans/epoch80/keymaps/default/keymap.c +++ b/keyboards/kbdfans/epoch80/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kbdfans/epoch80/keymaps/iso/keymap.c b/keyboards/kbdfans/epoch80/keymaps/iso/keymap.c index 5e6eec8eca0..68754f3440a 100644 --- a/keyboards/kbdfans/epoch80/keymaps/iso/keymap.c +++ b/keyboards/kbdfans/epoch80/keymaps/iso/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_iso( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c b/keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c index 9b74a7fdcfc..f34742c9bea 100644 --- a/keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c +++ b/keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi_tsangan( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kbdfans/epoch80/keymaps/via/keymap.c b/keyboards/kbdfans/epoch80/keymaps/via/keymap.c index 032ee3aaac3..bb5c0ce52e1 100644 --- a/keyboards/kbdfans/epoch80/keymaps/via/keymap.c +++ b/keyboards/kbdfans/epoch80/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c b/keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c index e673ee248b8..83caa21eec1 100644 --- a/keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c +++ b/keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi_wkl( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kbdfans/kbd19x/keymaps/default/keymap.c b/keyboards/kbdfans/kbd19x/keymaps/default/keymap.c index 6e4dfa60544..c4734bb2d85 100644 --- a/keyboards/kbdfans/kbd19x/keymaps/default/keymap.c +++ b/keyboards/kbdfans/kbd19x/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_ansi( /* Func */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c b/keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c index d48c30447e1..ebbd21b58c6 100644 --- a/keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c +++ b/keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_iso( /* Func */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c b/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c index a77170d0082..6832cfc8499 100644 --- a/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c +++ b/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_ansi( /* Func */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/default/keymap.c index 5f40be9ba86..08166a99ad1 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/default/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/via/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/via/keymap.c index e844d19bc07..176f0788612 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/via/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_DEL, - RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/keymap.c index 2e490cc9060..bcdda03e3be 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/keymap.c +++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_65_ansi_blocker( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, BL_UP, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, BL_UP, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/keymap.c index 7abaf112833..5843ea9e830 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/keymap.c +++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_UP, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_UP, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/keymap.c index 896603a3cd9..ab2544da5c3 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/keymap.c +++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_65_iso_blocker( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, BL_UP, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, BL_UP, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/via/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/via/keymap.c index 1c875eb1243..d9c9e6d59c4 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/via/keymap.c +++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_UP, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_UP, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, diff --git a/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c index 49c4b3ffc02..77a73100cc6 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c +++ b/keyboards/kbdfans/kbd6x/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [2] = LAYOUT( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/kbdfans/kbd75/keymaps/default/keymap.c b/keyboards/kbdfans/kbd75/keymaps/default/keymap.c index 4a20f3b7d5b..7b0fb0ab371 100644 --- a/keyboards/kbdfans/kbd75/keymaps/default/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/default/keymap.c @@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/kbd75/keymaps/iso/keymap.c b/keyboards/kbdfans/kbd75/keymaps/iso/keymap.c index 153ff34ceb3..22a3d4b67c5 100644 --- a/keyboards/kbdfans/kbd75/keymaps/iso/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/iso/keymap.c @@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_75_iso( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/kbd75/keymaps/via/keymap.c b/keyboards/kbdfans/kbd75/keymaps/via/keymap.c index c26a98b90b6..ad819481e34 100644 --- a/keyboards/kbdfans/kbd75/keymaps/via/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/via/keymap.c @@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/kbd75hs/keymaps/default/keymap.c b/keyboards/kbdfans/kbd75hs/keymaps/default/keymap.c index c76923eacf3..70308929a9c 100644 --- a/keyboards/kbdfans/kbd75hs/keymaps/default/keymap.c +++ b/keyboards/kbdfans/kbd75hs/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_75_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_75_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_75_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/kbd75hs/keymaps/via/keymap.c b/keyboards/kbdfans/kbd75hs/keymaps/via/keymap.c index c76923eacf3..70308929a9c 100644 --- a/keyboards/kbdfans/kbd75hs/keymaps/via/keymap.c +++ b/keyboards/kbdfans/kbd75hs/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_75_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_75_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_75_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c b/keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c index 2f0455cfc26..9c83795006b 100644 --- a/keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c +++ b/keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_75_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_75_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT_75_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/kbd75rgb/keymaps/via/keymap.c b/keyboards/kbdfans/kbd75rgb/keymaps/via/keymap.c index 1c56f4af319..7e6262e350a 100644 --- a/keyboards/kbdfans/kbd75rgb/keymaps/via/keymap.c +++ b/keyboards/kbdfans/kbd75rgb/keymaps/via/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_75_ansi ( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_75_ansi ( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT_75_ansi ( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/kbd8x/keymaps/default/keymap.c b/keyboards/kbdfans/kbd8x/keymaps/default/keymap.c index ecc91b8c24d..46516c2ca9f 100644 --- a/keyboards/kbdfans/kbd8x/keymaps/default/keymap.c +++ b/keyboards/kbdfans/kbd8x/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_UP, BL_DOWN, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/keymap.c b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/keymap.c index eeae78e5966..2656dccade8 100644 --- a/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/keymap.c +++ b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_UP, BL_DOWN, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/kbdfans/niu_mini/keymaps/default/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/default/keymap.c index e8b735a8869..c58ff63d87d 100644 --- a/keyboards/kbdfans/niu_mini/keymaps/default/keymap.c +++ b/keyboards/kbdfans/niu_mini/keymaps/default/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* Layer 2 (r_ Indicates RGB Controls) diff --git a/keyboards/kbdfans/niu_mini/keymaps/via/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/via/keymap.c index 18e98b55afd..b4cf56ddd18 100644 --- a/keyboards/kbdfans/niu_mini/keymaps/via/keymap.c +++ b/keyboards/kbdfans/niu_mini/keymaps/via/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* Layer 2 (r_ Indicates RGB Controls) @@ -74,6 +74,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/kbnordic/nordic60/keymaps/default/keymap.c b/keyboards/kbnordic/nordic60/keymaps/default/keymap.c index b9e8fd21f27..0eb41b2fa14 100644 --- a/keyboards/kbnordic/nordic60/keymaps/default/keymap.c +++ b/keyboards/kbnordic/nordic60/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), // basic function layer [1] = LAYOUT_60_iso_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/kbnordic/nordic60/keymaps/default_ansi/keymap.c b/keyboards/kbnordic/nordic60/keymaps/default_ansi/keymap.c index 72157cad980..6f9e297bf25 100644 --- a/keyboards/kbnordic/nordic60/keymaps/default_ansi/keymap.c +++ b/keyboards/kbnordic/nordic60/keymaps/default_ansi/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), // basic function layer [1] = LAYOUT_60_ansi( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/kbnordic/nordic60/keymaps/via/keymap.c b/keyboards/kbnordic/nordic60/keymaps/via/keymap.c index 62a06170d2c..a39bd5b6992 100644 --- a/keyboards/kbnordic/nordic60/keymaps/via/keymap.c +++ b/keyboards/kbnordic/nordic60/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL), // basic function layer [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/keebio/dilly/keymaps/default/keymap.c b/keyboards/keebio/dilly/keymaps/default/keymap.c index 9eaec582f19..a8ca4f60205 100644 --- a/keyboards/keebio/dilly/keymaps/default/keymap.c +++ b/keyboards/keebio/dilly/keymaps/default/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN5] = LAYOUT_ortho_3x10( - RGB_TOG, RGB_MOD, _______, QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, + RGB_TOG, RGB_MOD, _______, QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, DB_TOGG, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, BL_STEP, _______, KC_GUIC, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/keebio/dsp40/keymaps/default/keymap.c b/keyboards/keebio/dsp40/keymaps/default/keymap.c index 24296484f2f..f3da9b89427 100755 --- a/keyboards/keebio/dsp40/keymaps/default/keymap.c +++ b/keyboards/keebio/dsp40/keymaps/default/keymap.c @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/keebio/dsp40/keymaps/via/keymap.c b/keyboards/keebio/dsp40/keymaps/via/keymap.c index c4dd6bd3bd9..4987a9c01ce 100755 --- a/keyboards/keebio/dsp40/keymaps/via/keymap.c +++ b/keyboards/keebio/dsp40/keymaps/via/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN3] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/keebio/foldkb/keymaps/default/keymap.c b/keyboards/keebio/foldkb/keymaps/default/keymap.c index d8a841f4e4a..60499fa7944 100644 --- a/keyboards/keebio/foldkb/keymaps/default/keymap.c +++ b/keyboards/keebio/foldkb/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL ), [1] = LAYOUT( - KC_MUTE, QK_BOOT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + KC_MUTE, QK_BOOT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, BL_STEP, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, KC_7, KC_8, KC_9, _______, _______, _______, _______, RGB_MOD, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, _______, _______, _______, diff --git a/keyboards/keebio/foldkb/keymaps/via/keymap.c b/keyboards/keebio/foldkb/keymaps/via/keymap.c index adbf9369369..665b4a3b1dc 100644 --- a/keyboards/keebio/foldkb/keymaps/via/keymap.c +++ b/keyboards/keebio/foldkb/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL ), [1] = LAYOUT( - KC_MUTE, QK_BOOT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + KC_MUTE, QK_BOOT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, BL_STEP, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, KC_7, KC_8, KC_9, _______, _______, _______, _______, RGB_MOD, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, _______, _______, _______, diff --git a/keyboards/keebio/fourier/keymaps/default/keymap.c b/keyboards/keebio/fourier/keymaps/default/keymap.c index f98d94a9b62..8ae8e533e31 100644 --- a/keyboards/keebio/fourier/keymaps/default/keymap.c +++ b/keyboards/keebio/fourier/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, - QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, + QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_UP, _______, RGB_TOG, _______, _______, _______, _______, KC_DEL, KC_0, KC_LEFT, KC_DOWN, KC_RGHT ), diff --git a/keyboards/keebio/fourier/keymaps/via/keymap.c b/keyboards/keebio/fourier/keymaps/via/keymap.c index 899d8660083..9f1490a237f 100644 --- a/keyboards/keebio/fourier/keymaps/via/keymap.c +++ b/keyboards/keebio/fourier/keymaps/via/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, - QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, + QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_UP, _______, RGB_TOG, _______, _______, _______, _______, KC_DEL, KC_0, KC_LEFT, KC_DOWN, KC_RGHT ), diff --git a/keyboards/keebio/laplace/keymaps/default/keymap.c b/keyboards/keebio/laplace/keymaps/default/keymap.c index d728f65938f..e3866b01b65 100644 --- a/keyboards/keebio/laplace/keymaps/default/keymap.c +++ b/keyboards/keebio/laplace/keymaps/default/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, - QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, + QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_UP, _______, RGB_TOG, _______, _______, _______, _______, KC_DEL, KC_0, KC_LEFT, KC_DOWN, KC_RGHT ), diff --git a/keyboards/keebio/levinson/keymaps/default/keymap.c b/keyboards/keebio/levinson/keymaps/default/keymap.c index bdc4a50827f..20be1edd39e 100644 --- a/keyboards/keebio/levinson/keymaps/default/keymap.c +++ b/keyboards/keebio/levinson/keymaps/default/keymap.c @@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/keebio/rorschach/keymaps/default/keymap.c b/keyboards/keebio/rorschach/keymaps/default/keymap.c index c1efce8f2b8..6c07719d8ab 100644 --- a/keyboards/keebio/rorschach/keymaps/default/keymap.c +++ b/keyboards/keebio/rorschach/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( BL_STEP, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_PLUS, KC_PIPE, - QK_BOOT, _______, RGB_HUD, RGB_SAD, RGB_VAD, KC_LCBR, KC_RCBR, KC_P1, KC_P2, KC_P3, KC_SLSH, _______, + QK_BOOT, _______, RGB_HUD, RGB_SAD, RGB_VAD, KC_LCBR, KC_RCBR, KC_P1, KC_P2, KC_P3, KC_SLSH, _______, KC_GRV, _______, _______, _______, _______, KC_DEL, _______, _______, KC_P0, KC_PDOT, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/keebio/wavelet/keymaps/default/keymap.c b/keyboards/keebio/wavelet/keymaps/default/keymap.c index bdc4a50827f..20be1edd39e 100644 --- a/keyboards/keebio/wavelet/keymaps/default/keymap.c +++ b/keyboards/keebio/wavelet/keymaps/default/keymap.c @@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/keebwerk/mega/ansi/keymaps/default/keymap.c b/keyboards/keebwerk/mega/ansi/keymaps/default/keymap.c index a6b5fdf416e..2d9893771fa 100755 --- a/keyboards/keebwerk/mega/ansi/keymaps/default/keymap.c +++ b/keyboards/keebwerk/mega/ansi/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/keebwerk/mega/ansi/keymaps/via/keymap.c b/keyboards/keebwerk/mega/ansi/keymaps/via/keymap.c index 16b351a039d..9939cb63a61 100755 --- a/keyboards/keebwerk/mega/ansi/keymaps/via/keymap.c +++ b/keyboards/keebwerk/mega/ansi/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/keebzdotnet/fme/keymaps/default/keymap.c b/keyboards/keebzdotnet/fme/keymaps/default/keymap.c index 6b40c7e17e1..ba22cbe9c6f 100644 --- a/keyboards/keebzdotnet/fme/keymaps/default/keymap.c +++ b/keyboards/keebzdotnet/fme/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/keebzdotnet/fme/keymaps/via/keymap.c b/keyboards/keebzdotnet/fme/keymaps/via/keymap.c index 6b40c7e17e1..ba22cbe9c6f 100644 --- a/keyboards/keebzdotnet/fme/keymaps/via/keymap.c +++ b/keyboards/keebzdotnet/fme/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/keybage/radpad/keymaps/default/keymap.c b/keyboards/keybage/radpad/keymaps/default/keymap.c index 24fab560768..5957fe30b5c 100644 --- a/keyboards/keybage/radpad/keymaps/default/keymap.c +++ b/keyboards/keybage/radpad/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PSLS, KC_F21, KC_F22, KC_F23, KC_PAST, KC_F18, KC_F19, KC_F20, KC_NUM, KC_F15, KC_F16, KC_F17, - QK_BOOT, _______, KC_F13, KC_F14 + QK_BOOT, _______, KC_F13, KC_F14 ) }; diff --git a/keyboards/keyboardio/atreus/keymaps/default/keymap.c b/keyboards/keyboardio/atreus/keymaps/default/keymap.c index f24cc7595de..eb7c3c951a7 100644 --- a/keyboards/keyboardio/atreus/keymaps/default/keymap.c +++ b/keyboards/keyboardio/atreus/keymaps/default/keymap.c @@ -38,6 +38,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LW] = LAYOUT( /* [> LOWER <] */ KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 , KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 , - KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, _______, _______, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 , + KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, _______, _______, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 , KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS ) }; diff --git a/keyboards/keyboardio/atreus/keymaps/via/keymap.c b/keyboards/keyboardio/atreus/keymaps/via/keymap.c index 87d6102bc3a..7521d0d6a10 100644 --- a/keyboards/keyboardio/atreus/keymaps/via/keymap.c +++ b/keyboards/keyboardio/atreus/keymaps/via/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT( /* [> LOWER <] */ KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 , KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 , - KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_TRNS, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 , + KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_TRNS, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 , TO(0), KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(0), KC_PSCR, KC_SCRL, KC_PAUS ), [3] = LAYOUT( /* blank */ diff --git a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c b/keyboards/keycapsss/kimiko/keymaps/default/keymap.c index 74da1ce9732..28bb5d4597f 100644 --- a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c +++ b/keyboards/keycapsss/kimiko/keymaps/default/keymap.c @@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( - QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c b/keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c index f7e434c8816..e2518afd541 100644 --- a/keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c +++ b/keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c @@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------' '---------------------------------' */ [_ADJUST] = LAYOUT( - QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, diff --git a/keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c b/keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c index 461172ca040..f8d156d197a 100644 --- a/keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c +++ b/keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, KC_DEL, RGB_M_P, KC_LCBR, KC_LBRC, KC_LPRN, KC_SLSH, KC_BSLS, KC_RPRN, KC_RBRC, KC_RCBR, _______, _______, KC_PIPE, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, QK_BOOT, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + RGB_TOG, QK_BOOT, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ) }; diff --git a/keyboards/keyhive/absinthe/keymaps/ansi/keymap.c b/keyboards/keyhive/absinthe/keymaps/ansi/keymap.c index 02d1fcaf275..b9db98758ff 100644 --- a/keyboards/keyhive/absinthe/keymaps/ansi/keymap.c +++ b/keyboards/keyhive/absinthe/keymaps/ansi/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_HUD,RGB_HUI,RGB_SAD,RGB_SAI,RGB_VAD,RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS) diff --git a/keyboards/keyhive/absinthe/keymaps/default/keymap.c b/keyboards/keyhive/absinthe/keymaps/default/keymap.c index 51ab1ceeb7c..82f0a3e86c9 100644 --- a/keyboards/keyhive/absinthe/keymaps/default/keymap.c +++ b/keyboards/keyhive/absinthe/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_default( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_HUD,RGB_HUI,RGB_SAD,RGB_SAI,RGB_VAD,RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS) diff --git a/keyboards/keyprez/unicorn/keymaps/default/keymap.c b/keyboards/keyprez/unicorn/keymaps/default/keymap.c index 511389969bf..53eb9ae475b 100644 --- a/keyboards/keyprez/unicorn/keymaps/default/keymap.c +++ b/keyboards/keyprez/unicorn/keymaps/default/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/kin80/keymaps/default/keymap.c b/keyboards/kin80/keymaps/default/keymap.c index a167f1ca006..311aeed9891 100644 --- a/keyboards/kin80/keymaps/default/keymap.c +++ b/keyboards/kin80/keymaps/default/keymap.c @@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, KC_CAPS, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, _______, _______, _______, _______, _______, _______, KC_PDOT, KC_P1, KC_P2, KC_P3, KC_PENT, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RALT, _______, KC_WH_U, _______, _______, _______, KC_WH_D, _______, _______, KC_P0 diff --git a/keyboards/kingly_keys/little_foot/keymaps/default/keymap.c b/keyboards/kingly_keys/little_foot/keymaps/default/keymap.c index e6ae7409461..e3bb4b4bf5c 100644 --- a/keyboards/kingly_keys/little_foot/keymaps/default/keymap.c +++ b/keyboards/kingly_keys/little_foot/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LT(_LN, KC_ESC), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_BSPC, KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LSFT(KC_MINS), KC_BSLS, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_QUOT, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LALT, KC_TRNS, KC_LCTL ), diff --git a/keyboards/kira/kira80/keymaps/ansi/keymap.c b/keyboards/kira/kira80/keymaps/ansi/keymap.c index cadda95908b..fad8e738f7c 100644 --- a/keyboards/kira/kira80/keymaps/ansi/keymap.c +++ b/keyboards/kira/kira80/keymaps/ansi/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/kira/kira80/keymaps/default/keymap.c b/keyboards/kira/kira80/keymaps/default/keymap.c index c433b4351c5..6eeb8a8e6f6 100644 --- a/keyboards/kira/kira80/keymaps/default/keymap.c +++ b/keyboards/kira/kira80/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/kira/kira80/keymaps/iso/keymap.c b/keyboards/kira/kira80/keymaps/iso/keymap.c index a6502d5ffa0..4afeaf76e25 100644 --- a/keyboards/kira/kira80/keymaps/iso/keymap.c +++ b/keyboards/kira/kira80/keymaps/iso/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_iso( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/kira/kira80/keymaps/via/keymap.c b/keyboards/kira/kira80/keymaps/via/keymap.c index ab04b07a0ae..0748b5c5311 100644 --- a/keyboards/kira/kira80/keymaps/via/keymap.c +++ b/keyboards/kira/kira80/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/kiwikey/borderland/keymaps/default/keymap.c b/keyboards/kiwikey/borderland/keymaps/default/keymap.c index 965d5075758..dcd8a447d7c 100644 --- a/keyboards/kiwikey/borderland/keymaps/default/keymap.c +++ b/keyboards/kiwikey/borderland/keymaps/default/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/kiwikey/borderland/keymaps/via/keymap.c b/keyboards/kiwikey/borderland/keymaps/via/keymap.c index 53477b7f856..c4cbeb524b5 100644 --- a/keyboards/kiwikey/borderland/keymaps/via/keymap.c +++ b/keyboards/kiwikey/borderland/keymaps/via/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/kiwikey/wanderland/keymaps/default/keymap.c b/keyboards/kiwikey/wanderland/keymaps/default/keymap.c index 5d9166d603d..7b44ab51905 100644 --- a/keyboards/kiwikey/wanderland/keymaps/default/keymap.c +++ b/keyboards/kiwikey/wanderland/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, _______, RGB_TOG, RGB_MOD, RGB_RMOD,_______, _______, _______, BL_TOGG, BL_STEP, BL_BRTG, KC_UP, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, - QK_BOOT, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/kiwikey/wanderland/keymaps/via/keymap.c b/keyboards/kiwikey/wanderland/keymaps/via/keymap.c index d3580477716..c0c8b6de82c 100644 --- a/keyboards/kiwikey/wanderland/keymaps/via/keymap.c +++ b/keyboards/kiwikey/wanderland/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, _______, RGB_TOG, RGB_MOD, RGB_RMOD,_______, _______, _______, BL_TOGG, BL_STEP, BL_BRTG, KC_UP, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, - QK_BOOT, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT_alice_split_bs( diff --git a/keyboards/kkatano/bakeneko60/keymaps/default/keymap.c b/keyboards/kkatano/bakeneko60/keymaps/default/keymap.c index c00e7fb050f..b3147b81d35 100644 --- a/keyboards/kkatano/bakeneko60/keymaps/default/keymap.c +++ b/keyboards/kkatano/bakeneko60/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), [_FN] = LAYOUT_60_ansi_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kkatano/bakeneko60/keymaps/via/keymap.c b/keyboards/kkatano/bakeneko60/keymaps/via/keymap.c index 516ad4dc81b..55f0b6bd264 100644 --- a/keyboards/kkatano/bakeneko60/keymaps/via/keymap.c +++ b/keyboards/kkatano/bakeneko60/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), [_L1] = LAYOUT_60_ansi_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kkatano/bakeneko65/rev2/keymaps/default/keymap.c b/keyboards/kkatano/bakeneko65/rev2/keymaps/default/keymap.c index bcfb2304698..a0c6a23078d 100644 --- a/keyboards/kkatano/bakeneko65/rev2/keymaps/default/keymap.c +++ b/keyboards/kkatano/bakeneko65/rev2/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT_65_ansi_split_bs( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kkatano/bakeneko65/rev2/keymaps/via/keymap.c b/keyboards/kkatano/bakeneko65/rev2/keymaps/via/keymap.c index fd164e9d30d..2bc7b485d11 100644 --- a/keyboards/kkatano/bakeneko65/rev2/keymaps/via/keymap.c +++ b/keyboards/kkatano/bakeneko65/rev2/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_L1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_L1] = LAYOUT_65_ansi_split_bs( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kkatano/bakeneko65/rev3/keymaps/default/keymap.c b/keyboards/kkatano/bakeneko65/rev3/keymaps/default/keymap.c index 0ca1cecacf4..9f9fa6b244d 100644 --- a/keyboards/kkatano/bakeneko65/rev3/keymaps/default/keymap.c +++ b/keyboards/kkatano/bakeneko65/rev3/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT_65_ansi_blocker_split_bs( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_INS, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kkatano/bakeneko65/rev3/keymaps/via/keymap.c b/keyboards/kkatano/bakeneko65/rev3/keymaps/via/keymap.c index d565f19e2fc..f90e7b48bb5 100644 --- a/keyboards/kkatano/bakeneko65/rev3/keymaps/via/keymap.c +++ b/keyboards/kkatano/bakeneko65/rev3/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT ), [_L1] = LAYOUT_65_ansi_blocker_split_bs( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_INS, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kkatano/bakeneko80/keymaps/default/keymap.c b/keyboards/kkatano/bakeneko80/keymaps/default/keymap.c index f7003c796fe..372dcd49622 100644 --- a/keyboards/kkatano/bakeneko80/keymaps/default/keymap.c +++ b/keyboards/kkatano/bakeneko80/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, LT(_FN, KC_APP), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT_tkl_ansi( - QK_BOOT, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kmini/keymaps/default/keymap.c b/keyboards/kmini/keymaps/default/keymap.c index 1f041daffc9..571572f38f3 100755 --- a/keyboards/kmini/keymaps/default/keymap.c +++ b/keyboards/kmini/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT( - _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, _______, + _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kopibeng/mnk60/keymaps/default/keymap.c b/keyboards/kopibeng/mnk60/keymaps/default/keymap.c index 844f338d193..b21f4a78197 100644 --- a/keyboards/kopibeng/mnk60/keymaps/default/keymap.c +++ b/keyboards/kopibeng/mnk60/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_all( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kopibeng/mnk60/keymaps/via/keymap.c b/keyboards/kopibeng/mnk60/keymaps/via/keymap.c index 844f338d193..b21f4a78197 100644 --- a/keyboards/kopibeng/mnk60/keymaps/via/keymap.c +++ b/keyboards/kopibeng/mnk60/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_all( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kopibeng/mnk88/keymaps/default/keymap.c b/keyboards/kopibeng/mnk88/keymaps/default/keymap.c index 7973f1de798..3f057ad8629 100644 --- a/keyboards/kopibeng/mnk88/keymaps/default/keymap.c +++ b/keyboards/kopibeng/mnk88/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kopibeng/mnk88/keymaps/via/keymap.c b/keyboards/kopibeng/mnk88/keymaps/via/keymap.c index 7973f1de798..3f057ad8629 100644 --- a/keyboards/kopibeng/mnk88/keymaps/via/keymap.c +++ b/keyboards/kopibeng/mnk88/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kopibeng/xt60/keymaps/default/keymap.c b/keyboards/kopibeng/xt60/keymaps/default/keymap.c index ff460018c99..845118d1abb 100644 --- a/keyboards/kopibeng/xt60/keymaps/default/keymap.c +++ b/keyboards/kopibeng/xt60/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_all( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kopibeng/xt60/keymaps/via/keymap.c b/keyboards/kopibeng/xt60/keymaps/via/keymap.c index ff460018c99..845118d1abb 100644 --- a/keyboards/kopibeng/xt60/keymaps/via/keymap.c +++ b/keyboards/kopibeng/xt60/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_all( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c b/keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c index ff460018c99..845118d1abb 100644 --- a/keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c +++ b/keyboards/kopibeng/xt60_singa/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_all( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kopibeng/xt60_singa/keymaps/via/keymap.c b/keyboards/kopibeng/xt60_singa/keymaps/via/keymap.c index ff460018c99..845118d1abb 100644 --- a/keyboards/kopibeng/xt60_singa/keymaps/via/keymap.c +++ b/keyboards/kopibeng/xt60_singa/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_all( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kopibeng/xt87/keymaps/default/keymap.c b/keyboards/kopibeng/xt87/keymaps/default/keymap.c index d963941d808..3258ae94146 100644 --- a/keyboards/kopibeng/xt87/keymaps/default/keymap.c +++ b/keyboards/kopibeng/xt87/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kopibeng/xt87/keymaps/via/keymap.c b/keyboards/kopibeng/xt87/keymaps/via/keymap.c index d963941d808..3258ae94146 100644 --- a/keyboards/kopibeng/xt87/keymaps/via/keymap.c +++ b/keyboards/kopibeng/xt87/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kopibeng/xt8x/keymaps/default/keymap.c b/keyboards/kopibeng/xt8x/keymaps/default/keymap.c index b3f3f1b8d07..e4a38129a65 100644 --- a/keyboards/kopibeng/xt8x/keymaps/default/keymap.c +++ b/keyboards/kopibeng/xt8x/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kopibeng/xt8x/keymaps/via/keymap.c b/keyboards/kopibeng/xt8x/keymaps/via/keymap.c index b3f3f1b8d07..e4a38129a65 100644 --- a/keyboards/kopibeng/xt8x/keymaps/via/keymap.c +++ b/keyboards/kopibeng/xt8x/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kprepublic/bm16a/v1/keymaps/via/keymap.c b/keyboards/kprepublic/bm16a/v1/keymaps/via/keymap.c index 8b41b08dfef..503149e80ce 100644 --- a/keyboards/kprepublic/bm16a/v1/keymaps/via/keymap.c +++ b/keyboards/kprepublic/bm16a/v1/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(1), KC_VOLD, KC_MUTE, KC_MNXT ), [1] = LAYOUT_ortho_4x4( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/kprepublic/bm16s/keymaps/default/keymap.c b/keyboards/kprepublic/bm16s/keymaps/default/keymap.c index b5c0a3df057..faa5e3e8f70 100755 --- a/keyboards/kprepublic/bm16s/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm16s/keymaps/default/keymap.c @@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_KP_0, KC_PDOT, KC_PCMM, KC_PENT ), [1] = LAYOUT_ortho_4x4( - QK_BOOT, BL_STEP, _______, KC_VOLU, + QK_BOOT, BL_STEP, _______, KC_VOLU, BL_TOGG, BL_DOWN, BL_UP, KC_VOLD, RGB_TOG, RGB_MOD, RGB_HUI, KC_MUTE, RGB_SAI, RGB_SAD, RGB_HUD, _______ diff --git a/keyboards/kprepublic/bm16s/keymaps/via/keymap.c b/keyboards/kprepublic/bm16s/keymaps/via/keymap.c index 5ed0f1fcd5c..6ab2e13a963 100644 --- a/keyboards/kprepublic/bm16s/keymaps/via/keymap.c +++ b/keyboards/kprepublic/bm16s/keymaps/via/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_KP_0, KC_PDOT, KC_PCMM, KC_PENT ), [1] = LAYOUT_ortho_4x4( - QK_BOOT, BL_STEP, KC_TRNS, KC_VOLU, + QK_BOOT, BL_STEP, KC_TRNS, KC_VOLU, BL_TOGG, BL_DOWN, BL_UP, KC_VOLD, RGB_TOG, RGB_MOD, RGB_HUI, KC_MUTE, RGB_SAI, RGB_SAD, RGB_HUD, KC_TRNS diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/via/keymap.c index 216d7cb8886..7e061697119 100644 --- a/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/via/keymap.c +++ b/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/via/keymap.c @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12_1x2uC( - _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , + _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/kprepublic/bm43a/keymaps/default/keymap.c b/keyboards/kprepublic/bm43a/keymaps/default/keymap.c index e51156fd052..d7878e7f237 100644 --- a/keyboards/kprepublic/bm43a/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm43a/keymaps/default/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm43hsrgb/keymaps/default/keymap.c index b6edf3925e2..d8d1f1ac516 100755 --- a/keyboards/kprepublic/bm43hsrgb/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm43hsrgb/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/keymap.c index 9ef0ca3c473..f89dd675a00 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_60_ansi_arrow( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/keymap.c index d0a3d2bcf51..ef4cc103bf2 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_60_ansi_arrow( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_ec/rev1/keymaps/default/keymap.c index eb7e5cc221f..680c20327b9 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb_ec/rev1/keymaps/via/keymap.c index a82f480bf0a..c593a18b679 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/keymaps/via/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/keymaps/via/keymap.c @@ -28,21 +28,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ ), [3] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/default/keymap.c index 8e373e8c395..2aea24ff66b 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/default/keymap.c @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, _______, _______, _______, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, RMT, RMS, RMIH, RMDH, RMIS, RMDS, RMIV, RMDV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/via/keymap.c index 288f920d5e2..d7ea66d9381 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/via/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/keymaps/via/keymap.c @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, _______, _______, _______, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, RMT, RMS, RMIH, RMDH, RMIS, RMDS, RMIV, RMDV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/keymap.c index 7df75df11c2..558f03e1f2d 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_60_iso_arrow( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/default/keymap.c index 0e54a9dd4a0..db0ba7cd50d 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL ), [1] = LAYOUT_60_ansi( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/via/keymap.c index 049fc66b8c2..f0d50c54013 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/via/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, MO(1) ), [1] = LAYOUT_60_ansi( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/default/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/default/keymap.c index fdcae9037ce..4b5364fc9b6 100644 --- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_65_iso_blocker( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/keymap.c index c959f4a0bf1..ba9cabea65e 100644 --- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/keymap.c +++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_65_iso_blocker( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kprepublic/bm80v2/keymaps/default/keymap.c b/keyboards/kprepublic/bm80v2/keymaps/default/keymap.c index 96850f69952..090d61bed03 100644 --- a/keyboards/kprepublic/bm80v2/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm80v2/keymaps/default/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_tkl_ansi( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kprepublic/bm80v2/keymaps/via/keymap.c b/keyboards/kprepublic/bm80v2/keymaps/via/keymap.c index 96850f69952..090d61bed03 100644 --- a/keyboards/kprepublic/bm80v2/keymaps/via/keymap.c +++ b/keyboards/kprepublic/bm80v2/keymaps/via/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_tkl_ansi( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kprepublic/bm80v2_iso/keymaps/default/keymap.c b/keyboards/kprepublic/bm80v2_iso/keymaps/default/keymap.c index d4f4151c4c1..5cd13af6652 100644 --- a/keyboards/kprepublic/bm80v2_iso/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm80v2_iso/keymaps/default/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_tkl_iso( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kprepublic/bm80v2_iso/keymaps/via/keymap.c b/keyboards/kprepublic/bm80v2_iso/keymaps/via/keymap.c index d4f4151c4c1..5cd13af6652 100644 --- a/keyboards/kprepublic/bm80v2_iso/keymaps/via/keymap.c +++ b/keyboards/kprepublic/bm80v2_iso/keymaps/via/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_tkl_iso( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kprepublic/cospad/keymaps/default/keymap.c b/keyboards/kprepublic/cospad/keymaps/default/keymap.c index 4f8c8b2bbc4..59cc2ce42f4 100644 --- a/keyboards/kprepublic/cospad/keymaps/default/keymap.c +++ b/keyboards/kprepublic/cospad/keymaps/default/keymap.c @@ -52,6 +52,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_HUD, RGB_HUI, BL_ON, RGB_SAD, RGB_SAI, BL_OFF, _______, RGB_VAD, RGB_VAI, BL_STEP, - _______, QK_BOOT, _______ + _______, QK_BOOT, _______ ) }; diff --git a/keyboards/kprepublic/cospad/keymaps/via/keymap.c b/keyboards/kprepublic/cospad/keymaps/via/keymap.c index 2c9008c5753..ab6dce553f3 100644 --- a/keyboards/kprepublic/cospad/keymaps/via/keymap.c +++ b/keyboards/kprepublic/cospad/keymaps/via/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_HUD, RGB_HUI, BL_ON, RGB_SAD, RGB_SAI, BL_OFF, _______, RGB_VAD, RGB_VAI, BL_STEP, - _______, QK_BOOT, _______ + _______, QK_BOOT, _______ ), [2] = LAYOUT_numpad_6x4( diff --git a/keyboards/kprepublic/jj4x4/keymaps/via/keymap.c b/keyboards/kprepublic/jj4x4/keymaps/via/keymap.c index 120d275efd2..d94364c784f 100644 --- a/keyboards/kprepublic/jj4x4/keymaps/via/keymap.c +++ b/keyboards/kprepublic/jj4x4/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P0, KC_PDOT, KC_PPLS, LT(1, KC_ENT) ), LAYOUT_ortho_4x4( - QK_BOOT, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/kprepublic/jj50/keymaps/default/keymap.c b/keyboards/kprepublic/jj50/keymaps/default/keymap.c index 43c73cc99a7..05698551378 100644 --- a/keyboards/kprepublic/jj50/keymaps/default/keymap.c +++ b/keyboards/kprepublic/jj50/keymaps/default/keymap.c @@ -182,7 +182,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_CAPS, _______, _______, _______, _______, _______, _______, QWERTY, WORKMAN, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/kprepublic/jj50/keymaps/via/keymap.c b/keyboards/kprepublic/jj50/keymaps/via/keymap.c index 3e8d1c56860..4772d51d612 100644 --- a/keyboards/kprepublic/jj50/keymaps/via/keymap.c +++ b/keyboards/kprepublic/jj50/keymaps/via/keymap.c @@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/kradoindustries/krado66/keymaps/default/keymap.c b/keyboards/kradoindustries/krado66/keymaps/default/keymap.c index ca18457196d..60ffb68cffe 100644 --- a/keyboards/kradoindustries/krado66/keymaps/default/keymap.c +++ b/keyboards/kradoindustries/krado66/keymaps/default/keymap.c @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FUNCTION] = LAYOUT( - QK_BOOT, QWERTYX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT, \ + QK_BOOT, QWERTYX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT, \ QWERTY, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_DEL, \ _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, RGB_TOG, \ KC_TRNS, RGB_M_R, RGB_M_X, RGB_M_SW,RGB_M_K, RGB_M_B, RGB_M_G, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, KC_CAPS, KC_PGUP, KC_TRNS, \ @@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_EXTRA] = LAYOUT( - QK_BOOT, QWERTYX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT, \ + QK_BOOT, QWERTYX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT, \ QWERTY, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_DEL, \ _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, RGB_TOG, \ KC_TRNS, RGB_M_R, RGB_M_X, RGB_M_SW,RGB_M_K, RGB_M_B, RGB_M_G, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, KC_CAPS, KC_PGUP, KC_TRNS, \ diff --git a/keyboards/kradoindustries/krado66/keymaps/via/keymap.c b/keyboards/kradoindustries/krado66/keymaps/via/keymap.c index 192bd377bdf..80b72e05127 100644 --- a/keyboards/kradoindustries/krado66/keymaps/via/keymap.c +++ b/keyboards/kradoindustries/krado66/keymaps/via/keymap.c @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FUNCTION] = LAYOUT( - QK_BOOT, QWERTYX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT, \ + QK_BOOT, QWERTYX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT, \ QWERTY, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_DEL, \ _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, RGB_TOG, \ KC_TRNS, RGB_M_R, RGB_M_X, RGB_M_SW,RGB_M_K, RGB_M_B, RGB_M_G, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, KC_CAPS, KC_PGUP, KC_TRNS, \ @@ -118,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_EXTRA] = LAYOUT( - QK_BOOT, QWERTYX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT, \ + QK_BOOT, QWERTYX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT, \ QWERTY, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_DEL, \ _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, RGB_TOG, \ KC_TRNS, RGB_M_R, RGB_M_X, RGB_M_SW,RGB_M_K, RGB_M_B, RGB_M_G, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, KC_CAPS, KC_PGUP, KC_TRNS, \ diff --git a/keyboards/ktec/daisy/keymaps/default/keymap.c b/keyboards/ktec/daisy/keymaps/default/keymap.c index 2bb7048696b..628538dedb4 100644 --- a/keyboards/ktec/daisy/keymaps/default/keymap.c +++ b/keyboards/ktec/daisy/keymaps/default/keymap.c @@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴───┴────┴────────┴──────────┴────┴───┴────┘ */ [_RS] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_HOME, KC_PGUP, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_HOME, KC_PGUP, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_END, KC_PGDN, _______, _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ktec/daisy/keymaps/via/keymap.c b/keyboards/ktec/daisy/keymaps/via/keymap.c index 2b566454838..2190ca55046 100644 --- a/keyboards/ktec/daisy/keymaps/via/keymap.c +++ b/keyboards/ktec/daisy/keymaps/via/keymap.c @@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴───┴────┴────────┴──────────┴────┴───┴────┘ */ [_RS] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_HOME, KC_PGUP, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_HOME, KC_PGUP, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_END, KC_PGDN, _______, _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ky01/keymaps/default/keymap.c b/keyboards/ky01/keymaps/default/keymap.c index bb40b8bec6a..8fc498b7e87 100644 --- a/keyboards/ky01/keymaps/default/keymap.c +++ b/keyboards/ky01/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), [L1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/lazydesigners/bolt/keymaps/default/keymap.c b/keyboards/lazydesigners/bolt/keymaps/default/keymap.c index c1f9870ad66..a7f3ec14617 100644 --- a/keyboards/lazydesigners/bolt/keymaps/default/keymap.c +++ b/keyboards/lazydesigners/bolt/keymaps/default/keymap.c @@ -26,13 +26,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_LGUI, LT1_SPC, KC_SPC, LT1_SPC, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, + QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, KC_INS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO ), [2] = LAYOUT( - QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO diff --git a/keyboards/lazydesigners/bolt/keymaps/via/keymap.c b/keyboards/lazydesigners/bolt/keymaps/via/keymap.c index 11c4a8409db..e28b3fa34ad 100644 --- a/keyboards/lazydesigners/bolt/keymaps/via/keymap.c +++ b/keyboards/lazydesigners/bolt/keymaps/via/keymap.c @@ -23,13 +23,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, + QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, KC_INS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO ), [2] = LAYOUT( - QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO diff --git a/keyboards/lazydesigners/cassette8/keymaps/default/keymap.c b/keyboards/lazydesigners/cassette8/keymaps/default/keymap.c index b2646306548..ce1a8838f51 100755 --- a/keyboards/lazydesigners/cassette8/keymaps/default/keymap.c +++ b/keyboards/lazydesigners/cassette8/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_5, KC_6, KC_7, LT1_SPC ), [1] = LAYOUT( - QK_BOOT, KC_NO, KC_NO, KC_NO, + QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO ), [2] = LAYOUT( diff --git a/keyboards/lazydesigners/cassette8/keymaps/via/keymap.c b/keyboards/lazydesigners/cassette8/keymaps/via/keymap.c index b2646306548..ce1a8838f51 100755 --- a/keyboards/lazydesigners/cassette8/keymaps/via/keymap.c +++ b/keyboards/lazydesigners/cassette8/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_5, KC_6, KC_7, LT1_SPC ), [1] = LAYOUT( - QK_BOOT, KC_NO, KC_NO, KC_NO, + QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO ), [2] = LAYOUT( diff --git a/keyboards/lazydesigners/dimple/ortho/keymaps/default/keymap.c b/keyboards/lazydesigners/dimple/ortho/keymaps/default/keymap.c index afdc729f58c..26af526b692 100644 --- a/keyboards/lazydesigners/dimple/ortho/keymaps/default/keymap.c +++ b/keyboards/lazydesigners/dimple/ortho/keymaps/default/keymap.c @@ -40,7 +40,7 @@ ), [1] = LAYOUT_ortho_2u( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_NO, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO ), diff --git a/keyboards/lazydesigners/dimple/ortho/keymaps/via/keymap.c b/keyboards/lazydesigners/dimple/ortho/keymaps/via/keymap.c index 15248143bde..532679513b8 100644 --- a/keyboards/lazydesigners/dimple/ortho/keymaps/via/keymap.c +++ b/keyboards/lazydesigners/dimple/ortho/keymaps/via/keymap.c @@ -40,7 +40,7 @@ ), [1] = LAYOUT_ortho_2u( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_NO, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO ), diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/default/keymap.c b/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/default/keymap.c index 8742851f925..3725f84fefd 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/default/keymap.c +++ b/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/default/keymap.c @@ -40,7 +40,7 @@ ), [1] = LAYOUT_all( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_NO, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO ), diff --git a/keyboards/lazydesigners/dimpleplus/keymaps/default/keymap.c b/keyboards/lazydesigners/dimpleplus/keymaps/default/keymap.c index 8e82d33e423..f442f726923 100644 --- a/keyboards/lazydesigners/dimpleplus/keymaps/default/keymap.c +++ b/keyboards/lazydesigners/dimpleplus/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_LGUI, LT1_SPC, KC_SPC, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, QK_BOOT, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, QK_BOOT, KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_SCLN, KC_SLSH, KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO, KC_NO, KC_NO, KC_DOT, KC_NO, diff --git a/keyboards/lazydesigners/dimpleplus/keymaps/default_7u/keymap.c b/keyboards/lazydesigners/dimpleplus/keymaps/default_7u/keymap.c index b22c21c8dc9..79d5d2d4932 100644 --- a/keyboards/lazydesigners/dimpleplus/keymaps/default_7u/keymap.c +++ b/keyboards/lazydesigners/dimpleplus/keymaps/default_7u/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_SPC, KC_RALT, MO(1) ), [1] = LAYOUT_7u( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_TAB, KC_UNDS, KC_SCLN, KC_BSLS, KC_QUOT, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_UP, KC_SLSH, KC_LSFT, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPLY, KC_MFFD, KC_LEFT, KC_DOWN, KC_RIGHT, KC_RSFT, diff --git a/keyboards/lazydesigners/dimpleplus/keymaps/via/keymap.c b/keyboards/lazydesigners/dimpleplus/keymaps/via/keymap.c index 76cfe9a9a21..a72938fe918 100644 --- a/keyboards/lazydesigners/dimpleplus/keymaps/via/keymap.c +++ b/keyboards/lazydesigners/dimpleplus/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, diff --git a/keyboards/lazydesigners/the30/keymaps/via/keymap.c b/keyboards/lazydesigners/the30/keymaps/via/keymap.c index 0158e981c23..343f3358acc 100644 --- a/keyboards/lazydesigners/the30/keymaps/via/keymap.c +++ b/keyboards/lazydesigners/the30/keymaps/via/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(1) ), [1] = LAYOUT_ortho_3x10( - QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO ), diff --git a/keyboards/lazydesigners/the40/keymaps/default/keymap.c b/keyboards/lazydesigners/the40/keymaps/default/keymap.c index 6bd7bbfdbdd..349e244765b 100644 --- a/keyboards/lazydesigners/the40/keymaps/default/keymap.c +++ b/keyboards/lazydesigners/the40/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO ), diff --git a/keyboards/lazydesigners/the40/keymaps/via/keymap.c b/keyboards/lazydesigners/the40/keymaps/via/keymap.c index 615bbf6b805..e9540a2a013 100644 --- a/keyboards/lazydesigners/the40/keymaps/via/keymap.c +++ b/keyboards/lazydesigners/the40/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_ortho( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_NO, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO ), diff --git a/keyboards/lazydesigners/the60/rev2/keymaps/default/keymap.c b/keyboards/lazydesigners/the60/rev2/keymaps/default/keymap.c index 745f46e1fb3..b11bdec5637 100755 --- a/keyboards/lazydesigners/the60/rev2/keymaps/default/keymap.c +++ b/keyboards/lazydesigners/the60/rev2/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, BL_STEP, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, diff --git a/keyboards/lazydesigners/the60/rev2/keymaps/via/keymap.c b/keyboards/lazydesigners/the60/rev2/keymaps/via/keymap.c index 745f46e1fb3..b11bdec5637 100755 --- a/keyboards/lazydesigners/the60/rev2/keymaps/via/keymap.c +++ b/keyboards/lazydesigners/the60/rev2/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, BL_STEP, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, diff --git a/keyboards/leeku/finger65/keymaps/default/keymap.c b/keyboards/leeku/finger65/keymaps/default/keymap.c index b583577a0dd..ae013fffe00 100644 --- a/keyboards/leeku/finger65/keymaps/default/keymap.c +++ b/keyboards/leeku/finger65/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_DEL, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END), diff --git a/keyboards/lets_split/keymaps/default/keymap.c b/keyboards/lets_split/keymaps/default/keymap.c index 34b470d533e..4eec2e02acd 100644 --- a/keyboards/lets_split/keymaps/default/keymap.c +++ b/keyboards/lets_split/keymaps/default/keymap.c @@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/lets_split/keymaps/via/keymap.c b/keyboards/lets_split/keymaps/via/keymap.c index 6c5239cf4cf..65621981a7b 100644 --- a/keyboards/lets_split/keymaps/via/keymap.c +++ b/keyboards/lets_split/keymaps/via/keymap.c @@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , - QK_BOOT, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + QK_BOOT, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), @@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [3] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, RGB_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c b/keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c index d2a22a09eca..9013d181898 100644 --- a/keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c +++ b/keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/lime/keymaps/default/keymap.c b/keyboards/lime/keymaps/default/keymap.c index 9dd28948798..b208bd01e78 100644 --- a/keyboards/lime/keymaps/default/keymap.c +++ b/keyboards/lime/keymaps/default/keymap.c @@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------------' '------''----------------------------------' */ [_ADJUST] = LAYOUT( - QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_QWERTY, XXXXXXX, XXXXXXX, CG_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_JOYSTICK_DEBUG,XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_COLEMAK, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, diff --git a/keyboards/linworks/fave87/keymaps/default/keymap.c b/keyboards/linworks/fave87/keymaps/default/keymap.c index 7cc84d4ea40..4163f6368aa 100644 --- a/keyboards/linworks/fave87/keymaps/default/keymap.c +++ b/keyboards/linworks/fave87/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( RGB_TOG, RGB_VAD, RGB_VAI, BL_DOWN, BL_UP, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_SPI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), diff --git a/keyboards/linworks/fave87/keymaps/via/keymap.c b/keyboards/linworks/fave87/keymaps/via/keymap.c index 7cc84d4ea40..4163f6368aa 100644 --- a/keyboards/linworks/fave87/keymaps/via/keymap.c +++ b/keyboards/linworks/fave87/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( RGB_TOG, RGB_VAD, RGB_VAI, BL_DOWN, BL_UP, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_SPI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), diff --git a/keyboards/lm_keyboard/lm60n/keymaps/default/keymap.c b/keyboards/lm_keyboard/lm60n/keymaps/default/keymap.c index 6c4bf068215..772d9bcf2ec 100644 --- a/keyboards/lm_keyboard/lm60n/keymaps/default/keymap.c +++ b/keyboards/lm_keyboard/lm60n/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, RGB_TOG, RGB_RMOD,RGB_MOD, RGB_VAD, RGB_VAI, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/lm_keyboard/lm60n/keymaps/via/keymap.c b/keyboards/lm_keyboard/lm60n/keymaps/via/keymap.c index 0adcda16a2d..6076569ef64 100644 --- a/keyboards/lm_keyboard/lm60n/keymaps/via/keymap.c +++ b/keyboards/lm_keyboard/lm60n/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all_ansi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/lucid/alexa/keymaps/default/keymap.c b/keyboards/lucid/alexa/keymaps/default/keymap.c index fb8f7ca8029..82d328ae23e 100644 --- a/keyboards/lucid/alexa/keymaps/default/keymap.c +++ b/keyboards/lucid/alexa/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_LAYER1] = LAYOUT_65_ansi_blocker_split_bs( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/lucid/alexa/keymaps/via/keymap.c b/keyboards/lucid/alexa/keymaps/via/keymap.c index 5356ae28299..301c26d6ab1 100644 --- a/keyboards/lucid/alexa/keymaps/via/keymap.c +++ b/keyboards/lucid/alexa/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_LAYER1] = LAYOUT_65_ansi_blocker_split_bs( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/lucid/alexa_solder/keymaps/default/keymap.c b/keyboards/lucid/alexa_solder/keymaps/default/keymap.c index 60889b6e232..9677e1f697e 100644 --- a/keyboards/lucid/alexa_solder/keymaps/default/keymap.c +++ b/keyboards/lucid/alexa_solder/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, KC_DEL, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/lucid/alexa_solder/keymaps/via/keymap.c b/keyboards/lucid/alexa_solder/keymaps/via/keymap.c index dcd2f7de29c..6cbb72c8532 100644 --- a/keyboards/lucid/alexa_solder/keymaps/via/keymap.c +++ b/keyboards/lucid/alexa_solder/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, KC_TRNS, KC_DEL, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE,QK_BOOT, KC_PGUP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE,QK_BOOT, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/lucid/phantom_solder/keymaps/default/keymap.c b/keyboards/lucid/phantom_solder/keymaps/default/keymap.c index 17244e580dc..838d2043738 100644 --- a/keyboards/lucid/phantom_solder/keymaps/default/keymap.c +++ b/keyboards/lucid/phantom_solder/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, KC_DEL, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/lucid/phantom_solder/keymaps/via/keymap.c b/keyboards/lucid/phantom_solder/keymaps/via/keymap.c index 8d65087c78a..4470d48dcbf 100644 --- a/keyboards/lucid/phantom_solder/keymaps/via/keymap.c +++ b/keyboards/lucid/phantom_solder/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, KC_TRNS, KC_DEL, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE,QK_BOOT, KC_PGUP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE,QK_BOOT, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/lyso1/lck75/keymaps/7u/keymap.c b/keyboards/lyso1/lck75/keymaps/7u/keymap.c index e3458103a11..2b557d4984a 100644 --- a/keyboards/lyso1/lck75/keymaps/7u/keymap.c +++ b/keyboards/lyso1/lck75/keymaps/7u/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_7u( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, MO(1), KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/lyso1/lck75/keymaps/7u_iso/keymap.c b/keyboards/lyso1/lck75/keymaps/7u_iso/keymap.c index 74750a5dc60..d0ff3adf72f 100644 --- a/keyboards/lyso1/lck75/keymaps/7u_iso/keymap.c +++ b/keyboards/lyso1/lck75/keymaps/7u_iso/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_iso( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, MO(1), KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/lyso1/lck75/keymaps/7u_sbs/keymap.c b/keyboards/lyso1/lck75/keymaps/7u_sbs/keymap.c index 4a57ab5a63f..634329f0e73 100644 --- a/keyboards/lyso1/lck75/keymaps/7u_sbs/keymap.c +++ b/keyboards/lyso1/lck75/keymaps/7u_sbs/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_7u_sbs( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, MO(1), KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/lyso1/lck75/keymaps/default/keymap.c b/keyboards/lyso1/lck75/keymaps/default/keymap.c index 4f72b50e4ac..5c6f6a531dd 100644 --- a/keyboards/lyso1/lck75/keymaps/default/keymap.c +++ b/keyboards/lyso1/lck75/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_default( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, MO(1), KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/lyso1/lck75/keymaps/iso/keymap.c b/keyboards/lyso1/lck75/keymaps/iso/keymap.c index 3d412a66c69..12d688e5558 100644 --- a/keyboards/lyso1/lck75/keymaps/iso/keymap.c +++ b/keyboards/lyso1/lck75/keymaps/iso/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_iso( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, MO(1), KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/lyso1/lck75/keymaps/iso_sbs/keymap.c b/keyboards/lyso1/lck75/keymaps/iso_sbs/keymap.c index ca2e2351637..e335ae16bb9 100644 --- a/keyboards/lyso1/lck75/keymaps/iso_sbs/keymap.c +++ b/keyboards/lyso1/lck75/keymaps/iso_sbs/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_iso_sbs( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, MO(1), KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/lyso1/lck75/keymaps/via/keymap.c b/keyboards/lyso1/lck75/keymaps/via/keymap.c index 21ad2420945..3625dcd3434 100644 --- a/keyboards/lyso1/lck75/keymaps/via/keymap.c +++ b/keyboards/lyso1/lck75/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_default( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, MO(1), KC_TRNS, KC_TRNS, KC_TRNS @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_default( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, MO(1), KC_TRNS, KC_TRNS, KC_TRNS @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_default( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, MO(1), KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/lyso1/lefishe/keymaps/default/keymap.c b/keyboards/lyso1/lefishe/keymaps/default/keymap.c index ccba20a3cbe..e3291d6edb8 100644 --- a/keyboards/lyso1/lefishe/keymaps/default/keymap.c +++ b/keyboards/lyso1/lefishe/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_default( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/lyso1/lefishe/keymaps/wkl/keymap.c b/keyboards/lyso1/lefishe/keymaps/wkl/keymap.c index 41b092062b3..3caba293833 100644 --- a/keyboards/lyso1/lefishe/keymaps/wkl/keymap.c +++ b/keyboards/lyso1/lefishe/keymaps/wkl/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_wkl( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/makenova/omega/omega4/keymaps/default/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default/keymap.c index cfe32331455..581d9a44080 100644 --- a/keyboards/makenova/omega/omega4/keymaps/default/keymap.c +++ b/keyboards/makenova/omega/omega4/keymaps/default/keymap.c @@ -59,6 +59,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c index 00c135b3f30..d284528761c 100644 --- a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c +++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c @@ -59,6 +59,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS + QK_BOOT, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/maple_computing/minidox/keymaps/default/keymap.c b/keyboards/maple_computing/minidox/keymaps/default/keymap.c index 39ebffd9875..93a8e7025e5 100644 --- a/keyboards/maple_computing/minidox/keymaps/default/keymap.c +++ b/keyboards/maple_computing/minidox/keymaps/default/keymap.c @@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_split_3x5_3( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, TSKMGR, CALTDEL, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/marksard/leftover30/keymaps/default/keymap.c b/keyboards/marksard/leftover30/keymaps/default/keymap.c index 13c36a248dc..2e0d2aa6bb1 100644 --- a/keyboards/marksard/leftover30/keymaps/default/keymap.c +++ b/keyboards/marksard/leftover30/keymaps/default/keymap.c @@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_all( //,-----------------------------------------------------------------------------------------------------------. - QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_INS, KC_PSCR, + QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_INS, KC_PSCR, //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NUM, //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| diff --git a/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c b/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c index 1db0ca318b0..db2baa90852 100644 --- a/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c +++ b/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c @@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_isoenter( //,-----------------------------------------------------------------------------------------------------------. - QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_INS, KC_PSCR, + QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_INS, KC_PSCR, //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NUM, //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| diff --git a/keyboards/marksard/rhymestone/keymaps/default/keymap.c b/keyboards/marksard/rhymestone/keymaps/default/keymap.c index 0827c185937..7cbd51fbd67 100644 --- a/keyboards/marksard/rhymestone/keymaps/default/keymap.c +++ b/keyboards/marksard/rhymestone/keymaps/default/keymap.c @@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_ortho_4x10( //,---------------------------------------------------------------------------------------------------. - QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_PSCR, + QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_PSCR, //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NUM, //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| diff --git a/keyboards/marksard/treadstone32/keymaps/default/keymap.c b/keyboards/marksard/treadstone32/keymaps/default/keymap.c index cbc8ed42bba..7e6aaf20098 100644 --- a/keyboards/marksard/treadstone32/keymaps/default/keymap.c +++ b/keyboards/marksard/treadstone32/keymaps/default/keymap.c @@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( //,---------------------------------------------------------------------------------------------------. - QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_PSCR, + QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_PSCR, //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NUM, //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| diff --git a/keyboards/marksard/treadstone48/keymaps/default/keymap.c b/keyboards/marksard/treadstone48/keymaps/default/keymap.c index b7b0b0f46a0..20d7badb897 100644 --- a/keyboards/marksard/treadstone48/keymaps/default/keymap.c +++ b/keyboards/marksard/treadstone48/keymaps/default/keymap.c @@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_base( //,--------------------------------------------------------------------------------------------------------------------. - XXXXXXX, QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP, XXXXXXX, + XXXXXXX, QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP, XXXXXXX, //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+-----------------| XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, KC_WH_R, KC_WH_D, KC_END, KC_PGDN, XXXXXXX, //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------| diff --git a/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c b/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c index 643926d9387..e6667e2e198 100644 --- a/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c +++ b/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c @@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_base( //,--------------------------------------------------------------------------------------------------------------------. - XXXXXXX, QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP, XXXXXXX, + XXXXXXX, QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP, XXXXXXX, //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+-----------------| XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, KC_WH_R, KC_WH_D, KC_END, KC_PGDN, XXXXXXX, //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------| diff --git a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c index 8ab72847473..bfd8dff1112 100644 --- a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c +++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c @@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_rs( // Treadstone48 Rhymestone //,--------------------------------------------------------------------------------------------------------------------. --------------------------------------------. - XXXXXXX, QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+-----------------| --------+--------+--------+--------+--------| XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, KC_WH_R, KC_WH_D, KC_END, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------| --------+--------+--------+--------+--------| diff --git a/keyboards/matrix/abelx/keymaps/default/keymap.c b/keyboards/matrix/abelx/keymaps/default/keymap.c index e4d2cd41f56..7376259a89b 100644 --- a/keyboards/matrix/abelx/keymaps/default/keymap.c +++ b/keyboards/matrix/abelx/keymaps/default/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, KC_MPLY, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), }; diff --git a/keyboards/matrix/abelx/keymaps/iso/keymap.c b/keyboards/matrix/abelx/keymaps/iso/keymap.c index e0061099052..3fce63a8211 100644 --- a/keyboards/matrix/abelx/keymaps/iso/keymap.c +++ b/keyboards/matrix/abelx/keymaps/iso/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, KC_MPLY, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), }; diff --git a/keyboards/matrix/cain_re/keymaps/default/keymap.c b/keyboards/matrix/cain_re/keymaps/default/keymap.c index 8df1dabe61c..d23d4982a72 100644 --- a/keyboards/matrix/cain_re/keymaps/default/keymap.c +++ b/keyboards/matrix/cain_re/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______, _______, _______, KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______, KC_VOLU, _______, _______, _______, KC_MPLY, _______, _______, _______, _______,_______,_______,_______, KC_MPRV, KC_VOLD, KC_MNXT), }; diff --git a/keyboards/matrix/falcon/keymaps/default/keymap.c b/keyboards/matrix/falcon/keymaps/default/keymap.c index a40f1d4094f..c371a99c75c 100644 --- a/keyboards/matrix/falcon/keymaps/default/keymap.c +++ b/keyboards/matrix/falcon/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_hhkb( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR, - QK_BOOT, RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, + QK_BOOT, RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME,KC_END,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______, _______, _______,_______), diff --git a/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c b/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c index d6e96a48135..5fa7ebdd731 100644 --- a/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c +++ b/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi_tsangan( KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, KC_TRNS, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c index 71436fddd05..790625465bf 100644 --- a/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c +++ b/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), }; diff --git a/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c index 4c3b86ec4b2..68fdb33f688 100644 --- a/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c +++ b/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), }; diff --git a/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c index 2f0bbe2c698..db99fef7db6 100644 --- a/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c +++ b/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), diff --git a/keyboards/matrix/m20add/keymaps/default/keymap.c b/keyboards/matrix/m20add/keymaps/default/keymap.c index 0cd0e239162..92a34c68111 100644 --- a/keyboards/matrix/m20add/keymaps/default/keymap.c +++ b/keyboards/matrix/m20add/keymaps/default/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, KC_F24, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, KC_F24, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), }; diff --git a/keyboards/matrix/m20add/keymaps/iso/keymap.c b/keyboards/matrix/m20add/keymaps/iso/keymap.c index 85bfbaa6605..3d6cd8f073a 100644 --- a/keyboards/matrix/m20add/keymaps/iso/keymap.c +++ b/keyboards/matrix/m20add/keymaps/iso/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), }; diff --git a/keyboards/mb44/keymaps/default/keymap.c b/keyboards/mb44/keymaps/default/keymap.c index 8b8c5092410..977f4f34c1a 100644 --- a/keyboards/mb44/keymaps/default/keymap.c +++ b/keyboards/mb44/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER2] = LAYOUT_default( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL, KC_RALT, KC_RCTL ), }; diff --git a/keyboards/mb44/keymaps/via/keymap.c b/keyboards/mb44/keymaps/via/keymap.c index fa999fa8cc7..f765ecd245c 100644 --- a/keyboards/mb44/keymaps/via/keymap.c +++ b/keyboards/mb44/keymaps/via/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER2] = LAYOUT_default( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL, KC_RALT, KC_RCTL ), diff --git a/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c b/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c index 31db5531177..90b6d4e0567 100644 --- a/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c +++ b/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT( /*3: Empty */ - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c b/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c index 45a09b06a7b..f0d1700267b 100644 --- a/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c +++ b/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT( /*3: Empty */ - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/mechanickeys/undead60m/keymaps/default/keymap.c b/keyboards/mechanickeys/undead60m/keymaps/default/keymap.c index cad22afff4b..cabdc8db6bb 100644 --- a/keyboards/mechanickeys/undead60m/keymaps/default/keymap.c +++ b/keyboards/mechanickeys/undead60m/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( /* 1: fn */ KC_TRNS, KC_TRNS, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS diff --git a/keyboards/mechanickeys/undead60m/keymaps/via/keymap.c b/keyboards/mechanickeys/undead60m/keymaps/via/keymap.c index a12e6c7bd40..fc9fd9b1f40 100644 --- a/keyboards/mechanickeys/undead60m/keymaps/via/keymap.c +++ b/keyboards/mechanickeys/undead60m/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( /* 1: fn */ KC_TRNS, KC_TRNS, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS diff --git a/keyboards/mechkeys/espectro/keymaps/default/keymap.c b/keyboards/mechkeys/espectro/keymaps/default/keymap.c index 3efe7989a1d..823fef9de5c 100755 --- a/keyboards/mechkeys/espectro/keymaps/default/keymap.c +++ b/keyboards/mechkeys/espectro/keymaps/default/keymap.c @@ -76,7 +76,7 @@ ________________________________________________________________________________ */ [_FN1] = LAYOUT_default( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, BL_TOGG, BL_UP, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/mechkeys/espectro/keymaps/iso/keymap.c b/keyboards/mechkeys/espectro/keymaps/iso/keymap.c index bd9426da6f1..15be88e37a8 100755 --- a/keyboards/mechkeys/espectro/keymaps/iso/keymap.c +++ b/keyboards/mechkeys/espectro/keymaps/iso/keymap.c @@ -76,7 +76,7 @@ ________________________________________________________________________________ */ [_FN1] = LAYOUT_iso( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, BL_TOGG, BL_UP, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/mechkeys/mk60/keymaps/default/keymap.c b/keyboards/mechkeys/mk60/keymaps/default/keymap.c index faef51330d3..a917b7ce5c7 100644 --- a/keyboards/mechkeys/mk60/keymaps/default/keymap.c +++ b/keyboards/mechkeys/mk60/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(1), KC_SPC, KC_RALT, KC_PGUP, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c b/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c index 049607376dd..f9c8c1397aa 100644 --- a/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c +++ b/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN2] = LAYOUT( _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c b/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c index 049607376dd..f9c8c1397aa 100644 --- a/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c +++ b/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN2] = LAYOUT( _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/mehkee96/keymaps/default/keymap.c b/keyboards/mehkee96/keymaps/default/keymap.c index 6576661865a..c411dbc189d 100644 --- a/keyboards/mehkee96/keymaps/default/keymap.c +++ b/keyboards/mehkee96/keymaps/default/keymap.c @@ -61,7 +61,7 @@ BL_TOGG, BL_DOWN,BL_UP changes the in-switch LEDs LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/melgeek/mach80/keymaps/default/keymap.c b/keyboards/melgeek/mach80/keymaps/default/keymap.c index 3530c9e7cbb..49b67c40b3b 100755 --- a/keyboards/melgeek/mach80/keymaps/default/keymap.c +++ b/keyboards/melgeek/mach80/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi( /* FN */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, KC_END, _______, - _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT, _______, KC_INS, _______, + _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/melgeek/mach80/keymaps/via/keymap.c b/keyboards/melgeek/mach80/keymaps/via/keymap.c index 3ec65081b7e..3e18aaca53b 100755 --- a/keyboards/melgeek/mach80/keymaps/via/keymap.c +++ b/keyboards/melgeek/mach80/keymaps/via/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi( /* FN */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, KC_END, _______, - _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT, _______, KC_INS, _______, + _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/melgeek/mach80/keymaps/wkl/keymap.c b/keyboards/melgeek/mach80/keymaps/wkl/keymap.c index dff20e628c2..fcaae9338af 100755 --- a/keyboards/melgeek/mach80/keymaps/wkl/keymap.c +++ b/keyboards/melgeek/mach80/keymaps/wkl/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_ansi_wkl( /* FN */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, KC_END, _______, - _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT, _______, KC_INS, _______, + _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/meow65/keymaps/default/keymap.c b/keyboards/meow65/keymaps/default/keymap.c index 485c22e10df..0bc1afe69ab 100644 --- a/keyboards/meow65/keymaps/default/keymap.c +++ b/keyboards/meow65/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT_65_ansi_blocker( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/meow65/keymaps/via/keymap.c b/keyboards/meow65/keymaps/via/keymap.c index d5bbede8866..c53cd833a0c 100644 --- a/keyboards/meow65/keymaps/via/keymap.c +++ b/keyboards/meow65/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_L1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_L1] = LAYOUT_65_ansi_blocker( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/meson/keymaps/default/keymap.c b/keyboards/meson/keymaps/default/keymap.c index b83a2a7533a..6077ca678cd 100644 --- a/keyboards/meson/keymaps/default/keymap.c +++ b/keyboards/meson/keymaps/default/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT( /* Reset, other functions if you want */ - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/miuni32/keymaps/default/keymap.c b/keyboards/miuni32/keymaps/default/keymap.c index 5d1eab8b8c9..d6f5f40fddf 100644 --- a/keyboards/miuni32/keymaps/default/keymap.c +++ b/keyboards/miuni32/keymaps/default/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------------------------------| */ [3] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + QK_BOOT, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, KC_NO, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 ) diff --git a/keyboards/mlego/m60/keymaps/via/keymap.c b/keyboards/mlego/m60/keymaps/via/keymap.c index fc3ab612d09..d997bd2dc06 100644 --- a/keyboards/mlego/m60/keymaps/via/keymap.c +++ b/keyboards/mlego/m60/keymaps/via/keymap.c @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJ] = LAYOUT_ortho_5x12( - _______, QK_BOOT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, QK_BOOT, _______, + _______, QK_BOOT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/mntre/keymaps/default/keymap.c b/keyboards/mntre/keymaps/default/keymap.c index 227ab15c62d..2db7a7d975d 100644 --- a/keyboards/mntre/keymaps/default/keymap.c +++ b/keyboards/mntre/keymaps/default/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( _______, BL_DOWN, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/mode/m80v1/m80h/keymaps/default/keymap.c b/keyboards/mode/m80v1/m80h/keymaps/default/keymap.c index d9d8e2a878a..920e1c0c1b6 100644 --- a/keyboards/mode/m80v1/m80h/keymaps/default/keymap.c +++ b/keyboards/mode/m80v1/m80h/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [_FN1] = LAYOUT_tkl_ansi( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/mode/m80v1/m80h/keymaps/via/keymap.c b/keyboards/mode/m80v1/m80h/keymaps/via/keymap.c index a2bdf526384..e54cf66e0b9 100644 --- a/keyboards/mode/m80v1/m80h/keymaps/via/keymap.c +++ b/keyboards/mode/m80v1/m80h/keymaps/via/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [_FN1] = LAYOUT_tkl_ansi( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/mode/m80v1/m80s/keymaps/default/keymap.c b/keyboards/mode/m80v1/m80s/keymaps/default/keymap.c index 6712f9e1c6b..8d13c6bb71a 100644 --- a/keyboards/mode/m80v1/m80s/keymaps/default/keymap.c +++ b/keyboards/mode/m80v1/m80s/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [_FN1] = LAYOUT_eighty_m80s( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/mode/m80v1/m80s/keymaps/via/keymap.c b/keyboards/mode/m80v1/m80s/keymaps/via/keymap.c index 248758525bb..ef862d3b523 100644 --- a/keyboards/mode/m80v1/m80s/keymaps/via/keymap.c +++ b/keyboards/mode/m80v1/m80s/keymaps/via/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [_FN1] = LAYOUT_eighty_m80s( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/mokey/ginkgo65/keymaps/default/keymap.c b/keyboards/mokey/ginkgo65/keymaps/default/keymap.c index fbe5a8531fd..386584bb682 100644 --- a/keyboards/mokey/ginkgo65/keymaps/default/keymap.c +++ b/keyboards/mokey/ginkgo65/keymaps/default/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - BL_TOGG, BL_STEP, BL_DOWN, BL_UP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_TOGG, BL_STEP, BL_DOWN, BL_UP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/mokey/ginkgo65/keymaps/via/keymap.c b/keyboards/mokey/ginkgo65/keymaps/via/keymap.c index 5a9f3cf8390..3a801372143 100644 --- a/keyboards/mokey/ginkgo65/keymaps/via/keymap.c +++ b/keyboards/mokey/ginkgo65/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - BL_TOGG, BL_STEP, BL_DOWN, BL_UP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_TOGG, BL_STEP, BL_DOWN, BL_UP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/mokey/ginkgo65hot/keymaps/via/keymap.c b/keyboards/mokey/ginkgo65hot/keymaps/via/keymap.c index 7f4924e1a16..59744905c63 100644 --- a/keyboards/mokey/ginkgo65hot/keymaps/via/keymap.c +++ b/keyboards/mokey/ginkgo65hot/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - BL_TOGG, BL_STEP, BL_DOWN, BL_UP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_TOGG, BL_STEP, BL_DOWN, BL_UP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/momoka_ergo/keymaps/default/keymap.c b/keyboards/momoka_ergo/keymaps/default/keymap.c index 45faae63bae..143a3900ef4 100644 --- a/keyboards/momoka_ergo/keymaps/default/keymap.c +++ b/keyboards/momoka_ergo/keymaps/default/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN2] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, QK_BOOT, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, + _______, _______, _______, QK_BOOT, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_MOD, RGB_TOG, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, RGB_VAI, RGB_VAD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, diff --git a/keyboards/momoka_ergo/keymaps/via/keymap.c b/keyboards/momoka_ergo/keymaps/via/keymap.c index 34b363841e8..466f05dd204 100644 --- a/keyboards/momoka_ergo/keymaps/via/keymap.c +++ b/keyboards/momoka_ergo/keymaps/via/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN2] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_MOD, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, RGB_VAI, RGB_VAD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/monarch/keymaps/default/keymap.c b/keyboards/monarch/keymaps/default/keymap.c index 76d64c35635..d1b00eebbf1 100644 --- a/keyboards/monarch/keymaps/default/keymap.c +++ b/keyboards/monarch/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_ansi( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_ON, diff --git a/keyboards/monarch/keymaps/iso/keymap.c b/keyboards/monarch/keymaps/iso/keymap.c index 5df9e560d0c..a2b464657a4 100644 --- a/keyboards/monarch/keymaps/iso/keymap.c +++ b/keyboards/monarch/keymaps/iso/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_iso( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_ON, diff --git a/keyboards/monarch/keymaps/via/keymap.c b/keyboards/monarch/keymaps/via/keymap.c index 39ad94fb8eb..4638f4d15f4 100644 --- a/keyboards/monarch/keymaps/via/keymap.c +++ b/keyboards/monarch/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_ON, diff --git a/keyboards/montsinger/rebound/rev1/keymaps/default/keymap.c b/keyboards/montsinger/rebound/rev1/keymaps/default/keymap.c index b5a9b110857..9b2369ce314 100644 --- a/keyboards/montsinger/rebound/rev1/keymaps/default/keymap.c +++ b/keyboards/montsinger/rebound/rev1/keymaps/default/keymap.c @@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/montsinger/rebound/rev2/keymaps/default/keymap.c b/keyboards/montsinger/rebound/rev2/keymaps/default/keymap.c index 45cda20cf17..d430a7877f3 100644 --- a/keyboards/montsinger/rebound/rev2/keymaps/default/keymap.c +++ b/keyboards/montsinger/rebound/rev2/keymaps/default/keymap.c @@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_all( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/montsinger/rebound/rev3/keymaps/default/keymap.c b/keyboards/montsinger/rebound/rev3/keymaps/default/keymap.c index cda97096adf..aadbde3672f 100644 --- a/keyboards/montsinger/rebound/rev3/keymaps/default/keymap.c +++ b/keyboards/montsinger/rebound/rev3/keymaps/default/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT_all( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, _______, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/montsinger/rebound/rev4/keymaps/default/keymap.c b/keyboards/montsinger/rebound/rev4/keymaps/default/keymap.c index cda97096adf..aadbde3672f 100644 --- a/keyboards/montsinger/rebound/rev4/keymaps/default/keymap.c +++ b/keyboards/montsinger/rebound/rev4/keymaps/default/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT_all( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, _______, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/montsinger/rebound/rev4/keymaps/via/keymap.c b/keyboards/montsinger/rebound/rev4/keymaps/via/keymap.c index f678ce60ba0..f6f9b08a42b 100644 --- a/keyboards/montsinger/rebound/rev4/keymaps/via/keymap.c +++ b/keyboards/montsinger/rebound/rev4/keymaps/via/keymap.c @@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT_all( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, _______, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/montsinger/rewind/keymaps/default/keymap.c b/keyboards/montsinger/rewind/keymaps/default/keymap.c index 8cd802eb73d..b46292ea5ff 100644 --- a/keyboards/montsinger/rewind/keymaps/default/keymap.c +++ b/keyboards/montsinger/rewind/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_LEFT, KC_UP, KC_RIGHT,KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DOWN, XXXXXXX, XXXXXXX, - QK_BOOT, XXXXXXX, XXXXXXX, _______, KC_BSPC, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + QK_BOOT, XXXXXXX, XXXXXXX, _______, KC_BSPC, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), [_SYM] = LAYOUT_ortho_5x10( diff --git a/keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c b/keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c index 7ae43b355d4..f6314f228b4 100644 --- a/keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c +++ b/keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c @@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 */ [_FN] = LAYOUT_60_ansi_arrow( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, RGB_HUI, RGB_MOD, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, RGB_HUI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI diff --git a/keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c b/keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c index 7ae43b355d4..f6314f228b4 100644 --- a/keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c +++ b/keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c @@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 */ [_FN] = LAYOUT_60_ansi_arrow( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, RGB_HUI, RGB_MOD, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, RGB_HUI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI diff --git a/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c b/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c index 7e66cc4f325..c37dcd8fb10 100644 --- a/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c +++ b/keyboards/mss_studio/m64_rgb/keymaps/default/keymap.c @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 */ [_FN] = LAYOUT_64_ansi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, RGB_HUI, RGB_MOD, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, RGB_HUI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI diff --git a/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c b/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c index 7e66cc4f325..c37dcd8fb10 100644 --- a/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c +++ b/keyboards/mss_studio/m64_rgb/keymaps/via/keymap.c @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 */ [_FN] = LAYOUT_64_ansi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, RGB_HUI, RGB_MOD, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, RGB_HUI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI diff --git a/keyboards/mt/blocked65/keymaps/default/keymap.c b/keyboards/mt/blocked65/keymaps/default/keymap.c index ab7f37a51d8..68e086501e8 100644 --- a/keyboards/mt/blocked65/keymaps/default/keymap.c +++ b/keyboards/mt/blocked65/keymaps/default/keymap.c @@ -22,10 +22,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FL] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PSCR, - KC_TRNS, KC_NO, KC_UP, KC_NO, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, KC_INS, QK_BOOT, KC_PSCR, KC_SCRL, KC_PAUS, KC_BSLS, KC_SCRL, + KC_TRNS, KC_NO, KC_UP, KC_NO, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, KC_INS, QK_BOOT, KC_PSCR, KC_SCRL, KC_PAUS, KC_BSLS, KC_SCRL, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_MOD, RGB_VAD, RGB_HUD, RGB_SAD, KC_NO, KC_NO, KC_F14, KC_F15, KC_INS, KC_HOME, KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, BL_TOGG, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_RSFT, RGB_MOD, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, QK_BOOT, KC_RALT, KC_TRNS, KC_HOME, BL_STEP, KC_END + KC_LCTL, KC_LGUI, KC_LALT, QK_BOOT, KC_RALT, KC_TRNS, KC_HOME, BL_STEP, KC_END ) }; diff --git a/keyboards/mt/blocked65/keymaps/via/keymap.c b/keyboards/mt/blocked65/keymaps/via/keymap.c index b328b0e7356..3be65ca5877 100644 --- a/keyboards/mt/blocked65/keymaps/via/keymap.c +++ b/keyboards/mt/blocked65/keymaps/via/keymap.c @@ -24,10 +24,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FL] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PSCR, - KC_TRNS, KC_NO, KC_UP, KC_NO, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, KC_INS, QK_BOOT, KC_PSCR, KC_SCRL, KC_PAUS, KC_BSLS, KC_SCRL, + KC_TRNS, KC_NO, KC_UP, KC_NO, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, KC_INS, QK_BOOT, KC_PSCR, KC_SCRL, KC_PAUS, KC_BSLS, KC_SCRL, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_MOD, RGB_VAD, RGB_HUD, RGB_SAD, KC_NO, KC_NO, KC_F14, KC_F15, KC_INS, KC_HOME, KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, BL_TOGG, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_RSFT, RGB_MOD, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, QK_BOOT, KC_RALT, KC_TRNS, KC_HOME, BL_STEP, KC_END + KC_LCTL, KC_LGUI, KC_LALT, QK_BOOT, KC_RALT, KC_TRNS, KC_HOME, BL_STEP, KC_END ), [_SL] = LAYOUT_65_ansi_blocker( diff --git a/keyboards/mt/mt980/keymaps/default/keymap.c b/keyboards/mt/mt980/keymaps/default/keymap.c index ee49cc522e5..f25fba2465d 100644 --- a/keyboards/mt/mt980/keymaps/default/keymap.c +++ b/keyboards/mt/mt980/keymaps/default/keymap.c @@ -12,10 +12,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUSE, KC_SCRL, KC_HOME, KC_END, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_VAD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS) + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_VAD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/mwstudio/alicekk/keymaps/default/keymap.c b/keyboards/mwstudio/alicekk/keymaps/default/keymap.c index 81ba1191db3..adec82d5036 100644 --- a/keyboards/mwstudio/alicekk/keymaps/default/keymap.c +++ b/keyboards/mwstudio/alicekk/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, - _______, RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______ diff --git a/keyboards/mwstudio/alicekk/keymaps/via/keymap.c b/keyboards/mwstudio/alicekk/keymaps/via/keymap.c index 5c3ae235b14..bac5dcb8341 100644 --- a/keyboards/mwstudio/alicekk/keymaps/via/keymap.c +++ b/keyboards/mwstudio/alicekk/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, - _______, RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______ diff --git a/keyboards/mwstudio/mw65_black/keymaps/default/keymap.c b/keyboards/mwstudio/mw65_black/keymaps/default/keymap.c index 44e3097d471..0150a7b6749 100644 --- a/keyboards/mwstudio/mw65_black/keymaps/default/keymap.c +++ b/keyboards/mwstudio/mw65_black/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), diff --git a/keyboards/mwstudio/mw65_black/keymaps/via/keymap.c b/keyboards/mwstudio/mw65_black/keymaps/via/keymap.c index 44e3097d471..0150a7b6749 100644 --- a/keyboards/mwstudio/mw65_black/keymaps/via/keymap.c +++ b/keyboards/mwstudio/mw65_black/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), diff --git a/keyboards/mwstudio/mw75r2/keymaps/default/keymap.c b/keyboards/mwstudio/mw75r2/keymaps/default/keymap.c index 1c46bdc5728..5976aec91f7 100644 --- a/keyboards/mwstudio/mw75r2/keymaps/default/keymap.c +++ b/keyboards/mwstudio/mw75r2/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, - RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, _______, _______, _______, _______, RGB_MOD, _______, RGB_SPD, RGB_VAD, RGB_SPI diff --git a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c index 777a0dd6f47..08526094c54 100644 --- a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c +++ b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, USER00, USER01, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, - RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + RGB_TOG, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, _______, _______, _______, _______, RGB_MOD, _______, RGB_SPD, RGB_VAD, RGB_SPI diff --git a/keyboards/mwstudio/mw80/keymaps/default/keymap.c b/keyboards/mwstudio/mw80/keymaps/default/keymap.c index 6afeceaadb9..390f8789abb 100644 --- a/keyboards/mwstudio/mw80/keymaps/default/keymap.c +++ b/keyboards/mwstudio/mw80/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUI, RGB_VAI, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/mwstudio/mw80/keymaps/via/keymap.c b/keyboards/mwstudio/mw80/keymaps/via/keymap.c index 5da7e2f8826..baf3d2b938f 100644 --- a/keyboards/mwstudio/mw80/keymaps/via/keymap.c +++ b/keyboards/mwstudio/mw80/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUI, RGB_VAI, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/mysticworks/wyvern/keymaps/default/keymap.c b/keyboards/mysticworks/wyvern/keymaps/default/keymap.c index e95d7e0d805..32696312066 100644 --- a/keyboards/mysticworks/wyvern/keymaps/default/keymap.c +++ b/keyboards/mysticworks/wyvern/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P0, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( - _______, _______, _______, _______, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/mysticworks/wyvern/keymaps/via/keymap.c b/keyboards/mysticworks/wyvern/keymaps/via/keymap.c index bcf6198ede6..5d16c7e4b6a 100644 --- a/keyboards/mysticworks/wyvern/keymaps/via/keymap.c +++ b/keyboards/mysticworks/wyvern/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P0, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( - _______, _______, _______, _______, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/neokeys/g67/element_hs/keymaps/default/keymap.c b/keyboards/neokeys/g67/element_hs/keymaps/default/keymap.c index bd49d335d79..0461030be3b 100644 --- a/keyboards/neokeys/g67/element_hs/keymaps/default/keymap.c +++ b/keyboards/neokeys/g67/element_hs/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_HOME, _______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS, KC_HOME, KC_PGUP, _______, KC_PGUP, - _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, KC_PGDN, + _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/neokeys/g67/element_hs/keymaps/via/keymap.c b/keyboards/neokeys/g67/element_hs/keymaps/via/keymap.c index e7c28aa0ad5..2fa810c71fe 100644 --- a/keyboards/neokeys/g67/element_hs/keymaps/via/keymap.c +++ b/keyboards/neokeys/g67/element_hs/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_HOME, _______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS, KC_HOME, KC_PGUP, _______, KC_PGUP, - _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, KC_PGDN, + _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT_65_ansi_blocker( diff --git a/keyboards/neokeys/g67/hotswap/keymaps/default/keymap.c b/keyboards/neokeys/g67/hotswap/keymaps/default/keymap.c index 33a5fa5e006..d7cb34bc636 100644 --- a/keyboards/neokeys/g67/hotswap/keymaps/default/keymap.c +++ b/keyboards/neokeys/g67/hotswap/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_HOME, _______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS, KC_HOME, KC_PGUP, _______, KC_PGUP, - _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, KC_PGDN, + _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/neokeys/g67/hotswap/keymaps/via/keymap.c b/keyboards/neokeys/g67/hotswap/keymaps/via/keymap.c index 69d3a90fd87..c839a47731c 100644 --- a/keyboards/neokeys/g67/hotswap/keymaps/via/keymap.c +++ b/keyboards/neokeys/g67/hotswap/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_HOME, _______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS, KC_HOME, KC_PGUP, _______, KC_PGUP, - _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, KC_PGDN, + _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT_65_ansi_blocker( diff --git a/keyboards/neokeys/g67/soldered/keymaps/default/keymap.c b/keyboards/neokeys/g67/soldered/keymaps/default/keymap.c index b8c37e14045..5abca799b35 100644 --- a/keyboards/neokeys/g67/soldered/keymaps/default/keymap.c +++ b/keyboards/neokeys/g67/soldered/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_INS, KC_HOME, KC_PGUP, _______, _______, - _______, _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, + _______, _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/neokeys/g67/soldered/keymaps/via/keymap.c b/keyboards/neokeys/g67/soldered/keymaps/via/keymap.c index 7d7c1a1a449..d1dca901d28 100644 --- a/keyboards/neokeys/g67/soldered/keymaps/via/keymap.c +++ b/keyboards/neokeys/g67/soldered/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_INS, KC_HOME, KC_PGUP, _______, _______, - _______, _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, + _______, _______, QK_BOOT, BL_DOWN, BL_TOGG, BL_UP, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT_all( diff --git a/keyboards/neson_design/n6/keymaps/default/keymap.c b/keyboards/neson_design/n6/keymaps/default/keymap.c index 56d867f2183..b2f192f408a 100644 --- a/keyboards/neson_design/n6/keymaps/default/keymap.c +++ b/keyboards/neson_design/n6/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi_blocker_split_bs( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR,_______, - QK_BOOT, RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,_______, + QK_BOOT, RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,_______, _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END, _______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______, _______, _______,_______, _______,_______,_______), diff --git a/keyboards/neson_design/n6/keymaps/via/keymap.c b/keyboards/neson_design/n6/keymaps/via/keymap.c index dc9b3714ceb..a8942028d81 100644 --- a/keyboards/neson_design/n6/keymaps/via/keymap.c +++ b/keyboards/neson_design/n6/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi_blocker_split_bs( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR,_______, - QK_BOOT, RGB_TOG,RGB_MOD,RGB_RMOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,KC_MUTE,KC_VOLU,KC_VOLD,_______, _______, + QK_BOOT,RGB_TOG,RGB_MOD,RGB_RMOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,KC_MUTE,KC_VOLU,KC_VOLD,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______, _______,_______,_______, _______, _______,_______, _______,_______,_______), diff --git a/keyboards/nightingale_studios/hailey/keymaps/default/keymap.c b/keyboards/nightingale_studios/hailey/keymaps/default/keymap.c index 88997699a1b..fcf0c8850d1 100644 --- a/keyboards/nightingale_studios/hailey/keymaps/default/keymap.c +++ b/keyboards/nightingale_studios/hailey/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_ansi( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/nightingale_studios/hailey/keymaps/via/keymap.c b/keyboards/nightingale_studios/hailey/keymaps/via/keymap.c index 8836cf5278b..b7f2b40d37b 100644 --- a/keyboards/nightingale_studios/hailey/keymaps/via/keymap.c +++ b/keyboards/nightingale_studios/hailey/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c b/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c index b5b909a07df..e671804adfc 100644 --- a/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c +++ b/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RGUI, KC_RCTL ), [1] = LAYOUT_alice_split_bs( - QK_BOOT, _______, KC_F1 , KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, _______, KC_F1 , KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_BRIU, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______ , _______, KC_DEL, KC_BRID, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_HOME, KC_END, _______, _______, diff --git a/keyboards/nightly_boards/alter_lite/keymaps/default/keymap.c b/keyboards/nightly_boards/alter_lite/keymaps/default/keymap.c index fbf3eb02718..226e487c393 100644 --- a/keyboards/nightly_boards/alter_lite/keymaps/default/keymap.c +++ b/keyboards/nightly_boards/alter_lite/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(1), KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL ), [1] = LAYOUT( - QK_BOOT, _______, KC_F1 , KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, _______, KC_F1 , KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, KC_BRIU, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______ , _______, _______, KC_BRID, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END, _______, _______, diff --git a/keyboards/nightly_boards/alter_lite/keymaps/via/keymap.c b/keyboards/nightly_boards/alter_lite/keymaps/via/keymap.c index 744d365b57a..fbdde11ba30 100644 --- a/keyboards/nightly_boards/alter_lite/keymaps/via/keymap.c +++ b/keyboards/nightly_boards/alter_lite/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(1), KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL ), [1] = LAYOUT( - QK_BOOT, KC_TRNS, KC_F1 , KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, KC_TRNS, KC_F1 , KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, KC_BRIU, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_BRID, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS, KC_TRNS, diff --git a/keyboards/nightly_boards/n60_s/keymaps/default/keymap.c b/keyboards/nightly_boards/n60_s/keymaps/default/keymap.c index 7549f061c6d..455e0710877 100644 --- a/keyboards/nightly_boards/n60_s/keymaps/default/keymap.c +++ b/keyboards/nightly_boards/n60_s/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_APP, KC_RGUI, KC_RCTL ), [1] = LAYOUT_60_ansi_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, diff --git a/keyboards/nightly_boards/n60_s/keymaps/tsangan/keymap.c b/keyboards/nightly_boards/n60_s/keymaps/tsangan/keymap.c index 0fd3ac6a7a3..4d45f15880e 100644 --- a/keyboards/nightly_boards/n60_s/keymaps/tsangan/keymap.c +++ b/keyboards/nightly_boards/n60_s/keymaps/tsangan/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ), [1] = LAYOUT_60_ansi_split_bs_rshift_tsangan( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, diff --git a/keyboards/nightly_boards/n60_s/keymaps/via/keymap.c b/keyboards/nightly_boards/n60_s/keymaps/via/keymap.c index 04078c784ef..90e496eb1f2 100644 --- a/keyboards/nightly_boards/n60_s/keymaps/via/keymap.c +++ b/keyboards/nightly_boards/n60_s/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_LALT, KC_APP, KC_RGUI, KC_LCTL ), [1] = LAYOUT_60_ansi_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, KC_F12, KC_DEL, KC_DEL, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, diff --git a/keyboards/nightly_boards/paraluman/keymaps/default/keymap.c b/keyboards/nightly_boards/paraluman/keymaps/default/keymap.c index 7f254287c08..e9b734955bf 100644 --- a/keyboards/nightly_boards/paraluman/keymaps/default/keymap.c +++ b/keyboards/nightly_boards/paraluman/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_APP, KC_RGUI, KC_RCTL ), [1] = LAYOUT_60_ansi_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, diff --git a/keyboards/nightly_boards/paraluman/keymaps/tsangan/keymap.c b/keyboards/nightly_boards/paraluman/keymaps/tsangan/keymap.c index f06e2ee93ae..1605185a409 100644 --- a/keyboards/nightly_boards/paraluman/keymaps/tsangan/keymap.c +++ b/keyboards/nightly_boards/paraluman/keymaps/tsangan/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ), [1] = LAYOUT_60_ansi_split_bs_rshift_tsangan( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, diff --git a/keyboards/nightly_boards/paraluman/keymaps/via/keymap.c b/keyboards/nightly_boards/paraluman/keymaps/via/keymap.c index 0de50911ad6..b15885a8c51 100644 --- a/keyboards/nightly_boards/paraluman/keymaps/via/keymap.c +++ b/keyboards/nightly_boards/paraluman/keymaps/via/keymap.c @@ -25,21 +25,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_LALT, KC_APP, KC_RGUI, KC_LCTL ), [1] = LAYOUT_60_ansi_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, KC_F12, KC_DEL, KC_DEL, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS ), [2] = LAYOUT_60_ansi_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, KC_F12, KC_DEL, KC_DEL, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS ), [3] = LAYOUT_60_ansi_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, KC_F12, KC_DEL, KC_DEL, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, diff --git a/keyboards/nightly_boards/ph_arisu/keymaps/default/keymap.c b/keyboards/nightly_boards/ph_arisu/keymaps/default/keymap.c index eee64b28a02..d9af3529b84 100644 --- a/keyboards/nightly_boards/ph_arisu/keymaps/default/keymap.c +++ b/keyboards/nightly_boards/ph_arisu/keymaps/default/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(1), KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/nightly_boards/ph_arisu/keymaps/via/keymap.c b/keyboards/nightly_boards/ph_arisu/keymaps/via/keymap.c index 5866d6aa1db..b9fa0c5bf23 100644 --- a/keyboards/nightly_boards/ph_arisu/keymaps/via/keymap.c +++ b/keyboards/nightly_boards/ph_arisu/keymaps/via/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/nix_studio/n60_a/keymaps/default/keymap.c b/keyboards/nix_studio/n60_a/keymaps/default/keymap.c index a057e1ea41b..24196d55abd 100644 --- a/keyboards/nix_studio/n60_a/keymaps/default/keymap.c +++ b/keyboards/nix_studio/n60_a/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, KC_DEL, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/nix_studio/n60_a/keymaps/via/keymap.c b/keyboards/nix_studio/n60_a/keymaps/via/keymap.c index 36b547eb8ee..05bd3aa05a6 100644 --- a/keyboards/nix_studio/n60_a/keymaps/via/keymap.c +++ b/keyboards/nix_studio/n60_a/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TILD, KC_DEL, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c b/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c index ef5f9c9cf43..f1693115433 100644 --- a/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c +++ b/keyboards/nix_studio/oxalys80/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c b/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c index 3a4483f89ee..910b90b4221 100644 --- a/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c +++ b/keyboards/nix_studio/oxalys80/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/novelkeys/nk65/keymaps/default/keymap.c b/keyboards/novelkeys/nk65/keymaps/default/keymap.c index c8ab09e3178..3a043cbfe71 100755 --- a/keyboards/novelkeys/nk65/keymaps/default/keymap.c +++ b/keyboards/novelkeys/nk65/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/novelkeys/nk65/keymaps/via/keymap.c b/keyboards/novelkeys/nk65/keymaps/via/keymap.c index c8ab09e3178..3a043cbfe71 100755 --- a/keyboards/novelkeys/nk65/keymaps/via/keymap.c +++ b/keyboards/novelkeys/nk65/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/novelkeys/nk87/keymaps/default/keymap.c b/keyboards/novelkeys/nk87/keymaps/default/keymap.c index c9842f6ae6d..c5ac34e8a39 100755 --- a/keyboards/novelkeys/nk87/keymaps/default/keymap.c +++ b/keyboards/novelkeys/nk87/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_f13_ansi_tsangan( /* FN */ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/novelkeys/nk87/keymaps/via/keymap.c b/keyboards/novelkeys/nk87/keymaps/via/keymap.c index 205f2d2709e..ad49576007e 100755 --- a/keyboards/novelkeys/nk87/keymaps/via/keymap.c +++ b/keyboards/novelkeys/nk87/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_f13_ansi_tsangan( /* FN */ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/noxary/260/keymaps/default/keymap.c b/keyboards/noxary/260/keymaps/default/keymap.c index 904e3bed101..24351f57e21 100644 --- a/keyboards/noxary/260/keymaps/default/keymap.c +++ b/keyboards/noxary/260/keymaps/default/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSCR, - _______, KC_VOLU, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_VOLU, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, _______, KC_MUTE, _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______), diff --git a/keyboards/noxary/260/keymaps/via/keymap.c b/keyboards/noxary/260/keymaps/via/keymap.c index 1c7a672b723..68a29538951 100644 --- a/keyboards/noxary/260/keymaps/via/keymap.c +++ b/keyboards/noxary/260/keymaps/via/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_60_ansi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, - _______, KC_VOLU, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_VOLU, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, _______, KC_MUTE, _______, _______, _______, BL_TOGG, _______, _______, _______, _______), diff --git a/keyboards/noxary/268/keymaps/ansi/keymap.c b/keyboards/noxary/268/keymaps/ansi/keymap.c index 860d17177c7..dfbf6445499 100644 --- a/keyboards/noxary/268/keymaps/ansi/keymap.c +++ b/keyboards/noxary/268/keymaps/ansi/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL1] = LAYOUT_ansi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, _______, KC_MUTE, KC_VOLU, KC_END, _______, _______, _______, BL_TOGG, _______, _______, _______, KC_VOLD, _______ diff --git a/keyboards/noxary/268/keymaps/default/keymap.c b/keyboards/noxary/268/keymaps/default/keymap.c index 9023c6f81fd..717dba04b27 100644 --- a/keyboards/noxary/268/keymaps/default/keymap.c +++ b/keyboards/noxary/268/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSCR, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, _______, KC_MUTE, KC_MUTE, KC_VOLU, KC_END, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, KC_VOLD, _______), diff --git a/keyboards/noxary/268/keymaps/iso/keymap.c b/keyboards/noxary/268/keymaps/iso/keymap.c index 76462bf7fe8..827aa8bbd6a 100644 --- a/keyboards/noxary/268/keymaps/iso/keymap.c +++ b/keyboards/noxary/268/keymaps/iso/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL1] = LAYOUT_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, _______, KC_MUTE, KC_VOLU, KC_END, _______, _______, _______, BL_TOGG, _______, _______, _______, KC_VOLD, _______ diff --git a/keyboards/noxary/268/keymaps/via/keymap.c b/keyboards/noxary/268/keymaps/via/keymap.c index 333172a2a26..a6773b996cd 100644 --- a/keyboards/noxary/268/keymaps/via/keymap.c +++ b/keyboards/noxary/268/keymaps/via/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSCR, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, _______, KC_MUTE, KC_MUTE, KC_VOLU, KC_END, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, KC_VOLD, _______ diff --git a/keyboards/noxary/268_2/keymaps/default/keymap.c b/keyboards/noxary/268_2/keymaps/default/keymap.c index d29114563ae..a384595c289 100644 --- a/keyboards/noxary/268_2/keymaps/default/keymap.c +++ b/keyboards/noxary/268_2/keymaps/default/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, KC_MUTE, KC_VOLU, KC_END, _______, _______, _______, BL_TOGG, _______, _______, _______, KC_VOLD, _______ diff --git a/keyboards/noxary/268_2/keymaps/via/keymap.c b/keyboards/noxary/268_2/keymaps/via/keymap.c index 7c2002d0e4d..ce5467edd29 100644 --- a/keyboards/noxary/268_2/keymaps/via/keymap.c +++ b/keyboards/noxary/268_2/keymaps/via/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, KC_MUTE, KC_VOLU, KC_END, _______, _______, _______, BL_TOGG, _______, _______, _______, KC_VOLD, _______ diff --git a/keyboards/noxary/268_2_rgb/keymaps/default/keymap.c b/keyboards/noxary/268_2_rgb/keymaps/default/keymap.c index 926855a0b4b..c348119fd33 100644 --- a/keyboards/noxary/268_2_rgb/keymaps/default/keymap.c +++ b/keyboards/noxary/268_2_rgb/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, _______, - RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, + RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, KC_MUTE, KC_VOLU, KC_END, _______, _______, _______, BL_TOGG, _______, _______, _______, KC_VOLD, _______ diff --git a/keyboards/noxary/268_2_rgb/keymaps/via/keymap.c b/keyboards/noxary/268_2_rgb/keymaps/via/keymap.c index dbd6dd8992a..893a6e797ac 100644 --- a/keyboards/noxary/268_2_rgb/keymaps/via/keymap.c +++ b/keyboards/noxary/268_2_rgb/keymaps/via/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, _______, - RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, + RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, KC_MUTE, KC_VOLU, KC_END, _______, _______, _______, BL_TOGG, _______, _______, _______, KC_VOLD, _______ diff --git a/keyboards/noxary/280/keymaps/default/keymap.c b/keyboards/noxary/280/keymaps/default/keymap.c index 4300540f461..a26e716d73e 100644 --- a/keyboards/noxary/280/keymaps/default/keymap.c +++ b/keyboards/noxary/280/keymaps/default/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FL1] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, _______, KC_MUTE, _______, KC_VOLU, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, KC_VOLD, _______ diff --git a/keyboards/noxary/280/keymaps/via/keymap.c b/keyboards/noxary/280/keymaps/via/keymap.c index 4300540f461..a26e716d73e 100644 --- a/keyboards/noxary/280/keymaps/via/keymap.c +++ b/keyboards/noxary/280/keymaps/via/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FL1] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, _______, KC_MUTE, _______, KC_VOLU, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, KC_VOLD, _______ diff --git a/keyboards/noxary/vulcan/keymaps/default/keymap.c b/keyboards/noxary/vulcan/keymaps/default/keymap.c index 8b80a94d65d..bb374fca033 100644 --- a/keyboards/noxary/vulcan/keymaps/default/keymap.c +++ b/keyboards/noxary/vulcan/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ), [_FN] = LAYOUT( /* Fn */ - QK_BOOT, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/noxary/x268/keymaps/default/keymap.c b/keyboards/noxary/x268/keymaps/default/keymap.c index 90567b0f48f..ef8fd1f8074 100644 --- a/keyboards/noxary/x268/keymaps/default/keymap.c +++ b/keyboards/noxary/x268/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSCR, _______, - RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, + RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, _______, KC_MUTE, KC_VOLU, KC_END, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, KC_VOLD, _______ diff --git a/keyboards/noxary/x268/keymaps/via/keymap.c b/keyboards/noxary/x268/keymaps/via/keymap.c index 90567b0f48f..ef8fd1f8074 100644 --- a/keyboards/noxary/x268/keymaps/via/keymap.c +++ b/keyboards/noxary/x268/keymaps/via/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSCR, _______, - RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, + RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, _______, KC_MUTE, KC_VOLU, KC_END, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, KC_VOLD, _______ diff --git a/keyboards/nullbitsco/nibble/keymaps/default/keymap.c b/keyboards/nullbitsco/nibble/keymaps/default/keymap.c index 9337c82863d..1980573616c 100644 --- a/keyboards/nullbitsco/nibble/keymaps/default/keymap.c +++ b/keyboards/nullbitsco/nibble/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F16, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT_ansi( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_END, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_END, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/nullbitsco/nibble/keymaps/iso/keymap.c b/keyboards/nullbitsco/nibble/keymaps/iso/keymap.c index 866585b9097..b865bf4df6d 100644 --- a/keyboards/nullbitsco/nibble/keymaps/iso/keymap.c +++ b/keyboards/nullbitsco/nibble/keymaps/iso/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F16, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT_iso( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_INS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_INS, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c index 4e2f7dd4d6e..62db2726b28 100644 --- a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c +++ b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_VIA1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_END, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_END, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/numatreus/keymaps/default/keymap.c b/keyboards/numatreus/keymaps/default/keymap.c index 50c426a40f7..2862d47e58f 100644 --- a/keyboards/numatreus/keymaps/default/keymap.c +++ b/keyboards/numatreus/keymaps/default/keymap.c @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( /* [> LOWER <] */ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN , KC_DEL, KC_ESC, KC_NO, KC_NO, KC_NO, KC_PGDN, KC_PGUP, KC_PSCR, KC_NO, KC_NO, - KC_CAPS, KC_VOLU, KC_NO, KC_ENT, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO , + KC_CAPS, KC_VOLU, KC_NO, KC_ENT, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO , KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_SPC, KC_BSPC, KC_LALT, KC_ENT, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT ) }; diff --git a/keyboards/obosob/arch_36/keymaps/default/keymap.c b/keyboards/obosob/arch_36/keymaps/default/keymap.c index 33cb5d09feb..6351944e371 100644 --- a/keyboards/obosob/arch_36/keymaps/default/keymap.c +++ b/keyboards/obosob/arch_36/keymaps/default/keymap.c @@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_split_3x5_3( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, TSKMGR, CALTDEL, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/ogre/ergo_single/keymaps/default/keymap.c b/keyboards/ogre/ergo_single/keymaps/default/keymap.c index 404ab79a8bd..411ef5c847b 100644 --- a/keyboards/ogre/ergo_single/keymaps/default/keymap.c +++ b/keyboards/ogre/ergo_single/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TP_GR, KC_LALT, KC_LEFT, KC_RGHT, TP_SPC, KC_SPC, KC_BSPC, KC_RALT, KC_ENT, TP_ENT, KC_DOWN, KC_UP, KC_LBRC, TP_RCTRL ), [1] = LAYOUT( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_INS, KC_HOME, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + QK_BOOT,_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_INS, KC_HOME, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/ogre/ergo_split/keymaps/default/keymap.c b/keyboards/ogre/ergo_split/keymaps/default/keymap.c index 404ab79a8bd..411ef5c847b 100644 --- a/keyboards/ogre/ergo_split/keymaps/default/keymap.c +++ b/keyboards/ogre/ergo_split/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TP_GR, KC_LALT, KC_LEFT, KC_RGHT, TP_SPC, KC_SPC, KC_BSPC, KC_RALT, KC_ENT, TP_ENT, KC_DOWN, KC_UP, KC_LBRC, TP_RCTRL ), [1] = LAYOUT( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_INS, KC_HOME, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + QK_BOOT,_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_INS, KC_HOME, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/ok60/keymaps/default/keymap.c b/keyboards/ok60/keymaps/default/keymap.c index cd5b3962c1a..8308ae30a9e 100644 --- a/keyboards/ok60/keymaps/default/keymap.c +++ b/keyboards/ok60/keymaps/default/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_60_ansi( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/ok60/keymaps/via/keymap.c b/keyboards/ok60/keymaps/via/keymap.c index 574d5798da0..a93e26dba9c 100644 --- a/keyboards/ok60/keymaps/via/keymap.c +++ b/keyboards/ok60/keymaps/via/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_60_ansi( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/omkbd/runner3680/3x6/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/3x6/keymaps/default/keymap.c index 1889e759a06..cd28b75a4b6 100644 --- a/keyboards/omkbd/runner3680/3x6/keymaps/default/keymap.c +++ b/keyboards/omkbd/runner3680/3x6/keymaps/default/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------' `-----------------------------------------' */ [_ADJUST] = LAYOUT( - _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/omkbd/runner3680/3x7/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/3x7/keymaps/default/keymap.c index f0b1a8cab2f..9f0f7dfcbf2 100644 --- a/keyboards/omkbd/runner3680/3x7/keymaps/default/keymap.c +++ b/keyboards/omkbd/runner3680/3x7/keymaps/default/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `------------------------------------------------' `------------------------------------------------' */ [_ADJUST] = LAYOUT( - _______, _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/omkbd/runner3680/3x8/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/3x8/keymaps/default/keymap.c index d7796a04ebe..d8f855bf63a 100644 --- a/keyboards/omkbd/runner3680/3x8/keymaps/default/keymap.c +++ b/keyboards/omkbd/runner3680/3x8/keymaps/default/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-------------------------------------------------------' `-------------------------------------------------------' */ [_ADJUST] = LAYOUT( - _______, _______, _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/omkbd/runner3680/4x6/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/4x6/keymaps/default/keymap.c index 566e65128f1..6482096270f 100644 --- a/keyboards/omkbd/runner3680/4x6/keymaps/default/keymap.c +++ b/keyboards/omkbd/runner3680/4x6/keymaps/default/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------' `-----------------------------------------' */ [_ADJUST] = LAYOUT( - _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/omkbd/runner3680/4x7/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/4x7/keymaps/default/keymap.c index a081d4e9dd5..da9a56daa9e 100644 --- a/keyboards/omkbd/runner3680/4x7/keymaps/default/keymap.c +++ b/keyboards/omkbd/runner3680/4x7/keymaps/default/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `------------------------------------------------' `------------------------------------------------' */ [_ADJUST] = LAYOUT( - _______, _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/omkbd/runner3680/4x8/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/4x8/keymaps/default/keymap.c index 6e0b01c30f7..043bcc878e0 100644 --- a/keyboards/omkbd/runner3680/4x8/keymaps/default/keymap.c +++ b/keyboards/omkbd/runner3680/4x8/keymaps/default/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-------------------------------------------------------' `-------------------------------------------------------' */ [_ADJUST] = LAYOUT( - _______, _______, _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/omkbd/runner3680/5x6/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/5x6/keymaps/default/keymap.c index eb886efa46b..fc6a47e950b 100644 --- a/keyboards/omkbd/runner3680/5x6/keymaps/default/keymap.c +++ b/keyboards/omkbd/runner3680/5x6/keymaps/default/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/omkbd/runner3680/5x7/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/5x7/keymaps/default/keymap.c index 03010e9a4ec..7b6154b20ca 100644 --- a/keyboards/omkbd/runner3680/5x7/keymaps/default/keymap.c +++ b/keyboards/omkbd/runner3680/5x7/keymaps/default/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/omkbd/runner3680/5x8/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/5x8/keymaps/default/keymap.c index f4c67427922..543370bd640 100644 --- a/keyboards/omkbd/runner3680/5x8/keymaps/default/keymap.c +++ b/keyboards/omkbd/runner3680/5x8/keymaps/default/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, - _______, _______, _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, RGBRST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/omnikeyish/keymaps/default/keymap.c b/keyboards/omnikeyish/keymaps/default/keymap.c index 553c77758cb..8f6e36f8549 100644 --- a/keyboards/omnikeyish/keymaps/default/keymap.c +++ b/keyboards/omnikeyish/keymaps/default/keymap.c @@ -9,6 +9,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { DYN_MACRO_KEY1, DYN_MACRO_KEY2, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, M_PROG, KC_PSLS, KC_PAST, KC_PMNS, DYN_MACRO_KEY3, DYN_MACRO_KEY4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, DYN_MACRO_KEY5, DYN_MACRO_KEY6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_MPRV, KC_MPLY, KC_MNXT, KC_P4, KC_P5, KC_P6, KC_PEQL, - DYN_MACRO_KEY7, DYN_MACRO_KEY8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_BSLS, DB_TOGG, KC_UP, QK_BOOT, KC_P1, KC_P2, KC_P3, KC_PENT, + DYN_MACRO_KEY7, DYN_MACRO_KEY8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_BSLS, DB_TOGG, KC_UP, QK_BOOT, KC_P1, KC_P2, KC_P3, KC_PENT, DYN_MACRO_KEY9, DYN_MACRO_KEY10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT) }; diff --git a/keyboards/orange75/keymaps/default/keymap.c b/keyboards/orange75/keymaps/default/keymap.c index d6b585145db..19321f289c8 100644 --- a/keyboards/orange75/keymaps/default/keymap.c +++ b/keyboards/orange75/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------------------------------------------' */ LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_UP, diff --git a/keyboards/org60/keymaps/default/keymap.c b/keyboards/org60/keymaps/default/keymap.c index 91f21d2d6b9..666f61ca839 100644 --- a/keyboards/org60/keymaps/default/keymap.c +++ b/keyboards/org60/keymaps/default/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // 1: Function Layer LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_UP, KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_NO, KC_ENT, KC_LSFT, KC_NO, KC_NO, KC_APP, BL_STEP,KC_NO, KC_NO, KC_VOLD,KC_VOLU,KC_MUTE, KC_END, KC_RSFT, KC_NO ,KC_PGUP, KC_INS, diff --git a/keyboards/orthocode/keymaps/default/keymap.c b/keyboards/orthocode/keymaps/default/keymap.c index ba00c5956aa..237eddfe435 100644 --- a/keyboards/orthocode/keymaps/default/keymap.c +++ b/keyboards/orthocode/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* esc 1 2 3 4 5 6 7 8 9 0 - = home */ KC_TRNS, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, /* tab Q W E R T Y U I O P \ delete end */ - RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, + RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS,KC_TRNS, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, /* caps A S D F G H J K L ; ' enter */ RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, /* shift Z X C V B N M , . / up */ diff --git a/keyboards/orthocode/keymaps/via/keymap.c b/keyboards/orthocode/keymaps/via/keymap.c index 1666fbc7e96..593ac7fe849 100644 --- a/keyboards/orthocode/keymaps/via/keymap.c +++ b/keyboards/orthocode/keymaps/via/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* esc 1 2 3 4 5 6 7 8 9 0 - = home */ KC_TRNS, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, /* tab Q W E R T Y U I O P \ delete end */ - RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, + RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS,KC_TRNS, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, /* caps A S D F G H J K L ; ' enter */ RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, /* shift Z X C V B N M , . / up */ diff --git a/keyboards/owlab/jelly_epoch/hotswap/keymaps/default/keymap.c b/keyboards/owlab/jelly_epoch/hotswap/keymaps/default/keymap.c index f61039a33a6..87e1b5497e9 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/keymaps/default/keymap.c +++ b/keyboards/owlab/jelly_epoch/hotswap/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/owlab/jelly_epoch/hotswap/keymaps/via/keymap.c b/keyboards/owlab/jelly_epoch/hotswap/keymaps/via/keymap.c index 023e520dea7..df340fc56a7 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/keymaps/via/keymap.c +++ b/keyboards/owlab/jelly_epoch/hotswap/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/owlab/jelly_epoch/soldered/keymaps/default/keymap.c b/keyboards/owlab/jelly_epoch/soldered/keymaps/default/keymap.c index c82f8bc67ad..3b0ffebf2fa 100644 --- a/keyboards/owlab/jelly_epoch/soldered/keymaps/default/keymap.c +++ b/keyboards/owlab/jelly_epoch/soldered/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_75_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/owlab/jelly_epoch/soldered/keymaps/via/keymap.c b/keyboards/owlab/jelly_epoch/soldered/keymaps/via/keymap.c index 4dab4725a59..29e0498b8c1 100644 --- a/keyboards/owlab/jelly_epoch/soldered/keymaps/via/keymap.c +++ b/keyboards/owlab/jelly_epoch/soldered/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/owlab/suit80/ansi/keymaps/default/keymap.c b/keyboards/owlab/suit80/ansi/keymaps/default/keymap.c index 3eec26dcdeb..b8c8f370e72 100644 --- a/keyboards/owlab/suit80/ansi/keymaps/default/keymap.c +++ b/keyboards/owlab/suit80/ansi/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/owlab/suit80/ansi/keymaps/via/keymap.c b/keyboards/owlab/suit80/ansi/keymaps/via/keymap.c index dea1ce8966d..f3600fe53b1 100644 --- a/keyboards/owlab/suit80/ansi/keymaps/via/keymap.c +++ b/keyboards/owlab/suit80/ansi/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/owlab/suit80/iso/keymaps/default/keymap.c b/keyboards/owlab/suit80/iso/keymaps/default/keymap.c index 4e4dab8a1c5..4010468d685 100644 --- a/keyboards/owlab/suit80/iso/keymaps/default/keymap.c +++ b/keyboards/owlab/suit80/iso/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_iso( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/owlab/suit80/iso/keymaps/via/keymap.c b/keyboards/owlab/suit80/iso/keymaps/via/keymap.c index d74ae95b924..0ac956dfdbc 100644 --- a/keyboards/owlab/suit80/iso/keymaps/via/keymap.c +++ b/keyboards/owlab/suit80/iso/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/p3d/synapse/keymaps/7u_space/keymap.c b/keyboards/p3d/synapse/keymaps/7u_space/keymap.c index b530e91c78e..dbdb20697d6 100644 --- a/keyboards/p3d/synapse/keymaps/7u_space/keymap.c +++ b/keyboards/p3d/synapse/keymaps/7u_space/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_NAV] = LAYOUT_7u_space( - QK_BOOT, KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC, KC_TRNS, + QK_BOOT, KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_F4, KC_F5, KC_F6, KC_F7, KC_TAB, KC_LCAP, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/p3d/synapse/keymaps/default/keymap.c b/keyboards/p3d/synapse/keymaps/default/keymap.c index 3428272ee91..83daee7c001 100644 --- a/keyboards/p3d/synapse/keymaps/default/keymap.c +++ b/keyboards/p3d/synapse/keymaps/default/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_NAV] = LAYOUT_default( - QK_BOOT, KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC, KC_TRNS, + QK_BOOT, KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_F4, KC_F5, KC_F6, KC_F7, KC_TAB, KC_LCAP, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/panc40/keymaps/default/keymap.c b/keyboards/panc40/keymaps/default/keymap.c index 816c9507495..b7713967574 100644 --- a/keyboards/panc40/keymaps/default/keymap.c +++ b/keyboards/panc40/keymaps/default/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/panc40/keymaps/default_minorca/keymap.c b/keyboards/panc40/keymaps/default_minorca/keymap.c index e43b7a9c126..b2de4e3c014 100644 --- a/keyboards/panc40/keymaps/default_minorca/keymap.c +++ b/keyboards/panc40/keymaps/default_minorca/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_minorca( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/panc40/keymaps/default_sebright/keymap.c b/keyboards/panc40/keymaps/default_sebright/keymap.c index 7ad9c6883a8..8c361114300 100644 --- a/keyboards/panc40/keymaps/default_sebright/keymap.c +++ b/keyboards/panc40/keymaps/default_sebright/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_sebright( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/pearlboards/pandora/keymaps/default/keymap.c b/keyboards/pearlboards/pandora/keymaps/default/keymap.c index 974ea1fc10b..c7c124f5749 100644 --- a/keyboards/pearlboards/pandora/keymaps/default/keymap.c +++ b/keyboards/pearlboards/pandora/keymaps/default/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, diff --git a/keyboards/pearlboards/pandora/keymaps/via/keymap.c b/keyboards/pearlboards/pandora/keymaps/via/keymap.c index b306772e1c3..ecf2089b696 100644 --- a/keyboards/pearlboards/pandora/keymaps/via/keymap.c +++ b/keyboards/pearlboards/pandora/keymaps/via/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, diff --git a/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c b/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c index 3294d0bf8b5..88c243cdc59 100644 --- a/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c +++ b/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, + QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c b/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c index 8907a07cd4e..ee0165b28eb 100644 --- a/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c +++ b/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, + QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/pegasus/keymaps/default/keymap.c b/keyboards/pegasus/keymaps/default/keymap.c index dfad61d82f1..ea879a4e21d 100644 --- a/keyboards/pegasus/keymaps/default/keymap.c +++ b/keyboards/pegasus/keymaps/default/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER2] = LAYOUT_default( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, KC_RALT, KC_RCTL, KC_DEL, KC_VOLD, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, KC_RALT, KC_RCTL, KC_DEL, KC_VOLD, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPLY ), }; diff --git a/keyboards/percent/canoe/keymaps/default/keymap.c b/keyboards/percent/canoe/keymaps/default/keymap.c index 9c0e6680d5f..8d6f3674d44 100644 --- a/keyboards/percent/canoe/keymaps/default/keymap.c +++ b/keyboards/percent/canoe/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FL] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PAUS, - KC_TRNS, KC_NO, KC_UP, KC_NO, RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, QK_BOOT, KC_PSCR, KC_SCRL, KC_PAUS, KC_BSLS, KC_SCRL, + KC_TRNS, KC_NO, KC_UP, KC_NO, RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, QK_BOOT, KC_PSCR, KC_SCRL, KC_PAUS, KC_BSLS, KC_SCRL, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD,RGB_VAD,RGB_HUD,RGB_SAD,KC_NO, KC_NO, KC_F14, KC_F15, KC_INS, KC_HOME, KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT,KC_NO, KC_NO, KC_NO, KC_MUTE,KC_VOLD, KC_VOLU, KC_NO, KC_RSFT, KC_PGUP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_RALT, KC_TRNS, KC_HOME, KC_PGDN, KC_END) diff --git a/keyboards/percent/canoe/keymaps/via/keymap.c b/keyboards/percent/canoe/keymaps/via/keymap.c index e381cf7f2f9..0b04ab68dd3 100644 --- a/keyboards/percent/canoe/keymaps/via/keymap.c +++ b/keyboards/percent/canoe/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PAUS, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, KC_INS, QK_BOOT, KC_PSCR, KC_SCRL, KC_PAUS, KC_BSLS, KC_SCRL, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, KC_INS, QK_BOOT, KC_PSCR, KC_SCRL, KC_PAUS, KC_BSLS, KC_SCRL, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD, RGB_VAD, RGB_HUD, RGB_SAD, KC_TRNS, KC_TRNS, KC_F14, KC_F15, KC_INS, KC_HOME, KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_PGUP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_RALT, KC_TRNS, KC_HOME, KC_PGDN, KC_END), diff --git a/keyboards/percent/canoe_gen2/keymaps/default/keymap.c b/keyboards/percent/canoe_gen2/keymaps/default/keymap.c index 0fb7cc7913b..a434fd184a9 100644 --- a/keyboards/percent/canoe_gen2/keymaps/default/keymap.c +++ b/keyboards/percent/canoe_gen2/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi_blocker_split_bs( KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______), diff --git a/keyboards/percent/canoe_gen2/keymaps/via/keymap.c b/keyboards/percent/canoe_gen2/keymaps/via/keymap.c index 1b6d3468198..082b16c6a37 100644 --- a/keyboards/percent/canoe_gen2/keymaps/via/keymap.c +++ b/keyboards/percent/canoe_gen2/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), diff --git a/keyboards/picolab/frusta_fundamental/keymaps/default/keymap.c b/keyboards/picolab/frusta_fundamental/keymaps/default/keymap.c index 20388835105..6f8d0a0d814 100644 --- a/keyboards/picolab/frusta_fundamental/keymaps/default/keymap.c +++ b/keyboards/picolab/frusta_fundamental/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FKEY] = LAYOUT( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RGB_MOD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/picolab/frusta_fundamental/keymaps/via/keymap.c b/keyboards/picolab/frusta_fundamental/keymaps/via/keymap.c index 8d18625a887..45bb0368865 100644 --- a/keyboards/picolab/frusta_fundamental/keymaps/via/keymap.c +++ b/keyboards/picolab/frusta_fundamental/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* F-Keys */ [1] = LAYOUT( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RGB_MOD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/pixelspace/capsule65i/keymaps/default/keymap.c b/keyboards/pixelspace/capsule65i/keymaps/default/keymap.c index 146c7de0073..f2558bf2f32 100644 --- a/keyboards/pixelspace/capsule65i/keymaps/default/keymap.c +++ b/keyboards/pixelspace/capsule65i/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, diff --git a/keyboards/pixelspace/capsule65i/keymaps/via/keymap.c b/keyboards/pixelspace/capsule65i/keymaps/via/keymap.c index 8ae7f71411a..2bb46e931a5 100644 --- a/keyboards/pixelspace/capsule65i/keymaps/via/keymap.c +++ b/keyboards/pixelspace/capsule65i/keymaps/via/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c index c241f4a3ee3..fb11f75edc7 100644 --- a/keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c +++ b/keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c @@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), }; diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c index 21e51c07260..fcdc25f610b 100644 --- a/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c +++ b/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c @@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), }; diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_split_bs/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_split_bs/keymap.c index 36cac8018fc..65b0df4d705 100644 --- a/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_split_bs/keymap.c +++ b/keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_split_bs/keymap.c @@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUHS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), }; diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c b/keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c index bedc9fb5da9..1b86947e1f7 100644 --- a/keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c +++ b/keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), [2] = LAYOUT_65_ansi_blocker( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/playkbtw/ca66/keymaps/default/keymap.c b/keyboards/playkbtw/ca66/keymaps/default/keymap.c index 65db4b6be3d..0cd212ef5e9 100644 --- a/keyboards/playkbtw/ca66/keymaps/default/keymap.c +++ b/keyboards/playkbtw/ca66/keymaps/default/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, RGB_TOG, - KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, RGB_MOD, + KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, RGB_MOD, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_INS, KC_HOME, KC_LSFT, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, RGB_HUI, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_SAI), diff --git a/keyboards/playkbtw/helen80/keymaps/default/keymap.c b/keyboards/playkbtw/helen80/keymaps/default/keymap.c index 345943c1e40..90f74cfac59 100644 --- a/keyboards/playkbtw/helen80/keymaps/default/keymap.c +++ b/keyboards/playkbtw/helen80/keymaps/default/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RGB] = LAYOUT_tkl_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/playkbtw/helen80/keymaps/via/keymap.c b/keyboards/playkbtw/helen80/keymaps/via/keymap.c index 345943c1e40..90f74cfac59 100644 --- a/keyboards/playkbtw/helen80/keymaps/via/keymap.c +++ b/keyboards/playkbtw/helen80/keymaps/via/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RGB] = LAYOUT_tkl_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, + _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/playkbtw/pk60/keymaps/default/keymap.c b/keyboards/playkbtw/pk60/keymaps/default/keymap.c index cc0276673a3..d8c61edf14a 100644 --- a/keyboards/playkbtw/pk60/keymaps/default/keymap.c +++ b/keyboards/playkbtw/pk60/keymaps/default/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, - QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_PSCR, KC_CALC, + QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_PSCR, KC_CALC, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_SCRL, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/plut0nium/0x3e/keymaps/default/keymap.c b/keyboards/plut0nium/0x3e/keymaps/default/keymap.c index a906ebd24e9..4963f76ac12 100644 --- a/keyboards/plut0nium/0x3e/keymaps/default/keymap.c +++ b/keyboards/plut0nium/0x3e/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, - QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12, _______, + QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, KC_END, _______, _______, BL_UP, KC_MPLY, KC_VOLU, KC_MUTE, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, RGB_TOG, KC_HOME, BL_TOGG, BL_TOGG, BL_DOWN, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/poker87c/keymaps/default/keymap.c b/keyboards/poker87c/keymaps/default/keymap.c index 16c9df2b4d8..78882203207 100644 --- a/keyboards/poker87c/keymaps/default/keymap.c +++ b/keyboards/poker87c/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/poker87c/keymaps/via/keymap.c b/keyboards/poker87c/keymaps/via/keymap.c index 2b24e02b733..2bf9f7e9bcf 100644 --- a/keyboards/poker87c/keymaps/via/keymap.c +++ b/keyboards/poker87c/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/poker87d/keymaps/default/keymap.c b/keyboards/poker87d/keymaps/default/keymap.c index 0271b848a4e..5499f84d037 100644 --- a/keyboards/poker87d/keymaps/default/keymap.c +++ b/keyboards/poker87d/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), diff --git a/keyboards/poker87d/keymaps/via/keymap.c b/keyboards/poker87d/keymaps/via/keymap.c index 4d6a2317963..af1ad46b5ae 100644 --- a/keyboards/poker87d/keymaps/via/keymap.c +++ b/keyboards/poker87d/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), diff --git a/keyboards/polycarbdiet/s20/keymaps/default/keymap.c b/keyboards/polycarbdiet/s20/keymaps/default/keymap.c index 1186a5e4607..26ef7bbf263 100644 --- a/keyboards/polycarbdiet/s20/keymaps/default/keymap.c +++ b/keyboards/polycarbdiet/s20/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, - QK_BOOT, MO(2), KC_TRNS, KC_TRNS + QK_BOOT, MO(2), KC_TRNS, KC_TRNS ), [2] = LAYOUT_ortho_5x4( RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, diff --git a/keyboards/portal_66/hotswap/keymaps/default/keymap.c b/keyboards/portal_66/hotswap/keymaps/default/keymap.c index e57b7990825..7a42263429e 100644 --- a/keyboards/portal_66/hotswap/keymaps/default/keymap.c +++ b/keyboards/portal_66/hotswap/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT_65_ansi_blocker( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/portal_66/hotswap/keymaps/via/keymap.c b/keyboards/portal_66/hotswap/keymaps/via/keymap.c index 540e54320b3..de33d6b8416 100644 --- a/keyboards/portal_66/hotswap/keymaps/via/keymap.c +++ b/keyboards/portal_66/hotswap/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT ), [_L1] = LAYOUT_65_ansi_blocker( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/portal_66/soldered/keymaps/default/keymap.c b/keyboards/portal_66/soldered/keymaps/default/keymap.c index 181031a29ac..ee84d9b2245 100644 --- a/keyboards/portal_66/soldered/keymaps/default/keymap.c +++ b/keyboards/portal_66/soldered/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT_65_ansi_blocker_split_bs( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/portal_66/soldered/keymaps/via/keymap.c b/keyboards/portal_66/soldered/keymaps/via/keymap.c index 37f03ff1dcb..d03816197c7 100644 --- a/keyboards/portal_66/soldered/keymaps/via/keymap.c +++ b/keyboards/portal_66/soldered/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT ), [_L1] = LAYOUT_65_ansi_blocker_split_bs( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/pos78/keymaps/default/keymap.c b/keyboards/pos78/keymaps/default/keymap.c index 6f739536afa..152b08e9d3c 100644 --- a/keyboards/pos78/keymaps/default/keymap.c +++ b/keyboards/pos78/keymaps/default/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12, _______, XXXXXXX, KC_WAKE, KC_MYCM, XXXXXXX, XXXXXXX, KC_AGAIN, KC_VOLU, KC_INS, KC_PWR, KC_PSCR, XXXXXXX, KC_PGUP, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_FIND, XXXXXXX, KC_HELP, KC_VOLD, KC_CALC, KC_BRIU, XXXXXXX, KC_UP, KC_PGDN, - _______, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, QK_BOOT, XXXXXXX, KC_MAIL, UK_COMM, KC_BRID, KC_LEFT, KC_DOWN, KC_RIGHT, + _______, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, QK_BOOT, XXXXXXX, KC_MAIL, UK_COMM, KC_BRID, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/primekb/meridian/keymaps/default/keymap.c b/keyboards/primekb/meridian/keymaps/default/keymap.c index 6dfe00c87f9..c5f467d01cc 100644 --- a/keyboards/primekb/meridian/keymaps/default/keymap.c +++ b/keyboards/primekb/meridian/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_RGUI, KC_RCTL ), [1] = LAYOUT_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, diff --git a/keyboards/primekb/meridian/keymaps/via/keymap.c b/keyboards/primekb/meridian/keymaps/via/keymap.c index 9d3113a831c..bcbac63a0ee 100644 --- a/keyboards/primekb/meridian/keymaps/via/keymap.c +++ b/keyboards/primekb/meridian/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_RGUI, KC_RCTL ), [1] = LAYOUT_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, diff --git a/keyboards/primekb/meridian_rgb/keymaps/default/keymap.c b/keyboards/primekb/meridian_rgb/keymaps/default/keymap.c index a86654c4f6b..c1c39b98dca 100644 --- a/keyboards/primekb/meridian_rgb/keymaps/default/keymap.c +++ b/keyboards/primekb/meridian_rgb/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RGUI, KC_RCTL ), [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, diff --git a/keyboards/primekb/meridian_rgb/keymaps/via/keymap.c b/keyboards/primekb/meridian_rgb/keymaps/via/keymap.c index a86654c4f6b..c1c39b98dca 100644 --- a/keyboards/primekb/meridian_rgb/keymaps/via/keymap.c +++ b/keyboards/primekb/meridian_rgb/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RGUI, KC_RCTL ), [1] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, diff --git a/keyboards/program_yoink/ortho/keymaps/default/keymap.c b/keyboards/program_yoink/ortho/keymaps/default/keymap.c index 35f58efc4fd..a2061b36242 100644 --- a/keyboards/program_yoink/ortho/keymaps/default/keymap.c +++ b/keyboards/program_yoink/ortho/keymaps/default/keymap.c @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER2] = LAYOUT_ortho( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_K, RGB_M_G, RGB_M_R, RGB_M_SW, _______, RGB_HUI, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, RGB_VAD, _______, RGB_HUD, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, RGB_VAD, _______, RGB_HUD, _______, RGB_TOG, XXXXXXX, XXXXXXX, KC_DEL, KC_RALT, KC_RCTL ), }; diff --git a/keyboards/program_yoink/staggered/keymaps/default/keymap.c b/keyboards/program_yoink/staggered/keymaps/default/keymap.c index aa7a2887050..623f14b3422 100644 --- a/keyboards/program_yoink/staggered/keymaps/default/keymap.c +++ b/keyboards/program_yoink/staggered/keymaps/default/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER2] = LAYOUT_default( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, RGB_M_B, RGB_M_P, RGB_M_K, RGB_M_G, RGB_M_R, RGB_HUI, - _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, RGB_HUD, _______, RGB_TOG, XXXXXXX, QK_BOOT, _______, _______, _______ ), }; diff --git a/keyboards/program_yoink/staggered/keymaps/via/keymap.c b/keyboards/program_yoink/staggered/keymaps/via/keymap.c index 0ac2bfd60d5..e0ddab1a200 100644 --- a/keyboards/program_yoink/staggered/keymaps/via/keymap.c +++ b/keyboards/program_yoink/staggered/keymaps/via/keymap.c @@ -43,14 +43,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER2] = LAYOUT_default( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, RGB_M_B, RGB_M_P, RGB_M_K, RGB_M_G, RGB_M_R, RGB_HUI, - _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, RGB_HUD, _______, RGB_TOG, XXXXXXX, QK_BOOT, _______, _______, _______ ), [_LAYER3] = LAYOUT_default( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, RGB_M_B, RGB_M_P, RGB_M_K, RGB_M_G, RGB_M_R, RGB_HUI, - _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, RGB_HUD, _______, RGB_TOG, XXXXXXX, QK_BOOT, _______, _______, _______ ), }; diff --git a/keyboards/projectkb/signature65/keymaps/default/keymap.c b/keyboards/projectkb/signature65/keymaps/default/keymap.c index bf5748b423b..9b071b77af9 100644 --- a/keyboards/projectkb/signature65/keymaps/default/keymap.c +++ b/keyboards/projectkb/signature65/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi_blocker_split_bs( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, KC_PSCR, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/projectkb/signature65/keymaps/via/keymap.c b/keyboards/projectkb/signature65/keymaps/via/keymap.c index 71caf9ad0c1..2fc9a8e0578 100644 --- a/keyboards/projectkb/signature65/keymaps/via/keymap.c +++ b/keyboards/projectkb/signature65/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_65_ansi_blocker_split_bs( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, KC_PSCR, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/projectkb/signature87/keymaps/default/keymap.c b/keyboards/projectkb/signature87/keymaps/default/keymap.c index 100fd6f1edc..c6c7adabaac 100644 --- a/keyboards/projectkb/signature87/keymaps/default/keymap.c +++ b/keyboards/projectkb/signature87/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/projectkb/signature87/keymaps/via/keymap.c b/keyboards/projectkb/signature87/keymaps/via/keymap.c index ad52cdd56e8..ef87eed9bc7 100644 --- a/keyboards/projectkb/signature87/keymaps/via/keymap.c +++ b/keyboards/projectkb/signature87/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/prototypist/allison/keymaps/default/keymap.c b/keyboards/prototypist/allison/keymaps/default/keymap.c index dada7449437..8e24d406725 100644 --- a/keyboards/prototypist/allison/keymaps/default/keymap.c +++ b/keyboards/prototypist/allison/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LGUI, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_APP, KC_RCTL), [1] = LAYOUT_all( /* FN1 */ - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/prototypist/allison/keymaps/via/keymap.c b/keyboards/prototypist/allison/keymaps/via/keymap.c index dada7449437..8e24d406725 100644 --- a/keyboards/prototypist/allison/keymaps/via/keymap.c +++ b/keyboards/prototypist/allison/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LGUI, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_APP, KC_RCTL), [1] = LAYOUT_all( /* FN1 */ - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/punk75/keymaps/default/keymap.c b/keyboards/punk75/keymaps/default/keymap.c index 9ceaef93974..b6e8884eb9e 100644 --- a/keyboards/punk75/keymaps/default/keymap.c +++ b/keyboards/punk75/keymaps/default/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NUM, KC_SLSH, KC_ASTR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7, KC_P8, KC_P9, KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, - KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, + KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_APP, RGB_VAD, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0, _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______ ) diff --git a/keyboards/punk75/keymaps/via/keymap.c b/keyboards/punk75/keymaps/via/keymap.c index 6cbc33a6a0c..97ebc96593b 100644 --- a/keyboards/punk75/keymaps/via/keymap.c +++ b/keyboards/punk75/keymaps/via/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ortho_5x15( /* FUNCTION */ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NUM, KC_SLSH, KC_ASTR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7, KC_P8, KC_P9, KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, - KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, + KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_APP, RGB_VAD, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, MO(1), RGB_RMOD,RGB_MOD, KC_P0, _______, KC_PDOT, KC_PENT, KC_PENT, MO(1), _______, _______, _______ ), diff --git a/keyboards/qpockets/eggman/keymaps/default/keymap.c b/keyboards/qpockets/eggman/keymaps/default/keymap.c index 9e6ec192c20..079272d9188 100644 --- a/keyboards/qpockets/eggman/keymaps/default/keymap.c +++ b/keyboards/qpockets/eggman/keymaps/default/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NAV] = LAYOUT_default( KC_TRNS, KC_TRNS, - KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, + KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TAB, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_LCAP, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_ENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c b/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c index 4b0262d4edb..19390f665c3 100644 --- a/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c +++ b/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_NAV] = LAYOUT_default( - KC_HOME, KC_UP, KC_END, KC_PGUP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, + KC_HOME, KC_UP, KC_END, KC_PGUP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TAB, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_LCAP, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_ENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c index faf9c0f3d4c..7ba157a0dda 100644 --- a/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c +++ b/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_NAV] = LAYOUT_default( - KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC, + KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_F4, KC_F5, KC_F6, KC_F7, KC_TAB, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_LCAP, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/qpockets/wanten/keymaps/default/keymap.c b/keyboards/qpockets/wanten/keymaps/default/keymap.c index 13d8a301468..248974a7eb6 100644 --- a/keyboards/qpockets/wanten/keymaps/default/keymap.c +++ b/keyboards/qpockets/wanten/keymaps/default/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_NAV] = LAYOUT_default( - KC_TRNS, KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC, + KC_TRNS, KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_F5, KC_F6, KC_F7, KC_F8, KC_TAB, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_CAPS, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/quarkeys/z60/solder/keymaps/default/keymap.c b/keyboards/quarkeys/z60/solder/keymaps/default/keymap.c index 7aede3ef883..fc09954c765 100644 --- a/keyboards/quarkeys/z60/solder/keymaps/default/keymap.c +++ b/keyboards/quarkeys/z60/solder/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), RALT_T(KC_LEFT), RGUI_T(KC_DOWN), RCTL_T(KC_RGHT)), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/quarkeys/z60/solder/keymaps/via/keymap.c b/keyboards/quarkeys/z60/solder/keymaps/via/keymap.c index 7aede3ef883..fc09954c765 100644 --- a/keyboards/quarkeys/z60/solder/keymaps/via/keymap.c +++ b/keyboards/quarkeys/z60/solder/keymaps/via/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), RALT_T(KC_LEFT), RGUI_T(KC_DOWN), RCTL_T(KC_RGHT)), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/rart/rart45/keymaps/default/keymap.c b/keyboards/rart/rart45/keymaps/default/keymap.c index 98bef8a3fa2..f7db88d82ed 100644 --- a/keyboards/rart/rart45/keymaps/default/keymap.c +++ b/keyboards/rart/rart45/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [2] = LAYOUT( - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/rart/rart45/keymaps/via/keymap.c b/keyboards/rart/rart45/keymaps/via/keymap.c index 042f282a2ce..05267dffe98 100644 --- a/keyboards/rart/rart45/keymaps/via/keymap.c +++ b/keyboards/rart/rart45/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [2] = LAYOUT( - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/rart/rartand/keymaps/default/keymap.c b/keyboards/rart/rartand/keymaps/default/keymap.c index 47b37e7e2d8..122850d517f 100644 --- a/keyboards/rart/rartand/keymaps/default/keymap.c +++ b/keyboards/rart/rartand/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [2] = LAYOUT_all( - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, + QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/rart/rartand/keymaps/via/keymap.c b/keyboards/rart/rartand/keymaps/via/keymap.c index 47b37e7e2d8..122850d517f 100644 --- a/keyboards/rart/rartand/keymaps/via/keymap.c +++ b/keyboards/rart/rartand/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [2] = LAYOUT_all( - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, + QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/rart/rartland/keymaps/default/keymap.c b/keyboards/rart/rartland/keymaps/default/keymap.c index 9b406af2925..658e695e1bc 100644 --- a/keyboards/rart/rartland/keymaps/default/keymap.c +++ b/keyboards/rart/rartland/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/rart/rartland/keymaps/via/keymap.c b/keyboards/rart/rartland/keymaps/via/keymap.c index 18db9b8b4b8..dcc3cf1bd7b 100644 --- a/keyboards/rart/rartland/keymaps/via/keymap.c +++ b/keyboards/rart/rartland/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/rart/rartlice/keymaps/via/keymap.c b/keyboards/rart/rartlice/keymaps/via/keymap.c index 6edb1875227..f46e4674cac 100644 --- a/keyboards/rart/rartlice/keymaps/via/keymap.c +++ b/keyboards/rart/rartlice/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - KC_NUM, RGB_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, _______, + KC_NUM, RGB_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, _______, KC_SCRL, _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7, KC_P8, KC_P9, KC_P0, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______, diff --git a/keyboards/rart/rartpad/keymaps/default/keymap.c b/keyboards/rart/rartpad/keymaps/default/keymap.c index 673f97ab741..6cc785f231f 100644 --- a/keyboards/rart/rartpad/keymaps/default/keymap.c +++ b/keyboards/rart/rartpad/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_SAI, RGB_SAD, KC_MNXT, KC_MPRV, RGB_VAI, RGB_VAD, KC_MSTP, KC_MPLY, KC_COPY, KC_PSTE, KC_MYCM, KC_CALC, - KC_TRNS, RGB_TOG, QK_BOOT, KC_TRNS + KC_TRNS, RGB_TOG, QK_BOOT, KC_TRNS ) }; diff --git a/keyboards/recompile_keys/mio/keymaps/default/keymap.c b/keyboards/recompile_keys/mio/keymaps/default/keymap.c index f21d1357b8b..d22e0fc6f34 100644 --- a/keyboards/recompile_keys/mio/keymaps/default/keymap.c +++ b/keyboards/recompile_keys/mio/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(_FN), KC_LCTL, KC_LALT, KC_SPC, KC_ENT ), [_FN] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/recompile_keys/mio/keymaps/via/keymap.c b/keyboards/recompile_keys/mio/keymaps/via/keymap.c index abe39250612..d7b141ccc9d 100644 --- a/keyboards/recompile_keys/mio/keymaps/via/keymap.c +++ b/keyboards/recompile_keys/mio/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(1), KC_LCTL, KC_LALT, KC_SPC, KC_ENT ), [1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/redscarf_iiplus/verb/keymaps/default/keymap.c b/keyboards/redscarf_iiplus/verb/keymaps/default/keymap.c index 5920f297059..809b2f4306b 100755 --- a/keyboards/redscarf_iiplus/verb/keymaps/default/keymap.c +++ b/keyboards/redscarf_iiplus/verb/keymaps/default/keymap.c @@ -22,6 +22,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_F9, QK_BOOT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT + KC_F9, QK_BOOT,KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ) }; diff --git a/keyboards/redscarf_iiplus/verc/keymaps/default/keymap.c b/keyboards/redscarf_iiplus/verc/keymaps/default/keymap.c index 525c8094393..21416e408bb 100755 --- a/keyboards/redscarf_iiplus/verc/keymaps/default/keymap.c +++ b/keyboards/redscarf_iiplus/verc/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_65_ansi( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/retro_75/keymaps/default/keymap.c b/keyboards/retro_75/keymaps/default/keymap.c index 929097b3b4c..f12d4f4b0c0 100644 --- a/keyboards/retro_75/keymaps/default/keymap.c +++ b/keyboards/retro_75/keymaps/default/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/reviung/reviung33/keymaps/default/keymap.c b/keyboards/reviung/reviung33/keymaps/default/keymap.c index 1bd46954721..48e72aa6b5c 100644 --- a/keyboards/reviung/reviung33/keymaps/default/keymap.c +++ b/keyboards/reviung/reviung33/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, RGB_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD,XXXXXXX, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, KC_F11, KC_F12, KC_CAPS, XXXXXXX, KC_PSCR, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, KC_F11, KC_F12, KC_CAPS, XXXXXXX, KC_PSCR, _______, _______, _______ ), }; diff --git a/keyboards/reviung/reviung33/keymaps/default_jp/keymap.c b/keyboards/reviung/reviung33/keymaps/default_jp/keymap.c index 6b18f802325..d27e41e7bdd 100644 --- a/keyboards/reviung/reviung33/keymaps/default_jp/keymap.c +++ b/keyboards/reviung/reviung33/keymaps/default_jp/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, RGB_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD,XXXXXXX, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, KC_F11, KC_F12, KC_CAPS, XXXXXXX, KC_PSCR, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, KC_F11, KC_F12, KC_CAPS, XXXXXXX, KC_PSCR, _______, _______, _______ ), }; diff --git a/keyboards/reviung/reviung34/keymaps/default/keymap.c b/keyboards/reviung/reviung34/keymaps/default/keymap.c index 44ec64bdd37..004518b4646 100755 --- a/keyboards/reviung/reviung34/keymaps/default/keymap.c +++ b/keyboards/reviung/reviung34/keymaps/default/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_reviung34( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_F11, KC_F12, KC_CAPS, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_F11, KC_F12, KC_CAPS, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______ ), }; diff --git a/keyboards/reviung/reviung34/keymaps/default_2u/keymap.c b/keyboards/reviung/reviung34/keymaps/default_2u/keymap.c index 4e759db5d74..2b7a46a639e 100755 --- a/keyboards/reviung/reviung34/keymaps/default_2u/keymap.c +++ b/keyboards/reviung/reviung34/keymaps/default_2u/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_reviung34_2u( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_F11, KC_F12, KC_CAPS, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_F11, KC_F12, KC_CAPS, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______ ), }; diff --git a/keyboards/reviung/reviung34/keymaps/default_jp/keymap.c b/keyboards/reviung/reviung34/keymaps/default_jp/keymap.c index cc1fa5de9b8..72aa2bcc00a 100755 --- a/keyboards/reviung/reviung34/keymaps/default_jp/keymap.c +++ b/keyboards/reviung/reviung34/keymaps/default_jp/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_reviung34( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_F11, KC_F12, KC_CAPS, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_F11, KC_F12, KC_CAPS, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______ ), }; diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb/keymap.c b/keyboards/reviung/reviung34/keymaps/default_rgb/keymap.c index fd232c6f0e1..e94006e6f11 100755 --- a/keyboards/reviung/reviung34/keymaps/default_rgb/keymap.c +++ b/keyboards/reviung/reviung34/keymaps/default_rgb/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_reviung34( RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, RGB_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD,XXXXXXX, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, KC_F11, KC_F12, KC_CAPS, XXXXXXX, KC_PSCR, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, KC_F11, KC_F12, KC_CAPS, XXXXXXX, KC_PSCR, _______, _______, _______, _______ ), }; diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb2u/keymap.c b/keyboards/reviung/reviung34/keymaps/default_rgb2u/keymap.c index 0f9595c7b88..cc567d6b696 100755 --- a/keyboards/reviung/reviung34/keymaps/default_rgb2u/keymap.c +++ b/keyboards/reviung/reviung34/keymaps/default_rgb2u/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_reviung34_2u( RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, RGB_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD,XXXXXXX, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, KC_F11, KC_F12, KC_CAPS, XXXXXXX, KC_PSCR, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, KC_F11, KC_F12, KC_CAPS, XXXXXXX, KC_PSCR, _______, _______, _______ ), }; diff --git a/keyboards/reviung/reviung34/keymaps/via/keymap.c b/keyboards/reviung/reviung34/keymaps/via/keymap.c index 44ec64bdd37..004518b4646 100644 --- a/keyboards/reviung/reviung34/keymaps/via/keymap.c +++ b/keyboards/reviung/reviung34/keymaps/via/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_reviung34( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_F11, KC_F12, KC_CAPS, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_F11, KC_F12, KC_CAPS, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______ ), }; diff --git a/keyboards/reviung/reviung39/keymaps/default/keymap.c b/keyboards/reviung/reviung39/keymaps/default/keymap.c index 0de5eb8a047..d3a1f22a364 100644 --- a/keyboards/reviung/reviung39/keymaps/default/keymap.c +++ b/keyboards/reviung/reviung39/keymaps/default/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, _______ ), }; diff --git a/keyboards/reviung/reviung39/keymaps/default_s/keymap.c b/keyboards/reviung/reviung39/keymaps/default_s/keymap.c index 4d956940d4f..7af7882deea 100644 --- a/keyboards/reviung/reviung39/keymaps/default_s/keymap.c +++ b/keyboards/reviung/reviung39/keymaps/default_s/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, _______ ), }; diff --git a/keyboards/reviung/reviung39/keymaps/via/keymap.c b/keyboards/reviung/reviung39/keymaps/via/keymap.c index 386c2741dd2..585cdb35188 100644 --- a/keyboards/reviung/reviung39/keymaps/via/keymap.c +++ b/keyboards/reviung/reviung39/keymaps/via/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, _______ ), }; diff --git a/keyboards/reviung/reviung41/keymaps/default/keymap.c b/keyboards/reviung/reviung41/keymaps/default/keymap.c index 664560b75a7..701ac0dd5f6 100644 --- a/keyboards/reviung/reviung41/keymaps/default/keymap.c +++ b/keyboards/reviung/reviung41/keymaps/default/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, _______, _______ ), }; diff --git a/keyboards/reviung/reviung41/keymaps/via/keymap.c b/keyboards/reviung/reviung41/keymaps/via/keymap.c index ec5a87fc60a..6f64245c51a 100644 --- a/keyboards/reviung/reviung41/keymaps/via/keymap.c +++ b/keyboards/reviung/reviung41/keymaps/via/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, _______, _______ ), }; diff --git a/keyboards/reviung/reviung61/keymaps/default/keymap.c b/keyboards/reviung/reviung61/keymaps/default/keymap.c index 4b66239d26d..dc795062510 100644 --- a/keyboards/reviung/reviung61/keymaps/default/keymap.c +++ b/keyboards/reviung/reviung61/keymaps/default/keymap.c @@ -36,6 +36,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, RGB_TOG, _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_PSCR, KC_INS, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______ + _______, _______, _______, _______, QK_BOOT, _______, _______, _______ ) }; diff --git a/keyboards/reviung/reviung61/keymaps/default_rgb/keymap.c b/keyboards/reviung/reviung61/keymaps/default_rgb/keymap.c index 4b66239d26d..dc795062510 100644 --- a/keyboards/reviung/reviung61/keymaps/default_rgb/keymap.c +++ b/keyboards/reviung/reviung61/keymaps/default_rgb/keymap.c @@ -36,6 +36,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, RGB_TOG, _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_PSCR, KC_INS, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______ + _______, _______, _______, _______, QK_BOOT, _______, _______, _______ ) }; diff --git a/keyboards/rgbkb/mun/keymaps/default/keymap.c b/keyboards/rgbkb/mun/keymaps/default/keymap.c index aa8ba1eba0f..100e5f745ea 100644 --- a/keyboards/rgbkb/mun/keymaps/default/keymap.c +++ b/keyboards/rgbkb/mun/keymaps/default/keymap.c @@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, - _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, + _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, GAME, _______, RGB_RMOD,_______, RGB_MOD, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, KC_NUM, QWERTY, COLEMAK, diff --git a/keyboards/rgbkb/mun/keymaps/via/keymap.c b/keyboards/rgbkb/mun/keymaps/via/keymap.c index aa8ba1eba0f..100e5f745ea 100644 --- a/keyboards/rgbkb/mun/keymaps/via/keymap.c +++ b/keyboards/rgbkb/mun/keymaps/via/keymap.c @@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, - _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, + _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, GAME, _______, RGB_RMOD,_______, RGB_MOD, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, KC_NUM, QWERTY, COLEMAK, diff --git a/keyboards/rgbkb/pan/keymaps/default/keymap.c b/keyboards/rgbkb/pan/keymaps/default/keymap.c index 5d84ea07638..887056723eb 100644 --- a/keyboards/rgbkb/pan/keymaps/default/keymap.c +++ b/keyboards/rgbkb/pan/keymaps/default/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJ] = LAYOUT_all( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, - _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, + _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, KC_P0, KC_PDOT, KC_NUM, _QWERTY, _COLEMAK diff --git a/keyboards/rgbkb/sol3/keymaps/default/keymap.c b/keyboards/rgbkb/sol3/keymaps/default/keymap.c index dacdf98a405..862cc03ef42 100644 --- a/keyboards/rgbkb/sol3/keymaps/default/keymap.c +++ b/keyboards/rgbkb/sol3/keymaps/default/keymap.c @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, - _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, + _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI, RGB_RST, _______, DM_REC1, _______, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, RGB_SPD, _______, RGB_SPI, _______, _______, DM_RSTP, _______, _______, KC_P1, KC_P2, KC_P3, _______, GAME, _______, RGB_RMOD,RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, KC_NUM, QWERTY, COLEMAK, diff --git a/keyboards/rgbkb/sol3/keymaps/via/keymap.c b/keyboards/rgbkb/sol3/keymaps/via/keymap.c index 9ceb324f645..6e02051ae35 100644 --- a/keyboards/rgbkb/sol3/keymaps/via/keymap.c +++ b/keyboards/rgbkb/sol3/keymaps/via/keymap.c @@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, - _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, + _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI, RGB_RST, _______, DM_REC1, _______, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, RGB_SPD, _______, RGB_SPI, _______, _______, DM_RSTP, _______, _______, KC_P1, KC_P2, KC_P3, _______, GAME, _______, RGB_RMOD,RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, KC_NUM, QWERTY, COLEMAK, diff --git a/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c index c84d9574af8..254eccc2f58 100644 --- a/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c +++ b/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_NAV] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, RGB_SAI, RGB_VAI, RGB_SAD, QK_BOOT, KC_LBRC, KC_RBRC, KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME, + _______, RGB_SAI, RGB_VAI, RGB_SAD, QK_BOOT, KC_LBRC, KC_RBRC, KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME, _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_END, KC_LSFT, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, KC_LCTL, KC_LGUI, KC_LALT, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_VOLD diff --git a/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c index 1776c6b5856..20afc56a886 100644 --- a/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c +++ b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_NAV] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, RGB_SAI, RGB_VAI, RGB_SAD, QK_BOOT, KC_LBRC, KC_RBRC, KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME, + _______, RGB_SAI, RGB_VAI, RGB_SAD, QK_BOOT, KC_LBRC, KC_RBRC, KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME, _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_END, KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, KC_LCTL, KC_LGUI, KC_LALT, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_VOLD, diff --git a/keyboards/rgbkb/zygomorph/keymaps/default/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/default/keymap.c index db376d1a853..30e9b1cd3ff 100644 --- a/keyboards/rgbkb/zygomorph/keymaps/default/keymap.c +++ b/keyboards/rgbkb/zygomorph/keymaps/default/keymap.c @@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJ] = LAYOUT_ortho_5x12( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI, RGBRST, _______, _______, QWERTY, COLEMAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD diff --git a/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c index c4da28ba357..8c02fe26d8c 100644 --- a/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c +++ b/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c @@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJ] = LAYOUT_ortho_5x12( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI, RGBRST, _______, _______, QWERTY, COLEMAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD diff --git a/keyboards/rmi_kb/aelith/keymaps/default/keymap.c b/keyboards/rmi_kb/aelith/keymaps/default/keymap.c index 64e74607e1a..820860c0195 100644 --- a/keyboards/rmi_kb/aelith/keymaps/default/keymap.c +++ b/keyboards/rmi_kb/aelith/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL ), [1] = LAYOUT_alice_split_bs( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, KC_HOME, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/rmi_kb/aelith/keymaps/via/keymap.c b/keyboards/rmi_kb/aelith/keymaps/via/keymap.c index e916d6e6c17..218fff5e322 100644 --- a/keyboards/rmi_kb/aelith/keymaps/via/keymap.c +++ b/keyboards/rmi_kb/aelith/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL ), [1] = LAYOUT_alice_split_bs( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, KC_HOME, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c index 9df8143fb72..f8db2c5ea27 100644 --- a/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c +++ b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/rmi_kb/mona/v1/keymaps/via/keymap.c b/keyboards/rmi_kb/mona/v1/keymaps/via/keymap.c index 14ba2a4339f..02c5836f0ce 100644 --- a/keyboards/rmi_kb/mona/v1/keymaps/via/keymap.c +++ b/keyboards/rmi_kb/mona/v1/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/rmi_kb/mona/v1_1/keymaps/via/keymap.c b/keyboards/rmi_kb/mona/v1_1/keymaps/via/keymap.c index f7e88610f01..6f78cdffc17 100644 --- a/keyboards/rmi_kb/mona/v1_1/keymaps/via/keymap.c +++ b/keyboards/rmi_kb/mona/v1_1/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/rmi_kb/mona/v32a/keymaps/via/keymap.c b/keyboards/rmi_kb/mona/v32a/keymaps/via/keymap.c index f7e88610f01..6f78cdffc17 100644 --- a/keyboards/rmi_kb/mona/v32a/keymaps/via/keymap.c +++ b/keyboards/rmi_kb/mona/v32a/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/rmi_kb/squishy65/keymaps/default/keymap.c b/keyboards/rmi_kb/squishy65/keymaps/default/keymap.c index f22daf17609..c3cca76fe42 100644 --- a/keyboards/rmi_kb/squishy65/keymaps/default/keymap.c +++ b/keyboards/rmi_kb/squishy65/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_ansi( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_SAI, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, diff --git a/keyboards/rmi_kb/squishy65/keymaps/iso/keymap.c b/keyboards/rmi_kb/squishy65/keymaps/iso/keymap.c index dedb48f333a..1ae0331bfa0 100644 --- a/keyboards/rmi_kb/squishy65/keymaps/iso/keymap.c +++ b/keyboards/rmi_kb/squishy65/keymaps/iso/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_iso( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, RGB_SAI, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, diff --git a/keyboards/rmi_kb/squishy65/keymaps/via/keymap.c b/keyboards/rmi_kb/squishy65/keymaps/via/keymap.c index c1abb8cff60..27def18b7a9 100644 --- a/keyboards/rmi_kb/squishy65/keymaps/via/keymap.c +++ b/keyboards/rmi_kb/squishy65/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_SAI, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, diff --git a/keyboards/rmi_kb/squishyfrl/keymaps/via/keymap.c b/keyboards/rmi_kb/squishyfrl/keymaps/via/keymap.c index 06e14e016eb..d08a62f8bc0 100644 --- a/keyboards/rmi_kb/squishyfrl/keymaps/via/keymap.c +++ b/keyboards/rmi_kb/squishyfrl/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/rocketboard_16/keymaps/default/keymap.c b/keyboards/rocketboard_16/keymaps/default/keymap.c index eb31d2f25a1..3ef0e3ff215 100644 --- a/keyboards/rocketboard_16/keymaps/default/keymap.c +++ b/keyboards/rocketboard_16/keymaps/default/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_RMOD, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_EXAM, KC_NO, KC_NO, KC_NO, KC_NO, - QK_BOOT, RGB_TOG, RGB_SPI, RGB_SPD, + QK_BOOT, RGB_TOG, RGB_SPI, RGB_SPD, KC_NO, _______, KC_NO, KC_NO ) }; diff --git a/keyboards/rocketboard_16/keymaps/via/keymap.c b/keyboards/rocketboard_16/keymaps/via/keymap.c index 58da55abeb7..bf48efd7c4e 100644 --- a/keyboards/rocketboard_16/keymaps/via/keymap.c +++ b/keyboards/rocketboard_16/keymaps/via/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_RMOD, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_EXAM, KC_NO, KC_NO, KC_NO, KC_NO, - QK_BOOT, RGB_TOG, RGB_SPI, RGB_SPD, + QK_BOOT, RGB_TOG, RGB_SPI, RGB_SPD, KC_NO, _______, KC_NO, KC_NO ) }; diff --git a/keyboards/rominronin/katana60/rev1/keymaps/default/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/default/keymap.c index d0b03bf45b3..20ed993ade0 100644 --- a/keyboards/rominronin/katana60/rev1/keymaps/default/keymap.c +++ b/keyboards/rominronin/katana60/rev1/keymaps/default/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, KC_BTN1, _______, KC_P0, KC_PDOT, KC_PENT, _______, _______, _______ ), [SYMB] = LAYOUT( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_VOLD, KC_VOLU, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_MPRV, KC_MPLY, KC_MNXT, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______, diff --git a/keyboards/rominronin/katana60/rev2/keymaps/default/keymap.c b/keyboards/rominronin/katana60/rev2/keymaps/default/keymap.c index 9b06ebfedff..0a2182bdf7e 100644 --- a/keyboards/rominronin/katana60/rev2/keymaps/default/keymap.c +++ b/keyboards/rominronin/katana60/rev2/keymaps/default/keymap.c @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, KC_P0, _______, _______, KC_PDOT, KC_PENT, _______, _______ ), [SYMB] = LAYOUT_1_a( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_VOLD, KC_VOLU, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_MPRV, KC_MPLY, KC_MNXT, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______, diff --git a/keyboards/rominronin/katana60/rev2/keymaps/via/keymap.c b/keyboards/rominronin/katana60/rev2/keymaps/via/keymap.c index 88afa6e64d6..33048b564f1 100644 --- a/keyboards/rominronin/katana60/rev2/keymaps/via/keymap.c +++ b/keyboards/rominronin/katana60/rev2/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, KC_P0, _______, _______, KC_PDOT, KC_PENT, _______, _______ ), [2] = LAYOUT_1_a( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_VOLD, KC_VOLU, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_MPRV, KC_MPLY, KC_MNXT, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______, diff --git a/keyboards/roseslite/keymaps/default/keymap.c b/keyboards/roseslite/keymaps/default/keymap.c index 9e28ba9e9fb..fd4b8cd8267 100644 --- a/keyboards/roseslite/keymaps/default/keymap.c +++ b/keyboards/roseslite/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/roseslite/keymaps/via/keymap.c b/keyboards/roseslite/keymaps/via/keymap.c index 0db056914ea..fa1ec478e7e 100644 --- a/keyboards/roseslite/keymaps/via/keymap.c +++ b/keyboards/roseslite/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ @@ -34,14 +34,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT( _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [3] = LAYOUT( _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/rot13labs/hackboard/keymaps/default/keymap.c b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c index 542d541bf31..98a709346bb 100644 --- a/keyboards/rot13labs/hackboard/keymaps/default/keymap.c +++ b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______) diff --git a/keyboards/rpiguy9907/southpaw66/keymaps/default/keymap.c b/keyboards/rpiguy9907/southpaw66/keymaps/default/keymap.c index 426bd91c7ec..b9e8912c54e 100644 --- a/keyboards/rpiguy9907/southpaw66/keymaps/default/keymap.c +++ b/keyboards/rpiguy9907/southpaw66/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_RCTL ), [1] = LAYOUT( - KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/rpiguy9907/southpaw66/keymaps/via/keymap.c b/keyboards/rpiguy9907/southpaw66/keymaps/via/keymap.c index ec6f5e3e4ee..f836b166952 100644 --- a/keyboards/rpiguy9907/southpaw66/keymaps/via/keymap.c +++ b/keyboards/rpiguy9907/southpaw66/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_SPC, MO(1), KC_RALT, KC_RCTL ), [1] = LAYOUT( - KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default/keymap.c index 7d65b17d6ac..4df63d109b8 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/default/keymap.c +++ b/keyboards/salicylic_acid3/naked48/keymaps/default/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______ //`------------------------------------------------------------------------------------------------------------' ) }; diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c index 4b32066e773..510f59e5608 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c +++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c @@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_MOD, RGB_TOG, RGB_SAI, //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------| - _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______ //`------------------------------------------------------------------------------------------------------------' ) }; diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c index 7764ddfdf60..a8200ecb349 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c +++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c @@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______, //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| - _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, RGB_MOD, RGB_TOG,_______,_______ + _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, RGB_MOD, RGB_TOG,_______,_______ //`------------------------------------------------------------------------------------------------------------' |-----------------------------------------------| ) }; diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/via/keymap.c index 6fa06a49010..62369c4765c 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/via/keymap.c +++ b/keyboards/salicylic_acid3/naked48/keymaps/via/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______ //`------------------------------------------------------------------------------------------------------------' ) }; diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c index 41d8d147d87..ffc5a0ad622 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c +++ b/keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c @@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL), //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______ //`------------------------------------------------------------------------------------------------------------' ) }; diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c index 9d6021e8449..606ca3a881c 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c +++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c @@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------------------------| _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL), //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______ //`------------------------------------------------------------------------------------------------------------' ) }; diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c index 960ad2b7635..2e97b919b55 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c +++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c @@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL), RGB_MOD, RGB_TOG,_______,_______, //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |-----------------------------------------------| - _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______ //`------------------------------------------------------------------------------------------------------------' ) }; diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/default/keymap.c index 1b947ac4a9e..1448f13bc5c 100644 --- a/keyboards/salicylic_acid3/naked64/keymaps/default/keymap.c +++ b/keyboards/salicylic_acid3/naked64/keymaps/default/keymap.c @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( /* Base */ //,--------------------------------------------------------------| |--------------------------------------------------------------. - TG(_FLOCK), QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + TG(_FLOCK), QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c index eb155ec15e4..2d7f729db6a 100644 --- a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c +++ b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c @@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT_with_setta21( /* Base */ - TG(_FLOCK), QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, + TG(_FLOCK), QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX, LCA(KC_DEL), LALT(KC_PSCR), KC_PSCR, XXXXXXX, RGB_SAD, RGB_SAI, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX, RGB_HUD, RGB_HUI, XXXXXXX, RGB_TOG, diff --git a/keyboards/salicylic_acid3/nknl7en/keymaps/default/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/default/keymap.c index 42581c59795..3fd0b2d1d60 100644 --- a/keyboards/salicylic_acid3/nknl7en/keymaps/default/keymap.c +++ b/keyboards/salicylic_acid3/nknl7en/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( //,-----------------------------------------------------| |--------------------------------------------------------------------------------. - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_STOP, KC_PSCR, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_STOP, KC_PSCR, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------| diff --git a/keyboards/salicylic_acid3/nknl7en/keymaps/via/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/via/keymap.c index 32a493c79d7..2bfed822825 100644 --- a/keyboards/salicylic_acid3/nknl7en/keymaps/via/keymap.c +++ b/keyboards/salicylic_acid3/nknl7en/keymaps/via/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_L1] = LAYOUT( //,-----------------------------------------------------| |--------------------------------------------------------------------------------. - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_STOP, KC_PSCR, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_STOP, KC_PSCR, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------| _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------| diff --git a/keyboards/sandwich/keeb68/keymaps/default/keymap.c b/keyboards/sandwich/keeb68/keymaps/default/keymap.c index 71d3dddac7d..a2f807c96c1 100644 --- a/keyboards/sandwich/keeb68/keymaps/default/keymap.c +++ b/keyboards/sandwich/keeb68/keymaps/default/keymap.c @@ -35,6 +35,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, BL_TOGG, BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_END, - _______, QK_BOOT, _______, _______, _______, MO(_FN), _______, _______, KC_VOLD, _______ + _______, QK_BOOT, _______, _______, _______, MO(_FN), _______, _______, KC_VOLD, _______ ) }; diff --git a/keyboards/satt/comet46/keymaps/default-rgbled/keymap.c b/keyboards/satt/comet46/keymaps/default-rgbled/keymap.c index f6fb0440493..225c3c8084a 100644 --- a/keyboards/satt/comet46/keymaps/default-rgbled/keymap.c +++ b/keyboards/satt/comet46/keymaps/default-rgbled/keymap.c @@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, QK_BOOT, DVORAK, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, QK_BOOT, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/satt/comet46/keymaps/default/keymap.c b/keyboards/satt/comet46/keymaps/default/keymap.c index 3e6f9045ffe..84dd07f02a9 100644 --- a/keyboards/satt/comet46/keymaps/default/keymap.c +++ b/keyboards/satt/comet46/keymaps/default/keymap.c @@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, QK_BOOT, DVORAK, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, QK_BOOT, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/satt/vision/keymaps/default/keymap.c b/keyboards/satt/vision/keymaps/default/keymap.c index 7f50dc70449..5e6b773c39b 100644 --- a/keyboards/satt/vision/keymaps/default/keymap.c +++ b/keyboards/satt/vision/keymaps/default/keymap.c @@ -59,7 +59,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/satt/vision/keymaps/via/keymap.c b/keyboards/satt/vision/keymaps/via/keymap.c index 037ab3e382a..221e7d27bdf 100644 --- a/keyboards/satt/vision/keymaps/via/keymap.c +++ b/keyboards/satt/vision/keymaps/via/keymap.c @@ -56,7 +56,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT( - QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/sawnsprojects/vcl65/solder/keymaps/default/keymap.c b/keyboards/sawnsprojects/vcl65/solder/keymaps/default/keymap.c index 652ff4eb9b2..64bb0e4185c 100644 --- a/keyboards/sawnsprojects/vcl65/solder/keymaps/default/keymap.c +++ b/keyboards/sawnsprojects/vcl65/solder/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_INS, - QK_BOOT, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, + QK_BOOT, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS diff --git a/keyboards/sawnsprojects/vcl65/solder/keymaps/via/keymap.c b/keyboards/sawnsprojects/vcl65/solder/keymaps/via/keymap.c index 528b3f89b51..b7cab194c0b 100644 --- a/keyboards/sawnsprojects/vcl65/solder/keymaps/via/keymap.c +++ b/keyboards/sawnsprojects/vcl65/solder/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_INS, - QK_BOOT, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, + QK_BOOT, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS diff --git a/keyboards/sentraq/s65_plus/keymaps/default/keymap.c b/keyboards/sentraq/s65_plus/keymaps/default/keymap.c index e912a8bbf7d..30ce79d0213 100644 --- a/keyboards/sentraq/s65_plus/keymaps/default/keymap.c +++ b/keyboards/sentraq/s65_plus/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_AL] = LAYOUT_ansi( - _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_STEP, + _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, KC_VOLU, _______, diff --git a/keyboards/sentraq/s65_plus/keymaps/iso/keymap.c b/keyboards/sentraq/s65_plus/keymaps/iso/keymap.c index 3e5ebe57484..63565681463 100644 --- a/keyboards/sentraq/s65_plus/keymaps/iso/keymap.c +++ b/keyboards/sentraq/s65_plus/keymaps/iso/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_AL] = LAYOUT_iso( - _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_STEP, + _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, KC_VOLU, _______, diff --git a/keyboards/sets3n/kk980/keymaps/default/keymap.c b/keyboards/sets3n/kk980/keymaps/default/keymap.c index d4df2b8fee1..91a27b44b63 100644 --- a/keyboards/sets3n/kk980/keymaps/default/keymap.c +++ b/keyboards/sets3n/kk980/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/sets3n/kk980/keymaps/via/keymap.c b/keyboards/sets3n/kk980/keymaps/via/keymap.c index d4df2b8fee1..91a27b44b63 100644 --- a/keyboards/sets3n/kk980/keymaps/via/keymap.c +++ b/keyboards/sets3n/kk980/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/singa/keymaps/default/keymap.c b/keyboards/singa/keymaps/default/keymap.c index f1152b170e8..fd49f0eb1fd 100644 --- a/keyboards/singa/keymaps/default/keymap.c +++ b/keyboards/singa/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_wkl( /* Base */ - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/singa/keymaps/via/keymap.c b/keyboards/singa/keymaps/via/keymap.c index c23e470c83a..1f5c8a694f1 100644 --- a/keyboards/singa/keymaps/via/keymap.c +++ b/keyboards/singa/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/smk60/keymaps/60_ansi/keymap.c b/keyboards/smk60/keymaps/60_ansi/keymap.c index 70f913c82b5..00f8343afb6 100644 --- a/keyboards/smk60/keymaps/60_ansi/keymap.c +++ b/keyboards/smk60/keymaps/60_ansi/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL), [1] = LAYOUT_60_ansi( 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_F12,_______, - QK_BOOT, RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, + QK_BOOT,RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______, _______,_______,_______,_______), diff --git a/keyboards/smk60/keymaps/60_ansi_split_bs_shift/keymap.c b/keyboards/smk60/keymaps/60_ansi_split_bs_shift/keymap.c index e8ee531ed32..fbfc949bec3 100644 --- a/keyboards/smk60/keymaps/60_ansi_split_bs_shift/keymap.c +++ b/keyboards/smk60/keymaps/60_ansi_split_bs_shift/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_CAPS, KC_LGUI, KC_LALT, LT(1,KC_SPC), KC_RALT, KC_RGUI, TG(1), KC_RCTL), [1] = LAYOUT_60_ansi_split_bs_shift( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR, - QK_BOOT, RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, + QK_BOOT, RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______, _______,_______,TG(0),_______), diff --git a/keyboards/smk60/keymaps/60_iso/keymap.c b/keyboards/smk60/keymaps/60_iso/keymap.c index d57823ccfbf..0bb0c430795 100644 --- a/keyboards/smk60/keymaps/60_iso/keymap.c +++ b/keyboards/smk60/keymaps/60_iso/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_CAPS, KC_LGUI, KC_LALT, LT(1,KC_SPC), KC_RALT, KC_RGUI, MO(1), KC_RCTL), [1] = LAYOUT_60_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______, - QK_BOOT, RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, + QK_BOOT,RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT, _______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______, _______,_______,_______,_______), diff --git a/keyboards/smk60/keymaps/default/keymap.c b/keyboards/smk60/keymaps/default/keymap.c index 70f913c82b5..00f8343afb6 100644 --- a/keyboards/smk60/keymaps/default/keymap.c +++ b/keyboards/smk60/keymaps/default/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL), [1] = LAYOUT_60_ansi( 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_F12,_______, - QK_BOOT, RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, + QK_BOOT,RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______, _______,_______,_______,_______), diff --git a/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c b/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c index c9b37e01347..f587433e131 100644 --- a/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c +++ b/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_alice_split_bs( KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; diff --git a/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c b/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c index 1d4248da5e1..521cb2ce96f 100644 --- a/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c +++ b/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_alice_split_bs( KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [_L3] = LAYOUT_alice_split_bs( diff --git a/keyboards/sneakbox/aliceclonergb/keymaps/default/keymap.c b/keyboards/sneakbox/aliceclonergb/keymaps/default/keymap.c index f451ffca47a..dfb91bccea0 100644 --- a/keyboards/sneakbox/aliceclonergb/keymaps/default/keymap.c +++ b/keyboards/sneakbox/aliceclonergb/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_alice_split_bs( KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_MOD, RGB_TOG, - QK_BOOT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_TRNS, + QK_BOOT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_SAI, KC_TRNS, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; diff --git a/keyboards/sneakbox/aliceclonergb/keymaps/via/keymap.c b/keyboards/sneakbox/aliceclonergb/keymaps/via/keymap.c index bdd6deb5f89..862ba95ccd9 100644 --- a/keyboards/sneakbox/aliceclonergb/keymaps/via/keymap.c +++ b/keyboards/sneakbox/aliceclonergb/keymaps/via/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_alice_split_bs( KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_MOD, RGB_TOG, - QK_BOOT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_TRNS, + QK_BOOT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_SAI, KC_TRNS, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [_L3] = LAYOUT_alice_split_bs( diff --git a/keyboards/sneakbox/ava/keymaps/default/keymap.c b/keyboards/sneakbox/ava/keymaps/default/keymap.c index 43fa636fe45..6462d202f5e 100644 --- a/keyboards/sneakbox/ava/keymaps/default/keymap.c +++ b/keyboards/sneakbox/ava/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_MOD, RGB_TOG, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_SAI, KC_TRNS, RGB_HUI, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_SAI, KC_TRNS, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; diff --git a/keyboards/sneakbox/ava/keymaps/via/keymap.c b/keyboards/sneakbox/ava/keymaps/via/keymap.c index 630edd4c9a7..32768299787 100644 --- a/keyboards/sneakbox/ava/keymaps/via/keymap.c +++ b/keyboards/sneakbox/ava/keymaps/via/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_MOD, RGB_TOG, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_SAI, KC_TRNS, RGB_HUI, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_SAI, KC_TRNS, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [_L3] = LAYOUT_alice_split_bs( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/spaceholdings/nebula68/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula68/keymaps/default/keymap.c index 1a20fc1ebc7..56583f202a5 100755 --- a/keyboards/spaceholdings/nebula68/keymaps/default/keymap.c +++ b/keyboards/spaceholdings/nebula68/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_68_ansi( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_PGUP, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_DEL, KC_PGDN, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_DEL, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/spaceholdings/nebula68/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68/keymaps/via/keymap.c index 1a20fc1ebc7..56583f202a5 100755 --- a/keyboards/spaceholdings/nebula68/keymaps/via/keymap.c +++ b/keyboards/spaceholdings/nebula68/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_68_ansi( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_PGUP, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_DEL, KC_PGDN, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_DEL, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/spaceman/pancake/rev1/keymaps/default/keymap.c b/keyboards/spaceman/pancake/rev1/keymaps/default/keymap.c index 682e1ae3820..f0b860917a6 100644 --- a/keyboards/spaceman/pancake/rev1/keymaps/default/keymap.c +++ b/keyboards/spaceman/pancake/rev1/keymaps/default/keymap.c @@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_FN] = LAYOUT_ortho_4x12( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/spaceman/pancake/rev1/keymaps/via/keymap.c b/keyboards/spaceman/pancake/rev1/keymaps/via/keymap.c index ed8cd28521f..00a0e606e02 100644 --- a/keyboards/spaceman/pancake/rev1/keymaps/via/keymap.c +++ b/keyboards/spaceman/pancake/rev1/keymaps/via/keymap.c @@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_FN] = LAYOUT_ortho_4x12( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/spiderisland/split78/keymaps/default/keymap.c b/keyboards/spiderisland/split78/keymaps/default/keymap.c index 6cb31a180f2..a9b49e13087 100644 --- a/keyboards/spiderisland/split78/keymaps/default/keymap.c +++ b/keyboards/spiderisland/split78/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, TT(_FN), KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT( - QK_BOOT, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, + QK_BOOT, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP, KC_DEL, KC_NUM, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, KC_P7, KC_P8, KC_P9, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_P4, KC_P5, KC_P6, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, diff --git a/keyboards/splitkb/zima/keymaps/default/keymap.c b/keyboards/splitkb/zima/keymaps/default/keymap.c index 2bf4c3700f1..0365821be44 100644 --- a/keyboards/splitkb/zima/keymaps/default/keymap.c +++ b/keyboards/splitkb/zima/keymaps/default/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, KC_P3 ), [1] = LAYOUT_ortho_4x3( /* Layer 1 */ - QK_BOOT, _______, XXXXXXX, + QK_BOOT, _______, XXXXXXX, AU_ON, AU_OFF, XXXXXXX, CK_TOGG, XXXXXXX, CK_UP, CK_RST, XXXXXXX, CK_DOWN diff --git a/keyboards/splitkb/zima/keymaps/via/keymap.c b/keyboards/splitkb/zima/keymaps/via/keymap.c index 7d29c05fdc2..9937bb6e14e 100644 --- a/keyboards/splitkb/zima/keymaps/via/keymap.c +++ b/keyboards/splitkb/zima/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, KC_P3 ), [1] = LAYOUT_ortho_4x3(/* Layer 1 */ - QK_BOOT, _______, XXXXXXX, + QK_BOOT, _______, XXXXXXX, AU_ON, AU_OFF, XXXXXXX, CK_TOGG, XXXXXXX, CK_UP, CK_RST, XXXXXXX, CK_DOWN diff --git a/keyboards/stello65/hs_rev1/keymaps/default/keymap.c b/keyboards/stello65/hs_rev1/keymaps/default/keymap.c index 4ed3a8a98ac..0679402dac2 100644 --- a/keyboards/stello65/hs_rev1/keymaps/default/keymap.c +++ b/keyboards/stello65/hs_rev1/keymaps/default/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, - RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/stello65/hs_rev1/keymaps/via/keymap.c b/keyboards/stello65/hs_rev1/keymaps/via/keymap.c index eb225da7928..51cbf19a914 100644 --- a/keyboards/stello65/hs_rev1/keymaps/via/keymap.c +++ b/keyboards/stello65/hs_rev1/keymaps/via/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, - RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/stello65/sl_rev1/keymaps/default/keymap.c b/keyboards/stello65/sl_rev1/keymaps/default/keymap.c index 7c2c054fc4e..38283ab64b0 100644 --- a/keyboards/stello65/sl_rev1/keymaps/default/keymap.c +++ b/keyboards/stello65/sl_rev1/keymaps/default/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/stello65/sl_rev1/keymaps/via/keymap.c b/keyboards/stello65/sl_rev1/keymaps/via/keymap.c index 0c59498a5c8..f4c7bfbd671 100644 --- a/keyboards/stello65/sl_rev1/keymaps/via/keymap.c +++ b/keyboards/stello65/sl_rev1/keymaps/via/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/studiokestra/bourgeau/keymaps/default/keymap.c b/keyboards/studiokestra/bourgeau/keymaps/default/keymap.c index 479b6cc6be0..3a20b5ab546 100644 --- a/keyboards/studiokestra/bourgeau/keymaps/default/keymap.c +++ b/keyboards/studiokestra/bourgeau/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), [_FN] = LAYOUT_75_ansi_rwkl( /* FN */ - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/studiokestra/bourgeau/keymaps/via/keymap.c b/keyboards/studiokestra/bourgeau/keymaps/via/keymap.c index fa1e40e4f6f..361da9211bc 100644 --- a/keyboards/studiokestra/bourgeau/keymaps/via/keymap.c +++ b/keyboards/studiokestra/bourgeau/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), [1] = LAYOUT_75_ansi_rwkl( /* FN */ - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [2] = LAYOUT_75_ansi_rwkl( /* Layer 3 */ - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [3] = LAYOUT_75_ansi_rwkl( /* Layer 3 */ - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/studiokestra/cascade/keymaps/default/keymap.c b/keyboards/studiokestra/cascade/keymaps/default/keymap.c index 783c2ac15a0..f57fdc0956e 100644 --- a/keyboards/studiokestra/cascade/keymaps/default/keymap.c +++ b/keyboards/studiokestra/cascade/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), [_FN] = LAYOUT_all( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, BL_STEP, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_PSCR, _______, diff --git a/keyboards/studiokestra/cascade/keymaps/default_tsangan_hhkb/keymap.c b/keyboards/studiokestra/cascade/keymaps/default_tsangan_hhkb/keymap.c index a5cfe430cd9..dcdf6d6e706 100644 --- a/keyboards/studiokestra/cascade/keymaps/default_tsangan_hhkb/keymap.c +++ b/keyboards/studiokestra/cascade/keymaps/default_tsangan_hhkb/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ), [_FN] = LAYOUT_60_tsangan_hhkb( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, BL_STEP, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_PSCR, _______, diff --git a/keyboards/studiokestra/cascade/keymaps/via/keymap.c b/keyboards/studiokestra/cascade/keymaps/via/keymap.c index 3ef3479995b..c254d9e5b25 100644 --- a/keyboards/studiokestra/cascade/keymaps/via/keymap.c +++ b/keyboards/studiokestra/cascade/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), [_FN] = LAYOUT_all( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, BL_STEP, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_PSCR, _______, diff --git a/keyboards/studiokestra/nue/keymaps/default/keymap.c b/keyboards/studiokestra/nue/keymaps/default/keymap.c index 513e78393f7..cfd24b93bbb 100644 --- a/keyboards/studiokestra/nue/keymaps/default/keymap.c +++ b/keyboards/studiokestra/nue/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/studiokestra/nue/keymaps/via/keymap.c b/keyboards/studiokestra/nue/keymaps/via/keymap.c index 5990f1ba899..b1979d5ecdf 100644 --- a/keyboards/studiokestra/nue/keymaps/via/keymap.c +++ b/keyboards/studiokestra/nue/keymaps/via/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL), [_FN1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/suavity/ehan/keymaps/default/keymap.c b/keyboards/suavity/ehan/keymaps/default/keymap.c index 7e84ba614c4..49b826d0032 100755 --- a/keyboards/suavity/ehan/keymaps/default/keymap.c +++ b/keyboards/suavity/ehan/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi_split_bs_rshift_lspace( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/suavity/ehan/keymaps/default_iso/keymap.c b/keyboards/suavity/ehan/keymaps/default_iso/keymap.c index 238c11bde47..65e59b4cccb 100644 --- a/keyboards/suavity/ehan/keymaps/default_iso/keymap.c +++ b/keyboards/suavity/ehan/keymaps/default_iso/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_iso_split_bs_rshift_lspace( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/suavity/ehan/keymaps/via/keymap.c b/keyboards/suavity/ehan/keymaps/via/keymap.c index db281587520..f0cb17947e2 100644 --- a/keyboards/suavity/ehan/keymaps/via/keymap.c +++ b/keyboards/suavity/ehan/keymaps/via/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi_split_bs_rshift_lspace( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c b/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c index 57b43a0988a..cd0070be4e3 100644 --- a/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c +++ b/keyboards/switchplate/southpaw_65/keymaps/default/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */ _______, _______, _______, _______, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, KC_INS, /* ├─────────┼─────────┼─────────┼─────────┼─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴─────────┼─────────┤ */ - _______, _______, _______, _______, QK_BOOT, BL_TOGG, BL_UP, BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, BL_TOGG, BL_UP, BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, /* ├─────────┼─────────┼─────────┼─────────┼──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬───────────┼─────────┤ */ _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, EE_CLR, _______, /* ├─────────┼─────────┼─────────┼─────────┼───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */ diff --git a/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c b/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c index f0668b5948e..9d74385719c 100644 --- a/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c +++ b/keyboards/switchplate/southpaw_65/keymaps/default_ansi/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */ _______, _______, _______, _______, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, /* ├─────────┼─────────┼─────────┼─────────┼─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */ - _______, _______, _______, _______, QK_BOOT, BL_TOGG, BL_UP, BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, BL_TOGG, BL_UP, BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, /* ├─────────┼─────────┼─────────┤ ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────┤ */ _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, EE_CLR, _______, /* ├─────────┼─────────┼─────────┼─────────┼─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┤ */ diff --git a/keyboards/switchplate/southpaw_fullsize/keymaps/default/keymap.c b/keyboards/switchplate/southpaw_fullsize/keymaps/default/keymap.c index aae7e1c8c13..58473cbea2e 100644 --- a/keyboards/switchplate/southpaw_fullsize/keymaps/default/keymap.c +++ b/keyboards/switchplate/southpaw_fullsize/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_all ( - _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/switchplate/southpaw_fullsize/keymaps/default_wkl/keymap.c b/keyboards/switchplate/southpaw_fullsize/keymaps/default_wkl/keymap.c index 5012f11d0db..b31b68d21e2 100644 --- a/keyboards/switchplate/southpaw_fullsize/keymaps/default_wkl/keymap.c +++ b/keyboards/switchplate/southpaw_fullsize/keymaps/default_wkl/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_ansi_wkl ( - _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/sx60/keymaps/default/keymap.c b/keyboards/sx60/keymaps/default/keymap.c index 5ec3f52b8f3..8bcf4e71bfa 100755 --- a/keyboards/sx60/keymaps/default/keymap.c +++ b/keyboards/sx60/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_ansi_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_LPRN, KC_RPRN, KC_GRV, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/sx60/keymaps/via/keymap.c b/keyboards/sx60/keymaps/via/keymap.c index c52e9b9dbb6..e187fe6dc7d 100755 --- a/keyboards/sx60/keymaps/via/keymap.c +++ b/keyboards/sx60/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_ansi_split_bs_rshift( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_LPRN, KC_RPRN, KC_GRV, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/system76/launch_1/keymaps/default/keymap.c b/keyboards/system76/launch_1/keymaps/default/keymap.c index 1da2fbf4bc7..f3dfd3420e7 100644 --- a/keyboards/system76/launch_1/keymaps/default/keymap.c +++ b/keyboards/system76/launch_1/keymaps/default/keymap.c @@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAD, RGB_VAI, KC_TRNS, KC_VOLU, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, diff --git a/keyboards/tanuki/keymaps/default/keymap.c b/keyboards/tanuki/keymaps/default/keymap.c index e4987ef8cb2..9c60cdc59e6 100644 --- a/keyboards/tanuki/keymaps/default/keymap.c +++ b/keyboards/tanuki/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [_UL] = LAYOUT( KC_GRV, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_PIPE, KC_BSLS, KC_PLUS, KC_UNDS, KC_MINS, KC_EQL, KC_DEL, diff --git a/keyboards/tenki/keymaps/default/keymap.c b/keyboards/tenki/keymaps/default/keymap.c index 8c08efe1bc5..54232250c12 100644 --- a/keyboards/tenki/keymaps/default/keymap.c +++ b/keyboards/tenki/keymaps/default/keymap.c @@ -14,6 +14,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_VOLU, RGB_TOG, RGB_VAI, KC_MPRV, KC_MUTE, KC_MNXT, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, RGB_MOD + QK_BOOT, KC_TRNS, KC_TRNS, RGB_MOD ) }; diff --git a/keyboards/tenki/keymaps/via/keymap.c b/keyboards/tenki/keymaps/via/keymap.c index 3c29e49d31a..7354f33a1d0 100644 --- a/keyboards/tenki/keymaps/via/keymap.c +++ b/keyboards/tenki/keymaps/via/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_VOLU, RGB_TOG, RGB_VAI, KC_MPRV, KC_MUTE, KC_MNXT, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, RGB_MOD + QK_BOOT, KC_TRNS, KC_TRNS, RGB_MOD ), [2] = LAYOUT_ortho_5x4( diff --git a/keyboards/terrazzo/keymaps/default/keymap.c b/keyboards/terrazzo/keymaps/default/keymap.c index d81ced8acc9..2c2ca0b161b 100644 --- a/keyboards/terrazzo/keymaps/default/keymap.c +++ b/keyboards/terrazzo/keymaps/default/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11, KC_F12, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, CG_TOGG, - _______, QK_BOOT, _______, _______, _______, _______, _______ + _______, QK_BOOT, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/tgr/910/keymaps/default/keymap.c b/keyboards/tgr/910/keymaps/default/keymap.c index 6871f6c47e7..b3473ac5cc1 100644 --- a/keyboards/tgr/910/keymaps/default/keymap.c +++ b/keyboards/tgr/910/keymaps/default/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi_split_bs( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSLS, KC_DEL, - BL_TOGG, BL_STEP, BL_UP, BL_DOWN, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, + BL_TOGG, BL_STEP, BL_UP, BL_DOWN, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/tgr/910/keymaps/via/keymap.c b/keyboards/tgr/910/keymaps/via/keymap.c index 42dad2bbb64..8fc80729d53 100644 --- a/keyboards/tgr/910/keymaps/via/keymap.c +++ b/keyboards/tgr/910/keymaps/via/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi_split_bs( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSLS, KC_TRNS, - BL_TOGG, BL_STEP, BL_UP, BL_DOWN, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, + BL_TOGG, BL_STEP, BL_UP, BL_DOWN, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/tgr/tris/keymaps/default/keymap.c b/keyboards/tgr/tris/keymaps/default/keymap.c index 7d983a06369..c30abdc4514 100644 --- a/keyboards/tgr/tris/keymaps/default/keymap.c +++ b/keyboards/tgr/tris/keymaps/default/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [2] = LAYOUT_numpad_6x4( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/tgr/tris/keymaps/via/keymap.c b/keyboards/tgr/tris/keymaps/via/keymap.c index 4ad7ebf693f..18be2af8516 100644 --- a/keyboards/tgr/tris/keymaps/via/keymap.c +++ b/keyboards/tgr/tris/keymaps/via/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [2] = LAYOUT_numpad_6x4( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c index 67f7c0717cb..0c08482c980 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c @@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( //,-----------------------------------------------------------------------------------------------------------. // Reset LEDReset MacMode WinMode Home PageDown PageUp End - _______, QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, XXXXXXX, + _______, QK_BOOT,RGBRST, AG_NORM, AG_SWAP, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| // LED On/Off Hue/Saturation/Value Increment Mouse Left Down Up Right _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX, _______, diff --git a/keyboards/tkc/godspeed75/keymaps/default/keymap.c b/keyboards/tkc/godspeed75/keymaps/default/keymap.c index c40b714bf0e..120a57d61b3 100644 --- a/keyboards/tkc/godspeed75/keymaps/default/keymap.c +++ b/keyboards/tkc/godspeed75/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL] = 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, QK_BOOT, KC_PGUP, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, QK_BOOT, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_INS, KC_LSFT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, diff --git a/keyboards/tkc/godspeed75/keymaps/via/keymap.c b/keyboards/tkc/godspeed75/keymaps/via/keymap.c index b5b32c7db2e..f4263a90b6f 100644 --- a/keyboards/tkc/godspeed75/keymaps/via/keymap.c +++ b/keyboards/tkc/godspeed75/keymaps/via/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FL] = 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, QK_BOOT, KC_PGUP, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, QK_BOOT, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_INS, KC_LSFT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_AL] = 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, QK_BOOT, KC_PGUP, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, QK_BOOT, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_INS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LL] = 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, QK_BOOT, KC_PGUP, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, QK_BOOT, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_INS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, diff --git a/keyboards/tkc/tkc1800/keymaps/default/keymap.c b/keyboards/tkc/tkc1800/keymaps/default/keymap.c index 268679c9d2f..67c587707be 100644 --- a/keyboards/tkc/tkc1800/keymaps/default/keymap.c +++ b/keyboards/tkc/tkc1800/keymaps/default/keymap.c @@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [FUNCTION] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, XXXXXXX, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, _______, _______, _______, _______, XXXXXXX, diff --git a/keyboards/tkc/tkc1800/keymaps/via/keymap.c b/keyboards/tkc/tkc1800/keymaps/via/keymap.c index 6e6998a360c..232f9ab7e20 100644 --- a/keyboards/tkc/tkc1800/keymaps/via/keymap.c +++ b/keyboards/tkc/tkc1800/keymaps/via/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [FUNCTION] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, XXXXXXX, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, _______, _______, _______, _______, XXXXXXX, @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [ALTERNATE] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, XXXXXXX, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, _______, _______, _______, _______, XXXXXXX, @@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [LAST] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, XXXXXXX, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, _______, _______, _______, _______, XXXXXXX, diff --git a/keyboards/tkc/tkc1800/keymaps/wkl/keymap.c b/keyboards/tkc/tkc1800/keymaps/wkl/keymap.c index 5b0afccb4b4..2e574f4b413 100644 --- a/keyboards/tkc/tkc1800/keymaps/wkl/keymap.c +++ b/keyboards/tkc/tkc1800/keymaps/wkl/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [FUNCTION] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, XXXXXXX, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, _______, _______, _______, _______, XXXXXXX, diff --git a/keyboards/tkw/stoutgat/v1/keymaps/default/keymap.c b/keyboards/tkw/stoutgat/v1/keymaps/default/keymap.c index 6b73bc2b8e2..57f7289463c 100644 --- a/keyboards/tkw/stoutgat/v1/keymaps/default/keymap.c +++ b/keyboards/tkw/stoutgat/v1/keymaps/default/keymap.c @@ -19,7 +19,7 @@ /* esc 1 2 3 4 5 6 7 8 9 0 - = bkspc `~ */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PSCR, /* tab Q W E R T Y U I O P [ ] delete*/ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, /* caps A S D F G H J K L ; ' # enter pg up*/ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_HOME, /* shift \ Z X C V B N M , . / shift up pg dn*/ diff --git a/keyboards/tkw/stoutgat/v2/keymaps/ansi/keymap.c b/keyboards/tkw/stoutgat/v2/keymaps/ansi/keymap.c index de6f510abcd..2b5dc3f2a55 100644 --- a/keyboards/tkw/stoutgat/v2/keymaps/ansi/keymap.c +++ b/keyboards/tkw/stoutgat/v2/keymaps/ansi/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* esc 1 2 3 4 5 6 7 8 9 0 - = bkspc `~ */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, QK_BOOT, /* tab Q W E R T Y U I O P [ ] \ delete*/ - RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS, + RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS, /* caps A S D F G H J K L ; ' enter pg up*/ RGB_TOG, RGB_VAD, RGB_SAD, RGB_HUD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, /* shift Z X C V B N M , . / shift up pg dn*/ diff --git a/keyboards/tmo50/keymaps/default/keymap.c b/keyboards/tmo50/keymaps/default/keymap.c index 1a1778356de..de588b81238 100644 --- a/keyboards/tmo50/keymaps/default/keymap.c +++ b/keyboards/tmo50/keymaps/default/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn3 layer [3] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP, BL_DOWN,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/tmo50/keymaps/via/keymap.c b/keyboards/tmo50/keymaps/via/keymap.c index 1a1778356de..de588b81238 100644 --- a/keyboards/tmo50/keymaps/via/keymap.c +++ b/keyboards/tmo50/keymaps/via/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn3 layer [3] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP, BL_DOWN,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/tominabox1/bigboy/keymaps/default/keymap.c b/keyboards/tominabox1/bigboy/keymaps/default/keymap.c index dfb4030e681..3c867c5fabc 100755 --- a/keyboards/tominabox1/bigboy/keymaps/default/keymap.c +++ b/keyboards/tominabox1/bigboy/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_4, KC_5, MO(1) ), [1] = LAYOUT( - QK_BOOT, KC_NO, KC_NO, + QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO ), [2] = LAYOUT( diff --git a/keyboards/tominabox1/bigboy/keymaps/default_2u/keymap.c b/keyboards/tominabox1/bigboy/keymaps/default_2u/keymap.c index 7ad83d3d6fa..00638e0c5f2 100755 --- a/keyboards/tominabox1/bigboy/keymaps/default_2u/keymap.c +++ b/keyboards/tominabox1/bigboy/keymaps/default_2u/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_1, KC_2, MO(1) ), [1] = LAYOUT_2us( - QK_BOOT, KC_NO, KC_NO + QK_BOOT, KC_NO, KC_NO ), [2] = LAYOUT_2us( KC_NO, KC_NO, KC_NO diff --git a/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c b/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c index 8b981c6d750..c7e12ebbb71 100644 --- a/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c +++ b/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_NAV] = LAYOUT( - QK_BOOT, _______, AG_NORM, AG_SWAP, DB_TOGG, KC_TRNS, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN, + QK_BOOT, _______, AG_NORM, AG_SWAP, DB_TOGG, KC_TRNS, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_MINS, KC_INT1, KC_COMM, KC_DOT, KC_BSLS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c b/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c index cf4eca1a4b7..8ed4720fdf3 100644 --- a/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c +++ b/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_NAV] = LAYOUT_33_split_space( - QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN, + QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_MINS, KC_INT1, KC_COMM, KC_DOT, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c index 59bff4940b5..0aa2a412c92 100644 --- a/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c +++ b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_NAV] = LAYOUT_33_big_space( - QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN, + QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_MINS, KC_INT1, KC_COMM, KC_DOT, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/tominabox1/underscore33/rev2/keymaps/default/keymap.c b/keyboards/tominabox1/underscore33/rev2/keymaps/default/keymap.c index be37e1bdd2f..97b60d61d46 100644 --- a/keyboards/tominabox1/underscore33/rev2/keymaps/default/keymap.c +++ b/keyboards/tominabox1/underscore33/rev2/keymaps/default/keymap.c @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_NAV] = LAYOUT_33_split_space( - QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN, + QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_MINS, KC_INT1, KC_COMM, KC_DOT, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/tr60w/keymaps/default/keymap.c b/keyboards/tr60w/keymaps/default/keymap.c index 4f81df09ce7..5c0b6ec2135 100644 --- a/keyboards/tr60w/keymaps/default/keymap.c +++ b/keyboards/tr60w/keymaps/default/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), LAYOUT_60_tsangan_hhkb( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, KC_DEL, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, KC_LEFT, KC_RGHT, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, _______, _______, _______, KC_DOWN, _______, _______, diff --git a/keyboards/trashman/ketch/keymaps/default/keymap.c b/keyboards/trashman/ketch/keymaps/default/keymap.c index 231704686e1..9e7a9b4bb03 100644 --- a/keyboards/trashman/ketch/keymaps/default/keymap.c +++ b/keyboards/trashman/ketch/keymaps/default/keymap.c @@ -39,6 +39,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_TRNS, KC_UNDS, KC_PLUS, KC_COLN, KC_DQUO, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_DQUO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_PGUP, KC_PIPE, - KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END + KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ) }; diff --git a/keyboards/treasure/type9s2/keymaps/default/keymap.c b/keyboards/treasure/type9s2/keymaps/default/keymap.c index 8d076c3d997..fb71b5adf25 100644 --- a/keyboards/treasure/type9s2/keymaps/default/keymap.c +++ b/keyboards/treasure/type9s2/keymaps/default/keymap.c @@ -38,6 +38,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_ortho_3x3( _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______ + QK_BOOT, _______, _______ ) }; diff --git a/keyboards/treasure/type9s3/keymaps/default/keymap.c b/keyboards/treasure/type9s3/keymaps/default/keymap.c index 166062f649b..aecf899e6cf 100644 --- a/keyboards/treasure/type9s3/keymaps/default/keymap.c +++ b/keyboards/treasure/type9s3/keymaps/default/keymap.c @@ -26,6 +26,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_ortho_3x3( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS + QK_BOOT, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/treasure/type9s3/keymaps/via/keymap.c b/keyboards/treasure/type9s3/keymaps/via/keymap.c index 166062f649b..aecf899e6cf 100644 --- a/keyboards/treasure/type9s3/keymaps/via/keymap.c +++ b/keyboards/treasure/type9s3/keymaps/via/keymap.c @@ -26,6 +26,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT_ortho_3x3( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS + QK_BOOT, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/tszaboo/ortho4exent/keymaps/default/keymap.c b/keyboards/tszaboo/ortho4exent/keymaps/default/keymap.c index 148beb247a2..52bdc5949fb 100644 --- a/keyboards/tszaboo/ortho4exent/keymaps/default/keymap.c +++ b/keyboards/tszaboo/ortho4exent/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( KC_TRNS, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_TRNS, KC_TRNS, KC_TRNS, KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_M_P, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/uk78/keymaps/default/keymap.c b/keyboards/uk78/keymaps/default/keymap.c index e4bdf905085..0385f8bf17c 100644 --- a/keyboards/uk78/keymaps/default/keymap.c +++ b/keyboards/uk78/keymaps/default/keymap.c @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_INS, KC_NUM, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, BL_DOWN, BL_UP, _______, KC_MUTE, KC_MUTE, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, KC_VOLD, _______, _______, _______, _______ diff --git a/keyboards/ungodly/launch_pad/keymaps/default/keymap.c b/keyboards/ungodly/launch_pad/keymaps/default/keymap.c index b1534760caf..fb7a1e90be3 100644 --- a/keyboards/ungodly/launch_pad/keymaps/default/keymap.c +++ b/keyboards/ungodly/launch_pad/keymaps/default/keymap.c @@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_HUD, RGB_HUI, XXXXXXX, RGB_M_P, RGB_SAD, RGB_SAI, XXXXXXX, RGB_MOD, RGB_VAD, RGB_VAI, XXXXXXX, XXXXXXX, - QK_BOOT, QK_BOOT, XXXXXXX, XXXXXXX + QK_BOOT, QK_BOOT, XXXXXXX, XXXXXXX ), }; diff --git a/keyboards/ungodly/launch_pad/keymaps/via/keymap.c b/keyboards/ungodly/launch_pad/keymaps/via/keymap.c index b2b6640e6a6..6bf504a9098 100644 --- a/keyboards/ungodly/launch_pad/keymaps/via/keymap.c +++ b/keyboards/ungodly/launch_pad/keymaps/via/keymap.c @@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_HUD, RGB_HUI, XXXXXXX, RGB_M_P, RGB_SAD, RGB_SAI, XXXXXXX, RGB_MOD, RGB_VAD, RGB_VAI, XXXXXXX, XXXXXXX, - QK_BOOT, QK_BOOT, XXXXXXX, XXXXXXX + QK_BOOT, QK_BOOT, XXXXXXX, XXXXXXX ), }; diff --git a/keyboards/ungodly/nines/keymaps/default/keymap.c b/keyboards/ungodly/nines/keymaps/default/keymap.c index e9cd2e02b62..8de2106edab 100644 --- a/keyboards/ungodly/nines/keymaps/default/keymap.c +++ b/keyboards/ungodly/nines/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_ortho_3x3( - QK_BOOT, _______, KC_STOP, + QK_BOOT, _______, KC_STOP, _______, KC_HOME, _______, KC_MPRV, KC_END , KC_MNXT ) diff --git a/keyboards/ungodly/nines/keymaps/via/keymap.c b/keyboards/ungodly/nines/keymaps/via/keymap.c index 46644b3a208..13f0f6fb554 100644 --- a/keyboards/ungodly/nines/keymaps/via/keymap.c +++ b/keyboards/ungodly/nines/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_ortho_3x3( - QK_BOOT, _______, KC_STOP, + QK_BOOT, _______, KC_STOP, _______, KC_HOME, _______, KC_MPRV, KC_END , KC_MNXT ), diff --git a/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c b/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c index 3111ac26d76..569807ea7e8 100644 --- a/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c +++ b/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , - QK_BOOT, KC_LCTL, KC_LALT, KC_LGUI, LT(_LOWER, KC_SPC), LT(_RAISE,KC_SPC), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + QK_BOOT, KC_LCTL, KC_LALT, KC_LGUI, LT(_LOWER, KC_SPC), LT(_RAISE,KC_SPC), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), /* Colemak @@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12_2x2u( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/unikorn/keymaps/default/keymap.c b/keyboards/unikorn/keymaps/default/keymap.c index 5ecc4b29bb8..f0cbd2764e4 100644 --- a/keyboards/unikorn/keymaps/default/keymap.c +++ b/keyboards/unikorn/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_ansi( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/unikorn/keymaps/tsangan/keymap.c b/keyboards/unikorn/keymaps/tsangan/keymap.c index 6761281787e..814c0992854 100644 --- a/keyboards/unikorn/keymaps/tsangan/keymap.c +++ b/keyboards/unikorn/keymaps/tsangan/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_tsangan_hhkb( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/unikorn/keymaps/via/keymap.c b/keyboards/unikorn/keymaps/via/keymap.c index 05a9ea0a96e..2a8a16550a3 100644 --- a/keyboards/unikorn/keymaps/via/keymap.c +++ b/keyboards/unikorn/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_ansi( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/viktus/at101_bh/keymaps/default/keymap.c b/keyboards/viktus/at101_bh/keymaps/default/keymap.c index d05e549d21e..cef4ad93cb1 100644 --- a/keyboards/viktus/at101_bh/keymaps/default/keymap.c +++ b/keyboards/viktus/at101_bh/keymaps/default/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c b/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c index ad63d050233..cf976da3306 100644 --- a/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c +++ b/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, XXXXXXX, _______, _______, _______, _______, diff --git a/keyboards/viktus/smolka/keymaps/default/keymap.c b/keyboards/viktus/smolka/keymaps/default/keymap.c index 8e91203f325..a51676e0dfd 100644 --- a/keyboards/viktus/smolka/keymaps/default/keymap.c +++ b/keyboards/viktus/smolka/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( /* Smolka Base */ - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/viktus/smolka/keymaps/via/keymap.c b/keyboards/viktus/smolka/keymaps/via/keymap.c index 7f5fff9ee9c..ac283cb7e85 100644 --- a/keyboards/viktus/smolka/keymaps/via/keymap.c +++ b/keyboards/viktus/smolka/keymaps/via/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( /* Smolka Base */ - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/viktus/sp_mini/keymaps/default/keymap.c b/keyboards/viktus/sp_mini/keymaps/default/keymap.c index 3f123b1cb1f..939b545d0ba 100644 --- a/keyboards/viktus/sp_mini/keymaps/default/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/default/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT_all( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, _______, KC_UP, diff --git a/keyboards/viktus/sp_mini/keymaps/via/keymap.c b/keyboards/viktus/sp_mini/keymaps/via/keymap.c index de6a8895772..7fd1eb0961c 100644 --- a/keyboards/viktus/sp_mini/keymaps/via/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/via/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT_all( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, _______, KC_UP, diff --git a/keyboards/viktus/styrka/keymaps/default/keymap.c b/keyboards/viktus/styrka/keymaps/default/keymap.c index 47adf073137..9980519141f 100644 --- a/keyboards/viktus/styrka/keymaps/default/keymap.c +++ b/keyboards/viktus/styrka/keymaps/default/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_default( /* Styrka Base */ - QK_BOOT, KC_F2, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_INS, + QK_BOOT, KC_F2, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_INS, KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL, KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, diff --git a/keyboards/viktus/styrka/keymaps/via/keymap.c b/keyboards/viktus/styrka/keymaps/via/keymap.c index 2950af55237..40fa021fcff 100644 --- a/keyboards/viktus/styrka/keymaps/via/keymap.c +++ b/keyboards/viktus/styrka/keymaps/via/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( /* Styrka Base */ - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/viktus/z150_bh/keymaps/default/keymap.c b/keyboards/viktus/z150_bh/keymaps/default/keymap.c index 8610ad1d662..7d58cf52553 100644 --- a/keyboards/viktus/z150_bh/keymaps/default/keymap.c +++ b/keyboards/viktus/z150_bh/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( - _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/viktus/z150_bh/keymaps/default_tkl/keymap.c b/keyboards/viktus/z150_bh/keymaps/default_tkl/keymap.c index bcc5501bac3..7da30d2f97a 100644 --- a/keyboards/viktus/z150_bh/keymaps/default_tkl/keymap.c +++ b/keyboards/viktus/z150_bh/keymaps/default_tkl/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_z150_tkl( - _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/vitamins_included/keymaps/default/keymap.c b/keyboards/vitamins_included/keymaps/default/keymap.c index 0f90fe22bdb..12219b723ad 100644 --- a/keyboards/vitamins_included/keymaps/default/keymap.c +++ b/keyboards/vitamins_included/keymaps/default/keymap.c @@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT_ortho_4x12( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - QK_BOOT, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______, + QK_BOOT, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), diff --git a/keyboards/vitamins_included/keymaps/via/keymap.c b/keyboards/vitamins_included/keymaps/via/keymap.c index f2a3918e25e..79669cc6a3a 100644 --- a/keyboards/vitamins_included/keymaps/via/keymap.c +++ b/keyboards/vitamins_included/keymaps/via/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT_ortho_4x12( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - QK_BOOT, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______, + QK_BOOT, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, AU_OFF, AU_ON, _______, _______, _______, _______, _______, RGB_MOD diff --git a/keyboards/waldo/keymaps/default/keymap.c b/keyboards/waldo/keymaps/default/keymap.c index 7d5f8c70f01..339fb42036a 100644 --- a/keyboards/waldo/keymaps/default/keymap.c +++ b/keyboards/waldo/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FUNCTION] = LAYOUT_60_ansi( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/waldo/keymaps/via/keymap.c b/keyboards/waldo/keymaps/via/keymap.c index b5217a7a8ab..def30bd6f82 100644 --- a/keyboards/waldo/keymaps/via/keymap.c +++ b/keyboards/waldo/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_60_ansi( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/wavtype/foundation/keymaps/default/keymap.c b/keyboards/wavtype/foundation/keymaps/default/keymap.c index 884a66f7e2b..df08988705e 100644 --- a/keyboards/wavtype/foundation/keymaps/default/keymap.c +++ b/keyboards/wavtype/foundation/keymaps/default/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_ansi_split_bs( RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, - RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/wavtype/foundation/keymaps/default_ansi_tsangan_split_bs/keymap.c b/keyboards/wavtype/foundation/keymaps/default_ansi_tsangan_split_bs/keymap.c index 16915388319..a28b79ec7cb 100644 --- a/keyboards/wavtype/foundation/keymaps/default_ansi_tsangan_split_bs/keymap.c +++ b/keyboards/wavtype/foundation/keymaps/default_ansi_tsangan_split_bs/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_ansi_tsangan_split_bs( RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, - RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/wavtype/foundation/keymaps/default_iso_split_bs_rshift/keymap.c b/keyboards/wavtype/foundation/keymaps/default_iso_split_bs_rshift/keymap.c index cfb2589685c..7ab52cc6798 100644 --- a/keyboards/wavtype/foundation/keymaps/default_iso_split_bs_rshift/keymap.c +++ b/keyboards/wavtype/foundation/keymaps/default_iso_split_bs_rshift/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_iso_split_bs_rshift( RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, - RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/wavtype/foundation/keymaps/default_iso_tsangan_split_bs_rshift/keymap.c b/keyboards/wavtype/foundation/keymaps/default_iso_tsangan_split_bs_rshift/keymap.c index ffe2f53221e..3a3093ecbb3 100644 --- a/keyboards/wavtype/foundation/keymaps/default_iso_tsangan_split_bs_rshift/keymap.c +++ b/keyboards/wavtype/foundation/keymaps/default_iso_tsangan_split_bs_rshift/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_iso_tsangan_split_bs_rshift( RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, - RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/wavtype/foundation/keymaps/via/keymap.c b/keyboards/wavtype/foundation/keymaps/via/keymap.c index f57fe6d61a0..e6da42440d0 100644 --- a/keyboards/wavtype/foundation/keymaps/via/keymap.c +++ b/keyboards/wavtype/foundation/keymaps/via/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_ansi_split_bs( RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, - RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/wavtype/p01_ultra/keymaps/default/keymap.c b/keyboards/wavtype/p01_ultra/keymaps/default/keymap.c index 5dc0bff12da..f35dd2a25c9 100644 --- a/keyboards/wavtype/p01_ultra/keymaps/default/keymap.c +++ b/keyboards/wavtype/p01_ultra/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_tkl_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS) diff --git a/keyboards/wavtype/p01_ultra/keymaps/via/keymap.c b/keyboards/wavtype/p01_ultra/keymaps/via/keymap.c index f08e6dd7fd1..10c06d11d48 100644 --- a/keyboards/wavtype/p01_ultra/keymaps/via/keymap.c +++ b/keyboards/wavtype/p01_ultra/keymaps/via/keymap.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_iso( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_SAI,RGB_VAI,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS) diff --git a/keyboards/wekey/polaris/keymaps/default/keymap.c b/keyboards/wekey/polaris/keymaps/default/keymap.c index c53c3a7226e..5c137002efd 100644 --- a/keyboards/wekey/polaris/keymaps/default/keymap.c +++ b/keyboards/wekey/polaris/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), [_FN] = LAYOUT_all( /* FN */ - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, BL_STEP, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_PSCR, _______, diff --git a/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c b/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c index d0de40733ce..a72e7861dcb 100644 --- a/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c +++ b/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,MO(_F1), KC_LEFT,KC_DOWN,KC_RGHT), [_F1] = LAYOUT_ansi( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,_______,_______, + QK_BOOT,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,_______,_______, _______,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, diff --git a/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c b/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c index 4dd531741ea..7385329f018 100644 --- a/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c +++ b/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,MO(_F1), KC_LEFT,KC_DOWN, KC_RGHT), [_F1] = LAYOUT_iso( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,_______, + QK_BOOT,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, diff --git a/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c b/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c index 8fca8fa1251..5c5c31dbf76 100644 --- a/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c +++ b/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,MO(_F1) ,KC_LEFT,KC_DOWN, KC_RGHT), [_F1] = LAYOUT_ansi( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,_______,_______, + QK_BOOT,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,_______,_______,_______, _______,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______,_______,_______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, diff --git a/keyboards/westfoxtrot/cyclops/keymaps/default/keymap.c b/keyboards/westfoxtrot/cyclops/keymaps/default/keymap.c index 42e3dcd0bda..18fe618cf9e 100644 --- a/keyboards/westfoxtrot/cyclops/keymaps/default/keymap.c +++ b/keyboards/westfoxtrot/cyclops/keymaps/default/keymap.c @@ -33,5 +33,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ENT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______), + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/via/keymap.c b/keyboards/westfoxtrot/cypher/rev5/keymaps/via/keymap.c index e5442352c50..1d1c5062aa8 100644 --- a/keyboards/westfoxtrot/cypher/rev5/keymaps/via/keymap.c +++ b/keyboards/westfoxtrot/cypher/rev5/keymaps/via/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RALT, MO(1), KC_LEFT,KC_DOWN,KC_RGHT, KC_P0, KC_PDOT, KC_BSPC), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_STEP, BL_ON, BL_OFF, BL_UP, BL_DOWN, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/westfoxtrot/prophet/keymaps/default/keymap.c b/keyboards/westfoxtrot/prophet/keymaps/default/keymap.c index c7db32f2ddb..7e1a6ddb05a 100644 --- a/keyboards/westfoxtrot/prophet/keymaps/default/keymap.c +++ b/keyboards/westfoxtrot/prophet/keymaps/default/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LGUI,KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,KC_RCTL), [_F1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,KC_INS,KC_DEL, + QK_BOOT,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,KC_INS,KC_DEL, KC_CAPS,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,KC_UP,_______,KC_DEL, _______,KC_VOLD,KC_VOLU,KC_MUTE,KC_EJCT,_______,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RIGHT, _______, _______,_______,_______,_______,_______,_______,_______,KC_PPLS,KC_PMNS,KC_END,KC_PGDN,KC_DOWN,_______,_______, diff --git a/keyboards/westfoxtrot/prophet/keymaps/via/keymap.c b/keyboards/westfoxtrot/prophet/keymaps/via/keymap.c index d7ec7d2d67d..f84f168b01b 100644 --- a/keyboards/westfoxtrot/prophet/keymaps/via/keymap.c +++ b/keyboards/westfoxtrot/prophet/keymaps/via/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LGUI,KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,KC_RCTL), [_F1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,KC_INS,KC_DEL, + QK_BOOT,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,KC_INS,KC_DEL, KC_CAPS,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,KC_UP,_______,KC_DEL, _______,KC_VOLD,KC_VOLU,KC_MUTE,KC_EJCT,_______,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RIGHT, _______, _______,_______,_______,_______,_______,_______,_______,KC_PPLS,KC_PMNS,KC_END,KC_PGDN,KC_DOWN,_______,_______, diff --git a/keyboards/wolf/kuku65/keymaps/default/keymap.c b/keyboards/wolf/kuku65/keymaps/default/keymap.c index 5e876efe694..0db0f32093b 100644 --- a/keyboards/wolf/kuku65/keymaps/default/keymap.c +++ b/keyboards/wolf/kuku65/keymaps/default/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK ) }; diff --git a/keyboards/wolf/kuku65/keymaps/via/keymap.c b/keyboards/wolf/kuku65/keymaps/via/keymap.c index e0bb8dad785..24aa71294a5 100644 --- a/keyboards/wolf/kuku65/keymaps/via/keymap.c +++ b/keyboards/wolf/kuku65/keymaps/via/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK ), diff --git a/keyboards/wolf/ryujin/keymaps/default/keymap.c b/keyboards/wolf/ryujin/keymaps/default/keymap.c index 118515242cc..f414bd81406 100644 --- a/keyboards/wolf/ryujin/keymaps/default/keymap.c +++ b/keyboards/wolf/ryujin/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK ) }; diff --git a/keyboards/wolf/ryujin/keymaps/via/keymap.c b/keyboards/wolf/ryujin/keymaps/via/keymap.c index 4a66cdf5c12..062ac0f01ff 100644 --- a/keyboards/wolf/ryujin/keymaps/via/keymap.c +++ b/keyboards/wolf/ryujin/keymaps/via/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK ), diff --git a/keyboards/wolf/sabre/keymaps/default/keymap.c b/keyboards/wolf/sabre/keymaps/default/keymap.c index f4711d3a697..439bbb6c644 100644 --- a/keyboards/wolf/sabre/keymaps/default/keymap.c +++ b/keyboards/wolf/sabre/keymaps/default/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_UP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN,BL_BRTG ) }; diff --git a/keyboards/wolf/sabre/keymaps/via/keymap.c b/keyboards/wolf/sabre/keymaps/via/keymap.c index 8b301e90e5f..94740a12d32 100644 --- a/keyboards/wolf/sabre/keymaps/via/keymap.c +++ b/keyboards/wolf/sabre/keymaps/via/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_UP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN,BL_BRTG ), diff --git a/keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c b/keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c index a525e19c226..fac2966b4fa 100644 --- a/keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c +++ b/keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c @@ -10,7 +10,7 @@ KC_LCTL, KC_LALT,KC_LGUI,KC_SPC, KC_SPC, KC_RALT, [1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, -QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), diff --git a/keyboards/woodkeys/meira/keymaps/default/keymap.c b/keyboards/woodkeys/meira/keymaps/default/keymap.c index 72f465e44ac..03f5ad34067 100644 --- a/keyboards/woodkeys/meira/keymaps/default/keymap.c +++ b/keyboards/woodkeys/meira/keymaps/default/keymap.c @@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT( - BL_TOGG, QK_BOOT, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, + BL_TOGG, QK_BOOT, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, BL_STEP, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/work_louder/loop/keymaps/default/keymap.c b/keyboards/work_louder/loop/keymaps/default/keymap.c index aafe366180e..80acd57e4a7 100644 --- a/keyboards/work_louder/loop/keymaps/default/keymap.c +++ b/keyboards/work_louder/loop/keymaps/default/keymap.c @@ -21,10 +21,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MUTE, KC_MPLY, R_M_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, MO(1) ), [1] = LAYOUT( - QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MO(2), _______ + QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MO(2), _______ ), [2] = LAYOUT( - QK_BOOT, _______, R_M_TOG, R_M_MOD, R_M_HUI, R_M_HUD, R_M_SAI, R_M_SAD, R_M_VAI, R_M_VAD, _______, _______ + QK_BOOT, _______, R_M_TOG, R_M_MOD, R_M_HUI, R_M_HUD, R_M_SAI, R_M_SAD, R_M_VAI, R_M_VAD, _______, _______ ) }; // clang-format on diff --git a/keyboards/work_louder/loop/keymaps/via/keymap.c b/keyboards/work_louder/loop/keymaps/via/keymap.c index 844ef1c874e..6fadc4a94ad 100644 --- a/keyboards/work_louder/loop/keymaps/via/keymap.c +++ b/keyboards/work_louder/loop/keymaps/via/keymap.c @@ -21,10 +21,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MUTE, KC_MPLY, R_M_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, MO(1) ), [1] = LAYOUT( - QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MO(2), _______ + QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MO(2), _______ ), [2] = LAYOUT( - QK_BOOT, _______, R_M_TOG, R_M_MOD, R_M_HUI, R_M_HUD, R_M_SAI, R_M_SAD, R_M_VAI, R_M_VAD, _______, _______ + QK_BOOT, _______, R_M_TOG, R_M_MOD, R_M_HUI, R_M_HUD, R_M_SAI, R_M_SAD, R_M_VAI, R_M_VAD, _______, _______ ), [3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/wsk/gothic70/keymaps/via/keymap.c b/keyboards/wsk/gothic70/keymaps/via/keymap.c index af0424baedc..3f72979b924 100644 --- a/keyboards/wsk/gothic70/keymaps/via/keymap.c +++ b/keyboards/wsk/gothic70/keymaps/via/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PAUS, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END diff --git a/keyboards/wsk/sl40/keymaps/default/keymap.c b/keyboards/wsk/sl40/keymaps/default/keymap.c index 087c7302a6c..bfc9894a404 100644 --- a/keyboards/wsk/sl40/keymaps/default/keymap.c +++ b/keyboards/wsk/sl40/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, - KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, QK_BOOT, KC_VOLU, KC_VOLD, KC_MPRV, KC_MNXT, KC_TRNS, + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, QK_BOOT, KC_VOLU, KC_VOLD, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPLY, KC_MSTP, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), diff --git a/keyboards/wsk/tkl30/keymaps/default/keymap.c b/keyboards/wsk/tkl30/keymaps/default/keymap.c index 01e16b46bc5..571d30150bc 100644 --- a/keyboards/wsk/tkl30/keymaps/default/keymap.c +++ b/keyboards/wsk/tkl30/keymaps/default/keymap.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [2] = LAYOUT( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) diff --git a/keyboards/xelus/dharma/keymaps/default/keymap.c b/keyboards/xelus/dharma/keymaps/default/keymap.c index 8d348b408e0..fd443b7722b 100644 --- a/keyboards/xelus/dharma/keymaps/default/keymap.c +++ b/keyboards/xelus/dharma/keymaps/default/keymap.c @@ -29,8 +29,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_ansi_rwkl_split_bs( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) diff --git a/keyboards/xelus/dharma/keymaps/via/keymap.c b/keyboards/xelus/dharma/keymaps/via/keymap.c index 171ac2ee839..2b7df7b15a8 100644 --- a/keyboards/xelus/dharma/keymaps/via/keymap.c +++ b/keyboards/xelus/dharma/keymaps/via/keymap.c @@ -29,8 +29,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_ansi_rwkl_split_bs( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/xelus/la_plus/keymaps/default/keymap.c b/keyboards/xelus/la_plus/keymaps/default/keymap.c index ef06048deae..855f417a32b 100755 --- a/keyboards/xelus/la_plus/keymaps/default/keymap.c +++ b/keyboards/xelus/la_plus/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_65_ansi_rwkl_split_bs( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KB_SUAC, - KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/xelus/la_plus/keymaps/via/keymap.c b/keyboards/xelus/la_plus/keymaps/via/keymap.c index ef06048deae..855f417a32b 100755 --- a/keyboards/xelus/la_plus/keymaps/via/keymap.c +++ b/keyboards/xelus/la_plus/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_65_ansi_rwkl_split_bs( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KB_SUAC, - KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/xelus/ninjin/keymaps/default/keymap.c b/keyboards/xelus/ninjin/keymaps/default/keymap.c index 3a62fc0ad0f..29472685d62 100644 --- a/keyboards/xelus/ninjin/keymaps/default/keymap.c +++ b/keyboards/xelus/ninjin/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_tkl_ansi_tsangan( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/xelus/ninjin/keymaps/via/keymap.c b/keyboards/xelus/ninjin/keymaps/via/keymap.c index 23c65adecee..5fbd6d5b404 100644 --- a/keyboards/xelus/ninjin/keymaps/via/keymap.c +++ b/keyboards/xelus/ninjin/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_tkl_ansi_tsangan( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/xelus/pachi/mini_32u4/keymaps/default/keymap.c b/keyboards/xelus/pachi/mini_32u4/keymaps/default/keymap.c index 1ab90656a54..9a6ed47931e 100644 --- a/keyboards/xelus/pachi/mini_32u4/keymaps/default/keymap.c +++ b/keyboards/xelus/pachi/mini_32u4/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/xelus/pachi/mini_32u4/keymaps/via/keymap.c b/keyboards/xelus/pachi/mini_32u4/keymaps/via/keymap.c index cbb90485100..c781b6f2455 100644 --- a/keyboards/xelus/pachi/mini_32u4/keymaps/via/keymap.c +++ b/keyboards/xelus/pachi/mini_32u4/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/xelus/pachi/rev1/keymaps/default/keymap.c b/keyboards/xelus/pachi/rev1/keymaps/default/keymap.c index 1ab90656a54..9a6ed47931e 100644 --- a/keyboards/xelus/pachi/rev1/keymaps/default/keymap.c +++ b/keyboards/xelus/pachi/rev1/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/xelus/pachi/rev1/keymaps/via/keymap.c b/keyboards/xelus/pachi/rev1/keymaps/via/keymap.c index cbb90485100..c781b6f2455 100644 --- a/keyboards/xelus/pachi/rev1/keymaps/via/keymap.c +++ b/keyboards/xelus/pachi/rev1/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/xelus/rs108/keymaps/default/keymap.c b/keyboards/xelus/rs108/keymaps/default/keymap.c index 26ac68ffdc7..d25219d740c 100644 --- a/keyboards/xelus/rs108/keymaps/default/keymap.c +++ b/keyboards/xelus/rs108/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_108_fullsize_ansi( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/xelus/rs108/keymaps/via/keymap.c b/keyboards/xelus/rs108/keymaps/via/keymap.c index 3484e446897..1cb0ee9bfd8 100644 --- a/keyboards/xelus/rs108/keymaps/via/keymap.c +++ b/keyboards/xelus/rs108/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_108_fullsize_ansi( - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/xelus/valor/rev1/keymaps/default/keymap.c b/keyboards/xelus/valor/rev1/keymaps/default/keymap.c index 6f7c7f0bbd9..f215733fd01 100644 --- a/keyboards/xelus/valor/rev1/keymaps/default/keymap.c +++ b/keyboards/xelus/valor/rev1/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( RGB_TOG, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) diff --git a/keyboards/xelus/valor/rev1/keymaps/via/keymap.c b/keyboards/xelus/valor/rev1/keymaps/via/keymap.c index fa077c309de..cf7552315c4 100644 --- a/keyboards/xelus/valor/rev1/keymaps/via/keymap.c +++ b/keyboards/xelus/valor/rev1/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( RGB_TOG, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/xelus/valor/rev2/keymaps/default/keymap.c b/keyboards/xelus/valor/rev2/keymaps/default/keymap.c index 20ac204777d..af6823a5a48 100644 --- a/keyboards/xelus/valor/rev2/keymaps/default/keymap.c +++ b/keyboards/xelus/valor/rev2/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( RGB_TOG, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) diff --git a/keyboards/xelus/valor/rev2/keymaps/via/keymap.c b/keyboards/xelus/valor/rev2/keymaps/via/keymap.c index c1ed227effe..f0e36f59c5c 100644 --- a/keyboards/xelus/valor/rev2/keymaps/via/keymap.c +++ b/keyboards/xelus/valor/rev2/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( RGB_TOG, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/xiudi/xd60/keymaps/default/keymap.c b/keyboards/xiudi/xd60/keymaps/default/keymap.c index fc95035bd2f..af133d9b3ad 100644 --- a/keyboards/xiudi/xd60/keymaps/default/keymap.c +++ b/keyboards/xiudi/xd60/keymaps/default/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // 1: Function Layer LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_NO, KC_WH_U, KC_UP, KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_NO, KC_ENT, KC_LSFT, KC_NO, KC_NO, KC_APP, BL_STEP,KC_NO, KC_NO, KC_VOLD,KC_VOLU,KC_MUTE, KC_END, KC_PGDN, KC_RSFT, KC_PGUP, KC_INS, diff --git a/keyboards/xiudi/xd60/keymaps/iso/keymap.c b/keyboards/xiudi/xd60/keymaps/iso/keymap.c index d4ec91919e2..74d582159e5 100644 --- a/keyboards/xiudi/xd60/keymaps/iso/keymap.c +++ b/keyboards/xiudi/xd60/keymaps/iso/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,: Function Layer [_FL] = LAYOUT_60_iso( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG, BL_DOWN, BL_UP, XXXXXXX, KC_MPLY, KC_MSTP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ENT, KC_LSFT, RGB_TOG, RGB_MOD, KC_CUT, KC_COPY, KC_PSTE, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_RSFT, diff --git a/keyboards/xiudi/xd60/keymaps/via/keymap.c b/keyboards/xiudi/xd60/keymaps/via/keymap.c index 6d1ce4ed04b..c75400c63f8 100644 --- a/keyboards/xiudi/xd60/keymaps/via/keymap.c +++ b/keyboards/xiudi/xd60/keymaps/via/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // 1: Function Layer [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_NO, KC_WH_U, KC_UP, KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_NO, KC_ENT, KC_LSFT, KC_NO, KC_NO, KC_APP, BL_STEP,KC_NO, KC_NO, KC_VOLD,KC_VOLU,KC_MUTE, KC_END, KC_PGDN, KC_RSFT, KC_PGUP, KC_INS, diff --git a/keyboards/xiudi/xd68/keymaps/default/keymap.c b/keyboards/xiudi/xd68/keymaps/default/keymap.c index bc8484e7f97..1311ea9f234 100644 --- a/keyboards/xiudi/xd68/keymaps/default/keymap.c +++ b/keyboards/xiudi/xd68/keymaps/default/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL] = LAYOUT_65_ansi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, - QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, BL_DOWN, BL_TOGG, BL_UP, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE, RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/xiudi/xd68/keymaps/default_iso/keymap.c b/keyboards/xiudi/xd68/keymaps/default_iso/keymap.c index 2c9cce92d1c..7949b4e2a20 100644 --- a/keyboards/xiudi/xd68/keymaps/default_iso/keymap.c +++ b/keyboards/xiudi/xd68/keymaps/default_iso/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL] = LAYOUT_65_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, - QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, BL_DOWN, BL_TOGG, BL_UP, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE, RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/xiudi/xd68/keymaps/via/keymap.c b/keyboards/xiudi/xd68/keymaps/via/keymap.c index 5dd09992bd5..461d1cf6b9f 100644 --- a/keyboards/xiudi/xd68/keymaps/via/keymap.c +++ b/keyboards/xiudi/xd68/keymaps/via/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, - QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______, RGB_SAI, RGB_VAI, RGB_MOD, BL_DOWN, BL_TOGG, BL_UP, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE, RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/xiudi/xd75/keymaps/default/keymap.c b/keyboards/xiudi/xd75/keymaps/default/keymap.c index cc193c9749a..7c0faed9b11 100644 --- a/keyboards/xiudi/xd75/keymaps/default/keymap.c +++ b/keyboards/xiudi/xd75/keymaps/default/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NUM, KC_SLSH, KC_ASTR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7, KC_P8, KC_P9, KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, - KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, + KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_APP, RGB_VAD, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0, _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______ ) diff --git a/keyboards/xiudi/xd75/keymaps/via/keymap.c b/keyboards/xiudi/xd75/keymaps/via/keymap.c index a156f60317e..2b7b5177e1c 100644 --- a/keyboards/xiudi/xd75/keymaps/via/keymap.c +++ b/keyboards/xiudi/xd75/keymaps/via/keymap.c @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ortho_5x15( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NUM, KC_SLSH, KC_ASTR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7, KC_P8, KC_P9, KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, - KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, + KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_APP, RGB_VAD, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, RGB_RMOD,RGB_MOD, KC_P0, _______, KC_PDOT, KC_PENT, KC_PENT, _______, _______, _______, _______ ), diff --git a/keyboards/yampad/keymaps/default/keymap.c b/keyboards/yampad/keymaps/default/keymap.c index 61e6d8ff746..6eaccb77259 100644 --- a/keyboards/yampad/keymaps/default/keymap.c +++ b/keyboards/yampad/keymaps/default/keymap.c @@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_HUD, RGB_HUI, XXXXXXX, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, XXXXXXX, - QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX ), }; diff --git a/keyboards/yampad/keymaps/via/keymap.c b/keyboards/yampad/keymaps/via/keymap.c index 61e6d8ff746..6eaccb77259 100644 --- a/keyboards/yampad/keymaps/via/keymap.c +++ b/keyboards/yampad/keymaps/via/keymap.c @@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_HUD, RGB_HUI, XXXXXXX, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, XXXXXXX, - QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX ), }; diff --git a/keyboards/yanghu/unicorne/keymaps/default/keymap.c b/keyboards/yanghu/unicorne/keymaps/default/keymap.c index a8c7bd7c513..bb7e27b8de2 100644 --- a/keyboards/yanghu/unicorne/keymaps/default/keymap.c +++ b/keyboards/yanghu/unicorne/keymaps/default/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_split_3x6_4( RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/yiancardesigns/barleycorn/keymaps/default/keymap.c b/keyboards/yiancardesigns/barleycorn/keymaps/default/keymap.c index ae2738b6042..fa4022f555c 100644 --- a/keyboards/yiancardesigns/barleycorn/keymaps/default/keymap.c +++ b/keyboards/yiancardesigns/barleycorn/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c b/keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c index 13d0aa8ff92..e7827c3816d 100644 --- a/keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c +++ b/keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_iso( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c b/keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c index 6f477896beb..633b2e3a290 100644 --- a/keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c +++ b/keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/yiancardesigns/gingham/keymaps/default/keymap.c b/keyboards/yiancardesigns/gingham/keymaps/default/keymap.c index 395f06f6acc..df61f1421d0 100644 --- a/keyboards/yiancardesigns/gingham/keymaps/default/keymap.c +++ b/keyboards/yiancardesigns/gingham/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_ansi_split_bs_rshift( /* FN */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/ymdk/melody96/soldered/keymaps/default/keymap.c b/keyboards/ymdk/melody96/soldered/keymaps/default/keymap.c index cc5a7cc0e56..23adc73d43f 100644 --- a/keyboards/ymdk/melody96/soldered/keymaps/default/keymap.c +++ b/keyboards/ymdk/melody96/soldered/keymaps/default/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT ), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/ymdk/melody96/soldered/keymaps/default_96_with60_split_num0/keymap.c b/keyboards/ymdk/melody96/soldered/keymaps/default_96_with60_split_num0/keymap.c index 6e4af827d6f..69d8bc5e9aa 100644 --- a/keyboards/ymdk/melody96/soldered/keymaps/default_96_with60_split_num0/keymap.c +++ b/keyboards/ymdk/melody96/soldered/keymaps/default_96_with60_split_num0/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_P0, KC_P00, KC_PDOT ), [1] = LAYOUT_96_with60_split_num0( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/ymdk/melody96/soldered/keymaps/via/keymap.c b/keyboards/ymdk/melody96/soldered/keymaps/via/keymap.c index 897d86acb79..f430825a35e 100644 --- a/keyboards/ymdk/melody96/soldered/keymaps/via/keymap.c +++ b/keyboards/ymdk/melody96/soldered/keymaps/via/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT ), [1] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/ymdk/wings/keymaps/via/keymap.c b/keyboards/ymdk/wings/keymaps/via/keymap.c index b66f9a0daa6..7398f7c725f 100644 --- a/keyboards/ymdk/wings/keymaps/via/keymap.c +++ b/keyboards/ymdk/wings/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi_split_bs( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ymdk/wingshs/keymaps/via/keymap.c b/keyboards/ymdk/wingshs/keymaps/via/keymap.c index 0b9771c7497..0b4184236eb 100644 --- a/keyboards/ymdk/wingshs/keymaps/via/keymap.c +++ b/keyboards/ymdk/wingshs/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ymdk/yd60mq/keymaps/default/keymap.c b/keyboards/ymdk/yd60mq/keymaps/default/keymap.c index f9403fb0b90..9ba09fc4b91 100644 --- a/keyboards/ymdk/yd60mq/keymaps/default/keymap.c +++ b/keyboards/ymdk/yd60mq/keymaps/default/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, _______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/ymdk/yd60mq/keymaps/via/keymap.c b/keyboards/ymdk/yd60mq/keymaps/via/keymap.c index 44b1eb5e65d..e771cedc20d 100644 --- a/keyboards/ymdk/yd60mq/keymaps/via/keymap.c +++ b/keyboards/ymdk/yd60mq/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_TRNS, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/ymdk/ym68/keymaps/default/keymap.c b/keyboards/ymdk/ym68/keymaps/default/keymap.c index c0304d3145d..cf3ef195282 100644 --- a/keyboards/ymdk/ym68/keymaps/default/keymap.c +++ b/keyboards/ymdk/ym68/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PSCR, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PSCR, RGB_TOG, _______, KC_UP, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, BL_TOGG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, KC_END, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, diff --git a/keyboards/ymdk/ymd40/v2/keymaps/default/keymap.c b/keyboards/ymdk/ymd40/v2/keymaps/default/keymap.c index 82f8b5ac487..0fc6668e0b9 100644 --- a/keyboards/ymdk/ymd40/v2/keymaps/default/keymap.c +++ b/keyboards/ymdk/ymd40/v2/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [_ADJUST] = LAYOUT_ortho_4x12( - QK_BOOT, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, DB_TOGG, + QK_BOOT, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, DB_TOGG, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c b/keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c index 2b9bca4bedc..a65cbfae661 100644 --- a/keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c +++ b/keyboards/ymdk/ymd40/v2/keymaps/via/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, MO(3), _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [3] = LAYOUT_ortho_4x12( - QK_BOOT, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, DB_TOGG, + QK_BOOT, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, DB_TOGG, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ymdk/ymd75/rev1/keymaps/default_iso/keymap.c b/keyboards/ymdk/ymd75/rev1/keymaps/default_iso/keymap.c index 6e14c7ceb0f..9c322869335 100644 --- a/keyboards/ymdk/ymd75/rev1/keymaps/default_iso/keymap.c +++ b/keyboards/ymdk/ymd75/rev1/keymaps/default_iso/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_75_iso( /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */ - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */ diff --git a/keyboards/ymdk/ymd75/rev2/keymaps/default_iso/keymap.c b/keyboards/ymdk/ymd75/rev2/keymaps/default_iso/keymap.c index 6e14c7ceb0f..9c322869335 100644 --- a/keyboards/ymdk/ymd75/rev2/keymaps/default_iso/keymap.c +++ b/keyboards/ymdk/ymd75/rev2/keymaps/default_iso/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_75_iso( /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */ - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */ diff --git a/keyboards/ymdk/ymd75/rev3/keymaps/default_iso/keymap.c b/keyboards/ymdk/ymd75/rev3/keymaps/default_iso/keymap.c index 6e14c7ceb0f..9c322869335 100644 --- a/keyboards/ymdk/ymd75/rev3/keymaps/default_iso/keymap.c +++ b/keyboards/ymdk/ymd75/rev3/keymaps/default_iso/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_75_iso( /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */ - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */ diff --git a/keyboards/yoichiro/lunakey_macro/keymaps/default/keymap.c b/keyboards/yoichiro/lunakey_macro/keymaps/default/keymap.c index cb4e757cdc7..ca63c1cbec1 100644 --- a/keyboards/yoichiro/lunakey_macro/keymaps/default/keymap.c +++ b/keyboards/yoichiro/lunakey_macro/keymaps/default/keymap.c @@ -36,6 +36,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - QK_BOOT, KC_NO, DF(_NUMBERS) + QK_BOOT, KC_NO, DF(_NUMBERS) ) }; diff --git a/keyboards/yoichiro/lunakey_mini/keymaps/default/keymap.c b/keyboards/yoichiro/lunakey_mini/keymaps/default/keymap.c index 0132e8c3d25..435b99dca9a 100644 --- a/keyboards/yoichiro/lunakey_mini/keymaps/default/keymap.c +++ b/keyboards/yoichiro/lunakey_mini/keymaps/default/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_split_3x6_4( //+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - QK_BOOT, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + QK_BOOT, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, //+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, //+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ diff --git a/keyboards/yoichiro/lunakey_mini/keymaps/via/keymap.c b/keyboards/yoichiro/lunakey_mini/keymaps/via/keymap.c index 0132e8c3d25..435b99dca9a 100644 --- a/keyboards/yoichiro/lunakey_mini/keymaps/via/keymap.c +++ b/keyboards/yoichiro/lunakey_mini/keymaps/via/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_split_3x6_4( //+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - QK_BOOT, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + QK_BOOT, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, //+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, //+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ diff --git a/keyboards/yoichiro/lunakey_pico/keymaps/default/keymap.c b/keyboards/yoichiro/lunakey_pico/keymaps/default/keymap.c index 83a326c33a3..5b0c9ae3c88 100644 --- a/keyboards/yoichiro/lunakey_pico/keymaps/default/keymap.c +++ b/keyboards/yoichiro/lunakey_pico/keymaps/default/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_split_3x6_4( //+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - QK_BOOT, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + QK_BOOT, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, //+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, //+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ diff --git a/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c b/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c index c7261a3fb85..37ae386624f 100644 --- a/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c +++ b/keyboards/yoichiro/lunakey_pico/keymaps/via/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_split_3x6_4( //+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - QK_BOOT, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + QK_BOOT, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, //+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, //+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ diff --git a/keyboards/yosino58/keymaps/default/keymap.c b/keyboards/yosino58/keymaps/default/keymap.c index 512c0ec4b19..88320c2898c 100644 --- a/keyboards/yosino58/keymaps/default/keymap.c +++ b/keyboards/yosino58/keymaps/default/keymap.c @@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------' '------------------------------' */ [_ADJUST] = LAYOUT( - QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLU, KC_MPLY, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLU, KC_MPLY, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, KC_MPRV, KC_VOLD, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL, KC_END, KC_PGDN, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, RGBRST, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 134f48965d0..2bde382cae4 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_VOLU, KC_CAPS,KC_NUM, KC_NO, RGB_MOD,KC_MPRV,KC_VOLD, - CG_NORM,CG_LSWP,EE_CLR, QK_BOOT, TO(0), KC_MUTE + CG_NORM,CG_LSWP,EE_CLR, QK_BOOT,TO(0), KC_MUTE ) }; diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c index 134f48965d0..2bde382cae4 100644 --- a/keyboards/yushakobo/quick17/keymaps/via/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_VOLU, KC_CAPS,KC_NUM, KC_NO, RGB_MOD,KC_MPRV,KC_VOLD, - CG_NORM,CG_LSWP,EE_CLR, QK_BOOT, TO(0), KC_MUTE + CG_NORM,CG_LSWP,EE_CLR, QK_BOOT,TO(0), KC_MUTE ) }; diff --git a/keyboards/yushakobo/quick7/keymaps/default/keymap.c b/keyboards/yushakobo/quick7/keymaps/default/keymap.c index b3c77dd24b7..027bc4fe118 100644 --- a/keyboards/yushakobo/quick7/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick7/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_DOWN, KC_RGHT ), [_FUNC1] = LAYOUT( - QK_BOOT, KC_TRNS, RGB_TOG, + QK_BOOT, KC_TRNS, RGB_TOG, KC_HOME, KC_VOLU, KC_END, KC_MPRV, KC_VOLD, KC_MNXT ) diff --git a/keyboards/yushakobo/quick7/keymaps/via/keymap.c b/keyboards/yushakobo/quick7/keymaps/via/keymap.c index c7cd0ed8216..0f3d44963d6 100644 --- a/keyboards/yushakobo/quick7/keymaps/via/keymap.c +++ b/keyboards/yushakobo/quick7/keymaps/via/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_DOWN, KC_RGHT ), [_FUNC1] = LAYOUT( - QK_BOOT, KC_TRNS, RGB_TOG, + QK_BOOT, KC_TRNS, RGB_TOG, KC_HOME, KC_VOLU, KC_END, KC_MPRV, KC_VOLD, KC_MNXT ), diff --git a/keyboards/zj68/keymaps/default/keymap.c b/keyboards/zj68/keymaps/default/keymap.c index 18c4a7e7325..d2f6c546c0b 100644 --- a/keyboards/zj68/keymaps/default/keymap.c +++ b/keyboards/zj68/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), LAYOUT_all( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, QK_BOOT, KC_PSCR, + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, QK_BOOT, KC_PSCR, RGB_TOG, _______, KC_UP, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, BL_TOGG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, KC_END, _______, _______, _______, BL_DOWN, BL_UP, BL_STEP, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, diff --git a/keyboards/zlant/keymaps/default/keymap.c b/keyboards/zlant/keymaps/default/keymap.c index eb6df738595..6e9764f82b5 100755 --- a/keyboards/zlant/keymaps/default/keymap.c +++ b/keyboards/zlant/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PGUP, KC_HOME, _______, _______, - RGB_VAI, RGB_VAD, QK_BOOT, KC_PSCR, _______, _______, _______, _______, KC_PGDN, KC_END, _______, KC_DEL + RGB_VAI, RGB_VAD, QK_BOOT, KC_PSCR, _______, _______, _______, _______, KC_PGDN, KC_END, _______, KC_DEL ) }; /* FN LAYER diff --git a/keyboards/ztboards/after/keymaps/default/keymap.c b/keyboards/ztboards/after/keymaps/default/keymap.c index 55ea7254e59..1df253eec96 100644 --- a/keyboards/ztboards/after/keymaps/default/keymap.c +++ b/keyboards/ztboards/after/keymaps/default/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_65_ansi_wkl_split_bs( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/ztboards/noon/keymaps/default/keymap.c b/keyboards/ztboards/noon/keymaps/default/keymap.c index d5a8c6b5131..23161bb262a 100644 --- a/keyboards/ztboards/noon/keymaps/default/keymap.c +++ b/keyboards/ztboards/noon/keymaps/default/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] LAYOUT_ansi_blocker_wkl_split_bs ( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/ztboards/noon/keymaps/via/keymap.c b/keyboards/ztboards/noon/keymaps/via/keymap.c index 7f51da89e12..2ae6fe2e1ae 100644 --- a/keyboards/ztboards/noon/keymaps/via/keymap.c +++ b/keyboards/ztboards/noon/keymaps/via/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_ansi_blocker_wkl_split_bs( - QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, From a8e9d4f2078795f1f51a06c4fb88cff3c475fca2 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 11 May 2024 18:26:11 +0100 Subject: [PATCH 262/333] Add embed to docs capabilities (#23698) --- docs/__capabilities.md | 4 ++++ docs/__capabilities_inc.md | 1 + 2 files changed, 5 insertions(+) create mode 100644 docs/__capabilities_inc.md diff --git a/docs/__capabilities.md b/docs/__capabilities.md index 469da462eb1..71183ed7608 100644 --- a/docs/__capabilities.md +++ b/docs/__capabilities.md @@ -255,3 +255,7 @@ This is some inner content. [1]: https://en.wikipedia.org/wiki/Eclipse_(software) + +## Embed + +[example embed](__capabilities_inc.md ':include') diff --git a/docs/__capabilities_inc.md b/docs/__capabilities_inc.md new file mode 100644 index 00000000000..d2cf010d36f --- /dev/null +++ b/docs/__capabilities_inc.md @@ -0,0 +1 @@ +Lorem ipsum dolor sit amet. From d09ea04fa1b42b362a81218785ff41d3004df081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=AB=E3=82=BF=E3=83=BC=E3=83=9A?= =?UTF-8?q?=E3=83=BC=E3=83=91=E3=83=BC?= <76888457+filterpaper@users.noreply.github.com> Date: Sun, 12 May 2024 07:33:01 +0800 Subject: [PATCH 263/333] [Doc] Revise squeezing AVR (#23665) * Note AVR's flash space * Include guards for magic functions * Remove mention of silicon shortage * Demote an unavailable controller --- docs/squeezing_avr.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/squeezing_avr.md b/docs/squeezing_avr.md index c3b9e5595e1..3f014cafb7e 100644 --- a/docs/squeezing_avr.md +++ b/docs/squeezing_avr.md @@ -2,7 +2,7 @@ AVR is severely resource-constrained, and as QMK continues to grow, it is approaching a point where support for AVR may need to be moved to legacy status as newer development is unable to fit into those constraints. -However, if you need to reduce the compiled size of your firmware, there are a number of options to do so. +However, if you need to reduce the compiled size of your firmware to fit the controller's limited flash size, there are a number of options to do so. ## `rules.mk` Settings First and foremost is enabling link time optimization. To do so, add this to your rules.mk: @@ -91,15 +91,19 @@ Or if you're not using layers at all, you can outright remove the functionality There are two `__attribute__ ((weak))` placeholder functions available to customize magic keycodes. If you are not using that feature to swap keycodes, such as backslash with backspace, add the following to your `keymap.c` or user space code: ```c +#ifndef MAGIC_ENABLE uint16_t keycode_config(uint16_t keycode) { return keycode; } +#endif ``` Likewise, if you are not using magic keycodes to swap modifiers, such as Control with GUI, add the following to your `keymap.c` or user space code: ```c +#ifndef MAGIC_ENABLE uint8_t mod_config(uint8_t mod) { return mod; } +#endif ``` Both of them will overwrite the placeholder functions with a simple return statement to reduce firmware size. @@ -197,11 +201,7 @@ For RGB Matrix, these need to be explicitly enabled as well. To disable any that # Final Thoughts -If you've done all of this, and your firmware is still too large, then it's time. It's time to consider making the switch to ARM. Unfortunately, right now is the worst possible time for that, due to the silicon shortage, and supply chain issues. Getting an ARM chip is difficult, at best, and significantly overpriced, at worst. - -- Drashna - -That said, there are a number of Pro Micro replacements with ARM controllers: -* [Proton C](https://qmk.fm/proton-c/) (out of stock) +If you've done all of this, and your firmware is still too large, then it is time to consider making the switch to ARM. There are a number of Pro Micro replacements with an ARM controller: * [Bonsai C](https://github.com/customMK/Bonsai-C) (Open Source, DIY/PCBA) * [STeMCell](https://github.com/megamind4089/STeMCell) (Open Source, DIY/PCBA) * [Adafruit KB2040](https://learn.adafruit.com/adafruit-kb2040) @@ -212,6 +212,7 @@ That said, there are a number of Pro Micro replacements with ARM controllers: * [Liatris](https://splitkb.com/products/liatris) * [Imera](https://splitkb.com/products/imera) * [Michi](https://github.com/ci-bus/michi-promicro-rp2040) +* [Proton C](https://qmk.fm/proton-c/) (out of stock) There are other, non-Pro Micro compatible boards out there. The most popular being: * [WeAct Blackpill F411](https://www.aliexpress.com/item/1005001456186625.html) (~$6 USD) From f9f67d4cb33507e208f1495fe9f5d76e9f27c41b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 12 May 2024 10:05:11 +1000 Subject: [PATCH 264/333] Change all RGB mode keycodes to short aliases (#23691) --- .../4pplet/perk60_iso/keymaps/default/keymap.c | 2 +- .../4pplet/perk60_iso/keymaps/via/keymap.c | 2 +- keyboards/abacus/keymaps/default/keymap.json | 2 +- .../basekeys/slice/keymaps/default/keymap.c | 6 +++--- .../keymaps/default_split_left_space/keymap.c | 6 +++--- .../slice/rev1/keymaps/default_all/keymap.c | 6 +++--- .../keymaps/default_split_backspace/keymap.c | 6 +++--- .../basekeys/slice/rev1/keymaps/via/keymap.c | 18 +++++++++--------- .../slice/rev1_rgb/keymaps/2moons_rgb/keymap.c | 18 +++++++++--------- .../slice/rev1_rgb/keymaps/via/keymap.c | 18 +++++++++--------- keyboards/cxt_studio/keymaps/via/keymap.c | 2 +- .../duckypad/keymaps/default/keymap.c | 4 ++-- .../ergodox_ez/keymaps/rgb_layer/keymap.c | 2 +- .../handwired/macroboard/keymaps/via/keymap.c | 2 +- .../handwired/uthol/keymaps/default/keymap.c | 2 +- .../handwired/uthol/keymaps/oled/keymap.c | 2 +- keyboards/hifumi/keymaps/default/keymap.c | 2 +- keyboards/hp69/keymaps/default/keymap.c | 4 ++-- keyboards/hp69/keymaps/via/keymap.c | 4 ++-- .../keymaps/halfkeyboard/keymap.c | 2 +- .../keyquest/enclave/keymaps/default/keymap.c | 4 ++-- .../kiwikey/kawii9/keymaps/default/keymap.c | 4 ++-- keyboards/kiwikey/kawii9/keymaps/via/keymap.c | 4 ++-- .../magic_force/mf17/keymaps/default/keymap.c | 4 ++-- .../magic_force/mf17/keymaps/via/keymap.c | 4 ++-- .../magic_force/mf34/keymaps/default/keymap.c | 4 ++-- .../magic_force/mf34/keymaps/via/keymap.c | 4 ++-- keyboards/matrix/m20add/rgb_ring.c | 4 ++-- .../tb16_rgb/keymaps/default/keymap.c | 2 +- .../orthograph/keymaps/default/keymap.json | 2 +- .../pandora/keymaps/default/keymap.c | 2 +- .../pearlboards/pandora/keymaps/via/keymap.c | 2 +- .../rastersoft/minitkl/keymaps/ansi/keymap.c | 2 +- .../minitkl/keymaps/default/keymap.c | 2 +- .../runes/vaengr/keymaps/default/keymap.c | 2 +- keyboards/runes/vaengr/keymaps/via/keymap.c | 2 +- .../gos65/keymaps/default/keymap.c | 2 +- .../senselessclay/gos65/keymaps/via/keymap.c | 2 +- keyboards/skmt/15k/keymaps/default/keymap.c | 4 ++-- keyboards/skmt/15k/keymaps/via/keymap.c | 4 ++-- .../taleguers75/keymaps/default/keymap.c | 2 +- .../taleguers/taleguers75/keymaps/via/keymap.c | 2 +- 42 files changed, 87 insertions(+), 87 deletions(-) diff --git a/keyboards/4pplet/perk60_iso/keymaps/default/keymap.c b/keyboards/4pplet/perk60_iso/keymaps/default/keymap.c index c6e1f14d0b3..d720096ad31 100644 --- a/keyboards/4pplet/perk60_iso/keymaps/default/keymap.c +++ b/keyboards/4pplet/perk60_iso/keymaps/default/keymap.c @@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/4pplet/perk60_iso/keymaps/via/keymap.c b/keyboards/4pplet/perk60_iso/keymaps/via/keymap.c index da28173b0a2..cda76050562 100644 --- a/keyboards/4pplet/perk60_iso/keymaps/via/keymap.c +++ b/keyboards/4pplet/perk60_iso/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT_60_iso( diff --git a/keyboards/abacus/keymaps/default/keymap.json b/keyboards/abacus/keymaps/default/keymap.json index 87cb8831ddd..e4fcc9a6a02 100644 --- a/keyboards/abacus/keymaps/default/keymap.json +++ b/keyboards/abacus/keymaps/default/keymap.json @@ -5,6 +5,6 @@ "layers": [ ["KC_ESCAPE", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_BSPC", "KC_TAB", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_BSLS", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMMA", "KC_DOT", "KC_UP", "KC_DELETE", "KC_LCTL", "KC_LGUI", "MO(1)", "KC_SPACE", "KC_ENTER", "MO(2)", "KC_LEFT", "KC_DOWN", "KC_RIGHT"], ["KC_GRAVE", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_LBRC", "KC_RBRC", "KC_QUOTE", "KC_SLASH", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MINUS", "KC_EQUAL", "KC_TRNS", "KC_TRNS", "KC_LALT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_TRNS", "KC_END"], - ["KC_GRV", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_TRNS", "KC_TRNS", "KC_F11", "KC_F12", "RGB_MODE_PLAIN", "RGB_MODE_BREATHE", "RGB_MODE_RAINBOW", "RGB_MODE_SWIRL", "RGB_MODE_SNAKE", "RGB_MODE_KNIGHT", "RGB_MODE_GRADIENT", "KC_NO", "RGB_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_HUI", "KC_CAPS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"] + ["KC_GRV", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_TRNS", "KC_TRNS", "KC_F11", "KC_F12", "RGB_M_P", "RGB_M_B", "RGB_M_R", "RGB_M_SW", "RGB_M_SN", "RGB_M_K", "RGB_M_G", "KC_NO", "RGB_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_HUI", "KC_CAPS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"] ] } diff --git a/keyboards/basekeys/slice/keymaps/default/keymap.c b/keyboards/basekeys/slice/keymaps/default/keymap.c index 12532f7201a..2dca256d51b 100644 --- a/keyboards/basekeys/slice/keymaps/default/keymap.c +++ b/keyboards/basekeys/slice/keymaps/default/keymap.c @@ -34,11 +34,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |---------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_FORWARD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_GRADIENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_XMAS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |---------------------------------------------------------------------------' diff --git a/keyboards/basekeys/slice/keymaps/default_split_left_space/keymap.c b/keyboards/basekeys/slice/keymaps/default_split_left_space/keymap.c index b899b2e53b0..ac4d42fca52 100644 --- a/keyboards/basekeys/slice/keymaps/default_split_left_space/keymap.c +++ b/keyboards/basekeys/slice/keymaps/default_split_left_space/keymap.c @@ -34,11 +34,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |---------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_FORWARD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_GRADIENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_XMAS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| RGB_TOG, KC_LCTL,KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |---------------------------------------------------------------------------' diff --git a/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c index 492f46be447..548e0acf29d 100644 --- a/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c +++ b/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c @@ -36,11 +36,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |--------------------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MODE_FORWARD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MODE_GRADIENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MODE_XMAS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, + RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |--------------------------------------------------------------------------------------' diff --git a/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c index 6c3830630a2..6d99f5b74d9 100644 --- a/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c +++ b/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c @@ -36,11 +36,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |---------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_FORWARD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_GRADIENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_XMAS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |---------------------------------------------------------------------------' diff --git a/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c index 4721a8bc3d2..53bf2fae0b1 100644 --- a/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c +++ b/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c @@ -31,11 +31,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |--------------------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MODE_FORWARD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MODE_GRADIENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MODE_XMAS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, + RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |--------------------------------------------------------------------------------------' @@ -59,11 +59,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |--------------------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MODE_FORWARD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MODE_GRADIENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MODE_XMAS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, + RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |--------------------------------------------------------------------------------------' @@ -73,11 +73,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |--------------------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MODE_FORWARD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MODE_GRADIENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MODE_XMAS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, + RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |--------------------------------------------------------------------------------------' diff --git a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c index 220b319ff60..6ed863d01b3 100644 --- a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c +++ b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c @@ -48,11 +48,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |---------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_FORWARD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_GRADIENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_XMAS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |---------------------------------------------------------------------------' @@ -90,11 +90,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-------------------------------------------------------------------------| |---------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, //|-------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_FORWARD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|-------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_GRADIENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|-------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_XMAS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, //|-------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`-------------------------------------------------------------------------| |---------------------------------------------------------------------------' @@ -104,11 +104,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-------------------------------------------------------------------------| |---------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, //|-------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_FORWARD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|-------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_GRADIENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|-------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_XMAS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, //|-------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`-----------------------------------------------------------------| |---------------------------------------------------------------------------' diff --git a/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c b/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c index 27b0881a505..04d9aa5b632 100644 --- a/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c +++ b/keyboards/basekeys/slice/rev1_rgb/keymaps/via/keymap.c @@ -31,11 +31,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |---------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_FORWARD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_GRADIENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_XMAS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |---------------------------------------------------------------------------' @@ -59,11 +59,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |---------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_FORWARD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_GRADIENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_XMAS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |---------------------------------------------------------------------------' @@ -73,11 +73,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |---------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_FORWARD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_GRADIENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MODE_XMAS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |---------------------------------------------------------------------------' diff --git a/keyboards/cxt_studio/keymaps/via/keymap.c b/keyboards/cxt_studio/keymaps/via/keymap.c index 1d58a60471c..50376727585 100644 --- a/keyboards/cxt_studio/keymaps/via/keymap.c +++ b/keyboards/cxt_studio/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), - ENCODER_CCW_CW(RGB_MODE_REVERSE, RGB_MODE_FORWARD) + ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) }, }; #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) diff --git a/keyboards/dekunukem/duckypad/keymaps/default/keymap.c b/keyboards/dekunukem/duckypad/keymaps/default/keymap.c index 482f816fb33..5665bcb799a 100644 --- a/keyboards/dekunukem/duckypad/keymaps/default/keymap.c +++ b/keyboards/dekunukem/duckypad/keymaps/default/keymap.c @@ -81,8 +81,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { `=========================================' `---------------------' */ [_RGB] = LAYOUT( - RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, - RGB_MODE_SWIRL, RGB_SPD, RGB_SPI, + RGB_M_P, RGB_M_B, RGB_M_R, + RGB_M_SW, RGB_SPD, RGB_SPI, RGB_MOD, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_HUD, RGB_HUI, RGB_TOG, RGB_VAD, RGB_VAI, diff --git a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c index 31911c5d6ff..dc26fa1075f 100644 --- a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c +++ b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c @@ -189,7 +189,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } } return false; - case RGB_MODE_FORWARD ... RGB_MODE_GRADIENT: // For any of the RGB codes (see quantum_keycodes.h, L400 for reference) + case RGB_MOD ... RGB_M_G: // For any of the RGB codes (see quantum_keycodes.h, L400 for reference) if (record->event.pressed) { //This disables layer indication, as it's assumed that if you're changing this ... you want that disabled if (user_config.rgb_layer_change) { // only if this is enabled user_config.rgb_layer_change = false; // disable it, and diff --git a/keyboards/handwired/macroboard/keymaps/via/keymap.c b/keyboards/handwired/macroboard/keymaps/via/keymap.c index 1afcda31bc3..c67b32e970c 100644 --- a/keyboards/handwired/macroboard/keymaps/via/keymap.c +++ b/keyboards/handwired/macroboard/keymaps/via/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, - KC_LCTL, KC_LGUI, RGB_TOG, RGB_MODE_FORWARD, QK_BOOT, KC_SPC + KC_LCTL, KC_LGUI, RGB_TOG, RGB_MOD, QK_BOOT, KC_SPC ), [1] = LAYOUT_ortho_5x6( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/handwired/uthol/keymaps/default/keymap.c b/keyboards/handwired/uthol/keymaps/default/keymap.c index 9ddc2d01bab..f1fa4cd0fe7 100644 --- a/keyboards/handwired/uthol/keymaps/default/keymap.c +++ b/keyboards/handwired/uthol/keymaps/default/keymap.c @@ -30,5 +30,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_COLEMAK] = LAYOUT(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, SETTINGS, KC_LGUI, KC_LALT, RAISE, KC_SPC, LOWER, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), [_LOWER] = LAYOUT(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_MINS, KC_EQL, KC_INS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_BSLS, KC_P0, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT), [_RAISE] = LAYOUT(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_BSLS, KC_P0, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT), - [_SETTINGS] = LAYOUT(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, RGB_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_SCRL, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NUM, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_SAI, RGB_MODE_PLAIN, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MODE_REVERSE, RGB_VAD, RGB_VAI, RGB_MODE_FORWARD) + [_SETTINGS] = LAYOUT(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, RGB_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_SCRL, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NUM, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_SAI, RGB_M_P, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_VAD, RGB_VAI, RGB_MOD) }; diff --git a/keyboards/handwired/uthol/keymaps/oled/keymap.c b/keyboards/handwired/uthol/keymaps/oled/keymap.c index a1fa8f97fc6..352abb4ad8e 100644 --- a/keyboards/handwired/uthol/keymaps/oled/keymap.c +++ b/keyboards/handwired/uthol/keymaps/oled/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_COLEMAK] = LAYOUT(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, SETTINGS, KC_LGUI, KC_LALT, RAISE, KC_SPC, LOWER, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), [_LOWER] = LAYOUT(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_MINS, KC_EQL, KC_INS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_BSLS, KC_P0, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT), [_RAISE] = LAYOUT(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_BSLS, KC_P0, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT), - [_SETTINGS] = LAYOUT(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, RGB_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_SCRL, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NUM, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_SAI, RGB_MODE_PLAIN, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MODE_REVERSE, RGB_VAD, RGB_VAI, RGB_MODE_FORWARD) + [_SETTINGS] = LAYOUT(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, RGB_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_SCRL, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NUM, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_SAI, RGB_M_P, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_VAD, RGB_VAI, RGB_MOD) }; #define ANIM_SIZE 1024 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/hifumi/keymaps/default/keymap.c b/keyboards/hifumi/keymaps/default/keymap.c index 9a4330398fc..1117867e0b5 100644 --- a/keyboards/hifumi/keymaps/default/keymap.c +++ b/keyboards/hifumi/keymaps/default/keymap.c @@ -42,6 +42,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [ADJUST] = LAYOUT( _______, RGB_TOG, _______, - RGB_MODE_SNAKE, RGB_MODE_PLAIN, RGB_HUI + RGB_M_SN, RGB_M_P, RGB_HUI ) }; diff --git a/keyboards/hp69/keymaps/default/keymap.c b/keyboards/hp69/keymaps/default/keymap.c index 88a4e608d28..ac1e95d8870 100644 --- a/keyboards/hp69/keymaps/default/keymap.c +++ b/keyboards/hp69/keymaps/default/keymap.c @@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MODE_FORWARD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_MODE_RGBTEST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_M_T, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/hp69/keymaps/via/keymap.c b/keyboards/hp69/keymaps/via/keymap.c index fac033bdabf..e97e1bab7d0 100644 --- a/keyboards/hp69/keymaps/via/keymap.c +++ b/keyboards/hp69/keymaps/via/keymap.c @@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT( QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, - RGB_TOG, RGB_MODE_FORWARD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_MODE_RGBTEST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_M_T, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c index 48b26c704ee..550eea0d31a 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c +++ b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c @@ -347,7 +347,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Otherwise, it needs KC_* [SHORTCUTS] = LAYOUT_ergodox( // layer 0 : default // left hand - RGB_MODE_KNIGHT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, + RGB_M_K, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_TAB, LCTL(KC_Q), LCTL(KC_W),LCTL(KC_E),LCTL(KC_R),LCTL(KC_T), KC_NO, KC_BSPC, LCTL(KC_A), LCTL(KC_S),LCTL(KC_D),LCTL(KC_F),LCTL(KC_G), KC_LSFT, LCTL(KC_Z), LCTL(KC_X),LCTL(KC_C),LCTL(KC_V),LCTL(KC_B), KC_MINUS, diff --git a/keyboards/keyquest/enclave/keymaps/default/keymap.c b/keyboards/keyquest/enclave/keymaps/default/keymap.c index fb77341e8e8..1e1f0e08efb 100644 --- a/keyboards/keyquest/enclave/keymaps/default/keymap.c +++ b/keyboards/keyquest/enclave/keymaps/default/keymap.c @@ -44,8 +44,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT_ortho_3x3( - RGB_TOG, RGB_MODE_PLAIN, RGB_MODE_BREATHE, - RGB_MODE_RAINBOW, RGB_MODE_SWIRL, RGB_MODE_GRADIENT, + RGB_TOG, RGB_M_P, RGB_M_B, + RGB_M_R, RGB_M_SW, RGB_M_G, _______, _______, _______ ) }; diff --git a/keyboards/kiwikey/kawii9/keymaps/default/keymap.c b/keyboards/kiwikey/kawii9/keymaps/default/keymap.c index b9d1f0f2dd2..5dc49862978 100644 --- a/keyboards/kiwikey/kawii9/keymaps/default/keymap.c +++ b/keyboards/kiwikey/kawii9/keymaps/default/keymap.c @@ -28,8 +28,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(_FN), LCTL(KC_C), LCTL(KC_V) // FN - Copy - Paste ), [_FN] = LAYOUT_ortho_3x3( - RGB_TOG, RGB_MODE_REVERSE, RGB_MODE_FORWARD, - _______, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, + RGB_TOG, RGB_RMOD, RGB_MOD, + _______, RGB_M_B, RGB_M_R, _______, _______, QK_BOOT ) }; diff --git a/keyboards/kiwikey/kawii9/keymaps/via/keymap.c b/keyboards/kiwikey/kawii9/keymaps/via/keymap.c index cb462a58fe8..18f0d8ccaeb 100644 --- a/keyboards/kiwikey/kawii9/keymaps/via/keymap.c +++ b/keyboards/kiwikey/kawii9/keymaps/via/keymap.c @@ -22,8 +22,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(1), LCTL(KC_C), LCTL(KC_V) // FN(1) - Copy - Paste ), [1] = LAYOUT_ortho_3x3( - RGB_TOG, RGB_MODE_REVERSE, RGB_MODE_FORWARD, - _______, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, + RGB_TOG, RGB_RMOD, RGB_MOD, + _______, RGB_M_B, RGB_M_R, _______, _______, QK_BOOT ), [2] = LAYOUT_ortho_3x3( diff --git a/keyboards/magic_force/mf17/keymaps/default/keymap.c b/keyboards/magic_force/mf17/keymaps/default/keymap.c index 7497c875143..1ebe11b6d9d 100755 --- a/keyboards/magic_force/mf17/keymaps/default/keymap.c +++ b/keyboards/magic_force/mf17/keymaps/default/keymap.c @@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P0, KC_PDOT, KC_PENT), [1] = LAYOUT_numpad_5x4( KC_TRNS, KC_CALCULATOR, KC_BSPC, KC_TRNS, - RGB_MODE_FORWARD, RGB_VAI, RGB_HUI, + RGB_MOD, RGB_VAI, RGB_HUI, RGB_SPD, RGB_TOG, RGB_SPI, QK_BOOTLOADER, - RGB_MODE_REVERSE, RGB_VAD, RGB_HUD, + RGB_RMOD, RGB_VAD, RGB_HUD, KC_TRNS, KC_TRNS, QK_CLEAR_EEPROM), }; \ No newline at end of file diff --git a/keyboards/magic_force/mf17/keymaps/via/keymap.c b/keyboards/magic_force/mf17/keymaps/via/keymap.c index 059598a6809..0facde4bb8f 100755 --- a/keyboards/magic_force/mf17/keymaps/via/keymap.c +++ b/keyboards/magic_force/mf17/keymaps/via/keymap.c @@ -25,9 +25,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P0, KC_PDOT, KC_PENT), [1] = LAYOUT_numpad_5x4( KC_TRNS, KC_CALCULATOR, KC_BSPC, KC_TRNS, - RGB_MODE_FORWARD, RGB_VAI, RGB_HUI, + RGB_MOD, RGB_VAI, RGB_HUI, RGB_SPD, RGB_TOG, RGB_SPI, QK_BOOTLOADER, - RGB_MODE_REVERSE, RGB_VAD, RGB_HUD, + RGB_RMOD, RGB_VAD, RGB_HUD, KC_TRNS, KC_TRNS, QK_CLEAR_EEPROM), }; diff --git a/keyboards/magic_force/mf34/keymaps/default/keymap.c b/keyboards/magic_force/mf34/keymaps/default/keymap.c index 4d65df2d73a..03135be2264 100755 --- a/keyboards/magic_force/mf34/keymaps/default/keymap.c +++ b/keyboards/magic_force/mf34/keymaps/default/keymap.c @@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT), [_FN] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOTLOADER, - RGB_TOG, RGB_HUI, RGB_MODE_FORWARD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_HUD, RGB_MODE_REVERSE, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_HUI, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_HUD, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI, KC_TRNS, KC_TRNS, QK_CLEAR_EEPROM), diff --git a/keyboards/magic_force/mf34/keymaps/via/keymap.c b/keyboards/magic_force/mf34/keymaps/via/keymap.c index 4d65df2d73a..03135be2264 100755 --- a/keyboards/magic_force/mf34/keymaps/via/keymap.c +++ b/keyboards/magic_force/mf34/keymaps/via/keymap.c @@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT), [_FN] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOTLOADER, - RGB_TOG, RGB_HUI, RGB_MODE_FORWARD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_HUD, RGB_MODE_REVERSE, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_HUI, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_HUD, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI, KC_TRNS, KC_TRNS, QK_CLEAR_EEPROM), diff --git a/keyboards/matrix/m20add/rgb_ring.c b/keyboards/matrix/m20add/rgb_ring.c index ecdac9130a6..d629a5d2ec0 100644 --- a/keyboards/matrix/m20add/rgb_ring.c +++ b/keyboards/matrix/m20add/rgb_ring.c @@ -405,7 +405,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { switch(keycode) { - case RGB_MODE_FORWARD: + case RGB_MOD: if (rgb_ring.state == RING_STATE_INIT) { // in testing mode, do nothing return false; @@ -423,7 +423,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) } } break; - case RGB_MODE_REVERSE: + case RGB_RMOD: if (rgb_ring.state == RING_STATE_INIT) { // in testing mode, do nothing return false; diff --git a/keyboards/ning/tiny_board/tb16_rgb/keymaps/default/keymap.c b/keyboards/ning/tiny_board/tb16_rgb/keymaps/default/keymap.c index e9529fe91e1..f8ef14aa93f 100644 --- a/keyboards/ning/tiny_board/tb16_rgb/keymaps/default/keymap.c +++ b/keyboards/ning/tiny_board/tb16_rgb/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [0] = LAYOUT_ortho_4x4( KC_P7, KC_P8, KC_P9, RGB_TOG, - KC_P4, KC_P5, KC_P6, RGB_MODE_FORWARD, + KC_P4, KC_P5, KC_P6, RGB_MOD, KC_P1, KC_P2, KC_P3, KC_PMNS, KC_P0, KC_PDOT, KC_PENT, KC_PPLS ) diff --git a/keyboards/orthograph/keymaps/default/keymap.json b/keyboards/orthograph/keymaps/default/keymap.json index fcd2e26edcd..8d2f53c71a8 100644 --- a/keyboards/orthograph/keymaps/default/keymap.json +++ b/keyboards/orthograph/keymaps/default/keymap.json @@ -18,7 +18,7 @@ "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS", "KC_HOME", "KC_PGUP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_DEL", "KC_END", "KC_PGDN", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_MODE_FORWARD","KC_TRNS", "RGB_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS" + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_MOD","KC_TRNS", "RGB_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS" ] ] } \ No newline at end of file diff --git a/keyboards/pearlboards/pandora/keymaps/default/keymap.c b/keyboards/pearlboards/pandora/keymaps/default/keymap.c index c7c124f5749..23fb10eba36 100644 --- a/keyboards/pearlboards/pandora/keymaps/default/keymap.c +++ b/keyboards/pearlboards/pandora/keymaps/default/keymap.c @@ -27,7 +27,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case RGBWINGS: if (record->event.pressed) { /* Blackout these RGB components */ - tap_code16(RGB_MODE_PLAIN); + rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT); rgblight_setrgb_at(0, 0, 0, 0); rgblight_setrgb_at(0, 0, 0, 1); rgblight_setrgb_at(0, 0, 0, 4); diff --git a/keyboards/pearlboards/pandora/keymaps/via/keymap.c b/keyboards/pearlboards/pandora/keymaps/via/keymap.c index ecf2089b696..6a8088df845 100644 --- a/keyboards/pearlboards/pandora/keymaps/via/keymap.c +++ b/keyboards/pearlboards/pandora/keymaps/via/keymap.c @@ -27,7 +27,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case RGBWINGS: if (record->event.pressed) { /* Blackout these RGB components */ - tap_code16(RGB_MODE_PLAIN); + rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT); rgblight_setrgb_at(0, 0, 0, 0); rgblight_setrgb_at(0, 0, 0, 1); rgblight_setrgb_at(0, 0, 0, 4); diff --git a/keyboards/rastersoft/minitkl/keymaps/ansi/keymap.c b/keyboards/rastersoft/minitkl/keymaps/ansi/keymap.c index fce96e6a05e..e1c023f89e4 100644 --- a/keyboards/rastersoft/minitkl/keymaps/ansi/keymap.c +++ b/keyboards/rastersoft/minitkl/keymaps/ansi/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_ansi( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, RGB_TOG, RGB_MODE_FORWARD, RGB_MODE_REVERSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, RGB_TOG, RGB_MOD, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, XXXXXXX, diff --git a/keyboards/rastersoft/minitkl/keymaps/default/keymap.c b/keyboards/rastersoft/minitkl/keymaps/default/keymap.c index 12d9548433a..60aeaa7cf93 100644 --- a/keyboards/rastersoft/minitkl/keymaps/default/keymap.c +++ b/keyboards/rastersoft/minitkl/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_iso( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, RGB_TOG, RGB_MODE_FORWARD, RGB_MODE_REVERSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, RGB_TOG, RGB_MOD, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, XXXXXXX, diff --git a/keyboards/runes/vaengr/keymaps/default/keymap.c b/keyboards/runes/vaengr/keymaps/default/keymap.c index 451cefae5f3..95c1e84348a 100644 --- a/keyboards/runes/vaengr/keymaps/default/keymap.c +++ b/keyboards/runes/vaengr/keymaps/default/keymap.c @@ -49,6 +49,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_SLEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MODE_FORWARD, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; diff --git a/keyboards/runes/vaengr/keymaps/via/keymap.c b/keyboards/runes/vaengr/keymaps/via/keymap.c index 451cefae5f3..95c1e84348a 100644 --- a/keyboards/runes/vaengr/keymaps/via/keymap.c +++ b/keyboards/runes/vaengr/keymaps/via/keymap.c @@ -49,6 +49,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_SLEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MODE_FORWARD, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; diff --git a/keyboards/senselessclay/gos65/keymaps/default/keymap.c b/keyboards/senselessclay/gos65/keymaps/default/keymap.c index 9419266d2d7..6e7c3086529 100644 --- a/keyboards/senselessclay/gos65/keymaps/default/keymap.c +++ b/keyboards/senselessclay/gos65/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, RGB_VAI, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, RGB_VAD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_HOME, KC_PGUP, KC_TRNS, RGB_MODE_FORWARD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_HOME, KC_PGUP, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MUTE, KC_VOLU, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), [2] = LAYOUT( diff --git a/keyboards/senselessclay/gos65/keymaps/via/keymap.c b/keyboards/senselessclay/gos65/keymaps/via/keymap.c index dc43c0f31d5..f20817622a1 100644 --- a/keyboards/senselessclay/gos65/keymaps/via/keymap.c +++ b/keyboards/senselessclay/gos65/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, RGB_VAI, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, RGB_VAD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_HOME, KC_PGUP, KC_TRNS, RGB_MODE_FORWARD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_HOME, KC_PGUP, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MUTE, KC_VOLU, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), [_2] = LAYOUT( diff --git a/keyboards/skmt/15k/keymaps/default/keymap.c b/keyboards/skmt/15k/keymaps/default/keymap.c index bc34dd7ca2d..74144f71a5a 100644 --- a/keyboards/skmt/15k/keymaps/default/keymap.c +++ b/keyboards/skmt/15k/keymaps/default/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_default( RGB_TOG,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, - RGB_MODE_FORWARD,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI, - RGB_MODE_REVERSE,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD + RGB_MOD,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI, + RGB_RMOD,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD ) }; diff --git a/keyboards/skmt/15k/keymaps/via/keymap.c b/keyboards/skmt/15k/keymaps/via/keymap.c index d0384efba08..177470d3fae 100644 --- a/keyboards/skmt/15k/keymaps/via/keymap.c +++ b/keyboards/skmt/15k/keymaps/via/keymap.c @@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_default( RGB_TOG,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, - RGB_MODE_FORWARD,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI, - RGB_MODE_REVERSE,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD + RGB_MOD,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI, + RGB_RMOD,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD ), [2] = LAYOUT_default( KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, diff --git a/keyboards/taleguers/taleguers75/keymaps/default/keymap.c b/keyboards/taleguers/taleguers75/keymaps/default/keymap.c index 2f5025e459d..f6c50b52029 100644 --- a/keyboards/taleguers/taleguers75/keymaps/default/keymap.c +++ b/keyboards/taleguers/taleguers75/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT), [1] = LAYOUT( - KC_TRNS, RGB_MODE_FORWARD, RGB_MODE_REVERSE, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, + KC_TRNS, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/taleguers/taleguers75/keymaps/via/keymap.c b/keyboards/taleguers/taleguers75/keymaps/via/keymap.c index cbaaedcafd5..c07f469ebd9 100644 --- a/keyboards/taleguers/taleguers75/keymaps/via/keymap.c +++ b/keyboards/taleguers/taleguers75/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT), [1] = LAYOUT( - KC_TRNS, RGB_MODE_FORWARD, RGB_MODE_REVERSE, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, + KC_TRNS, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, From 8c05254a68f291a374eef3ac4174914a196c726a Mon Sep 17 00:00:00 2001 From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com> Date: Mon, 13 May 2024 19:33:25 +1000 Subject: [PATCH 265/333] [Bug][Keyboard] Fix encoder resolution issue with Binepad BNK9 (#23707) --- keyboards/binepad/bnk9/config.h | 2 -- keyboards/binepad/bnk9/info.json | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/keyboards/binepad/bnk9/config.h b/keyboards/binepad/bnk9/config.h index c774a0f2b09..1d553e3fea4 100644 --- a/keyboards/binepad/bnk9/config.h +++ b/keyboards/binepad/bnk9/config.h @@ -3,8 +3,6 @@ #pragma once -#define ENCODER_DEFAULT_POS 0x3 // enable 1:1 resolution - // Default PIO0 cases flickering in this board. Setting to PIO1 resolves this issue. #define WS2812_PIO_USE_PIO1 diff --git a/keyboards/binepad/bnk9/info.json b/keyboards/binepad/bnk9/info.json index 1f3b7cb7b0f..89e25f9d063 100644 --- a/keyboards/binepad/bnk9/info.json +++ b/keyboards/binepad/bnk9/info.json @@ -8,7 +8,7 @@ "diode_direction": "COL2ROW", "encoder": { "rotary": [ - {"pin_a": "GP13", "pin_b": "GP14"} + {"pin_a": "GP13", "pin_b": "GP14", "resolution": 2} ] }, "features": { @@ -83,4 +83,4 @@ ] } } -} \ No newline at end of file +} From 6d222b71c6de320097e3dd25ef3f2783da0d638f Mon Sep 17 00:00:00 2001 From: leep-frog <66687468+leep-frog@users.noreply.github.com> Date: Mon, 13 May 2024 13:15:52 -0400 Subject: [PATCH 266/333] Add housekeeping execution to unit tests (#22999) --- tests/housekeeping/config.h | 19 +++++++ tests/housekeeping/test.mk | 18 +++++++ tests/housekeeping/test_housekeeping.cpp | 68 ++++++++++++++++++++++++ tests/test_common/test_fixture.cpp | 4 +- 4 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 tests/housekeeping/config.h create mode 100644 tests/housekeeping/test.mk create mode 100644 tests/housekeeping/test_housekeeping.cpp diff --git a/tests/housekeeping/config.h b/tests/housekeeping/config.h new file mode 100644 index 00000000000..bf1f8cd27fb --- /dev/null +++ b/tests/housekeeping/config.h @@ -0,0 +1,19 @@ +/* Copyright 2024 leep-frog + * + * 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 + +#include "test_common.h" diff --git a/tests/housekeeping/test.mk b/tests/housekeeping/test.mk new file mode 100644 index 00000000000..bf46b735ce8 --- /dev/null +++ b/tests/housekeeping/test.mk @@ -0,0 +1,18 @@ +# Copyright 2024 leep-frog +# +# 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 . + +# -------------------------------------------------------------------------------- +# Keep this file, even if it is empty, as a marker that this folder contains tests +# -------------------------------------------------------------------------------- diff --git a/tests/housekeeping/test_housekeeping.cpp b/tests/housekeeping/test_housekeeping.cpp new file mode 100644 index 00000000000..6f1e6a62841 --- /dev/null +++ b/tests/housekeeping/test_housekeeping.cpp @@ -0,0 +1,68 @@ +/* Copyright 2024 leep-frog + * + * 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 . + */ + +#include "keyboard_report_util.hpp" +#include "keycode.h" +#include "test_common.hpp" +#include "action_tapping.h" +#include "test_keymap_key.hpp" + +using testing::_; + +class HousekeepingMock { + public: + virtual ~HousekeepingMock() {} + + // mock methods + MOCK_METHOD0(housekeeping_task_kb, void(void)); + MOCK_METHOD0(housekeeping_task_user, void(void)); +}; + +class Housekeeping : public TestFixture { + public: + Housekeeping() { + _housekeepingMock.reset(new ::testing::NiceMock()); + } + virtual ~Housekeeping() { + _housekeepingMock.reset(); + } + + static std::unique_ptr _housekeepingMock; +}; + +std::unique_ptr Housekeeping::_housekeepingMock; + +extern "C" { +void housekeeping_task_kb(void) { + if (Housekeeping::_housekeepingMock) { + Housekeeping::_housekeepingMock->housekeeping_task_kb(); + } +} + +void housekeeping_task_user(void) { + if (Housekeeping::_housekeepingMock) { + Housekeeping::_housekeepingMock->housekeeping_task_user(); + } +} +} + +TEST_F(Housekeeping, Works) { + TestDriver driver; + + EXPECT_CALL(*_housekeepingMock, housekeeping_task_kb()).Times(1); + EXPECT_CALL(*_housekeepingMock, housekeeping_task_user()).Times(1); + run_one_scan_loop(); +} diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp index 72763d0bc08..3cfb2cb4c29 100644 --- a/tests/test_common/test_fixture.cpp +++ b/tests/test_common/test_fixture.cpp @@ -58,7 +58,8 @@ void TestFixture::TearDownTestCase() {} TestFixture::TestFixture() { m_this = this; timer_clear(); - test_logger.info() << "tapping term is " << +GET_TAPPING_TERM(KC_TRANSPARENT, &(keyrecord_t){}) << "ms" << std::endl; + keyrecord_t empty_keyrecord = {0}; + test_logger.info() << "tapping term is " << +GET_TAPPING_TERM(KC_TRANSPARENT, &empty_keyrecord) << "ms" << std::endl; } TestFixture::~TestFixture() { @@ -175,6 +176,7 @@ void TestFixture::idle_for(unsigned time) { test_logger.trace() << +time << " keyboard task " << (time > 1 ? "loops" : "loop") << std::endl; for (unsigned i = 0; i < time; i++) { keyboard_task(); + housekeeping_task(); advance_time(1); } } From fcbbaf448569679323b6533e1d441385e3a0fa7d Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Mon, 13 May 2024 20:20:47 +0200 Subject: [PATCH 267/333] Fix for RGB color override and brightness for EC Type K (#23703) Fix for RGB color override and brightness --- keyboards/cipulot/ec_typek/config.h | 2 +- keyboards/cipulot/ec_typek/ec_typek.c | 9 +++++---- keyboards/cipulot/ec_typek/info.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/keyboards/cipulot/ec_typek/config.h b/keyboards/cipulot/ec_typek/config.h index a6619c600c8..1fad97e7117 100644 --- a/keyboards/cipulot/ec_typek/config.h +++ b/keyboards/cipulot/ec_typek/config.h @@ -73,7 +73,7 @@ #define WS2812_DMA_CHANNEL 6 #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM1_UP -#define RGBLIGHT_DEFAULT_VAL 200 +#define RGBLIGHT_DEFAULT_VAL 175 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5) #define NUM_INDICATOR_INDEX 2 diff --git a/keyboards/cipulot/ec_typek/ec_typek.c b/keyboards/cipulot/ec_typek/ec_typek.c index 035c90303ca..3d128d4cdc5 100644 --- a/keyboards/cipulot/ec_typek/ec_typek.c +++ b/keyboards/cipulot/ec_typek/ec_typek.c @@ -35,8 +35,8 @@ void eeconfig_init_kb(void) { eeprom_ec_config.mode_0_actuation_threshold = DEFAULT_MODE_0_ACTUATION_LEVEL; eeprom_ec_config.mode_0_release_threshold = DEFAULT_MODE_0_RELEASE_LEVEL; eeprom_ec_config.mode_1_initial_deadzone_offset = DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET; - eeprom_ec_config.mode_1_actuation_offset = DEFAULT_MODE_1_ACTUATION_OFFSET; - eeprom_ec_config.mode_1_release_offset = DEFAULT_MODE_1_RELEASE_OFFSET; + eeprom_ec_config.mode_1_actuation_offset = DEFAULT_MODE_1_ACTUATION_OFFSET; + eeprom_ec_config.mode_1_release_offset = DEFAULT_MODE_1_RELEASE_OFFSET; for (uint8_t row = 0; row < MATRIX_ROWS; row++) { for (uint8_t col = 0; col < MATRIX_COLS; col++) { @@ -59,8 +59,8 @@ void keyboard_post_init_kb(void) { ec_config.mode_0_actuation_threshold = eeprom_ec_config.mode_0_actuation_threshold; ec_config.mode_0_release_threshold = eeprom_ec_config.mode_0_release_threshold; ec_config.mode_1_initial_deadzone_offset = eeprom_ec_config.mode_1_initial_deadzone_offset; - ec_config.mode_1_actuation_offset = eeprom_ec_config.mode_1_actuation_offset; - ec_config.mode_1_release_offset = eeprom_ec_config.mode_1_release_offset; + ec_config.mode_1_actuation_offset = eeprom_ec_config.mode_1_actuation_offset; + ec_config.mode_1_release_offset = eeprom_ec_config.mode_1_release_offset; ec_config.bottoming_calibration = false; for (uint8_t row = 0; row < MATRIX_ROWS; row++) { for (uint8_t col = 0; col < MATRIX_COLS; col++) { @@ -115,5 +115,6 @@ bool indicators_callback(void) { else sethsv(0, 0, 0, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]); + rgblight_set(); return true; } diff --git a/keyboards/cipulot/ec_typek/info.json b/keyboards/cipulot/ec_typek/info.json index e4642ee5553..be8c6d02701 100644 --- a/keyboards/cipulot/ec_typek/info.json +++ b/keyboards/cipulot/ec_typek/info.json @@ -42,7 +42,7 @@ }, "led_count": 69, "led_map": [0, 1, 2, 3, 4, 5, 66, 67, 68, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65], - "max_brightness": 200 + "max_brightness": 175 }, "usb": { "device_version": "0.0.1", From 501f9886664d6f41fab09733f038851cddf699f0 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Wed, 15 May 2024 11:31:14 +1000 Subject: [PATCH 268/333] [CLI] Fixup return code for `qmk userspace-compile`. (#23720) --- lib/python/qmk/cli/userspace/compile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/python/qmk/cli/userspace/compile.py b/lib/python/qmk/cli/userspace/compile.py index 0a42dd5bf5b..fb320a16f0d 100644 --- a/lib/python/qmk/cli/userspace/compile.py +++ b/lib/python/qmk/cli/userspace/compile.py @@ -35,4 +35,4 @@ def userspace_compile(cli): if len(keyboard_keymap_targets) > 0: build_targets.extend(search_keymap_targets(keyboard_keymap_targets)) - mass_compile_targets(list(set(build_targets)), cli.args.clean, cli.args.dry_run, cli.config.userspace_compile.no_temp, cli.config.userspace_compile.parallel, **build_environment(cli.args.env)) + return mass_compile_targets(list(set(build_targets)), cli.args.clean, cli.args.dry_run, cli.config.userspace_compile.no_temp, cli.config.userspace_compile.parallel, **build_environment(cli.args.env)) From ef80077b685ffb87fc62bf0fecd9acadb6fe2e54 Mon Sep 17 00:00:00 2001 From: George Secillano Date: Tue, 14 May 2024 19:24:27 -0700 Subject: [PATCH 269/333] Fix mapping of GUI/ALT for Win/Mac layers (#22662) --- keyboards/keychron/q60/ansi/keymaps/default/keymap.c | 2 +- keyboards/keychron/q60/ansi/keymaps/keychron/keymap.c | 2 +- keyboards/keychron/q60/ansi/keymaps/via/keymap.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/keychron/q60/ansi/keymaps/default/keymap.c b/keyboards/keychron/q60/ansi/keymaps/default/keymap.c index cb245ede67a..48c38a8c853 100644 --- a/keyboards/keychron/q60/ansi/keymaps/default/keymap.c +++ b/keyboards/keychron/q60/ansi/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(FUNC), - KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN), + KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT), [WIN_BASE] = LAYOUT_ansi_60( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, diff --git a/keyboards/keychron/q60/ansi/keymaps/keychron/keymap.c b/keyboards/keychron/q60/ansi/keymaps/keychron/keymap.c index e75f61a1f99..17a5d9b78d7 100644 --- a/keyboards/keychron/q60/ansi/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q60/ansi/keymaps/keychron/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(FUNC), - KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN), + KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT), [WIN_BASE] = LAYOUT_ansi_60( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, diff --git a/keyboards/keychron/q60/ansi/keymaps/via/keymap.c b/keyboards/keychron/q60/ansi/keymaps/via/keymap.c index cb245ede67a..e1cd23e7178 100644 --- a/keyboards/keychron/q60/ansi/keymaps/via/keymap.c +++ b/keyboards/keychron/q60/ansi/keymaps/via/keymap.c @@ -33,14 +33,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(FUNC), - KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN), + KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT), [WIN_BASE] = LAYOUT_ansi_60( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(FUNC), - KC_LALT, KC_LWIN, KC_SPC, KC_RWIN, KC_RALT), + KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN), [FUNC] = LAYOUT_ansi_60( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, From eb5172f4b5b1589d83a0a4c63ad40340d68da673 Mon Sep 17 00:00:00 2001 From: Vertex-kb <102476474+Vertex-kb@users.noreply.github.com> Date: Wed, 15 May 2024 12:06:17 +0800 Subject: [PATCH 270/333] [Keyboard] Add cycle7 (#23290) * Add files via upload * Update keyboards/vertex/cycle7/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/vertex/cycle7/mcuconf.h Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/vertex/cycle7/halconf.h Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/vertex/cycle7/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/vertex/cycle7/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/vertex/cycle7/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/vertex/cycle7/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/vertex/cycle7/keymaps/default/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/vertex/cycle7/keymaps/via/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/vertex/cycle7/config.h Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Add files via upload * Update info.json * Add files via upload * Update keyboards/vertex/cycle7/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland * Update keyboards/vertex/cycle7/keymaps/via/keymap.c Co-authored-by: Duncan Sutherland * Update keyboards/vertex/cycle7/keymaps/via/keymap.c Co-authored-by: Duncan Sutherland * Update keyboards/vertex/cycle7/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland * Update keyboards/vertex/cycle7/info.json Co-authored-by: Duncan Sutherland * Update keyboards/vertex/cycle7/info.json Co-authored-by: Duncan Sutherland * Update keyboards/vertex/cycle7/info.json Co-authored-by: Duncan Sutherland --------- Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: Duncan Sutherland --- keyboards/vertex/cycle7/config.h | 19 + keyboards/vertex/cycle7/halconf.h | 21 + keyboards/vertex/cycle7/info.json | 739 ++++++++++++++++++ .../vertex/cycle7/keymaps/default/keymap.c | 27 + keyboards/vertex/cycle7/keymaps/via/keymap.c | 27 + keyboards/vertex/cycle7/keymaps/via/rules.mk | 2 + keyboards/vertex/cycle7/mcuconf.h | 22 + keyboards/vertex/cycle7/readme.md | 25 + keyboards/vertex/cycle7/rules.mk | 1 + 9 files changed, 883 insertions(+) create mode 100644 keyboards/vertex/cycle7/config.h create mode 100644 keyboards/vertex/cycle7/halconf.h create mode 100644 keyboards/vertex/cycle7/info.json create mode 100644 keyboards/vertex/cycle7/keymaps/default/keymap.c create mode 100644 keyboards/vertex/cycle7/keymaps/via/keymap.c create mode 100644 keyboards/vertex/cycle7/keymaps/via/rules.mk create mode 100644 keyboards/vertex/cycle7/mcuconf.h create mode 100644 keyboards/vertex/cycle7/readme.md create mode 100644 keyboards/vertex/cycle7/rules.mk diff --git a/keyboards/vertex/cycle7/config.h b/keyboards/vertex/cycle7/config.h new file mode 100644 index 00000000000..4b316ce6304 --- /dev/null +++ b/keyboards/vertex/cycle7/config.h @@ -0,0 +1,19 @@ +/* Copyright 2022 Eason + +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 +#define WS2812_SPI_DRIVER SPID2 +#define WS2812_SPI_MOSI_PAL_MODE 5 diff --git a/keyboards/vertex/cycle7/halconf.h b/keyboards/vertex/cycle7/halconf.h new file mode 100644 index 00000000000..e6258a974c8 --- /dev/null +++ b/keyboards/vertex/cycle7/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2022 Eason + * + * 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 + + #define HAL_USE_SPI TRUE + + #include_next diff --git a/keyboards/vertex/cycle7/info.json b/keyboards/vertex/cycle7/info.json new file mode 100644 index 00000000000..d9b2f301684 --- /dev/null +++ b/keyboards/vertex/cycle7/info.json @@ -0,0 +1,739 @@ +{ + "keyboard_name": "Cycle7", + "manufacturer": "vertex", + "maintainer": "Eason", + "usb": { + "vid": "0x9A94", + "pid": "0x9F70", + "device_version": "0.0.1", + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "rgblight": { + "led_count": 1, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "ws2812": { + "pin": "B15", + "driver": "spi" + }, + "matrix_pins": { + "rows": [ "A8", "A9", "A10", "B3", "A15"], + "cols": [ "A3", "A2", "A1", "A0", "C15", "C14", "B9", "B8", "B7", "B6", "A7", "A6", "A5", "A4", "B5", "B4"] + }, + "diode_direction": "ROW2COL", + "processor": "STM32F103", + "bootloader": "uf2boot", + "community_layouts": [ + "tkl_nofrow_ansi", + "tkl_nofrow_iso" + ], + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [4, 7], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [2, 14], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [1, 15], "x": 16.25, "y": 1}, + {"matrix": [2, 15], "x": 17.25, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 16.25, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4}, + {"matrix": [3, 14], "x": 17.25, "y": 4} + ] + }, + "LAYOUT_tkl_nofrow_ansi_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [4, 7], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [2, 14], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [1, 15], "x": 16.25, "y": 1}, + {"matrix": [2, 15], "x": 17.25, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 16.25, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4}, + {"matrix": [3, 14], "x": 17.25, "y": 4} + +] +}, + "LAYOUT_tkl_nofrow_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [2, 14], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [1, 15], "x": 16.25, "y": 1}, + {"matrix": [2, 15], "x": 17.25, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [3, 15], "x": 16.25, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4}, + {"matrix": [3, 14], "x": 17.25, "y": 4} + ] + }, + "LAYOUT_tkl_nofrow_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [2, 14], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [1, 15], "x": 16.25, "y": 1}, + {"matrix": [2, 15], "x": 17.25, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [3, 15], "x": 16.25, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4}, + {"matrix": [3, 14], "x": 17.25, "y": 4} + ] + }, + "LAYOUT_tkl_nofrow_iso_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [4, 7], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [2, 14], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [1, 15], "x": 16.25, "y": 1}, + {"matrix": [2, 15], "x": 17.25, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 16.25, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4}, + {"matrix": [3, 14], "x": 17.25, "y": 4} + ] + }, + "LAYOUT_tkl_nofrow_ansi_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [4, 7], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [2, 14], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [1, 15], "x": 16.25, "y": 1}, + {"matrix": [2, 15], "x": 17.25, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 16.25, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4}, + {"matrix": [3, 14], "x": 17.25, "y": 4} + ] + }, + "LAYOUT_tkl_nofrow_ansi_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [2, 14], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [1, 15], "x": 16.25, "y": 1}, + {"matrix": [2, 15], "x": 17.25, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [3, 15], "x": 16.25, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4}, + {"matrix": [3, 14], "x": 17.25, "y": 4} + ] + }, + "LAYOUT_tkl_nofrow_iso_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [2, 14], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [1, 15], "x": 16.25, "y": 1}, + {"matrix": [2, 15], "x": 17.25, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [3, 15], "x": 16.25, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4}, + {"matrix": [3, 14], "x": 17.25, "y": 4} + ] + }, + "LAYOUT_tkl_nofrow_iso_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [4, 7], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [2, 14], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [1, 15], "x": 16.25, "y": 1}, + {"matrix": [2, 15], "x": 17.25, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 16.25, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4}, + {"matrix": [3, 14], "x": 17.25, "y": 4} + ] + } + } +} diff --git a/keyboards/vertex/cycle7/keymaps/default/keymap.c b/keyboards/vertex/cycle7/keymaps/default/keymap.c new file mode 100644 index 00000000000..c5f7e8699b3 --- /dev/null +++ b/keyboards/vertex/cycle7/keymaps/default/keymap.c @@ -0,0 +1,27 @@ +/* Copyright 2022 vertex + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_1, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_SLSH, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, KC_MENU, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/vertex/cycle7/keymaps/via/keymap.c b/keyboards/vertex/cycle7/keymaps/via/keymap.c new file mode 100644 index 00000000000..c5f7e8699b3 --- /dev/null +++ b/keyboards/vertex/cycle7/keymaps/via/keymap.c @@ -0,0 +1,27 @@ +/* Copyright 2022 vertex + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_1, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_SLSH, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, KC_MENU, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/vertex/cycle7/keymaps/via/rules.mk b/keyboards/vertex/cycle7/keymaps/via/rules.mk new file mode 100644 index 00000000000..36b7ba9cbc9 --- /dev/null +++ b/keyboards/vertex/cycle7/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/vertex/cycle7/mcuconf.h b/keyboards/vertex/cycle7/mcuconf.h new file mode 100644 index 00000000000..45bdcba1740 --- /dev/null +++ b/keyboards/vertex/cycle7/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2022 Eason + * + * 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 + +#include_next + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 TRUE diff --git a/keyboards/vertex/cycle7/readme.md b/keyboards/vertex/cycle7/readme.md new file mode 100644 index 00000000000..ad36741dedc --- /dev/null +++ b/keyboards/vertex/cycle7/readme.md @@ -0,0 +1,25 @@ +# Cycle7 + +![Cycle7](https://i.imgur.com/v5d8D7h.png) + +* A customizable hotswap 70% keyboard. + +* Keyboard Maintainer: [EASON](https://github.com/EasonQian1) +* Hardware Supported: Cycle7 PCB +* Hardware Availability: [EASON](https://github.com/EasonQian1) + +Make example for this keyboard (after setting up your build environment): + + make vertex/cycle7:default + +Flashing example for this keyboard: + + make vertex/cycle7: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). + +## Bootloader Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down ESC in the keyboard then replug +* **Physical reset button**: Briefly press the button on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` diff --git a/keyboards/vertex/cycle7/rules.mk b/keyboards/vertex/cycle7/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/vertex/cycle7/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From a9ba83c7beee3fd86d677eae5823fbb1e8b8bb30 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 16 May 2024 21:52:15 +1000 Subject: [PATCH 271/333] Remove useless `LED/RGB_MATRIX_ENABLE` ifdefs (#23726) --- quantum/led_matrix/led_matrix.c | 4 ++-- quantum/rgb_matrix/rgb_matrix.c | 4 ++-- quantum/rgb_matrix/rgb_matrix_drivers.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c index 2ca62c6969d..798ab9a120e 100644 --- a/quantum/led_matrix/led_matrix.c +++ b/quantum/led_matrix/led_matrix.c @@ -82,7 +82,7 @@ static last_hit_t last_hit_buffer; #endif // LED_MATRIX_KEYREACTIVE_ENABLED // split led matrix -#if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT) +#if defined(LED_MATRIX_SPLIT) const uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT; #endif @@ -147,7 +147,7 @@ void led_matrix_set_value(int index, uint8_t value) { } void led_matrix_set_value_all(uint8_t value) { -#if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT) +#if defined(LED_MATRIX_SPLIT) for (uint8_t i = 0; i < LED_MATRIX_LED_COUNT; i++) led_matrix_set_value(i, value); #else diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c index aaba00b4576..70175f9d50e 100644 --- a/quantum/rgb_matrix/rgb_matrix.c +++ b/quantum/rgb_matrix/rgb_matrix.c @@ -84,7 +84,7 @@ static last_hit_t last_hit_buffer; #endif // RGB_MATRIX_KEYREACTIVE_ENABLED // split rgb matrix -#if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) +#if defined(RGB_MATRIX_SPLIT) const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT; #endif @@ -148,7 +148,7 @@ void rgb_matrix_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { } void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue) { -#if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) +#if defined(RGB_MATRIX_SPLIT) for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) rgb_matrix_set_color(i, red, green, blue); #else diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c index db3a2ef9e02..bf5209a9d32 100644 --- a/quantum/rgb_matrix/rgb_matrix_drivers.c +++ b/quantum/rgb_matrix/rgb_matrix_drivers.c @@ -164,7 +164,7 @@ static void flush(void) { // Set an led in the buffer to a color static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) { -# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) +# if defined(RGB_MATRIX_SPLIT) const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT; if (!is_keyboard_left()) { if (i >= k_rgb_matrix_split[0]) { From 340be4bae34d35137b65f3c303f3091ede3c8938 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 17 May 2024 00:06:19 +0100 Subject: [PATCH 272/333] Resolve home directory in userspace config (#23730) --- lib/python/qmk/userspace.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/python/qmk/userspace.py b/lib/python/qmk/userspace.py index 7e4cb847c80..1e5823b2291 100644 --- a/lib/python/qmk/userspace.py +++ b/lib/python/qmk/userspace.py @@ -12,29 +12,29 @@ from qmk.json_encoders import UserspaceJSONEncoder def qmk_userspace_paths(): - test_dirs = {} + test_dirs = set() # If we're already in a directory with a qmk.json and a keyboards or layouts directory, interpret it as userspace if environ.get('ORIG_CWD') is not None: current_dir = Path(environ['ORIG_CWD']) while len(current_dir.parts) > 1: if (current_dir / 'qmk.json').is_file(): - test_dirs[current_dir] = True + test_dirs.add(current_dir) current_dir = current_dir.parent # If we have a QMK_USERSPACE environment variable, use that if environ.get('QMK_USERSPACE') is not None: - current_dir = Path(environ['QMK_USERSPACE']) + current_dir = Path(environ['QMK_USERSPACE']).expanduser() if current_dir.is_dir(): - test_dirs[current_dir] = True + test_dirs.add(current_dir) # If someone has configured a directory, use that if cli.config.user.overlay_dir is not None: - current_dir = Path(cli.config.user.overlay_dir) + current_dir = Path(cli.config.user.overlay_dir).expanduser().resolve() if current_dir.is_dir(): - test_dirs[current_dir] = True + test_dirs.add(current_dir) - return list(test_dirs.keys()) + return list(test_dirs) def qmk_userspace_validate(path): From 47bc02b2ff84c9a35b8f778a8a1012f737372eea Mon Sep 17 00:00:00 2001 From: Dasky <32983009+daskygit@users.noreply.github.com> Date: Fri, 17 May 2024 22:59:45 +0100 Subject: [PATCH 273/333] Force CPI update using timer when using split pointing. (#23545) --- quantum/split_common/transactions.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c index 33bc9e9f575..2bebd2757da 100644 --- a/quantum/split_common/transactions.c +++ b/quantum/split_common/transactions.c @@ -710,16 +710,17 @@ static bool pointing_handlers_master(matrix_row_t master_matrix[], matrix_row_t return true; } # endif - static uint32_t last_update = 0; - static uint16_t last_cpi = 0; + static uint32_t last_update = 0; + static uint32_t last_cpi_update = 0; + static uint16_t last_cpi = 0; report_mouse_t temp_state; uint16_t temp_cpi; bool okay = read_if_checksum_mismatch(GET_POINTING_CHECKSUM, GET_POINTING_DATA, &last_update, &temp_state, &split_shmem->pointing.report, sizeof(temp_state)); if (okay) pointing_device_set_shared_report(temp_state); temp_cpi = pointing_device_get_shared_cpi(); - if (temp_cpi && last_cpi != temp_cpi) { + if (temp_cpi) { split_shmem->pointing.cpi = temp_cpi; - okay = transport_write(PUT_POINTING_CPI, &split_shmem->pointing.cpi, sizeof(split_shmem->pointing.cpi)); + okay = send_if_condition(PUT_POINTING_CPI, &last_cpi_update, last_cpi != temp_cpi, &split_shmem->pointing.cpi, sizeof(split_shmem->pointing.cpi)); if (okay) { last_cpi = temp_cpi; } From 5c592ab0c0104f93cb521acb9a5df0bac7aabb15 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 18 May 2024 08:49:29 +1000 Subject: [PATCH 274/333] Delete trivial keymap readmes (#23714) --- keyboards/0_sixty/keymaps/default/readme.md | 1 - keyboards/0_sixty/keymaps/via/readme.md | 1 - keyboards/1upkeyboards/1up60hse/keymaps/default/readme.md | 4 ---- keyboards/1upkeyboards/1up60hse/keymaps/via/readme.md | 1 - keyboards/1upkeyboards/super16/keymaps/default/readme.md | 1 - .../1upkeyboards/super16v2/keymaps/default/readme.md | 1 - keyboards/1upkeyboards/super16v2/keymaps/via/readme.md | 1 - .../1upkeyboards/sweet16v2/keymaps/default/readme.md | 1 - keyboards/1upkeyboards/sweet16v2/keymaps/via/readme.md | 1 - keyboards/25keys/cassette42/keymaps/default/readme.md | 1 - keyboards/40percentclub/25/keymaps/default/readme.md | 1 - keyboards/40percentclub/4pack/keymaps/default/readme.md | 1 - keyboards/40percentclub/6lit/keymaps/default/readme.md | 1 - keyboards/40percentclub/foobar/keymaps/default/readme.md | 1 - .../40percentclub/half_n_half/keymaps/default/readme.md | 1 - keyboards/40percentclub/i75/keymaps/default/readme.md | 1 - keyboards/40percentclub/nori/keymaps/default/readme.md | 1 - keyboards/40percentclub/sixpack/keymaps/default/readme.md | 1 - keyboards/45_ats/keymaps/via/readme.md | 3 --- keyboards/4by3/keymaps/default/readme.md | 3 --- keyboards/acheron/elongate/beta/keymaps/default/readme.md | 1 - keyboards/ada/ada1800mini/keymaps/default/readme.md | 1 - keyboards/ada/infinity81/keymaps/default/readme.md | 1 - keyboards/adpenrose/kintsugi/keymaps/default/readme.md | 1 - keyboards/adpenrose/kintsugi/keymaps/via/readme.md | 1 - keyboards/adpenrose/shisaku/keymaps/default/readme.md | 1 - keyboards/adpenrose/shisaku/keymaps/via/readme.md | 1 - keyboards/aeboards/aegis/keymaps/default/readme.md | 2 -- keyboards/aeboards/aegis/keymaps/via/readme.md | 2 -- .../aeboards/constellation/keymaps/default/readme.md | 2 -- keyboards/aeboards/constellation/keymaps/via/readme.md | 2 -- keyboards/aeboards/ext65/rev1/keymaps/default/readme.md | 2 -- keyboards/aeboards/ext65/rev1/keymaps/via/readme.md | 2 -- keyboards/aeboards/ext65/rev2/keymaps/default/readme.md | 2 -- keyboards/aeboards/ext65/rev2/keymaps/via/readme.md | 2 -- keyboards/aeboards/ext65/rev3/keymaps/default/readme.md | 2 -- keyboards/aeboards/ext65/rev3/keymaps/via/readme.md | 2 -- keyboards/ai03/equinox/keymaps/default/readme.md | 3 --- keyboards/ai03/equinox/keymaps/via/readme.md | 3 --- keyboards/ai03/jp60/keymaps/default/readme.md | 3 --- keyboards/ai03/jp60/keymaps/via/readme.md | 3 --- keyboards/ai03/lunar/keymaps/default/readme.md | 2 -- keyboards/ai03/lunar/keymaps/via/readme.md | 2 -- keyboards/ai03/lunar_ii/keymaps/default/readme.md | 2 -- keyboards/ai03/lunar_ii/keymaps/via/readme.md | 2 -- keyboards/ai03/orbit/keymaps/default/readme.md | 3 --- keyboards/ai03/orbit_x/keymaps/default/readme.md | 3 --- keyboards/ai03/orbit_x/keymaps/via/readme.md | 2 -- keyboards/ai03/polaris/keymaps/default/readme.md | 3 --- .../ai03/polaris/keymaps/default_ansi_tsangan/readme.md | 3 --- keyboards/ai03/polaris/keymaps/via/readme.md | 3 --- keyboards/ai03/quasar/keymaps/default/readme.md | 4 ---- keyboards/ai03/soyuz/keymaps/1U/readme.md | 3 --- keyboards/ai03/soyuz/keymaps/default/readme.md | 3 --- keyboards/ai03/voyager60_alps/keymaps/default/readme.md | 1 - keyboards/ai03/voyager60_alps/keymaps/via/readme.md | 1 - keyboards/al1/keymaps/via/readme.md | 1 - keyboards/alf/dc60/keymaps/default/readme.md | 1 - keyboards/amjkeyboard/amj84/keymaps/default/readme.md | 1 - keyboards/aos/tkl/keymaps/default/readme.md | 3 --- keyboards/arisu/keymaps/default/readme.md | 1 - keyboards/ash1800/keymaps/default/readme.md | 1 - keyboards/ask55/keymaps/default/readme.md | 1 - keyboards/atlas_65/keymaps/default/readme.md | 1 - keyboards/atreyu/keymaps/default/readme.md | 7 ------- keyboards/atxkb/1894/keymaps/default/readme.md | 3 --- .../atxkb/1894/keymaps/default_ansi_tsangan/readme.md | 3 --- keyboards/atxkb/1894/keymaps/via/readme.md | 3 --- keyboards/aves60/keymaps/default/readme.md | 1 - keyboards/bandominedoni/keymaps/default/readme.md | 1 - keyboards/bandominedoni/keymaps/via/readme.md | 1 - keyboards/barleycorn_smd/keymaps/via/readme.md | 1 - keyboards/barracuda/keymaps/default/readme.md | 1 - keyboards/barracuda/keymaps/via/readme.md | 1 - .../bastardkb/dilemma/4x6_4/keymaps/default/readme.md | 2 -- keyboards/beatervan/keymaps/default/readme.md | 1 - keyboards/beatervan/keymaps/via/readme.md | 1 - keyboards/biacco42/meishi/keymaps/default/readme.md | 1 - keyboards/biacco42/meishi2/keymaps/default/readme.md | 1 - keyboards/binepad/bn003/keymaps/default/readme.md | 1 - keyboards/blank/blank01/keymaps/default/readme.md | 1 - keyboards/blank/blank01/keymaps/via/readme.md | 1 - .../blank_tehnologii/manibus/keymaps/default/readme.md | 3 --- keyboards/boardwalk/keymaps/default/readme.md | 1 - keyboards/boardwalk/keymaps/default_2u_arrow/readme.md | 1 - keyboards/boardwalk/keymaps/default_2x2u/readme.md | 1 - keyboards/boardwalk/keymaps/default_625u_arrow/readme.md | 1 - keyboards/boardwalk/keymaps/default_ortho_7u/readme.md | 1 - keyboards/boardwalk/keymaps/default_ortho_hhkb/readme.md | 1 - keyboards/boardwalk/keymaps/via/readme.md | 1 - keyboards/bpiphany/frosty_flake/keymaps/default/readme.md | 1 - keyboards/bpiphany/frosty_flake/keymaps/tkl/readme.md | 1 - keyboards/bpiphany/sixshooter/keymaps/default/readme.md | 1 - keyboards/bpiphany/tiger_lily/keymaps/default/readme.md | 1 - .../bpiphany/tiger_lily/keymaps/default_ansi/readme.md | 3 --- .../unloved_bastard/keymaps/default_ansi/readme.md | 3 --- .../unloved_bastard/keymaps/default_iso/readme.md | 3 --- keyboards/bt66tech/bt66tech60/keymaps/default/readme.md | 1 - keyboards/buildakb/potato65/keymaps/default/readme.md | 3 --- keyboards/buildakb/potato65/keymaps/via/readme.md | 3 --- keyboards/buildakb/potato65hs/keymaps/default/readme.md | 3 --- keyboards/buildakb/potato65hs/keymaps/via/readme.md | 3 --- keyboards/buildakb/potato65s/keymaps/default/readme.md | 3 --- keyboards/buildakb/potato65s/keymaps/via/readme.md | 3 --- .../cablecardesigns/cypher/rev6/keymaps/default/readme.md | 1 - .../cypher/rev6/keymaps/default_ansi/readme.md | 1 - .../cypher/rev6/keymaps/default_iso/readme.md | 1 - keyboards/caffeinated/serpent65/keymaps/default/readme.md | 1 - keyboards/caffeinated/serpent65/keymaps/via/readme.md | 1 - keyboards/cannonkeys/atlas_alps/keymaps/default/readme.md | 2 -- keyboards/capsunlocked/cu65/keymaps/default/readme.md | 1 - keyboards/capsunlocked/cu65/keymaps/iso/readme.md | 1 - .../capsunlocked/cu65/keymaps/iso_split_bs/readme.md | 1 - keyboards/capsunlocked/cu7/keymaps/default/readme.md | 1 - keyboards/capsunlocked/cu80/v1/keymaps/default/readme.md | 1 - keyboards/charue/charon/keymaps/default/readme.md | 1 - keyboards/charue/charon/keymaps/via/readme.md | 1 - keyboards/charue/sunsetter_r2/keymaps/default/readme.md | 1 - keyboards/charue/sunsetter_r2/keymaps/via/readme.md | 1 - keyboards/checkerboards/axon40/keymaps/default/readme.md | 2 -- .../candybar_ortho/keymaps/default/readme.md | 2 -- .../checkerboards/candybar_ortho/keymaps/via/readme.md | 2 -- .../checkerboards/plexus75/keymaps/default/readme.md | 1 - .../checkerboards/plexus75/keymaps/default_3u/readme.md | 1 - .../checkerboards/plexus75/keymaps/default_7u/readme.md | 2 -- .../checkerboards/plexus75_he/keymaps/default/readme.md | 1 - .../checkerboards/pursuit40/keymaps/default/readme.md | 1 - keyboards/checkerboards/quark/keymaps/default/readme.md | 1 - .../checkerboards/quark_plus/keymaps/default/readme.md | 1 - keyboards/cherrybstudio/cb1800/keymaps/default/readme.md | 1 - keyboards/cherrybstudio/cb65/keymaps/default/readme.md | 1 - keyboards/cherrybstudio/cb87/keymaps/default/readme.md | 1 - keyboards/cherrybstudio/cb87rgb/keymaps/default/readme.md | 1 - keyboards/cherrybstudio/cb87v2/keymaps/default/readme.md | 1 - keyboards/chickenman/ciel/keymaps/default/readme.md | 1 - keyboards/chromatonemini/keymaps/default/readme.md | 1 - keyboards/chromatonemini/keymaps/via/readme.md | 1 - keyboards/ckeys/handwire_101/keymaps/default/readme.md | 1 - keyboards/ckeys/nakey/keymaps/default/readme.md | 1 - keyboards/ckeys/obelus/keymaps/default/readme.md | 1 - keyboards/ckeys/washington/keymaps/default/readme.md | 1 - keyboards/clueboard/17/keymaps/default/readme.md | 1 - keyboards/clueboard/2x1800/2018/keymaps/default/readme.md | 1 - .../clueboard/2x1800/2018/keymaps/default_4u/readme.md | 1 - .../clueboard/2x1800/2018/keymaps/default_7u/readme.md | 1 - keyboards/clueboard/2x1800/2019/keymaps/default/readme.md | 1 - .../2x1800/2019/keymaps/default_1u_ansi/readme.md | 1 - .../2x1800/2019/keymaps/default_1u_iso/readme.md | 1 - .../2x1800/2019/keymaps/default_2u_ansi/readme.md | 1 - .../2x1800/2019/keymaps/default_2u_iso/readme.md | 1 - .../2x1800/2019/keymaps/default_4u_ansi/readme.md | 1 - .../2x1800/2019/keymaps/default_4u_iso/readme.md | 1 - .../2x1800/2019/keymaps/default_7u_ansi/readme.md | 1 - .../2x1800/2019/keymaps/default_7u_iso/readme.md | 1 - .../clueboard/2x1800/2021/keymaps/default_4u/readme.md | 1 - .../clueboard/2x1800/2021/keymaps/default_7u/readme.md | 1 - keyboards/clueboard/60/keymaps/default/readme.md | 1 - keyboards/clueboard/60/keymaps/default_aek/readme.md | 1 - keyboards/clueboard/california/keymaps/default/readme.md | 1 - keyboards/contender/keymaps/default/readme.md | 1 - keyboards/contra/keymaps/default/readme.md | 2 -- keyboards/contra/keymaps/via/readme.md | 2 -- .../converter/siemens_tastatur/keymaps/default/readme.md | 1 - .../click_pad_v1/keymaps/default/readme.md | 1 - keyboards/cozykeys/speedo/v2/keymaps/default/readme.md | 1 - keyboards/craftwalk/keymaps/default/readme.md | 1 - keyboards/crazy_keyboard_68/keymaps/default/readme.md | 4 ---- keyboards/crypt_macro/keymaps/default/readme.md | 1 - keyboards/crypt_macro/keymaps/via/readme.md | 1 - keyboards/cutie_club/wraith/keymaps/default/readme.md | 1 - keyboards/cx60/keymaps/default/readme.md | 1 - keyboards/cx60/keymaps/via/readme.md | 1 - keyboards/cx60/keymaps/via_caps/readme.md | 1 - keyboards/dailycraft/bat43/keymaps/default/readme.md | 1 - keyboards/dailycraft/bat43/keymaps/via/readme.md | 1 - keyboards/dailycraft/owl8/keymaps/default/readme.md | 1 - keyboards/dailycraft/owl8/keymaps/via/readme.md | 1 - .../dailycraft/sandbox/rev1/keymaps/default/readme.md | 1 - keyboards/dailycraft/sandbox/rev1/keymaps/via/readme.md | 1 - .../dailycraft/sandbox/rev2/keymaps/default/readme.md | 1 - keyboards/dailycraft/sandbox/rev2/keymaps/via/readme.md | 1 - keyboards/dailycraft/stickey4/keymaps/default/readme.md | 1 - keyboards/dailycraft/stickey4/keymaps/via/readme.md | 1 - .../dailycraft/wings42/rev1/keymaps/default/readme.md | 1 - .../wings42/rev1_extkeys/keymaps/default/readme.md | 1 - .../dailycraft/wings42/rev2/keymaps/default/readme.md | 1 - keyboards/delikeeb/flatbread60/keymaps/default/readme.md | 1 - keyboards/delikeeb/vaguettelite/keymaps/default/readme.md | 1 - .../vaguettelite/keymaps/default_625u_universal/readme.md | 1 - keyboards/delikeeb/vanana/keymaps/default/readme.md | 1 - keyboards/delikeeb/vaneela/keymaps/default/readme.md | 1 - keyboards/delikeeb/vaneelaex/keymaps/default/readme.md | 2 -- keyboards/delikeeb/waaffle/keymaps/default/readme.md | 1 - keyboards/dinofizz/fnrow/v1/keymaps/default/readme.md | 1 - keyboards/dm9records/tartan/keymaps/default/readme.md | 1 - keyboards/dmqdesign/spin/keymaps/default/readme.md | 1 - keyboards/donutcables/budget96/keymaps/default/readme.md | 1 - keyboards/doppelganger/keymaps/default/readme.md | 1 - keyboards/drewkeys/iskar/keymaps/default/readme.md | 1 - keyboards/drewkeys/iskar/keymaps/via/readme.md | 1 - keyboards/drhigsby/bkf/keymaps/default/readme.md | 1 - keyboards/drhigsby/dubba175/keymaps/default/readme.md | 1 - keyboards/drhigsby/ogurec/keymaps/default/readme.md | 1 - keyboards/drhigsby/packrat/keymaps/default/readme.md | 3 --- keyboards/drop/sense75/keymaps/default_md/readme.md | 1 - keyboards/dtisaac/cg108/keymaps/default/readme.md | 1 - keyboards/dtisaac/dosa40rgb/keymaps/default/readme.md | 1 - keyboards/dtisaac/dtisaac01/keymaps/default/readme.md | 1 - keyboards/dtisaac/dtisaac01/keymaps/via/readme.md | 1 - keyboards/duck/jetfire/keymaps/default/readme.md | 1 - keyboards/ducky/one2mini/keymaps/ansi/readme.md | 1 - keyboards/ducky/one2mini/keymaps/default/readme.md | 1 - keyboards/ducky/one2mini/keymaps/iso/readme.md | 1 - keyboards/ducky/one2sf/keymaps/default/readme.md | 1 - keyboards/e88/keymaps/default/readme.md | 1 - keyboards/e88/keymaps/via/readme.md | 1 - keyboards/ealdin/quadrant/keymaps/default/readme.md | 1 - keyboards/earth_rover/keymaps/default/readme.md | 1 - keyboards/eco/keymaps/default/readme.md | 3 --- keyboards/edc40/keymaps/default/readme.md | 1 - keyboards/edc40/keymaps/via/readme.md | 1 - keyboards/eek/keymaps/default/readme.md | 1 - keyboards/efreet/keymaps/default/readme.md | 1 - keyboards/ein_60/keymaps/ledtest/readme.md | 1 - keyboards/elephant42/keymaps/default/readme.md | 1 - keyboards/elephant42/keymaps/via/readme.md | 1 - keyboards/emajesty/eiri/keymaps/default/readme.md | 3 --- keyboards/ep/40/keymaps/default/readme.md | 1 - keyboards/ep/96/keymaps/default/readme.md | 1 - .../ericrlau/numdiscipline/keymaps/default/readme.md | 1 - keyboards/eternal_keypad/keymaps/default/readme.md | 1 - keyboards/evyd13/atom47/keymaps/default/readme.md | 1 - keyboards/evyd13/eon40/keymaps/default/readme.md | 1 - keyboards/evyd13/eon87/keymaps/default/readme.md | 1 - keyboards/evyd13/gh80_1800/keymaps/default/readme.md | 1 - keyboards/evyd13/gh80_3700/keymaps/default/readme.md | 1 - keyboards/evyd13/gh80_3700/keymaps/rgb/readme.md | 1 - keyboards/evyd13/minitomic/keymaps/default/readme.md | 1 - keyboards/evyd13/mx5160/keymaps/default/readme.md | 1 - keyboards/evyd13/pockettype/keymaps/default/readme.md | 1 - keyboards/evyd13/solheim68/keymaps/default/readme.md | 1 - keyboards/evyd13/wasdat/keymaps/default/readme.md | 1 - keyboards/evyd13/wasdat/keymaps/default_iso/readme.md | 1 - keyboards/evyd13/wasdat_code/keymaps/default/readme.md | 1 - .../evyd13/wasdat_code/keymaps/default_iso/readme.md | 1 - keyboards/exclusive/e6v2/le_bmc/keymaps/default/readme.md | 1 - keyboards/exclusive/e6v2/oe_bmc/keymaps/default/readme.md | 1 - keyboards/flehrad/downbubble/keymaps/default/readme.md | 1 - keyboards/fleuron/keymaps/default/readme.md | 1 - keyboards/fluorite/keymaps/default/readme.md | 1 - keyboards/flx/lodestone/keymaps/default/readme.md | 1 - keyboards/flx/lodestone/keymaps/default_ansi/readme.md | 1 - keyboards/flx/lodestone/keymaps/default_iso/readme.md | 1 - keyboards/flx/lodestone/keymaps/via/readme.md | 1 - keyboards/flx/virgo/keymaps/default/readme.md | 1 - keyboards/flx/virgo/keymaps/via/readme.md | 1 - keyboards/foostan/cornelius/keymaps/default/readme.md | 1 - keyboards/foostan/cornelius/keymaps/via/readme.md | 1 - keyboards/for_science/keymaps/default/readme.md | 1 - keyboards/foxlab/leaf60/hotswap/keymaps/default/readme.md | 1 - .../foxlab/leaf60/universal/keymaps/default/readme.md | 1 - keyboards/foxlab/time80/keymaps/default/readme.md | 1 - keyboards/fractal/keymaps/default/readme.md | 2 -- keyboards/ft/mars80/keymaps/default/readme.md | 1 - keyboards/function96/v1/keymaps/default/readme.md | 3 --- keyboards/function96/v2/keymaps/ansi_splitspace/readme.md | 3 --- keyboards/function96/v2/keymaps/default/readme.md | 3 --- keyboards/function96/v2/keymaps/iso/readme.md | 3 --- keyboards/function96/v2/keymaps/iso_splitspace/readme.md | 3 --- keyboards/funky40/keymaps/default/readme.md | 6 ------ .../geekboards/macropad_v2/keymaps/default/readme.md | 1 - keyboards/geekboards/macropad_v2/keymaps/via/readme.md | 3 --- .../generic_panda/panda65_01/keymaps/default/readme.md | 5 ----- keyboards/gh60/satan/keymaps/colemak/readme.md | 1 - keyboards/gh60/satan/keymaps/default/readme.md | 1 - keyboards/gh60/v1p3/keymaps/default/readme.md | 1 - keyboards/giabalanai/keymaps/default/readme.md | 1 - .../giabalanai/keymaps/default_giabarinaix2/readme.md | 1 - keyboards/giabalanai/keymaps/giabarinaix2led/readme.md | 1 - keyboards/giabalanai/keymaps/via/readme.md | 1 - keyboards/giabalanai/keymaps/via_giabarinaix2/readme.md | 1 - keyboards/gkeyboard/gkb_m16/keymaps/default/readme.md | 1 - keyboards/gkeyboard/gkb_m16/keymaps/via/readme.md | 1 - keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/readme.md | 1 - keyboards/gmmk/gmmk2/p65/iso/keymaps/default/readme.md | 1 - keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/readme.md | 1 - keyboards/gmmk/gmmk2/p96/iso/keymaps/default/readme.md | 1 - keyboards/gon/nerd60/keymaps/default/readme.md | 3 --- keyboards/gon/nerdtkl/keymaps/default/readme.md | 3 --- keyboards/gorthage_truck/keymaps/10u/readme.md | 1 - keyboards/gorthage_truck/keymaps/7u/readme.md | 1 - keyboards/gorthage_truck/keymaps/default/readme.md | 1 - keyboards/gray_studio/cod67/keymaps/default/readme.md | 5 ----- keyboards/gray_studio/space65/keymaps/default/readme.md | 1 - keyboards/gray_studio/space65/keymaps/iso/readme.md | 3 --- .../gray_studio/think65/hotswap/keymaps/default/readme.md | 1 - .../gray_studio/think65/solder/keymaps/default/readme.md | 1 - keyboards/grid600/press/keymaps/default/readme.md | 1 - keyboards/gvalchca/ga150/keymaps/default/readme.md | 1 - keyboards/gvalchca/spaccboard/keymaps/default/readme.md | 1 - keyboards/hadron/ver2/keymaps/default/readme.md | 2 -- keyboards/hadron/ver2/keymaps/side_numpad/readme.md | 2 -- keyboards/hadron/ver3/keymaps/default/readme.md | 2 -- keyboards/halfcliff/keymaps/default/readme.md | 1 - keyboards/halfcliff/keymaps/via/readme.md | 1 - keyboards/han60/keymaps/default/readme.md | 1 - keyboards/hand88/keymaps/default/readme.md | 3 --- keyboards/hand88/keymaps/via/readme.md | 3 --- keyboards/handwired/3dfoxc/keymaps/default/readme.md | 3 --- keyboards/handwired/3dortho14u/keymaps/default/readme.md | 1 - keyboards/handwired/aranck/keymaps/default/readme.md | 1 - keyboards/handwired/bolek/keymaps/default/readme.md | 1 - keyboards/handwired/chiron/keymaps/default/readme.md | 1 - keyboards/handwired/co60/keymaps/default/readme.md | 1 - keyboards/handwired/cyberstar/keymaps/default/readme.md | 1 - keyboards/handwired/cyberstar/keymaps/via/readme.md | 1 - keyboards/handwired/dactyl_left/keymaps/default/readme.md | 1 - keyboards/handwired/dc/mc/001/keymaps/default/readme.md | 1 - keyboards/handwired/dygma/raise/keymaps/ansi/readme.md | 1 - keyboards/handwired/dygma/raise/keymaps/default/readme.md | 1 - keyboards/handwired/dygma/raise/keymaps/iso/readme.md | 1 - keyboards/handwired/evk/v1_3/keymaps/default/readme.md | 1 - keyboards/handwired/floorboard/keymaps/default/readme.md | 1 - .../handwired/frankie_macropad/keymaps/default/readme.md | 1 - keyboards/handwired/fruity60/keymaps/default/readme.md | 1 - .../handwired/hacked_motospeed/keymaps/default/readme.md | 1 - keyboards/handwired/heisenberg/keymaps/default/readme.md | 1 - keyboards/handwired/hnah108/keymaps/default/readme.md | 1 - keyboards/handwired/hnah40/keymaps/default/readme.md | 1 - keyboards/handwired/hnah40rgb/keymaps/ansi/readme.md | 1 - keyboards/handwired/hnah40rgb/keymaps/default/readme.md | 1 - keyboards/handwired/lemonpad/keymaps/default/readme.md | 1 - keyboards/handwired/lemonpad/keymaps/via/readme.md | 1 - .../handwired/m40/5x5_macropad/keymaps/default/readme.md | 1 - keyboards/handwired/macroboard/keymaps/default/readme.md | 1 - keyboards/handwired/meck_tkl/keymaps/default/readme.md | 1 - .../handwired/ms_sculpt_mobile/keymaps/default/readme.md | 1 - keyboards/handwired/mutepad/keymaps/default/readme.md | 1 - keyboards/handwired/novem/keymaps/default/readme.md | 1 - keyboards/handwired/nozbe_macro/keymaps/default/readme.md | 1 - .../obuwunkunubi/spaget/keymaps/default/readme.md | 1 - .../handwired/oem_ansi_fullsize/keymaps/default/readme.md | 1 - keyboards/handwired/owlet60/keymaps/default/readme.md | 1 - .../handwired/owlet60/keymaps/oled_testing/readme.md | 1 - keyboards/handwired/pilcrow/keymaps/default/readme.md | 1 - .../handwired/postageboard/keymaps/default/readme.md | 1 - keyboards/handwired/prime_exl/keymaps/default/readme.md | 1 - keyboards/handwired/prime_exl/keymaps/via/readme.md | 1 - .../handwired/prime_exl_plus/keymaps/default/readme.md | 1 - keyboards/handwired/prime_exl_plus/keymaps/via/readme.md | 1 - keyboards/handwired/reclined/keymaps/default/readme.md | 1 - keyboards/handwired/riblee_f401/keymaps/default/readme.md | 1 - keyboards/handwired/rs60/keymaps/default/readme.md | 1 - keyboards/handwired/sick68/keymaps/default/readme.md | 1 - keyboards/handwired/sick68/keymaps/via/readme.md | 2 -- keyboards/handwired/slash/keymaps/default/readme.md | 1 - keyboards/handwired/snatchpad/keymaps/default/readme.md | 1 - keyboards/handwired/sono1/keymaps/default/readme.md | 1 - keyboards/handwired/steamvan/keymaps/default/readme.md | 1 - keyboards/handwired/symmetry60/keymaps/default/readme.md | 1 - keyboards/handwired/tsubasa/keymaps/default/readme.md | 2 -- .../handwired/twadlee/tp69/keymaps/default/readme.md | 1 - .../handwired/unicomp_mini_m/keymaps/default/readme.md | 1 - keyboards/handwired/videowriter/keymaps/default/readme.md | 1 - keyboards/handwired/woodpad/keymaps/default/readme.md | 1 - keyboards/hhkb_lite_2/keymaps/via/readme.md | 3 --- keyboards/hineybush/h08_ocelot/keymaps/default/readme.md | 1 - keyboards/hineybush/h08_ocelot/keymaps/via/readme.md | 1 - keyboards/hineybush/h10/keymaps/default/readme.md | 1 - keyboards/hineybush/h10/keymaps/via/readme.md | 1 - keyboards/hineybush/h60/keymaps/default/readme.md | 1 - keyboards/hineybush/h60/keymaps/kei/readme.md | 1 - keyboards/hineybush/h60/keymaps/via/readme.md | 1 - keyboards/hineybush/h65/keymaps/default/readme.md | 1 - keyboards/hineybush/h65/keymaps/via/readme.md | 1 - keyboards/hineybush/h65_hotswap/keymaps/default/readme.md | 1 - keyboards/hineybush/h65_hotswap/keymaps/via/readme.md | 1 - keyboards/hineybush/h660s/keymaps/default/readme.md | 1 - keyboards/hineybush/h660s/keymaps/via/readme.md | 1 - keyboards/hineybush/h75_singa/keymaps/default/readme.md | 1 - keyboards/hineybush/h75_singa/keymaps/via/readme.md | 1 - keyboards/hineybush/h75_singa/keymaps/wkl_std/readme.md | 1 - keyboards/hineybush/h87a/keymaps/default/readme.md | 1 - keyboards/hineybush/h87a/keymaps/via/readme.md | 1 - keyboards/hineybush/h87a/keymaps/wkl/readme.md | 1 - keyboards/hineybush/h88/keymaps/default/readme.md | 1 - keyboards/hineybush/h88/keymaps/via/readme.md | 1 - keyboards/hineybush/h88/keymaps/wkl/readme.md | 1 - keyboards/hineybush/hbcp/keymaps/default/readme.md | 2 -- keyboards/hineybush/hbcp/keymaps/hiney/readme.md | 1 - keyboards/hineybush/hbcp/keymaps/via/readme.md | 2 -- keyboards/hineybush/hbcp/keymaps/wkl/readme.md | 1 - keyboards/hineybush/hineyg80/keymaps/default/readme.md | 1 - keyboards/hineybush/hineyg80/keymaps/wkl/readme.md | 1 - keyboards/hineybush/physix/keymaps/default/readme.md | 1 - keyboards/hineybush/physix/keymaps/via/readme.md | 1 - keyboards/hineybush/sm68/keymaps/default/readme.md | 1 - keyboards/hineybush/sm68/keymaps/via/readme.md | 1 - keyboards/hnahkb/freyr/keymaps/default/readme.md | 1 - keyboards/hnahkb/stella/keymaps/default/readme.md | 1 - keyboards/hnahkb/vn66/keymaps/default/readme.md | 1 - keyboards/holyswitch/southpaw75/keymaps/default/readme.md | 1 - keyboards/horrortroll/paws60/keymaps/default/readme.md | 3 --- keyboards/horrortroll/paws60/keymaps/via/readme.md | 3 --- keyboards/ianklug/grooveboard/keymaps/default/readme.md | 1 - keyboards/ianklug/grooveboard/keymaps/via/readme.md | 1 - keyboards/ibm/model_m/teensy2/keymaps/default/readme.md | 1 - keyboards/ibm/model_m/teensypp/keymaps/default/readme.md | 1 - keyboards/ibm/model_m_4th_gen/keymaps/default/readme.md | 1 - .../model_m_ssk/teensypp_ssk/keymaps/default/readme.md | 1 - keyboards/ibnuda/alicia_cook/keymaps/default/readme.md | 1 - keyboards/ibnuda/gurindam/keymaps/default/readme.md | 1 - keyboards/idank/sweeq/keymaps/default/readme.md | 1 - keyboards/idobao/id75/keymaps/default/readme.md | 1 - keyboards/idobao/id75/keymaps/default75/readme.md | 1 - keyboards/idobao/id87/v1/keymaps/default/readme.md | 1 - keyboards/idobao/montex/v1rgb/keymaps/default/readme.md | 3 --- keyboards/idobao/montex/v1rgb/keymaps/via/readme.md | 3 --- keyboards/illuminati/is0/keymaps/default/readme.md | 3 --- keyboards/illuminati/is0/keymaps/via/readme.md | 1 - keyboards/illusion/rosa/keymaps/default/readme.md | 1 - keyboards/illusion/rosa/keymaps/split_bs_rshift/readme.md | 1 - keyboards/illusion/rosa/keymaps/split_rshift/readme.md | 1 - keyboards/illusion/rosa/keymaps/via/readme.md | 1 - keyboards/ingrained/keymaps/3x5/readme.md | 1 - keyboards/ingrained/keymaps/default/readme.md | 1 - keyboards/io_mini1800/keymaps/2x3u/readme.md | 1 - keyboards/io_mini1800/keymaps/default/readme.md | 1 - keyboards/iriskeyboards/keymaps/default/readme.md | 1 - keyboards/iriskeyboards/keymaps/via/readme.md | 1 - keyboards/j80/keymaps/default/readme.md | 1 - keyboards/j80/keymaps/default_iso/readme.md | 1 - keyboards/jacky_studio/bear_65/keymaps/default/readme.md | 1 - keyboards/jacky_studio/bear_65/keymaps/via/readme.md | 1 - keyboards/jae/j01/keymaps/default/readme.md | 1 - keyboards/jagdpietr/drakon/keymaps/default/readme.md | 1 - keyboards/jagdpietr/drakon/keymaps/wkl/readme.md | 1 - keyboards/jones/v03/keymaps/default/readme.md | 1 - keyboards/jones/v03/keymaps/default_jp/readme.md | 1 - keyboards/jones/v03_1/keymaps/default/readme.md | 1 - keyboards/jones/v03_1/keymaps/default_ansi/readme.md | 1 - keyboards/jones/v03_1/keymaps/default_jp/readme.md | 1 - keyboards/k34/keymaps/default/readme.md | 1 - keyboards/kagizaraya/chidori/keymaps/default/readme.md | 1 - keyboards/kagizaraya/chidori/keymaps/extended/readme.md | 1 - keyboards/kagizaraya/halberd/keymaps/default/readme.md | 1 - .../kagizaraya/halberd/keymaps/right_modifiers/readme.md | 2 -- keyboards/kagizaraya/scythe/keymaps/default/readme.md | 2 -- keyboards/kakunpc/angel17/keymaps/default/readme.md | 1 - keyboards/kakunpc/angel64/alpha/keymaps/default/readme.md | 1 - keyboards/kakunpc/angel64/rev1/keymaps/default/readme.md | 1 - .../kakunpc/business_card/alpha/keymaps/default/readme.md | 1 - .../kakunpc/business_card/beta/keymaps/default/readme.md | 1 - keyboards/kakunpc/choc_taro/keymaps/default/readme.md | 1 - keyboards/kakunpc/choc_taro/keymaps/via/readme.md | 3 --- .../kakunpc/rabbit_capture_plan/keymaps/default/readme.md | 1 - .../kakunpc/rabbit_capture_plan/keymaps/via/readme.md | 1 - .../kakunpc/suihankey/alpha/keymaps/default/readme.md | 1 - .../kakunpc/suihankey/rev1/keymaps/default/readme.md | 1 - .../kakunpc/suihankey/split/keymaps/default/readme.md | 1 - .../kakunpc/thedogkeyboard/keymaps/default/readme.md | 1 - keyboards/kapcave/arya/keymaps/default/readme.md | 1 - keyboards/kapcave/arya/keymaps/via/readme.md | 1 - keyboards/kapcave/gskt00/keymaps/default/readme.md | 1 - keyboards/kapcave/gskt00/keymaps/via/readme.md | 1 - keyboards/kapcave/paladinpad/keymaps/default/readme.md | 1 - keyboards/kapcave/paladinpad/keymaps/ortho/readme.md | 1 - keyboards/kbdclack/kaishi65/keymaps/default/readme.md | 1 - keyboards/kbdfans/kbd4x/keymaps/default/readme.md | 1 - keyboards/kbdfans/kbd67/hotswap/keymaps/default/readme.md | 1 - .../kbdfans/kbd67/mkii_soldered/keymaps/ansi/readme.md | 3 --- .../kbd67/mkii_soldered/keymaps/ansi_split_bs/readme.md | 3 --- .../kbdfans/kbd67/mkii_soldered/keymaps/default/readme.md | 3 --- .../kbdfans/kbd67/mkii_soldered/keymaps/iso/readme.md | 3 --- .../kbdfans/kbd67/rev2/keymaps/ansi_blocker/readme.md | 1 - .../kbd67/rev2/keymaps/ansi_blocker_splitbs/readme.md | 1 - .../kbdfans/kbd67/rev2/keymaps/ansi_split_space/readme.md | 1 - keyboards/kbdfans/kbd67/rev2/keymaps/default/readme.md | 1 - keyboards/kbdfans/kbd6x/keymaps/default/readme.md | 1 - .../kbdfans/kbd6x/keymaps/hhkb-default-improved/readme.md | 1 - keyboards/kbdfans/kbd6x/keymaps/hhkb-default/readme.md | 1 - keyboards/kbdfans/kbd8x/keymaps/default/readme.md | 3 --- .../kbdfans/kbd8x/keymaps/default_backlighting/readme.md | 3 --- keyboards/kbdfans/kbd8x_mk2/keymaps/ansi_7/readme.md | 3 --- keyboards/kbdfans/kbd8x_mk2/keymaps/default/readme.md | 4 ---- .../kbdfans/kbd8x_mk2/keymaps/default_ansi/readme.md | 3 --- keyboards/kbdfans/kbd8x_mk2/keymaps/default_iso/readme.md | 3 --- keyboards/kbdfans/kbd8x_mk2/keymaps/iso_625/readme.md | 3 --- keyboards/kbdfans/kbd8x_mk2/keymaps/iso_7/readme.md | 3 --- keyboards/kbdfans/kbd8x_mk2/keymaps/via/readme.md | 3 --- keyboards/kbdfans/kbdpad/mk2/keymaps/default/readme.md | 3 --- keyboards/kbdfans/niu_mini/keymaps/default/readme.md | 2 -- keyboards/kc60/keymaps/via/readme.md | 1 - keyboards/keebformom/keymaps/default/readme.md | 1 - keyboards/keebio/choconum/keymaps/via/readme.md | 1 - keyboards/keebio/ergodicity/keymaps/default/readme.md | 1 - keyboards/keebio/tukey/keymaps/default/readme.md | 1 - keyboards/keebwerk/nano_slider/keymaps/default/readme.md | 1 - keyboards/keebzdotnet/wazowski/keymaps/default/readme.md | 1 - keyboards/keybage/radpad/keymaps/default/readme.md | 1 - keyboards/keyhive/absinthe/keymaps/ansi/readme.md | 3 --- keyboards/keyhive/maypad/keymaps/default/readme.md | 1 - keyboards/keyprez/bison/keymaps/default/readme.md | 1 - keyboards/keyprez/bison/keymaps/default_6_6/readme.md | 1 - keyboards/keyprez/bison/keymaps/default_6_8/readme.md | 1 - keyboards/keyprez/bison/keymaps/default_8_6/readme.md | 1 - keyboards/keyprez/corgi/keymaps/default/readme.md | 1 - keyboards/keyprez/rhino/keymaps/default/readme.md | 1 - keyboards/keyprez/rhino/keymaps/default_7u/readme.md | 1 - keyboards/keyprez/rhino/keymaps/default_ergo/readme.md | 1 - keyboards/keyprez/unicorn/keymaps/default/readme.md | 1 - keyboards/keyten/aperture/keymaps/default/readme.md | 1 - keyboards/keyten/aperture/keymaps/via/readme.md | 1 - keyboards/keyten/kt3700/keymaps/default/readme.md | 1 - keyboards/keyten/kt3700/keymaps/via/readme.md | 1 - keyboards/keyten/kt60_m/keymaps/default/readme.md | 1 - keyboards/keyten/kt60_m/keymaps/via/readme.md | 1 - keyboards/kinesis/keymaps/default/readme.md | 1 - keyboards/kingly_keys/ropro/keymaps/default/readme.md | 1 - keyboards/kira/kira75/keymaps/default/readme.md | 1 - keyboards/kira/kira80/keymaps/ansi/readme.md | 1 - keyboards/kira/kira80/keymaps/ansi_wkl/readme.md | 1 - keyboards/kira/kira80/keymaps/default/readme.md | 1 - keyboards/kira/kira80/keymaps/iso/readme.md | 1 - keyboards/kira/kira80/keymaps/via/readme.md | 1 - keyboards/kiwikey/borderland/keymaps/default/readme.md | 1 - keyboards/kiwikey/borderland/keymaps/via/readme.md | 1 - keyboards/kkatano/bakeneko60/keymaps/default/readme.md | 1 - .../kkatano/bakeneko65/rev2/keymaps/default/readme.md | 1 - .../kkatano/bakeneko65/rev3/keymaps/default/readme.md | 1 - keyboards/kkatano/bakeneko80/keymaps/default/readme.md | 1 - keyboards/kkatano/wallaby/keymaps/default/readme.md | 1 - keyboards/kkatano/yurei/keymaps/default/readme.md | 1 - keyboards/knobgoblin/keymaps/via/readme.md | 3 --- keyboards/kprepublic/bm16a/v1/keymaps/default/readme.md | 1 - keyboards/kprepublic/bm16a/v1/keymaps/via/readme.md | 1 - keyboards/kprepublic/bm16s/keymaps/via/readme.md | 1 - .../kprepublic/bm40hsrgb/rev1/keymaps/default/readme.md | 1 - keyboards/kprepublic/bm40hsrgb/rev1/keymaps/via/readme.md | 1 - keyboards/kprepublic/bm43a/keymaps/default/readme.md | 1 - .../kprepublic/bm60hsrgb/rev1/keymaps/default/readme.md | 1 - keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/readme.md | 1 - .../bm60hsrgb_iso/rev1/keymaps/default/readme.md | 1 - keyboards/kprepublic/bm65hsrgb/keymaps/default/readme.md | 1 - .../kprepublic/bm65hsrgb_iso/rev1/keymaps/via/readme.md | 1 - .../kprepublic/bm68hsrgb/rev1/keymaps/default/readme.md | 1 - keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/readme.md | 1 - keyboards/kprepublic/bm80hsrgb/keymaps/default/readme.md | 1 - keyboards/kprepublic/bm80hsrgb/keymaps/via/readme.md | 1 - keyboards/kprepublic/bm980hsrgb/keymaps/default/readme.md | 1 - keyboards/kprepublic/bm980hsrgb/keymaps/via/readme.md | 1 - keyboards/ktec/daisy/keymaps/default/readme.md | 1 - keyboards/ktec/daisy/keymaps/via/readme.md | 1 - .../kumaokobo/kudox/columner/keymaps/default/readme.md | 1 - keyboards/kumaokobo/kudox/columner/keymaps/via/readme.md | 1 - keyboards/kumaokobo/kudox/rev1/keymaps/default/readme.md | 1 - keyboards/kumaokobo/kudox/rev1/keymaps/jis/readme.md | 1 - keyboards/kumaokobo/kudox/rev3/keymaps/default/readme.md | 1 - keyboards/kumaokobo/kudox/rev3/keymaps/jis/readme.md | 1 - keyboards/kumaokobo/kudox/rev3/keymaps/via/readme.md | 1 - keyboards/kumaokobo/kudox_game/keymaps/default/readme.md | 1 - keyboards/kumaokobo/kudox_game/keymaps/via/readme.md | 1 - keyboards/kv/revt/keymaps/default/readme.md | 1 - keyboards/kwub/bloop/keymaps/default/readme.md | 1 - keyboards/kwub/bloop/keymaps/via/readme.md | 1 - keyboards/labbe/labbeminiv1/keymaps/default/readme.md | 1 - keyboards/lfkeyboards/lfk78/keymaps/default/readme.md | 1 - keyboards/lfkeyboards/lfk78/keymaps/iso/readme.md | 1 - .../lfkeyboards/lfk78/keymaps/split_bs_osx/readme.md | 1 - keyboards/lfkeyboards/lfk78/keymaps/via/readme.md | 1 - keyboards/lfkeyboards/lfkpad/keymaps/default/readme.md | 1 - keyboards/lfkeyboards/lfkpad/keymaps/via/readme.md | 1 - keyboards/lm_keyboard/lm60n/keymaps/default/readme.md | 1 - keyboards/lm_keyboard/lm60n/keymaps/via/readme.md | 1 - keyboards/lz/erghost/keymaps/default/readme.md | 1 - keyboards/lz/erghost/keymaps/via/readme.md | 1 - keyboards/majistic/keymaps/default/readme.md | 1 - keyboards/makenova/omega/omega4/keymaps/default/readme.md | 1 - .../omega/omega4/keymaps/default_10u_bar/readme.md | 1 - .../omega/omega4/keymaps/default_6u_bar/readme.md | 1 - keyboards/manta60/keymaps/default/readme.md | 1 - keyboards/maple_computing/c39/keymaps/default/readme.md | 1 - .../christmas_tree/keymaps/default/readme.md | 2 -- .../maple_computing/the_ruler/keymaps/default/readme.md | 1 - keyboards/marksard/leftover30/keymaps/default/readme.md | 1 - .../marksard/rhymestone/keymaps/switch_tester/readme.md | 3 --- keyboards/marksard/treadstone32/keymaps/default/readme.md | 5 ----- .../marksard/treadstone32/keymaps/like_jis/readme.md | 5 ----- keyboards/marksard/treadstone48/keymaps/default/readme.md | 5 ----- .../marksard/treadstone48/keymaps/like_jis/readme.md | 5 ----- .../treadstone48/rev1/keymaps/like_jis_rs/readme.md | 5 ----- .../masterworks/classy_tkl/keymaps/default/readme.md | 1 - .../classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md | 1 - .../classy_tkl/keymaps/default_tkl_iso_wkl/readme.md | 1 - keyboards/maxipad/keymaps/default/readme.md | 1 - keyboards/mc_76k/keymaps/via/readme.md | 1 - keyboards/mechbrewery/mb65h/keymaps/default/readme.md | 1 - keyboards/mechbrewery/mb65s/keymaps/default/readme.md | 1 - keyboards/mechkeys/mechmini/v2/keymaps/default/readme.md | 2 -- .../mechkeys/mechmini/v2/keymaps/split_space/readme.md | 2 -- keyboards/mechkeys/mk60/keymaps/default/readme.md | 1 - keyboards/mechllama/g35/keymaps/default/readme.md | 4 ---- keyboards/mechlovin/adelais/keymaps/default/readme.md | 1 - keyboards/mechlovin/adelais/keymaps/via/readme.md | 1 - keyboards/mechlovin/delphine/keymaps/default/readme.md | 1 - keyboards/mechlovin/delphine/keymaps/via/readme.md | 1 - keyboards/mechlovin/foundation/keymaps/default/readme.md | 1 - .../mechlovin/hannah65/rev1/keymaps/default/readme.md | 1 - keyboards/mechlovin/hannah910/rev1/keymaps/ansi/readme.md | 1 - .../mechlovin/hannah910/rev1/keymaps/default/readme.md | 1 - keyboards/mechlovin/hannah910/rev1/keymaps/via/readme.md | 1 - keyboards/mechlovin/hannah910/rev3/keymaps/ansi/readme.md | 1 - .../mechlovin/hannah910/rev3/keymaps/default/readme.md | 1 - keyboards/mechlovin/hannah910/rev3/keymaps/via/readme.md | 1 - keyboards/mechlovin/hex4b/keymaps/default/readme.md | 1 - keyboards/mechlovin/hex6c/keymaps/default/readme.md | 1 - .../infinity87/rev1/rogue87/keymaps/default/readme.md | 1 - .../infinity87/rev1/rogue87/keymaps/via/readme.md | 1 - .../infinity87/rev1/rouge87/keymaps/default/readme.md | 1 - .../infinity87/rev1/rouge87/keymaps/via/readme.md | 1 - .../infinity87/rev1/standard/keymaps/default/readme.md | 1 - .../infinity87/rev1/standard/keymaps/via/readme.md | 1 - .../mechlovin/infinity87/rev2/keymaps/default/readme.md | 1 - keyboards/mechlovin/infinity87/rev2/keymaps/via/readme.md | 1 - .../infinity87/rgb_rev1/keymaps/default/readme.md | 1 - .../mechlovin/infinity87/rgb_rev1/keymaps/via/readme.md | 1 - keyboards/mechlovin/infinity875/keymaps/default/readme.md | 1 - keyboards/mechlovin/infinity875/keymaps/via/readme.md | 1 - keyboards/mechlovin/infinity88/keymaps/default/readme.md | 1 - keyboards/mechlovin/infinity88/keymaps/via/readme.md | 1 - keyboards/mechlovin/infinityce/keymaps/default/readme.md | 1 - keyboards/mechlovin/infinityce/keymaps/via/readme.md | 3 --- keyboards/mechlovin/jay60/keymaps/default/readme.md | 1 - keyboards/mechlovin/kanu/keymaps/ansi/readme.md | 1 - keyboards/mechlovin/kanu/keymaps/default/readme.md | 1 - keyboards/mechlovin/kanu/keymaps/via/readme.md | 1 - keyboards/mechlovin/kay60/keymaps/default/readme.md | 1 - keyboards/mechlovin/kay65/keymaps/default/readme.md | 1 - keyboards/mechlovin/kay65/keymaps/via/readme.md | 1 - keyboards/mechlovin/mechlovin9/keymaps/default/readme.md | 1 - keyboards/mechlovin/olly/bb/keymaps/default/readme.md | 1 - .../olly/bb/keymaps/default_ansi_split_bs/readme.md | 1 - .../olly/bb/keymaps/default_iso_split_bs/readme.md | 1 - keyboards/mechlovin/olly/bb/keymaps/via/readme.md | 1 - .../mechlovin/olly/jf/rev1/keymaps/default/readme.md | 1 - keyboards/mechlovin/pisces/keymaps/default/readme.md | 1 - keyboards/mechlovin/pisces/keymaps/via/readme.md | 1 - keyboards/mechlovin/serratus/keymaps/default/readme.md | 1 - keyboards/mechlovin/serratus/keymaps/via/readme.md | 1 - keyboards/mechlovin/th1800/keymaps/default/readme.md | 1 - keyboards/mechlovin/th1800/keymaps/via/readme.md | 2 -- keyboards/mechlovin/tmkl/keymaps/default/readme.md | 1 - keyboards/mechlovin/tmkl/keymaps/via/readme.md | 1 - keyboards/mechlovin/zed60/keymaps/default/readme.md | 1 - keyboards/mechlovin/zed60/keymaps/via/readme.md | 1 - .../mechlovin/zed65/mono_led/keymaps/default/readme.md | 1 - keyboards/mechlovin/zed65/mono_led/keymaps/via/readme.md | 1 - .../zed65/no_backlight/cor65/keymaps/default/readme.md | 1 - .../zed65/no_backlight/cor65/keymaps/via/readme.md | 1 - .../zed65/no_backlight/retro66/keymaps/default/readme.md | 1 - .../zed65/no_backlight/retro66/keymaps/via/readme.md | 1 - .../no_backlight/wearhaus66/keymaps/default/readme.md | 1 - .../zed65/no_backlight/wearhaus66/keymaps/via/readme.md | 1 - .../mechwild/mokulua/mirrored/keymaps/default/readme.md | 1 - keyboards/mechwild/mokulua/mirrored/keymaps/via/readme.md | 1 - .../mechwild/mokulua/standard/keymaps/default/readme.md | 1 - keyboards/mechwild/mokulua/standard/keymaps/via/readme.md | 1 - .../meletrix/zoom65/keymaps/65_ansi_blocker/readme.md | 1 - .../zoom65/keymaps/65_ansi_blocker_split_bs/readme.md | 1 - .../zoom65/keymaps/65_ansi_blocker_split_lshift/readme.md | 1 - .../zoom65/keymaps/65_ansi_blocker_split_space/readme.md | 1 - .../meletrix/zoom65/keymaps/65_iso_blocker/readme.md | 1 - .../zoom65/keymaps/65_iso_blocker_split_bs/readme.md | 1 - .../zoom65/keymaps/65_iso_blocker_split_space/readme.md | 1 - keyboards/meletrix/zoom65/keymaps/default/readme.md | 1 - keyboards/meletrix/zoom65/keymaps/via/readme.md | 1 - .../zoom65_lite/keymaps/65_ansi_blocker/readme.md | 1 - .../keymaps/65_ansi_blocker_split_bs/readme.md | 1 - .../keymaps/65_ansi_blocker_split_lshift/readme.md | 1 - .../keymaps/65_ansi_blocker_split_space/readme.md | 1 - .../meletrix/zoom65_lite/keymaps/65_iso_blocker/readme.md | 1 - .../zoom65_lite/keymaps/65_iso_blocker_split_bs/readme.md | 1 - .../keymaps/65_iso_blocker_split_space/readme.md | 1 - keyboards/meletrix/zoom65_lite/keymaps/default/readme.md | 1 - keyboards/meletrix/zoom65_lite/keymaps/via/readme.md | 1 - keyboards/meletrix/zoom87/keymaps/default/readme.md | 1 - .../meletrix/zoom87/keymaps/default_tkl_f13/readme.md | 1 - .../zoom87/keymaps/default_tkl_f13_split_bs/readme.md | 1 - .../zoom87/keymaps/default_tkl_f13_split_lshift/readme.md | 1 - .../zoom87/keymaps/default_tkl_f13_split_rshift/readme.md | 1 - .../zoom87/keymaps/default_tkl_f13_split_space/readme.md | 1 - keyboards/meletrix/zoom87/keymaps/via/readme.md | 1 - keyboards/meme/keymaps/default/readme.md | 1 - keyboards/meow65/keymaps/default/readme.md | 1 - keyboards/meow65/keymaps/via/readme.md | 1 - keyboards/meson/keymaps/default/readme.md | 1 - keyboards/mexsistor/ludmila/keymaps/default/readme.md | 1 - keyboards/mikeneko65/keymaps/default/readme.md | 1 - keyboards/millet/doksin/keymaps/default/readme.md | 1 - keyboards/millipad/keymaps/default/readme.md | 1 - keyboards/mint60/keymaps/default/readme.md | 1 - keyboards/miuni32/keymaps/default/readme.md | 1 - keyboards/ml/gas75/keymaps/default/readme.md | 3 --- keyboards/ml/gas75/keymaps/via/readme.md | 3 --- keyboards/molecule/keymaps/default/readme.md | 1 - keyboards/monoflex60/keymaps/default/readme.md | 1 - keyboards/monoflex60/keymaps/via/readme.md | 1 - keyboards/monokei/mnk75/keymaps/default/readme.md | 1 - keyboards/monokei/mnk75/keymaps/via/readme.md | 1 - keyboards/monstargear/xo87/rgb/keymaps/default/readme.md | 1 - .../monstargear/xo87/solderable/keymaps/default/readme.md | 1 - .../monstargear/xo87/solderable/keymaps/via/readme.md | 1 - keyboards/moon/keymaps/default/readme.md | 1 - keyboards/moon/keymaps/default_tkl_ansi/readme.md | 1 - keyboards/moon/keymaps/default_tkl_ansi_wkl/readme.md | 1 - keyboards/moon/keymaps/default_tkl_iso/readme.md | 1 - keyboards/moon/keymaps/default_tkl_iso_wkl/readme.md | 1 - keyboards/mountainblocks/mb17/keymaps/default/readme.md | 1 - keyboards/mss_studio/m63_rgb/keymaps/default/readme.md | 3 --- keyboards/mss_studio/m63_rgb/keymaps/via/readme.md | 3 --- keyboards/mss_studio/m64_rgb/keymaps/default/readme.md | 3 --- keyboards/mss_studio/m64_rgb/keymaps/via/readme.md | 3 --- keyboards/mt/mt64rgb/keymaps/default/readme.md | 3 --- keyboards/mwstudio/mw65_rgb/keymaps/thearesia/readme.md | 3 --- keyboards/mysticworks/wyvern/keymaps/default/readme.md | 3 --- keyboards/mysticworks/wyvern/keymaps/via/readme.md | 3 --- keyboards/nack/keymaps/default/readme.md | 1 - keyboards/nimrod/keymaps/default/readme.md | 3 --- keyboards/nimrod/keymaps/default_center_space/readme.md | 3 --- keyboards/nimrod/keymaps/default_left_space/readme.md | 3 --- keyboards/nimrod/keymaps/default_right_space/readme.md | 3 --- keyboards/nimrod/keymaps/default_split_space/readme.md | 3 --- keyboards/nix_studio/n60_a/keymaps/default/readme.md | 1 - keyboards/nix_studio/n60_a/keymaps/via/readme.md | 1 - keyboards/nix_studio/oxalys80/keymaps/default/readme.md | 1 - keyboards/nix_studio/oxalys80/keymaps/via/readme.md | 1 - keyboards/novelkeys/nk1/keymaps/default/readme.md | 1 - keyboards/novelkeys/nk1/keymaps/via/readme.md | 1 - keyboards/noxary/260/keymaps/default/readme.md | 1 - keyboards/noxary/vulcan/keymaps/default/readme.md | 2 -- keyboards/noxary/vulcan/keymaps/via/readme.md | 2 -- keyboards/nyhxis/nfr_70/keymaps/default/readme.md | 1 - keyboards/obosob/arch_36/keymaps/obosob/readme.md | 1 - keyboards/ogre/ergo_single/keymaps/default/readme.md | 1 - keyboards/ogre/ergo_split/keymaps/default/readme.md | 1 - keyboards/opendeck/32/keymaps/default/readme.md | 1 - keyboards/p3d/glitch/keymaps/default/readme.md | 1 - keyboards/p3d/q4z/keymaps/default/readme.md | 1 - keyboards/p3d/spacey/keymaps/default/readme.md | 1 - keyboards/p3d/tw40/keymaps/default/readme.md | 1 - keyboards/palette1202/keymaps/default/readme.md | 1 - keyboards/palette1202/keymaps/key-check/readme.md | 2 -- keyboards/panc60/keymaps/default/readme.md | 1 - .../gerald65/keymaps/default/readme.md | 1 - .../parallel_65/hotswap/keymaps/default/readme.md | 1 - .../parallel_65/soldered/keymaps/default/readme.md | 1 - keyboards/pdxkbc/keymaps/default/readme.md | 1 - keyboards/pegasus/keymaps/default/readme.md | 1 - keyboards/pegasus/keymaps/split/readme.md | 1 - keyboards/peranekofactory/tone/keymaps/default/readme.md | 2 -- keyboards/percent/booster/keymaps/default/readme.md | 1 - keyboards/percent/skog_lite/keymaps/default/readme.md | 1 - .../picolab/frusta_fundamental/keymaps/default/readme.md | 3 --- keyboards/pimentoso/touhoupad/keymaps/default/readme.md | 1 - keyboards/pisces/keymaps/default/readme.md | 1 - keyboards/pisces/keymaps/via/readme.md | 1 - .../pizzakeyboards/pizza65/keymaps/default/readme.md | 1 - keyboards/pizzakeyboards/pizza65/keymaps/via/readme.md | 1 - keyboards/planck/keymaps/default/readme.md | 2 -- keyboards/playkbtw/helen80/keymaps/default/readme.md | 3 --- keyboards/playkbtw/pk60/keymaps/default/readme.md | 3 --- keyboards/playkbtw/pk64rgb/keymaps/default/readme.md | 3 --- keyboards/ploopyco/madromys/keymaps/via/readme.md | 1 - keyboards/ploopyco/mouse/keymaps/default/readme.md | 1 - keyboards/ploopyco/trackball/keymaps/default/readme.md | 1 - .../ploopyco/trackball_nano/keymaps/default/readme.md | 1 - .../ploopyco/trackball_thumb/keymaps/default/readme.md | 1 - keyboards/plume/plume65/keymaps/default/readme.md | 1 - keyboards/plut0nium/0x3e/keymaps/default/readme.md | 1 - keyboards/polycarbdiet/s20/keymaps/default/readme.md | 1 - keyboards/portal_66/hotswap/keymaps/default/readme.md | 1 - keyboards/portal_66/soldered/keymaps/default/readme.md | 1 - keyboards/pos78/keymaps/default/readme.md | 1 - keyboards/preonic/keymaps/default/readme.md | 1 - keyboards/preonic/keymaps/via/readme.md | 1 - keyboards/primekb/prime_e/keymaps/default/readme.md | 2 -- keyboards/primekb/prime_e/keymaps/via/readme.md | 2 -- keyboards/primekb/prime_l/keymaps/default/readme.md | 1 - keyboards/primekb/prime_l/keymaps/via/readme.md | 2 -- keyboards/primekb/prime_m/keymaps/default/readme.md | 1 - keyboards/primekb/prime_m/keymaps/via/readme.md | 1 - keyboards/primekb/prime_o/keymaps/default/readme.md | 1 - keyboards/program_yoink/ortho/keymaps/default/readme.md | 1 - .../program_yoink/ortho/keymaps/ortho_split/readme.md | 1 - .../program_yoink/staggered/keymaps/default/readme.md | 1 - .../program_yoink/staggered/keymaps/split_bar/readme.md | 1 - keyboards/program_yoink/staggered/keymaps/via/readme.md | 1 - keyboards/projectcain/relic/keymaps/default/readme.md | 1 - keyboards/projectcain/vault35/keymaps/default/readme.md | 1 - keyboards/projectcain/vault45/keymaps/default/readme.md | 1 - keyboards/prototypist/allison/keymaps/via/readme.md | 1 - .../prototypist/allison_numpad/keymaps/via/readme.md | 1 - keyboards/prototypist/j01/keymaps/default/readme.md | 1 - keyboards/prototypist/j01/keymaps/via/readme.md | 1 - keyboards/psuieee/pluto12/keymaps/default/readme.md | 1 - keyboards/pteron36/keymaps/via/readme.md | 1 - keyboards/punk75/keymaps/default/readme.md | 1 - keyboards/qpockets/wanten/keymaps/default/readme.md | 1 - keyboards/quad_h/lb75/keymaps/continuous_fnrow/readme.md | 3 --- keyboards/quad_h/lb75/keymaps/default/readme.md | 3 --- keyboards/quad_h/lb75/keymaps/divided_fnrow/readme.md | 3 --- keyboards/quad_h/lb75/keymaps/via/readme.md | 3 --- keyboards/quantrik/kyuu/keymaps/default/readme.md | 1 - keyboards/quantrik/kyuu/keymaps/via/readme.md | 1 - keyboards/qvex/lynepad/keymaps/default/readme.md | 1 - keyboards/rad/keymaps/default/readme.md | 1 - keyboards/rate/pistachio_mp/keymaps/default/readme.md | 1 - keyboards/rate/pistachio_mp/keymaps/via/readme.md | 1 - keyboards/rate/pistachio_pro/keymaps/default/readme.md | 1 - keyboards/rate/pistachio_pro/keymaps/rate/readme.md | 1 - keyboards/rate/pistachio_pro/keymaps/via/readme.md | 1 - .../recompile_keys/choco60/keymaps/default/readme.md | 1 - .../recompile_keys/cocoa40/keymaps/default/readme.md | 1 - keyboards/recompile_keys/nomu30/keymaps/default/readme.md | 1 - keyboards/redox/keymaps/default/readme.md | 1 - keyboards/redox/keymaps/via/readme.md | 1 - keyboards/redscarf_iiplus/verb/keymaps/default/readme.md | 1 - keyboards/redscarf_iiplus/verc/keymaps/default/readme.md | 1 - keyboards/redscarf_iiplus/verd/keymaps/default/readme.md | 1 - keyboards/reviung/reviung33/keymaps/default/readme.md | 1 - keyboards/reviung/reviung33/keymaps/default_jp/readme.md | 1 - keyboards/reviung/reviung34/keymaps/default/readme.md | 1 - keyboards/reviung/reviung34/keymaps/default_2u/readme.md | 1 - keyboards/reviung/reviung34/keymaps/default_jp/readme.md | 1 - keyboards/reviung/reviung34/keymaps/default_rgb/readme.md | 1 - .../reviung/reviung34/keymaps/default_rgb2u/readme.md | 3 --- keyboards/reviung/reviung41/keymaps/default/readme.md | 1 - keyboards/reviung/reviung5/keymaps/default/readme.md | 1 - keyboards/reviung/reviung5/keymaps/default_lre/readme.md | 3 --- keyboards/reviung/reviung5/keymaps/default_rre/readme.md | 4 ---- keyboards/reviung/reviung53/keymaps/default/readme.md | 1 - keyboards/reviung/reviung53/keymaps/via/readme.md | 3 --- keyboards/reviung/reviung61/keymaps/default/readme.md | 1 - keyboards/reviung/reviung61/keymaps/default_rgb/readme.md | 3 --- keyboards/rmi_kb/squishyfrl/keymaps/default/readme.md | 3 --- keyboards/rmi_kb/squishytkl/keymaps/default/readme.md | 3 --- .../rominronin/katana60/rev1/keymaps/colemak/readme.md | 5 ----- .../rominronin/katana60/rev2/keymaps/default/readme.md | 1 - keyboards/rookiebwoy/late9/rev1/keymaps/default/readme.md | 3 --- keyboards/roseslite/keymaps/default/readme.md | 1 - keyboards/runes/skjoldr/keymaps/default/readme.md | 1 - .../ryanskidmore/rskeys100/keymaps/default/readme.md | 1 - keyboards/salicylic_acid3/7skb/keymaps/via/readme.md | 3 --- keyboards/sandwich/keeb68/keymaps/default/readme.md | 1 - keyboards/satt/comet46/keymaps/default-rgbled/readme.md | 3 --- keyboards/satt/comet46/keymaps/default/readme.md | 3 --- .../amber80/solder/keymaps/default/readme.md | 1 - .../sawnsprojects/amber80/solder/keymaps/via/readme.md | 1 - .../krush/krush60/solder/keymaps/60_ansi/readme.md | 3 --- .../krush/krush60/solder/keymaps/60_ansi_arrow/readme.md | 3 --- .../solder/keymaps/60_ansi_arrow_split_bs/readme.md | 4 ---- .../solder/keymaps/60_ansi_arrow_split_bs_spc/readme.md | 5 ----- .../solder/keymaps/60_ansi_arrow_split_spc/readme.md | 4 ---- .../solder/keymaps/60_ansi_arrow_tsangan/readme.md | 4 ---- .../keymaps/60_ansi_arrow_tsangan_split_bs/readme.md | 5 ----- .../krush60/solder/keymaps/60_ansi_split_bs/readme.md | 4 ---- .../krush60/solder/keymaps/60_ansi_split_bs_spc/readme.md | 5 ----- .../krush60/solder/keymaps/60_ansi_split_spc/readme.md | 4 ---- .../krush60/solder/keymaps/60_ansi_tsangan/readme.md | 4 ---- .../solder/keymaps/60_ansi_tsangan_split_bs/readme.md | 5 ----- .../solder/keymaps/60_ansi_tsangan_split_rshift/readme.md | 5 ----- .../krush60/solder/keymaps/60_isoenter_split_bs/readme.md | 5 ----- .../krush60/solder/keymaps/60_tsangan_hhkb/readme.md | 6 ------ .../krush/krush65/hotswap/keymaps/default/readme.md | 1 - .../krush/krush65/hotswap/keymaps/via/readme.md | 1 - .../krush/krush65/solder/keymaps/ansi_blocker/readme.md | 3 --- .../solder/keymaps/ansi_blocker_split_bs/readme.md | 4 ---- .../krush/krush65/solder/keymaps/default/readme.md | 5 ----- .../krush/krush65/solder/keymaps/via/readme.md | 5 ----- .../sawnsprojects/plaque80/keymaps/default/readme.md | 1 - keyboards/sawnsprojects/plaque80/keymaps/via/readme.md | 1 - .../sawnsprojects/satxri6key/keymaps/default/readme.md | 1 - .../sawnsprojects/vcl65/solder/keymaps/default/readme.md | 1 - .../sawnsprojects/vcl65/solder/keymaps/via/readme.md | 1 - keyboards/scatter42/keymaps/default/readme.md | 1 - keyboards/sck/m0116b/keymaps/default/readme.md | 1 - keyboards/sck/neiso/keymaps/default/readme.md | 1 - keyboards/sck/osa/keymaps/all/readme.md | 1 - keyboards/sck/osa/keymaps/default/readme.md | 1 - keyboards/sck/osa/keymaps/via/readme.md | 1 - keyboards/sentraq/number_pad/keymaps/default/readme.md | 1 - keyboards/sentraq/s65_plus/keymaps/iso/readme.md | 3 --- .../shandoncodes/flygone60/rev3/keymaps/default/readme.md | 1 - keyboards/shiro/keymaps/check/readme.md | 1 - keyboards/shiro/keymaps/default/readme.md | 1 - keyboards/shiro/keymaps/default_mac/readme.md | 1 - .../sidderskb/majbritt/rev1/keymaps/default/readme.md | 1 - .../sidderskb/majbritt/rev2/keymaps/default/readme.md | 1 - keyboards/singa/keymaps/default/readme.md | 1 - keyboards/singa/keymaps/test/readme.md | 1 - keyboards/slz40/keymaps/default/readme.md | 1 - keyboards/snampad/keymaps/default/readme.md | 1 - keyboards/soup10/keymaps/default/readme.md | 1 - keyboards/spaceman/pancake/rev1/keymaps/default/readme.md | 3 --- keyboards/spaceman/pancake/rev2/keymaps/default/readme.md | 3 --- keyboards/spacetime/keymaps/default/readme.md | 1 - keyboards/specskeys/keymaps/default/readme.md | 1 - keyboards/stello65/beta/keymaps/default/readme.md | 1 - keyboards/stello65/hs_rev1/keymaps/default/readme.md | 1 - keyboards/stello65/sl_rev1/keymaps/default/readme.md | 1 - keyboards/studiokestra/bourgeau/keymaps/default/readme.md | 3 --- keyboards/studiokestra/bourgeau/keymaps/via/readme.md | 3 --- keyboards/studiokestra/cascade/keymaps/default/readme.md | 3 --- .../cascade/keymaps/default_tsangan_hhkb/readme.md | 3 --- keyboards/studiokestra/cascade/keymaps/via/readme.md | 3 --- keyboards/studiokestra/nascent/keymaps/default/readme.md | 1 - keyboards/studiokestra/nascent/keymaps/via/readme.md | 1 - keyboards/studiokestra/nue/keymaps/default/readme.md | 1 - keyboards/studiokestra/nue/keymaps/via/readme.md | 1 - keyboards/superuser/ext/keymaps/default/readme.md | 1 - keyboards/superuser/ext/keymaps/via/readme.md | 1 - keyboards/superuser/frl/keymaps/default/readme.md | 1 - keyboards/superuser/frl/keymaps/via/readme.md | 1 - keyboards/superuser/tkl/keymaps/default/readme.md | 1 - keyboards/superuser/tkl/keymaps/via/readme.md | 1 - .../southpaw_fullsize/keymaps/default/readme.md | 3 --- .../southpaw_fullsize/keymaps/default_wkl/readme.md | 3 --- .../switchplate/southpaw_fullsize/keymaps/via/readme.md | 3 --- .../switchplate/switchplate910/keymaps/default/readme.md | 3 --- keyboards/sx60/keymaps/default/readme.md | 8 -------- keyboards/synthlabs/060/keymaps/via/readme.md | 5 ----- keyboards/synthlabs/solo/keymaps/default/readme.md | 3 --- keyboards/tada68/keymaps/default/readme.md | 3 --- keyboards/tada68/keymaps/via/readme.md | 3 --- keyboards/takashiski/hecomi/keymaps/default/readme.md | 1 - .../takashiski/otaku_split/rev0/keymaps/default/readme.md | 1 - .../takashiski/otaku_split/rev1/keymaps/default/readme.md | 1 - keyboards/team0110/p1800fl/keymaps/default/readme.md | 1 - keyboards/team0110/p1800fl/keymaps/via/readme.md | 1 - keyboards/tg4x/keymaps/default/readme.md | 1 - keyboards/tg4x/keymaps/via/readme.md | 1 - keyboards/tgr/jane/v2/keymaps/default/readme.md | 1 - keyboards/tgr/jane/v2ce/keymaps/default/readme.md | 1 - keyboards/tgr/tris/keymaps/default/readme.md | 1 - keyboards/the_royal/liminal/keymaps/via/readme.md | 3 --- .../thevankeyboards/bananasplit/keymaps/default/readme.md | 1 - .../thevankeyboards/caravan/keymaps/default/readme.md | 1 - .../thevankeyboards/minivan/keymaps/default/readme.md | 1 - .../thevankeyboards/roadkit/keymaps/default/readme.md | 1 - keyboards/tkw/stoutgat/v1/keymaps/default/readme.md | 1 - keyboards/tmo50/keymaps/via/readme.md | 1 - keyboards/tominabox1/adalyn/keymaps/default/readme.md | 1 - keyboards/tominabox1/le_chiffre/keymaps/default/readme.md | 1 - keyboards/tominabox1/qaz/keymaps/default/readme.md | 1 - .../tominabox1/qaz/keymaps/default_big_space/readme.md | 1 - .../underscore33/rev1/keymaps/default/readme.md | 3 --- .../underscore33/rev1/keymaps/default_big_space/readme.md | 3 --- .../tominabox1/underscore33/rev1/keymaps/via/readme.md | 1 - .../underscore33/rev2/keymaps/default/readme.md | 3 --- .../underscore33/rev2/keymaps/default_big_space/readme.md | 3 --- .../tominabox1/underscore33/rev2/keymaps/via/readme.md | 1 - keyboards/treasure/type9/keymaps/default/readme.md | 1 - keyboards/treasure/type9s2/keymaps/default/readme.md | 1 - keyboards/treasure/type9s2/keymaps/via/readme.md | 1 - keyboards/tszaboo/ortho4exent/keymaps/default/readme.md | 1 - keyboards/tweetydabird/lbs6/keymaps/default/readme.md | 3 --- .../classic_ultracl_post_2013/keymaps/default/readme.md | 1 - .../classic_ultracl_pre_2013/keymaps/default/readme.md | 1 - .../spacesaver_m_post_2013/keymaps/default/readme.md | 1 - .../spacesaver_m_pre_2013/keymaps/default/readme.md | 1 - keyboards/unikeyboard/diverge3/keymaps/iso_uk/readme.md | 1 - keyboards/utd80/keymaps/default/readme.md | 1 - keyboards/viktus/smolka/keymaps/default/readme.md | 1 - keyboards/viktus/smolka/keymaps/via/readme.md | 1 - keyboards/viktus/styrka/keymaps/all/readme.md | 1 - keyboards/viktus/styrka/keymaps/default/readme.md | 1 - keyboards/viktus/styrka/keymaps/split_bs/readme.md | 1 - keyboards/viktus/styrka/keymaps/via/readme.md | 1 - keyboards/waldo/keymaps/default/readme.md | 2 -- keyboards/waldo/keymaps/default_split_shft_bck/readme.md | 2 -- keyboards/waldo/keymaps/via/readme.md | 1 - keyboards/wekey/polaris/keymaps/default/readme.md | 3 --- keyboards/wekey/polaris/keymaps/via/readme.md | 3 --- keyboards/wekey/we27/keymaps/default/readme.md | 1 - keyboards/wekey/we27/keymaps/via/readme.md | 1 - keyboards/westfoxtrot/aanzee/keymaps/default/readme.md | 1 - .../westfoxtrot/aanzee/keymaps/iso-default/readme.md | 1 - keyboards/westfoxtrot/aanzee/keymaps/via/readme.md | 1 - keyboards/westfoxtrot/cyclops/keymaps/default/readme.md | 1 - .../westfoxtrot/cypher/rev1/keymaps/default/readme.md | 1 - .../westfoxtrot/cypher/rev1/keymaps/default_iso/readme.md | 1 - .../westfoxtrot/cypher/rev5/keymaps/default/readme.md | 1 - .../westfoxtrot/cypher/rev5/keymaps/default_iso/readme.md | 1 - keyboards/westfoxtrot/prophet/keymaps/default/readme.md | 1 - keyboards/winry/winry315/keymaps/default/readme.md | 1 - keyboards/woodkeys/meira/keymaps/default/readme.md | 1 - keyboards/woodkeys/meira/keymaps/takmiya/readme.md | 1 - .../woodkeys/scarletbandana/keymaps/default/readme.md | 1 - keyboards/work_louder/loop/keymaps/default/readme.md | 1 - keyboards/work_louder/nano/keymaps/default/readme.md | 1 - keyboards/wuque/ikki68/keymaps/default/readme.md | 1 - keyboards/wuque/ikki68/keymaps/via/readme.md | 1 - keyboards/wuque/ikki68_aurora/keymaps/68_ansi/readme.md | 1 - keyboards/wuque/ikki68_aurora/keymaps/68_iso/readme.md | 1 - .../wuque/ikki68_aurora/keymaps/68_split_bs/readme.md | 1 - .../wuque/ikki68_aurora/keymaps/68_split_lshift/readme.md | 1 - .../wuque/ikki68_aurora/keymaps/68_split_rshift/readme.md | 1 - .../wuque/ikki68_aurora/keymaps/68_split_space/readme.md | 1 - keyboards/wuque/ikki68_aurora/keymaps/default/readme.md | 1 - keyboards/wuque/ikki68_aurora/keymaps/via/readme.md | 1 - keyboards/wuque/mammoth20x/keymaps/default/readme.md | 1 - keyboards/wuque/mammoth20x/keymaps/via/readme.md | 1 - keyboards/wuque/mammoth75x/keymaps/75_ansi/readme.md | 1 - keyboards/wuque/mammoth75x/keymaps/75_split_bs/readme.md | 1 - .../wuque/mammoth75x/keymaps/75_split_lshift/readme.md | 1 - .../wuque/mammoth75x/keymaps/75_split_rshift/readme.md | 1 - .../wuque/mammoth75x/keymaps/75_split_space/readme.md | 1 - keyboards/wuque/mammoth75x/keymaps/default/readme.md | 1 - keyboards/wuque/mammoth75x/keymaps/via/readme.md | 1 - keyboards/wuque/promise87/ansi/keymaps/default/readme.md | 1 - .../ansi/keymaps/default_tkl_f13_ansi_tsangan/readme.md | 1 - .../default_tkl_f13_ansi_tsangan_split_bs/readme.md | 1 - .../readme.md | 1 - .../default_tkl_f13_ansi_tsangan_split_lshift/readme.md | 1 - .../default_tkl_f13_ansi_tsangan_split_rshift/readme.md | 1 - .../default_tkl_f13_ansi_tsangan_split_space/readme.md | 1 - .../ansi/keymaps/default_tkl_f13_iso_tsangan/readme.md | 1 - keyboards/wuque/promise87/ansi/keymaps/via/readme.md | 1 - keyboards/wuque/promise87/wkl/keymaps/default/readme.md | 1 - .../wkl/keymaps/default_tkl_f13_ansi_wkl/readme.md | 1 - .../keymaps/default_tkl_f13_ansi_wkl_split_bs/readme.md | 1 - .../default_tkl_f13_ansi_wkl_split_bs_rshift/readme.md | 1 - .../default_tkl_f13_ansi_wkl_split_lshift/readme.md | 1 - .../default_tkl_f13_ansi_wkl_split_rshift/readme.md | 1 - .../default_tkl_f13_ansi_wkl_split_space/readme.md | 1 - .../wkl/keymaps/default_tkl_f13_iso_wkl/readme.md | 1 - keyboards/wuque/promise87/wkl/keymaps/via/readme.md | 1 - keyboards/wuque/serneity65/keymaps/65_ansi/readme.md | 1 - keyboards/wuque/serneity65/keymaps/65_split_bs/readme.md | 1 - .../wuque/serneity65/keymaps/65_split_lshift/readme.md | 1 - .../wuque/serneity65/keymaps/65_split_space/readme.md | 1 - keyboards/wuque/serneity65/keymaps/default/readme.md | 1 - keyboards/wuque/serneity65/keymaps/via/readme.md | 1 - keyboards/xelus/dharma/keymaps/default/readme.md | 2 -- keyboards/xelus/dharma/keymaps/via/readme.md | 2 -- keyboards/xelus/la_plus/keymaps/default/readme.md | 2 -- keyboards/xelus/la_plus/keymaps/via/readme.md | 2 -- keyboards/xelus/pachi/mini_32u4/keymaps/default/readme.md | 2 -- keyboards/xelus/pachi/mini_32u4/keymaps/via/readme.md | 2 -- keyboards/xelus/pachi/rev1/keymaps/default/readme.md | 2 -- keyboards/xelus/pachi/rev1/keymaps/via/readme.md | 2 -- keyboards/xelus/pachi/rgb/keymaps/default/readme.md | 2 -- keyboards/xelus/pachi/rgb/keymaps/via/readme.md | 2 -- keyboards/xelus/valor/rev1/keymaps/default/readme.md | 2 -- keyboards/xelus/valor/rev1/keymaps/via/readme.md | 2 -- keyboards/xelus/valor/rev2/keymaps/default/readme.md | 2 -- keyboards/xelus/valor/rev2/keymaps/via/readme.md | 2 -- keyboards/xelus/valor_frl_tkl/keymaps/default/readme.md | 2 -- keyboards/xelus/valor_frl_tkl/keymaps/via/readme.md | 2 -- keyboards/xiudi/xd004/keymaps/default/readme.md | 7 ------- keyboards/xiudi/xd60/keymaps/via/readme.md | 1 - keyboards/xiudi/xd68/keymaps/default/readme.md | 5 ----- keyboards/xiudi/xd68/keymaps/default_iso/readme.md | 5 ----- keyboards/xiudi/xd68/keymaps/via/readme.md | 1 - keyboards/xiudi/xd75/keymaps/default/readme.md | 1 - keyboards/xiudi/xd75/keymaps/via/readme.md | 1 - keyboards/xiudi/xd84/keymaps/via/readme.md | 1 - keyboards/xiudi/xd84pro/keymaps/via/readme.md | 1 - keyboards/xiudi/xd87/keymaps/default/readme.md | 1 - keyboards/xiudi/xd87/keymaps/via/readme.md | 1 - keyboards/xiudi/xd96/keymaps/via/readme.md | 1 - keyboards/ydkb/yd68/keymaps/default/readme.md | 1 - keyboards/yiancardesigns/barleycorn/keymaps/via/readme.md | 1 - keyboards/yiancardesigns/gingham/keymaps/via/readme.md | 1 - keyboards/ymdk/ymd40/v2/keymaps/default/readme.md | 1 - keyboards/ymdk/ymd40/v2/keymaps/via/readme.md | 1 - keyboards/yncognito/batpad/keymaps/default/readme.md | 1 - .../yoichiro/lunakey_macro/keymaps/default/readme.md | 1 - keyboards/yoichiro/lunakey_macro/keymaps/via/readme.md | 1 - keyboards/zfrontier/big_switch/keymaps/default/readme.md | 1 - keyboards/zigotica/z12/keymaps/default/readme.md | 3 --- keyboards/zigotica/z34/keymaps/default/readme.md | 3 --- 1082 files changed, 1545 deletions(-) delete mode 100644 keyboards/0_sixty/keymaps/default/readme.md delete mode 100644 keyboards/0_sixty/keymaps/via/readme.md delete mode 100644 keyboards/1upkeyboards/1up60hse/keymaps/default/readme.md delete mode 100644 keyboards/1upkeyboards/1up60hse/keymaps/via/readme.md delete mode 100644 keyboards/1upkeyboards/super16/keymaps/default/readme.md delete mode 100644 keyboards/1upkeyboards/super16v2/keymaps/default/readme.md delete mode 100644 keyboards/1upkeyboards/super16v2/keymaps/via/readme.md delete mode 100644 keyboards/1upkeyboards/sweet16v2/keymaps/default/readme.md delete mode 100644 keyboards/1upkeyboards/sweet16v2/keymaps/via/readme.md delete mode 100644 keyboards/25keys/cassette42/keymaps/default/readme.md delete mode 100644 keyboards/40percentclub/25/keymaps/default/readme.md delete mode 100644 keyboards/40percentclub/4pack/keymaps/default/readme.md delete mode 100644 keyboards/40percentclub/6lit/keymaps/default/readme.md delete mode 100644 keyboards/40percentclub/foobar/keymaps/default/readme.md delete mode 100644 keyboards/40percentclub/half_n_half/keymaps/default/readme.md delete mode 100644 keyboards/40percentclub/i75/keymaps/default/readme.md delete mode 100644 keyboards/40percentclub/nori/keymaps/default/readme.md delete mode 100644 keyboards/40percentclub/sixpack/keymaps/default/readme.md delete mode 100644 keyboards/45_ats/keymaps/via/readme.md delete mode 100644 keyboards/4by3/keymaps/default/readme.md delete mode 100644 keyboards/acheron/elongate/beta/keymaps/default/readme.md delete mode 100644 keyboards/ada/ada1800mini/keymaps/default/readme.md delete mode 100644 keyboards/ada/infinity81/keymaps/default/readme.md delete mode 100644 keyboards/adpenrose/kintsugi/keymaps/default/readme.md delete mode 100644 keyboards/adpenrose/kintsugi/keymaps/via/readme.md delete mode 100644 keyboards/adpenrose/shisaku/keymaps/default/readme.md delete mode 100644 keyboards/adpenrose/shisaku/keymaps/via/readme.md delete mode 100644 keyboards/aeboards/aegis/keymaps/default/readme.md delete mode 100644 keyboards/aeboards/aegis/keymaps/via/readme.md delete mode 100755 keyboards/aeboards/constellation/keymaps/default/readme.md delete mode 100755 keyboards/aeboards/constellation/keymaps/via/readme.md delete mode 100644 keyboards/aeboards/ext65/rev1/keymaps/default/readme.md delete mode 100644 keyboards/aeboards/ext65/rev1/keymaps/via/readme.md delete mode 100644 keyboards/aeboards/ext65/rev2/keymaps/default/readme.md delete mode 100644 keyboards/aeboards/ext65/rev2/keymaps/via/readme.md delete mode 100644 keyboards/aeboards/ext65/rev3/keymaps/default/readme.md delete mode 100644 keyboards/aeboards/ext65/rev3/keymaps/via/readme.md delete mode 100644 keyboards/ai03/equinox/keymaps/default/readme.md delete mode 100644 keyboards/ai03/equinox/keymaps/via/readme.md delete mode 100644 keyboards/ai03/jp60/keymaps/default/readme.md delete mode 100644 keyboards/ai03/jp60/keymaps/via/readme.md delete mode 100644 keyboards/ai03/lunar/keymaps/default/readme.md delete mode 100644 keyboards/ai03/lunar/keymaps/via/readme.md delete mode 100644 keyboards/ai03/lunar_ii/keymaps/default/readme.md delete mode 100644 keyboards/ai03/lunar_ii/keymaps/via/readme.md delete mode 100644 keyboards/ai03/orbit/keymaps/default/readme.md delete mode 100644 keyboards/ai03/orbit_x/keymaps/default/readme.md delete mode 100644 keyboards/ai03/orbit_x/keymaps/via/readme.md delete mode 100644 keyboards/ai03/polaris/keymaps/default/readme.md delete mode 100644 keyboards/ai03/polaris/keymaps/default_ansi_tsangan/readme.md delete mode 100644 keyboards/ai03/polaris/keymaps/via/readme.md delete mode 100644 keyboards/ai03/quasar/keymaps/default/readme.md delete mode 100644 keyboards/ai03/soyuz/keymaps/1U/readme.md delete mode 100644 keyboards/ai03/soyuz/keymaps/default/readme.md delete mode 100644 keyboards/ai03/voyager60_alps/keymaps/default/readme.md delete mode 100644 keyboards/ai03/voyager60_alps/keymaps/via/readme.md delete mode 100644 keyboards/al1/keymaps/via/readme.md delete mode 100644 keyboards/alf/dc60/keymaps/default/readme.md delete mode 100644 keyboards/amjkeyboard/amj84/keymaps/default/readme.md delete mode 100644 keyboards/aos/tkl/keymaps/default/readme.md delete mode 100644 keyboards/arisu/keymaps/default/readme.md delete mode 100644 keyboards/ash1800/keymaps/default/readme.md delete mode 100644 keyboards/ask55/keymaps/default/readme.md delete mode 100644 keyboards/atlas_65/keymaps/default/readme.md delete mode 100644 keyboards/atreyu/keymaps/default/readme.md delete mode 100644 keyboards/atxkb/1894/keymaps/default/readme.md delete mode 100644 keyboards/atxkb/1894/keymaps/default_ansi_tsangan/readme.md delete mode 100644 keyboards/atxkb/1894/keymaps/via/readme.md delete mode 100644 keyboards/aves60/keymaps/default/readme.md delete mode 100644 keyboards/bandominedoni/keymaps/default/readme.md delete mode 100644 keyboards/bandominedoni/keymaps/via/readme.md delete mode 100644 keyboards/barleycorn_smd/keymaps/via/readme.md delete mode 100644 keyboards/barracuda/keymaps/default/readme.md delete mode 100644 keyboards/barracuda/keymaps/via/readme.md delete mode 100644 keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md delete mode 100644 keyboards/beatervan/keymaps/default/readme.md delete mode 100644 keyboards/beatervan/keymaps/via/readme.md delete mode 100644 keyboards/biacco42/meishi/keymaps/default/readme.md delete mode 100644 keyboards/biacco42/meishi2/keymaps/default/readme.md delete mode 100644 keyboards/binepad/bn003/keymaps/default/readme.md delete mode 100644 keyboards/blank/blank01/keymaps/default/readme.md delete mode 100644 keyboards/blank/blank01/keymaps/via/readme.md delete mode 100644 keyboards/blank_tehnologii/manibus/keymaps/default/readme.md delete mode 100644 keyboards/boardwalk/keymaps/default/readme.md delete mode 100644 keyboards/boardwalk/keymaps/default_2u_arrow/readme.md delete mode 100644 keyboards/boardwalk/keymaps/default_2x2u/readme.md delete mode 100644 keyboards/boardwalk/keymaps/default_625u_arrow/readme.md delete mode 100644 keyboards/boardwalk/keymaps/default_ortho_7u/readme.md delete mode 100644 keyboards/boardwalk/keymaps/default_ortho_hhkb/readme.md delete mode 100644 keyboards/boardwalk/keymaps/via/readme.md delete mode 100644 keyboards/bpiphany/frosty_flake/keymaps/default/readme.md delete mode 100644 keyboards/bpiphany/frosty_flake/keymaps/tkl/readme.md delete mode 100644 keyboards/bpiphany/sixshooter/keymaps/default/readme.md delete mode 100644 keyboards/bpiphany/tiger_lily/keymaps/default/readme.md delete mode 100644 keyboards/bpiphany/tiger_lily/keymaps/default_ansi/readme.md delete mode 100644 keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/readme.md delete mode 100644 keyboards/bpiphany/unloved_bastard/keymaps/default_iso/readme.md delete mode 100644 keyboards/bt66tech/bt66tech60/keymaps/default/readme.md delete mode 100644 keyboards/buildakb/potato65/keymaps/default/readme.md delete mode 100644 keyboards/buildakb/potato65/keymaps/via/readme.md delete mode 100644 keyboards/buildakb/potato65hs/keymaps/default/readme.md delete mode 100644 keyboards/buildakb/potato65hs/keymaps/via/readme.md delete mode 100644 keyboards/buildakb/potato65s/keymaps/default/readme.md delete mode 100644 keyboards/buildakb/potato65s/keymaps/via/readme.md delete mode 100644 keyboards/cablecardesigns/cypher/rev6/keymaps/default/readme.md delete mode 100644 keyboards/cablecardesigns/cypher/rev6/keymaps/default_ansi/readme.md delete mode 100644 keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/readme.md delete mode 100644 keyboards/caffeinated/serpent65/keymaps/default/readme.md delete mode 100644 keyboards/caffeinated/serpent65/keymaps/via/readme.md delete mode 100644 keyboards/cannonkeys/atlas_alps/keymaps/default/readme.md delete mode 100644 keyboards/capsunlocked/cu65/keymaps/default/readme.md delete mode 100644 keyboards/capsunlocked/cu65/keymaps/iso/readme.md delete mode 100644 keyboards/capsunlocked/cu65/keymaps/iso_split_bs/readme.md delete mode 100644 keyboards/capsunlocked/cu7/keymaps/default/readme.md delete mode 100644 keyboards/capsunlocked/cu80/v1/keymaps/default/readme.md delete mode 100644 keyboards/charue/charon/keymaps/default/readme.md delete mode 100644 keyboards/charue/charon/keymaps/via/readme.md delete mode 100644 keyboards/charue/sunsetter_r2/keymaps/default/readme.md delete mode 100644 keyboards/charue/sunsetter_r2/keymaps/via/readme.md delete mode 100644 keyboards/checkerboards/axon40/keymaps/default/readme.md delete mode 100644 keyboards/checkerboards/candybar_ortho/keymaps/default/readme.md delete mode 100644 keyboards/checkerboards/candybar_ortho/keymaps/via/readme.md delete mode 100644 keyboards/checkerboards/plexus75/keymaps/default/readme.md delete mode 100644 keyboards/checkerboards/plexus75/keymaps/default_3u/readme.md delete mode 100644 keyboards/checkerboards/plexus75/keymaps/default_7u/readme.md delete mode 100644 keyboards/checkerboards/plexus75_he/keymaps/default/readme.md delete mode 100644 keyboards/checkerboards/pursuit40/keymaps/default/readme.md delete mode 100644 keyboards/checkerboards/quark/keymaps/default/readme.md delete mode 100644 keyboards/checkerboards/quark_plus/keymaps/default/readme.md delete mode 100644 keyboards/cherrybstudio/cb1800/keymaps/default/readme.md delete mode 100644 keyboards/cherrybstudio/cb65/keymaps/default/readme.md delete mode 100644 keyboards/cherrybstudio/cb87/keymaps/default/readme.md delete mode 100644 keyboards/cherrybstudio/cb87rgb/keymaps/default/readme.md delete mode 100644 keyboards/cherrybstudio/cb87v2/keymaps/default/readme.md delete mode 100644 keyboards/chickenman/ciel/keymaps/default/readme.md delete mode 100644 keyboards/chromatonemini/keymaps/default/readme.md delete mode 100644 keyboards/chromatonemini/keymaps/via/readme.md delete mode 100755 keyboards/ckeys/handwire_101/keymaps/default/readme.md delete mode 100644 keyboards/ckeys/nakey/keymaps/default/readme.md delete mode 100644 keyboards/ckeys/obelus/keymaps/default/readme.md delete mode 100644 keyboards/ckeys/washington/keymaps/default/readme.md delete mode 100644 keyboards/clueboard/17/keymaps/default/readme.md delete mode 100644 keyboards/clueboard/2x1800/2018/keymaps/default/readme.md delete mode 100644 keyboards/clueboard/2x1800/2018/keymaps/default_4u/readme.md delete mode 100644 keyboards/clueboard/2x1800/2018/keymaps/default_7u/readme.md delete mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default/readme.md delete mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/readme.md delete mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/readme.md delete mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/readme.md delete mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/readme.md delete mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/readme.md delete mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/readme.md delete mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/readme.md delete mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/readme.md delete mode 100644 keyboards/clueboard/2x1800/2021/keymaps/default_4u/readme.md delete mode 100644 keyboards/clueboard/2x1800/2021/keymaps/default_7u/readme.md delete mode 100644 keyboards/clueboard/60/keymaps/default/readme.md delete mode 100644 keyboards/clueboard/60/keymaps/default_aek/readme.md delete mode 100644 keyboards/clueboard/california/keymaps/default/readme.md delete mode 100644 keyboards/contender/keymaps/default/readme.md delete mode 100644 keyboards/contra/keymaps/default/readme.md delete mode 100644 keyboards/contra/keymaps/via/readme.md delete mode 100644 keyboards/converter/siemens_tastatur/keymaps/default/readme.md delete mode 100755 keyboards/copenhagen_click/click_pad_v1/keymaps/default/readme.md delete mode 100644 keyboards/cozykeys/speedo/v2/keymaps/default/readme.md delete mode 100644 keyboards/craftwalk/keymaps/default/readme.md delete mode 100644 keyboards/crazy_keyboard_68/keymaps/default/readme.md delete mode 100644 keyboards/crypt_macro/keymaps/default/readme.md delete mode 100644 keyboards/crypt_macro/keymaps/via/readme.md delete mode 100644 keyboards/cutie_club/wraith/keymaps/default/readme.md delete mode 100644 keyboards/cx60/keymaps/default/readme.md delete mode 100644 keyboards/cx60/keymaps/via/readme.md delete mode 100644 keyboards/cx60/keymaps/via_caps/readme.md delete mode 100644 keyboards/dailycraft/bat43/keymaps/default/readme.md delete mode 100644 keyboards/dailycraft/bat43/keymaps/via/readme.md delete mode 100644 keyboards/dailycraft/owl8/keymaps/default/readme.md delete mode 100644 keyboards/dailycraft/owl8/keymaps/via/readme.md delete mode 100644 keyboards/dailycraft/sandbox/rev1/keymaps/default/readme.md delete mode 100644 keyboards/dailycraft/sandbox/rev1/keymaps/via/readme.md delete mode 100644 keyboards/dailycraft/sandbox/rev2/keymaps/default/readme.md delete mode 100644 keyboards/dailycraft/sandbox/rev2/keymaps/via/readme.md delete mode 100644 keyboards/dailycraft/stickey4/keymaps/default/readme.md delete mode 100644 keyboards/dailycraft/stickey4/keymaps/via/readme.md delete mode 100644 keyboards/dailycraft/wings42/rev1/keymaps/default/readme.md delete mode 100644 keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/readme.md delete mode 100644 keyboards/dailycraft/wings42/rev2/keymaps/default/readme.md delete mode 100644 keyboards/delikeeb/flatbread60/keymaps/default/readme.md delete mode 100644 keyboards/delikeeb/vaguettelite/keymaps/default/readme.md delete mode 100644 keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/readme.md delete mode 100644 keyboards/delikeeb/vanana/keymaps/default/readme.md delete mode 100644 keyboards/delikeeb/vaneela/keymaps/default/readme.md delete mode 100644 keyboards/delikeeb/vaneelaex/keymaps/default/readme.md delete mode 100644 keyboards/delikeeb/waaffle/keymaps/default/readme.md delete mode 100644 keyboards/dinofizz/fnrow/v1/keymaps/default/readme.md delete mode 100644 keyboards/dm9records/tartan/keymaps/default/readme.md delete mode 100644 keyboards/dmqdesign/spin/keymaps/default/readme.md delete mode 100644 keyboards/donutcables/budget96/keymaps/default/readme.md delete mode 100644 keyboards/doppelganger/keymaps/default/readme.md delete mode 100644 keyboards/drewkeys/iskar/keymaps/default/readme.md delete mode 100644 keyboards/drewkeys/iskar/keymaps/via/readme.md delete mode 100644 keyboards/drhigsby/bkf/keymaps/default/readme.md delete mode 100644 keyboards/drhigsby/dubba175/keymaps/default/readme.md delete mode 100644 keyboards/drhigsby/ogurec/keymaps/default/readme.md delete mode 100644 keyboards/drhigsby/packrat/keymaps/default/readme.md delete mode 100644 keyboards/drop/sense75/keymaps/default_md/readme.md delete mode 100644 keyboards/dtisaac/cg108/keymaps/default/readme.md delete mode 100644 keyboards/dtisaac/dosa40rgb/keymaps/default/readme.md delete mode 100644 keyboards/dtisaac/dtisaac01/keymaps/default/readme.md delete mode 100644 keyboards/dtisaac/dtisaac01/keymaps/via/readme.md delete mode 100644 keyboards/duck/jetfire/keymaps/default/readme.md delete mode 100644 keyboards/ducky/one2mini/keymaps/ansi/readme.md delete mode 100644 keyboards/ducky/one2mini/keymaps/default/readme.md delete mode 100644 keyboards/ducky/one2mini/keymaps/iso/readme.md delete mode 100644 keyboards/ducky/one2sf/keymaps/default/readme.md delete mode 100644 keyboards/e88/keymaps/default/readme.md delete mode 100644 keyboards/e88/keymaps/via/readme.md delete mode 100644 keyboards/ealdin/quadrant/keymaps/default/readme.md delete mode 100644 keyboards/earth_rover/keymaps/default/readme.md delete mode 100644 keyboards/eco/keymaps/default/readme.md delete mode 100644 keyboards/edc40/keymaps/default/readme.md delete mode 100644 keyboards/edc40/keymaps/via/readme.md delete mode 100644 keyboards/eek/keymaps/default/readme.md delete mode 100644 keyboards/efreet/keymaps/default/readme.md delete mode 100644 keyboards/ein_60/keymaps/ledtest/readme.md delete mode 100644 keyboards/elephant42/keymaps/default/readme.md delete mode 100644 keyboards/elephant42/keymaps/via/readme.md delete mode 100644 keyboards/emajesty/eiri/keymaps/default/readme.md delete mode 100644 keyboards/ep/40/keymaps/default/readme.md delete mode 100644 keyboards/ep/96/keymaps/default/readme.md delete mode 100644 keyboards/ericrlau/numdiscipline/keymaps/default/readme.md delete mode 100644 keyboards/eternal_keypad/keymaps/default/readme.md delete mode 100644 keyboards/evyd13/atom47/keymaps/default/readme.md delete mode 100644 keyboards/evyd13/eon40/keymaps/default/readme.md delete mode 100644 keyboards/evyd13/eon87/keymaps/default/readme.md delete mode 100644 keyboards/evyd13/gh80_1800/keymaps/default/readme.md delete mode 100644 keyboards/evyd13/gh80_3700/keymaps/default/readme.md delete mode 100644 keyboards/evyd13/gh80_3700/keymaps/rgb/readme.md delete mode 100644 keyboards/evyd13/minitomic/keymaps/default/readme.md delete mode 100644 keyboards/evyd13/mx5160/keymaps/default/readme.md delete mode 100644 keyboards/evyd13/pockettype/keymaps/default/readme.md delete mode 100644 keyboards/evyd13/solheim68/keymaps/default/readme.md delete mode 100644 keyboards/evyd13/wasdat/keymaps/default/readme.md delete mode 100644 keyboards/evyd13/wasdat/keymaps/default_iso/readme.md delete mode 100644 keyboards/evyd13/wasdat_code/keymaps/default/readme.md delete mode 100644 keyboards/evyd13/wasdat_code/keymaps/default_iso/readme.md delete mode 100644 keyboards/exclusive/e6v2/le_bmc/keymaps/default/readme.md delete mode 100644 keyboards/exclusive/e6v2/oe_bmc/keymaps/default/readme.md delete mode 100644 keyboards/flehrad/downbubble/keymaps/default/readme.md delete mode 100644 keyboards/fleuron/keymaps/default/readme.md delete mode 100644 keyboards/fluorite/keymaps/default/readme.md delete mode 100644 keyboards/flx/lodestone/keymaps/default/readme.md delete mode 100644 keyboards/flx/lodestone/keymaps/default_ansi/readme.md delete mode 100644 keyboards/flx/lodestone/keymaps/default_iso/readme.md delete mode 100644 keyboards/flx/lodestone/keymaps/via/readme.md delete mode 100644 keyboards/flx/virgo/keymaps/default/readme.md delete mode 100644 keyboards/flx/virgo/keymaps/via/readme.md delete mode 100644 keyboards/foostan/cornelius/keymaps/default/readme.md delete mode 100644 keyboards/foostan/cornelius/keymaps/via/readme.md delete mode 100644 keyboards/for_science/keymaps/default/readme.md delete mode 100644 keyboards/foxlab/leaf60/hotswap/keymaps/default/readme.md delete mode 100644 keyboards/foxlab/leaf60/universal/keymaps/default/readme.md delete mode 100644 keyboards/foxlab/time80/keymaps/default/readme.md delete mode 100644 keyboards/fractal/keymaps/default/readme.md delete mode 100644 keyboards/ft/mars80/keymaps/default/readme.md delete mode 100644 keyboards/function96/v1/keymaps/default/readme.md delete mode 100644 keyboards/function96/v2/keymaps/ansi_splitspace/readme.md delete mode 100644 keyboards/function96/v2/keymaps/default/readme.md delete mode 100644 keyboards/function96/v2/keymaps/iso/readme.md delete mode 100644 keyboards/function96/v2/keymaps/iso_splitspace/readme.md delete mode 100644 keyboards/funky40/keymaps/default/readme.md delete mode 100644 keyboards/geekboards/macropad_v2/keymaps/default/readme.md delete mode 100644 keyboards/geekboards/macropad_v2/keymaps/via/readme.md delete mode 100644 keyboards/generic_panda/panda65_01/keymaps/default/readme.md delete mode 100644 keyboards/gh60/satan/keymaps/colemak/readme.md delete mode 100644 keyboards/gh60/satan/keymaps/default/readme.md delete mode 100644 keyboards/gh60/v1p3/keymaps/default/readme.md delete mode 100644 keyboards/giabalanai/keymaps/default/readme.md delete mode 100644 keyboards/giabalanai/keymaps/default_giabarinaix2/readme.md delete mode 100644 keyboards/giabalanai/keymaps/giabarinaix2led/readme.md delete mode 100644 keyboards/giabalanai/keymaps/via/readme.md delete mode 100644 keyboards/giabalanai/keymaps/via_giabarinaix2/readme.md delete mode 100644 keyboards/gkeyboard/gkb_m16/keymaps/default/readme.md delete mode 100644 keyboards/gkeyboard/gkb_m16/keymaps/via/readme.md delete mode 100644 keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/readme.md delete mode 100644 keyboards/gmmk/gmmk2/p65/iso/keymaps/default/readme.md delete mode 100644 keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/readme.md delete mode 100644 keyboards/gmmk/gmmk2/p96/iso/keymaps/default/readme.md delete mode 100644 keyboards/gon/nerd60/keymaps/default/readme.md delete mode 100644 keyboards/gon/nerdtkl/keymaps/default/readme.md delete mode 100644 keyboards/gorthage_truck/keymaps/10u/readme.md delete mode 100644 keyboards/gorthage_truck/keymaps/7u/readme.md delete mode 100644 keyboards/gorthage_truck/keymaps/default/readme.md delete mode 100644 keyboards/gray_studio/cod67/keymaps/default/readme.md delete mode 100644 keyboards/gray_studio/space65/keymaps/default/readme.md delete mode 100644 keyboards/gray_studio/space65/keymaps/iso/readme.md delete mode 100644 keyboards/gray_studio/think65/hotswap/keymaps/default/readme.md delete mode 100644 keyboards/gray_studio/think65/solder/keymaps/default/readme.md delete mode 100644 keyboards/grid600/press/keymaps/default/readme.md delete mode 100644 keyboards/gvalchca/ga150/keymaps/default/readme.md delete mode 100644 keyboards/gvalchca/spaccboard/keymaps/default/readme.md delete mode 100644 keyboards/hadron/ver2/keymaps/default/readme.md delete mode 100644 keyboards/hadron/ver2/keymaps/side_numpad/readme.md delete mode 100644 keyboards/hadron/ver3/keymaps/default/readme.md delete mode 100644 keyboards/halfcliff/keymaps/default/readme.md delete mode 100644 keyboards/halfcliff/keymaps/via/readme.md delete mode 100644 keyboards/han60/keymaps/default/readme.md delete mode 100755 keyboards/hand88/keymaps/default/readme.md delete mode 100755 keyboards/hand88/keymaps/via/readme.md delete mode 100644 keyboards/handwired/3dfoxc/keymaps/default/readme.md delete mode 100644 keyboards/handwired/3dortho14u/keymaps/default/readme.md delete mode 100644 keyboards/handwired/aranck/keymaps/default/readme.md delete mode 100644 keyboards/handwired/bolek/keymaps/default/readme.md delete mode 100644 keyboards/handwired/chiron/keymaps/default/readme.md delete mode 100644 keyboards/handwired/co60/keymaps/default/readme.md delete mode 100644 keyboards/handwired/cyberstar/keymaps/default/readme.md delete mode 100644 keyboards/handwired/cyberstar/keymaps/via/readme.md delete mode 100644 keyboards/handwired/dactyl_left/keymaps/default/readme.md delete mode 100644 keyboards/handwired/dc/mc/001/keymaps/default/readme.md delete mode 100644 keyboards/handwired/dygma/raise/keymaps/ansi/readme.md delete mode 100644 keyboards/handwired/dygma/raise/keymaps/default/readme.md delete mode 100644 keyboards/handwired/dygma/raise/keymaps/iso/readme.md delete mode 100644 keyboards/handwired/evk/v1_3/keymaps/default/readme.md delete mode 100644 keyboards/handwired/floorboard/keymaps/default/readme.md delete mode 100644 keyboards/handwired/frankie_macropad/keymaps/default/readme.md delete mode 100644 keyboards/handwired/fruity60/keymaps/default/readme.md delete mode 100644 keyboards/handwired/hacked_motospeed/keymaps/default/readme.md delete mode 100644 keyboards/handwired/heisenberg/keymaps/default/readme.md delete mode 100644 keyboards/handwired/hnah108/keymaps/default/readme.md delete mode 100644 keyboards/handwired/hnah40/keymaps/default/readme.md delete mode 100644 keyboards/handwired/hnah40rgb/keymaps/ansi/readme.md delete mode 100644 keyboards/handwired/hnah40rgb/keymaps/default/readme.md delete mode 100644 keyboards/handwired/lemonpad/keymaps/default/readme.md delete mode 100644 keyboards/handwired/lemonpad/keymaps/via/readme.md delete mode 100644 keyboards/handwired/m40/5x5_macropad/keymaps/default/readme.md delete mode 100644 keyboards/handwired/macroboard/keymaps/default/readme.md delete mode 100644 keyboards/handwired/meck_tkl/keymaps/default/readme.md delete mode 100644 keyboards/handwired/ms_sculpt_mobile/keymaps/default/readme.md delete mode 100644 keyboards/handwired/mutepad/keymaps/default/readme.md delete mode 100644 keyboards/handwired/novem/keymaps/default/readme.md delete mode 100644 keyboards/handwired/nozbe_macro/keymaps/default/readme.md delete mode 100644 keyboards/handwired/obuwunkunubi/spaget/keymaps/default/readme.md delete mode 100644 keyboards/handwired/oem_ansi_fullsize/keymaps/default/readme.md delete mode 100644 keyboards/handwired/owlet60/keymaps/default/readme.md delete mode 100644 keyboards/handwired/owlet60/keymaps/oled_testing/readme.md delete mode 100644 keyboards/handwired/pilcrow/keymaps/default/readme.md delete mode 100644 keyboards/handwired/postageboard/keymaps/default/readme.md delete mode 100644 keyboards/handwired/prime_exl/keymaps/default/readme.md delete mode 100644 keyboards/handwired/prime_exl/keymaps/via/readme.md delete mode 100644 keyboards/handwired/prime_exl_plus/keymaps/default/readme.md delete mode 100644 keyboards/handwired/prime_exl_plus/keymaps/via/readme.md delete mode 100644 keyboards/handwired/reclined/keymaps/default/readme.md delete mode 100644 keyboards/handwired/riblee_f401/keymaps/default/readme.md delete mode 100644 keyboards/handwired/rs60/keymaps/default/readme.md delete mode 100644 keyboards/handwired/sick68/keymaps/default/readme.md delete mode 100644 keyboards/handwired/sick68/keymaps/via/readme.md delete mode 100644 keyboards/handwired/slash/keymaps/default/readme.md delete mode 100644 keyboards/handwired/snatchpad/keymaps/default/readme.md delete mode 100644 keyboards/handwired/sono1/keymaps/default/readme.md delete mode 100644 keyboards/handwired/steamvan/keymaps/default/readme.md delete mode 100644 keyboards/handwired/symmetry60/keymaps/default/readme.md delete mode 100644 keyboards/handwired/tsubasa/keymaps/default/readme.md delete mode 100644 keyboards/handwired/twadlee/tp69/keymaps/default/readme.md delete mode 100644 keyboards/handwired/unicomp_mini_m/keymaps/default/readme.md delete mode 100644 keyboards/handwired/videowriter/keymaps/default/readme.md delete mode 100644 keyboards/handwired/woodpad/keymaps/default/readme.md delete mode 100644 keyboards/hhkb_lite_2/keymaps/via/readme.md delete mode 100644 keyboards/hineybush/h08_ocelot/keymaps/default/readme.md delete mode 100644 keyboards/hineybush/h08_ocelot/keymaps/via/readme.md delete mode 100644 keyboards/hineybush/h10/keymaps/default/readme.md delete mode 100644 keyboards/hineybush/h10/keymaps/via/readme.md delete mode 100644 keyboards/hineybush/h60/keymaps/default/readme.md delete mode 100644 keyboards/hineybush/h60/keymaps/kei/readme.md delete mode 100644 keyboards/hineybush/h60/keymaps/via/readme.md delete mode 100644 keyboards/hineybush/h65/keymaps/default/readme.md delete mode 100644 keyboards/hineybush/h65/keymaps/via/readme.md delete mode 100644 keyboards/hineybush/h65_hotswap/keymaps/default/readme.md delete mode 100644 keyboards/hineybush/h65_hotswap/keymaps/via/readme.md delete mode 100644 keyboards/hineybush/h660s/keymaps/default/readme.md delete mode 100644 keyboards/hineybush/h660s/keymaps/via/readme.md delete mode 100644 keyboards/hineybush/h75_singa/keymaps/default/readme.md delete mode 100644 keyboards/hineybush/h75_singa/keymaps/via/readme.md delete mode 100644 keyboards/hineybush/h75_singa/keymaps/wkl_std/readme.md delete mode 100644 keyboards/hineybush/h87a/keymaps/default/readme.md delete mode 100644 keyboards/hineybush/h87a/keymaps/via/readme.md delete mode 100644 keyboards/hineybush/h87a/keymaps/wkl/readme.md delete mode 100644 keyboards/hineybush/h88/keymaps/default/readme.md delete mode 100644 keyboards/hineybush/h88/keymaps/via/readme.md delete mode 100644 keyboards/hineybush/h88/keymaps/wkl/readme.md delete mode 100644 keyboards/hineybush/hbcp/keymaps/default/readme.md delete mode 100644 keyboards/hineybush/hbcp/keymaps/hiney/readme.md delete mode 100644 keyboards/hineybush/hbcp/keymaps/via/readme.md delete mode 100644 keyboards/hineybush/hbcp/keymaps/wkl/readme.md delete mode 100644 keyboards/hineybush/hineyg80/keymaps/default/readme.md delete mode 100644 keyboards/hineybush/hineyg80/keymaps/wkl/readme.md delete mode 100644 keyboards/hineybush/physix/keymaps/default/readme.md delete mode 100644 keyboards/hineybush/physix/keymaps/via/readme.md delete mode 100644 keyboards/hineybush/sm68/keymaps/default/readme.md delete mode 100644 keyboards/hineybush/sm68/keymaps/via/readme.md delete mode 100644 keyboards/hnahkb/freyr/keymaps/default/readme.md delete mode 100644 keyboards/hnahkb/stella/keymaps/default/readme.md delete mode 100644 keyboards/hnahkb/vn66/keymaps/default/readme.md delete mode 100644 keyboards/holyswitch/southpaw75/keymaps/default/readme.md delete mode 100644 keyboards/horrortroll/paws60/keymaps/default/readme.md delete mode 100644 keyboards/horrortroll/paws60/keymaps/via/readme.md delete mode 100644 keyboards/ianklug/grooveboard/keymaps/default/readme.md delete mode 100644 keyboards/ianklug/grooveboard/keymaps/via/readme.md delete mode 100644 keyboards/ibm/model_m/teensy2/keymaps/default/readme.md delete mode 100644 keyboards/ibm/model_m/teensypp/keymaps/default/readme.md delete mode 100644 keyboards/ibm/model_m_4th_gen/keymaps/default/readme.md delete mode 100644 keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/default/readme.md delete mode 100644 keyboards/ibnuda/alicia_cook/keymaps/default/readme.md delete mode 100644 keyboards/ibnuda/gurindam/keymaps/default/readme.md delete mode 100644 keyboards/idank/sweeq/keymaps/default/readme.md delete mode 100644 keyboards/idobao/id75/keymaps/default/readme.md delete mode 100644 keyboards/idobao/id75/keymaps/default75/readme.md delete mode 100644 keyboards/idobao/id87/v1/keymaps/default/readme.md delete mode 100755 keyboards/idobao/montex/v1rgb/keymaps/default/readme.md delete mode 100755 keyboards/idobao/montex/v1rgb/keymaps/via/readme.md delete mode 100644 keyboards/illuminati/is0/keymaps/default/readme.md delete mode 100644 keyboards/illuminati/is0/keymaps/via/readme.md delete mode 100644 keyboards/illusion/rosa/keymaps/default/readme.md delete mode 100644 keyboards/illusion/rosa/keymaps/split_bs_rshift/readme.md delete mode 100644 keyboards/illusion/rosa/keymaps/split_rshift/readme.md delete mode 100644 keyboards/illusion/rosa/keymaps/via/readme.md delete mode 100644 keyboards/ingrained/keymaps/3x5/readme.md delete mode 100644 keyboards/ingrained/keymaps/default/readme.md delete mode 100644 keyboards/io_mini1800/keymaps/2x3u/readme.md delete mode 100644 keyboards/io_mini1800/keymaps/default/readme.md delete mode 100644 keyboards/iriskeyboards/keymaps/default/readme.md delete mode 100644 keyboards/iriskeyboards/keymaps/via/readme.md delete mode 100644 keyboards/j80/keymaps/default/readme.md delete mode 100644 keyboards/j80/keymaps/default_iso/readme.md delete mode 100644 keyboards/jacky_studio/bear_65/keymaps/default/readme.md delete mode 100644 keyboards/jacky_studio/bear_65/keymaps/via/readme.md delete mode 100644 keyboards/jae/j01/keymaps/default/readme.md delete mode 100644 keyboards/jagdpietr/drakon/keymaps/default/readme.md delete mode 100644 keyboards/jagdpietr/drakon/keymaps/wkl/readme.md delete mode 100644 keyboards/jones/v03/keymaps/default/readme.md delete mode 100644 keyboards/jones/v03/keymaps/default_jp/readme.md delete mode 100644 keyboards/jones/v03_1/keymaps/default/readme.md delete mode 100644 keyboards/jones/v03_1/keymaps/default_ansi/readme.md delete mode 100644 keyboards/jones/v03_1/keymaps/default_jp/readme.md delete mode 100644 keyboards/k34/keymaps/default/readme.md delete mode 100644 keyboards/kagizaraya/chidori/keymaps/default/readme.md delete mode 100644 keyboards/kagizaraya/chidori/keymaps/extended/readme.md delete mode 100644 keyboards/kagizaraya/halberd/keymaps/default/readme.md delete mode 100644 keyboards/kagizaraya/halberd/keymaps/right_modifiers/readme.md delete mode 100644 keyboards/kagizaraya/scythe/keymaps/default/readme.md delete mode 100644 keyboards/kakunpc/angel17/keymaps/default/readme.md delete mode 100644 keyboards/kakunpc/angel64/alpha/keymaps/default/readme.md delete mode 100644 keyboards/kakunpc/angel64/rev1/keymaps/default/readme.md delete mode 100644 keyboards/kakunpc/business_card/alpha/keymaps/default/readme.md delete mode 100644 keyboards/kakunpc/business_card/beta/keymaps/default/readme.md delete mode 100644 keyboards/kakunpc/choc_taro/keymaps/default/readme.md delete mode 100644 keyboards/kakunpc/choc_taro/keymaps/via/readme.md delete mode 100644 keyboards/kakunpc/rabbit_capture_plan/keymaps/default/readme.md delete mode 100644 keyboards/kakunpc/rabbit_capture_plan/keymaps/via/readme.md delete mode 100644 keyboards/kakunpc/suihankey/alpha/keymaps/default/readme.md delete mode 100644 keyboards/kakunpc/suihankey/rev1/keymaps/default/readme.md delete mode 100644 keyboards/kakunpc/suihankey/split/keymaps/default/readme.md delete mode 100644 keyboards/kakunpc/thedogkeyboard/keymaps/default/readme.md delete mode 100644 keyboards/kapcave/arya/keymaps/default/readme.md delete mode 100644 keyboards/kapcave/arya/keymaps/via/readme.md delete mode 100644 keyboards/kapcave/gskt00/keymaps/default/readme.md delete mode 100644 keyboards/kapcave/gskt00/keymaps/via/readme.md delete mode 100644 keyboards/kapcave/paladinpad/keymaps/default/readme.md delete mode 100644 keyboards/kapcave/paladinpad/keymaps/ortho/readme.md delete mode 100644 keyboards/kbdclack/kaishi65/keymaps/default/readme.md delete mode 100644 keyboards/kbdfans/kbd4x/keymaps/default/readme.md delete mode 100644 keyboards/kbdfans/kbd67/hotswap/keymaps/default/readme.md delete mode 100644 keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/readme.md delete mode 100644 keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/readme.md delete mode 100644 keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/readme.md delete mode 100644 keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/readme.md delete mode 100644 keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker/readme.md delete mode 100644 keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker_splitbs/readme.md delete mode 100644 keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/readme.md delete mode 100644 keyboards/kbdfans/kbd67/rev2/keymaps/default/readme.md delete mode 100644 keyboards/kbdfans/kbd6x/keymaps/default/readme.md delete mode 100644 keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/readme.md delete mode 100644 keyboards/kbdfans/kbd6x/keymaps/hhkb-default/readme.md delete mode 100644 keyboards/kbdfans/kbd8x/keymaps/default/readme.md delete mode 100644 keyboards/kbdfans/kbd8x/keymaps/default_backlighting/readme.md delete mode 100644 keyboards/kbdfans/kbd8x_mk2/keymaps/ansi_7/readme.md delete mode 100644 keyboards/kbdfans/kbd8x_mk2/keymaps/default/readme.md delete mode 100644 keyboards/kbdfans/kbd8x_mk2/keymaps/default_ansi/readme.md delete mode 100644 keyboards/kbdfans/kbd8x_mk2/keymaps/default_iso/readme.md delete mode 100644 keyboards/kbdfans/kbd8x_mk2/keymaps/iso_625/readme.md delete mode 100644 keyboards/kbdfans/kbd8x_mk2/keymaps/iso_7/readme.md delete mode 100644 keyboards/kbdfans/kbd8x_mk2/keymaps/via/readme.md delete mode 100644 keyboards/kbdfans/kbdpad/mk2/keymaps/default/readme.md delete mode 100644 keyboards/kbdfans/niu_mini/keymaps/default/readme.md delete mode 100644 keyboards/kc60/keymaps/via/readme.md delete mode 100644 keyboards/keebformom/keymaps/default/readme.md delete mode 100644 keyboards/keebio/choconum/keymaps/via/readme.md delete mode 100644 keyboards/keebio/ergodicity/keymaps/default/readme.md delete mode 100644 keyboards/keebio/tukey/keymaps/default/readme.md delete mode 100644 keyboards/keebwerk/nano_slider/keymaps/default/readme.md delete mode 100644 keyboards/keebzdotnet/wazowski/keymaps/default/readme.md delete mode 100644 keyboards/keybage/radpad/keymaps/default/readme.md delete mode 100644 keyboards/keyhive/absinthe/keymaps/ansi/readme.md delete mode 100644 keyboards/keyhive/maypad/keymaps/default/readme.md delete mode 100644 keyboards/keyprez/bison/keymaps/default/readme.md delete mode 100644 keyboards/keyprez/bison/keymaps/default_6_6/readme.md delete mode 100644 keyboards/keyprez/bison/keymaps/default_6_8/readme.md delete mode 100644 keyboards/keyprez/bison/keymaps/default_8_6/readme.md delete mode 100644 keyboards/keyprez/corgi/keymaps/default/readme.md delete mode 100644 keyboards/keyprez/rhino/keymaps/default/readme.md delete mode 100644 keyboards/keyprez/rhino/keymaps/default_7u/readme.md delete mode 100644 keyboards/keyprez/rhino/keymaps/default_ergo/readme.md delete mode 100644 keyboards/keyprez/unicorn/keymaps/default/readme.md delete mode 100644 keyboards/keyten/aperture/keymaps/default/readme.md delete mode 100644 keyboards/keyten/aperture/keymaps/via/readme.md delete mode 100644 keyboards/keyten/kt3700/keymaps/default/readme.md delete mode 100644 keyboards/keyten/kt3700/keymaps/via/readme.md delete mode 100644 keyboards/keyten/kt60_m/keymaps/default/readme.md delete mode 100644 keyboards/keyten/kt60_m/keymaps/via/readme.md delete mode 100644 keyboards/kinesis/keymaps/default/readme.md delete mode 100644 keyboards/kingly_keys/ropro/keymaps/default/readme.md delete mode 100644 keyboards/kira/kira75/keymaps/default/readme.md delete mode 100644 keyboards/kira/kira80/keymaps/ansi/readme.md delete mode 100644 keyboards/kira/kira80/keymaps/ansi_wkl/readme.md delete mode 100644 keyboards/kira/kira80/keymaps/default/readme.md delete mode 100644 keyboards/kira/kira80/keymaps/iso/readme.md delete mode 100644 keyboards/kira/kira80/keymaps/via/readme.md delete mode 100644 keyboards/kiwikey/borderland/keymaps/default/readme.md delete mode 100644 keyboards/kiwikey/borderland/keymaps/via/readme.md delete mode 100644 keyboards/kkatano/bakeneko60/keymaps/default/readme.md delete mode 100644 keyboards/kkatano/bakeneko65/rev2/keymaps/default/readme.md delete mode 100644 keyboards/kkatano/bakeneko65/rev3/keymaps/default/readme.md delete mode 100644 keyboards/kkatano/bakeneko80/keymaps/default/readme.md delete mode 100644 keyboards/kkatano/wallaby/keymaps/default/readme.md delete mode 100644 keyboards/kkatano/yurei/keymaps/default/readme.md delete mode 100644 keyboards/knobgoblin/keymaps/via/readme.md delete mode 100644 keyboards/kprepublic/bm16a/v1/keymaps/default/readme.md delete mode 100644 keyboards/kprepublic/bm16a/v1/keymaps/via/readme.md delete mode 100644 keyboards/kprepublic/bm16s/keymaps/via/readme.md delete mode 100644 keyboards/kprepublic/bm40hsrgb/rev1/keymaps/default/readme.md delete mode 100644 keyboards/kprepublic/bm40hsrgb/rev1/keymaps/via/readme.md delete mode 100644 keyboards/kprepublic/bm43a/keymaps/default/readme.md delete mode 100644 keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/readme.md delete mode 100644 keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/readme.md delete mode 100644 keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/readme.md delete mode 100644 keyboards/kprepublic/bm65hsrgb/keymaps/default/readme.md delete mode 100644 keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/readme.md delete mode 100644 keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/readme.md delete mode 100644 keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/readme.md delete mode 100644 keyboards/kprepublic/bm80hsrgb/keymaps/default/readme.md delete mode 100644 keyboards/kprepublic/bm80hsrgb/keymaps/via/readme.md delete mode 100644 keyboards/kprepublic/bm980hsrgb/keymaps/default/readme.md delete mode 100644 keyboards/kprepublic/bm980hsrgb/keymaps/via/readme.md delete mode 100644 keyboards/ktec/daisy/keymaps/default/readme.md delete mode 100644 keyboards/ktec/daisy/keymaps/via/readme.md delete mode 100644 keyboards/kumaokobo/kudox/columner/keymaps/default/readme.md delete mode 100644 keyboards/kumaokobo/kudox/columner/keymaps/via/readme.md delete mode 100644 keyboards/kumaokobo/kudox/rev1/keymaps/default/readme.md delete mode 100644 keyboards/kumaokobo/kudox/rev1/keymaps/jis/readme.md delete mode 100644 keyboards/kumaokobo/kudox/rev3/keymaps/default/readme.md delete mode 100644 keyboards/kumaokobo/kudox/rev3/keymaps/jis/readme.md delete mode 100644 keyboards/kumaokobo/kudox/rev3/keymaps/via/readme.md delete mode 100644 keyboards/kumaokobo/kudox_game/keymaps/default/readme.md delete mode 100644 keyboards/kumaokobo/kudox_game/keymaps/via/readme.md delete mode 100644 keyboards/kv/revt/keymaps/default/readme.md delete mode 100644 keyboards/kwub/bloop/keymaps/default/readme.md delete mode 100644 keyboards/kwub/bloop/keymaps/via/readme.md delete mode 100644 keyboards/labbe/labbeminiv1/keymaps/default/readme.md delete mode 100644 keyboards/lfkeyboards/lfk78/keymaps/default/readme.md delete mode 100644 keyboards/lfkeyboards/lfk78/keymaps/iso/readme.md delete mode 100644 keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/readme.md delete mode 100644 keyboards/lfkeyboards/lfk78/keymaps/via/readme.md delete mode 100644 keyboards/lfkeyboards/lfkpad/keymaps/default/readme.md delete mode 100644 keyboards/lfkeyboards/lfkpad/keymaps/via/readme.md delete mode 100644 keyboards/lm_keyboard/lm60n/keymaps/default/readme.md delete mode 100644 keyboards/lm_keyboard/lm60n/keymaps/via/readme.md delete mode 100644 keyboards/lz/erghost/keymaps/default/readme.md delete mode 100644 keyboards/lz/erghost/keymaps/via/readme.md delete mode 100644 keyboards/majistic/keymaps/default/readme.md delete mode 100644 keyboards/makenova/omega/omega4/keymaps/default/readme.md delete mode 100644 keyboards/makenova/omega/omega4/keymaps/default_10u_bar/readme.md delete mode 100644 keyboards/makenova/omega/omega4/keymaps/default_6u_bar/readme.md delete mode 100644 keyboards/manta60/keymaps/default/readme.md delete mode 100755 keyboards/maple_computing/c39/keymaps/default/readme.md delete mode 100644 keyboards/maple_computing/christmas_tree/keymaps/default/readme.md delete mode 100644 keyboards/maple_computing/the_ruler/keymaps/default/readme.md delete mode 100644 keyboards/marksard/leftover30/keymaps/default/readme.md delete mode 100644 keyboards/marksard/rhymestone/keymaps/switch_tester/readme.md delete mode 100644 keyboards/marksard/treadstone32/keymaps/default/readme.md delete mode 100644 keyboards/marksard/treadstone32/keymaps/like_jis/readme.md delete mode 100644 keyboards/marksard/treadstone48/keymaps/default/readme.md delete mode 100644 keyboards/marksard/treadstone48/keymaps/like_jis/readme.md delete mode 100644 keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme.md delete mode 100644 keyboards/masterworks/classy_tkl/keymaps/default/readme.md delete mode 100644 keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md delete mode 100644 keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/readme.md delete mode 100644 keyboards/maxipad/keymaps/default/readme.md delete mode 100644 keyboards/mc_76k/keymaps/via/readme.md delete mode 100644 keyboards/mechbrewery/mb65h/keymaps/default/readme.md delete mode 100644 keyboards/mechbrewery/mb65s/keymaps/default/readme.md delete mode 100644 keyboards/mechkeys/mechmini/v2/keymaps/default/readme.md delete mode 100644 keyboards/mechkeys/mechmini/v2/keymaps/split_space/readme.md delete mode 100644 keyboards/mechkeys/mk60/keymaps/default/readme.md delete mode 100644 keyboards/mechllama/g35/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/adelais/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/adelais/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/delphine/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/delphine/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/foundation/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/hannah65/rev1/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/hannah910/rev1/keymaps/ansi/readme.md delete mode 100644 keyboards/mechlovin/hannah910/rev1/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/hannah910/rev1/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/hannah910/rev3/keymaps/ansi/readme.md delete mode 100644 keyboards/mechlovin/hannah910/rev3/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/hannah910/rev3/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/hex4b/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/hex6c/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/infinity87/rev1/standard/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/infinity87/rev1/standard/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/infinity87/rev2/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/infinity87/rev2/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/infinity875/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/infinity875/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/infinity88/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/infinity88/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/infinityce/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/infinityce/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/jay60/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/kanu/keymaps/ansi/readme.md delete mode 100644 keyboards/mechlovin/kanu/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/kanu/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/kay60/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/kay65/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/kay65/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/mechlovin9/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/olly/bb/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/readme.md delete mode 100644 keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/readme.md delete mode 100644 keyboards/mechlovin/olly/bb/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/olly/jf/rev1/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/pisces/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/pisces/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/serratus/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/serratus/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/th1800/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/th1800/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/tmkl/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/tmkl/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/zed60/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/zed60/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/zed65/mono_led/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/zed65/mono_led/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/zed65/no_backlight/cor65/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/zed65/no_backlight/cor65/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/zed65/no_backlight/retro66/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/zed65/no_backlight/retro66/keymaps/via/readme.md delete mode 100644 keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/default/readme.md delete mode 100644 keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/readme.md delete mode 100644 keyboards/mechwild/mokulua/mirrored/keymaps/default/readme.md delete mode 100644 keyboards/mechwild/mokulua/mirrored/keymaps/via/readme.md delete mode 100644 keyboards/mechwild/mokulua/standard/keymaps/default/readme.md delete mode 100644 keyboards/mechwild/mokulua/standard/keymaps/via/readme.md delete mode 100644 keyboards/meletrix/zoom65/keymaps/65_ansi_blocker/readme.md delete mode 100644 keyboards/meletrix/zoom65/keymaps/65_ansi_blocker_split_bs/readme.md delete mode 100644 keyboards/meletrix/zoom65/keymaps/65_ansi_blocker_split_lshift/readme.md delete mode 100644 keyboards/meletrix/zoom65/keymaps/65_ansi_blocker_split_space/readme.md delete mode 100644 keyboards/meletrix/zoom65/keymaps/65_iso_blocker/readme.md delete mode 100644 keyboards/meletrix/zoom65/keymaps/65_iso_blocker_split_bs/readme.md delete mode 100644 keyboards/meletrix/zoom65/keymaps/65_iso_blocker_split_space/readme.md delete mode 100644 keyboards/meletrix/zoom65/keymaps/default/readme.md delete mode 100644 keyboards/meletrix/zoom65/keymaps/via/readme.md delete mode 100644 keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker/readme.md delete mode 100644 keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker_split_bs/readme.md delete mode 100644 keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker_split_lshift/readme.md delete mode 100644 keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker_split_space/readme.md delete mode 100644 keyboards/meletrix/zoom65_lite/keymaps/65_iso_blocker/readme.md delete mode 100644 keyboards/meletrix/zoom65_lite/keymaps/65_iso_blocker_split_bs/readme.md delete mode 100644 keyboards/meletrix/zoom65_lite/keymaps/65_iso_blocker_split_space/readme.md delete mode 100644 keyboards/meletrix/zoom65_lite/keymaps/default/readme.md delete mode 100644 keyboards/meletrix/zoom65_lite/keymaps/via/readme.md delete mode 100644 keyboards/meletrix/zoom87/keymaps/default/readme.md delete mode 100644 keyboards/meletrix/zoom87/keymaps/default_tkl_f13/readme.md delete mode 100644 keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_bs/readme.md delete mode 100644 keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_lshift/readme.md delete mode 100644 keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_rshift/readme.md delete mode 100644 keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_space/readme.md delete mode 100644 keyboards/meletrix/zoom87/keymaps/via/readme.md delete mode 100644 keyboards/meme/keymaps/default/readme.md delete mode 100644 keyboards/meow65/keymaps/default/readme.md delete mode 100644 keyboards/meow65/keymaps/via/readme.md delete mode 100644 keyboards/meson/keymaps/default/readme.md delete mode 100644 keyboards/mexsistor/ludmila/keymaps/default/readme.md delete mode 100644 keyboards/mikeneko65/keymaps/default/readme.md delete mode 100644 keyboards/millet/doksin/keymaps/default/readme.md delete mode 100644 keyboards/millipad/keymaps/default/readme.md delete mode 100644 keyboards/mint60/keymaps/default/readme.md delete mode 100644 keyboards/miuni32/keymaps/default/readme.md delete mode 100644 keyboards/ml/gas75/keymaps/default/readme.md delete mode 100644 keyboards/ml/gas75/keymaps/via/readme.md delete mode 100755 keyboards/molecule/keymaps/default/readme.md delete mode 100644 keyboards/monoflex60/keymaps/default/readme.md delete mode 100644 keyboards/monoflex60/keymaps/via/readme.md delete mode 100755 keyboards/monokei/mnk75/keymaps/default/readme.md delete mode 100755 keyboards/monokei/mnk75/keymaps/via/readme.md delete mode 100644 keyboards/monstargear/xo87/rgb/keymaps/default/readme.md delete mode 100644 keyboards/monstargear/xo87/solderable/keymaps/default/readme.md delete mode 100644 keyboards/monstargear/xo87/solderable/keymaps/via/readme.md delete mode 100644 keyboards/moon/keymaps/default/readme.md delete mode 100644 keyboards/moon/keymaps/default_tkl_ansi/readme.md delete mode 100644 keyboards/moon/keymaps/default_tkl_ansi_wkl/readme.md delete mode 100644 keyboards/moon/keymaps/default_tkl_iso/readme.md delete mode 100644 keyboards/moon/keymaps/default_tkl_iso_wkl/readme.md delete mode 100644 keyboards/mountainblocks/mb17/keymaps/default/readme.md delete mode 100644 keyboards/mss_studio/m63_rgb/keymaps/default/readme.md delete mode 100644 keyboards/mss_studio/m63_rgb/keymaps/via/readme.md delete mode 100644 keyboards/mss_studio/m64_rgb/keymaps/default/readme.md delete mode 100644 keyboards/mss_studio/m64_rgb/keymaps/via/readme.md delete mode 100644 keyboards/mt/mt64rgb/keymaps/default/readme.md delete mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/thearesia/readme.md delete mode 100644 keyboards/mysticworks/wyvern/keymaps/default/readme.md delete mode 100644 keyboards/mysticworks/wyvern/keymaps/via/readme.md delete mode 100644 keyboards/nack/keymaps/default/readme.md delete mode 100644 keyboards/nimrod/keymaps/default/readme.md delete mode 100644 keyboards/nimrod/keymaps/default_center_space/readme.md delete mode 100644 keyboards/nimrod/keymaps/default_left_space/readme.md delete mode 100644 keyboards/nimrod/keymaps/default_right_space/readme.md delete mode 100644 keyboards/nimrod/keymaps/default_split_space/readme.md delete mode 100644 keyboards/nix_studio/n60_a/keymaps/default/readme.md delete mode 100644 keyboards/nix_studio/n60_a/keymaps/via/readme.md delete mode 100644 keyboards/nix_studio/oxalys80/keymaps/default/readme.md delete mode 100644 keyboards/nix_studio/oxalys80/keymaps/via/readme.md delete mode 100644 keyboards/novelkeys/nk1/keymaps/default/readme.md delete mode 100644 keyboards/novelkeys/nk1/keymaps/via/readme.md delete mode 100644 keyboards/noxary/260/keymaps/default/readme.md delete mode 100644 keyboards/noxary/vulcan/keymaps/default/readme.md delete mode 100644 keyboards/noxary/vulcan/keymaps/via/readme.md delete mode 100644 keyboards/nyhxis/nfr_70/keymaps/default/readme.md delete mode 100644 keyboards/obosob/arch_36/keymaps/obosob/readme.md delete mode 100644 keyboards/ogre/ergo_single/keymaps/default/readme.md delete mode 100644 keyboards/ogre/ergo_split/keymaps/default/readme.md delete mode 100644 keyboards/opendeck/32/keymaps/default/readme.md delete mode 100644 keyboards/p3d/glitch/keymaps/default/readme.md delete mode 100644 keyboards/p3d/q4z/keymaps/default/readme.md delete mode 100644 keyboards/p3d/spacey/keymaps/default/readme.md delete mode 100644 keyboards/p3d/tw40/keymaps/default/readme.md delete mode 100644 keyboards/palette1202/keymaps/default/readme.md delete mode 100644 keyboards/palette1202/keymaps/key-check/readme.md delete mode 100644 keyboards/panc60/keymaps/default/readme.md delete mode 100644 keyboards/papercranekeyboards/gerald65/keymaps/default/readme.md delete mode 100644 keyboards/parallel/parallel_65/hotswap/keymaps/default/readme.md delete mode 100644 keyboards/parallel/parallel_65/soldered/keymaps/default/readme.md delete mode 100644 keyboards/pdxkbc/keymaps/default/readme.md delete mode 100644 keyboards/pegasus/keymaps/default/readme.md delete mode 100644 keyboards/pegasus/keymaps/split/readme.md delete mode 100644 keyboards/peranekofactory/tone/keymaps/default/readme.md delete mode 100644 keyboards/percent/booster/keymaps/default/readme.md delete mode 100644 keyboards/percent/skog_lite/keymaps/default/readme.md delete mode 100644 keyboards/picolab/frusta_fundamental/keymaps/default/readme.md delete mode 100644 keyboards/pimentoso/touhoupad/keymaps/default/readme.md delete mode 100644 keyboards/pisces/keymaps/default/readme.md delete mode 100644 keyboards/pisces/keymaps/via/readme.md delete mode 100644 keyboards/pizzakeyboards/pizza65/keymaps/default/readme.md delete mode 100644 keyboards/pizzakeyboards/pizza65/keymaps/via/readme.md delete mode 100644 keyboards/planck/keymaps/default/readme.md delete mode 100644 keyboards/playkbtw/helen80/keymaps/default/readme.md delete mode 100644 keyboards/playkbtw/pk60/keymaps/default/readme.md delete mode 100644 keyboards/playkbtw/pk64rgb/keymaps/default/readme.md delete mode 100644 keyboards/ploopyco/madromys/keymaps/via/readme.md delete mode 100644 keyboards/ploopyco/mouse/keymaps/default/readme.md delete mode 100644 keyboards/ploopyco/trackball/keymaps/default/readme.md delete mode 100644 keyboards/ploopyco/trackball_nano/keymaps/default/readme.md delete mode 100644 keyboards/ploopyco/trackball_thumb/keymaps/default/readme.md delete mode 100644 keyboards/plume/plume65/keymaps/default/readme.md delete mode 100644 keyboards/plut0nium/0x3e/keymaps/default/readme.md delete mode 100644 keyboards/polycarbdiet/s20/keymaps/default/readme.md delete mode 100644 keyboards/portal_66/hotswap/keymaps/default/readme.md delete mode 100644 keyboards/portal_66/soldered/keymaps/default/readme.md delete mode 100644 keyboards/pos78/keymaps/default/readme.md delete mode 100644 keyboards/preonic/keymaps/default/readme.md delete mode 100644 keyboards/preonic/keymaps/via/readme.md delete mode 100644 keyboards/primekb/prime_e/keymaps/default/readme.md delete mode 100644 keyboards/primekb/prime_e/keymaps/via/readme.md delete mode 100644 keyboards/primekb/prime_l/keymaps/default/readme.md delete mode 100644 keyboards/primekb/prime_l/keymaps/via/readme.md delete mode 100644 keyboards/primekb/prime_m/keymaps/default/readme.md delete mode 100644 keyboards/primekb/prime_m/keymaps/via/readme.md delete mode 100644 keyboards/primekb/prime_o/keymaps/default/readme.md delete mode 100644 keyboards/program_yoink/ortho/keymaps/default/readme.md delete mode 100644 keyboards/program_yoink/ortho/keymaps/ortho_split/readme.md delete mode 100644 keyboards/program_yoink/staggered/keymaps/default/readme.md delete mode 100644 keyboards/program_yoink/staggered/keymaps/split_bar/readme.md delete mode 100644 keyboards/program_yoink/staggered/keymaps/via/readme.md delete mode 100644 keyboards/projectcain/relic/keymaps/default/readme.md delete mode 100644 keyboards/projectcain/vault35/keymaps/default/readme.md delete mode 100644 keyboards/projectcain/vault45/keymaps/default/readme.md delete mode 100644 keyboards/prototypist/allison/keymaps/via/readme.md delete mode 100644 keyboards/prototypist/allison_numpad/keymaps/via/readme.md delete mode 100644 keyboards/prototypist/j01/keymaps/default/readme.md delete mode 100644 keyboards/prototypist/j01/keymaps/via/readme.md delete mode 100644 keyboards/psuieee/pluto12/keymaps/default/readme.md delete mode 100644 keyboards/pteron36/keymaps/via/readme.md delete mode 100644 keyboards/punk75/keymaps/default/readme.md delete mode 100644 keyboards/qpockets/wanten/keymaps/default/readme.md delete mode 100644 keyboards/quad_h/lb75/keymaps/continuous_fnrow/readme.md delete mode 100644 keyboards/quad_h/lb75/keymaps/default/readme.md delete mode 100644 keyboards/quad_h/lb75/keymaps/divided_fnrow/readme.md delete mode 100644 keyboards/quad_h/lb75/keymaps/via/readme.md delete mode 100644 keyboards/quantrik/kyuu/keymaps/default/readme.md delete mode 100755 keyboards/quantrik/kyuu/keymaps/via/readme.md delete mode 100644 keyboards/qvex/lynepad/keymaps/default/readme.md delete mode 100644 keyboards/rad/keymaps/default/readme.md delete mode 100644 keyboards/rate/pistachio_mp/keymaps/default/readme.md delete mode 100644 keyboards/rate/pistachio_mp/keymaps/via/readme.md delete mode 100644 keyboards/rate/pistachio_pro/keymaps/default/readme.md delete mode 100644 keyboards/rate/pistachio_pro/keymaps/rate/readme.md delete mode 100644 keyboards/rate/pistachio_pro/keymaps/via/readme.md delete mode 100644 keyboards/recompile_keys/choco60/keymaps/default/readme.md delete mode 100644 keyboards/recompile_keys/cocoa40/keymaps/default/readme.md delete mode 100644 keyboards/recompile_keys/nomu30/keymaps/default/readme.md delete mode 100644 keyboards/redox/keymaps/default/readme.md delete mode 100644 keyboards/redox/keymaps/via/readme.md delete mode 100755 keyboards/redscarf_iiplus/verb/keymaps/default/readme.md delete mode 100755 keyboards/redscarf_iiplus/verc/keymaps/default/readme.md delete mode 100644 keyboards/redscarf_iiplus/verd/keymaps/default/readme.md delete mode 100644 keyboards/reviung/reviung33/keymaps/default/readme.md delete mode 100644 keyboards/reviung/reviung33/keymaps/default_jp/readme.md delete mode 100755 keyboards/reviung/reviung34/keymaps/default/readme.md delete mode 100755 keyboards/reviung/reviung34/keymaps/default_2u/readme.md delete mode 100755 keyboards/reviung/reviung34/keymaps/default_jp/readme.md delete mode 100755 keyboards/reviung/reviung34/keymaps/default_rgb/readme.md delete mode 100755 keyboards/reviung/reviung34/keymaps/default_rgb2u/readme.md delete mode 100644 keyboards/reviung/reviung41/keymaps/default/readme.md delete mode 100644 keyboards/reviung/reviung5/keymaps/default/readme.md delete mode 100644 keyboards/reviung/reviung5/keymaps/default_lre/readme.md delete mode 100644 keyboards/reviung/reviung5/keymaps/default_rre/readme.md delete mode 100644 keyboards/reviung/reviung53/keymaps/default/readme.md delete mode 100644 keyboards/reviung/reviung53/keymaps/via/readme.md delete mode 100644 keyboards/reviung/reviung61/keymaps/default/readme.md delete mode 100644 keyboards/reviung/reviung61/keymaps/default_rgb/readme.md delete mode 100644 keyboards/rmi_kb/squishyfrl/keymaps/default/readme.md delete mode 100644 keyboards/rmi_kb/squishytkl/keymaps/default/readme.md delete mode 100644 keyboards/rominronin/katana60/rev1/keymaps/colemak/readme.md delete mode 100644 keyboards/rominronin/katana60/rev2/keymaps/default/readme.md delete mode 100644 keyboards/rookiebwoy/late9/rev1/keymaps/default/readme.md delete mode 100644 keyboards/roseslite/keymaps/default/readme.md delete mode 100644 keyboards/runes/skjoldr/keymaps/default/readme.md delete mode 100644 keyboards/ryanskidmore/rskeys100/keymaps/default/readme.md delete mode 100644 keyboards/salicylic_acid3/7skb/keymaps/via/readme.md delete mode 100644 keyboards/sandwich/keeb68/keymaps/default/readme.md delete mode 100644 keyboards/satt/comet46/keymaps/default-rgbled/readme.md delete mode 100644 keyboards/satt/comet46/keymaps/default/readme.md delete mode 100644 keyboards/sawnsprojects/amber80/solder/keymaps/default/readme.md delete mode 100644 keyboards/sawnsprojects/amber80/solder/keymaps/via/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/default/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/readme.md delete mode 100644 keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/readme.md delete mode 100644 keyboards/sawnsprojects/plaque80/keymaps/default/readme.md delete mode 100644 keyboards/sawnsprojects/plaque80/keymaps/via/readme.md delete mode 100644 keyboards/sawnsprojects/satxri6key/keymaps/default/readme.md delete mode 100644 keyboards/sawnsprojects/vcl65/solder/keymaps/default/readme.md delete mode 100644 keyboards/sawnsprojects/vcl65/solder/keymaps/via/readme.md delete mode 100644 keyboards/scatter42/keymaps/default/readme.md delete mode 100644 keyboards/sck/m0116b/keymaps/default/readme.md delete mode 100644 keyboards/sck/neiso/keymaps/default/readme.md delete mode 100644 keyboards/sck/osa/keymaps/all/readme.md delete mode 100644 keyboards/sck/osa/keymaps/default/readme.md delete mode 100644 keyboards/sck/osa/keymaps/via/readme.md delete mode 100644 keyboards/sentraq/number_pad/keymaps/default/readme.md delete mode 100644 keyboards/sentraq/s65_plus/keymaps/iso/readme.md delete mode 100644 keyboards/shandoncodes/flygone60/rev3/keymaps/default/readme.md delete mode 100644 keyboards/shiro/keymaps/check/readme.md delete mode 100644 keyboards/shiro/keymaps/default/readme.md delete mode 100644 keyboards/shiro/keymaps/default_mac/readme.md delete mode 100644 keyboards/sidderskb/majbritt/rev1/keymaps/default/readme.md delete mode 100644 keyboards/sidderskb/majbritt/rev2/keymaps/default/readme.md delete mode 100644 keyboards/singa/keymaps/default/readme.md delete mode 100644 keyboards/singa/keymaps/test/readme.md delete mode 100644 keyboards/slz40/keymaps/default/readme.md delete mode 100644 keyboards/snampad/keymaps/default/readme.md delete mode 100644 keyboards/soup10/keymaps/default/readme.md delete mode 100644 keyboards/spaceman/pancake/rev1/keymaps/default/readme.md delete mode 100644 keyboards/spaceman/pancake/rev2/keymaps/default/readme.md delete mode 100644 keyboards/spacetime/keymaps/default/readme.md delete mode 100644 keyboards/specskeys/keymaps/default/readme.md delete mode 100644 keyboards/stello65/beta/keymaps/default/readme.md delete mode 100644 keyboards/stello65/hs_rev1/keymaps/default/readme.md delete mode 100644 keyboards/stello65/sl_rev1/keymaps/default/readme.md delete mode 100644 keyboards/studiokestra/bourgeau/keymaps/default/readme.md delete mode 100644 keyboards/studiokestra/bourgeau/keymaps/via/readme.md delete mode 100644 keyboards/studiokestra/cascade/keymaps/default/readme.md delete mode 100644 keyboards/studiokestra/cascade/keymaps/default_tsangan_hhkb/readme.md delete mode 100644 keyboards/studiokestra/cascade/keymaps/via/readme.md delete mode 100644 keyboards/studiokestra/nascent/keymaps/default/readme.md delete mode 100644 keyboards/studiokestra/nascent/keymaps/via/readme.md delete mode 100644 keyboards/studiokestra/nue/keymaps/default/readme.md delete mode 100644 keyboards/studiokestra/nue/keymaps/via/readme.md delete mode 100644 keyboards/superuser/ext/keymaps/default/readme.md delete mode 100644 keyboards/superuser/ext/keymaps/via/readme.md delete mode 100644 keyboards/superuser/frl/keymaps/default/readme.md delete mode 100644 keyboards/superuser/frl/keymaps/via/readme.md delete mode 100644 keyboards/superuser/tkl/keymaps/default/readme.md delete mode 100644 keyboards/superuser/tkl/keymaps/via/readme.md delete mode 100644 keyboards/switchplate/southpaw_fullsize/keymaps/default/readme.md delete mode 100644 keyboards/switchplate/southpaw_fullsize/keymaps/default_wkl/readme.md delete mode 100644 keyboards/switchplate/southpaw_fullsize/keymaps/via/readme.md delete mode 100644 keyboards/switchplate/switchplate910/keymaps/default/readme.md delete mode 100644 keyboards/sx60/keymaps/default/readme.md delete mode 100644 keyboards/synthlabs/060/keymaps/via/readme.md delete mode 100644 keyboards/synthlabs/solo/keymaps/default/readme.md delete mode 100755 keyboards/tada68/keymaps/default/readme.md delete mode 100755 keyboards/tada68/keymaps/via/readme.md delete mode 100644 keyboards/takashiski/hecomi/keymaps/default/readme.md delete mode 100644 keyboards/takashiski/otaku_split/rev0/keymaps/default/readme.md delete mode 100644 keyboards/takashiski/otaku_split/rev1/keymaps/default/readme.md delete mode 100644 keyboards/team0110/p1800fl/keymaps/default/readme.md delete mode 100644 keyboards/team0110/p1800fl/keymaps/via/readme.md delete mode 100644 keyboards/tg4x/keymaps/default/readme.md delete mode 100644 keyboards/tg4x/keymaps/via/readme.md delete mode 100644 keyboards/tgr/jane/v2/keymaps/default/readme.md delete mode 100644 keyboards/tgr/jane/v2ce/keymaps/default/readme.md delete mode 100644 keyboards/tgr/tris/keymaps/default/readme.md delete mode 100644 keyboards/the_royal/liminal/keymaps/via/readme.md delete mode 100644 keyboards/thevankeyboards/bananasplit/keymaps/default/readme.md delete mode 100644 keyboards/thevankeyboards/caravan/keymaps/default/readme.md delete mode 100644 keyboards/thevankeyboards/minivan/keymaps/default/readme.md delete mode 100644 keyboards/thevankeyboards/roadkit/keymaps/default/readme.md delete mode 100644 keyboards/tkw/stoutgat/v1/keymaps/default/readme.md delete mode 100644 keyboards/tmo50/keymaps/via/readme.md delete mode 100644 keyboards/tominabox1/adalyn/keymaps/default/readme.md delete mode 100644 keyboards/tominabox1/le_chiffre/keymaps/default/readme.md delete mode 100644 keyboards/tominabox1/qaz/keymaps/default/readme.md delete mode 100644 keyboards/tominabox1/qaz/keymaps/default_big_space/readme.md delete mode 100644 keyboards/tominabox1/underscore33/rev1/keymaps/default/readme.md delete mode 100644 keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/readme.md delete mode 100644 keyboards/tominabox1/underscore33/rev1/keymaps/via/readme.md delete mode 100644 keyboards/tominabox1/underscore33/rev2/keymaps/default/readme.md delete mode 100644 keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/readme.md delete mode 100644 keyboards/tominabox1/underscore33/rev2/keymaps/via/readme.md delete mode 100644 keyboards/treasure/type9/keymaps/default/readme.md delete mode 100644 keyboards/treasure/type9s2/keymaps/default/readme.md delete mode 100644 keyboards/treasure/type9s2/keymaps/via/readme.md delete mode 100644 keyboards/tszaboo/ortho4exent/keymaps/default/readme.md delete mode 100644 keyboards/tweetydabird/lbs6/keymaps/default/readme.md delete mode 100644 keyboards/unicomp/classic_ultracl_post_2013/keymaps/default/readme.md delete mode 100644 keyboards/unicomp/classic_ultracl_pre_2013/keymaps/default/readme.md delete mode 100644 keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/readme.md delete mode 100644 keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/readme.md delete mode 100755 keyboards/unikeyboard/diverge3/keymaps/iso_uk/readme.md delete mode 100644 keyboards/utd80/keymaps/default/readme.md delete mode 100644 keyboards/viktus/smolka/keymaps/default/readme.md delete mode 100644 keyboards/viktus/smolka/keymaps/via/readme.md delete mode 100644 keyboards/viktus/styrka/keymaps/all/readme.md delete mode 100644 keyboards/viktus/styrka/keymaps/default/readme.md delete mode 100644 keyboards/viktus/styrka/keymaps/split_bs/readme.md delete mode 100644 keyboards/viktus/styrka/keymaps/via/readme.md delete mode 100644 keyboards/waldo/keymaps/default/readme.md delete mode 100644 keyboards/waldo/keymaps/default_split_shft_bck/readme.md delete mode 100644 keyboards/waldo/keymaps/via/readme.md delete mode 100644 keyboards/wekey/polaris/keymaps/default/readme.md delete mode 100644 keyboards/wekey/polaris/keymaps/via/readme.md delete mode 100644 keyboards/wekey/we27/keymaps/default/readme.md delete mode 100644 keyboards/wekey/we27/keymaps/via/readme.md delete mode 100644 keyboards/westfoxtrot/aanzee/keymaps/default/readme.md delete mode 100644 keyboards/westfoxtrot/aanzee/keymaps/iso-default/readme.md delete mode 100644 keyboards/westfoxtrot/aanzee/keymaps/via/readme.md delete mode 100644 keyboards/westfoxtrot/cyclops/keymaps/default/readme.md delete mode 100644 keyboards/westfoxtrot/cypher/rev1/keymaps/default/readme.md delete mode 100644 keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/readme.md delete mode 100644 keyboards/westfoxtrot/cypher/rev5/keymaps/default/readme.md delete mode 100644 keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/readme.md delete mode 100644 keyboards/westfoxtrot/prophet/keymaps/default/readme.md delete mode 100644 keyboards/winry/winry315/keymaps/default/readme.md delete mode 100644 keyboards/woodkeys/meira/keymaps/default/readme.md delete mode 100644 keyboards/woodkeys/meira/keymaps/takmiya/readme.md delete mode 100644 keyboards/woodkeys/scarletbandana/keymaps/default/readme.md delete mode 100644 keyboards/work_louder/loop/keymaps/default/readme.md delete mode 100644 keyboards/work_louder/nano/keymaps/default/readme.md delete mode 100644 keyboards/wuque/ikki68/keymaps/default/readme.md delete mode 100644 keyboards/wuque/ikki68/keymaps/via/readme.md delete mode 100644 keyboards/wuque/ikki68_aurora/keymaps/68_ansi/readme.md delete mode 100644 keyboards/wuque/ikki68_aurora/keymaps/68_iso/readme.md delete mode 100644 keyboards/wuque/ikki68_aurora/keymaps/68_split_bs/readme.md delete mode 100644 keyboards/wuque/ikki68_aurora/keymaps/68_split_lshift/readme.md delete mode 100644 keyboards/wuque/ikki68_aurora/keymaps/68_split_rshift/readme.md delete mode 100644 keyboards/wuque/ikki68_aurora/keymaps/68_split_space/readme.md delete mode 100644 keyboards/wuque/ikki68_aurora/keymaps/default/readme.md delete mode 100644 keyboards/wuque/ikki68_aurora/keymaps/via/readme.md delete mode 100644 keyboards/wuque/mammoth20x/keymaps/default/readme.md delete mode 100644 keyboards/wuque/mammoth20x/keymaps/via/readme.md delete mode 100644 keyboards/wuque/mammoth75x/keymaps/75_ansi/readme.md delete mode 100644 keyboards/wuque/mammoth75x/keymaps/75_split_bs/readme.md delete mode 100644 keyboards/wuque/mammoth75x/keymaps/75_split_lshift/readme.md delete mode 100644 keyboards/wuque/mammoth75x/keymaps/75_split_rshift/readme.md delete mode 100644 keyboards/wuque/mammoth75x/keymaps/75_split_space/readme.md delete mode 100644 keyboards/wuque/mammoth75x/keymaps/default/readme.md delete mode 100644 keyboards/wuque/mammoth75x/keymaps/via/readme.md delete mode 100644 keyboards/wuque/promise87/ansi/keymaps/default/readme.md delete mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan/readme.md delete mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs/readme.md delete mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs_rshift/readme.md delete mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_lshift/readme.md delete mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_rshift/readme.md delete mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_space/readme.md delete mode 100644 keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_iso_tsangan/readme.md delete mode 100644 keyboards/wuque/promise87/ansi/keymaps/via/readme.md delete mode 100644 keyboards/wuque/promise87/wkl/keymaps/default/readme.md delete mode 100644 keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl/readme.md delete mode 100644 keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs/readme.md delete mode 100644 keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs_rshift/readme.md delete mode 100644 keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_lshift/readme.md delete mode 100644 keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_rshift/readme.md delete mode 100644 keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_space/readme.md delete mode 100644 keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_iso_wkl/readme.md delete mode 100644 keyboards/wuque/promise87/wkl/keymaps/via/readme.md delete mode 100644 keyboards/wuque/serneity65/keymaps/65_ansi/readme.md delete mode 100644 keyboards/wuque/serneity65/keymaps/65_split_bs/readme.md delete mode 100644 keyboards/wuque/serneity65/keymaps/65_split_lshift/readme.md delete mode 100644 keyboards/wuque/serneity65/keymaps/65_split_space/readme.md delete mode 100644 keyboards/wuque/serneity65/keymaps/default/readme.md delete mode 100644 keyboards/wuque/serneity65/keymaps/via/readme.md delete mode 100644 keyboards/xelus/dharma/keymaps/default/readme.md delete mode 100644 keyboards/xelus/dharma/keymaps/via/readme.md delete mode 100755 keyboards/xelus/la_plus/keymaps/default/readme.md delete mode 100755 keyboards/xelus/la_plus/keymaps/via/readme.md delete mode 100644 keyboards/xelus/pachi/mini_32u4/keymaps/default/readme.md delete mode 100644 keyboards/xelus/pachi/mini_32u4/keymaps/via/readme.md delete mode 100644 keyboards/xelus/pachi/rev1/keymaps/default/readme.md delete mode 100644 keyboards/xelus/pachi/rev1/keymaps/via/readme.md delete mode 100644 keyboards/xelus/pachi/rgb/keymaps/default/readme.md delete mode 100644 keyboards/xelus/pachi/rgb/keymaps/via/readme.md delete mode 100644 keyboards/xelus/valor/rev1/keymaps/default/readme.md delete mode 100644 keyboards/xelus/valor/rev1/keymaps/via/readme.md delete mode 100644 keyboards/xelus/valor/rev2/keymaps/default/readme.md delete mode 100644 keyboards/xelus/valor/rev2/keymaps/via/readme.md delete mode 100644 keyboards/xelus/valor_frl_tkl/keymaps/default/readme.md delete mode 100644 keyboards/xelus/valor_frl_tkl/keymaps/via/readme.md delete mode 100644 keyboards/xiudi/xd004/keymaps/default/readme.md delete mode 100644 keyboards/xiudi/xd60/keymaps/via/readme.md delete mode 100644 keyboards/xiudi/xd68/keymaps/default/readme.md delete mode 100644 keyboards/xiudi/xd68/keymaps/default_iso/readme.md delete mode 100644 keyboards/xiudi/xd68/keymaps/via/readme.md delete mode 100644 keyboards/xiudi/xd75/keymaps/default/readme.md delete mode 100644 keyboards/xiudi/xd75/keymaps/via/readme.md delete mode 100644 keyboards/xiudi/xd84/keymaps/via/readme.md delete mode 100644 keyboards/xiudi/xd84pro/keymaps/via/readme.md delete mode 100644 keyboards/xiudi/xd87/keymaps/default/readme.md delete mode 100644 keyboards/xiudi/xd87/keymaps/via/readme.md delete mode 100644 keyboards/xiudi/xd96/keymaps/via/readme.md delete mode 100644 keyboards/ydkb/yd68/keymaps/default/readme.md delete mode 100644 keyboards/yiancardesigns/barleycorn/keymaps/via/readme.md delete mode 100644 keyboards/yiancardesigns/gingham/keymaps/via/readme.md delete mode 100644 keyboards/ymdk/ymd40/v2/keymaps/default/readme.md delete mode 100644 keyboards/ymdk/ymd40/v2/keymaps/via/readme.md delete mode 100644 keyboards/yncognito/batpad/keymaps/default/readme.md delete mode 100644 keyboards/yoichiro/lunakey_macro/keymaps/default/readme.md delete mode 100644 keyboards/yoichiro/lunakey_macro/keymaps/via/readme.md delete mode 100644 keyboards/zfrontier/big_switch/keymaps/default/readme.md delete mode 100644 keyboards/zigotica/z12/keymaps/default/readme.md delete mode 100644 keyboards/zigotica/z34/keymaps/default/readme.md diff --git a/keyboards/0_sixty/keymaps/default/readme.md b/keyboards/0_sixty/keymaps/default/readme.md deleted file mode 100644 index 8922bb9eed5..00000000000 --- a/keyboards/0_sixty/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default 0-Sixty layout - largely based on the Preonic's and Planck's \ No newline at end of file diff --git a/keyboards/0_sixty/keymaps/via/readme.md b/keyboards/0_sixty/keymaps/via/readme.md deleted file mode 100644 index 106c6d79512..00000000000 --- a/keyboards/0_sixty/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default via-supported 0-Sixty layout - largely based on the Preonic's and Planck's \ No newline at end of file diff --git a/keyboards/1upkeyboards/1up60hse/keymaps/default/readme.md b/keyboards/1upkeyboards/1up60hse/keymaps/default/readme.md deleted file mode 100644 index a7041f37b2a..00000000000 --- a/keyboards/1upkeyboards/1up60hse/keymaps/default/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# 1up60hse default keymap generated by QMK Configurator - -This is the keymap used by [QMK Configurator](https://config.qmk.fm/#/1upkeyboards/1up60hse/LAYOUT_60_ansi) as default. - diff --git a/keyboards/1upkeyboards/1up60hse/keymaps/via/readme.md b/keyboards/1upkeyboards/1up60hse/keymaps/via/readme.md deleted file mode 100644 index 3eca320761a..00000000000 --- a/keyboards/1upkeyboards/1up60hse/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# 1up60hse via keymap diff --git a/keyboards/1upkeyboards/super16/keymaps/default/readme.md b/keyboards/1upkeyboards/super16/keymaps/default/readme.md deleted file mode 100644 index 814f15c005a..00000000000 --- a/keyboards/1upkeyboards/super16/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for super16 diff --git a/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md deleted file mode 100644 index e229fcba740..00000000000 --- a/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Super 16 V2 diff --git a/keyboards/1upkeyboards/super16v2/keymaps/via/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/via/readme.md deleted file mode 100644 index e229fcba740..00000000000 --- a/keyboards/1upkeyboards/super16v2/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Super 16 V2 diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/default/readme.md b/keyboards/1upkeyboards/sweet16v2/keymaps/default/readme.md deleted file mode 100644 index fcf8c872348..00000000000 --- a/keyboards/1upkeyboards/sweet16v2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Sweet 16 V2 diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/via/readme.md b/keyboards/1upkeyboards/sweet16v2/keymaps/via/readme.md deleted file mode 100644 index b0fba0bdd91..00000000000 --- a/keyboards/1upkeyboards/sweet16v2/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for via on the Sweet 16 V2 diff --git a/keyboards/25keys/cassette42/keymaps/default/readme.md b/keyboards/25keys/cassette42/keymaps/default/readme.md deleted file mode 100644 index cf1a7bc4335..00000000000 --- a/keyboards/25keys/cassette42/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for cassette42 \ No newline at end of file diff --git a/keyboards/40percentclub/25/keymaps/default/readme.md b/keyboards/40percentclub/25/keymaps/default/readme.md deleted file mode 100644 index 7558c42ec50..00000000000 --- a/keyboards/40percentclub/25/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default split keymap for 25 diff --git a/keyboards/40percentclub/4pack/keymaps/default/readme.md b/keyboards/40percentclub/4pack/keymaps/default/readme.md deleted file mode 100644 index 00bf43cb990..00000000000 --- a/keyboards/40percentclub/4pack/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 4pack diff --git a/keyboards/40percentclub/6lit/keymaps/default/readme.md b/keyboards/40percentclub/6lit/keymaps/default/readme.md deleted file mode 100644 index b3acc3f58a9..00000000000 --- a/keyboards/40percentclub/6lit/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default split keymap for 6lit diff --git a/keyboards/40percentclub/foobar/keymaps/default/readme.md b/keyboards/40percentclub/foobar/keymaps/default/readme.md deleted file mode 100644 index 7113469e7ec..00000000000 --- a/keyboards/40percentclub/foobar/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default split keymap for foobar diff --git a/keyboards/40percentclub/half_n_half/keymaps/default/readme.md b/keyboards/40percentclub/half_n_half/keymaps/default/readme.md deleted file mode 100644 index 58a457f1bc8..00000000000 --- a/keyboards/40percentclub/half_n_half/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for half_n_half \ No newline at end of file diff --git a/keyboards/40percentclub/i75/keymaps/default/readme.md b/keyboards/40percentclub/i75/keymaps/default/readme.md deleted file mode 100644 index 4d054181fb6..00000000000 --- a/keyboards/40percentclub/i75/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for i75 diff --git a/keyboards/40percentclub/nori/keymaps/default/readme.md b/keyboards/40percentclub/nori/keymaps/default/readme.md deleted file mode 100644 index 4a55a35e4be..00000000000 --- a/keyboards/40percentclub/nori/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap diff --git a/keyboards/40percentclub/sixpack/keymaps/default/readme.md b/keyboards/40percentclub/sixpack/keymaps/default/readme.md deleted file mode 100644 index 178cae10103..00000000000 --- a/keyboards/40percentclub/sixpack/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Six Pack diff --git a/keyboards/45_ats/keymaps/via/readme.md b/keyboards/45_ats/keymaps/via/readme.md deleted file mode 100644 index 702a497dd86..00000000000 --- a/keyboards/45_ats/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# 45-ATS VIA Firmware - -This keymap is to enable the use of VIA on the 45-ATS Keyboard. diff --git a/keyboards/4by3/keymaps/default/readme.md b/keyboards/4by3/keymaps/default/readme.md deleted file mode 100644 index 281dfd5463f..00000000000 --- a/keyboards/4by3/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default 4by3 keymap - -![The default 4by3 keymap](https://i.imgur.com/E4OlQAs.png) diff --git a/keyboards/acheron/elongate/beta/keymaps/default/readme.md b/keyboards/acheron/elongate/beta/keymaps/default/readme.md deleted file mode 100644 index a154ac59155..00000000000 --- a/keyboards/acheron/elongate/beta/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Elongate diff --git a/keyboards/ada/ada1800mini/keymaps/default/readme.md b/keyboards/ada/ada1800mini/keymaps/default/readme.md deleted file mode 100644 index 366b3134fde..00000000000 --- a/keyboards/ada/ada1800mini/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for ada1800mini diff --git a/keyboards/ada/infinity81/keymaps/default/readme.md b/keyboards/ada/infinity81/keymaps/default/readme.md deleted file mode 100644 index 1b6598c1df6..00000000000 --- a/keyboards/ada/infinity81/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for infinity81 diff --git a/keyboards/adpenrose/kintsugi/keymaps/default/readme.md b/keyboards/adpenrose/kintsugi/keymaps/default/readme.md deleted file mode 100644 index 83bc48086db..00000000000 --- a/keyboards/adpenrose/kintsugi/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Kintsugi diff --git a/keyboards/adpenrose/kintsugi/keymaps/via/readme.md b/keyboards/adpenrose/kintsugi/keymaps/via/readme.md deleted file mode 100644 index afdea1ca5b9..00000000000 --- a/keyboards/adpenrose/kintsugi/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# VIA keymap for Kintsugi diff --git a/keyboards/adpenrose/shisaku/keymaps/default/readme.md b/keyboards/adpenrose/shisaku/keymaps/default/readme.md deleted file mode 100644 index 6f49aff82ea..00000000000 --- a/keyboards/adpenrose/shisaku/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Shisaku \ No newline at end of file diff --git a/keyboards/adpenrose/shisaku/keymaps/via/readme.md b/keyboards/adpenrose/shisaku/keymaps/via/readme.md deleted file mode 100644 index f7d4f74fdbe..00000000000 --- a/keyboards/adpenrose/shisaku/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# VIA keymap for Shisaku \ No newline at end of file diff --git a/keyboards/aeboards/aegis/keymaps/default/readme.md b/keyboards/aeboards/aegis/keymaps/default/readme.md deleted file mode 100644 index e6b24245634..00000000000 --- a/keyboards/aeboards/aegis/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Aegis Layout - diff --git a/keyboards/aeboards/aegis/keymaps/via/readme.md b/keyboards/aeboards/aegis/keymaps/via/readme.md deleted file mode 100644 index a80671bd943..00000000000 --- a/keyboards/aeboards/aegis/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA Aegis Layout - diff --git a/keyboards/aeboards/constellation/keymaps/default/readme.md b/keyboards/aeboards/constellation/keymaps/default/readme.md deleted file mode 100755 index e5e100d873f..00000000000 --- a/keyboards/aeboards/constellation/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Constellation Layout - diff --git a/keyboards/aeboards/constellation/keymaps/via/readme.md b/keyboards/aeboards/constellation/keymaps/via/readme.md deleted file mode 100755 index ce1a7d691ca..00000000000 --- a/keyboards/aeboards/constellation/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA Constellation Layout - diff --git a/keyboards/aeboards/ext65/rev1/keymaps/default/readme.md b/keyboards/aeboards/ext65/rev1/keymaps/default/readme.md deleted file mode 100644 index 3a3bb66d679..00000000000 --- a/keyboards/aeboards/ext65/rev1/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Ext65Rev2 Layout - diff --git a/keyboards/aeboards/ext65/rev1/keymaps/via/readme.md b/keyboards/aeboards/ext65/rev1/keymaps/via/readme.md deleted file mode 100644 index 4be6efb9e7e..00000000000 --- a/keyboards/aeboards/ext65/rev1/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA Ext65Rev2 Layout - diff --git a/keyboards/aeboards/ext65/rev2/keymaps/default/readme.md b/keyboards/aeboards/ext65/rev2/keymaps/default/readme.md deleted file mode 100644 index 3a3bb66d679..00000000000 --- a/keyboards/aeboards/ext65/rev2/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Ext65Rev2 Layout - diff --git a/keyboards/aeboards/ext65/rev2/keymaps/via/readme.md b/keyboards/aeboards/ext65/rev2/keymaps/via/readme.md deleted file mode 100644 index 4be6efb9e7e..00000000000 --- a/keyboards/aeboards/ext65/rev2/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA Ext65Rev2 Layout - diff --git a/keyboards/aeboards/ext65/rev3/keymaps/default/readme.md b/keyboards/aeboards/ext65/rev3/keymaps/default/readme.md deleted file mode 100644 index 301a72857a7..00000000000 --- a/keyboards/aeboards/ext65/rev3/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Ext65 Rev3 Layout - diff --git a/keyboards/aeboards/ext65/rev3/keymaps/via/readme.md b/keyboards/aeboards/ext65/rev3/keymaps/via/readme.md deleted file mode 100644 index 3cb1d92b95f..00000000000 --- a/keyboards/aeboards/ext65/rev3/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA Ext65 Rev3 Layout - diff --git a/keyboards/ai03/equinox/keymaps/default/readme.md b/keyboards/ai03/equinox/keymaps/default/readme.md deleted file mode 100644 index 9a8bd56a30a..00000000000 --- a/keyboards/ai03/equinox/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for equinox - -Basic, nothing special \ No newline at end of file diff --git a/keyboards/ai03/equinox/keymaps/via/readme.md b/keyboards/ai03/equinox/keymaps/via/readme.md deleted file mode 100644 index c2892a3ad53..00000000000 --- a/keyboards/ai03/equinox/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The via keymap for equinox - -The basic keymap with full support for VIA Configurator diff --git a/keyboards/ai03/jp60/keymaps/default/readme.md b/keyboards/ai03/jp60/keymaps/default/readme.md deleted file mode 100644 index a240bd90527..00000000000 --- a/keyboards/ai03/jp60/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for JP60 - -Configured for JIS input. \ No newline at end of file diff --git a/keyboards/ai03/jp60/keymaps/via/readme.md b/keyboards/ai03/jp60/keymaps/via/readme.md deleted file mode 100644 index f6e9c3d8c61..00000000000 --- a/keyboards/ai03/jp60/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The via keymap for JP60 - -For use with VIA configurator and compatible keymap editors. \ No newline at end of file diff --git a/keyboards/ai03/lunar/keymaps/default/readme.md b/keyboards/ai03/lunar/keymaps/default/readme.md deleted file mode 100644 index 8ff536ffc1e..00000000000 --- a/keyboards/ai03/lunar/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The default keymap for Lunar -For use without VIA configurator. \ No newline at end of file diff --git a/keyboards/ai03/lunar/keymaps/via/readme.md b/keyboards/ai03/lunar/keymaps/via/readme.md deleted file mode 100644 index ff0b73bfcee..00000000000 --- a/keyboards/ai03/lunar/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA keymap for Lunar -This keymap is for compatibility with the VIA configurator. \ No newline at end of file diff --git a/keyboards/ai03/lunar_ii/keymaps/default/readme.md b/keyboards/ai03/lunar_ii/keymaps/default/readme.md deleted file mode 100644 index a956904f1ce..00000000000 --- a/keyboards/ai03/lunar_ii/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The default keymap for lunar_ii -Nothing special \ No newline at end of file diff --git a/keyboards/ai03/lunar_ii/keymaps/via/readme.md b/keyboards/ai03/lunar_ii/keymaps/via/readme.md deleted file mode 100644 index 942e11ff4a0..00000000000 --- a/keyboards/ai03/lunar_ii/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The via keymap for lunar_ii -Enables via support; for use with via configurator diff --git a/keyboards/ai03/orbit/keymaps/default/readme.md b/keyboards/ai03/orbit/keymaps/default/readme.md deleted file mode 100644 index 63c528abfa5..00000000000 --- a/keyboards/ai03/orbit/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for Orbit - -[KLE of layout](http://www.keyboard-layout-editor.com/#/gists/53ebf59524de12515cb7e2e6de94f0d6) \ No newline at end of file diff --git a/keyboards/ai03/orbit_x/keymaps/default/readme.md b/keyboards/ai03/orbit_x/keymaps/default/readme.md deleted file mode 100644 index b106c969e14..00000000000 --- a/keyboards/ai03/orbit_x/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for orbit_x - -Basic keymap that works well in most cases. \ No newline at end of file diff --git a/keyboards/ai03/orbit_x/keymaps/via/readme.md b/keyboards/ai03/orbit_x/keymaps/via/readme.md deleted file mode 100644 index ec31b557d44..00000000000 --- a/keyboards/ai03/orbit_x/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The via keymap for orbit_x -For use with VIA configurator only diff --git a/keyboards/ai03/polaris/keymaps/default/readme.md b/keyboards/ai03/polaris/keymaps/default/readme.md deleted file mode 100644 index ec7f3154a4f..00000000000 --- a/keyboards/ai03/polaris/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for Polaris - -Fits just about everything on two layers. \ No newline at end of file diff --git a/keyboards/ai03/polaris/keymaps/default_ansi_tsangan/readme.md b/keyboards/ai03/polaris/keymaps/default_ansi_tsangan/readme.md deleted file mode 100644 index a6a85dd525f..00000000000 --- a/keyboards/ai03/polaris/keymaps/default_ansi_tsangan/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default_ansi_tsangan keymap for Polaris - -Simplified down to the basic ANSI Tsangan layouts for ease of configuration. \ No newline at end of file diff --git a/keyboards/ai03/polaris/keymaps/via/readme.md b/keyboards/ai03/polaris/keymaps/via/readme.md deleted file mode 100644 index 6e4d2c7446c..00000000000 --- a/keyboards/ai03/polaris/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The via keymap for Polaris - -For via configurator use \ No newline at end of file diff --git a/keyboards/ai03/quasar/keymaps/default/readme.md b/keyboards/ai03/quasar/keymaps/default/readme.md deleted file mode 100644 index bcfeda1ad1b..00000000000 --- a/keyboards/ai03/quasar/keymaps/default/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# The default keymap for Quasar - -Caps lock behaves as Fn/Layer. Press caps+esc for reset, caps+tab for caps lock. -The rest is basic WKL TKL. \ No newline at end of file diff --git a/keyboards/ai03/soyuz/keymaps/1U/readme.md b/keyboards/ai03/soyuz/keymaps/1U/readme.md deleted file mode 100644 index f030f8c68dd..00000000000 --- a/keyboards/ai03/soyuz/keymaps/1U/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The 1U keymap for Soyuz - -A keymap that uses 1U keys everywhere for a 20-key numpad. \ No newline at end of file diff --git a/keyboards/ai03/soyuz/keymaps/default/readme.md b/keyboards/ai03/soyuz/keymaps/default/readme.md deleted file mode 100644 index f4954e8b33b..00000000000 --- a/keyboards/ai03/soyuz/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for Soyuz - -A very basic keymap for a "typical" numpad layout using 2U keys wherever applicable. \ No newline at end of file diff --git a/keyboards/ai03/voyager60_alps/keymaps/default/readme.md b/keyboards/ai03/voyager60_alps/keymaps/default/readme.md deleted file mode 100644 index 1a78792616f..00000000000 --- a/keyboards/ai03/voyager60_alps/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default keymap diff --git a/keyboards/ai03/voyager60_alps/keymaps/via/readme.md b/keyboards/ai03/voyager60_alps/keymaps/via/readme.md deleted file mode 100644 index cb1709f705c..00000000000 --- a/keyboards/ai03/voyager60_alps/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# VIA Keymap diff --git a/keyboards/al1/keymaps/via/readme.md b/keyboards/al1/keymaps/via/readme.md deleted file mode 100644 index 458df9ca136..00000000000 --- a/keyboards/al1/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for al1 diff --git a/keyboards/alf/dc60/keymaps/default/readme.md b/keyboards/alf/dc60/keymaps/default/readme.md deleted file mode 100644 index 85bef5fc7b2..00000000000 --- a/keyboards/alf/dc60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for dc60 diff --git a/keyboards/amjkeyboard/amj84/keymaps/default/readme.md b/keyboards/amjkeyboard/amj84/keymaps/default/readme.md deleted file mode 100644 index 9233dcbfdb5..00000000000 --- a/keyboards/amjkeyboard/amj84/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for amj84 diff --git a/keyboards/aos/tkl/keymaps/default/readme.md b/keyboards/aos/tkl/keymaps/default/readme.md deleted file mode 100644 index 0de9187eaa4..00000000000 --- a/keyboards/aos/tkl/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for Ace of Spades - -The Ace of Spades is a fixed ISO TKL with blocked winkeyless bottom row. diff --git a/keyboards/arisu/keymaps/default/readme.md b/keyboards/arisu/keymaps/default/readme.md deleted file mode 100644 index f6d782cd996..00000000000 --- a/keyboards/arisu/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for arisu \ No newline at end of file diff --git a/keyboards/ash1800/keymaps/default/readme.md b/keyboards/ash1800/keymaps/default/readme.md deleted file mode 100644 index de61a697132..00000000000 --- a/keyboards/ash1800/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for ash1800 diff --git a/keyboards/ask55/keymaps/default/readme.md b/keyboards/ask55/keymaps/default/readme.md deleted file mode 100644 index 7e0a6bd73aa..00000000000 --- a/keyboards/ask55/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The M0116, M0330 and IIc Plus (default) keymap for the ASK55 \ No newline at end of file diff --git a/keyboards/atlas_65/keymaps/default/readme.md b/keyboards/atlas_65/keymaps/default/readme.md deleted file mode 100644 index 5086db264bb..00000000000 --- a/keyboards/atlas_65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for atlas-65 \ No newline at end of file diff --git a/keyboards/atreyu/keymaps/default/readme.md b/keyboards/atreyu/keymaps/default/readme.md deleted file mode 100644 index 7037fa18859..00000000000 --- a/keyboards/atreyu/keymaps/default/readme.md +++ /dev/null @@ -1,7 +0,0 @@ -# Atreyu Keymap - -The default keymap provided here is useful for testing and as a base -for your own mapping. It only includes basic layers and is missing many -keycodes. To build the default keymap: - -make atreyu:default diff --git a/keyboards/atxkb/1894/keymaps/default/readme.md b/keyboards/atxkb/1894/keymaps/default/readme.md deleted file mode 100644 index eb6b7baccfe..00000000000 --- a/keyboards/atxkb/1894/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for 1894 - -Fits just about everything on two layers. diff --git a/keyboards/atxkb/1894/keymaps/default_ansi_tsangan/readme.md b/keyboards/atxkb/1894/keymaps/default_ansi_tsangan/readme.md deleted file mode 100644 index 712f7fa1aa4..00000000000 --- a/keyboards/atxkb/1894/keymaps/default_ansi_tsangan/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default_ansi_tsangan keymap for 1894 - -Simplified down to the basic ANSI Tsangan layouts for ease of configuration. diff --git a/keyboards/atxkb/1894/keymaps/via/readme.md b/keyboards/atxkb/1894/keymaps/via/readme.md deleted file mode 100644 index 0dc4a94580a..00000000000 --- a/keyboards/atxkb/1894/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The via keymap for 1894 - -For via configurator use diff --git a/keyboards/aves60/keymaps/default/readme.md b/keyboards/aves60/keymaps/default/readme.md deleted file mode 100644 index ad8b72772ae..00000000000 --- a/keyboards/aves60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Aves60 diff --git a/keyboards/bandominedoni/keymaps/default/readme.md b/keyboards/bandominedoni/keymaps/default/readme.md deleted file mode 100644 index e6ec2ad10d5..00000000000 --- a/keyboards/bandominedoni/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bandominedoni diff --git a/keyboards/bandominedoni/keymaps/via/readme.md b/keyboards/bandominedoni/keymaps/via/readme.md deleted file mode 100644 index 6af1cf92bbe..00000000000 --- a/keyboards/bandominedoni/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for bandominedoni diff --git a/keyboards/barleycorn_smd/keymaps/via/readme.md b/keyboards/barleycorn_smd/keymaps/via/readme.md deleted file mode 100644 index b82bc8e79f9..00000000000 --- a/keyboards/barleycorn_smd/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Compile with this keymap to use VIA diff --git a/keyboards/barracuda/keymaps/default/readme.md b/keyboards/barracuda/keymaps/default/readme.md deleted file mode 100644 index 4a55a35e4be..00000000000 --- a/keyboards/barracuda/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap diff --git a/keyboards/barracuda/keymaps/via/readme.md b/keyboards/barracuda/keymaps/via/readme.md deleted file mode 100644 index 5b3ff232e60..00000000000 --- a/keyboards/barracuda/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# VIA enabled keymap diff --git a/keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md b/keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md deleted file mode 100644 index 2005c2fec91..00000000000 --- a/keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# Dilemma Max (4x6+4) default keymap - diff --git a/keyboards/beatervan/keymaps/default/readme.md b/keyboards/beatervan/keymaps/default/readme.md deleted file mode 100644 index ac84c08cfa6..00000000000 --- a/keyboards/beatervan/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for tv44 \ No newline at end of file diff --git a/keyboards/beatervan/keymaps/via/readme.md b/keyboards/beatervan/keymaps/via/readme.md deleted file mode 100644 index 2e9d45177f9..00000000000 --- a/keyboards/beatervan/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Via keymap for beatervan diff --git a/keyboards/biacco42/meishi/keymaps/default/readme.md b/keyboards/biacco42/meishi/keymaps/default/readme.md deleted file mode 100644 index a9eb4e9cd80..00000000000 --- a/keyboards/biacco42/meishi/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for meishi \ No newline at end of file diff --git a/keyboards/biacco42/meishi2/keymaps/default/readme.md b/keyboards/biacco42/meishi2/keymaps/default/readme.md deleted file mode 100644 index e03642d2225..00000000000 --- a/keyboards/biacco42/meishi2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for meishi2 \ No newline at end of file diff --git a/keyboards/binepad/bn003/keymaps/default/readme.md b/keyboards/binepad/bn003/keymaps/default/readme.md deleted file mode 100644 index be0a7d956ea..00000000000 --- a/keyboards/binepad/bn003/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# bn003 - Default layout diff --git a/keyboards/blank/blank01/keymaps/default/readme.md b/keyboards/blank/blank01/keymaps/default/readme.md deleted file mode 100644 index e81b2134e9c..00000000000 --- a/keyboards/blank/blank01/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for blank01 diff --git a/keyboards/blank/blank01/keymaps/via/readme.md b/keyboards/blank/blank01/keymaps/via/readme.md deleted file mode 100644 index 257f797f083..00000000000 --- a/keyboards/blank/blank01/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for blank01 diff --git a/keyboards/blank_tehnologii/manibus/keymaps/default/readme.md b/keyboards/blank_tehnologii/manibus/keymaps/default/readme.md deleted file mode 100644 index a720b722b9c..00000000000 --- a/keyboards/blank_tehnologii/manibus/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -#Manibus Default Layout - -This is the default layout for Manibus that comes shipped with every keyboard. diff --git a/keyboards/boardwalk/keymaps/default/readme.md b/keyboards/boardwalk/keymaps/default/readme.md deleted file mode 100644 index 73cf19b06fb..00000000000 --- a/keyboards/boardwalk/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Boardwalk diff --git a/keyboards/boardwalk/keymaps/default_2u_arrow/readme.md b/keyboards/boardwalk/keymaps/default_2u_arrow/readme.md deleted file mode 100644 index 2774d6e2bbf..00000000000 --- a/keyboards/boardwalk/keymaps/default_2u_arrow/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_2u_arrow keymap for Boardwalk diff --git a/keyboards/boardwalk/keymaps/default_2x2u/readme.md b/keyboards/boardwalk/keymaps/default_2x2u/readme.md deleted file mode 100644 index 94a68e744f8..00000000000 --- a/keyboards/boardwalk/keymaps/default_2x2u/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_2x2u keymap for Boardwalk diff --git a/keyboards/boardwalk/keymaps/default_625u_arrow/readme.md b/keyboards/boardwalk/keymaps/default_625u_arrow/readme.md deleted file mode 100644 index 25eca02be6b..00000000000 --- a/keyboards/boardwalk/keymaps/default_625u_arrow/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_625u_arrow keymap for Boardwalk diff --git a/keyboards/boardwalk/keymaps/default_ortho_7u/readme.md b/keyboards/boardwalk/keymaps/default_ortho_7u/readme.md deleted file mode 100644 index 57fa07eab60..00000000000 --- a/keyboards/boardwalk/keymaps/default_ortho_7u/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_ortho_7u keymap for Boardwalk diff --git a/keyboards/boardwalk/keymaps/default_ortho_hhkb/readme.md b/keyboards/boardwalk/keymaps/default_ortho_hhkb/readme.md deleted file mode 100644 index b11c8c4009b..00000000000 --- a/keyboards/boardwalk/keymaps/default_ortho_hhkb/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_ortho_hhkb keymap for Boardwalk diff --git a/keyboards/boardwalk/keymaps/via/readme.md b/keyboards/boardwalk/keymaps/via/readme.md deleted file mode 100644 index 86a7b902f35..00000000000 --- a/keyboards/boardwalk/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for Boardwalk diff --git a/keyboards/bpiphany/frosty_flake/keymaps/default/readme.md b/keyboards/bpiphany/frosty_flake/keymaps/default/readme.md deleted file mode 100644 index 11bf4825ffa..00000000000 --- a/keyboards/bpiphany/frosty_flake/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for frosty_flake diff --git a/keyboards/bpiphany/frosty_flake/keymaps/tkl/readme.md b/keyboards/bpiphany/frosty_flake/keymaps/tkl/readme.md deleted file mode 100644 index a076a65de92..00000000000 --- a/keyboards/bpiphany/frosty_flake/keymaps/tkl/readme.md +++ /dev/null @@ -1 +0,0 @@ -# TKL keymap for frosty_flake diff --git a/keyboards/bpiphany/sixshooter/keymaps/default/readme.md b/keyboards/bpiphany/sixshooter/keymaps/default/readme.md deleted file mode 100644 index 050a6f23418..00000000000 --- a/keyboards/bpiphany/sixshooter/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for sixshooter diff --git a/keyboards/bpiphany/tiger_lily/keymaps/default/readme.md b/keyboards/bpiphany/tiger_lily/keymaps/default/readme.md deleted file mode 100644 index 4626859df4c..00000000000 --- a/keyboards/bpiphany/tiger_lily/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for tiger_lily diff --git a/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/readme.md b/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/readme.md deleted file mode 100644 index 2cb8c899353..00000000000 --- a/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# default_ansi - -A standard fullsize ANSI-layout keymap for Tiger Lily-powered keyboards. diff --git a/keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/readme.md b/keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/readme.md deleted file mode 100644 index 00d90f12c94..00000000000 --- a/keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# default_ansi - -A standard tenkeyless ANSI-layout keymap for Unloved Bastard-powered keyboards. diff --git a/keyboards/bpiphany/unloved_bastard/keymaps/default_iso/readme.md b/keyboards/bpiphany/unloved_bastard/keymaps/default_iso/readme.md deleted file mode 100644 index 40fae94480b..00000000000 --- a/keyboards/bpiphany/unloved_bastard/keymaps/default_iso/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# default_iso - -A standard tenkeyless ISO-layout keymap for Unloved Bastard-powered keyboards. diff --git a/keyboards/bt66tech/bt66tech60/keymaps/default/readme.md b/keyboards/bt66tech/bt66tech60/keymaps/default/readme.md deleted file mode 100644 index 73d3f7235ff..00000000000 --- a/keyboards/bt66tech/bt66tech60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bt66tech60 diff --git a/keyboards/buildakb/potato65/keymaps/default/readme.md b/keyboards/buildakb/potato65/keymaps/default/readme.md deleted file mode 100644 index 1f0d69e17ca..00000000000 --- a/keyboards/buildakb/potato65/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Potato65 Layout - -This is the default layout for the Potato65. Largely based on the Tada68 layout. diff --git a/keyboards/buildakb/potato65/keymaps/via/readme.md b/keyboards/buildakb/potato65/keymaps/via/readme.md deleted file mode 100644 index 292046d7269..00000000000 --- a/keyboards/buildakb/potato65/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# VIA Potato65 Layout - -This is the VIA layout for the Potato65. Largely based on the Tada68 layout. diff --git a/keyboards/buildakb/potato65hs/keymaps/default/readme.md b/keyboards/buildakb/potato65hs/keymaps/default/readme.md deleted file mode 100644 index bb34368c996..00000000000 --- a/keyboards/buildakb/potato65hs/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Potato65 Hotswap Layout - -This is the default layout for the Potato65 Hotswap keyboard. Largely based on the KBD67 layout. diff --git a/keyboards/buildakb/potato65hs/keymaps/via/readme.md b/keyboards/buildakb/potato65hs/keymaps/via/readme.md deleted file mode 100644 index 4e3ddd1228a..00000000000 --- a/keyboards/buildakb/potato65hs/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Potato65 Layout - -This is the VIA layout for the Potato65 Hotswap Keyboard. Largely based on the KBD67 layout. diff --git a/keyboards/buildakb/potato65s/keymaps/default/readme.md b/keyboards/buildakb/potato65s/keymaps/default/readme.md deleted file mode 100644 index bb34368c996..00000000000 --- a/keyboards/buildakb/potato65s/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Potato65 Hotswap Layout - -This is the default layout for the Potato65 Hotswap keyboard. Largely based on the KBD67 layout. diff --git a/keyboards/buildakb/potato65s/keymaps/via/readme.md b/keyboards/buildakb/potato65s/keymaps/via/readme.md deleted file mode 100644 index 4e3ddd1228a..00000000000 --- a/keyboards/buildakb/potato65s/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Potato65 Layout - -This is the VIA layout for the Potato65 Hotswap Keyboard. Largely based on the KBD67 layout. diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default/readme.md b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/readme.md deleted file mode 100644 index 05c37002666..00000000000 --- a/keyboards/cablecardesigns/cypher/rev6/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for cypher \ No newline at end of file diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_ansi/readme.md b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_ansi/readme.md deleted file mode 100644 index 3b736d1b717..00000000000 --- a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ANSI keymap for Cypher diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/readme.md b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/readme.md deleted file mode 100644 index a6ea34c482d..00000000000 --- a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ISO keymap for Cypher diff --git a/keyboards/caffeinated/serpent65/keymaps/default/readme.md b/keyboards/caffeinated/serpent65/keymaps/default/readme.md deleted file mode 100644 index fd995e9e2a4..00000000000 --- a/keyboards/caffeinated/serpent65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Cafeinated Studios Serpent65 diff --git a/keyboards/caffeinated/serpent65/keymaps/via/readme.md b/keyboards/caffeinated/serpent65/keymaps/via/readme.md deleted file mode 100644 index 156593344fc..00000000000 --- a/keyboards/caffeinated/serpent65/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for the Cafeinated Studios Serpent65 diff --git a/keyboards/cannonkeys/atlas_alps/keymaps/default/readme.md b/keyboards/cannonkeys/atlas_alps/keymaps/default/readme.md deleted file mode 100644 index 2cede9af1f7..00000000000 --- a/keyboards/cannonkeys/atlas_alps/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default atlas_alps Layout - diff --git a/keyboards/capsunlocked/cu65/keymaps/default/readme.md b/keyboards/capsunlocked/cu65/keymaps/default/readme.md deleted file mode 100644 index 65bed4a3dc5..00000000000 --- a/keyboards/capsunlocked/cu65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ANSI keymap for CU65 diff --git a/keyboards/capsunlocked/cu65/keymaps/iso/readme.md b/keyboards/capsunlocked/cu65/keymaps/iso/readme.md deleted file mode 100644 index 2c2ded31f5a..00000000000 --- a/keyboards/capsunlocked/cu65/keymaps/iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The ISO keymap for CU65 diff --git a/keyboards/capsunlocked/cu65/keymaps/iso_split_bs/readme.md b/keyboards/capsunlocked/cu65/keymaps/iso_split_bs/readme.md deleted file mode 100644 index 5ec6b24d12b..00000000000 --- a/keyboards/capsunlocked/cu65/keymaps/iso_split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# A 69-key variant of the ISO keymap for CU65 (w/ split Backspace) diff --git a/keyboards/capsunlocked/cu7/keymaps/default/readme.md b/keyboards/capsunlocked/cu7/keymaps/default/readme.md deleted file mode 100644 index e6123685748..00000000000 --- a/keyboards/capsunlocked/cu7/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for CU7 \ No newline at end of file diff --git a/keyboards/capsunlocked/cu80/v1/keymaps/default/readme.md b/keyboards/capsunlocked/cu80/v1/keymaps/default/readme.md deleted file mode 100644 index e1fd6d7384d..00000000000 --- a/keyboards/capsunlocked/cu80/v1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for CU80 \ No newline at end of file diff --git a/keyboards/charue/charon/keymaps/default/readme.md b/keyboards/charue/charon/keymaps/default/readme.md deleted file mode 100644 index b1b61bf15fd..00000000000 --- a/keyboards/charue/charon/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for charon diff --git a/keyboards/charue/charon/keymaps/via/readme.md b/keyboards/charue/charon/keymaps/via/readme.md deleted file mode 100644 index f45f3c54b9f..00000000000 --- a/keyboards/charue/charon/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for charon diff --git a/keyboards/charue/sunsetter_r2/keymaps/default/readme.md b/keyboards/charue/sunsetter_r2/keymaps/default/readme.md deleted file mode 100644 index c42ac9da88d..00000000000 --- a/keyboards/charue/sunsetter_r2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Sunsetter R2 diff --git a/keyboards/charue/sunsetter_r2/keymaps/via/readme.md b/keyboards/charue/sunsetter_r2/keymaps/via/readme.md deleted file mode 100644 index 5e3de8d376f..00000000000 --- a/keyboards/charue/sunsetter_r2/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Sunsetter R2 diff --git a/keyboards/checkerboards/axon40/keymaps/default/readme.md b/keyboards/checkerboards/axon40/keymaps/default/readme.md deleted file mode 100644 index 4bab3a595c1..00000000000 --- a/keyboards/checkerboards/axon40/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Axon40 Layout - diff --git a/keyboards/checkerboards/candybar_ortho/keymaps/default/readme.md b/keyboards/checkerboards/candybar_ortho/keymaps/default/readme.md deleted file mode 100644 index 9ee103b7096..00000000000 --- a/keyboards/checkerboards/candybar_ortho/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Candybar_Ortho Layout - diff --git a/keyboards/checkerboards/candybar_ortho/keymaps/via/readme.md b/keyboards/checkerboards/candybar_ortho/keymaps/via/readme.md deleted file mode 100644 index 16ffb72e72f..00000000000 --- a/keyboards/checkerboards/candybar_ortho/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# Keymap for VIA - diff --git a/keyboards/checkerboards/plexus75/keymaps/default/readme.md b/keyboards/checkerboards/plexus75/keymaps/default/readme.md deleted file mode 100644 index 39dccf08e5b..00000000000 --- a/keyboards/checkerboards/plexus75/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Plexus75 with 2x2u bars diff --git a/keyboards/checkerboards/plexus75/keymaps/default_3u/readme.md b/keyboards/checkerboards/plexus75/keymaps/default_3u/readme.md deleted file mode 100644 index e7b84c5ba99..00000000000 --- a/keyboards/checkerboards/plexus75/keymaps/default_3u/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_3u bar keymap for Plexus75 \ No newline at end of file diff --git a/keyboards/checkerboards/plexus75/keymaps/default_7u/readme.md b/keyboards/checkerboards/plexus75/keymaps/default_7u/readme.md deleted file mode 100644 index a80769aa1fe..00000000000 --- a/keyboards/checkerboards/plexus75/keymaps/default_7u/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The default_ortho_7u keymap for Plexus75 - diff --git a/keyboards/checkerboards/plexus75_he/keymaps/default/readme.md b/keyboards/checkerboards/plexus75_he/keymaps/default/readme.md deleted file mode 100644 index 353debb7d68..00000000000 --- a/keyboards/checkerboards/plexus75_he/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Plexus75_HE with 2x3u bars diff --git a/keyboards/checkerboards/pursuit40/keymaps/default/readme.md b/keyboards/checkerboards/pursuit40/keymaps/default/readme.md deleted file mode 100644 index 45bc6a33a2d..00000000000 --- a/keyboards/checkerboards/pursuit40/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The Default Pursuit40 Layout diff --git a/keyboards/checkerboards/quark/keymaps/default/readme.md b/keyboards/checkerboards/quark/keymaps/default/readme.md deleted file mode 100644 index 9a85e831e9d..00000000000 --- a/keyboards/checkerboards/quark/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The Default Quark Layout diff --git a/keyboards/checkerboards/quark_plus/keymaps/default/readme.md b/keyboards/checkerboards/quark_plus/keymaps/default/readme.md deleted file mode 100644 index 65ffbc82db1..00000000000 --- a/keyboards/checkerboards/quark_plus/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -The Default Quark_Plus Layout diff --git a/keyboards/cherrybstudio/cb1800/keymaps/default/readme.md b/keyboards/cherrybstudio/cb1800/keymaps/default/readme.md deleted file mode 100644 index d68382007dd..00000000000 --- a/keyboards/cherrybstudio/cb1800/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for cb1800 \ No newline at end of file diff --git a/keyboards/cherrybstudio/cb65/keymaps/default/readme.md b/keyboards/cherrybstudio/cb65/keymaps/default/readme.md deleted file mode 100644 index af21c876dbc..00000000000 --- a/keyboards/cherrybstudio/cb65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for CB65 diff --git a/keyboards/cherrybstudio/cb87/keymaps/default/readme.md b/keyboards/cherrybstudio/cb87/keymaps/default/readme.md deleted file mode 100644 index 75b731fa17e..00000000000 --- a/keyboards/cherrybstudio/cb87/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for CB87 diff --git a/keyboards/cherrybstudio/cb87rgb/keymaps/default/readme.md b/keyboards/cherrybstudio/cb87rgb/keymaps/default/readme.md deleted file mode 100644 index d68382007dd..00000000000 --- a/keyboards/cherrybstudio/cb87rgb/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for cb1800 \ No newline at end of file diff --git a/keyboards/cherrybstudio/cb87v2/keymaps/default/readme.md b/keyboards/cherrybstudio/cb87v2/keymaps/default/readme.md deleted file mode 100644 index d68382007dd..00000000000 --- a/keyboards/cherrybstudio/cb87v2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for cb1800 \ No newline at end of file diff --git a/keyboards/chickenman/ciel/keymaps/default/readme.md b/keyboards/chickenman/ciel/keymaps/default/readme.md deleted file mode 100644 index 5609e2adbbb..00000000000 --- a/keyboards/chickenman/ciel/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Bakeneko 60 diff --git a/keyboards/chromatonemini/keymaps/default/readme.md b/keyboards/chromatonemini/keymaps/default/readme.md deleted file mode 100644 index 4a18250f97e..00000000000 --- a/keyboards/chromatonemini/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for chromatonemini diff --git a/keyboards/chromatonemini/keymaps/via/readme.md b/keyboards/chromatonemini/keymaps/via/readme.md deleted file mode 100644 index 2ebbac44311..00000000000 --- a/keyboards/chromatonemini/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for chromatonemini, RGB MATRIX enabled. diff --git a/keyboards/ckeys/handwire_101/keymaps/default/readme.md b/keyboards/ckeys/handwire_101/keymaps/default/readme.md deleted file mode 100755 index 4594bdfe317..00000000000 --- a/keyboards/ckeys/handwire_101/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the cKeys Handwire 101 4x4 keyboard. \ No newline at end of file diff --git a/keyboards/ckeys/nakey/keymaps/default/readme.md b/keyboards/ckeys/nakey/keymaps/default/readme.md deleted file mode 100644 index c842dc99a76..00000000000 --- a/keyboards/ckeys/nakey/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for naKey diff --git a/keyboards/ckeys/obelus/keymaps/default/readme.md b/keyboards/ckeys/obelus/keymaps/default/readme.md deleted file mode 100644 index bac51fc043c..00000000000 --- a/keyboards/ckeys/obelus/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for obelus \ No newline at end of file diff --git a/keyboards/ckeys/washington/keymaps/default/readme.md b/keyboards/ckeys/washington/keymaps/default/readme.md deleted file mode 100644 index bc0b52d2317..00000000000 --- a/keyboards/ckeys/washington/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for washington diff --git a/keyboards/clueboard/17/keymaps/default/readme.md b/keyboards/clueboard/17/keymaps/default/readme.md deleted file mode 100644 index 4fc9092b390..00000000000 --- a/keyboards/clueboard/17/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -Default keymap for the Clueboard 17. diff --git a/keyboards/clueboard/2x1800/2018/keymaps/default/readme.md b/keyboards/clueboard/2x1800/2018/keymaps/default/readme.md deleted file mode 100644 index 4e3457efce6..00000000000 --- a/keyboards/clueboard/2x1800/2018/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 2x1800 diff --git a/keyboards/clueboard/2x1800/2018/keymaps/default_4u/readme.md b/keyboards/clueboard/2x1800/2018/keymaps/default_4u/readme.md deleted file mode 100644 index a696972e8c4..00000000000 --- a/keyboards/clueboard/2x1800/2018/keymaps/default_4u/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 2x1800 with 4u Spacebar diff --git a/keyboards/clueboard/2x1800/2018/keymaps/default_7u/readme.md b/keyboards/clueboard/2x1800/2018/keymaps/default_7u/readme.md deleted file mode 100644 index f5718e842dc..00000000000 --- a/keyboards/clueboard/2x1800/2018/keymaps/default_7u/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 2x1800 with 7u spacebar diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default/readme.md deleted file mode 100644 index 4e3457efce6..00000000000 --- a/keyboards/clueboard/2x1800/2019/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 2x1800 diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/readme.md deleted file mode 100644 index 4e3457efce6..00000000000 --- a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 2x1800 diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/readme.md deleted file mode 100644 index 4e3457efce6..00000000000 --- a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 2x1800 diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/readme.md deleted file mode 100644 index c933ee3edb7..00000000000 --- a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 2x1800 with 2u spacebar diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/readme.md deleted file mode 100644 index c933ee3edb7..00000000000 --- a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 2x1800 with 2u spacebar diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/readme.md deleted file mode 100644 index a696972e8c4..00000000000 --- a/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 2x1800 with 4u Spacebar diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/readme.md deleted file mode 100644 index a696972e8c4..00000000000 --- a/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 2x1800 with 4u Spacebar diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/readme.md deleted file mode 100644 index f5718e842dc..00000000000 --- a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 2x1800 with 7u spacebar diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/readme.md deleted file mode 100644 index f5718e842dc..00000000000 --- a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 2x1800 with 7u spacebar diff --git a/keyboards/clueboard/2x1800/2021/keymaps/default_4u/readme.md b/keyboards/clueboard/2x1800/2021/keymaps/default_4u/readme.md deleted file mode 100644 index a696972e8c4..00000000000 --- a/keyboards/clueboard/2x1800/2021/keymaps/default_4u/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 2x1800 with 4u Spacebar diff --git a/keyboards/clueboard/2x1800/2021/keymaps/default_7u/readme.md b/keyboards/clueboard/2x1800/2021/keymaps/default_7u/readme.md deleted file mode 100644 index f5718e842dc..00000000000 --- a/keyboards/clueboard/2x1800/2021/keymaps/default_7u/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 2x1800 with 7u spacebar diff --git a/keyboards/clueboard/60/keymaps/default/readme.md b/keyboards/clueboard/60/keymaps/default/readme.md deleted file mode 100644 index 32d4bfba612..00000000000 --- a/keyboards/clueboard/60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for clueboard 60% diff --git a/keyboards/clueboard/60/keymaps/default_aek/readme.md b/keyboards/clueboard/60/keymaps/default_aek/readme.md deleted file mode 100644 index cdec2416091..00000000000 --- a/keyboards/clueboard/60/keymaps/default_aek/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for clueboard 60%, optimized for the AEK layout. diff --git a/keyboards/clueboard/california/keymaps/default/readme.md b/keyboards/clueboard/california/keymaps/default/readme.md deleted file mode 100644 index f79b015f756..00000000000 --- a/keyboards/clueboard/california/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -Default keymap for the Clueboard California Macropad. diff --git a/keyboards/contender/keymaps/default/readme.md b/keyboards/contender/keymaps/default/readme.md deleted file mode 100644 index b623b296db4..00000000000 --- a/keyboards/contender/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for contender diff --git a/keyboards/contra/keymaps/default/readme.md b/keyboards/contra/keymaps/default/readme.md deleted file mode 100644 index 80aba109548..00000000000 --- a/keyboards/contra/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Contra Layout - diff --git a/keyboards/contra/keymaps/via/readme.md b/keyboards/contra/keymaps/via/readme.md deleted file mode 100644 index 3c863243d45..00000000000 --- a/keyboards/contra/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# A basic Contra Layout with VIA enabled - diff --git a/keyboards/converter/siemens_tastatur/keymaps/default/readme.md b/keyboards/converter/siemens_tastatur/keymaps/default/readme.md deleted file mode 100644 index 8b72f0770ea..00000000000 --- a/keyboards/converter/siemens_tastatur/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for siemens_tastatur diff --git a/keyboards/copenhagen_click/click_pad_v1/keymaps/default/readme.md b/keyboards/copenhagen_click/click_pad_v1/keymaps/default/readme.md deleted file mode 100755 index 97b159b94e0..00000000000 --- a/keyboards/copenhagen_click/click_pad_v1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for CopenhagenClickPad-V1 diff --git a/keyboards/cozykeys/speedo/v2/keymaps/default/readme.md b/keyboards/cozykeys/speedo/v2/keymaps/default/readme.md deleted file mode 100644 index 46d98fad1c1..00000000000 --- a/keyboards/cozykeys/speedo/v2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# CozyKeys Speedo v2 Default Keymap diff --git a/keyboards/craftwalk/keymaps/default/readme.md b/keyboards/craftwalk/keymaps/default/readme.md deleted file mode 100644 index 7d51f51adf7..00000000000 --- a/keyboards/craftwalk/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for craftwalk diff --git a/keyboards/crazy_keyboard_68/keymaps/default/readme.md b/keyboards/crazy_keyboard_68/keymaps/default/readme.md deleted file mode 100644 index 21c72142fdb..00000000000 --- a/keyboards/crazy_keyboard_68/keymaps/default/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# The default keymap for crazy_keyboard_68 -``` -make crazy_keyboard_68:default -``` diff --git a/keyboards/crypt_macro/keymaps/default/readme.md b/keyboards/crypt_macro/keymaps/default/readme.md deleted file mode 100644 index a72af1220a1..00000000000 --- a/keyboards/crypt_macro/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Crypt Macro. VIA support disabled. diff --git a/keyboards/crypt_macro/keymaps/via/readme.md b/keyboards/crypt_macro/keymaps/via/readme.md deleted file mode 100644 index e6edc49fe7a..00000000000 --- a/keyboards/crypt_macro/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Crypt Macro. VIA support enabled. diff --git a/keyboards/cutie_club/wraith/keymaps/default/readme.md b/keyboards/cutie_club/wraith/keymaps/default/readme.md deleted file mode 100644 index cdf6376c2de..00000000000 --- a/keyboards/cutie_club/wraith/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Wraith diff --git a/keyboards/cx60/keymaps/default/readme.md b/keyboards/cx60/keymaps/default/readme.md deleted file mode 100644 index 37128e7c072..00000000000 --- a/keyboards/cx60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The CX60-VIA default layout diff --git a/keyboards/cx60/keymaps/via/readme.md b/keyboards/cx60/keymaps/via/readme.md deleted file mode 100644 index 37128e7c072..00000000000 --- a/keyboards/cx60/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The CX60-VIA default layout diff --git a/keyboards/cx60/keymaps/via_caps/readme.md b/keyboards/cx60/keymaps/via_caps/readme.md deleted file mode 100644 index 37128e7c072..00000000000 --- a/keyboards/cx60/keymaps/via_caps/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The CX60-VIA default layout diff --git a/keyboards/dailycraft/bat43/keymaps/default/readme.md b/keyboards/dailycraft/bat43/keymaps/default/readme.md deleted file mode 100644 index f72376d89e4..00000000000 --- a/keyboards/dailycraft/bat43/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bat43 diff --git a/keyboards/dailycraft/bat43/keymaps/via/readme.md b/keyboards/dailycraft/bat43/keymaps/via/readme.md deleted file mode 100644 index f72376d89e4..00000000000 --- a/keyboards/dailycraft/bat43/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bat43 diff --git a/keyboards/dailycraft/owl8/keymaps/default/readme.md b/keyboards/dailycraft/owl8/keymaps/default/readme.md deleted file mode 100644 index e0129daa2d3..00000000000 --- a/keyboards/dailycraft/owl8/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for owl8 diff --git a/keyboards/dailycraft/owl8/keymaps/via/readme.md b/keyboards/dailycraft/owl8/keymaps/via/readme.md deleted file mode 100644 index c4fa65987c0..00000000000 --- a/keyboards/dailycraft/owl8/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for owl8 diff --git a/keyboards/dailycraft/sandbox/rev1/keymaps/default/readme.md b/keyboards/dailycraft/sandbox/rev1/keymaps/default/readme.md deleted file mode 100644 index 7fe2318a44e..00000000000 --- a/keyboards/dailycraft/sandbox/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for sandbox diff --git a/keyboards/dailycraft/sandbox/rev1/keymaps/via/readme.md b/keyboards/dailycraft/sandbox/rev1/keymaps/via/readme.md deleted file mode 100644 index f3c721ab107..00000000000 --- a/keyboards/dailycraft/sandbox/rev1/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for sandbox diff --git a/keyboards/dailycraft/sandbox/rev2/keymaps/default/readme.md b/keyboards/dailycraft/sandbox/rev2/keymaps/default/readme.md deleted file mode 100644 index 7fe2318a44e..00000000000 --- a/keyboards/dailycraft/sandbox/rev2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for sandbox diff --git a/keyboards/dailycraft/sandbox/rev2/keymaps/via/readme.md b/keyboards/dailycraft/sandbox/rev2/keymaps/via/readme.md deleted file mode 100644 index f3c721ab107..00000000000 --- a/keyboards/dailycraft/sandbox/rev2/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for sandbox diff --git a/keyboards/dailycraft/stickey4/keymaps/default/readme.md b/keyboards/dailycraft/stickey4/keymaps/default/readme.md deleted file mode 100644 index 3b9ed23b9c5..00000000000 --- a/keyboards/dailycraft/stickey4/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for stickey4 diff --git a/keyboards/dailycraft/stickey4/keymaps/via/readme.md b/keyboards/dailycraft/stickey4/keymaps/via/readme.md deleted file mode 100644 index 202bcb2b9d8..00000000000 --- a/keyboards/dailycraft/stickey4/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for stickey4 diff --git a/keyboards/dailycraft/wings42/rev1/keymaps/default/readme.md b/keyboards/dailycraft/wings42/rev1/keymaps/default/readme.md deleted file mode 100644 index d99098ad0c3..00000000000 --- a/keyboards/dailycraft/wings42/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for wings42 diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/readme.md b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/readme.md deleted file mode 100644 index d99098ad0c3..00000000000 --- a/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for wings42 diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/default/readme.md b/keyboards/dailycraft/wings42/rev2/keymaps/default/readme.md deleted file mode 100644 index d99098ad0c3..00000000000 --- a/keyboards/dailycraft/wings42/rev2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for wings42 diff --git a/keyboards/delikeeb/flatbread60/keymaps/default/readme.md b/keyboards/delikeeb/flatbread60/keymaps/default/readme.md deleted file mode 100644 index 571cfbcd682..00000000000 --- a/keyboards/delikeeb/flatbread60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for flatbread60 diff --git a/keyboards/delikeeb/vaguettelite/keymaps/default/readme.md b/keyboards/delikeeb/vaguettelite/keymaps/default/readme.md deleted file mode 100644 index 1dc39673446..00000000000 --- a/keyboards/delikeeb/vaguettelite/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Vaguette LITE diff --git a/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/readme.md b/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/readme.md deleted file mode 100644 index fc537215ee1..00000000000 --- a/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The keymap using standard 6.25u spacebar for Vaguette LITE diff --git a/keyboards/delikeeb/vanana/keymaps/default/readme.md b/keyboards/delikeeb/vanana/keymaps/default/readme.md deleted file mode 100644 index 4fb4d2183a2..00000000000 --- a/keyboards/delikeeb/vanana/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for vanana diff --git a/keyboards/delikeeb/vaneela/keymaps/default/readme.md b/keyboards/delikeeb/vaneela/keymaps/default/readme.md deleted file mode 100644 index 597cee4faf5..00000000000 --- a/keyboards/delikeeb/vaneela/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for vaneela diff --git a/keyboards/delikeeb/vaneelaex/keymaps/default/readme.md b/keyboards/delikeeb/vaneelaex/keymaps/default/readme.md deleted file mode 100644 index 89c3c8c2aed..00000000000 --- a/keyboards/delikeeb/vaneelaex/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The default keymap for vaneela Ex - diff --git a/keyboards/delikeeb/waaffle/keymaps/default/readme.md b/keyboards/delikeeb/waaffle/keymaps/default/readme.md deleted file mode 100644 index 4cf5c435bde..00000000000 --- a/keyboards/delikeeb/waaffle/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for waaffle diff --git a/keyboards/dinofizz/fnrow/v1/keymaps/default/readme.md b/keyboards/dinofizz/fnrow/v1/keymaps/default/readme.md deleted file mode 100644 index 46525779343..00000000000 --- a/keyboards/dinofizz/fnrow/v1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for FnRow v1 diff --git a/keyboards/dm9records/tartan/keymaps/default/readme.md b/keyboards/dm9records/tartan/keymaps/default/readme.md deleted file mode 100644 index c829d531036..00000000000 --- a/keyboards/dm9records/tartan/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Tartan diff --git a/keyboards/dmqdesign/spin/keymaps/default/readme.md b/keyboards/dmqdesign/spin/keymaps/default/readme.md deleted file mode 100644 index 384b1a7d8af..00000000000 --- a/keyboards/dmqdesign/spin/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the SPIN Macro Pad, it includes basic encoder & rgb functionality. \ No newline at end of file diff --git a/keyboards/donutcables/budget96/keymaps/default/readme.md b/keyboards/donutcables/budget96/keymaps/default/readme.md deleted file mode 100644 index acbac7b4e0b..00000000000 --- a/keyboards/donutcables/budget96/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for budget96 diff --git a/keyboards/doppelganger/keymaps/default/readme.md b/keyboards/doppelganger/keymaps/default/readme.md deleted file mode 100644 index 9e9824f4d4a..00000000000 --- a/keyboards/doppelganger/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for doppelganger diff --git a/keyboards/drewkeys/iskar/keymaps/default/readme.md b/keyboards/drewkeys/iskar/keymaps/default/readme.md deleted file mode 100644 index d7cffe7242c..00000000000 --- a/keyboards/drewkeys/iskar/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for iskar -- ansi and split back space diff --git a/keyboards/drewkeys/iskar/keymaps/via/readme.md b/keyboards/drewkeys/iskar/keymaps/via/readme.md deleted file mode 100644 index 9b6e8c67b59..00000000000 --- a/keyboards/drewkeys/iskar/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for iskar for via diff --git a/keyboards/drhigsby/bkf/keymaps/default/readme.md b/keyboards/drhigsby/bkf/keymaps/default/readme.md deleted file mode 100644 index ea52e615832..00000000000 --- a/keyboards/drhigsby/bkf/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default BKF - Base Kit Forty Keymap diff --git a/keyboards/drhigsby/dubba175/keymaps/default/readme.md b/keyboards/drhigsby/dubba175/keymaps/default/readme.md deleted file mode 100644 index 8e5c2c528ba..00000000000 --- a/keyboards/drhigsby/dubba175/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default Dubba175 Keymap diff --git a/keyboards/drhigsby/ogurec/keymaps/default/readme.md b/keyboards/drhigsby/ogurec/keymaps/default/readme.md deleted file mode 100644 index 3be288eeebc..00000000000 --- a/keyboards/drhigsby/ogurec/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# default ogurec keymap diff --git a/keyboards/drhigsby/packrat/keymaps/default/readme.md b/keyboards/drhigsby/packrat/keymaps/default/readme.md deleted file mode 100644 index 3e6ed27b579..00000000000 --- a/keyboards/drhigsby/packrat/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Packrat Keymap - -The default Packrat Keymap uses the 2x3uC layout. diff --git a/keyboards/drop/sense75/keymaps/default_md/readme.md b/keyboards/drop/sense75/keymaps/default_md/readme.md deleted file mode 100644 index d954886bcd1..00000000000 --- a/keyboards/drop/sense75/keymaps/default_md/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The stock firmware the keyboard ships with diff --git a/keyboards/dtisaac/cg108/keymaps/default/readme.md b/keyboards/dtisaac/cg108/keymaps/default/readme.md deleted file mode 100644 index 48c74775db4..00000000000 --- a/keyboards/dtisaac/cg108/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for CG108 diff --git a/keyboards/dtisaac/dosa40rgb/keymaps/default/readme.md b/keyboards/dtisaac/dosa40rgb/keymaps/default/readme.md deleted file mode 100644 index 35494635d86..00000000000 --- a/keyboards/dtisaac/dosa40rgb/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for dosa40rgb diff --git a/keyboards/dtisaac/dtisaac01/keymaps/default/readme.md b/keyboards/dtisaac/dtisaac01/keymaps/default/readme.md deleted file mode 100644 index 0407ae2339f..00000000000 --- a/keyboards/dtisaac/dtisaac01/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for dtisaac01 diff --git a/keyboards/dtisaac/dtisaac01/keymaps/via/readme.md b/keyboards/dtisaac/dtisaac01/keymaps/via/readme.md deleted file mode 100644 index aa2ec3fa225..00000000000 --- a/keyboards/dtisaac/dtisaac01/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for dtisaac01 diff --git a/keyboards/duck/jetfire/keymaps/default/readme.md b/keyboards/duck/jetfire/keymaps/default/readme.md deleted file mode 100644 index 8b807694bd7..00000000000 --- a/keyboards/duck/jetfire/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for jetfire diff --git a/keyboards/ducky/one2mini/keymaps/ansi/readme.md b/keyboards/ducky/one2mini/keymaps/ansi/readme.md deleted file mode 100644 index e4eb351aea9..00000000000 --- a/keyboards/ducky/one2mini/keymaps/ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ANSI keymap for one2mini \ No newline at end of file diff --git a/keyboards/ducky/one2mini/keymaps/default/readme.md b/keyboards/ducky/one2mini/keymaps/default/readme.md deleted file mode 100644 index c83b30eeffc..00000000000 --- a/keyboards/ducky/one2mini/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for one2mini (ISO & ANSI combined) \ No newline at end of file diff --git a/keyboards/ducky/one2mini/keymaps/iso/readme.md b/keyboards/ducky/one2mini/keymaps/iso/readme.md deleted file mode 100644 index 218e0dff0f1..00000000000 --- a/keyboards/ducky/one2mini/keymaps/iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ISO keymap for one2mini \ No newline at end of file diff --git a/keyboards/ducky/one2sf/keymaps/default/readme.md b/keyboards/ducky/one2sf/keymaps/default/readme.md deleted file mode 100644 index 4b29f4aef23..00000000000 --- a/keyboards/ducky/one2sf/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for one2sf diff --git a/keyboards/e88/keymaps/default/readme.md b/keyboards/e88/keymaps/default/readme.md deleted file mode 100644 index 4918034caca..00000000000 --- a/keyboards/e88/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -Default e88 firmware. \ No newline at end of file diff --git a/keyboards/e88/keymaps/via/readme.md b/keyboards/e88/keymaps/via/readme.md deleted file mode 100644 index 28b835b2802..00000000000 --- a/keyboards/e88/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for the e88 diff --git a/keyboards/ealdin/quadrant/keymaps/default/readme.md b/keyboards/ealdin/quadrant/keymaps/default/readme.md deleted file mode 100644 index 54e4980c3ed..00000000000 --- a/keyboards/ealdin/quadrant/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for quadrant \ No newline at end of file diff --git a/keyboards/earth_rover/keymaps/default/readme.md b/keyboards/earth_rover/keymaps/default/readme.md deleted file mode 100644 index aa0b88c3866..00000000000 --- a/keyboards/earth_rover/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for earth_rover diff --git a/keyboards/eco/keymaps/default/readme.md b/keyboards/eco/keymaps/default/readme.md deleted file mode 100644 index cf168377d5d..00000000000 --- a/keyboards/eco/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# ECO Default Layout by u/That-Canadian - -KLE here : http://www.keyboard-layout-editor.com/#/gists/0733eca6b4cb88ff9d7de746803f4039 \ No newline at end of file diff --git a/keyboards/edc40/keymaps/default/readme.md b/keyboards/edc40/keymaps/default/readme.md deleted file mode 100644 index 127f7c5632b..00000000000 --- a/keyboards/edc40/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# default keymap for edc40 diff --git a/keyboards/edc40/keymaps/via/readme.md b/keyboards/edc40/keymaps/via/readme.md deleted file mode 100644 index b53c7a62d4e..00000000000 --- a/keyboards/edc40/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# VIA keymap for edc40 \ No newline at end of file diff --git a/keyboards/eek/keymaps/default/readme.md b/keyboards/eek/keymaps/default/readme.md deleted file mode 100644 index fe83fd2c55e..00000000000 --- a/keyboards/eek/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for eek! diff --git a/keyboards/efreet/keymaps/default/readme.md b/keyboards/efreet/keymaps/default/readme.md deleted file mode 100644 index 08f10328c48..00000000000 --- a/keyboards/efreet/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for efreet diff --git a/keyboards/ein_60/keymaps/ledtest/readme.md b/keyboards/ein_60/keymaps/ledtest/readme.md deleted file mode 100644 index 17954c3322e..00000000000 --- a/keyboards/ein_60/keymaps/ledtest/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The keymap for testing the LEDs and OLED on the EIN_60 diff --git a/keyboards/elephant42/keymaps/default/readme.md b/keyboards/elephant42/keymaps/default/readme.md deleted file mode 100644 index 632fe222b03..00000000000 --- a/keyboards/elephant42/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for elephant42 diff --git a/keyboards/elephant42/keymaps/via/readme.md b/keyboards/elephant42/keymaps/via/readme.md deleted file mode 100644 index 4457bf9f46a..00000000000 --- a/keyboards/elephant42/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The keymap with VIA support for elephant42 diff --git a/keyboards/emajesty/eiri/keymaps/default/readme.md b/keyboards/emajesty/eiri/keymaps/default/readme.md deleted file mode 100644 index f4b3c66d040..00000000000 --- a/keyboards/emajesty/eiri/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -![default keymap](https://imgur.com/F3L3z8w.png) - -# The default keymap for eiri diff --git a/keyboards/ep/40/keymaps/default/readme.md b/keyboards/ep/40/keymaps/default/readme.md deleted file mode 100644 index 242c0afb93c..00000000000 --- a/keyboards/ep/40/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for ep40 \ No newline at end of file diff --git a/keyboards/ep/96/keymaps/default/readme.md b/keyboards/ep/96/keymaps/default/readme.md deleted file mode 100644 index 81e87464f0c..00000000000 --- a/keyboards/ep/96/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for ep96 \ No newline at end of file diff --git a/keyboards/ericrlau/numdiscipline/keymaps/default/readme.md b/keyboards/ericrlau/numdiscipline/keymaps/default/readme.md deleted file mode 100644 index 1e3a04f7359..00000000000 --- a/keyboards/ericrlau/numdiscipline/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for NumDiscipline diff --git a/keyboards/eternal_keypad/keymaps/default/readme.md b/keyboards/eternal_keypad/keymaps/default/readme.md deleted file mode 100644 index aaf38728883..00000000000 --- a/keyboards/eternal_keypad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for eternal_keypad diff --git a/keyboards/evyd13/atom47/keymaps/default/readme.md b/keyboards/evyd13/atom47/keymaps/default/readme.md deleted file mode 100644 index 67959538571..00000000000 --- a/keyboards/evyd13/atom47/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -This is the default keymap as found on the Vortex Core, with some added buttons for RGB and backlight control. diff --git a/keyboards/evyd13/eon40/keymaps/default/readme.md b/keyboards/evyd13/eon40/keymaps/default/readme.md deleted file mode 100644 index 7185afb0e0a..00000000000 --- a/keyboards/evyd13/eon40/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -This is the default keymap for the Eon40. diff --git a/keyboards/evyd13/eon87/keymaps/default/readme.md b/keyboards/evyd13/eon87/keymaps/default/readme.md deleted file mode 100644 index a70270cfacc..00000000000 --- a/keyboards/evyd13/eon87/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -This is the default keymap for the Eon87. diff --git a/keyboards/evyd13/gh80_1800/keymaps/default/readme.md b/keyboards/evyd13/gh80_1800/keymaps/default/readme.md deleted file mode 100644 index c90376fe842..00000000000 --- a/keyboards/evyd13/gh80_1800/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -This is the default keymap for the GH80-1800. diff --git a/keyboards/evyd13/gh80_3700/keymaps/default/readme.md b/keyboards/evyd13/gh80_3700/keymaps/default/readme.md deleted file mode 100644 index 8e1232190b3..00000000000 --- a/keyboards/evyd13/gh80_3700/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -This is the default keymap for the GH80-3700. diff --git a/keyboards/evyd13/gh80_3700/keymaps/rgb/readme.md b/keyboards/evyd13/gh80_3700/keymaps/rgb/readme.md deleted file mode 100644 index cac017f429c..00000000000 --- a/keyboards/evyd13/gh80_3700/keymaps/rgb/readme.md +++ /dev/null @@ -1 +0,0 @@ -This is a keymap for the GH80-3700 with RGB enabled. diff --git a/keyboards/evyd13/minitomic/keymaps/default/readme.md b/keyboards/evyd13/minitomic/keymaps/default/readme.md deleted file mode 100644 index 0ec508ffa32..00000000000 --- a/keyboards/evyd13/minitomic/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -This is the default keymap for the Minitomic. diff --git a/keyboards/evyd13/mx5160/keymaps/default/readme.md b/keyboards/evyd13/mx5160/keymaps/default/readme.md deleted file mode 100644 index c9386773524..00000000000 --- a/keyboards/evyd13/mx5160/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -This is the default keymap for the mx-5160 PCB. \ No newline at end of file diff --git a/keyboards/evyd13/pockettype/keymaps/default/readme.md b/keyboards/evyd13/pockettype/keymaps/default/readme.md deleted file mode 100644 index 281fa6485d7..00000000000 --- a/keyboards/evyd13/pockettype/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -This is the default keymap for the PocketType. diff --git a/keyboards/evyd13/solheim68/keymaps/default/readme.md b/keyboards/evyd13/solheim68/keymaps/default/readme.md deleted file mode 100644 index 6e9745403b3..00000000000 --- a/keyboards/evyd13/solheim68/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -This is the default keymap for the Solheim68. \ No newline at end of file diff --git a/keyboards/evyd13/wasdat/keymaps/default/readme.md b/keyboards/evyd13/wasdat/keymaps/default/readme.md deleted file mode 100644 index 66cf593892c..00000000000 --- a/keyboards/evyd13/wasdat/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ANSI keymap for the Wasdat diff --git a/keyboards/evyd13/wasdat/keymaps/default_iso/readme.md b/keyboards/evyd13/wasdat/keymaps/default_iso/readme.md deleted file mode 100644 index e36d7642016..00000000000 --- a/keyboards/evyd13/wasdat/keymaps/default_iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ISO keymap for the Wasdat diff --git a/keyboards/evyd13/wasdat_code/keymaps/default/readme.md b/keyboards/evyd13/wasdat_code/keymaps/default/readme.md deleted file mode 100644 index 66cf593892c..00000000000 --- a/keyboards/evyd13/wasdat_code/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ANSI keymap for the Wasdat diff --git a/keyboards/evyd13/wasdat_code/keymaps/default_iso/readme.md b/keyboards/evyd13/wasdat_code/keymaps/default_iso/readme.md deleted file mode 100644 index e36d7642016..00000000000 --- a/keyboards/evyd13/wasdat_code/keymaps/default_iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ISO keymap for the Wasdat diff --git a/keyboards/exclusive/e6v2/le_bmc/keymaps/default/readme.md b/keyboards/exclusive/e6v2/le_bmc/keymaps/default/readme.md deleted file mode 100644 index 4a1b6efa62c..00000000000 --- a/keyboards/exclusive/e6v2/le_bmc/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bmc diff --git a/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/readme.md b/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/readme.md deleted file mode 100644 index 4a1b6efa62c..00000000000 --- a/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bmc diff --git a/keyboards/flehrad/downbubble/keymaps/default/readme.md b/keyboards/flehrad/downbubble/keymaps/default/readme.md deleted file mode 100644 index 757d9906258..00000000000 --- a/keyboards/flehrad/downbubble/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymaps for downbubble diff --git a/keyboards/fleuron/keymaps/default/readme.md b/keyboards/fleuron/keymaps/default/readme.md deleted file mode 100644 index ad065932b9a..00000000000 --- a/keyboards/fleuron/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for fleuron \ No newline at end of file diff --git a/keyboards/fluorite/keymaps/default/readme.md b/keyboards/fluorite/keymaps/default/readme.md deleted file mode 100644 index f9216dab9a9..00000000000 --- a/keyboards/fluorite/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for fluorite \ No newline at end of file diff --git a/keyboards/flx/lodestone/keymaps/default/readme.md b/keyboards/flx/lodestone/keymaps/default/readme.md deleted file mode 100644 index 55aeb57eaca..00000000000 --- a/keyboards/flx/lodestone/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Lodestone diff --git a/keyboards/flx/lodestone/keymaps/default_ansi/readme.md b/keyboards/flx/lodestone/keymaps/default_ansi/readme.md deleted file mode 100644 index 94cff2f42f5..00000000000 --- a/keyboards/flx/lodestone/keymaps/default_ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ANSI keymap for Lodestone diff --git a/keyboards/flx/lodestone/keymaps/default_iso/readme.md b/keyboards/flx/lodestone/keymaps/default_iso/readme.md deleted file mode 100644 index b1e45987796..00000000000 --- a/keyboards/flx/lodestone/keymaps/default_iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ISO keymap for Lodestone diff --git a/keyboards/flx/lodestone/keymaps/via/readme.md b/keyboards/flx/lodestone/keymaps/via/readme.md deleted file mode 100644 index 9ee2c477bc1..00000000000 --- a/keyboards/flx/lodestone/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for Lodestone \ No newline at end of file diff --git a/keyboards/flx/virgo/keymaps/default/readme.md b/keyboards/flx/virgo/keymaps/default/readme.md deleted file mode 100644 index e22e64c954a..00000000000 --- a/keyboards/flx/virgo/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for virgo diff --git a/keyboards/flx/virgo/keymaps/via/readme.md b/keyboards/flx/virgo/keymaps/via/readme.md deleted file mode 100644 index 67398c8bd7a..00000000000 --- a/keyboards/flx/virgo/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for FLX - Virgo diff --git a/keyboards/foostan/cornelius/keymaps/default/readme.md b/keyboards/foostan/cornelius/keymaps/default/readme.md deleted file mode 100644 index cb35bd8a29d..00000000000 --- a/keyboards/foostan/cornelius/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for cornelius diff --git a/keyboards/foostan/cornelius/keymaps/via/readme.md b/keyboards/foostan/cornelius/keymaps/via/readme.md deleted file mode 100644 index cb35bd8a29d..00000000000 --- a/keyboards/foostan/cornelius/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for cornelius diff --git a/keyboards/for_science/keymaps/default/readme.md b/keyboards/for_science/keymaps/default/readme.md deleted file mode 100644 index a5cb3ac0983..00000000000 --- a/keyboards/for_science/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default layout for For Science diff --git a/keyboards/foxlab/leaf60/hotswap/keymaps/default/readme.md b/keyboards/foxlab/leaf60/hotswap/keymaps/default/readme.md deleted file mode 100644 index 870439f268a..00000000000 --- a/keyboards/foxlab/leaf60/hotswap/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Fox Lab Hotswap Leaf60 \ No newline at end of file diff --git a/keyboards/foxlab/leaf60/universal/keymaps/default/readme.md b/keyboards/foxlab/leaf60/universal/keymaps/default/readme.md deleted file mode 100644 index a9f03336743..00000000000 --- a/keyboards/foxlab/leaf60/universal/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Universal Leaf60 \ No newline at end of file diff --git a/keyboards/foxlab/time80/keymaps/default/readme.md b/keyboards/foxlab/time80/keymaps/default/readme.md deleted file mode 100644 index bf4136282f2..00000000000 --- a/keyboards/foxlab/time80/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for time80 diff --git a/keyboards/fractal/keymaps/default/readme.md b/keyboards/fractal/keymaps/default/readme.md deleted file mode 100644 index 9722e901eeb..00000000000 --- a/keyboards/fractal/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Fractal Layout - diff --git a/keyboards/ft/mars80/keymaps/default/readme.md b/keyboards/ft/mars80/keymaps/default/readme.md deleted file mode 100644 index 180935f5d4a..00000000000 --- a/keyboards/ft/mars80/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Mars 8.0 \ No newline at end of file diff --git a/keyboards/function96/v1/keymaps/default/readme.md b/keyboards/function96/v1/keymaps/default/readme.md deleted file mode 100644 index c80df7f7b39..00000000000 --- a/keyboards/function96/v1/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The Default Function96 Layout - -There are layer buttons assigned as MO(-). Feel free to modify both layers as you choose. diff --git a/keyboards/function96/v2/keymaps/ansi_splitspace/readme.md b/keyboards/function96/v2/keymaps/ansi_splitspace/readme.md deleted file mode 100644 index 72b69e766db..00000000000 --- a/keyboards/function96/v2/keymaps/ansi_splitspace/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The ANSI Splitspace Function96v2 Layout - -There are layer buttons assigned as MO(-). Feel free to modify both layers as you choose. diff --git a/keyboards/function96/v2/keymaps/default/readme.md b/keyboards/function96/v2/keymaps/default/readme.md deleted file mode 100644 index 3a42e3f5f77..00000000000 --- a/keyboards/function96/v2/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The ANSI Function96v2 Layout - -There are layer buttons assigned as MO(-). Feel free to modify both layers as you choose. diff --git a/keyboards/function96/v2/keymaps/iso/readme.md b/keyboards/function96/v2/keymaps/iso/readme.md deleted file mode 100644 index e1d1003aa66..00000000000 --- a/keyboards/function96/v2/keymaps/iso/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The ISO Function96v2 Layout - -There are layer buttons assigned as MO(-). Feel free to modify both layers as you choose. diff --git a/keyboards/function96/v2/keymaps/iso_splitspace/readme.md b/keyboards/function96/v2/keymaps/iso_splitspace/readme.md deleted file mode 100644 index 5433795ab57..00000000000 --- a/keyboards/function96/v2/keymaps/iso_splitspace/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The ISO and Splitspace Function96v2 Layout - -There are layer buttons assigned as MO(-). Feel free to modify both layers as you choose. diff --git a/keyboards/funky40/keymaps/default/readme.md b/keyboards/funky40/keymaps/default/readme.md deleted file mode 100644 index 122732376d0..00000000000 --- a/keyboards/funky40/keymaps/default/readme.md +++ /dev/null @@ -1,6 +0,0 @@ -# Default Funky40 Layout - -![](https://i.imgur.com/jxoCDqx.png) -![](https://i.imgur.com/3bBL52A.png) - -This is the default Funky40 layout, it is currently a work in progress. The right shift key is setup to be enter when tapped and right shift when held. The centered delete key is delete when tapped but a momentary layer modifier when held, use this to access the number and function keys and more as the map progresses. diff --git a/keyboards/geekboards/macropad_v2/keymaps/default/readme.md b/keyboards/geekboards/macropad_v2/keymaps/default/readme.md deleted file mode 100644 index 8846bd59166..00000000000 --- a/keyboards/geekboards/macropad_v2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Geekboards Macropad v2 diff --git a/keyboards/geekboards/macropad_v2/keymaps/via/readme.md b/keyboards/geekboards/macropad_v2/keymaps/via/readme.md deleted file mode 100644 index 79130f4d117..00000000000 --- a/keyboards/geekboards/macropad_v2/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Geekboards Macropad v2 - VIA layout - -Flash with this layout to use [VIA](https://caniusevia.com/) for customising layout. diff --git a/keyboards/generic_panda/panda65_01/keymaps/default/readme.md b/keyboards/generic_panda/panda65_01/keymaps/default/readme.md deleted file mode 100644 index 9bb2c18c896..00000000000 --- a/keyboards/generic_panda/panda65_01/keymaps/default/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The default keymap for Panda65_01 - -![panda65_01 layout image](https://i.imgur.com/fPBUDMT.png) - -This is the default layout that comes flashed with the panda65_01 pcb. It follows the physical layout of the bauer with equal sized windows keyless blockers. \ No newline at end of file diff --git a/keyboards/gh60/satan/keymaps/colemak/readme.md b/keyboards/gh60/satan/keymaps/colemak/readme.md deleted file mode 100644 index 59bd4d1244d..00000000000 --- a/keyboards/gh60/satan/keymaps/colemak/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Colemak layout for GH60 Satan diff --git a/keyboards/gh60/satan/keymaps/default/readme.md b/keyboards/gh60/satan/keymaps/default/readme.md deleted file mode 100644 index c366147df39..00000000000 --- a/keyboards/gh60/satan/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# default Satan GH60 layout diff --git a/keyboards/gh60/v1p3/keymaps/default/readme.md b/keyboards/gh60/v1p3/keymaps/default/readme.md deleted file mode 100644 index ecf2a883b3a..00000000000 --- a/keyboards/gh60/v1p3/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for GH60 v1.3 diff --git a/keyboards/giabalanai/keymaps/default/readme.md b/keyboards/giabalanai/keymaps/default/readme.md deleted file mode 100644 index d929aa1f5e5..00000000000 --- a/keyboards/giabalanai/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for giabalanai diff --git a/keyboards/giabalanai/keymaps/default_giabarinaix2/readme.md b/keyboards/giabalanai/keymaps/default_giabarinaix2/readme.md deleted file mode 100644 index ecdae4723d9..00000000000 --- a/keyboards/giabalanai/keymaps/default_giabarinaix2/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for giabarinaix2 diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/readme.md b/keyboards/giabalanai/keymaps/giabarinaix2led/readme.md deleted file mode 100644 index 89139ec1b3b..00000000000 --- a/keyboards/giabalanai/keymaps/giabarinaix2led/readme.md +++ /dev/null @@ -1 +0,0 @@ -# A keymap for giabarinaix2 with LEDs. diff --git a/keyboards/giabalanai/keymaps/via/readme.md b/keyboards/giabalanai/keymaps/via/readme.md deleted file mode 100644 index 3c599bfe0e3..00000000000 --- a/keyboards/giabalanai/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for giabalanai diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/readme.md b/keyboards/giabalanai/keymaps/via_giabarinaix2/readme.md deleted file mode 100644 index 04c1613d530..00000000000 --- a/keyboards/giabalanai/keymaps/via_giabarinaix2/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for giabarinaix2, VIA version. diff --git a/keyboards/gkeyboard/gkb_m16/keymaps/default/readme.md b/keyboards/gkeyboard/gkb_m16/keymaps/default/readme.md deleted file mode 100644 index 7e496012494..00000000000 --- a/keyboards/gkeyboard/gkb_m16/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for GKB-M16 diff --git a/keyboards/gkeyboard/gkb_m16/keymaps/via/readme.md b/keyboards/gkeyboard/gkb_m16/keymaps/via/readme.md deleted file mode 100644 index b04d2f4a317..00000000000 --- a/keyboards/gkeyboard/gkb_m16/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Via keymap for GKB-M16 diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/readme.md b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/readme.md deleted file mode 100644 index 4f80a5b9566..00000000000 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# ANSI GMMKV2 65% Layout diff --git a/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/readme.md b/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/readme.md deleted file mode 100644 index 89d52f6afa0..00000000000 --- a/keyboards/gmmk/gmmk2/p65/iso/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# ISO GMMKV2 65% Layout diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/readme.md b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/readme.md deleted file mode 100644 index fd8536d5de6..00000000000 --- a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# ANSI GMMKV2 96% Layout diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/readme.md b/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/readme.md deleted file mode 100644 index b83b40941da..00000000000 --- a/keyboards/gmmk/gmmk2/p96/iso/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# ISO GMMKV2 96% Layout diff --git a/keyboards/gon/nerd60/keymaps/default/readme.md b/keyboards/gon/nerd60/keymaps/default/readme.md deleted file mode 100644 index b7d46191e68..00000000000 --- a/keyboards/gon/nerd60/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for GON NerD 60 - -![keymap](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/gon/nerd60/keymaps/default/keymap.png) diff --git a/keyboards/gon/nerdtkl/keymaps/default/readme.md b/keyboards/gon/nerdtkl/keymaps/default/readme.md deleted file mode 100644 index 648157a0516..00000000000 --- a/keyboards/gon/nerdtkl/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for GON NerD TKL - -![keymap](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/gon/nerdtkl/keymaps/default/keymap.png) diff --git a/keyboards/gorthage_truck/keymaps/10u/readme.md b/keyboards/gorthage_truck/keymaps/10u/readme.md deleted file mode 100644 index ba57cd8dc7c..00000000000 --- a/keyboards/gorthage_truck/keymaps/10u/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for gorthage_truck diff --git a/keyboards/gorthage_truck/keymaps/7u/readme.md b/keyboards/gorthage_truck/keymaps/7u/readme.md deleted file mode 100644 index ba57cd8dc7c..00000000000 --- a/keyboards/gorthage_truck/keymaps/7u/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for gorthage_truck diff --git a/keyboards/gorthage_truck/keymaps/default/readme.md b/keyboards/gorthage_truck/keymaps/default/readme.md deleted file mode 100644 index ba57cd8dc7c..00000000000 --- a/keyboards/gorthage_truck/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for gorthage_truck diff --git a/keyboards/gray_studio/cod67/keymaps/default/readme.md b/keyboards/gray_studio/cod67/keymaps/default/readme.md deleted file mode 100644 index 4b45689de83..00000000000 --- a/keyboards/gray_studio/cod67/keymaps/default/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The default keymap for a COD67 - -The default map only implements the default layer from the map on [ydkb.io](http://ydkb.io). - -If you want an example of a multi-layer map, look at [rys's map](../rys). diff --git a/keyboards/gray_studio/space65/keymaps/default/readme.md b/keyboards/gray_studio/space65/keymaps/default/readme.md deleted file mode 100644 index 944c1e8a0f5..00000000000 --- a/keyboards/gray_studio/space65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for space65 diff --git a/keyboards/gray_studio/space65/keymaps/iso/readme.md b/keyboards/gray_studio/space65/keymaps/iso/readme.md deleted file mode 100644 index e7d3dd8238f..00000000000 --- a/keyboards/gray_studio/space65/keymaps/iso/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# ISO keymap for Space65 - -Make this firmware with `make gray_studio/space65:iso`. diff --git a/keyboards/gray_studio/think65/hotswap/keymaps/default/readme.md b/keyboards/gray_studio/think65/hotswap/keymaps/default/readme.md deleted file mode 100644 index 438e10e2910..00000000000 --- a/keyboards/gray_studio/think65/hotswap/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for think65 diff --git a/keyboards/gray_studio/think65/solder/keymaps/default/readme.md b/keyboards/gray_studio/think65/solder/keymaps/default/readme.md deleted file mode 100644 index 438e10e2910..00000000000 --- a/keyboards/gray_studio/think65/solder/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for think65 diff --git a/keyboards/grid600/press/keymaps/default/readme.md b/keyboards/grid600/press/keymaps/default/readme.md deleted file mode 100644 index b29ee678683..00000000000 --- a/keyboards/grid600/press/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for grid diff --git a/keyboards/gvalchca/ga150/keymaps/default/readme.md b/keyboards/gvalchca/ga150/keymaps/default/readme.md deleted file mode 100644 index cee1f4cb916..00000000000 --- a/keyboards/gvalchca/ga150/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for GA15.0 \ No newline at end of file diff --git a/keyboards/gvalchca/spaccboard/keymaps/default/readme.md b/keyboards/gvalchca/spaccboard/keymaps/default/readme.md deleted file mode 100644 index 80a375dc055..00000000000 --- a/keyboards/gvalchca/spaccboard/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for SpaccBoard \ No newline at end of file diff --git a/keyboards/hadron/ver2/keymaps/default/readme.md b/keyboards/hadron/ver2/keymaps/default/readme.md deleted file mode 100644 index de9680b4985..00000000000 --- a/keyboards/hadron/ver2/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Planck Layout - diff --git a/keyboards/hadron/ver2/keymaps/side_numpad/readme.md b/keyboards/hadron/ver2/keymaps/side_numpad/readme.md deleted file mode 100644 index de9680b4985..00000000000 --- a/keyboards/hadron/ver2/keymaps/side_numpad/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Planck Layout - diff --git a/keyboards/hadron/ver3/keymaps/default/readme.md b/keyboards/hadron/ver3/keymaps/default/readme.md deleted file mode 100644 index 88b958ec423..00000000000 --- a/keyboards/hadron/ver3/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Hadron Layout - diff --git a/keyboards/halfcliff/keymaps/default/readme.md b/keyboards/halfcliff/keymaps/default/readme.md deleted file mode 100644 index 2924c68c24a..00000000000 --- a/keyboards/halfcliff/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for halfcliff diff --git a/keyboards/halfcliff/keymaps/via/readme.md b/keyboards/halfcliff/keymaps/via/readme.md deleted file mode 100644 index 2924c68c24a..00000000000 --- a/keyboards/halfcliff/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for halfcliff diff --git a/keyboards/han60/keymaps/default/readme.md b/keyboards/han60/keymaps/default/readme.md deleted file mode 100644 index 02e9fab479a..00000000000 --- a/keyboards/han60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for han60 diff --git a/keyboards/hand88/keymaps/default/readme.md b/keyboards/hand88/keymaps/default/readme.md deleted file mode 100755 index 9b306744194..00000000000 --- a/keyboards/hand88/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for Hand 88. VIA support disabled. - -![Layer 0](https://i.imgur.com/IhbvSZ1.png) diff --git a/keyboards/hand88/keymaps/via/readme.md b/keyboards/hand88/keymaps/via/readme.md deleted file mode 100755 index 32bb1fcc269..00000000000 --- a/keyboards/hand88/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for Hand 88. VIA support enabled. - -![Layer 0](https://i.imgur.com/IhbvSZ1.png) diff --git a/keyboards/handwired/3dfoxc/keymaps/default/readme.md b/keyboards/handwired/3dfoxc/keymaps/default/readme.md deleted file mode 100644 index 26ced1cb91e..00000000000 --- a/keyboards/handwired/3dfoxc/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# 3dfoxc "Default" keymap - -Set up just like the [original whitefox](https://input.club/whitefox/), except the function layer is totally made up. \ No newline at end of file diff --git a/keyboards/handwired/3dortho14u/keymaps/default/readme.md b/keyboards/handwired/3dortho14u/keymaps/default/readme.md deleted file mode 100644 index 04e5d40fd50..00000000000 --- a/keyboards/handwired/3dortho14u/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 3dortho14u diff --git a/keyboards/handwired/aranck/keymaps/default/readme.md b/keyboards/handwired/aranck/keymaps/default/readme.md deleted file mode 100644 index ba7ddbdd337..00000000000 --- a/keyboards/handwired/aranck/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Aranck diff --git a/keyboards/handwired/bolek/keymaps/default/readme.md b/keyboards/handwired/bolek/keymaps/default/readme.md deleted file mode 100644 index eccf85e3a04..00000000000 --- a/keyboards/handwired/bolek/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bolek diff --git a/keyboards/handwired/chiron/keymaps/default/readme.md b/keyboards/handwired/chiron/keymaps/default/readme.md deleted file mode 100644 index c95a502f221..00000000000 --- a/keyboards/handwired/chiron/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for chiron diff --git a/keyboards/handwired/co60/keymaps/default/readme.md b/keyboards/handwired/co60/keymaps/default/readme.md deleted file mode 100644 index eb8ba49e3eb..00000000000 --- a/keyboards/handwired/co60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for co60 \ No newline at end of file diff --git a/keyboards/handwired/cyberstar/keymaps/default/readme.md b/keyboards/handwired/cyberstar/keymaps/default/readme.md deleted file mode 100644 index 3a430bff3ce..00000000000 --- a/keyboards/handwired/cyberstar/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Cyberstar. VIA support disabled. diff --git a/keyboards/handwired/cyberstar/keymaps/via/readme.md b/keyboards/handwired/cyberstar/keymaps/via/readme.md deleted file mode 100644 index fce02861d63..00000000000 --- a/keyboards/handwired/cyberstar/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Cyberstar. VIA support enabled. diff --git a/keyboards/handwired/dactyl_left/keymaps/default/readme.md b/keyboards/handwired/dactyl_left/keymaps/default/readme.md deleted file mode 100644 index 7fa3e26f5fd..00000000000 --- a/keyboards/handwired/dactyl_left/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for dactyl_left \ No newline at end of file diff --git a/keyboards/handwired/dc/mc/001/keymaps/default/readme.md b/keyboards/handwired/dc/mc/001/keymaps/default/readme.md deleted file mode 100644 index e207a7b80d2..00000000000 --- a/keyboards/handwired/dc/mc/001/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for DC MC 001 diff --git a/keyboards/handwired/dygma/raise/keymaps/ansi/readme.md b/keyboards/handwired/dygma/raise/keymaps/ansi/readme.md deleted file mode 100644 index ceafd78f416..00000000000 --- a/keyboards/handwired/dygma/raise/keymaps/ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The ansi keymap for Dygma's Raise diff --git a/keyboards/handwired/dygma/raise/keymaps/default/readme.md b/keyboards/handwired/dygma/raise/keymaps/default/readme.md deleted file mode 100644 index 1103cb349b8..00000000000 --- a/keyboards/handwired/dygma/raise/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Dygma's Raise diff --git a/keyboards/handwired/dygma/raise/keymaps/iso/readme.md b/keyboards/handwired/dygma/raise/keymaps/iso/readme.md deleted file mode 100644 index 5f8924ae2c2..00000000000 --- a/keyboards/handwired/dygma/raise/keymaps/iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The iso keymap for Dygma's Raise diff --git a/keyboards/handwired/evk/v1_3/keymaps/default/readme.md b/keyboards/handwired/evk/v1_3/keymaps/default/readme.md deleted file mode 100644 index 4bb6a3de813..00000000000 --- a/keyboards/handwired/evk/v1_3/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for this version of the EVK \ No newline at end of file diff --git a/keyboards/handwired/floorboard/keymaps/default/readme.md b/keyboards/handwired/floorboard/keymaps/default/readme.md deleted file mode 100644 index eed7dfd5a94..00000000000 --- a/keyboards/handwired/floorboard/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Floorboard diff --git a/keyboards/handwired/frankie_macropad/keymaps/default/readme.md b/keyboards/handwired/frankie_macropad/keymaps/default/readme.md deleted file mode 100644 index f29affb8721..00000000000 --- a/keyboards/handwired/frankie_macropad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for handwired/frankie_macropad diff --git a/keyboards/handwired/fruity60/keymaps/default/readme.md b/keyboards/handwired/fruity60/keymaps/default/readme.md deleted file mode 100644 index 7c01154cd1e..00000000000 --- a/keyboards/handwired/fruity60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for fruity60 diff --git a/keyboards/handwired/hacked_motospeed/keymaps/default/readme.md b/keyboards/handwired/hacked_motospeed/keymaps/default/readme.md deleted file mode 100644 index 4c740bd9a55..00000000000 --- a/keyboards/handwired/hacked_motospeed/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for hacked_motospeed \ No newline at end of file diff --git a/keyboards/handwired/heisenberg/keymaps/default/readme.md b/keyboards/handwired/heisenberg/keymaps/default/readme.md deleted file mode 100644 index 7ab5d474ef2..00000000000 --- a/keyboards/handwired/heisenberg/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Heisenberg diff --git a/keyboards/handwired/hnah108/keymaps/default/readme.md b/keyboards/handwired/hnah108/keymaps/default/readme.md deleted file mode 100644 index 21d49073d7e..00000000000 --- a/keyboards/handwired/hnah108/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for hnah108 diff --git a/keyboards/handwired/hnah40/keymaps/default/readme.md b/keyboards/handwired/hnah40/keymaps/default/readme.md deleted file mode 100644 index b948ef96426..00000000000 --- a/keyboards/handwired/hnah40/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -![Hnah40 Layout Image](https://i.imgur.com/7LT6Vam.jpg) \ No newline at end of file diff --git a/keyboards/handwired/hnah40rgb/keymaps/ansi/readme.md b/keyboards/handwired/hnah40rgb/keymaps/ansi/readme.md deleted file mode 100644 index 825a57ab07b..00000000000 --- a/keyboards/handwired/hnah40rgb/keymaps/ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The ansi keymap for hnah40rgb \ No newline at end of file diff --git a/keyboards/handwired/hnah40rgb/keymaps/default/readme.md b/keyboards/handwired/hnah40rgb/keymaps/default/readme.md deleted file mode 100644 index 866686644d6..00000000000 --- a/keyboards/handwired/hnah40rgb/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for hnah40rgb \ No newline at end of file diff --git a/keyboards/handwired/lemonpad/keymaps/default/readme.md b/keyboards/handwired/lemonpad/keymaps/default/readme.md deleted file mode 100644 index 7d4196c9e30..00000000000 --- a/keyboards/handwired/lemonpad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for lemonpad diff --git a/keyboards/handwired/lemonpad/keymaps/via/readme.md b/keyboards/handwired/lemonpad/keymaps/via/readme.md deleted file mode 100644 index 907b8f5add9..00000000000 --- a/keyboards/handwired/lemonpad/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Basic VIA config, 9 layers. \ No newline at end of file diff --git a/keyboards/handwired/m40/5x5_macropad/keymaps/default/readme.md b/keyboards/handwired/m40/5x5_macropad/keymaps/default/readme.md deleted file mode 100644 index faaecfd9ea9..00000000000 --- a/keyboards/handwired/m40/5x5_macropad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 5x5_macropad diff --git a/keyboards/handwired/macroboard/keymaps/default/readme.md b/keyboards/handwired/macroboard/keymaps/default/readme.md deleted file mode 100644 index 39fa5888ed7..00000000000 --- a/keyboards/handwired/macroboard/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for macroboard diff --git a/keyboards/handwired/meck_tkl/keymaps/default/readme.md b/keyboards/handwired/meck_tkl/keymaps/default/readme.md deleted file mode 100644 index 9e2994008ac..00000000000 --- a/keyboards/handwired/meck_tkl/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for meck_tkl diff --git a/keyboards/handwired/ms_sculpt_mobile/keymaps/default/readme.md b/keyboards/handwired/ms_sculpt_mobile/keymaps/default/readme.md deleted file mode 100644 index 91575f7cd52..00000000000 --- a/keyboards/handwired/ms_sculpt_mobile/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Microsoft Sculpt Mobile diff --git a/keyboards/handwired/mutepad/keymaps/default/readme.md b/keyboards/handwired/mutepad/keymaps/default/readme.md deleted file mode 100644 index c3c9ec6aec0..00000000000 --- a/keyboards/handwired/mutepad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for MutePad diff --git a/keyboards/handwired/novem/keymaps/default/readme.md b/keyboards/handwired/novem/keymaps/default/readme.md deleted file mode 100644 index 0f833a09d32..00000000000 --- a/keyboards/handwired/novem/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for novem diff --git a/keyboards/handwired/nozbe_macro/keymaps/default/readme.md b/keyboards/handwired/nozbe_macro/keymaps/default/readme.md deleted file mode 100644 index 99051c3a254..00000000000 --- a/keyboards/handwired/nozbe_macro/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for nozbe_macro diff --git a/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/readme.md b/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/readme.md deleted file mode 100644 index 9a453e1f693..00000000000 --- a/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# default spaget layout diff --git a/keyboards/handwired/oem_ansi_fullsize/keymaps/default/readme.md b/keyboards/handwired/oem_ansi_fullsize/keymaps/default/readme.md deleted file mode 100644 index 882181d208d..00000000000 --- a/keyboards/handwired/oem_ansi_fullsize/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for oem_ansi_fullsize diff --git a/keyboards/handwired/owlet60/keymaps/default/readme.md b/keyboards/handwired/owlet60/keymaps/default/readme.md deleted file mode 100644 index 1d177ae1029..00000000000 --- a/keyboards/handwired/owlet60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for owlet60 \ No newline at end of file diff --git a/keyboards/handwired/owlet60/keymaps/oled_testing/readme.md b/keyboards/handwired/owlet60/keymaps/oled_testing/readme.md deleted file mode 100644 index 1d177ae1029..00000000000 --- a/keyboards/handwired/owlet60/keymaps/oled_testing/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for owlet60 \ No newline at end of file diff --git a/keyboards/handwired/pilcrow/keymaps/default/readme.md b/keyboards/handwired/pilcrow/keymaps/default/readme.md deleted file mode 100644 index 95472dfca89..00000000000 --- a/keyboards/handwired/pilcrow/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for pilcrow \ No newline at end of file diff --git a/keyboards/handwired/postageboard/keymaps/default/readme.md b/keyboards/handwired/postageboard/keymaps/default/readme.md deleted file mode 100644 index c166556a852..00000000000 --- a/keyboards/handwired/postageboard/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for PostageBoard diff --git a/keyboards/handwired/prime_exl/keymaps/default/readme.md b/keyboards/handwired/prime_exl/keymaps/default/readme.md deleted file mode 100644 index c2278bd4600..00000000000 --- a/keyboards/handwired/prime_exl/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for prime_exl \ No newline at end of file diff --git a/keyboards/handwired/prime_exl/keymaps/via/readme.md b/keyboards/handwired/prime_exl/keymaps/via/readme.md deleted file mode 100644 index c2278bd4600..00000000000 --- a/keyboards/handwired/prime_exl/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for prime_exl \ No newline at end of file diff --git a/keyboards/handwired/prime_exl_plus/keymaps/default/readme.md b/keyboards/handwired/prime_exl_plus/keymaps/default/readme.md deleted file mode 100644 index 2df9774487a..00000000000 --- a/keyboards/handwired/prime_exl_plus/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for prime_exl plus \ No newline at end of file diff --git a/keyboards/handwired/prime_exl_plus/keymaps/via/readme.md b/keyboards/handwired/prime_exl_plus/keymaps/via/readme.md deleted file mode 100644 index bcd7f1d8bee..00000000000 --- a/keyboards/handwired/prime_exl_plus/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for Prime_EXL Plus \ No newline at end of file diff --git a/keyboards/handwired/reclined/keymaps/default/readme.md b/keyboards/handwired/reclined/keymaps/default/readme.md deleted file mode 100644 index 3818217ad37..00000000000 --- a/keyboards/handwired/reclined/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for reclined \ No newline at end of file diff --git a/keyboards/handwired/riblee_f401/keymaps/default/readme.md b/keyboards/handwired/riblee_f401/keymaps/default/readme.md deleted file mode 100644 index e911968dd96..00000000000 --- a/keyboards/handwired/riblee_f401/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default Preonic layout - largely based on the Planck's \ No newline at end of file diff --git a/keyboards/handwired/rs60/keymaps/default/readme.md b/keyboards/handwired/rs60/keymaps/default/readme.md deleted file mode 100644 index e911968dd96..00000000000 --- a/keyboards/handwired/rs60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default Preonic layout - largely based on the Planck's \ No newline at end of file diff --git a/keyboards/handwired/sick68/keymaps/default/readme.md b/keyboards/handwired/sick68/keymaps/default/readme.md deleted file mode 100644 index 0cc8fbefcc5..00000000000 --- a/keyboards/handwired/sick68/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for sick68 diff --git a/keyboards/handwired/sick68/keymaps/via/readme.md b/keyboards/handwired/sick68/keymaps/via/readme.md deleted file mode 100644 index f03fbedb489..00000000000 --- a/keyboards/handwired/sick68/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# VIA keymap for sick68 -Adds support for VIA mapping and encoder (pin F0 and F1 by default). diff --git a/keyboards/handwired/slash/keymaps/default/readme.md b/keyboards/handwired/slash/keymaps/default/readme.md deleted file mode 100644 index 517377a4b01..00000000000 --- a/keyboards/handwired/slash/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for slash diff --git a/keyboards/handwired/snatchpad/keymaps/default/readme.md b/keyboards/handwired/snatchpad/keymaps/default/readme.md deleted file mode 100644 index 11c0c781c4c..00000000000 --- a/keyboards/handwired/snatchpad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for snatchpad diff --git a/keyboards/handwired/sono1/keymaps/default/readme.md b/keyboards/handwired/sono1/keymaps/default/readme.md deleted file mode 100644 index 8342cd4974d..00000000000 --- a/keyboards/handwired/sono1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for sono1 diff --git a/keyboards/handwired/steamvan/keymaps/default/readme.md b/keyboards/handwired/steamvan/keymaps/default/readme.md deleted file mode 100644 index efc21654823..00000000000 --- a/keyboards/handwired/steamvan/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the SteamVan, based on the MiniVan default layout. diff --git a/keyboards/handwired/symmetry60/keymaps/default/readme.md b/keyboards/handwired/symmetry60/keymaps/default/readme.md deleted file mode 100644 index db25aa3bf21..00000000000 --- a/keyboards/handwired/symmetry60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for symmetry60 diff --git a/keyboards/handwired/tsubasa/keymaps/default/readme.md b/keyboards/handwired/tsubasa/keymaps/default/readme.md deleted file mode 100644 index bfc5167d031..00000000000 --- a/keyboards/handwired/tsubasa/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The default keymap for tsubasa -![keymap](https://i.imgur.com/wIRs6Ebh.png) diff --git a/keyboards/handwired/twadlee/tp69/keymaps/default/readme.md b/keyboards/handwired/twadlee/tp69/keymaps/default/readme.md deleted file mode 100644 index 453673a6e99..00000000000 --- a/keyboards/handwired/twadlee/tp69/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for tp69 diff --git a/keyboards/handwired/unicomp_mini_m/keymaps/default/readme.md b/keyboards/handwired/unicomp_mini_m/keymaps/default/readme.md deleted file mode 100644 index f15b1b50d3f..00000000000 --- a/keyboards/handwired/unicomp_mini_m/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for unicomp\_mini\_m diff --git a/keyboards/handwired/videowriter/keymaps/default/readme.md b/keyboards/handwired/videowriter/keymaps/default/readme.md deleted file mode 100644 index 05b0f039f9d..00000000000 --- a/keyboards/handwired/videowriter/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for videowriter diff --git a/keyboards/handwired/woodpad/keymaps/default/readme.md b/keyboards/handwired/woodpad/keymaps/default/readme.md deleted file mode 100644 index 1f9e9246895..00000000000 --- a/keyboards/handwired/woodpad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Woodpad diff --git a/keyboards/hhkb_lite_2/keymaps/via/readme.md b/keyboards/hhkb_lite_2/keymaps/via/readme.md deleted file mode 100644 index 6eee36480ea..00000000000 --- a/keyboards/hhkb_lite_2/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Via-enabled keymap for HHKB Lite 2 - -See https://caniusevia.com/ diff --git a/keyboards/hineybush/h08_ocelot/keymaps/default/readme.md b/keyboards/hineybush/h08_ocelot/keymaps/default/readme.md deleted file mode 100644 index 7bed472217b..00000000000 --- a/keyboards/hineybush/h08_ocelot/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for h08 diff --git a/keyboards/hineybush/h08_ocelot/keymaps/via/readme.md b/keyboards/hineybush/h08_ocelot/keymaps/via/readme.md deleted file mode 100644 index 54e95c67fd7..00000000000 --- a/keyboards/hineybush/h08_ocelot/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA-enabled keymap for h08 diff --git a/keyboards/hineybush/h10/keymaps/default/readme.md b/keyboards/hineybush/h10/keymaps/default/readme.md deleted file mode 100644 index fd8638b75c2..00000000000 --- a/keyboards/hineybush/h10/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for h10 diff --git a/keyboards/hineybush/h10/keymaps/via/readme.md b/keyboards/hineybush/h10/keymaps/via/readme.md deleted file mode 100644 index 5986e148274..00000000000 --- a/keyboards/hineybush/h10/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for h10 diff --git a/keyboards/hineybush/h60/keymaps/default/readme.md b/keyboards/hineybush/h60/keymaps/default/readme.md deleted file mode 100644 index 08aa4a5c8fe..00000000000 --- a/keyboards/hineybush/h60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for h60 diff --git a/keyboards/hineybush/h60/keymaps/kei/readme.md b/keyboards/hineybush/h60/keymaps/kei/readme.md deleted file mode 100644 index c7b8dd63012..00000000000 --- a/keyboards/hineybush/h60/keymaps/kei/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Kei keyboard diff --git a/keyboards/hineybush/h60/keymaps/via/readme.md b/keyboards/hineybush/h60/keymaps/via/readme.md deleted file mode 100644 index a8d6e39e151..00000000000 --- a/keyboards/hineybush/h60/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for h60 diff --git a/keyboards/hineybush/h65/keymaps/default/readme.md b/keyboards/hineybush/h65/keymaps/default/readme.md deleted file mode 100644 index 17b99a5cde9..00000000000 --- a/keyboards/hineybush/h65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for h65 diff --git a/keyboards/hineybush/h65/keymaps/via/readme.md b/keyboards/hineybush/h65/keymaps/via/readme.md deleted file mode 100644 index ec8815555fc..00000000000 --- a/keyboards/hineybush/h65/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for h65 diff --git a/keyboards/hineybush/h65_hotswap/keymaps/default/readme.md b/keyboards/hineybush/h65_hotswap/keymaps/default/readme.md deleted file mode 100644 index 9984e095316..00000000000 --- a/keyboards/hineybush/h65_hotswap/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for h65 hotswap diff --git a/keyboards/hineybush/h65_hotswap/keymaps/via/readme.md b/keyboards/hineybush/h65_hotswap/keymaps/via/readme.md deleted file mode 100644 index a8811e97c15..00000000000 --- a/keyboards/hineybush/h65_hotswap/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for h65 hotswap diff --git a/keyboards/hineybush/h660s/keymaps/default/readme.md b/keyboards/hineybush/h660s/keymaps/default/readme.md deleted file mode 100644 index 0487cfb1a69..00000000000 --- a/keyboards/hineybush/h660s/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for h660-s diff --git a/keyboards/hineybush/h660s/keymaps/via/readme.md b/keyboards/hineybush/h660s/keymaps/via/readme.md deleted file mode 100644 index fd91fc8e96b..00000000000 --- a/keyboards/hineybush/h660s/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for h660-s diff --git a/keyboards/hineybush/h75_singa/keymaps/default/readme.md b/keyboards/hineybush/h75_singa/keymaps/default/readme.md deleted file mode 100644 index cf2ef2d8184..00000000000 --- a/keyboards/hineybush/h75_singa/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for h75_singa diff --git a/keyboards/hineybush/h75_singa/keymaps/via/readme.md b/keyboards/hineybush/h75_singa/keymaps/via/readme.md deleted file mode 100644 index 4c3cfd80098..00000000000 --- a/keyboards/hineybush/h75_singa/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for h75_singa diff --git a/keyboards/hineybush/h75_singa/keymaps/wkl_std/readme.md b/keyboards/hineybush/h75_singa/keymaps/wkl_std/readme.md deleted file mode 100644 index cbffa642ce2..00000000000 --- a/keyboards/hineybush/h75_singa/keymaps/wkl_std/readme.md +++ /dev/null @@ -1 +0,0 @@ -# A basic winkeyless keymap with full-sized backspace for h75_singa diff --git a/keyboards/hineybush/h87a/keymaps/default/readme.md b/keyboards/hineybush/h87a/keymaps/default/readme.md deleted file mode 100644 index da22afc6ad3..00000000000 --- a/keyboards/hineybush/h87a/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for h87a \ No newline at end of file diff --git a/keyboards/hineybush/h87a/keymaps/via/readme.md b/keyboards/hineybush/h87a/keymaps/via/readme.md deleted file mode 100644 index f81b69ee838..00000000000 --- a/keyboards/hineybush/h87a/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for h87a diff --git a/keyboards/hineybush/h87a/keymaps/wkl/readme.md b/keyboards/hineybush/h87a/keymaps/wkl/readme.md deleted file mode 100644 index da22afc6ad3..00000000000 --- a/keyboards/hineybush/h87a/keymaps/wkl/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for h87a \ No newline at end of file diff --git a/keyboards/hineybush/h88/keymaps/default/readme.md b/keyboards/hineybush/h88/keymaps/default/readme.md deleted file mode 100644 index 455a2e00e85..00000000000 --- a/keyboards/hineybush/h88/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for h88a diff --git a/keyboards/hineybush/h88/keymaps/via/readme.md b/keyboards/hineybush/h88/keymaps/via/readme.md deleted file mode 100644 index 086686e7d67..00000000000 --- a/keyboards/hineybush/h88/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for h88a diff --git a/keyboards/hineybush/h88/keymaps/wkl/readme.md b/keyboards/hineybush/h88/keymaps/wkl/readme.md deleted file mode 100644 index bc0d78f04e2..00000000000 --- a/keyboards/hineybush/h88/keymaps/wkl/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The wkl keymap for h88a diff --git a/keyboards/hineybush/hbcp/keymaps/default/readme.md b/keyboards/hineybush/hbcp/keymaps/default/readme.md deleted file mode 100644 index 8cbd45cd094..00000000000 --- a/keyboards/hineybush/hbcp/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The default "all key" keymap for hbcp -# Somewhat dirty with ISO and split backspace, but has all keys diff --git a/keyboards/hineybush/hbcp/keymaps/hiney/readme.md b/keyboards/hineybush/hbcp/keymaps/hiney/readme.md deleted file mode 100644 index 2829d4b5bad..00000000000 --- a/keyboards/hineybush/hbcp/keymaps/hiney/readme.md +++ /dev/null @@ -1 +0,0 @@ -# hineybush's keymap for hbcp diff --git a/keyboards/hineybush/hbcp/keymaps/via/readme.md b/keyboards/hineybush/hbcp/keymaps/via/readme.md deleted file mode 100644 index be77ea7ff61..00000000000 --- a/keyboards/hineybush/hbcp/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The default VIA keymap for hbcp - diff --git a/keyboards/hineybush/hbcp/keymaps/wkl/readme.md b/keyboards/hineybush/hbcp/keymaps/wkl/readme.md deleted file mode 100644 index 70f59363705..00000000000 --- a/keyboards/hineybush/hbcp/keymaps/wkl/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default WKL keymap for hbcp diff --git a/keyboards/hineybush/hineyg80/keymaps/default/readme.md b/keyboards/hineybush/hineyg80/keymaps/default/readme.md deleted file mode 100644 index 3e0d8343c7f..00000000000 --- a/keyboards/hineybush/hineyg80/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for hineyg80 \ No newline at end of file diff --git a/keyboards/hineybush/hineyg80/keymaps/wkl/readme.md b/keyboards/hineybush/hineyg80/keymaps/wkl/readme.md deleted file mode 100644 index 3e0d8343c7f..00000000000 --- a/keyboards/hineybush/hineyg80/keymaps/wkl/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for hineyg80 \ No newline at end of file diff --git a/keyboards/hineybush/physix/keymaps/default/readme.md b/keyboards/hineybush/physix/keymaps/default/readme.md deleted file mode 100644 index 0127c70d357..00000000000 --- a/keyboards/hineybush/physix/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for physix diff --git a/keyboards/hineybush/physix/keymaps/via/readme.md b/keyboards/hineybush/physix/keymaps/via/readme.md deleted file mode 100644 index a976ffd0c9b..00000000000 --- a/keyboards/hineybush/physix/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# A VIA-enabled keymap for physix diff --git a/keyboards/hineybush/sm68/keymaps/default/readme.md b/keyboards/hineybush/sm68/keymaps/default/readme.md deleted file mode 100644 index 90031c3b02e..00000000000 --- a/keyboards/hineybush/sm68/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for sm68 diff --git a/keyboards/hineybush/sm68/keymaps/via/readme.md b/keyboards/hineybush/sm68/keymaps/via/readme.md deleted file mode 100644 index 93e99290dfe..00000000000 --- a/keyboards/hineybush/sm68/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for sm68 diff --git a/keyboards/hnahkb/freyr/keymaps/default/readme.md b/keyboards/hnahkb/freyr/keymaps/default/readme.md deleted file mode 100644 index dfb2794c66b..00000000000 --- a/keyboards/hnahkb/freyr/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for freyr diff --git a/keyboards/hnahkb/stella/keymaps/default/readme.md b/keyboards/hnahkb/stella/keymaps/default/readme.md deleted file mode 100644 index fa9cd4a555b..00000000000 --- a/keyboards/hnahkb/stella/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for stella diff --git a/keyboards/hnahkb/vn66/keymaps/default/readme.md b/keyboards/hnahkb/vn66/keymaps/default/readme.md deleted file mode 100644 index f6119fbc876..00000000000 --- a/keyboards/hnahkb/vn66/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for vn66 diff --git a/keyboards/holyswitch/southpaw75/keymaps/default/readme.md b/keyboards/holyswitch/southpaw75/keymaps/default/readme.md deleted file mode 100644 index bbcf7d1143f..00000000000 --- a/keyboards/holyswitch/southpaw75/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for southpaw75 diff --git a/keyboards/horrortroll/paws60/keymaps/default/readme.md b/keyboards/horrortroll/paws60/keymaps/default/readme.md deleted file mode 100644 index f450e1a2244..00000000000 --- a/keyboards/horrortroll/paws60/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Layout - -Keymap is default 61 qwerty, 60% layout with split backspace & split right shift diff --git a/keyboards/horrortroll/paws60/keymaps/via/readme.md b/keyboards/horrortroll/paws60/keymaps/via/readme.md deleted file mode 100644 index 13fa492ddff..00000000000 --- a/keyboards/horrortroll/paws60/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Layout with VIA - -Keymap is default 61 qwerty, 60% layout with split backspace & split right shift diff --git a/keyboards/ianklug/grooveboard/keymaps/default/readme.md b/keyboards/ianklug/grooveboard/keymaps/default/readme.md deleted file mode 100644 index 95ec856a520..00000000000 --- a/keyboards/ianklug/grooveboard/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for grooveboard diff --git a/keyboards/ianklug/grooveboard/keymaps/via/readme.md b/keyboards/ianklug/grooveboard/keymaps/via/readme.md deleted file mode 100644 index 0963f48e621..00000000000 --- a/keyboards/ianklug/grooveboard/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for grooveboard diff --git a/keyboards/ibm/model_m/teensy2/keymaps/default/readme.md b/keyboards/ibm/model_m/teensy2/keymaps/default/readme.md deleted file mode 100644 index fb91a8ebe52..00000000000 --- a/keyboards/ibm/model_m/teensy2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for modelm101 \ No newline at end of file diff --git a/keyboards/ibm/model_m/teensypp/keymaps/default/readme.md b/keyboards/ibm/model_m/teensypp/keymaps/default/readme.md deleted file mode 100644 index fb91a8ebe52..00000000000 --- a/keyboards/ibm/model_m/teensypp/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for modelm101 \ No newline at end of file diff --git a/keyboards/ibm/model_m_4th_gen/keymaps/default/readme.md b/keyboards/ibm/model_m_4th_gen/keymaps/default/readme.md deleted file mode 100644 index 06a8d26116e..00000000000 --- a/keyboards/ibm/model_m_4th_gen/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for ibm/model_m_4th_gen/$(CONTROLLER) diff --git a/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/default/readme.md b/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/default/readme.md deleted file mode 100644 index bc829be2662..00000000000 --- a/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for modelm_ssk diff --git a/keyboards/ibnuda/alicia_cook/keymaps/default/readme.md b/keyboards/ibnuda/alicia_cook/keymaps/default/readme.md deleted file mode 100644 index 18f516f6fbb..00000000000 --- a/keyboards/ibnuda/alicia_cook/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for alicia_cook diff --git a/keyboards/ibnuda/gurindam/keymaps/default/readme.md b/keyboards/ibnuda/gurindam/keymaps/default/readme.md deleted file mode 100644 index 52e0c72c531..00000000000 --- a/keyboards/ibnuda/gurindam/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for gurindam \ No newline at end of file diff --git a/keyboards/idank/sweeq/keymaps/default/readme.md b/keyboards/idank/sweeq/keymaps/default/readme.md deleted file mode 100644 index 4d08a5502aa..00000000000 --- a/keyboards/idank/sweeq/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -See the readme of the Ferris [default keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ferris/keymaps/default). diff --git a/keyboards/idobao/id75/keymaps/default/readme.md b/keyboards/idobao/id75/keymaps/default/readme.md deleted file mode 100644 index 577c62b51f8..00000000000 --- a/keyboards/idobao/id75/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for idobo diff --git a/keyboards/idobao/id75/keymaps/default75/readme.md b/keyboards/idobao/id75/keymaps/default75/readme.md deleted file mode 100644 index a1c0236ed9c..00000000000 --- a/keyboards/idobao/id75/keymaps/default75/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for xd75, with led controls \ No newline at end of file diff --git a/keyboards/idobao/id87/v1/keymaps/default/readme.md b/keyboards/idobao/id87/v1/keymaps/default/readme.md deleted file mode 100644 index 6054431de49..00000000000 --- a/keyboards/idobao/id87/v1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for id87 \ No newline at end of file diff --git a/keyboards/idobao/montex/v1rgb/keymaps/default/readme.md b/keyboards/idobao/montex/v1rgb/keymaps/default/readme.md deleted file mode 100755 index a5ed54cbc55..00000000000 --- a/keyboards/idobao/montex/v1rgb/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for RGB Version - -![](https://idobao.github.io/kle/idobao-id27-v2.png) diff --git a/keyboards/idobao/montex/v1rgb/keymaps/via/readme.md b/keyboards/idobao/montex/v1rgb/keymaps/via/readme.md deleted file mode 100755 index 692de7e69fd..00000000000 --- a/keyboards/idobao/montex/v1rgb/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The VIA keymap for RGB Version - -![](https://idobao.github.io/kle/idobao-id27-v2.png) diff --git a/keyboards/illuminati/is0/keymaps/default/readme.md b/keyboards/illuminati/is0/keymaps/default/readme.md deleted file mode 100644 index 84110e663a9..00000000000 --- a/keyboards/illuminati/is0/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for is0 - -Simply to verify that it works. \ No newline at end of file diff --git a/keyboards/illuminati/is0/keymaps/via/readme.md b/keyboards/illuminati/is0/keymaps/via/readme.md deleted file mode 100644 index 1c12e453033..00000000000 --- a/keyboards/illuminati/is0/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for is0 diff --git a/keyboards/illusion/rosa/keymaps/default/readme.md b/keyboards/illusion/rosa/keymaps/default/readme.md deleted file mode 100644 index 7acbd7dea26..00000000000 --- a/keyboards/illusion/rosa/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Rosa PCB \ No newline at end of file diff --git a/keyboards/illusion/rosa/keymaps/split_bs_rshift/readme.md b/keyboards/illusion/rosa/keymaps/split_bs_rshift/readme.md deleted file mode 100644 index 767db354900..00000000000 --- a/keyboards/illusion/rosa/keymaps/split_bs_rshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The keymap with split backspace and split right shift for the Rosa PCB \ No newline at end of file diff --git a/keyboards/illusion/rosa/keymaps/split_rshift/readme.md b/keyboards/illusion/rosa/keymaps/split_rshift/readme.md deleted file mode 100644 index ef68f253ffc..00000000000 --- a/keyboards/illusion/rosa/keymaps/split_rshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The keymap with split right shift for the Rosa PCB \ No newline at end of file diff --git a/keyboards/illusion/rosa/keymaps/via/readme.md b/keyboards/illusion/rosa/keymaps/via/readme.md deleted file mode 100644 index 4b3ccd070c1..00000000000 --- a/keyboards/illusion/rosa/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Rosa. \ No newline at end of file diff --git a/keyboards/ingrained/keymaps/3x5/readme.md b/keyboards/ingrained/keymaps/3x5/readme.md deleted file mode 100644 index c2a997fcbf4..00000000000 --- a/keyboards/ingrained/keymaps/3x5/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 3x5 keymap for ingrained diff --git a/keyboards/ingrained/keymaps/default/readme.md b/keyboards/ingrained/keymaps/default/readme.md deleted file mode 100644 index 804feead667..00000000000 --- a/keyboards/ingrained/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for ingrained diff --git a/keyboards/io_mini1800/keymaps/2x3u/readme.md b/keyboards/io_mini1800/keymaps/2x3u/readme.md deleted file mode 100644 index 7e6980f5cdd..00000000000 --- a/keyboards/io_mini1800/keymaps/2x3u/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default Split Spacebar keymap for io_mini1800 diff --git a/keyboards/io_mini1800/keymaps/default/readme.md b/keyboards/io_mini1800/keymaps/default/readme.md deleted file mode 100644 index 4bcc9ba5120..00000000000 --- a/keyboards/io_mini1800/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for io_mini1800 diff --git a/keyboards/iriskeyboards/keymaps/default/readme.md b/keyboards/iriskeyboards/keymaps/default/readme.md deleted file mode 100644 index fe7026dbe3f..00000000000 --- a/keyboards/iriskeyboards/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for iriskeyboards diff --git a/keyboards/iriskeyboards/keymaps/via/readme.md b/keyboards/iriskeyboards/keymaps/via/readme.md deleted file mode 100644 index fe7026dbe3f..00000000000 --- a/keyboards/iriskeyboards/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for iriskeyboards diff --git a/keyboards/j80/keymaps/default/readme.md b/keyboards/j80/keymaps/default/readme.md deleted file mode 100644 index 21ad7d5aba9..00000000000 --- a/keyboards/j80/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for J80 diff --git a/keyboards/j80/keymaps/default_iso/readme.md b/keyboards/j80/keymaps/default_iso/readme.md deleted file mode 100644 index db7bdb41578..00000000000 --- a/keyboards/j80/keymaps/default_iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ISO keymap for J80 diff --git a/keyboards/jacky_studio/bear_65/keymaps/default/readme.md b/keyboards/jacky_studio/bear_65/keymaps/default/readme.md deleted file mode 100644 index d5173485577..00000000000 --- a/keyboards/jacky_studio/bear_65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bear_65 diff --git a/keyboards/jacky_studio/bear_65/keymaps/via/readme.md b/keyboards/jacky_studio/bear_65/keymaps/via/readme.md deleted file mode 100644 index 5cb67ab25f3..00000000000 --- a/keyboards/jacky_studio/bear_65/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for bear_65 diff --git a/keyboards/jae/j01/keymaps/default/readme.md b/keyboards/jae/j01/keymaps/default/readme.md deleted file mode 100644 index cd7209ec74a..00000000000 --- a/keyboards/jae/j01/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for j01 diff --git a/keyboards/jagdpietr/drakon/keymaps/default/readme.md b/keyboards/jagdpietr/drakon/keymaps/default/readme.md deleted file mode 100644 index e56b5a93bbd..00000000000 --- a/keyboards/jagdpietr/drakon/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for drakon diff --git a/keyboards/jagdpietr/drakon/keymaps/wkl/readme.md b/keyboards/jagdpietr/drakon/keymaps/wkl/readme.md deleted file mode 100644 index 46356035b01..00000000000 --- a/keyboards/jagdpietr/drakon/keymaps/wkl/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The Winkeyless keymap for drakon diff --git a/keyboards/jones/v03/keymaps/default/readme.md b/keyboards/jones/v03/keymaps/default/readme.md deleted file mode 100644 index a23bc4c15a0..00000000000 --- a/keyboards/jones/v03/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Defalut keymap for Jones diff --git a/keyboards/jones/v03/keymaps/default_jp/readme.md b/keyboards/jones/v03/keymaps/default_jp/readme.md deleted file mode 100644 index a5d679aefdd..00000000000 --- a/keyboards/jones/v03/keymaps/default_jp/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default JP-style keymap for Jones diff --git a/keyboards/jones/v03_1/keymaps/default/readme.md b/keyboards/jones/v03_1/keymaps/default/readme.md deleted file mode 100644 index a23bc4c15a0..00000000000 --- a/keyboards/jones/v03_1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Defalut keymap for Jones diff --git a/keyboards/jones/v03_1/keymaps/default_ansi/readme.md b/keyboards/jones/v03_1/keymaps/default_ansi/readme.md deleted file mode 100644 index 1838a84adc1..00000000000 --- a/keyboards/jones/v03_1/keymaps/default_ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Defalut ANSI-style keymap for Jones diff --git a/keyboards/jones/v03_1/keymaps/default_jp/readme.md b/keyboards/jones/v03_1/keymaps/default_jp/readme.md deleted file mode 100644 index 0cb2c18a4cc..00000000000 --- a/keyboards/jones/v03_1/keymaps/default_jp/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Defalut JP-style keymap for Jones diff --git a/keyboards/k34/keymaps/default/readme.md b/keyboards/k34/keymaps/default/readme.md deleted file mode 100644 index bad277222b0..00000000000 --- a/keyboards/k34/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for k34 diff --git a/keyboards/kagizaraya/chidori/keymaps/default/readme.md b/keyboards/kagizaraya/chidori/keymaps/default/readme.md deleted file mode 100644 index 8e66dc4b39d..00000000000 --- a/keyboards/kagizaraya/chidori/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for chidori diff --git a/keyboards/kagizaraya/chidori/keymaps/extended/readme.md b/keyboards/kagizaraya/chidori/keymaps/extended/readme.md deleted file mode 100644 index 5bfdbedcce3..00000000000 --- a/keyboards/kagizaraya/chidori/keymaps/extended/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The extended keymap for chidori diff --git a/keyboards/kagizaraya/halberd/keymaps/default/readme.md b/keyboards/kagizaraya/halberd/keymaps/default/readme.md deleted file mode 100644 index 567b45c4747..00000000000 --- a/keyboards/kagizaraya/halberd/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for halberd diff --git a/keyboards/kagizaraya/halberd/keymaps/right_modifiers/readme.md b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/readme.md deleted file mode 100644 index 2479922bdc1..00000000000 --- a/keyboards/kagizaraya/halberd/keymaps/right_modifiers/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# Modifiers on the right side. - diff --git a/keyboards/kagizaraya/scythe/keymaps/default/readme.md b/keyboards/kagizaraya/scythe/keymaps/default/readme.md deleted file mode 100644 index c4d73c4e33d..00000000000 --- a/keyboards/kagizaraya/scythe/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The default keymap for scythe - diff --git a/keyboards/kakunpc/angel17/keymaps/default/readme.md b/keyboards/kakunpc/angel17/keymaps/default/readme.md deleted file mode 100644 index a509fef7a35..00000000000 --- a/keyboards/kakunpc/angel17/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for angel17 \ No newline at end of file diff --git a/keyboards/kakunpc/angel64/alpha/keymaps/default/readme.md b/keyboards/kakunpc/angel64/alpha/keymaps/default/readme.md deleted file mode 100644 index f4cd48f2ef9..00000000000 --- a/keyboards/kakunpc/angel64/alpha/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for angel64 \ No newline at end of file diff --git a/keyboards/kakunpc/angel64/rev1/keymaps/default/readme.md b/keyboards/kakunpc/angel64/rev1/keymaps/default/readme.md deleted file mode 100644 index f4cd48f2ef9..00000000000 --- a/keyboards/kakunpc/angel64/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for angel64 \ No newline at end of file diff --git a/keyboards/kakunpc/business_card/alpha/keymaps/default/readme.md b/keyboards/kakunpc/business_card/alpha/keymaps/default/readme.md deleted file mode 100644 index 22cc77eebff..00000000000 --- a/keyboards/kakunpc/business_card/alpha/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for business_card \ No newline at end of file diff --git a/keyboards/kakunpc/business_card/beta/keymaps/default/readme.md b/keyboards/kakunpc/business_card/beta/keymaps/default/readme.md deleted file mode 100644 index 22cc77eebff..00000000000 --- a/keyboards/kakunpc/business_card/beta/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for business_card \ No newline at end of file diff --git a/keyboards/kakunpc/choc_taro/keymaps/default/readme.md b/keyboards/kakunpc/choc_taro/keymaps/default/readme.md deleted file mode 100644 index a2cb119040a..00000000000 --- a/keyboards/kakunpc/choc_taro/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for choc_taro diff --git a/keyboards/kakunpc/choc_taro/keymaps/via/readme.md b/keyboards/kakunpc/choc_taro/keymaps/via/readme.md deleted file mode 100644 index cb3af77dfab..00000000000 --- a/keyboards/kakunpc/choc_taro/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for choc_taro - -This is an experimental. Use at your own risk. diff --git a/keyboards/kakunpc/rabbit_capture_plan/keymaps/default/readme.md b/keyboards/kakunpc/rabbit_capture_plan/keymaps/default/readme.md deleted file mode 100644 index 2ececc3fc2a..00000000000 --- a/keyboards/kakunpc/rabbit_capture_plan/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for rabbit_capture_plan diff --git a/keyboards/kakunpc/rabbit_capture_plan/keymaps/via/readme.md b/keyboards/kakunpc/rabbit_capture_plan/keymaps/via/readme.md deleted file mode 100644 index 928cdb8b777..00000000000 --- a/keyboards/kakunpc/rabbit_capture_plan/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for rabbit_capture_plan diff --git a/keyboards/kakunpc/suihankey/alpha/keymaps/default/readme.md b/keyboards/kakunpc/suihankey/alpha/keymaps/default/readme.md deleted file mode 100644 index 95eac805a02..00000000000 --- a/keyboards/kakunpc/suihankey/alpha/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for suihankey \ No newline at end of file diff --git a/keyboards/kakunpc/suihankey/rev1/keymaps/default/readme.md b/keyboards/kakunpc/suihankey/rev1/keymaps/default/readme.md deleted file mode 100644 index 95eac805a02..00000000000 --- a/keyboards/kakunpc/suihankey/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for suihankey \ No newline at end of file diff --git a/keyboards/kakunpc/suihankey/split/keymaps/default/readme.md b/keyboards/kakunpc/suihankey/split/keymaps/default/readme.md deleted file mode 100644 index 43ede895269..00000000000 --- a/keyboards/kakunpc/suihankey/split/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default split keymap for suihankey diff --git a/keyboards/kakunpc/thedogkeyboard/keymaps/default/readme.md b/keyboards/kakunpc/thedogkeyboard/keymaps/default/readme.md deleted file mode 100644 index 045729a7a5b..00000000000 --- a/keyboards/kakunpc/thedogkeyboard/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for thedogkeyboard diff --git a/keyboards/kapcave/arya/keymaps/default/readme.md b/keyboards/kapcave/arya/keymaps/default/readme.md deleted file mode 100644 index 9d9894862a0..00000000000 --- a/keyboards/kapcave/arya/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -The default layout for the KapCave Arya \ No newline at end of file diff --git a/keyboards/kapcave/arya/keymaps/via/readme.md b/keyboards/kapcave/arya/keymaps/via/readme.md deleted file mode 100644 index dcf12fbffde..00000000000 --- a/keyboards/kapcave/arya/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -The VIA Keymap for the KapCave Arya \ No newline at end of file diff --git a/keyboards/kapcave/gskt00/keymaps/default/readme.md b/keyboards/kapcave/gskt00/keymaps/default/readme.md deleted file mode 100644 index 042b07d1489..00000000000 --- a/keyboards/kapcave/gskt00/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -The default keymap for the GSKT-00 PCB. \ No newline at end of file diff --git a/keyboards/kapcave/gskt00/keymaps/via/readme.md b/keyboards/kapcave/gskt00/keymaps/via/readme.md deleted file mode 100644 index c5c3db7e3b0..00000000000 --- a/keyboards/kapcave/gskt00/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -The via keymap for the GSKT-00 PCB. \ No newline at end of file diff --git a/keyboards/kapcave/paladinpad/keymaps/default/readme.md b/keyboards/kapcave/paladinpad/keymaps/default/readme.md deleted file mode 100644 index 2ade4edf388..00000000000 --- a/keyboards/kapcave/paladinpad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -The default keymap for PaladinPad which resembles the AEK Numpad \ No newline at end of file diff --git a/keyboards/kapcave/paladinpad/keymaps/ortho/readme.md b/keyboards/kapcave/paladinpad/keymaps/ortho/readme.md deleted file mode 100644 index 4dc98d30f49..00000000000 --- a/keyboards/kapcave/paladinpad/keymaps/ortho/readme.md +++ /dev/null @@ -1 +0,0 @@ -The ortho keymap for PaladinPad which makes it a 5x4 ortho pad \ No newline at end of file diff --git a/keyboards/kbdclack/kaishi65/keymaps/default/readme.md b/keyboards/kbdclack/kaishi65/keymaps/default/readme.md deleted file mode 100644 index c3c1392a96a..00000000000 --- a/keyboards/kbdclack/kaishi65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for kaishi65 diff --git a/keyboards/kbdfans/kbd4x/keymaps/default/readme.md b/keyboards/kbdfans/kbd4x/keymaps/default/readme.md deleted file mode 100644 index a950a25ace7..00000000000 --- a/keyboards/kbdfans/kbd4x/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for kbd4x diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/default/readme.md b/keyboards/kbdfans/kbd67/hotswap/keymaps/default/readme.md deleted file mode 100644 index 7e681294f2f..00000000000 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for hotswap diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/readme.md b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/readme.md deleted file mode 100644 index 051a9ce1644..00000000000 --- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default ANSI keymap for KBD67 MKII - -A basic 65% keymap. diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/readme.md b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/readme.md deleted file mode 100644 index 1f3f3633560..00000000000 --- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ansi_split_bs/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default ANSI with Split Backspace keymap for KBD67 MKII - -A basic 65% keymap. diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/readme.md b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/readme.md deleted file mode 100644 index dec2b048627..00000000000 --- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for KBD67 MKII - -A basic 65% keymap. diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/readme.md b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/readme.md deleted file mode 100644 index e2dd061075d..00000000000 --- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default ISO keymap for KBD67 MKII - -A basic 65% keymap. diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker/readme.md b/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker/readme.md deleted file mode 100644 index de149da1b63..00000000000 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Ansi with blocker keymap for kbd67 diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker_splitbs/readme.md b/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker_splitbs/readme.md deleted file mode 100644 index de149da1b63..00000000000 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_blocker_splitbs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Ansi with blocker keymap for kbd67 diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/readme.md b/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/readme.md deleted file mode 100644 index 980bf97c201..00000000000 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Keymap for kbd67 rev.2 tofu65, with split spacebar diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/default/readme.md b/keyboards/kbdfans/kbd67/rev2/keymaps/default/readme.md deleted file mode 100644 index 2cb43c5e1a3..00000000000 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for kbd67 diff --git a/keyboards/kbdfans/kbd6x/keymaps/default/readme.md b/keyboards/kbdfans/kbd6x/keymaps/default/readme.md deleted file mode 100644 index c416cd8fa72..00000000000 --- a/keyboards/kbdfans/kbd6x/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for kbd6x diff --git a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/readme.md b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/readme.md deleted file mode 100644 index be22dd16c0b..00000000000 --- a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/readme.md +++ /dev/null @@ -1 +0,0 @@ -# this is the default hhkb layout in a more useable normalized form (aka the way i use mine) \ No newline at end of file diff --git a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/readme.md b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/readme.md deleted file mode 100644 index cf93c3553a2..00000000000 --- a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# default hhkb layout adapted to the 6x (for tofu hhkb) \ No newline at end of file diff --git a/keyboards/kbdfans/kbd8x/keymaps/default/readme.md b/keyboards/kbdfans/kbd8x/keymaps/default/readme.md deleted file mode 100644 index 773a3dfbaee..00000000000 --- a/keyboards/kbdfans/kbd8x/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for kbd8x - -This keymap uses the LAYOUT_all macro when creating its keymap. \ No newline at end of file diff --git a/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/readme.md b/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/readme.md deleted file mode 100644 index 773a3dfbaee..00000000000 --- a/keyboards/kbdfans/kbd8x/keymaps/default_backlighting/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for kbd8x - -This keymap uses the LAYOUT_all macro when creating its keymap. \ No newline at end of file diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/ansi_7/readme.md b/keyboards/kbdfans/kbd8x_mk2/keymaps/ansi_7/readme.md deleted file mode 100644 index c0f5b86294f..00000000000 --- a/keyboards/kbdfans/kbd8x_mk2/keymaps/ansi_7/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The ANSI WKL keymap for KBD8X MKII - -A typical setup for the 1.5/7U bottom row. \ No newline at end of file diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/default/readme.md b/keyboards/kbdfans/kbd8x_mk2/keymaps/default/readme.md deleted file mode 100644 index 287ee702a0d..00000000000 --- a/keyboards/kbdfans/kbd8x_mk2/keymaps/default/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# The default keymap for KBD8X MKII - -A typical setup. Nothing special. -A nice starting point for customizing. diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/default_ansi/readme.md b/keyboards/kbdfans/kbd8x_mk2/keymaps/default_ansi/readme.md deleted file mode 100644 index d3e716f58a4..00000000000 --- a/keyboards/kbdfans/kbd8x_mk2/keymaps/default_ansi/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The ANSI 6.25U keymap for KBD8X MKII - -A typical ANSI setup for the 1.25/6.25U bottom row. \ No newline at end of file diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/default_iso/readme.md b/keyboards/kbdfans/kbd8x_mk2/keymaps/default_iso/readme.md deleted file mode 100644 index 489a2b7b988..00000000000 --- a/keyboards/kbdfans/kbd8x_mk2/keymaps/default_iso/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The ISO 6.25U keymap for KBD8X MKII - -A typical ISO setup for the 1.25/6.25U bottom row. \ No newline at end of file diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_625/readme.md b/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_625/readme.md deleted file mode 100644 index 38760b7ad79..00000000000 --- a/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_625/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The ISO 6.25U keymap for KBD8X MKII - -A typical setup for an ISO layout using 1.25/6.25U bottom row. \ No newline at end of file diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_7/readme.md b/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_7/readme.md deleted file mode 100644 index 2f0eb196177..00000000000 --- a/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_7/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The ISO 7U keymap for KBD8X MKII - -A typical setup for an ISO layout using 1.5/7U bottom row. \ No newline at end of file diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/via/readme.md b/keyboards/kbdfans/kbd8x_mk2/keymaps/via/readme.md deleted file mode 100644 index 52c06a3108b..00000000000 --- a/keyboards/kbdfans/kbd8x_mk2/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Via keymap for VIA - -Based on the default keymap. diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/default/readme.md b/keyboards/kbdfans/kbdpad/mk2/keymaps/default/readme.md deleted file mode 100644 index 71ff8e0025d..00000000000 --- a/keyboards/kbdfans/kbdpad/mk2/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for KBDPAD MKII - -Just a numpad. Top row from Cherry G80-3700 \ No newline at end of file diff --git a/keyboards/kbdfans/niu_mini/keymaps/default/readme.md b/keyboards/kbdfans/niu_mini/keymaps/default/readme.md deleted file mode 100644 index a2f2aa2f468..00000000000 --- a/keyboards/kbdfans/niu_mini/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# Default layout -Default layout that shipped with the NIU mini diff --git a/keyboards/kc60/keymaps/via/readme.md b/keyboards/kc60/keymaps/via/readme.md deleted file mode 100644 index e573ceee4f0..00000000000 --- a/keyboards/kc60/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for KC60 diff --git a/keyboards/keebformom/keymaps/default/readme.md b/keyboards/keebformom/keymaps/default/readme.md deleted file mode 100644 index a6d199a4b74..00000000000 --- a/keyboards/keebformom/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Keeb For Mom diff --git a/keyboards/keebio/choconum/keymaps/via/readme.md b/keyboards/keebio/choconum/keymaps/via/readme.md deleted file mode 100644 index 58d53f0dfef..00000000000 --- a/keyboards/keebio/choconum/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for choconum diff --git a/keyboards/keebio/ergodicity/keymaps/default/readme.md b/keyboards/keebio/ergodicity/keymaps/default/readme.md deleted file mode 100644 index 906b26c649d..00000000000 --- a/keyboards/keebio/ergodicity/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for ergodicity diff --git a/keyboards/keebio/tukey/keymaps/default/readme.md b/keyboards/keebio/tukey/keymaps/default/readme.md deleted file mode 100644 index 7112da958a1..00000000000 --- a/keyboards/keebio/tukey/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for tukey diff --git a/keyboards/keebwerk/nano_slider/keymaps/default/readme.md b/keyboards/keebwerk/nano_slider/keymaps/default/readme.md deleted file mode 100644 index 55a8805553a..00000000000 --- a/keyboards/keebwerk/nano_slider/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for nano_slider diff --git a/keyboards/keebzdotnet/wazowski/keymaps/default/readme.md b/keyboards/keebzdotnet/wazowski/keymaps/default/readme.md deleted file mode 100644 index 435ccad319b..00000000000 --- a/keyboards/keebzdotnet/wazowski/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for wazowski diff --git a/keyboards/keybage/radpad/keymaps/default/readme.md b/keyboards/keybage/radpad/keymaps/default/readme.md deleted file mode 100644 index 053bf297b7a..00000000000 --- a/keyboards/keybage/radpad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for radpad diff --git a/keyboards/keyhive/absinthe/keymaps/ansi/readme.md b/keyboards/keyhive/absinthe/keymaps/ansi/readme.md deleted file mode 100644 index e88d0cf9dd8..00000000000 --- a/keyboards/keyhive/absinthe/keymaps/ansi/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The all ANSI keymap for absinthe - -![default absinthe keymap](https://i.imgur.com/td0vfz0.png) diff --git a/keyboards/keyhive/maypad/keymaps/default/readme.md b/keyboards/keyhive/maypad/keymaps/default/readme.md deleted file mode 100644 index fbd112d92d1..00000000000 --- a/keyboards/keyhive/maypad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for maypad \ No newline at end of file diff --git a/keyboards/keyprez/bison/keymaps/default/readme.md b/keyboards/keyprez/bison/keymaps/default/readme.md deleted file mode 100644 index b8557bbc8e5..00000000000 --- a/keyboards/keyprez/bison/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bison diff --git a/keyboards/keyprez/bison/keymaps/default_6_6/readme.md b/keyboards/keyprez/bison/keymaps/default_6_6/readme.md deleted file mode 100644 index b8557bbc8e5..00000000000 --- a/keyboards/keyprez/bison/keymaps/default_6_6/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bison diff --git a/keyboards/keyprez/bison/keymaps/default_6_8/readme.md b/keyboards/keyprez/bison/keymaps/default_6_8/readme.md deleted file mode 100644 index b8557bbc8e5..00000000000 --- a/keyboards/keyprez/bison/keymaps/default_6_8/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bison diff --git a/keyboards/keyprez/bison/keymaps/default_8_6/readme.md b/keyboards/keyprez/bison/keymaps/default_8_6/readme.md deleted file mode 100644 index b8557bbc8e5..00000000000 --- a/keyboards/keyprez/bison/keymaps/default_8_6/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bison diff --git a/keyboards/keyprez/corgi/keymaps/default/readme.md b/keyboards/keyprez/corgi/keymaps/default/readme.md deleted file mode 100644 index 2d86599374a..00000000000 --- a/keyboards/keyprez/corgi/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for corgi diff --git a/keyboards/keyprez/rhino/keymaps/default/readme.md b/keyboards/keyprez/rhino/keymaps/default/readme.md deleted file mode 100644 index 2a9de9d7463..00000000000 --- a/keyboards/keyprez/rhino/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for rhino diff --git a/keyboards/keyprez/rhino/keymaps/default_7u/readme.md b/keyboards/keyprez/rhino/keymaps/default_7u/readme.md deleted file mode 100644 index 1b930c1e7d7..00000000000 --- a/keyboards/keyprez/rhino/keymaps/default_7u/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default 7u keymap for rhino diff --git a/keyboards/keyprez/rhino/keymaps/default_ergo/readme.md b/keyboards/keyprez/rhino/keymaps/default_ergo/readme.md deleted file mode 100644 index 2a9de9d7463..00000000000 --- a/keyboards/keyprez/rhino/keymaps/default_ergo/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for rhino diff --git a/keyboards/keyprez/unicorn/keymaps/default/readme.md b/keyboards/keyprez/unicorn/keymaps/default/readme.md deleted file mode 100644 index f3e626cc76d..00000000000 --- a/keyboards/keyprez/unicorn/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for unicorn diff --git a/keyboards/keyten/aperture/keymaps/default/readme.md b/keyboards/keyten/aperture/keymaps/default/readme.md deleted file mode 100644 index 59f22e3e8cf..00000000000 --- a/keyboards/keyten/aperture/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Aperture diff --git a/keyboards/keyten/aperture/keymaps/via/readme.md b/keyboards/keyten/aperture/keymaps/via/readme.md deleted file mode 100644 index 9ee17fca403..00000000000 --- a/keyboards/keyten/aperture/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Aperture diff --git a/keyboards/keyten/kt3700/keymaps/default/readme.md b/keyboards/keyten/kt3700/keymaps/default/readme.md deleted file mode 100644 index 2d315a8536b..00000000000 --- a/keyboards/keyten/kt3700/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for kt3700 diff --git a/keyboards/keyten/kt3700/keymaps/via/readme.md b/keyboards/keyten/kt3700/keymaps/via/readme.md deleted file mode 100644 index eb53ddbfe13..00000000000 --- a/keyboards/keyten/kt3700/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for kt3700 diff --git a/keyboards/keyten/kt60_m/keymaps/default/readme.md b/keyboards/keyten/kt60_m/keymaps/default/readme.md deleted file mode 100644 index 821228e1c7c..00000000000 --- a/keyboards/keyten/kt60_m/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for kt60-M diff --git a/keyboards/keyten/kt60_m/keymaps/via/readme.md b/keyboards/keyten/kt60_m/keymaps/via/readme.md deleted file mode 100644 index 4d8109bbde7..00000000000 --- a/keyboards/keyten/kt60_m/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for kt60-M diff --git a/keyboards/kinesis/keymaps/default/readme.md b/keyboards/kinesis/keymaps/default/readme.md deleted file mode 100644 index da033be1e95..00000000000 --- a/keyboards/kinesis/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for kinesis-advantage diff --git a/keyboards/kingly_keys/ropro/keymaps/default/readme.md b/keyboards/kingly_keys/ropro/keymaps/default/readme.md deleted file mode 100644 index 5d7ff3dccc8..00000000000 --- a/keyboards/kingly_keys/ropro/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The BASE Layout for the RoPro diff --git a/keyboards/kira/kira75/keymaps/default/readme.md b/keyboards/kira/kira75/keymaps/default/readme.md deleted file mode 100644 index fcf6f71110c..00000000000 --- a/keyboards/kira/kira75/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for kira75 diff --git a/keyboards/kira/kira80/keymaps/ansi/readme.md b/keyboards/kira/kira80/keymaps/ansi/readme.md deleted file mode 100644 index 183eeaf7482..00000000000 --- a/keyboards/kira/kira80/keymaps/ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ANSI keymap for Kira 80 diff --git a/keyboards/kira/kira80/keymaps/ansi_wkl/readme.md b/keyboards/kira/kira80/keymaps/ansi_wkl/readme.md deleted file mode 100644 index 6e87b5dca3c..00000000000 --- a/keyboards/kira/kira80/keymaps/ansi_wkl/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ANSI WKL keymap for Kira 80 diff --git a/keyboards/kira/kira80/keymaps/default/readme.md b/keyboards/kira/kira80/keymaps/default/readme.md deleted file mode 100644 index 1441cdf666c..00000000000 --- a/keyboards/kira/kira80/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Kira 80 diff --git a/keyboards/kira/kira80/keymaps/iso/readme.md b/keyboards/kira/kira80/keymaps/iso/readme.md deleted file mode 100644 index 538d1f59453..00000000000 --- a/keyboards/kira/kira80/keymaps/iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ISO keymap for Kira 80 diff --git a/keyboards/kira/kira80/keymaps/via/readme.md b/keyboards/kira/kira80/keymaps/via/readme.md deleted file mode 100644 index a72e88c8bae..00000000000 --- a/keyboards/kira/kira80/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# VIA keymap for Kira 80 diff --git a/keyboards/kiwikey/borderland/keymaps/default/readme.md b/keyboards/kiwikey/borderland/keymaps/default/readme.md deleted file mode 100644 index 44d758912ca..00000000000 --- a/keyboards/kiwikey/borderland/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Borderland diff --git a/keyboards/kiwikey/borderland/keymaps/via/readme.md b/keyboards/kiwikey/borderland/keymaps/via/readme.md deleted file mode 100644 index ff14495c6ba..00000000000 --- a/keyboards/kiwikey/borderland/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# VIA keymap for Borderland diff --git a/keyboards/kkatano/bakeneko60/keymaps/default/readme.md b/keyboards/kkatano/bakeneko60/keymaps/default/readme.md deleted file mode 100644 index 5609e2adbbb..00000000000 --- a/keyboards/kkatano/bakeneko60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Bakeneko 60 diff --git a/keyboards/kkatano/bakeneko65/rev2/keymaps/default/readme.md b/keyboards/kkatano/bakeneko65/rev2/keymaps/default/readme.md deleted file mode 100644 index 71ad76773fd..00000000000 --- a/keyboards/kkatano/bakeneko65/rev2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Bakeneko 65 V2 diff --git a/keyboards/kkatano/bakeneko65/rev3/keymaps/default/readme.md b/keyboards/kkatano/bakeneko65/rev3/keymaps/default/readme.md deleted file mode 100644 index ecac9e3dffe..00000000000 --- a/keyboards/kkatano/bakeneko65/rev3/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Bakeneko 65 V3 diff --git a/keyboards/kkatano/bakeneko80/keymaps/default/readme.md b/keyboards/kkatano/bakeneko80/keymaps/default/readme.md deleted file mode 100644 index 65fe06599d7..00000000000 --- a/keyboards/kkatano/bakeneko80/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bakeneko80 diff --git a/keyboards/kkatano/wallaby/keymaps/default/readme.md b/keyboards/kkatano/wallaby/keymaps/default/readme.md deleted file mode 100644 index 517ef1e8576..00000000000 --- a/keyboards/kkatano/wallaby/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for wallaby diff --git a/keyboards/kkatano/yurei/keymaps/default/readme.md b/keyboards/kkatano/yurei/keymaps/default/readme.md deleted file mode 100644 index 4134a11e427..00000000000 --- a/keyboards/kkatano/yurei/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for yurei diff --git a/keyboards/knobgoblin/keymaps/via/readme.md b/keyboards/knobgoblin/keymaps/via/readme.md deleted file mode 100644 index f137c78c3ab..00000000000 --- a/keyboards/knobgoblin/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Ortho Knob Goblin Layout - -Via functionality for the Knob Goblin. Ortho layout. \ No newline at end of file diff --git a/keyboards/kprepublic/bm16a/v1/keymaps/default/readme.md b/keyboards/kprepublic/bm16a/v1/keymaps/default/readme.md deleted file mode 100644 index f356f2cca05..00000000000 --- a/keyboards/kprepublic/bm16a/v1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bm16a \ No newline at end of file diff --git a/keyboards/kprepublic/bm16a/v1/keymaps/via/readme.md b/keyboards/kprepublic/bm16a/v1/keymaps/via/readme.md deleted file mode 100644 index b381108759a..00000000000 --- a/keyboards/kprepublic/bm16a/v1/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Via keymap for bm16a diff --git a/keyboards/kprepublic/bm16s/keymaps/via/readme.md b/keyboards/kprepublic/bm16s/keymaps/via/readme.md deleted file mode 100644 index f5e43b909cb..00000000000 --- a/keyboards/kprepublic/bm16s/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Via keymap for bm16s diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/default/readme.md b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/default/readme.md deleted file mode 100644 index 7fc64a7a057..00000000000 --- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bm40hsrgb diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/via/readme.md b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/via/readme.md deleted file mode 100644 index bff946f327b..00000000000 --- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for bm40hsrgb diff --git a/keyboards/kprepublic/bm43a/keymaps/default/readme.md b/keyboards/kprepublic/bm43a/keymaps/default/readme.md deleted file mode 100644 index cec19a1f9ef..00000000000 --- a/keyboards/kprepublic/bm43a/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bm43a diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/readme.md b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/readme.md deleted file mode 100644 index d45609f3d7e..00000000000 --- a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bm60rgb diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/readme.md b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/readme.md deleted file mode 100644 index 9335f2cab0e..00000000000 --- a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA default keymap for bm60rgb diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/readme.md b/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/readme.md deleted file mode 100644 index 1fd0185d427..00000000000 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bm60rgb_iso diff --git a/keyboards/kprepublic/bm65hsrgb/keymaps/default/readme.md b/keyboards/kprepublic/bm65hsrgb/keymaps/default/readme.md deleted file mode 100644 index 72171ee89a6..00000000000 --- a/keyboards/kprepublic/bm65hsrgb/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bm65rgb diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/readme.md b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/readme.md deleted file mode 100644 index 87c75427560..00000000000 --- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA default keymap for bm65iso diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/readme.md b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/readme.md deleted file mode 100644 index 0408ee9e986..00000000000 --- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bm68rgb diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/readme.md b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/readme.md deleted file mode 100644 index c013ae25e20..00000000000 --- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for bm68rgb \ No newline at end of file diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/default/readme.md b/keyboards/kprepublic/bm80hsrgb/keymaps/default/readme.md deleted file mode 100644 index 8ad360ebda2..00000000000 --- a/keyboards/kprepublic/bm80hsrgb/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bm80 diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/via/readme.md b/keyboards/kprepublic/bm80hsrgb/keymaps/via/readme.md deleted file mode 100644 index 9fb42c24d86..00000000000 --- a/keyboards/kprepublic/bm80hsrgb/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for bm80 diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/default/readme.md b/keyboards/kprepublic/bm980hsrgb/keymaps/default/readme.md deleted file mode 100644 index 4b17a028100..00000000000 --- a/keyboards/kprepublic/bm980hsrgb/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bm980rgb diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/via/readme.md b/keyboards/kprepublic/bm980hsrgb/keymaps/via/readme.md deleted file mode 100644 index a94481a786f..00000000000 --- a/keyboards/kprepublic/bm980hsrgb/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default via keymap for bm980rgb diff --git a/keyboards/ktec/daisy/keymaps/default/readme.md b/keyboards/ktec/daisy/keymaps/default/readme.md deleted file mode 100644 index b8c7d17f285..00000000000 --- a/keyboards/ktec/daisy/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Daisy diff --git a/keyboards/ktec/daisy/keymaps/via/readme.md b/keyboards/ktec/daisy/keymaps/via/readme.md deleted file mode 100644 index 9345124a3c1..00000000000 --- a/keyboards/ktec/daisy/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# VIA keymap for Daisy diff --git a/keyboards/kumaokobo/kudox/columner/keymaps/default/readme.md b/keyboards/kumaokobo/kudox/columner/keymaps/default/readme.md deleted file mode 100644 index 13d9e8bee10..00000000000 --- a/keyboards/kumaokobo/kudox/columner/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Kudox Keyboard Columner diff --git a/keyboards/kumaokobo/kudox/columner/keymaps/via/readme.md b/keyboards/kumaokobo/kudox/columner/keymaps/via/readme.md deleted file mode 100644 index 152df04959f..00000000000 --- a/keyboards/kumaokobo/kudox/columner/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for Kudox Columner Keyboard diff --git a/keyboards/kumaokobo/kudox/rev1/keymaps/default/readme.md b/keyboards/kumaokobo/kudox/rev1/keymaps/default/readme.md deleted file mode 100644 index 98d8b2a054a..00000000000 --- a/keyboards/kumaokobo/kudox/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Kudox Keyboard diff --git a/keyboards/kumaokobo/kudox/rev1/keymaps/jis/readme.md b/keyboards/kumaokobo/kudox/rev1/keymaps/jis/readme.md deleted file mode 100644 index 0f3fae39f71..00000000000 --- a/keyboards/kumaokobo/kudox/rev1/keymaps/jis/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The JIS keymap for Kudox Keyboard diff --git a/keyboards/kumaokobo/kudox/rev3/keymaps/default/readme.md b/keyboards/kumaokobo/kudox/rev3/keymaps/default/readme.md deleted file mode 100644 index aead0ad1f17..00000000000 --- a/keyboards/kumaokobo/kudox/rev3/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Kudox Keyboard Rev3.0 diff --git a/keyboards/kumaokobo/kudox/rev3/keymaps/jis/readme.md b/keyboards/kumaokobo/kudox/rev3/keymaps/jis/readme.md deleted file mode 100644 index 90e7902153a..00000000000 --- a/keyboards/kumaokobo/kudox/rev3/keymaps/jis/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The JIS keymap for Kudox Keyboard Rev3.0 diff --git a/keyboards/kumaokobo/kudox/rev3/keymaps/via/readme.md b/keyboards/kumaokobo/kudox/rev3/keymaps/via/readme.md deleted file mode 100644 index cc95d79eacd..00000000000 --- a/keyboards/kumaokobo/kudox/rev3/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for Kudox Keyboard Rev3.0 diff --git a/keyboards/kumaokobo/kudox_game/keymaps/default/readme.md b/keyboards/kumaokobo/kudox_game/keymaps/default/readme.md deleted file mode 100644 index 0fbdb86a940..00000000000 --- a/keyboards/kumaokobo/kudox_game/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Kudox Game Keyboard diff --git a/keyboards/kumaokobo/kudox_game/keymaps/via/readme.md b/keyboards/kumaokobo/kudox_game/keymaps/via/readme.md deleted file mode 100644 index 203474736cd..00000000000 --- a/keyboards/kumaokobo/kudox_game/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for Kudox Game Keyboard diff --git a/keyboards/kv/revt/keymaps/default/readme.md b/keyboards/kv/revt/keymaps/default/readme.md deleted file mode 100644 index 63fb4e78dfb..00000000000 --- a/keyboards/kv/revt/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The Default keymap for KVT diff --git a/keyboards/kwub/bloop/keymaps/default/readme.md b/keyboards/kwub/bloop/keymaps/default/readme.md deleted file mode 100644 index 4de2f94c02f..00000000000 --- a/keyboards/kwub/bloop/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default keymap for the Bloop65 \ No newline at end of file diff --git a/keyboards/kwub/bloop/keymaps/via/readme.md b/keyboards/kwub/bloop/keymaps/via/readme.md deleted file mode 100644 index 2ebf4743cf4..00000000000 --- a/keyboards/kwub/bloop/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA layout for the Bloop65 \ No newline at end of file diff --git a/keyboards/labbe/labbeminiv1/keymaps/default/readme.md b/keyboards/labbe/labbeminiv1/keymaps/default/readme.md deleted file mode 100644 index 1bb84664065..00000000000 --- a/keyboards/labbe/labbeminiv1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the labbe mini v1 diff --git a/keyboards/lfkeyboards/lfk78/keymaps/default/readme.md b/keyboards/lfkeyboards/lfk78/keymaps/default/readme.md deleted file mode 100644 index 8321adeb7a1..00000000000 --- a/keyboards/lfkeyboards/lfk78/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for LFK78 diff --git a/keyboards/lfkeyboards/lfk78/keymaps/iso/readme.md b/keyboards/lfkeyboards/lfk78/keymaps/iso/readme.md deleted file mode 100644 index 3b9acefbfd4..00000000000 --- a/keyboards/lfkeyboards/lfk78/keymaps/iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ISO keymap for LFK78 diff --git a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/readme.md b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/readme.md deleted file mode 100644 index 750a4340fd4..00000000000 --- a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The split bs keymap for LFK78 diff --git a/keyboards/lfkeyboards/lfk78/keymaps/via/readme.md b/keyboards/lfkeyboards/lfk78/keymaps/via/readme.md deleted file mode 100644 index 5ec8e4e34d8..00000000000 --- a/keyboards/lfkeyboards/lfk78/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for LFK78 diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/default/readme.md b/keyboards/lfkeyboards/lfkpad/keymaps/default/readme.md deleted file mode 100644 index 9c0dad03015..00000000000 --- a/keyboards/lfkeyboards/lfkpad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the LFKPad 21 diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/via/readme.md b/keyboards/lfkeyboards/lfkpad/keymaps/via/readme.md deleted file mode 100644 index bafbae872e1..00000000000 --- a/keyboards/lfkeyboards/lfkpad/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA compatible keymap for the LFKPad 21 diff --git a/keyboards/lm_keyboard/lm60n/keymaps/default/readme.md b/keyboards/lm_keyboard/lm60n/keymaps/default/readme.md deleted file mode 100644 index a2a10509b2e..00000000000 --- a/keyboards/lm_keyboard/lm60n/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for lm60n diff --git a/keyboards/lm_keyboard/lm60n/keymaps/via/readme.md b/keyboards/lm_keyboard/lm60n/keymaps/via/readme.md deleted file mode 100644 index 1e517bfa0fb..00000000000 --- a/keyboards/lm_keyboard/lm60n/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for lm60n diff --git a/keyboards/lz/erghost/keymaps/default/readme.md b/keyboards/lz/erghost/keymaps/default/readme.md deleted file mode 100644 index be484dbb0e8..00000000000 --- a/keyboards/lz/erghost/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for ERghost diff --git a/keyboards/lz/erghost/keymaps/via/readme.md b/keyboards/lz/erghost/keymaps/via/readme.md deleted file mode 100644 index abafa4946f1..00000000000 --- a/keyboards/lz/erghost/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for erGhost diff --git a/keyboards/majistic/keymaps/default/readme.md b/keyboards/majistic/keymaps/default/readme.md deleted file mode 100644 index 65ee11cd798..00000000000 --- a/keyboards/majistic/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for maJIStic diff --git a/keyboards/makenova/omega/omega4/keymaps/default/readme.md b/keyboards/makenova/omega/omega4/keymaps/default/readme.md deleted file mode 100644 index 9e5e5aeb1e4..00000000000 --- a/keyboards/makenova/omega/omega4/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for omega4 diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/readme.md b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/readme.md deleted file mode 100644 index 30893854159..00000000000 --- a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 10u spacebar omega4 diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/readme.md b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/readme.md deleted file mode 100644 index 31f6b4c0197..00000000000 --- a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 6u spacebar omega4 diff --git a/keyboards/manta60/keymaps/default/readme.md b/keyboards/manta60/keymaps/default/readme.md deleted file mode 100644 index f5c0e2c18cc..00000000000 --- a/keyboards/manta60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for manta60 diff --git a/keyboards/maple_computing/c39/keymaps/default/readme.md b/keyboards/maple_computing/c39/keymaps/default/readme.md deleted file mode 100755 index f5b1b6ac114..00000000000 --- a/keyboards/maple_computing/c39/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the C39 diff --git a/keyboards/maple_computing/christmas_tree/keymaps/default/readme.md b/keyboards/maple_computing/christmas_tree/keymaps/default/readme.md deleted file mode 100644 index a9cb4586efe..00000000000 --- a/keyboards/maple_computing/christmas_tree/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Christmas Tree Layout - diff --git a/keyboards/maple_computing/the_ruler/keymaps/default/readme.md b/keyboards/maple_computing/the_ruler/keymaps/default/readme.md deleted file mode 100644 index b515c1d48e3..00000000000 --- a/keyboards/maple_computing/the_ruler/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the ruler \ No newline at end of file diff --git a/keyboards/marksard/leftover30/keymaps/default/readme.md b/keyboards/marksard/leftover30/keymaps/default/readme.md deleted file mode 100644 index 05dcdc3d14f..00000000000 --- a/keyboards/marksard/leftover30/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for leftover30 diff --git a/keyboards/marksard/rhymestone/keymaps/switch_tester/readme.md b/keyboards/marksard/rhymestone/keymaps/switch_tester/readme.md deleted file mode 100644 index f85906a83be..00000000000 --- a/keyboards/marksard/rhymestone/keymaps/switch_tester/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The switch tester keymap for Rhymestone - -This keymap is Switch Tester and RGB_MATRIX Light demo. diff --git a/keyboards/marksard/treadstone32/keymaps/default/readme.md b/keyboards/marksard/treadstone32/keymaps/default/readme.md deleted file mode 100644 index 387efc0d45a..00000000000 --- a/keyboards/marksard/treadstone32/keymaps/default/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# Default keymap for treadstone32 - -## Description - -## How to use diff --git a/keyboards/marksard/treadstone32/keymaps/like_jis/readme.md b/keyboards/marksard/treadstone32/keymaps/like_jis/readme.md deleted file mode 100644 index 206133ee7c8..00000000000 --- a/keyboards/marksard/treadstone32/keymaps/like_jis/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The like jis type keyboard keymap for treadstone32 - -## Description - -## How to use diff --git a/keyboards/marksard/treadstone48/keymaps/default/readme.md b/keyboards/marksard/treadstone48/keymaps/default/readme.md deleted file mode 100644 index bb835d169c1..00000000000 --- a/keyboards/marksard/treadstone48/keymaps/default/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# Default keymap for treadstone48 - -## Description - -## How to use diff --git a/keyboards/marksard/treadstone48/keymaps/like_jis/readme.md b/keyboards/marksard/treadstone48/keymaps/like_jis/readme.md deleted file mode 100644 index 796df6c4cd7..00000000000 --- a/keyboards/marksard/treadstone48/keymaps/like_jis/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The like jis type keyboard keymap for treadstone48 - -## Description - -## How to use diff --git a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme.md b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme.md deleted file mode 100644 index 796df6c4cd7..00000000000 --- a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The like jis type keyboard keymap for treadstone48 - -## Description - -## How to use diff --git a/keyboards/masterworks/classy_tkl/keymaps/default/readme.md b/keyboards/masterworks/classy_tkl/keymaps/default/readme.md deleted file mode 100644 index 72b4eb54a07..00000000000 --- a/keyboards/masterworks/classy_tkl/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default winkeyless ANSI keymap for the Classy TKL diff --git a/keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md deleted file mode 100644 index 72b4eb54a07..00000000000 --- a/keyboards/masterworks/classy_tkl/keymaps/default_tkl_ansi_wkl/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default winkeyless ANSI keymap for the Classy TKL diff --git a/keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/readme.md b/keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/readme.md deleted file mode 100644 index a4b8c86b1dc..00000000000 --- a/keyboards/masterworks/classy_tkl/keymaps/default_tkl_iso_wkl/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default winkeyless ISO keymap for the Classy TKL diff --git a/keyboards/maxipad/keymaps/default/readme.md b/keyboards/maxipad/keymaps/default/readme.md deleted file mode 100644 index a6c0d4a3f04..00000000000 --- a/keyboards/maxipad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for maxipad \ No newline at end of file diff --git a/keyboards/mc_76k/keymaps/via/readme.md b/keyboards/mc_76k/keymaps/via/readme.md deleted file mode 100644 index b82bc8e79f9..00000000000 --- a/keyboards/mc_76k/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Compile with this keymap to use VIA diff --git a/keyboards/mechbrewery/mb65h/keymaps/default/readme.md b/keyboards/mechbrewery/mb65h/keymaps/default/readme.md deleted file mode 100644 index ca5e0ebd995..00000000000 --- a/keyboards/mechbrewery/mb65h/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the MB65H diff --git a/keyboards/mechbrewery/mb65s/keymaps/default/readme.md b/keyboards/mechbrewery/mb65s/keymaps/default/readme.md deleted file mode 100644 index 50d242b75af..00000000000 --- a/keyboards/mechbrewery/mb65s/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the MB65S diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/default/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/default/readme.md deleted file mode 100644 index 093a7b084a4..00000000000 --- a/keyboards/mechkeys/mechmini/v2/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Mechmini 2.0 Layout - the same as split_space keymap - diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/split_space/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/split_space/readme.md deleted file mode 100644 index 9c2dad396f5..00000000000 --- a/keyboards/mechkeys/mechmini/v2/keymaps/split_space/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Mechmini 2.0 Layout - diff --git a/keyboards/mechkeys/mk60/keymaps/default/readme.md b/keyboards/mechkeys/mk60/keymaps/default/readme.md deleted file mode 100644 index 8a01d9475e8..00000000000 --- a/keyboards/mechkeys/mk60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for mk60 diff --git a/keyboards/mechllama/g35/keymaps/default/readme.md b/keyboards/mechllama/g35/keymaps/default/readme.md deleted file mode 100644 index 200a42f1943..00000000000 --- a/keyboards/mechllama/g35/keymaps/default/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -![G35 Layout Image](https://i.imgur.com/fDlRAN9.png) -# Default G35 Layout - -This is the default layout for the G35. diff --git a/keyboards/mechlovin/adelais/keymaps/default/readme.md b/keyboards/mechlovin/adelais/keymaps/default/readme.md deleted file mode 100644 index 54d78d873b5..00000000000 --- a/keyboards/mechlovin/adelais/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for adelais diff --git a/keyboards/mechlovin/adelais/keymaps/via/readme.md b/keyboards/mechlovin/adelais/keymaps/via/readme.md deleted file mode 100644 index a85ba709d78..00000000000 --- a/keyboards/mechlovin/adelais/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for adelais diff --git a/keyboards/mechlovin/delphine/keymaps/default/readme.md b/keyboards/mechlovin/delphine/keymaps/default/readme.md deleted file mode 100644 index 67504a70dd4..00000000000 --- a/keyboards/mechlovin/delphine/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for delphine diff --git a/keyboards/mechlovin/delphine/keymaps/via/readme.md b/keyboards/mechlovin/delphine/keymaps/via/readme.md deleted file mode 100644 index b97ae1f2627..00000000000 --- a/keyboards/mechlovin/delphine/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for delphine diff --git a/keyboards/mechlovin/foundation/keymaps/default/readme.md b/keyboards/mechlovin/foundation/keymaps/default/readme.md deleted file mode 100644 index 32bfee434d2..00000000000 --- a/keyboards/mechlovin/foundation/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Foundation \ No newline at end of file diff --git a/keyboards/mechlovin/hannah65/rev1/keymaps/default/readme.md b/keyboards/mechlovin/hannah65/rev1/keymaps/default/readme.md deleted file mode 100644 index 1e8f0ec1fa2..00000000000 --- a/keyboards/mechlovin/hannah65/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for hannah65 diff --git a/keyboards/mechlovin/hannah910/rev1/keymaps/ansi/readme.md b/keyboards/mechlovin/hannah910/rev1/keymaps/ansi/readme.md deleted file mode 100644 index 0b0b0e3fb78..00000000000 --- a/keyboards/mechlovin/hannah910/rev1/keymaps/ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The ansi keymap for hannah910v1 diff --git a/keyboards/mechlovin/hannah910/rev1/keymaps/default/readme.md b/keyboards/mechlovin/hannah910/rev1/keymaps/default/readme.md deleted file mode 100644 index fcfadce9510..00000000000 --- a/keyboards/mechlovin/hannah910/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for hannah910v1 diff --git a/keyboards/mechlovin/hannah910/rev1/keymaps/via/readme.md b/keyboards/mechlovin/hannah910/rev1/keymaps/via/readme.md deleted file mode 100644 index 3e54ca18c54..00000000000 --- a/keyboards/mechlovin/hannah910/rev1/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap (VIA support) for hannah910v1 \ No newline at end of file diff --git a/keyboards/mechlovin/hannah910/rev3/keymaps/ansi/readme.md b/keyboards/mechlovin/hannah910/rev3/keymaps/ansi/readme.md deleted file mode 100644 index f1f3ec9015b..00000000000 --- a/keyboards/mechlovin/hannah910/rev3/keymaps/ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The ansi keymap for hannah910v2 \ No newline at end of file diff --git a/keyboards/mechlovin/hannah910/rev3/keymaps/default/readme.md b/keyboards/mechlovin/hannah910/rev3/keymaps/default/readme.md deleted file mode 100644 index f073d24c2c6..00000000000 --- a/keyboards/mechlovin/hannah910/rev3/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The full keymap for hannah910v2 \ No newline at end of file diff --git a/keyboards/mechlovin/hannah910/rev3/keymaps/via/readme.md b/keyboards/mechlovin/hannah910/rev3/keymaps/via/readme.md deleted file mode 100644 index 8dac1d9122d..00000000000 --- a/keyboards/mechlovin/hannah910/rev3/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for hannah910v3 \ No newline at end of file diff --git a/keyboards/mechlovin/hex4b/keymaps/default/readme.md b/keyboards/mechlovin/hex4b/keymaps/default/readme.md deleted file mode 100644 index 6b36fc52137..00000000000 --- a/keyboards/mechlovin/hex4b/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for hex4b diff --git a/keyboards/mechlovin/hex6c/keymaps/default/readme.md b/keyboards/mechlovin/hex6c/keymaps/default/readme.md deleted file mode 100644 index 5d2f472b0a7..00000000000 --- a/keyboards/mechlovin/hex6c/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for hex6c diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/readme.md b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/readme.md deleted file mode 100644 index 01ef555056b..00000000000 --- a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for infinity87 diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/readme.md b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/readme.md deleted file mode 100644 index 8867d290cdf..00000000000 --- a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for infinity87 diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/readme.md b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/readme.md deleted file mode 100644 index 01ef555056b..00000000000 --- a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for infinity87 diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/readme.md b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/readme.md deleted file mode 100644 index 8867d290cdf..00000000000 --- a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for infinity87 diff --git a/keyboards/mechlovin/infinity87/rev1/standard/keymaps/default/readme.md b/keyboards/mechlovin/infinity87/rev1/standard/keymaps/default/readme.md deleted file mode 100644 index cd40ace4dfa..00000000000 --- a/keyboards/mechlovin/infinity87/rev1/standard/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for infinity87 Rev.1 Standard diff --git a/keyboards/mechlovin/infinity87/rev1/standard/keymaps/via/readme.md b/keyboards/mechlovin/infinity87/rev1/standard/keymaps/via/readme.md deleted file mode 100644 index 5dce2b9af1d..00000000000 --- a/keyboards/mechlovin/infinity87/rev1/standard/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for infinity87 Rev.1 Standard diff --git a/keyboards/mechlovin/infinity87/rev2/keymaps/default/readme.md b/keyboards/mechlovin/infinity87/rev2/keymaps/default/readme.md deleted file mode 100644 index 01ef555056b..00000000000 --- a/keyboards/mechlovin/infinity87/rev2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for infinity87 diff --git a/keyboards/mechlovin/infinity87/rev2/keymaps/via/readme.md b/keyboards/mechlovin/infinity87/rev2/keymaps/via/readme.md deleted file mode 100644 index 8867d290cdf..00000000000 --- a/keyboards/mechlovin/infinity87/rev2/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for infinity87 diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/readme.md b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/readme.md deleted file mode 100644 index 01ef555056b..00000000000 --- a/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for infinity87 diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/readme.md b/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/readme.md deleted file mode 100644 index 8867d290cdf..00000000000 --- a/keyboards/mechlovin/infinity87/rgb_rev1/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for infinity87 diff --git a/keyboards/mechlovin/infinity875/keymaps/default/readme.md b/keyboards/mechlovin/infinity875/keymaps/default/readme.md deleted file mode 100644 index 877e1a6862b..00000000000 --- a/keyboards/mechlovin/infinity875/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for infinity875 diff --git a/keyboards/mechlovin/infinity875/keymaps/via/readme.md b/keyboards/mechlovin/infinity875/keymaps/via/readme.md deleted file mode 100644 index 9289e7dbe2a..00000000000 --- a/keyboards/mechlovin/infinity875/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for infinity87.5 diff --git a/keyboards/mechlovin/infinity88/keymaps/default/readme.md b/keyboards/mechlovin/infinity88/keymaps/default/readme.md deleted file mode 100644 index 01ef555056b..00000000000 --- a/keyboards/mechlovin/infinity88/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for infinity87 diff --git a/keyboards/mechlovin/infinity88/keymaps/via/readme.md b/keyboards/mechlovin/infinity88/keymaps/via/readme.md deleted file mode 100644 index 8867d290cdf..00000000000 --- a/keyboards/mechlovin/infinity88/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for infinity87 diff --git a/keyboards/mechlovin/infinityce/keymaps/default/readme.md b/keyboards/mechlovin/infinityce/keymaps/default/readme.md deleted file mode 100644 index 32a67319249..00000000000 --- a/keyboards/mechlovin/infinityce/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for infinityce diff --git a/keyboards/mechlovin/infinityce/keymaps/via/readme.md b/keyboards/mechlovin/infinityce/keymaps/via/readme.md deleted file mode 100644 index 992bbfbcecb..00000000000 --- a/keyboards/mechlovin/infinityce/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The VIA keymap for infinityce - -![infinityce](https://i.imgur.com/f2VPnXY.png) diff --git a/keyboards/mechlovin/jay60/keymaps/default/readme.md b/keyboards/mechlovin/jay60/keymaps/default/readme.md deleted file mode 100644 index c86f2113d84..00000000000 --- a/keyboards/mechlovin/jay60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for common60 diff --git a/keyboards/mechlovin/kanu/keymaps/ansi/readme.md b/keyboards/mechlovin/kanu/keymaps/ansi/readme.md deleted file mode 100644 index b5ae1d393a4..00000000000 --- a/keyboards/mechlovin/kanu/keymaps/ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The ansi keymap for kanu diff --git a/keyboards/mechlovin/kanu/keymaps/default/readme.md b/keyboards/mechlovin/kanu/keymaps/default/readme.md deleted file mode 100644 index baed249ecee..00000000000 --- a/keyboards/mechlovin/kanu/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap (full layout) for kanu diff --git a/keyboards/mechlovin/kanu/keymaps/via/readme.md b/keyboards/mechlovin/kanu/keymaps/via/readme.md deleted file mode 100644 index 2f28c723f96..00000000000 --- a/keyboards/mechlovin/kanu/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for kanu diff --git a/keyboards/mechlovin/kay60/keymaps/default/readme.md b/keyboards/mechlovin/kay60/keymaps/default/readme.md deleted file mode 100644 index 17a9cf38c5a..00000000000 --- a/keyboards/mechlovin/kay60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for kay60 \ No newline at end of file diff --git a/keyboards/mechlovin/kay65/keymaps/default/readme.md b/keyboards/mechlovin/kay65/keymaps/default/readme.md deleted file mode 100644 index 95a00bd46c8..00000000000 --- a/keyboards/mechlovin/kay65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Kay65 \ No newline at end of file diff --git a/keyboards/mechlovin/kay65/keymaps/via/readme.md b/keyboards/mechlovin/kay65/keymaps/via/readme.md deleted file mode 100644 index 9a13f95f0dc..00000000000 --- a/keyboards/mechlovin/kay65/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Kay65 \ No newline at end of file diff --git a/keyboards/mechlovin/mechlovin9/keymaps/default/readme.md b/keyboards/mechlovin/mechlovin9/keymaps/default/readme.md deleted file mode 100644 index 324467b059e..00000000000 --- a/keyboards/mechlovin/mechlovin9/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for mechlovin9 diff --git a/keyboards/mechlovin/olly/bb/keymaps/default/readme.md b/keyboards/mechlovin/olly/bb/keymaps/default/readme.md deleted file mode 100644 index 2fa087aa1d0..00000000000 --- a/keyboards/mechlovin/olly/bb/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Olly BB diff --git a/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/readme.md b/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/readme.md deleted file mode 100644 index 95cffc54a01..00000000000 --- a/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_ansi_split_bs keymap for Olly BB diff --git a/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/readme.md b/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/readme.md deleted file mode 100644 index 7ad1086f943..00000000000 --- a/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_iso_split_bs keymap for Olly BB diff --git a/keyboards/mechlovin/olly/bb/keymaps/via/readme.md b/keyboards/mechlovin/olly/bb/keymaps/via/readme.md deleted file mode 100644 index bc577158bbc..00000000000 --- a/keyboards/mechlovin/olly/bb/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Olly BB \ No newline at end of file diff --git a/keyboards/mechlovin/olly/jf/rev1/keymaps/default/readme.md b/keyboards/mechlovin/olly/jf/rev1/keymaps/default/readme.md deleted file mode 100644 index 0dad971bdca..00000000000 --- a/keyboards/mechlovin/olly/jf/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Olly JF diff --git a/keyboards/mechlovin/pisces/keymaps/default/readme.md b/keyboards/mechlovin/pisces/keymaps/default/readme.md deleted file mode 100644 index 966b8fd8024..00000000000 --- a/keyboards/mechlovin/pisces/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for pisces diff --git a/keyboards/mechlovin/pisces/keymaps/via/readme.md b/keyboards/mechlovin/pisces/keymaps/via/readme.md deleted file mode 100644 index 33523d55921..00000000000 --- a/keyboards/mechlovin/pisces/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for pisces diff --git a/keyboards/mechlovin/serratus/keymaps/default/readme.md b/keyboards/mechlovin/serratus/keymaps/default/readme.md deleted file mode 100644 index 2061661718d..00000000000 --- a/keyboards/mechlovin/serratus/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for serratus diff --git a/keyboards/mechlovin/serratus/keymaps/via/readme.md b/keyboards/mechlovin/serratus/keymaps/via/readme.md deleted file mode 100644 index 3481201f9c6..00000000000 --- a/keyboards/mechlovin/serratus/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for serratus diff --git a/keyboards/mechlovin/th1800/keymaps/default/readme.md b/keyboards/mechlovin/th1800/keymaps/default/readme.md deleted file mode 100644 index 4471e2802bf..00000000000 --- a/keyboards/mechlovin/th1800/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for th1800 diff --git a/keyboards/mechlovin/th1800/keymaps/via/readme.md b/keyboards/mechlovin/th1800/keymaps/via/readme.md deleted file mode 100644 index d81d42fbc6b..00000000000 --- a/keyboards/mechlovin/th1800/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA keymap for TH1800 - diff --git a/keyboards/mechlovin/tmkl/keymaps/default/readme.md b/keyboards/mechlovin/tmkl/keymaps/default/readme.md deleted file mode 100644 index a0d7e3a7423..00000000000 --- a/keyboards/mechlovin/tmkl/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for TMKL diff --git a/keyboards/mechlovin/tmkl/keymaps/via/readme.md b/keyboards/mechlovin/tmkl/keymaps/via/readme.md deleted file mode 100644 index fd097324593..00000000000 --- a/keyboards/mechlovin/tmkl/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for tmkl diff --git a/keyboards/mechlovin/zed60/keymaps/default/readme.md b/keyboards/mechlovin/zed60/keymaps/default/readme.md deleted file mode 100644 index c7d59d98291..00000000000 --- a/keyboards/mechlovin/zed60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Zed60 diff --git a/keyboards/mechlovin/zed60/keymaps/via/readme.md b/keyboards/mechlovin/zed60/keymaps/via/readme.md deleted file mode 100644 index b05c87e4767..00000000000 --- a/keyboards/mechlovin/zed60/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Zed60 diff --git a/keyboards/mechlovin/zed65/mono_led/keymaps/default/readme.md b/keyboards/mechlovin/zed65/mono_led/keymaps/default/readme.md deleted file mode 100644 index 195c0c07259..00000000000 --- a/keyboards/mechlovin/zed65/mono_led/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Zed65-MonoLED \ No newline at end of file diff --git a/keyboards/mechlovin/zed65/mono_led/keymaps/via/readme.md b/keyboards/mechlovin/zed65/mono_led/keymaps/via/readme.md deleted file mode 100644 index 58b12efff75..00000000000 --- a/keyboards/mechlovin/zed65/mono_led/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Zed65-MonoLED \ No newline at end of file diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/keymaps/default/readme.md b/keyboards/mechlovin/zed65/no_backlight/cor65/keymaps/default/readme.md deleted file mode 100644 index ac3f3127e79..00000000000 --- a/keyboards/mechlovin/zed65/no_backlight/cor65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Retro66 \ No newline at end of file diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/keymaps/via/readme.md b/keyboards/mechlovin/zed65/no_backlight/cor65/keymaps/via/readme.md deleted file mode 100644 index 62163029536..00000000000 --- a/keyboards/mechlovin/zed65/no_backlight/cor65/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for retro66 \ No newline at end of file diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/keymaps/default/readme.md b/keyboards/mechlovin/zed65/no_backlight/retro66/keymaps/default/readme.md deleted file mode 100644 index ac3f3127e79..00000000000 --- a/keyboards/mechlovin/zed65/no_backlight/retro66/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Retro66 \ No newline at end of file diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/keymaps/via/readme.md b/keyboards/mechlovin/zed65/no_backlight/retro66/keymaps/via/readme.md deleted file mode 100644 index 62163029536..00000000000 --- a/keyboards/mechlovin/zed65/no_backlight/retro66/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for retro66 \ No newline at end of file diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/default/readme.md b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/default/readme.md deleted file mode 100644 index 2d77dcd5dfd..00000000000 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for wearhaus66 \ No newline at end of file diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/readme.md b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/readme.md deleted file mode 100644 index 6ac2f7bccc9..00000000000 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for wearhaus66 \ No newline at end of file diff --git a/keyboards/mechwild/mokulua/mirrored/keymaps/default/readme.md b/keyboards/mechwild/mokulua/mirrored/keymaps/default/readme.md deleted file mode 100644 index 727105dcba6..00000000000 --- a/keyboards/mechwild/mokulua/mirrored/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Mokulua using a mirrored right-half diff --git a/keyboards/mechwild/mokulua/mirrored/keymaps/via/readme.md b/keyboards/mechwild/mokulua/mirrored/keymaps/via/readme.md deleted file mode 100644 index 37aca6eac7e..00000000000 --- a/keyboards/mechwild/mokulua/mirrored/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Mokulua using a mirrored right-half diff --git a/keyboards/mechwild/mokulua/standard/keymaps/default/readme.md b/keyboards/mechwild/mokulua/standard/keymaps/default/readme.md deleted file mode 100644 index 81569df1424..00000000000 --- a/keyboards/mechwild/mokulua/standard/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Mokulua using a standard right-half diff --git a/keyboards/mechwild/mokulua/standard/keymaps/via/readme.md b/keyboards/mechwild/mokulua/standard/keymaps/via/readme.md deleted file mode 100644 index 4f47e50e88e..00000000000 --- a/keyboards/mechwild/mokulua/standard/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Mokulua using a standard right-half diff --git a/keyboards/meletrix/zoom65/keymaps/65_ansi_blocker/readme.md b/keyboards/meletrix/zoom65/keymaps/65_ansi_blocker/readme.md deleted file mode 100644 index f9dd323673e..00000000000 --- a/keyboards/meletrix/zoom65/keymaps/65_ansi_blocker/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_ansi_blocker keymap for zoom65 diff --git a/keyboards/meletrix/zoom65/keymaps/65_ansi_blocker_split_bs/readme.md b/keyboards/meletrix/zoom65/keymaps/65_ansi_blocker_split_bs/readme.md deleted file mode 100644 index 768bda7b6d9..00000000000 --- a/keyboards/meletrix/zoom65/keymaps/65_ansi_blocker_split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_ansi_blocker_split_bs keymap for zoom65 diff --git a/keyboards/meletrix/zoom65/keymaps/65_ansi_blocker_split_lshift/readme.md b/keyboards/meletrix/zoom65/keymaps/65_ansi_blocker_split_lshift/readme.md deleted file mode 100644 index 5d3bfbcd171..00000000000 --- a/keyboards/meletrix/zoom65/keymaps/65_ansi_blocker_split_lshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_ansi_blocker_split_lshift keymap for zoom65 diff --git a/keyboards/meletrix/zoom65/keymaps/65_ansi_blocker_split_space/readme.md b/keyboards/meletrix/zoom65/keymaps/65_ansi_blocker_split_space/readme.md deleted file mode 100644 index 85d4e776cf6..00000000000 --- a/keyboards/meletrix/zoom65/keymaps/65_ansi_blocker_split_space/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_ansi_blocker_split_space keymap for zoom65 diff --git a/keyboards/meletrix/zoom65/keymaps/65_iso_blocker/readme.md b/keyboards/meletrix/zoom65/keymaps/65_iso_blocker/readme.md deleted file mode 100644 index 46af22fcd94..00000000000 --- a/keyboards/meletrix/zoom65/keymaps/65_iso_blocker/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_iso_blocker keymap for zoom65 diff --git a/keyboards/meletrix/zoom65/keymaps/65_iso_blocker_split_bs/readme.md b/keyboards/meletrix/zoom65/keymaps/65_iso_blocker_split_bs/readme.md deleted file mode 100644 index 873c51652a3..00000000000 --- a/keyboards/meletrix/zoom65/keymaps/65_iso_blocker_split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_iso_blocker_split_bs keymap for zoom65 diff --git a/keyboards/meletrix/zoom65/keymaps/65_iso_blocker_split_space/readme.md b/keyboards/meletrix/zoom65/keymaps/65_iso_blocker_split_space/readme.md deleted file mode 100644 index a9c715e796f..00000000000 --- a/keyboards/meletrix/zoom65/keymaps/65_iso_blocker_split_space/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_iso_blocker_split_space keymap for zoom65 diff --git a/keyboards/meletrix/zoom65/keymaps/default/readme.md b/keyboards/meletrix/zoom65/keymaps/default/readme.md deleted file mode 100644 index 32dfecc2657..00000000000 --- a/keyboards/meletrix/zoom65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for zoom65 diff --git a/keyboards/meletrix/zoom65/keymaps/via/readme.md b/keyboards/meletrix/zoom65/keymaps/via/readme.md deleted file mode 100644 index 5bc43e82b3b..00000000000 --- a/keyboards/meletrix/zoom65/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for zoom65 diff --git a/keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker/readme.md b/keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker/readme.md deleted file mode 100644 index d15fff8ad0b..00000000000 --- a/keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_ansi_blocker keymap for zoom65_lite diff --git a/keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker_split_bs/readme.md b/keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker_split_bs/readme.md deleted file mode 100644 index 1ec5b964428..00000000000 --- a/keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker_split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_ansi_blocker_split_bs keymap for zoom65_lite diff --git a/keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker_split_lshift/readme.md b/keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker_split_lshift/readme.md deleted file mode 100644 index e0816ba218f..00000000000 --- a/keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker_split_lshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_ansi_blocker_split_lshift keymap for zoom65_lite diff --git a/keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker_split_space/readme.md b/keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker_split_space/readme.md deleted file mode 100644 index b0dc099a5c1..00000000000 --- a/keyboards/meletrix/zoom65_lite/keymaps/65_ansi_blocker_split_space/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_ansi_blocker_split_space keymap for zoom65_lite diff --git a/keyboards/meletrix/zoom65_lite/keymaps/65_iso_blocker/readme.md b/keyboards/meletrix/zoom65_lite/keymaps/65_iso_blocker/readme.md deleted file mode 100644 index 4f6f7de0193..00000000000 --- a/keyboards/meletrix/zoom65_lite/keymaps/65_iso_blocker/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_iso_blocker keymap for zoom65_lite diff --git a/keyboards/meletrix/zoom65_lite/keymaps/65_iso_blocker_split_bs/readme.md b/keyboards/meletrix/zoom65_lite/keymaps/65_iso_blocker_split_bs/readme.md deleted file mode 100644 index 260836b6c91..00000000000 --- a/keyboards/meletrix/zoom65_lite/keymaps/65_iso_blocker_split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_iso_blocker_split_bs keymap for zoom65_lite diff --git a/keyboards/meletrix/zoom65_lite/keymaps/65_iso_blocker_split_space/readme.md b/keyboards/meletrix/zoom65_lite/keymaps/65_iso_blocker_split_space/readme.md deleted file mode 100644 index c4983514b17..00000000000 --- a/keyboards/meletrix/zoom65_lite/keymaps/65_iso_blocker_split_space/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_iso_blocker_split_space keymap for zoom65_lite diff --git a/keyboards/meletrix/zoom65_lite/keymaps/default/readme.md b/keyboards/meletrix/zoom65_lite/keymaps/default/readme.md deleted file mode 100644 index 47c3be8e300..00000000000 --- a/keyboards/meletrix/zoom65_lite/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for zoom65_lite diff --git a/keyboards/meletrix/zoom65_lite/keymaps/via/readme.md b/keyboards/meletrix/zoom65_lite/keymaps/via/readme.md deleted file mode 100644 index e605d458755..00000000000 --- a/keyboards/meletrix/zoom65_lite/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for zoom65_lite diff --git a/keyboards/meletrix/zoom87/keymaps/default/readme.md b/keyboards/meletrix/zoom87/keymaps/default/readme.md deleted file mode 100644 index 5a5a49c4683..00000000000 --- a/keyboards/meletrix/zoom87/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for zoom87 diff --git a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13/readme.md b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13/readme.md deleted file mode 100644 index 0d04949fa4c..00000000000 --- a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The tkl_f13 keymap for zoom87 diff --git a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_bs/readme.md b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_bs/readme.md deleted file mode 100644 index 872c77f91a8..00000000000 --- a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_tkl_f13_split_bs keymap for zoom87 diff --git a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_lshift/readme.md b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_lshift/readme.md deleted file mode 100644 index a386f41b90f..00000000000 --- a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_lshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_tkl_f13_split_lshift keymap for zoom87 diff --git a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_rshift/readme.md b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_rshift/readme.md deleted file mode 100644 index d978de20ae8..00000000000 --- a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_rshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The tkl_f13_split_rshift keymap for zoom87 diff --git a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_space/readme.md b/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_space/readme.md deleted file mode 100644 index d978de20ae8..00000000000 --- a/keyboards/meletrix/zoom87/keymaps/default_tkl_f13_split_space/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The tkl_f13_split_rshift keymap for zoom87 diff --git a/keyboards/meletrix/zoom87/keymaps/via/readme.md b/keyboards/meletrix/zoom87/keymaps/via/readme.md deleted file mode 100644 index 40fd5138b34..00000000000 --- a/keyboards/meletrix/zoom87/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for zoom87 diff --git a/keyboards/meme/keymaps/default/readme.md b/keyboards/meme/keymaps/default/readme.md deleted file mode 100644 index 59aa078d715..00000000000 --- a/keyboards/meme/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Meme diff --git a/keyboards/meow65/keymaps/default/readme.md b/keyboards/meow65/keymaps/default/readme.md deleted file mode 100644 index 6da1fe875a4..00000000000 --- a/keyboards/meow65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for meow65 diff --git a/keyboards/meow65/keymaps/via/readme.md b/keyboards/meow65/keymaps/via/readme.md deleted file mode 100644 index 717f08351e1..00000000000 --- a/keyboards/meow65/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for meow65 diff --git a/keyboards/meson/keymaps/default/readme.md b/keyboards/meson/keymaps/default/readme.md deleted file mode 100644 index 04d94252beb..00000000000 --- a/keyboards/meson/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for meson diff --git a/keyboards/mexsistor/ludmila/keymaps/default/readme.md b/keyboards/mexsistor/ludmila/keymaps/default/readme.md deleted file mode 100644 index 1fb3e58afe9..00000000000 --- a/keyboards/mexsistor/ludmila/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for ludmila diff --git a/keyboards/mikeneko65/keymaps/default/readme.md b/keyboards/mikeneko65/keymaps/default/readme.md deleted file mode 100644 index 579e2822111..00000000000 --- a/keyboards/mikeneko65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Mikeneko 65 diff --git a/keyboards/millet/doksin/keymaps/default/readme.md b/keyboards/millet/doksin/keymaps/default/readme.md deleted file mode 100644 index 5ddd4572c40..00000000000 --- a/keyboards/millet/doksin/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# default keymap for DOKSIN \ No newline at end of file diff --git a/keyboards/millipad/keymaps/default/readme.md b/keyboards/millipad/keymaps/default/readme.md deleted file mode 100644 index effc205a24f..00000000000 --- a/keyboards/millipad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for millipad diff --git a/keyboards/mint60/keymaps/default/readme.md b/keyboards/mint60/keymaps/default/readme.md deleted file mode 100644 index 37dec75a66f..00000000000 --- a/keyboards/mint60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Mint60 diff --git a/keyboards/miuni32/keymaps/default/readme.md b/keyboards/miuni32/keymaps/default/readme.md deleted file mode 100644 index 4cff8ef5a3a..00000000000 --- a/keyboards/miuni32/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for miuni32 \ No newline at end of file diff --git a/keyboards/ml/gas75/keymaps/default/readme.md b/keyboards/ml/gas75/keymaps/default/readme.md deleted file mode 100644 index 30d8c00f430..00000000000 --- a/keyboards/ml/gas75/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Layout - -Keymap is default 81 qwerty, 75% exploded layout with F13 & knob diff --git a/keyboards/ml/gas75/keymaps/via/readme.md b/keyboards/ml/gas75/keymaps/via/readme.md deleted file mode 100644 index a4f2599f49a..00000000000 --- a/keyboards/ml/gas75/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Layout with VIA - -Keymap is default 81 qwerty, 75% exploded layout with F13 & knob diff --git a/keyboards/molecule/keymaps/default/readme.md b/keyboards/molecule/keymaps/default/readme.md deleted file mode 100755 index 136c2c986a2..00000000000 --- a/keyboards/molecule/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for molecule diff --git a/keyboards/monoflex60/keymaps/default/readme.md b/keyboards/monoflex60/keymaps/default/readme.md deleted file mode 100644 index 146f52292d6..00000000000 --- a/keyboards/monoflex60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Monoflex 60 diff --git a/keyboards/monoflex60/keymaps/via/readme.md b/keyboards/monoflex60/keymaps/via/readme.md deleted file mode 100644 index 29862d748b4..00000000000 --- a/keyboards/monoflex60/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Monoflex 60 diff --git a/keyboards/monokei/mnk75/keymaps/default/readme.md b/keyboards/monokei/mnk75/keymaps/default/readme.md deleted file mode 100755 index 934ada1fef6..00000000000 --- a/keyboards/monokei/mnk75/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for MNK75. diff --git a/keyboards/monokei/mnk75/keymaps/via/readme.md b/keyboards/monokei/mnk75/keymaps/via/readme.md deleted file mode 100755 index 3cac4633fe1..00000000000 --- a/keyboards/monokei/mnk75/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for MNK75. VIA support enabled. diff --git a/keyboards/monstargear/xo87/rgb/keymaps/default/readme.md b/keyboards/monstargear/xo87/rgb/keymaps/default/readme.md deleted file mode 100644 index 1ee46d99bc5..00000000000 --- a/keyboards/monstargear/xo87/rgb/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the XO87 RGB diff --git a/keyboards/monstargear/xo87/solderable/keymaps/default/readme.md b/keyboards/monstargear/xo87/solderable/keymaps/default/readme.md deleted file mode 100644 index ed048bfee6c..00000000000 --- a/keyboards/monstargear/xo87/solderable/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the XO87 Solderable PCB diff --git a/keyboards/monstargear/xo87/solderable/keymaps/via/readme.md b/keyboards/monstargear/xo87/solderable/keymaps/via/readme.md deleted file mode 100644 index e7edaf3f769..00000000000 --- a/keyboards/monstargear/xo87/solderable/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for the XO87 Solderable PCB diff --git a/keyboards/moon/keymaps/default/readme.md b/keyboards/moon/keymaps/default/readme.md deleted file mode 100644 index 3a1a937828c..00000000000 --- a/keyboards/moon/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Moon diff --git a/keyboards/moon/keymaps/default_tkl_ansi/readme.md b/keyboards/moon/keymaps/default_tkl_ansi/readme.md deleted file mode 100644 index bf1e2ac77aa..00000000000 --- a/keyboards/moon/keymaps/default_tkl_ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ANSI keymap for the Moon diff --git a/keyboards/moon/keymaps/default_tkl_ansi_wkl/readme.md b/keyboards/moon/keymaps/default_tkl_ansi_wkl/readme.md deleted file mode 100644 index f284c1b3cac..00000000000 --- a/keyboards/moon/keymaps/default_tkl_ansi_wkl/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default winkeyless ANSI keymap for the Moon diff --git a/keyboards/moon/keymaps/default_tkl_iso/readme.md b/keyboards/moon/keymaps/default_tkl_iso/readme.md deleted file mode 100644 index 9dd1e2c252f..00000000000 --- a/keyboards/moon/keymaps/default_tkl_iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ISO keymap for the Moon diff --git a/keyboards/moon/keymaps/default_tkl_iso_wkl/readme.md b/keyboards/moon/keymaps/default_tkl_iso_wkl/readme.md deleted file mode 100644 index fabba452b3b..00000000000 --- a/keyboards/moon/keymaps/default_tkl_iso_wkl/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default winkeyless ISO keymap for the Moon diff --git a/keyboards/mountainblocks/mb17/keymaps/default/readme.md b/keyboards/mountainblocks/mb17/keymaps/default/readme.md deleted file mode 100644 index fb963c63993..00000000000 --- a/keyboards/mountainblocks/mb17/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for mb17 diff --git a/keyboards/mss_studio/m63_rgb/keymaps/default/readme.md b/keyboards/mss_studio/m63_rgb/keymaps/default/readme.md deleted file mode 100644 index 01ff3523b99..00000000000 --- a/keyboards/mss_studio/m63_rgb/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Layout - -Keymap is default 63 qwerty, 60% arrow layout diff --git a/keyboards/mss_studio/m63_rgb/keymaps/via/readme.md b/keyboards/mss_studio/m63_rgb/keymaps/via/readme.md deleted file mode 100644 index c60a188047e..00000000000 --- a/keyboards/mss_studio/m63_rgb/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Layout with VIA - -Keymap is default 63 qwerty, 60% arrow layout diff --git a/keyboards/mss_studio/m64_rgb/keymaps/default/readme.md b/keyboards/mss_studio/m64_rgb/keymaps/default/readme.md deleted file mode 100644 index 810af1193be..00000000000 --- a/keyboards/mss_studio/m64_rgb/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Layout - -Keymap is default 64 qwerty, 64% layout diff --git a/keyboards/mss_studio/m64_rgb/keymaps/via/readme.md b/keyboards/mss_studio/m64_rgb/keymaps/via/readme.md deleted file mode 100644 index ee171181300..00000000000 --- a/keyboards/mss_studio/m64_rgb/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Layout with VIA - -Keymap is default 64 qwerty, 64% layout diff --git a/keyboards/mt/mt64rgb/keymaps/default/readme.md b/keyboards/mt/mt64rgb/keymaps/default/readme.md deleted file mode 100644 index 5508f7df16d..00000000000 --- a/keyboards/mt/mt64rgb/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default mt4rgb Layout - -This is the default layout that comes flashed on every mt64rgb. All key pins are shown in the file. diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/readme.md b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/readme.md deleted file mode 100644 index 0fb9e0a292c..00000000000 --- a/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Personal Layout with VIA - -Keymap is default 67 qwerty, 65 ansi blocker layout diff --git a/keyboards/mysticworks/wyvern/keymaps/default/readme.md b/keyboards/mysticworks/wyvern/keymaps/default/readme.md deleted file mode 100644 index 1d4604ba5d7..00000000000 --- a/keyboards/mysticworks/wyvern/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Wyvern Default Keymap - -Default keymap for Wyvern- Normal numpad, ANSI layout with 6.25u. F-keys on second layer. diff --git a/keyboards/mysticworks/wyvern/keymaps/via/readme.md b/keyboards/mysticworks/wyvern/keymaps/via/readme.md deleted file mode 100644 index 02b3ae2a6ef..00000000000 --- a/keyboards/mysticworks/wyvern/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Wyvern VIA Keymap - -Keymap for VIA Configurator usage- supports all layouts possible. diff --git a/keyboards/nack/keymaps/default/readme.md b/keyboards/nack/keymaps/default/readme.md deleted file mode 100644 index 9cbf5c6e6f3..00000000000 --- a/keyboards/nack/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for nack, simple and minimal. diff --git a/keyboards/nimrod/keymaps/default/readme.md b/keyboards/nimrod/keymaps/default/readme.md deleted file mode 100644 index b93c8f8469e..00000000000 --- a/keyboards/nimrod/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Nimrod Layout - -This is the recommended full grid layout. diff --git a/keyboards/nimrod/keymaps/default_center_space/readme.md b/keyboards/nimrod/keymaps/default_center_space/readme.md deleted file mode 100644 index 4912b44c408..00000000000 --- a/keyboards/nimrod/keymaps/default_center_space/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Center Space Nimrod Layout - -This is the layout for a center space bottom row. diff --git a/keyboards/nimrod/keymaps/default_left_space/readme.md b/keyboards/nimrod/keymaps/default_left_space/readme.md deleted file mode 100644 index e331b9c297a..00000000000 --- a/keyboards/nimrod/keymaps/default_left_space/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Left Space Nimrod Layout - -This is the layout for a left space bottom row. diff --git a/keyboards/nimrod/keymaps/default_right_space/readme.md b/keyboards/nimrod/keymaps/default_right_space/readme.md deleted file mode 100644 index 65e6ec80b8f..00000000000 --- a/keyboards/nimrod/keymaps/default_right_space/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Right Space Nimrod Layout - -This is the layout for a right space bottom row. diff --git a/keyboards/nimrod/keymaps/default_split_space/readme.md b/keyboards/nimrod/keymaps/default_split_space/readme.md deleted file mode 100644 index aab94d2f036..00000000000 --- a/keyboards/nimrod/keymaps/default_split_space/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Split Space Nimrod Layout - -This is the layout for a split space bottom row. diff --git a/keyboards/nix_studio/n60_a/keymaps/default/readme.md b/keyboards/nix_studio/n60_a/keymaps/default/readme.md deleted file mode 100644 index 314c4660675..00000000000 --- a/keyboards/nix_studio/n60_a/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for N60A diff --git a/keyboards/nix_studio/n60_a/keymaps/via/readme.md b/keyboards/nix_studio/n60_a/keymaps/via/readme.md deleted file mode 100644 index 984856f1f12..00000000000 --- a/keyboards/nix_studio/n60_a/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for N60A diff --git a/keyboards/nix_studio/oxalys80/keymaps/default/readme.md b/keyboards/nix_studio/oxalys80/keymaps/default/readme.md deleted file mode 100644 index d4b2ba96712..00000000000 --- a/keyboards/nix_studio/oxalys80/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for oxalys80 \ No newline at end of file diff --git a/keyboards/nix_studio/oxalys80/keymaps/via/readme.md b/keyboards/nix_studio/oxalys80/keymaps/via/readme.md deleted file mode 100644 index 7b9d19da1fe..00000000000 --- a/keyboards/nix_studio/oxalys80/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for oxalys80 diff --git a/keyboards/novelkeys/nk1/keymaps/default/readme.md b/keyboards/novelkeys/nk1/keymaps/default/readme.md deleted file mode 100644 index 6e9c78ee516..00000000000 --- a/keyboards/novelkeys/nk1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for NK1 diff --git a/keyboards/novelkeys/nk1/keymaps/via/readme.md b/keyboards/novelkeys/nk1/keymaps/via/readme.md deleted file mode 100644 index 10025a5969c..00000000000 --- a/keyboards/novelkeys/nk1/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for NK1 with VIA enabled diff --git a/keyboards/noxary/260/keymaps/default/readme.md b/keyboards/noxary/260/keymaps/default/readme.md deleted file mode 100644 index af0cd4ee276..00000000000 --- a/keyboards/noxary/260/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Noxary 260 \ No newline at end of file diff --git a/keyboards/noxary/vulcan/keymaps/default/readme.md b/keyboards/noxary/vulcan/keymaps/default/readme.md deleted file mode 100644 index 64ee9c8a3c1..00000000000 --- a/keyboards/noxary/vulcan/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The default keymap for Vulcan -Nothing special \ No newline at end of file diff --git a/keyboards/noxary/vulcan/keymaps/via/readme.md b/keyboards/noxary/vulcan/keymaps/via/readme.md deleted file mode 100644 index e4393e3fe1a..00000000000 --- a/keyboards/noxary/vulcan/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The via keymap for Vulcan -For use with VIA configurator \ No newline at end of file diff --git a/keyboards/nyhxis/nfr_70/keymaps/default/readme.md b/keyboards/nyhxis/nfr_70/keymaps/default/readme.md deleted file mode 100644 index 9b3c534eb7b..00000000000 --- a/keyboards/nyhxis/nfr_70/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for NFR-70 \ No newline at end of file diff --git a/keyboards/obosob/arch_36/keymaps/obosob/readme.md b/keyboards/obosob/arch_36/keymaps/obosob/readme.md deleted file mode 100644 index e7dc6952d79..00000000000 --- a/keyboards/obosob/arch_36/keymaps/obosob/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Obosob's keymap for Arch-36 diff --git a/keyboards/ogre/ergo_single/keymaps/default/readme.md b/keyboards/ogre/ergo_single/keymaps/default/readme.md deleted file mode 100644 index a63ad5baa23..00000000000 --- a/keyboards/ogre/ergo_single/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for ergo_single diff --git a/keyboards/ogre/ergo_split/keymaps/default/readme.md b/keyboards/ogre/ergo_split/keymaps/default/readme.md deleted file mode 100644 index 4e225222b1c..00000000000 --- a/keyboards/ogre/ergo_split/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for ergo_split diff --git a/keyboards/opendeck/32/keymaps/default/readme.md b/keyboards/opendeck/32/keymaps/default/readme.md deleted file mode 100644 index 4ccf0b46332..00000000000 --- a/keyboards/opendeck/32/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for OpenDeck32 diff --git a/keyboards/p3d/glitch/keymaps/default/readme.md b/keyboards/p3d/glitch/keymaps/default/readme.md deleted file mode 100644 index 8661c4b95f6..00000000000 --- a/keyboards/p3d/glitch/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Glitch diff --git a/keyboards/p3d/q4z/keymaps/default/readme.md b/keyboards/p3d/q4z/keymaps/default/readme.md deleted file mode 100644 index 28186f64d86..00000000000 --- a/keyboards/p3d/q4z/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default Q4Z Keymap diff --git a/keyboards/p3d/spacey/keymaps/default/readme.md b/keyboards/p3d/spacey/keymaps/default/readme.md deleted file mode 100644 index 808ab68264c..00000000000 --- a/keyboards/p3d/spacey/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for spacey diff --git a/keyboards/p3d/tw40/keymaps/default/readme.md b/keyboards/p3d/tw40/keymaps/default/readme.md deleted file mode 100644 index 4dfa184e29f..00000000000 --- a/keyboards/p3d/tw40/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for tw40 diff --git a/keyboards/palette1202/keymaps/default/readme.md b/keyboards/palette1202/keymaps/default/readme.md deleted file mode 100644 index e84238695a6..00000000000 --- a/keyboards/palette1202/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Palette1202 diff --git a/keyboards/palette1202/keymaps/key-check/readme.md b/keyboards/palette1202/keymaps/key-check/readme.md deleted file mode 100644 index c9e27ce1431..00000000000 --- a/keyboards/palette1202/keymaps/key-check/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The test-purpose keymap for Palette1202 -組み立て後のテスト用keymapです。 \ No newline at end of file diff --git a/keyboards/panc60/keymaps/default/readme.md b/keyboards/panc60/keymaps/default/readme.md deleted file mode 100644 index 3aa3cdb4c60..00000000000 --- a/keyboards/panc60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for panc60 diff --git a/keyboards/papercranekeyboards/gerald65/keymaps/default/readme.md b/keyboards/papercranekeyboards/gerald65/keymaps/default/readme.md deleted file mode 100644 index e548f34ac48..00000000000 --- a/keyboards/papercranekeyboards/gerald65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for gerald65 diff --git a/keyboards/parallel/parallel_65/hotswap/keymaps/default/readme.md b/keyboards/parallel/parallel_65/hotswap/keymaps/default/readme.md deleted file mode 100644 index 64ddedeed4e..00000000000 --- a/keyboards/parallel/parallel_65/hotswap/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Parallel 65% Hotswap PCB diff --git a/keyboards/parallel/parallel_65/soldered/keymaps/default/readme.md b/keyboards/parallel/parallel_65/soldered/keymaps/default/readme.md deleted file mode 100644 index 149c5a0bf12..00000000000 --- a/keyboards/parallel/parallel_65/soldered/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Parallel 65% PCB diff --git a/keyboards/pdxkbc/keymaps/default/readme.md b/keyboards/pdxkbc/keymaps/default/readme.md deleted file mode 100644 index 1371be84896..00000000000 --- a/keyboards/pdxkbc/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for pdxkbc \ No newline at end of file diff --git a/keyboards/pegasus/keymaps/default/readme.md b/keyboards/pegasus/keymaps/default/readme.md deleted file mode 100644 index 170cc76269d..00000000000 --- a/keyboards/pegasus/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for pegasus diff --git a/keyboards/pegasus/keymaps/split/readme.md b/keyboards/pegasus/keymaps/split/readme.md deleted file mode 100644 index 170cc76269d..00000000000 --- a/keyboards/pegasus/keymaps/split/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for pegasus diff --git a/keyboards/peranekofactory/tone/keymaps/default/readme.md b/keyboards/peranekofactory/tone/keymaps/default/readme.md deleted file mode 100644 index 9d7e7502431..00000000000 --- a/keyboards/peranekofactory/tone/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The default keymap for tone -For Adobe Lightroom. diff --git a/keyboards/percent/booster/keymaps/default/readme.md b/keyboards/percent/booster/keymaps/default/readme.md deleted file mode 100644 index 0293153f029..00000000000 --- a/keyboards/percent/booster/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Booster diff --git a/keyboards/percent/skog_lite/keymaps/default/readme.md b/keyboards/percent/skog_lite/keymaps/default/readme.md deleted file mode 100644 index c7ec726b03c..00000000000 --- a/keyboards/percent/skog_lite/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Skog Lite \ No newline at end of file diff --git a/keyboards/picolab/frusta_fundamental/keymaps/default/readme.md b/keyboards/picolab/frusta_fundamental/keymaps/default/readme.md deleted file mode 100644 index 2a93bcacb05..00000000000 --- a/keyboards/picolab/frusta_fundamental/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for Frusta Fundamental - -This is the default layout that comes flashed on every Frusta Fundamental. \ No newline at end of file diff --git a/keyboards/pimentoso/touhoupad/keymaps/default/readme.md b/keyboards/pimentoso/touhoupad/keymaps/default/readme.md deleted file mode 100644 index 00bf43cb990..00000000000 --- a/keyboards/pimentoso/touhoupad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 4pack diff --git a/keyboards/pisces/keymaps/default/readme.md b/keyboards/pisces/keymaps/default/readme.md deleted file mode 100644 index 4a55a35e4be..00000000000 --- a/keyboards/pisces/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap diff --git a/keyboards/pisces/keymaps/via/readme.md b/keyboards/pisces/keymaps/via/readme.md deleted file mode 100644 index 5b3ff232e60..00000000000 --- a/keyboards/pisces/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# VIA enabled keymap diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/default/readme.md b/keyboards/pizzakeyboards/pizza65/keymaps/default/readme.md deleted file mode 100644 index bf78ffe048d..00000000000 --- a/keyboards/pizzakeyboards/pizza65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -#Default keymap. Pretty Standard ANSI with blocker layout. diff --git a/keyboards/pizzakeyboards/pizza65/keymaps/via/readme.md b/keyboards/pizzakeyboards/pizza65/keymaps/via/readme.md deleted file mode 100644 index 72be963a9c7..00000000000 --- a/keyboards/pizzakeyboards/pizza65/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -#Keymap for enabling VIA compatibility. Same ANSI with blocker as default. diff --git a/keyboards/planck/keymaps/default/readme.md b/keyboards/planck/keymaps/default/readme.md deleted file mode 100644 index de9680b4985..00000000000 --- a/keyboards/planck/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Planck Layout - diff --git a/keyboards/playkbtw/helen80/keymaps/default/readme.md b/keyboards/playkbtw/helen80/keymaps/default/readme.md deleted file mode 100644 index 396c6ee7309..00000000000 --- a/keyboards/playkbtw/helen80/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Helen 80 Layout - -This is the default tkl_ansi layout that comes flashed on every Helen 80. \ No newline at end of file diff --git a/keyboards/playkbtw/pk60/keymaps/default/readme.md b/keyboards/playkbtw/pk60/keymaps/default/readme.md deleted file mode 100644 index 911cb37c59e..00000000000 --- a/keyboards/playkbtw/pk60/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Play Keyboard60 Layout - -This is the default layout that comes flashed on every Play Keyboard60. All key pins are shown in the file. \ No newline at end of file diff --git a/keyboards/playkbtw/pk64rgb/keymaps/default/readme.md b/keyboards/playkbtw/pk64rgb/keymaps/default/readme.md deleted file mode 100644 index 9875a6a41f7..00000000000 --- a/keyboards/playkbtw/pk64rgb/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default PK64RGB Layout - -This is the default 64_ansi layout that comes flashed on every PK64RGB. \ No newline at end of file diff --git a/keyboards/ploopyco/madromys/keymaps/via/readme.md b/keyboards/ploopyco/madromys/keymaps/via/readme.md deleted file mode 100644 index c8717fe1f74..00000000000 --- a/keyboards/ploopyco/madromys/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -This is the VIA keymap for Ploopyco Madromys Trackball, which can be used to customise the key layout. See [the VIA online app](https://usevia.app/) for how to do this. diff --git a/keyboards/ploopyco/mouse/keymaps/default/readme.md b/keyboards/ploopyco/mouse/keymaps/default/readme.md deleted file mode 100644 index 4618c83c05f..00000000000 --- a/keyboards/ploopyco/mouse/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for PloopyCo Mouse diff --git a/keyboards/ploopyco/trackball/keymaps/default/readme.md b/keyboards/ploopyco/trackball/keymaps/default/readme.md deleted file mode 100644 index f965ef3c326..00000000000 --- a/keyboards/ploopyco/trackball/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Ploopyco Trackball diff --git a/keyboards/ploopyco/trackball_nano/keymaps/default/readme.md b/keyboards/ploopyco/trackball_nano/keymaps/default/readme.md deleted file mode 100644 index 72401991c9a..00000000000 --- a/keyboards/ploopyco/trackball_nano/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -The default keymap for the Ploopy Trackball Nano. diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/default/readme.md b/keyboards/ploopyco/trackball_thumb/keymaps/default/readme.md deleted file mode 100644 index 0f21a21ba6f..00000000000 --- a/keyboards/ploopyco/trackball_thumb/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Ploopyco Thumb Trackball diff --git a/keyboards/plume/plume65/keymaps/default/readme.md b/keyboards/plume/plume65/keymaps/default/readme.md deleted file mode 100644 index 33c50283a06..00000000000 --- a/keyboards/plume/plume65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -This is the default keymap for the Plume65. diff --git a/keyboards/plut0nium/0x3e/keymaps/default/readme.md b/keyboards/plut0nium/0x3e/keymaps/default/readme.md deleted file mode 100644 index d75f467dfa4..00000000000 --- a/keyboards/plut0nium/0x3e/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for 0x3E diff --git a/keyboards/polycarbdiet/s20/keymaps/default/readme.md b/keyboards/polycarbdiet/s20/keymaps/default/readme.md deleted file mode 100644 index 81c2266b4b7..00000000000 --- a/keyboards/polycarbdiet/s20/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for S20 diff --git a/keyboards/portal_66/hotswap/keymaps/default/readme.md b/keyboards/portal_66/hotswap/keymaps/default/readme.md deleted file mode 100644 index 1a4e1624e39..00000000000 --- a/keyboards/portal_66/hotswap/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Portal 66 Hotswap diff --git a/keyboards/portal_66/soldered/keymaps/default/readme.md b/keyboards/portal_66/soldered/keymaps/default/readme.md deleted file mode 100644 index 5d87fc7fe06..00000000000 --- a/keyboards/portal_66/soldered/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Portal 66 diff --git a/keyboards/pos78/keymaps/default/readme.md b/keyboards/pos78/keymaps/default/readme.md deleted file mode 100644 index c313876fc91..00000000000 --- a/keyboards/pos78/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default (UK) keymap for pos78 diff --git a/keyboards/preonic/keymaps/default/readme.md b/keyboards/preonic/keymaps/default/readme.md deleted file mode 100644 index e911968dd96..00000000000 --- a/keyboards/preonic/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default Preonic layout - largely based on the Planck's \ No newline at end of file diff --git a/keyboards/preonic/keymaps/via/readme.md b/keyboards/preonic/keymaps/via/readme.md deleted file mode 100644 index e911968dd96..00000000000 --- a/keyboards/preonic/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default Preonic layout - largely based on the Planck's \ No newline at end of file diff --git a/keyboards/primekb/prime_e/keymaps/default/readme.md b/keyboards/primekb/prime_e/keymaps/default/readme.md deleted file mode 100644 index 5266526eec9..00000000000 --- a/keyboards/primekb/prime_e/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The default keymap for Prime_E -This is the default keymap for Prime_E. \ No newline at end of file diff --git a/keyboards/primekb/prime_e/keymaps/via/readme.md b/keyboards/primekb/prime_e/keymaps/via/readme.md deleted file mode 100644 index bbd56c0cc71..00000000000 --- a/keyboards/primekb/prime_e/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA keymap for Prime_E -This keymap is for compatibility with the VIA configurator. \ No newline at end of file diff --git a/keyboards/primekb/prime_l/keymaps/default/readme.md b/keyboards/primekb/prime_l/keymaps/default/readme.md deleted file mode 100644 index 4e4db88799e..00000000000 --- a/keyboards/primekb/prime_l/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for prime_l \ No newline at end of file diff --git a/keyboards/primekb/prime_l/keymaps/via/readme.md b/keyboards/primekb/prime_l/keymaps/via/readme.md deleted file mode 100644 index 28baba88e06..00000000000 --- a/keyboards/primekb/prime_l/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA keymap for Prime_L -This keymap is for compatibility with the VIA configurator. \ No newline at end of file diff --git a/keyboards/primekb/prime_m/keymaps/default/readme.md b/keyboards/primekb/prime_m/keymaps/default/readme.md deleted file mode 100644 index 35a3edc8f33..00000000000 --- a/keyboards/primekb/prime_m/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Prime_M \ No newline at end of file diff --git a/keyboards/primekb/prime_m/keymaps/via/readme.md b/keyboards/primekb/prime_m/keymaps/via/readme.md deleted file mode 100644 index 3283f635677..00000000000 --- a/keyboards/primekb/prime_m/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Prime_M \ No newline at end of file diff --git a/keyboards/primekb/prime_o/keymaps/default/readme.md b/keyboards/primekb/prime_o/keymaps/default/readme.md deleted file mode 100644 index e6e7a1dc9df..00000000000 --- a/keyboards/primekb/prime_o/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for prime_o \ No newline at end of file diff --git a/keyboards/program_yoink/ortho/keymaps/default/readme.md b/keyboards/program_yoink/ortho/keymaps/default/readme.md deleted file mode 100644 index 7598e7886bc..00000000000 --- a/keyboards/program_yoink/ortho/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Program Yoink! Ortho diff --git a/keyboards/program_yoink/ortho/keymaps/ortho_split/readme.md b/keyboards/program_yoink/ortho/keymaps/ortho_split/readme.md deleted file mode 100644 index 36a1385a319..00000000000 --- a/keyboards/program_yoink/ortho/keymaps/ortho_split/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The split space bar keymap for the Program Yoink! Ortho diff --git a/keyboards/program_yoink/staggered/keymaps/default/readme.md b/keyboards/program_yoink/staggered/keymaps/default/readme.md deleted file mode 100644 index b225f4bede4..00000000000 --- a/keyboards/program_yoink/staggered/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Program Yoink! Staggered diff --git a/keyboards/program_yoink/staggered/keymaps/split_bar/readme.md b/keyboards/program_yoink/staggered/keymaps/split_bar/readme.md deleted file mode 100644 index db383d07a44..00000000000 --- a/keyboards/program_yoink/staggered/keymaps/split_bar/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The split space bar keymap for the Program Yoink! Staggered diff --git a/keyboards/program_yoink/staggered/keymaps/via/readme.md b/keyboards/program_yoink/staggered/keymaps/via/readme.md deleted file mode 100644 index cb47e59459b..00000000000 --- a/keyboards/program_yoink/staggered/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for the Program Yoink! Staggered diff --git a/keyboards/projectcain/relic/keymaps/default/readme.md b/keyboards/projectcain/relic/keymaps/default/readme.md deleted file mode 100644 index 0c00cd74afb..00000000000 --- a/keyboards/projectcain/relic/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for relic diff --git a/keyboards/projectcain/vault35/keymaps/default/readme.md b/keyboards/projectcain/vault35/keymaps/default/readme.md deleted file mode 100644 index 60807227676..00000000000 --- a/keyboards/projectcain/vault35/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for vault35 diff --git a/keyboards/projectcain/vault45/keymaps/default/readme.md b/keyboards/projectcain/vault45/keymaps/default/readme.md deleted file mode 100644 index ce333c3b81c..00000000000 --- a/keyboards/projectcain/vault45/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for vault45 diff --git a/keyboards/prototypist/allison/keymaps/via/readme.md b/keyboards/prototypist/allison/keymaps/via/readme.md deleted file mode 100644 index b82bc8e79f9..00000000000 --- a/keyboards/prototypist/allison/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Compile with this keymap to use VIA diff --git a/keyboards/prototypist/allison_numpad/keymaps/via/readme.md b/keyboards/prototypist/allison_numpad/keymaps/via/readme.md deleted file mode 100644 index b82bc8e79f9..00000000000 --- a/keyboards/prototypist/allison_numpad/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Compile with this keymap to use VIA diff --git a/keyboards/prototypist/j01/keymaps/default/readme.md b/keyboards/prototypist/j01/keymaps/default/readme.md deleted file mode 100644 index ef72054f196..00000000000 --- a/keyboards/prototypist/j01/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Proto[Typist] J-01 rev1 keyboard diff --git a/keyboards/prototypist/j01/keymaps/via/readme.md b/keyboards/prototypist/j01/keymaps/via/readme.md deleted file mode 100644 index 9783843b17d..00000000000 --- a/keyboards/prototypist/j01/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for the Proto[Typist] J-01 rev1 keyboard diff --git a/keyboards/psuieee/pluto12/keymaps/default/readme.md b/keyboards/psuieee/pluto12/keymaps/default/readme.md deleted file mode 100644 index 8416c0fe61d..00000000000 --- a/keyboards/psuieee/pluto12/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for pluto12 diff --git a/keyboards/pteron36/keymaps/via/readme.md b/keyboards/pteron36/keymaps/via/readme.md deleted file mode 100644 index 5bde196156b..00000000000 --- a/keyboards/pteron36/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default keymap for via \ No newline at end of file diff --git a/keyboards/punk75/keymaps/default/readme.md b/keyboards/punk75/keymaps/default/readme.md deleted file mode 100644 index 963571e9354..00000000000 --- a/keyboards/punk75/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for punk75 diff --git a/keyboards/qpockets/wanten/keymaps/default/readme.md b/keyboards/qpockets/wanten/keymaps/default/readme.md deleted file mode 100644 index 5a2b63c0bb4..00000000000 --- a/keyboards/qpockets/wanten/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for wanten diff --git a/keyboards/quad_h/lb75/keymaps/continuous_fnrow/readme.md b/keyboards/quad_h/lb75/keymaps/continuous_fnrow/readme.md deleted file mode 100644 index be0223d1a7f..00000000000 --- a/keyboards/quad_h/lb75/keymaps/continuous_fnrow/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The continuous fnrow keymap for LB75 - -Non-blockered upper row \ No newline at end of file diff --git a/keyboards/quad_h/lb75/keymaps/default/readme.md b/keyboards/quad_h/lb75/keymaps/default/readme.md deleted file mode 100644 index 6d3bb42bcf5..00000000000 --- a/keyboards/quad_h/lb75/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for LB75 - -Nothing special \ No newline at end of file diff --git a/keyboards/quad_h/lb75/keymaps/divided_fnrow/readme.md b/keyboards/quad_h/lb75/keymaps/divided_fnrow/readme.md deleted file mode 100644 index 0a2f0b5de8d..00000000000 --- a/keyboards/quad_h/lb75/keymaps/divided_fnrow/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The divided fnrow keymap for LB75 - -Blockered upper row \ No newline at end of file diff --git a/keyboards/quad_h/lb75/keymaps/via/readme.md b/keyboards/quad_h/lb75/keymaps/via/readme.md deleted file mode 100644 index 943c015c189..00000000000 --- a/keyboards/quad_h/lb75/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The via keymap for LB75 - -For use with VIA configurator \ No newline at end of file diff --git a/keyboards/quantrik/kyuu/keymaps/default/readme.md b/keyboards/quantrik/kyuu/keymaps/default/readme.md deleted file mode 100644 index f87ce36e38e..00000000000 --- a/keyboards/quantrik/kyuu/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Kyuu diff --git a/keyboards/quantrik/kyuu/keymaps/via/readme.md b/keyboards/quantrik/kyuu/keymaps/via/readme.md deleted file mode 100755 index c3d6edabfb7..00000000000 --- a/keyboards/quantrik/kyuu/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for Kyuu diff --git a/keyboards/qvex/lynepad/keymaps/default/readme.md b/keyboards/qvex/lynepad/keymaps/default/readme.md deleted file mode 100644 index 8884d1a91a2..00000000000 --- a/keyboards/qvex/lynepad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for lynepad diff --git a/keyboards/rad/keymaps/default/readme.md b/keyboards/rad/keymaps/default/readme.md deleted file mode 100644 index e3562e4f0be..00000000000 --- a/keyboards/rad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# rad - Default layout diff --git a/keyboards/rate/pistachio_mp/keymaps/default/readme.md b/keyboards/rate/pistachio_mp/keymaps/default/readme.md deleted file mode 100644 index 2bc50be9dd0..00000000000 --- a/keyboards/rate/pistachio_mp/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for pistachio_mp diff --git a/keyboards/rate/pistachio_mp/keymaps/via/readme.md b/keyboards/rate/pistachio_mp/keymaps/via/readme.md deleted file mode 100644 index b768049ccc0..00000000000 --- a/keyboards/rate/pistachio_mp/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for pistachio_mp diff --git a/keyboards/rate/pistachio_pro/keymaps/default/readme.md b/keyboards/rate/pistachio_pro/keymaps/default/readme.md deleted file mode 100644 index bf313ec19d1..00000000000 --- a/keyboards/rate/pistachio_pro/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for pistachio_pro diff --git a/keyboards/rate/pistachio_pro/keymaps/rate/readme.md b/keyboards/rate/pistachio_pro/keymaps/rate/readme.md deleted file mode 100644 index c7049b67ce2..00000000000 --- a/keyboards/rate/pistachio_pro/keymaps/rate/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The rate's keymap for pistachio_pro diff --git a/keyboards/rate/pistachio_pro/keymaps/via/readme.md b/keyboards/rate/pistachio_pro/keymaps/via/readme.md deleted file mode 100644 index e2f4b9f6b28..00000000000 --- a/keyboards/rate/pistachio_pro/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for pistachio_pro diff --git a/keyboards/recompile_keys/choco60/keymaps/default/readme.md b/keyboards/recompile_keys/choco60/keymaps/default/readme.md deleted file mode 100644 index f55e392c391..00000000000 --- a/keyboards/recompile_keys/choco60/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for choco60 diff --git a/keyboards/recompile_keys/cocoa40/keymaps/default/readme.md b/keyboards/recompile_keys/cocoa40/keymaps/default/readme.md deleted file mode 100644 index 9e530faff07..00000000000 --- a/keyboards/recompile_keys/cocoa40/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for cocoa40 diff --git a/keyboards/recompile_keys/nomu30/keymaps/default/readme.md b/keyboards/recompile_keys/nomu30/keymaps/default/readme.md deleted file mode 100644 index 55bc4585010..00000000000 --- a/keyboards/recompile_keys/nomu30/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for nomu30 diff --git a/keyboards/redox/keymaps/default/readme.md b/keyboards/redox/keymaps/default/readme.md deleted file mode 100644 index 8fa8ddf5cea..00000000000 --- a/keyboards/redox/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Redox diff --git a/keyboards/redox/keymaps/via/readme.md b/keyboards/redox/keymaps/via/readme.md deleted file mode 100644 index 60c8e0af54f..00000000000 --- a/keyboards/redox/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for Redox diff --git a/keyboards/redscarf_iiplus/verb/keymaps/default/readme.md b/keyboards/redscarf_iiplus/verb/keymaps/default/readme.md deleted file mode 100755 index b7324c5180c..00000000000 --- a/keyboards/redscarf_iiplus/verb/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Red Scarf II+ ver B. \ No newline at end of file diff --git a/keyboards/redscarf_iiplus/verc/keymaps/default/readme.md b/keyboards/redscarf_iiplus/verc/keymaps/default/readme.md deleted file mode 100755 index c792f1d1204..00000000000 --- a/keyboards/redscarf_iiplus/verc/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Red Scarf II+ ver C \ No newline at end of file diff --git a/keyboards/redscarf_iiplus/verd/keymaps/default/readme.md b/keyboards/redscarf_iiplus/verd/keymaps/default/readme.md deleted file mode 100644 index cf396a4255e..00000000000 --- a/keyboards/redscarf_iiplus/verd/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Red Scarf II+ ver D. diff --git a/keyboards/reviung/reviung33/keymaps/default/readme.md b/keyboards/reviung/reviung33/keymaps/default/readme.md deleted file mode 100644 index 9121b14294d..00000000000 --- a/keyboards/reviung/reviung33/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for reviung33 diff --git a/keyboards/reviung/reviung33/keymaps/default_jp/readme.md b/keyboards/reviung/reviung33/keymaps/default_jp/readme.md deleted file mode 100644 index d7739a3d86b..00000000000 --- a/keyboards/reviung/reviung33/keymaps/default_jp/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_jp keymap for reviung33 diff --git a/keyboards/reviung/reviung34/keymaps/default/readme.md b/keyboards/reviung/reviung34/keymaps/default/readme.md deleted file mode 100755 index 2e4619fae83..00000000000 --- a/keyboards/reviung/reviung34/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for reviung34 diff --git a/keyboards/reviung/reviung34/keymaps/default_2u/readme.md b/keyboards/reviung/reviung34/keymaps/default_2u/readme.md deleted file mode 100755 index 2e4619fae83..00000000000 --- a/keyboards/reviung/reviung34/keymaps/default_2u/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for reviung34 diff --git a/keyboards/reviung/reviung34/keymaps/default_jp/readme.md b/keyboards/reviung/reviung34/keymaps/default_jp/readme.md deleted file mode 100755 index 2e4619fae83..00000000000 --- a/keyboards/reviung/reviung34/keymaps/default_jp/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for reviung34 diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb/readme.md b/keyboards/reviung/reviung34/keymaps/default_rgb/readme.md deleted file mode 100755 index 81b04868cba..00000000000 --- a/keyboards/reviung/reviung34/keymaps/default_rgb/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for non-split reviung34 diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb2u/readme.md b/keyboards/reviung/reviung34/keymaps/default_rgb2u/readme.md deleted file mode 100755 index 8acc99250fa..00000000000 --- a/keyboards/reviung/reviung34/keymaps/default_rgb2u/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for non-split reviung34 - -Use the thumb key with 2u diff --git a/keyboards/reviung/reviung41/keymaps/default/readme.md b/keyboards/reviung/reviung41/keymaps/default/readme.md deleted file mode 100644 index 7e8120413e4..00000000000 --- a/keyboards/reviung/reviung41/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for reviung41 diff --git a/keyboards/reviung/reviung5/keymaps/default/readme.md b/keyboards/reviung/reviung5/keymaps/default/readme.md deleted file mode 100644 index babdce579fa..00000000000 --- a/keyboards/reviung/reviung5/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for reviung5 diff --git a/keyboards/reviung/reviung5/keymaps/default_lre/readme.md b/keyboards/reviung/reviung5/keymaps/default_lre/readme.md deleted file mode 100644 index 0e3edee7b11..00000000000 --- a/keyboards/reviung/reviung5/keymaps/default_lre/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for reviung5 - -## Use the Left Rotary Encoder diff --git a/keyboards/reviung/reviung5/keymaps/default_rre/readme.md b/keyboards/reviung/reviung5/keymaps/default_rre/readme.md deleted file mode 100644 index d16e25ce503..00000000000 --- a/keyboards/reviung/reviung5/keymaps/default_rre/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# The default keymap for reviung5 - -## Use the Right Rotary Encoder - diff --git a/keyboards/reviung/reviung53/keymaps/default/readme.md b/keyboards/reviung/reviung53/keymaps/default/readme.md deleted file mode 100644 index 1e473c9a745..00000000000 --- a/keyboards/reviung/reviung53/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for reviung53 diff --git a/keyboards/reviung/reviung53/keymaps/via/readme.md b/keyboards/reviung/reviung53/keymaps/via/readme.md deleted file mode 100644 index 9b299ba2864..00000000000 --- a/keyboards/reviung/reviung53/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for reviung53 - -For use with VIA configurator and compatible keymap editors. \ No newline at end of file diff --git a/keyboards/reviung/reviung61/keymaps/default/readme.md b/keyboards/reviung/reviung61/keymaps/default/readme.md deleted file mode 100644 index 43446daa89a..00000000000 --- a/keyboards/reviung/reviung61/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for reviung61 diff --git a/keyboards/reviung/reviung61/keymaps/default_rgb/readme.md b/keyboards/reviung/reviung61/keymaps/default_rgb/readme.md deleted file mode 100644 index 741e9127052..00000000000 --- a/keyboards/reviung/reviung61/keymaps/default_rgb/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default_rgb keymap for reviung61 - -Use LED STRIP SERIAL RGB for RGB underglow. diff --git a/keyboards/rmi_kb/squishyfrl/keymaps/default/readme.md b/keyboards/rmi_kb/squishyfrl/keymaps/default/readme.md deleted file mode 100644 index b20cf74361a..00000000000 --- a/keyboards/rmi_kb/squishyfrl/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for SquishyTKL - -ANSI, 6.25u bottom row diff --git a/keyboards/rmi_kb/squishytkl/keymaps/default/readme.md b/keyboards/rmi_kb/squishytkl/keymaps/default/readme.md deleted file mode 100644 index b20cf74361a..00000000000 --- a/keyboards/rmi_kb/squishytkl/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for SquishyTKL - -ANSI, 6.25u bottom row diff --git a/keyboards/rominronin/katana60/rev1/keymaps/colemak/readme.md b/keyboards/rominronin/katana60/rev1/keymaps/colemak/readme.md deleted file mode 100644 index 4446bffca3c..00000000000 --- a/keyboards/rominronin/katana60/rev1/keymaps/colemak/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The colemak keymap for katana60 - -Same as the default layout, but with default Colemal layout. - -# TODO: references to extend layer and symbol layers \ No newline at end of file diff --git a/keyboards/rominronin/katana60/rev2/keymaps/default/readme.md b/keyboards/rominronin/katana60/rev2/keymaps/default/readme.md deleted file mode 100644 index 6d0bbe8b2d1..00000000000 --- a/keyboards/rominronin/katana60/rev2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for katana60_rev2 diff --git a/keyboards/rookiebwoy/late9/rev1/keymaps/default/readme.md b/keyboards/rookiebwoy/late9/rev1/keymaps/default/readme.md deleted file mode 100644 index f78318d7dea..00000000000 --- a/keyboards/rookiebwoy/late9/rev1/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# LATE-9 default keymap - -This is a simple 2-layer calculator look-a-like layout. diff --git a/keyboards/roseslite/keymaps/default/readme.md b/keyboards/roseslite/keymaps/default/readme.md deleted file mode 100644 index 6598b04bdc0..00000000000 --- a/keyboards/roseslite/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for roses_lite \ No newline at end of file diff --git a/keyboards/runes/skjoldr/keymaps/default/readme.md b/keyboards/runes/skjoldr/keymaps/default/readme.md deleted file mode 100644 index 24f28db1e90..00000000000 --- a/keyboards/runes/skjoldr/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Skjoldr \ No newline at end of file diff --git a/keyboards/ryanskidmore/rskeys100/keymaps/default/readme.md b/keyboards/ryanskidmore/rskeys100/keymaps/default/readme.md deleted file mode 100644 index 03357c206bb..00000000000 --- a/keyboards/ryanskidmore/rskeys100/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -This is the default keymap (UK, ISO) for the rskeys100. The RGB control layer can be activated by holding the F12 key. \ No newline at end of file diff --git a/keyboards/salicylic_acid3/7skb/keymaps/via/readme.md b/keyboards/salicylic_acid3/7skb/keymaps/via/readme.md deleted file mode 100644 index 67c31de5c0b..00000000000 --- a/keyboards/salicylic_acid3/7skb/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The via keymap for 7sKB - -The basic keymap with full support for VIA Configurator diff --git a/keyboards/sandwich/keeb68/keymaps/default/readme.md b/keyboards/sandwich/keeb68/keymaps/default/readme.md deleted file mode 100644 index 61f0460aa45..00000000000 --- a/keyboards/sandwich/keeb68/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for keeb68 diff --git a/keyboards/satt/comet46/keymaps/default-rgbled/readme.md b/keyboards/satt/comet46/keymaps/default-rgbled/readme.md deleted file mode 100644 index 40cc7443376..00000000000 --- a/keyboards/satt/comet46/keymaps/default-rgbled/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -## default-led - -A keymap that is compatible with mitosis-type receivers, which use RGB LED for layer indication. diff --git a/keyboards/satt/comet46/keymaps/default/readme.md b/keyboards/satt/comet46/keymaps/default/readme.md deleted file mode 100644 index b0085d2a626..00000000000 --- a/keyboards/satt/comet46/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -## default-oled-display - -A keymap that is compatible with receivers with an OLED display. diff --git a/keyboards/sawnsprojects/amber80/solder/keymaps/default/readme.md b/keyboards/sawnsprojects/amber80/solder/keymaps/default/readme.md deleted file mode 100644 index 60f00eb4ba7..00000000000 --- a/keyboards/sawnsprojects/amber80/solder/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Amber80 Solder \ No newline at end of file diff --git a/keyboards/sawnsprojects/amber80/solder/keymaps/via/readme.md b/keyboards/sawnsprojects/amber80/solder/keymaps/via/readme.md deleted file mode 100644 index 3313fcc41a4..00000000000 --- a/keyboards/sawnsprojects/amber80/solder/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Amber80 Solder \ No newline at end of file diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/readme.md deleted file mode 100644 index 56cc403367b..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The 60_ansi keymap for krush60 solder - -* Standard 60% ANSI layout diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/readme.md deleted file mode 100644 index d601194a079..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The 60_ansi_arrow keymap for krush60 solder - -* 60% ANSI with Arrows layout diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/readme.md deleted file mode 100644 index 618b721d221..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# The 60_ansi_arrow_split_bs keymap for krush60 solder - -* 60% ANSI with Arrows layout - * split Backspace diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/readme.md deleted file mode 100644 index db21ea0871f..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The 60_ansi_arrow_split_bs_spc keymap for krush60 solder - -* 60% ANSI with Arrows layout - * split Backspace - * split Spacebar diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/readme.md deleted file mode 100644 index 68409cf47a9..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# The 60_ansi_arrow_split_spc keymap for krush60 solder - -* 60% ANSI with Arrows layout - * split Spacebar diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/readme.md deleted file mode 100644 index 6590eb30344..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# The 60_ansi_arrow_tsangan keymap for krush60 solder - -* 60% ANSI with Arrows layout - * 7u Spacebar diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/readme.md deleted file mode 100644 index b48a892a23a..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The 60_ansi_arrow_tsangan_split_bs keymap for krush60 solder - -* 60% ANSI with Arrows layout - * 7u Spacebar - * split Backspace diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/readme.md deleted file mode 100644 index b0075b8c7b9..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# The 60_ansi_split_bs keymap for krush60 solder - -* 60% ANSI layout - * split Backspace diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/readme.md deleted file mode 100644 index 922e791c406..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The 60_ansi_split_bs_spc keymap for krush60 solder - -* 60% ANSI layout - * split Backspace - * split Spacebar diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/readme.md deleted file mode 100644 index d98e08c875b..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# The 60_ansi_split_spc keymap for krush60 solder - -* 60% ANSI layout - * split Spacebar diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/readme.md deleted file mode 100644 index 11453644ea6..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# The 60_ansi_tsangan keymap for krush60 solder - -* 60% ANSI layout - * Tsangan bottom row diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/readme.md deleted file mode 100644 index 5bc89c6b263..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The 60_ansi_tsangan_split_bs keymap for krush60 solder - -* 60% ANSI layout - * Tsangan bottom row - * split Backspace diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/readme.md deleted file mode 100644 index 63bfb362241..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The 60_ansi_tsangan_split_rshift keymap for krush60 solder - -* 60% ANSI layout - * Tsangan bottom row - * split Right Shift diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/readme.md deleted file mode 100644 index 1a837607e94..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The 60_isoenter_split_bs keymap for krush60 - -* 60% ANSI layout - * ISO Enter with 2.25u Left Shift - * split Backspace diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/readme.md deleted file mode 100644 index 3d983464834..00000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/readme.md +++ /dev/null @@ -1,6 +0,0 @@ -# The 60_tsangan_hhkb keymap for krush60 solder - -* 60% ANSI layout - * Tsangan bottom row - * split Backspace - * split Right Shift diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/default/readme.md b/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/default/readme.md deleted file mode 100644 index 33e79b607e8..00000000000 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for krush65 Hotswap diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/readme.md b/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/readme.md deleted file mode 100644 index a03a6d13a9e..00000000000 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for krush65 Hotswap diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/readme.md deleted file mode 100644 index d69d73d3499..00000000000 --- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The ansi_blocker keymap for krush65 solder - -* 65% ANSI layout with blocker diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/readme.md deleted file mode 100644 index fffebdf6a0d..00000000000 --- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# The ansi_blocker_split_bs keymap for krush65 solder - -* 65% ANSI layout with blocker - * split Backspace diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/readme.md deleted file mode 100644 index 9e7dd186d99..00000000000 --- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The default keymap for krush65 solder - -* 65% ANSI layout with blocker - * split Backspace - * split Spacebar diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/readme.md deleted file mode 100644 index 1c17d4e53bb..00000000000 --- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# The VIA keymap for krush65 solder - -* 65% ANSI layout with blocker - * split Backspace - * split Spacebar diff --git a/keyboards/sawnsprojects/plaque80/keymaps/default/readme.md b/keyboards/sawnsprojects/plaque80/keymaps/default/readme.md deleted file mode 100644 index bb3f8c72e7c..00000000000 --- a/keyboards/sawnsprojects/plaque80/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Plaque80 \ No newline at end of file diff --git a/keyboards/sawnsprojects/plaque80/keymaps/via/readme.md b/keyboards/sawnsprojects/plaque80/keymaps/via/readme.md deleted file mode 100644 index 48798fd6e15..00000000000 --- a/keyboards/sawnsprojects/plaque80/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for Plaque80 \ No newline at end of file diff --git a/keyboards/sawnsprojects/satxri6key/keymaps/default/readme.md b/keyboards/sawnsprojects/satxri6key/keymaps/default/readme.md deleted file mode 100644 index 67bd9ee0722..00000000000 --- a/keyboards/sawnsprojects/satxri6key/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default Satxri6key Layout \ No newline at end of file diff --git a/keyboards/sawnsprojects/vcl65/solder/keymaps/default/readme.md b/keyboards/sawnsprojects/vcl65/solder/keymaps/default/readme.md deleted file mode 100644 index d4a1e6fc318..00000000000 --- a/keyboards/sawnsprojects/vcl65/solder/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for VCL65 solder \ No newline at end of file diff --git a/keyboards/sawnsprojects/vcl65/solder/keymaps/via/readme.md b/keyboards/sawnsprojects/vcl65/solder/keymaps/via/readme.md deleted file mode 100644 index 31baf7fc714..00000000000 --- a/keyboards/sawnsprojects/vcl65/solder/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for VCL65 solder \ No newline at end of file diff --git a/keyboards/scatter42/keymaps/default/readme.md b/keyboards/scatter42/keymaps/default/readme.md deleted file mode 100644 index 0471f5e05d8..00000000000 --- a/keyboards/scatter42/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for scatter42 diff --git a/keyboards/sck/m0116b/keymaps/default/readme.md b/keyboards/sck/m0116b/keymaps/default/readme.md deleted file mode 100644 index ebc0b3e92ce..00000000000 --- a/keyboards/sck/m0116b/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# A keymap for the Golden Delicious, this is for the M0116 diff --git a/keyboards/sck/neiso/keymaps/default/readme.md b/keyboards/sck/neiso/keymaps/default/readme.md deleted file mode 100644 index af217561978..00000000000 --- a/keyboards/sck/neiso/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the NEISO Macropad diff --git a/keyboards/sck/osa/keymaps/all/readme.md b/keyboards/sck/osa/keymaps/all/readme.md deleted file mode 100644 index 03a0b5463ef..00000000000 --- a/keyboards/sck/osa/keymaps/all/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The split backspace and split right shift keymap for osa diff --git a/keyboards/sck/osa/keymaps/default/readme.md b/keyboards/sck/osa/keymaps/default/readme.md deleted file mode 100644 index 982042494a5..00000000000 --- a/keyboards/sck/osa/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default ANSI keymap for OSA diff --git a/keyboards/sck/osa/keymaps/via/readme.md b/keyboards/sck/osa/keymaps/via/readme.md deleted file mode 100644 index 3f8300bb1f8..00000000000 --- a/keyboards/sck/osa/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for OSA diff --git a/keyboards/sentraq/number_pad/keymaps/default/readme.md b/keyboards/sentraq/number_pad/keymaps/default/readme.md deleted file mode 100644 index a2c0e756762..00000000000 --- a/keyboards/sentraq/number_pad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Sentraq Number Pad RGB DIY Kit diff --git a/keyboards/sentraq/s65_plus/keymaps/iso/readme.md b/keyboards/sentraq/s65_plus/keymaps/iso/readme.md deleted file mode 100644 index de1d9adf803..00000000000 --- a/keyboards/sentraq/s65_plus/keymaps/iso/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# iso - -An ISO layout version of the default keymap. diff --git a/keyboards/shandoncodes/flygone60/rev3/keymaps/default/readme.md b/keyboards/shandoncodes/flygone60/rev3/keymaps/default/readme.md deleted file mode 100644 index 91ea23c734e..00000000000 --- a/keyboards/shandoncodes/flygone60/rev3/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for flygone60 diff --git a/keyboards/shiro/keymaps/check/readme.md b/keyboards/shiro/keymaps/check/readme.md deleted file mode 100644 index 715ddd3358c..00000000000 --- a/keyboards/shiro/keymaps/check/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Shiro \ No newline at end of file diff --git a/keyboards/shiro/keymaps/default/readme.md b/keyboards/shiro/keymaps/default/readme.md deleted file mode 100644 index 715ddd3358c..00000000000 --- a/keyboards/shiro/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Shiro \ No newline at end of file diff --git a/keyboards/shiro/keymaps/default_mac/readme.md b/keyboards/shiro/keymaps/default_mac/readme.md deleted file mode 100644 index 715ddd3358c..00000000000 --- a/keyboards/shiro/keymaps/default_mac/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Shiro \ No newline at end of file diff --git a/keyboards/sidderskb/majbritt/rev1/keymaps/default/readme.md b/keyboards/sidderskb/majbritt/rev1/keymaps/default/readme.md deleted file mode 100644 index 7b51ddcd2d9..00000000000 --- a/keyboards/sidderskb/majbritt/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for majbritt diff --git a/keyboards/sidderskb/majbritt/rev2/keymaps/default/readme.md b/keyboards/sidderskb/majbritt/rev2/keymaps/default/readme.md deleted file mode 100644 index 8485b90d8e4..00000000000 --- a/keyboards/sidderskb/majbritt/rev2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Majbritt diff --git a/keyboards/singa/keymaps/default/readme.md b/keyboards/singa/keymaps/default/readme.md deleted file mode 100644 index 1f19a96b46e..00000000000 --- a/keyboards/singa/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for singa \ No newline at end of file diff --git a/keyboards/singa/keymaps/test/readme.md b/keyboards/singa/keymaps/test/readme.md deleted file mode 100644 index 1f19a96b46e..00000000000 --- a/keyboards/singa/keymaps/test/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for singa \ No newline at end of file diff --git a/keyboards/slz40/keymaps/default/readme.md b/keyboards/slz40/keymaps/default/readme.md deleted file mode 100644 index e9b38ab415f..00000000000 --- a/keyboards/slz40/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for slz40 diff --git a/keyboards/snampad/keymaps/default/readme.md b/keyboards/snampad/keymaps/default/readme.md deleted file mode 100644 index 05eef58d4a8..00000000000 --- a/keyboards/snampad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for snampad \ No newline at end of file diff --git a/keyboards/soup10/keymaps/default/readme.md b/keyboards/soup10/keymaps/default/readme.md deleted file mode 100644 index 5daae6fdb99..00000000000 --- a/keyboards/soup10/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for soup10 diff --git a/keyboards/spaceman/pancake/rev1/keymaps/default/readme.md b/keyboards/spaceman/pancake/rev1/keymaps/default/readme.md deleted file mode 100644 index 7eb8cc6d8d6..00000000000 --- a/keyboards/spaceman/pancake/rev1/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default keymap for Pancake - -designed by: Spaceman diff --git a/keyboards/spaceman/pancake/rev2/keymaps/default/readme.md b/keyboards/spaceman/pancake/rev2/keymaps/default/readme.md deleted file mode 100644 index 7eb8cc6d8d6..00000000000 --- a/keyboards/spaceman/pancake/rev2/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default keymap for Pancake - -designed by: Spaceman diff --git a/keyboards/spacetime/keymaps/default/readme.md b/keyboards/spacetime/keymaps/default/readme.md deleted file mode 100644 index bcc95f4b7c9..00000000000 --- a/keyboards/spacetime/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Spacetime Default Keymap diff --git a/keyboards/specskeys/keymaps/default/readme.md b/keyboards/specskeys/keymaps/default/readme.md deleted file mode 100644 index b704e67e8ff..00000000000 --- a/keyboards/specskeys/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for specskeys diff --git a/keyboards/stello65/beta/keymaps/default/readme.md b/keyboards/stello65/beta/keymaps/default/readme.md deleted file mode 100644 index 6eb1659ce79..00000000000 --- a/keyboards/stello65/beta/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for stello65 diff --git a/keyboards/stello65/hs_rev1/keymaps/default/readme.md b/keyboards/stello65/hs_rev1/keymaps/default/readme.md deleted file mode 100644 index 84d98e93dc3..00000000000 --- a/keyboards/stello65/hs_rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Stello65 diff --git a/keyboards/stello65/sl_rev1/keymaps/default/readme.md b/keyboards/stello65/sl_rev1/keymaps/default/readme.md deleted file mode 100644 index 84d98e93dc3..00000000000 --- a/keyboards/stello65/sl_rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Stello65 diff --git a/keyboards/studiokestra/bourgeau/keymaps/default/readme.md b/keyboards/studiokestra/bourgeau/keymaps/default/readme.md deleted file mode 100644 index cbed849589e..00000000000 --- a/keyboards/studiokestra/bourgeau/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for Bourgeau - -Default key configuration. \ No newline at end of file diff --git a/keyboards/studiokestra/bourgeau/keymaps/via/readme.md b/keyboards/studiokestra/bourgeau/keymaps/via/readme.md deleted file mode 100644 index bf2bc20a627..00000000000 --- a/keyboards/studiokestra/bourgeau/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The via keymap for Bourgeau - -For via configurator use \ No newline at end of file diff --git a/keyboards/studiokestra/cascade/keymaps/default/readme.md b/keyboards/studiokestra/cascade/keymaps/default/readme.md deleted file mode 100644 index 4645574fe4f..00000000000 --- a/keyboards/studiokestra/cascade/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for Cascade - -Supporting split-backspace as the default configuration alongside split-right shift with ANSI bottom row. \ No newline at end of file diff --git a/keyboards/studiokestra/cascade/keymaps/default_tsangan_hhkb/readme.md b/keyboards/studiokestra/cascade/keymaps/default_tsangan_hhkb/readme.md deleted file mode 100644 index 6a7c75a83d2..00000000000 --- a/keyboards/studiokestra/cascade/keymaps/default_tsangan_hhkb/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default_tsangan_hhkb keymap for Cascade - -Supporting split-backspace as the default configuration alongside split-right shift with tsangan bottom row. \ No newline at end of file diff --git a/keyboards/studiokestra/cascade/keymaps/via/readme.md b/keyboards/studiokestra/cascade/keymaps/via/readme.md deleted file mode 100644 index e1e766fc848..00000000000 --- a/keyboards/studiokestra/cascade/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The via keymap for Cascade - -For via configurator use \ No newline at end of file diff --git a/keyboards/studiokestra/nascent/keymaps/default/readme.md b/keyboards/studiokestra/nascent/keymaps/default/readme.md deleted file mode 100644 index afd4f9a69d0..00000000000 --- a/keyboards/studiokestra/nascent/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Nascent diff --git a/keyboards/studiokestra/nascent/keymaps/via/readme.md b/keyboards/studiokestra/nascent/keymaps/via/readme.md deleted file mode 100644 index 206240488f0..00000000000 --- a/keyboards/studiokestra/nascent/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Studio Kestra's Nascent keymap for VIA diff --git a/keyboards/studiokestra/nue/keymaps/default/readme.md b/keyboards/studiokestra/nue/keymaps/default/readme.md deleted file mode 100644 index 3255b4b4aac..00000000000 --- a/keyboards/studiokestra/nue/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Nue diff --git a/keyboards/studiokestra/nue/keymaps/via/readme.md b/keyboards/studiokestra/nue/keymaps/via/readme.md deleted file mode 100644 index d97e0a680da..00000000000 --- a/keyboards/studiokestra/nue/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Studio Kestra's Nue keymap for VIA diff --git a/keyboards/superuser/ext/keymaps/default/readme.md b/keyboards/superuser/ext/keymaps/default/readme.md deleted file mode 100644 index 846c97d3bec..00000000000 --- a/keyboards/superuser/ext/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for ext diff --git a/keyboards/superuser/ext/keymaps/via/readme.md b/keyboards/superuser/ext/keymaps/via/readme.md deleted file mode 100644 index f17cd8212af..00000000000 --- a/keyboards/superuser/ext/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for ext diff --git a/keyboards/superuser/frl/keymaps/default/readme.md b/keyboards/superuser/frl/keymaps/default/readme.md deleted file mode 100644 index 806f56f8321..00000000000 --- a/keyboards/superuser/frl/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for frl diff --git a/keyboards/superuser/frl/keymaps/via/readme.md b/keyboards/superuser/frl/keymaps/via/readme.md deleted file mode 100644 index e4b8616e129..00000000000 --- a/keyboards/superuser/frl/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for frl diff --git a/keyboards/superuser/tkl/keymaps/default/readme.md b/keyboards/superuser/tkl/keymaps/default/readme.md deleted file mode 100644 index 4b2def12366..00000000000 --- a/keyboards/superuser/tkl/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for tkl diff --git a/keyboards/superuser/tkl/keymaps/via/readme.md b/keyboards/superuser/tkl/keymaps/via/readme.md deleted file mode 100644 index 89f15e18a45..00000000000 --- a/keyboards/superuser/tkl/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for tkl diff --git a/keyboards/switchplate/southpaw_fullsize/keymaps/default/readme.md b/keyboards/switchplate/southpaw_fullsize/keymaps/default/readme.md deleted file mode 100644 index aea00fdd696..00000000000 --- a/keyboards/switchplate/southpaw_fullsize/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for southpaw fullsize - -Nothing special \ No newline at end of file diff --git a/keyboards/switchplate/southpaw_fullsize/keymaps/default_wkl/readme.md b/keyboards/switchplate/southpaw_fullsize/keymaps/default_wkl/readme.md deleted file mode 100644 index 39dc221a478..00000000000 --- a/keyboards/switchplate/southpaw_fullsize/keymaps/default_wkl/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default WKL keymap for southpaw fullsize - -Nothing special \ No newline at end of file diff --git a/keyboards/switchplate/southpaw_fullsize/keymaps/via/readme.md b/keyboards/switchplate/southpaw_fullsize/keymaps/via/readme.md deleted file mode 100644 index 1335b773c50..00000000000 --- a/keyboards/switchplate/southpaw_fullsize/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The via keymap for southpaw fullsize - -For use with VIA configurator \ No newline at end of file diff --git a/keyboards/switchplate/switchplate910/keymaps/default/readme.md b/keyboards/switchplate/switchplate910/keymaps/default/readme.md deleted file mode 100644 index 19ca528e96e..00000000000 --- a/keyboards/switchplate/switchplate910/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for Switchplate910 - -Nothing special \ No newline at end of file diff --git a/keyboards/sx60/keymaps/default/readme.md b/keyboards/sx60/keymaps/default/readme.md deleted file mode 100644 index 898fb84a2f9..00000000000 --- a/keyboards/sx60/keymaps/default/readme.md +++ /dev/null @@ -1,8 +0,0 @@ -Default Keymap -=== - -Super simple default keymap with only a base layer. - -Keymap Maintainer: [amnobis](https://github.com/amnobis) - -Intended usage: This is mostly provided for testing before you build your own keymap and as a reference to a stock(ish) configuration diff --git a/keyboards/synthlabs/060/keymaps/via/readme.md b/keyboards/synthlabs/060/keymaps/via/readme.md deleted file mode 100644 index efb25f15190..00000000000 --- a/keyboards/synthlabs/060/keymaps/via/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# VIA Synth Labs 060 Layout - -This is the VIA keymap for the 060 keyboard, which comes pre-flashed with your PCB from keebwerk. - -To reassign keys, add macros, or change the backlighting options, use the [VIA web app](https://usevia.app/). diff --git a/keyboards/synthlabs/solo/keymaps/default/readme.md b/keyboards/synthlabs/solo/keymaps/default/readme.md deleted file mode 100644 index 625bd392b68..00000000000 --- a/keyboards/synthlabs/solo/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default Synth Labs Solo Layout - -This keymap is intended for usage as a macropad. diff --git a/keyboards/tada68/keymaps/default/readme.md b/keyboards/tada68/keymaps/default/readme.md deleted file mode 100755 index 53412d7c255..00000000000 --- a/keyboards/tada68/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# default TADA68 layout - -This layout replicates the default factory layout of the TADA68. diff --git a/keyboards/tada68/keymaps/via/readme.md b/keyboards/tada68/keymaps/via/readme.md deleted file mode 100755 index 53412d7c255..00000000000 --- a/keyboards/tada68/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# default TADA68 layout - -This layout replicates the default factory layout of the TADA68. diff --git a/keyboards/takashiski/hecomi/keymaps/default/readme.md b/keyboards/takashiski/hecomi/keymaps/default/readme.md deleted file mode 100644 index e44f3d6f611..00000000000 --- a/keyboards/takashiski/hecomi/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for hecomi_alpha \ No newline at end of file diff --git a/keyboards/takashiski/otaku_split/rev0/keymaps/default/readme.md b/keyboards/takashiski/otaku_split/rev0/keymaps/default/readme.md deleted file mode 100644 index dbaaa2eb8ef..00000000000 --- a/keyboards/takashiski/otaku_split/rev0/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for otaku_split \ No newline at end of file diff --git a/keyboards/takashiski/otaku_split/rev1/keymaps/default/readme.md b/keyboards/takashiski/otaku_split/rev1/keymaps/default/readme.md deleted file mode 100644 index dbaaa2eb8ef..00000000000 --- a/keyboards/takashiski/otaku_split/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for otaku_split \ No newline at end of file diff --git a/keyboards/team0110/p1800fl/keymaps/default/readme.md b/keyboards/team0110/p1800fl/keymaps/default/readme.md deleted file mode 100644 index 268d3992248..00000000000 --- a/keyboards/team0110/p1800fl/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for p1800fl diff --git a/keyboards/team0110/p1800fl/keymaps/via/readme.md b/keyboards/team0110/p1800fl/keymaps/via/readme.md deleted file mode 100644 index fabc3229f37..00000000000 --- a/keyboards/team0110/p1800fl/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default VIA keymap for p1800fl diff --git a/keyboards/tg4x/keymaps/default/readme.md b/keyboards/tg4x/keymaps/default/readme.md deleted file mode 100644 index 83a96bee226..00000000000 --- a/keyboards/tg4x/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for tg4x diff --git a/keyboards/tg4x/keymaps/via/readme.md b/keyboards/tg4x/keymaps/via/readme.md deleted file mode 100644 index 7b085ec2b7d..00000000000 --- a/keyboards/tg4x/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Keymap for TG4x with Via enabled diff --git a/keyboards/tgr/jane/v2/keymaps/default/readme.md b/keyboards/tgr/jane/v2/keymaps/default/readme.md deleted file mode 100644 index 983182da247..00000000000 --- a/keyboards/tgr/jane/v2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Jane \ No newline at end of file diff --git a/keyboards/tgr/jane/v2ce/keymaps/default/readme.md b/keyboards/tgr/jane/v2ce/keymaps/default/readme.md deleted file mode 100644 index 91383ee2319..00000000000 --- a/keyboards/tgr/jane/v2ce/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Jane V2 CE diff --git a/keyboards/tgr/tris/keymaps/default/readme.md b/keyboards/tgr/tris/keymaps/default/readme.md deleted file mode 100644 index 660966577f7..00000000000 --- a/keyboards/tgr/tris/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for tris diff --git a/keyboards/the_royal/liminal/keymaps/via/readme.md b/keyboards/the_royal/liminal/keymaps/via/readme.md deleted file mode 100644 index 5a1cda6823b..00000000000 --- a/keyboards/the_royal/liminal/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The VIA keymap for the Liminal Keyboard - -This keymap is for compatibility with the VIA configurator. \ No newline at end of file diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/default/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/default/readme.md deleted file mode 100644 index aaf6daa08c5..00000000000 --- a/keyboards/thevankeyboards/bananasplit/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Bananasplit diff --git a/keyboards/thevankeyboards/caravan/keymaps/default/readme.md b/keyboards/thevankeyboards/caravan/keymaps/default/readme.md deleted file mode 100644 index 2e3e33c9aa1..00000000000 --- a/keyboards/thevankeyboards/caravan/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default Caravan Layout diff --git a/keyboards/thevankeyboards/minivan/keymaps/default/readme.md b/keyboards/thevankeyboards/minivan/keymaps/default/readme.md deleted file mode 100644 index ac84c08cfa6..00000000000 --- a/keyboards/thevankeyboards/minivan/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for tv44 \ No newline at end of file diff --git a/keyboards/thevankeyboards/roadkit/keymaps/default/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/default/readme.md deleted file mode 100644 index 5984a71d1ab..00000000000 --- a/keyboards/thevankeyboards/roadkit/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for roadkit diff --git a/keyboards/tkw/stoutgat/v1/keymaps/default/readme.md b/keyboards/tkw/stoutgat/v1/keymaps/default/readme.md deleted file mode 100644 index 19855073546..00000000000 --- a/keyboards/tkw/stoutgat/v1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for stoutgat diff --git a/keyboards/tmo50/keymaps/via/readme.md b/keyboards/tmo50/keymaps/via/readme.md deleted file mode 100644 index 27cb965eba9..00000000000 --- a/keyboards/tmo50/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA default layout diff --git a/keyboards/tominabox1/adalyn/keymaps/default/readme.md b/keyboards/tominabox1/adalyn/keymaps/default/readme.md deleted file mode 100644 index fb85d36e287..00000000000 --- a/keyboards/tominabox1/adalyn/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default QAZ Layout diff --git a/keyboards/tominabox1/le_chiffre/keymaps/default/readme.md b/keyboards/tominabox1/le_chiffre/keymaps/default/readme.md deleted file mode 100644 index 29f2d31f6ff..00000000000 --- a/keyboards/tominabox1/le_chiffre/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default Le Chiffre Keymap diff --git a/keyboards/tominabox1/qaz/keymaps/default/readme.md b/keyboards/tominabox1/qaz/keymaps/default/readme.md deleted file mode 100644 index fb85d36e287..00000000000 --- a/keyboards/tominabox1/qaz/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default QAZ Layout diff --git a/keyboards/tominabox1/qaz/keymaps/default_big_space/readme.md b/keyboards/tominabox1/qaz/keymaps/default_big_space/readme.md deleted file mode 100644 index f1fc30c211f..00000000000 --- a/keyboards/tominabox1/qaz/keymaps/default_big_space/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default QAZ Layout full size spacebar diff --git a/keyboards/tominabox1/underscore33/rev1/keymaps/default/readme.md b/keyboards/tominabox1/underscore33/rev1/keymaps/default/readme.md deleted file mode 100644 index 908b3e04ab3..00000000000 --- a/keyboards/tominabox1/underscore33/rev1/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default _33 Rev1 Layout - -This is the recommended default layout. diff --git a/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/readme.md b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/readme.md deleted file mode 100644 index 3f22df7c221..00000000000 --- a/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default _33 Rev1 Layout (with big spacebar) - -This is the recommended default layout. diff --git a/keyboards/tominabox1/underscore33/rev1/keymaps/via/readme.md b/keyboards/tominabox1/underscore33/rev1/keymaps/via/readme.md deleted file mode 100644 index a63a8342e83..00000000000 --- a/keyboards/tominabox1/underscore33/rev1/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# VIA _33 Rev1 Layout diff --git a/keyboards/tominabox1/underscore33/rev2/keymaps/default/readme.md b/keyboards/tominabox1/underscore33/rev2/keymaps/default/readme.md deleted file mode 100644 index fb485988915..00000000000 --- a/keyboards/tominabox1/underscore33/rev2/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default _33 Rev2 Layout - -This is the recommended default layout. diff --git a/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/readme.md b/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/readme.md deleted file mode 100644 index f11d18ece96..00000000000 --- a/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default _33 Rev2 Layout (with big spacebar) - -This is the recommended default layout. diff --git a/keyboards/tominabox1/underscore33/rev2/keymaps/via/readme.md b/keyboards/tominabox1/underscore33/rev2/keymaps/via/readme.md deleted file mode 100644 index 7a6d4cf2f73..00000000000 --- a/keyboards/tominabox1/underscore33/rev2/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# VIA Layout diff --git a/keyboards/treasure/type9/keymaps/default/readme.md b/keyboards/treasure/type9/keymaps/default/readme.md deleted file mode 100644 index 94784baccdf..00000000000 --- a/keyboards/treasure/type9/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Type-9 diff --git a/keyboards/treasure/type9s2/keymaps/default/readme.md b/keyboards/treasure/type9s2/keymaps/default/readme.md deleted file mode 100644 index 76778b088be..00000000000 --- a/keyboards/treasure/type9s2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Type-9 Series II diff --git a/keyboards/treasure/type9s2/keymaps/via/readme.md b/keyboards/treasure/type9s2/keymaps/via/readme.md deleted file mode 100644 index 76778b088be..00000000000 --- a/keyboards/treasure/type9s2/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Type-9 Series II diff --git a/keyboards/tszaboo/ortho4exent/keymaps/default/readme.md b/keyboards/tszaboo/ortho4exent/keymaps/default/readme.md deleted file mode 100644 index 153fc96da97..00000000000 --- a/keyboards/tszaboo/ortho4exent/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Ortho4exent diff --git a/keyboards/tweetydabird/lbs6/keymaps/default/readme.md b/keyboards/tweetydabird/lbs6/keymaps/default/readme.md deleted file mode 100644 index 22c4296f554..00000000000 --- a/keyboards/tweetydabird/lbs6/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for LBS6 - -This is a very basic layout using LBS6 as media playback buttons. diff --git a/keyboards/unicomp/classic_ultracl_post_2013/keymaps/default/readme.md b/keyboards/unicomp/classic_ultracl_post_2013/keymaps/default/readme.md deleted file mode 100644 index 7ac6e45ce70..00000000000 --- a/keyboards/unicomp/classic_ultracl_post_2013/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for unicomp/classic_ultracl_post_2013/$(CONTROLLER) diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/keymaps/default/readme.md b/keyboards/unicomp/classic_ultracl_pre_2013/keymaps/default/readme.md deleted file mode 100644 index f9a7d214fa9..00000000000 --- a/keyboards/unicomp/classic_ultracl_pre_2013/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for unicomp/classic_ultracl_pre_2013/$(CONTROLLER) diff --git a/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/readme.md b/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/readme.md deleted file mode 100644 index 5e44dade263..00000000000 --- a/keyboards/unicomp/spacesaver_m_post_2013/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for unicomp/spacesaver_m_post_2013/$(CONTROLLER) diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/readme.md b/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/readme.md deleted file mode 100644 index f19d75c9360..00000000000 --- a/keyboards/unicomp/spacesaver_m_pre_2013/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for unicomp/spacesaver_m_pre_2013/$(CONTROLLER) diff --git a/keyboards/unikeyboard/diverge3/keymaps/iso_uk/readme.md b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/readme.md deleted file mode 100755 index ff4971754ae..00000000000 --- a/keyboards/unikeyboard/diverge3/keymaps/iso_uk/readme.md +++ /dev/null @@ -1 +0,0 @@ -# My UK based diverge 3 layout diff --git a/keyboards/utd80/keymaps/default/readme.md b/keyboards/utd80/keymaps/default/readme.md deleted file mode 100644 index 59c01c6195c..00000000000 --- a/keyboards/utd80/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for UTD80 diff --git a/keyboards/viktus/smolka/keymaps/default/readme.md b/keyboards/viktus/smolka/keymaps/default/readme.md deleted file mode 100644 index e7b2fa9bb14..00000000000 --- a/keyboards/viktus/smolka/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for smolka diff --git a/keyboards/viktus/smolka/keymaps/via/readme.md b/keyboards/viktus/smolka/keymaps/via/readme.md deleted file mode 100644 index 5a9d11c51bd..00000000000 --- a/keyboards/viktus/smolka/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default via keymap for smolka diff --git a/keyboards/viktus/styrka/keymaps/all/readme.md b/keyboards/viktus/styrka/keymaps/all/readme.md deleted file mode 100644 index 09b07840629..00000000000 --- a/keyboards/viktus/styrka/keymaps/all/readme.md +++ /dev/null @@ -1 +0,0 @@ -# A keymap for the Viktus Styrka that covers all supported layout options diff --git a/keyboards/viktus/styrka/keymaps/default/readme.md b/keyboards/viktus/styrka/keymaps/default/readme.md deleted file mode 100644 index 656be826cab..00000000000 --- a/keyboards/viktus/styrka/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for the Viktus Styrka diff --git a/keyboards/viktus/styrka/keymaps/split_bs/readme.md b/keyboards/viktus/styrka/keymaps/split_bs/readme.md deleted file mode 100644 index 1e2a856ea87..00000000000 --- a/keyboards/viktus/styrka/keymaps/split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The Split Backspace keymap for the Viktus Styrka diff --git a/keyboards/viktus/styrka/keymaps/via/readme.md b/keyboards/viktus/styrka/keymaps/via/readme.md deleted file mode 100644 index 7c6ea6ce9cd..00000000000 --- a/keyboards/viktus/styrka/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for the Viktus Styrka diff --git a/keyboards/waldo/keymaps/default/readme.md b/keyboards/waldo/keymaps/default/readme.md deleted file mode 100644 index 440961939c8..00000000000 --- a/keyboards/waldo/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Waldo Layout - diff --git a/keyboards/waldo/keymaps/default_split_shft_bck/readme.md b/keyboards/waldo/keymaps/default_split_shft_bck/readme.md deleted file mode 100644 index bb4d32898ee..00000000000 --- a/keyboards/waldo/keymaps/default_split_shft_bck/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Waldo Layout w/ Split backspace, split shift, and 7u space - diff --git a/keyboards/waldo/keymaps/via/readme.md b/keyboards/waldo/keymaps/via/readme.md deleted file mode 100644 index 3b15345d620..00000000000 --- a/keyboards/waldo/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The Default VIA keymap for Waldo diff --git a/keyboards/wekey/polaris/keymaps/default/readme.md b/keyboards/wekey/polaris/keymaps/default/readme.md deleted file mode 100644 index ec7f3154a4f..00000000000 --- a/keyboards/wekey/polaris/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The default keymap for Polaris - -Fits just about everything on two layers. \ No newline at end of file diff --git a/keyboards/wekey/polaris/keymaps/via/readme.md b/keyboards/wekey/polaris/keymaps/via/readme.md deleted file mode 100644 index 6e4d2c7446c..00000000000 --- a/keyboards/wekey/polaris/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The via keymap for Polaris - -For via configurator use \ No newline at end of file diff --git a/keyboards/wekey/we27/keymaps/default/readme.md b/keyboards/wekey/we27/keymaps/default/readme.md deleted file mode 100644 index 8ad307a9c3a..00000000000 --- a/keyboards/wekey/we27/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for we27 diff --git a/keyboards/wekey/we27/keymaps/via/readme.md b/keyboards/wekey/we27/keymaps/via/readme.md deleted file mode 100644 index 8ad307a9c3a..00000000000 --- a/keyboards/wekey/we27/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for we27 diff --git a/keyboards/westfoxtrot/aanzee/keymaps/default/readme.md b/keyboards/westfoxtrot/aanzee/keymaps/default/readme.md deleted file mode 100644 index 77137f2f004..00000000000 --- a/keyboards/westfoxtrot/aanzee/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for aanzee \ No newline at end of file diff --git a/keyboards/westfoxtrot/aanzee/keymaps/iso-default/readme.md b/keyboards/westfoxtrot/aanzee/keymaps/iso-default/readme.md deleted file mode 100644 index 77137f2f004..00000000000 --- a/keyboards/westfoxtrot/aanzee/keymaps/iso-default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for aanzee \ No newline at end of file diff --git a/keyboards/westfoxtrot/aanzee/keymaps/via/readme.md b/keyboards/westfoxtrot/aanzee/keymaps/via/readme.md deleted file mode 100644 index d5c8b708def..00000000000 --- a/keyboards/westfoxtrot/aanzee/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for aanzee with via support diff --git a/keyboards/westfoxtrot/cyclops/keymaps/default/readme.md b/keyboards/westfoxtrot/cyclops/keymaps/default/readme.md deleted file mode 100644 index b1e2b84a3bf..00000000000 --- a/keyboards/westfoxtrot/cyclops/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for cyclops diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/default/readme.md b/keyboards/westfoxtrot/cypher/rev1/keymaps/default/readme.md deleted file mode 100644 index 05c37002666..00000000000 --- a/keyboards/westfoxtrot/cypher/rev1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for cypher \ No newline at end of file diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/readme.md b/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/readme.md deleted file mode 100644 index 81a4a677fd7..00000000000 --- a/keyboards/westfoxtrot/cypher/rev1/keymaps/default_iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default iso keymap for cypher diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/default/readme.md b/keyboards/westfoxtrot/cypher/rev5/keymaps/default/readme.md deleted file mode 100644 index 05c37002666..00000000000 --- a/keyboards/westfoxtrot/cypher/rev5/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for cypher \ No newline at end of file diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/readme.md b/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/readme.md deleted file mode 100644 index 81a4a677fd7..00000000000 --- a/keyboards/westfoxtrot/cypher/rev5/keymaps/default_iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default iso keymap for cypher diff --git a/keyboards/westfoxtrot/prophet/keymaps/default/readme.md b/keyboards/westfoxtrot/prophet/keymaps/default/readme.md deleted file mode 100644 index 8d2b027b8ff..00000000000 --- a/keyboards/westfoxtrot/prophet/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for prophet \ No newline at end of file diff --git a/keyboards/winry/winry315/keymaps/default/readme.md b/keyboards/winry/winry315/keymaps/default/readme.md deleted file mode 100644 index 685bea57671..00000000000 --- a/keyboards/winry/winry315/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Winry315 diff --git a/keyboards/woodkeys/meira/keymaps/default/readme.md b/keyboards/woodkeys/meira/keymaps/default/readme.md deleted file mode 100644 index be840488132..00000000000 --- a/keyboards/woodkeys/meira/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for meira diff --git a/keyboards/woodkeys/meira/keymaps/takmiya/readme.md b/keyboards/woodkeys/meira/keymaps/takmiya/readme.md deleted file mode 100644 index 40f48bb091d..00000000000 --- a/keyboards/woodkeys/meira/keymaps/takmiya/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The takmiya keymap for meira diff --git a/keyboards/woodkeys/scarletbandana/keymaps/default/readme.md b/keyboards/woodkeys/scarletbandana/keymaps/default/readme.md deleted file mode 100644 index c2c281fe353..00000000000 --- a/keyboards/woodkeys/scarletbandana/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for scarletbandana diff --git a/keyboards/work_louder/loop/keymaps/default/readme.md b/keyboards/work_louder/loop/keymaps/default/readme.md deleted file mode 100644 index d11673e0625..00000000000 --- a/keyboards/work_louder/loop/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for loop diff --git a/keyboards/work_louder/nano/keymaps/default/readme.md b/keyboards/work_louder/nano/keymaps/default/readme.md deleted file mode 100644 index 1ca552d7219..00000000000 --- a/keyboards/work_louder/nano/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for nano diff --git a/keyboards/wuque/ikki68/keymaps/default/readme.md b/keyboards/wuque/ikki68/keymaps/default/readme.md deleted file mode 100644 index ede286cc075..00000000000 --- a/keyboards/wuque/ikki68/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for ikki68 diff --git a/keyboards/wuque/ikki68/keymaps/via/readme.md b/keyboards/wuque/ikki68/keymaps/via/readme.md deleted file mode 100644 index 163846fd4c0..00000000000 --- a/keyboards/wuque/ikki68/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for ikki68 diff --git a/keyboards/wuque/ikki68_aurora/keymaps/68_ansi/readme.md b/keyboards/wuque/ikki68_aurora/keymaps/68_ansi/readme.md deleted file mode 100644 index 4984cb51752..00000000000 --- a/keyboards/wuque/ikki68_aurora/keymaps/68_ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 68_ansi keymap for ikki68_aurora diff --git a/keyboards/wuque/ikki68_aurora/keymaps/68_iso/readme.md b/keyboards/wuque/ikki68_aurora/keymaps/68_iso/readme.md deleted file mode 100644 index 18cae381289..00000000000 --- a/keyboards/wuque/ikki68_aurora/keymaps/68_iso/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 68_iso for ikki68_aurora diff --git a/keyboards/wuque/ikki68_aurora/keymaps/68_split_bs/readme.md b/keyboards/wuque/ikki68_aurora/keymaps/68_split_bs/readme.md deleted file mode 100644 index 759043af0f8..00000000000 --- a/keyboards/wuque/ikki68_aurora/keymaps/68_split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 68_split_bs keymap for ikki68_aurora diff --git a/keyboards/wuque/ikki68_aurora/keymaps/68_split_lshift/readme.md b/keyboards/wuque/ikki68_aurora/keymaps/68_split_lshift/readme.md deleted file mode 100644 index b299bdb229d..00000000000 --- a/keyboards/wuque/ikki68_aurora/keymaps/68_split_lshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 68_split_lshift keymap for ikki68_aurora diff --git a/keyboards/wuque/ikki68_aurora/keymaps/68_split_rshift/readme.md b/keyboards/wuque/ikki68_aurora/keymaps/68_split_rshift/readme.md deleted file mode 100644 index ce8eada8c5e..00000000000 --- a/keyboards/wuque/ikki68_aurora/keymaps/68_split_rshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 68_split_rshift keymap for ikki68_aurora diff --git a/keyboards/wuque/ikki68_aurora/keymaps/68_split_space/readme.md b/keyboards/wuque/ikki68_aurora/keymaps/68_split_space/readme.md deleted file mode 100644 index 71178dcc331..00000000000 --- a/keyboards/wuque/ikki68_aurora/keymaps/68_split_space/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 68_split_space keymap for ikki68_aurora diff --git a/keyboards/wuque/ikki68_aurora/keymaps/default/readme.md b/keyboards/wuque/ikki68_aurora/keymaps/default/readme.md deleted file mode 100644 index 7539e469b41..00000000000 --- a/keyboards/wuque/ikki68_aurora/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for ikki68_aurora diff --git a/keyboards/wuque/ikki68_aurora/keymaps/via/readme.md b/keyboards/wuque/ikki68_aurora/keymaps/via/readme.md deleted file mode 100644 index 0470b32e677..00000000000 --- a/keyboards/wuque/ikki68_aurora/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for ikki68_aurora diff --git a/keyboards/wuque/mammoth20x/keymaps/default/readme.md b/keyboards/wuque/mammoth20x/keymaps/default/readme.md deleted file mode 100644 index 5bad9b4558a..00000000000 --- a/keyboards/wuque/mammoth20x/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for mammoth20x diff --git a/keyboards/wuque/mammoth20x/keymaps/via/readme.md b/keyboards/wuque/mammoth20x/keymaps/via/readme.md deleted file mode 100644 index fcd4ba857fb..00000000000 --- a/keyboards/wuque/mammoth20x/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for mammoth20x diff --git a/keyboards/wuque/mammoth75x/keymaps/75_ansi/readme.md b/keyboards/wuque/mammoth75x/keymaps/75_ansi/readme.md deleted file mode 100644 index b6b384197af..00000000000 --- a/keyboards/wuque/mammoth75x/keymaps/75_ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 75_ansi keymap for mammoth75x diff --git a/keyboards/wuque/mammoth75x/keymaps/75_split_bs/readme.md b/keyboards/wuque/mammoth75x/keymaps/75_split_bs/readme.md deleted file mode 100644 index ef0bf98c57f..00000000000 --- a/keyboards/wuque/mammoth75x/keymaps/75_split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 75_split_bs keymap for mammoth75x diff --git a/keyboards/wuque/mammoth75x/keymaps/75_split_lshift/readme.md b/keyboards/wuque/mammoth75x/keymaps/75_split_lshift/readme.md deleted file mode 100644 index cd6640f912b..00000000000 --- a/keyboards/wuque/mammoth75x/keymaps/75_split_lshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 75_split_lshift keymap for mammoth75x diff --git a/keyboards/wuque/mammoth75x/keymaps/75_split_rshift/readme.md b/keyboards/wuque/mammoth75x/keymaps/75_split_rshift/readme.md deleted file mode 100644 index cd6640f912b..00000000000 --- a/keyboards/wuque/mammoth75x/keymaps/75_split_rshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 75_split_lshift keymap for mammoth75x diff --git a/keyboards/wuque/mammoth75x/keymaps/75_split_space/readme.md b/keyboards/wuque/mammoth75x/keymaps/75_split_space/readme.md deleted file mode 100644 index c2057660f9f..00000000000 --- a/keyboards/wuque/mammoth75x/keymaps/75_split_space/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 75_split_space keymap for mammoth75x diff --git a/keyboards/wuque/mammoth75x/keymaps/default/readme.md b/keyboards/wuque/mammoth75x/keymaps/default/readme.md deleted file mode 100644 index 73cba9c7b90..00000000000 --- a/keyboards/wuque/mammoth75x/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for mammoth75x diff --git a/keyboards/wuque/mammoth75x/keymaps/via/readme.md b/keyboards/wuque/mammoth75x/keymaps/via/readme.md deleted file mode 100644 index e6ea1cf87d9..00000000000 --- a/keyboards/wuque/mammoth75x/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for mammoth75x diff --git a/keyboards/wuque/promise87/ansi/keymaps/default/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default/readme.md deleted file mode 100644 index f3a77c93fd0..00000000000 --- a/keyboards/wuque/promise87/ansi/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for promise87 diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan/readme.md deleted file mode 100644 index f4a469688d5..00000000000 --- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The tkl_f13_ansi_tsangan keymap for promise87 diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs/readme.md deleted file mode 100644 index 151db6f9c17..00000000000 --- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_tkl_f13_ansi_tsangan_split_bs keymap for promise87 diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs_rshift/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs_rshift/readme.md deleted file mode 100644 index 1d28f515997..00000000000 --- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_bs_rshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_tkl_f13_ansi_tsangan_split_bs_rshift keymap for promise87 diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_lshift/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_lshift/readme.md deleted file mode 100644 index 63ffd4279f2..00000000000 --- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_lshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_tkl_f13_ansi_tsangan_split_lshift keymap for promise87 diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_rshift/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_rshift/readme.md deleted file mode 100644 index db444badf00..00000000000 --- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_rshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The tkl_f13_ansi_tsangan_split_rshift keymap for promise87 diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_space/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_space/readme.md deleted file mode 100644 index d36f76419f8..00000000000 --- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_ansi_tsangan_split_space/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The tkl_f13_ansi_tsangan_split_space keymap for promise87 diff --git a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_iso_tsangan/readme.md b/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_iso_tsangan/readme.md deleted file mode 100644 index 9c9e2a9c427..00000000000 --- a/keyboards/wuque/promise87/ansi/keymaps/default_tkl_f13_iso_tsangan/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The tkl_f13_iso_tsangan keymap for promise87 diff --git a/keyboards/wuque/promise87/ansi/keymaps/via/readme.md b/keyboards/wuque/promise87/ansi/keymaps/via/readme.md deleted file mode 100644 index a500dfdb152..00000000000 --- a/keyboards/wuque/promise87/ansi/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for promise87 diff --git a/keyboards/wuque/promise87/wkl/keymaps/default/readme.md b/keyboards/wuque/promise87/wkl/keymaps/default/readme.md deleted file mode 100644 index f3a77c93fd0..00000000000 --- a/keyboards/wuque/promise87/wkl/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for promise87 diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl/readme.md b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl/readme.md deleted file mode 100644 index b009ab3ef25..00000000000 --- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_tkl_f13_ansi_wkl keymap for promise87 diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs/readme.md b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs/readme.md deleted file mode 100644 index 22921ef2e72..00000000000 --- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_tkl_f13_ansi_wkl_split_bs keymap for promise87 diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs_rshift/readme.md b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs_rshift/readme.md deleted file mode 100644 index a0baa328e6b..00000000000 --- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_bs_rshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_tkl_f13_ansi_wkl_split_bs_rshift keymap for promise87 diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_lshift/readme.md b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_lshift/readme.md deleted file mode 100644 index 4b397050741..00000000000 --- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_lshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_tkl_f13_ansi_wkl_split_lshift keymap for promise87 diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_rshift/readme.md b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_rshift/readme.md deleted file mode 100644 index a7df0be109a..00000000000 --- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_rshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_tkl_f13_ansi_wkl_split_rshift keymap for promise87 diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_space/readme.md b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_space/readme.md deleted file mode 100644 index e27a9b424cd..00000000000 --- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_ansi_wkl_split_space/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_tkl_f13_ansi_wkl_split_space keymap for promise87 diff --git a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_iso_wkl/readme.md b/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_iso_wkl/readme.md deleted file mode 100644 index 628c9453003..00000000000 --- a/keyboards/wuque/promise87/wkl/keymaps/default_tkl_f13_iso_wkl/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default_tkl_f13_iso_wkl keymap for promise87 diff --git a/keyboards/wuque/promise87/wkl/keymaps/via/readme.md b/keyboards/wuque/promise87/wkl/keymaps/via/readme.md deleted file mode 100644 index a500dfdb152..00000000000 --- a/keyboards/wuque/promise87/wkl/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for promise87 diff --git a/keyboards/wuque/serneity65/keymaps/65_ansi/readme.md b/keyboards/wuque/serneity65/keymaps/65_ansi/readme.md deleted file mode 100644 index 42b2423f597..00000000000 --- a/keyboards/wuque/serneity65/keymaps/65_ansi/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_ansi keymap for serneity65 diff --git a/keyboards/wuque/serneity65/keymaps/65_split_bs/readme.md b/keyboards/wuque/serneity65/keymaps/65_split_bs/readme.md deleted file mode 100644 index 121b7581103..00000000000 --- a/keyboards/wuque/serneity65/keymaps/65_split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_split_bs keymap for serneity65 diff --git a/keyboards/wuque/serneity65/keymaps/65_split_lshift/readme.md b/keyboards/wuque/serneity65/keymaps/65_split_lshift/readme.md deleted file mode 100644 index f5895d138b6..00000000000 --- a/keyboards/wuque/serneity65/keymaps/65_split_lshift/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_split_lshift keymap for serneity65 diff --git a/keyboards/wuque/serneity65/keymaps/65_split_space/readme.md b/keyboards/wuque/serneity65/keymaps/65_split_space/readme.md deleted file mode 100644 index 2f76503194f..00000000000 --- a/keyboards/wuque/serneity65/keymaps/65_split_space/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The 65_split_space keymap for serneity65 diff --git a/keyboards/wuque/serneity65/keymaps/default/readme.md b/keyboards/wuque/serneity65/keymaps/default/readme.md deleted file mode 100644 index 83e06cf6e8b..00000000000 --- a/keyboards/wuque/serneity65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for serneity65 diff --git a/keyboards/wuque/serneity65/keymaps/via/readme.md b/keyboards/wuque/serneity65/keymaps/via/readme.md deleted file mode 100644 index 87ee7a006b9..00000000000 --- a/keyboards/wuque/serneity65/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for serneity65 diff --git a/keyboards/xelus/dharma/keymaps/default/readme.md b/keyboards/xelus/dharma/keymaps/default/readme.md deleted file mode 100644 index 6ed75f1ec3f..00000000000 --- a/keyboards/xelus/dharma/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Dharma Layout - diff --git a/keyboards/xelus/dharma/keymaps/via/readme.md b/keyboards/xelus/dharma/keymaps/via/readme.md deleted file mode 100644 index a64bbb0faf4..00000000000 --- a/keyboards/xelus/dharma/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA Dharma Layout - diff --git a/keyboards/xelus/la_plus/keymaps/default/readme.md b/keyboards/xelus/la_plus/keymaps/default/readme.md deleted file mode 100755 index 779f6a019e8..00000000000 --- a/keyboards/xelus/la_plus/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default La+ Layout - diff --git a/keyboards/xelus/la_plus/keymaps/via/readme.md b/keyboards/xelus/la_plus/keymaps/via/readme.md deleted file mode 100755 index 705b9df41a1..00000000000 --- a/keyboards/xelus/la_plus/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA La+ Layout - diff --git a/keyboards/xelus/pachi/mini_32u4/keymaps/default/readme.md b/keyboards/xelus/pachi/mini_32u4/keymaps/default/readme.md deleted file mode 100644 index ab9f162639c..00000000000 --- a/keyboards/xelus/pachi/mini_32u4/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Pachi TKL Layout - diff --git a/keyboards/xelus/pachi/mini_32u4/keymaps/via/readme.md b/keyboards/xelus/pachi/mini_32u4/keymaps/via/readme.md deleted file mode 100644 index 4f2ef1ef33e..00000000000 --- a/keyboards/xelus/pachi/mini_32u4/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA Pachi TKL Layout - diff --git a/keyboards/xelus/pachi/rev1/keymaps/default/readme.md b/keyboards/xelus/pachi/rev1/keymaps/default/readme.md deleted file mode 100644 index ab9f162639c..00000000000 --- a/keyboards/xelus/pachi/rev1/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Pachi TKL Layout - diff --git a/keyboards/xelus/pachi/rev1/keymaps/via/readme.md b/keyboards/xelus/pachi/rev1/keymaps/via/readme.md deleted file mode 100644 index 4f2ef1ef33e..00000000000 --- a/keyboards/xelus/pachi/rev1/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA Pachi TKL Layout - diff --git a/keyboards/xelus/pachi/rgb/keymaps/default/readme.md b/keyboards/xelus/pachi/rgb/keymaps/default/readme.md deleted file mode 100644 index 2227ffe0b37..00000000000 --- a/keyboards/xelus/pachi/rgb/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Pachi RGB Layout - diff --git a/keyboards/xelus/pachi/rgb/keymaps/via/readme.md b/keyboards/xelus/pachi/rgb/keymaps/via/readme.md deleted file mode 100644 index af77c042760..00000000000 --- a/keyboards/xelus/pachi/rgb/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA Pachi RGB Layout - diff --git a/keyboards/xelus/valor/rev1/keymaps/default/readme.md b/keyboards/xelus/valor/rev1/keymaps/default/readme.md deleted file mode 100644 index d596c606c7a..00000000000 --- a/keyboards/xelus/valor/rev1/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Valor Layout - diff --git a/keyboards/xelus/valor/rev1/keymaps/via/readme.md b/keyboards/xelus/valor/rev1/keymaps/via/readme.md deleted file mode 100644 index 1efb713ba94..00000000000 --- a/keyboards/xelus/valor/rev1/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA Valor Layout - diff --git a/keyboards/xelus/valor/rev2/keymaps/default/readme.md b/keyboards/xelus/valor/rev2/keymaps/default/readme.md deleted file mode 100644 index 8648f1c1504..00000000000 --- a/keyboards/xelus/valor/rev2/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Valor Rev2 Layout - diff --git a/keyboards/xelus/valor/rev2/keymaps/via/readme.md b/keyboards/xelus/valor/rev2/keymaps/via/readme.md deleted file mode 100644 index dcdfd4dd9e5..00000000000 --- a/keyboards/xelus/valor/rev2/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA Valor Rev2 Layout - diff --git a/keyboards/xelus/valor_frl_tkl/keymaps/default/readme.md b/keyboards/xelus/valor_frl_tkl/keymaps/default/readme.md deleted file mode 100644 index 3f9d6dff5f1..00000000000 --- a/keyboards/xelus/valor_frl_tkl/keymaps/default/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The Default Valor FRL TKL Layout - diff --git a/keyboards/xelus/valor_frl_tkl/keymaps/via/readme.md b/keyboards/xelus/valor_frl_tkl/keymaps/via/readme.md deleted file mode 100644 index c1f633ac391..00000000000 --- a/keyboards/xelus/valor_frl_tkl/keymaps/via/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# The VIA Valor FRL TKL Layout - diff --git a/keyboards/xiudi/xd004/keymaps/default/readme.md b/keyboards/xiudi/xd004/keymaps/default/readme.md deleted file mode 100644 index fdf07cc8775..00000000000 --- a/keyboards/xiudi/xd004/keymaps/default/readme.md +++ /dev/null @@ -1,7 +0,0 @@ -# Default Keymap for XD004 PCB - -This keymap is not very useful, but it will validate that the board works. - -## Build - -To build the default keymap, simply run `make xd004:default`. diff --git a/keyboards/xiudi/xd60/keymaps/via/readme.md b/keyboards/xiudi/xd60/keymaps/via/readme.md deleted file mode 100644 index 27cb965eba9..00000000000 --- a/keyboards/xiudi/xd60/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA default layout diff --git a/keyboards/xiudi/xd68/keymaps/default/readme.md b/keyboards/xiudi/xd68/keymaps/default/readme.md deleted file mode 100644 index 7f5c5c39eaf..00000000000 --- a/keyboards/xiudi/xd68/keymaps/default/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# XD68 layout for Default ANSI - -``` -make xiudi/xd68:default -``` diff --git a/keyboards/xiudi/xd68/keymaps/default_iso/readme.md b/keyboards/xiudi/xd68/keymaps/default_iso/readme.md deleted file mode 100644 index a91aff3992a..00000000000 --- a/keyboards/xiudi/xd68/keymaps/default_iso/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# XD68 layout for Default ISO - -``` -make xiudi/xd68:default_iso -``` diff --git a/keyboards/xiudi/xd68/keymaps/via/readme.md b/keyboards/xiudi/xd68/keymaps/via/readme.md deleted file mode 100644 index 27cb965eba9..00000000000 --- a/keyboards/xiudi/xd68/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA default layout diff --git a/keyboards/xiudi/xd75/keymaps/default/readme.md b/keyboards/xiudi/xd75/keymaps/default/readme.md deleted file mode 100644 index a1c0236ed9c..00000000000 --- a/keyboards/xiudi/xd75/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for xd75, with led controls \ No newline at end of file diff --git a/keyboards/xiudi/xd75/keymaps/via/readme.md b/keyboards/xiudi/xd75/keymaps/via/readme.md deleted file mode 100644 index 27cb965eba9..00000000000 --- a/keyboards/xiudi/xd75/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA default layout diff --git a/keyboards/xiudi/xd84/keymaps/via/readme.md b/keyboards/xiudi/xd84/keymaps/via/readme.md deleted file mode 100644 index 27cb965eba9..00000000000 --- a/keyboards/xiudi/xd84/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA default layout diff --git a/keyboards/xiudi/xd84pro/keymaps/via/readme.md b/keyboards/xiudi/xd84pro/keymaps/via/readme.md deleted file mode 100644 index 27cb965eba9..00000000000 --- a/keyboards/xiudi/xd84pro/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA default layout diff --git a/keyboards/xiudi/xd87/keymaps/default/readme.md b/keyboards/xiudi/xd87/keymaps/default/readme.md deleted file mode 100644 index 41baff94358..00000000000 --- a/keyboards/xiudi/xd87/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for xd87 \ No newline at end of file diff --git a/keyboards/xiudi/xd87/keymaps/via/readme.md b/keyboards/xiudi/xd87/keymaps/via/readme.md deleted file mode 100644 index 27cb965eba9..00000000000 --- a/keyboards/xiudi/xd87/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA default layout diff --git a/keyboards/xiudi/xd96/keymaps/via/readme.md b/keyboards/xiudi/xd96/keymaps/via/readme.md deleted file mode 100644 index 27cb965eba9..00000000000 --- a/keyboards/xiudi/xd96/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA default layout diff --git a/keyboards/ydkb/yd68/keymaps/default/readme.md b/keyboards/ydkb/yd68/keymaps/default/readme.md deleted file mode 100644 index 877e64f18be..00000000000 --- a/keyboards/ydkb/yd68/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for yd68 \ No newline at end of file diff --git a/keyboards/yiancardesigns/barleycorn/keymaps/via/readme.md b/keyboards/yiancardesigns/barleycorn/keymaps/via/readme.md deleted file mode 100644 index b82bc8e79f9..00000000000 --- a/keyboards/yiancardesigns/barleycorn/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Compile with this keymap to use VIA diff --git a/keyboards/yiancardesigns/gingham/keymaps/via/readme.md b/keyboards/yiancardesigns/gingham/keymaps/via/readme.md deleted file mode 100644 index b82bc8e79f9..00000000000 --- a/keyboards/yiancardesigns/gingham/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Compile with this keymap to use VIA diff --git a/keyboards/ymdk/ymd40/v2/keymaps/default/readme.md b/keyboards/ymdk/ymd40/v2/keymaps/default/readme.md deleted file mode 100644 index 95286635472..00000000000 --- a/keyboards/ymdk/ymd40/v2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for YMD40 v2 diff --git a/keyboards/ymdk/ymd40/v2/keymaps/via/readme.md b/keyboards/ymdk/ymd40/v2/keymaps/via/readme.md deleted file mode 100644 index 95286635472..00000000000 --- a/keyboards/ymdk/ymd40/v2/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for YMD40 v2 diff --git a/keyboards/yncognito/batpad/keymaps/default/readme.md b/keyboards/yncognito/batpad/keymaps/default/readme.md deleted file mode 100644 index ecc5d913a81..00000000000 --- a/keyboards/yncognito/batpad/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for batpad diff --git a/keyboards/yoichiro/lunakey_macro/keymaps/default/readme.md b/keyboards/yoichiro/lunakey_macro/keymaps/default/readme.md deleted file mode 100644 index b079aa9fa66..00000000000 --- a/keyboards/yoichiro/lunakey_macro/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Lunakey Macro diff --git a/keyboards/yoichiro/lunakey_macro/keymaps/via/readme.md b/keyboards/yoichiro/lunakey_macro/keymaps/via/readme.md deleted file mode 100644 index 4e74b05bcd8..00000000000 --- a/keyboards/yoichiro/lunakey_macro/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The keymap supporing VIA for Lunakey Macro diff --git a/keyboards/zfrontier/big_switch/keymaps/default/readme.md b/keyboards/zfrontier/big_switch/keymaps/default/readme.md deleted file mode 100644 index fea7a92a576..00000000000 --- a/keyboards/zfrontier/big_switch/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for big_switch diff --git a/keyboards/zigotica/z12/keymaps/default/readme.md b/keyboards/zigotica/z12/keymaps/default/readme.md deleted file mode 100644 index 5f30ab6a396..00000000000 --- a/keyboards/zigotica/z12/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default z12 Layout - -This is the default layout that comes flashed on every z12. diff --git a/keyboards/zigotica/z34/keymaps/default/readme.md b/keyboards/zigotica/z34/keymaps/default/readme.md deleted file mode 100644 index c6a0115573c..00000000000 --- a/keyboards/zigotica/z34/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default z34 Layout - -This is the default QWERTY layout that comes flashed on every z34. From 924147dfe44ca812ed5e6ca17b2eb345dd72b2c3 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 17 May 2024 15:54:21 -0700 Subject: [PATCH 275/333] Miscellaneous Data-Driven Keyboard Conversions (#23712) Converts `rules.mk` entries to data-driven where applicable. Affects: - `handwired/dygma/raise/ansi` - `handwired/dygma/raise/iso` - `handwired/symmetric70_proto/promicro` - `handwired/symmetric70_proto/proton_c` - `lazydesigners/dimple/ortho` - `lazydesigners/dimple/staggered/rev2` - `lazydesigners/dimple/staggered/rev3` - `sirius/uni660/rev2/ansi` - `sirius/uni660/rev2/iso` --- keyboards/handwired/dygma/raise/ansi/keyboard.json | 7 +++++++ keyboards/handwired/dygma/raise/info.json | 6 ------ keyboards/handwired/dygma/raise/iso/keyboard.json | 7 +++++++ keyboards/handwired/dygma/raise/rules.mk | 1 - .../handwired/symmetric70_proto/promicro/info.json | 5 +++++ .../handwired/symmetric70_proto/promicro/rules.mk | 13 +------------ .../handwired/symmetric70_proto/proton_c/info.json | 7 ++++++- .../handwired/symmetric70_proto/proton_c/rules.mk | 13 +------------ keyboards/lazydesigners/dimple/ortho/rules.mk | 1 - .../lazydesigners/dimple/staggered/rev2/rules.mk | 1 - .../lazydesigners/dimple/staggered/rev3/rules.mk | 1 - keyboards/sirius/uni660/rev2/ansi/keyboard.json | 9 +++++++++ keyboards/sirius/uni660/rev2/iso/keyboard.json | 9 +++++++++ keyboards/sirius/uni660/rev2/rules.mk | 13 ------------- 14 files changed, 45 insertions(+), 48 deletions(-) diff --git a/keyboards/handwired/dygma/raise/ansi/keyboard.json b/keyboards/handwired/dygma/raise/ansi/keyboard.json index 0b6c9f6f679..9abe98fdfa5 100644 --- a/keyboards/handwired/dygma/raise/ansi/keyboard.json +++ b/keyboards/handwired/dygma/raise/ansi/keyboard.json @@ -1,4 +1,11 @@ { + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "raw": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json index 2d0c354f3b2..be32abfb94c 100644 --- a/keyboards/handwired/dygma/raise/info.json +++ b/keyboards/handwired/dygma/raise/info.json @@ -25,11 +25,5 @@ "sleep": true }, "development_board": "blackpill_f411", - "features": { - "bootmagic": false, - "mousekey": true, - "extrakey": true, - "rgb_matrix": true - }, "debounce": 0 } diff --git a/keyboards/handwired/dygma/raise/iso/keyboard.json b/keyboards/handwired/dygma/raise/iso/keyboard.json index 0b6c9f6f679..9abe98fdfa5 100644 --- a/keyboards/handwired/dygma/raise/iso/keyboard.json +++ b/keyboards/handwired/dygma/raise/iso/keyboard.json @@ -1,4 +1,11 @@ { + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "raw": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk index 7a078c9757b..cd02f80200d 100644 --- a/keyboards/handwired/dygma/raise/rules.mk +++ b/keyboards/handwired/dygma/raise/rules.mk @@ -4,7 +4,6 @@ CUSTOM_MATRIX = lite # in the usb driver this triggers that allows mousekeys to work. The same side # effect happens if console or midi is enabled -- so something to do with # alternate usb endpoints. -RAW_ENABLE = yes I2C_DRIVER_REQUIRED = yes SRC += matrix.c diff --git a/keyboards/handwired/symmetric70_proto/promicro/info.json b/keyboards/handwired/symmetric70_proto/promicro/info.json index 29feccc819e..e567fb283d0 100644 --- a/keyboards/handwired/symmetric70_proto/promicro/info.json +++ b/keyboards/handwired/symmetric70_proto/promicro/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Symmetric70 prototype promicro", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/symmetric70_proto/promicro/rules.mk b/keyboards/handwired/symmetric70_proto/promicro/rules.mk index 29f6808ed5d..6e7633bfe01 100644 --- a/keyboards/handwired/symmetric70_proto/promicro/rules.mk +++ b/keyboards/handwired/symmetric70_proto/promicro/rules.mk @@ -1,12 +1 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output +# This file intentionally left blank diff --git a/keyboards/handwired/symmetric70_proto/proton_c/info.json b/keyboards/handwired/symmetric70_proto/proton_c/info.json index 1fd231bbc47..0b9e8584670 100644 --- a/keyboards/handwired/symmetric70_proto/proton_c/info.json +++ b/keyboards/handwired/symmetric70_proto/proton_c/info.json @@ -1,4 +1,9 @@ { "keyboard_name": "Symmetric70 prototype proton-c", - "development_board": "proton_c" + "development_board": "proton_c", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false + } } diff --git a/keyboards/handwired/symmetric70_proto/proton_c/rules.mk b/keyboards/handwired/symmetric70_proto/proton_c/rules.mk index 29f6808ed5d..6e7633bfe01 100644 --- a/keyboards/handwired/symmetric70_proto/proton_c/rules.mk +++ b/keyboards/handwired/symmetric70_proto/proton_c/rules.mk @@ -1,12 +1 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output +# This file intentionally left blank diff --git a/keyboards/lazydesigners/dimple/ortho/rules.mk b/keyboards/lazydesigners/dimple/ortho/rules.mk index dcedd7449b5..623023fdb63 100644 --- a/keyboards/lazydesigners/dimple/ortho/rules.mk +++ b/keyboards/lazydesigners/dimple/ortho/rules.mk @@ -1,4 +1,3 @@ # Disable unsupported hardware BACKLIGHT_SUPPORTED = no -RGBLIGHT_ENABLE = no AUDIO_SUPPORTED = no diff --git a/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk b/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk index 748a459f785..271780b75ec 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk +++ b/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk @@ -1,3 +1,2 @@ # Disable unsupported hardware -RGBLIGHT_ENABLE = no AUDIO_SUPPORTED = no diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk b/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk index 748a459f785..271780b75ec 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk +++ b/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk @@ -1,3 +1,2 @@ # Disable unsupported hardware -RGBLIGHT_ENABLE = no AUDIO_SUPPORTED = no diff --git a/keyboards/sirius/uni660/rev2/ansi/keyboard.json b/keyboards/sirius/uni660/rev2/ansi/keyboard.json index bc09b260808..3db9fb966a7 100644 --- a/keyboards/sirius/uni660/rev2/ansi/keyboard.json +++ b/keyboards/sirius/uni660/rev2/ansi/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0202", "device_version": "20.0.4" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "unicode": true + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/sirius/uni660/rev2/iso/keyboard.json b/keyboards/sirius/uni660/rev2/iso/keyboard.json index af369f48daf..0e5958c1171 100644 --- a/keyboards/sirius/uni660/rev2/iso/keyboard.json +++ b/keyboards/sirius/uni660/rev2/iso/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0203", "device_version": "20.0.4" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "unicode": true + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/sirius/uni660/rev2/rules.mk b/keyboards/sirius/uni660/rev2/rules.mk index 791fa054c8e..c03b052c56b 100644 --- a/keyboards/sirius/uni660/rev2/rules.mk +++ b/keyboards/sirius/uni660/rev2/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 From 5469f30dfedb2537bf950bbc8e7fea95a42ac667 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 17 May 2024 15:55:29 -0700 Subject: [PATCH 276/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: 0-9 (#23716) Affects: - `0_sixty` - `1upkeyboards/pi40` - `1upkeyboards/pi50` - `40percentclub/gherkin` - `4pplet/perk60_iso/rev_a` --- keyboards/0_sixty/config.h | 38 ------------------- keyboards/0_sixty/info.json | 6 +++ keyboards/1upkeyboards/pi40/config.h | 5 --- keyboards/1upkeyboards/pi40/info.json | 6 +++ keyboards/1upkeyboards/pi50/config.h | 5 --- keyboards/1upkeyboards/pi50/info.json | 6 +++ keyboards/40percentclub/gherkin/config.h | 7 ---- keyboards/40percentclub/gherkin/info.json | 6 +++ keyboards/4pplet/perk60_iso/rev_a/config.h | 5 --- .../4pplet/perk60_iso/rev_a/keyboard.json | 6 +++ 10 files changed, 30 insertions(+), 60 deletions(-) delete mode 100644 keyboards/0_sixty/config.h delete mode 100644 keyboards/40percentclub/gherkin/config.h diff --git a/keyboards/0_sixty/config.h b/keyboards/0_sixty/config.h deleted file mode 100644 index 6023c08795b..00000000000 --- a/keyboards/0_sixty/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 Vinam Arora - * - * 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/0_sixty/info.json b/keyboards/0_sixty/info.json index f86b9722e8b..ce76f808b2f 100644 --- a/keyboards/0_sixty/info.json +++ b/keyboards/0_sixty/info.json @@ -20,6 +20,12 @@ "build": { "lto": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h index c93b70f120f..627c0c5ddb0 100644 --- a/keyboards/1upkeyboards/pi40/config.h +++ b/keyboards/1upkeyboards/pi40/config.h @@ -9,8 +9,3 @@ #define I2C_DRIVER I2CD0 #define OLED_BRIGHTNESS 128 #define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c" - -/* 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/1upkeyboards/pi40/info.json b/keyboards/1upkeyboards/pi40/info.json index 135c32dedeb..2dad865b287 100644 --- a/keyboards/1upkeyboards/pi40/info.json +++ b/keyboards/1upkeyboards/pi40/info.json @@ -1,4 +1,10 @@ { + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgb_matrix": { "animations":{ "alphas_mods": true, diff --git a/keyboards/1upkeyboards/pi50/config.h b/keyboards/1upkeyboards/pi50/config.h index ffdba3bd1f2..e20a9854a52 100644 --- a/keyboards/1upkeyboards/pi50/config.h +++ b/keyboards/1upkeyboards/pi50/config.h @@ -8,8 +8,3 @@ #define I2C_DRIVER I2CD1 #define OLED_BRIGHTNESS 128 #define OLED_FONT_H "keyboards/1upkeyboards/pi50/lib/glcdfont.c" - -/* 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/1upkeyboards/pi50/info.json b/keyboards/1upkeyboards/pi50/info.json index 2ee1aed4ccf..409fbecbc89 100644 --- a/keyboards/1upkeyboards/pi50/info.json +++ b/keyboards/1upkeyboards/pi50/info.json @@ -24,6 +24,12 @@ "rgb_matrix": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "rows": ["GP20", "GP15", "GP19", "GP14", "GP18", "GP13", "GP17", "GP12", "GP16", "GP21"], "cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP9"] diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/40percentclub/gherkin/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json index d531c9408c1..0c9f609cdcc 100644 --- a/keyboards/40percentclub/gherkin/info.json +++ b/keyboards/40percentclub/gherkin/info.json @@ -15,6 +15,12 @@ "nkro": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_3x10"], "layouts": { "LAYOUT_ortho_3x10": { diff --git a/keyboards/4pplet/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h index 1aa7587780c..b8f03532820 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/config.h +++ b/keyboards/4pplet/perk60_iso/rev_a/config.h @@ -16,10 +16,5 @@ 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 IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND #define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ diff --git a/keyboards/4pplet/perk60_iso/rev_a/keyboard.json b/keyboards/4pplet/perk60_iso/rev_a/keyboard.json index ae60e30d7a5..56e7a25de4b 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/keyboard.json +++ b/keyboards/4pplet/perk60_iso/rev_a/keyboard.json @@ -49,6 +49,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A1", "B12", "B14", "A2", "A0", "A3", "A4"], "rows": ["C14", "C13", "B5", "B4", "B8", "A15", "B3", "B9", "A5", "A7"] From 8f2085421e60fe1ac7ebc2c9b0fc7047daaaa1b5 Mon Sep 17 00:00:00 2001 From: Danny Date: Sat, 18 May 2024 13:51:02 -0400 Subject: [PATCH 277/333] [Keyboard] Add Irispad (#23724) * Add Irispad * Fix x positions for RGB LEDs * Add encoder/bootmagic settings in info.json and run format-json * Add missing info.json * Fix README formatting --- keyboards/keebio/irispad/info.json | 8 + .../irispad/keymaps/default/keymap.json | 43 +++++ .../keebio/irispad/keymaps/via/keymap.json | 43 +++++ keyboards/keebio/irispad/readme.md | 21 +++ keyboards/keebio/irispad/rev8/config.h | 11 ++ keyboards/keebio/irispad/rev8/info.json | 151 ++++++++++++++++++ keyboards/keebio/irispad/rev8/rules.mk | 1 + 7 files changed, 278 insertions(+) create mode 100644 keyboards/keebio/irispad/info.json create mode 100644 keyboards/keebio/irispad/keymaps/default/keymap.json create mode 100644 keyboards/keebio/irispad/keymaps/via/keymap.json create mode 100644 keyboards/keebio/irispad/readme.md create mode 100644 keyboards/keebio/irispad/rev8/config.h create mode 100644 keyboards/keebio/irispad/rev8/info.json create mode 100644 keyboards/keebio/irispad/rev8/rules.mk diff --git a/keyboards/keebio/irispad/info.json b/keyboards/keebio/irispad/info.json new file mode 100644 index 00000000000..669038aff1f --- /dev/null +++ b/keyboards/keebio/irispad/info.json @@ -0,0 +1,8 @@ +{ + "manufacturer": "Keebio", + "url": "https://keeb.io", + "maintainer": "Keebio", + "usb": { + "vid": "0xCB10" + } +} diff --git a/keyboards/keebio/irispad/keymaps/default/keymap.json b/keyboards/keebio/irispad/keymaps/default/keymap.json new file mode 100644 index 00000000000..fd0dc3bb5ee --- /dev/null +++ b/keyboards/keebio/irispad/keymaps/default/keymap.json @@ -0,0 +1,43 @@ +{ + "config": { "features": {"encoder_map": true, "tri_layer": true} }, + "keyboard": "keebio/irispad", + "keymap": "default", + "layout": "LAYOUT", + "layers": [ + [ + "QK_GESC", "KC_1" , "KC_2" , "KC_3" , "KC_4" , "KC_5" , + "KC_TAB" , "KC_Q" , "KC_W" , "KC_E" , "KC_R" , "KC_T" , + "KC_LCTL", "KC_A" , "KC_S" , "KC_D" , "KC_F" , "KC_G" , + "KC_LSFT", "KC_Z" , "KC_X" , "KC_C" , "KC_V" , "KC_B" , "TL_UPPR", + "KC_LGUI", "TL_LOWR", "KC_ENT" + ], + [ + "KC_TILD", "KC_EXLM", "KC_AT" , "KC_HASH", "KC_DLR" , "KC_PERC", + "KC_GRV" , "_______", "KC_UP" , "_______", "QK_BOOT", "_______", + "KC_DEL" , "KC_LEFT", "KC_DOWN", "KC_RGHT", "_______", "KC_LBRC", + "RGB_MOD", "EE_CLR" , "_______", "_______", "_______", "KC_LCBR", "KC_LPRN", + "_______", "_______", "KC_DEL" + ], + [ + "KC_F6" , "KC_F1" , "KC_F2" , "KC_F3" , "KC_F4" , "KC_F5" , + "KC_F12", "KC_F7" , "KC_F8" , "KC_F9" , "KC_F10" , "KC_F11" , + "RGB_MOD", "KC_MPRV", "KC_MNXT", "KC_VOLU", "KC_PGUP", "KC_UNDS", + "KC_MUTE", "KC_MSTP", "KC_MPLY", "KC_VOLD", "KC_PGDN", "KC_MINS", "KC_LPRN", + "_______", "_______", "_______" + ] + ], + "encoders": [ + [ + {"ccw": "KC_PGUP", "cw": "KC_PGDN"}, + {"ccw": "KC_VOLD", "cw": "KC_VOLU"} + ], + [ + {"ccw": "_______", "cw": "_______"}, + {"ccw": "_______", "cw": "_______"} + ], + [ + {"ccw": "_______", "cw": "_______"}, + {"ccw": "_______", "cw": "_______"} + ] + ] +} diff --git a/keyboards/keebio/irispad/keymaps/via/keymap.json b/keyboards/keebio/irispad/keymaps/via/keymap.json new file mode 100644 index 00000000000..97fc085b92e --- /dev/null +++ b/keyboards/keebio/irispad/keymaps/via/keymap.json @@ -0,0 +1,43 @@ +{ + "config": { "features": {"encoder_map": true, "via": true} }, + "keyboard": "keebio/irispad", + "keymap": "via", + "layout": "LAYOUT", + "layers": [ + [ + "QK_GESC", "KC_1" , "KC_2" , "KC_3" , "KC_4" , "KC_5" , + "KC_TAB" , "KC_Q" , "KC_W" , "KC_E" , "KC_R" , "KC_T" , + "KC_LCTL", "KC_A" , "KC_S" , "KC_D" , "KC_F" , "KC_G" , + "KC_LSFT", "KC_Z" , "KC_X" , "KC_C" , "KC_V" , "KC_B" , "TL_UPPR", + "KC_LGUI", "TL_LOWR", "KC_ENT" + ], + [ + "KC_TILD", "KC_EXLM", "KC_AT" , "KC_HASH", "KC_DLR" , "KC_PERC", + "KC_GRV" , "_______", "KC_UP" , "_______", "QK_BOOT", "_______", + "KC_DEL" , "KC_LEFT", "KC_DOWN", "KC_RGHT", "_______", "KC_LBRC", + "RGB_MOD", "EE_CLR" , "_______", "_______", "_______", "KC_LCBR", "KC_LPRN", + "_______", "_______", "KC_DEL" + ], + [ + "KC_F6" , "KC_F1" , "KC_F2" , "KC_F3" , "KC_F4" , "KC_F5" , + "KC_F12", "KC_F7" , "KC_F8" , "KC_F9" , "KC_F10" , "KC_F11" , + "RGB_MOD", "KC_MPRV", "KC_MNXT", "KC_VOLU", "KC_PGUP", "KC_UNDS", + "KC_MUTE", "KC_MSTP", "KC_MPLY", "KC_VOLD", "KC_PGDN", "KC_MINS", "KC_LPRN", + "_______", "_______", "_______" + ] + ], + "encoders": [ + [ + {"ccw": "KC_PGUP", "cw": "KC_PGDN"}, + {"ccw": "KC_VOLD", "cw": "KC_VOLU"} + ], + [ + {"ccw": "_______", "cw": "_______"}, + {"ccw": "_______", "cw": "_______"} + ], + [ + {"ccw": "_______", "cw": "_______"}, + {"ccw": "_______", "cw": "_______"} + ] + ] +} diff --git a/keyboards/keebio/irispad/readme.md b/keyboards/keebio/irispad/readme.md new file mode 100644 index 00000000000..28e0334eed8 --- /dev/null +++ b/keyboards/keebio/irispad/readme.md @@ -0,0 +1,21 @@ +# Irispad + +An ergonomic gamepad based off of the Iris and sold by Keebio. [More info at Keebio](https://keeb.io). + +* Keyboard Maintainer: [Bakingpy/nooges](https://github.com/nooges) +* Hardware Supported: RP2040 +* Hardware Availability: [Keebio](https://keeb.io) + +Make example for this keyboard (after setting up your build environment): + + make keebio/irispad/rev8:default + +Example of flashing this keyboard: + + make keebio/irispad/rev8:default:flash + +See [build environment setup](https://docs.qmk.fm/#/newbs_getting_started) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. + +A build guide for this keyboard can be found here: [Iris Build Guide](https://docs.keeb.io/iris-rev6-build-guide) + +Note: The Irispad PCB is a repurposed Iris Rev. 8 PCB from a batch that had all of the diodes flipped, so if you would like to use a regular Iris Rev. 8 PCB, you will need to change `ROW2COL` to `COL2ROW` in `keyboard.json`. diff --git a/keyboards/keebio/irispad/rev8/config.h b/keyboards/keebio/irispad/rev8/config.h new file mode 100644 index 00000000000..c0407f20bbb --- /dev/null +++ b/keyboards/keebio/irispad/rev8/config.h @@ -0,0 +1,11 @@ +// Copyright 2024 Danny Nguyen (danny@keeb.io) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U + +#define I2C_DRIVER I2CD2 +#define I2C1_SDA_PIN GP10 +#define I2C1_SCL_PIN GP11 diff --git a/keyboards/keebio/irispad/rev8/info.json b/keyboards/keebio/irispad/rev8/info.json new file mode 100644 index 00000000000..9845ebc9fd9 --- /dev/null +++ b/keyboards/keebio/irispad/rev8/info.json @@ -0,0 +1,151 @@ +{ + "keyboard_name": "Irispad Rev. 8", + "bootloader": "rp2040", + "diode_direction": "ROW2COL", + "encoder": { + "rotary": [ + {"pin_a": "GP14", "pin_b": "GP15"}, + {"pin_a": "GP26", "pin_b": "GP25"} + ] + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["GP2", "GP3", "GP29", "GP27", "GP6", "GP5"], + "rows": ["GP0", "GP1", "GP7", "GP16", "GP28"] + }, + "processor": "RP2040", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 5, "flags": 4}, + {"x": 18, "y": 5, "flags": 2}, + {"matrix": [0, 1], "x": 37, "y": 5, "flags": 4}, + {"matrix": [0, 2], "x": 76, "y": 2, "flags": 4}, + {"x": 91, "y": 1, "flags": 2}, + {"matrix": [0, 3], "x": 110, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 146, "y": 5, "flags": 4}, + {"x": 165, "y": 3, "flags": 2}, + {"matrix": [0, 5], "x": 183, "y": 3, "flags": 4}, + {"matrix": [1, 5], "x": 183, "y": 17, "flags": 4}, + {"matrix": [1, 4], "x": 137, "y": 15, "flags": 4}, + {"matrix": [1, 3], "x": 110, "y": 13, "flags": 4}, + {"matrix": [1, 2], "x": 73, "y": 15, "flags": 4}, + {"matrix": [1, 1], "x": 37, "y": 18, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 18, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, + {"matrix": [2, 1], "x": 37, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 73, "y": 28, "flags": 4}, + {"matrix": [2, 3], "x": 110, "y": 27, "flags": 4}, + {"matrix": [2, 4], "x": 137, "y": 28, "flags": 4}, + {"matrix": [2, 5], "x": 183, "y": 30, "flags": 4}, + {"matrix": [3, 5], "x": 183, "y": 43, "flags": 4}, + {"matrix": [3, 4], "x": 146, "y": 42, "flags": 4}, + {"matrix": [3, 3], "x": 110, "y": 40, "flags": 4}, + {"x": 91, "y": 50, "flags": 2}, + {"matrix": [3, 2], "x": 73, "y": 42, "flags": 4}, + {"matrix": [3, 1], "x": 37, "y": 45, "flags": 4}, + {"x": 18, "y": 43, "flags": 2}, + {"matrix": [3, 0], "x": 0, "y": 45, "flags": 4}, + {"matrix": [4, 5], "x": 224, "y": 52, "flags": 4}, + {"matrix": [4, 4], "x": 206, "y": 64, "flags": 4}, + {"x": 183, "y": 58, "flags": 2}, + {"matrix": [4, 3], "x": 165, "y": 58, "flags": 4}, + {"matrix": [4, 2], "x": 128, "y": 47, "flags": 4} + ], + "max_brightness": 180, + "sleep": true + }, + "usb": { + "device_version": "8.0.0", + "pid": "0x8356" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP9" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 5], "x": 6.15, "y": 3.75}, + {"matrix": [4, 2], "x": 3.5, "y": 4.25}, + {"matrix": [4, 3], "x": 4.5, "y": 4.375}, + {"matrix": [4, 4], "x": 5.6, "y": 4.75} + ] + } + } +} diff --git a/keyboards/keebio/irispad/rev8/rules.mk b/keyboards/keebio/irispad/rev8/rules.mk new file mode 100644 index 00000000000..161ec22b16e --- /dev/null +++ b/keyboards/keebio/irispad/rev8/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = vendor From d0ac04a841a11bd51d3bda73c989724289ddae0f Mon Sep 17 00:00:00 2001 From: c0ldbru Date: Sat, 18 May 2024 13:52:24 -0400 Subject: [PATCH 278/333] [Keyboard] Add h4ckb0ard (#23717) * adds h4ckb0ard * Update keyboards/rot13labs/h4ckb0ard/info.json Co-authored-by: Joel Challis * Update keyboards/rot13labs/h4ckb0ard/info.json Co-authored-by: Joel Challis * Update keyboards/rot13labs/h4ckb0ard/info.json Co-authored-by: Joel Challis * Update info.json updating flags to indicate backlighting * Update info.json reduces max brightness to 100 * Delete keyboards/rot13labs/h4ckb0ard/config.h removes this since its not needed anymore * Update keyboards/rot13labs/h4ckb0ard/info.json Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/rot13labs/h4ckb0ard/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/rot13labs/h4ckb0ard/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --------- Co-authored-by: c0ldbru Co-authored-by: Joel Challis Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/rot13labs/h4ckb0ard/info.json | 159 ++++++++++++++++++ .../h4ckb0ard/keymaps/default/keymap.c | 45 +++++ keyboards/rot13labs/h4ckb0ard/readme.md | 19 +++ keyboards/rot13labs/h4ckb0ard/rules.mk | 1 + 4 files changed, 224 insertions(+) create mode 100644 keyboards/rot13labs/h4ckb0ard/info.json create mode 100755 keyboards/rot13labs/h4ckb0ard/keymaps/default/keymap.c create mode 100644 keyboards/rot13labs/h4ckb0ard/readme.md create mode 100644 keyboards/rot13labs/h4ckb0ard/rules.mk diff --git a/keyboards/rot13labs/h4ckb0ard/info.json b/keyboards/rot13labs/h4ckb0ard/info.json new file mode 100644 index 00000000000..0ffe5be40de --- /dev/null +++ b/keyboards/rot13labs/h4ckb0ard/info.json @@ -0,0 +1,159 @@ +{ + "manufacturer": "rot13labs", + "keyboard_name": "H4CKB0ARD", + "maintainer": "c0ldbru", + "bootloader": "usbasploader", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "C4", "C5", "D0", "D1", "B5", "D7", "D6", "D4"], + "rows": ["B0", "B1", "B2", "B3"] + }, + "processor": "atmega328p", + "usb": { + "pid": "0xBABE", + "vid": "0xBEEF", + "device_version": "13.3.7", + "no_startup_check": true + }, + "ws2812": { + "pin": "B4" + }, + "rgb_matrix": { + "animations": { + "cycle_up_down": true, + "jellybean_raindrops": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "pixel_fractal": true, + "rainbow_moving_chevron": true, + "cycle_pinwheel": true, + "pixel_rain": true, + "dual_beacon": true, + "hue_breathing": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_reactive_cross": true + }, + "driver": "ws2812", + "default": { + "animation": "cycle_up_down" + }, + "layout": [ + {"flags": 4, "matrix": [0, 11], "x": 0, "y": 0}, + {"flags": 4, "matrix": [0, 10], "x": 1, "y": 0}, + {"flags": 4, "matrix": [0, 9], "x": 2, "y": 0}, + {"flags": 4, "matrix": [0, 8], "x": 3, "y": 0}, + {"flags": 4, "matrix": [0, 7], "x": 4, "y": 0}, + {"flags": 4, "matrix": [0, 6], "x": 5, "y": 0}, + {"flags": 4, "matrix": [0, 5], "x": 6, "y": 0}, + {"flags": 4, "matrix": [0, 4], "x": 7, "y": 0}, + {"flags": 4, "matrix": [0, 3], "x": 8, "y": 0}, + {"flags": 4, "matrix": [0, 2], "x": 9, "y": 0}, + {"flags": 4, "matrix": [0, 1], "x": 10, "y": 0}, + {"flags": 4, "matrix": [0, 0], "x": 11, "y": 0}, + + {"flags": 4, "matrix": [1, 0], "x": 0, "y": 1}, + {"flags": 4, "matrix": [1, 1], "x": 1.25, "y": 1}, + {"flags": 4, "matrix": [1, 2], "x": 2.25, "y": 1}, + {"flags": 4, "matrix": [1, 3], "x": 3.25, "y": 1}, + {"flags": 4, "matrix": [1, 4], "x": 4.25, "y": 1}, + {"flags": 4, "matrix": [1, 5], "x": 5.25, "y": 1}, + {"flags": 4, "matrix": [1, 6], "x": 6.25, "y": 1}, + {"flags": 4, "matrix": [1, 7], "x": 7.25, "y": 1}, + {"flags": 4, "matrix": [1, 8], "x": 8.25, "y": 1}, + {"flags": 4, "matrix": [1, 9], "x": 9.25, "y": 1}, + {"flags": 4, "matrix": [1, 11], "x": 10.25, "y": 1}, + + {"flags": 4, "matrix": [2, 11], "x": 0, "y": 2}, + {"flags": 4, "matrix": [2, 10], "x": 1.75, "y": 2}, + {"flags": 4, "matrix": [2, 8], "x": 2.75, "y": 2}, + {"flags": 4, "matrix": [2, 7], "x": 3.75, "y": 2}, + {"flags": 4, "matrix": [2, 6], "x": 4.75, "y": 2}, + {"flags": 4, "matrix": [2, 5], "x": 5.75, "y": 2}, + {"flags": 4, "matrix": [2, 4], "x": 6.75, "y": 2}, + {"flags": 4, "matrix": [2, 3], "x": 7.75, "y": 2}, + {"flags": 4, "matrix": [2, 2], "x": 8.75, "y": 2}, + {"flags": 4, "matrix": [2, 1], "x": 10.5, "y": 2}, + {"flags": 4, "matrix": [2, 0], "x": 11.5, "y": 2}, + + {"flags": 4, "matrix": [3, 0], "x": 0, "y": 3}, + {"flags": 4, "matrix": [3, 1], "x": 1.25, "y": 3}, + {"flags": 4, "matrix": [3, 2], "x": 2.5, "y": 3}, + {"flags": 4, "matrix": [3, 4], "x": 3.5, "y": 3}, + {"flags": 4, "matrix": [3, 6], "x": 5.75, "y": 3}, + {"flags": 4, "matrix": [3, 8], "x": 8.5, "y": 3}, + {"flags": 4, "matrix": [3, 9], "x": 9.5, "y": 3}, + {"flags": 4, "matrix": [3, 10], "x": 10.5, "y": 3}, + {"flags": 4, "matrix": [3, 11], "x": 11.5, "y": 3} + ], + "max_brightness": 100 + + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 2.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2, "w": 1.75}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 2.75}, + {"matrix": [3, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3}, + {"matrix": [3, 10], "x": 10.5, "y": 3}, + {"matrix": [3, 11], "x": 11.5, "y": 3} + ] + } + } +} + diff --git a/keyboards/rot13labs/h4ckb0ard/keymaps/default/keymap.c b/keyboards/rot13labs/h4ckb0ard/keymaps/default/keymap.c new file mode 100755 index 00000000000..ab938a9b3d1 --- /dev/null +++ b/keyboards/rot13labs/h4ckb0ard/keymaps/default/keymap.c @@ -0,0 +1,45 @@ +/* Copyright 2024 rot13labs + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_RCTL, KC_UP, DF(1), + KC_LCTL, KC_LGUI, MO(2), KC_SPC, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT), + + /* FN - symbols & audio controls */ + [1] = LAYOUT( + KC_ESC, KC_MINS, KC_EQL, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_LBRC, KC_RBRC, KC_BSLS, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, KC_VOLU, DF(2), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), + + /* ALT - numbers */ + [2] = LAYOUT( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_RCTL, KC_UP, DF(3), + KC_LCTL, KC_LGUI, _______, MO(3), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT), + + /* SPC - RGB control layer */ + [3] = LAYOUT( + KC_ESC, KC_Q, RGB_M_SW, KC_E, RGB_M_R, KC_T, KC_Y, RGB_SPD, RGB_SPI, RGB_RMOD, RGB_MOD, KC_DEL, + KC_TAB, KC_A, RGB_M_P, KC_D, KC_F, KC_G, KC_H, RGB_SAD, RGB_SAI, RGB_TOG, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, RGB_M_B, KC_N, KC_M, KC_RCTL, RGB_VAI, DF(0), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, _______, RGB_HUD, RGB_VAD, RGB_HUI), +}; \ No newline at end of file diff --git a/keyboards/rot13labs/h4ckb0ard/readme.md b/keyboards/rot13labs/h4ckb0ard/readme.md new file mode 100644 index 00000000000..fdf42fa5b8e --- /dev/null +++ b/keyboards/rot13labs/h4ckb0ard/readme.md @@ -0,0 +1,19 @@ +# h4ckb0ard + +![h4ckb0ard](https://i.imgur.com/U325abR.jpg) + +A 40% keyboard for hackers using the c0ldbru layout, designed to minimize space without requiring users to buy extra keycaps just to use less. + +* Keyboard Maintainer: [c0ldbru](https://github.com/c0ldbru) +* Hardware Supported: h4ckb0ard // atmega328p +* Hardware Availability: [rot13labs](https://rot13labs.com) + +Make example for this keyboard (after setting up your build environment): + + make rot13labs/h4ckb0ard:default + +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). + +## Bootloader + +You can enter the bootloader to flash on new firmware by holding down the ESC key while plugging the h4ckb0ard in. diff --git a/keyboards/rot13labs/h4ckb0ard/rules.mk b/keyboards/rot13labs/h4ckb0ard/rules.mk new file mode 100644 index 00000000000..7ff128fa692 --- /dev/null +++ b/keyboards/rot13labs/h4ckb0ard/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From e9e26c2b52fbc82138435346597521ded6f78605 Mon Sep 17 00:00:00 2001 From: Shandon Anderson Date: Sat, 18 May 2024 16:15:59 -0400 Subject: [PATCH 279/333] Add media key support to Riot Pad (#23719) --- keyboards/shandoncodes/riot_pad/keyboard.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/shandoncodes/riot_pad/keyboard.json b/keyboards/shandoncodes/riot_pad/keyboard.json index ab732ef0b03..7ecb52d8e0e 100644 --- a/keyboards/shandoncodes/riot_pad/keyboard.json +++ b/keyboards/shandoncodes/riot_pad/keyboard.json @@ -9,7 +9,8 @@ "command": false, "console": false, "nkro": true, - "rgblight": true + "rgblight": true, + "extrakey": true }, "matrix_pins": { "cols": ["B14", "A8", "A9"], From a29f665769ab79a119f0f3670734ff743c42e1a1 Mon Sep 17 00:00:00 2001 From: Skyler Hawthorne Date: Sun, 19 May 2024 00:37:33 -0400 Subject: [PATCH 280/333] Insert delay between shifted chars in send_string_with_delay for AVR (#23673) --- quantum/send_string/send_string.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/quantum/send_string/send_string.c b/quantum/send_string/send_string.c index 8b59c19219f..44c5ec5ab99 100644 --- a/quantum/send_string/send_string.c +++ b/quantum/send_string/send_string.c @@ -294,7 +294,7 @@ void tap_random_base64(void) { #if defined(__AVR__) void send_string_P(const char *string) { - send_string_with_delay_P(string, 0); + send_string_with_delay_P(string, TAP_CODE_DELAY); } void send_string_with_delay_P(const char *string, uint8_t interval) { @@ -303,6 +303,7 @@ void send_string_with_delay_P(const char *string, uint8_t interval) { if (!ascii_code) break; if (ascii_code == SS_QMK_PREFIX) { ascii_code = pgm_read_byte(++string); + if (ascii_code == SS_TAP_CODE) { // tap uint8_t keycode = pgm_read_byte(++string); @@ -319,24 +320,19 @@ void send_string_with_delay_P(const char *string, uint8_t interval) { // delay int ms = 0; uint8_t keycode = pgm_read_byte(++string); + while (isdigit(keycode)) { ms *= 10; ms += keycode - '0'; keycode = pgm_read_byte(++string); } - while (ms--) - wait_ms(1); + wait_ms(ms); } } else { - send_char(ascii_code); + send_char_with_delay(ascii_code, interval); } + ++string; - // interval - { - uint8_t ms = interval; - while (ms--) - wait_ms(1); - } } } #endif From dd56bee9e13979a140b2e691bf7ab8a0ec9a066d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=AB=E3=82=BF=E3=83=BC=E3=83=9A?= =?UTF-8?q?=E3=83=BC=E3=83=91=E3=83=BC?= <76888457+filterpaper@users.noreply.github.com> Date: Sun, 19 May 2024 12:41:03 +0800 Subject: [PATCH 281/333] [Doc] Reference advance keycodes in combos (#23666) --- docs/feature_combo.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/feature_combo.md b/docs/feature_combo.md index 61f8b2ee197..496e97bd3c1 100644 --- a/docs/feature_combo.md +++ b/docs/feature_combo.md @@ -17,11 +17,12 @@ combo_t key_combos[] = { This will send "Escape" if you hit the A and B keys, and Ctrl+Z when you hit the C and D keys. -## Mod-Tap Support -[Mod-Tap](mod_tap.md) feature is also supported together with combos. You will need to use the full Mod-Tap keycode in the combo definition, e.g.: +## Advanced Keycodes Support +Advanced keycodes, such as [Mod-Tap](mod_tap.md) and [Tap Dance](feature_tap_dance.md) are also supported together with combos. If you use these advanced keycodes in your keymap, you will need to place the full keycode in the combo definition, e.g.: ```c const uint16_t PROGMEM test_combo1[] = {LSFT_T(KC_A), LT(1, KC_B), COMBO_END}; +const uint16_t PROGMEM test_combo2[] = {TD(TD_ESC_CAPS), KC_F1, COMBO_END}; ``` ## Overlapping Combos From 5bb01794ee51f984d5bd904a1234da89a5762149 Mon Sep 17 00:00:00 2001 From: Coby Sher <63015754+CobyPear@users.noreply.github.com> Date: Sat, 18 May 2024 23:51:36 -0500 Subject: [PATCH 282/333] Add sleepy_craft_studios sleepy_keeb (#23659) Co-authored-by: Duncan Sutherland --- .../sleepy_keeb/info.json | 92 +++++++++++++++++++ .../sleepy_keeb/keymaps/default/keymap.c | 31 +++++++ .../sleepy_keeb/keymaps/via/keymap.c | 31 +++++++ .../sleepy_keeb/keymaps/via/rules.mk | 1 + .../sleepy_keeb/readme.md | 27 ++++++ .../sleepy_craft_studios/sleepy_keeb/rules.mk | 1 + 6 files changed, 183 insertions(+) create mode 100644 keyboards/sleepy_craft_studios/sleepy_keeb/info.json create mode 100644 keyboards/sleepy_craft_studios/sleepy_keeb/keymaps/default/keymap.c create mode 100644 keyboards/sleepy_craft_studios/sleepy_keeb/keymaps/via/keymap.c create mode 100644 keyboards/sleepy_craft_studios/sleepy_keeb/keymaps/via/rules.mk create mode 100644 keyboards/sleepy_craft_studios/sleepy_keeb/readme.md create mode 100644 keyboards/sleepy_craft_studios/sleepy_keeb/rules.mk diff --git a/keyboards/sleepy_craft_studios/sleepy_keeb/info.json b/keyboards/sleepy_craft_studios/sleepy_keeb/info.json new file mode 100644 index 00000000000..635a780ed4a --- /dev/null +++ b/keyboards/sleepy_craft_studios/sleepy_keeb/info.json @@ -0,0 +1,92 @@ +{ + "manufacturer": "Sleepy Craft Studios", + "keyboard_name": "sleepy_keeb", + "maintainer": "Sleepy Craft Studios", + "development_board": "promicro", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D1", "D0", "D4", "C6"] + }, + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "static_gradient": true, + "twinkle": true + }, + "led_count": 17 + }, + "url": "https://sleepycraftstudios.com/downloads/sleepy-keeb", + "usb": { + "device_version": "1.0.0", + "pid": "0x0001", + "vid": "0x7373" + }, + "ws2812": { + "pin": "D2" + }, + "community_layouts": ["planck_mit"], + "layouts": { + "LAYOUT_planck_mit": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 6], "x": 5, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} + ] + } + } +} diff --git a/keyboards/sleepy_craft_studios/sleepy_keeb/keymaps/default/keymap.c b/keyboards/sleepy_craft_studios/sleepy_keeb/keymaps/default/keymap.c new file mode 100644 index 00000000000..1082b0afa6b --- /dev/null +++ b/keyboards/sleepy_craft_studios/sleepy_keeb/keymaps/default/keymap.c @@ -0,0 +1,31 @@ +// Copyright 2024 Sleepy Craft Studios +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum keeb_layers { + _BASE, + _RAISE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_planck_mit( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + KC_GRV, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_UP, KC_DOWN, KC_LEFT, KC_RGHT + ), + [_RAISE] = LAYOUT_planck_mit( + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, RGB_MOD, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, + _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), + [_FN] = LAYOUT_planck_mit( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, RGB_TOG, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, + _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), +}; diff --git a/keyboards/sleepy_craft_studios/sleepy_keeb/keymaps/via/keymap.c b/keyboards/sleepy_craft_studios/sleepy_keeb/keymaps/via/keymap.c new file mode 100644 index 00000000000..1082b0afa6b --- /dev/null +++ b/keyboards/sleepy_craft_studios/sleepy_keeb/keymaps/via/keymap.c @@ -0,0 +1,31 @@ +// Copyright 2024 Sleepy Craft Studios +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum keeb_layers { + _BASE, + _RAISE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_planck_mit( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + KC_GRV, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_UP, KC_DOWN, KC_LEFT, KC_RGHT + ), + [_RAISE] = LAYOUT_planck_mit( + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, RGB_MOD, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, + _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), + [_FN] = LAYOUT_planck_mit( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, RGB_TOG, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, + _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), +}; diff --git a/keyboards/sleepy_craft_studios/sleepy_keeb/keymaps/via/rules.mk b/keyboards/sleepy_craft_studios/sleepy_keeb/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/sleepy_craft_studios/sleepy_keeb/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/sleepy_craft_studios/sleepy_keeb/readme.md b/keyboards/sleepy_craft_studios/sleepy_keeb/readme.md new file mode 100644 index 00000000000..9e99b9002a7 --- /dev/null +++ b/keyboards/sleepy_craft_studios/sleepy_keeb/readme.md @@ -0,0 +1,27 @@ +# Sleepy Keeb + +![sleepy_keeb](https://i.imgur.com/y3cessF.jpeg) + +The Sleepy Keeb is a hand-wired keyboard based on the 4x12 Planck layout. The Sleepy Keeb integrates hot-swap socket and diode holders into the plate for easier building. + +- Keyboard Maintainer: [Sleepy Craft Studios](https://github.com/sleepy-craft-studios) +- Hardware Supported: Pro Micro development board (and clones/adapations of) +- Hardware Availability: [Sleepy Craft Studios Shop](https://sleepycraftstudios.com/shop) for kits and full builds, [Sleepy Craft Studios Downloads](https://sleepycraftstudios.com/downloads) for CC-BY-SA-NC licensed stl files for 3D printing. + +Make example for this keyboard (after setting up your build environment): + + make sleepy_keeb:default + +Flashing example for this keyboard: + + make sleepy_keeb: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +- **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/sleepy_craft_studios/sleepy_keeb/rules.mk b/keyboards/sleepy_craft_studios/sleepy_keeb/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/sleepy_craft_studios/sleepy_keeb/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From eab07b865568fb11198889451a28b33b75dfca81 Mon Sep 17 00:00:00 2001 From: sotoba Date: Sun, 19 May 2024 13:51:52 +0900 Subject: [PATCH 283/333] Add via support for craftwalk (#23658) Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/craftwalk/keyboard.json | 8 ++-- keyboards/craftwalk/keymaps/via/keymap.c | 47 ++++++++++++++++++++++++ keyboards/craftwalk/keymaps/via/rules.mk | 2 + 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 keyboards/craftwalk/keymaps/via/keymap.c create mode 100644 keyboards/craftwalk/keymaps/via/rules.mk diff --git a/keyboards/craftwalk/keyboard.json b/keyboards/craftwalk/keyboard.json index e1cee6d56b9..0458c8f8c46 100644 --- a/keyboards/craftwalk/keyboard.json +++ b/keyboards/craftwalk/keyboard.json @@ -4,10 +4,13 @@ "url": "https://github.com/sotoba/craftwalk", "maintainer": "sotoba", "usb": { - "vid": "0xFEED", + "vid": "0x7364", "pid": "0x2E8F", "device_version": "0.0.1" }, + "bootmagic": { + "matrix": [1, 0] + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, @@ -40,8 +43,7 @@ "rows": ["F6", "B3", "B5"] }, "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "caterina", + "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/craftwalk/keymaps/via/keymap.c b/keyboards/craftwalk/keymaps/via/keymap.c new file mode 100644 index 00000000000..ceb01d1e2be --- /dev/null +++ b/keyboards/craftwalk/keymaps/via/keymap.c @@ -0,0 +1,47 @@ +/* Copyright 2020 sotoba + * + * 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 . + */ +#include QMK_KEYBOARD_H + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _NUM, + _ADJUST +}; + +#define MO_NUM MO(_NUM) +#define MO_ADJ MO(_ADJUST) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_BASE] = LAYOUT( + KC_Q, KC_W, KC_E, + KC_LCTL, KC_A, KC_S, KC_D, + KC_LSFT, MO_ADJ, KC_WH_U, KC_WH_D, KC_F, MO_NUM, KC_SPC + ), + /* Number */ + [_NUM] = LAYOUT( + KC_7, KC_8, KC_9, + KC_ESC, KC_4, KC_5, KC_6, + KC_TRNS, KC_1, KC_2, KC_3, KC_F3, KC_TRNS, KC_TRNS + ), + /* Adjust */ + [_ADJUST] = LAYOUT( + RGB_HUI, RGB_SAI, RGB_VAI, + QK_BOOT, RGB_HUD, RGB_SAD, RGB_VAD, + RGB_M_T, KC_TRNS, RGB_MOD, RGB_RMOD,RGB_TOG, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/craftwalk/keymaps/via/rules.mk b/keyboards/craftwalk/keymaps/via/rules.mk new file mode 100644 index 00000000000..36b7ba9cbc9 --- /dev/null +++ b/keyboards/craftwalk/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes From 2420487e55fb922e93fae846cee1a73244358019 Mon Sep 17 00:00:00 2001 From: blindassassin111 <38090555+blindassassin111@users.noreply.github.com> Date: Sun, 19 May 2024 00:19:32 -0500 Subject: [PATCH 284/333] [Keyboard] Adding TX_Roundup_Pad PCB (#23526) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre --- keyboards/viktus/tx_roundup_pad/info.json | 54 +++++++++++++++++++ .../tx_roundup_pad/keymaps/default/keymap.c | 28 ++++++++++ .../tx_roundup_pad/keymaps/via/keymap.c | 28 ++++++++++ .../tx_roundup_pad/keymaps/via/rules.mk | 1 + keyboards/viktus/tx_roundup_pad/readme.md | 27 ++++++++++ keyboards/viktus/tx_roundup_pad/rules.mk | 1 + 6 files changed, 139 insertions(+) create mode 100644 keyboards/viktus/tx_roundup_pad/info.json create mode 100644 keyboards/viktus/tx_roundup_pad/keymaps/default/keymap.c create mode 100644 keyboards/viktus/tx_roundup_pad/keymaps/via/keymap.c create mode 100644 keyboards/viktus/tx_roundup_pad/keymaps/via/rules.mk create mode 100644 keyboards/viktus/tx_roundup_pad/readme.md create mode 100644 keyboards/viktus/tx_roundup_pad/rules.mk diff --git a/keyboards/viktus/tx_roundup_pad/info.json b/keyboards/viktus/tx_roundup_pad/info.json new file mode 100644 index 00000000000..c4b013bb0ef --- /dev/null +++ b/keyboards/viktus/tx_roundup_pad/info.json @@ -0,0 +1,54 @@ +{ + "manufacturer": "Viktus Design LLC", + "keyboard_name": "TX Roundup Pad", + "maintainer": "BlindAssassin111", + "build": { + "lto": true + }, + "development_board": "promicro", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4"], + "rows": ["B5", "B4", "E6", "D7", "C6", "D4"] + }, + "url": "https://viktus.design", + "usb": { + "device_version": "1.0.0", + "pid": "0x5458", + "vid": "0x5644" + }, + "community_layouts": [ "numpad_6x4" ], + "layouts": { + "LAYOUT_numpad_6x4": { + "layout": [ + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "K11", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "K12", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "K13", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "K21", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, + {"label": "K23", "matrix": [2, 3], "x": 3, "y": 2, "h": 2}, + {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4}, + {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, + {"label": "K51", "matrix": [5, 1], "x": 0, "y": 5, "w": 2}, + {"label": "K52", "matrix": [5, 2], "x": 2, "y": 5}, + {"label": "K53", "matrix": [5, 3], "x": 3, "y": 4, "h": 2} + ] + } + } +} diff --git a/keyboards/viktus/tx_roundup_pad/keymaps/default/keymap.c b/keyboards/viktus/tx_roundup_pad/keymaps/default/keymap.c new file mode 100644 index 00000000000..50d4c092845 --- /dev/null +++ b/keyboards/viktus/tx_roundup_pad/keymaps/default/keymap.c @@ -0,0 +1,28 @@ +/* Copyright 2024 Viktus Design LLC + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_numpad_6x4( + KC_F1, KC_F2, KC_F3, KC_F4, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, + KC_P0, KC_PDOT, KC_PENT + ) +}; diff --git a/keyboards/viktus/tx_roundup_pad/keymaps/via/keymap.c b/keyboards/viktus/tx_roundup_pad/keymaps/via/keymap.c new file mode 100644 index 00000000000..50d4c092845 --- /dev/null +++ b/keyboards/viktus/tx_roundup_pad/keymaps/via/keymap.c @@ -0,0 +1,28 @@ +/* Copyright 2024 Viktus Design LLC + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_numpad_6x4( + KC_F1, KC_F2, KC_F3, KC_F4, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, + KC_P0, KC_PDOT, KC_PENT + ) +}; diff --git a/keyboards/viktus/tx_roundup_pad/keymaps/via/rules.mk b/keyboards/viktus/tx_roundup_pad/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/viktus/tx_roundup_pad/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/viktus/tx_roundup_pad/readme.md b/keyboards/viktus/tx_roundup_pad/readme.md new file mode 100644 index 00000000000..ab034ed8c5a --- /dev/null +++ b/keyboards/viktus/tx_roundup_pad/readme.md @@ -0,0 +1,27 @@ +# TX Roundup Pad + +![tx_roundup_pad](https://i.imgur.com/7O9CkPw.jpeg) + +The PCB badge for the April 27, 2024 Texas Roundup meet in Dallas, Tx. + +- Keyboard Maintainer: BlindAssassin111 +- Hardware Supported: TX Roundup Pad Badge PCB +- Hardware Availability: At meetup only + +Make example for this keyboard (after setting up your build environment): + + make viktus/tx_roundup_pad:default + +Flashing example for this keyboard: + + make viktus/tx_roundup_pad: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/viktus/tx_roundup_pad/rules.mk b/keyboards/viktus/tx_roundup_pad/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/viktus/tx_roundup_pad/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 93023511ab0f334bb0394d279b9175d46fe1b3c6 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 19 May 2024 15:23:24 +1000 Subject: [PATCH 285/333] macOS install script: remove `brew upgrade --ignore-pinned` (#23735) --- util/install/macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/install/macos.sh b/util/install/macos.sh index 8890c5a3f08..a1b79fe8683 100755 --- a/util/install/macos.sh +++ b/util/install/macos.sh @@ -9,7 +9,7 @@ _qmk_install_prepare() { return 1 fi - brew update && brew upgrade --formulae --ignore-pinned + brew update && brew upgrade --formulae } _qmk_install() { From 2fd56317763e8b3b73f0db7488ef42a70f5b946e Mon Sep 17 00:00:00 2001 From: gskygithub <106651989+gskygithub@users.noreply.github.com> Date: Sun, 19 May 2024 13:25:19 +0800 Subject: [PATCH 286/333] [Keyboard] Add Projectd 75 iso (#21942) Co-authored-by: Ryan Co-authored-by: gksygithub <106651989+gksygithub@users.noreply.github.com> --- keyboards/projectd/75/iso/config.h | 30 ++ keyboards/projectd/75/iso/halconf.h | 23 ++ keyboards/projectd/75/iso/info.json | 287 ++++++++++++++++++ keyboards/projectd/75/iso/iso.c | 206 +++++++++++++ keyboards/projectd/75/iso/iso.h | 27 ++ .../projectd/75/iso/keymaps/default/keymap.c | 46 +++ .../projectd/75/iso/keymaps/via/keymap.c | 46 +++ .../projectd/75/iso/keymaps/via/rules.mk | 1 + keyboards/projectd/75/iso/mcuconf.h | 25 ++ keyboards/projectd/75/iso/readme.md | 25 ++ keyboards/projectd/75/iso/rules.mk | 1 + 11 files changed, 717 insertions(+) create mode 100644 keyboards/projectd/75/iso/config.h create mode 100644 keyboards/projectd/75/iso/halconf.h create mode 100644 keyboards/projectd/75/iso/info.json create mode 100644 keyboards/projectd/75/iso/iso.c create mode 100644 keyboards/projectd/75/iso/iso.h create mode 100644 keyboards/projectd/75/iso/keymaps/default/keymap.c create mode 100644 keyboards/projectd/75/iso/keymaps/via/keymap.c create mode 100644 keyboards/projectd/75/iso/keymaps/via/rules.mk create mode 100644 keyboards/projectd/75/iso/mcuconf.h create mode 100644 keyboards/projectd/75/iso/readme.md create mode 100644 keyboards/projectd/75/iso/rules.mk diff --git a/keyboards/projectd/75/iso/config.h b/keyboards/projectd/75/iso/config.h new file mode 100644 index 00000000000..282e20a8e2b --- /dev/null +++ b/keyboards/projectd/75/iso/config.h @@ -0,0 +1,30 @@ +/* Copyright 2023 GSKY + * + * 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 + +/* External spi flash */ +#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14 + +/* SPI Config for LED Driver */ +#define SPI_DRIVER SPIDQ +#define SPI_SCK_PIN A5 +#define SPI_MOSI_PIN A7 +#define SPI_MISO_PIN A6 + +#define AW20216S_CS_PIN_1 A15 +#define AW20216S_CS_PIN_2 B15 +#define AW20216S_EN_PIN C13 diff --git a/keyboards/projectd/75/iso/halconf.h b/keyboards/projectd/75/iso/halconf.h new file mode 100644 index 00000000000..64a184eb924 --- /dev/null +++ b/keyboards/projectd/75/iso/halconf.h @@ -0,0 +1,23 @@ +/* Copyright (C) 2023 Westberry Technology (ChangZhou) Corp., 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 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 + +#define HAL_USE_SPI TRUE +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD + +#include_next diff --git a/keyboards/projectd/75/iso/info.json b/keyboards/projectd/75/iso/info.json new file mode 100644 index 00000000000..d8615000316 --- /dev/null +++ b/keyboards/projectd/75/iso/info.json @@ -0,0 +1,287 @@ +{ + "manufacturer": "ProjectD", + "keyboard_name": "ProjectD 75% ISO", + "maintainer": "Gsky", + "bootloader": "wb32-dfu", + "bootmagic": { + "matrix": [1, 3] + }, + "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 10 + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"] + }, + "processor": "WB32FQ95", + "qmk": { + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } + }, + "rgb_matrix": { + "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, + "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 + }, + "center_point": [78, 20], + "driver": "aw20216s", + "sleep": true, + "layout": [ + { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [2, 6], "x": 12.5, "y": 0 }, + { "flags": 4, "matrix": [3, 6], "x": 22.5, "y": 0 }, + { "flags": 4, "matrix": [3, 1], "x": 32.5, "y": 0 }, + { "flags": 4, "matrix": [3, 3], "x": 42.5, "y": 0 }, + { "flags": 4, "matrix": [0, 7], "x": 55, "y": 0 }, + { "flags": 4, "matrix": [6, 3], "x": 65, "y": 0 }, + { "flags": 4, "matrix": [7, 1], "x": 75, "y": 0 }, + { "flags": 4, "matrix": [7, 6], "x": 85, "y": 0 }, + { "flags": 4, "matrix": [10, 6], "x": 97.5, "y": 0 }, + { "flags": 4, "matrix": [10, 7], "x": 107.5, "y": 0 }, + { "flags": 4, "matrix": [10, 3], "x": 117.5, "y": 0 }, + { "flags": 4, "matrix": [10, 5], "x": 127.5, "y": 0 }, + { "flags": 4, "matrix": [9, 7], "x": 140, "y": 0 }, + { "flags": 4, "matrix": [6, 5], "x": 155, "y": 0 }, + + { "flags": 4, "matrix": [1, 6], "x": 0, "y": 12.5 }, + { "flags": 4, "matrix": [1, 7], "x": 10, "y": 12.5 }, + { "flags": 4, "matrix": [2, 7], "x": 20, "y": 12.5 }, + { "flags": 4, "matrix": [3, 7], "x": 30, "y": 12.5 }, + { "flags": 4, "matrix": [4, 7], "x": 40, "y": 12.5 }, + { "flags": 4, "matrix": [4, 6], "x": 50, "y": 12.5 }, + { "flags": 4, "matrix": [5, 6], "x": 60, "y": 12.5 }, + { "flags": 4, "matrix": [5, 7], "x": 70, "y": 12.5 }, + { "flags": 4, "matrix": [6, 7], "x": 80, "y": 12.5 }, + { "flags": 4, "matrix": [7, 7], "x": 90, "y": 12.5 }, + { "flags": 4, "matrix": [8, 7], "x": 100, "y": 12.5 }, + { "flags": 4, "matrix": [8, 6], "x": 110, "y": 12.5 }, + { "flags": 4, "matrix": [6, 6], "x": 120, "y": 12.5 }, + { "flags": 4, "matrix": [10, 1], "x": 130, "y": 12.5 }, + { "flags": 4, "matrix": [0, 2], "x": 155, "y": 12.5 }, + + { "flags": 4, "matrix": [1, 1], "x": 0, "y": 22.5 }, + { "flags": 4, "matrix": [1, 0], "x": 15, "y": 22.5 }, + { "flags": 4, "matrix": [2, 0], "x": 25, "y": 22.5 }, + { "flags": 4, "matrix": [3, 0], "x": 35, "y": 22.5 }, + { "flags": 4, "matrix": [4, 0], "x": 45, "y": 22.5 }, + { "flags": 4, "matrix": [4, 1], "x": 55, "y": 22.5 }, + { "flags": 4, "matrix": [5, 1], "x": 65, "y": 22.5 }, + { "flags": 4, "matrix": [5, 0], "x": 75, "y": 22.5 }, + { "flags": 4, "matrix": [6, 0], "x": 85, "y": 22.5 }, + { "flags": 4, "matrix": [7, 0], "x": 95, "y": 22.5 }, + { "flags": 4, "matrix": [8, 0], "x": 105, "y": 22.5 }, + { "flags": 4, "matrix": [8, 1], "x": 115, "y": 22.5 }, + { "flags": 4, "matrix": [6, 1], "x": 125, "y": 22.5 }, + { "flags": 4, "matrix": [1, 5], "x": 155.5, "y": 22.5 }, + + { "flags": 8, "matrix": [2, 1], "x": 0, "y": 32.5 }, + { "flags": 4, "matrix": [1, 2], "x": 17.5, "y": 32.5 }, + { "flags": 4, "matrix": [2, 2], "x": 27.5, "y": 32.5 }, + { "flags": 4, "matrix": [3, 2], "x": 37.5, "y": 32.5 }, + { "flags": 4, "matrix": [4, 2], "x": 47.5, "y": 32.5 }, + { "flags": 4, "matrix": [4, 3], "x": 57.5, "y": 32.5 }, + { "flags": 4, "matrix": [5, 3], "x": 67.5, "y": 32.5 }, + { "flags": 4, "matrix": [5, 2], "x": 77.5, "y": 32.5 }, + { "flags": 4, "matrix": [6, 2], "x": 87.5, "y": 32.5 }, + { "flags": 4, "matrix": [7, 2], "x": 97.5, "y": 32.5 }, + { "flags": 4, "matrix": [8, 2], "x": 107.5, "y": 32.5 }, + { "flags": 4, "matrix": [8, 3], "x": 117.5, "y": 32.5 }, + { "flags": 4, "matrix": [10, 2], "x": 127.5, "y": 32.5 }, + { "flags": 4, "matrix": [10, 4], "x": 137.5, "y": 22.5 }, + { "flags": 4, "matrix": [2, 5], "x": 155.5, "y": 32.5 }, + + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 42.5 }, + { "flags": 4, "matrix": [0, 1], "x": 12.5, "y": 42.5 }, + { "flags": 4, "matrix": [1, 4], "x": 22.5, "y": 42.5 }, + { "flags": 4, "matrix": [2, 4], "x": 32.5, "y": 42.5 }, + { "flags": 4, "matrix": [3, 4], "x": 42.5, "y": 42.5 }, + { "flags": 4, "matrix": [4, 4], "x": 52.5, "y": 42.5 }, + { "flags": 4, "matrix": [4, 5], "x": 62.5, "y": 42.5 }, + { "flags": 4, "matrix": [5, 5], "x": 72.5, "y": 42.5 }, + { "flags": 4, "matrix": [5, 4], "x": 82.5, "y": 42.5 }, + { "flags": 4, "matrix": [6, 4], "x": 92.5, "y": 42.5 }, + { "flags": 4, "matrix": [7, 4], "x": 102.5, "y": 42.5 }, + { "flags": 4, "matrix": [8, 5], "x": 112.5, "y": 42.5 }, + { "flags": 4, "matrix": [9, 1], "x": 122.5, "y": 42.5 }, + { "flags": 4, "matrix": [3, 5], "x": 142.5, "y": 45 }, + { "flags": 4, "matrix": [7, 5], "x": 155, "y": 42.5 }, + + { "flags": 4, "matrix": [0, 6], "x": 0, "y": 52.5 }, + { "flags": 4, "matrix": [9, 0], "x": 12.5, "y": 52.5 }, + { "flags": 4, "matrix": [9, 3], "x": 25, "y": 52.5 }, + { "flags": 4, "x": 61.5, "y": 52.5 }, + { "flags": 4, "x": 62.5, "y": 52.5 }, + { "flags": 4, "matrix": [9, 4], "x": 65, "y": 52.5 }, + { "flags": 4, "x": 67.5, "y": 52.5 }, + { "flags": 4, "x": 68.5, "y": 52.5 }, + { "flags": 4, "matrix": [9, 5], "x": 100, "y": 52.5 }, + { "flags": 4, "matrix": [9, 2], "x": 110, "y": 52.5 }, + { "flags": 4, "matrix": [0, 4], "x": 120, "y": 52.5 }, + { "flags": 4, "matrix": [0, 3], "x": 132.5, "y": 52.5 }, + { "flags": 4, "matrix": [7, 3], "x": 142.5, "y": 52.5 }, + { "flags": 4, "matrix": [0, 5], "x": 152.5, "y": 52.5 } + ] + }, + "url": "", + "usb": { + "device_version": "0.0.2", + "pid": "0x0011", + "vid": "0x3233" + }, + "eeprom": { + "driver": "wear_leveling", + "wear_leveling": { + "driver": "spi_flash", + "backing_size": 4096 + } + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix": [1, 3], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [2, 6], "x": 1.25, "y": 0 }, + { "label": "F2", "matrix": [3, 6], "x": 2.25, "y": 0 }, + { "label": "F3", "matrix": [3, 1], "x": 3.25, "y": 0 }, + { "label": "F4", "matrix": [3, 3], "x": 4.25, "y": 0 }, + { "label": "F5", "matrix": [0, 7], "x": 5.5, "y": 0 }, + { "label": "F6", "matrix": [6, 3], "x": 6.5, "y": 0 }, + { "label": "F7", "matrix": [7, 1], "x": 7.5, "y": 0 }, + { "label": "F8", "matrix": [7, 6], "x": 8.5, "y": 0 }, + { "label": "F9", "matrix": [10, 6], "x": 9.75, "y": 0 }, + { "label": "F10", "matrix": [10, 7], "x": 10.75, "y": 0 }, + { "label": "F11", "matrix": [10, 3], "x": 11.75, "y": 0 }, + { "label": "F12", "matrix": [10, 5], "x": 12.75, "y": 0 }, + { "label": "PrintScreen", "matrix": [9, 7], "x": 14, "y": 0 }, + { "label": "Delete", "matrix": [6, 5], "x": 15.5, "y": 0 }, + + { "label": "`", "matrix": [1, 6], "x": 0, "y": 1.25 }, + { "label": "1", "matrix": [1, 7], "x": 1, "y": 1.25 }, + { "label": "2", "matrix": [2, 7], "x": 2, "y": 1.25 }, + { "label": "3", "matrix": [3, 7], "x": 3, "y": 1.25 }, + { "label": "4", "matrix": [4, 7], "x": 4, "y": 1.25 }, + { "label": "5", "matrix": [4, 6], "x": 5, "y": 1.25 }, + { "label": "6", "matrix": [5, 6], "x": 6, "y": 1.25 }, + { "label": "7", "matrix": [5, 7], "x": 7, "y": 1.25 }, + { "label": "8", "matrix": [6, 7], "x": 8, "y": 1.25 }, + { "label": "9", "matrix": [7, 7], "x": 9, "y": 1.25 }, + { "label": "0", "matrix": [8, 7], "x": 10, "y": 1.25 }, + { "label": "-", "matrix": [8, 6], "x": 11, "y": 1.25 }, + { "label": "=", "matrix": [6, 6], "x": 12, "y": 1.25 }, + { "label": "Backspace", "matrix": [10, 1], "w": 2, "x": 13, "y": 1.25 }, + { "label": "Home", "matrix": [0, 2], "x": 15.5, "y": 1.25 }, + + { "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 2.25 }, + { "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 2.25 }, + { "label": "W", "matrix": [2, 0], "x": 2.5, "y": 2.25 }, + { "label": "E", "matrix": [3, 0], "x": 3.5, "y": 2.25 }, + { "label": "R", "matrix": [4, 0], "x": 4.5, "y": 2.25 }, + { "label": "T", "matrix": [4, 1], "x": 5.5, "y": 2.25 }, + { "label": "Y", "matrix": [5, 1], "x": 6.5, "y": 2.25 }, + { "label": "U", "matrix": [5, 0], "x": 7.5, "y": 2.25 }, + { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 2.25 }, + { "label": "O", "matrix": [7, 0], "x": 9.5, "y": 2.25 }, + { "label": "P", "matrix": [8, 0], "x": 10.5, "y": 2.25 }, + { "label": "[", "matrix": [8, 1], "x": 11.5, "y": 2.25 }, + { "label": "]", "matrix": [6, 1], "x": 12.5, "y": 2.25 }, + { "label": "PGUP", "matrix": [1, 5], "x": 15.5, "y": 2.25 }, + + { "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 3.25 }, + { "label": "A", "matrix": [1, 2], "x": 1.75, "y": 3.25 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 3.25 }, + { "label": "D", "matrix": [3, 2], "x": 3.75, "y": 3.25 }, + { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25 }, + { "label": "G", "matrix": [4, 3], "x": 5.75, "y": 3.25 }, + { "label": "H", "matrix": [5, 3], "x": 6.75, "y": 3.25 }, + { "label": "J", "matrix": [5, 2], "x": 7.75, "y": 3.25 }, + { "label": "K", "matrix": [6, 2], "x": 8.75, "y": 3.25 }, + { "label": "L", "matrix": [7, 2], "x": 9.75, "y": 3.25 }, + { "label": ";", "matrix": [8, 2], "x": 10.75, "y": 3.25 }, + { "label": "'", "matrix": [8, 3], "x": 11.75, "y": 3.25 }, + { "label": "|", "matrix": [10, 2], "x": 12.75, "y": 3.25 }, + { "label": "ENTER", "matrix": [10, 4], "w": 1.25, "h": 2, "x": 13.75, "y": 2.25 }, + { "label": "PGDN", "matrix": [2, 5], "x": 15.5, "y": 3.25 }, + + { "label": "L Shift", "matrix": [0, 0], "w": 1.25, "x": 0, "y": 4.25 }, + { "label": "|", "matrix": [0, 1], "x": 1.25, "y": 4.25 }, + { "label": "Z", "matrix": [1, 4], "x": 2.25, "y": 4.25 }, + { "label": "X", "matrix": [2, 4], "x": 3.25, "y": 4.25 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 4.25 }, + { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 }, + { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 }, + { "label": "N", "matrix": [5, 5], "x": 7.25, "y": 4.25 }, + { "label": "M", "matrix": [5, 4], "x": 8.25, "y": 4.25 }, + { "label": ",", "matrix": [6, 4], "x": 9.25, "y": 4.25 }, + { "label": ".", "matrix": [7, 4], "x": 10.25, "y": 4.25 }, + { "label": "/", "matrix": [8, 5], "x": 11.25, "y": 4.25 }, + { "label": "R Shift", "matrix": [9, 1], "w": 1.75, "x": 12.25, "y": 4.25 }, + { "label": "Up", "matrix": [3, 5], "x": 14.25, "y": 4.5 }, + { "label": "End", "matrix": [7, 5], "x": 15.5, "y": 4.25 }, + + { "label": "L Ctrl", "matrix": [0, 6], "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "L Win", "matrix": [9, 0], "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "L Alt", "matrix": [9, 3], "w": 1.25, "x": 2.5, "y": 5.25 }, + { "label": "Space", "matrix": [9, 4], "w": 6.25, "x": 3.75, "y": 5.25 }, + { "label": "R Alt", "matrix": [9, 5], "x": 10, "y": 5.25 }, + { "label": "FN", "matrix": [9, 2], "x": 11, "y": 5.25 }, + { "label": "R Ctrl", "matrix": [0, 4], "x": 12, "y": 5.25 }, + { "label": "Left", "matrix": [0, 3], "x": 13.25, "y": 5.5 }, + { "label": "Down", "matrix": [7, 3], "x": 14.25, "y": 5.5 }, + { "label": "Right", "matrix": [0, 5], "x": 15.25, "y": 5.5 } + ] + } + } +} diff --git a/keyboards/projectd/75/iso/iso.c b/keyboards/projectd/75/iso/iso.c new file mode 100644 index 00000000000..59544db359d --- /dev/null +++ b/keyboards/projectd/75/iso/iso.c @@ -0,0 +1,206 @@ +/* Copyright 2023 GSKY + * + * 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 . + */ + +#include "iso.h" + +#ifdef RGB_MATRIX_ENABLE + +const aw20216s_led_t g_aw20216s_leds[AW20216S_LED_COUNT] = { +/* Refer to IS31 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + //{0, CS1_SW4, CS2_SW4, CS3_SW4}, // 0, k00, Esc + + {0, SW1_CS1, SW1_CS2, SW1_CS3}, // Esc + {0, SW2_CS1, SW2_CS2, SW2_CS3}, // F1 + {0, SW3_CS1, SW3_CS2, SW3_CS3}, // F2 + {0, SW4_CS1, SW4_CS2, SW4_CS3}, // F3 + {0, SW5_CS1, SW5_CS2, SW5_CS3}, // F4 + {0, SW6_CS1, SW6_CS2, SW6_CS3}, // F5 + {0, SW7_CS1, SW7_CS2, SW7_CS3}, // F6 + {0, SW8_CS1, SW8_CS2, SW8_CS3}, // F7 + {0, SW9_CS1, SW9_CS2, SW9_CS3}, // F8 + {0, SW10_CS1, SW10_CS2, SW10_CS3}, // F9 + {0, SW11_CS1, SW11_CS2, SW11_CS3}, // F10 + {0, SW12_CS1, SW12_CS2, SW12_CS3}, // F11 + {1, SW1_CS1, SW1_CS2, SW1_CS3}, // F12 + {1, SW1_CS4, SW1_CS5, SW1_CS6}, // Printscreen + {1, SW3_CS4, SW3_CS5, SW3_CS6}, // Delete + + {0, SW1_CS4, SW1_CS5, SW1_CS6}, // ` + {0, SW2_CS4, SW2_CS5, SW2_CS6}, // 1 + {0, SW3_CS4, SW3_CS5, SW3_CS6}, // 2 + {0, SW4_CS4, SW4_CS5, SW4_CS6}, // 3 + {0, SW5_CS4, SW5_CS5, SW5_CS6}, // 4 + {0, SW6_CS4, SW6_CS5, SW6_CS6}, // 5 + {0, SW7_CS4, SW7_CS5, SW7_CS6}, // 6 + {0, SW8_CS4, SW8_CS5, SW8_CS6}, // 7 + {0, SW9_CS4, SW9_CS5, SW9_CS6}, // 8 + {0, SW10_CS4, SW10_CS5, SW10_CS6}, // 9 + {0, SW11_CS4, SW11_CS5, SW11_CS6}, // 0 + {0, SW12_CS4, SW12_CS5, SW12_CS6}, // - + {1, SW5_CS1, SW5_CS2, SW5_CS3}, // = + {1, SW7_CS1, SW7_CS2, SW7_CS3}, // Backspace + {1, SW5_CS4, SW5_CS5, SW5_CS6}, // Home + + {0, SW1_CS7, SW1_CS8, SW1_CS9}, // Tab + {0, SW2_CS7, SW2_CS8, SW2_CS9}, // Q + {0, SW3_CS7, SW3_CS8, SW3_CS9}, // W + {0, SW4_CS7, SW4_CS8, SW4_CS9}, // E + {0, SW5_CS7, SW5_CS8, SW5_CS9}, // R + {0, SW6_CS7, SW6_CS8, SW6_CS9}, // T + {0, SW7_CS7, SW7_CS8, SW7_CS9}, // Y + {0, SW8_CS7, SW8_CS8, SW8_CS9}, // U + {0, SW9_CS7, SW9_CS8, SW9_CS9}, // I + {0, SW10_CS7, SW10_CS8, SW10_CS9}, // O + {0, SW11_CS7, SW11_CS8, SW11_CS9}, // P + {0, SW12_CS7, SW12_CS8, SW12_CS9}, // [ + {1, SW8_CS1, SW8_CS2, SW8_CS3}, // ] + {1, SW4_CS4, SW4_CS5, SW4_CS6}, // PGUP + + {0, SW1_CS10, SW1_CS11, SW1_CS12}, // Caps Lock + {0, SW2_CS10, SW2_CS11, SW2_CS12}, // A + {0, SW3_CS10, SW3_CS11, SW3_CS12}, // S + {0, SW4_CS10, SW4_CS11, SW4_CS12}, // D + {0, SW5_CS10, SW5_CS11, SW5_CS12}, // F + {0, SW6_CS10, SW6_CS11, SW6_CS12}, // G + {0, SW7_CS10, SW7_CS11, SW7_CS12}, // H + {0, SW8_CS10, SW8_CS11, SW8_CS12}, // J + {0, SW9_CS10, SW9_CS11, SW9_CS12}, // K + {0, SW10_CS10, SW10_CS11, SW10_CS12}, // L + {0, SW11_CS10, SW11_CS11, SW11_CS12}, // ; + {0, SW12_CS10, SW12_CS11, SW12_CS12}, // ' + {1, SW9_CS1, SW9_CS2, SW9_CS3}, // || + {1, SW11_CS1, SW11_CS2, SW11_CS3}, // Enter + {1, SW7_CS4, SW7_CS5, SW7_CS6}, // PGDN + + {0, SW1_CS13, SW1_CS14, SW1_CS15}, // L Shift + {0, SW12_CS13, SW12_CS14, SW12_CS15}, // | + {0, SW2_CS13, SW2_CS14, SW2_CS15}, // Z + {0, SW3_CS13, SW3_CS14, SW3_CS15}, // X + {0, SW4_CS13, SW4_CS14, SW4_CS15}, // C + {0, SW5_CS13, SW5_CS14, SW5_CS15}, // V + {0, SW6_CS13, SW6_CS14, SW6_CS15}, // B + {0, SW7_CS13, SW7_CS14, SW7_CS15}, // N + {0, SW8_CS13, SW8_CS14, SW8_CS15}, // M + {0, SW9_CS13, SW9_CS14, SW9_CS15}, // , + {0, SW10_CS13, SW10_CS14, SW10_CS15}, // . + {0, SW11_CS13, SW11_CS14, SW11_CS15}, // "/"" + {1, SW8_CS4, SW8_CS5, SW8_CS6}, // R Shift + {1, SW9_CS4, SW9_CS5, SW9_CS6}, // Up + {1, SW6_CS4, SW6_CS5, SW6_CS6}, // END + + {0, SW1_CS16, SW1_CS17, SW1_CS18}, // L Ctrl + {0, SW2_CS16, SW2_CS17, SW2_CS18}, // L Win + {0, SW3_CS16, SW3_CS17, SW3_CS18}, // L Alt + {0, SW4_CS16, SW4_CS17, SW4_CS18}, // LED1 + {0, SW5_CS16, SW5_CS17, SW5_CS18}, // LED2 + {0, SW6_CS16, SW6_CS17, SW6_CS18}, // Space + {0, SW7_CS16, SW7_CS17, SW7_CS18}, // LED3 + {0, SW8_CS16, SW8_CS17, SW8_CS18}, // LED4 + {0, SW9_CS16, SW9_CS17, SW9_CS18}, // R Alt + {0, SW10_CS16, SW10_CS17, SW10_CS18}, // FN + {0, SW12_CS16, SW12_CS17, SW12_CS18}, // R Ctrl + + {1, SW10_CS4, SW10_CS5, SW10_CS6}, // Left + {1, SW11_CS4, SW11_CS5, SW11_CS6}, // Down + {1, SW5_CS10, SW5_CS11, SW5_CS12}, // Right +}; + +#endif + +#ifdef EEPROM_ENABLE + +#include "spi_master.h" + +void spi_init(void) { + static bool is_initialised = false; + if (!is_initialised) { + is_initialised = true; + + // Try releasing special pins for a short time + gpio_set_pin_input(SPI_SCK_PIN); + gpio_set_pin_input(SPI_MOSI_PIN); + gpio_set_pin_input(SPI_MISO_PIN); + + chThdSleepMilliseconds(10); + + palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST | PAL_WB32_CURRENT_LEVEL3); + palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST); + palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST); + } +} + +#endif +bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { + if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { + return false; + } + + if (host_keyboard_led_state().caps_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(44, 255, 255, 255); + } + + return false; +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + if (!process_record_user(keycode, record)) { + return false; + } + switch (keycode) { + + case RGB_R: + if (record->event.pressed) { + rgb_matrix_sethsv(0, 255, 255); + rgb_matrix_mode(1); + } + return false; /* Skip all further processing of this key */ + + case RGB_G: + if (record->event.pressed) { + rgb_matrix_sethsv(85, 255, 255); + rgb_matrix_mode(1); + } + return false; /* Skip all further processing of this key */ + + case RGB_B: + if (record->event.pressed) { + rgb_matrix_sethsv(170, 255, 255); + rgb_matrix_mode(1); + } + return false; /* Skip all further processing of this key */ + + case RGB_W: + if (record->event.pressed) { + rgb_matrix_sethsv(0, 0, 255); + rgb_matrix_mode(1); + } + return false; /* Skip all further processing of this key */ + + case SW_cy: + rgb_matrix_sethsv(0, 255, 255); + rgb_matrix_mode(13); + return false; /* Skip all further processing of this key */ + + + default: + return true; /* Process all other keycodes normally */ + } +}; diff --git a/keyboards/projectd/75/iso/iso.h b/keyboards/projectd/75/iso/iso.h new file mode 100644 index 00000000000..4e65d84ba74 --- /dev/null +++ b/keyboards/projectd/75/iso/iso.h @@ -0,0 +1,27 @@ +/* Copyright 2023 GSKY + * + * 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 + +#include "quantum.h" + +enum my_keycodes { + RGB_R = QK_KB, + RGB_G, + RGB_B, + RGB_W, + SW_cy, +}; diff --git a/keyboards/projectd/75/iso/keymaps/default/keymap.c b/keyboards/projectd/75/iso/keymaps/default/keymap.c new file mode 100644 index 00000000000..2f6e6cf3105 --- /dev/null +++ b/keyboards/projectd/75/iso/keymaps/default/keymap.c @@ -0,0 +1,46 @@ +/* Copyright 2023 GSKY + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap _BL: Base Layer (Default Layer) + */ +[0] = LAYOUT( + QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), +[1] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, _______, MO(2), _______, _______, RGB_SPD, RGB_VAD, RGB_SPI), +[2] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, RGB_R, RGB_G, RGB_B, RGB_W, SW_cy, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/projectd/75/iso/keymaps/via/keymap.c b/keyboards/projectd/75/iso/keymaps/via/keymap.c new file mode 100644 index 00000000000..2f6e6cf3105 --- /dev/null +++ b/keyboards/projectd/75/iso/keymaps/via/keymap.c @@ -0,0 +1,46 @@ +/* Copyright 2023 GSKY + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap _BL: Base Layer (Default Layer) + */ +[0] = LAYOUT( + QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), +[1] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, _______, MO(2), _______, _______, RGB_SPD, RGB_VAD, RGB_SPI), +[2] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, RGB_R, RGB_G, RGB_B, RGB_W, SW_cy, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/projectd/75/iso/keymaps/via/rules.mk b/keyboards/projectd/75/iso/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/projectd/75/iso/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/projectd/75/iso/mcuconf.h b/keyboards/projectd/75/iso/mcuconf.h new file mode 100644 index 00000000000..e4b8d1f9732 --- /dev/null +++ b/keyboards/projectd/75/iso/mcuconf.h @@ -0,0 +1,25 @@ +/* Copyright (C) 2023 Westberry Technology (ChangZhou) Corp., 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 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 + +#include_next + +#undef WB32_SPI_USE_QSPI +#define WB32_SPI_USE_QSPI TRUE + +#undef WB32_SPI_USE_SPIM2 +#define WB32_SPI_USE_SPIM2 TRUE diff --git a/keyboards/projectd/75/iso/readme.md b/keyboards/projectd/75/iso/readme.md new file mode 100644 index 00000000000..1b9f7f48975 --- /dev/null +++ b/keyboards/projectd/75/iso/readme.md @@ -0,0 +1,25 @@ +# ProjectD 75% ISO + +![ProjectD 75 ISO](https://imgur.com/pbGXTUd.png) + +A 75% keyboard with the WestBerry Q95 microcontroller integrated into PCB. + +* Keyboard Maintainer: [GSKY](https://github.com/gksygithub) +* Hardware Supported: ProjectD 75% ISO PCB +* Hardware Availability: [GSKY](https://github.com/gskygithub/projectd_75_iso) + +Make example for this keyboard (after setting up your build environment): + + make projectd/75/iso:default + +Flashing example for this keyboard: + + make projectd/75/iso:default:flash + +To reset the board into bootloader mode, do one of the following: + +* Hold the Reset switch mounted under the space key after the USB cable is connected +* Hold the Esc key while connecting the USB cable (also erases persistent settings) +* Fn+Alt+Tab will reset the board to bootloader mode + +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). diff --git a/keyboards/projectd/75/iso/rules.mk b/keyboards/projectd/75/iso/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/projectd/75/iso/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 48c0b601412513c83e31bd818c1ce2127682d567 Mon Sep 17 00:00:00 2001 From: Vertex-kb <102476474+Vertex-kb@users.noreply.github.com> Date: Sun, 19 May 2024 13:36:45 +0800 Subject: [PATCH 287/333] KB name change to Part.1-75-HS (#23403) --- keyboards/vertex/t75/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/vertex/t75/keyboard.json b/keyboards/vertex/t75/keyboard.json index 82f7b7a5e86..32e85cf8b41 100644 --- a/keyboards/vertex/t75/keyboard.json +++ b/keyboards/vertex/t75/keyboard.json @@ -1,6 +1,6 @@ { "manufacturer": "vertex", - "keyboard_name": "T75", + "keyboard_name": "Part.1-75-HS", "board": "STM32_F103_STM32DUINO", "bootloader": "stm32duino", "diode_direction": "ROW2COL", From 5fda3490187a7448176b7d37bf16c1cd1d80b736 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 20 May 2024 17:11:49 +1000 Subject: [PATCH 288/333] Remove RGB keycodes from boards with no RGB config (#23709) --- .../shark/alpha/keymaps/default/keymap.c | 2 +- .../acheron/shark/alpha/keymaps/via/keymap.c | 2 +- .../ext65/rev1/keymaps/default/keymap.c | 6 +-- .../aeboards/ext65/rev1/keymaps/via/keymap.c | 6 +-- .../ext65/rev3/keymaps/default/keymap.c | 6 +-- .../aeboards/ext65/rev3/keymaps/via/keymap.c | 6 +-- .../slice/rev1/keymaps/default_all/keymap.c | 18 ++++----- .../keymaps/default_split_backspace/keymap.c | 18 ++++----- .../basekeys/slice/rev1/keymaps/via/keymap.c | 24 ++++++------ .../piantor_pro/keymaps/default/keymap.c | 4 +- keyboards/boardsource/the_mark/keyboard.json | 3 +- .../ellipse/keymaps/default/keymap.c | 2 +- .../cannonkeys/ellipse/keymaps/via/keymap.c | 2 +- .../gentoo_hs/keymaps/default/keymap.c | 4 +- .../cannonkeys/gentoo_hs/keymaps/via/keymap.c | 4 +- .../leviatan/keymaps/default/keymap.c | 2 +- .../cannonkeys/leviatan/keymaps/iso/keymap.c | 2 +- .../leviatan/keymaps/tsangan/keymap.c | 2 +- .../cannonkeys/leviatan/keymaps/via/keymap.c | 2 +- .../moment/keymaps/default/keymap.c | 2 +- .../cannonkeys/moment/keymaps/via/keymap.c | 2 +- .../ortho48v2/keymaps/default/keymap.c | 2 +- .../cannonkeys/ortho48v2/keymaps/via/keymap.c | 2 +- .../ortho60v2/keymaps/default/keymap.c | 2 +- .../cannonkeys/ortho60v2/keymaps/via/keymap.c | 2 +- .../ripple_hs/keymaps/default/keymap.c | 2 +- .../cannonkeys/ripple_hs/keymaps/via/keymap.c | 2 +- .../vector/keymaps/default/keymap.c | 2 +- .../cu75/keymaps/default/keymap.c | 16 ++++---- .../capsunlocked/cu75/keymaps/iso/keymap.c | 16 ++++---- .../chlx/merro60/keymaps/default/keymap.c | 2 +- keyboards/chlx/merro60/keymaps/via/keymap.c | 2 +- .../66_hotswap/gen1/keymaps/66_ansi/keymap.c | 8 ++-- .../66_hotswap/gen1/keymaps/default/keymap.c | 6 +-- keyboards/contra/keymaps/default/keymap.c | 2 +- .../vaneelaex/keymaps/default/keymap.c | 2 +- .../delikeeb/vaneelaex/keymaps/via/keymap.c | 2 +- .../doro67/regular/keymaps/default/keymap.c | 2 +- .../dztech/dz96/keymaps/default/keymap.c | 2 +- keyboards/dztech/dz96/keymaps/iso/keymap.c | 2 +- keyboards/dztech/dz96/keymaps/via/keymap.c | 2 +- keyboards/edda/keymaps/default/keymap.c | 6 +-- .../fjlabs/bolsa65/keymaps/default/keymap.c | 4 +- keyboards/fjlabs/bolsa65/keymaps/via/keymap.c | 4 +- .../fjlabs/ldk65/keymaps/default/keymap.c | 4 +- keyboards/fjlabs/ldk65/keymaps/via/keymap.c | 4 +- .../fjlabs/midway60/keymaps/default/keymap.c | 2 +- .../fjlabs/midway60/keymaps/via/keymap.c | 2 +- .../fjlabs/sinanju/keymaps/default/keymap.c | 2 +- .../sinanju/keymaps/default_ansi_wkl/keymap.c | 2 +- keyboards/fjlabs/sinanju/keymaps/via/keymap.c | 2 +- .../fjlabs/sinanjuwk/keymaps/default/keymap.c | 2 +- .../fjlabs/sinanjuwk/keymaps/via/keymap.c | 2 +- .../gh60/revc/keymaps/default_abnt2/keymap.c | 2 +- keyboards/gh60/satan/keymaps/colemak/keymap.c | 8 ---- keyboards/giabalanai/keyboard.json | 3 +- .../handwired/hnah40/keymaps/default/keymap.c | 4 +- .../ortho_brass/keymaps/default/keymap.c | 2 +- .../pilcrow/keymaps/default/keymap.c | 2 +- .../riblee_split/keymaps/default/keymap.c | 2 +- .../split_5x7/keymaps/stef9998/keymap.c | 2 +- keyboards/hotdox/keymaps/default/keymap.c | 19 +++------- .../idank/sweeq/keymaps/default/keymap.json | 4 +- .../ergodox_infinity/keymaps/default/keymap.c | 17 ++------- .../kapcave/gskt00/keymaps/default/keymap.c | 2 +- .../maja_soldered/keymaps/default/keymap.c | 4 +- .../maja_soldered/keymaps/via/keymap.c | 4 +- .../kezewa/enter80/keymaps/default/keymap.c | 2 +- keyboards/kezewa/enter80/keymaps/via/keymap.c | 2 +- keyboards/kikoslab/kl90/keymaps/via/keymap.c | 4 +- .../pteron56/keymaps/via/keymap.c | 4 +- .../ktec/ergodone/keymaps/default/keymap.c | 8 ++-- keyboards/ktec/ergodone/keymaps/via/keymap.c | 8 ++-- .../palmetto/keymaps/default/keymap.c | 2 +- .../montsinger/palmetto/keymaps/via/keymap.c | 2 +- keyboards/neson_design/810e/keyboard.json | 3 +- .../810e/keymaps/default/keymap.c | 2 +- .../neson_design/810e/keymaps/via/keymap.c | 2 +- keyboards/p3d/glitch/glitch.c | 2 - .../titan65/soldered/keymaps/default/keymap.c | 4 +- .../titan65/soldered/keymaps/via/keymap.c | 4 +- keyboards/ploopyco/mouse/keyboard.json | 1 - .../vault45/keymaps/default/keymap.c | 2 +- keyboards/punk75/keymaps/default/keymap.c | 8 ++-- keyboards/punk75/keymaps/via/keymap.c | 8 ++-- keyboards/rart/rart75/keymaps/ansi/keymap.c | 2 +- .../rart/rart75/keymaps/default/keymap.c | 2 +- keyboards/rart/rart75/keymaps/via/keymap.c | 2 +- keyboards/reviung/reviung39/keyboard.json | 25 ++++++++++++- .../reviung39/keymaps/default/config.h | 37 ------------------- .../reviung39/keymaps/default/rules.mk | 1 - .../reviung39/keymaps/default_s/config.h | 21 +---------- .../reviung39/keymaps/default_s/rules.mk | 1 - .../reviung/reviung39/keymaps/via/keymap.c | 4 +- .../reviung/reviung39/keymaps/via/rules.mk | 1 - .../reviung61/keymaps/default/keymap.c | 2 +- keyboards/rgbkb/mun/rev1/keyboard.json | 3 +- keyboards/rgbkb/sol/rev1/keyboard.json | 1 - keyboards/rgbkb/sol/rev2/keyboard.json | 3 +- keyboards/rgbkb/sol3/rev1/keyboard.json | 3 +- keyboards/scatter42/keymaps/default/keymap.c | 2 +- keyboards/sirius/unigo66/keyboard.json | 1 - .../switchplate910/keymaps/default/keymap.c | 8 ++-- .../switchplate910/keymaps/via/keymap.c | 8 ++-- .../ergomirage/keymaps/default/keymap.c | 6 +-- .../ergomirage/keymaps/via/keymap.c | 6 +-- .../rev1/keymaps/default/keymap.c | 4 +- .../rev1/keymaps/default_big_space/keymap.c | 4 +- .../wekey/polaris/keymaps/default/keymap.c | 2 +- 109 files changed, 223 insertions(+), 302 deletions(-) delete mode 100644 keyboards/reviung/reviung39/keymaps/default/config.h delete mode 100644 keyboards/reviung/reviung39/keymaps/default/rules.mk delete mode 100644 keyboards/reviung/reviung39/keymaps/default_s/rules.mk diff --git a/keyboards/acheron/shark/alpha/keymaps/default/keymap.c b/keyboards/acheron/shark/alpha/keymaps/default/keymap.c index 7238d8b49e0..19161ebea42 100644 --- a/keyboards/acheron/shark/alpha/keymaps/default/keymap.c +++ b/keyboards/acheron/shark/alpha/keymaps/default/keymap.c @@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_ortho_4x12( _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_UP, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/acheron/shark/alpha/keymaps/via/keymap.c b/keyboards/acheron/shark/alpha/keymaps/via/keymap.c index 1f006a79222..77343b2e6da 100644 --- a/keyboards/acheron/shark/alpha/keymaps/via/keymap.c +++ b/keyboards/acheron/shark/alpha/keymaps/via/keymap.c @@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_ortho_4x12( _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_UP, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/aeboards/ext65/rev1/keymaps/default/keymap.c b/keyboards/aeboards/ext65/rev1/keymaps/default/keymap.c index e246b5c471d..1cbbbddce89 100644 --- a/keyboards/aeboards/ext65/rev1/keymaps/default/keymap.c +++ b/keyboards/aeboards/ext65/rev1/keymaps/default/keymap.c @@ -39,9 +39,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, - KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, - KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DB_TOGG, - KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DB_TOGG, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/aeboards/ext65/rev1/keymaps/via/keymap.c b/keyboards/aeboards/ext65/rev1/keymaps/via/keymap.c index e246b5c471d..1cbbbddce89 100644 --- a/keyboards/aeboards/ext65/rev1/keymaps/via/keymap.c +++ b/keyboards/aeboards/ext65/rev1/keymaps/via/keymap.c @@ -39,9 +39,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, - KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, - KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DB_TOGG, - KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DB_TOGG, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/aeboards/ext65/rev3/keymaps/default/keymap.c b/keyboards/aeboards/ext65/rev3/keymaps/default/keymap.c index ac6dd4dfede..56930cacc66 100644 --- a/keyboards/aeboards/ext65/rev3/keymaps/default/keymap.c +++ b/keyboards/aeboards/ext65/rev3/keymaps/default/keymap.c @@ -39,9 +39,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, - KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, - RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DB_TOGG, - KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DB_TOGG, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/aeboards/ext65/rev3/keymaps/via/keymap.c b/keyboards/aeboards/ext65/rev3/keymaps/via/keymap.c index ac6dd4dfede..56930cacc66 100644 --- a/keyboards/aeboards/ext65/rev3/keymaps/via/keymap.c +++ b/keyboards/aeboards/ext65/rev3/keymaps/via/keymap.c @@ -39,9 +39,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, - KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, - RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DB_TOGG, - KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DB_TOGG, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c index 548e0acf29d..4e224397e25 100644 --- a/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c +++ b/keyboards/basekeys/slice/rev1/keymaps/default_all/keymap.c @@ -27,22 +27,18 @@ enum layer_number { _ADJUST, }; -enum custom_keycodes { - RGB_RST = SAFE_RANGE -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_all( //,------------------------------------------------------------------------| |--------------------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + XXXXXXX, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + XXXXXXX, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, + XXXXXXX, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) + XXXXXXX, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |--------------------------------------------------------------------------------------' ), @@ -64,11 +60,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |--------------------------------------------------------------------------------------. XXXXXXX,TG(_ADJUST), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX //`------------------------------------------------------------------------| |--------------------------------------------------------------------------------------' diff --git a/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c index 6d99f5b74d9..22a3912938c 100644 --- a/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c +++ b/keyboards/basekeys/slice/rev1/keymaps/default_split_backspace/keymap.c @@ -27,22 +27,18 @@ enum layer_number { _ADJUST, }; -enum custom_keycodes { - RGB_RST = SAFE_RANGE -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_split_backspace( //,------------------------------------------------------------------------| |---------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + XXXXXXX, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + XXXXXXX, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, + XXXXXXX, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) + XXXXXXX, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |---------------------------------------------------------------------------' ), @@ -64,11 +60,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-------------------------------------------------------------------------| |---------------------------------------------------------------------------. XXXXXXX, TG(_ADJUST), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, //|-------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|-------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|-------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|-------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------| XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX //`-------------------------------------------------------------------------| |---------------------------------------------------------------------------' diff --git a/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c index 53bf2fae0b1..e4fbf1fcf7f 100644 --- a/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c +++ b/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c @@ -31,13 +31,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |--------------------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + XXXXXXX, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + XXXXXXX, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, + XXXXXXX, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) + XXXXXXX, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |--------------------------------------------------------------------------------------' ), @@ -59,13 +59,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |--------------------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + XXXXXXX, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + XXXXXXX, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, + XXXXXXX, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) + XXXXXXX, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |--------------------------------------------------------------------------------------' ), @@ -73,13 +73,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,------------------------------------------------------------------------| |--------------------------------------------------------------------------------------. KC_ESC, KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_BSPC, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + XXXXXXX, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_M_G, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + XXXXXXX, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_M_X, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, + XXXXXXX, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT, //|------------------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------+----------+----------| - RGB_TOG, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) + XXXXXXX, KC_LCTL, KC_LALT, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, MO(_FN) //`------------------------------------------------------------------------| |--------------------------------------------------------------------------------------' ) }; diff --git a/keyboards/beekeeb/piantor_pro/keymaps/default/keymap.c b/keyboards/beekeeb/piantor_pro/keymaps/default/keymap.c index ed09dd7d069..300597ddb55 100644 --- a/keyboards/beekeeb/piantor_pro/keymaps/default/keymap.c +++ b/keyboards/beekeeb/piantor_pro/keymaps/default/keymap.c @@ -45,9 +45,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------------------. ,-----------------------------------------------------. QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT //`--------------------------' `--------------------------' diff --git a/keyboards/boardsource/the_mark/keyboard.json b/keyboards/boardsource/the_mark/keyboard.json index 8dc08e4fc45..69c5f681eb5 100644 --- a/keyboards/boardsource/the_mark/keyboard.json +++ b/keyboards/boardsource/the_mark/keyboard.json @@ -8,8 +8,7 @@ "bootmagic": true, "extrakey": true, "mousekey": true, - "rgblight": true, - "rgb_matrix": false + "rgblight": true }, "matrix_pins": { "cols": ["B5", "B6", "B7", "F5", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4"], diff --git a/keyboards/cannonkeys/ellipse/keymaps/default/keymap.c b/keyboards/cannonkeys/ellipse/keymaps/default/keymap.c index 646a0769c38..f1b692131f9 100644 --- a/keyboards/cannonkeys/ellipse/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/ellipse/keymaps/default/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, - RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN,BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT diff --git a/keyboards/cannonkeys/ellipse/keymaps/via/keymap.c b/keyboards/cannonkeys/ellipse/keymaps/via/keymap.c index 4d32b2bd1e3..ea45b14a615 100644 --- a/keyboards/cannonkeys/ellipse/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/ellipse/keymaps/via/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, - RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN,BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT diff --git a/keyboards/cannonkeys/gentoo_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/gentoo_hs/keymaps/default/keymap.c index 2d614d1801b..07222de58ad 100644 --- a/keyboards/cannonkeys/gentoo_hs/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/gentoo_hs/keymaps/default/keymap.c @@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT_65_ansi_rwkl( - QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, RGB_TOG, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, + QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_UP, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS diff --git a/keyboards/cannonkeys/gentoo_hs/keymaps/via/keymap.c b/keyboards/cannonkeys/gentoo_hs/keymaps/via/keymap.c index 5df21f66c59..a1817427ab7 100644 --- a/keyboards/cannonkeys/gentoo_hs/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/gentoo_hs/keymaps/via/keymap.c @@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT_65_ansi_rwkl( - QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, RGB_TOG, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, + QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_UP, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS diff --git a/keyboards/cannonkeys/leviatan/keymaps/default/keymap.c b/keyboards/cannonkeys/leviatan/keymaps/default/keymap.c index 317eeab093d..63a2f3bc007 100644 --- a/keyboards/cannonkeys/leviatan/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/leviatan/keymaps/default/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_60_ansi( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV, _______, _______, _______, _______, _______, _______, QK_BOOT diff --git a/keyboards/cannonkeys/leviatan/keymaps/iso/keymap.c b/keyboards/cannonkeys/leviatan/keymaps/iso/keymap.c index a0cacca0f5c..75ed5d80e59 100644 --- a/keyboards/cannonkeys/leviatan/keymaps/iso/keymap.c +++ b/keyboards/cannonkeys/leviatan/keymaps/iso/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_60_iso( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_UP, _______, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV, _______, _______, _______, _______, _______, _______, QK_BOOT diff --git a/keyboards/cannonkeys/leviatan/keymaps/tsangan/keymap.c b/keyboards/cannonkeys/leviatan/keymaps/tsangan/keymap.c index d280f72d1ec..c735160c3d6 100644 --- a/keyboards/cannonkeys/leviatan/keymaps/tsangan/keymap.c +++ b/keyboards/cannonkeys/leviatan/keymaps/tsangan/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_60_tsangan_hhkb( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, - RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT diff --git a/keyboards/cannonkeys/leviatan/keymaps/via/keymap.c b/keyboards/cannonkeys/leviatan/keymaps/via/keymap.c index b3b684cf198..056634dab4d 100644 --- a/keyboards/cannonkeys/leviatan/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/leviatan/keymaps/via/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, - RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT diff --git a/keyboards/cannonkeys/moment/keymaps/default/keymap.c b/keyboards/cannonkeys/moment/keymaps/default/keymap.c index e81469c48f4..a72db1eda1a 100644 --- a/keyboards/cannonkeys/moment/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/moment/keymaps/default/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, - RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT diff --git a/keyboards/cannonkeys/moment/keymaps/via/keymap.c b/keyboards/cannonkeys/moment/keymaps/via/keymap.c index e81469c48f4..a72db1eda1a 100644 --- a/keyboards/cannonkeys/moment/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/moment/keymaps/via/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, - RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT diff --git a/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c b/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c index 1c2f38355eb..7bfc7a5cf07 100644 --- a/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c @@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, - RGB_TOG, RGB_MOD, BL_UP , BL_DOWN, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + _______, _______, BL_UP , BL_DOWN, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), }; diff --git a/keyboards/cannonkeys/ortho48v2/keymaps/via/keymap.c b/keyboards/cannonkeys/ortho48v2/keymaps/via/keymap.c index c0a823f9f8f..1776d294afb 100644 --- a/keyboards/cannonkeys/ortho48v2/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/ortho48v2/keymaps/via/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, - RGB_TOG, RGB_MOD, BL_UP , BL_DOWN, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + _______, _______, BL_UP , BL_DOWN, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [3] = LAYOUT_ortho_4x12( diff --git a/keyboards/cannonkeys/ortho60v2/keymaps/default/keymap.c b/keyboards/cannonkeys/ortho60v2/keymaps/default/keymap.c index 9b9f11ab052..30876d111cd 100644 --- a/keyboards/cannonkeys/ortho60v2/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/ortho60v2/keymaps/default/keymap.c @@ -94,6 +94,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, - RGB_TOG, RGB_MOD, BL_UP, BL_DOWN, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + _______, _______, BL_UP, BL_DOWN, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ) }; diff --git a/keyboards/cannonkeys/ortho60v2/keymaps/via/keymap.c b/keyboards/cannonkeys/ortho60v2/keymaps/via/keymap.c index a5d88980dcd..37a0f8794f3 100644 --- a/keyboards/cannonkeys/ortho60v2/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/ortho60v2/keymaps/via/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, - RGB_TOG, RGB_MOD, BL_UP, BL_DOWN, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + _______, _______, BL_UP, BL_DOWN, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), [3] = LAYOUT_ortho_5x12( diff --git a/keyboards/cannonkeys/ripple_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/ripple_hs/keymaps/default/keymap.c index d7d05641193..9e0ef1b6c51 100644 --- a/keyboards/cannonkeys/ripple_hs/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/ripple_hs/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [_FN1] = LAYOUT_tkl_f13_ansi_tsangan( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/cannonkeys/ripple_hs/keymaps/via/keymap.c b/keyboards/cannonkeys/ripple_hs/keymaps/via/keymap.c index d4b94f0defa..fd80ec93d68 100644 --- a/keyboards/cannonkeys/ripple_hs/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/ripple_hs/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [_FN1] = LAYOUT_tkl_f13_ansi_tsangan( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/cannonkeys/vector/keymaps/default/keymap.c b/keyboards/cannonkeys/vector/keymaps/default/keymap.c index a4ce417ac49..26a69ba35da 100644 --- a/keyboards/cannonkeys/vector/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/vector/keymaps/default/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, - RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT diff --git a/keyboards/capsunlocked/cu75/keymaps/default/keymap.c b/keyboards/capsunlocked/cu75/keymaps/default/keymap.c index 2afc7399e8f..268cce036fd 100644 --- a/keyboards/capsunlocked/cu75/keymaps/default/keymap.c +++ b/keyboards/capsunlocked/cu75/keymaps/default/keymap.c @@ -39,21 +39,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |-------------------------------------------------------------------| * | | | | | | | | | | | | | | | | * |-------------------------------------------------------------------| - * | | | | | | | | | | | | | | | RGB_TOG| + * | | | | | | | | | | | | | | | | * |-------------------------------------------------------------------| - * | | | | | | | | | | | | |QK_BOOT |RGB_MODE| + * | | | | | | | | | | | | |QK_BOOT | | * |-------------------------------------------------------------------| - * | | | | | | | | | |VAD|VAI| |RGB_HUI| | + * | | | | | | | | | | | | | | | * |-------------------------------------------------------------------| - * | | | | | | | |RGB_SAD|RGB_HUD|RGB_SAI| + * | | | | | | | | | | | * `-------------------------------------------------------------------' */ [FUNC] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, RGB_MOD, - _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/capsunlocked/cu75/keymaps/iso/keymap.c b/keyboards/capsunlocked/cu75/keymaps/iso/keymap.c index 95f742db4b3..479ec6f58ed 100644 --- a/keyboards/capsunlocked/cu75/keymaps/iso/keymap.c +++ b/keyboards/capsunlocked/cu75/keymaps/iso/keymap.c @@ -38,21 +38,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | | | | | | | | | | | | | * |---------------------------------------------------------------| - * | | | | | | | | | | | | | | |TOG| + * | | | | | | | | | | | | | | | | * |------------------------------------------------------. |---| - * | | | | | | | | | | | | |RST| |MOD| + * | | | | | | | | | | | | |RST| | | * |---------------------------------------------------------------| - * | | | | | | | | | |VAD|VAI| | |HUI| | + * | | | | | | | | | | | | | | | | * |---------------------------------------------------------------| - * | | | | | | | |SAD|HUD|SAI| + * | | | | | | | | | | | * `---------------------------------------------------------------' */ [FUNC] = LAYOUT_iso( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, RGB_MOD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/chlx/merro60/keymaps/default/keymap.c b/keyboards/chlx/merro60/keymaps/default/keymap.c index 9d9c34d9197..ca673bbb744 100644 --- a/keyboards/chlx/merro60/keymaps/default/keymap.c +++ b/keyboards/chlx/merro60/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), diff --git a/keyboards/chlx/merro60/keymaps/via/keymap.c b/keyboards/chlx/merro60/keymaps/via/keymap.c index 5459a2558a3..5abec5736c8 100644 --- a/keyboards/chlx/merro60/keymaps/via/keymap.c +++ b/keyboards/chlx/merro60/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c index 4dcc09c913f..a5a7adfefbd 100644 --- a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c +++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c @@ -44,9 +44,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _CL: Control layer */ [_CL] = LAYOUT_66_ansi( - LM_NEXT,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI, - _______,_______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, + LM_NEXT,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, LM_TOGG, LM_BRIU, + _______,_______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______, LM_BRID, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, - _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, - _______,_______,_______, RGB_MOD, _______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), + _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, + _______,_______,_______, LM_NEXT, _______,MO(_FL),_______,_______,_______,_______), }; diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c index 507aa80f7ce..2d0873ccc02 100644 --- a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c +++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c @@ -68,11 +68,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _CL: Control layer */ [_CL] = LAYOUT( - LM_NEXT,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, LM_TOGG, LM_BRIU, + LM_NEXT,S_ONEUP,S_SCALE,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, LM_TOGG, LM_BRIU, _______,_______,_______,_______,QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______, LM_BRID, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, - _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, - _______,_______,_______, _______,_______, _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), + _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, + _______,_______,_______, _______,_______, _______,_______,MO(_FL),_______,_______,_______,_______), }; diff --git a/keyboards/contra/keymaps/default/keymap.c b/keyboards/contra/keymaps/default/keymap.c index e8e967b0d6c..29f98033d61 100644 --- a/keyboards/contra/keymaps/default/keymap.c +++ b/keyboards/contra/keymaps/default/keymap.c @@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_planck_mit( - _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , + _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , _______, _______, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______, _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/delikeeb/vaneelaex/keymaps/default/keymap.c b/keyboards/delikeeb/vaneelaex/keymaps/default/keymap.c index f6a08015eb0..3c7d3b9a581 100644 --- a/keyboards/delikeeb/vaneelaex/keymaps/default/keymap.c +++ b/keyboards/delikeeb/vaneelaex/keymaps/default/keymap.c @@ -94,7 +94,7 @@ KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_DOT, _______, KC_0, _______, ____ * `---------------------------------------------------------------------------------------------------------------' */ [_FN] = LAYOUT_ss_6x12( -KC_KP_EQUAL, KC_7, KC_8, KC_9, QK_BOOT , RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAI, RGB_VAD, RGB_SAI, RGB_SAD, _______, _______, _______, KC_DEL, +KC_KP_EQUAL, KC_7, KC_8, KC_9, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_KP_MINUS, KC_4, KC_5, KC_6, _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, KC_KP_PLUS, KC_1, KC_2, KC_3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_DOT, KC_0, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c b/keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c index a126bc65b72..6dcb93a07eb 100644 --- a/keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c +++ b/keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c @@ -95,7 +95,7 @@ KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_DOT, _______, KC_0, _______, ____ * `---------------------------------------------------------------------------------------------------------------' */ [_FN] = LAYOUT_ss_6x12( -KC_KP_EQUAL, KC_7, KC_8, KC_9, QK_BOOT , RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAI, RGB_VAD, RGB_SAI, RGB_SAD, _______, _______, _______, KC_DEL, +KC_KP_EQUAL, KC_7, KC_8, KC_9, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_KP_MINUS, KC_4, KC_5, KC_6, _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, KC_KP_PLUS, KC_1, KC_2, KC_3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_DOT, KC_0, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/doro67/regular/keymaps/default/keymap.c b/keyboards/doro67/regular/keymaps/default/keymap.c index a86075c616d..8b45f736cbe 100644 --- a/keyboards/doro67/regular/keymaps/default/keymap.c +++ b/keyboards/doro67/regular/keymaps/default/keymap.c @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/dztech/dz96/keymaps/default/keymap.c b/keyboards/dztech/dz96/keymaps/default/keymap.c index 16d79d5a564..88680c80aae 100644 --- a/keyboards/dztech/dz96/keymaps/default/keymap.c +++ b/keyboards/dztech/dz96/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_default( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, - _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, BL_TOGG, BL_UP, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/dztech/dz96/keymaps/iso/keymap.c b/keyboards/dztech/dz96/keymaps/iso/keymap.c index fe6218a3236..b61455932fb 100644 --- a/keyboards/dztech/dz96/keymaps/iso/keymap.c +++ b/keyboards/dztech/dz96/keymaps/iso/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_iso( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, - _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, BL_TOGG, BL_UP, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/dztech/dz96/keymaps/via/keymap.c b/keyboards/dztech/dz96/keymaps/via/keymap.c index 4a357efd1a4..f265d35c304 100644 --- a/keyboards/dztech/dz96/keymaps/via/keymap.c +++ b/keyboards/dztech/dz96/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_default( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_HOME, KC_END, - _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, BL_TOGG, BL_UP, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/edda/keymaps/default/keymap.c b/keyboards/edda/keymaps/default/keymap.c index 79c55717802..07993d19b51 100644 --- a/keyboards/edda/keymaps/default/keymap.c +++ b/keyboards/edda/keymaps/default/keymap.c @@ -31,9 +31,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT_alice_split_bs( - RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, - RGB_MOD, _______, _______, KC_UP, _______, _______, _______, RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______, - RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______, _______, + _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, + _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN, BL_TOGG, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT ) diff --git a/keyboards/fjlabs/bolsa65/keymaps/default/keymap.c b/keyboards/fjlabs/bolsa65/keymaps/default/keymap.c index d36898e0c61..5e8350ad313 100644 --- a/keyboards/fjlabs/bolsa65/keymaps/default/keymap.c +++ b/keyboards/fjlabs/bolsa65/keymaps/default/keymap.c @@ -31,8 +31,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_65_ansi_blocker( 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_F12, KC_TRNS, TG(1), - KC_TRNS, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_SPI, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) diff --git a/keyboards/fjlabs/bolsa65/keymaps/via/keymap.c b/keyboards/fjlabs/bolsa65/keymaps/via/keymap.c index 0db9e52210a..6e55141cff7 100644 --- a/keyboards/fjlabs/bolsa65/keymaps/via/keymap.c +++ b/keyboards/fjlabs/bolsa65/keymaps/via/keymap.c @@ -33,8 +33,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_65_ansi_blocker( 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_F12, KC_TRNS, TG(1), - KC_TRNS, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_SPI, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/fjlabs/ldk65/keymaps/default/keymap.c b/keyboards/fjlabs/ldk65/keymaps/default/keymap.c index 17090ae052e..1d4f47e62a7 100644 --- a/keyboards/fjlabs/ldk65/keymaps/default/keymap.c +++ b/keyboards/fjlabs/ldk65/keymaps/default/keymap.c @@ -31,8 +31,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_65_ansi( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP, - KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK ) diff --git a/keyboards/fjlabs/ldk65/keymaps/via/keymap.c b/keyboards/fjlabs/ldk65/keymaps/via/keymap.c index 55a217d9090..ae4e8931611 100644 --- a/keyboards/fjlabs/ldk65/keymaps/via/keymap.c +++ b/keyboards/fjlabs/ldk65/keymaps/via/keymap.c @@ -33,8 +33,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_65_ansi( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP, - KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK ), diff --git a/keyboards/fjlabs/midway60/keymaps/default/keymap.c b/keyboards/fjlabs/midway60/keymaps/default/keymap.c index e1c921c4191..8f42ce31319 100644 --- a/keyboards/fjlabs/midway60/keymaps/default/keymap.c +++ b/keyboards/fjlabs/midway60/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/fjlabs/midway60/keymaps/via/keymap.c b/keyboards/fjlabs/midway60/keymaps/via/keymap.c index 31f21f09081..2860c0cdad0 100644 --- a/keyboards/fjlabs/midway60/keymaps/via/keymap.c +++ b/keyboards/fjlabs/midway60/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_all( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/fjlabs/sinanju/keymaps/default/keymap.c b/keyboards/fjlabs/sinanju/keymaps/default/keymap.c index b82b513b1ed..0107383011a 100644 --- a/keyboards/fjlabs/sinanju/keymaps/default/keymap.c +++ b/keyboards/fjlabs/sinanju/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_60_ansi_wkl_split_bs_rshift( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/fjlabs/sinanju/keymaps/default_ansi_wkl/keymap.c b/keyboards/fjlabs/sinanju/keymaps/default_ansi_wkl/keymap.c index 5035004e2f6..15ab2b37702 100644 --- a/keyboards/fjlabs/sinanju/keymaps/default_ansi_wkl/keymap.c +++ b/keyboards/fjlabs/sinanju/keymaps/default_ansi_wkl/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_60_ansi_wkl( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/fjlabs/sinanju/keymaps/via/keymap.c b/keyboards/fjlabs/sinanju/keymaps/via/keymap.c index dc910d93f15..33ea65b440d 100644 --- a/keyboards/fjlabs/sinanju/keymaps/via/keymap.c +++ b/keyboards/fjlabs/sinanju/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_60_ansi_wkl_split_bs_rshift( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c b/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c index 1bfbfead427..cb0a01ca538 100644 --- a/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c +++ b/keyboards/fjlabs/sinanjuwk/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_60_ansi_split_bs_rshift( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c b/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c index d1635acc544..7081b24c054 100644 --- a/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c +++ b/keyboards/fjlabs/sinanjuwk/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER1] = LAYOUT_60_ansi_split_bs_rshift( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c b/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c index fc6075f3379..d69402c841b 100644 --- a/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c +++ b/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FL] = LAYOUT_60_abnt2( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LCTL, KC_LGUI, KC_LGUI, XXXXXXX, KC_RALT, KC_RGUI, _______, KC_RCTL), diff --git a/keyboards/gh60/satan/keymaps/colemak/keymap.c b/keyboards/gh60/satan/keymaps/colemak/keymap.c index 0fc195fe6c6..93dba80fc30 100644 --- a/keyboards/gh60/satan/keymaps/colemak/keymap.c +++ b/keyboards/gh60/satan/keymaps/colemak/keymap.c @@ -51,19 +51,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------' */ [_FL] = LAYOUT_60_ansi( - #ifdef RGBLIGHT_ENABLE - KC_GRV, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT, - _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DOWN,BL_UP, BL_TOGG, - _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, - _______,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______,_______, - _______,_______,_______, _______, _______,_______,_______, _______ - #else KC_GRV, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT, _______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,KC_HOME,KC_PGDN,KC_PGUP, KC_END, BL_DOWN,BL_UP, BL_TOGG, KC_DEL, KC_VOLD,KC_MUTE,KC_VOLU,_______,_______,_______,KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______, _______,_______,_______,_______ - #endif ), }; diff --git a/keyboards/giabalanai/keyboard.json b/keyboards/giabalanai/keyboard.json index ae5787cec6e..6cadf023281 100644 --- a/keyboards/giabalanai/keyboard.json +++ b/keyboards/giabalanai/keyboard.json @@ -38,8 +38,7 @@ "mousekey": false, "nkro": false, "command": false, - "backlight": false, - "rgb_matrix": false + "backlight": false }, "build": { "lto": true diff --git a/keyboards/handwired/hnah40/keymaps/default/keymap.c b/keyboards/handwired/hnah40/keymaps/default/keymap.c index ecea89280cd..9842e7408d3 100644 --- a/keyboards/handwired/hnah40/keymaps/default/keymap.c +++ b/keyboards/handwired/hnah40/keymaps/default/keymap.c @@ -40,8 +40,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_SPACE, KC_APP, KC_TRNS, KC_RCTL ), [_RAISE] = LAYOUT( /* Base */ - QK_BOOT, KC_1, KC_UP, RGB_TOG, RGB_MOD, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, - KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT , RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_ENT, + QK_BOOT, KC_1, KC_UP, KC_TRNS, KC_TRNS, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPACE, KC_SPACE, KC_LEFT, KC_DOWN, KC_RGHT ), diff --git a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c index 4101bb7b02d..d5ab0ba3985 100644 --- a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c +++ b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c @@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12_1x2uC( - _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , + _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , _______, _______, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______, _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/handwired/pilcrow/keymaps/default/keymap.c b/keyboards/handwired/pilcrow/keymaps/default/keymap.c index 34b75c417a7..8882fdb3ea5 100644 --- a/keyboards/handwired/pilcrow/keymaps/default/keymap.c +++ b/keyboards/handwired/pilcrow/keymaps/default/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT( QK_BOOT, KC_UP, _______, _______, _______, _______, _______, KC_WH_D, KC_MS_U, KC_WH_U, KC_LEFT, KC_DOWN, KC_RGHT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, KC_MS_L, KC_MS_D, KC_MS_R, - RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______ ) }; diff --git a/keyboards/handwired/riblee_split/keymaps/default/keymap.c b/keyboards/handwired/riblee_split/keymaps/default/keymap.c index f954599c90e..9bcb8134ec5 100644 --- a/keyboards/handwired/riblee_split/keymaps/default/keymap.c +++ b/keyboards/handwired/riblee_split/keymaps/default/keymap.c @@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT_ortho_5x12( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c index 833a245c543..ce807018d93 100644 --- a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c +++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c @@ -160,7 +160,7 @@ _______ ,_______ ,RALT_T(KC_S),LCTL_T(KC_D),LSFT_T(KC_F),LT(_SYM,KC_G),_______ , // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐ XXXXXXX ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,XXXXXXX , XXXXXXX ,KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,XXXXXXX , // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - XXXXXXX ,QK_BOOT ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI , RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX , + XXXXXXX ,QK_BOOT ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ diff --git a/keyboards/hotdox/keymaps/default/keymap.c b/keyboards/hotdox/keymaps/default/keymap.c index 5a52c055868..45e81b7fcf1 100644 --- a/keyboards/hotdox/keymaps/default/keymap.c +++ b/keyboards/hotdox/keymaps/default/keymap.c @@ -6,8 +6,7 @@ #define MDIA 2 // media keys enum custom_keycodes { - VRSN = SAFE_RANGE, - RGB_SLD + VRSN = SAFE_RANGE }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -83,18 +82,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, EE_CLR, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, - RGB_MOD,KC_TRNS, + KC_TRNS,KC_TRNS, KC_TRNS, - RGB_VAD,RGB_VAI,KC_TRNS, + KC_TRNS,KC_TRNS,KC_TRNS, // right hand KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS, - RGB_TOG, RGB_SLD, + KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_HUD, RGB_HUI + KC_TRNS, KC_TRNS, KC_TRNS ), /* Keymap 2: Media and mouse keys * @@ -148,14 +147,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; - case RGB_SLD: - if (record->event.pressed) { - #ifdef RGBLIGHT_ENABLE - rgblight_mode(1); - #endif - } - return false; - break; } return true; } diff --git a/keyboards/idank/sweeq/keymaps/default/keymap.json b/keyboards/idank/sweeq/keymaps/default/keymap.json index a7845f6e238..efd87277c7f 100644 --- a/keyboards/idank/sweeq/keymaps/default/keymap.json +++ b/keyboards/idank/sweeq/keymaps/default/keymap.json @@ -51,8 +51,8 @@ "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS", "KC_TRNS" , "KC_MINS" , "KC_BSLS" , "KC_GRV" , "KC_TRNS", - "RGB_RMOD" , "KC_TRNS", - "KC_TRNS" , "RGB_MOD" + "KC_TRNS" , "KC_TRNS", + "KC_TRNS" , "KC_TRNS" ], ["KC_TRNS" , "KC_COLN" , "KC_LT" , "KC_GT" , "KC_SCLN", "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS", diff --git a/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c index b84f83c3ad5..8b3d110c882 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c +++ b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c @@ -11,7 +11,6 @@ enum custom_layers { enum custom_keycodes { PLACEHOLDER = SAFE_RANGE, // can always be here VRSN, - RGB_SLD }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -87,18 +86,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, EE_CLR, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, - RGB_MOD,KC_TRNS, + LM_NEXT,KC_TRNS, KC_TRNS, - RGB_VAD,RGB_VAI,KC_TRNS, + LM_BRID,LM_BRIU,KC_TRNS, // right hand KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS, - RGB_TOG, RGB_SLD, + LM_TOGG, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_HUD, RGB_HUI + KC_TRNS, KC_TRNS, KC_TRNS ), /* Keymap 2: Media and mouse keys * @@ -152,14 +151,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; - case RGB_SLD: - if (record->event.pressed) { - #ifdef RGBLIGHT_ENABLE - rgblight_mode(1); - #endif - } - return false; - break; } return true; } diff --git a/keyboards/kapcave/gskt00/keymaps/default/keymap.c b/keyboards/kapcave/gskt00/keymaps/default/keymap.c index 0df9320a326..f52894db187 100755 --- a/keyboards/kapcave/gskt00/keymaps/default/keymap.c +++ b/keyboards/kapcave/gskt00/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCRL, KC_PAUS, KC_UP, KC_PAUS, KC_DEL, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_TOG) + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c b/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c index 31eeb0cd960..68cdcf6de54 100755 --- a/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c +++ b/keyboards/kbdfans/maja_soldered/keymaps/default/keymap.c @@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT( /* FN */ QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, KC_TRNS,KC_HOME, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, - CTL_T(KC_CAPS),RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_PGDN, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, + CTL_T(KC_CAPS),KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_PGDN, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), [2] = LAYOUT( /* FN */ diff --git a/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c b/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c index e7a8b5f27a9..636ae3af727 100755 --- a/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c +++ b/keyboards/kbdfans/maja_soldered/keymaps/via/keymap.c @@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT( /* FN */ QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, KC_TRNS,KC_HOME, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, - CTL_T(KC_CAPS),RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_PGDN, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, + CTL_T(KC_CAPS),KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_PGDN, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), [2] = LAYOUT( diff --git a/keyboards/kezewa/enter80/keymaps/default/keymap.c b/keyboards/kezewa/enter80/keymaps/default/keymap.c index e3bc2d65262..85638e0a9c6 100644 --- a/keyboards/kezewa/enter80/keymaps/default/keymap.c +++ b/keyboards/kezewa/enter80/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1]=LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/kezewa/enter80/keymaps/via/keymap.c b/keyboards/kezewa/enter80/keymaps/via/keymap.c index e3bc2d65262..85638e0a9c6 100644 --- a/keyboards/kezewa/enter80/keymaps/via/keymap.c +++ b/keyboards/kezewa/enter80/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1]=LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/kikoslab/kl90/keymaps/via/keymap.c b/keyboards/kikoslab/kl90/keymaps/via/keymap.c index 7534fa27612..758da22d58b 100644 --- a/keyboards/kikoslab/kl90/keymaps/via/keymap.c +++ b/keyboards/kikoslab/kl90/keymaps/via/keymap.c @@ -52,8 +52,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_LOWER] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, - [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, + [_LOWER] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_RAISE] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, }; #endif diff --git a/keyboards/kraken_jones/pteron56/keymaps/via/keymap.c b/keyboards/kraken_jones/pteron56/keymaps/via/keymap.c index 3a1da6324e8..b3a56ac7f43 100644 --- a/keyboards/kraken_jones/pteron56/keymaps/via/keymap.c +++ b/keyboards/kraken_jones/pteron56/keymaps/via/keymap.c @@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT( QK_BOOT, KC_SLEP, KC_WAKE, KC_TRNS, KC_PWR, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - KC_DEL, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSEL, KC_MYCM, KC_PSLS, KC_PAST, - RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, RGB_M_P, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSEL, KC_MYCM, KC_PSLS, KC_PAST, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PDOT ), diff --git a/keyboards/ktec/ergodone/keymaps/default/keymap.c b/keyboards/ktec/ergodone/keymaps/default/keymap.c index 837af0fa03c..41d5da8deed 100644 --- a/keyboards/ktec/ergodone/keymaps/default/keymap.c +++ b/keyboards/ktec/ergodone/keymaps/default/keymap.c @@ -82,18 +82,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, EE_CLR,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, - RGB_MOD,KC_TRNS, + KC_TRNS,KC_TRNS, KC_TRNS, - RGB_VAD,RGB_VAI,KC_TRNS, + KC_TRNS,KC_TRNS,KC_TRNS, // right hand KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS, - RGB_TOG, RGB_M_P, + KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_HUD, RGB_HUI + KC_TRNS, KC_TRNS, KC_TRNS ), /* Keymap 2: Media and mouse keys * diff --git a/keyboards/ktec/ergodone/keymaps/via/keymap.c b/keyboards/ktec/ergodone/keymaps/via/keymap.c index f475ef009cf..60298b820af 100644 --- a/keyboards/ktec/ergodone/keymaps/via/keymap.c +++ b/keyboards/ktec/ergodone/keymaps/via/keymap.c @@ -96,18 +96,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, EE_CLR ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, - RGB_MOD,KC_TRNS, + KC_TRNS,KC_TRNS, KC_TRNS, - RGB_VAD,RGB_VAI,KC_TRNS, + KC_TRNS,KC_TRNS,KC_TRNS, // right hand KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS, - RGB_TOG, RGB_M_P , + KC_TRNS, KC_TRNS , KC_TRNS, - KC_TRNS, RGB_HUD, RGB_HUI + KC_TRNS, KC_TRNS, KC_TRNS ), /* Keymap 2: Media and mouse keys * diff --git a/keyboards/montsinger/palmetto/keymaps/default/keymap.c b/keyboards/montsinger/palmetto/keymaps/default/keymap.c index 5d7b042b27a..5239736c1ab 100644 --- a/keyboards/montsinger/palmetto/keymaps/default/keymap.c +++ b/keyboards/montsinger/palmetto/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_60_ansi( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV, _______, _______, _______, _______, _______, _______, QK_BOOT diff --git a/keyboards/montsinger/palmetto/keymaps/via/keymap.c b/keyboards/montsinger/palmetto/keymaps/via/keymap.c index 5d7b042b27a..5239736c1ab 100644 --- a/keyboards/montsinger/palmetto/keymaps/via/keymap.c +++ b/keyboards/montsinger/palmetto/keymaps/via/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_60_ansi( QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV, _______, _______, _______, _______, _______, _______, QK_BOOT diff --git a/keyboards/neson_design/810e/keyboard.json b/keyboards/neson_design/810e/keyboard.json index ee80a34afbd..2c62eb1f88e 100644 --- a/keyboards/neson_design/810e/keyboard.json +++ b/keyboards/neson_design/810e/keyboard.json @@ -8,8 +8,7 @@ "bootmagic": true, "extrakey": true, "mousekey": true, - "nkro": true, - "rgblight": false + "nkro": true }, "indicators": { "caps_lock": "A10", diff --git a/keyboards/neson_design/810e/keymaps/default/keymap.c b/keyboards/neson_design/810e/keymaps/default/keymap.c index f4893faa357..261314f2655 100644 --- a/keyboards/neson_design/810e/keymaps/default/keymap.c +++ b/keyboards/neson_design/810e/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1]=LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_TOG, RGB_MOD, KC_F13, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, KC_F13, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,_______, _______, _______, _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______) diff --git a/keyboards/neson_design/810e/keymaps/via/keymap.c b/keyboards/neson_design/810e/keymaps/via/keymap.c index c5fff9823dd..963adba913f 100644 --- a/keyboards/neson_design/810e/keymaps/via/keymap.c +++ b/keyboards/neson_design/810e/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1]=LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_TOG, RGB_MOD, KC_F13, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, KC_F13, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,_______, _______, _______, _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______) diff --git a/keyboards/p3d/glitch/glitch.c b/keyboards/p3d/glitch/glitch.c index 6680e6506a2..6ce1cf6e2e6 100644 --- a/keyboards/p3d/glitch/glitch.c +++ b/keyboards/p3d/glitch/glitch.c @@ -21,10 +21,8 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { return false; } if (clockwise) { - // tap_code(RGB_MOD); rgblight_step(); } else { - // tap_code(RGB_RMOD); rgblight_step_reverse(); } diff --git a/keyboards/phase_studio/titan65/soldered/keymaps/default/keymap.c b/keyboards/phase_studio/titan65/soldered/keymaps/default/keymap.c index b6bb5f03234..05d34a0c56a 100644 --- a/keyboards/phase_studio/titan65/soldered/keymaps/default/keymap.c +++ b/keyboards/phase_studio/titan65/soldered/keymaps/default/keymap.c @@ -27,8 +27,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, - _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/phase_studio/titan65/soldered/keymaps/via/keymap.c b/keyboards/phase_studio/titan65/soldered/keymaps/via/keymap.c index 08448e679c1..0e6a9f4328a 100644 --- a/keyboards/phase_studio/titan65/soldered/keymaps/via/keymap.c +++ b/keyboards/phase_studio/titan65/soldered/keymaps/via/keymap.c @@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, - _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/ploopyco/mouse/keyboard.json b/keyboards/ploopyco/mouse/keyboard.json index e24572cc54c..4c81ee73383 100644 --- a/keyboards/ploopyco/mouse/keyboard.json +++ b/keyboards/ploopyco/mouse/keyboard.json @@ -15,7 +15,6 @@ "mousekey": true, "nkro": false, "pointing_device": true, - "rgblight": false, "encoder": true }, "bootmagic": { diff --git a/keyboards/projectcain/vault45/keymaps/default/keymap.c b/keyboards/projectcain/vault45/keymaps/default/keymap.c index 87baccad045..275d2bf3a6f 100644 --- a/keyboards/projectcain/vault45/keymaps/default/keymap.c +++ b/keyboards/projectcain/vault45/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [SYM] = LAYOUT_split_4space( - RGB_TOG, S(KC_GRV), KC_GRV, KC_BSLS, S(KC_BSLS), KC_TRNS, KC_TRNS, S(KC_MINS), KC_EQL, KC_TRNS, C(KC_W), C(KC_T), KC_TRNS, + KC_TRNS, S(KC_GRV), KC_GRV, KC_BSLS, S(KC_BSLS), KC_TRNS, KC_TRNS, S(KC_MINS), KC_EQL, KC_TRNS, C(KC_W), C(KC_T), KC_TRNS, KC_TRNS, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), KC_SCLN, S(KC_SCLN), KC_TRNS, S(KC_LBRC), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, S(KC_RBRC), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_NUM, KC_TRNS diff --git a/keyboards/punk75/keymaps/default/keymap.c b/keyboards/punk75/keymaps/default/keymap.c index b6e8884eb9e..c867e0e493d 100644 --- a/keyboards/punk75/keymaps/default/keymap.c +++ b/keyboards/punk75/keymaps/default/keymap.c @@ -60,10 +60,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NUM, KC_SLSH, KC_ASTR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7, KC_P8, KC_P9, KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, - KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, - KC_VOLD, KC_MUTE, KC_VOLU, KC_APP, RGB_VAD, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, - _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0, _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______ + KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, _______, _______, KC_P7, KC_P8, KC_P9, KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, + KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _______, _______, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, + KC_VOLD, KC_MUTE, KC_VOLU, KC_APP, _______, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, + _______, _______, _______, MO(_FN), _______, _______, KC_P0, _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______ ) }; diff --git a/keyboards/punk75/keymaps/via/keymap.c b/keyboards/punk75/keymaps/via/keymap.c index 97ebc96593b..e284c525b64 100644 --- a/keyboards/punk75/keymaps/via/keymap.c +++ b/keyboards/punk75/keymaps/via/keymap.c @@ -39,10 +39,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ortho_5x15( /* FUNCTION */ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NUM, KC_SLSH, KC_ASTR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7, KC_P8, KC_P9, KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, - KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, - KC_VOLD, KC_MUTE, KC_VOLU, KC_APP, RGB_VAD, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, - _______, _______, RGB_TOG, MO(1), RGB_RMOD,RGB_MOD, KC_P0, _______, KC_PDOT, KC_PENT, KC_PENT, MO(1), _______, _______, _______ + KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, _______, _______, KC_P7, KC_P8, KC_P9, KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, + KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _______, _______, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, QK_BOOT, _______, _______, _______, + KC_VOLD, KC_MUTE, KC_VOLU, KC_APP, _______, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, + _______, _______, _______, MO(1), _______, _______, KC_P0, _______, KC_PDOT, KC_PENT, KC_PENT, MO(1), _______, _______, _______ ), [2] = LAYOUT_ortho_5x15( diff --git a/keyboards/rart/rart75/keymaps/ansi/keymap.c b/keyboards/rart/rart75/keymaps/ansi/keymap.c index b4579c5dfb0..7c31568b7ca 100644 --- a/keyboards/rart/rart75/keymaps/ansi/keymap.c +++ b/keyboards/rart/rart75/keymaps/ansi/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/rart/rart75/keymaps/default/keymap.c b/keyboards/rart/rart75/keymaps/default/keymap.c index f8266cce55d..5a7bb1e97c3 100644 --- a/keyboards/rart/rart75/keymaps/default/keymap.c +++ b/keyboards/rart/rart75/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi_split_space_split_bs( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/rart/rart75/keymaps/via/keymap.c b/keyboards/rart/rart75/keymaps/via/keymap.c index 786e77ac7ee..7db4b58b32d 100644 --- a/keyboards/rart/rart75/keymaps/via/keymap.c +++ b/keyboards/rart/rart75/keymaps/via/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ansi_split_space_split_bs( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/reviung/reviung39/keyboard.json b/keyboards/reviung/reviung39/keyboard.json index fca69124b1b..56200a6a3d3 100644 --- a/keyboards/reviung/reviung39/keyboard.json +++ b/keyboards/reviung/reviung39/keyboard.json @@ -14,7 +14,30 @@ "console": true, "extrakey": true, "mousekey": false, - "nkro": false + "nkro": false, + "rgblight": true + }, + "rgblight": { + "led_count": 11, + "hue_steps": 16, + "saturation_steps": 16, + "brightness_steps": 16, + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "ws2812": { + "pin": "D3" }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], diff --git a/keyboards/reviung/reviung39/keymaps/default/config.h b/keyboards/reviung/reviung39/keymaps/default/config.h deleted file mode 100644 index d882e8ad949..00000000000 --- a/keyboards/reviung/reviung39/keymaps/default/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2019 gtips - * - * 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 - -// place overrides here - -#define WS2812_DI_PIN D3 - #define RGBLIGHT_LED_COUNT 11 - #define RGBLIGHT_HUE_STEP 16 - #define RGBLIGHT_SAT_STEP 16 - #define RGBLIGHT_VAL_STEP 16 - #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ - #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE diff --git a/keyboards/reviung/reviung39/keymaps/default/rules.mk b/keyboards/reviung/reviung39/keymaps/default/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/reviung/reviung39/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/reviung/reviung39/keymaps/default_s/config.h b/keyboards/reviung/reviung39/keymaps/default_s/config.h index 3fd3c73fcc2..816f0b0fcf6 100644 --- a/keyboards/reviung/reviung39/keymaps/default_s/config.h +++ b/keyboards/reviung/reviung39/keymaps/default_s/config.h @@ -16,22 +16,5 @@ #pragma once -// place overrides here - -#define WS2812_DI_PIN D3 - #define RGBLIGHT_LED_COUNT 6 - #define RGBLIGHT_HUE_STEP 16 - #define RGBLIGHT_SAT_STEP 16 - #define RGBLIGHT_VAL_STEP 16 - #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ - #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE +#undef RGBLIGHT_LED_COUNT +#define RGBLIGHT_LED_COUNT 6 diff --git a/keyboards/reviung/reviung39/keymaps/default_s/rules.mk b/keyboards/reviung/reviung39/keymaps/default_s/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/reviung/reviung39/keymaps/default_s/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/reviung/reviung39/keymaps/via/keymap.c b/keyboards/reviung/reviung39/keymaps/via/keymap.c index 585cdb35188..aba882337d3 100644 --- a/keyboards/reviung/reviung39/keymaps/via/keymap.c +++ b/keyboards/reviung/reviung39/keymaps/via/keymap.c @@ -45,8 +45,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT( - RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + UG_VALU, UG_SATU, UG_HUEU, UG_NEXT, XXXXXXX, UG_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + UG_VALD, UG_SATD, UG_HUED, UG_PREV, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, _______ ), diff --git a/keyboards/reviung/reviung39/keymaps/via/rules.mk b/keyboards/reviung/reviung39/keymaps/via/rules.mk index 5d85ccd1031..36b7ba9cbc9 100644 --- a/keyboards/reviung/reviung39/keymaps/via/rules.mk +++ b/keyboards/reviung/reviung39/keymaps/via/rules.mk @@ -1,3 +1,2 @@ VIA_ENABLE = yes -RGBLIGHT_ENABLE = no LTO_ENABLE = yes diff --git a/keyboards/reviung/reviung61/keymaps/default/keymap.c b/keyboards/reviung/reviung61/keymaps/default/keymap.c index dc795062510..5e5d97f0187 100644 --- a/keyboards/reviung/reviung61/keymaps/default/keymap.c +++ b/keyboards/reviung/reviung61/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_60_ansi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - _______, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, RGB_TOG, + _______, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_PSCR, KC_INS, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______ diff --git a/keyboards/rgbkb/mun/rev1/keyboard.json b/keyboards/rgbkb/mun/rev1/keyboard.json index daed72b4d2d..cf988d8f95b 100644 --- a/keyboards/rgbkb/mun/rev1/keyboard.json +++ b/keyboards/rgbkb/mun/rev1/keyboard.json @@ -18,8 +18,7 @@ "mousekey": false, "nkro": true, "oled": true, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "rgblight": { "led_count": 98, diff --git a/keyboards/rgbkb/sol/rev1/keyboard.json b/keyboards/rgbkb/sol/rev1/keyboard.json index 937ed97ce1b..9607e762595 100644 --- a/keyboards/rgbkb/sol/rev1/keyboard.json +++ b/keyboards/rgbkb/sol/rev1/keyboard.json @@ -15,7 +15,6 @@ "mousekey": false, "nkro": false, "oled": false, - "rgb_matrix": false, "rgblight": true }, "rgb_matrix": { diff --git a/keyboards/rgbkb/sol/rev2/keyboard.json b/keyboards/rgbkb/sol/rev2/keyboard.json index b080319f174..1a5ca12ed95 100644 --- a/keyboards/rgbkb/sol/rev2/keyboard.json +++ b/keyboards/rgbkb/sol/rev2/keyboard.json @@ -18,8 +18,7 @@ "mousekey": false, "nkro": false, "oled": false, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "rgb_matrix": { "animations": { diff --git a/keyboards/rgbkb/sol3/rev1/keyboard.json b/keyboards/rgbkb/sol3/rev1/keyboard.json index 0df040e6e08..54e57e3f8fe 100644 --- a/keyboards/rgbkb/sol3/rev1/keyboard.json +++ b/keyboards/rgbkb/sol3/rev1/keyboard.json @@ -21,8 +21,7 @@ "mousekey": true, "nkro": true, "oled": true, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "rgblight": { "led_count": 156, diff --git a/keyboards/scatter42/keymaps/default/keymap.c b/keyboards/scatter42/keymaps/default/keymap.c index 8f3da5498b1..5c6d932aac1 100644 --- a/keyboards/scatter42/keymaps/default/keymap.c +++ b/keyboards/scatter42/keymaps/default/keymap.c @@ -27,5 +27,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LCTL, KC_LSFT, KC_TAB, KC_LGUI, MO(1), KC_SPC, KC_ENT, MO(2), KC_RALT, KC_BSPC, KC_RSFT, KC_RCTL), [1] = LAYOUT(KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F11, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_LCTL, KC_LSFT, KC_ESC, KC_LGUI, KC_TRNS, KC_SPC, KC_ENT, MO(3), KC_RALT, KC_DEL, KC_RSFT, KC_PSCR), [2] = LAYOUT(KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_NO, KC_NO, KC_NO, KC_BSLS, KC_GRV, KC_MINS, KC_EQL, KC_QUOT, KC_LCBR, KC_RCBR, KC_NO, KC_NO, KC_NO, KC_PIPE, KC_TILD, KC_UNDS, KC_PLUS, KC_DQUO, KC_LBRC, KC_RBRC, KC_LCTL, KC_LSFT, KC_ESC, KC_LGUI, MO(3), KC_SPC, KC_ENT, KC_TRNS, KC_RALT, KC_DEL, KC_RSFT, KC_RCTL), - [3] = LAYOUT(KC_VOLU, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BRIU, KC_VOLD, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_BRID, KC_MUTE, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO) + [3] = LAYOUT(KC_VOLU, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BRIU, KC_VOLD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BRID, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO) }; diff --git a/keyboards/sirius/unigo66/keyboard.json b/keyboards/sirius/unigo66/keyboard.json index ac683a0f1db..0b3463013c8 100644 --- a/keyboards/sirius/unigo66/keyboard.json +++ b/keyboards/sirius/unigo66/keyboard.json @@ -13,7 +13,6 @@ "extrakey": true, "mousekey": false, "nkro": false, - "rgblight": false, "usb_hid": true }, "processor": "atmega32u4", diff --git a/keyboards/switchplate/switchplate910/keymaps/default/keymap.c b/keyboards/switchplate/switchplate910/keymaps/default/keymap.c index 9ba001dc46d..9c00a28480a 100644 --- a/keyboards/switchplate/switchplate910/keymaps/default/keymap.c +++ b/keyboards/switchplate/switchplate910/keymaps/default/keymap.c @@ -32,9 +32,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT_65_ansi_blocker_split_bs( /* L1 */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_TRNS, - KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, RGB_MOD, RGB_SAI, RGB_TOG, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI + KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/switchplate/switchplate910/keymaps/via/keymap.c b/keyboards/switchplate/switchplate910/keymaps/via/keymap.c index c4a2589e9ac..98098784cce 100644 --- a/keyboards/switchplate/switchplate910/keymaps/via/keymap.c +++ b/keyboards/switchplate/switchplate910/keymaps/via/keymap.c @@ -32,10 +32,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT_65_ansi_blocker_split_bs( /* L1 */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS, KC_TRNS, - KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, RGB_MOD, RGB_SAI, RGB_TOG, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI + KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), LAYOUT_65_ansi_blocker_split_bs( /* L2 */ diff --git a/keyboards/takashicompany/ergomirage/keymaps/default/keymap.c b/keyboards/takashicompany/ergomirage/keymaps/default/keymap.c index c3f4faf59a0..1c33054ce93 100644 --- a/keyboards/takashicompany/ergomirage/keymaps/default/keymap.c +++ b/keyboards/takashicompany/ergomirage/keymaps/default/keymap.c @@ -62,9 +62,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), LAYOUT( - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, DF(0), DF(3), KC_TRNS, - KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, - KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, DF(0), DF(3), KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/takashicompany/ergomirage/keymaps/via/keymap.c b/keyboards/takashicompany/ergomirage/keymaps/via/keymap.c index c3f4faf59a0..1c33054ce93 100644 --- a/keyboards/takashicompany/ergomirage/keymaps/via/keymap.c +++ b/keyboards/takashicompany/ergomirage/keymaps/via/keymap.c @@ -62,9 +62,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), LAYOUT( - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, DF(0), DF(3), KC_TRNS, - KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, - KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, DF(0), DF(3), KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c b/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c index 8ed4720fdf3..4dcb222cea5 100644 --- a/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c +++ b/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c @@ -57,8 +57,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NAV] = LAYOUT_33_split_space( QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN, - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_MINS, KC_INT1, KC_COMM, KC_DOT, KC_BSLS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_MINS, KC_INT1, KC_COMM, KC_DOT, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c index 0aa2a412c92..ce513872c50 100644 --- a/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c +++ b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c @@ -57,8 +57,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NAV] = LAYOUT_33_big_space( QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN, - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_MINS, KC_INT1, KC_COMM, KC_DOT, KC_BSLS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_MINS, KC_INT1, KC_COMM, KC_DOT, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/wekey/polaris/keymaps/default/keymap.c b/keyboards/wekey/polaris/keymaps/default/keymap.c index 5c137002efd..8bc5eca945c 100644 --- a/keyboards/wekey/polaris/keymaps/default/keymap.c +++ b/keyboards/wekey/polaris/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, BL_STEP, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, - _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_PSCR, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; From 4d31c5172515a3cf5ea92010142ae11a2743e235 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 20 May 2024 12:31:42 -0700 Subject: [PATCH 289/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: D, Part 1 (#23749) Affects: - `dailycraft/owl8` - `dailycraft/sandbox/rev1` - `dailycraft/sandbox/rev2` - `dailycraft/stickey4` - `dailycraft/wings42/rev1` - `dailycraft/wings42/rev1_extkeys` - `dailycraft/wings42/rev2` - `daji/seis_cinco` - `dark/magnum_ergo_1` - `darkproject/kd83a_bfg_edition` - `darkproject/kd87a_bfg_edition` - `dc01/arrow` - `dc01/left` - `dc01/numpad` - `dc01/right` - `dcpedit/redherring` - `delikeeb/flatbread60` - `delikeeb/vaguettelite` - `delikeeb/vanana/rev1` - `delikeeb/vanana/rev2` - `delikeeb/vaneela` - `delikeeb/vaneelaex` - `delikeeb/waaffle/rev3/elite_c` - `delikeeb/waaffle/rev3/pro_micro` - `deltapad` - `deltasplit75/v2` - `dk60` - `dm9records/lain` - `dm9records/plaid` - `dm9records/tartan` - `dmqdesign/spin` --- keyboards/dailycraft/owl8/config.h | 39 ------------------- keyboards/dailycraft/owl8/keyboard.json | 6 +++ keyboards/dailycraft/sandbox/rev1/config.h | 39 ------------------- .../dailycraft/sandbox/rev1/keyboard.json | 6 +++ keyboards/dailycraft/sandbox/rev2/config.h | 39 ------------------- .../dailycraft/sandbox/rev2/keyboard.json | 6 +++ keyboards/dailycraft/stickey4/config.h | 39 ------------------- keyboards/dailycraft/stickey4/keyboard.json | 6 +++ keyboards/dailycraft/wings42/rev1/config.h | 39 ------------------- .../dailycraft/wings42/rev1/keyboard.json | 6 +++ .../dailycraft/wings42/rev1_extkeys/config.h | 39 ------------------- .../wings42/rev1_extkeys/keyboard.json | 6 +++ keyboards/dailycraft/wings42/rev2/config.h | 39 ------------------- .../dailycraft/wings42/rev2/keyboard.json | 6 +++ keyboards/daji/seis_cinco/config.h | 5 --- keyboards/daji/seis_cinco/keyboard.json | 6 +++ keyboards/dark/magnum_ergo_1/config.h | 4 -- keyboards/dark/magnum_ergo_1/keyboard.json | 6 +++ .../darkproject/kd83a_bfg_edition/config.h | 5 --- .../kd83a_bfg_edition/keyboard.json | 6 ++- .../darkproject/kd87a_bfg_edition/config.h | 5 --- .../kd87a_bfg_edition/keyboard.json | 6 ++- keyboards/dc01/arrow/config.h | 5 --- keyboards/dc01/arrow/keyboard.json | 6 +++ keyboards/dc01/left/config.h | 5 --- keyboards/dc01/left/keyboard.json | 6 +++ keyboards/dc01/numpad/config.h | 5 --- keyboards/dc01/numpad/keyboard.json | 6 +++ keyboards/dc01/right/config.h | 5 --- keyboards/dc01/right/keyboard.json | 6 +++ keyboards/dcpedit/redherring/config.h | 4 +- keyboards/dcpedit/redherring/keyboard.json | 6 ++- keyboards/delikeeb/flatbread60/config.h | 39 ------------------- keyboards/delikeeb/flatbread60/keyboard.json | 6 +++ keyboards/delikeeb/vaguettelite/config.h | 39 ------------------- keyboards/delikeeb/vaguettelite/keyboard.json | 6 +++ keyboards/delikeeb/vanana/rev1/config.h | 5 --- keyboards/delikeeb/vanana/rev1/keyboard.json | 6 +++ keyboards/delikeeb/vanana/rev2/config.h | 5 --- keyboards/delikeeb/vanana/rev2/keyboard.json | 6 +++ keyboards/delikeeb/vaneela/config.h | 39 ------------------- keyboards/delikeeb/vaneela/keyboard.json | 6 +++ keyboards/delikeeb/vaneelaex/config.h | 39 ------------------- keyboards/delikeeb/vaneelaex/keyboard.json | 6 +++ keyboards/delikeeb/waaffle/rev3/config.h | 5 --- .../waaffle/rev3/elite_c/keyboard.json | 6 +++ .../waaffle/rev3/pro_micro/keyboard.json | 6 +++ keyboards/deltapad/config.h | 39 ------------------- keyboards/deltapad/keyboard.json | 6 +++ keyboards/deltasplit75/v2/config.h | 39 ------------------- keyboards/deltasplit75/v2/keyboard.json | 6 +++ keyboards/dk60/config.h | 39 ------------------- keyboards/dk60/keyboard.json | 6 +++ keyboards/dm9records/lain/config.h | 5 --- keyboards/dm9records/lain/keyboard.json | 6 +++ keyboards/dm9records/plaid/config.h | 39 ------------------- keyboards/dm9records/plaid/keyboard.json | 6 +++ keyboards/dm9records/tartan/config.h | 39 ------------------- keyboards/dm9records/tartan/keyboard.json | 6 +++ keyboards/dmqdesign/spin/config.h | 23 ----------- keyboards/dmqdesign/spin/keyboard.json | 6 +++ 61 files changed, 184 insertions(+), 712 deletions(-) delete mode 100644 keyboards/dailycraft/owl8/config.h delete mode 100644 keyboards/dailycraft/sandbox/rev1/config.h delete mode 100644 keyboards/dailycraft/sandbox/rev2/config.h delete mode 100644 keyboards/dailycraft/stickey4/config.h delete mode 100644 keyboards/dailycraft/wings42/rev1/config.h delete mode 100644 keyboards/dailycraft/wings42/rev1_extkeys/config.h delete mode 100644 keyboards/dailycraft/wings42/rev2/config.h delete mode 100644 keyboards/delikeeb/flatbread60/config.h delete mode 100644 keyboards/delikeeb/vaguettelite/config.h delete mode 100644 keyboards/delikeeb/vaneela/config.h delete mode 100644 keyboards/delikeeb/vaneelaex/config.h delete mode 100644 keyboards/deltapad/config.h delete mode 100644 keyboards/deltasplit75/v2/config.h delete mode 100644 keyboards/dk60/config.h delete mode 100644 keyboards/dm9records/plaid/config.h delete mode 100644 keyboards/dm9records/tartan/config.h delete mode 100644 keyboards/dmqdesign/spin/config.h diff --git a/keyboards/dailycraft/owl8/config.h b/keyboards/dailycraft/owl8/config.h deleted file mode 100644 index 7da6e3f1bf2..00000000000 --- a/keyboards/dailycraft/owl8/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 yfuku - -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/dailycraft/owl8/keyboard.json b/keyboards/dailycraft/owl8/keyboard.json index 9d654b7d3fb..a4a1a70e3ed 100644 --- a/keyboards/dailycraft/owl8/keyboard.json +++ b/keyboards/dailycraft/owl8/keyboard.json @@ -25,6 +25,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["F4", "F7", "B3", "B6", "F5", "F6", "B1", "B2", "D4", "C6", "D7", "E6"] diff --git a/keyboards/dailycraft/sandbox/rev1/config.h b/keyboards/dailycraft/sandbox/rev1/config.h deleted file mode 100644 index 7da6e3f1bf2..00000000000 --- a/keyboards/dailycraft/sandbox/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 yfuku - -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/dailycraft/sandbox/rev1/keyboard.json b/keyboards/dailycraft/sandbox/rev1/keyboard.json index 0a48996815e..8658de96df2 100644 --- a/keyboards/dailycraft/sandbox/rev1/keyboard.json +++ b/keyboards/dailycraft/sandbox/rev1/keyboard.json @@ -21,6 +21,12 @@ "extrakey": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/sandbox/rev2/config.h b/keyboards/dailycraft/sandbox/rev2/config.h deleted file mode 100644 index 7da6e3f1bf2..00000000000 --- a/keyboards/dailycraft/sandbox/rev2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 yfuku - -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/dailycraft/sandbox/rev2/keyboard.json b/keyboards/dailycraft/sandbox/rev2/keyboard.json index d6f0ac2c2a5..c9f2b8f567f 100644 --- a/keyboards/dailycraft/sandbox/rev2/keyboard.json +++ b/keyboards/dailycraft/sandbox/rev2/keyboard.json @@ -25,6 +25,12 @@ "extrakey": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/stickey4/config.h b/keyboards/dailycraft/stickey4/config.h deleted file mode 100644 index 7da6e3f1bf2..00000000000 --- a/keyboards/dailycraft/stickey4/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 yfuku - -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/dailycraft/stickey4/keyboard.json b/keyboards/dailycraft/stickey4/keyboard.json index 101c796b4ea..d0e2a491d39 100644 --- a/keyboards/dailycraft/stickey4/keyboard.json +++ b/keyboards/dailycraft/stickey4/keyboard.json @@ -25,6 +25,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["D4", "C6", "D7", "E6"] diff --git a/keyboards/dailycraft/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h deleted file mode 100644 index 7da6e3f1bf2..00000000000 --- a/keyboards/dailycraft/wings42/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 yfuku - -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/dailycraft/wings42/rev1/keyboard.json b/keyboards/dailycraft/wings42/rev1/keyboard.json index a32b591bd6e..6b19954d881 100644 --- a/keyboards/dailycraft/wings42/rev1/keyboard.json +++ b/keyboards/dailycraft/wings42/rev1/keyboard.json @@ -24,6 +24,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": [ "split_3x6_3" ], diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h deleted file mode 100644 index 7da6e3f1bf2..00000000000 --- a/keyboards/dailycraft/wings42/rev1_extkeys/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 yfuku - -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/dailycraft/wings42/rev1_extkeys/keyboard.json b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json index ff665a3bb75..1d77f044fbb 100644 --- a/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json +++ b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json @@ -24,6 +24,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h deleted file mode 100644 index 7da6e3f1bf2..00000000000 --- a/keyboards/dailycraft/wings42/rev2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 yfuku - -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/dailycraft/wings42/rev2/keyboard.json b/keyboards/dailycraft/wings42/rev2/keyboard.json index 13f283d92b3..c3b686cec44 100644 --- a/keyboards/dailycraft/wings42/rev2/keyboard.json +++ b/keyboards/dailycraft/wings42/rev2/keyboard.json @@ -31,6 +31,12 @@ "extrakey": true, "mousekey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_split_3x6_3_2": "LAYOUT_split_3x6_3" }, diff --git a/keyboards/daji/seis_cinco/config.h b/keyboards/daji/seis_cinco/config.h index d212094077a..a8afb615725 100644 --- a/keyboards/daji/seis_cinco/config.h +++ b/keyboards/daji/seis_cinco/config.h @@ -17,11 +17,6 @@ #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 - /* VIA layouts * 2 bits = 4 layout options */ diff --git a/keyboards/daji/seis_cinco/keyboard.json b/keyboards/daji/seis_cinco/keyboard.json index a358ae86a1c..358dfc17ced 100644 --- a/keyboards/daji/seis_cinco/keyboard.json +++ b/keyboards/daji/seis_cinco/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "B0", "A7", "B14", "A8", "B15", "A0", "C15", "C14", "C13", "B5", "B4", "B3", "A15", "A10", "A14"], "rows": ["B2", "B10", "B11", "A9", "A6"] diff --git a/keyboards/dark/magnum_ergo_1/config.h b/keyboards/dark/magnum_ergo_1/config.h index 6b153f69df6..a62055722be 100644 --- a/keyboards/dark/magnum_ergo_1/config.h +++ b/keyboards/dark/magnum_ergo_1/config.h @@ -16,10 +16,6 @@ along with this program. If not, see . #pragma once - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 2 #define BACKLIGHT_PAL_MODE 2 diff --git a/keyboards/dark/magnum_ergo_1/keyboard.json b/keyboards/dark/magnum_ergo_1/keyboard.json index 1aecfe86305..a52de6decc0 100644 --- a/keyboards/dark/magnum_ergo_1/keyboard.json +++ b/keyboards/dark/magnum_ergo_1/keyboard.json @@ -25,6 +25,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "backlight": { "pin": "C7", diff --git a/keyboards/darkproject/kd83a_bfg_edition/config.h b/keyboards/darkproject/kd83a_bfg_edition/config.h index cb7cdb57fc1..880aabd5d71 100644 --- a/keyboards/darkproject/kd83a_bfg_edition/config.h +++ b/keyboards/darkproject/kd83a_bfg_edition/config.h @@ -16,11 +16,6 @@ #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 - /* External spi flash */ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14 diff --git a/keyboards/darkproject/kd83a_bfg_edition/keyboard.json b/keyboards/darkproject/kd83a_bfg_edition/keyboard.json index 56c45a222f3..23bd2b69817 100644 --- a/keyboards/darkproject/kd83a_bfg_edition/keyboard.json +++ b/keyboards/darkproject/kd83a_bfg_edition/keyboard.json @@ -31,7 +31,11 @@ }, "processor": "WB32FQ95", "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "rgb_matrix": { "animations": { diff --git a/keyboards/darkproject/kd87a_bfg_edition/config.h b/keyboards/darkproject/kd87a_bfg_edition/config.h index 1d4c0772a24..a32f7122311 100644 --- a/keyboards/darkproject/kd87a_bfg_edition/config.h +++ b/keyboards/darkproject/kd87a_bfg_edition/config.h @@ -16,11 +16,6 @@ #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 - /* External spi flash */ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14 diff --git a/keyboards/darkproject/kd87a_bfg_edition/keyboard.json b/keyboards/darkproject/kd87a_bfg_edition/keyboard.json index 76cd497b0f3..856dbea6488 100644 --- a/keyboards/darkproject/kd87a_bfg_edition/keyboard.json +++ b/keyboards/darkproject/kd87a_bfg_edition/keyboard.json @@ -30,7 +30,11 @@ }, "processor": "WB32FQ95", "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "rgb_matrix": { "animations": { diff --git a/keyboards/dc01/arrow/config.h b/keyboards/dc01/arrow/config.h index ef008e5dfe4..0edb8002c8a 100644 --- a/keyboards/dc01/arrow/config.h +++ b/keyboards/dc01/arrow/config.h @@ -37,8 +37,3 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -/* 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/dc01/arrow/keyboard.json b/keyboards/dc01/arrow/keyboard.json index 85ca25c23e8..72fa1b4e22c 100644 --- a/keyboards/dc01/arrow/keyboard.json +++ b/keyboards/dc01/arrow/keyboard.json @@ -17,6 +17,12 @@ "extrakey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/dc01/left/config.h b/keyboards/dc01/left/config.h index dbaed0d54df..1f58007ac19 100644 --- a/keyboards/dc01/left/config.h +++ b/keyboards/dc01/left/config.h @@ -41,11 +41,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* 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. diff --git a/keyboards/dc01/left/keyboard.json b/keyboards/dc01/left/keyboard.json index e2967909955..2238f67564d 100644 --- a/keyboards/dc01/left/keyboard.json +++ b/keyboards/dc01/left/keyboard.json @@ -16,6 +16,12 @@ "extrakey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "debounce": 0, "layouts": { "LAYOUT_ansi": { diff --git a/keyboards/dc01/numpad/config.h b/keyboards/dc01/numpad/config.h index bcaf26b3f06..b2b71f574f2 100644 --- a/keyboards/dc01/numpad/config.h +++ b/keyboards/dc01/numpad/config.h @@ -37,8 +37,3 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -/* 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/dc01/numpad/keyboard.json b/keyboards/dc01/numpad/keyboard.json index 0cf73c23e33..900af6e542a 100644 --- a/keyboards/dc01/numpad/keyboard.json +++ b/keyboards/dc01/numpad/keyboard.json @@ -17,6 +17,12 @@ "extrakey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["numpad_5x4", "ortho_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/dc01/right/config.h b/keyboards/dc01/right/config.h index 0e19af15256..6529b8e788b 100644 --- a/keyboards/dc01/right/config.h +++ b/keyboards/dc01/right/config.h @@ -37,8 +37,3 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -/* 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/dc01/right/keyboard.json b/keyboards/dc01/right/keyboard.json index 6f48e05483e..36dc7a7056b 100644 --- a/keyboards/dc01/right/keyboard.json +++ b/keyboards/dc01/right/keyboard.json @@ -17,6 +17,12 @@ "extrakey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/dcpedit/redherring/config.h b/keyboards/dcpedit/redherring/config.h index 115be3306e5..790b9cd631d 100755 --- a/keyboards/dcpedit/redherring/config.h +++ b/keyboards/dcpedit/redherring/config.h @@ -3,8 +3,6 @@ #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE #define SOLENOID_PIN B5 #define OLED_IC OLED_IC_SH1107 -#define OLED_DISPLAY_64X128 \ No newline at end of file +#define OLED_DISPLAY_64X128 diff --git a/keyboards/dcpedit/redherring/keyboard.json b/keyboards/dcpedit/redherring/keyboard.json index a2f87c90b9a..a6747402d01 100644 --- a/keyboards/dcpedit/redherring/keyboard.json +++ b/keyboards/dcpedit/redherring/keyboard.json @@ -29,7 +29,11 @@ }, "processor": "atmega32a", "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "haptic": { "driver": "solenoid" diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h deleted file mode 100644 index 93fec1ee2da..00000000000 --- a/keyboards/delikeeb/flatbread60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 noclew - -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/delikeeb/flatbread60/keyboard.json b/keyboards/delikeeb/flatbread60/keyboard.json index 8a4614e5b46..b0cf794dfb0 100644 --- a/keyboards/delikeeb/flatbread60/keyboard.json +++ b/keyboards/delikeeb/flatbread60/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["F6", "B1", "B3", "B2", "B6"] diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h deleted file mode 100644 index 93fec1ee2da..00000000000 --- a/keyboards/delikeeb/vaguettelite/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 noclew - -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/delikeeb/vaguettelite/keyboard.json b/keyboards/delikeeb/vaguettelite/keyboard.json index 98311fe1155..56919958f26 100644 --- a/keyboards/delikeeb/vaguettelite/keyboard.json +++ b/keyboards/delikeeb/vaguettelite/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D0", "D4"], "rows": ["F4", "B3", "D1", "D2", "D3", "F5"] diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h index f5d10c1915f..97281151068 100644 --- a/keyboards/delikeeb/vanana/rev1/config.h +++ b/keyboards/delikeeb/vanana/rev1/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define B7_AUDIO -/* 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 - /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. * This is useful for the Windows task manager shortcut (ctrl+shift+esc). */ diff --git a/keyboards/delikeeb/vanana/rev1/keyboard.json b/keyboards/delikeeb/vanana/rev1/keyboard.json index 9ae59761de9..d8d5d2e4c96 100644 --- a/keyboards/delikeeb/vanana/rev1/keyboard.json +++ b/keyboards/delikeeb/vanana/rev1/keyboard.json @@ -37,6 +37,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h index f5d10c1915f..97281151068 100644 --- a/keyboards/delikeeb/vanana/rev2/config.h +++ b/keyboards/delikeeb/vanana/rev2/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define B7_AUDIO -/* 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 - /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. * This is useful for the Windows task manager shortcut (ctrl+shift+esc). */ diff --git a/keyboards/delikeeb/vanana/rev2/keyboard.json b/keyboards/delikeeb/vanana/rev2/keyboard.json index a15ad3e71a3..9da7a9dd885 100644 --- a/keyboards/delikeeb/vanana/rev2/keyboard.json +++ b/keyboards/delikeeb/vanana/rev2/keyboard.json @@ -39,6 +39,12 @@ "rgblight": true, "audio": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/delikeeb/vaneela/config.h b/keyboards/delikeeb/vaneela/config.h deleted file mode 100644 index 93fec1ee2da..00000000000 --- a/keyboards/delikeeb/vaneela/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 noclew - -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/delikeeb/vaneela/keyboard.json b/keyboards/delikeeb/vaneela/keyboard.json index 226014b8a0b..5f76c8b7ab1 100644 --- a/keyboards/delikeeb/vaneela/keyboard.json +++ b/keyboards/delikeeb/vaneela/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["F6", "F7", "B3", "B2", "B6"] diff --git a/keyboards/delikeeb/vaneelaex/config.h b/keyboards/delikeeb/vaneelaex/config.h deleted file mode 100644 index 93fec1ee2da..00000000000 --- a/keyboards/delikeeb/vaneelaex/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 noclew - -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/delikeeb/vaneelaex/keyboard.json b/keyboards/delikeeb/vaneelaex/keyboard.json index 8bf40b169bc..9810d341abe 100644 --- a/keyboards/delikeeb/vaneelaex/keyboard.json +++ b/keyboards/delikeeb/vaneelaex/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B5", "B4", "E6", "D7", "C6", "D4"], "rows": ["D3", "D2", "D1", "D0", "B2", "B6"] diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h index 6450b251b79..43f6a43b6fe 100644 --- a/keyboards/delikeeb/waaffle/rev3/config.h +++ b/keyboards/delikeeb/waaffle/rev3/config.h @@ -17,11 +17,6 @@ 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 - /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. * This is useful for the Windows task manager shortcut (ctrl+shift+esc). */ diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json b/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json index 44fd177e020..22fb33aade1 100644 --- a/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json +++ b/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json @@ -10,5 +10,11 @@ "nkro": false, "rgblight": true, "encoder": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } } } diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json b/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json index a97bf794ea1..55e68c43935 100644 --- a/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json +++ b/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json @@ -8,5 +8,11 @@ "extrakey": true, "mousekey": true, "nkro": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } } } diff --git a/keyboards/deltapad/config.h b/keyboards/deltapad/config.h deleted file mode 100644 index a62147158e1..00000000000 --- a/keyboards/deltapad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Richard Snijder - -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/deltapad/keyboard.json b/keyboards/deltapad/keyboard.json index 256f2ba1055..23683bbd1e2 100644 --- a/keyboards/deltapad/keyboard.json +++ b/keyboards/deltapad/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["D2", "D3", "D1", "D0"] diff --git a/keyboards/deltasplit75/v2/config.h b/keyboards/deltasplit75/v2/config.h deleted file mode 100644 index 9b7700e0139..00000000000 --- a/keyboards/deltasplit75/v2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/deltasplit75/v2/keyboard.json b/keyboards/deltasplit75/v2/keyboard.json index 2c1968e0b59..d175633d71e 100644 --- a/keyboards/deltasplit75/v2/keyboard.json +++ b/keyboards/deltasplit75/v2/keyboard.json @@ -30,6 +30,12 @@ "extrakey": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_v2": { "layout": [ diff --git a/keyboards/dk60/config.h b/keyboards/dk60/config.h deleted file mode 100644 index cfa9c05154c..00000000000 --- a/keyboards/dk60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2017 Damien Broqua - -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/dk60/keyboard.json b/keyboards/dk60/keyboard.json index 3e451a5c8dc..a88920814d1 100644 --- a/keyboards/dk60/keyboard.json +++ b/keyboards/dk60/keyboard.json @@ -18,6 +18,12 @@ "sleep_led": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B3", "B2", "B1", "D3", "D5", "B5", "B7", "C6", "C7", "D0", "D1", "D2"], "rows": ["B6", "B4", "D7", "D6", "D4"] diff --git a/keyboards/dm9records/lain/config.h b/keyboards/dm9records/lain/config.h index ddb4b6702fc..7c9ddea707a 100644 --- a/keyboards/dm9records/lain/config.h +++ b/keyboards/dm9records/lain/config.h @@ -7,8 +7,3 @@ #define LED_NUM 3 #define LED_PINS \ { B6, B5, B4 } - -/* 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/dm9records/lain/keyboard.json b/keyboards/dm9records/lain/keyboard.json index 3736d04aeee..32cece9f152 100644 --- a/keyboards/dm9records/lain/keyboard.json +++ b/keyboards/dm9records/lain/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "D2", "D3", "D5"], "rows": ["C6", "D7", "D6", "D4"] diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h deleted file mode 100644 index 71400c3cf88..00000000000 --- a/keyboards/dm9records/plaid/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Takuya Urakawa (dm9records.com) - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#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/dm9records/plaid/keyboard.json b/keyboards/dm9records/plaid/keyboard.json index a2052e55621..661b4addcaa 100644 --- a/keyboards/dm9records/plaid/keyboard.json +++ b/keyboards/dm9records/plaid/keyboard.json @@ -21,6 +21,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12", diff --git a/keyboards/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h deleted file mode 100644 index 71400c3cf88..00000000000 --- a/keyboards/dm9records/tartan/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Takuya Urakawa (dm9records.com) - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#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/dm9records/tartan/keyboard.json b/keyboards/dm9records/tartan/keyboard.json index 208dcf330b9..feb0722c01f 100644 --- a/keyboards/dm9records/tartan/keyboard.json +++ b/keyboards/dm9records/tartan/keyboard.json @@ -20,6 +20,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], "layout_aliases": { "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift" diff --git a/keyboards/dmqdesign/spin/config.h b/keyboards/dmqdesign/spin/config.h deleted file mode 100644 index cc43876148b..00000000000 --- a/keyboards/dmqdesign/spin/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019-2020 DMQ Design - -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 diff --git a/keyboards/dmqdesign/spin/keyboard.json b/keyboards/dmqdesign/spin/keyboard.json index a2bc050e910..b271f1ebd5d 100644 --- a/keyboards/dmqdesign/spin/keyboard.json +++ b/keyboards/dmqdesign/spin/keyboard.json @@ -19,6 +19,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "C7", "C6"], "rows": ["F0", "F1", "F4"] From 03f0d683420a1efa9709f61dd778e764300d86ea Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 20 May 2024 12:34:57 -0700 Subject: [PATCH 290/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: D, Part 2 (#23750) Affects: - `do60` - `doio/kb30` - `donutcables/scrabblepad` - `doppelganger` - `doro67/rgb` - `dotmod/dymium65` - `draytronics/daisy` - `draytronics/elise` - `draytronics/elise_v2` - `drewkeys/iskar` - `drhigsby/bkf` - `drhigsby/dubba175` - `drhigsby/ogurec` - `drhigsby/packrat` - `dtisaac/cg108` - `dumbo` - `dz60` - `dztech/bocc` - `dztech/duo_s` --- keyboards/do60/config.h | 23 ----------- keyboards/do60/keyboard.json | 6 +++ keyboards/doio/kb30/config.h | 5 --- keyboards/doio/kb30/keyboard.json | 6 +++ keyboards/donutcables/scrabblepad/config.h | 39 ------------------- .../donutcables/scrabblepad/keyboard.json | 6 +++ keyboards/doppelganger/config.h | 5 --- keyboards/doppelganger/keyboard.json | 6 +++ keyboards/doro67/rgb/config.h | 23 ----------- keyboards/doro67/rgb/keyboard.json | 6 +++ keyboards/dotmod/dymium65/config.h | 23 ----------- keyboards/dotmod/dymium65/keyboard.json | 6 +++ keyboards/draytronics/daisy/config.h | 37 ------------------ keyboards/draytronics/daisy/keyboard.json | 6 ++- keyboards/draytronics/elise/config.h | 24 ------------ keyboards/draytronics/elise/keyboard.json | 6 +++ keyboards/draytronics/elise_v2/config.h | 24 ------------ keyboards/draytronics/elise_v2/keyboard.json | 6 +++ keyboards/drewkeys/iskar/config.h | 23 ----------- keyboards/drewkeys/iskar/keyboard.json | 6 +++ keyboards/drhigsby/bkf/config.h | 21 ---------- keyboards/drhigsby/bkf/keyboard.json | 6 +++ keyboards/drhigsby/dubba175/config.h | 21 ---------- keyboards/drhigsby/dubba175/keyboard.json | 6 +++ keyboards/drhigsby/ogurec/config.h | 21 ---------- keyboards/drhigsby/ogurec/info.json | 6 +++ keyboards/drhigsby/packrat/config.h | 21 ---------- keyboards/drhigsby/packrat/keyboard.json | 6 +++ keyboards/dtisaac/cg108/config.h | 23 ----------- keyboards/dtisaac/cg108/keyboard.json | 6 +++ keyboards/dumbo/config.h | 20 ---------- keyboards/dumbo/keyboard.json | 6 +++ keyboards/dz60/config.h | 5 --- keyboards/dz60/keyboard.json | 6 +++ keyboards/dztech/bocc/config.h | 5 --- keyboards/dztech/bocc/keyboard.json | 6 +++ keyboards/dztech/duo_s/config.h | 5 --- keyboards/dztech/duo_s/keyboard.json | 6 +++ 38 files changed, 113 insertions(+), 369 deletions(-) delete mode 100644 keyboards/do60/config.h delete mode 100644 keyboards/donutcables/scrabblepad/config.h delete mode 100644 keyboards/doro67/rgb/config.h delete mode 100644 keyboards/dotmod/dymium65/config.h delete mode 100644 keyboards/draytronics/daisy/config.h delete mode 100644 keyboards/draytronics/elise/config.h delete mode 100644 keyboards/draytronics/elise_v2/config.h delete mode 100644 keyboards/drewkeys/iskar/config.h delete mode 100644 keyboards/drhigsby/bkf/config.h delete mode 100644 keyboards/drhigsby/dubba175/config.h delete mode 100644 keyboards/drhigsby/ogurec/config.h delete mode 100644 keyboards/drhigsby/packrat/config.h delete mode 100644 keyboards/dtisaac/cg108/config.h delete mode 100644 keyboards/dumbo/config.h diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h deleted file mode 100644 index 5a870e5f7ee..00000000000 --- a/keyboards/do60/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2012 Doyu Studio - -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 diff --git a/keyboards/do60/keyboard.json b/keyboards/do60/keyboard.json index 76de66f6d7d..2a7d585f65c 100644 --- a/keyboards/do60/keyboard.json +++ b/keyboards/do60/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "F4", "B4", "D7", "D6", "B3", "B0"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h index 7050e67b7e3..04730a1f18c 100644 --- a/keyboards/doio/kb30/config.h +++ b/keyboards/doio/kb30/config.h @@ -17,11 +17,6 @@ #pragma once -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* OLED */ #ifdef OLED_ENABLE # define OLED_BRIGHTNESS 5 diff --git a/keyboards/doio/kb30/keyboard.json b/keyboards/doio/kb30/keyboard.json index 637a1fe68b1..b14eab1c33a 100644 --- a/keyboards/doio/kb30/keyboard.json +++ b/keyboards/doio/kb30/keyboard.json @@ -59,6 +59,12 @@ "oled": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B14", "B13", "B12", "B0", "A7", "A9", "A8"], "rows": ["B3", "B4", "B9", "B8", "A5", "A6"] diff --git a/keyboards/donutcables/scrabblepad/config.h b/keyboards/donutcables/scrabblepad/config.h deleted file mode 100644 index 76f004028fa..00000000000 --- a/keyboards/donutcables/scrabblepad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 DonutCables - -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/donutcables/scrabblepad/keyboard.json b/keyboards/donutcables/scrabblepad/keyboard.json index ed31e35018d..aa03523ed81 100644 --- a/keyboards/donutcables/scrabblepad/keyboard.json +++ b/keyboards/donutcables/scrabblepad/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D6", "D7", "E0", "E1", "B7", "D2", "D3", "D4", "C0", "B4", "B5", "B6", "F0", "E6", "E7"], "rows": ["D5", "F1", "C7", "F2", "C6", "F3", "C5", "F4", "C4", "F5", "C3", "F6", "C2", "F7", "C1"] diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h index a18b4847465..20a23ab6dad 100644 --- a/keyboards/doppelganger/config.h +++ b/keyboards/doppelganger/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . // #define USE_I2C -/* 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. diff --git a/keyboards/doppelganger/keyboard.json b/keyboards/doppelganger/keyboard.json index 2be90e30abf..9ea2241a807 100644 --- a/keyboards/doppelganger/keyboard.json +++ b/keyboards/doppelganger/keyboard.json @@ -41,6 +41,12 @@ "extrakey": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/doro67/rgb/config.h b/keyboards/doro67/rgb/config.h deleted file mode 100644 index b5a6d1893cf..00000000000 --- a/keyboards/doro67/rgb/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 MechMerlin - -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 diff --git a/keyboards/doro67/rgb/keyboard.json b/keyboards/doro67/rgb/keyboard.json index 87a31e6e21e..9b660fd1aec 100644 --- a/keyboards/doro67/rgb/keyboard.json +++ b/keyboards/doro67/rgb/keyboard.json @@ -65,6 +65,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6", "F7"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/dotmod/dymium65/config.h b/keyboards/dotmod/dymium65/config.h deleted file mode 100644 index ca6e56156de..00000000000 --- a/keyboards/dotmod/dymium65/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2023 Finalkey - * Copyright 2023 LiWenLiu - * - * 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 diff --git a/keyboards/dotmod/dymium65/keyboard.json b/keyboards/dotmod/dymium65/keyboard.json index 6095f4c3f1c..c5cd1b2cb7d 100644 --- a/keyboards/dotmod/dymium65/keyboard.json +++ b/keyboards/dotmod/dymium65/keyboard.json @@ -25,6 +25,12 @@ "mousekey": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h deleted file mode 100644 index 96a43955847..00000000000 --- a/keyboards/draytronics/daisy/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/*Copyright 2021 Blake Drayson / Draytronics - -Contact info@draytronics.co.uk - -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/draytronics/daisy/keyboard.json b/keyboards/draytronics/daisy/keyboard.json index f871517e879..92b0b54f43c 100644 --- a/keyboards/draytronics/daisy/keyboard.json +++ b/keyboards/draytronics/daisy/keyboard.json @@ -30,7 +30,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "rgblight": { "saturation_steps": 8, diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h deleted file mode 100644 index 0df48812aa3..00000000000 --- a/keyboards/draytronics/elise/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/*Copyright 2021 Blake Drayson / Draytronics - -Contact info@draytronics.co.uk - -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 diff --git a/keyboards/draytronics/elise/keyboard.json b/keyboards/draytronics/elise/keyboard.json index 62ccd9babbe..782c61d7643 100644 --- a/keyboards/draytronics/elise/keyboard.json +++ b/keyboards/draytronics/elise/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "D5"], "rows": ["B2", "B3", "B1", "F0", "F1"] diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h deleted file mode 100644 index 0df48812aa3..00000000000 --- a/keyboards/draytronics/elise_v2/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/*Copyright 2021 Blake Drayson / Draytronics - -Contact info@draytronics.co.uk - -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 diff --git a/keyboards/draytronics/elise_v2/keyboard.json b/keyboards/draytronics/elise_v2/keyboard.json index 91f34c23f87..217f837e197 100644 --- a/keyboards/draytronics/elise_v2/keyboard.json +++ b/keyboards/draytronics/elise_v2/keyboard.json @@ -38,6 +38,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "D5"], "rows": ["B2", "B3", "B1", "F0", "F1"] diff --git a/keyboards/drewkeys/iskar/config.h b/keyboards/drewkeys/iskar/config.h deleted file mode 100644 index fb8fbcaac5b..00000000000 --- a/keyboards/drewkeys/iskar/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Drewkeys - -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 diff --git a/keyboards/drewkeys/iskar/keyboard.json b/keyboards/drewkeys/iskar/keyboard.json index c3f1aace78c..66d4ebd74d6 100644 --- a/keyboards/drewkeys/iskar/keyboard.json +++ b/keyboards/drewkeys/iskar/keyboard.json @@ -19,6 +19,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "C6", "C7", "F6", "F5", "F4", "F7", "F1", "F0", "E6", "B7", "D0", "D1", "D2", "D3", "D5"], "rows": ["D6", "D7", "B4", "B5", "D4"] diff --git a/keyboards/drhigsby/bkf/config.h b/keyboards/drhigsby/bkf/config.h deleted file mode 100644 index 44c01661259..00000000000 --- a/keyboards/drhigsby/bkf/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 drhigsby - * - * 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 diff --git a/keyboards/drhigsby/bkf/keyboard.json b/keyboards/drhigsby/bkf/keyboard.json index 97bb5919fb7..a3933c8228a 100644 --- a/keyboards/drhigsby/bkf/keyboard.json +++ b/keyboards/drhigsby/bkf/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B2", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3"] diff --git a/keyboards/drhigsby/dubba175/config.h b/keyboards/drhigsby/dubba175/config.h deleted file mode 100644 index 7cfb519fe9e..00000000000 --- a/keyboards/drhigsby/dubba175/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 drhigsby - * - * 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 \ No newline at end of file diff --git a/keyboards/drhigsby/dubba175/keyboard.json b/keyboards/drhigsby/dubba175/keyboard.json index ad964408063..69570a1c2fa 100644 --- a/keyboards/drhigsby/dubba175/keyboard.json +++ b/keyboards/drhigsby/dubba175/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B6"], "rows": ["B1", "B3", "B2", "B5"] diff --git a/keyboards/drhigsby/ogurec/config.h b/keyboards/drhigsby/ogurec/config.h deleted file mode 100644 index 44c01661259..00000000000 --- a/keyboards/drhigsby/ogurec/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 drhigsby - * - * 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 diff --git a/keyboards/drhigsby/ogurec/info.json b/keyboards/drhigsby/ogurec/info.json index bddd3359d9e..f3c753f2c03 100644 --- a/keyboards/drhigsby/ogurec/info.json +++ b/keyboards/drhigsby/ogurec/info.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"], "rows": ["F6", "B6", "B2"] diff --git a/keyboards/drhigsby/packrat/config.h b/keyboards/drhigsby/packrat/config.h deleted file mode 100644 index 44c01661259..00000000000 --- a/keyboards/drhigsby/packrat/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 drhigsby - * - * 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 diff --git a/keyboards/drhigsby/packrat/keyboard.json b/keyboards/drhigsby/packrat/keyboard.json index a1b00f835ca..a836b0bf96d 100644 --- a/keyboards/drhigsby/packrat/keyboard.json +++ b/keyboards/drhigsby/packrat/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3"], "rows": ["F7", "B1", "B6", "B2"] diff --git a/keyboards/dtisaac/cg108/config.h b/keyboards/dtisaac/cg108/config.h deleted file mode 100644 index d39c818a739..00000000000 --- a/keyboards/dtisaac/cg108/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 DTIsaac - -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 diff --git a/keyboards/dtisaac/cg108/keyboard.json b/keyboards/dtisaac/cg108/keyboard.json index 703586e3d06..28e5563111e 100644 --- a/keyboards/dtisaac/cg108/keyboard.json +++ b/keyboards/dtisaac/cg108/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "C6", "B4", "D7", "B3", "B2", "B0", "E6", "B1", "D1", "D6"], "rows": ["F4", "F1", "F0", "F5", "F6", "F7", "D4", "D5", "D3", "D2", "D0"] diff --git a/keyboards/dumbo/config.h b/keyboards/dumbo/config.h deleted file mode 100644 index 5a4dcfdd8f1..00000000000 --- a/keyboards/dumbo/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Adam Naldal -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 diff --git a/keyboards/dumbo/keyboard.json b/keyboards/dumbo/keyboard.json index 84993a6b6d9..df0f1100128 100644 --- a/keyboards/dumbo/keyboard.json +++ b/keyboards/dumbo/keyboard.json @@ -38,6 +38,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h index bec7fcc3dcd..2e5656e5f8f 100644 --- a/keyboards/dz60/config.h +++ b/keyboards/dz60/config.h @@ -1,9 +1,4 @@ #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 - /* VIA related config */ #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/dz60/keyboard.json b/keyboards/dz60/keyboard.json index a6beff0d63a..e3e74959582 100644 --- a/keyboards/dz60/keyboard.json +++ b/keyboards/dz60/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h index 9ad357341e9..4e0c90ca260 100644 --- a/keyboards/dztech/bocc/config.h +++ b/keyboards/dztech/bocc/config.h @@ -15,10 +15,5 @@ */ #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 - /* VIA related config */ #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/dztech/bocc/keyboard.json b/keyboards/dztech/bocc/keyboard.json index 5d56524b3fb..7e40fde49cb 100644 --- a/keyboards/dztech/bocc/keyboard.json +++ b/keyboards/dztech/bocc/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B0", "B1", "B2", "B3", "F0"] diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h index 14d66caf12a..c180c019a43 100644 --- a/keyboards/dztech/duo_s/config.h +++ b/keyboards/dztech/duo_s/config.h @@ -18,9 +18,4 @@ #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) -/* 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 VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/dztech/duo_s/keyboard.json b/keyboards/dztech/duo_s/keyboard.json index 46f9b4fc349..7bf8b0bfddb 100644 --- a/keyboards/dztech/duo_s/keyboard.json +++ b/keyboards/dztech/duo_s/keyboard.json @@ -42,6 +42,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B12", "B13", "B14", "A8", "B9", "C13", "C14", "C15", "A1", "A2", "A3", "A4", "A5", "A6", "A7"], "rows": ["A15", "B3", "B4", "B5", "B11"] From bf42707eed2cee8e6b0ad579df2924e50eada841 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 20 May 2024 12:40:23 -0700 Subject: [PATCH 291/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: E (#23751) Affects: - `e88` - `ealdin/quadrant` - `earth_rover` - `eco` - `edc40` - `edi/standaside` - `eek` - `ein_60` - `eniigmakeyboards/ek65` - `eniigmakeyboards/ek87` - `ep/96` - `ep/comsn/hs68` - `ep/comsn/mollydooker` - `ep/comsn/tf_longeboye` - `ergodox_ez` - `ergotravel/rev1` - `eternal_keypad` - `evil80` - `evolv` - `evyd13/atom47/rev2` - `evyd13/atom47/rev5` - `evyd13/eon65` - `evyd13/eon75` - `evyd13/eon87` - `evyd13/eon95` - `evyd13/gh80_1800` - `evyd13/gh80_3700` - `evyd13/minitomic` - `evyd13/mx5160` - `evyd13/nt750` - `evyd13/nt980` - `evyd13/omrontkl` - `evyd13/quackfire` - `evyd13/solheim68` - `evyd13/ta65` - `evyd13/wasdat_code` - `exclusive/e65` - `exclusive/e7v1` - `exclusive/e7v1se` - `exclusive/e85/hotswap` - `exclusive/e85/soldered` --- keyboards/e88/config.h | 38 ------------------ keyboards/e88/keyboard.json | 6 +++ keyboards/ealdin/quadrant/config.h | 5 --- keyboards/ealdin/quadrant/keyboard.json | 6 +++ keyboards/earth_rover/config.h | 39 ------------------- keyboards/earth_rover/keyboard.json | 6 +++ keyboards/eco/config.h | 39 ------------------- keyboards/eco/info.json | 8 +++- keyboards/edc40/config.h | 19 --------- keyboards/edc40/keyboard.json | 6 +++ keyboards/edi/standaside/config.h | 24 ------------ keyboards/edi/standaside/keyboard.json | 6 +++ keyboards/eek/config.h | 39 ------------------- keyboards/eek/info.json | 6 +++ keyboards/ein_60/config.h | 5 --- keyboards/ein_60/keyboard.json | 6 +++ keyboards/eniigmakeyboards/ek65/config.h | 39 ------------------- keyboards/eniigmakeyboards/ek65/keyboard.json | 6 +++ keyboards/eniigmakeyboards/ek87/config.h | 39 ------------------- keyboards/eniigmakeyboards/ek87/keyboard.json | 6 +++ keyboards/ep/96/config.h | 39 ------------------- keyboards/ep/96/keyboard.json | 6 +++ keyboards/ep/comsn/hs68/config.h | 23 ----------- keyboards/ep/comsn/hs68/keyboard.json | 6 +++ keyboards/ep/comsn/mollydooker/config.h | 39 ------------------- keyboards/ep/comsn/mollydooker/keyboard.json | 6 +++ keyboards/ep/comsn/tf_longeboye/config.h | 23 ----------- keyboards/ep/comsn/tf_longeboye/keyboard.json | 6 +++ keyboards/ergodox_ez/config.h | 5 --- keyboards/ergodox_ez/info.json | 6 +++ keyboards/ergotravel/rev1/config.h | 39 ------------------- keyboards/ergotravel/rev1/keyboard.json | 6 +++ keyboards/eternal_keypad/config.h | 39 ------------------- keyboards/eternal_keypad/keyboard.json | 6 +++ keyboards/evil80/config.h | 23 ----------- keyboards/evil80/keyboard.json | 6 +++ keyboards/evolv/config.h | 39 ------------------- keyboards/evolv/keyboard.json | 6 +++ keyboards/evyd13/atom47/rev2/config.h | 23 ----------- keyboards/evyd13/atom47/rev2/keyboard.json | 6 +++ keyboards/evyd13/atom47/rev5/config.h | 5 --- keyboards/evyd13/atom47/rev5/keyboard.json | 6 +++ keyboards/evyd13/eon65/config.h | 38 ------------------ keyboards/evyd13/eon65/keyboard.json | 6 +++ keyboards/evyd13/eon75/config.h | 38 ------------------ keyboards/evyd13/eon75/keyboard.json | 6 +++ keyboards/evyd13/eon87/config.h | 38 ------------------ keyboards/evyd13/eon87/keyboard.json | 6 +++ keyboards/evyd13/eon95/config.h | 38 ------------------ keyboards/evyd13/eon95/keyboard.json | 6 +++ keyboards/evyd13/gh80_1800/config.h | 38 ------------------ keyboards/evyd13/gh80_1800/keyboard.json | 6 +++ keyboards/evyd13/gh80_3700/config.h | 38 ------------------ keyboards/evyd13/gh80_3700/keyboard.json | 6 +++ keyboards/evyd13/minitomic/config.h | 38 ------------------ keyboards/evyd13/minitomic/keyboard.json | 6 +++ keyboards/evyd13/mx5160/config.h | 38 ------------------ keyboards/evyd13/mx5160/keyboard.json | 6 +++ keyboards/evyd13/nt750/config.h | 39 ------------------- keyboards/evyd13/nt750/keyboard.json | 6 +++ keyboards/evyd13/nt980/config.h | 39 ------------------- keyboards/evyd13/nt980/keyboard.json | 6 +++ keyboards/evyd13/omrontkl/config.h | 38 ------------------ keyboards/evyd13/omrontkl/keyboard.json | 6 +++ keyboards/evyd13/quackfire/config.h | 39 ------------------- keyboards/evyd13/quackfire/keyboard.json | 6 +++ keyboards/evyd13/solheim68/config.h | 38 ------------------ keyboards/evyd13/solheim68/keyboard.json | 6 +++ keyboards/evyd13/ta65/config.h | 23 ----------- keyboards/evyd13/ta65/keyboard.json | 6 +++ keyboards/evyd13/wasdat_code/config.h | 5 --- keyboards/evyd13/wasdat_code/keyboard.json | 6 +++ keyboards/exclusive/e65/config.h | 23 ----------- keyboards/exclusive/e65/keyboard.json | 6 +++ keyboards/exclusive/e7v1/config.h | 7 ---- keyboards/exclusive/e7v1/keyboard.json | 6 +++ keyboards/exclusive/e7v1se/config.h | 39 ------------------- keyboards/exclusive/e7v1se/keyboard.json | 6 +++ keyboards/exclusive/e85/config.h | 39 ------------------- keyboards/exclusive/e85/hotswap/keyboard.json | 6 +++ .../exclusive/e85/soldered/keyboard.json | 6 +++ 81 files changed, 247 insertions(+), 1217 deletions(-) delete mode 100644 keyboards/e88/config.h delete mode 100644 keyboards/earth_rover/config.h delete mode 100644 keyboards/eco/config.h delete mode 100644 keyboards/edc40/config.h delete mode 100644 keyboards/edi/standaside/config.h delete mode 100644 keyboards/eek/config.h delete mode 100644 keyboards/eniigmakeyboards/ek65/config.h delete mode 100644 keyboards/eniigmakeyboards/ek87/config.h delete mode 100644 keyboards/ep/96/config.h delete mode 100644 keyboards/ep/comsn/hs68/config.h delete mode 100644 keyboards/ep/comsn/mollydooker/config.h delete mode 100644 keyboards/ep/comsn/tf_longeboye/config.h delete mode 100644 keyboards/ergotravel/rev1/config.h delete mode 100644 keyboards/eternal_keypad/config.h delete mode 100644 keyboards/evil80/config.h delete mode 100644 keyboards/evolv/config.h delete mode 100644 keyboards/evyd13/atom47/rev2/config.h delete mode 100644 keyboards/evyd13/eon65/config.h delete mode 100644 keyboards/evyd13/eon75/config.h delete mode 100644 keyboards/evyd13/eon87/config.h delete mode 100644 keyboards/evyd13/eon95/config.h delete mode 100644 keyboards/evyd13/gh80_1800/config.h delete mode 100644 keyboards/evyd13/gh80_3700/config.h delete mode 100644 keyboards/evyd13/minitomic/config.h delete mode 100644 keyboards/evyd13/mx5160/config.h delete mode 100644 keyboards/evyd13/nt750/config.h delete mode 100644 keyboards/evyd13/nt980/config.h delete mode 100644 keyboards/evyd13/omrontkl/config.h delete mode 100644 keyboards/evyd13/quackfire/config.h delete mode 100644 keyboards/evyd13/solheim68/config.h delete mode 100644 keyboards/evyd13/ta65/config.h delete mode 100644 keyboards/exclusive/e65/config.h delete mode 100644 keyboards/exclusive/e7v1/config.h delete mode 100644 keyboards/exclusive/e7v1se/config.h delete mode 100644 keyboards/exclusive/e85/config.h diff --git a/keyboards/e88/config.h b/keyboards/e88/config.h deleted file mode 100644 index 230ff5e311e..00000000000 --- a/keyboards/e88/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/e88/keyboard.json b/keyboards/e88/keyboard.json index 4d3fe72caa6..32ee42aefd4 100644 --- a/keyboards/e88/keyboard.json +++ b/keyboards/e88/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D0", "D1", "D2", "D3", "B3", "B2", "B1", "E6", "D5", "D6", "D4"], "rows": ["B7", "D7", "B4", "C6", "B5", "B6"] diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h index bce1fbc662e..64c816e57ef 100644 --- a/keyboards/ealdin/quadrant/config.h +++ b/keyboards/ealdin/quadrant/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/ealdin/quadrant/keyboard.json b/keyboards/ealdin/quadrant/keyboard.json index 12ef41c41bd..9f7a6143d2f 100644 --- a/keyboards/ealdin/quadrant/keyboard.json +++ b/keyboards/ealdin/quadrant/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B7", "F6", "F5", "F4"], "rows": ["B2", "F7", "B3", "B6", "B1"] diff --git a/keyboards/earth_rover/config.h b/keyboards/earth_rover/config.h deleted file mode 100644 index e03d0cfcbb8..00000000000 --- a/keyboards/earth_rover/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 k.bigwheel - -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/earth_rover/keyboard.json b/keyboards/earth_rover/keyboard.json index 0ab2cb08a0c..0c760f612cd 100644 --- a/keyboards/earth_rover/keyboard.json +++ b/keyboards/earth_rover/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/eco/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/eco/info.json b/keyboards/eco/info.json index 6a1b2adda1b..1bb5c79eb20 100644 --- a/keyboards/eco/info.json +++ b/keyboards/eco/info.json @@ -8,5 +8,11 @@ "pid": "0x6006" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + } } diff --git a/keyboards/edc40/config.h b/keyboards/edc40/config.h deleted file mode 100644 index 55d7cb23a71..00000000000 --- a/keyboards/edc40/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 OJtheTiny - * - * 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 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/edc40/keyboard.json b/keyboards/edc40/keyboard.json index 304fb3f1123..7ad2fdd3b85 100644 --- a/keyboards/edc40/keyboard.json +++ b/keyboards/edc40/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "B4", "B5"], "rows": ["D4", "D6", "D7", "F7"] diff --git a/keyboards/edi/standaside/config.h b/keyboards/edi/standaside/config.h deleted file mode 100644 index 7caa265c1a1..00000000000 --- a/keyboards/edi/standaside/config.h +++ /dev/null @@ -1,24 +0,0 @@ - - -#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/edi/standaside/keyboard.json b/keyboards/edi/standaside/keyboard.json index ccfa5cf1da7..410f8f693a6 100644 --- a/keyboards/edi/standaside/keyboard.json +++ b/keyboards/edi/standaside/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["D1", "F4", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h deleted file mode 100644 index 95a2527d403..00000000000 --- a/keyboards/eek/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 klackygears - -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/eek/info.json b/keyboards/eek/info.json index 0caca6df3bd..86ff2843470 100644 --- a/keyboards/eek/info.json +++ b/keyboards/eek/info.json @@ -24,6 +24,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h index ccb31b8612a..18b19202d7a 100644 --- a/keyboards/ein_60/config.h +++ b/keyboards/ein_60/config.h @@ -28,8 +28,3 @@ along with this program. If not, see . # define AUDIO_CLICKY # define AUDIO_DAC_SAMPLE_MAX 4095U #endif - -/* 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/ein_60/keyboard.json b/keyboards/ein_60/keyboard.json index cb84c45095f..a7902af490e 100644 --- a/keyboards/ein_60/keyboard.json +++ b/keyboards/ein_60/keyboard.json @@ -46,6 +46,12 @@ "nkro": false, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A3", "A2", "A1", "A0", "F6", "F5", "F0", "E0", "E1", "C0", "C1", "C2", "C3"], "rows": ["F1", "F2", "F3", "F4"] diff --git a/keyboards/eniigmakeyboards/ek65/config.h b/keyboards/eniigmakeyboards/ek65/config.h deleted file mode 100644 index 5bb07f46312..00000000000 --- a/keyboards/eniigmakeyboards/ek65/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 adamws - -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/eniigmakeyboards/ek65/keyboard.json b/keyboards/eniigmakeyboards/ek65/keyboard.json index 129a73e5651..fa6ad3566ad 100644 --- a/keyboards/eniigmakeyboards/ek65/keyboard.json +++ b/keyboards/eniigmakeyboards/ek65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "E6", "B2", "B1", "B0"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/eniigmakeyboards/ek87/config.h b/keyboards/eniigmakeyboards/ek87/config.h deleted file mode 100644 index 5bb07f46312..00000000000 --- a/keyboards/eniigmakeyboards/ek87/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 adamws - -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/eniigmakeyboards/ek87/keyboard.json b/keyboards/eniigmakeyboards/ek87/keyboard.json index 553c34ac53e..900a74a4b62 100644 --- a/keyboards/eniigmakeyboards/ek87/keyboard.json +++ b/keyboards/eniigmakeyboards/ek87/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "F0", "F1", "E6", "D3", "D2", "D1"], "rows": ["B0", "B1", "B2", "B3", "B7", "D0"] diff --git a/keyboards/ep/96/config.h b/keyboards/ep/96/config.h deleted file mode 100644 index 8b29e416c80..00000000000 --- a/keyboards/ep/96/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Elliot Powell - -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/ep/96/keyboard.json b/keyboards/ep/96/keyboard.json index a6708a3a80b..cd267eda898 100644 --- a/keyboards/ep/96/keyboard.json +++ b/keyboards/ep/96/keyboard.json @@ -15,6 +15,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["B0", "B1", "B3", "B2", "B7", "C6"] diff --git a/keyboards/ep/comsn/hs68/config.h b/keyboards/ep/comsn/hs68/config.h deleted file mode 100644 index a86557f6cec..00000000000 --- a/keyboards/ep/comsn/hs68/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Elliot Powell - -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 diff --git a/keyboards/ep/comsn/hs68/keyboard.json b/keyboards/ep/comsn/hs68/keyboard.json index 80ebbcf9a87..d87b2741447 100644 --- a/keyboards/ep/comsn/hs68/keyboard.json +++ b/keyboards/ep/comsn/hs68/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B3", "B2", "B7", "D3", "F1", "D5", "D6", "D7", "F4", "F5", "C7", "C6", "F0"], "rows": ["B6", "B5", "B4", "D0", "F6"] diff --git a/keyboards/ep/comsn/mollydooker/config.h b/keyboards/ep/comsn/mollydooker/config.h deleted file mode 100644 index d5971524a69..00000000000 --- a/keyboards/ep/comsn/mollydooker/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Elliot Powell - -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/ep/comsn/mollydooker/keyboard.json b/keyboards/ep/comsn/mollydooker/keyboard.json index dd5f9e6739a..d54920df6ba 100644 --- a/keyboards/ep/comsn/mollydooker/keyboard.json +++ b/keyboards/ep/comsn/mollydooker/keyboard.json @@ -16,6 +16,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "B2", "B3", "E6", "B7", "F1", "F0", "D0", "D1", "D7", "D5", "D4", "D6", "B4", "B5", "D3", "B6", "C6", "C7"], "rows": ["F4", "F5", "F6", "F7", "D2"] diff --git a/keyboards/ep/comsn/tf_longeboye/config.h b/keyboards/ep/comsn/tf_longeboye/config.h deleted file mode 100644 index a86557f6cec..00000000000 --- a/keyboards/ep/comsn/tf_longeboye/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Elliot Powell - -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 diff --git a/keyboards/ep/comsn/tf_longeboye/keyboard.json b/keyboards/ep/comsn/tf_longeboye/keyboard.json index deb00d24061..73a18c1ebb9 100644 --- a/keyboards/ep/comsn/tf_longeboye/keyboard.json +++ b/keyboards/ep/comsn/tf_longeboye/keyboard.json @@ -15,6 +15,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "C7", "D5", "B7", "E6", "D7", "C6", "D4", "D0"], "rows": ["B5", "B4", "D1", "D2", "D3"] diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h index 3688e007854..b57968b81b9 100644 --- a/keyboards/ergodox_ez/config.h +++ b/keyboards/ergodox_ez/config.h @@ -44,11 +44,6 @@ along with this program. If not, see . #define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED #define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX -/* 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 - /* key combination for command */ #define IS_COMMAND() ( \ get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json index a560e97a0b5..f7b20b19e07 100644 --- a/keyboards/ergodox_ez/info.json +++ b/keyboards/ergodox_ez/info.json @@ -6,6 +6,12 @@ "vid": "0x3297", "device_version": "0.0.1" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "hue_steps": 12, "brightness_steps": 12, diff --git a/keyboards/ergotravel/rev1/config.h b/keyboards/ergotravel/rev1/config.h deleted file mode 100644 index 790a2696fbe..00000000000 --- a/keyboards/ergotravel/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Pierre Constantineau - -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/ergotravel/rev1/keyboard.json b/keyboards/ergotravel/rev1/keyboard.json index 14c645d2f0c..7a6710c7bd8 100644 --- a/keyboards/ergotravel/rev1/keyboard.json +++ b/keyboards/ergotravel/rev1/keyboard.json @@ -32,6 +32,12 @@ "command": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h deleted file mode 100644 index e2e4c258cc4..00000000000 --- a/keyboards/eternal_keypad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 duckyb - -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/eternal_keypad/keyboard.json b/keyboards/eternal_keypad/keyboard.json index c35a66986d7..f50f235c981 100644 --- a/keyboards/eternal_keypad/keyboard.json +++ b/keyboards/eternal_keypad/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["B5", "B4", "E6", "D7", "C6"] diff --git a/keyboards/evil80/config.h b/keyboards/evil80/config.h deleted file mode 100644 index a559a9698ef..00000000000 --- a/keyboards/evil80/config.h +++ /dev/null @@ -1,23 +0,0 @@ -#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/evil80/keyboard.json b/keyboards/evil80/keyboard.json index 68e99167843..9610718b342 100644 --- a/keyboards/evil80/keyboard.json +++ b/keyboards/evil80/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B1", "C6", "C7", "E6", "F6", "F7"], "rows": ["F1", "F4", "F5", "F0", "B3", "B0"] diff --git a/keyboards/evolv/config.h b/keyboards/evolv/config.h deleted file mode 100644 index f962b74196e..00000000000 --- a/keyboards/evolv/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - Copyright 2020 Á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/evolv/keyboard.json b/keyboards/evolv/keyboard.json index ab4ccfd9d79..8373bbb5365 100644 --- a/keyboards/evolv/keyboard.json +++ b/keyboards/evolv/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A6", "A5", "A4", "A3", "A2", "A1", "A0", "C14", "F0", "C15", "B9", "B8", "B7", "B6", "B5", "B4"], "rows": ["B10", "B11", "A7", "B0", "B1", "B2"] diff --git a/keyboards/evyd13/atom47/rev2/config.h b/keyboards/evyd13/atom47/rev2/config.h deleted file mode 100644 index e14ecadbf09..00000000000 --- a/keyboards/evyd13/atom47/rev2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Evelien Dekkers - -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 diff --git a/keyboards/evyd13/atom47/rev2/keyboard.json b/keyboards/evyd13/atom47/rev2/keyboard.json index 62927b70a36..6466c1b7b81 100644 --- a/keyboards/evyd13/atom47/rev2/keyboard.json +++ b/keyboards/evyd13/atom47/rev2/keyboard.json @@ -40,6 +40,12 @@ "extrakey": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_split_space" }, diff --git a/keyboards/evyd13/atom47/rev5/config.h b/keyboards/evyd13/atom47/rev5/config.h index 83d433f08d1..117eb270578 100644 --- a/keyboards/evyd13/atom47/rev5/config.h +++ b/keyboards/evyd13/atom47/rev5/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/evyd13/atom47/rev5/keyboard.json b/keyboards/evyd13/atom47/rev5/keyboard.json index c002dcb18c0..074d34ab437 100644 --- a/keyboards/evyd13/atom47/rev5/keyboard.json +++ b/keyboards/evyd13/atom47/rev5/keyboard.json @@ -55,6 +55,12 @@ "extrakey": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_split_space" }, diff --git a/keyboards/evyd13/eon65/config.h b/keyboards/evyd13/eon65/config.h deleted file mode 100644 index 230ff5e311e..00000000000 --- a/keyboards/evyd13/eon65/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/evyd13/eon65/keyboard.json b/keyboards/evyd13/eon65/keyboard.json index 66bae813826..05506e0ea8c 100644 --- a/keyboards/evyd13/eon65/keyboard.json +++ b/keyboards/evyd13/eon65/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "D2", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D3", "D5", "B1", "B2", "B3"] diff --git a/keyboards/evyd13/eon75/config.h b/keyboards/evyd13/eon75/config.h deleted file mode 100644 index 230ff5e311e..00000000000 --- a/keyboards/evyd13/eon75/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/evyd13/eon75/keyboard.json b/keyboards/evyd13/eon75/keyboard.json index 9908f4a9cc1..fe6ee01832c 100644 --- a/keyboards/evyd13/eon75/keyboard.json +++ b/keyboards/evyd13/eon75/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B3"], "rows": ["D1", "D0", "D3", "D2", "D6", "D4", "D7", "B4", "B5", "B6", "C6", "C7"] diff --git a/keyboards/evyd13/eon87/config.h b/keyboards/evyd13/eon87/config.h deleted file mode 100644 index 230ff5e311e..00000000000 --- a/keyboards/evyd13/eon87/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/evyd13/eon87/keyboard.json b/keyboards/evyd13/eon87/keyboard.json index ad0d42eaf93..a0d73d442ee 100644 --- a/keyboards/evyd13/eon87/keyboard.json +++ b/keyboards/evyd13/eon87/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "E6", "B7", "D3", "D2"], "rows": ["B1", "B2", "B3", "D4", "D1", "D5"] diff --git a/keyboards/evyd13/eon95/config.h b/keyboards/evyd13/eon95/config.h deleted file mode 100644 index 230ff5e311e..00000000000 --- a/keyboards/evyd13/eon95/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/evyd13/eon95/keyboard.json b/keyboards/evyd13/eon95/keyboard.json index 6b5ee8f191b..20be437ea1b 100644 --- a/keyboards/evyd13/eon95/keyboard.json +++ b/keyboards/evyd13/eon95/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "B1"], "rows": ["D1", "D0", "D3", "D2", "D6", "D4", "D7", "B4", "B5", "B6", "C6", "C7"] diff --git a/keyboards/evyd13/gh80_1800/config.h b/keyboards/evyd13/gh80_1800/config.h deleted file mode 100644 index 4183c7db05e..00000000000 --- a/keyboards/evyd13/gh80_1800/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 Evy Dekkers - * - * 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/evyd13/gh80_1800/keyboard.json b/keyboards/evyd13/gh80_1800/keyboard.json index 3200086a171..4fb513cc3c4 100644 --- a/keyboards/evyd13/gh80_1800/keyboard.json +++ b/keyboards/evyd13/gh80_1800/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D3", "D2", "D1", "D0", "B7"], "rows": ["D5", "B4", "B5", "B6", "C6", "C7", "B0", "B2", "B1", "B3"] diff --git a/keyboards/evyd13/gh80_3700/config.h b/keyboards/evyd13/gh80_3700/config.h deleted file mode 100644 index 4183c7db05e..00000000000 --- a/keyboards/evyd13/gh80_3700/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 Evy Dekkers - * - * 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/evyd13/gh80_3700/keyboard.json b/keyboards/evyd13/gh80_3700/keyboard.json index fee94f3a55f..fa11a482df0 100644 --- a/keyboards/evyd13/gh80_3700/keyboard.json +++ b/keyboards/evyd13/gh80_3700/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "D7", "D6", "D4"], "rows": ["B3", "C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/evyd13/minitomic/config.h b/keyboards/evyd13/minitomic/config.h deleted file mode 100644 index 230ff5e311e..00000000000 --- a/keyboards/evyd13/minitomic/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/evyd13/minitomic/keyboard.json b/keyboards/evyd13/minitomic/keyboard.json index 4bf23b1a564..7a8d6d8c234 100644 --- a/keyboards/evyd13/minitomic/keyboard.json +++ b/keyboards/evyd13/minitomic/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4", "D7", "F0", "F1", "F4", "F5", "F6", "F7", "B7", "E6"], "rows": ["B1", "B3", "D4", "D6"] diff --git a/keyboards/evyd13/mx5160/config.h b/keyboards/evyd13/mx5160/config.h deleted file mode 100644 index 230ff5e311e..00000000000 --- a/keyboards/evyd13/mx5160/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/evyd13/mx5160/keyboard.json b/keyboards/evyd13/mx5160/keyboard.json index 5b430797ec7..b50f6130cec 100644 --- a/keyboards/evyd13/mx5160/keyboard.json +++ b/keyboards/evyd13/mx5160/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["C6", "C7", "B5", "B6", "D7", "B4", "D4", "D6", "D5", "D3"] diff --git a/keyboards/evyd13/nt750/config.h b/keyboards/evyd13/nt750/config.h deleted file mode 100644 index f64827d05f1..00000000000 --- a/keyboards/evyd13/nt750/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Evy Dekkers - -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/evyd13/nt750/keyboard.json b/keyboards/evyd13/nt750/keyboard.json index 5ead6193dea..03c76f10406 100644 --- a/keyboards/evyd13/nt750/keyboard.json +++ b/keyboards/evyd13/nt750/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B1", "B0"], "rows": ["B2", "B3", "B7", "D0", "D1", "D2"] diff --git a/keyboards/evyd13/nt980/config.h b/keyboards/evyd13/nt980/config.h deleted file mode 100644 index f64827d05f1..00000000000 --- a/keyboards/evyd13/nt980/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Evy Dekkers - -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/evyd13/nt980/keyboard.json b/keyboards/evyd13/nt980/keyboard.json index 307f35cecc1..65ba93d73d3 100644 --- a/keyboards/evyd13/nt980/keyboard.json +++ b/keyboards/evyd13/nt980/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "D3", "D2"], "rows": ["B0", "B1", "D1", "D0", "C6", "C7", "B5", "B6", "B4", "D7", "D4", "D6"] diff --git a/keyboards/evyd13/omrontkl/config.h b/keyboards/evyd13/omrontkl/config.h deleted file mode 100644 index 230ff5e311e..00000000000 --- a/keyboards/evyd13/omrontkl/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/evyd13/omrontkl/keyboard.json b/keyboards/evyd13/omrontkl/keyboard.json index 28f59b4f537..1ea340acaaf 100644 --- a/keyboards/evyd13/omrontkl/keyboard.json +++ b/keyboards/evyd13/omrontkl/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "C7", "F1", "C6", "F4", "B6", "F5", "B5", "F6", "B4", "F7", "D7", "D6", "D5", "B3", "B1", "B2"], "rows": ["D0", "D1", "D2", "D3", "D4", "B7"] diff --git a/keyboards/evyd13/quackfire/config.h b/keyboards/evyd13/quackfire/config.h deleted file mode 100644 index f64827d05f1..00000000000 --- a/keyboards/evyd13/quackfire/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Evy Dekkers - -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/evyd13/quackfire/keyboard.json b/keyboards/evyd13/quackfire/keyboard.json index a0d0e819fa5..85c2ae81fbc 100644 --- a/keyboards/evyd13/quackfire/keyboard.json +++ b/keyboards/evyd13/quackfire/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "F1", "B1", "D5", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D3", "F5", "F4", "F0", "B7", "B2", "E6", "B0"] diff --git a/keyboards/evyd13/solheim68/config.h b/keyboards/evyd13/solheim68/config.h deleted file mode 100644 index 82eff7341c7..00000000000 --- a/keyboards/evyd13/solheim68/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 Dekkers - * - * 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/evyd13/solheim68/keyboard.json b/keyboards/evyd13/solheim68/keyboard.json index d48281763e8..9e04b9caab9 100644 --- a/keyboards/evyd13/solheim68/keyboard.json +++ b/keyboards/evyd13/solheim68/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["E6", "B0", "B1", "B2", "B3"] diff --git a/keyboards/evyd13/ta65/config.h b/keyboards/evyd13/ta65/config.h deleted file mode 100644 index 28be4f1a5b4..00000000000 --- a/keyboards/evyd13/ta65/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Evy Dekkers - -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 diff --git a/keyboards/evyd13/ta65/keyboard.json b/keyboards/evyd13/ta65/keyboard.json index 97090c611cb..1f58de02003 100644 --- a/keyboards/evyd13/ta65/keyboard.json +++ b/keyboards/evyd13/ta65/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D1", "D0", "D3", "D5", "C7", "C6", "B6", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "B0"], "rows": ["B4", "D7", "D6", "D4", "B3"] diff --git a/keyboards/evyd13/wasdat_code/config.h b/keyboards/evyd13/wasdat_code/config.h index 769751b19d8..5254d35e463 100644 --- a/keyboards/evyd13/wasdat_code/config.h +++ b/keyboards/evyd13/wasdat_code/config.h @@ -38,11 +38,6 @@ along with this program. If not, see . #define SN74X138_ADDRESS_PINS { D2, D1, D0 } #define SN74X138_E3_PIN D4 -/* 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. diff --git a/keyboards/evyd13/wasdat_code/keyboard.json b/keyboards/evyd13/wasdat_code/keyboard.json index 8c1bb52b6bf..836047cdf1a 100644 --- a/keyboards/evyd13/wasdat_code/keyboard.json +++ b/keyboards/evyd13/wasdat_code/keyboard.json @@ -39,6 +39,12 @@ "nkro": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["fullsize_ansi", "fullsize_iso", "tkl_ansi", "tkl_iso"], "layout_aliases": { "LAYOUT_all": "LAYOUT_fullsize_iso" diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h deleted file mode 100644 index b7e8690b3cc..00000000000 --- a/keyboards/exclusive/e65/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2019 Brice Figureau - * - * 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 diff --git a/keyboards/exclusive/e65/keyboard.json b/keyboards/exclusive/e65/keyboard.json index 14bed7b7651..9735155abe4 100644 --- a/keyboards/exclusive/e65/keyboard.json +++ b/keyboards/exclusive/e65/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/exclusive/e7v1/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/exclusive/e7v1/keyboard.json b/keyboards/exclusive/e7v1/keyboard.json index c6efe800b4f..ac0eb5549ab 100644 --- a/keyboards/exclusive/e7v1/keyboard.json +++ b/keyboards/exclusive/e7v1/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7", "F1"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5"] diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h deleted file mode 100644 index f6e1e895abd..00000000000 --- a/keyboards/exclusive/e7v1se/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Bart Riemens - -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/exclusive/e7v1se/keyboard.json b/keyboards/exclusive/e7v1se/keyboard.json index 6dcb6ac8664..4cd9484ae4b 100644 --- a/keyboards/exclusive/e7v1se/keyboard.json +++ b/keyboards/exclusive/e7v1se/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0", "D7", "D6", "D4", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F4"], "rows": ["E6", "B0", "B1", "B2", "B3", "F0"] diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h deleted file mode 100644 index 0ccb642711a..00000000000 --- a/keyboards/exclusive/e85/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 MechMerlin - -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/exclusive/e85/hotswap/keyboard.json b/keyboards/exclusive/e85/hotswap/keyboard.json index c64509496aa..4bd8e738829 100644 --- a/keyboards/exclusive/e85/hotswap/keyboard.json +++ b/keyboards/exclusive/e85/hotswap/keyboard.json @@ -49,6 +49,12 @@ "command": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/exclusive/e85/soldered/keyboard.json b/keyboards/exclusive/e85/soldered/keyboard.json index 5f7458e851b..8b4ebbfc575 100644 --- a/keyboards/exclusive/e85/soldered/keyboard.json +++ b/keyboards/exclusive/e85/soldered/keyboard.json @@ -49,6 +49,12 @@ "command": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, From b7b4ffc44974e8f8c65bf54b32a8fc8f1b2ee043 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 20 May 2024 12:55:19 -0700 Subject: [PATCH 292/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: A-C, Part 3 (#23747) Affects: - `ck60i` - `coarse/cordillera` - `contender` - `converter/a1200/mistress1200` - `converter/adb_usb` - `converter/m0110_usb` - `converter/siemens_tastatur` - `cool836a` - `copenhagen_click/click_pad_v1` - `coseyfannitutti/discipad` - `coseyfannitutti/discipline` - `coseyfannitutti/mysterium` - `coseyfannitutti/romeo` - `cozykeys/bloomer` - `cozykeys/speedo/v2` - `cozykeys/speedo/v3` - `craftwalk` - `crawlpad` - `crazy_keyboard_68` - `crbn` - `creatkeebs/glacier` - `crimsonkeyboards/resume1800` - `crin` - `cutie_club/borsdorf` - `cutie_club/fidelity` - `cutie_club/giant_macro_pad` - `cutie_club/keebcats/denis` - `cutie_club/keebcats/dougal` - `cutie_club/novus` - `cutie_club/wraith` --- keyboards/ck60i/config.h | 5 --- keyboards/ck60i/keyboard.json | 6 +++ keyboards/coarse/cordillera/config.h | 5 --- keyboards/coarse/cordillera/keyboard.json | 6 +++ keyboards/contender/config.h | 39 ------------------- keyboards/contender/keyboard.json | 6 +++ .../converter/a1200/mistress1200/config.h | 2 - keyboards/converter/adb_usb/config.h | 5 --- keyboards/converter/adb_usb/info.json | 6 +++ keyboards/converter/m0110_usb/config.h | 5 --- keyboards/converter/m0110_usb/keyboard.json | 6 +++ keyboards/converter/siemens_tastatur/config.h | 6 --- .../converter/siemens_tastatur/keyboard.json | 6 +++ keyboards/cool836a/config.h | 39 ------------------- keyboards/cool836a/keyboard.json | 6 +++ .../copenhagen_click/click_pad_v1/config.h | 39 ------------------- .../click_pad_v1/keyboard.json | 6 +++ keyboards/coseyfannitutti/discipad/config.h | 39 ------------------- .../coseyfannitutti/discipad/keyboard.json | 6 +++ keyboards/coseyfannitutti/discipline/config.h | 38 ------------------ .../coseyfannitutti/discipline/keyboard.json | 6 +++ keyboards/coseyfannitutti/mysterium/config.h | 38 ------------------ .../coseyfannitutti/mysterium/keyboard.json | 6 +++ keyboards/coseyfannitutti/romeo/config.h | 39 ------------------- keyboards/coseyfannitutti/romeo/keyboard.json | 6 +++ keyboards/cozykeys/bloomer/config.h | 22 ----------- keyboards/cozykeys/bloomer/info.json | 6 +++ keyboards/cozykeys/speedo/v2/config.h | 22 ----------- keyboards/cozykeys/speedo/v2/keyboard.json | 6 +++ keyboards/cozykeys/speedo/v3/config.h | 22 ----------- keyboards/cozykeys/speedo/v3/keyboard.json | 6 +++ keyboards/craftwalk/config.h | 39 ------------------- keyboards/craftwalk/keyboard.json | 6 +++ keyboards/crawlpad/config.h | 6 --- keyboards/crawlpad/keyboard.json | 6 +++ keyboards/crazy_keyboard_68/config.h | 39 ------------------- keyboards/crazy_keyboard_68/keyboard.json | 6 +++ keyboards/crbn/config.h | 23 ----------- keyboards/crbn/keyboard.json | 6 +++ keyboards/creatkeebs/glacier/config.h | 23 ----------- keyboards/creatkeebs/glacier/keyboard.json | 6 +++ .../crimsonkeyboards/resume1800/config.h | 38 ------------------ .../crimsonkeyboards/resume1800/keyboard.json | 6 +++ keyboards/crin/config.h | 21 ---------- keyboards/crin/keyboard.json | 6 +++ keyboards/cutie_club/borsdorf/config.h | 23 ----------- keyboards/cutie_club/borsdorf/keyboard.json | 6 +++ keyboards/cutie_club/fidelity/config.h | 20 ---------- keyboards/cutie_club/fidelity/keyboard.json | 6 +++ keyboards/cutie_club/giant_macro_pad/config.h | 22 ----------- .../cutie_club/giant_macro_pad/keyboard.json | 6 +++ keyboards/cutie_club/keebcats/denis/config.h | 22 ----------- .../cutie_club/keebcats/denis/keyboard.json | 6 +++ keyboards/cutie_club/keebcats/dougal/config.h | 22 ----------- .../cutie_club/keebcats/dougal/keyboard.json | 6 +++ keyboards/cutie_club/novus/config.h | 23 ----------- keyboards/cutie_club/novus/keyboard.json | 6 +++ keyboards/cutie_club/wraith/config.h | 39 ------------------- keyboards/cutie_club/wraith/keyboard.json | 6 +++ 59 files changed, 174 insertions(+), 725 deletions(-) delete mode 100644 keyboards/contender/config.h delete mode 100644 keyboards/cool836a/config.h delete mode 100755 keyboards/copenhagen_click/click_pad_v1/config.h delete mode 100644 keyboards/coseyfannitutti/discipad/config.h delete mode 100644 keyboards/coseyfannitutti/discipline/config.h delete mode 100644 keyboards/coseyfannitutti/mysterium/config.h delete mode 100644 keyboards/coseyfannitutti/romeo/config.h delete mode 100644 keyboards/cozykeys/bloomer/config.h delete mode 100644 keyboards/cozykeys/speedo/v2/config.h delete mode 100644 keyboards/cozykeys/speedo/v3/config.h delete mode 100644 keyboards/craftwalk/config.h delete mode 100644 keyboards/crazy_keyboard_68/config.h delete mode 100644 keyboards/crbn/config.h delete mode 100644 keyboards/creatkeebs/glacier/config.h delete mode 100644 keyboards/crimsonkeyboards/resume1800/config.h delete mode 100644 keyboards/crin/config.h delete mode 100644 keyboards/cutie_club/borsdorf/config.h delete mode 100644 keyboards/cutie_club/fidelity/config.h delete mode 100755 keyboards/cutie_club/giant_macro_pad/config.h delete mode 100644 keyboards/cutie_club/keebcats/denis/config.h delete mode 100644 keyboards/cutie_club/keebcats/dougal/config.h delete mode 100644 keyboards/cutie_club/novus/config.h delete mode 100644 keyboards/cutie_club/wraith/config.h diff --git a/keyboards/ck60i/config.h b/keyboards/ck60i/config.h index 7506922b008..efc249f466e 100644 --- a/keyboards/ck60i/config.h +++ b/keyboards/ck60i/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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. diff --git a/keyboards/ck60i/keyboard.json b/keyboards/ck60i/keyboard.json index 62ddd817288..72b57598a4e 100644 --- a/keyboards/ck60i/keyboard.json +++ b/keyboards/ck60i/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B12", "A2", "A1", "A0", "F1", "F0", "B11", "B10", "B2", "B1", "B0", "A7", "C15", "C14"], "rows": ["B9", "C13", "A3", "B14", "A8"] diff --git a/keyboards/coarse/cordillera/config.h b/keyboards/coarse/cordillera/config.h index 4282937c7cd..3d552b3f19c 100644 --- a/keyboards/coarse/cordillera/config.h +++ b/keyboards/coarse/cordillera/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 -/* 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. diff --git a/keyboards/coarse/cordillera/keyboard.json b/keyboards/coarse/cordillera/keyboard.json index de78b3027c2..33e0ac06c0b 100644 --- a/keyboards/coarse/cordillera/keyboard.json +++ b/keyboards/coarse/cordillera/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["A13", "B9", "F1", "A10", "A9"] diff --git a/keyboards/contender/config.h b/keyboards/contender/config.h deleted file mode 100644 index 4254bdc63c3..00000000000 --- a/keyboards/contender/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 sotoba - -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/contender/keyboard.json b/keyboards/contender/keyboard.json index 5bef1f0633c..2e5ef844124 100644 --- a/keyboards/contender/keyboard.json +++ b/keyboards/contender/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "D6", "B3", "B0", "B1"], "rows": ["D4", "D3", "B5", "B7", "B4", "B2"] diff --git a/keyboards/converter/a1200/mistress1200/config.h b/keyboards/converter/a1200/mistress1200/config.h index bc137dc1856..1e86b7c7072 100644 --- a/keyboards/converter/a1200/mistress1200/config.h +++ b/keyboards/converter/a1200/mistress1200/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#undef LOCKING_SUPPORT_ENABLE -#undef LOCKING_RESYNC_ENABLE #define LAYER_STATE_8BIT /* disable action features */ diff --git a/keyboards/converter/adb_usb/config.h b/keyboards/converter/adb_usb/config.h index b6eb105bbd5..ac1bfbe2f70 100644 --- a/keyboards/converter/adb_usb/config.h +++ b/keyboards/converter/adb_usb/config.h @@ -23,11 +23,6 @@ Ported to QMK by Peter Roe #define MATRIX_ROWS 16 // keycode bit: 3-0 #define MATRIX_COLS 8 // keycode bit: 6-4 -/* 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 - /* ADB port setting */ #define ADB_PORT PORTD #define ADB_PIN PIND diff --git a/keyboards/converter/adb_usb/info.json b/keyboards/converter/adb_usb/info.json index 47467a97c72..3fbe2c0c74e 100644 --- a/keyboards/converter/adb_usb/info.json +++ b/keyboards/converter/adb_usb/info.json @@ -13,6 +13,12 @@ "mousekey": false, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_ext_ansi": { "layout": [ diff --git a/keyboards/converter/m0110_usb/config.h b/keyboards/converter/m0110_usb/config.h index 62fdaf0869c..a3b56ed9d10 100644 --- a/keyboards/converter/m0110_usb/config.h +++ b/keyboards/converter/m0110_usb/config.h @@ -25,11 +25,6 @@ Ported to QMK by Techsock #define MATRIX_ROWS 14 #define MATRIX_COLS 8 -/* 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 - /* magic key */ #define IS_COMMAND() ( \ get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LGUI)) || \ diff --git a/keyboards/converter/m0110_usb/keyboard.json b/keyboards/converter/m0110_usb/keyboard.json index 522f83caba1..11b83bbb18d 100644 --- a/keyboards/converter/m0110_usb/keyboard.json +++ b/keyboards/converter/m0110_usb/keyboard.json @@ -17,6 +17,12 @@ "extrakey": true, "usb_hid": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/converter/siemens_tastatur/config.h b/keyboards/converter/siemens_tastatur/config.h index 49725a9592b..cdd98443447 100644 --- a/keyboards/converter/siemens_tastatur/config.h +++ b/keyboards/converter/siemens_tastatur/config.h @@ -21,12 +21,6 @@ along with this program. If not, see . #define MATRIX_ROWS 5 #define MATRIX_COLS 19 -/* 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. diff --git a/keyboards/converter/siemens_tastatur/keyboard.json b/keyboards/converter/siemens_tastatur/keyboard.json index 639859f2081..710a2902cbf 100644 --- a/keyboards/converter/siemens_tastatur/keyboard.json +++ b/keyboards/converter/siemens_tastatur/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cool836a/config.h b/keyboards/cool836a/config.h deleted file mode 100644 index 886f8a69f1d..00000000000 --- a/keyboards/cool836a/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Ohashi - -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/cool836a/keyboard.json b/keyboards/cool836a/keyboard.json index 18dd9cfcdc9..3d32f45c9d5 100644 --- a/keyboards/cool836a/keyboard.json +++ b/keyboards/cool836a/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D0", "B2", "C6", "D7", "E6"], "rows": ["D1", "B5", "B4", "F4", "B1", "B6"] diff --git a/keyboards/copenhagen_click/click_pad_v1/config.h b/keyboards/copenhagen_click/click_pad_v1/config.h deleted file mode 100755 index 970e69e7f62..00000000000 --- a/keyboards/copenhagen_click/click_pad_v1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 mini-ninja-64 - -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/copenhagen_click/click_pad_v1/keyboard.json b/keyboards/copenhagen_click/click_pad_v1/keyboard.json index 1c402db576b..d84630cfbc9 100755 --- a/keyboards/copenhagen_click/click_pad_v1/keyboard.json +++ b/keyboards/copenhagen_click/click_pad_v1/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5"], "rows": ["F7"] diff --git a/keyboards/coseyfannitutti/discipad/config.h b/keyboards/coseyfannitutti/discipad/config.h deleted file mode 100644 index 31a3fe8cb01..00000000000 --- a/keyboards/coseyfannitutti/discipad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 coseyfannitutti - -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/coseyfannitutti/discipad/keyboard.json b/keyboards/coseyfannitutti/discipad/keyboard.json index a169863dba2..5c491876e4e 100644 --- a/keyboards/coseyfannitutti/discipad/keyboard.json +++ b/keyboards/coseyfannitutti/discipad/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C0", "C1", "C2", "C3"], "rows": ["B1", "B0", "D7", "D6", "D4"] diff --git a/keyboards/coseyfannitutti/discipline/config.h b/keyboards/coseyfannitutti/discipline/config.h deleted file mode 100644 index 0acee7345a5..00000000000 --- a/keyboards/coseyfannitutti/discipline/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/*Copyright 2019 coseyfannitutti - -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/coseyfannitutti/discipline/keyboard.json b/keyboards/coseyfannitutti/discipline/keyboard.json index 1fb94c7052c..26c5f95bb4e 100644 --- a/keyboards/coseyfannitutti/discipline/keyboard.json +++ b/keyboards/coseyfannitutti/discipline/keyboard.json @@ -21,6 +21,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_65_ansi_2_right_mods": "LAYOUT_65_ansi_blocker", "LAYOUT_65_iso_2_right_mods": "LAYOUT_65_iso_blocker", diff --git a/keyboards/coseyfannitutti/mysterium/config.h b/keyboards/coseyfannitutti/mysterium/config.h deleted file mode 100644 index 0acee7345a5..00000000000 --- a/keyboards/coseyfannitutti/mysterium/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/*Copyright 2019 coseyfannitutti - -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/coseyfannitutti/mysterium/keyboard.json b/keyboards/coseyfannitutti/mysterium/keyboard.json index 0d75d192293..ae6adf0ae69 100644 --- a/keyboards/coseyfannitutti/mysterium/keyboard.json +++ b/keyboards/coseyfannitutti/mysterium/keyboard.json @@ -20,6 +20,12 @@ "mousekey": false, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/coseyfannitutti/romeo/config.h b/keyboards/coseyfannitutti/romeo/config.h deleted file mode 100644 index 31a3fe8cb01..00000000000 --- a/keyboards/coseyfannitutti/romeo/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 coseyfannitutti - -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/coseyfannitutti/romeo/keyboard.json b/keyboards/coseyfannitutti/romeo/keyboard.json index 5392cf00f1a..260589889a4 100644 --- a/keyboards/coseyfannitutti/romeo/keyboard.json +++ b/keyboards/coseyfannitutti/romeo/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C5", "C4", "C3", "D0", "C2", "D1", "C1", "C0", "D4", "B0", "D7", "D6"], "rows": ["B1", "B4", "B3", "B2"] diff --git a/keyboards/cozykeys/bloomer/config.h b/keyboards/cozykeys/bloomer/config.h deleted file mode 100644 index 922dec71d15..00000000000 --- a/keyboards/cozykeys/bloomer/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2021 Paul Ewing - -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 diff --git a/keyboards/cozykeys/bloomer/info.json b/keyboards/cozykeys/bloomer/info.json index dd0232bbcb5..37a80f8fb44 100644 --- a/keyboards/cozykeys/bloomer/info.json +++ b/keyboards/cozykeys/bloomer/info.json @@ -7,6 +7,12 @@ "vid": "0xFEED", "pid": "0x1191" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/cozykeys/speedo/v2/config.h b/keyboards/cozykeys/speedo/v2/config.h deleted file mode 100644 index 2643e4de4a1..00000000000 --- a/keyboards/cozykeys/speedo/v2/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 Paul Ewing - -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 diff --git a/keyboards/cozykeys/speedo/v2/keyboard.json b/keyboards/cozykeys/speedo/v2/keyboard.json index 48412e7e7d6..69dd33d6b6e 100644 --- a/keyboards/cozykeys/speedo/v2/keyboard.json +++ b/keyboards/cozykeys/speedo/v2/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "D0", "B7", "B3", "B2", "B1", "B0"], "rows": ["D1", "D2", "D3", "C6", "C7"] diff --git a/keyboards/cozykeys/speedo/v3/config.h b/keyboards/cozykeys/speedo/v3/config.h deleted file mode 100644 index 2643e4de4a1..00000000000 --- a/keyboards/cozykeys/speedo/v3/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 Paul Ewing - -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 diff --git a/keyboards/cozykeys/speedo/v3/keyboard.json b/keyboards/cozykeys/speedo/v3/keyboard.json index c4aaaecb6d1..7e91058cd5e 100644 --- a/keyboards/cozykeys/speedo/v3/keyboard.json +++ b/keyboards/cozykeys/speedo/v3/keyboard.json @@ -43,6 +43,12 @@ "extrakey": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/craftwalk/config.h b/keyboards/craftwalk/config.h deleted file mode 100644 index 4254bdc63c3..00000000000 --- a/keyboards/craftwalk/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 sotoba - -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/craftwalk/keyboard.json b/keyboards/craftwalk/keyboard.json index 0458c8f8c46..8659bb42236 100644 --- a/keyboards/craftwalk/keyboard.json +++ b/keyboards/craftwalk/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "F7", "F5", "F4", "B2", "E6", "B4"], "rows": ["F6", "B3", "B5"] diff --git a/keyboards/crawlpad/config.h b/keyboards/crawlpad/config.h index cf006905ab2..6e1c5089781 100755 --- a/keyboards/crawlpad/config.h +++ b/keyboards/crawlpad/config.h @@ -3,12 +3,6 @@ /* Pins for custom per-row LEDs. Should be changed to use named pins. */ #define LED_ROW_PINS { 8, 9, 10, 11 } -/* 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 - /* key combination for command */ #define IS_COMMAND() ( \ false \ diff --git a/keyboards/crawlpad/keyboard.json b/keyboards/crawlpad/keyboard.json index 1e9bb74c765..d4f1c439715 100644 --- a/keyboards/crawlpad/keyboard.json +++ b/keyboards/crawlpad/keyboard.json @@ -34,6 +34,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "D5", "D6", "D7"], "rows": ["F0", "F1", "F4", "F5"] diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h deleted file mode 100644 index b5128c93651..00000000000 --- a/keyboards/crazy_keyboard_68/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 chent7 - -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/crazy_keyboard_68/keyboard.json b/keyboards/crazy_keyboard_68/keyboard.json index fa36b106be0..a53013bfb97 100644 --- a/keyboards/crazy_keyboard_68/keyboard.json +++ b/keyboards/crazy_keyboard_68/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F4"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/crbn/config.h b/keyboards/crbn/config.h deleted file mode 100644 index f7584af0bb2..00000000000 --- a/keyboards/crbn/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Harry Herring - * - * 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 diff --git a/keyboards/crbn/keyboard.json b/keyboards/crbn/keyboard.json index 63c82470471..9febd33ed6c 100644 --- a/keyboards/crbn/keyboard.json +++ b/keyboards/crbn/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2"], "rows": ["B3", "B1", "F7", "F6"] diff --git a/keyboards/creatkeebs/glacier/config.h b/keyboards/creatkeebs/glacier/config.h deleted file mode 100644 index 81016b23a03..00000000000 --- a/keyboards/creatkeebs/glacier/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2022 Tim (https://github.com/Timliuzhaolu) - * - * 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 diff --git a/keyboards/creatkeebs/glacier/keyboard.json b/keyboards/creatkeebs/glacier/keyboard.json index c6b5dccd2c1..61e6bd9136a 100644 --- a/keyboards/creatkeebs/glacier/keyboard.json +++ b/keyboards/creatkeebs/glacier/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "F6", "B0", "B6", "C6", "C7", "B1", "B2", "B3", "B7", "D3", "D2", "D1"], "rows": ["F0", "F1", "F4", "E6", "F5", "D0"] diff --git a/keyboards/crimsonkeyboards/resume1800/config.h b/keyboards/crimsonkeyboards/resume1800/config.h deleted file mode 100644 index bdc484a3b31..00000000000 --- a/keyboards/crimsonkeyboards/resume1800/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 CrimsonKeyboards - -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/crimsonkeyboards/resume1800/keyboard.json b/keyboards/crimsonkeyboards/resume1800/keyboard.json index f88b7032086..aa54b048018 100644 --- a/keyboards/crimsonkeyboards/resume1800/keyboard.json +++ b/keyboards/crimsonkeyboards/resume1800/keyboard.json @@ -25,6 +25,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_resume1800_ansi_all": "LAYOUT_ansi_all", "LAYOUT_resume1800_iso_all": "LAYOUT_iso_all" diff --git a/keyboards/crin/config.h b/keyboards/crin/config.h deleted file mode 100644 index 3fe5a403296..00000000000 --- a/keyboards/crin/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2020 KnoblesseOblige - -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 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/crin/keyboard.json b/keyboards/crin/keyboard.json index e6680219363..f54c1db1dc2 100644 --- a/keyboards/crin/keyboard.json +++ b/keyboards/crin/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "B3"], "rows": ["A9", "A8", "B15", "B14", "B13"] diff --git a/keyboards/cutie_club/borsdorf/config.h b/keyboards/cutie_club/borsdorf/config.h deleted file mode 100644 index c25df59397a..00000000000 --- a/keyboards/cutie_club/borsdorf/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 Cutie Club - -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 diff --git a/keyboards/cutie_club/borsdorf/keyboard.json b/keyboards/cutie_club/borsdorf/keyboard.json index ba3b6f8376e..30b5a74d64d 100644 --- a/keyboards/cutie_club/borsdorf/keyboard.json +++ b/keyboards/cutie_club/borsdorf/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0"], "rows": ["A15", "A14", "B12", "B5", "B4"] diff --git a/keyboards/cutie_club/fidelity/config.h b/keyboards/cutie_club/fidelity/config.h deleted file mode 100644 index 6615bd2ab72..00000000000 --- a/keyboards/cutie_club/fidelity/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2023 Cutie Club - * - * 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 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/cutie_club/fidelity/keyboard.json b/keyboards/cutie_club/fidelity/keyboard.json index 0b06e1e5672..47e7789506f 100644 --- a/keyboards/cutie_club/fidelity/keyboard.json +++ b/keyboards/cutie_club/fidelity/keyboard.json @@ -10,6 +10,12 @@ "command": false, "console": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "usb": { "vid": "0xFB9C", "pid": "0x4D1B", diff --git a/keyboards/cutie_club/giant_macro_pad/config.h b/keyboards/cutie_club/giant_macro_pad/config.h deleted file mode 100755 index c5eb6384a37..00000000000 --- a/keyboards/cutie_club/giant_macro_pad/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Cutie Club - * - * 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 diff --git a/keyboards/cutie_club/giant_macro_pad/keyboard.json b/keyboards/cutie_club/giant_macro_pad/keyboard.json index fc5ce85a2a8..f5cde334c04 100644 --- a/keyboards/cutie_club/giant_macro_pad/keyboard.json +++ b/keyboards/cutie_club/giant_macro_pad/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C9", "C8", "C7", "C6", "B15", "B14", "B13", "B12", "A8", "A15", "B9", "A2", "A1", "A0", "C3", "C2", "C1", "C0", "F1", "F0"], "rows": ["C10", "C11", "C12", "D2", "B3", "B4", "B5", "B6", "B7", "B8", "A3", "B2", "B1", "B0", "C5", "C4", "A7", "A6", "A5", "A4"] diff --git a/keyboards/cutie_club/keebcats/denis/config.h b/keyboards/cutie_club/keebcats/denis/config.h deleted file mode 100644 index c5eb6384a37..00000000000 --- a/keyboards/cutie_club/keebcats/denis/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Cutie Club - * - * 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 diff --git a/keyboards/cutie_club/keebcats/denis/keyboard.json b/keyboards/cutie_club/keebcats/denis/keyboard.json index 9f583d9797b..f9d06af12ad 100644 --- a/keyboards/cutie_club/keebcats/denis/keyboard.json +++ b/keyboards/cutie_club/keebcats/denis/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["B2", "D0", "F5", "F4", "F1"] diff --git a/keyboards/cutie_club/keebcats/dougal/config.h b/keyboards/cutie_club/keebcats/dougal/config.h deleted file mode 100644 index c5eb6384a37..00000000000 --- a/keyboards/cutie_club/keebcats/dougal/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Cutie Club - * - * 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 diff --git a/keyboards/cutie_club/keebcats/dougal/keyboard.json b/keyboards/cutie_club/keebcats/dougal/keyboard.json index 19a422b9ba5..915e3ad15c5 100644 --- a/keyboards/cutie_club/keebcats/dougal/keyboard.json +++ b/keyboards/cutie_club/keebcats/dougal/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "B7"], "rows": ["B2", "D0", "F5", "F4", "F1"] diff --git a/keyboards/cutie_club/novus/config.h b/keyboards/cutie_club/novus/config.h deleted file mode 100644 index 4c65b71f76e..00000000000 --- a/keyboards/cutie_club/novus/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 Cutie Club - -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 diff --git a/keyboards/cutie_club/novus/keyboard.json b/keyboards/cutie_club/novus/keyboard.json index 8738fcc32c8..97bb81a71f8 100644 --- a/keyboards/cutie_club/novus/keyboard.json +++ b/keyboards/cutie_club/novus/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "C6", "C7", "B2", "B3", "D0", "D1", "D2", "D3", "D7", "B4", "B5", "D5", "D4", "D6"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/cutie_club/wraith/config.h b/keyboards/cutie_club/wraith/config.h deleted file mode 100644 index 46a265902c4..00000000000 --- a/keyboards/cutie_club/wraith/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Amber Holly - -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/cutie_club/wraith/keyboard.json b/keyboards/cutie_club/wraith/keyboard.json index 6f217e420f3..7cc29caf25d 100644 --- a/keyboards/cutie_club/wraith/keyboard.json +++ b/keyboards/cutie_club/wraith/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7"] From 079ac7c1665c292ea086e8457d2a83dad805ea31 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 20 May 2024 13:00:35 -0700 Subject: [PATCH 293/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: A-C, Part 2 (#23746) Affects: - `chalice` - `charue/sunsetter_r2` - `checkerboards/axon40` - `checkerboards/candybar_ortho` - `checkerboards/g_idb60` - `checkerboards/nop60` - `checkerboards/phoenix45_ortho` - `checkerboards/plexus75` - `checkerboards/plexus75_he` - `checkerboards/pursuit40` - `checkerboards/quark` - `checkerboards/quark_lp` - `checkerboards/quark_plus` - `checkerboards/quark_squared` - `checkerboards/snop60` - `checkerboards/ud40_ortho_alt` - `cheshire/curiosity` - `chickenman/ciel` - `chlx/merro60` - `chlx/str_merro60` - `chosfox/cf81` - `citrus/erdnuss65` - `ckeys/handwire_101` - `ckeys/nakey` - `ckeys/obelus` - `ckeys/thedora` - `ckeys/washington` - `clueboard/2x1800/2018` - `clueboard/2x1800/2021` --- keyboards/chalice/config.h | 23 ----------- keyboards/chalice/keyboard.json | 6 +++ keyboards/charue/sunsetter_r2/config.h | 9 ----- keyboards/charue/sunsetter_r2/keyboard.json | 6 +++ keyboards/checkerboards/axon40/config.h | 23 ----------- keyboards/checkerboards/axon40/keyboard.json | 6 +++ .../checkerboards/candybar_ortho/config.h | 23 ----------- .../candybar_ortho/keyboard.json | 6 +++ keyboards/checkerboards/g_idb60/config.h | 24 ------------ keyboards/checkerboards/g_idb60/keyboard.json | 6 +++ keyboards/checkerboards/nop60/config.h | 24 ------------ keyboards/checkerboards/nop60/keyboard.json | 6 +++ .../checkerboards/phoenix45_ortho/config.h | 23 ----------- .../phoenix45_ortho/keyboard.json | 6 +++ keyboards/checkerboards/plexus75/config.h | 38 ------------------ .../checkerboards/plexus75/keyboard.json | 6 +++ keyboards/checkerboards/plexus75_he/config.h | 23 ----------- .../checkerboards/plexus75_he/keyboard.json | 6 +++ keyboards/checkerboards/pursuit40/config.h | 39 ------------------- .../checkerboards/pursuit40/keyboard.json | 6 +++ keyboards/checkerboards/quark/config.h | 23 ----------- keyboards/checkerboards/quark/keyboard.json | 6 +++ keyboards/checkerboards/quark_lp/config.h | 23 ----------- .../checkerboards/quark_lp/keyboard.json | 6 +++ keyboards/checkerboards/quark_plus/config.h | 23 ----------- .../checkerboards/quark_plus/keyboard.json | 6 +++ .../checkerboards/quark_squared/config.h | 23 ----------- .../checkerboards/quark_squared/keyboard.json | 6 +++ keyboards/checkerboards/snop60/config.h | 24 ------------ keyboards/checkerboards/snop60/keyboard.json | 6 +++ .../checkerboards/ud40_ortho_alt/config.h | 23 ----------- .../ud40_ortho_alt/keyboard.json | 6 +++ keyboards/cheshire/curiosity/config.h | 23 ----------- keyboards/cheshire/curiosity/keyboard.json | 6 +++ keyboards/chickenman/ciel/config.h | 39 ------------------- keyboards/chickenman/ciel/keyboard.json | 6 +++ keyboards/chlx/merro60/config.h | 5 --- keyboards/chlx/merro60/keyboard.json | 6 +++ keyboards/chlx/str_merro60/config.h | 5 --- keyboards/chlx/str_merro60/keyboard.json | 6 +++ keyboards/chosfox/cf81/config.h | 5 --- keyboards/chosfox/cf81/keyboard.json | 6 +++ keyboards/citrus/erdnuss65/config.h | 3 -- keyboards/citrus/erdnuss65/keyboard.json | 6 +++ keyboards/ckeys/handwire_101/config.h | 5 --- keyboards/ckeys/handwire_101/keyboard.json | 6 +++ keyboards/ckeys/nakey/config.h | 39 ------------------- keyboards/ckeys/nakey/keyboard.json | 6 +++ keyboards/ckeys/obelus/config.h | 5 --- keyboards/ckeys/obelus/keyboard.json | 6 +++ keyboards/ckeys/thedora/config.h | 5 --- keyboards/ckeys/thedora/keyboard.json | 6 +++ keyboards/ckeys/washington/config.h | 37 ------------------ keyboards/ckeys/washington/keyboard.json | 6 +++ keyboards/clueboard/2x1800/2018/config.h | 6 --- keyboards/clueboard/2x1800/2018/keyboard.json | 6 +++ keyboards/clueboard/2x1800/2021/config.h | 6 --- keyboards/clueboard/2x1800/2021/keyboard.json | 6 +++ 58 files changed, 174 insertions(+), 571 deletions(-) delete mode 100644 keyboards/chalice/config.h delete mode 100644 keyboards/charue/sunsetter_r2/config.h delete mode 100644 keyboards/checkerboards/axon40/config.h delete mode 100644 keyboards/checkerboards/candybar_ortho/config.h delete mode 100644 keyboards/checkerboards/g_idb60/config.h delete mode 100644 keyboards/checkerboards/nop60/config.h delete mode 100644 keyboards/checkerboards/phoenix45_ortho/config.h delete mode 100644 keyboards/checkerboards/plexus75/config.h delete mode 100644 keyboards/checkerboards/plexus75_he/config.h delete mode 100644 keyboards/checkerboards/pursuit40/config.h delete mode 100644 keyboards/checkerboards/quark/config.h delete mode 100644 keyboards/checkerboards/quark_lp/config.h delete mode 100644 keyboards/checkerboards/quark_plus/config.h delete mode 100644 keyboards/checkerboards/quark_squared/config.h delete mode 100644 keyboards/checkerboards/snop60/config.h delete mode 100644 keyboards/checkerboards/ud40_ortho_alt/config.h delete mode 100644 keyboards/cheshire/curiosity/config.h delete mode 100644 keyboards/chickenman/ciel/config.h delete mode 100644 keyboards/ckeys/nakey/config.h delete mode 100644 keyboards/ckeys/washington/config.h diff --git a/keyboards/chalice/config.h b/keyboards/chalice/config.h deleted file mode 100644 index f53b6e90992..00000000000 --- a/keyboards/chalice/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 null-ll - * Copyright 2021 Jels, Josh Johnson - * - * 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 diff --git a/keyboards/chalice/keyboard.json b/keyboards/chalice/keyboard.json index 9332431184f..b8b44369661 100644 --- a/keyboards/chalice/keyboard.json +++ b/keyboards/chalice/keyboard.json @@ -36,6 +36,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "C6", "B1", "D2", "E6", "B3", "D7"], "rows": ["F4", "D1", "D0", "F5", "D4", "F6", "B4", "B5", "B2", "B6"] diff --git a/keyboards/charue/sunsetter_r2/config.h b/keyboards/charue/sunsetter_r2/config.h deleted file mode 100644 index bb09fb145c7..00000000000 --- a/keyboards/charue/sunsetter_r2/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2022 Charue Design -// 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/charue/sunsetter_r2/keyboard.json b/keyboards/charue/sunsetter_r2/keyboard.json index b961c21e26c..b7b7cc8d92b 100644 --- a/keyboards/charue/sunsetter_r2/keyboard.json +++ b/keyboards/charue/sunsetter_r2/keyboard.json @@ -35,6 +35,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F7", "B1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["B3", "B2", "F4", "F5", "F6"] diff --git a/keyboards/checkerboards/axon40/config.h b/keyboards/checkerboards/axon40/config.h deleted file mode 100644 index 21d76ea1ac7..00000000000 --- a/keyboards/checkerboards/axon40/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Nathan Spears - * - * 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 diff --git a/keyboards/checkerboards/axon40/keyboard.json b/keyboards/checkerboards/axon40/keyboard.json index 8a3f0d58572..ca492690b9d 100644 --- a/keyboards/checkerboards/axon40/keyboard.json +++ b/keyboards/checkerboards/axon40/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "B7", "D4", "D6", "F0", "F1", "C6", "B6", "B5", "B4", "E6", "B0"], "rows": ["D2", "D3", "D1", "D5"] diff --git a/keyboards/checkerboards/candybar_ortho/config.h b/keyboards/checkerboards/candybar_ortho/config.h deleted file mode 100644 index e9b1b6d1052..00000000000 --- a/keyboards/checkerboards/candybar_ortho/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Nathan Spears - * - * 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 diff --git a/keyboards/checkerboards/candybar_ortho/keyboard.json b/keyboards/checkerboards/candybar_ortho/keyboard.json index 6067d1c2771..d7908a04f4d 100644 --- a/keyboards/checkerboards/candybar_ortho/keyboard.json +++ b/keyboards/checkerboards/candybar_ortho/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D0", "D1", "D2"], "rows": ["B4", "D4", "D7", "D6", "B5", "B6", "C7", "C6"] diff --git a/keyboards/checkerboards/g_idb60/config.h b/keyboards/checkerboards/g_idb60/config.h deleted file mode 100644 index 9b8adff3ecf..00000000000 --- a/keyboards/checkerboards/g_idb60/config.h +++ /dev/null @@ -1,24 +0,0 @@ - /* -Copyright 2021 Nathan Spears - - 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 diff --git a/keyboards/checkerboards/g_idb60/keyboard.json b/keyboards/checkerboards/g_idb60/keyboard.json index 7ef5a8e0cdc..b4fc0f9b6d9 100644 --- a/keyboards/checkerboards/g_idb60/keyboard.json +++ b/keyboards/checkerboards/g_idb60/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "C6", "C7", "D4", "F6", "F0", "B0", "F1", "F4", "F5", "D1", "D0", "D3", "D5"], "rows": ["D6", "D7", "B4", "B5", "F7"] diff --git a/keyboards/checkerboards/nop60/config.h b/keyboards/checkerboards/nop60/config.h deleted file mode 100644 index 9b8adff3ecf..00000000000 --- a/keyboards/checkerboards/nop60/config.h +++ /dev/null @@ -1,24 +0,0 @@ - /* -Copyright 2021 Nathan Spears - - 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 diff --git a/keyboards/checkerboards/nop60/keyboard.json b/keyboards/checkerboards/nop60/keyboard.json index f12b7a54d28..a07c2af3bc5 100644 --- a/keyboards/checkerboards/nop60/keyboard.json +++ b/keyboards/checkerboards/nop60/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "D0", "D7", "D3", "D4", "D5", "D6", "F7", "C7", "B4", "B6", "B5"], "rows": ["F0", "F1", "E6", "B7", "C6"] diff --git a/keyboards/checkerboards/phoenix45_ortho/config.h b/keyboards/checkerboards/phoenix45_ortho/config.h deleted file mode 100644 index 21d76ea1ac7..00000000000 --- a/keyboards/checkerboards/phoenix45_ortho/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Nathan Spears - * - * 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 diff --git a/keyboards/checkerboards/phoenix45_ortho/keyboard.json b/keyboards/checkerboards/phoenix45_ortho/keyboard.json index 43565b98529..ecec354c561 100644 --- a/keyboards/checkerboards/phoenix45_ortho/keyboard.json +++ b/keyboards/checkerboards/phoenix45_ortho/keyboard.json @@ -29,6 +29,12 @@ "unicode": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_ortho_2x225u": { "layout": [ diff --git a/keyboards/checkerboards/plexus75/config.h b/keyboards/checkerboards/plexus75/config.h deleted file mode 100644 index c71a85e7db8..00000000000 --- a/keyboards/checkerboards/plexus75/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 Nathan Spears - -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/checkerboards/plexus75/keyboard.json b/keyboards/checkerboards/plexus75/keyboard.json index 1757cdeb572..14bd4deb75f 100644 --- a/keyboards/checkerboards/plexus75/keyboard.json +++ b/keyboards/checkerboards/plexus75/keyboard.json @@ -39,6 +39,12 @@ "rgblight": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B0", "D1", "F7", "F6", "F5", "F4", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D2", "B3", "B1", "F1", "F0"] diff --git a/keyboards/checkerboards/plexus75_he/config.h b/keyboards/checkerboards/plexus75_he/config.h deleted file mode 100644 index 21d76ea1ac7..00000000000 --- a/keyboards/checkerboards/plexus75_he/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Nathan Spears - * - * 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 diff --git a/keyboards/checkerboards/plexus75_he/keyboard.json b/keyboards/checkerboards/plexus75_he/keyboard.json index c089e58e613..2da1bf34f39 100644 --- a/keyboards/checkerboards/plexus75_he/keyboard.json +++ b/keyboards/checkerboards/plexus75_he/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C4", "C5", "D3", "C7", "B7", "B6", "B5", "B4"], "rows": ["C2", "D0", "D1", "D2", "D6", "B0", "B3", "B2", "C6", "B1"] diff --git a/keyboards/checkerboards/pursuit40/config.h b/keyboards/checkerboards/pursuit40/config.h deleted file mode 100644 index 4552a750928..00000000000 --- a/keyboards/checkerboards/pursuit40/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2020 Nathan Spears - * - * 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/checkerboards/pursuit40/keyboard.json b/keyboards/checkerboards/pursuit40/keyboard.json index 6e65dde2f1c..974bab5c920 100644 --- a/keyboards/checkerboards/pursuit40/keyboard.json +++ b/keyboards/checkerboards/pursuit40/keyboard.json @@ -38,6 +38,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "E6", "B7", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D2", "D1", "F4", "F5"] diff --git a/keyboards/checkerboards/quark/config.h b/keyboards/checkerboards/quark/config.h deleted file mode 100644 index 876e59daa07..00000000000 --- a/keyboards/checkerboards/quark/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Nathan Spears - * - * 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 diff --git a/keyboards/checkerboards/quark/keyboard.json b/keyboards/checkerboards/quark/keyboard.json index 22fa758e7ed..4bb7c7fef7f 100644 --- a/keyboards/checkerboards/quark/keyboard.json +++ b/keyboards/checkerboards/quark/keyboard.json @@ -51,6 +51,12 @@ "unicode": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_ortho_5x12_2x225u": { diff --git a/keyboards/checkerboards/quark_lp/config.h b/keyboards/checkerboards/quark_lp/config.h deleted file mode 100644 index 21d76ea1ac7..00000000000 --- a/keyboards/checkerboards/quark_lp/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Nathan Spears - * - * 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 diff --git a/keyboards/checkerboards/quark_lp/keyboard.json b/keyboards/checkerboards/quark_lp/keyboard.json index 35b599879eb..59fda2efc8a 100644 --- a/keyboards/checkerboards/quark_lp/keyboard.json +++ b/keyboards/checkerboards/quark_lp/keyboard.json @@ -47,6 +47,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "B4", "B3", "B0", "D6", "D5", "D4", "D3", "D2", "D1", "D0"], "rows": ["C5", "C4", "C6", "C7"] diff --git a/keyboards/checkerboards/quark_plus/config.h b/keyboards/checkerboards/quark_plus/config.h deleted file mode 100644 index 07fe2e4c7b8..00000000000 --- a/keyboards/checkerboards/quark_plus/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2022 Nathan Spears - * - * 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 diff --git a/keyboards/checkerboards/quark_plus/keyboard.json b/keyboards/checkerboards/quark_plus/keyboard.json index 6e7f5a8cc28..311d21c219c 100644 --- a/keyboards/checkerboards/quark_plus/keyboard.json +++ b/keyboards/checkerboards/quark_plus/keyboard.json @@ -40,6 +40,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "D1", "D5", "D4", "D3", "D2"], "rows": ["B4", "B1", "C2", "D0", "D6", "B0", "B6", "B5"] diff --git a/keyboards/checkerboards/quark_squared/config.h b/keyboards/checkerboards/quark_squared/config.h deleted file mode 100644 index 21d76ea1ac7..00000000000 --- a/keyboards/checkerboards/quark_squared/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Nathan Spears - * - * 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 diff --git a/keyboards/checkerboards/quark_squared/keyboard.json b/keyboards/checkerboards/quark_squared/keyboard.json index e242bfc5d9a..efec5e50e75 100644 --- a/keyboards/checkerboards/quark_squared/keyboard.json +++ b/keyboards/checkerboards/quark_squared/keyboard.json @@ -51,6 +51,12 @@ "unicode": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_4_2x225u": { "layout": [ diff --git a/keyboards/checkerboards/snop60/config.h b/keyboards/checkerboards/snop60/config.h deleted file mode 100644 index e335720fd1e..00000000000 --- a/keyboards/checkerboards/snop60/config.h +++ /dev/null @@ -1,24 +0,0 @@ - /* -Copyright 2022 Nathan Spears - - 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 diff --git a/keyboards/checkerboards/snop60/keyboard.json b/keyboards/checkerboards/snop60/keyboard.json index 60b22caf76a..443c27d9b4f 100644 --- a/keyboards/checkerboards/snop60/keyboard.json +++ b/keyboards/checkerboards/snop60/keyboard.json @@ -60,6 +60,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_7u": "LAYOUT_60_ansi_tsangan_split_bs_rshift", "LAYOUT_2x3u": "LAYOUT_60_ansi_tsangan_split_bs_rshift_space" diff --git a/keyboards/checkerboards/ud40_ortho_alt/config.h b/keyboards/checkerboards/ud40_ortho_alt/config.h deleted file mode 100644 index 21d76ea1ac7..00000000000 --- a/keyboards/checkerboards/ud40_ortho_alt/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Nathan Spears - * - * 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 diff --git a/keyboards/checkerboards/ud40_ortho_alt/keyboard.json b/keyboards/checkerboards/ud40_ortho_alt/keyboard.json index 4e025c181fb..2aae3d1cc85 100644 --- a/keyboards/checkerboards/ud40_ortho_alt/keyboard.json +++ b/keyboards/checkerboards/ud40_ortho_alt/keyboard.json @@ -39,6 +39,12 @@ "rgblight": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B1", "F7", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6"], "rows": ["E6", "F0", "F1", "F4"] diff --git a/keyboards/cheshire/curiosity/config.h b/keyboards/cheshire/curiosity/config.h deleted file mode 100644 index 2687b628f58..00000000000 --- a/keyboards/cheshire/curiosity/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 zvecr - -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 diff --git a/keyboards/cheshire/curiosity/keyboard.json b/keyboards/cheshire/curiosity/keyboard.json index 09b01e896fe..679f2a45d1a 100644 --- a/keyboards/cheshire/curiosity/keyboard.json +++ b/keyboards/cheshire/curiosity/keyboard.json @@ -34,6 +34,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], "rows": ["B13", "B14", "A4", "A2", "A1"] diff --git a/keyboards/chickenman/ciel/config.h b/keyboards/chickenman/ciel/config.h deleted file mode 100644 index 2a4bb26963d..00000000000 --- a/keyboards/chickenman/ciel/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Koichi Katano, 2022 Ramon Imbao - -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/chickenman/ciel/keyboard.json b/keyboards/chickenman/ciel/keyboard.json index d6813a23aaf..554d41c3945 100644 --- a/keyboards/chickenman/ciel/keyboard.json +++ b/keyboards/chickenman/ciel/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D3", "D2", "D1", "D0", "C2"], "rows": ["C5", "C4", "B0", "C7", "B7"] diff --git a/keyboards/chlx/merro60/config.h b/keyboards/chlx/merro60/config.h index 18198a8bce8..c16e7f09f55 100644 --- a/keyboards/chlx/merro60/config.h +++ b/keyboards/chlx/merro60/config.h @@ -17,10 +17,5 @@ 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 - /* VIA related config */ #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/chlx/merro60/keyboard.json b/keyboards/chlx/merro60/keyboard.json index d34489607ac..700af7e7e74 100644 --- a/keyboards/chlx/merro60/keyboard.json +++ b/keyboards/chlx/merro60/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B7", "D1", "D0", "B0", "B1", "E6", "B2", "B3", "D2", "D7", "B4", "B6", "C6", "C7", "D6"], "rows": ["D4", "D5", "D3", "B5", "F4"] diff --git a/keyboards/chlx/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h index 763f2a4d5cc..2e886ebef5b 100644 --- a/keyboards/chlx/str_merro60/config.h +++ b/keyboards/chlx/str_merro60/config.h @@ -19,10 +19,5 @@ along with this program. If not, see . # define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 -/* 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 - /* VIA related config */ #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/chlx/str_merro60/keyboard.json b/keyboards/chlx/str_merro60/keyboard.json index 15903f2f6cb..cfd0286dd35 100644 --- a/keyboards/chlx/str_merro60/keyboard.json +++ b/keyboards/chlx/str_merro60/keyboard.json @@ -43,6 +43,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_default": "LAYOUT_all", "LAYOUT_hhkb": "LAYOUT_60_hhkb", diff --git a/keyboards/chosfox/cf81/config.h b/keyboards/chosfox/cf81/config.h index 71e783f2bcc..fea36a590c2 100644 --- a/keyboards/chosfox/cf81/config.h +++ b/keyboards/chosfox/cf81/config.h @@ -16,11 +16,6 @@ #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 - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/chosfox/cf81/keyboard.json b/keyboards/chosfox/cf81/keyboard.json index de125801b79..aae2421a034 100644 --- a/keyboards/chosfox/cf81/keyboard.json +++ b/keyboards/chosfox/cf81/keyboard.json @@ -28,6 +28,12 @@ "encoder": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": 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/citrus/erdnuss65/config.h b/keyboards/citrus/erdnuss65/config.h index 5e4a88b9e23..b2cc0677486 100644 --- a/keyboards/citrus/erdnuss65/config.h +++ b/keyboards/citrus/erdnuss65/config.h @@ -18,6 +18,3 @@ // The pin connected to the data pin of the LEDs #define RGBLIGHT_LAYERS//允许您定义可打开或关闭的照明层。非常适合显示当前键盘层或大写锁定状态。 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF//如果已定义，则即使 RGB 光源处于关闭状态，也会显示照明图层。 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE//尝试使开关状态与键盘指示灯状态保持一致 \ No newline at end of file diff --git a/keyboards/citrus/erdnuss65/keyboard.json b/keyboards/citrus/erdnuss65/keyboard.json index 4faaa054310..43b075e2c6a 100644 --- a/keyboards/citrus/erdnuss65/keyboard.json +++ b/keyboards/citrus/erdnuss65/keyboard.json @@ -11,6 +11,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B12", "B14", "B15", "B5", "B13", "B3", "B4", "B6", "A0", "A1", "A2", "A3", "A4", "A5", "B11"], "rows": ["B10", "B1", "B0", "A7", "A6"] diff --git a/keyboards/ckeys/handwire_101/config.h b/keyboards/ckeys/handwire_101/config.h index 95780766c57..d8c0c5d99d7 100755 --- a/keyboards/ckeys/handwire_101/config.h +++ b/keyboards/ckeys/handwire_101/config.h @@ -17,11 +17,6 @@ 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 - // Audio Click //#define AUDIO_CLICKY diff --git a/keyboards/ckeys/handwire_101/keyboard.json b/keyboards/ckeys/handwire_101/keyboard.json index f8e2b383c23..642d0d8a255 100644 --- a/keyboards/ckeys/handwire_101/keyboard.json +++ b/keyboards/ckeys/handwire_101/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/ckeys/nakey/config.h b/keyboards/ckeys/nakey/config.h deleted file mode 100644 index 60f42fbcda9..00000000000 --- a/keyboards/ckeys/nakey/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 James Underwood - -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/ckeys/nakey/keyboard.json b/keyboards/ckeys/nakey/keyboard.json index 1454858d9d4..85f744217fb 100644 --- a/keyboards/ckeys/nakey/keyboard.json +++ b/keyboards/ckeys/nakey/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3"], "rows": ["F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/ckeys/obelus/config.h b/keyboards/ckeys/obelus/config.h index 0588edea278..5c7585f5628 100644 --- a/keyboards/ckeys/obelus/config.h +++ b/keyboards/ckeys/obelus/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/ckeys/obelus/keyboard.json b/keyboards/ckeys/obelus/keyboard.json index 969e6a2d495..797bb870b9e 100644 --- a/keyboards/ckeys/obelus/keyboard.json +++ b/keyboards/ckeys/obelus/keyboard.json @@ -18,6 +18,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "B2", "B3"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/ckeys/thedora/config.h b/keyboards/ckeys/thedora/config.h index 8eaf7dc2f30..8dc681eccb2 100755 --- a/keyboards/ckeys/thedora/config.h +++ b/keyboards/ckeys/thedora/config.h @@ -16,11 +16,6 @@ #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 AUDIO_CLICKY #define DAC_SAMPLE_MAX 65535U diff --git a/keyboards/ckeys/thedora/keyboard.json b/keyboards/ckeys/thedora/keyboard.json index 08448e761c4..d287e81a0bc 100644 --- a/keyboards/ckeys/thedora/keyboard.json +++ b/keyboards/ckeys/thedora/keyboard.json @@ -19,6 +19,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B4", "B3", "B2", "B1", "B0"], "rows": ["A2", "A1", "A0", "B8"] diff --git a/keyboards/ckeys/washington/config.h b/keyboards/ckeys/washington/config.h deleted file mode 100644 index 1b4e5a6d87e..00000000000 --- a/keyboards/ckeys/washington/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -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/ckeys/washington/keyboard.json b/keyboards/ckeys/washington/keyboard.json index b6952fe44af..b410e16f930 100644 --- a/keyboards/ckeys/washington/keyboard.json +++ b/keyboards/ckeys/washington/keyboard.json @@ -19,6 +19,12 @@ "nkro": false, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "B1", "B3"], "rows": ["F4", "F5", "F6"] diff --git a/keyboards/clueboard/2x1800/2018/config.h b/keyboards/clueboard/2x1800/2018/config.h index 95cde576688..ac6f646c644 100644 --- a/keyboards/clueboard/2x1800/2018/config.h +++ b/keyboards/clueboard/2x1800/2018/config.h @@ -22,9 +22,3 @@ along with this program. If not, see . #define AUDIO_PIN_ALT B7 #define AUDIO_PIN C4 #define AUDIO_CLICKY - -/* 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/clueboard/2x1800/2018/keyboard.json b/keyboards/clueboard/2x1800/2018/keyboard.json index fe0b5210343..1a926c62b9a 100644 --- a/keyboards/clueboard/2x1800/2018/keyboard.json +++ b/keyboards/clueboard/2x1800/2018/keyboard.json @@ -15,6 +15,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "num_lock": "B4", "caps_lock": "B5", diff --git a/keyboards/clueboard/2x1800/2021/config.h b/keyboards/clueboard/2x1800/2021/config.h index eb4fd4bbf68..6cb7bd2c9fd 100644 --- a/keyboards/clueboard/2x1800/2021/config.h +++ b/keyboards/clueboard/2x1800/2021/config.h @@ -23,12 +23,6 @@ along with this program. If not, see . #define AUDIO_PIN C4 #define AUDIO_CLICKY -/* 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 - // Configure our MAX7219's //#define MAX7219_LOAD B0 //#define MAX7219_CONTROLLERS 4 diff --git a/keyboards/clueboard/2x1800/2021/keyboard.json b/keyboards/clueboard/2x1800/2021/keyboard.json index 8800d05cf2d..b87c9fd755f 100644 --- a/keyboards/clueboard/2x1800/2021/keyboard.json +++ b/keyboards/clueboard/2x1800/2021/keyboard.json @@ -13,6 +13,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "B5", "num_lock": "B4", From 3029a23cfa2c1fcaaad841542d09753512db25ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 21:01:20 +0100 Subject: [PATCH 294/333] Bump JamesIves/github-pages-deploy-action from 4.6.0 to 4.6.1 (#23752) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3f7fbbe7aff..a00e6616a64 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -37,7 +37,7 @@ jobs: qmk --verbose generate-docs - name: Deploy - uses: JamesIves/github-pages-deploy-action@v4.6.0 + uses: JamesIves/github-pages-deploy-action@v4.6.1 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BASE_BRANCH: master From 8ad2e307323415ac0a0198daf79223b3ae90de97 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 20 May 2024 13:07:40 -0700 Subject: [PATCH 295/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: A-C, Part 1 (#23745) Affects: - `atreus` - `cablecardesigns/cypher/rev6` - `caffeinated/serpent65` - `cannonkeys/adelie` - `cannonkeys/aella` - `cannonkeys/an_c` - `cannonkeys/atlas` - `cannonkeys/atlas_alps` - `cannonkeys/balance` - `cannonkeys/brutalv2_65` - `cannonkeys/chimera65` - `cannonkeys/cloudline` - `cannonkeys/crin` - `cannonkeys/db60` - `cannonkeys/devastatingtkl` - `cannonkeys/gentoo` - `cannonkeys/gentoo_hs` - `cannonkeys/hoodrowg` - `cannonkeys/instant60` - `cannonkeys/instant65` - `cannonkeys/iron165` - `cannonkeys/malicious_ergo` - `cannonkeys/obliterated75` - `cannonkeys/onyx` - `cannonkeys/ortho48` - `cannonkeys/ortho60` - `cannonkeys/ortho75` - `cannonkeys/practice60` - `cannonkeys/practice65` - `cannonkeys/rekt1800` - `cannonkeys/ripple` - `cannonkeys/sagittarius` - `cannonkeys/satisfaction75` - `cannonkeys/savage65` - `cannonkeys/tmov2` - `cannonkeys/tsukuyomi` - `cannonkeys/vicious40` - `capsunlocked/cu24` - `capsunlocked/cu65` - `capsunlocked/cu7` - `capsunlocked/cu75` - `capsunlocked/cu80/v1` --- keyboards/atreus/config.h | 38 ------------------ keyboards/atreus/info.json | 6 +++ .../cablecardesigns/cypher/rev6/config.h | 8 ---- .../cablecardesigns/cypher/rev6/keyboard.json | 6 +++ keyboards/caffeinated/serpent65/config.h | 39 ------------------- keyboards/caffeinated/serpent65/keyboard.json | 6 +++ keyboards/cannonkeys/adelie/config.h | 5 --- keyboards/cannonkeys/adelie/keyboard.json | 6 +++ keyboards/cannonkeys/aella/config.h | 39 ------------------- keyboards/cannonkeys/aella/keyboard.json | 6 +++ keyboards/cannonkeys/an_c/config.h | 5 --- keyboards/cannonkeys/an_c/keyboard.json | 6 +++ keyboards/cannonkeys/atlas/config.h | 5 --- keyboards/cannonkeys/atlas/keyboard.json | 6 +++ keyboards/cannonkeys/atlas_alps/config.h | 23 ----------- keyboards/cannonkeys/atlas_alps/keyboard.json | 6 +++ keyboards/cannonkeys/balance/config.h | 39 ------------------- keyboards/cannonkeys/balance/keyboard.json | 4 ++ keyboards/cannonkeys/brutalv2_65/config.h | 39 ------------------- .../cannonkeys/brutalv2_65/keyboard.json | 6 +++ keyboards/cannonkeys/chimera65/config.h | 5 --- keyboards/cannonkeys/chimera65/keyboard.json | 6 +++ keyboards/cannonkeys/cloudline/config.h | 5 --- keyboards/cannonkeys/cloudline/keyboard.json | 6 +++ keyboards/cannonkeys/crin/config.h | 5 --- keyboards/cannonkeys/crin/keyboard.json | 6 +++ keyboards/cannonkeys/db60/config.h | 5 --- keyboards/cannonkeys/db60/info.json | 6 +++ keyboards/cannonkeys/devastatingtkl/config.h | 5 --- .../cannonkeys/devastatingtkl/keyboard.json | 6 +++ keyboards/cannonkeys/gentoo/config.h | 39 ------------------- keyboards/cannonkeys/gentoo/keyboard.json | 6 +++ keyboards/cannonkeys/gentoo_hs/config.h | 39 ------------------- keyboards/cannonkeys/gentoo_hs/keyboard.json | 6 +++ keyboards/cannonkeys/hoodrowg/config.h | 5 --- keyboards/cannonkeys/hoodrowg/keyboard.json | 6 +++ keyboards/cannonkeys/instant60/config.h | 5 --- keyboards/cannonkeys/instant60/keyboard.json | 6 +++ keyboards/cannonkeys/instant65/config.h | 5 --- keyboards/cannonkeys/instant65/keyboard.json | 6 +++ keyboards/cannonkeys/iron165/config.h | 6 --- keyboards/cannonkeys/iron165/keyboard.json | 6 +++ keyboards/cannonkeys/malicious_ergo/config.h | 5 --- .../cannonkeys/malicious_ergo/keyboard.json | 6 +++ keyboards/cannonkeys/obliterated75/config.h | 5 --- .../cannonkeys/obliterated75/keyboard.json | 6 +++ keyboards/cannonkeys/onyx/config.h | 5 --- keyboards/cannonkeys/onyx/keyboard.json | 6 +++ keyboards/cannonkeys/ortho48/config.h | 5 --- keyboards/cannonkeys/ortho48/keyboard.json | 6 +++ keyboards/cannonkeys/ortho60/config.h | 5 --- keyboards/cannonkeys/ortho60/keyboard.json | 6 +++ keyboards/cannonkeys/ortho75/config.h | 5 --- keyboards/cannonkeys/ortho75/keyboard.json | 6 +++ keyboards/cannonkeys/practice60/config.h | 5 --- keyboards/cannonkeys/practice60/keyboard.json | 6 +++ keyboards/cannonkeys/practice65/config.h | 5 --- keyboards/cannonkeys/practice65/keyboard.json | 6 +++ keyboards/cannonkeys/rekt1800/config.h | 5 --- keyboards/cannonkeys/rekt1800/keyboard.json | 6 +++ keyboards/cannonkeys/ripple/config.h | 5 --- keyboards/cannonkeys/ripple/keyboard.json | 6 +++ keyboards/cannonkeys/sagittarius/config.h | 5 --- .../cannonkeys/sagittarius/keyboard.json | 6 +++ keyboards/cannonkeys/satisfaction75/config.h | 5 --- keyboards/cannonkeys/satisfaction75/info.json | 8 +++- keyboards/cannonkeys/savage65/config.h | 5 --- keyboards/cannonkeys/savage65/keyboard.json | 6 +++ keyboards/cannonkeys/tmov2/config.h | 5 --- keyboards/cannonkeys/tmov2/keyboard.json | 6 +++ keyboards/cannonkeys/tsukuyomi/config.h | 5 --- keyboards/cannonkeys/tsukuyomi/keyboard.json | 6 +++ keyboards/cannonkeys/vicious40/config.h | 5 --- keyboards/cannonkeys/vicious40/keyboard.json | 6 +++ keyboards/capsunlocked/cu24/config.h | 38 ------------------ keyboards/capsunlocked/cu24/keyboard.json | 6 +++ keyboards/capsunlocked/cu65/config.h | 39 ------------------- keyboards/capsunlocked/cu65/keyboard.json | 6 +++ keyboards/capsunlocked/cu7/config.h | 22 ----------- keyboards/capsunlocked/cu7/keyboard.json | 6 +++ keyboards/capsunlocked/cu75/config.h | 39 ------------------- keyboards/capsunlocked/cu75/keyboard.json | 6 +++ keyboards/capsunlocked/cu80/v1/config.h | 22 ----------- keyboards/capsunlocked/cu80/v1/keyboard.json | 6 +++ 84 files changed, 251 insertions(+), 605 deletions(-) delete mode 100644 keyboards/atreus/config.h delete mode 100644 keyboards/cablecardesigns/cypher/rev6/config.h delete mode 100644 keyboards/caffeinated/serpent65/config.h delete mode 100644 keyboards/cannonkeys/aella/config.h delete mode 100644 keyboards/cannonkeys/atlas_alps/config.h delete mode 100644 keyboards/cannonkeys/balance/config.h delete mode 100644 keyboards/cannonkeys/brutalv2_65/config.h delete mode 100644 keyboards/cannonkeys/gentoo/config.h delete mode 100644 keyboards/cannonkeys/gentoo_hs/config.h delete mode 100644 keyboards/capsunlocked/cu24/config.h delete mode 100644 keyboards/capsunlocked/cu65/config.h delete mode 100644 keyboards/capsunlocked/cu7/config.h delete mode 100644 keyboards/capsunlocked/cu75/config.h delete mode 100644 keyboards/capsunlocked/cu80/v1/config.h diff --git a/keyboards/atreus/config.h b/keyboards/atreus/config.h deleted file mode 100644 index c30966d9d2f..00000000000 --- a/keyboards/atreus/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 - * - * 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/atreus/info.json b/keyboards/atreus/info.json index ff1a77579ca..a0f592105f1 100644 --- a/keyboards/atreus/info.json +++ b/keyboards/atreus/info.json @@ -17,6 +17,12 @@ "pid": "0xA1E5", "device_version": "0.0.8" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cablecardesigns/cypher/rev6/config.h b/keyboards/cablecardesigns/cypher/rev6/config.h deleted file mode 100644 index 791ecc26877..00000000000 --- a/keyboards/cablecardesigns/cypher/rev6/config.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2022 Cable Car Designs (@westfoxtrot) -// 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/cablecardesigns/cypher/rev6/keyboard.json b/keyboards/cablecardesigns/cypher/rev6/keyboard.json index 57bd4356351..644f2f1aa69 100644 --- a/keyboards/cablecardesigns/cypher/rev6/keyboard.json +++ b/keyboards/cablecardesigns/cypher/rev6/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5", "B6", "B7", "B3", "B2", "B1", "F0"], "rows": ["B0", "F1", "F5", "F6", "F7", "D1", "F4", "D4", "C6", "C7"] diff --git a/keyboards/caffeinated/serpent65/config.h b/keyboards/caffeinated/serpent65/config.h deleted file mode 100644 index bb14ae71b11..00000000000 --- a/keyboards/caffeinated/serpent65/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 jrfhoutx - -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/caffeinated/serpent65/keyboard.json b/keyboards/caffeinated/serpent65/keyboard.json index f8c7a90ce9f..add48547204 100644 --- a/keyboards/caffeinated/serpent65/keyboard.json +++ b/keyboards/caffeinated/serpent65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "B14", "B15", "A8", "A9"], "rows": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B13", "B12"] diff --git a/keyboards/cannonkeys/adelie/config.h b/keyboards/cannonkeys/adelie/config.h index 9027c44df53..9d031073f8d 100644 --- a/keyboards/cannonkeys/adelie/config.h +++ b/keyboards/cannonkeys/adelie/config.h @@ -17,11 +17,6 @@ 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 - /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. * This is useful for the Windows task manager shortcut (ctrl+shift+esc). */ diff --git a/keyboards/cannonkeys/adelie/keyboard.json b/keyboards/cannonkeys/adelie/keyboard.json index f4d46b35d16..6b36af3082b 100644 --- a/keyboards/cannonkeys/adelie/keyboard.json +++ b/keyboards/cannonkeys/adelie/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B2"], "rows": ["F4", "F1", "B1", "B0"] diff --git a/keyboards/cannonkeys/aella/config.h b/keyboards/cannonkeys/aella/config.h deleted file mode 100644 index 4b007cf387e..00000000000 --- a/keyboards/cannonkeys/aella/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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/cannonkeys/aella/keyboard.json b/keyboards/cannonkeys/aella/keyboard.json index 54679d57921..b29a9e546de 100644 --- a/keyboards/cannonkeys/aella/keyboard.json +++ b/keyboards/cannonkeys/aella/keyboard.json @@ -23,6 +23,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/an_c/config.h b/keyboards/cannonkeys/an_c/config.h index f3d6237a78d..b8c68bc65d4 100644 --- a/keyboards/cannonkeys/an_c/config.h +++ b/keyboards/cannonkeys/an_c/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/an_c/keyboard.json b/keyboards/cannonkeys/an_c/keyboard.json index e1e18f51670..ea127998710 100644 --- a/keyboards/cannonkeys/an_c/keyboard.json +++ b/keyboards/cannonkeys/an_c/keyboard.json @@ -49,6 +49,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["60_ansi", "60_tsangan_hhkb"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/cannonkeys/atlas/config.h b/keyboards/cannonkeys/atlas/config.h index 38f684a8617..70a2d7fc634 100644 --- a/keyboards/cannonkeys/atlas/config.h +++ b/keyboards/cannonkeys/atlas/config.h @@ -17,11 +17,6 @@ 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/atlas/keyboard.json b/keyboards/cannonkeys/atlas/keyboard.json index 86eaec2d519..bdb7347af5e 100644 --- a/keyboards/cannonkeys/atlas/keyboard.json +++ b/keyboards/cannonkeys/atlas/keyboard.json @@ -36,6 +36,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "A15", "A10", "A9"], "rows": ["A8", "B14", "B12", "B4", "B3"] diff --git a/keyboards/cannonkeys/atlas_alps/config.h b/keyboards/cannonkeys/atlas_alps/config.h deleted file mode 100644 index 876e59daa07..00000000000 --- a/keyboards/cannonkeys/atlas_alps/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Nathan Spears - * - * 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 diff --git a/keyboards/cannonkeys/atlas_alps/keyboard.json b/keyboards/cannonkeys/atlas_alps/keyboard.json index 6f8c1305c38..39bfa968b9f 100644 --- a/keyboards/cannonkeys/atlas_alps/keyboard.json +++ b/keyboards/cannonkeys/atlas_alps/keyboard.json @@ -39,6 +39,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "C6", "D2", "E6", "C7", "B3", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B5", "B4", "D1", "D7", "D6"] diff --git a/keyboards/cannonkeys/balance/config.h b/keyboards/cannonkeys/balance/config.h deleted file mode 100644 index 4b007cf387e..00000000000 --- a/keyboards/cannonkeys/balance/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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/cannonkeys/balance/keyboard.json b/keyboards/cannonkeys/balance/keyboard.json index c7ecea37f8e..5aef1f7d5ba 100644 --- a/keyboards/cannonkeys/balance/keyboard.json +++ b/keyboards/cannonkeys/balance/keyboard.json @@ -19,6 +19,10 @@ ] }, "qmk": { + "locking": { + "enabled": true, + "resync": true + }, "tap_keycode_delay": 25 }, "indicators": { diff --git a/keyboards/cannonkeys/brutalv2_65/config.h b/keyboards/cannonkeys/brutalv2_65/config.h deleted file mode 100644 index ae9c049bc11..00000000000 --- a/keyboards/cannonkeys/brutalv2_65/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2022 Andrew Kannan - -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/cannonkeys/brutalv2_65/keyboard.json b/keyboards/cannonkeys/brutalv2_65/keyboard.json index 4cff1a7571f..496ea2066fa 100644 --- a/keyboards/cannonkeys/brutalv2_65/keyboard.json +++ b/keyboards/cannonkeys/brutalv2_65/keyboard.json @@ -27,6 +27,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": [ "65_ansi_blocker", "65_ansi_blocker_split_bs", diff --git a/keyboards/cannonkeys/chimera65/config.h b/keyboards/cannonkeys/chimera65/config.h index a47b76953a2..974ecf1c6c0 100644 --- a/keyboards/cannonkeys/chimera65/config.h +++ b/keyboards/cannonkeys/chimera65/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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. diff --git a/keyboards/cannonkeys/chimera65/keyboard.json b/keyboards/cannonkeys/chimera65/keyboard.json index 7cf30d2ea7b..d9b33085021 100644 --- a/keyboards/cannonkeys/chimera65/keyboard.json +++ b/keyboards/cannonkeys/chimera65/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "A5", "A4", "A3", "A2", "A1", "F0", "C15", "C14", "A9", "A8", "A10", "B3"], "rows": ["A13", "A14", "A15", "C13", "B8"] diff --git a/keyboards/cannonkeys/cloudline/config.h b/keyboards/cannonkeys/cloudline/config.h index 41e58784b48..2f601da00fb 100644 --- a/keyboards/cannonkeys/cloudline/config.h +++ b/keyboards/cannonkeys/cloudline/config.h @@ -7,11 +7,6 @@ #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/cloudline/keyboard.json b/keyboards/cannonkeys/cloudline/keyboard.json index ac1bca976b1..f0388cf8946 100644 --- a/keyboards/cannonkeys/cloudline/keyboard.json +++ b/keyboards/cannonkeys/cloudline/keyboard.json @@ -54,6 +54,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": [ "tkl_f13_ansi_tsangan", "tkl_f13_ansi_tsangan_split_bs_rshift", diff --git a/keyboards/cannonkeys/crin/config.h b/keyboards/cannonkeys/crin/config.h index d6e974b21d9..9617128befe 100644 --- a/keyboards/cannonkeys/crin/config.h +++ b/keyboards/cannonkeys/crin/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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. diff --git a/keyboards/cannonkeys/crin/keyboard.json b/keyboards/cannonkeys/crin/keyboard.json index f61d0e12e5b..d5f60a1c216 100644 --- a/keyboards/cannonkeys/crin/keyboard.json +++ b/keyboards/cannonkeys/crin/keyboard.json @@ -33,6 +33,12 @@ "nkro": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_all": "LAYOUT" }, diff --git a/keyboards/cannonkeys/db60/config.h b/keyboards/cannonkeys/db60/config.h index f3d6237a78d..b8c68bc65d4 100644 --- a/keyboards/cannonkeys/db60/config.h +++ b/keyboards/cannonkeys/db60/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json index 0c437ed921f..b369e628357 100644 --- a/keyboards/cannonkeys/db60/info.json +++ b/keyboards/cannonkeys/db60/info.json @@ -46,5 +46,11 @@ "nkro": true, "backlight": true, "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } } } diff --git a/keyboards/cannonkeys/devastatingtkl/config.h b/keyboards/cannonkeys/devastatingtkl/config.h index f3d6237a78d..b8c68bc65d4 100644 --- a/keyboards/cannonkeys/devastatingtkl/config.h +++ b/keyboards/cannonkeys/devastatingtkl/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/devastatingtkl/keyboard.json b/keyboards/cannonkeys/devastatingtkl/keyboard.json index 7acea3fe8b1..b4e8281b889 100644 --- a/keyboards/cannonkeys/devastatingtkl/keyboard.json +++ b/keyboards/cannonkeys/devastatingtkl/keyboard.json @@ -49,6 +49,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": [ "tkl_f13_ansi", "tkl_f13_ansi_split_bs_rshift", diff --git a/keyboards/cannonkeys/gentoo/config.h b/keyboards/cannonkeys/gentoo/config.h deleted file mode 100644 index ae9c049bc11..00000000000 --- a/keyboards/cannonkeys/gentoo/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2022 Andrew Kannan - -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/cannonkeys/gentoo/keyboard.json b/keyboards/cannonkeys/gentoo/keyboard.json index 3d8a4acac93..7aa76d5efc2 100644 --- a/keyboards/cannonkeys/gentoo/keyboard.json +++ b/keyboards/cannonkeys/gentoo/keyboard.json @@ -27,6 +27,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": [ "65_ansi", "65_ansi_split_bs", diff --git a/keyboards/cannonkeys/gentoo_hs/config.h b/keyboards/cannonkeys/gentoo_hs/config.h deleted file mode 100644 index 4b007cf387e..00000000000 --- a/keyboards/cannonkeys/gentoo_hs/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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/cannonkeys/gentoo_hs/keyboard.json b/keyboards/cannonkeys/gentoo_hs/keyboard.json index fa97ae58772..bef60fb5d7e 100644 --- a/keyboards/cannonkeys/gentoo_hs/keyboard.json +++ b/keyboards/cannonkeys/gentoo_hs/keyboard.json @@ -27,6 +27,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_default": "LAYOUT_65_ansi_rwkl" }, diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h index dabdb5ee30e..47aff1530bb 100644 --- a/keyboards/cannonkeys/hoodrowg/config.h +++ b/keyboards/cannonkeys/hoodrowg/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/cannonkeys/hoodrowg/keyboard.json b/keyboards/cannonkeys/hoodrowg/keyboard.json index 231b67e244f..971779411d4 100644 --- a/keyboards/cannonkeys/hoodrowg/keyboard.json +++ b/keyboards/cannonkeys/hoodrowg/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B4", "D7", "F5", "F6", "F7", "F4", "D2", "D0"], "rows": ["E6", "B7", "B0", "B1", "F1", "F0", "C6", "C7", "D4", "D6", "D5", "D3"] diff --git a/keyboards/cannonkeys/instant60/config.h b/keyboards/cannonkeys/instant60/config.h index f3d6237a78d..b8c68bc65d4 100644 --- a/keyboards/cannonkeys/instant60/config.h +++ b/keyboards/cannonkeys/instant60/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/instant60/keyboard.json b/keyboards/cannonkeys/instant60/keyboard.json index bca90e50157..3261a82f28b 100644 --- a/keyboards/cannonkeys/instant60/keyboard.json +++ b/keyboards/cannonkeys/instant60/keyboard.json @@ -49,6 +49,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["60_ansi", "60_tsangan_hhkb"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/cannonkeys/instant65/config.h b/keyboards/cannonkeys/instant65/config.h index 0b1e0948b31..55989a7676d 100644 --- a/keyboards/cannonkeys/instant65/config.h +++ b/keyboards/cannonkeys/instant65/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/instant65/keyboard.json b/keyboards/cannonkeys/instant65/keyboard.json index 63e84be0aa4..92af662b6e2 100644 --- a/keyboards/cannonkeys/instant65/keyboard.json +++ b/keyboards/cannonkeys/instant65/keyboard.json @@ -49,6 +49,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/iron165/config.h b/keyboards/cannonkeys/iron165/config.h index eb890c1cbf6..974ecf1c6c0 100644 --- a/keyboards/cannonkeys/iron165/config.h +++ b/keyboards/cannonkeys/iron165/config.h @@ -21,12 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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. diff --git a/keyboards/cannonkeys/iron165/keyboard.json b/keyboards/cannonkeys/iron165/keyboard.json index bc0c6af503b..e4569a7bd82 100644 --- a/keyboards/cannonkeys/iron165/keyboard.json +++ b/keyboards/cannonkeys/iron165/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A5", "B10", "A3", "A2", "B0", "A8", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["B12", "B13", "B14", "B15", "A1"] diff --git a/keyboards/cannonkeys/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h index f2314b6077d..8dce4c5c2e3 100644 --- a/keyboards/cannonkeys/malicious_ergo/config.h +++ b/keyboards/cannonkeys/malicious_ergo/config.h @@ -23,11 +23,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/malicious_ergo/keyboard.json b/keyboards/cannonkeys/malicious_ergo/keyboard.json index 3897aea08b9..e7bec98200f 100644 --- a/keyboards/cannonkeys/malicious_ergo/keyboard.json +++ b/keyboards/cannonkeys/malicious_ergo/keyboard.json @@ -55,6 +55,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/obliterated75/config.h b/keyboards/cannonkeys/obliterated75/config.h index 0b1e0948b31..55989a7676d 100644 --- a/keyboards/cannonkeys/obliterated75/config.h +++ b/keyboards/cannonkeys/obliterated75/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/obliterated75/keyboard.json b/keyboards/cannonkeys/obliterated75/keyboard.json index 19227c51507..2b57f9b4364 100644 --- a/keyboards/cannonkeys/obliterated75/keyboard.json +++ b/keyboards/cannonkeys/obliterated75/keyboard.json @@ -49,6 +49,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/onyx/config.h b/keyboards/cannonkeys/onyx/config.h index a47b76953a2..974ecf1c6c0 100644 --- a/keyboards/cannonkeys/onyx/config.h +++ b/keyboards/cannonkeys/onyx/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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. diff --git a/keyboards/cannonkeys/onyx/keyboard.json b/keyboards/cannonkeys/onyx/keyboard.json index 5ae7039049a..463ad72e239 100644 --- a/keyboards/cannonkeys/onyx/keyboard.json +++ b/keyboards/cannonkeys/onyx/keyboard.json @@ -29,6 +29,12 @@ "nkro": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/ortho48/config.h b/keyboards/cannonkeys/ortho48/config.h index 32412b1d544..63929b7aea6 100644 --- a/keyboards/cannonkeys/ortho48/config.h +++ b/keyboards/cannonkeys/ortho48/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 -/* 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 WS2812_SPI_DRIVER SPID2 /* diff --git a/keyboards/cannonkeys/ortho48/keyboard.json b/keyboards/cannonkeys/ortho48/keyboard.json index facd47633d0..2e045c183ec 100644 --- a/keyboards/cannonkeys/ortho48/keyboard.json +++ b/keyboards/cannonkeys/ortho48/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "B14", "A15", "A0", "C15", "C14"], "rows": ["B12", "C13", "A2", "A1"] diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h index 32412b1d544..63929b7aea6 100644 --- a/keyboards/cannonkeys/ortho60/config.h +++ b/keyboards/cannonkeys/ortho60/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 -/* 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 WS2812_SPI_DRIVER SPID2 /* diff --git a/keyboards/cannonkeys/ortho60/keyboard.json b/keyboards/cannonkeys/ortho60/keyboard.json index d8eea8a6ae9..2e8ad772979 100644 --- a/keyboards/cannonkeys/ortho60/keyboard.json +++ b/keyboards/cannonkeys/ortho60/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"], "rows": ["B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/cannonkeys/ortho75/config.h b/keyboards/cannonkeys/ortho75/config.h index 32412b1d544..63929b7aea6 100644 --- a/keyboards/cannonkeys/ortho75/config.h +++ b/keyboards/cannonkeys/ortho75/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 -/* 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 WS2812_SPI_DRIVER SPID2 /* diff --git a/keyboards/cannonkeys/ortho75/keyboard.json b/keyboards/cannonkeys/ortho75/keyboard.json index 49595685ef3..af09fd47a70 100644 --- a/keyboards/cannonkeys/ortho75/keyboard.json +++ b/keyboards/cannonkeys/ortho75/keyboard.json @@ -20,6 +20,12 @@ "rgblight": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "B14", "A15", "A0", "C15", "C14", "B7", "B6", "B5"], "rows": ["B12", "C13", "A2", "A1", "A3"] diff --git a/keyboards/cannonkeys/practice60/config.h b/keyboards/cannonkeys/practice60/config.h index 32412b1d544..63929b7aea6 100644 --- a/keyboards/cannonkeys/practice60/config.h +++ b/keyboards/cannonkeys/practice60/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 -/* 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 WS2812_SPI_DRIVER SPID2 /* diff --git a/keyboards/cannonkeys/practice60/keyboard.json b/keyboards/cannonkeys/practice60/keyboard.json index ff8cf00cb04..ad8cde6d6b3 100644 --- a/keyboards/cannonkeys/practice60/keyboard.json +++ b/keyboards/cannonkeys/practice60/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], "rows": ["B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/cannonkeys/practice65/config.h b/keyboards/cannonkeys/practice65/config.h index 32412b1d544..63929b7aea6 100644 --- a/keyboards/cannonkeys/practice65/config.h +++ b/keyboards/cannonkeys/practice65/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 -/* 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 WS2812_SPI_DRIVER SPID2 /* diff --git a/keyboards/cannonkeys/practice65/keyboard.json b/keyboards/cannonkeys/practice65/keyboard.json index 36fb46dd518..ce0a1b12cfe 100644 --- a/keyboards/cannonkeys/practice65/keyboard.json +++ b/keyboards/cannonkeys/practice65/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B8", "B0", "A0", "B5", "B10", "B9", "A6", "B12", "A7", "A5", "A4", "A3", "A2", "A1", "B13", "B14"], "rows": ["B4", "B11", "B1", "B7", "B6"] diff --git a/keyboards/cannonkeys/rekt1800/config.h b/keyboards/cannonkeys/rekt1800/config.h index a47b76953a2..974ecf1c6c0 100644 --- a/keyboards/cannonkeys/rekt1800/config.h +++ b/keyboards/cannonkeys/rekt1800/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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. diff --git a/keyboards/cannonkeys/rekt1800/keyboard.json b/keyboards/cannonkeys/rekt1800/keyboard.json index f9a58afa020..8172af1184a 100644 --- a/keyboards/cannonkeys/rekt1800/keyboard.json +++ b/keyboards/cannonkeys/rekt1800/keyboard.json @@ -29,6 +29,12 @@ "nkro": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/ripple/config.h b/keyboards/cannonkeys/ripple/config.h index d95e23cfaad..8cffc2447d8 100644 --- a/keyboards/cannonkeys/ripple/config.h +++ b/keyboards/cannonkeys/ripple/config.h @@ -7,11 +7,6 @@ #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/ripple/keyboard.json b/keyboards/cannonkeys/ripple/keyboard.json index e416ad44a36..3dc11719a14 100644 --- a/keyboards/cannonkeys/ripple/keyboard.json +++ b/keyboards/cannonkeys/ripple/keyboard.json @@ -23,6 +23,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "B15", "driver": "spi" diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h index f3d6237a78d..b8c68bc65d4 100644 --- a/keyboards/cannonkeys/sagittarius/config.h +++ b/keyboards/cannonkeys/sagittarius/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/sagittarius/keyboard.json b/keyboards/cannonkeys/sagittarius/keyboard.json index 876c68e82e2..8f83a42984b 100644 --- a/keyboards/cannonkeys/sagittarius/keyboard.json +++ b/keyboards/cannonkeys/sagittarius/keyboard.json @@ -54,6 +54,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/satisfaction75/config.h b/keyboards/cannonkeys/satisfaction75/config.h index 1ca72c9c7c5..969206b19a3 100644 --- a/keyboards/cannonkeys/satisfaction75/config.h +++ b/keyboards/cannonkeys/satisfaction75/config.h @@ -25,11 +25,6 @@ #define I2C1_TIMINGR_SCLH 0x03U #define I2C1_TIMINGR_SCLL 0x09U -/* 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 - // configure oled driver for the 128x32 oled #define OLED_UPDATE_INTERVAL 66 // ~15fps diff --git a/keyboards/cannonkeys/satisfaction75/info.json b/keyboards/cannonkeys/satisfaction75/info.json index a06faccd230..96aeca80ee3 100644 --- a/keyboards/cannonkeys/satisfaction75/info.json +++ b/keyboards/cannonkeys/satisfaction75/info.json @@ -19,9 +19,15 @@ "nkro": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "STM32F072", "url": "https://cannonkeys.com", "usb": { "vid": "0xCA04" } -} \ No newline at end of file +} diff --git a/keyboards/cannonkeys/savage65/config.h b/keyboards/cannonkeys/savage65/config.h index 0b1e0948b31..55989a7676d 100644 --- a/keyboards/cannonkeys/savage65/config.h +++ b/keyboards/cannonkeys/savage65/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/savage65/keyboard.json b/keyboards/cannonkeys/savage65/keyboard.json index 9d7d454e550..bc9c1d77e50 100644 --- a/keyboards/cannonkeys/savage65/keyboard.json +++ b/keyboards/cannonkeys/savage65/keyboard.json @@ -49,6 +49,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker"], "layouts": { "LAYOUT_default": { diff --git a/keyboards/cannonkeys/tmov2/config.h b/keyboards/cannonkeys/tmov2/config.h index f3d6237a78d..b8c68bc65d4 100644 --- a/keyboards/cannonkeys/tmov2/config.h +++ b/keyboards/cannonkeys/tmov2/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/tmov2/keyboard.json b/keyboards/cannonkeys/tmov2/keyboard.json index acc5093221d..859607813d2 100644 --- a/keyboards/cannonkeys/tmov2/keyboard.json +++ b/keyboards/cannonkeys/tmov2/keyboard.json @@ -49,6 +49,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/tsukuyomi/config.h b/keyboards/cannonkeys/tsukuyomi/config.h index 0b1e0948b31..55989a7676d 100644 --- a/keyboards/cannonkeys/tsukuyomi/config.h +++ b/keyboards/cannonkeys/tsukuyomi/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/tsukuyomi/keyboard.json b/keyboards/cannonkeys/tsukuyomi/keyboard.json index a874d3d2935..48057a82e1b 100644 --- a/keyboards/cannonkeys/tsukuyomi/keyboard.json +++ b/keyboards/cannonkeys/tsukuyomi/keyboard.json @@ -49,6 +49,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/vicious40/config.h b/keyboards/cannonkeys/vicious40/config.h index a47b76953a2..974ecf1c6c0 100644 --- a/keyboards/cannonkeys/vicious40/config.h +++ b/keyboards/cannonkeys/vicious40/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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. diff --git a/keyboards/cannonkeys/vicious40/keyboard.json b/keyboards/cannonkeys/vicious40/keyboard.json index b2d68545f0b..184093fd23b 100644 --- a/keyboards/cannonkeys/vicious40/keyboard.json +++ b/keyboards/cannonkeys/vicious40/keyboard.json @@ -29,6 +29,12 @@ "nkro": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/capsunlocked/cu24/config.h b/keyboards/capsunlocked/cu24/config.h deleted file mode 100644 index 8ec34286fc3..00000000000 --- a/keyboards/capsunlocked/cu24/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2018 Yiancar - * - * 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/capsunlocked/cu24/keyboard.json b/keyboards/capsunlocked/cu24/keyboard.json index c3c262734d9..ceec64611c7 100644 --- a/keyboards/capsunlocked/cu24/keyboard.json +++ b/keyboards/capsunlocked/cu24/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "D0", "D1"], "rows": ["E6", "F5", "B4", "B6", "C6", "C7"] diff --git a/keyboards/capsunlocked/cu65/config.h b/keyboards/capsunlocked/cu65/config.h deleted file mode 100644 index cf38d9dcc64..00000000000 --- a/keyboards/capsunlocked/cu65/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 CapsUnlocked - -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/capsunlocked/cu65/keyboard.json b/keyboards/capsunlocked/cu65/keyboard.json index eabb7694688..80f11496611 100644 --- a/keyboards/capsunlocked/cu65/keyboard.json +++ b/keyboards/capsunlocked/cu65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D6", "D7", "D4", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "E6", "B0", "B1", "B7", "B3", "B2"], "rows": ["F1", "F4", "F5", "F6", "D3"] diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h deleted file mode 100644 index b7767c19ec4..00000000000 --- a/keyboards/capsunlocked/cu7/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2021 CapsUnlocked - -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 diff --git a/keyboards/capsunlocked/cu7/keyboard.json b/keyboards/capsunlocked/cu7/keyboard.json index 6f96c00e50b..46f8b34213f 100644 --- a/keyboards/capsunlocked/cu7/keyboard.json +++ b/keyboards/capsunlocked/cu7/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F7", "F4"], "rows": ["D7", "F0", "F6"] diff --git a/keyboards/capsunlocked/cu75/config.h b/keyboards/capsunlocked/cu75/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/capsunlocked/cu75/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/capsunlocked/cu75/keyboard.json b/keyboards/capsunlocked/cu75/keyboard.json index 25e3ca049f1..f7a8356bccf 100644 --- a/keyboards/capsunlocked/cu75/keyboard.json +++ b/keyboards/capsunlocked/cu75/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x6062", "device_version": "0.0.1" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B1", "B0", "F0"], "rows": ["F1", "B7", "B3", "D2", "D3", "B2"] diff --git a/keyboards/capsunlocked/cu80/v1/config.h b/keyboards/capsunlocked/cu80/v1/config.h deleted file mode 100644 index 991c996ea80..00000000000 --- a/keyboards/capsunlocked/cu80/v1/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 Andy Holland - -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 - -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/capsunlocked/cu80/v1/keyboard.json b/keyboards/capsunlocked/cu80/v1/keyboard.json index a5379a45cc9..e3283d99cb7 100644 --- a/keyboards/capsunlocked/cu80/v1/keyboard.json +++ b/keyboards/capsunlocked/cu80/v1/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B0", "E6", "B7", "B3", "B2", "D2", "D3", "D5", "D4"], "rows": ["B1", "B5", "B4", "F7", "D7", "D6"] From a850f7d69509a99ef46dd2790c2e55171db16e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20B=C3=BCchler?= Date: Tue, 21 May 2024 01:36:48 +0200 Subject: [PATCH 296/333] Fix PS/2 Trackpoint mouse clicks (#22265) (#23694) --- drivers/ps2/ps2_mouse.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/ps2/ps2_mouse.c b/drivers/ps2/ps2_mouse.c index 88c9bdcebef..ef1a0e26f9e 100644 --- a/drivers/ps2/ps2_mouse.c +++ b/drivers/ps2/ps2_mouse.c @@ -88,6 +88,8 @@ void ps2_mouse_task(void) { # endif } else { if (debug_mouse) print("ps2_mouse: fail to get mouse packet\n"); + /* return here to avoid updating the mouse button state */ + return; } #else if (pbuf_has_data()) { @@ -99,6 +101,8 @@ void ps2_mouse_task(void) { # endif } else { if (debug_mouse) print("ps2_mouse: fail to get mouse packet\n"); + /* return here to avoid updating the mouse button state */ + return; } #endif From bf918a8f6ccb4b1c56e7bac2bf632bd5ee264f1f Mon Sep 17 00:00:00 2001 From: VertorWang <1479115496@qq.com> Date: Tue, 21 May 2024 07:48:26 +0800 Subject: [PATCH 297/333] Add moky67 keyboard (#23118) --- keyboards/moky/moky67/config.h | 18 ++ keyboards/moky/moky67/halconf.h | 10 + keyboards/moky/moky67/info.json | 233 ++++++++++++++++++ .../moky/moky67/keymaps/default/keymap.c | 50 ++++ .../moky/moky67/keymaps/default/rules.mk | 1 + keyboards/moky/moky67/keymaps/via/keymap.c | 50 ++++ keyboards/moky/moky67/keymaps/via/rules.mk | 2 + keyboards/moky/moky67/mcuconf.h | 29 +++ keyboards/moky/moky67/readme.md | 26 ++ keyboards/moky/moky67/rules.mk | 1 + 10 files changed, 420 insertions(+) create mode 100644 keyboards/moky/moky67/config.h create mode 100644 keyboards/moky/moky67/halconf.h create mode 100644 keyboards/moky/moky67/info.json create mode 100644 keyboards/moky/moky67/keymaps/default/keymap.c create mode 100644 keyboards/moky/moky67/keymaps/default/rules.mk create mode 100644 keyboards/moky/moky67/keymaps/via/keymap.c create mode 100644 keyboards/moky/moky67/keymaps/via/rules.mk create mode 100644 keyboards/moky/moky67/mcuconf.h create mode 100644 keyboards/moky/moky67/readme.md create mode 100644 keyboards/moky/moky67/rules.mk diff --git a/keyboards/moky/moky67/config.h b/keyboards/moky/moky67/config.h new file mode 100644 index 00000000000..7b247bf9700 --- /dev/null +++ b/keyboards/moky/moky67/config.h @@ -0,0 +1,18 @@ +// Copyright 2023 VertorWang (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* SPI */ +#define SPI_DRIVER SPIDQ +#define SPI_SCK_PIN B3 +#define SPI_MOSI_PIN B5 +#define SPI_MISO_PIN B4 + +/* Flash */ +#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 + +/* RGB Driver */ +#define WS2812_SPI_DRIVER SPIDM2 +#define WS2812_SPI_MOSI_PAL_MODE 0 +#define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/moky/moky67/halconf.h b/keyboards/moky/moky67/halconf.h new file mode 100644 index 00000000000..0a59a1fcb8e --- /dev/null +++ b/keyboards/moky/moky67/halconf.h @@ -0,0 +1,10 @@ +// Copyright 2023 VertorWang (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_SPI TRUE +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD + +#include_next diff --git a/keyboards/moky/moky67/info.json b/keyboards/moky/moky67/info.json new file mode 100644 index 00000000000..8737790b69e --- /dev/null +++ b/keyboards/moky/moky67/info.json @@ -0,0 +1,233 @@ +{ + "manufacturer": "moky", + "keyboard_name": "moky67", + "url": "", + "processor": "WB32FQ95", + "bootloader": "wb32-dfu", + "usb": { + "device_version": "1.0.0", + "vid": "0xBB4F", + "pid": "0x0002", + "suspend_wakeup_delay": 1000 + }, + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true + }, + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "A6", "B10", "B11", "B12", "B13", "B14", "A10", "C6", "C7", "C8", "C9", "A8", "C4"], + "rows": ["A1", "A2", "A3", "A4", "C13"] + }, + "eeprom": { + "wear_leveling": { + "backing_size": 4096, + "driver": "spi_flash" + } + }, + "encoder": { + "rotary": [ + {"pin_a": "B6", "pin_b": "B7"} + ] + }, + "ws2812": { + "driver": "spi", + "pin": "B15" + }, + "rgb_matrix": { + "driver": "ws2812", + "max_brightness": 100, + "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, + "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 + }, + "layout": [ + {"flags": 4, "matrix": [2, 16], "x": 210 , "y": 32 }, + {"flags": 4, "matrix": [1, 16], "x": 210 , "y": 18 }, + {"flags": 4, "matrix": [0, 13], "x": 183 , "y": 4 }, + {"flags": 4, "matrix": [0, 12], "x": 163 , "y": 4 }, + {"flags": 4, "matrix": [0, 11], "x": 149 , "y": 4 }, + {"flags": 4, "matrix": [0, 10], "x": 136 , "y": 4 }, + {"flags": 4, "matrix": [0, 9], "x": 122 , "y": 4 }, + {"flags": 4, "matrix": [0, 8], "x": 109 , "y": 4 }, + {"flags": 4, "matrix": [0, 7], "x": 95 , "y": 4 }, + {"flags": 4, "matrix": [0, 6], "x": 81 , "y": 4 }, + {"flags": 4, "matrix": [0, 5], "x": 68 , "y": 4 }, + {"flags": 4, "matrix": [0, 4], "x": 54 , "y": 4 }, + {"flags": 4, "matrix": [0, 3], "x": 41 , "y": 4 }, + {"flags": 4, "matrix": [0, 2], "x": 27 , "y": 4 }, + {"flags": 4, "matrix": [0, 1], "x": 14 , "y": 4 }, + {"flags": 4, "matrix": [0, 0], "x": 0 , "y": 4 }, + {"flags": 4, "matrix": [1, 0], "x": 3 , "y": 18 }, + {"flags": 4, "matrix": [1, 1], "x": 20 , "y": 18 }, + {"flags": 4, "matrix": [1, 2], "x": 34 , "y": 18 }, + {"flags": 4, "matrix": [1, 3], "x": 48 , "y": 18 }, + {"flags": 4, "matrix": [1, 4], "x": 61 , "y": 18 }, + {"flags": 4, "matrix": [1, 5], "x": 75 , "y": 18 }, + {"flags": 4, "matrix": [1, 6], "x": 88 , "y": 18 }, + {"flags": 4, "matrix": [1, 7], "x": 102 , "y": 18 }, + {"flags": 4, "matrix": [1, 8], "x": 115 , "y": 18 }, + {"flags": 4, "matrix": [1, 9], "x": 129 , "y": 18 }, + {"flags": 4, "matrix": [1, 10], "x": 143 , "y": 18 }, + {"flags": 4, "matrix": [1, 11], "x": 156 , "y": 18 }, + {"flags": 4, "matrix": [1, 12], "x": 170 , "y": 18 }, + {"flags": 4, "matrix": [1, 13], "x": 187 , "y": 18 }, + {"flags": 4, "matrix": [2, 13], "x": 182 , "y": 32 }, + {"flags": 4, "matrix": [2, 11], "x": 160 , "y": 32 }, + {"flags": 4, "matrix": [2, 10], "x": 146 , "y": 32 }, + {"flags": 4, "matrix": [2, 9], "x": 132 , "y": 32 }, + {"flags": 4, "matrix": [2, 8], "x": 119 , "y": 32 }, + {"flags": 4, "matrix": [2, 7], "x": 105 , "y": 32 }, + {"flags": 4, "matrix": [2, 6], "x": 92 , "y": 32 }, + {"flags": 4, "matrix": [2, 5], "x": 78 , "y": 32 }, + {"flags": 4, "matrix": [2, 4], "x": 64 , "y": 32 }, + {"flags": 4, "matrix": [2, 3], "x": 51 , "y": 32 }, + {"flags": 4, "matrix": [2, 2], "x": 37 , "y": 32 }, + {"flags": 4, "matrix": [2, 1], "x": 24 , "y": 32 }, + {"flags": 4, "matrix": [2, 0], "x": 5 , "y": 32 }, + {"flags": 4, "matrix": [3, 0], "x": 8 , "y": 46 }, + {"flags": 4, "matrix": [3, 1], "x": 31 , "y": 46 }, + {"flags": 4, "matrix": [3, 2], "x": 44 , "y": 46 }, + {"flags": 4, "matrix": [3, 3], "x": 58 , "y": 46 }, + {"flags": 4, "matrix": [3, 4], "x": 71 , "y": 46 }, + {"flags": 4, "matrix": [3, 5], "x": 85 , "y": 46 }, + {"flags": 4, "matrix": [3, 6], "x": 98 , "y": 46 }, + {"flags": 4, "matrix": [3, 7], "x": 112 , "y": 46 }, + {"flags": 4, "matrix": [3, 8], "x": 126 , "y": 46 }, + {"flags": 4, "matrix": [3, 9], "x": 139 , "y": 46 }, + {"flags": 4, "matrix": [3, 10], "x": 153 , "y": 46 }, + {"flags": 4, "matrix": [3, 13], "x": 171 , "y": 46 }, + {"flags": 4, "matrix": [3, 15], "x": 193 , "y": 50 }, + {"flags": 4, "matrix": [4, 16], "x": 207 , "y": 64 }, + {"flags": 4, "matrix": [4, 15], "x": 193 , "y": 64 }, + {"flags": 4, "matrix": [4, 14], "x": 180 , "y": 64 }, + {"flags": 4, "matrix": [4, 13], "x": 163 , "y": 60 }, + {"flags": 4, "matrix": [4, 10], "x": 149 , "y": 60 }, + {"flags": 4, "matrix": [4, 9], "x": 136 , "y": 60 }, + {"flags": 4, "matrix": [4, 6], "x": 87 , "y": 60 }, + {"flags": 4, "matrix": [4, 2], "x": 36 , "y": 60 }, + {"flags": 4, "matrix": [4, 1], "x": 19 , "y": 60 }, + {"flags": 4, "matrix": [4, 0], "x": 2 , "y": 60 }, + {"flags": 4, "matrix": [0, 16], "x": 210 , "y": 4 } + ], + "sleep": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 16], "x": 15.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 16], "x": 15.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 16], "x": 15.5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 15], "x": 14.25, "y": 3.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 13], "x": 12, "y": 4}, + {"matrix": [4, 14], "x": 13.25, "y": 4.25}, + {"matrix": [4, 15], "x": 14.25, "y": 4.25}, + {"matrix": [4, 16], "x": 15.25, "y": 4.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/moky/moky67/keymaps/default/keymap.c b/keyboards/moky/moky67/keymaps/default/keymap.c new file mode 100644 index 00000000000..aab6493c2e9 --- /dev/null +++ b/keyboards/moky/moky67/keymaps/default/keymap.c @@ -0,0 +1,50 @@ +// Copyright 2023 VertorWang (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( /* Base */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, _______, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_SCRL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = LAYOUT( /* Base */ + KC_GRV, KC_MYCM, KC_WHOM, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, + _______, TO(0), TO(2), _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, + _______, GU_TOGG, _______, EE_CLR, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI), + + [2] = LAYOUT( /* Base */ + KC_ESC, KC_BRMD, KC_BRMU, KC_F3, _______, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSPC, _______, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_SCRL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [3] = LAYOUT( /* FN */ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, + _______, TO(0), TO(2), _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, + _______, _______, _______, EE_CLR, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI), +}; + +// clang-format on + +#ifdef ENCODER_MAP_ENABLE + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + + [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, + [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)}, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, +}; + +#endif diff --git a/keyboards/moky/moky67/keymaps/default/rules.mk b/keyboards/moky/moky67/keymaps/default/rules.mk new file mode 100644 index 00000000000..ee325681483 --- /dev/null +++ b/keyboards/moky/moky67/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/moky/moky67/keymaps/via/keymap.c b/keyboards/moky/moky67/keymaps/via/keymap.c new file mode 100644 index 00000000000..aab6493c2e9 --- /dev/null +++ b/keyboards/moky/moky67/keymaps/via/keymap.c @@ -0,0 +1,50 @@ +// Copyright 2023 VertorWang (@itarze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( /* Base */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, _______, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_SCRL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = LAYOUT( /* Base */ + KC_GRV, KC_MYCM, KC_WHOM, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, + _______, TO(0), TO(2), _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, + _______, GU_TOGG, _______, EE_CLR, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI), + + [2] = LAYOUT( /* Base */ + KC_ESC, KC_BRMD, KC_BRMU, KC_F3, _______, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSPC, _______, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_SCRL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [3] = LAYOUT( /* FN */ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______, + _______, TO(0), TO(2), _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, + _______, _______, _______, EE_CLR, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI), +}; + +// clang-format on + +#ifdef ENCODER_MAP_ENABLE + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + + [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, + [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)}, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, +}; + +#endif diff --git a/keyboards/moky/moky67/keymaps/via/rules.mk b/keyboards/moky/moky67/keymaps/via/rules.mk new file mode 100644 index 00000000000..715838ecc5d --- /dev/null +++ b/keyboards/moky/moky67/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +ENCODER_MAP_ENABLE = yes +VIA_ENABLE = yes diff --git a/keyboards/moky/moky67/mcuconf.h b/keyboards/moky/moky67/mcuconf.h new file mode 100644 index 00000000000..2b674fffd3d --- /dev/null +++ b/keyboards/moky/moky67/mcuconf.h @@ -0,0 +1,29 @@ +/* Copyright (C) 2023 Westberry Technology Corp., 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 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 + +#include_next + +#undef WB32_GPT_TIM1_IRQ_PRIORITY +#define WB32_GPT_TIM1_IRQ_PRIORITY 3 + +#undef WB32_SPI_USE_QSPI +#define WB32_SPI_USE_QSPI TRUE + +#undef WB32_SPI_USE_SPIM2 +#define WB32_SPI_USE_SPIM2 TRUE + diff --git a/keyboards/moky/moky67/readme.md b/keyboards/moky/moky67/readme.md new file mode 100644 index 00000000000..15b3513d1d7 --- /dev/null +++ b/keyboards/moky/moky67/readme.md @@ -0,0 +1,26 @@ +# moky67 +![moky/moky67](https://i.imgur.com/9k4QiqR.png) + +An in-switch RGB LED keyboard with RGB underglow. + +* Keyboard Maintainer: [Vertor](https://github.com/VertorWang) +* Hardware Supported: moky67 +* Hardware Availability: Private GB + +Make example for this keyboard (after setting up your build environment): + + make moky/moky67:default + +Flashing example for this keyboard: + + make moky/moky67: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/moky/moky67/rules.mk b/keyboards/moky/moky67/rules.mk new file mode 100644 index 00000000000..7ff128fa692 --- /dev/null +++ b/keyboards/moky/moky67/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From 02af906de1df017dfeecddff85f9bf8ce5e48648 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 21 May 2024 00:49:14 +0100 Subject: [PATCH 298/333] Add second encoder to matrix info of arrowmechanics/wings (#23390) --- keyboards/arrowmechanics/wings/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/arrowmechanics/wings/keyboard.json b/keyboards/arrowmechanics/wings/keyboard.json index 0f1e6696f75..1da4077baa8 100644 --- a/keyboards/arrowmechanics/wings/keyboard.json +++ b/keyboards/arrowmechanics/wings/keyboard.json @@ -237,7 +237,7 @@ {"matrix": [1, 7], "x": 7.25, "y": 1.15}, {"matrix": [1, 8], "x": 8.25, "y": 1.15, "encoder": 0}, - {"matrix": [7, 0], "x": 9.45, "y": 1.15}, + {"matrix": [7, 0], "x": 9.45, "y": 1.15, "encoder": 1}, {"matrix": [7, 1], "x": 10.45, "y": 1.15}, {"matrix": [7, 2], "x": 11.45, "y": 1.08}, {"matrix": [7, 3], "x": 12.45, "y": 1}, From a8de554d22ace15b70e3b20da162b1c571267b95 Mon Sep 17 00:00:00 2001 From: eason <98533237+EasonQian1@users.noreply.github.com> Date: Tue, 21 May 2024 08:16:55 +0800 Subject: [PATCH 299/333] Add Meow65 (#23427) --- keyboards/eason/meow65/config.h | 6 + keyboards/eason/meow65/halconf.h | 8 + keyboards/eason/meow65/info.json | 265 ++++++++++++++++++ .../eason/meow65/keymaps/default/keymap.c | 15 + keyboards/eason/meow65/keymaps/via/keymap.c | 15 + keyboards/eason/meow65/keymaps/via/rules.mk | 2 + keyboards/eason/meow65/mcuconf.h | 9 + keyboards/eason/meow65/readme.md | 27 ++ keyboards/eason/meow65/rules.mk | 1 + 9 files changed, 348 insertions(+) create mode 100644 keyboards/eason/meow65/config.h create mode 100644 keyboards/eason/meow65/halconf.h create mode 100644 keyboards/eason/meow65/info.json create mode 100644 keyboards/eason/meow65/keymaps/default/keymap.c create mode 100644 keyboards/eason/meow65/keymaps/via/keymap.c create mode 100644 keyboards/eason/meow65/keymaps/via/rules.mk create mode 100644 keyboards/eason/meow65/mcuconf.h create mode 100644 keyboards/eason/meow65/readme.md create mode 100644 keyboards/eason/meow65/rules.mk diff --git a/keyboards/eason/meow65/config.h b/keyboards/eason/meow65/config.h new file mode 100644 index 00000000000..ea83fd49fa4 --- /dev/null +++ b/keyboards/eason/meow65/config.h @@ -0,0 +1,6 @@ +// Copyright 2022 Eason +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define WS2812_SPI_DRIVER SPID2 diff --git a/keyboards/eason/meow65/halconf.h b/keyboards/eason/meow65/halconf.h new file mode 100644 index 00000000000..7dda577da1b --- /dev/null +++ b/keyboards/eason/meow65/halconf.h @@ -0,0 +1,8 @@ +// Copyright 2022 Eason +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_SPI TRUE + +#include_next diff --git a/keyboards/eason/meow65/info.json b/keyboards/eason/meow65/info.json new file mode 100644 index 00000000000..340a7410407 --- /dev/null +++ b/keyboards/eason/meow65/info.json @@ -0,0 +1,265 @@ +{ + "keyboard_name": "Meow65", + "manufacturer": "Eason", + "url": "", + "maintainer": "Eason", + "usb": { + "vid": "0x68F4", + "pid": "0x70A0", + "device_version": "0.0.1", + "force_nkro": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "rgblight": { + "led_count": 2, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "ws2812": { + "pin": "B15", + "driver": "spi" + }, + "indicators": { + "caps_lock": "C13" + }, + "matrix_pins": { + "rows": [ "A15", "B3", "B4", "B5", "B6"], + "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "A8"] + }, + "diode_direction": "ROW2COL", + "processor": "STM32F103", + "bootloader": "uf2boot", + "layouts":{ + "LAYOUT_all": { + "layout":[ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_ansi": { + "layout":[ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/eason/meow65/keymaps/default/keymap.c b/keyboards/eason/meow65/keymaps/default/keymap.c new file mode 100644 index 00000000000..f70a94c0d96 --- /dev/null +++ b/keyboards/eason/meow65/keymaps/default/keymap.c @@ -0,0 +1,15 @@ +// Copyright 2022 Eason +// SPDX-License-Identifier: GPL-2.0-or-later + + #include QMK_KEYBOARD_H + + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT + ) + }; diff --git a/keyboards/eason/meow65/keymaps/via/keymap.c b/keyboards/eason/meow65/keymaps/via/keymap.c new file mode 100644 index 00000000000..61c6323ea04 --- /dev/null +++ b/keyboards/eason/meow65/keymaps/via/keymap.c @@ -0,0 +1,15 @@ +// Copyright 2022 Eason +// SPDX-License-Identifier: GPL-2.0-or-later + + #include QMK_KEYBOARD_H + + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT + ) + }; diff --git a/keyboards/eason/meow65/keymaps/via/rules.mk b/keyboards/eason/meow65/keymaps/via/rules.mk new file mode 100644 index 00000000000..36b7ba9cbc9 --- /dev/null +++ b/keyboards/eason/meow65/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/eason/meow65/mcuconf.h b/keyboards/eason/meow65/mcuconf.h new file mode 100644 index 00000000000..bac8fc07c5f --- /dev/null +++ b/keyboards/eason/meow65/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2022 Eason +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 TRUE diff --git a/keyboards/eason/meow65/readme.md b/keyboards/eason/meow65/readme.md new file mode 100644 index 00000000000..5c72d73c6e0 --- /dev/null +++ b/keyboards/eason/meow65/readme.md @@ -0,0 +1,27 @@ +# Meow65 + +![meow65](https://i.imgur.com/i5tM4nY.jpg) + +A customizable hotswap 65% keyboard. + +* Keyboard Maintainer: [EASON](https://github.com/EasonQian1) +* Hardware Supported: Meow65 PCB +* Hardware Availability: [EASON](https://github.com/EasonQian1) + +Make example for this keyboard (after setting up your build environment): + + make eason/meow65:default + +Flashing example for this keyboard: + + make eason/meow65: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down Esc in the keyboard then replug +* **Physical reset button**: Briefly press the button on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` diff --git a/keyboards/eason/meow65/rules.mk b/keyboards/eason/meow65/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/eason/meow65/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 2b926774cae11e55001435d0475436137afda7fb Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 21 May 2024 05:00:53 -0700 Subject: [PATCH 300/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: H, Part 1 (#23759) Affects: - `h0oni/deskpad` - `h0oni/hotduck` - `halfcliff` - `halokeys/elemental75` - `han60` - `hardlineworks/otd_plus` - `helix/rev3_4rows` - `helix/rev3_5rows` - `hfdkb/ac001` - `hidtech/bastyl` - `hineybush/h08_ocelot` - `hineybush/h10` - `hineybush/h60` - `hineybush/h65` - `hineybush/h65_hotswap` - `hineybush/h660s` - `hineybush/h75_singa` - `hineybush/h87a` - `hineybush/h88` - `hineybush/hbcp` - `hineybush/hineyg80` - `hineybush/physix` - `hineybush/sm68` - `hnahkb/freyr` - `hnahkb/stella` - `hnahkb/vn66` - `horizon` - `hotdox` - `hs60/v1` --- keyboards/h0oni/deskpad/config.h | 22 ----------- keyboards/h0oni/deskpad/keyboard.json | 6 +++ keyboards/h0oni/hotduck/config.h | 22 ----------- keyboards/h0oni/hotduck/keyboard.json | 6 +++ keyboards/halfcliff/config.h | 5 --- keyboards/halfcliff/keyboard.json | 6 +++ keyboards/halokeys/elemental75/config.h | 22 ----------- keyboards/halokeys/elemental75/keyboard.json | 6 ++- keyboards/han60/config.h | 39 ------------------- keyboards/han60/keyboard.json | 6 +++ keyboards/hardlineworks/otd_plus/config.h | 7 ---- .../hardlineworks/otd_plus/keyboard.json | 6 +++ keyboards/helix/rev3_4rows/config.h | 5 --- keyboards/helix/rev3_4rows/info.json | 6 +++ keyboards/helix/rev3_5rows/config.h | 5 --- keyboards/helix/rev3_5rows/info.json | 6 +++ keyboards/hfdkb/ac001/config.h | 5 --- keyboards/hfdkb/ac001/keyboard.json | 6 ++- keyboards/hidtech/bastyl/config.h | 2 - keyboards/hidtech/bastyl/keyboard.json | 6 +++ keyboards/hineybush/h08_ocelot/config.h | 39 ------------------- keyboards/hineybush/h08_ocelot/keyboard.json | 6 +++ keyboards/hineybush/h10/config.h | 23 ----------- keyboards/hineybush/h10/keyboard.json | 6 +++ keyboards/hineybush/h60/config.h | 23 ----------- keyboards/hineybush/h60/keyboard.json | 6 +++ keyboards/hineybush/h65/config.h | 39 ------------------- keyboards/hineybush/h65/keyboard.json | 6 +++ keyboards/hineybush/h65_hotswap/config.h | 39 ------------------- keyboards/hineybush/h65_hotswap/keyboard.json | 6 +++ keyboards/hineybush/h660s/config.h | 39 ------------------- keyboards/hineybush/h660s/keyboard.json | 6 +++ keyboards/hineybush/h75_singa/config.h | 39 ------------------- keyboards/hineybush/h75_singa/keyboard.json | 6 +++ keyboards/hineybush/h87a/config.h | 23 ----------- keyboards/hineybush/h87a/keyboard.json | 6 +++ keyboards/hineybush/h88/config.h | 23 ----------- keyboards/hineybush/h88/keyboard.json | 6 +++ keyboards/hineybush/hbcp/config.h | 5 --- keyboards/hineybush/hbcp/keyboard.json | 6 +++ keyboards/hineybush/hineyg80/config.h | 7 ---- keyboards/hineybush/hineyg80/keyboard.json | 6 +++ keyboards/hineybush/physix/config.h | 39 ------------------- keyboards/hineybush/physix/keyboard.json | 6 +++ keyboards/hineybush/sm68/config.h | 39 ------------------- keyboards/hineybush/sm68/keyboard.json | 6 +++ keyboards/hnahkb/freyr/config.h | 39 ------------------- keyboards/hnahkb/freyr/keyboard.json | 6 +++ keyboards/hnahkb/stella/config.h | 39 ------------------- keyboards/hnahkb/stella/keyboard.json | 6 +++ keyboards/hnahkb/vn66/config.h | 5 --- keyboards/hnahkb/vn66/keyboard.json | 6 +++ keyboards/horizon/config.h | 23 ----------- keyboards/horizon/keyboard.json | 6 +++ keyboards/hotdox/config.h | 5 --- keyboards/hotdox/keyboard.json | 6 +++ keyboards/hs60/v1/config.h | 5 --- keyboards/hs60/v1/keyboard.json | 6 +++ 58 files changed, 172 insertions(+), 629 deletions(-) delete mode 100644 keyboards/h0oni/deskpad/config.h delete mode 100644 keyboards/h0oni/hotduck/config.h delete mode 100644 keyboards/halokeys/elemental75/config.h delete mode 100644 keyboards/han60/config.h delete mode 100644 keyboards/hardlineworks/otd_plus/config.h delete mode 100644 keyboards/hineybush/h08_ocelot/config.h delete mode 100644 keyboards/hineybush/h10/config.h delete mode 100644 keyboards/hineybush/h60/config.h delete mode 100644 keyboards/hineybush/h65/config.h delete mode 100644 keyboards/hineybush/h65_hotswap/config.h delete mode 100644 keyboards/hineybush/h660s/config.h delete mode 100644 keyboards/hineybush/h75_singa/config.h delete mode 100644 keyboards/hineybush/h87a/config.h delete mode 100644 keyboards/hineybush/h88/config.h delete mode 100644 keyboards/hineybush/hineyg80/config.h delete mode 100644 keyboards/hineybush/physix/config.h delete mode 100644 keyboards/hineybush/sm68/config.h delete mode 100644 keyboards/hnahkb/freyr/config.h delete mode 100644 keyboards/hnahkb/stella/config.h delete mode 100644 keyboards/horizon/config.h diff --git a/keyboards/h0oni/deskpad/config.h b/keyboards/h0oni/deskpad/config.h deleted file mode 100644 index 441e3b8c1a6..00000000000 --- a/keyboards/h0oni/deskpad/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Hydrogen BD - * - * 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 diff --git a/keyboards/h0oni/deskpad/keyboard.json b/keyboards/h0oni/deskpad/keyboard.json index 471d101693b..d240acf9d33 100644 --- a/keyboards/h0oni/deskpad/keyboard.json +++ b/keyboards/h0oni/deskpad/keyboard.json @@ -20,6 +20,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D4", "D1"], "rows": ["D7", "C6"] diff --git a/keyboards/h0oni/hotduck/config.h b/keyboards/h0oni/hotduck/config.h deleted file mode 100644 index 4c8c95e41ec..00000000000 --- a/keyboards/h0oni/hotduck/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Md Mashur Shalehin, aka h0oni - * - * 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 diff --git a/keyboards/h0oni/hotduck/keyboard.json b/keyboards/h0oni/hotduck/keyboard.json index c034e7a3a48..605d614d6af 100644 --- a/keyboards/h0oni/hotduck/keyboard.json +++ b/keyboards/h0oni/hotduck/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5"] diff --git a/keyboards/halfcliff/config.h b/keyboards/halfcliff/config.h index d3c5de43387..be92d93d938 100644 --- a/keyboards/halfcliff/config.h +++ b/keyboards/halfcliff/config.h @@ -24,8 +24,3 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F5, F6, F7, D7, B5, F5, F6, F7, D7, B5 } #define MATRIX_COL_PINS { B4, E6, C6, B6, B2 } - -/* 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/halfcliff/keyboard.json b/keyboards/halfcliff/keyboard.json index 1f60537b249..a864c4ce332 100644 --- a/keyboards/halfcliff/keyboard.json +++ b/keyboards/halfcliff/keyboard.json @@ -34,6 +34,12 @@ "mousekey": false, "extrakey": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/halokeys/elemental75/config.h b/keyboards/halokeys/elemental75/config.h deleted file mode 100644 index ea52da29280..00000000000 --- a/keyboards/halokeys/elemental75/config.h +++ /dev/null @@ -1,22 +0,0 @@ - /* Copyright 2022 Halokeys - * - * 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 diff --git a/keyboards/halokeys/elemental75/keyboard.json b/keyboards/halokeys/elemental75/keyboard.json index ccb1de12b68..866916b69b9 100644 --- a/keyboards/halokeys/elemental75/keyboard.json +++ b/keyboards/halokeys/elemental75/keyboard.json @@ -32,7 +32,11 @@ "term": 300 }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "ws2812": { "pin": "A10" diff --git a/keyboards/han60/config.h b/keyboards/han60/config.h deleted file mode 100644 index 9c95070341a..00000000000 --- a/keyboards/han60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 farhandsome - -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/han60/keyboard.json b/keyboards/han60/keyboard.json index d1dcff6baf6..41d33b1ba87 100644 --- a/keyboards/han60/keyboard.json +++ b/keyboards/han60/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D5", "D3", "D2", "D1", "D0"] diff --git a/keyboards/hardlineworks/otd_plus/config.h b/keyboards/hardlineworks/otd_plus/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/hardlineworks/otd_plus/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/hardlineworks/otd_plus/keyboard.json b/keyboards/hardlineworks/otd_plus/keyboard.json index 50a7eb22246..e0afc03893f 100644 --- a/keyboards/hardlineworks/otd_plus/keyboard.json +++ b/keyboards/hardlineworks/otd_plus/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "B7", "B0", "F1", "D7", "F7", "C7"], "rows": ["D2", "D4", "D1", "E6", "F5", "C6", "B6", "F6", "F0", "D0", "D6", "D3"] diff --git a/keyboards/helix/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h index cc1a9252959..56d9a13feba 100644 --- a/keyboards/helix/rev3_4rows/config.h +++ b/keyboards/helix/rev3_4rows/config.h @@ -43,11 +43,6 @@ along with this program. If not, see . /* Custom font */ #define OLED_FONT_H "keyboards/helix/common/glcdfont.c" -/* 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. diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json index ce7bcde3e03..5e9fd2dcd84 100644 --- a/keyboards/helix/rev3_4rows/info.json +++ b/keyboards/helix/rev3_4rows/info.json @@ -8,6 +8,12 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgb_matrix": { "driver": "ws2812", "sat_steps": 8, diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h index 733f8b5a55f..84173da2dee 100644 --- a/keyboards/helix/rev3_5rows/config.h +++ b/keyboards/helix/rev3_5rows/config.h @@ -43,11 +43,6 @@ along with this program. If not, see . /* Custom font */ #define OLED_FONT_H "keyboards/helix/common/glcdfont.c" -/* 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. diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json index e867f033262..b61db7df86e 100644 --- a/keyboards/helix/rev3_5rows/info.json +++ b/keyboards/helix/rev3_5rows/info.json @@ -8,6 +8,12 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgb_matrix": { "driver": "ws2812", "sat_steps": 8, diff --git a/keyboards/hfdkb/ac001/config.h b/keyboards/hfdkb/ac001/config.h index e069609fad2..d82b4602542 100644 --- a/keyboards/hfdkb/ac001/config.h +++ b/keyboards/hfdkb/ac001/config.h @@ -16,11 +16,6 @@ #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 - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/hfdkb/ac001/keyboard.json b/keyboards/hfdkb/ac001/keyboard.json index daf3e735f0e..87f6e40bc30 100644 --- a/keyboards/hfdkb/ac001/keyboard.json +++ b/keyboards/hfdkb/ac001/keyboard.json @@ -46,7 +46,11 @@ "pin": "A1" }, "qmk": { - "tap_keycode_delay": 5 + "tap_keycode_delay": 5, + "locking": { + "enabled": true, + "resync": true + } }, "processor": "WB32FQ95", "bootloader": "wb32-dfu", diff --git a/keyboards/hidtech/bastyl/config.h b/keyboards/hidtech/bastyl/config.h index a033888b412..455c1771d83 100644 --- a/keyboards/hidtech/bastyl/config.h +++ b/keyboards/hidtech/bastyl/config.h @@ -18,6 +18,4 @@ #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE #define MASTER_RIGHT diff --git a/keyboards/hidtech/bastyl/keyboard.json b/keyboards/hidtech/bastyl/keyboard.json index 5c3a9fcfcff..7ebb9157396 100644 --- a/keyboards/hidtech/bastyl/keyboard.json +++ b/keyboards/hidtech/bastyl/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "E6", "C6", "B1", "B3", "B2"], "rows": ["D7", "B5", "F7", "F6", "B6"] diff --git a/keyboards/hineybush/h08_ocelot/config.h b/keyboards/hineybush/h08_ocelot/config.h deleted file mode 100644 index 474c1d6701d..00000000000 --- a/keyboards/hineybush/h08_ocelot/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 hineybush - -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/hineybush/h08_ocelot/keyboard.json b/keyboards/hineybush/h08_ocelot/keyboard.json index 0e6ccb732bc..bca579aab8d 100644 --- a/keyboards/hineybush/h08_ocelot/keyboard.json +++ b/keyboards/hineybush/h08_ocelot/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "C7", "D0", "D1"], "rows": ["B4", "B6"] diff --git a/keyboards/hineybush/h10/config.h b/keyboards/hineybush/h10/config.h deleted file mode 100644 index 994b108d8e8..00000000000 --- a/keyboards/hineybush/h10/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 hineybush - -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 diff --git a/keyboards/hineybush/h10/keyboard.json b/keyboards/hineybush/h10/keyboard.json index 924acb515f9..73205f85ffc 100644 --- a/keyboards/hineybush/h10/keyboard.json +++ b/keyboards/hineybush/h10/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "C7", "B1", "B2"], "rows": ["B0", "C6", "B6", "B5", "B4", "D7"] diff --git a/keyboards/hineybush/h60/config.h b/keyboards/hineybush/h60/config.h deleted file mode 100644 index 994b108d8e8..00000000000 --- a/keyboards/hineybush/h60/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 hineybush - -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 diff --git a/keyboards/hineybush/h60/keyboard.json b/keyboards/hineybush/h60/keyboard.json index 63d41a55b41..8a019d42da3 100644 --- a/keyboards/hineybush/h60/keyboard.json +++ b/keyboards/hineybush/h60/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "D0", "D1", "D2", "D3", "D5", "D6", "C7", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["B6", "B5", "B4", "D7", "E6"] diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h deleted file mode 100644 index 474c1d6701d..00000000000 --- a/keyboards/hineybush/h65/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 hineybush - -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/hineybush/h65/keyboard.json b/keyboards/hineybush/h65/keyboard.json index cacc673311e..8560c7774c5 100644 --- a/keyboards/hineybush/h65/keyboard.json +++ b/keyboards/hineybush/h65/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "B0", "B1", "B2", "B3"], "rows": ["D7", "D6", "D4", "D1", "D0"] diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h deleted file mode 100644 index 474c1d6701d..00000000000 --- a/keyboards/hineybush/h65_hotswap/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 hineybush - -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/hineybush/h65_hotswap/keyboard.json b/keyboards/hineybush/h65_hotswap/keyboard.json index 0cabdf074bb..510836f22ff 100644 --- a/keyboards/hineybush/h65_hotswap/keyboard.json +++ b/keyboards/hineybush/h65_hotswap/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "B0", "B1", "B2", "B3"], "rows": ["D7", "D6", "D4", "D1", "D0"] diff --git a/keyboards/hineybush/h660s/config.h b/keyboards/hineybush/h660s/config.h deleted file mode 100644 index 373b97179ea..00000000000 --- a/keyboards/hineybush/h660s/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Josh Hinnebusch - -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/hineybush/h660s/keyboard.json b/keyboards/hineybush/h660s/keyboard.json index de658ff1296..d76664080e6 100644 --- a/keyboards/hineybush/h660s/keyboard.json +++ b/keyboards/hineybush/h660s/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], "rows": ["B1", "E6", "B3", "D3", "D2"] diff --git a/keyboards/hineybush/h75_singa/config.h b/keyboards/hineybush/h75_singa/config.h deleted file mode 100644 index 2e3e4304220..00000000000 --- a/keyboards/hineybush/h75_singa/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 hineybush - -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/hineybush/h75_singa/keyboard.json b/keyboards/hineybush/h75_singa/keyboard.json index a313213e67e..30dbd8d6a1f 100644 --- a/keyboards/hineybush/h75_singa/keyboard.json +++ b/keyboards/hineybush/h75_singa/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "B2", "D4", "D5", "D3"], "rows": ["B0", "B1", "D0", "D1", "D2", "D6"] diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h deleted file mode 100644 index 68b99c1a55d..00000000000 --- a/keyboards/hineybush/h87a/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2018 Josh Hinnebusch - -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 diff --git a/keyboards/hineybush/h87a/keyboard.json b/keyboards/hineybush/h87a/keyboard.json index 196a3aa8fe5..e9096201d92 100644 --- a/keyboards/hineybush/h87a/keyboard.json +++ b/keyboards/hineybush/h87a/keyboard.json @@ -21,6 +21,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D2"], "rows": ["B0", "B1", "B2", "B3", "D0", "D1", "B5", "B6", "D7", "B4", "D6", "D4"] diff --git a/keyboards/hineybush/h88/config.h b/keyboards/hineybush/h88/config.h deleted file mode 100644 index 8099d5a0e41..00000000000 --- a/keyboards/hineybush/h88/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Josh Hinnebusch - -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 diff --git a/keyboards/hineybush/h88/keyboard.json b/keyboards/hineybush/h88/keyboard.json index 2adb661273f..e74a3f36234 100644 --- a/keyboards/hineybush/h88/keyboard.json +++ b/keyboards/hineybush/h88/keyboard.json @@ -21,6 +21,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D2"], "rows": ["B0", "B1", "B2", "B3", "D0", "D1", "B5", "B6", "D7", "B4", "D6", "D4"] diff --git a/keyboards/hineybush/hbcp/config.h b/keyboards/hineybush/hbcp/config.h index f76948d482b..bde356232d8 100644 --- a/keyboards/hineybush/hbcp/config.h +++ b/keyboards/hineybush/hbcp/config.h @@ -34,8 +34,3 @@ along with this program. If not, see . */ #define MATRIX_ROW_PINS { B1, B6, D0, C7, C6, C5 } #define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, B5, B4, B3, B2 } - -/* 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/hineybush/hbcp/keyboard.json b/keyboards/hineybush/hbcp/keyboard.json index ab36bfaea09..f03c4d57540 100644 --- a/keyboards/hineybush/hbcp/keyboard.json +++ b/keyboards/hineybush/hbcp/keyboard.json @@ -46,6 +46,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/hineybush/hineyg80/config.h b/keyboards/hineybush/hineyg80/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/hineybush/hineyg80/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/hineybush/hineyg80/keyboard.json b/keyboards/hineybush/hineyg80/keyboard.json index fa6e3401204..933d689225d 100644 --- a/keyboards/hineybush/hineyg80/keyboard.json +++ b/keyboards/hineybush/hineyg80/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B7", "B0"], "rows": ["B2", "B3", "D0", "B1", "D2", "D1", "D5", "D3", "D6", "D4", "B4", "D7"] diff --git a/keyboards/hineybush/physix/config.h b/keyboards/hineybush/physix/config.h deleted file mode 100644 index 2e3e4304220..00000000000 --- a/keyboards/hineybush/physix/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 hineybush - -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/hineybush/physix/keyboard.json b/keyboards/hineybush/physix/keyboard.json index a08e09af185..b7b1c05393e 100644 --- a/keyboards/hineybush/physix/keyboard.json +++ b/keyboards/hineybush/physix/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "B1", "B0", "B5", "B4", "D7", "D6", "D4"], "rows": ["D0", "D1", "D2", "C7", "C6"] diff --git a/keyboards/hineybush/sm68/config.h b/keyboards/hineybush/sm68/config.h deleted file mode 100644 index 2e3e4304220..00000000000 --- a/keyboards/hineybush/sm68/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 hineybush - -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/hineybush/sm68/keyboard.json b/keyboards/hineybush/sm68/keyboard.json index d4280b6747f..8350ca03807 100644 --- a/keyboards/hineybush/sm68/keyboard.json +++ b/keyboards/hineybush/sm68/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D3", "D2"], "rows": ["B2", "B1", "B0", "D4", "D1"] diff --git a/keyboards/hnahkb/freyr/config.h b/keyboards/hnahkb/freyr/config.h deleted file mode 100644 index 9f9d81bea91..00000000000 --- a/keyboards/hnahkb/freyr/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 HnahKB - -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/hnahkb/freyr/keyboard.json b/keyboards/hnahkb/freyr/keyboard.json index 4ddc37d3dce..635c9d59897 100644 --- a/keyboards/hnahkb/freyr/keyboard.json +++ b/keyboards/hnahkb/freyr/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "C6", "F5", "F6", "F7"], "rows": ["D3", "B2", "B1", "B0", "E6", "F0", "D2", "D5", "F4", "F1"] diff --git a/keyboards/hnahkb/stella/config.h b/keyboards/hnahkb/stella/config.h deleted file mode 100644 index 9f9d81bea91..00000000000 --- a/keyboards/hnahkb/stella/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 HnahKB - -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/hnahkb/stella/keyboard.json b/keyboards/hnahkb/stella/keyboard.json index 13abbffbec2..7c69ec3de21 100644 --- a/keyboards/hnahkb/stella/keyboard.json +++ b/keyboards/hnahkb/stella/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "C6", "F5", "F6", "F7"], "rows": ["D3", "B2", "B1", "B0", "E6", "F0", "D2", "D5", "F4", "F1"] diff --git a/keyboards/hnahkb/vn66/config.h b/keyboards/hnahkb/vn66/config.h index 0369461b671..b8f23d935b0 100644 --- a/keyboards/hnahkb/vn66/config.h +++ b/keyboards/hnahkb/vn66/config.h @@ -17,11 +17,6 @@ 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 - /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. * This is useful for the Windows task manager shortcut (ctrl+shift+esc). */ diff --git a/keyboards/hnahkb/vn66/keyboard.json b/keyboards/hnahkb/vn66/keyboard.json index 6934fd1f8fa..a83948f5cd0 100644 --- a/keyboards/hnahkb/vn66/keyboard.json +++ b/keyboards/hnahkb/vn66/keyboard.json @@ -22,6 +22,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "F0", "C6", "C7", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "D2", "F7"] diff --git a/keyboards/horizon/config.h b/keyboards/horizon/config.h deleted file mode 100644 index 24264fee6c6..00000000000 --- a/keyboards/horizon/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Steven Karrmann - -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 diff --git a/keyboards/horizon/keyboard.json b/keyboards/horizon/keyboard.json index 0d1c633e5fd..0fea8cb74ca 100644 --- a/keyboards/horizon/keyboard.json +++ b/keyboards/horizon/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0"], "rows": ["D3", "D2", "D1", "F4"] diff --git a/keyboards/hotdox/config.h b/keyboards/hotdox/config.h index 60d9fe62174..c7458176162 100644 --- a/keyboards/hotdox/config.h +++ b/keyboards/hotdox/config.h @@ -11,11 +11,6 @@ #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* 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 - /* key combination for command */ #ifndef IS_COMMAND #define IS_COMMAND() ( \ diff --git a/keyboards/hotdox/keyboard.json b/keyboards/hotdox/keyboard.json index 5d2c3ec5acd..dee1decb947 100644 --- a/keyboards/hotdox/keyboard.json +++ b/keyboards/hotdox/keyboard.json @@ -21,6 +21,12 @@ "backlight": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "tapping": { "toggle": 1 }, diff --git a/keyboards/hs60/v1/config.h b/keyboards/hs60/v1/config.h index 95730e10e46..1bbc88ac1d4 100644 --- a/keyboards/hs60/v1/config.h +++ b/keyboards/hs60/v1/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/hs60/v1/keyboard.json b/keyboards/hs60/v1/keyboard.json index 3c07491a3db..f4a05dfe27e 100644 --- a/keyboards/hs60/v1/keyboard.json +++ b/keyboards/hs60/v1/keyboard.json @@ -75,6 +75,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["60_ansi", "60_iso"], "layouts": { "LAYOUT_60_iso": { From 73f9fb91a391555748d4839161154b98f95eb8fc Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 21 May 2024 05:04:53 -0700 Subject: [PATCH 301/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: G (#23758) Affects: - `gboards/ergotaco` - `gboards/georgi` - `gboards/gergo` - `geekboards/tester` - `geonworks/frogmini/fmh` - `geonworks/frogmini/fms` - `gh60/revc` - `gh60/satan` - `ghs/rar` - `gkeyboard/gkb_m16` - `gkeyboard/gpad8_2r` - `gl516/a52gl` - `gl516/j73gl` - `gl516/n51gl` - `gmmk/gmmk2/p65` - `gmmk/gmmk2/p96` - `gmmk/numpad` - `gmmk/pro` - `gon/nerd60` - `gon/nerdtkl` - `gray_studio/aero75` - `gray_studio/cod67` - `gray_studio/space65` - `gray_studio/space65r3` - `gray_studio/think65v3` - `grid600/press` --- keyboards/gboards/ergotaco/config.h | 5 --- keyboards/gboards/ergotaco/keyboard.json | 6 +++ keyboards/gboards/georgi/config.h | 5 --- keyboards/gboards/georgi/keyboard.json | 6 +++ keyboards/gboards/gergo/config.h | 5 --- keyboards/gboards/gergo/keyboard.json | 6 +++ keyboards/geekboards/tester/config.h | 3 -- keyboards/geekboards/tester/keyboard.json | 6 +++ keyboards/geonworks/frogmini/fmh/config.h | 3 -- .../geonworks/frogmini/fmh/keyboard.json | 6 +++ keyboards/geonworks/frogmini/fms/config.h | 3 -- .../geonworks/frogmini/fms/keyboard.json | 6 +++ keyboards/gh60/revc/config.h | 39 ------------------- keyboards/gh60/revc/keyboard.json | 6 +++ keyboards/gh60/satan/config.h | 39 ------------------- keyboards/gh60/satan/keyboard.json | 6 +++ keyboards/ghs/rar/config.h | 39 ------------------- keyboards/ghs/rar/keyboard.json | 6 +++ keyboards/gkeyboard/gkb_m16/config.h | 39 ------------------- keyboards/gkeyboard/gkb_m16/keyboard.json | 6 +++ keyboards/gkeyboard/gpad8_2r/config.h | 9 ----- keyboards/gkeyboard/gpad8_2r/keyboard.json | 6 +++ keyboards/gl516/a52gl/config.h | 5 --- keyboards/gl516/a52gl/keyboard.json | 6 +++ keyboards/gl516/j73gl/config.h | 5 --- keyboards/gl516/j73gl/keyboard.json | 6 +++ keyboards/gl516/n51gl/config.h | 5 --- keyboards/gl516/n51gl/keyboard.json | 6 +++ keyboards/gmmk/gmmk2/p65/config.h | 5 --- keyboards/gmmk/gmmk2/p65/info.json | 8 +++- keyboards/gmmk/gmmk2/p96/config.h | 5 --- keyboards/gmmk/gmmk2/p96/info.json | 8 +++- keyboards/gmmk/numpad/config.h | 3 -- keyboards/gmmk/numpad/keyboard.json | 6 +++ keyboards/gmmk/pro/config.h | 5 --- keyboards/gmmk/pro/info.json | 8 +++- keyboards/gon/nerd60/config.h | 6 --- keyboards/gon/nerd60/keyboard.json | 6 +++ keyboards/gon/nerdtkl/config.h | 6 --- keyboards/gon/nerdtkl/keyboard.json | 6 +++ keyboards/gray_studio/aero75/config.h | 10 ----- keyboards/gray_studio/aero75/keyboard.json | 6 +++ keyboards/gray_studio/cod67/config.h | 23 ----------- keyboards/gray_studio/cod67/keyboard.json | 6 +++ keyboards/gray_studio/space65/config.h | 39 ------------------- keyboards/gray_studio/space65/keyboard.json | 6 +++ keyboards/gray_studio/space65r3/config.h | 8 ---- keyboards/gray_studio/space65r3/keyboard.json | 6 +++ keyboards/gray_studio/think65v3/config.h | 9 ----- keyboards/gray_studio/think65v3/keyboard.json | 6 +++ keyboards/grid600/press/config.h | 23 ----------- keyboards/grid600/press/keyboard.json | 6 +++ 52 files changed, 159 insertions(+), 349 deletions(-) delete mode 100644 keyboards/gh60/revc/config.h delete mode 100644 keyboards/gh60/satan/config.h delete mode 100644 keyboards/ghs/rar/config.h delete mode 100644 keyboards/gkeyboard/gkb_m16/config.h delete mode 100644 keyboards/gkeyboard/gpad8_2r/config.h delete mode 100644 keyboards/gon/nerd60/config.h delete mode 100644 keyboards/gon/nerdtkl/config.h delete mode 100644 keyboards/gray_studio/aero75/config.h delete mode 100644 keyboards/gray_studio/cod67/config.h delete mode 100644 keyboards/gray_studio/space65/config.h delete mode 100644 keyboards/gray_studio/space65r3/config.h delete mode 100644 keyboards/gray_studio/think65v3/config.h delete mode 100644 keyboards/grid600/press/config.h diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h index 0ab992eac30..dccdbf8528d 100644 --- a/keyboards/gboards/ergotaco/config.h +++ b/keyboards/gboards/ergotaco/config.h @@ -33,10 +33,5 @@ along with this program. If not, see . #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* 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 - /* key combination for command */ #define IS_COMMAND() (get_mods() == MOD_MASK_CTRL || get_mods() == MOD_MASK_SHIFT) diff --git a/keyboards/gboards/ergotaco/keyboard.json b/keyboards/gboards/ergotaco/keyboard.json index 1d13c2458a7..dfd1177c9eb 100644 --- a/keyboards/gboards/ergotaco/keyboard.json +++ b/keyboards/gboards/ergotaco/keyboard.json @@ -17,6 +17,12 @@ "console": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "tapping": { "toggle": 1 }, diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h index f0785f24bc6..279ccca596e 100644 --- a/keyboards/gboards/georgi/config.h +++ b/keyboards/gboards/georgi/config.h @@ -38,11 +38,6 @@ along with this program. If not, see . #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* 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 - /* key combination for command */ #define IS_COMMAND() ( \ get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ diff --git a/keyboards/gboards/georgi/keyboard.json b/keyboards/gboards/georgi/keyboard.json index 066797a2415..0b403a5a448 100644 --- a/keyboards/gboards/georgi/keyboard.json +++ b/keyboards/gboards/georgi/keyboard.json @@ -19,6 +19,12 @@ "nkro": true, "steno": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h index 44cb5a4304a..b18d58aeed7 100644 --- a/keyboards/gboards/gergo/config.h +++ b/keyboards/gboards/gergo/config.h @@ -42,11 +42,6 @@ along with this program. If not, see . #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* 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 - /* key combination for command */ #define IS_COMMAND() ( \ get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ diff --git a/keyboards/gboards/gergo/keyboard.json b/keyboards/gboards/gergo/keyboard.json index e576ac8012e..9446b3d1830 100644 --- a/keyboards/gboards/gergo/keyboard.json +++ b/keyboards/gboards/gergo/keyboard.json @@ -23,6 +23,12 @@ "console": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "tapping": { "toggle": 1 }, diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h index 1c78a34e604..20bed345131 100644 --- a/keyboards/geekboards/tester/config.h +++ b/keyboards/geekboards/tester/config.h @@ -1,6 +1,3 @@ #pragma once #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND - -#define LOCKING_SUPPORT_ENABL -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/geekboards/tester/keyboard.json b/keyboards/geekboards/tester/keyboard.json index 0bd115906d2..60c6b34e002 100644 --- a/keyboards/geekboards/tester/keyboard.json +++ b/keyboards/geekboards/tester/keyboard.json @@ -61,6 +61,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "F6", "D2", "D3"], "rows": ["B0", "D4"] diff --git a/keyboards/geonworks/frogmini/fmh/config.h b/keyboards/geonworks/frogmini/fmh/config.h index 7410a49e598..68fdadddc7c 100644 --- a/keyboards/geonworks/frogmini/fmh/config.h +++ b/keyboards/geonworks/frogmini/fmh/config.h @@ -25,6 +25,3 @@ along with this program. If not, see . #define EEPROM_I2C_24LC256 #define I2C1_CLOCK_SPEED 400000 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/geonworks/frogmini/fmh/keyboard.json b/keyboards/geonworks/frogmini/fmh/keyboard.json index 899f5084d19..29c5ee8272c 100644 --- a/keyboards/geonworks/frogmini/fmh/keyboard.json +++ b/keyboards/geonworks/frogmini/fmh/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C4", "C5", "B0", "C13", "C14", "C15", "B9", "C1", "C2", "C3", "A6", "A5", "A4", "A0"], "rows": ["A3", "A2", "A1", "B8", "A7", "C0"] diff --git a/keyboards/geonworks/frogmini/fms/config.h b/keyboards/geonworks/frogmini/fms/config.h index ddeaa2abff0..4949570d707 100644 --- a/keyboards/geonworks/frogmini/fms/config.h +++ b/keyboards/geonworks/frogmini/fms/config.h @@ -28,6 +28,3 @@ along with this program. If not, see . #define EEPROM_I2C_24LC256 #define I2C1_CLOCK_SPEED 400000 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/geonworks/frogmini/fms/keyboard.json b/keyboards/geonworks/frogmini/fms/keyboard.json index 66a28805856..06a9c560473 100644 --- a/keyboards/geonworks/frogmini/fms/keyboard.json +++ b/keyboards/geonworks/frogmini/fms/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C4", "C5", "B0", "C13", "C14", "C15", "B9", "C1", "C2", "C3", "A6", "A5", "A4", "A0"], "rows": ["A3", "A2", "A1", "B8", "A7", "C0"] diff --git a/keyboards/gh60/revc/config.h b/keyboards/gh60/revc/config.h deleted file mode 100644 index baf09cebb5e..00000000000 --- a/keyboards/gh60/revc/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/gh60/revc/keyboard.json b/keyboards/gh60/revc/keyboard.json index bc30efd02f5..ea9794d9d27 100644 --- a/keyboards/gh60/revc/keyboard.json +++ b/keyboards/gh60/revc/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/gh60/satan/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/gh60/satan/keyboard.json b/keyboards/gh60/satan/keyboard.json index 54e9d42bcd4..e3f26852970 100644 --- a/keyboards/gh60/satan/keyboard.json +++ b/keyboards/gh60/satan/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h deleted file mode 100644 index 13265701b04..00000000000 --- a/keyboards/ghs/rar/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Gone Hacking Studio - -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/ghs/rar/keyboard.json b/keyboards/ghs/rar/keyboard.json index e033b08f510..22b133c8f99 100644 --- a/keyboards/ghs/rar/keyboard.json +++ b/keyboards/ghs/rar/keyboard.json @@ -35,6 +35,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D1"], "rows": ["B0", "B7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"] diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h deleted file mode 100644 index a8deb9de2aa..00000000000 --- a/keyboards/gkeyboard/gkb_m16/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 gkeyboard - -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/gkeyboard/gkb_m16/keyboard.json b/keyboards/gkeyboard/gkb_m16/keyboard.json index 0d4ddbd4c3c..1f1fe50a678 100644 --- a/keyboards/gkeyboard/gkb_m16/keyboard.json +++ b/keyboards/gkeyboard/gkb_m16/keyboard.json @@ -38,6 +38,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7"], "rows": ["D4", "D5", "D6", "D7"] diff --git a/keyboards/gkeyboard/gpad8_2r/config.h b/keyboards/gkeyboard/gpad8_2r/config.h deleted file mode 100644 index 82f451e0065..00000000000 --- a/keyboards/gkeyboard/gpad8_2r/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2023 gkeyboard (@gkeyboard) -// 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/gkeyboard/gpad8_2r/keyboard.json b/keyboards/gkeyboard/gpad8_2r/keyboard.json index 52e733f9617..6c9a779b05e 100644 --- a/keyboards/gkeyboard/gpad8_2r/keyboard.json +++ b/keyboards/gkeyboard/gpad8_2r/keyboard.json @@ -20,6 +20,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["GP12", "GP11", "GP10", "GP9"], "rows": ["GP4", "GP5", "GP6"] diff --git a/keyboards/gl516/a52gl/config.h b/keyboards/gl516/a52gl/config.h index a4114e1ca6e..7296abd723b 100644 --- a/keyboards/gl516/a52gl/config.h +++ b/keyboards/gl516/a52gl/config.h @@ -25,8 +25,3 @@ along with this program. If not, see . // wiring of each half #define MATRIX_ROW_PINS { D1, D0, D4, C6 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - -/* 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/gl516/a52gl/keyboard.json b/keyboards/gl516/a52gl/keyboard.json index 54fbce6bdad..ad4921f6358 100644 --- a/keyboards/gl516/a52gl/keyboard.json +++ b/keyboards/gl516/a52gl/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gl516/j73gl/config.h b/keyboards/gl516/j73gl/config.h index 16d7526f814..dc93e327c31 100644 --- a/keyboards/gl516/j73gl/config.h +++ b/keyboards/gl516/j73gl/config.h @@ -25,8 +25,3 @@ along with this program. If not, see . // wiring of each half #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, E6 } - -/* 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/gl516/j73gl/keyboard.json b/keyboards/gl516/j73gl/keyboard.json index b252363f700..5fba198a718 100644 --- a/keyboards/gl516/j73gl/keyboard.json +++ b/keyboards/gl516/j73gl/keyboard.json @@ -34,6 +34,12 @@ "extrakey": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gl516/n51gl/config.h b/keyboards/gl516/n51gl/config.h index a4114e1ca6e..7296abd723b 100644 --- a/keyboards/gl516/n51gl/config.h +++ b/keyboards/gl516/n51gl/config.h @@ -25,8 +25,3 @@ along with this program. If not, see . // wiring of each half #define MATRIX_ROW_PINS { D1, D0, D4, C6 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - -/* 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/gl516/n51gl/keyboard.json b/keyboards/gl516/n51gl/keyboard.json index 0e54ee52a45..c1ea4ab5791 100644 --- a/keyboards/gl516/n51gl/keyboard.json +++ b/keyboards/gl516/n51gl/keyboard.json @@ -40,6 +40,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/gmmk2/p65/config.h b/keyboards/gmmk/gmmk2/p65/config.h index 4ea6b3d7392..6d66d0147d2 100644 --- a/keyboards/gmmk/gmmk2/p65/config.h +++ b/keyboards/gmmk/gmmk2/p65/config.h @@ -16,11 +16,6 @@ #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 - /* SPI Config for LED Driver */ #define SPI_DRIVER SPIDM2 #define SPI_SCK_PIN B13 diff --git a/keyboards/gmmk/gmmk2/p65/info.json b/keyboards/gmmk/gmmk2/p65/info.json index 91080575194..aa93e87f624 100644 --- a/keyboards/gmmk/gmmk2/p65/info.json +++ b/keyboards/gmmk/gmmk2/p65/info.json @@ -1,4 +1,10 @@ { + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgb_matrix": { "animations": { "alphas_mods": true, @@ -48,4 +54,4 @@ "driver": "aw20216s", "sleep": true } -} \ No newline at end of file +} diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h index 2b73b4a396c..1b246e4f3fa 100644 --- a/keyboards/gmmk/gmmk2/p96/config.h +++ b/keyboards/gmmk/gmmk2/p96/config.h @@ -16,11 +16,6 @@ #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 - /* External spi flash */ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14 diff --git a/keyboards/gmmk/gmmk2/p96/info.json b/keyboards/gmmk/gmmk2/p96/info.json index 91080575194..aa93e87f624 100644 --- a/keyboards/gmmk/gmmk2/p96/info.json +++ b/keyboards/gmmk/gmmk2/p96/info.json @@ -1,4 +1,10 @@ { + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgb_matrix": { "animations": { "alphas_mods": true, @@ -48,4 +54,4 @@ "driver": "aw20216s", "sleep": true } -} \ No newline at end of file +} diff --git a/keyboards/gmmk/numpad/config.h b/keyboards/gmmk/numpad/config.h index 8f8c893af44..11507c56b9f 100644 --- a/keyboards/gmmk/numpad/config.h +++ b/keyboards/gmmk/numpad/config.h @@ -20,9 +20,6 @@ #define SLIDER_PIN B0 #define MIDI_ADVANCED -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 #define SPI_MOSI_PIN B5 diff --git a/keyboards/gmmk/numpad/keyboard.json b/keyboards/gmmk/numpad/keyboard.json index 70e2d3e6791..f5d64bf6cb1 100644 --- a/keyboards/gmmk/numpad/keyboard.json +++ b/keyboards/gmmk/numpad/keyboard.json @@ -82,6 +82,12 @@ "encoder": true, "midi": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h index 258b57e49d6..0b14de1bab5 100644 --- a/keyboards/gmmk/pro/config.h +++ b/keyboards/gmmk/pro/config.h @@ -16,11 +16,6 @@ #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 - /* SPI Config for LED Driver */ #define SPI_SCK_PIN A5 #define SPI_MOSI_PIN A6 diff --git a/keyboards/gmmk/pro/info.json b/keyboards/gmmk/pro/info.json index 91080575194..aa93e87f624 100644 --- a/keyboards/gmmk/pro/info.json +++ b/keyboards/gmmk/pro/info.json @@ -1,4 +1,10 @@ { + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgb_matrix": { "animations": { "alphas_mods": true, @@ -48,4 +54,4 @@ "driver": "aw20216s", "sleep": true } -} \ No newline at end of file +} diff --git a/keyboards/gon/nerd60/config.h b/keyboards/gon/nerd60/config.h deleted file mode 100644 index fa9a83d08ec..00000000000 --- a/keyboards/gon/nerd60/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#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/gon/nerd60/keyboard.json b/keyboards/gon/nerd60/keyboard.json index 33ad716b4fd..590b3f3d9ed 100644 --- a/keyboards/gon/nerd60/keyboard.json +++ b/keyboards/gon/nerd60/keyboard.json @@ -28,6 +28,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/gon/nerdtkl/config.h b/keyboards/gon/nerdtkl/config.h deleted file mode 100644 index fa9a83d08ec..00000000000 --- a/keyboards/gon/nerdtkl/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#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/gon/nerdtkl/keyboard.json b/keyboards/gon/nerdtkl/keyboard.json index 301cbaf19f1..ccf13ec3251 100644 --- a/keyboards/gon/nerdtkl/keyboard.json +++ b/keyboards/gon/nerdtkl/keyboard.json @@ -28,6 +28,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_tkl": { "layout": [ diff --git a/keyboards/gray_studio/aero75/config.h b/keyboards/gray_studio/aero75/config.h deleted file mode 100644 index 57da6a8ac13..00000000000 --- a/keyboards/gray_studio/aero75/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2022 Yizhen Liu (@edwardslau) -// SPDX-License-Identifier: GPL-2.0 - -#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/gray_studio/aero75/keyboard.json b/keyboards/gray_studio/aero75/keyboard.json index 4119aff5b6e..c0ede794c24 100644 --- a/keyboards/gray_studio/aero75/keyboard.json +++ b/keyboards/gray_studio/aero75/keyboard.json @@ -46,6 +46,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B1", "A8", "B15", "B14", "B13"], "rows": ["A7", "A6", "B12", "A2", "A1", "A0"] diff --git a/keyboards/gray_studio/cod67/config.h b/keyboards/gray_studio/cod67/config.h deleted file mode 100644 index 578f469599a..00000000000 --- a/keyboards/gray_studio/cod67/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2018 MechMerlin - -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 diff --git a/keyboards/gray_studio/cod67/keyboard.json b/keyboards/gray_studio/cod67/keyboard.json index e3687ce9591..fa946d9b339 100644 --- a/keyboards/gray_studio/cod67/keyboard.json +++ b/keyboards/gray_studio/cod67/keyboard.json @@ -49,6 +49,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h deleted file mode 100644 index b5b661bef2a..00000000000 --- a/keyboards/gray_studio/space65/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 MechMerlin - -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/gray_studio/space65/keyboard.json b/keyboards/gray_studio/space65/keyboard.json index 7d5270d0da6..ffe825ff4c8 100644 --- a/keyboards/gray_studio/space65/keyboard.json +++ b/keyboards/gray_studio/space65/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B3", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["D0", "D1", "F0", "F4", "F1"] diff --git a/keyboards/gray_studio/space65r3/config.h b/keyboards/gray_studio/space65r3/config.h deleted file mode 100644 index 67315123e53..00000000000 --- a/keyboards/gray_studio/space65r3/config.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2022 Yizhen Liu (@edwardslau) -// SPDX-License-Identifier: GPL-2.0 -#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/gray_studio/space65r3/keyboard.json b/keyboards/gray_studio/space65r3/keyboard.json index 5895a591944..bdf3624c58f 100644 --- a/keyboards/gray_studio/space65r3/keyboard.json +++ b/keyboards/gray_studio/space65r3/keyboard.json @@ -46,6 +46,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B0", "A8", "B15", "B14", "B13"], "rows": ["A6", "B12", "A2", "A0", "A1"] diff --git a/keyboards/gray_studio/think65v3/config.h b/keyboards/gray_studio/think65v3/config.h deleted file mode 100644 index 6b1f49b5925..00000000000 --- a/keyboards/gray_studio/think65v3/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2023 Yizhen Liu (@edwardslau) -// SPDX-License-Identifier: GPL-2.0 -#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 - \ No newline at end of file diff --git a/keyboards/gray_studio/think65v3/keyboard.json b/keyboards/gray_studio/think65v3/keyboard.json index a61dd5efe1d..0c6b8e7938d 100644 --- a/keyboards/gray_studio/think65v3/keyboard.json +++ b/keyboards/gray_studio/think65v3/keyboard.json @@ -20,6 +20,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "B10" }, diff --git a/keyboards/grid600/press/config.h b/keyboards/grid600/press/config.h deleted file mode 100644 index a7f362f47b7..00000000000 --- a/keyboards/grid600/press/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 mechmerlin - -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 diff --git a/keyboards/grid600/press/keyboard.json b/keyboards/grid600/press/keyboard.json index df8f857afeb..74c3e7aad1a 100644 --- a/keyboards/grid600/press/keyboard.json +++ b/keyboards/grid600/press/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6"], "rows": ["F0"] From 3400908b08284a8e2e17efa19053af874cd44e0c Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 21 May 2024 13:25:28 +0100 Subject: [PATCH 302/333] Move VIA config to keymap level (#23754) --- keyboards/atlantis/ak81_ve/ak81_ve.c | 4 +- keyboards/bandominedoni/config.h | 45 +++++++++---------- keyboards/bandominedoni/keymaps/via/config.h | 24 +++++++++- .../bemeier/bmek/{ => keymaps/via}/config.h | 0 keyboards/bioi/g60/config.h | 3 -- keyboards/bioi/g60/keymaps/via/config.h | 21 +++++++++ keyboards/bioi/morgan65/config.h | 2 - keyboards/bioi/morgan65/keymaps/via/config.h | 20 +++++++++ keyboards/cannonkeys/malicious_ergo/config.h | 8 ---- .../malicious_ergo/keymaps/via/config.h | 21 +++++++++ .../chlx/merro60/{ => keymaps/via}/config.h | 0 .../ppr_merro60/{ => keymaps/via}/config.h | 0 keyboards/chlx/str_merro60/config.h | 5 +-- .../chlx/str_merro60/keymaps/via/config.h | 21 +++++++++ .../seis_cinco/{ => keymaps/via}/config.h | 0 keyboards/dz60/{ => keymaps/via}/config.h | 0 .../dztech/bocc/{ => keymaps/via}/config.h | 0 keyboards/dztech/duo_s/config.h | 2 - keyboards/dztech/duo_s/keymaps/via/config.h | 19 ++++++++ keyboards/dztech/dz64rgb/config.h | 2 - keyboards/dztech/dz64rgb/keymaps/via/config.h | 19 ++++++++ keyboards/era/linx3/n8x/config.h | 2 - keyboards/era/linx3/n8x/keymaps/via/config.h | 6 +++ keyboards/ilumkb/primus75/config.h | 2 - .../ilumkb/primus75/keymaps/via/config.h | 18 ++++++++ keyboards/ilumkb/volcano660/config.h | 3 -- .../ilumkb/volcano660/keymaps/via/config.h | 19 ++++++++ keyboards/kbdfans/baguette66/rgb/config.h | 2 - .../baguette66/rgb/keymaps/via/config.h | 19 ++++++++ .../kbdfans/baguette66/soldered/config.h | 1 - .../baguette66/soldered/keymaps/via/config.h | 19 ++++++++ keyboards/kbdfans/boop65/rgb/config.h | 2 - .../kbdfans/boop65/rgb/keymaps/via/config.h | 19 ++++++++ keyboards/kbdfans/bounce/75/hotswap/config.h | 2 - .../bounce/75/hotswap/keymaps/via/config.h | 19 ++++++++ keyboards/kbdfans/bounce/75/soldered/config.h | 2 - .../bounce/75/soldered/keymaps/via/config.h | 19 ++++++++ .../kbd67/mkiirgb/keymaps/via/config.h | 19 ++++++++ keyboards/kbdfans/kbd67/mkiirgb/v4/config.h | 2 - keyboards/kbdfans/kbd67/mkiirgb_iso/config.h | 1 - .../kbd67/mkiirgb_iso/keymaps/via/config.h | 19 ++++++++ keyboards/kbdfans/kbd75hs/config.h | 2 - .../kbdfans/kbd75hs/keymaps/via/config.h | 19 ++++++++ keyboards/kbdfans/kbd75rgb/config.h | 1 - .../kbdfans/kbd75rgb/keymaps/via/config.h | 19 ++++++++ keyboards/kbdfans/odin/soldered/config.h | 2 - .../odin/soldered/keymaps/via/config.h | 5 ++- keyboards/kbdfans/phaseone/config.h | 2 - .../kbdfans/phaseone/keymaps/via/config.h | 19 ++++++++ keyboards/kbdfans/tiger80/config.h | 2 - .../kbdfans/tiger80/keymaps/via/config.h | 19 ++++++++ .../{rev1 => keymaps/via}/config.h | 0 .../keebio/quefrency/keymaps/via/config.h | 35 +++++++++++++++ keyboards/keebio/quefrency/rev1/config.h | 3 -- keyboards/keebio/quefrency/rev2/config.h | 4 -- keyboards/keebio/quefrency/rev3/config.h | 4 -- keyboards/keebio/sinc/keymaps/via/config.h | 23 ++++++++++ keyboards/keebio/sinc/rev1/config.h | 2 - keyboards/keebio/sinc/rev2/config.h | 2 - keyboards/keebsforall/coarse60/config.h | 3 -- .../keebsforall/coarse60/keymaps/via/config.h | 20 +++++++++ keyboards/melgeek/mj6xy/config.h | 4 -- keyboards/melgeek/mj6xy/keymaps/via/config.h | 21 +++++++++ keyboards/mt/mt64rgb/config.h | 3 -- keyboards/mt/mt64rgb/keymaps/via/config.h | 19 ++++++++ keyboards/playkbtw/pk64rgb/config.h | 3 -- .../playkbtw/pk64rgb/keymaps/via/config.h | 20 +++++++++ .../projectkb/alice/keymaps/via/config.h | 21 +++++++++ keyboards/projectkb/alice/rev1/config.h | 3 -- keyboards/projectkb/alice/rev2/config.h | 4 -- 70 files changed, 582 insertions(+), 113 deletions(-) rename keyboards/bemeier/bmek/{ => keymaps/via}/config.h (100%) create mode 100644 keyboards/bioi/g60/keymaps/via/config.h create mode 100644 keyboards/bioi/morgan65/keymaps/via/config.h create mode 100644 keyboards/cannonkeys/malicious_ergo/keymaps/via/config.h rename keyboards/chlx/merro60/{ => keymaps/via}/config.h (100%) rename keyboards/chlx/ppr_merro60/{ => keymaps/via}/config.h (100%) create mode 100644 keyboards/chlx/str_merro60/keymaps/via/config.h rename keyboards/daji/seis_cinco/{ => keymaps/via}/config.h (100%) rename keyboards/dz60/{ => keymaps/via}/config.h (100%) rename keyboards/dztech/bocc/{ => keymaps/via}/config.h (100%) create mode 100644 keyboards/dztech/duo_s/keymaps/via/config.h create mode 100644 keyboards/dztech/dz64rgb/keymaps/via/config.h create mode 100644 keyboards/era/linx3/n8x/keymaps/via/config.h create mode 100644 keyboards/ilumkb/primus75/keymaps/via/config.h create mode 100644 keyboards/ilumkb/volcano660/keymaps/via/config.h create mode 100644 keyboards/kbdfans/baguette66/rgb/keymaps/via/config.h create mode 100644 keyboards/kbdfans/baguette66/soldered/keymaps/via/config.h create mode 100644 keyboards/kbdfans/boop65/rgb/keymaps/via/config.h create mode 100644 keyboards/kbdfans/bounce/75/hotswap/keymaps/via/config.h create mode 100644 keyboards/kbdfans/bounce/75/soldered/keymaps/via/config.h create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/config.h create mode 100644 keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/config.h create mode 100644 keyboards/kbdfans/kbd75hs/keymaps/via/config.h create mode 100644 keyboards/kbdfans/kbd75rgb/keymaps/via/config.h create mode 100644 keyboards/kbdfans/phaseone/keymaps/via/config.h create mode 100644 keyboards/kbdfans/tiger80/keymaps/via/config.h rename keyboards/keebio/convolution/{rev1 => keymaps/via}/config.h (100%) create mode 100644 keyboards/keebio/quefrency/keymaps/via/config.h create mode 100644 keyboards/keebio/sinc/keymaps/via/config.h create mode 100644 keyboards/keebsforall/coarse60/keymaps/via/config.h create mode 100755 keyboards/melgeek/mj6xy/keymaps/via/config.h create mode 100644 keyboards/mt/mt64rgb/keymaps/via/config.h create mode 100644 keyboards/playkbtw/pk64rgb/keymaps/via/config.h create mode 100644 keyboards/projectkb/alice/keymaps/via/config.h diff --git a/keyboards/atlantis/ak81_ve/ak81_ve.c b/keyboards/atlantis/ak81_ve/ak81_ve.c index 2eda87b5b06..5f4ae20f15d 100644 --- a/keyboards/atlantis/ak81_ve/ak81_ve.c +++ b/keyboards/atlantis/ak81_ve/ak81_ve.c @@ -46,7 +46,7 @@ led_config_t g_led_config = { { } }; #endif -#if !defined(VIA_ENABLE) && defined(ENCODER_ENABLE) +#if defined(ENCODER_ENABLE) && !defined(ENCODER_MAP_ENABLE) bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; @@ -79,4 +79,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { } return true; } -#endif \ No newline at end of file +#endif diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h index ecab8fc61fc..03bff281333 100644 --- a/keyboards/bandominedoni/config.h +++ b/keyboards/bandominedoni/config.h @@ -75,30 +75,27 @@ // RAINDROPS don't match well with layer LED indicator (oc) using rgb_matrix_set_color(). // #define ENABLE_RGB_MATRIX_RAINDROPS // #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -// Recommended not to use these. -# ifndef VIA_ENABLE -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BAND_VAL -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -# define ENABLE_RGB_MATRIX_CYCLE_ALL -# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_BEACON -# define ENABLE_RGB_MATRIX_HUE_BREATHING -# define ENABLE_RGB_MATRIX_HUE_PENDULUM -# define ENABLE_RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# endif +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS # endif // CONSOLE_ENABLE #endif // RGB_MATRIX_ENABLE diff --git a/keyboards/bandominedoni/keymaps/via/config.h b/keyboards/bandominedoni/keymaps/via/config.h index 4dcac5104f0..6f27c9aea80 100644 --- a/keyboards/bandominedoni/keymaps/via/config.h +++ b/keyboards/bandominedoni/keymaps/via/config.h @@ -13,6 +13,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once +#pragma once -#define DYNAMIC_KEYMAP_LAYER_COUNT 4 +#undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +#undef ENABLE_RGB_MATRIX_BAND_VAL +#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +#undef ENABLE_RGB_MATRIX_CYCLE_ALL +#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN +#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#undef ENABLE_RGB_MATRIX_DUAL_BEACON +#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON +#undef ENABLE_RGB_MATRIX_HUE_BREATHING +#undef ENABLE_RGB_MATRIX_HUE_PENDULUM +#undef ENABLE_RGB_MATRIX_HUE_WAVE +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +#undef ENABLE_RGB_MATRIX_MULTISPLASH +#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS diff --git a/keyboards/bemeier/bmek/config.h b/keyboards/bemeier/bmek/keymaps/via/config.h similarity index 100% rename from keyboards/bemeier/bmek/config.h rename to keyboards/bemeier/bmek/keymaps/via/config.h diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h index 30ce798073d..9f005f2d79f 100644 --- a/keyboards/bioi/g60/config.h +++ b/keyboards/bioi/g60/config.h @@ -20,6 +20,3 @@ along with this program. If not, see . /* key combination for magic key command */ #define KEYBOARD_LOCK_ENABLE #define MAGIC_KEY_LOCK L - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 3 -#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 1 diff --git a/keyboards/bioi/g60/keymaps/via/config.h b/keyboards/bioi/g60/keymaps/via/config.h new file mode 100644 index 00000000000..d934386e798 --- /dev/null +++ b/keyboards/bioi/g60/keymaps/via/config.h @@ -0,0 +1,21 @@ +/* +Copyright 2019 Basic I/O Instruments(Scott Wei) + +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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 3 +#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 1 diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h index 78f53856f79..9f005f2d79f 100644 --- a/keyboards/bioi/morgan65/config.h +++ b/keyboards/bioi/morgan65/config.h @@ -20,5 +20,3 @@ along with this program. If not, see . /* key combination for magic key command */ #define KEYBOARD_LOCK_ENABLE #define MAGIC_KEY_LOCK L - -#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 1 diff --git a/keyboards/bioi/morgan65/keymaps/via/config.h b/keyboards/bioi/morgan65/keymaps/via/config.h new file mode 100644 index 00000000000..6dafe92cba0 --- /dev/null +++ b/keyboards/bioi/morgan65/keymaps/via/config.h @@ -0,0 +1,20 @@ +/* +Copyright 2019 Basic I/O Instruments(Scott Wei) + +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 + +#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 1 diff --git a/keyboards/cannonkeys/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h index 8dce4c5c2e3..5736094ee52 100644 --- a/keyboards/cannonkeys/malicious_ergo/config.h +++ b/keyboards/cannonkeys/malicious_ergo/config.h @@ -1,5 +1,3 @@ -#pragma once - /* Copyright 2022 Andrew Kannan @@ -28,9 +26,6 @@ along with this program. If not, see . #define WS2812_SPI_SCK_PAL_MODE 0 #define WS2812_SPI_SCK_PIN B13 -// 2 bits for 4 layout options -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 - #define SLEEP_LED_GPT_DRIVER GPTD1 /* @@ -48,6 +43,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - - - diff --git a/keyboards/cannonkeys/malicious_ergo/keymaps/via/config.h b/keyboards/cannonkeys/malicious_ergo/keymaps/via/config.h new file mode 100644 index 00000000000..9a8629d439e --- /dev/null +++ b/keyboards/cannonkeys/malicious_ergo/keymaps/via/config.h @@ -0,0 +1,21 @@ +/* +Copyright 2022 Andrew Kannan + +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 + +// 2 bits for 4 layout options +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/chlx/merro60/config.h b/keyboards/chlx/merro60/keymaps/via/config.h similarity index 100% rename from keyboards/chlx/merro60/config.h rename to keyboards/chlx/merro60/keymaps/via/config.h diff --git a/keyboards/chlx/ppr_merro60/config.h b/keyboards/chlx/ppr_merro60/keymaps/via/config.h similarity index 100% rename from keyboards/chlx/ppr_merro60/config.h rename to keyboards/chlx/ppr_merro60/keymaps/via/config.h diff --git a/keyboards/chlx/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h index 2e886ebef5b..db81c12b8cc 100644 --- a/keyboards/chlx/str_merro60/config.h +++ b/keyboards/chlx/str_merro60/config.h @@ -17,7 +17,4 @@ along with this program. If not, see . #pragma once -# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 - -/* VIA related config */ -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 +#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 diff --git a/keyboards/chlx/str_merro60/keymaps/via/config.h b/keyboards/chlx/str_merro60/keymaps/via/config.h new file mode 100644 index 00000000000..c1db72f6f5a --- /dev/null +++ b/keyboards/chlx/str_merro60/keymaps/via/config.h @@ -0,0 +1,21 @@ +/* +Copyright 2022 Alexander Lee + +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 + +/* VIA related config */ +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/daji/seis_cinco/config.h b/keyboards/daji/seis_cinco/keymaps/via/config.h similarity index 100% rename from keyboards/daji/seis_cinco/config.h rename to keyboards/daji/seis_cinco/keymaps/via/config.h diff --git a/keyboards/dz60/config.h b/keyboards/dz60/keymaps/via/config.h similarity index 100% rename from keyboards/dz60/config.h rename to keyboards/dz60/keymaps/via/config.h diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/keymaps/via/config.h similarity index 100% rename from keyboards/dztech/bocc/config.h rename to keyboards/dztech/bocc/keymaps/via/config.h diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h index c180c019a43..0cb10801f5d 100644 --- a/keyboards/dztech/duo_s/config.h +++ b/keyboards/dztech/duo_s/config.h @@ -17,5 +17,3 @@ #pragma once #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/dztech/duo_s/keymaps/via/config.h b/keyboards/dztech/duo_s/keymaps/via/config.h new file mode 100644 index 00000000000..12ea38ce794 --- /dev/null +++ b/keyboards/dztech/duo_s/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2021 DZTECH + * + * 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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/dztech/dz64rgb/config.h b/keyboards/dztech/dz64rgb/config.h index 970fce9d72f..9d8075fc34c 100644 --- a/keyboards/dztech/dz64rgb/config.h +++ b/keyboards/dztech/dz64rgb/config.h @@ -19,5 +19,3 @@ #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND #define USB_SUSPEND_WAKEUP_DELAY 5000 - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/dztech/dz64rgb/keymaps/via/config.h b/keyboards/dztech/dz64rgb/keymaps/via/config.h new file mode 100644 index 00000000000..e308f7ec980 --- /dev/null +++ b/keyboards/dztech/dz64rgb/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2021 DZTECH + * + * 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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/era/linx3/n8x/config.h b/keyboards/era/linx3/n8x/config.h index b2cffb1151a..28548bad000 100644 --- a/keyboards/era/linx3/n8x/config.h +++ b/keyboards/era/linx3/n8x/config.h @@ -10,5 +10,3 @@ /* BACKLIGHT PWM */ #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B - -#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 4 \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/keymaps/via/config.h b/keyboards/era/linx3/n8x/keymaps/via/config.h new file mode 100644 index 00000000000..7326eac2c79 --- /dev/null +++ b/keyboards/era/linx3/n8x/keymaps/via/config.h @@ -0,0 +1,6 @@ +// Copyright 2024 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 4 diff --git a/keyboards/ilumkb/primus75/config.h b/keyboards/ilumkb/primus75/config.h index 0e5e8b9d255..ee087cc051a 100644 --- a/keyboards/ilumkb/primus75/config.h +++ b/keyboards/ilumkb/primus75/config.h @@ -20,5 +20,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/ilumkb/primus75/keymaps/via/config.h b/keyboards/ilumkb/primus75/keymaps/via/config.h new file mode 100644 index 00000000000..ebf1bc97e9e --- /dev/null +++ b/keyboards/ilumkb/primus75/keymaps/via/config.h @@ -0,0 +1,18 @@ +/* Copyright 2021 dztech + * + * 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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/ilumkb/volcano660/config.h b/keyboards/ilumkb/volcano660/config.h index fdd18467535..fa9d81cec23 100644 --- a/keyboards/ilumkb/volcano660/config.h +++ b/keyboards/ilumkb/volcano660/config.h @@ -19,6 +19,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* VIA related config */ -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 4 diff --git a/keyboards/ilumkb/volcano660/keymaps/via/config.h b/keyboards/ilumkb/volcano660/keymaps/via/config.h new file mode 100644 index 00000000000..42718c96102 --- /dev/null +++ b/keyboards/ilumkb/volcano660/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2020 dztech + * + * 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 + +/* VIA related config */ +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 4 diff --git a/keyboards/kbdfans/baguette66/rgb/config.h b/keyboards/kbdfans/baguette66/rgb/config.h index d309ba55eeb..b7bf44d9b68 100644 --- a/keyboards/kbdfans/baguette66/rgb/config.h +++ b/keyboards/kbdfans/baguette66/rgb/config.h @@ -17,5 +17,3 @@ #pragma once #define USB_SUSPEND_WAKEUP_DELAY 5000 - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/baguette66/rgb/keymaps/via/config.h b/keyboards/kbdfans/baguette66/rgb/keymaps/via/config.h new file mode 100644 index 00000000000..269d09df1fa --- /dev/null +++ b/keyboards/kbdfans/baguette66/rgb/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2022 DZTECH + * + * 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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/baguette66/soldered/config.h b/keyboards/kbdfans/baguette66/soldered/config.h index 707393a1979..b7bf44d9b68 100644 --- a/keyboards/kbdfans/baguette66/soldered/config.h +++ b/keyboards/kbdfans/baguette66/soldered/config.h @@ -17,4 +17,3 @@ #pragma once #define USB_SUSPEND_WAKEUP_DELAY 5000 -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/baguette66/soldered/keymaps/via/config.h b/keyboards/kbdfans/baguette66/soldered/keymaps/via/config.h new file mode 100644 index 00000000000..269d09df1fa --- /dev/null +++ b/keyboards/kbdfans/baguette66/soldered/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2022 DZTECH + * + * 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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/boop65/rgb/config.h b/keyboards/kbdfans/boop65/rgb/config.h index daf59859966..ec4042f5121 100644 --- a/keyboards/kbdfans/boop65/rgb/config.h +++ b/keyboards/kbdfans/boop65/rgb/config.h @@ -19,5 +19,3 @@ #define USB_SUSPEND_WAKEUP_DELAY 5000 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/boop65/rgb/keymaps/via/config.h b/keyboards/kbdfans/boop65/rgb/keymaps/via/config.h new file mode 100644 index 00000000000..08f011077b2 --- /dev/null +++ b/keyboards/kbdfans/boop65/rgb/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2021 Dztech + * + * 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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h index 56a23d83219..ec3794e0673 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/config.h +++ b/keyboards/kbdfans/bounce/75/hotswap/config.h @@ -17,5 +17,3 @@ #pragma once #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 ) - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 \ No newline at end of file diff --git a/keyboards/kbdfans/bounce/75/hotswap/keymaps/via/config.h b/keyboards/kbdfans/bounce/75/hotswap/keymaps/via/config.h new file mode 100644 index 00000000000..0ecbf93f8b2 --- /dev/null +++ b/keyboards/kbdfans/bounce/75/hotswap/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2022 DZTECH + * + * 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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 \ No newline at end of file diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h index 56a23d83219..ec3794e0673 100644 --- a/keyboards/kbdfans/bounce/75/soldered/config.h +++ b/keyboards/kbdfans/bounce/75/soldered/config.h @@ -17,5 +17,3 @@ #pragma once #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 ) - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 \ No newline at end of file diff --git a/keyboards/kbdfans/bounce/75/soldered/keymaps/via/config.h b/keyboards/kbdfans/bounce/75/soldered/keymaps/via/config.h new file mode 100644 index 00000000000..269d09df1fa --- /dev/null +++ b/keyboards/kbdfans/bounce/75/soldered/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2022 DZTECH + * + * 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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/config.h new file mode 100644 index 00000000000..12ea38ce794 --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2021 DZTECH + * + * 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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h index 8ed4d909cb4..3390984411e 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h @@ -17,5 +17,3 @@ #pragma once #define USB_SUSPEND_WAKEUP_DELAY 5000 - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h index f20015619bb..3390984411e 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h @@ -17,4 +17,3 @@ #pragma once #define USB_SUSPEND_WAKEUP_DELAY 5000 -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/config.h new file mode 100644 index 00000000000..12ea38ce794 --- /dev/null +++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2021 DZTECH + * + * 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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h index 05ad34d3f57..4c42ba3c62e 100644 --- a/keyboards/kbdfans/kbd75hs/config.h +++ b/keyboards/kbdfans/kbd75hs/config.h @@ -17,5 +17,3 @@ #pragma once #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/kbd75hs/keymaps/via/config.h b/keyboards/kbdfans/kbd75hs/keymaps/via/config.h new file mode 100644 index 00000000000..e777326dd59 --- /dev/null +++ b/keyboards/kbdfans/kbd75hs/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2021 DZTECH + * + * 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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h index d7040d41727..40a0ab60c20 100644 --- a/keyboards/kbdfans/kbd75rgb/config.h +++ b/keyboards/kbdfans/kbd75rgb/config.h @@ -17,4 +17,3 @@ #pragma once #define USB_SUSPEND_WAKEUP_DELAY 5000 -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/kbd75rgb/keymaps/via/config.h b/keyboards/kbdfans/kbd75rgb/keymaps/via/config.h new file mode 100644 index 00000000000..e777326dd59 --- /dev/null +++ b/keyboards/kbdfans/kbd75rgb/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2021 DZTECH + * + * 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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h index 3586d1d96a4..f45d64b858a 100644 --- a/keyboards/kbdfans/odin/soldered/config.h +++ b/keyboards/kbdfans/odin/soldered/config.h @@ -17,5 +17,3 @@ #pragma once #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 8) - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/odin/soldered/keymaps/via/config.h b/keyboards/kbdfans/odin/soldered/keymaps/via/config.h index fc9fbf68cda..aaa7f148109 100644 --- a/keyboards/kbdfans/odin/soldered/keymaps/via/config.h +++ b/keyboards/kbdfans/odin/soldered/keymaps/via/config.h @@ -14,4 +14,7 @@ * along with this program. If not, see . */ #pragma once -#define DYNAMIC_KEYMAP_LAYER_COUNT 2 \ No newline at end of file + +#define DYNAMIC_KEYMAP_LAYER_COUNT 2 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h index b090729a50d..cc19b0f44fc 100644 --- a/keyboards/kbdfans/phaseone/config.h +++ b/keyboards/kbdfans/phaseone/config.h @@ -22,5 +22,3 @@ #define LOCKING_RESYNC_ENABLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 \ No newline at end of file diff --git a/keyboards/kbdfans/phaseone/keymaps/via/config.h b/keyboards/kbdfans/phaseone/keymaps/via/config.h new file mode 100644 index 00000000000..3afd289d1d5 --- /dev/null +++ b/keyboards/kbdfans/phaseone/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2022 Dztech + * + * 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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/tiger80/config.h b/keyboards/kbdfans/tiger80/config.h index b58aa329ecc..05101e6a08c 100644 --- a/keyboards/kbdfans/tiger80/config.h +++ b/keyboards/kbdfans/tiger80/config.h @@ -17,5 +17,3 @@ #pragma once #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/tiger80/keymaps/via/config.h b/keyboards/kbdfans/tiger80/keymaps/via/config.h new file mode 100644 index 00000000000..269d09df1fa --- /dev/null +++ b/keyboards/kbdfans/tiger80/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2022 DZTECH + * + * 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 + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/keebio/convolution/rev1/config.h b/keyboards/keebio/convolution/keymaps/via/config.h similarity index 100% rename from keyboards/keebio/convolution/rev1/config.h rename to keyboards/keebio/convolution/keymaps/via/config.h diff --git a/keyboards/keebio/quefrency/keymaps/via/config.h b/keyboards/keebio/quefrency/keymaps/via/config.h new file mode 100644 index 00000000000..bb1373dee30 --- /dev/null +++ b/keyboards/keebio/quefrency/keymaps/via/config.h @@ -0,0 +1,35 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 + +#if defined(KEYBOARD_keebio_quefrency_rev1) + // Set 65% column (option 1) and Macro (option 2) on by default + #define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x60 + +#elif defined(KEYBOARD_keebio_quefrency_rev2) + // Set 65% column (option 3) and Macro (option 4) on by default + #define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE + #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 + +#elif defined(KEYBOARD_keebio_quefrency_rev3) + // Set 65% column (option 3) and Macro (option 4) on by default + #define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE + #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 + +#endif diff --git a/keyboards/keebio/quefrency/rev1/config.h b/keyboards/keebio/quefrency/rev1/config.h index 84cfc900694..058d8b6cb53 100644 --- a/keyboards/keebio/quefrency/rev1/config.h +++ b/keyboards/keebio/quefrency/rev1/config.h @@ -24,6 +24,3 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -// Set 65% column (option 1) and Macro (option 2) on by default -#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x60 diff --git a/keyboards/keebio/quefrency/rev2/config.h b/keyboards/keebio/quefrency/rev2/config.h index 60db14d5fbd..edc732d668b 100644 --- a/keyboards/keebio/quefrency/rev2/config.h +++ b/keyboards/keebio/quefrency/rev2/config.h @@ -21,7 +21,3 @@ along with this program. If not, see . #define SPLIT_HAND_PIN F7 #define CAPS_LOCK_LED_PIN B6 - -// Set 65% column (option 3) and Macro (option 4) on by default -#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/keebio/quefrency/rev3/config.h b/keyboards/keebio/quefrency/rev3/config.h index 60db14d5fbd..edc732d668b 100644 --- a/keyboards/keebio/quefrency/rev3/config.h +++ b/keyboards/keebio/quefrency/rev3/config.h @@ -21,7 +21,3 @@ along with this program. If not, see . #define SPLIT_HAND_PIN F7 #define CAPS_LOCK_LED_PIN B6 - -// Set 65% column (option 3) and Macro (option 4) on by default -#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/keebio/sinc/keymaps/via/config.h b/keyboards/keebio/sinc/keymaps/via/config.h new file mode 100644 index 00000000000..c1b110bf861 --- /dev/null +++ b/keyboards/keebio/sinc/keymaps/via/config.h @@ -0,0 +1,23 @@ +/* Copyright 2021 Danny Nguyen + +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 + +#if defined(KEYBOARD_keebio_sinc_rev1) || defined(KEYBOARD_keebio_sinc_rev2) + + #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 + +#endif diff --git a/keyboards/keebio/sinc/rev1/config.h b/keyboards/keebio/sinc/rev1/config.h index e8024190b4b..7ddfa79fafe 100644 --- a/keyboards/keebio/sinc/rev1/config.h +++ b/keyboards/keebio/sinc/rev1/config.h @@ -25,5 +25,3 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/keebio/sinc/rev2/config.h b/keyboards/keebio/sinc/rev2/config.h index e8024190b4b..7ddfa79fafe 100644 --- a/keyboards/keebio/sinc/rev2/config.h +++ b/keyboards/keebio/sinc/rev2/config.h @@ -25,5 +25,3 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/keebsforall/coarse60/config.h b/keyboards/keebsforall/coarse60/config.h index 6ea9b9aae2d..9a4bf0a144d 100644 --- a/keyboards/keebsforall/coarse60/config.h +++ b/keyboards/keebsforall/coarse60/config.h @@ -30,9 +30,6 @@ along with this program. If not, see . #define WS2812_SPI_SCK_PAL_MODE 0 #define WS2812_SPI_SCK_PIN B13 -// 2 bits for 4 layout options -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/keebsforall/coarse60/keymaps/via/config.h b/keyboards/keebsforall/coarse60/keymaps/via/config.h new file mode 100644 index 00000000000..f55b94a87b7 --- /dev/null +++ b/keyboards/keebsforall/coarse60/keymaps/via/config.h @@ -0,0 +1,20 @@ +/* +Copyright 2021 Elliot Powell + +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 + +// 2 bits for 4 layout options +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/melgeek/mj6xy/config.h b/keyboards/melgeek/mj6xy/config.h index 263092c8f7b..79f977638b0 100755 --- a/keyboards/melgeek/mj6xy/config.h +++ b/keyboards/melgeek/mj6xy/config.h @@ -20,7 +20,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* VIA related config */ -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 - diff --git a/keyboards/melgeek/mj6xy/keymaps/via/config.h b/keyboards/melgeek/mj6xy/keymaps/via/config.h new file mode 100755 index 00000000000..bdbac3f182f --- /dev/null +++ b/keyboards/melgeek/mj6xy/keymaps/via/config.h @@ -0,0 +1,21 @@ +/* Copyright 2020 MelGeek + * + * 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 + +/* VIA related config */ +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 + diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h index cc215ee9a16..50c9ca5f64b 100644 --- a/keyboards/mt/mt64rgb/config.h +++ b/keyboards/mt/mt64rgb/config.h @@ -23,6 +23,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* VIA related config */ -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/mt/mt64rgb/keymaps/via/config.h b/keyboards/mt/mt64rgb/keymaps/via/config.h new file mode 100644 index 00000000000..d0bd4208847 --- /dev/null +++ b/keyboards/mt/mt64rgb/keymaps/via/config.h @@ -0,0 +1,19 @@ +/* Copyright 2020 MT + * + * 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 + +/* VIA related config */ +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h index 3922034290b..abcdafdbd00 100644 --- a/keyboards/playkbtw/pk64rgb/config.h +++ b/keyboards/playkbtw/pk64rgb/config.h @@ -24,6 +24,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* VIA related config */ -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/playkbtw/pk64rgb/keymaps/via/config.h b/keyboards/playkbtw/pk64rgb/keymaps/via/config.h new file mode 100644 index 00000000000..e7db5195bac --- /dev/null +++ b/keyboards/playkbtw/pk64rgb/keymaps/via/config.h @@ -0,0 +1,20 @@ +/* Copyright 2021 Play Keyboard + * + * 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 + +/* VIA related config */ +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/projectkb/alice/keymaps/via/config.h b/keyboards/projectkb/alice/keymaps/via/config.h new file mode 100644 index 00000000000..ab0b2896897 --- /dev/null +++ b/keyboards/projectkb/alice/keymaps/via/config.h @@ -0,0 +1,21 @@ +/* +Copyright 2015 Jun Wako + +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 + +// 2 bits for 4 layout options +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/projectkb/alice/rev1/config.h b/keyboards/projectkb/alice/rev1/config.h index dca7542513d..829976ebd6a 100644 --- a/keyboards/projectkb/alice/rev1/config.h +++ b/keyboards/projectkb/alice/rev1/config.h @@ -35,9 +35,6 @@ along with this program. If not, see . #define INDICATOR_PIN_1 A1 #define INDICATOR_PIN_2 A2 -// 2 bits for 4 layout options -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/projectkb/alice/rev2/config.h b/keyboards/projectkb/alice/rev2/config.h index f5d9ca0c3e6..6e250bb14ef 100644 --- a/keyboards/projectkb/alice/rev2/config.h +++ b/keyboards/projectkb/alice/rev2/config.h @@ -35,10 +35,6 @@ along with this program. If not, see . #define INDICATOR_PIN_1 A8 #define INDICATOR_PIN_2 B12 - -// 2 bits for 4 layout options -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 - /* * Feature disable options * These options are also useful to firmware size reduction. From 1c650aa55ca410bd888bb419604aa4feab56764e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 21 May 2024 13:38:30 +0100 Subject: [PATCH 303/333] Remove includes of config.h (#23760) --- keyboards/converter/hp_46010a/matrix.c | 3 --- .../satan/keymaps/iso_split_rshift/config.h | 7 +----- keyboards/handwired/owlet60/matrix.c | 1 - keyboards/handwired/xealous/matrix.c | 1 - keyboards/kinesis/alvicstep/matrix.c | 1 - .../mini/keymaps/default-gsm-newbs/config.h | 24 ------------------- .../rama_works_m6_a/keymaps/naut/config.h | 24 ------------------- 7 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 keyboards/knops/mini/keymaps/default-gsm-newbs/config.h delete mode 100644 keyboards/wilba_tech/rama_works_m6_a/keymaps/naut/config.h diff --git a/keyboards/converter/hp_46010a/matrix.c b/keyboards/converter/hp_46010a/matrix.c index a36e8821a38..d9d9eec48f0 100644 --- a/keyboards/converter/hp_46010a/matrix.c +++ b/keyboards/converter/hp_46010a/matrix.c @@ -31,9 +31,6 @@ along with this program. If not, see . #include "timer.h" #include -#include "config.h" - - #ifndef DEBOUNCE # define DEBOUNCE 5 #endif diff --git a/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h b/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h index 6795cf6c979..7f3ca253aa5 100644 --- a/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h +++ b/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h @@ -15,13 +15,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "../../config.h" +#pragma once // only change #undef WS2812_DI_PIN #define WS2812_DI_PIN B2 - -#endif diff --git a/keyboards/handwired/owlet60/matrix.c b/keyboards/handwired/owlet60/matrix.c index 43895468e9d..7ef5d66a9fb 100644 --- a/keyboards/handwired/owlet60/matrix.c +++ b/keyboards/handwired/owlet60/matrix.c @@ -26,7 +26,6 @@ along with this program. If not, see . #include "debug.h" #include "util.h" #include "matrix.h" -#include "config.h" #include "timer.h" #if (MATRIX_COLS <= 8) diff --git a/keyboards/handwired/xealous/matrix.c b/keyboards/handwired/xealous/matrix.c index 46410b986dc..b8ae9fd7385 100644 --- a/keyboards/handwired/xealous/matrix.c +++ b/keyboards/handwired/xealous/matrix.c @@ -27,7 +27,6 @@ along with this program. If not, see . #include "util.h" #include "matrix.h" #include "split_util.h" -#include "config.h" #include "timer.h" // Copy this code to split_common/matrix.c, diff --git a/keyboards/kinesis/alvicstep/matrix.c b/keyboards/kinesis/alvicstep/matrix.c index e1e637725b2..e45b9823c19 100644 --- a/keyboards/kinesis/alvicstep/matrix.c +++ b/keyboards/kinesis/alvicstep/matrix.c @@ -28,7 +28,6 @@ along with this program. If not, see . #include "util.h" #include "matrix.h" #include "led.h" -#include "config.h" #ifndef DEBOUNCE # define DEBOUNCE 5 diff --git a/keyboards/knops/mini/keymaps/default-gsm-newbs/config.h b/keyboards/knops/mini/keymaps/default-gsm-newbs/config.h deleted file mode 100644 index 999d8876c2b..00000000000 --- a/keyboards/knops/mini/keymaps/default-gsm-newbs/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2017 Pawnerd - * - * 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 . - */ - -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "../../config.h" - -// place overrides here - -#endif diff --git a/keyboards/wilba_tech/rama_works_m6_a/keymaps/naut/config.h b/keyboards/wilba_tech/rama_works_m6_a/keymaps/naut/config.h deleted file mode 100644 index 7f642203aac..00000000000 --- a/keyboards/wilba_tech/rama_works_m6_a/keymaps/naut/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2018 Wilba - * - * 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 . - */ - -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "../../config.h" - -// place overrides here - -#endif \ No newline at end of file From 0a84bf8b574b0efdf4ea729b3204ea32ffceef6e Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 21 May 2024 15:54:13 -0700 Subject: [PATCH 304/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: F (#23757) Affects: - `fallacy` - `ffkeebs/puca` - `fjlabs/7vhotswap` - `fjlabs/ad65` - `fjlabs/avalon` - `fjlabs/bks65` - `fjlabs/bks65solder` - `fjlabs/bolsa65` - `fjlabs/kf87` - `fjlabs/kyuu` - `fjlabs/ldk65` - `fjlabs/midway60` - `fjlabs/mk61rgbansi` - `fjlabs/peaker` - `fjlabs/polaris` - `fjlabs/ready100` - `fjlabs/sinanju` - `fjlabs/sinanjuwk` - `fjlabs/solanis` - `fjlabs/swordfish` - `fjlabs/tf60ansi` - `fjlabs/tf60v2` - `fjlabs/tf65rgbv2` - `flehrad/downbubble` - `flehrad/numbrero` - `flehrad/snagpad` - `flehrad/tradestation` - `fleuron` - `fluorite` - `flx/lodestone` - `flxlb/zplit` - `foostan/cornelius` - `forever65` - `fortitude60/rev1` - `foxlab/key65/hotswap` - `foxlab/key65/universal` - `foxlab/leaf60/hotswap` - `foxlab/leaf60/universal` - `foxlab/time80` - `fr4/southpaw75` - `fractal` - `fungo/rev1` - `funky40` --- keyboards/fallacy/config.h | 8 ---- keyboards/fallacy/keyboard.json | 6 +++ keyboards/ffkeebs/puca/config.h | 23 ----------- keyboards/ffkeebs/puca/keyboard.json | 6 +++ keyboards/fjlabs/7vhotswap/config.h | 41 ------------------- keyboards/fjlabs/7vhotswap/keyboard.json | 6 +++ keyboards/fjlabs/ad65/config.h | 41 ------------------- keyboards/fjlabs/ad65/keyboard.json | 6 +++ keyboards/fjlabs/avalon/config.h | 23 ----------- keyboards/fjlabs/avalon/keyboard.json | 6 +++ keyboards/fjlabs/bks65/config.h | 41 ------------------- keyboards/fjlabs/bks65/keyboard.json | 6 +++ keyboards/fjlabs/bks65solder/config.h | 41 ------------------- keyboards/fjlabs/bks65solder/keyboard.json | 6 +++ keyboards/fjlabs/bolsa65/config.h | 41 ------------------- keyboards/fjlabs/bolsa65/keyboard.json | 6 +++ keyboards/fjlabs/kf87/config.h | 41 ------------------- keyboards/fjlabs/kf87/keyboard.json | 6 +++ keyboards/fjlabs/kyuu/config.h | 41 ------------------- keyboards/fjlabs/kyuu/keyboard.json | 6 +++ keyboards/fjlabs/ldk65/config.h | 41 ------------------- keyboards/fjlabs/ldk65/keyboard.json | 6 +++ keyboards/fjlabs/midway60/config.h | 41 ------------------- keyboards/fjlabs/midway60/keyboard.json | 6 +++ keyboards/fjlabs/mk61rgbansi/config.h | 41 ------------------- keyboards/fjlabs/mk61rgbansi/keyboard.json | 6 +++ keyboards/fjlabs/peaker/config.h | 41 ------------------- keyboards/fjlabs/peaker/keyboard.json | 6 +++ keyboards/fjlabs/polaris/config.h | 41 ------------------- keyboards/fjlabs/polaris/keyboard.json | 6 +++ keyboards/fjlabs/ready100/config.h | 41 ------------------- keyboards/fjlabs/ready100/keyboard.json | 6 +++ keyboards/fjlabs/sinanju/config.h | 41 ------------------- keyboards/fjlabs/sinanju/keyboard.json | 6 +++ keyboards/fjlabs/sinanjuwk/config.h | 41 ------------------- keyboards/fjlabs/sinanjuwk/keyboard.json | 6 +++ keyboards/fjlabs/solanis/config.h | 41 ------------------- keyboards/fjlabs/solanis/keyboard.json | 6 +++ keyboards/fjlabs/swordfish/config.h | 41 ------------------- keyboards/fjlabs/swordfish/keyboard.json | 6 +++ keyboards/fjlabs/tf60ansi/config.h | 41 ------------------- keyboards/fjlabs/tf60ansi/keyboard.json | 6 +++ keyboards/fjlabs/tf60v2/config.h | 41 ------------------- keyboards/fjlabs/tf60v2/keyboard.json | 6 +++ keyboards/fjlabs/tf65rgbv2/config.h | 41 ------------------- keyboards/fjlabs/tf65rgbv2/keyboard.json | 6 +++ keyboards/flehrad/downbubble/config.h | 39 ------------------ keyboards/flehrad/downbubble/keyboard.json | 6 +++ keyboards/flehrad/numbrero/config.h | 7 ---- keyboards/flehrad/numbrero/keyboard.json | 6 +++ keyboards/flehrad/snagpad/config.h | 10 ----- keyboards/flehrad/snagpad/keyboard.json | 6 +++ keyboards/flehrad/tradestation/config.h | 22 ---------- keyboards/flehrad/tradestation/keyboard.json | 6 +++ keyboards/fleuron/config.h | 39 ------------------ keyboards/fleuron/keyboard.json | 6 +++ keyboards/fluorite/config.h | 39 ------------------ keyboards/fluorite/keyboard.json | 6 +++ keyboards/flx/lodestone/config.h | 22 ---------- keyboards/flx/lodestone/keyboard.json | 6 +++ keyboards/flxlb/zplit/config.h | 5 --- keyboards/flxlb/zplit/keyboard.json | 6 +++ keyboards/foostan/cornelius/config.h | 39 ------------------ keyboards/foostan/cornelius/keyboard.json | 6 +++ keyboards/forever65/config.h | 6 --- keyboards/forever65/keyboard.json | 6 +++ keyboards/fortitude60/rev1/config.h | 5 --- keyboards/fortitude60/rev1/keyboard.json | 6 +++ keyboards/foxlab/key65/hotswap/config.h | 38 ----------------- keyboards/foxlab/key65/hotswap/keyboard.json | 6 +++ keyboards/foxlab/key65/universal/config.h | 38 ----------------- .../foxlab/key65/universal/keyboard.json | 6 +++ keyboards/foxlab/leaf60/hotswap/config.h | 39 ------------------ keyboards/foxlab/leaf60/hotswap/keyboard.json | 6 +++ keyboards/foxlab/leaf60/universal/config.h | 39 ------------------ .../foxlab/leaf60/universal/keyboard.json | 6 +++ keyboards/foxlab/time80/config.h | 39 ------------------ keyboards/foxlab/time80/keyboard.json | 6 +++ keyboards/fr4/southpaw75/config.h | 23 ----------- keyboards/fr4/southpaw75/keyboard.json | 6 +++ keyboards/fractal/config.h | 7 ---- keyboards/fractal/keyboard.json | 6 +++ keyboards/fungo/rev1/config.h | 10 ----- keyboards/fungo/rev1/keyboard.json | 6 ++- keyboards/funky40/config.h | 22 ---------- keyboards/funky40/keyboard.json | 6 +++ 86 files changed, 257 insertions(+), 1363 deletions(-) delete mode 100644 keyboards/ffkeebs/puca/config.h delete mode 100644 keyboards/fjlabs/7vhotswap/config.h delete mode 100644 keyboards/fjlabs/ad65/config.h delete mode 100644 keyboards/fjlabs/avalon/config.h delete mode 100644 keyboards/fjlabs/bks65/config.h delete mode 100644 keyboards/fjlabs/bks65solder/config.h delete mode 100644 keyboards/fjlabs/bolsa65/config.h delete mode 100644 keyboards/fjlabs/kf87/config.h delete mode 100644 keyboards/fjlabs/kyuu/config.h delete mode 100644 keyboards/fjlabs/ldk65/config.h delete mode 100644 keyboards/fjlabs/midway60/config.h delete mode 100644 keyboards/fjlabs/mk61rgbansi/config.h delete mode 100644 keyboards/fjlabs/peaker/config.h delete mode 100644 keyboards/fjlabs/polaris/config.h delete mode 100644 keyboards/fjlabs/ready100/config.h delete mode 100644 keyboards/fjlabs/sinanju/config.h delete mode 100644 keyboards/fjlabs/sinanjuwk/config.h delete mode 100644 keyboards/fjlabs/solanis/config.h delete mode 100644 keyboards/fjlabs/swordfish/config.h delete mode 100644 keyboards/fjlabs/tf60ansi/config.h delete mode 100644 keyboards/fjlabs/tf60v2/config.h delete mode 100644 keyboards/fjlabs/tf65rgbv2/config.h delete mode 100644 keyboards/flehrad/downbubble/config.h delete mode 100644 keyboards/flehrad/numbrero/config.h delete mode 100644 keyboards/flehrad/snagpad/config.h delete mode 100644 keyboards/flehrad/tradestation/config.h delete mode 100644 keyboards/fleuron/config.h delete mode 100644 keyboards/fluorite/config.h delete mode 100644 keyboards/flx/lodestone/config.h delete mode 100644 keyboards/foostan/cornelius/config.h delete mode 100644 keyboards/foxlab/key65/hotswap/config.h delete mode 100644 keyboards/foxlab/key65/universal/config.h delete mode 100644 keyboards/foxlab/leaf60/hotswap/config.h delete mode 100644 keyboards/foxlab/leaf60/universal/config.h delete mode 100644 keyboards/foxlab/time80/config.h delete mode 100644 keyboards/fr4/southpaw75/config.h delete mode 100755 keyboards/fractal/config.h delete mode 100644 keyboards/funky40/config.h diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h index 14df31805dd..ed6561e6aab 100755 --- a/keyboards/fallacy/config.h +++ b/keyboards/fallacy/config.h @@ -20,11 +20,3 @@ */ #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_LED_COUNT 3 - -/* 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/fallacy/keyboard.json b/keyboards/fallacy/keyboard.json index fbeca239d9f..b1050f43541 100644 --- a/keyboards/fallacy/keyboard.json +++ b/keyboards/fallacy/keyboard.json @@ -40,6 +40,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["alice", "alice_split_bs"], "layout_aliases": { "LAYOUT_all": "LAYOUT_alice_split_bs", diff --git a/keyboards/ffkeebs/puca/config.h b/keyboards/ffkeebs/puca/config.h deleted file mode 100644 index ced239c8334..00000000000 --- a/keyboards/ffkeebs/puca/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Sleepdealer - -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 diff --git a/keyboards/ffkeebs/puca/keyboard.json b/keyboards/ffkeebs/puca/keyboard.json index 04f444869d7..2abd0cfc369 100644 --- a/keyboards/ffkeebs/puca/keyboard.json +++ b/keyboards/ffkeebs/puca/keyboard.json @@ -22,6 +22,12 @@ "oled": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "B1", "B3", "B2", "B6"], "rows": ["B4", "E6", "D7", "B5", "C6", "F6"] diff --git a/keyboards/fjlabs/7vhotswap/config.h b/keyboards/fjlabs/7vhotswap/config.h deleted file mode 100644 index 2b28e8a484d..00000000000 --- a/keyboards/fjlabs/7vhotswap/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/fjlabs/7vhotswap/keyboard.json b/keyboards/fjlabs/7vhotswap/keyboard.json index 220cf28831f..03d8fe03b7d 100644 --- a/keyboards/fjlabs/7vhotswap/keyboard.json +++ b/keyboards/fjlabs/7vhotswap/keyboard.json @@ -41,6 +41,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_75_all": { "layout": [ diff --git a/keyboards/fjlabs/ad65/config.h b/keyboards/fjlabs/ad65/config.h deleted file mode 100644 index 084c49212ca..00000000000 --- a/keyboards/fjlabs/ad65/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/fjlabs/ad65/keyboard.json b/keyboards/fjlabs/ad65/keyboard.json index 19adad79325..853bc32f55d 100644 --- a/keyboards/fjlabs/ad65/keyboard.json +++ b/keyboards/fjlabs/ad65/keyboard.json @@ -25,6 +25,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": [ "65_ansi_blocker", "65_ansi_blocker_split_bs", diff --git a/keyboards/fjlabs/avalon/config.h b/keyboards/fjlabs/avalon/config.h deleted file mode 100644 index 46df2a0d6af..00000000000 --- a/keyboards/fjlabs/avalon/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 - -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 diff --git a/keyboards/fjlabs/avalon/keyboard.json b/keyboards/fjlabs/avalon/keyboard.json index 2407c3ec26b..077286729cf 100644 --- a/keyboards/fjlabs/avalon/keyboard.json +++ b/keyboards/fjlabs/avalon/keyboard.json @@ -49,6 +49,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/fjlabs/bks65/config.h b/keyboards/fjlabs/bks65/config.h deleted file mode 100644 index 990e5335c31..00000000000 --- a/keyboards/fjlabs/bks65/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2020 - -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/fjlabs/bks65/keyboard.json b/keyboards/fjlabs/bks65/keyboard.json index 5be09bfe0d0..7b1a8db86e5 100644 --- a/keyboards/fjlabs/bks65/keyboard.json +++ b/keyboards/fjlabs/bks65/keyboard.json @@ -44,6 +44,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/fjlabs/bks65solder/config.h b/keyboards/fjlabs/bks65solder/config.h deleted file mode 100644 index 990e5335c31..00000000000 --- a/keyboards/fjlabs/bks65solder/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2020 - -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/fjlabs/bks65solder/keyboard.json b/keyboards/fjlabs/bks65solder/keyboard.json index 609dc4cdbc0..59599bb5490 100644 --- a/keyboards/fjlabs/bks65solder/keyboard.json +++ b/keyboards/fjlabs/bks65solder/keyboard.json @@ -41,6 +41,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/fjlabs/bolsa65/config.h b/keyboards/fjlabs/bolsa65/config.h deleted file mode 100644 index 990e5335c31..00000000000 --- a/keyboards/fjlabs/bolsa65/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2020 - -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/fjlabs/bolsa65/keyboard.json b/keyboards/fjlabs/bolsa65/keyboard.json index 9deb09fef29..dfa47e90bb5 100644 --- a/keyboards/fjlabs/bolsa65/keyboard.json +++ b/keyboards/fjlabs/bolsa65/keyboard.json @@ -22,6 +22,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/fjlabs/kf87/config.h b/keyboards/fjlabs/kf87/config.h deleted file mode 100644 index 9f459585649..00000000000 --- a/keyboards/fjlabs/kf87/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2020 - -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/fjlabs/kf87/keyboard.json b/keyboards/fjlabs/kf87/keyboard.json index e4f48acc8ec..f0742b671e7 100644 --- a/keyboards/fjlabs/kf87/keyboard.json +++ b/keyboards/fjlabs/kf87/keyboard.json @@ -46,6 +46,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_tkl_all": { "layout": [ diff --git a/keyboards/fjlabs/kyuu/config.h b/keyboards/fjlabs/kyuu/config.h deleted file mode 100644 index 084c49212ca..00000000000 --- a/keyboards/fjlabs/kyuu/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/fjlabs/kyuu/keyboard.json b/keyboards/fjlabs/kyuu/keyboard.json index a16e2835cf2..a2c9732ad3e 100644 --- a/keyboards/fjlabs/kyuu/keyboard.json +++ b/keyboards/fjlabs/kyuu/keyboard.json @@ -45,6 +45,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_65_ansi_blocker_badge": { "layout": [ diff --git a/keyboards/fjlabs/ldk65/config.h b/keyboards/fjlabs/ldk65/config.h deleted file mode 100644 index 990e5335c31..00000000000 --- a/keyboards/fjlabs/ldk65/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2020 - -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/fjlabs/ldk65/keyboard.json b/keyboards/fjlabs/ldk65/keyboard.json index a9d997c67e0..c9b0946b9a2 100644 --- a/keyboards/fjlabs/ldk65/keyboard.json +++ b/keyboards/fjlabs/ldk65/keyboard.json @@ -25,6 +25,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/fjlabs/midway60/config.h b/keyboards/fjlabs/midway60/config.h deleted file mode 100644 index 9f459585649..00000000000 --- a/keyboards/fjlabs/midway60/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2020 - -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/fjlabs/midway60/keyboard.json b/keyboards/fjlabs/midway60/keyboard.json index 0f5b1e13bca..d05975699b6 100644 --- a/keyboards/fjlabs/midway60/keyboard.json +++ b/keyboards/fjlabs/midway60/keyboard.json @@ -25,6 +25,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": [ "60_ansi", "60_ansi_split_bs_rshift", diff --git a/keyboards/fjlabs/mk61rgbansi/config.h b/keyboards/fjlabs/mk61rgbansi/config.h deleted file mode 100644 index b352868d2d4..00000000000 --- a/keyboards/fjlabs/mk61rgbansi/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/fjlabs/mk61rgbansi/keyboard.json b/keyboards/fjlabs/mk61rgbansi/keyboard.json index de26f98ebe6..649a881a8da 100644 --- a/keyboards/fjlabs/mk61rgbansi/keyboard.json +++ b/keyboards/fjlabs/mk61rgbansi/keyboard.json @@ -46,6 +46,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/fjlabs/peaker/config.h b/keyboards/fjlabs/peaker/config.h deleted file mode 100644 index 13c17d597d1..00000000000 --- a/keyboards/fjlabs/peaker/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2022 - -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/fjlabs/peaker/keyboard.json b/keyboards/fjlabs/peaker/keyboard.json index 73f4f754c31..4c07b348568 100644 --- a/keyboards/fjlabs/peaker/keyboard.json +++ b/keyboards/fjlabs/peaker/keyboard.json @@ -22,6 +22,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_tkl_all": { "layout": [ diff --git a/keyboards/fjlabs/polaris/config.h b/keyboards/fjlabs/polaris/config.h deleted file mode 100644 index 9f459585649..00000000000 --- a/keyboards/fjlabs/polaris/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2020 - -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/fjlabs/polaris/keyboard.json b/keyboards/fjlabs/polaris/keyboard.json index c4f3caf2879..674cf8484bc 100644 --- a/keyboards/fjlabs/polaris/keyboard.json +++ b/keyboards/fjlabs/polaris/keyboard.json @@ -25,6 +25,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": [ "60_ansi", "60_ansi_split_bs_rshift", diff --git a/keyboards/fjlabs/ready100/config.h b/keyboards/fjlabs/ready100/config.h deleted file mode 100644 index b352868d2d4..00000000000 --- a/keyboards/fjlabs/ready100/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/fjlabs/ready100/keyboard.json b/keyboards/fjlabs/ready100/keyboard.json index b5940b9c527..8b79b2b927a 100644 --- a/keyboards/fjlabs/ready100/keyboard.json +++ b/keyboards/fjlabs/ready100/keyboard.json @@ -42,6 +42,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_64key": "LAYOUT_64_ansi" }, diff --git a/keyboards/fjlabs/sinanju/config.h b/keyboards/fjlabs/sinanju/config.h deleted file mode 100644 index 13c17d597d1..00000000000 --- a/keyboards/fjlabs/sinanju/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2022 - -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/fjlabs/sinanju/keyboard.json b/keyboards/fjlabs/sinanju/keyboard.json index ef9cf0e872b..0ade74b77bd 100644 --- a/keyboards/fjlabs/sinanju/keyboard.json +++ b/keyboards/fjlabs/sinanju/keyboard.json @@ -25,6 +25,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_60_ansi_wkl": { "layout": [ diff --git a/keyboards/fjlabs/sinanjuwk/config.h b/keyboards/fjlabs/sinanjuwk/config.h deleted file mode 100644 index 13c17d597d1..00000000000 --- a/keyboards/fjlabs/sinanjuwk/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2022 - -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/fjlabs/sinanjuwk/keyboard.json b/keyboards/fjlabs/sinanjuwk/keyboard.json index e825ae335e7..cb1565c6829 100644 --- a/keyboards/fjlabs/sinanjuwk/keyboard.json +++ b/keyboards/fjlabs/sinanjuwk/keyboard.json @@ -25,6 +25,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift" }, diff --git a/keyboards/fjlabs/solanis/config.h b/keyboards/fjlabs/solanis/config.h deleted file mode 100644 index 68becd07670..00000000000 --- a/keyboards/fjlabs/solanis/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2022 - -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 \ No newline at end of file diff --git a/keyboards/fjlabs/solanis/keyboard.json b/keyboards/fjlabs/solanis/keyboard.json index 12103d10586..39cf7a1e69b 100644 --- a/keyboards/fjlabs/solanis/keyboard.json +++ b/keyboards/fjlabs/solanis/keyboard.json @@ -42,6 +42,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": [ "tkl_ansi", "tkl_ansi_split_bs_rshift", diff --git a/keyboards/fjlabs/swordfish/config.h b/keyboards/fjlabs/swordfish/config.h deleted file mode 100644 index ea4c7011e14..00000000000 --- a/keyboards/fjlabs/swordfish/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2022 - -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/fjlabs/swordfish/keyboard.json b/keyboards/fjlabs/swordfish/keyboard.json index 331bae459c0..cc21269832e 100644 --- a/keyboards/fjlabs/swordfish/keyboard.json +++ b/keyboards/fjlabs/swordfish/keyboard.json @@ -41,6 +41,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_2u_bs": { "layout": [ diff --git a/keyboards/fjlabs/tf60ansi/config.h b/keyboards/fjlabs/tf60ansi/config.h deleted file mode 100644 index b352868d2d4..00000000000 --- a/keyboards/fjlabs/tf60ansi/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/fjlabs/tf60ansi/keyboard.json b/keyboards/fjlabs/tf60ansi/keyboard.json index 69ff0690a18..16ee46e833e 100644 --- a/keyboards/fjlabs/tf60ansi/keyboard.json +++ b/keyboards/fjlabs/tf60ansi/keyboard.json @@ -46,6 +46,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/fjlabs/tf60v2/config.h b/keyboards/fjlabs/tf60v2/config.h deleted file mode 100644 index b352868d2d4..00000000000 --- a/keyboards/fjlabs/tf60v2/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/fjlabs/tf60v2/keyboard.json b/keyboards/fjlabs/tf60v2/keyboard.json index 337a06843f1..b38cde89aad 100644 --- a/keyboards/fjlabs/tf60v2/keyboard.json +++ b/keyboards/fjlabs/tf60v2/keyboard.json @@ -46,6 +46,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["60_ansi_arrow"], "layouts": { "LAYOUT_60_ansi_arrow": { diff --git a/keyboards/fjlabs/tf65rgbv2/config.h b/keyboards/fjlabs/tf65rgbv2/config.h deleted file mode 100644 index b352868d2d4..00000000000 --- a/keyboards/fjlabs/tf65rgbv2/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/fjlabs/tf65rgbv2/keyboard.json b/keyboards/fjlabs/tf65rgbv2/keyboard.json index dd567c63b85..7bcc4f60b97 100644 --- a/keyboards/fjlabs/tf65rgbv2/keyboard.json +++ b/keyboards/fjlabs/tf65rgbv2/keyboard.json @@ -46,6 +46,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/flehrad/downbubble/config.h b/keyboards/flehrad/downbubble/config.h deleted file mode 100644 index 64455593edf..00000000000 --- a/keyboards/flehrad/downbubble/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Don Chiou - -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/flehrad/downbubble/keyboard.json b/keyboards/flehrad/downbubble/keyboard.json index 94f29b89f2b..f4f2222fa84 100644 --- a/keyboards/flehrad/downbubble/keyboard.json +++ b/keyboards/flehrad/downbubble/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D6", "D5", "D4", "D3", "D2", "D1", "D0", "B7"], "rows": ["F1", "F2", "F3", "F4", "F5", "F6"] diff --git a/keyboards/flehrad/numbrero/config.h b/keyboards/flehrad/numbrero/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/flehrad/numbrero/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/flehrad/numbrero/keyboard.json b/keyboards/flehrad/numbrero/keyboard.json index 035aaa85b9c..f72b06ca7c7 100644 --- a/keyboards/flehrad/numbrero/keyboard.json +++ b/keyboards/flehrad/numbrero/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "F5", "F4"], "rows": ["F6", "B5", "B4", "E6", "F7"] diff --git a/keyboards/flehrad/snagpad/config.h b/keyboards/flehrad/snagpad/config.h deleted file mode 100644 index 57ae7860260..00000000000 --- a/keyboards/flehrad/snagpad/config.h +++ /dev/null @@ -1,10 +0,0 @@ -#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 - -/* prevent stuck modifiers */ -//#define STRICT_LAYER_RELEASE diff --git a/keyboards/flehrad/snagpad/keyboard.json b/keyboards/flehrad/snagpad/keyboard.json index 3c513a4b485..1b2a2c4ae17 100644 --- a/keyboards/flehrad/snagpad/keyboard.json +++ b/keyboards/flehrad/snagpad/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7"], "rows": ["D1", "D0", "D4", "C6", "D7"] diff --git a/keyboards/flehrad/tradestation/config.h b/keyboards/flehrad/tradestation/config.h deleted file mode 100644 index 41dafc075d8..00000000000 --- a/keyboards/flehrad/tradestation/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2019 flehrad - * - * 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. - */ - -#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/flehrad/tradestation/keyboard.json b/keyboards/flehrad/tradestation/keyboard.json index 52620b87be8..24a1e07dd45 100644 --- a/keyboards/flehrad/tradestation/keyboard.json +++ b/keyboards/flehrad/tradestation/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "B1", "D7", "E6"], "rows": ["D1", "C6", "D4", "D0"] diff --git a/keyboards/fleuron/config.h b/keyboards/fleuron/config.h deleted file mode 100644 index 60f42fbcda9..00000000000 --- a/keyboards/fleuron/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 James Underwood - -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/fleuron/keyboard.json b/keyboards/fleuron/keyboard.json index dbf11d6161c..5cd7b7d8b26 100644 --- a/keyboards/fleuron/keyboard.json +++ b/keyboards/fleuron/keyboard.json @@ -16,6 +16,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "B6", "B3", "B5", "B4", "D7", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B0", "B1", "B2"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/fluorite/config.h b/keyboards/fluorite/config.h deleted file mode 100644 index 21c3b72e603..00000000000 --- a/keyboards/fluorite/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Mafuyu Ihotsuno - -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/fluorite/keyboard.json b/keyboards/fluorite/keyboard.json index ca23f773b0e..2338c726712 100644 --- a/keyboards/fluorite/keyboard.json +++ b/keyboards/fluorite/keyboard.json @@ -24,6 +24,12 @@ "mousekey": false, "extrakey": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/flx/lodestone/config.h b/keyboards/flx/lodestone/config.h deleted file mode 100644 index 1d22c074e20..00000000000 --- a/keyboards/flx/lodestone/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Shaun Mitchell (Flex) - * - * 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 diff --git a/keyboards/flx/lodestone/keyboard.json b/keyboards/flx/lodestone/keyboard.json index c6dd4197da8..3a70655f2a0 100644 --- a/keyboards/flx/lodestone/keyboard.json +++ b/keyboards/flx/lodestone/keyboard.json @@ -19,6 +19,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "F5", "F6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["B3", "B7", "F0", "F1", "F4"] diff --git a/keyboards/flxlb/zplit/config.h b/keyboards/flxlb/zplit/config.h index 6bde2711c23..832108a54bf 100644 --- a/keyboards/flxlb/zplit/config.h +++ b/keyboards/flxlb/zplit/config.h @@ -23,11 +23,6 @@ along with this program. If not, see . #define SPLIT_USB_DETECT #define SPLIT_USB_TIMEOUT 500 -/* 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. diff --git a/keyboards/flxlb/zplit/keyboard.json b/keyboards/flxlb/zplit/keyboard.json index 2d5c33f49f3..2fcbd81742c 100644 --- a/keyboards/flxlb/zplit/keyboard.json +++ b/keyboards/flxlb/zplit/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B3", "D6", "D7", "B4", "B5"], "rows": ["D4", "F5", "F4", "F1"] diff --git a/keyboards/foostan/cornelius/config.h b/keyboards/foostan/cornelius/config.h deleted file mode 100644 index bb5de46d11a..00000000000 --- a/keyboards/foostan/cornelius/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 foostan - -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/foostan/cornelius/keyboard.json b/keyboards/foostan/cornelius/keyboard.json index a8dba9c3e74..75cf098c4d9 100644 --- a/keyboards/foostan/cornelius/keyboard.json +++ b/keyboards/foostan/cornelius/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["B0", "B1", "B2", "C7"] diff --git a/keyboards/forever65/config.h b/keyboards/forever65/config.h index 76b9a373f18..71c25e869e6 100644 --- a/keyboards/forever65/config.h +++ b/keyboards/forever65/config.h @@ -15,12 +15,6 @@ */ #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. diff --git a/keyboards/forever65/keyboard.json b/keyboards/forever65/keyboard.json index 210d550b8d6..9f128c1177a 100644 --- a/keyboards/forever65/keyboard.json +++ b/keyboards/forever65/keyboard.json @@ -22,6 +22,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/fortitude60/rev1/config.h b/keyboards/fortitude60/rev1/config.h index 5dec5df1f12..c7ae5a8416e 100644 --- a/keyboards/fortitude60/rev1/config.h +++ b/keyboards/fortitude60/rev1/config.h @@ -22,11 +22,6 @@ along with this program. If not, see . #define SPLIT_USB_DETECT #define SPLIT_USB_TIMEOUT 500 -/* 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. diff --git a/keyboards/fortitude60/rev1/keyboard.json b/keyboards/fortitude60/rev1/keyboard.json index f651c784247..cf3af329a87 100644 --- a/keyboards/fortitude60/rev1/keyboard.json +++ b/keyboards/fortitude60/rev1/keyboard.json @@ -34,6 +34,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/foxlab/key65/hotswap/config.h b/keyboards/foxlab/key65/hotswap/config.h deleted file mode 100644 index 43bd4ee5716..00000000000 --- a/keyboards/foxlab/key65/hotswap/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 Jumail Mundekkat / MxBlue - * - * 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/foxlab/key65/hotswap/keyboard.json b/keyboards/foxlab/key65/hotswap/keyboard.json index 0a98932eb00..b21893fa880 100644 --- a/keyboards/foxlab/key65/hotswap/keyboard.json +++ b/keyboards/foxlab/key65/hotswap/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F4", "F1", "F0", "B0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D2", "D1", "D0", "D3", "B3"] diff --git a/keyboards/foxlab/key65/universal/config.h b/keyboards/foxlab/key65/universal/config.h deleted file mode 100644 index 43bd4ee5716..00000000000 --- a/keyboards/foxlab/key65/universal/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 Jumail Mundekkat / MxBlue - * - * 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/foxlab/key65/universal/keyboard.json b/keyboards/foxlab/key65/universal/keyboard.json index 7523d7051d3..daaa1b37b1b 100644 --- a/keyboards/foxlab/key65/universal/keyboard.json +++ b/keyboards/foxlab/key65/universal/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B0"], "rows": ["D0", "D1", "F0", "F4", "F1"] diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h deleted file mode 100644 index d4515ef219d..00000000000 --- a/keyboards/foxlab/leaf60/hotswap/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Fox Lab - -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/foxlab/leaf60/hotswap/keyboard.json b/keyboards/foxlab/leaf60/hotswap/keyboard.json index 8c74898e37d..b452fb91e37 100644 --- a/keyboards/foxlab/leaf60/hotswap/keyboard.json +++ b/keyboards/foxlab/leaf60/hotswap/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F4", "F1", "F0", "B0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D2", "D1", "D0", "D3", "D5"] diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h deleted file mode 100644 index d4515ef219d..00000000000 --- a/keyboards/foxlab/leaf60/universal/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Fox Lab - -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/foxlab/leaf60/universal/keyboard.json b/keyboards/foxlab/leaf60/universal/keyboard.json index 1cf7f235a51..93bfe45cce4 100644 --- a/keyboards/foxlab/leaf60/universal/keyboard.json +++ b/keyboards/foxlab/leaf60/universal/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["D0", "D1", "F0", "F4", "F1"] diff --git a/keyboards/foxlab/time80/config.h b/keyboards/foxlab/time80/config.h deleted file mode 100644 index 0b0ee839718..00000000000 --- a/keyboards/foxlab/time80/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Lukas Alexander - -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/foxlab/time80/keyboard.json b/keyboards/foxlab/time80/keyboard.json index 29a374b5649..9902ed770d5 100644 --- a/keyboards/foxlab/time80/keyboard.json +++ b/keyboards/foxlab/time80/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7", "A0"], "rows": ["B1", "B2", "B3", "B5", "B6", "B7", "B0"] diff --git a/keyboards/fr4/southpaw75/config.h b/keyboards/fr4/southpaw75/config.h deleted file mode 100644 index bbb0ecc339a..00000000000 --- a/keyboards/fr4/southpaw75/config.h +++ /dev/null @@ -1,23 +0,0 @@ - /* - Copyright 2020 Kelvin Hall - - 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 diff --git a/keyboards/fr4/southpaw75/keyboard.json b/keyboards/fr4/southpaw75/keyboard.json index d29aa877373..47fb954bf96 100644 --- a/keyboards/fr4/southpaw75/keyboard.json +++ b/keyboards/fr4/southpaw75/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/fractal/config.h b/keyboards/fractal/config.h deleted file mode 100755 index 5f360813239..00000000000 --- a/keyboards/fractal/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/fractal/keyboard.json b/keyboards/fractal/keyboard.json index 4086ff969fe..1e322e63b4a 100644 --- a/keyboards/fractal/keyboard.json +++ b/keyboards/fractal/keyboard.json @@ -21,6 +21,12 @@ "extrakey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h index bebed352e22..6d362f70c02 100644 --- a/keyboards/fungo/rev1/config.h +++ b/keyboards/fungo/rev1/config.h @@ -18,13 +18,3 @@ /* select keyboard master board - I2C or Serial communication master */ #define MASTER_RIGHT - -/*************************************/ -/** public parameter **/ -/*************************************/ - -/* 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/fungo/rev1/keyboard.json b/keyboards/fungo/rev1/keyboard.json index 988ba0f6431..06ebf87f05e 100644 --- a/keyboards/fungo/rev1/keyboard.json +++ b/keyboards/fungo/rev1/keyboard.json @@ -34,7 +34,11 @@ } }, "qmk": { - "tap_keycode_delay": 50 + "tap_keycode_delay": 50, + "locking": { + "enabled": true, + "resync": true + } }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/funky40/config.h b/keyboards/funky40/config.h deleted file mode 100644 index 6ee0c16d92c..00000000000 --- a/keyboards/funky40/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 /u/TheFourthCow - * - * 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 \ No newline at end of file diff --git a/keyboards/funky40/keyboard.json b/keyboards/funky40/keyboard.json index 5825c0e3b70..d76b9eee2e1 100644 --- a/keyboards/funky40/keyboard.json +++ b/keyboards/funky40/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "F5", "F4", "F7", "B1", "B6", "B2", "B3", "D2", "F6", "E6", "D7"], "rows": ["D4", "C6", "B4", "B5"] From 89b9a39614f0d788aa9f2ac0a338b30fb34745b7 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 21 May 2024 15:57:59 -0700 Subject: [PATCH 305/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: H, Part 4 (#23764) Affects: - `handwired/reclined` - `handwired/retro_refit` - `handwired/selene` - `handwired/sick68` - `handwired/sick_pad` - `handwired/skakunm_dactyl` - `handwired/slash` - `handwired/snatchpad` - `handwired/sono1` - `handwired/space_oddity` - `handwired/split89` - `handwired/split_cloud` - `handwired/steamvan/rev1` - `handwired/sticc14` - `handwired/stream_cheap/2x3` - `handwired/stream_cheap/2x4` - `handwired/stream_cheap/2x5` - `handwired/symmetric70_proto/promicro` - `handwired/symmetric70_proto/proton_c` - `handwired/symmetry60` - `handwired/tennie` - `handwired/terminus_mini` - `handwired/trackpoint` - `handwired/tritium_numpad` - `handwired/twadlee/tp69` - `handwired/unk/rev1` - `handwired/uthol/rev3` - `handwired/videowriter` - `handwired/wabi` - `handwired/woodpad` --- keyboards/handwired/reclined/config.h | 42 ------------------- keyboards/handwired/reclined/keyboard.json | 6 +++ keyboards/handwired/retro_refit/config.h | 5 --- keyboards/handwired/retro_refit/keyboard.json | 6 +++ keyboards/handwired/selene/config.h | 20 --------- keyboards/handwired/selene/keyboard.json | 6 +++ keyboards/handwired/sick68/config.h | 39 ----------------- keyboards/handwired/sick68/keyboard.json | 6 +++ keyboards/handwired/sick_pad/config.h | 23 ---------- keyboards/handwired/sick_pad/keyboard.json | 6 +++ keyboards/handwired/skakunm_dactyl/config.h | 5 --- .../handwired/skakunm_dactyl/keyboard.json | 6 +++ keyboards/handwired/slash/config.h | 23 ---------- keyboards/handwired/slash/keyboard.json | 6 +++ keyboards/handwired/snatchpad/config.h | 25 ----------- keyboards/handwired/snatchpad/keyboard.json | 6 +++ keyboards/handwired/sono1/config.h | 22 ---------- keyboards/handwired/sono1/info.json | 6 +++ keyboards/handwired/space_oddity/config.h | 6 --- .../handwired/space_oddity/keyboard.json | 6 +++ keyboards/handwired/split89/config.h | 5 --- keyboards/handwired/split89/keyboard.json | 6 +++ keyboards/handwired/split_cloud/config.h | 5 --- keyboards/handwired/split_cloud/keyboard.json | 6 +++ keyboards/handwired/steamvan/rev1/config.h | 5 --- .../handwired/steamvan/rev1/keyboard.json | 6 +++ keyboards/handwired/sticc14/config.h | 39 ----------------- keyboards/handwired/sticc14/keyboard.json | 6 +++ keyboards/handwired/stream_cheap/2x3/config.h | 7 ---- .../handwired/stream_cheap/2x3/keyboard.json | 6 +++ keyboards/handwired/stream_cheap/2x4/config.h | 7 ---- .../handwired/stream_cheap/2x4/keyboard.json | 6 +++ keyboards/handwired/stream_cheap/2x5/config.h | 7 ---- .../handwired/stream_cheap/2x5/keyboard.json | 6 +++ .../symmetric70_proto/promicro/config.h | 5 --- .../symmetric70_proto/promicro/info.json | 6 +++ .../symmetric70_proto/proton_c/config.h | 5 --- .../symmetric70_proto/proton_c/info.json | 6 +++ keyboards/handwired/symmetry60/config.h | 23 ---------- keyboards/handwired/symmetry60/keyboard.json | 6 +++ keyboards/handwired/tennie/config.h | 39 ----------------- keyboards/handwired/tennie/keyboard.json | 6 +++ keyboards/handwired/terminus_mini/config.h | 39 ----------------- .../handwired/terminus_mini/keyboard.json | 6 +++ keyboards/handwired/trackpoint/config.h | 3 -- keyboards/handwired/trackpoint/keyboard.json | 6 +++ keyboards/handwired/tritium_numpad/config.h | 39 ----------------- .../handwired/tritium_numpad/keyboard.json | 6 +++ keyboards/handwired/twadlee/tp69/config.h | 39 ----------------- .../handwired/twadlee/tp69/keyboard.json | 6 +++ keyboards/handwired/unk/rev1/config.h | 5 --- keyboards/handwired/unk/rev1/keyboard.json | 6 +++ keyboards/handwired/uthol/rev3/config.h | 5 --- keyboards/handwired/uthol/rev3/keyboard.json | 6 +++ keyboards/handwired/videowriter/config.h | 23 ---------- keyboards/handwired/videowriter/keyboard.json | 6 +++ keyboards/handwired/wabi/config.h | 20 --------- keyboards/handwired/wabi/keyboard.json | 6 +++ keyboards/handwired/woodpad/config.h | 39 ----------------- keyboards/handwired/woodpad/keyboard.json | 6 +++ 60 files changed, 180 insertions(+), 569 deletions(-) delete mode 100644 keyboards/handwired/reclined/config.h delete mode 100644 keyboards/handwired/selene/config.h delete mode 100644 keyboards/handwired/sick68/config.h delete mode 100644 keyboards/handwired/sick_pad/config.h delete mode 100644 keyboards/handwired/slash/config.h delete mode 100644 keyboards/handwired/snatchpad/config.h delete mode 100644 keyboards/handwired/sono1/config.h delete mode 100644 keyboards/handwired/sticc14/config.h delete mode 100644 keyboards/handwired/stream_cheap/2x3/config.h delete mode 100644 keyboards/handwired/stream_cheap/2x4/config.h delete mode 100644 keyboards/handwired/stream_cheap/2x5/config.h delete mode 100644 keyboards/handwired/symmetry60/config.h delete mode 100644 keyboards/handwired/tennie/config.h delete mode 100644 keyboards/handwired/terminus_mini/config.h delete mode 100644 keyboards/handwired/tritium_numpad/config.h delete mode 100644 keyboards/handwired/twadlee/tp69/config.h delete mode 100644 keyboards/handwired/videowriter/config.h delete mode 100644 keyboards/handwired/wabi/config.h delete mode 100644 keyboards/handwired/woodpad/config.h diff --git a/keyboards/handwired/reclined/config.h b/keyboards/handwired/reclined/config.h deleted file mode 100644 index 0606be9b1b7..00000000000 --- a/keyboards/handwired/reclined/config.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2018 Daniel Perrett - -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/handwired/reclined/keyboard.json b/keyboards/handwired/reclined/keyboard.json index 993bcf407e2..ee57a40a71c 100644 --- a/keyboards/handwired/reclined/keyboard.json +++ b/keyboards/handwired/reclined/keyboard.json @@ -10,6 +10,12 @@ "extrakey": true, "mousekey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "F4", "B3", "F5", "B1", "F6", "D4", "D7", "D0", "E6", "D1", "B4"], "rows": ["D3", "C6", "B6", "B5"] diff --git a/keyboards/handwired/retro_refit/config.h b/keyboards/handwired/retro_refit/config.h index 8f6d8d5193f..fd2a955d8a3 100644 --- a/keyboards/handwired/retro_refit/config.h +++ b/keyboards/handwired/retro_refit/config.h @@ -17,11 +17,6 @@ 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 - /* remap magic keys */ #define MAGIC_KEY_LOCK BSLS diff --git a/keyboards/handwired/retro_refit/keyboard.json b/keyboards/handwired/retro_refit/keyboard.json index d1a5831fc36..1e7812d578f 100644 --- a/keyboards/handwired/retro_refit/keyboard.json +++ b/keyboards/handwired/retro_refit/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D2", "D3", "C7", "D5"], "rows": ["D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/handwired/selene/config.h b/keyboards/handwired/selene/config.h deleted file mode 100644 index 31c0cc59f75..00000000000 --- a/keyboards/handwired/selene/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 Bpendragon - * - * 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 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/handwired/selene/keyboard.json b/keyboards/handwired/selene/keyboard.json index 5e46cc4f324..592b51aaf40 100644 --- a/keyboards/handwired/selene/keyboard.json +++ b/keyboards/handwired/selene/keyboard.json @@ -23,6 +23,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A9", "A10", "B11", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "C14", "A4", "A5", "A6", "A7", "A8", "A15", "A13", "A14", "B12"], "rows": ["B10", "B9", "B15", "B14", "B13", "B8"] diff --git a/keyboards/handwired/sick68/config.h b/keyboards/handwired/sick68/config.h deleted file mode 100644 index ee4bc0e70cf..00000000000 --- a/keyboards/handwired/sick68/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 umbynos - -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/handwired/sick68/keyboard.json b/keyboards/handwired/sick68/keyboard.json index f5fbe24873c..339484791ff 100644 --- a/keyboards/handwired/sick68/keyboard.json +++ b/keyboards/handwired/sick68/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5", "B0", "D5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0", "D4"] diff --git a/keyboards/handwired/sick_pad/config.h b/keyboards/handwired/sick_pad/config.h deleted file mode 100644 index ee1c2446589..00000000000 --- a/keyboards/handwired/sick_pad/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Joel Schneider - * - * 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 diff --git a/keyboards/handwired/sick_pad/keyboard.json b/keyboards/handwired/sick_pad/keyboard.json index 86457a704e2..ce76294a0d6 100644 --- a/keyboards/handwired/sick_pad/keyboard.json +++ b/keyboards/handwired/sick_pad/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B9", "B15", "B14", "B13"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/handwired/skakunm_dactyl/config.h b/keyboards/handwired/skakunm_dactyl/config.h index 8b04fcdc713..168f20799e9 100644 --- a/keyboards/handwired/skakunm_dactyl/config.h +++ b/keyboards/handwired/skakunm_dactyl/config.h @@ -11,11 +11,6 @@ #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* 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 - /* Enables This makes it easier for fast typists to use dual-function keys */ #define PERMISSIVE_HOLD diff --git a/keyboards/handwired/skakunm_dactyl/keyboard.json b/keyboards/handwired/skakunm_dactyl/keyboard.json index 91ee5b1fb6c..cc6f70b482d 100644 --- a/keyboards/handwired/skakunm_dactyl/keyboard.json +++ b/keyboards/handwired/skakunm_dactyl/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5"], "rows": ["B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/slash/config.h b/keyboards/handwired/slash/config.h deleted file mode 100644 index bde67936ea0..00000000000 --- a/keyboards/handwired/slash/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 4sdftemp - -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 diff --git a/keyboards/handwired/slash/keyboard.json b/keyboards/handwired/slash/keyboard.json index 4fd99ebeee3..a682624d8ef 100644 --- a/keyboards/handwired/slash/keyboard.json +++ b/keyboards/handwired/slash/keyboard.json @@ -24,6 +24,12 @@ "extrakey": true, "bluetooth": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/snatchpad/config.h b/keyboards/handwired/snatchpad/config.h deleted file mode 100644 index 4dee4933a81..00000000000 --- a/keyboards/handwired/snatchpad/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2022 xia0 (@xia0) -// 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 - -/* - * 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/handwired/snatchpad/keyboard.json b/keyboards/handwired/snatchpad/keyboard.json index 3ff80ad2fd6..d06fe2c0034 100644 --- a/keyboards/handwired/snatchpad/keyboard.json +++ b/keyboards/handwired/snatchpad/keyboard.json @@ -18,6 +18,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "B3", "B2"], "rows": ["F4", "F5", "F6"] diff --git a/keyboards/handwired/sono1/config.h b/keyboards/handwired/sono1/config.h deleted file mode 100644 index c4105bdf5fe..00000000000 --- a/keyboards/handwired/sono1/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2021 DmNosachev - -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. NumLock key on the numpad uses Alps SKCL Lock switch */ -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/handwired/sono1/info.json b/keyboards/handwired/sono1/info.json index 85a698d2f4c..85e86051c3d 100644 --- a/keyboards/handwired/sono1/info.json +++ b/keyboards/handwired/sono1/info.json @@ -11,6 +11,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "usb": { "vid": "0x515A", "pid": "0x5331" diff --git a/keyboards/handwired/space_oddity/config.h b/keyboards/handwired/space_oddity/config.h index 400303c8b9e..85f8c623a5b 100644 --- a/keyboards/handwired/space_oddity/config.h +++ b/keyboards/handwired/space_oddity/config.h @@ -6,9 +6,3 @@ #define MOUSEKEY_TIME_TO_MAX 60 #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 - -/* 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/space_oddity/keyboard.json b/keyboards/handwired/space_oddity/keyboard.json index b02b48ac627..ca4e10d16be 100644 --- a/keyboards/handwired/space_oddity/keyboard.json +++ b/keyboards/handwired/space_oddity/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3"] diff --git a/keyboards/handwired/split89/config.h b/keyboards/handwired/split89/config.h index 042c165a182..e12db37b971 100644 --- a/keyboards/handwired/split89/config.h +++ b/keyboards/handwired/split89/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . /* this will be tied to high (VCC with a 2k to 10k resistor) on the left keyboard half and tied to low (GND using a wire jumper only) on the right keyboard half. This allows a user to plug in a USB cable to either side and function correctly with or without a TRS/TRRS cable with a single hex file. */ #define SPLIT_HAND_PIN D1 -/* 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. diff --git a/keyboards/handwired/split89/keyboard.json b/keyboards/handwired/split89/keyboard.json index d30105844af..d28953ab5fa 100644 --- a/keyboards/handwired/split89/keyboard.json +++ b/keyboards/handwired/split89/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/split_cloud/config.h b/keyboards/handwired/split_cloud/config.h index faa2750cafe..f1ca0ce37bf 100644 --- a/keyboards/handwired/split_cloud/config.h +++ b/keyboards/handwired/split_cloud/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . /* left/right via compilation flag */ #define EE_HANDS -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronztize hack */ -#define LOCKING_RESYNC_ENABLE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/handwired/split_cloud/keyboard.json b/keyboards/handwired/split_cloud/keyboard.json index 6d28728f69a..8d242cc6e60 100644 --- a/keyboards/handwired/split_cloud/keyboard.json +++ b/keyboards/handwired/split_cloud/keyboard.json @@ -21,6 +21,12 @@ "extrakey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split": { "enabled": true, "soft_serial_pin": "D3", diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h index b1137a0122a..68fb8c595c9 100644 --- a/keyboards/handwired/steamvan/rev1/config.h +++ b/keyboards/handwired/steamvan/rev1/config.h @@ -17,10 +17,5 @@ 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 WS2812_SPI_DRIVER SPID1 #define WS2812_SPI_MOSI_PAL_MODE 5 diff --git a/keyboards/handwired/steamvan/rev1/keyboard.json b/keyboards/handwired/steamvan/rev1/keyboard.json index 9808d50faae..9c4593bca77 100644 --- a/keyboards/handwired/steamvan/rev1/keyboard.json +++ b/keyboards/handwired/steamvan/rev1/keyboard.json @@ -19,6 +19,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A9", "A8", "B15", "B14", "B13", "A10", "B9", "B6", "B5", "B4", "B3", "A15"], "rows": ["A6", "A5", "A4", "A3"] diff --git a/keyboards/handwired/sticc14/config.h b/keyboards/handwired/sticc14/config.h deleted file mode 100644 index b4a9e4014d9..00000000000 --- a/keyboards/handwired/sticc14/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 ErkHal - -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/handwired/sticc14/keyboard.json b/keyboards/handwired/sticc14/keyboard.json index 1c0d683a7c6..b3fb4a06e54 100644 --- a/keyboards/handwired/sticc14/keyboard.json +++ b/keyboards/handwired/sticc14/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B2", "B3"], "rows": ["F4", "F5", "F6", "F7", "B1"] diff --git a/keyboards/handwired/stream_cheap/2x3/config.h b/keyboards/handwired/stream_cheap/2x3/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/handwired/stream_cheap/2x3/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/stream_cheap/2x3/keyboard.json b/keyboards/handwired/stream_cheap/2x3/keyboard.json index b10b4f7a7c0..ff62fa8a271 100644 --- a/keyboards/handwired/stream_cheap/2x3/keyboard.json +++ b/keyboards/handwired/stream_cheap/2x3/keyboard.json @@ -18,6 +18,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["D1", "C6", "B4"], diff --git a/keyboards/handwired/stream_cheap/2x4/config.h b/keyboards/handwired/stream_cheap/2x4/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/handwired/stream_cheap/2x4/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/stream_cheap/2x4/keyboard.json b/keyboards/handwired/stream_cheap/2x4/keyboard.json index 72e5e1814c0..3f058cfbe4c 100644 --- a/keyboards/handwired/stream_cheap/2x4/keyboard.json +++ b/keyboards/handwired/stream_cheap/2x4/keyboard.json @@ -21,6 +21,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["D1", "D0", "D4", "C6"], diff --git a/keyboards/handwired/stream_cheap/2x5/config.h b/keyboards/handwired/stream_cheap/2x5/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/handwired/stream_cheap/2x5/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/stream_cheap/2x5/keyboard.json b/keyboards/handwired/stream_cheap/2x5/keyboard.json index ccf47996e35..8e2de67e627 100644 --- a/keyboards/handwired/stream_cheap/2x5/keyboard.json +++ b/keyboards/handwired/stream_cheap/2x5/keyboard.json @@ -18,6 +18,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["D1", "C6", "B4", "B5", "B2"], diff --git a/keyboards/handwired/symmetric70_proto/promicro/config.h b/keyboards/handwired/symmetric70_proto/promicro/config.h index 07f30032e6b..43d9b1b4631 100644 --- a/keyboards/handwired/symmetric70_proto/promicro/config.h +++ b/keyboards/handwired/symmetric70_proto/promicro/config.h @@ -44,11 +44,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* 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. diff --git a/keyboards/handwired/symmetric70_proto/promicro/info.json b/keyboards/handwired/symmetric70_proto/promicro/info.json index e567fb283d0..f143f518eb7 100644 --- a/keyboards/handwired/symmetric70_proto/promicro/info.json +++ b/keyboards/handwired/symmetric70_proto/promicro/info.json @@ -5,6 +5,12 @@ "mousekey": false, "extrakey": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/symmetric70_proto/proton_c/config.h b/keyboards/handwired/symmetric70_proto/proton_c/config.h index e757e1e776f..97e64827f18 100644 --- a/keyboards/handwired/symmetric70_proto/proton_c/config.h +++ b/keyboards/handwired/symmetric70_proto/proton_c/config.h @@ -52,11 +52,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* 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. diff --git a/keyboards/handwired/symmetric70_proto/proton_c/info.json b/keyboards/handwired/symmetric70_proto/proton_c/info.json index 0b9e8584670..756fad94f91 100644 --- a/keyboards/handwired/symmetric70_proto/proton_c/info.json +++ b/keyboards/handwired/symmetric70_proto/proton_c/info.json @@ -5,5 +5,11 @@ "bootmagic": true, "mousekey": false, "extrakey": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } } } diff --git a/keyboards/handwired/symmetry60/config.h b/keyboards/handwired/symmetry60/config.h deleted file mode 100644 index a85f398caec..00000000000 --- a/keyboards/handwired/symmetry60/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Marhalloweenvt - -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 diff --git a/keyboards/handwired/symmetry60/keyboard.json b/keyboards/handwired/symmetry60/keyboard.json index e8cbe495b1f..40afdf88c9e 100644 --- a/keyboards/handwired/symmetry60/keyboard.json +++ b/keyboards/handwired/symmetry60/keyboard.json @@ -40,6 +40,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h deleted file mode 100644 index dcbcfeaaa8c..00000000000 --- a/keyboards/handwired/tennie/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Jack Hildebrandt - -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/handwired/tennie/keyboard.json b/keyboards/handwired/tennie/keyboard.json index 36c1266d50b..05143c1cb01 100644 --- a/keyboards/handwired/tennie/keyboard.json +++ b/keyboards/handwired/tennie/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["C6", "D4", "D0"] diff --git a/keyboards/handwired/terminus_mini/config.h b/keyboards/handwired/terminus_mini/config.h deleted file mode 100644 index 6243804dc58..00000000000 --- a/keyboards/handwired/terminus_mini/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2017 James Morgan - -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/handwired/terminus_mini/keyboard.json b/keyboards/handwired/terminus_mini/keyboard.json index 1bf37da57b4..09346c81bf1 100644 --- a/keyboards/handwired/terminus_mini/keyboard.json +++ b/keyboards/handwired/terminus_mini/keyboard.json @@ -20,6 +20,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "D0", "D5", "B6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B5", "B4", "D7", "D6"] diff --git a/keyboards/handwired/trackpoint/config.h b/keyboards/handwired/trackpoint/config.h index 8d4e88d3cb7..e7efa3e76b8 100644 --- a/keyboards/handwired/trackpoint/config.h +++ b/keyboards/handwired/trackpoint/config.h @@ -36,6 +36,3 @@ #define PS2_USART_ERROR (UCSR1A & ((1< - -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/handwired/tritium_numpad/keyboard.json b/keyboards/handwired/tritium_numpad/keyboard.json index b87f4768219..e0cdf13ea20 100644 --- a/keyboards/handwired/tritium_numpad/keyboard.json +++ b/keyboards/handwired/tritium_numpad/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F6", "B1", "B2"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6"] diff --git a/keyboards/handwired/twadlee/tp69/config.h b/keyboards/handwired/twadlee/tp69/config.h deleted file mode 100644 index 390c13b55cf..00000000000 --- a/keyboards/handwired/twadlee/tp69/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Tracy Wadleigh - -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/handwired/twadlee/tp69/keyboard.json b/keyboards/handwired/twadlee/tp69/keyboard.json index 27e0325f92d..833aa8bdf85 100644 --- a/keyboards/handwired/twadlee/tp69/keyboard.json +++ b/keyboards/handwired/twadlee/tp69/keyboard.json @@ -22,6 +22,12 @@ "console": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/unk/rev1/config.h b/keyboards/handwired/unk/rev1/config.h index 2a7f301a6a9..4e339bd5530 100644 --- a/keyboards/handwired/unk/rev1/config.h +++ b/keyboards/handwired/unk/rev1/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define MASTER_LEFT // Comment this line for the right half firmware -/* 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. diff --git a/keyboards/handwired/unk/rev1/keyboard.json b/keyboards/handwired/unk/rev1/keyboard.json index acaca15f3b3..bfc4ee3c797 100644 --- a/keyboards/handwired/unk/rev1/keyboard.json +++ b/keyboards/handwired/unk/rev1/keyboard.json @@ -37,6 +37,12 @@ "extrakey": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h index 569a38c699d..d6a4f17f0bc 100644 --- a/keyboards/handwired/uthol/rev3/config.h +++ b/keyboards/handwired/uthol/rev3/config.h @@ -26,9 +26,4 @@ #define OLED_DISPLAY_ADDRESS 0x3C #define OLED_RESET -1 -/* 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 PERMISSIVE_HOLD diff --git a/keyboards/handwired/uthol/rev3/keyboard.json b/keyboards/handwired/uthol/rev3/keyboard.json index 8d826772b06..acb7c54e785 100644 --- a/keyboards/handwired/uthol/rev3/keyboard.json +++ b/keyboards/handwired/uthol/rev3/keyboard.json @@ -49,5 +49,11 @@ "extrakey": true, "encoder": true, "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } } } diff --git a/keyboards/handwired/videowriter/config.h b/keyboards/handwired/videowriter/config.h deleted file mode 100644 index d1f1e1b0bf2..00000000000 --- a/keyboards/handwired/videowriter/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 DmNosachev - -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 diff --git a/keyboards/handwired/videowriter/keyboard.json b/keyboards/handwired/videowriter/keyboard.json index c8b0141767e..f82a0cd07ea 100644 --- a/keyboards/handwired/videowriter/keyboard.json +++ b/keyboards/handwired/videowriter/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D7", "C6", "D1", "D0", "D4", "D2", "D3", "E6", "B4", "B5"] diff --git a/keyboards/handwired/wabi/config.h b/keyboards/handwired/wabi/config.h deleted file mode 100644 index 274c715a937..00000000000 --- a/keyboards/handwired/wabi/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Ross Montsinger -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 diff --git a/keyboards/handwired/wabi/keyboard.json b/keyboards/handwired/wabi/keyboard.json index 26c82a209c2..68f9d910dae 100644 --- a/keyboards/handwired/wabi/keyboard.json +++ b/keyboards/handwired/wabi/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F1", "F0", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B5"], "rows": ["D5", "F5", "F6", "F7", "B0"] diff --git a/keyboards/handwired/woodpad/config.h b/keyboards/handwired/woodpad/config.h deleted file mode 100644 index 9113106abf3..00000000000 --- a/keyboards/handwired/woodpad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2017 WoodKeys - -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/handwired/woodpad/keyboard.json b/keyboards/handwired/woodpad/keyboard.json index 3af8bd19df0..e6c07b2c425 100644 --- a/keyboards/handwired/woodpad/keyboard.json +++ b/keyboards/handwired/woodpad/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "B3", "B2", "B6"], "rows": ["D1", "D0", "D4", "C6", "D7"] From a1c142759480fbad6e947862c0995d040ae9d8d4 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 21 May 2024 16:03:56 -0700 Subject: [PATCH 306/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: H, Part 3 (#23763) Affects: - `handwired/jn68m` - `handwired/jopr` - `handwired/jot50` - `handwired/jotanck` - `handwired/jotpad16` - `handwired/jtallbean/split_65` - `handwired/juliet` - `handwired/k_numpad17` - `handwired/kbod` - `handwired/ks63` - `handwired/leftynumpad` - `handwired/lemonpad` - `handwired/m40/5x5_macropad` - `handwired/macroboard/f401` - `handwired/macroboard/f411` - `handwired/magicforce61` - `handwired/magicforce68` - `handwired/mechboards_micropad` - `handwired/minorca` - `handwired/mutepad` - `handwired/nicekey` - `handwired/nortontechpad` - `handwired/not_so_minidox` - `handwired/novem` - `handwired/nozbe_macro` - `handwired/numpad20` - `handwired/obuwunkunubi/spaget` - `handwired/oem_ansi_fullsize` - `handwired/onekey` - `handwired/ortho5x13` - `handwired/ortho5x14` - `handwired/p65rgb` - `handwired/pilcrow` - `handwired/polly40` - `handwired/postageboard/mini` - `handwired/postageboard/r1` - `handwired/prime_exl` - `handwired/prime_exl_plus` --- keyboards/handwired/jn68m/config.h | 24 ----------- keyboards/handwired/jn68m/keyboard.json | 6 +++ keyboards/handwired/jopr/config.h | 6 --- keyboards/handwired/jopr/keyboard.json | 6 +++ keyboards/handwired/jot50/config.h | 7 ---- keyboards/handwired/jot50/keyboard.json | 6 +++ keyboards/handwired/jotanck/config.h | 6 --- keyboards/handwired/jotanck/keyboard.json | 6 +++ keyboards/handwired/jotpad16/config.h | 6 --- keyboards/handwired/jotpad16/keyboard.json | 6 +++ .../handwired/jtallbean/split_65/config.h | 5 --- .../jtallbean/split_65/keyboard.json | 6 +++ keyboards/handwired/juliet/config.h | 39 ------------------ keyboards/handwired/juliet/keyboard.json | 6 +++ keyboards/handwired/k_numpad17/config.h | 25 ----------- keyboards/handwired/k_numpad17/keyboard.json | 6 +++ keyboards/handwired/kbod/config.h | 39 ------------------ keyboards/handwired/kbod/keyboard.json | 6 +++ keyboards/handwired/ks63/config.h | 5 --- keyboards/handwired/ks63/keyboard.json | 6 +++ keyboards/handwired/leftynumpad/config.h | 39 ------------------ keyboards/handwired/leftynumpad/keyboard.json | 6 +++ keyboards/handwired/lemonpad/config.h | 38 ----------------- keyboards/handwired/lemonpad/keyboard.json | 6 +++ keyboards/handwired/m40/5x5_macropad/config.h | 25 ----------- .../handwired/m40/5x5_macropad/keyboard.json | 6 +++ keyboards/handwired/macroboard/config.h | 5 --- .../handwired/macroboard/f401/keyboard.json | 6 +++ .../handwired/macroboard/f411/keyboard.json | 6 +++ keyboards/handwired/magicforce61/config.h | 39 ------------------ .../handwired/magicforce61/keyboard.json | 6 +++ keyboards/handwired/magicforce68/config.h | 39 ------------------ .../handwired/magicforce68/keyboard.json | 6 +++ .../handwired/mechboards_micropad/config.h | 39 ------------------ .../mechboards_micropad/keyboard.json | 6 +++ keyboards/handwired/minorca/config.h | 39 ------------------ keyboards/handwired/minorca/keyboard.json | 6 +++ keyboards/handwired/mutepad/config.h | 20 --------- keyboards/handwired/mutepad/keyboard.json | 6 ++- keyboards/handwired/nicekey/config.h | 39 ------------------ keyboards/handwired/nicekey/keyboard.json | 6 +++ keyboards/handwired/nortontechpad/config.h | 24 ----------- .../handwired/nortontechpad/keyboard.json | 6 +++ keyboards/handwired/not_so_minidox/config.h | 5 --- .../handwired/not_so_minidox/keyboard.json | 6 +++ keyboards/handwired/novem/config.h | 26 ------------ keyboards/handwired/novem/keyboard.json | 6 +++ keyboards/handwired/nozbe_macro/config.h | 25 ----------- keyboards/handwired/nozbe_macro/keyboard.json | 6 +++ keyboards/handwired/numpad20/config.h | 39 ------------------ keyboards/handwired/numpad20/keyboard.json | 6 +++ .../handwired/obuwunkunubi/spaget/config.h | 40 ------------------ .../obuwunkunubi/spaget/keyboard.json | 6 +++ .../handwired/oem_ansi_fullsize/config.h | 39 ------------------ .../handwired/oem_ansi_fullsize/keyboard.json | 6 +++ keyboards/handwired/onekey/config.h | 5 --- keyboards/handwired/onekey/info.json | 6 +++ keyboards/handwired/ortho5x13/config.h | 39 ------------------ keyboards/handwired/ortho5x13/keyboard.json | 6 +++ keyboards/handwired/ortho5x14/config.h | 41 ------------------- keyboards/handwired/ortho5x14/keyboard.json | 6 +++ keyboards/handwired/p65rgb/config.h | 5 --- keyboards/handwired/p65rgb/keyboard.json | 6 +++ keyboards/handwired/pilcrow/config.h | 39 ------------------ keyboards/handwired/pilcrow/keyboard.json | 6 +++ keyboards/handwired/polly40/config.h | 24 ----------- keyboards/handwired/polly40/keyboard.json | 6 +++ .../handwired/postageboard/mini/config.h | 23 ----------- .../handwired/postageboard/mini/keyboard.json | 6 +++ keyboards/handwired/postageboard/r1/config.h | 23 ----------- .../handwired/postageboard/r1/keyboard.json | 6 +++ keyboards/handwired/prime_exl/config.h | 5 --- keyboards/handwired/prime_exl/keyboard.json | 6 +++ keyboards/handwired/prime_exl_plus/config.h | 23 ----------- .../handwired/prime_exl_plus/keyboard.json | 6 +++ 75 files changed, 227 insertions(+), 910 deletions(-) delete mode 100644 keyboards/handwired/jn68m/config.h delete mode 100644 keyboards/handwired/jot50/config.h delete mode 100644 keyboards/handwired/juliet/config.h delete mode 100644 keyboards/handwired/k_numpad17/config.h delete mode 100644 keyboards/handwired/kbod/config.h delete mode 100644 keyboards/handwired/leftynumpad/config.h delete mode 100644 keyboards/handwired/lemonpad/config.h delete mode 100644 keyboards/handwired/m40/5x5_macropad/config.h delete mode 100644 keyboards/handwired/magicforce61/config.h delete mode 100644 keyboards/handwired/magicforce68/config.h delete mode 100644 keyboards/handwired/mechboards_micropad/config.h delete mode 100644 keyboards/handwired/minorca/config.h delete mode 100644 keyboards/handwired/mutepad/config.h delete mode 100644 keyboards/handwired/nicekey/config.h delete mode 100644 keyboards/handwired/nortontechpad/config.h delete mode 100644 keyboards/handwired/novem/config.h delete mode 100644 keyboards/handwired/nozbe_macro/config.h delete mode 100644 keyboards/handwired/numpad20/config.h delete mode 100644 keyboards/handwired/obuwunkunubi/spaget/config.h delete mode 100644 keyboards/handwired/oem_ansi_fullsize/config.h delete mode 100644 keyboards/handwired/ortho5x13/config.h delete mode 100644 keyboards/handwired/ortho5x14/config.h delete mode 100644 keyboards/handwired/pilcrow/config.h delete mode 100644 keyboards/handwired/polly40/config.h delete mode 100644 keyboards/handwired/postageboard/mini/config.h delete mode 100644 keyboards/handwired/postageboard/r1/config.h delete mode 100644 keyboards/handwired/prime_exl_plus/config.h diff --git a/keyboards/handwired/jn68m/config.h b/keyboards/handwired/jn68m/config.h deleted file mode 100644 index e736c430c0d..00000000000 --- a/keyboards/handwired/jn68m/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2018 Jumail Mundekkat / MxBlue - -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 diff --git a/keyboards/handwired/jn68m/keyboard.json b/keyboards/handwired/jn68m/keyboard.json index 25dfb005ebf..e2c833b0027 100644 --- a/keyboards/handwired/jn68m/keyboard.json +++ b/keyboards/handwired/jn68m/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "D1"], "rows": ["B0", "B1", "D5", "D3", "D2"] diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h index 59717346c33..b4ee0992fe6 100644 --- a/keyboards/handwired/jopr/config.h +++ b/keyboards/handwired/jopr/config.h @@ -1,9 +1,3 @@ #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 NO_ACTION_ONESHOT diff --git a/keyboards/handwired/jopr/keyboard.json b/keyboards/handwired/jopr/keyboard.json index c01e622325f..36aa7276b53 100644 --- a/keyboards/handwired/jopr/keyboard.json +++ b/keyboards/handwired/jopr/keyboard.json @@ -26,6 +26,12 @@ "nkro": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": false, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "B0", "F7", "E6", "F6", "B5", "C7", "B4", "D1"], "rows": ["D0", "D6", "D2", "D4", "D3", "D5", "D7", "C6", "B6", "F5"] diff --git a/keyboards/handwired/jot50/config.h b/keyboards/handwired/jot50/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/handwired/jot50/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/jot50/keyboard.json b/keyboards/handwired/jot50/keyboard.json index 260fd6dffc9..d272ffc6b19 100644 --- a/keyboards/handwired/jot50/keyboard.json +++ b/keyboards/handwired/jot50/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D3", "D2", "D1", "D0", "D4", "C6"], "rows": ["D7", "E6", "B4", "B6", "B2"] diff --git a/keyboards/handwired/jotanck/config.h b/keyboards/handwired/jotanck/config.h index d78fb4d5bfb..ca1ac2450d8 100644 --- a/keyboards/handwired/jotanck/config.h +++ b/keyboards/handwired/jotanck/config.h @@ -20,9 +20,3 @@ #define JOTANCK_LEDS #define JOTANCK_LED1 B5 #define JOTANCK_LED2 B4 - -/* 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/jotanck/keyboard.json b/keyboards/handwired/jotanck/keyboard.json index 4c81ac1a61b..94ec9c15e57 100644 --- a/keyboards/handwired/jotanck/keyboard.json +++ b/keyboards/handwired/jotanck/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "tapping": { "term": 175 }, diff --git a/keyboards/handwired/jotpad16/config.h b/keyboards/handwired/jotpad16/config.h index 0e9074f2ce7..44d323a5bb6 100644 --- a/keyboards/handwired/jotpad16/config.h +++ b/keyboards/handwired/jotpad16/config.h @@ -4,9 +4,3 @@ #define JOTPAD16_LEDS #define JOTPAD16_LED1 B5 #define JOTPAD16_LED2 B4 - -/* 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/jotpad16/keyboard.json b/keyboards/handwired/jotpad16/keyboard.json index 944af735efe..6a8a5db44c3 100644 --- a/keyboards/handwired/jotpad16/keyboard.json +++ b/keyboards/handwired/jotpad16/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "D7", "B3", "B1"], "rows": ["B6", "B2", "D2", "D3"] diff --git a/keyboards/handwired/jtallbean/split_65/config.h b/keyboards/handwired/jtallbean/split_65/config.h index 313fe1940c1..2ae835db9d2 100644 --- a/keyboards/handwired/jtallbean/split_65/config.h +++ b/keyboards/handwired/jtallbean/split_65/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D5 -/* 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. diff --git a/keyboards/handwired/jtallbean/split_65/keyboard.json b/keyboards/handwired/jtallbean/split_65/keyboard.json index d1b974a59be..c8be82da8d4 100644 --- a/keyboards/handwired/jtallbean/split_65/keyboard.json +++ b/keyboards/handwired/jtallbean/split_65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "B7"], "rows": ["F4", "F1", "F0", "C7", "B6"] diff --git a/keyboards/handwired/juliet/config.h b/keyboards/handwired/juliet/config.h deleted file mode 100644 index 4570cdb18e1..00000000000 --- a/keyboards/handwired/juliet/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 na-cly - -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/handwired/juliet/keyboard.json b/keyboards/handwired/juliet/keyboard.json index e08a0266923..49c2489e66e 100644 --- a/keyboards/handwired/juliet/keyboard.json +++ b/keyboards/handwired/juliet/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B1", "B3", "B2", "B6"], "rows": ["F5", "D2", "D3", "F4"] diff --git a/keyboards/handwired/k_numpad17/config.h b/keyboards/handwired/k_numpad17/config.h deleted file mode 100644 index 9f71a07f90c..00000000000 --- a/keyboards/handwired/k_numpad17/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 - - diff --git a/keyboards/handwired/k_numpad17/keyboard.json b/keyboards/handwired/k_numpad17/keyboard.json index edf69bc5d58..7d48cd1f3ef 100644 --- a/keyboards/handwired/k_numpad17/keyboard.json +++ b/keyboards/handwired/k_numpad17/keyboard.json @@ -19,6 +19,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B1", "F6", "F4"], "rows": ["D1", "D4", "C6", "D7", "E6"] diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/handwired/kbod/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/handwired/kbod/keyboard.json b/keyboards/handwired/kbod/keyboard.json index 127595a0cee..91926b554d1 100644 --- a/keyboards/handwired/kbod/keyboard.json +++ b/keyboards/handwired/kbod/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6"] diff --git a/keyboards/handwired/ks63/config.h b/keyboards/handwired/ks63/config.h index f470196e1d6..9b05e85d644 100644 --- a/keyboards/handwired/ks63/config.h +++ b/keyboards/handwired/ks63/config.h @@ -25,11 +25,6 @@ along with this program. If not, see . #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* 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 - /* Enables This makes it easier for fast typists to use dual-function keys */ #define PERMISSIVE_HOLD diff --git a/keyboards/handwired/ks63/keyboard.json b/keyboards/handwired/ks63/keyboard.json index 542cd76811e..6040074f071 100644 --- a/keyboards/handwired/ks63/keyboard.json +++ b/keyboards/handwired/ks63/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["B5", "B4", "E6", "D7", "C6"] diff --git a/keyboards/handwired/leftynumpad/config.h b/keyboards/handwired/leftynumpad/config.h deleted file mode 100644 index 831b41bcd2a..00000000000 --- a/keyboards/handwired/leftynumpad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Tom Swartz - -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/handwired/leftynumpad/keyboard.json b/keyboards/handwired/leftynumpad/keyboard.json index 045fd7e8757..bb178be5be0 100644 --- a/keyboards/handwired/leftynumpad/keyboard.json +++ b/keyboards/handwired/leftynumpad/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B4", "B5", "B6", "B2"], "rows": ["D1", "D0", "D4", "C6", "D7"] diff --git a/keyboards/handwired/lemonpad/config.h b/keyboards/handwired/lemonpad/config.h deleted file mode 100644 index 966e3d16f6e..00000000000 --- a/keyboards/handwired/lemonpad/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 dari-studios (@dari-studios) - * - * 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/handwired/lemonpad/keyboard.json b/keyboards/handwired/lemonpad/keyboard.json index ba40689125e..aab7b946929 100644 --- a/keyboards/handwired/lemonpad/keyboard.json +++ b/keyboards/handwired/lemonpad/keyboard.json @@ -21,6 +21,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["E6", "D7", "C6"], diff --git a/keyboards/handwired/m40/5x5_macropad/config.h b/keyboards/handwired/m40/5x5_macropad/config.h deleted file mode 100644 index 6770ce638c1..00000000000 --- a/keyboards/handwired/m40/5x5_macropad/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2022 Tomek (@m40-dev) -// 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 - -/* - * 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/handwired/m40/5x5_macropad/keyboard.json b/keyboards/handwired/m40/5x5_macropad/keyboard.json index b4bc53afc54..41adb774376 100644 --- a/keyboards/handwired/m40/5x5_macropad/keyboard.json +++ b/keyboards/handwired/m40/5x5_macropad/keyboard.json @@ -21,6 +21,12 @@ "extrakey": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_ortho_5x5": { "layout": [ diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h index b8e437bddf9..ca12d2c7539 100644 --- a/keyboards/handwired/macroboard/config.h +++ b/keyboards/handwired/macroboard/config.h @@ -23,8 +23,3 @@ along with this program. If not, see . #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #define WS2812_PWM_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #define WS2812_PWM_TARGET_PERIOD 800000 - -/* 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/macroboard/f401/keyboard.json b/keyboards/handwired/macroboard/f401/keyboard.json index d5e217b2f3d..2107eebaa3b 100644 --- a/keyboards/handwired/macroboard/f401/keyboard.json +++ b/keyboards/handwired/macroboard/f401/keyboard.json @@ -19,5 +19,11 @@ "extrakey": true, "nkro": true, "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } } } diff --git a/keyboards/handwired/macroboard/f411/keyboard.json b/keyboards/handwired/macroboard/f411/keyboard.json index 8b1155d7740..83c438d3074 100644 --- a/keyboards/handwired/macroboard/f411/keyboard.json +++ b/keyboards/handwired/macroboard/f411/keyboard.json @@ -23,5 +23,11 @@ "nkro": true, "rgblight": true, "audio": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } } } diff --git a/keyboards/handwired/magicforce61/config.h b/keyboards/handwired/magicforce61/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/handwired/magicforce61/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/handwired/magicforce61/keyboard.json b/keyboards/handwired/magicforce61/keyboard.json index dbcae2f21af..e15cc0590ec 100644 --- a/keyboards/handwired/magicforce61/keyboard.json +++ b/keyboards/handwired/magicforce61/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B4", "B3", "B2", "B1", "B0", "E7", "E6", "F0", "F1", "F2", "F3", "F4", "F5"], "rows": ["D0", "D1", "D2", "D3", "D4"] diff --git a/keyboards/handwired/magicforce68/config.h b/keyboards/handwired/magicforce68/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/handwired/magicforce68/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/handwired/magicforce68/keyboard.json b/keyboards/handwired/magicforce68/keyboard.json index a9afdf913a2..6567c8b1cf2 100644 --- a/keyboards/handwired/magicforce68/keyboard.json +++ b/keyboards/handwired/magicforce68/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B0", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/handwired/mechboards_micropad/config.h b/keyboards/handwired/mechboards_micropad/config.h deleted file mode 100644 index 3fd748d1824..00000000000 --- a/keyboards/handwired/mechboards_micropad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Yiancar - -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/handwired/mechboards_micropad/keyboard.json b/keyboards/handwired/mechboards_micropad/keyboard.json index 16e6653a338..65ef6fb5b4e 100644 --- a/keyboards/handwired/mechboards_micropad/keyboard.json +++ b/keyboards/handwired/mechboards_micropad/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B3", "B1", "F7"], "rows": ["B6"] diff --git a/keyboards/handwired/minorca/config.h b/keyboards/handwired/minorca/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/handwired/minorca/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/handwired/minorca/keyboard.json b/keyboards/handwired/minorca/keyboard.json index 9642927f1ae..9ac1f52d13a 100644 --- a/keyboards/handwired/minorca/keyboard.json +++ b/keyboards/handwired/minorca/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/handwired/mutepad/config.h b/keyboards/handwired/mutepad/config.h deleted file mode 100644 index 632465bba71..00000000000 --- a/keyboards/handwired/mutepad/config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2022 JoshwJB (@JoshwJB) -// 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 - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT diff --git a/keyboards/handwired/mutepad/keyboard.json b/keyboards/handwired/mutepad/keyboard.json index 9bb273d4e85..f727569c980 100644 --- a/keyboards/handwired/mutepad/keyboard.json +++ b/keyboards/handwired/mutepad/keyboard.json @@ -29,7 +29,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/handwired/nicekey/config.h b/keyboards/handwired/nicekey/config.h deleted file mode 100644 index 4b007cf387e..00000000000 --- a/keyboards/handwired/nicekey/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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/handwired/nicekey/keyboard.json b/keyboards/handwired/nicekey/keyboard.json index 0ae1b3280bf..fe7267ab840 100644 --- a/keyboards/handwired/nicekey/keyboard.json +++ b/keyboards/handwired/nicekey/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6"], "rows": ["B6"] diff --git a/keyboards/handwired/nortontechpad/config.h b/keyboards/handwired/nortontechpad/config.h deleted file mode 100644 index 48ea26f0058..00000000000 --- a/keyboards/handwired/nortontechpad/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 Joel Schneider - * - * 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 - diff --git a/keyboards/handwired/nortontechpad/keyboard.json b/keyboards/handwired/nortontechpad/keyboard.json index 51871b42e32..e90b6b5482e 100644 --- a/keyboards/handwired/nortontechpad/keyboard.json +++ b/keyboards/handwired/nortontechpad/keyboard.json @@ -14,6 +14,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/not_so_minidox/config.h b/keyboards/handwired/not_so_minidox/config.h index 6a4ebbec82e..7b7d4c06ae9 100644 --- a/keyboards/handwired/not_so_minidox/config.h +++ b/keyboards/handwired/not_so_minidox/config.h @@ -22,11 +22,6 @@ along with this program. If not, see . #define MASTER_LEFT //#define MASTER_RIGHT -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* disable debug print */ //#define NO_DEBUG diff --git a/keyboards/handwired/not_so_minidox/keyboard.json b/keyboards/handwired/not_so_minidox/keyboard.json index b48eba771bd..c3cc5988407 100644 --- a/keyboards/handwired/not_so_minidox/keyboard.json +++ b/keyboards/handwired/not_so_minidox/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "D4"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/novem/config.h b/keyboards/handwired/novem/config.h deleted file mode 100644 index b5a88cb22e5..00000000000 --- a/keyboards/handwired/novem/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2020 Jose I. Martinez - -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 - - - diff --git a/keyboards/handwired/novem/keyboard.json b/keyboards/handwired/novem/keyboard.json index bc4fe2c1c95..c824f7809c1 100644 --- a/keyboards/handwired/novem/keyboard.json +++ b/keyboards/handwired/novem/keyboard.json @@ -20,6 +20,12 @@ "mousekey": false, "extrakey": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/nozbe_macro/config.h b/keyboards/handwired/nozbe_macro/config.h deleted file mode 100644 index 81860eaf4dd..00000000000 --- a/keyboards/handwired/nozbe_macro/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 Marcin Leon Omelan (@rozPierog) - * - * 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 - diff --git a/keyboards/handwired/nozbe_macro/keyboard.json b/keyboards/handwired/nozbe_macro/keyboard.json index c87205c9177..584509ad185 100644 --- a/keyboards/handwired/nozbe_macro/keyboard.json +++ b/keyboards/handwired/nozbe_macro/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6"], "rows": ["B0"] diff --git a/keyboards/handwired/numpad20/config.h b/keyboards/handwired/numpad20/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/handwired/numpad20/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/handwired/numpad20/keyboard.json b/keyboards/handwired/numpad20/keyboard.json index 7e3888bbe0a..e47cfc5df52 100644 --- a/keyboards/handwired/numpad20/keyboard.json +++ b/keyboards/handwired/numpad20/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D0", "F5", "F4"], "rows": ["F6", "B1", "B3", "B6", "B5"] diff --git a/keyboards/handwired/obuwunkunubi/spaget/config.h b/keyboards/handwired/obuwunkunubi/spaget/config.h deleted file mode 100644 index 55acb93cec0..00000000000 --- a/keyboards/handwired/obuwunkunubi/spaget/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2020 obuwunkunubi - -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/handwired/obuwunkunubi/spaget/keyboard.json b/keyboards/handwired/obuwunkunubi/spaget/keyboard.json index 7cbf1b3c0bc..238736705dc 100644 --- a/keyboards/handwired/obuwunkunubi/spaget/keyboard.json +++ b/keyboards/handwired/obuwunkunubi/spaget/keyboard.json @@ -19,6 +19,12 @@ "oled": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/oem_ansi_fullsize/config.h b/keyboards/handwired/oem_ansi_fullsize/config.h deleted file mode 100644 index 8906351de9a..00000000000 --- a/keyboards/handwired/oem_ansi_fullsize/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Cian Johnston - -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/handwired/oem_ansi_fullsize/keyboard.json b/keyboards/handwired/oem_ansi_fullsize/keyboard.json index 6c48bfcc369..e83b2c61d38 100644 --- a/keyboards/handwired/oem_ansi_fullsize/keyboard.json +++ b/keyboards/handwired/oem_ansi_fullsize/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C3", "C2", "C1", "C0", "E1", "E0", "D7", "E6", "D5", "D4", "D3", "D2", "D1", "D0", "B7", "B0", "B1", "B2", "B3", "B4", "B5", "F6"], "rows": ["F5", "F4", "F3", "F2", "F1", "F0"] diff --git a/keyboards/handwired/onekey/config.h b/keyboards/handwired/onekey/config.h index 09cf9659412..8b2755dc2c2 100644 --- a/keyboards/handwired/onekey/config.h +++ b/keyboards/handwired/onekey/config.h @@ -17,11 +17,6 @@ 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 PERMISSIVE_HOLD /* diff --git a/keyboards/handwired/onekey/info.json b/keyboards/handwired/onekey/info.json index 2d266f5ea3b..c952758265b 100644 --- a/keyboards/handwired/onekey/info.json +++ b/keyboards/handwired/onekey/info.json @@ -19,6 +19,12 @@ "command": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_1x1"], "layouts": { "LAYOUT_ortho_1x1": { diff --git a/keyboards/handwired/ortho5x13/config.h b/keyboards/handwired/ortho5x13/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/handwired/ortho5x13/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/handwired/ortho5x13/keyboard.json b/keyboards/handwired/ortho5x13/keyboard.json index 097ac3863d1..23591b5046c 100644 --- a/keyboards/handwired/ortho5x13/keyboard.json +++ b/keyboards/handwired/ortho5x13/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0", "D4"] diff --git a/keyboards/handwired/ortho5x14/config.h b/keyboards/handwired/ortho5x14/config.h deleted file mode 100644 index 5f60fd44d7e..00000000000 --- a/keyboards/handwired/ortho5x14/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2021 Richard Nunez - -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 PERMISSIVE_HOLD - -/* - * 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/handwired/ortho5x14/keyboard.json b/keyboards/handwired/ortho5x14/keyboard.json index fe34f2b800f..1e6828190b1 100644 --- a/keyboards/handwired/ortho5x14/keyboard.json +++ b/keyboards/handwired/ortho5x14/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["F0", "F1", "C7", "D5", "B7"] diff --git a/keyboards/handwired/p65rgb/config.h b/keyboards/handwired/p65rgb/config.h index 9a446a904b2..776088feb02 100644 --- a/keyboards/handwired/p65rgb/config.h +++ b/keyboards/handwired/p65rgb/config.h @@ -18,8 +18,3 @@ along with this program. If not, see . #pragma once #define RGB_MATRIX_LED_COUNT 83 - -/* 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/p65rgb/keyboard.json b/keyboards/handwired/p65rgb/keyboard.json index 184d7b323c2..474e2b8edd4 100644 --- a/keyboards/handwired/p65rgb/keyboard.json +++ b/keyboards/handwired/p65rgb/keyboard.json @@ -77,6 +77,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D7"], "rows": ["C7", "C6", "B6", "B5", "D5"] diff --git a/keyboards/handwired/pilcrow/config.h b/keyboards/handwired/pilcrow/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/handwired/pilcrow/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/handwired/pilcrow/keyboard.json b/keyboards/handwired/pilcrow/keyboard.json index b1c96a495e5..b44a4e2d3d4 100644 --- a/keyboards/handwired/pilcrow/keyboard.json +++ b/keyboards/handwired/pilcrow/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "F5", "F6", "B6", "B2", "F4", "B5"], "rows": ["B4", "F7", "B1", "B3"] diff --git a/keyboards/handwired/polly40/config.h b/keyboards/handwired/polly40/config.h deleted file mode 100644 index 79dcced2181..00000000000 --- a/keyboards/handwired/polly40/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2023 PAUL ENRICO N. VIOLA @PollyV1 - * - * 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 - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/polly40/keyboard.json b/keyboards/handwired/polly40/keyboard.json index 9ff34b339ef..fde1b77aab6 100644 --- a/keyboards/handwired/polly40/keyboard.json +++ b/keyboards/handwired/polly40/keyboard.json @@ -23,6 +23,12 @@ "command": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/postageboard/mini/config.h b/keyboards/handwired/postageboard/mini/config.h deleted file mode 100644 index 091cb7b510b..00000000000 --- a/keyboards/handwired/postageboard/mini/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Yan-Fa Li - -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 diff --git a/keyboards/handwired/postageboard/mini/keyboard.json b/keyboards/handwired/postageboard/mini/keyboard.json index 13e83147bbd..31ceb066aab 100644 --- a/keyboards/handwired/postageboard/mini/keyboard.json +++ b/keyboards/handwired/postageboard/mini/keyboard.json @@ -15,5 +15,11 @@ "extrakey": true, "console": true, "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } } } diff --git a/keyboards/handwired/postageboard/r1/config.h b/keyboards/handwired/postageboard/r1/config.h deleted file mode 100644 index 091cb7b510b..00000000000 --- a/keyboards/handwired/postageboard/r1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Yan-Fa Li - -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 diff --git a/keyboards/handwired/postageboard/r1/keyboard.json b/keyboards/handwired/postageboard/r1/keyboard.json index 78ab5d028e0..38bb66d3be2 100644 --- a/keyboards/handwired/postageboard/r1/keyboard.json +++ b/keyboards/handwired/postageboard/r1/keyboard.json @@ -15,5 +15,11 @@ "extrakey": true, "console": true, "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } } } diff --git a/keyboards/handwired/prime_exl/config.h b/keyboards/handwired/prime_exl/config.h index 8f57ec2b911..3a8b8495f8b 100644 --- a/keyboards/handwired/prime_exl/config.h +++ b/keyboards/handwired/prime_exl/config.h @@ -17,11 +17,6 @@ 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 NUM_LOCK_LED_PIN B6 #define CAPS_LOCK_LED_PIN B5 #define SCROLL_LOCK_LED_PIN C6 diff --git a/keyboards/handwired/prime_exl/keyboard.json b/keyboards/handwired/prime_exl/keyboard.json index ea8f6821a29..13993a61b4d 100644 --- a/keyboards/handwired/prime_exl/keyboard.json +++ b/keyboards/handwired/prime_exl/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "B3", "B2", "D1", "D2", "D3", "F7", "F6", "F5"], "rows": ["B1", "E6", "D5", "D6", "B4", "D7", "D4", "F1", "F0", "B0"] diff --git a/keyboards/handwired/prime_exl_plus/config.h b/keyboards/handwired/prime_exl_plus/config.h deleted file mode 100644 index cb77f4eda20..00000000000 --- a/keyboards/handwired/prime_exl_plus/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 Holten Campbell - -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 diff --git a/keyboards/handwired/prime_exl_plus/keyboard.json b/keyboards/handwired/prime_exl_plus/keyboard.json index 4ff9bb10494..43825a0ad88 100644 --- a/keyboards/handwired/prime_exl_plus/keyboard.json +++ b/keyboards/handwired/prime_exl_plus/keyboard.json @@ -35,6 +35,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B7", "B3", "D1", "D0"], "rows": ["D2", "D6", "B4", "F1", "E6", "F0", "F4", "B5", "D7", "D3"] From 3d0f4fa6927a8b600f1f5fc63f1f2349dc1c79af Mon Sep 17 00:00:00 2001 From: Dasky <32983009+daskygit@users.noreply.github.com> Date: Wed, 22 May 2024 00:04:18 +0100 Subject: [PATCH 307/333] Fix font artefact on Reverb keyboard. (#23761) --- .../dasky/reverb/graphics/robotomono20.qff.c | 465 ++++++------------ .../dasky/reverb/graphics/robotomono20.qff.h | 6 +- 2 files changed, 157 insertions(+), 314 deletions(-) diff --git a/keyboards/dasky/reverb/graphics/robotomono20.qff.c b/keyboards/dasky/reverb/graphics/robotomono20.qff.c index a232ffadfbb..8874c1b016c 100644 --- a/keyboards/dasky/reverb/graphics/robotomono20.qff.c +++ b/keyboards/dasky/reverb/graphics/robotomono20.qff.c @@ -1,320 +1,163 @@ -// Copyright 2023 QMK -- generated source code only, font retains original copyright +// Copyright 2024 QMK -- generated source code only, font retains original copyright // SPDX-License-Identifier: GPL-2.0-or-later -// This file was auto-generated by `qmk painter-convert-font-image -i robotomono20.png -f mono4` +// This file was auto-generated by `qmk painter-convert-font-image -i robotomono20.png -f mono2` #include -const uint32_t font_robotomono20_length = 4904; +const uint32_t font_robotomono20_length = 2396; // clang-format off -const uint8_t font_robotomono20[4904] = { - 0x00, 0xFF, 0x14, 0x00, 0x00, 0x51, 0x46, 0x46, 0x01, 0x28, 0x13, 0x00, 0x00, 0xD7, 0xEC, 0xFF, - 0xFF, 0x16, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0xFF, 0x01, 0xFE, 0x1D, 0x01, 0x00, 0x0C, 0x00, - 0x00, 0x8C, 0x00, 0x00, 0x0C, 0x0E, 0x00, 0xCC, 0x12, 0x00, 0xCC, 0x1F, 0x00, 0x8C, 0x2F, 0x00, - 0x0C, 0x3D, 0x00, 0xCC, 0x49, 0x00, 0x4C, 0x4F, 0x00, 0x4C, 0x62, 0x00, 0x0C, 0x76, 0x00, 0x4C, - 0x7F, 0x00, 0xCC, 0x89, 0x00, 0x0C, 0x8F, 0x00, 0xCC, 0x91, 0x00, 0x4C, 0x95, 0x00, 0x0C, 0xA4, - 0x00, 0xCC, 0xB0, 0x00, 0x8C, 0xBE, 0x00, 0x4C, 0xCB, 0x00, 0x4C, 0xD8, 0x00, 0x8C, 0xE4, 0x00, - 0x4C, 0xF2, 0x00, 0x8C, 0xFF, 0x00, 0x0C, 0x0D, 0x01, 0xCC, 0x19, 0x01, 0x0C, 0x26, 0x01, 0x8C, - 0x2C, 0x01, 0x0C, 0x35, 0x01, 0xCC, 0x3C, 0x01, 0x8C, 0x42, 0x01, 0x8C, 0x4A, 0x01, 0x8C, 0x56, - 0x01, 0x4C, 0x63, 0x01, 0xCC, 0x70, 0x01, 0x4C, 0x7D, 0x01, 0x4C, 0x8B, 0x01, 0x8C, 0x97, 0x01, - 0x0C, 0xA6, 0x01, 0x4C, 0xB4, 0x01, 0xCC, 0xC1, 0x01, 0x4C, 0xCE, 0x01, 0x0C, 0xDD, 0x01, 0x0C, - 0xEC, 0x01, 0x8C, 0xF8, 0x01, 0x4C, 0x08, 0x02, 0xCC, 0x14, 0x02, 0x8C, 0x21, 0x02, 0x8C, 0x2E, - 0x02, 0x8C, 0x3B, 0x02, 0x8C, 0x49, 0x02, 0x0C, 0x56, 0x02, 0x4C, 0x63, 0x02, 0x4C, 0x72, 0x02, - 0x4C, 0x7F, 0x02, 0x4C, 0x8C, 0x02, 0x8C, 0x99, 0x02, 0xCC, 0xA6, 0x02, 0xCC, 0xB4, 0x02, 0x0C, - 0xC2, 0x02, 0x4C, 0xD6, 0x02, 0x0C, 0xE7, 0x02, 0x4C, 0xFB, 0x02, 0x0C, 0x03, 0x03, 0xCC, 0x05, - 0x03, 0x4C, 0x09, 0x03, 0x4C, 0x13, 0x03, 0x4C, 0x21, 0x03, 0xCC, 0x2B, 0x03, 0x0C, 0x39, 0x03, - 0x0C, 0x43, 0x03, 0x0C, 0x52, 0x03, 0x8C, 0x5E, 0x03, 0x0C, 0x6C, 0x03, 0x4C, 0x7A, 0x03, 0xCC, - 0x89, 0x03, 0x4C, 0x97, 0x03, 0x8C, 0xA6, 0x03, 0x0C, 0xB0, 0x03, 0x8C, 0xB9, 0x03, 0x4C, 0xC3, - 0x03, 0xCC, 0xCF, 0x03, 0x0C, 0xDD, 0x03, 0x4C, 0xE6, 0x03, 0x0C, 0xF0, 0x03, 0x4C, 0xFD, 0x03, - 0x4C, 0x07, 0x04, 0x4C, 0x11, 0x04, 0xCC, 0x1A, 0x04, 0xCC, 0x24, 0x04, 0x8C, 0x32, 0x04, 0x8C, - 0x3C, 0x04, 0xCC, 0x4F, 0x04, 0x4C, 0x62, 0x04, 0xCC, 0x75, 0x04, 0x04, 0xFB, 0xE8, 0x11, 0x00, - 0x42, 0x00, 0x07, 0x00, 0x80, 0x04, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, - 0x80, 0x2C, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, - 0x80, 0x2C, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, 0x80, 0x14, 0x08, 0x00, - 0x80, 0x2C, 0x02, 0x00, 0x80, 0x3C, 0x10, 0x00, 0x06, 0x00, 0x8D, 0x80, 0xC3, 0x01, 0x80, 0xC3, - 0x01, 0x80, 0xC3, 0x01, 0x80, 0xC2, 0x01, 0x40, 0x82, 0x2E, 0x00, 0x07, 0x00, 0x02, 0x04, 0x80, - 0x00, 0x02, 0x0D, 0x80, 0x00, 0x02, 0x0D, 0x80, 0x00, 0x02, 0x0A, 0x97, 0x00, 0x0A, 0x0B, 0xF8, - 0xFF, 0xBF, 0x50, 0x57, 0x17, 0x40, 0x43, 0x03, 0x80, 0x82, 0x02, 0xD4, 0xD6, 0x16, 0xFD, 0xFF, - 0x2F, 0xC0, 0xD1, 0x01, 0x02, 0xD0, 0x83, 0x00, 0xE0, 0xA0, 0x00, 0x02, 0xA0, 0x10, 0x00, 0x81, - 0x00, 0x24, 0x02, 0x00, 0x80, 0x34, 0x02, 0x00, 0x95, 0x78, 0x00, 0x80, 0xFF, 0x07, 0xD0, 0x56, - 0x0F, 0xE0, 0x00, 0x1E, 0xF0, 0x00, 0x2D, 0xE0, 0x01, 0x00, 0xD0, 0x07, 0x00, 0x40, 0xBF, 0x02, - 0x00, 0x95, 0xF4, 0x07, 0x00, 0x40, 0x1F, 0x10, 0x00, 0x2D, 0x74, 0x00, 0x2D, 0xB0, 0x00, 0x2D, - 0xE0, 0x96, 0x0F, 0x80, 0xFF, 0x06, 0x00, 0x38, 0x02, 0x00, 0x80, 0x38, 0x0A, 0x00, 0x06, 0x00, - 0x80, 0x50, 0x02, 0x00, 0x90, 0xFC, 0x03, 0x00, 0x0D, 0x0B, 0x01, 0x0A, 0x4A, 0x07, 0x0E, 0x8A, - 0x02, 0x6D, 0xD7, 0x00, 0xA4, 0xB1, 0x02, 0x00, 0x80, 0x34, 0x02, 0x00, 0x80, 0x1C, 0x02, 0x00, - 0x90, 0x8E, 0x2F, 0x00, 0xD7, 0x75, 0x80, 0xA2, 0xB0, 0xC0, 0xA1, 0xA0, 0x00, 0xE0, 0x70, 0x00, - 0x80, 0x2F, 0x0F, 0x00, 0x07, 0x00, 0xAD, 0x15, 0x00, 0x80, 0xFF, 0x00, 0xD0, 0xD2, 0x02, 0xE0, - 0xC1, 0x02, 0xE0, 0xC1, 0x02, 0xD0, 0xE2, 0x01, 0xC0, 0x7F, 0x00, 0x80, 0x0F, 0x00, 0xE0, 0x2E, - 0x24, 0xB4, 0x78, 0x74, 0x3C, 0xF0, 0x39, 0x3C, 0xD0, 0x2F, 0x38, 0x40, 0x0F, 0xF4, 0xE5, 0x2F, - 0xD0, 0xBF, 0x7D, 0x00, 0x04, 0x0D, 0x00, 0x07, 0x00, 0x80, 0x1D, 0x02, 0x00, 0x80, 0x1D, 0x02, - 0x00, 0x80, 0x1D, 0x02, 0x00, 0x80, 0x1D, 0x02, 0x00, 0x80, 0x08, 0x2E, 0x00, 0x04, 0x00, 0x86, - 0x40, 0x01, 0x00, 0xE0, 0x01, 0x00, 0x74, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, 0x80, 0x1D, 0x02, - 0x00, 0x80, 0x0E, 0x02, 0x00, 0x95, 0x0B, 0x00, 0x40, 0x0B, 0x00, 0x40, 0x07, 0x00, 0x40, 0x07, - 0x00, 0x80, 0x07, 0x00, 0x40, 0x07, 0x00, 0x40, 0x07, 0x00, 0x40, 0x0B, 0x02, 0x00, 0x80, 0x0B, - 0x02, 0x00, 0x80, 0x0E, 0x02, 0x00, 0x80, 0x1D, 0x02, 0x00, 0x80, 0x38, 0x02, 0x00, 0x80, 0xB0, - 0x02, 0x00, 0x81, 0xD0, 0x01, 0x02, 0x00, 0x80, 0x01, 0x03, 0x00, 0x84, 0x80, 0x01, 0x00, 0x40, - 0x07, 0x02, 0x00, 0x80, 0x0E, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, 0x80, 0x78, 0x02, 0x00, 0x80, - 0xB4, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xE0, 0x02, 0x00, 0x8C, 0xE0, 0x01, 0x00, 0xE0, - 0x01, 0x00, 0xE0, 0x01, 0x00, 0xE0, 0x01, 0x00, 0xE0, 0x02, 0x00, 0x80, 0xE0, 0x02, 0x00, 0x80, - 0xB0, 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x80, 0x38, 0x02, 0x00, 0x80, 0x1D, 0x02, 0x00, 0x85, - 0x0B, 0x00, 0x80, 0x02, 0x00, 0x40, 0x02, 0x00, 0x07, 0x00, 0x80, 0x10, 0x02, 0x00, 0x80, 0x38, - 0x02, 0x00, 0x8C, 0x34, 0x00, 0x10, 0x34, 0x10, 0xF4, 0x7A, 0x2E, 0x90, 0xFF, 0x1A, 0x00, 0xBC, - 0x02, 0x00, 0x87, 0xDB, 0x01, 0x80, 0x87, 0x03, 0x80, 0x42, 0x07, 0x1E, 0x00, 0x10, 0x00, 0x80, - 0x28, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x8C, 0x3C, 0x00, 0xA8, 0xBE, - 0x2A, 0xFC, 0xFF, 0x3F, 0x50, 0x7D, 0x05, 0x00, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, - 0x3C, 0x02, 0x00, 0x80, 0x28, 0x13, 0x00, 0x2E, 0x00, 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, - 0x00, 0x80, 0x1E, 0x02, 0x00, 0x83, 0x0F, 0x00, 0x40, 0x07, 0x07, 0x00, 0x1E, 0x00, 0x85, 0xF0, - 0xFF, 0x0B, 0x90, 0xAA, 0x06, 0x1E, 0x00, 0x2B, 0x00, 0x80, 0x24, 0x02, 0x00, 0x80, 0xBC, 0x02, - 0x00, 0x80, 0x7C, 0x10, 0x00, 0x08, 0x00, 0x80, 0x04, 0x02, 0x00, 0x8E, 0x0B, 0x00, 0x40, 0x07, - 0x00, 0x80, 0x03, 0x00, 0xC0, 0x02, 0x00, 0xD0, 0x01, 0x00, 0xA0, 0x02, 0x00, 0x80, 0x74, 0x02, - 0x00, 0x80, 0x38, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, 0x80, 0x1D, 0x02, 0x00, 0x80, 0x0E, 0x02, - 0x00, 0x8B, 0x0B, 0x00, 0x40, 0x03, 0x00, 0xC0, 0x02, 0x00, 0xD0, 0x01, 0x00, 0x40, 0x0B, 0x00, - 0x07, 0x00, 0xAD, 0x55, 0x00, 0x80, 0xFF, 0x02, 0xE0, 0x42, 0x0B, 0xB0, 0x00, 0x1E, 0x74, 0x00, - 0x1D, 0x78, 0x00, 0x2E, 0x78, 0xD0, 0x2F, 0x78, 0xB8, 0x2D, 0x78, 0x1E, 0x2D, 0xF8, 0x07, 0x2D, - 0xB8, 0x00, 0x2D, 0x74, 0x00, 0x1D, 0xB0, 0x00, 0x0E, 0xE0, 0x96, 0x0B, 0x40, 0xFF, 0x02, 0x00, - 0x14, 0x0D, 0x00, 0x0A, 0x00, 0x89, 0xB4, 0x00, 0x90, 0xBF, 0x00, 0xF0, 0xB6, 0x00, 0x10, 0xB4, - 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, - 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, - 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x10, 0x00, 0x07, 0x00, 0x98, 0x15, 0x00, 0xD0, - 0xFF, 0x01, 0xB4, 0xD1, 0x07, 0x3C, 0x40, 0x0B, 0x2C, 0x00, 0x0B, 0x00, 0x40, 0x0B, 0x00, 0x80, - 0x07, 0x00, 0xD0, 0x02, 0x00, 0xB4, 0x02, 0x00, 0x80, 0x3D, 0x02, 0x00, 0x8D, 0x0F, 0x00, 0xC0, - 0x07, 0x00, 0xE0, 0x01, 0x00, 0xB8, 0x55, 0x15, 0xFC, 0xFF, 0x1F, 0x0F, 0x00, 0x07, 0x00, 0x9C, - 0x15, 0x00, 0xD0, 0xFF, 0x01, 0xB4, 0xD1, 0x07, 0x38, 0x40, 0x0B, 0x14, 0x00, 0x0B, 0x00, 0x40, - 0x0B, 0x00, 0xD0, 0x03, 0x40, 0xFF, 0x01, 0x00, 0xE9, 0x02, 0x00, 0x40, 0x0B, 0x02, 0x00, 0x8E, - 0x0F, 0x28, 0x00, 0x0F, 0x3C, 0x40, 0x0B, 0xF4, 0xD5, 0x07, 0xD0, 0xBF, 0x01, 0x00, 0x04, 0x0D, - 0x00, 0x07, 0x00, 0xAB, 0x40, 0x01, 0x00, 0xD0, 0x03, 0x00, 0xF0, 0x03, 0x00, 0xF8, 0x03, 0x00, - 0x9D, 0x03, 0x00, 0x8B, 0x03, 0x80, 0x83, 0x03, 0xD0, 0x81, 0x03, 0xB0, 0x80, 0x03, 0x78, 0x80, - 0x03, 0xBC, 0xEA, 0x2B, 0xA9, 0xEA, 0x2B, 0x00, 0x80, 0x03, 0x00, 0x80, 0x03, 0x00, 0x80, 0x03, - 0x0F, 0x00, 0x06, 0x00, 0x97, 0x40, 0x55, 0x05, 0xC0, 0xFF, 0x1F, 0xC0, 0xAA, 0x1A, 0xD0, 0x01, - 0x00, 0xD0, 0x01, 0x00, 0xD0, 0x51, 0x00, 0xE0, 0xFF, 0x07, 0xE0, 0x96, 0x0F, 0x02, 0x00, 0x80, - 0x1E, 0x02, 0x00, 0x80, 0x2D, 0x02, 0x00, 0x8E, 0x2C, 0x60, 0x00, 0x2C, 0xF0, 0x00, 0x1E, 0xD0, - 0x97, 0x0F, 0x40, 0xFF, 0x02, 0x00, 0x10, 0x0D, 0x00, 0x07, 0x00, 0x80, 0x40, 0x02, 0x00, 0x88, - 0xF9, 0x01, 0x80, 0x6F, 0x00, 0xD0, 0x02, 0x00, 0xF0, 0x02, 0x00, 0x9F, 0xB4, 0x14, 0x00, 0xB4, - 0xFF, 0x02, 0xF8, 0x96, 0x0B, 0xB8, 0x00, 0x0F, 0x78, 0x00, 0x1E, 0x78, 0x00, 0x1D, 0x74, 0x00, - 0x1E, 0xF0, 0x00, 0x0F, 0xD0, 0x96, 0x07, 0x40, 0xFF, 0x01, 0x00, 0x14, 0x0D, 0x00, 0x06, 0x00, - 0x88, 0x54, 0x55, 0x05, 0xFC, 0xFF, 0x2F, 0x54, 0x55, 0x1E, 0x02, 0x00, 0x8E, 0x0E, 0x00, 0x40, - 0x07, 0x00, 0x80, 0x03, 0x00, 0xC0, 0x02, 0x00, 0xE0, 0x01, 0x00, 0xB0, 0x02, 0x00, 0x80, 0x78, - 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, 0x80, 0x1D, 0x02, 0x00, 0x86, 0x0F, 0x00, 0x40, 0x07, 0x00, - 0xC0, 0x03, 0x10, 0x00, 0x07, 0x00, 0xAD, 0x54, 0x00, 0x80, 0xFF, 0x07, 0xD0, 0x46, 0x0F, 0xE0, - 0x00, 0x1E, 0xF0, 0x00, 0x1D, 0xE0, 0x00, 0x1E, 0xD0, 0x46, 0x0B, 0x40, 0xFF, 0x02, 0xD0, 0x9B, - 0x0B, 0xF0, 0x00, 0x1E, 0xB4, 0x00, 0x2C, 0xB4, 0x00, 0x2C, 0xF0, 0x00, 0x2D, 0xE0, 0x96, 0x0F, - 0x40, 0xFF, 0x02, 0x00, 0x10, 0x0D, 0x00, 0x07, 0x00, 0x9F, 0x15, 0x00, 0x80, 0xFF, 0x02, 0xE0, - 0x92, 0x07, 0xB4, 0x00, 0x0F, 0x74, 0x00, 0x1E, 0x78, 0x00, 0x1D, 0x74, 0x00, 0x1D, 0xB4, 0x00, - 0x1E, 0xE0, 0x96, 0x1F, 0x80, 0xBF, 0x1E, 0x00, 0x04, 0x0E, 0x02, 0x00, 0x88, 0x0B, 0x00, 0xD0, - 0x03, 0x40, 0xFA, 0x01, 0x80, 0x2F, 0x10, 0x00, 0x10, 0x00, 0x80, 0x60, 0x02, 0x00, 0x80, 0xF8, - 0x02, 0x00, 0x80, 0xF4, 0x14, 0x00, 0x80, 0x60, 0x02, 0x00, 0x80, 0xF8, 0x02, 0x00, 0x80, 0xF4, - 0x10, 0x00, 0x10, 0x00, 0x80, 0x60, 0x02, 0x00, 0x80, 0xF8, 0x02, 0x00, 0x80, 0xF8, 0x17, 0x00, - 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x80, 0x38, 0x02, 0x00, - 0x80, 0x2C, 0x07, 0x00, 0x14, 0x00, 0x95, 0x04, 0x00, 0x90, 0x0F, 0x00, 0xF9, 0x06, 0xD0, 0x2F, - 0x00, 0xF4, 0x01, 0x00, 0xE0, 0x0B, 0x00, 0x40, 0xBE, 0x01, 0x00, 0xE0, 0x0F, 0x02, 0x00, 0x80, - 0x09, 0x15, 0x00, 0x15, 0x00, 0x88, 0x50, 0x55, 0x05, 0xF4, 0xFF, 0x1F, 0x50, 0x55, 0x05, 0x06, - 0x00, 0x85, 0xF4, 0xFF, 0x1F, 0x50, 0x55, 0x15, 0x18, 0x00, 0x12, 0x00, 0x80, 0x14, 0x02, 0x00, - 0x84, 0xF4, 0x02, 0x00, 0x90, 0x6F, 0x02, 0x00, 0x8E, 0xF8, 0x07, 0x00, 0x40, 0x1F, 0x00, 0xE4, - 0x0B, 0x40, 0xBF, 0x01, 0xF4, 0x07, 0x00, 0x64, 0x17, 0x00, 0x07, 0x00, 0x8A, 0x55, 0x00, 0x80, - 0xFF, 0x07, 0xE0, 0x96, 0x0F, 0xB0, 0x00, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, 0x88, 0x0F, - 0x00, 0x80, 0x0B, 0x00, 0xD0, 0x02, 0x00, 0xB4, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x2C, - 0x08, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x10, 0x00, 0x07, 0x00, 0x89, 0x10, 0x00, 0x40, - 0xFE, 0x06, 0xD0, 0x02, 0x0E, 0x70, 0x10, 0x02, 0x28, 0x97, 0xFD, 0x31, 0x1C, 0x8B, 0x71, 0x4C, - 0x83, 0x61, 0x4D, 0xC2, 0x61, 0x8D, 0xC2, 0x70, 0x8D, 0xC2, 0x30, 0x4D, 0xFB, 0x29, 0x1C, 0x5A, - 0x0B, 0x38, 0x02, 0x00, 0x85, 0xE0, 0x55, 0x01, 0x80, 0xFF, 0x01, 0x0F, 0x00, 0x07, 0x00, 0x80, - 0x10, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x7D, 0x02, 0x00, 0x80, 0xBE, 0x02, 0x00, 0x80, - 0xEE, 0x02, 0x00, 0x9C, 0xDB, 0x01, 0x40, 0xC7, 0x02, 0x80, 0x83, 0x03, 0xC0, 0x42, 0x07, 0xD0, - 0x56, 0x0B, 0xE0, 0xFF, 0x0F, 0xB0, 0x55, 0x1E, 0x74, 0x00, 0x2C, 0x38, 0x00, 0x3C, 0x2C, 0x00, - 0x78, 0x0F, 0x00, 0x06, 0x00, 0xAC, 0x50, 0x15, 0x00, 0xF4, 0xFF, 0x02, 0xB4, 0x95, 0x0F, 0xB4, - 0x00, 0x1E, 0xB4, 0x00, 0x2D, 0xB4, 0x00, 0x1E, 0xB4, 0x90, 0x0B, 0xF4, 0xFF, 0x02, 0xB4, 0x95, - 0x0F, 0xB4, 0x00, 0x2D, 0xB4, 0x00, 0x3C, 0xB4, 0x00, 0x3C, 0xB4, 0x00, 0x2E, 0xB4, 0xAA, 0x0F, - 0xF4, 0xFF, 0x01, 0x0F, 0x00, 0x07, 0x00, 0x8E, 0x54, 0x00, 0x80, 0xFF, 0x07, 0xE0, 0x42, 0x0F, - 0xB4, 0x00, 0x2D, 0x78, 0x00, 0x2C, 0x38, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, - 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x90, 0x38, 0x00, 0x14, 0x78, 0x00, 0x2C, - 0xB0, 0x00, 0x1E, 0xD0, 0x96, 0x0B, 0x40, 0xFF, 0x02, 0x00, 0x10, 0x0D, 0x00, 0x06, 0x00, 0xAB, - 0x50, 0x05, 0x00, 0xF4, 0xBF, 0x01, 0xB4, 0xE5, 0x07, 0x74, 0x00, 0x0F, 0x74, 0x00, 0x2D, 0x74, - 0x00, 0x3C, 0x74, 0x00, 0x38, 0x74, 0x00, 0x38, 0x74, 0x00, 0x38, 0x74, 0x00, 0x38, 0x74, 0x00, - 0x2C, 0x74, 0x00, 0x1D, 0x74, 0x40, 0x0F, 0xB4, 0xE9, 0x03, 0xF4, 0x6F, 0x10, 0x00, 0x06, 0x00, - 0x89, 0x50, 0x55, 0x05, 0xF4, 0xFF, 0x1F, 0xB4, 0x55, 0x05, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, - 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x86, 0xF4, 0xFF, 0x0B, 0xB4, 0x55, 0x05, - 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x85, - 0xB4, 0xAA, 0x1A, 0xF4, 0xFF, 0x2F, 0x0F, 0x00, 0x06, 0x00, 0x89, 0x50, 0x55, 0x05, 0xF0, 0xFF, - 0x2F, 0xB0, 0x55, 0x15, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, - 0xB0, 0x02, 0x00, 0x86, 0xF0, 0xAA, 0x06, 0xF0, 0xAA, 0x06, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, - 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x11, - 0x00, 0x07, 0x00, 0x8E, 0x54, 0x00, 0x80, 0xFF, 0x06, 0xE0, 0x46, 0x0F, 0xB4, 0x00, 0x2D, 0x78, - 0x00, 0x2C, 0x3C, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, 0x96, 0x2C, 0xE0, - 0x3F, 0x3C, 0x50, 0x3D, 0x38, 0x00, 0x3C, 0x78, 0x00, 0x3C, 0xF0, 0x00, 0x3C, 0xD0, 0x57, 0x2E, - 0x40, 0xFF, 0x06, 0x00, 0x10, 0x0D, 0x00, 0x06, 0x00, 0xAC, 0x10, 0x00, 0x04, 0x38, 0x00, 0x2C, - 0x38, 0x00, 0x2C, 0x38, 0x00, 0x2C, 0x38, 0x00, 0x2C, 0x38, 0x00, 0x2C, 0x78, 0x00, 0x2D, 0xF8, - 0xFF, 0x2F, 0x78, 0x55, 0x2D, 0x38, 0x00, 0x2C, 0x38, 0x00, 0x2C, 0x38, 0x00, 0x2C, 0x38, 0x00, - 0x2C, 0x38, 0x00, 0x2C, 0x38, 0x00, 0x2C, 0x0F, 0x00, 0x06, 0x00, 0x8A, 0x50, 0x55, 0x05, 0xF4, - 0xFF, 0x1F, 0x50, 0x7D, 0x05, 0x00, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, - 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, - 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x87, 0x3C, 0x00, 0xA4, 0xBE, 0x1A, 0xF4, - 0xFF, 0x1F, 0x0F, 0x00, 0x08, 0x00, 0x80, 0x04, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, - 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, - 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, 0x8E, 0x1E, - 0x3C, 0x00, 0x0E, 0x78, 0x40, 0x0B, 0xF0, 0xE6, 0x07, 0x90, 0xBF, 0x01, 0x00, 0x04, 0x0D, 0x00, - 0x06, 0x00, 0xAC, 0x10, 0x00, 0x14, 0xB4, 0x00, 0x2D, 0xB4, 0x40, 0x0F, 0xB4, 0xC0, 0x03, 0xB4, - 0xF0, 0x01, 0xB4, 0x78, 0x00, 0xB4, 0x2D, 0x00, 0xB4, 0x2F, 0x00, 0xF4, 0x7B, 0x00, 0xF4, 0xF5, - 0x00, 0xB4, 0xE0, 0x02, 0xB4, 0xC0, 0x07, 0xB4, 0x40, 0x0F, 0xB4, 0x00, 0x2E, 0xB4, 0x00, 0x7C, - 0x0F, 0x00, 0x06, 0x00, 0x80, 0x10, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, - 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, - 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, - 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x85, 0xF0, 0xAA, 0x1A, 0xF0, 0xFF, 0x2F, 0x0F, - 0x00, 0x06, 0x00, 0xAC, 0x10, 0x00, 0x04, 0xF8, 0x00, 0x2E, 0xF8, 0x01, 0x2F, 0xF8, 0x42, 0x2F, - 0xB8, 0x83, 0x2E, 0x78, 0xC7, 0x2D, 0x78, 0xEB, 0x2C, 0x38, 0xBE, 0x2C, 0x78, 0x7D, 0x2C, 0x78, - 0x3C, 0x2C, 0x78, 0x28, 0x2C, 0x78, 0x00, 0x2C, 0x78, 0x00, 0x2C, 0x78, 0x00, 0x2C, 0x78, 0x00, - 0x2C, 0x0F, 0x00, 0x06, 0x00, 0x97, 0x10, 0x00, 0x04, 0xB8, 0x00, 0x2D, 0xF8, 0x00, 0x2D, 0xF8, - 0x02, 0x2D, 0xF8, 0x07, 0x2D, 0x78, 0x0B, 0x2D, 0x78, 0x1E, 0x2D, 0x78, 0x2C, 0x2D, 0x02, 0x78, - 0x92, 0x2D, 0x78, 0xB0, 0x2D, 0x78, 0xE0, 0x2E, 0x78, 0xC0, 0x2F, 0x78, 0x80, 0x2F, 0x78, 0x00, - 0x2F, 0x78, 0x00, 0x2D, 0x0F, 0x00, 0x07, 0x00, 0x98, 0x15, 0x00, 0x80, 0xFF, 0x02, 0xE0, 0x96, - 0x0B, 0xB4, 0x00, 0x1E, 0x78, 0x00, 0x2D, 0x38, 0x00, 0x2C, 0x3C, 0x00, 0x3C, 0x2C, 0x00, 0x3C, - 0x2C, 0x00, 0x02, 0x3C, 0x92, 0x00, 0x3C, 0x38, 0x00, 0x2C, 0x78, 0x00, 0x2D, 0xB0, 0x00, 0x0E, - 0xD0, 0xD7, 0x07, 0x40, 0xFF, 0x01, 0x00, 0x14, 0x0D, 0x00, 0x06, 0x00, 0x9E, 0x50, 0x15, 0x00, - 0xF0, 0xFF, 0x07, 0xB0, 0x55, 0x1F, 0xB0, 0x00, 0x3C, 0xB0, 0x00, 0x38, 0xB0, 0x00, 0x38, 0xB0, - 0x00, 0x3C, 0xB0, 0x55, 0x1F, 0xF0, 0xFF, 0x07, 0xB0, 0x55, 0x00, 0xB0, 0x02, 0x00, 0x80, 0xB0, - 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x11, 0x00, 0x07, 0x00, - 0xAE, 0x55, 0x00, 0x80, 0xFF, 0x02, 0xE0, 0x96, 0x0B, 0xB4, 0x00, 0x1E, 0x38, 0x00, 0x2C, 0x3C, - 0x00, 0x3C, 0x2C, 0x00, 0x38, 0x2C, 0x00, 0x38, 0x2C, 0x00, 0x38, 0x2C, 0x00, 0x38, 0x3C, 0x00, - 0x3C, 0x78, 0x00, 0x2D, 0xB4, 0x00, 0x1E, 0xE0, 0x96, 0x0B, 0x40, 0xFF, 0x07, 0x00, 0x44, 0x2F, - 0x02, 0x00, 0x80, 0x38, 0x09, 0x00, 0x06, 0x00, 0xAC, 0x50, 0x15, 0x00, 0xF4, 0xFF, 0x02, 0xB4, - 0x95, 0x0F, 0xB4, 0x00, 0x2D, 0xB4, 0x00, 0x2C, 0xB4, 0x00, 0x2C, 0xB4, 0x00, 0x1E, 0xB4, 0x95, - 0x0B, 0xF4, 0xFF, 0x02, 0xB4, 0xE5, 0x01, 0xB4, 0xC0, 0x03, 0xB4, 0x40, 0x07, 0xB4, 0x00, 0x0F, - 0xB4, 0x00, 0x1E, 0xB4, 0x00, 0x3C, 0x0F, 0x00, 0x07, 0x00, 0x8E, 0x54, 0x00, 0x80, 0xFF, 0x07, - 0xE0, 0x46, 0x1F, 0xB4, 0x00, 0x2D, 0x74, 0x00, 0x2C, 0xB4, 0x02, 0x00, 0x8B, 0xE0, 0x07, 0x00, - 0x80, 0xBF, 0x01, 0x00, 0xF4, 0x0B, 0x00, 0x40, 0x1F, 0x02, 0x00, 0x8E, 0x3C, 0x38, 0x00, 0x3C, - 0xB4, 0x00, 0x3D, 0xE0, 0x96, 0x1F, 0x40, 0xFF, 0x06, 0x00, 0x10, 0x0D, 0x00, 0x06, 0x00, 0x8A, - 0x54, 0x55, 0x15, 0xFD, 0xFF, 0x7F, 0x54, 0x7D, 0x15, 0x00, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, - 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, - 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x02, - 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x3C, 0x10, 0x00, 0x06, 0x00, 0xAE, 0x10, 0x00, 0x04, 0x38, - 0x00, 0x2C, 0x38, 0x00, 0x2C, 0x38, 0x00, 0x2C, 0x38, 0x00, 0x2C, 0x38, 0x00, 0x2C, 0x38, 0x00, - 0x2C, 0x38, 0x00, 0x2C, 0x38, 0x00, 0x2C, 0x38, 0x00, 0x2C, 0x38, 0x00, 0x2D, 0x78, 0x00, 0x2D, - 0xB4, 0x00, 0x1E, 0xE0, 0x96, 0x0B, 0x40, 0xFF, 0x01, 0x00, 0x14, 0x0D, 0x00, 0x06, 0x00, 0xA2, - 0x04, 0x00, 0x10, 0x3C, 0x00, 0x3C, 0x38, 0x00, 0x2D, 0x74, 0x00, 0x1D, 0xB0, 0x00, 0x0E, 0xE0, - 0x00, 0x0B, 0xE0, 0x41, 0x07, 0xD0, 0x82, 0x03, 0xC0, 0xC3, 0x02, 0x80, 0xD7, 0x01, 0x40, 0xE7, - 0x01, 0x00, 0xFB, 0x02, 0x00, 0x80, 0xBE, 0x02, 0x00, 0x80, 0x7D, 0x02, 0x00, 0x80, 0x3C, 0x10, - 0x00, 0x06, 0x00, 0x80, 0x04, 0x02, 0x10, 0x8A, 0x2D, 0x38, 0x74, 0x2C, 0x7C, 0x74, 0x2C, 0x7C, - 0x74, 0x28, 0xBD, 0x02, 0x38, 0x80, 0xAD, 0x02, 0x38, 0x99, 0xDA, 0x38, 0x34, 0xDB, 0x2C, 0x74, - 0xC7, 0x2D, 0xB4, 0xC7, 0x1E, 0xB0, 0x83, 0x1E, 0xF0, 0x83, 0x1F, 0xF0, 0x42, 0x0F, 0xE0, 0x42, - 0x0F, 0xE0, 0x01, 0x0F, 0x0F, 0x00, 0x06, 0x00, 0x93, 0x14, 0x00, 0x14, 0x78, 0x00, 0x3D, 0xF0, - 0x00, 0x1E, 0xD0, 0x42, 0x0B, 0xC0, 0xC3, 0x03, 0x40, 0xDB, 0x02, 0x00, 0xFE, 0x02, 0x00, 0x80, - 0x7C, 0x02, 0x00, 0x80, 0xBD, 0x02, 0x00, 0x90, 0xEF, 0x01, 0x40, 0xD7, 0x02, 0xC0, 0x83, 0x07, - 0xE0, 0x01, 0x0F, 0xB4, 0x00, 0x2E, 0x7C, 0x00, 0x3C, 0x0F, 0x00, 0x06, 0x00, 0x96, 0x04, 0x00, - 0x14, 0x3C, 0x00, 0x2D, 0x78, 0x00, 0x1E, 0xF0, 0x00, 0x0F, 0xE0, 0x81, 0x07, 0xC0, 0xC2, 0x03, - 0x80, 0xD7, 0x01, 0x00, 0xFB, 0x02, 0x00, 0x80, 0x7E, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, - 0x2C, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, 0x80, 0x2C, 0x02, 0x00, 0x80, - 0x2C, 0x10, 0x00, 0x06, 0x00, 0x93, 0x54, 0x55, 0x05, 0xF8, 0xFF, 0x1F, 0x54, 0x55, 0x0F, 0x00, - 0x80, 0x07, 0x00, 0xD0, 0x02, 0x00, 0xE0, 0x01, 0x00, 0xB4, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, - 0x8B, 0x1E, 0x00, 0x40, 0x0B, 0x00, 0xC0, 0x03, 0x00, 0xE0, 0x01, 0x00, 0xB4, 0x02, 0x00, 0x85, - 0xB8, 0xAA, 0x1A, 0xFC, 0xFF, 0x2F, 0x0F, 0x00, 0x81, 0x00, 0x55, 0x02, 0x00, 0x80, 0xFF, 0x02, - 0x00, 0x80, 0x5F, 0x02, 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, - 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, - 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, - 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, - 0x00, 0x80, 0x5F, 0x02, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x06, 0x00, 0x80, 0x40, 0x02, 0x00, 0x8A, - 0xD0, 0x01, 0x00, 0xC0, 0x02, 0x00, 0x80, 0x03, 0x00, 0x40, 0x07, 0x02, 0x00, 0x80, 0x0B, 0x02, - 0x00, 0x80, 0x0E, 0x02, 0x00, 0x80, 0x1D, 0x02, 0x00, 0x80, 0x38, 0x02, 0x00, 0x80, 0x74, 0x02, - 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xE0, 0x02, 0x00, 0x87, 0xD0, 0x01, 0x00, 0xC0, 0x02, 0x00, - 0x40, 0x07, 0x02, 0x00, 0x80, 0x0B, 0x02, 0x00, 0x80, 0x05, 0x09, 0x00, 0x81, 0x00, 0x55, 0x02, - 0x00, 0x80, 0xBF, 0x02, 0x00, 0x80, 0xB5, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, - 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, - 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, - 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, - 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB5, 0x02, 0x00, 0x80, 0xBF, 0x07, 0x00, 0x0A, 0x00, 0x80, - 0x3C, 0x02, 0x00, 0x80, 0x7D, 0x02, 0x00, 0x80, 0xBE, 0x02, 0x00, 0x8D, 0xEB, 0x00, 0x80, 0xC3, - 0x02, 0xC0, 0x82, 0x03, 0xD0, 0x41, 0x07, 0x50, 0x00, 0x05, 0x21, 0x00, 0x33, 0x00, 0x85, 0xF4, - 0xFF, 0x1F, 0x54, 0x55, 0x15, 0x09, 0x00, 0x07, 0x00, 0x80, 0x15, 0x02, 0x00, 0x80, 0x3C, 0x02, - 0x00, 0x80, 0xB4, 0x34, 0x00, 0x12, 0x00, 0xA2, 0x40, 0xAA, 0x01, 0xD0, 0xEB, 0x07, 0xF0, 0x40, - 0x0F, 0x50, 0x00, 0x0E, 0x00, 0x55, 0x0E, 0xD0, 0xFF, 0x0F, 0xF0, 0x01, 0x0E, 0x74, 0x00, 0x0E, - 0x74, 0x00, 0x0F, 0xF0, 0xE6, 0x1F, 0xD0, 0xBF, 0x1E, 0x00, 0x04, 0x0D, 0x00, 0x06, 0x00, 0x80, - 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0xA2, - 0xB4, 0xA9, 0x01, 0xF4, 0xEF, 0x07, 0xF4, 0x41, 0x0F, 0xB4, 0x00, 0x1E, 0xB4, 0x00, 0x2D, 0xB4, - 0x00, 0x2D, 0xB4, 0x00, 0x2D, 0xB4, 0x00, 0x1D, 0xB4, 0x00, 0x1E, 0xF4, 0x96, 0x0B, 0x74, 0xFE, - 0x02, 0x00, 0x10, 0x0D, 0x00, 0x13, 0x00, 0x8B, 0xA9, 0x01, 0xD0, 0xEB, 0x07, 0xF0, 0x01, 0x0F, - 0xB4, 0x00, 0x1D, 0x78, 0x02, 0x00, 0x80, 0x78, 0x02, 0x00, 0x80, 0x78, 0x02, 0x00, 0x8D, 0x74, - 0x00, 0x04, 0xF0, 0x00, 0x1D, 0xD0, 0x96, 0x0B, 0x40, 0xFF, 0x02, 0x00, 0x10, 0x0D, 0x00, 0x08, - 0x00, 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, 0xA3, 0x1E, 0x40, - 0x6A, 0x1E, 0xD0, 0xEF, 0x1F, 0xF0, 0x41, 0x1F, 0xB4, 0x00, 0x1E, 0x78, 0x00, 0x1E, 0x78, 0x00, - 0x1E, 0x78, 0x00, 0x1E, 0x74, 0x00, 0x1E, 0xF0, 0x00, 0x1E, 0xE0, 0x96, 0x1F, 0x80, 0xBF, 0x1E, - 0x00, 0x04, 0x0D, 0x00, 0x13, 0x00, 0x94, 0xA9, 0x01, 0xC0, 0xEB, 0x07, 0xE0, 0x01, 0x0F, 0xB4, - 0x00, 0x1D, 0x78, 0x55, 0x2D, 0xF8, 0xFF, 0x2F, 0x78, 0x55, 0x05, 0x78, 0x02, 0x00, 0x8A, 0xF0, - 0x00, 0x04, 0xD0, 0x57, 0x1F, 0x40, 0xFF, 0x06, 0x00, 0x10, 0x0D, 0x00, 0x04, 0x00, 0x89, 0x40, - 0x15, 0x00, 0xF4, 0x3F, 0x00, 0x7C, 0x10, 0x00, 0x1D, 0x02, 0x00, 0x89, 0x1E, 0x00, 0xA4, 0xAE, - 0x0A, 0xA4, 0xBF, 0x1A, 0x00, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, - 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, - 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x10, 0x00, 0x12, 0x00, 0xAC, 0x40, 0x6A, 0x09, 0xD0, 0xEF, - 0x1E, 0xF0, 0x41, 0x1F, 0xB4, 0x00, 0x1E, 0x78, 0x00, 0x1E, 0x78, 0x00, 0x1E, 0x78, 0x00, 0x1E, - 0x74, 0x00, 0x1E, 0xF0, 0x00, 0x1E, 0xE0, 0x96, 0x1F, 0x80, 0xBF, 0x1E, 0x00, 0x04, 0x1E, 0x10, - 0x00, 0x0F, 0xF0, 0xD6, 0x07, 0x80, 0xFF, 0x01, 0x03, 0x00, 0x06, 0x00, 0x80, 0xB4, 0x02, 0x00, - 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0xA0, 0xB4, 0xA8, 0x01, - 0xB4, 0xEF, 0x0B, 0xF4, 0x01, 0x0F, 0xB4, 0x00, 0x1D, 0xB4, 0x00, 0x1D, 0xB4, 0x00, 0x1D, 0xB4, - 0x00, 0x1D, 0xB4, 0x00, 0x1D, 0xB4, 0x00, 0x1D, 0xB4, 0x00, 0x1D, 0xB4, 0x00, 0x1D, 0x0F, 0x00, - 0x07, 0x00, 0x80, 0x10, 0x02, 0x00, 0x80, 0x78, 0x02, 0x00, 0x80, 0x64, 0x04, 0x00, 0x84, 0xA0, - 0x6A, 0x00, 0xF0, 0x7F, 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x80, 0x74, - 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x87, 0x74, - 0x00, 0xA0, 0xBA, 0x1A, 0xF0, 0xFF, 0x2F, 0x0F, 0x00, 0x07, 0x00, 0x80, 0x40, 0x02, 0x00, 0x83, - 0xE0, 0x01, 0x00, 0x90, 0x04, 0x00, 0xAF, 0x80, 0xAA, 0x00, 0xC0, 0xFF, 0x01, 0x00, 0xE0, 0x01, - 0x00, 0xE0, 0x01, 0x00, 0xE0, 0x01, 0x00, 0xE0, 0x01, 0x00, 0xE0, 0x01, 0x00, 0xE0, 0x01, 0x00, - 0xE0, 0x01, 0x00, 0xE0, 0x01, 0x00, 0xE0, 0x01, 0x00, 0xE0, 0x01, 0x00, 0xE0, 0x00, 0x50, 0xB9, - 0x00, 0xF0, 0x2F, 0x00, 0x40, 0x01, 0x00, 0x06, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, - 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0xA0, 0xB4, 0x00, 0x0A, 0xB4, 0x80, 0x07, - 0xB4, 0xE0, 0x01, 0xB4, 0x78, 0x00, 0xB4, 0x1E, 0x00, 0xF4, 0x2F, 0x00, 0xF4, 0x79, 0x00, 0xB4, - 0xF0, 0x01, 0xB4, 0xD0, 0x03, 0xB4, 0x40, 0x0B, 0xB4, 0x00, 0x2E, 0x0F, 0x00, 0x06, 0x00, 0x84, - 0xF0, 0x7F, 0x00, 0xA0, 0x7A, 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x80, - 0x74, 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x80, - 0x74, 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x80, 0x74, 0x02, 0x00, 0x87, - 0x74, 0x00, 0xA0, 0xBA, 0x1A, 0xF0, 0xFF, 0x2F, 0x0F, 0x00, 0x12, 0x00, 0xA0, 0x58, 0x4A, 0x0A, - 0xFC, 0xFF, 0x2E, 0x2C, 0x3C, 0x38, 0x2C, 0x3C, 0x38, 0x2C, 0x3C, 0x38, 0x2C, 0x3C, 0x38, 0x2C, - 0x3C, 0x38, 0x2C, 0x3C, 0x38, 0x2C, 0x3C, 0x38, 0x2C, 0x3C, 0x38, 0x2C, 0x3C, 0x38, 0x0F, 0x00, - 0x12, 0x00, 0xA0, 0x64, 0xA8, 0x01, 0xB4, 0xEF, 0x0B, 0xF4, 0x01, 0x0F, 0xB4, 0x00, 0x1D, 0xB4, - 0x00, 0x1D, 0xB4, 0x00, 0x1D, 0xB4, 0x00, 0x1D, 0xB4, 0x00, 0x1D, 0xB4, 0x00, 0x1D, 0xB4, 0x00, - 0x1D, 0xB4, 0x00, 0x1D, 0x0F, 0x00, 0x13, 0x00, 0xA1, 0xAA, 0x00, 0xD0, 0xEB, 0x07, 0xF0, 0x41, - 0x0F, 0x74, 0x00, 0x1D, 0x38, 0x00, 0x2C, 0x38, 0x00, 0x2C, 0x38, 0x00, 0x2C, 0x78, 0x00, 0x2D, - 0xB4, 0x00, 0x1E, 0xE0, 0x96, 0x0B, 0x80, 0xFF, 0x02, 0x00, 0x14, 0x0D, 0x00, 0x12, 0x00, 0xA4, - 0x64, 0xA9, 0x01, 0xB4, 0xFB, 0x07, 0xF4, 0x41, 0x0F, 0xB4, 0x00, 0x1E, 0xB4, 0x00, 0x2D, 0xB4, - 0x00, 0x2D, 0xB4, 0x00, 0x2D, 0xB4, 0x00, 0x1D, 0xB4, 0x00, 0x0F, 0xF4, 0x96, 0x0B, 0xB4, 0xFE, - 0x02, 0xB4, 0x10, 0x00, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x80, 0xB4, 0x05, 0x00, 0x12, - 0x00, 0xA3, 0x40, 0x6A, 0x09, 0xD0, 0xEB, 0x1F, 0xF0, 0x01, 0x1F, 0xB4, 0x00, 0x1E, 0x78, 0x00, - 0x1E, 0x78, 0x00, 0x1E, 0x78, 0x00, 0x1E, 0x74, 0x00, 0x1E, 0xF0, 0x00, 0x1E, 0xE0, 0x96, 0x1F, - 0x80, 0xBF, 0x1E, 0x00, 0x04, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, 0x80, 0x1E, 0x02, 0x00, - 0x80, 0x1E, 0x03, 0x00, 0x12, 0x00, 0x9F, 0x40, 0x92, 0x1A, 0x80, 0xF7, 0x1F, 0x80, 0x1F, 0x00, - 0x80, 0x07, 0x00, 0x80, 0x03, 0x00, 0x80, 0x03, 0x00, 0x80, 0x03, 0x00, 0x80, 0x03, 0x00, 0x80, - 0x03, 0x00, 0x80, 0x03, 0x00, 0x80, 0x03, 0x10, 0x00, 0x13, 0x00, 0xA1, 0xA9, 0x01, 0xD0, 0xEB, - 0x0B, 0xE0, 0x01, 0x1E, 0xF0, 0x00, 0x19, 0xE0, 0x06, 0x00, 0x80, 0xBF, 0x01, 0x00, 0xA4, 0x0F, - 0x10, 0x00, 0x1E, 0xB4, 0x00, 0x1D, 0xE0, 0x56, 0x0F, 0x80, 0xFF, 0x06, 0x00, 0x10, 0x0D, 0x00, - 0x0D, 0x00, 0x80, 0x0F, 0x02, 0x00, 0x89, 0x0F, 0x00, 0xA4, 0xAF, 0x0A, 0xA8, 0xAF, 0x0A, 0x00, - 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, - 0x0F, 0x02, 0x00, 0x80, 0x0F, 0x02, 0x00, 0x80, 0x0E, 0x02, 0x00, 0x86, 0x6D, 0x09, 0x00, 0xF8, - 0x1F, 0x00, 0x40, 0x0D, 0x00, 0x12, 0x00, 0xA2, 0x60, 0x00, 0x19, 0xB4, 0x00, 0x1E, 0xB4, 0x00, - 0x1E, 0xB4, 0x00, 0x1E, 0xB4, 0x00, 0x1E, 0xB4, 0x00, 0x1E, 0xB4, 0x00, 0x1E, 0xB4, 0x00, 0x1E, - 0xF0, 0x00, 0x1E, 0xE0, 0x96, 0x1F, 0x80, 0xBF, 0x1D, 0x00, 0x04, 0x0D, 0x00, 0x12, 0x00, 0x96, - 0x28, 0x00, 0x18, 0x78, 0x00, 0x2D, 0xB4, 0x00, 0x0E, 0xE0, 0x00, 0x0B, 0xD0, 0x41, 0x07, 0xC0, - 0x82, 0x03, 0x80, 0xC3, 0x02, 0x00, 0xDB, 0x02, 0x00, 0x80, 0xBE, 0x02, 0x00, 0x80, 0x7D, 0x02, - 0x00, 0x80, 0x3C, 0x10, 0x00, 0x12, 0x00, 0xA0, 0x09, 0x14, 0x60, 0x1D, 0x38, 0x70, 0x1C, 0x3C, - 0x74, 0x2C, 0x7D, 0x38, 0x28, 0xAA, 0x28, 0x34, 0xDA, 0x2C, 0x74, 0xD7, 0x1D, 0xB0, 0xC3, 0x0E, - 0xE0, 0x82, 0x0F, 0xE0, 0x42, 0x0B, 0xD0, 0x41, 0x07, 0x0F, 0x00, 0x12, 0x00, 0x8D, 0x64, 0x00, - 0x19, 0xF0, 0x00, 0x1F, 0xD0, 0x82, 0x07, 0x80, 0xD7, 0x02, 0x00, 0xFE, 0x02, 0x00, 0x80, 0x7C, - 0x02, 0x00, 0x8D, 0xBE, 0x00, 0x40, 0xEB, 0x01, 0xC0, 0x83, 0x07, 0xE0, 0x01, 0x0F, 0xB8, 0x00, - 0x2D, 0x0F, 0x00, 0x12, 0x00, 0x99, 0x18, 0x00, 0x24, 0x3C, 0x00, 0x2C, 0xB4, 0x00, 0x1E, 0xF0, - 0x00, 0x0F, 0xD0, 0x41, 0x0B, 0xC0, 0x83, 0x03, 0x80, 0xC7, 0x02, 0x00, 0xEB, 0x01, 0x00, 0xBE, - 0x02, 0x00, 0x80, 0x7D, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x1D, 0x02, 0x00, 0x88, 0x0F, - 0x00, 0x90, 0x07, 0x00, 0xF4, 0x02, 0x00, 0x10, 0x02, 0x00, 0x12, 0x00, 0x8D, 0xA4, 0xAA, 0x0A, - 0xF4, 0xFF, 0x1F, 0x00, 0x80, 0x0B, 0x00, 0xD0, 0x02, 0x00, 0xF4, 0x02, 0x00, 0x80, 0x7C, 0x02, - 0x00, 0x8D, 0x1E, 0x00, 0x80, 0x0B, 0x00, 0xD0, 0x02, 0x00, 0xF4, 0x56, 0x15, 0xF4, 0xFF, 0x2F, - 0x0F, 0x00, 0x05, 0x00, 0x85, 0x05, 0x00, 0xC0, 0x07, 0x00, 0xE0, 0x02, 0x00, 0x80, 0xB0, 0x02, - 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB4, 0x02, - 0x00, 0x86, 0x78, 0x00, 0x80, 0x1F, 0x00, 0x80, 0x1F, 0x02, 0x00, 0x80, 0x78, 0x02, 0x00, 0x80, - 0xB4, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, 0xB0, 0x02, 0x00, 0x80, - 0xF0, 0x02, 0x00, 0x84, 0xE0, 0x01, 0x00, 0x80, 0x07, 0x02, 0x00, 0x80, 0x05, 0x03, 0x00, 0x0A, - 0x00, 0x80, 0x28, 0x02, 0x00, 0x80, 0x28, 0x02, 0x00, 0x80, 0x28, 0x02, 0x00, 0x80, 0x28, 0x02, - 0x00, 0x80, 0x28, 0x02, 0x00, 0x80, 0x28, 0x02, 0x00, 0x80, 0x28, 0x02, 0x00, 0x80, 0x28, 0x02, - 0x00, 0x80, 0x28, 0x02, 0x00, 0x80, 0x28, 0x02, 0x00, 0x80, 0x28, 0x02, 0x00, 0x80, 0x28, 0x02, - 0x00, 0x80, 0x28, 0x02, 0x00, 0x80, 0x28, 0x02, 0x00, 0x80, 0x28, 0x02, 0x00, 0x80, 0x28, 0x02, - 0x00, 0x80, 0x28, 0x02, 0x00, 0x80, 0x28, 0x04, 0x00, 0x03, 0x00, 0x84, 0x40, 0x01, 0x00, 0x40, - 0x0B, 0x02, 0x00, 0x80, 0x2D, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x80, 0x38, 0x02, 0x00, 0x80, - 0x38, 0x02, 0x00, 0x80, 0x38, 0x02, 0x00, 0x80, 0x38, 0x02, 0x00, 0x80, 0xB4, 0x02, 0x00, 0x86, - 0xD0, 0x0B, 0x00, 0xD0, 0x0B, 0x00, 0xB4, 0x02, 0x00, 0x80, 0x38, 0x02, 0x00, 0x80, 0x38, 0x02, - 0x00, 0x80, 0x38, 0x02, 0x00, 0x80, 0x38, 0x02, 0x00, 0x80, 0x3C, 0x02, 0x00, 0x86, 0x1D, 0x00, - 0x40, 0x0B, 0x00, 0x40, 0x01, 0x04, 0x00, 0x1B, 0x00, 0x8B, 0xA0, 0x06, 0x10, 0xBC, 0x1F, 0x70, - 0x0D, 0xB8, 0x3E, 0x05, 0xD0, 0x1F, 0x1B, 0x00, +const uint8_t font_robotomono20[2396] = { + 0x00, 0xFF, 0x14, 0x00, 0x00, 0x51, 0x46, 0x46, 0x01, 0x5C, 0x09, 0x00, 0x00, 0xA3, 0xF6, 0xFF, + 0xFF, 0x16, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x01, 0xFE, 0x1D, 0x01, 0x00, 0x05, 0x00, + 0x00, 0x85, 0x00, 0x00, 0x06, 0x04, 0x00, 0x4D, 0x06, 0x00, 0x0B, 0x0D, 0x00, 0x4F, 0x14, 0x00, + 0x4D, 0x1C, 0x00, 0x43, 0x23, 0x00, 0xC7, 0x24, 0x00, 0x07, 0x2A, 0x00, 0x89, 0x2F, 0x00, 0x4B, + 0x33, 0x00, 0x04, 0x38, 0x00, 0xC6, 0x39, 0x00, 0x85, 0x3B, 0x00, 0x48, 0x3D, 0x00, 0xCB, 0x42, + 0x00, 0xCB, 0x48, 0x00, 0xCB, 0x4E, 0x00, 0x0B, 0x55, 0x00, 0x0B, 0x5B, 0x00, 0x0B, 0x61, 0x00, + 0x0B, 0x67, 0x00, 0x0B, 0x6D, 0x00, 0x0B, 0x73, 0x00, 0x0B, 0x79, 0x00, 0x05, 0x7F, 0x00, 0xC4, + 0x81, 0x00, 0x8A, 0x84, 0x00, 0xCB, 0x88, 0x00, 0x4A, 0x8C, 0x00, 0x49, 0x90, 0x00, 0xD2, 0x95, + 0x00, 0x0D, 0xA1, 0x00, 0x0C, 0xA8, 0x00, 0xCD, 0xAE, 0x00, 0x0D, 0xB6, 0x00, 0xCB, 0xBC, 0x00, + 0x0B, 0xC3, 0x00, 0x0E, 0xC9, 0x00, 0x8E, 0xD0, 0x00, 0x05, 0xD8, 0x00, 0x8B, 0xDB, 0x00, 0x4D, + 0xE1, 0x00, 0x8B, 0xE8, 0x00, 0xD1, 0xEE, 0x00, 0x8E, 0xF7, 0x00, 0x0E, 0xFF, 0x00, 0xCD, 0x06, + 0x01, 0x8E, 0x0D, 0x01, 0xCC, 0x15, 0x01, 0x8C, 0x1C, 0x01, 0x0C, 0x23, 0x01, 0x8D, 0x29, 0x01, + 0x8D, 0x30, 0x01, 0x92, 0x37, 0x01, 0xCD, 0x40, 0x01, 0xCC, 0x47, 0x01, 0x4C, 0x4E, 0x01, 0x06, + 0x55, 0x01, 0x89, 0x59, 0x01, 0x45, 0x5F, 0x01, 0x08, 0x63, 0x01, 0x09, 0x66, 0x01, 0xC6, 0x67, + 0x01, 0x8B, 0x69, 0x01, 0xCB, 0x6E, 0x01, 0x4A, 0x75, 0x01, 0x0B, 0x7A, 0x01, 0x8B, 0x80, 0x01, + 0x87, 0x85, 0x01, 0x0B, 0x8A, 0x01, 0x8B, 0x90, 0x01, 0x45, 0x97, 0x01, 0xC5, 0x9A, 0x01, 0x8B, + 0x9E, 0x01, 0x45, 0xA5, 0x01, 0xD2, 0xA8, 0x01, 0x4B, 0xB0, 0x01, 0x8B, 0xB5, 0x01, 0x8B, 0xBA, + 0x01, 0xCB, 0xC0, 0x01, 0x47, 0xC7, 0x01, 0x0A, 0xCB, 0x01, 0xC7, 0xCF, 0x01, 0x4B, 0xD4, 0x01, + 0x8A, 0xD9, 0x01, 0x4F, 0xDE, 0x01, 0x0A, 0xE5, 0x01, 0x0A, 0xEA, 0x01, 0x0A, 0xF0, 0x01, 0x07, + 0xF5, 0x01, 0xC5, 0xFA, 0x01, 0x87, 0xFE, 0x01, 0x0E, 0x04, 0x02, 0x04, 0xFB, 0x1C, 0x08, 0x00, + 0x0E, 0x00, 0x02, 0x00, 0x88, 0xC6, 0x08, 0x21, 0x84, 0x10, 0x42, 0x00, 0x60, 0x04, 0x03, 0x00, + 0x85, 0x00, 0x60, 0x59, 0x96, 0x25, 0x01, 0x0B, 0x00, 0x05, 0x00, 0x95, 0x30, 0x03, 0x22, 0x40, + 0x04, 0xFF, 0x83, 0x19, 0x30, 0x03, 0x22, 0x40, 0x04, 0xFF, 0x83, 0x19, 0x30, 0x03, 0x66, 0x40, + 0x04, 0x88, 0x09, 0x00, 0x02, 0x00, 0x97, 0x03, 0x18, 0xE0, 0xC1, 0x1F, 0x86, 0x11, 0x8C, 0x41, + 0x1C, 0xC0, 0x03, 0x78, 0x00, 0x07, 0x30, 0x83, 0x19, 0x8C, 0x3F, 0xF8, 0x00, 0x01, 0x08, 0x05, + 0x00, 0x05, 0x00, 0x9A, 0x80, 0x03, 0x60, 0x02, 0x10, 0x23, 0x88, 0x19, 0xC4, 0x04, 0x26, 0x01, + 0xDE, 0x00, 0xA0, 0x03, 0x68, 0x02, 0x16, 0x03, 0x89, 0x41, 0xC4, 0x20, 0x26, 0x00, 0x0E, 0x0A, + 0x00, 0x05, 0x00, 0x96, 0x78, 0x80, 0x1F, 0x18, 0x03, 0x63, 0x60, 0x0C, 0xF8, 0x00, 0x07, 0xF0, + 0x01, 0x67, 0x62, 0x5C, 0x0C, 0x8F, 0xC1, 0xE1, 0x3F, 0xF8, 0x0C, 0x08, 0x00, 0x82, 0x80, 0x24, + 0x09, 0x06, 0x00, 0x93, 0x00, 0x10, 0x0C, 0x82, 0x41, 0x30, 0x18, 0x04, 0x83, 0xC1, 0x60, 0x30, + 0x10, 0x18, 0x0C, 0x04, 0x06, 0x02, 0x03, 0x01, 0x80, 0x00, 0x02, 0x80, 0x8E, 0xC0, 0x40, 0x60, + 0x30, 0x18, 0x08, 0x04, 0x06, 0x81, 0x60, 0x30, 0x18, 0x04, 0x83, 0x20, 0x02, 0x00, 0x03, 0x00, + 0x89, 0x80, 0x00, 0x41, 0x92, 0x3F, 0x1C, 0x3C, 0xC8, 0x10, 0x01, 0x0C, 0x00, 0x07, 0x00, 0x8D, + 0x30, 0x80, 0x01, 0x0C, 0x60, 0xF0, 0xBF, 0xFF, 0xC0, 0x00, 0x06, 0x30, 0x80, 0x01, 0x0A, 0x00, + 0x07, 0x00, 0x83, 0x60, 0x66, 0x22, 0x00, 0x07, 0x00, 0x81, 0xF0, 0x01, 0x08, 0x00, 0x09, 0x00, + 0x81, 0x60, 0x04, 0x03, 0x00, 0x03, 0x00, 0x02, 0x40, 0x82, 0x60, 0x20, 0x30, 0x02, 0x10, 0x81, + 0x18, 0x08, 0x02, 0x0C, 0x83, 0x04, 0x06, 0x02, 0x03, 0x04, 0x00, 0x04, 0x00, 0x92, 0xF0, 0xC1, + 0x1F, 0x86, 0x19, 0xCC, 0x60, 0x06, 0x33, 0x98, 0xC1, 0x0C, 0x66, 0x30, 0x83, 0x31, 0x8C, 0x3F, + 0xF8, 0x08, 0x00, 0x04, 0x00, 0x02, 0x80, 0x90, 0x07, 0x3E, 0x80, 0x01, 0x0C, 0x60, 0x00, 0x03, + 0x18, 0xC0, 0x00, 0x06, 0x30, 0x80, 0x01, 0x0C, 0x60, 0x08, 0x00, 0x04, 0x00, 0x93, 0xF0, 0xC1, + 0x1F, 0x83, 0x19, 0x0C, 0x60, 0x00, 0x01, 0x0C, 0x30, 0xC0, 0x00, 0x03, 0x0C, 0x30, 0xC0, 0x01, + 0xFE, 0x07, 0x07, 0x00, 0x04, 0x00, 0x92, 0xF0, 0xC1, 0x1F, 0x83, 0x19, 0x0C, 0x60, 0x80, 0x81, + 0x07, 0x78, 0x00, 0x06, 0x30, 0x83, 0x19, 0x8C, 0x3F, 0xF8, 0x08, 0x00, 0x05, 0x00, 0x92, 0x03, + 0x1C, 0xF0, 0x80, 0x06, 0x36, 0x98, 0x61, 0x0C, 0x63, 0x0C, 0xE3, 0x7F, 0xC0, 0x00, 0x06, 0x30, + 0x80, 0x01, 0x07, 0x00, 0x04, 0x00, 0x92, 0xF0, 0x87, 0x3F, 0x06, 0x30, 0x80, 0x01, 0xFC, 0xE0, + 0x0F, 0xC0, 0x00, 0x06, 0x20, 0x82, 0x31, 0x8C, 0x3F, 0xF0, 0x08, 0x00, 0x04, 0x00, 0x92, 0xC0, + 0x01, 0x0F, 0x0C, 0x30, 0x80, 0x01, 0xF4, 0xF0, 0x8F, 0xC3, 0x0C, 0x66, 0x30, 0x82, 0x31, 0x0C, + 0x3F, 0xF0, 0x08, 0x00, 0x04, 0x00, 0x92, 0xFC, 0x07, 0x30, 0x80, 0x01, 0x04, 0x30, 0x80, 0x00, + 0x06, 0x10, 0xC0, 0x00, 0x06, 0x18, 0xC0, 0x00, 0x03, 0x18, 0x08, 0x00, 0x04, 0x00, 0x92, 0xF0, + 0xC1, 0x1F, 0x86, 0x19, 0x8C, 0x60, 0x8C, 0xC1, 0x07, 0x7F, 0x08, 0x66, 0x30, 0x83, 0x19, 0x8C, + 0x3F, 0xF8, 0x08, 0x00, 0x04, 0x00, 0x92, 0xF0, 0xC0, 0x1F, 0xC3, 0x18, 0xCC, 0x60, 0x06, 0x33, + 0x18, 0xFF, 0xF0, 0x06, 0x30, 0xC0, 0x00, 0x07, 0x1F, 0x38, 0x08, 0x00, 0x04, 0x00, 0x80, 0x31, + 0x04, 0x00, 0x81, 0x30, 0x04, 0x03, 0x00, 0x03, 0x00, 0x80, 0x66, 0x03, 0x00, 0x83, 0x60, 0x66, + 0x26, 0x00, 0x08, 0x00, 0x81, 0x10, 0x70, 0x02, 0x78, 0x86, 0x60, 0x80, 0x07, 0x78, 0x00, 0x07, + 0x10, 0x09, 0x00, 0x0B, 0x00, 0x82, 0xFE, 0xE3, 0x0F, 0x02, 0x00, 0x82, 0xE0, 0x3F, 0xFE, 0x0C, + 0x00, 0x07, 0x00, 0x86, 0x20, 0x80, 0x07, 0x78, 0x80, 0x07, 0x38, 0x03, 0x78, 0x80, 0x20, 0x0A, + 0x00, 0x03, 0x00, 0x85, 0xC0, 0xE3, 0xCF, 0xB0, 0x60, 0x40, 0x03, 0xC0, 0x80, 0x80, 0x02, 0x01, + 0x02, 0x00, 0x81, 0x08, 0x10, 0x06, 0x00, 0x07, 0x00, 0xA7, 0xE0, 0x03, 0xE0, 0x38, 0xC0, 0x80, + 0x81, 0x01, 0x0C, 0xC3, 0x23, 0x84, 0x89, 0x11, 0x23, 0x64, 0x84, 0x90, 0x11, 0x42, 0x66, 0x08, + 0x99, 0x31, 0x66, 0xC6, 0x08, 0xB1, 0x33, 0x84, 0x79, 0x30, 0x00, 0x80, 0x01, 0x00, 0x1C, 0x02, + 0xC0, 0x0F, 0x03, 0x00, 0x05, 0x00, 0x96, 0x60, 0x00, 0x0E, 0xC0, 0x01, 0x6C, 0x80, 0x0D, 0x10, + 0x01, 0x63, 0x60, 0x0C, 0x06, 0xC3, 0x7F, 0xF8, 0x8F, 0x01, 0x33, 0x60, 0x03, 0x18, 0x08, 0x00, + 0x04, 0x00, 0x95, 0xC0, 0x1F, 0xFC, 0xC3, 0x60, 0x0C, 0xC6, 0x60, 0x0C, 0xC3, 0x1F, 0xFC, 0xC3, + 0x60, 0x0C, 0xC6, 0x60, 0x0C, 0xC6, 0x3F, 0xFC, 0x01, 0x07, 0x00, 0x05, 0x00, 0x8F, 0xF0, 0x80, + 0x7F, 0x18, 0x0C, 0x03, 0x33, 0x60, 0x06, 0xC0, 0x00, 0x18, 0x00, 0x03, 0x60, 0xC0, 0x02, 0x18, + 0x84, 0x83, 0xC1, 0x3F, 0xF0, 0x01, 0x08, 0x00, 0x05, 0x00, 0x95, 0x7E, 0xC0, 0x3F, 0x18, 0x0E, + 0x83, 0x61, 0x60, 0x0C, 0x8C, 0x81, 0x31, 0x30, 0x06, 0xC6, 0xC0, 0x18, 0x0C, 0xC3, 0xE1, 0x1F, + 0xFC, 0x09, 0x00, 0x04, 0x00, 0x93, 0xF8, 0xCF, 0x3F, 0x06, 0x30, 0x80, 0x01, 0x0C, 0xE0, 0x1F, + 0x7F, 0x18, 0xC0, 0x00, 0x06, 0x30, 0x80, 0x7F, 0xFC, 0x07, 0x07, 0x00, 0x04, 0x00, 0x92, 0xF8, + 0xC7, 0x3F, 0x06, 0x30, 0x80, 0x01, 0x0C, 0xE0, 0x1F, 0x7F, 0x18, 0xC0, 0x00, 0x06, 0x30, 0x80, + 0x01, 0x0C, 0x08, 0x00, 0x05, 0x00, 0x98, 0xC0, 0x07, 0xF8, 0x07, 0x83, 0xC3, 0xC0, 0x18, 0x00, + 0x06, 0x80, 0xE1, 0x63, 0xF8, 0x18, 0x30, 0x06, 0x0C, 0x03, 0xC3, 0xC1, 0xE0, 0x1F, 0xE0, 0x03, + 0x09, 0x00, 0x05, 0x00, 0x98, 0x30, 0x60, 0x0C, 0x18, 0x03, 0xC6, 0x80, 0x31, 0x60, 0x0C, 0x18, + 0xFF, 0xC7, 0xFF, 0x31, 0x60, 0x0C, 0x18, 0x03, 0xC6, 0x80, 0x31, 0x60, 0x0C, 0x18, 0x09, 0x00, + 0x02, 0x00, 0x88, 0xC6, 0x18, 0x63, 0x8C, 0x31, 0xC6, 0x18, 0x63, 0x0C, 0x03, 0x00, 0x05, 0x00, + 0x91, 0x06, 0x30, 0x80, 0x01, 0x0C, 0x60, 0x00, 0x03, 0x18, 0xC0, 0x00, 0x06, 0x10, 0xC1, 0x18, + 0xC6, 0x3F, 0x78, 0x08, 0x00, 0x05, 0x00, 0x8E, 0x06, 0xC7, 0x60, 0x18, 0x06, 0x63, 0x60, 0x06, + 0x6C, 0x80, 0x0F, 0xF0, 0x03, 0x66, 0xC0, 0x02, 0x18, 0x83, 0x06, 0xC3, 0x61, 0x30, 0x02, 0x0C, + 0x08, 0x00, 0x04, 0x00, 0x93, 0x18, 0xC0, 0x00, 0x06, 0x30, 0x80, 0x01, 0x0C, 0x60, 0x00, 0x03, + 0x18, 0xC0, 0x00, 0x06, 0x30, 0x80, 0x7F, 0xFC, 0x03, 0x07, 0x00, 0x06, 0x00, 0x9D, 0x60, 0x00, + 0xC7, 0x01, 0x8E, 0x03, 0x1E, 0x0F, 0x3C, 0x1A, 0x68, 0x34, 0xD8, 0xC8, 0xB0, 0x91, 0x31, 0x63, + 0x66, 0xC6, 0x6C, 0x8C, 0xD1, 0x18, 0xE3, 0x30, 0xC6, 0x61, 0x0C, 0xC3, 0x0B, 0x00, 0x05, 0x00, + 0x98, 0x30, 0x60, 0x1C, 0x18, 0x07, 0xC6, 0x83, 0xF1, 0x61, 0x6C, 0x18, 0x33, 0xC6, 0x9C, 0x31, + 0x66, 0x0C, 0x1B, 0xC3, 0xC7, 0xE0, 0x31, 0x70, 0x0C, 0x1C, 0x09, 0x00, 0x05, 0x00, 0x93, 0x80, + 0x07, 0xF8, 0x07, 0x83, 0xC3, 0xC0, 0x18, 0x30, 0x06, 0x88, 0x01, 0x66, 0x80, 0x19, 0x20, 0x06, + 0x0C, 0x03, 0xC3, 0x02, 0xE0, 0x82, 0x1F, 0xE0, 0x01, 0x09, 0x00, 0x05, 0x00, 0x95, 0xFE, 0xC0, + 0x7F, 0x18, 0x0C, 0x03, 0x63, 0x60, 0x0C, 0x8C, 0xC1, 0xF0, 0x0F, 0x3E, 0xC0, 0x00, 0x18, 0x00, + 0x03, 0x60, 0x00, 0x0C, 0x09, 0x00, 0x05, 0x00, 0x9B, 0xC0, 0x07, 0xF8, 0x07, 0x83, 0xC1, 0xC0, + 0x18, 0x30, 0x06, 0x88, 0x01, 0x62, 0x80, 0x19, 0x20, 0x06, 0x0C, 0x03, 0xC3, 0x60, 0xE0, 0x1F, + 0xF0, 0x07, 0x80, 0x03, 0xC0, 0x06, 0x00, 0x04, 0x00, 0x93, 0xC0, 0x1F, 0xFC, 0xC3, 0x60, 0x0C, + 0xC6, 0x60, 0x0C, 0xC6, 0x70, 0xFC, 0xC3, 0x1F, 0x8C, 0xC1, 0x30, 0x0C, 0xC6, 0x60, 0x02, 0x0C, + 0x07, 0x00, 0x05, 0x00, 0x94, 0x0F, 0xFC, 0xE3, 0x70, 0x06, 0x66, 0x00, 0x1C, 0x80, 0x0F, 0xE0, + 0x03, 0x70, 0x00, 0x66, 0x60, 0x06, 0xC6, 0x3F, 0xF0, 0x01, 0x07, 0x00, 0x04, 0x00, 0x94, 0xF0, + 0x7F, 0xFE, 0x07, 0x06, 0x60, 0x00, 0x06, 0x60, 0x00, 0x06, 0x60, 0x00, 0x06, 0x60, 0x00, 0x06, + 0x60, 0x00, 0x06, 0x60, 0x08, 0x00, 0x05, 0x00, 0x96, 0x03, 0x66, 0xC0, 0x0C, 0x98, 0x01, 0x33, + 0x60, 0x06, 0xCC, 0x80, 0x19, 0x30, 0x03, 0x66, 0xC0, 0x08, 0x18, 0x83, 0xC1, 0x1F, 0xF0, 0x01, + 0x08, 0x00, 0x04, 0x00, 0x96, 0x80, 0x01, 0x66, 0xC0, 0x0C, 0x18, 0x83, 0x61, 0x30, 0x0C, 0x03, + 0x63, 0x60, 0x0C, 0xCC, 0x00, 0x1B, 0x60, 0x03, 0x38, 0x00, 0x07, 0x60, 0x09, 0x00, 0x06, 0x00, + 0x9B, 0x80, 0xC1, 0x60, 0x06, 0x83, 0x19, 0x0E, 0x66, 0x78, 0x08, 0xE3, 0x31, 0x8C, 0xC4, 0x30, + 0x33, 0xC3, 0xCC, 0x04, 0x12, 0x1A, 0x78, 0x68, 0xE0, 0xE1, 0x81, 0x83, 0x03, 0x02, 0x0C, 0x02, + 0x30, 0x0C, 0x00, 0x05, 0x00, 0x96, 0x03, 0xC7, 0x60, 0x18, 0x06, 0xC6, 0x80, 0x0D, 0xF0, 0x00, + 0x1C, 0x80, 0x03, 0x78, 0x80, 0x1B, 0x30, 0x06, 0xC3, 0x60, 0x30, 0x06, 0x0E, 0x08, 0x00, 0x04, + 0x00, 0x94, 0x70, 0xE0, 0x06, 0xC6, 0x30, 0x0C, 0x83, 0x19, 0x98, 0x01, 0x0F, 0xF0, 0x00, 0x06, + 0x60, 0x00, 0x06, 0x60, 0x00, 0x06, 0x60, 0x08, 0x00, 0x04, 0x00, 0x95, 0xE0, 0x7F, 0xFE, 0x07, + 0x30, 0x80, 0x01, 0x18, 0xC0, 0x00, 0x06, 0x70, 0x00, 0x03, 0x18, 0xC0, 0x00, 0x0C, 0xE0, 0x7F, + 0xFE, 0x07, 0x07, 0x00, 0x8E, 0x80, 0xE7, 0x18, 0x86, 0x61, 0x18, 0x86, 0x61, 0x18, 0x86, 0x61, + 0x18, 0x86, 0xE1, 0x78, 0x02, 0x00, 0x03, 0x00, 0x91, 0x10, 0x60, 0xC0, 0x00, 0x01, 0x06, 0x08, + 0x30, 0x60, 0x80, 0x00, 0x03, 0x04, 0x18, 0x30, 0x40, 0x80, 0x01, 0x04, 0x00, 0x8D, 0xE0, 0x39, + 0xC6, 0x18, 0x63, 0x8C, 0x31, 0xC6, 0x18, 0x63, 0x8C, 0xB9, 0x07, 0x00, 0x03, 0x00, 0x02, 0x18, + 0x84, 0x38, 0x2C, 0x64, 0x66, 0x46, 0x0C, 0x00, 0x13, 0x00, 0x81, 0xFE, 0x03, 0x04, 0x00, 0x83, + 0x00, 0x60, 0x30, 0x08, 0x0D, 0x00, 0x08, 0x00, 0x8F, 0xE0, 0x83, 0x3B, 0x86, 0x01, 0x08, 0x7E, + 0x38, 0x63, 0x10, 0x83, 0x18, 0x86, 0x3F, 0x78, 0x03, 0x07, 0x00, 0x02, 0x00, 0x94, 0x80, 0x01, + 0x0C, 0x60, 0x00, 0x03, 0xD8, 0xC3, 0x3F, 0x0E, 0x33, 0x98, 0xC1, 0x0C, 0x66, 0x30, 0x83, 0x39, + 0xCC, 0x3F, 0xF6, 0x08, 0x00, 0x07, 0x00, 0x8D, 0x80, 0x0F, 0x7F, 0x0C, 0x1B, 0x6C, 0x80, 0x01, + 0x06, 0x18, 0xC4, 0x30, 0x7F, 0xF8, 0x07, 0x00, 0x03, 0x00, 0x94, 0xC0, 0x00, 0x06, 0x30, 0x80, + 0xE1, 0x8D, 0x7F, 0x0E, 0x33, 0x98, 0xC1, 0x0C, 0x66, 0x30, 0x83, 0x31, 0x8C, 0x7F, 0x78, 0x03, + 0x07, 0x00, 0x08, 0x00, 0x8E, 0xC0, 0x83, 0x3F, 0x04, 0x31, 0x98, 0xFF, 0x0C, 0x60, 0x00, 0x03, + 0x30, 0x84, 0x3F, 0xF0, 0x08, 0x00, 0x02, 0x00, 0x8C, 0x1C, 0xCF, 0x60, 0xF8, 0x18, 0x0C, 0x06, + 0x83, 0xC1, 0x60, 0x30, 0x18, 0x0C, 0x05, 0x00, 0x08, 0x00, 0x94, 0xE0, 0x8D, 0x7F, 0x0E, 0x33, + 0x98, 0xC1, 0x0C, 0x66, 0x30, 0x83, 0x31, 0x8C, 0x7F, 0x78, 0x03, 0x18, 0x61, 0xF8, 0x83, 0x0F, + 0x02, 0x00, 0x02, 0x00, 0x95, 0x80, 0x01, 0x0C, 0x60, 0x00, 0x03, 0xD8, 0xC3, 0x3F, 0x0E, 0x31, + 0x98, 0xC1, 0x0C, 0x66, 0x30, 0x83, 0x19, 0xCC, 0x60, 0x06, 0x03, 0x07, 0x00, 0x8A, 0x00, 0x10, + 0x02, 0x00, 0x21, 0x84, 0x10, 0x42, 0x08, 0x21, 0x04, 0x03, 0x00, 0x8D, 0x00, 0x30, 0x06, 0x00, + 0x63, 0x8C, 0x31, 0xC6, 0x18, 0x63, 0x8C, 0x31, 0x77, 0x00, 0x02, 0x00, 0x95, 0x80, 0x01, 0x0C, + 0x60, 0x00, 0x03, 0x18, 0xC6, 0x18, 0x66, 0xB0, 0x83, 0x0F, 0x7C, 0x60, 0x06, 0x63, 0x18, 0xC3, + 0x30, 0x06, 0x03, 0x07, 0x00, 0x8A, 0x00, 0x10, 0x42, 0x08, 0x21, 0x84, 0x10, 0x42, 0x08, 0x21, + 0x04, 0x03, 0x00, 0x0D, 0x00, 0x98, 0x60, 0x8F, 0x87, 0xFF, 0x3F, 0x8E, 0xC3, 0x18, 0x0C, 0x63, + 0x30, 0x8C, 0xC1, 0x30, 0x06, 0xC3, 0x18, 0x0C, 0x63, 0x30, 0x8C, 0xC1, 0x30, 0x06, 0xC3, 0x0C, + 0x00, 0x08, 0x00, 0x8F, 0xD8, 0xC3, 0x3F, 0x0E, 0x31, 0x98, 0xC1, 0x0C, 0x66, 0x30, 0x83, 0x19, + 0xCC, 0x60, 0x06, 0x03, 0x07, 0x00, 0x08, 0x00, 0x8E, 0xC0, 0x83, 0x3F, 0x0C, 0x33, 0x98, 0x81, + 0x0C, 0x64, 0x20, 0x83, 0x31, 0x8C, 0x3B, 0xF0, 0x08, 0x00, 0x08, 0x00, 0x93, 0xD8, 0xC3, 0x3F, + 0x0E, 0x33, 0x98, 0xC1, 0x0C, 0x66, 0x30, 0x83, 0x19, 0xCC, 0x3B, 0xF6, 0x30, 0x80, 0x01, 0x0C, + 0x60, 0x03, 0x00, 0x08, 0x00, 0x94, 0xE0, 0x8D, 0x7F, 0x0E, 0x33, 0x98, 0xC1, 0x0C, 0x66, 0x30, + 0x83, 0x39, 0x8C, 0x7B, 0x78, 0x03, 0x18, 0xC0, 0x00, 0x06, 0x30, 0x02, 0x00, 0x05, 0x00, 0x89, + 0xD8, 0x7C, 0x0E, 0x83, 0xC1, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x05, 0x00, 0x07, 0x00, 0x8D, 0x80, + 0x07, 0x7F, 0x86, 0x19, 0xC0, 0x01, 0x3E, 0xC0, 0x01, 0x66, 0x18, 0x7F, 0x78, 0x07, 0x00, 0x02, + 0x00, 0x8C, 0x80, 0xC1, 0x60, 0xFC, 0x18, 0x0C, 0x06, 0x83, 0xC1, 0x60, 0x30, 0x78, 0x38, 0x05, + 0x00, 0x08, 0x00, 0x8F, 0x18, 0xCC, 0x60, 0x06, 0x33, 0x98, 0xC1, 0x0C, 0x66, 0x30, 0x83, 0x11, + 0x8E, 0x7F, 0x78, 0x03, 0x07, 0x00, 0x07, 0x00, 0x8D, 0x30, 0x98, 0x61, 0x86, 0x10, 0xC3, 0x0C, + 0x13, 0x68, 0xE0, 0x81, 0x03, 0x0C, 0x30, 0x07, 0x00, 0x0B, 0x00, 0x91, 0x08, 0x82, 0x8C, 0x63, + 0xC6, 0x31, 0xA3, 0x18, 0xD9, 0x84, 0x6D, 0xC3, 0xA2, 0xC1, 0x71, 0xE0, 0x38, 0x30, 0x02, 0x18, + 0x80, 0x0C, 0x0A, 0x00, 0x07, 0x00, 0x8E, 0x60, 0x98, 0x31, 0xCC, 0xE0, 0x81, 0x07, 0x0C, 0x78, + 0xE0, 0xC1, 0x8C, 0x71, 0x86, 0x01, 0x06, 0x00, 0x07, 0x00, 0x92, 0x30, 0x98, 0x61, 0x86, 0x18, + 0xC3, 0x0C, 0x13, 0x68, 0xE0, 0x81, 0x03, 0x0C, 0x30, 0x40, 0x80, 0x81, 0x03, 0x06, 0x02, 0x00, + 0x07, 0x00, 0x8E, 0xE0, 0x9F, 0x7F, 0xC0, 0x80, 0x01, 0x06, 0x0C, 0x18, 0x70, 0xC0, 0x80, 0x03, + 0xFE, 0x01, 0x06, 0x00, 0x88, 0x00, 0x10, 0x0C, 0x83, 0xC1, 0x60, 0x10, 0x08, 0x86, 0x02, 0xC1, + 0x84, 0x40, 0x20, 0x30, 0x18, 0x0C, 0x02, 0x06, 0x81, 0x02, 0x00, 0x02, 0x00, 0x8B, 0x42, 0x08, + 0x21, 0x84, 0x10, 0x42, 0x08, 0x21, 0x84, 0x10, 0x02, 0x00, 0x80, 0x80, 0x02, 0x81, 0x83, 0xC1, + 0x60, 0x30, 0x18, 0x03, 0x0C, 0x87, 0xC7, 0x60, 0x30, 0x18, 0x0C, 0x06, 0xC3, 0x30, 0x02, 0x00, + 0x10, 0x00, 0x86, 0x0E, 0xC2, 0xCF, 0x18, 0x1F, 0x00, 0x02, 0x10, 0x00, }; // clang-format on diff --git a/keyboards/dasky/reverb/graphics/robotomono20.qff.h b/keyboards/dasky/reverb/graphics/robotomono20.qff.h index 63b82834042..f60641a9582 100644 --- a/keyboards/dasky/reverb/graphics/robotomono20.qff.h +++ b/keyboards/dasky/reverb/graphics/robotomono20.qff.h @@ -1,11 +1,11 @@ -// Copyright 2023 QMK -- generated source code only, font retains original copyright +// Copyright 2024 QMK -- generated source code only, font retains original copyright // SPDX-License-Identifier: GPL-2.0-or-later -// This file was auto-generated by `qmk painter-convert-font-image -i robotomono20.png -f mono4` +// This file was auto-generated by `qmk painter-convert-font-image -i robotomono20.png -f mono2` #pragma once #include extern const uint32_t font_robotomono20_length; -extern const uint8_t font_robotomono20[4904]; +extern const uint8_t font_robotomono20[2396]; From 7620c64b99dc5bec480bfaa2708cb3fae709e2b3 Mon Sep 17 00:00:00 2001 From: Jerome Berclaz Date: Tue, 21 May 2024 19:49:49 -0700 Subject: [PATCH 308/333] Added MATRIX_HAS_GHOST definition for IBM Model H controller (#23744) --- keyboards/ibm/model_m/modelh/info.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/ibm/model_m/modelh/info.json b/keyboards/ibm/model_m/modelh/info.json index 6d55d5c6bdd..897d9be2f44 100644 --- a/keyboards/ibm/model_m/modelh/info.json +++ b/keyboards/ibm/model_m/modelh/info.json @@ -20,7 +20,8 @@ }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3"], - "rows": ["B6", "B5", "B4", "A15", "B3", "A0", "A2", "A1"] + "rows": ["B6", "B5", "B4", "A15", "B3", "A0", "A2", "A1"], + "ghost": true }, "processor": "STM32F103", "url": "modelh.club", From d1547320a0236eff98906f908224fe0d46b4b0e5 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 22 May 2024 02:53:40 -0700 Subject: [PATCH 309/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: H, Part 2 (#23762) Affects: - `handwired/108key_trackpoint` - `handwired/2x5keypad` - `handwired/3dp660` - `handwired/412_64` - `handwired/42` - `handwired/amigopunk` - `handwired/aranck` - `handwired/atreus50` - `handwired/axon` - `handwired/battleship_gamepad` - `handwired/bdn9_ble` - `handwired/bento/rev1` - `handwired/bolek` - `handwired/brain` - `handwired/bstk100` - `handwired/cans12er` - `handwired/chiron` - `handwired/ck4x4` - `handwired/cmd60` - `handwired/co60/rev6` - `handwired/co60/rev7` - `handwired/colorlice` - `handwired/curiosity` - `handwired/dactyl_left` - `handwired/dactyl_manuform/4x5` - `handwired/dactyl_manuform/4x5_5` - `handwired/dactyl_manuform/4x6` - `handwired/dactyl_manuform/4x6_4_3` - `handwired/dactyl_manuform/4x6_5` - `handwired/dactyl_manuform/5x6` - `handwired/dactyl_manuform/5x6_2_5` - `handwired/dactyl_manuform/5x6_5` - `handwired/dactyl_manuform/5x6_6` - `handwired/dactyl_manuform/5x6_68` - `handwired/dactyl_manuform/5x7` - `handwired/dactyl_manuform/6x6/blackpill_f411` - `handwired/dactyl_manuform/6x6/promicro` - `handwired/dactyl_manuform/6x6_4` - `handwired/dactyl_manuform/6x7` - `handwired/dactyl_promicro` - `handwired/dactyl_rah` - `handwired/datahand` - `handwired/evk/v1_3` - `handwired/fc200rt_qmk` - `handwired/fivethirteen` - `handwired/floorboard` - `handwired/fruity60` - `handwired/gamenum` - `handwired/hacked_motospeed` - `handwired/heisenberg` - `handwired/hnah40` --- .../handwired/108key_trackpoint/config.h | 3 -- .../handwired/108key_trackpoint/keyboard.json | 6 +++ keyboards/handwired/2x5keypad/config.h | 7 ---- keyboards/handwired/2x5keypad/keyboard.json | 6 +++ keyboards/handwired/3dp660/config.h | 24 ----------- keyboards/handwired/3dp660/keyboard.json | 6 +++ keyboards/handwired/412_64/config.h | 24 ----------- keyboards/handwired/412_64/keyboard.json | 6 +++ keyboards/handwired/42/config.h | 6 --- keyboards/handwired/42/keyboard.json | 6 +++ keyboards/handwired/amigopunk/config.h | 23 ---------- keyboards/handwired/amigopunk/keyboard.json | 6 +++ keyboards/handwired/aranck/config.h | 6 --- keyboards/handwired/aranck/keyboard.json | 6 +++ keyboards/handwired/atreus50/config.h | 39 ----------------- keyboards/handwired/atreus50/keyboard.json | 6 +++ keyboards/handwired/axon/config.h | 24 ----------- keyboards/handwired/axon/keyboard.json | 6 +++ .../handwired/battleship_gamepad/config.h | 6 --- .../battleship_gamepad/keyboard.json | 6 +++ keyboards/handwired/bdn9_ble/config.h | 23 ---------- keyboards/handwired/bdn9_ble/keyboard.json | 6 +++ keyboards/handwired/bento/rev1/config.h | 22 ---------- keyboards/handwired/bento/rev1/keyboard.json | 6 +++ keyboards/handwired/bolek/config.h | 5 --- keyboards/handwired/bolek/keyboard.json | 6 +++ keyboards/handwired/brain/config.h | 5 --- keyboards/handwired/brain/keyboard.json | 6 +++ keyboards/handwired/bstk100/config.h | 40 ------------------ keyboards/handwired/bstk100/keyboard.json | 6 +++ keyboards/handwired/cans12er/config.h | 7 ---- keyboards/handwired/cans12er/keyboard.json | 6 +++ keyboards/handwired/chiron/config.h | 3 -- keyboards/handwired/chiron/keyboard.json | 6 +++ keyboards/handwired/ck4x4/config.h | 42 ------------------- keyboards/handwired/ck4x4/keyboard.json | 6 +++ keyboards/handwired/cmd60/config.h | 39 ----------------- keyboards/handwired/cmd60/keyboard.json | 6 +++ keyboards/handwired/co60/rev6/config.h | 22 ---------- keyboards/handwired/co60/rev6/keyboard.json | 6 +++ keyboards/handwired/co60/rev7/config.h | 5 --- keyboards/handwired/co60/rev7/keyboard.json | 6 +++ keyboards/handwired/colorlice/config.h | 23 ---------- keyboards/handwired/colorlice/keyboard.json | 6 +++ keyboards/handwired/curiosity/config.h | 23 ---------- keyboards/handwired/curiosity/keyboard.json | 6 +++ keyboards/handwired/dactyl_left/config.h | 39 ----------------- keyboards/handwired/dactyl_left/keyboard.json | 6 +++ .../dactyl_manuform/4x5/keyboard.json | 6 +++ .../dactyl_manuform/4x5_5/keyboard.json | 6 +++ .../dactyl_manuform/4x6/keyboard.json | 6 +++ .../dactyl_manuform/4x6_4_3/keyboard.json | 6 +++ .../dactyl_manuform/4x6_5/keyboard.json | 6 +++ .../dactyl_manuform/5x6/keyboard.json | 6 +++ .../dactyl_manuform/5x6_2_5/keyboard.json | 6 +++ .../dactyl_manuform/5x6_5/keyboard.json | 6 +++ .../dactyl_manuform/5x6_6/keyboard.json | 6 +++ .../dactyl_manuform/5x6_68/keyboard.json | 6 +++ .../dactyl_manuform/5x7/keyboard.json | 6 +++ .../6x6/blackpill_f411/keyboard.json | 6 +++ .../6x6/promicro/keyboard.json | 6 +++ .../dactyl_manuform/6x6_4/keyboard.json | 6 +++ .../dactyl_manuform/6x7/keyboard.json | 6 +++ keyboards/handwired/dactyl_manuform/config.h | 5 --- keyboards/handwired/dactyl_promicro/config.h | 5 --- .../handwired/dactyl_promicro/keyboard.json | 6 +++ keyboards/handwired/dactyl_rah/config.h | 6 --- keyboards/handwired/dactyl_rah/keyboard.json | 6 +++ keyboards/handwired/datahand/config.h | 5 --- keyboards/handwired/datahand/keyboard.json | 6 +++ keyboards/handwired/evk/v1_3/config.h | 37 ---------------- keyboards/handwired/evk/v1_3/keyboard.json | 6 +++ keyboards/handwired/fc200rt_qmk/config.h | 23 ---------- keyboards/handwired/fc200rt_qmk/keyboard.json | 6 +++ keyboards/handwired/fivethirteen/config.h | 39 ----------------- .../handwired/fivethirteen/keyboard.json | 6 +++ keyboards/handwired/floorboard/config.h | 39 ----------------- keyboards/handwired/floorboard/keyboard.json | 6 +++ keyboards/handwired/fruity60/config.h | 23 ---------- keyboards/handwired/fruity60/keyboard.json | 6 +++ keyboards/handwired/gamenum/config.h | 39 ----------------- keyboards/handwired/gamenum/keyboard.json | 6 +++ keyboards/handwired/hacked_motospeed/config.h | 5 --- .../handwired/hacked_motospeed/keyboard.json | 6 +++ keyboards/handwired/heisenberg/config.h | 6 --- keyboards/handwired/heisenberg/keyboard.json | 6 +++ keyboards/handwired/hnah40/config.h | 38 ----------------- keyboards/handwired/hnah40/keyboard.json | 6 +++ 88 files changed, 306 insertions(+), 730 deletions(-) delete mode 100644 keyboards/handwired/2x5keypad/config.h delete mode 100644 keyboards/handwired/3dp660/config.h delete mode 100644 keyboards/handwired/412_64/config.h delete mode 100644 keyboards/handwired/42/config.h delete mode 100644 keyboards/handwired/amigopunk/config.h delete mode 100644 keyboards/handwired/atreus50/config.h delete mode 100644 keyboards/handwired/axon/config.h delete mode 100644 keyboards/handwired/bdn9_ble/config.h delete mode 100644 keyboards/handwired/bento/rev1/config.h delete mode 100644 keyboards/handwired/bstk100/config.h delete mode 100644 keyboards/handwired/cans12er/config.h delete mode 100644 keyboards/handwired/ck4x4/config.h delete mode 100644 keyboards/handwired/cmd60/config.h delete mode 100644 keyboards/handwired/co60/rev6/config.h delete mode 100644 keyboards/handwired/colorlice/config.h delete mode 100644 keyboards/handwired/curiosity/config.h delete mode 100644 keyboards/handwired/dactyl_left/config.h delete mode 100644 keyboards/handwired/evk/v1_3/config.h delete mode 100644 keyboards/handwired/fc200rt_qmk/config.h delete mode 100644 keyboards/handwired/fivethirteen/config.h delete mode 100644 keyboards/handwired/floorboard/config.h delete mode 100644 keyboards/handwired/fruity60/config.h delete mode 100644 keyboards/handwired/gamenum/config.h delete mode 100644 keyboards/handwired/hnah40/config.h diff --git a/keyboards/handwired/108key_trackpoint/config.h b/keyboards/handwired/108key_trackpoint/config.h index 8aca85bf26a..0bdefde109c 100644 --- a/keyboards/handwired/108key_trackpoint/config.h +++ b/keyboards/handwired/108key_trackpoint/config.h @@ -36,6 +36,3 @@ #define PS2_USART_ERROR (UCSR1A & ((1< - -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 - diff --git a/keyboards/handwired/3dp660/keyboard.json b/keyboards/handwired/3dp660/keyboard.json index e01ff4610c6..c1c4c13e7e3 100644 --- a/keyboards/handwired/3dp660/keyboard.json +++ b/keyboards/handwired/3dp660/keyboard.json @@ -22,6 +22,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D3", "C6", "C7", "D5", "D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/handwired/412_64/config.h b/keyboards/handwired/412_64/config.h deleted file mode 100644 index 7caa265c1a1..00000000000 --- a/keyboards/handwired/412_64/config.h +++ /dev/null @@ -1,24 +0,0 @@ - - -#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/handwired/412_64/keyboard.json b/keyboards/handwired/412_64/keyboard.json index 736c1886bbb..c0f27dcb91e 100644 --- a/keyboards/handwired/412_64/keyboard.json +++ b/keyboards/handwired/412_64/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "D2", "D0", "D1", "D4", "C6", "D7", "E6"], "rows": ["D3", "F4", "F5", "F6", "F7", "B1", "B3", "B2"] diff --git a/keyboards/handwired/42/config.h b/keyboards/handwired/42/config.h deleted file mode 100644 index fa9a83d08ec..00000000000 --- a/keyboards/handwired/42/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#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/42/keyboard.json b/keyboards/handwired/42/keyboard.json index d68dcd1ec2f..45801b7773e 100644 --- a/keyboards/handwired/42/keyboard.json +++ b/keyboards/handwired/42/keyboard.json @@ -28,6 +28,12 @@ "nkro": true, "bluetooth": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/amigopunk/config.h b/keyboards/handwired/amigopunk/config.h deleted file mode 100644 index bcdca4920c7..00000000000 --- a/keyboards/handwired/amigopunk/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2021 Christiano Haesbaert - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#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/amigopunk/keyboard.json b/keyboards/handwired/amigopunk/keyboard.json index d9ef295a4f3..e8e45d2b993 100644 --- a/keyboards/handwired/amigopunk/keyboard.json +++ b/keyboards/handwired/amigopunk/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "B4", "B3", "B2", "B1", "B0", "E7", "E6", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"], "rows": ["C0", "C1", "C2", "C3", "C4", "C5"] diff --git a/keyboards/handwired/aranck/config.h b/keyboards/handwired/aranck/config.h index b20b3099e9a..519ad1ea6f1 100644 --- a/keyboards/handwired/aranck/config.h +++ b/keyboards/handwired/aranck/config.h @@ -17,12 +17,6 @@ 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 - - /** * Aranck-specific definitions */ diff --git a/keyboards/handwired/aranck/keyboard.json b/keyboards/handwired/aranck/keyboard.json index ddd72b0e654..435d6da6967 100644 --- a/keyboards/handwired/aranck/keyboard.json +++ b/keyboards/handwired/aranck/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0"] diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/handwired/atreus50/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/handwired/atreus50/keyboard.json b/keyboards/handwired/atreus50/keyboard.json index dc62d3e849e..961d1959b04 100644 --- a/keyboards/handwired/atreus50/keyboard.json +++ b/keyboards/handwired/atreus50/keyboard.json @@ -35,6 +35,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0"] diff --git a/keyboards/handwired/axon/config.h b/keyboards/handwired/axon/config.h deleted file mode 100644 index dcf26800ca2..00000000000 --- a/keyboards/handwired/axon/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Robin Liu - -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 diff --git a/keyboards/handwired/axon/keyboard.json b/keyboards/handwired/axon/keyboard.json index fe7818d97f0..007f90fbc8b 100644 --- a/keyboards/handwired/axon/keyboard.json +++ b/keyboards/handwired/axon/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "D7", "B1", "B2", "C0", "C1", "C2", "C3", "C4", "C5", "D1"], "rows": ["D5", "D6", "D4", "D0"] diff --git a/keyboards/handwired/battleship_gamepad/config.h b/keyboards/handwired/battleship_gamepad/config.h index 9853f7f39d7..b785c80aadf 100644 --- a/keyboards/handwired/battleship_gamepad/config.h +++ b/keyboards/handwired/battleship_gamepad/config.h @@ -19,9 +19,3 @@ /* joystick configuration */ #define JOYSTICK_BUTTON_COUNT 25 #define JOYSTICK_AXIS_RESOLUTION 10 - -/* 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/battleship_gamepad/keyboard.json b/keyboards/handwired/battleship_gamepad/keyboard.json index 3b4010ce40c..28327418758 100644 --- a/keyboards/handwired/battleship_gamepad/keyboard.json +++ b/keyboards/handwired/battleship_gamepad/keyboard.json @@ -22,6 +22,12 @@ "nkro": true, "joystick": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/bdn9_ble/config.h b/keyboards/handwired/bdn9_ble/config.h deleted file mode 100644 index 3ed1c2ed30f..00000000000 --- a/keyboards/handwired/bdn9_ble/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Danny Nguyen - -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 diff --git a/keyboards/handwired/bdn9_ble/keyboard.json b/keyboards/handwired/bdn9_ble/keyboard.json index 76d9e42f83c..20f020504cc 100644 --- a/keyboards/handwired/bdn9_ble/keyboard.json +++ b/keyboards/handwired/bdn9_ble/keyboard.json @@ -27,6 +27,12 @@ "backlight": true, "bluetooth": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["D1", "D0", "C6"], diff --git a/keyboards/handwired/bento/rev1/config.h b/keyboards/handwired/bento/rev1/config.h deleted file mode 100644 index 65cc7669454..00000000000 --- a/keyboards/handwired/bento/rev1/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 GhostSeven - * - * 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 diff --git a/keyboards/handwired/bento/rev1/keyboard.json b/keyboards/handwired/bento/rev1/keyboard.json index 3baa7d77ce4..656eb0b5cec 100644 --- a/keyboards/handwired/bento/rev1/keyboard.json +++ b/keyboards/handwired/bento/rev1/keyboard.json @@ -45,6 +45,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["D7", "B1", "D2"], diff --git a/keyboards/handwired/bolek/config.h b/keyboards/handwired/bolek/config.h index 72c76ac580e..600937321ce 100644 --- a/keyboards/handwired/bolek/config.h +++ b/keyboards/handwired/bolek/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/handwired/bolek/keyboard.json b/keyboards/handwired/bolek/keyboard.json index a966044ebe8..68fe7958bf3 100644 --- a/keyboards/handwired/bolek/keyboard.json +++ b/keyboards/handwired/bolek/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "E6", "D7", "C6", "D0", "D4"], "rows": ["F4", "F5", "F6", "B5", "D3", "D2", "D1", "B4"] diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h index 91253b16957..5c3d9831930 100644 --- a/keyboards/handwired/brain/config.h +++ b/keyboards/handwired/brain/config.h @@ -34,11 +34,6 @@ along with this program. If not, see . //#define SPLIT_HAND_PIN B7 -/* 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 - /* Enables This makes it easier for fast typists to use dual-function keys */ #define PERMISSIVE_HOLD diff --git a/keyboards/handwired/brain/keyboard.json b/keyboards/handwired/brain/keyboard.json index e9093711d00..95c09ecfc90 100644 --- a/keyboards/handwired/brain/keyboard.json +++ b/keyboards/handwired/brain/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1"] diff --git a/keyboards/handwired/bstk100/config.h b/keyboards/handwired/bstk100/config.h deleted file mode 100644 index 2a30bd33633..00000000000 --- a/keyboards/handwired/bstk100/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2021 FREE WING,Y.Sakamoto -http://www.neko.ne.jp/~freewing/ - -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/handwired/bstk100/keyboard.json b/keyboards/handwired/bstk100/keyboard.json index b4f036631db..0fc255f9c41 100644 --- a/keyboards/handwired/bstk100/keyboard.json +++ b/keyboards/handwired/bstk100/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6"], "rows": ["B6", "B2", "B3", "B1", "F7"] diff --git a/keyboards/handwired/cans12er/config.h b/keyboards/handwired/cans12er/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/handwired/cans12er/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/cans12er/keyboard.json b/keyboards/handwired/cans12er/keyboard.json index 058f8a98b16..9d08706423c 100644 --- a/keyboards/handwired/cans12er/keyboard.json +++ b/keyboards/handwired/cans12er/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D4", "C6", "D7"], "rows": ["F7", "B1", "B3"] diff --git a/keyboards/handwired/chiron/config.h b/keyboards/handwired/chiron/config.h index 4d245e80e4b..254bed5c744 100644 --- a/keyboards/handwired/chiron/config.h +++ b/keyboards/handwired/chiron/config.h @@ -19,6 +19,3 @@ along with this program. If not, see . // Pro Micro Pins RX1 #define SPLIT_HAND_PIN D2 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/handwired/chiron/keyboard.json b/keyboards/handwired/chiron/keyboard.json index 6c2626df64b..f02c8cea281 100644 --- a/keyboards/handwired/chiron/keyboard.json +++ b/keyboards/handwired/chiron/keyboard.json @@ -18,6 +18,12 @@ "rgblight": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/ck4x4/config.h b/keyboards/handwired/ck4x4/config.h deleted file mode 100644 index 6a40218df2e..00000000000 --- a/keyboards/handwired/ck4x4/config.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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 - -//LEDS A6, RGB B15 - -/* 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/handwired/ck4x4/keyboard.json b/keyboards/handwired/ck4x4/keyboard.json index 4b8284ab71f..642408cc0eb 100644 --- a/keyboards/handwired/ck4x4/keyboard.json +++ b/keyboards/handwired/ck4x4/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B7", "B8", "B9", "B10"], "rows": ["B3", "B4", "B5", "B6"] diff --git a/keyboards/handwired/cmd60/config.h b/keyboards/handwired/cmd60/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/handwired/cmd60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/handwired/cmd60/keyboard.json b/keyboards/handwired/cmd60/keyboard.json index 4ac953e560a..f9733a75824 100644 --- a/keyboards/handwired/cmd60/keyboard.json +++ b/keyboards/handwired/cmd60/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "C6", "D7", "B4", "B5", "B6"], "rows": ["F0", "F4", "F5", "F6", "F7"] diff --git a/keyboards/handwired/co60/rev6/config.h b/keyboards/handwired/co60/rev6/config.h deleted file mode 100644 index fa1c24a396c..00000000000 --- a/keyboards/handwired/co60/rev6/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2019 John M Daly - * - * 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 diff --git a/keyboards/handwired/co60/rev6/keyboard.json b/keyboards/handwired/co60/rev6/keyboard.json index e772f0ba425..743a738ff07 100644 --- a/keyboards/handwired/co60/rev6/keyboard.json +++ b/keyboards/handwired/co60/rev6/keyboard.json @@ -13,6 +13,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A2", "A3", "A6", "B14", "B15", "A8", "A9", "A7", "B3", "B4", "C14", "C15", "C13", "B5", "B6"], "rows": ["B0", "B1", "B2", "A15", "A10"] diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h index b6b7cecec24..f9d324e2872 100644 --- a/keyboards/handwired/co60/rev7/config.h +++ b/keyboards/handwired/co60/rev7/config.h @@ -17,11 +17,6 @@ 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 - /* RGB underglow configuration */ #define WS2812_SPI_DRIVER SPID1 #define WS2812_SPI_MOSI_PAL_MODE 5 diff --git a/keyboards/handwired/co60/rev7/keyboard.json b/keyboards/handwired/co60/rev7/keyboard.json index 967c673d39c..4319c9aedfc 100644 --- a/keyboards/handwired/co60/rev7/keyboard.json +++ b/keyboards/handwired/co60/rev7/keyboard.json @@ -14,6 +14,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A9", "A3", "A4", "A5", "A6", "B0", "B1", "A15", "B3", "B4", "B5", "C13", "C14", "C15"], "rows": ["A8", "A2", "B13", "B2", "B10"] diff --git a/keyboards/handwired/colorlice/config.h b/keyboards/handwired/colorlice/config.h deleted file mode 100644 index a85f398caec..00000000000 --- a/keyboards/handwired/colorlice/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Marhalloweenvt - -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 diff --git a/keyboards/handwired/colorlice/keyboard.json b/keyboards/handwired/colorlice/keyboard.json index 1a9549d8632..77f5ded0970 100644 --- a/keyboards/handwired/colorlice/keyboard.json +++ b/keyboards/handwired/colorlice/keyboard.json @@ -74,6 +74,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/handwired/curiosity/config.h b/keyboards/handwired/curiosity/config.h deleted file mode 100644 index 65854bfac79..00000000000 --- a/keyboards/handwired/curiosity/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 Spaceman - -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 diff --git a/keyboards/handwired/curiosity/keyboard.json b/keyboards/handwired/curiosity/keyboard.json index 1a1024fb18b..e95fa25e717 100644 --- a/keyboards/handwired/curiosity/keyboard.json +++ b/keyboards/handwired/curiosity/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D4", "F4", "C6", "D7", "E6", "B5", "B4", "B1", "B3", "B2", "B6"], "rows": ["D0", "F7", "F6", "F5"] diff --git a/keyboards/handwired/dactyl_left/config.h b/keyboards/handwired/dactyl_left/config.h deleted file mode 100644 index d7658643b71..00000000000 --- a/keyboards/handwired/dactyl_left/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 RedForty - -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/handwired/dactyl_left/keyboard.json b/keyboards/handwired/dactyl_left/keyboard.json index ba374c87a34..cfb3ad14895 100644 --- a/keyboards/handwired/dactyl_left/keyboard.json +++ b/keyboards/handwired/dactyl_left/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "B7", "B3", "B2", "B1", "B0"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/handwired/dactyl_manuform/4x5/keyboard.json b/keyboards/handwired/dactyl_manuform/4x5/keyboard.json index b779e9d3c1e..e0a1b531a55 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/4x5/keyboard.json @@ -22,6 +22,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json b/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json index 8f53dd03039..7efc4718ad1 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "F6"], "rows": ["F7", "B1", "B3", "B2", "B4"] diff --git a/keyboards/handwired/dactyl_manuform/4x6/keyboard.json b/keyboards/handwired/dactyl_manuform/4x6/keyboard.json index feb58db5dbe..d589c532a86 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/4x6/keyboard.json @@ -22,6 +22,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json b/keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json index 60830dbf80a..c0c24a8966d 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json b/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json index a0607c70683..47ad7aa920e 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json @@ -22,6 +22,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6/keyboard.json index b5681f4ca7e..353b1481266 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/5x6/keyboard.json @@ -22,6 +22,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json index e36acea627c..620ffdec061 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json index 1153bcdb44e..fc7676aa4b8 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json index 8a3e69f2efb..974f1b8bc39 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json index 59d37ec15b0..5b6bdfb86eb 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split": { "enabled": true, "soft_serial_pin": "D0" diff --git a/keyboards/handwired/dactyl_manuform/5x7/keyboard.json b/keyboards/handwired/dactyl_manuform/5x7/keyboard.json index bc734607cf3..d40a45dfa72 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/5x7/keyboard.json @@ -22,6 +22,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json index 9391d3a46d4..73ce0d27d53 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json @@ -17,5 +17,11 @@ "extrakey": true, "console": true, "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } } } diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json index 0ec00196ba5..213a3c29f5a 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json @@ -21,5 +21,11 @@ "mousekey": true, "extrakey": true, "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } } } diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json index 36051fb7feb..98e96c96399 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json @@ -22,6 +22,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/6x7/keyboard.json b/keyboards/handwired/dactyl_manuform/6x7/keyboard.json index 5ce0affbeea..153b6c75c4f 100644 --- a/keyboards/handwired/dactyl_manuform/6x7/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/6x7/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/handwired/dactyl_manuform/config.h b/keyboards/handwired/dactyl_manuform/config.h index 904e5a729dd..a3b5aabcf1f 100644 --- a/keyboards/handwired/dactyl_manuform/config.h +++ b/keyboards/handwired/dactyl_manuform/config.h @@ -26,10 +26,5 @@ along with this program. If not, see . #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* 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 - /* Enables This makes it easier for fast typists to use dual-function keys */ #define PERMISSIVE_HOLD diff --git a/keyboards/handwired/dactyl_promicro/config.h b/keyboards/handwired/dactyl_promicro/config.h index 543ef8e6c5a..b11e0a9f31f 100644 --- a/keyboards/handwired/dactyl_promicro/config.h +++ b/keyboards/handwired/dactyl_promicro/config.h @@ -25,11 +25,6 @@ along with this program. If not, see . #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* 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 - /* Enables This makes it easier for fast typists to use dual-function keys */ #define PERMISSIVE_HOLD diff --git a/keyboards/handwired/dactyl_promicro/keyboard.json b/keyboards/handwired/dactyl_promicro/keyboard.json index 572ea05b2f3..824ffe7e7e0 100644 --- a/keyboards/handwired/dactyl_promicro/keyboard.json +++ b/keyboards/handwired/dactyl_promicro/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_rah/config.h b/keyboards/handwired/dactyl_rah/config.h index 107d8e16683..54a8f8514e5 100644 --- a/keyboards/handwired/dactyl_rah/config.h +++ b/keyboards/handwired/dactyl_rah/config.h @@ -24,12 +24,6 @@ along with this program. If not, see . #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* 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 - /* Enables This makes it easier for fast typists to use dual-function keys */ #define PERMISSIVE_HOLD diff --git a/keyboards/handwired/dactyl_rah/keyboard.json b/keyboards/handwired/dactyl_rah/keyboard.json index f550a055c7f..3bc5dc08547 100644 --- a/keyboards/handwired/dactyl_rah/keyboard.json +++ b/keyboards/handwired/dactyl_rah/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/datahand/config.h b/keyboards/handwired/datahand/config.h index b1d8cc9c773..2d37644678f 100644 --- a/keyboards/handwired/datahand/config.h +++ b/keyboards/handwired/datahand/config.h @@ -20,11 +20,6 @@ #define MATRIX_ROWS 13 #define MATRIX_COLS 4 -/* 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 - /* * Command/Windows key option * diff --git a/keyboards/handwired/datahand/keyboard.json b/keyboards/handwired/datahand/keyboard.json index 96e49388dc8..c2c7dab421c 100644 --- a/keyboards/handwired/datahand/keyboard.json +++ b/keyboards/handwired/datahand/keyboard.json @@ -19,6 +19,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/evk/v1_3/config.h b/keyboards/handwired/evk/v1_3/config.h deleted file mode 100644 index 1b4e5a6d87e..00000000000 --- a/keyboards/handwired/evk/v1_3/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -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/handwired/evk/v1_3/keyboard.json b/keyboards/handwired/evk/v1_3/keyboard.json index 5553db0a1f0..067382e89e3 100644 --- a/keyboards/handwired/evk/v1_3/keyboard.json +++ b/keyboards/handwired/evk/v1_3/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "C6", "C7", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6"], "rows": ["B0", "B1", "B2", "B3", "B7", "D0"] diff --git a/keyboards/handwired/fc200rt_qmk/config.h b/keyboards/handwired/fc200rt_qmk/config.h deleted file mode 100644 index 82fe0166b2f..00000000000 --- a/keyboards/handwired/fc200rt_qmk/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 NaCly - -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 diff --git a/keyboards/handwired/fc200rt_qmk/keyboard.json b/keyboards/handwired/fc200rt_qmk/keyboard.json index 1cde9518811..aab792e7bd5 100644 --- a/keyboards/handwired/fc200rt_qmk/keyboard.json +++ b/keyboards/handwired/fc200rt_qmk/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D3", "C6", "C7", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1"], "rows": ["B0", "B1", "B2", "B3", "E6", "B7", "D0", "D1"] diff --git a/keyboards/handwired/fivethirteen/config.h b/keyboards/handwired/fivethirteen/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/handwired/fivethirteen/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/handwired/fivethirteen/keyboard.json b/keyboards/handwired/fivethirteen/keyboard.json index 11baaf78cc1..9046fc53ba9 100644 --- a/keyboards/handwired/fivethirteen/keyboard.json +++ b/keyboards/handwired/fivethirteen/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "F0", "D0", "D1", "D2", "D3", "C6", "C7", "D6", "D7"], "rows": ["F6", "F7", "B6", "B5", "B4"] diff --git a/keyboards/handwired/floorboard/config.h b/keyboards/handwired/floorboard/config.h deleted file mode 100644 index af56b8a7fe4..00000000000 --- a/keyboards/handwired/floorboard/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Kevin Lockwood - -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/handwired/floorboard/keyboard.json b/keyboards/handwired/floorboard/keyboard.json index 0bcec56b8fe..0e9f277160d 100644 --- a/keyboards/handwired/floorboard/keyboard.json +++ b/keyboards/handwired/floorboard/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B7", "B6", "B5", "B4", "B3", "B2", "B1", "B9", "B0", "B15", "B14", "B13"], "rows": ["A2", "A1", "A0", "B8"] diff --git a/keyboards/handwired/fruity60/config.h b/keyboards/handwired/fruity60/config.h deleted file mode 100644 index 091cb7b510b..00000000000 --- a/keyboards/handwired/fruity60/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Yan-Fa Li - -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 diff --git a/keyboards/handwired/fruity60/keyboard.json b/keyboards/handwired/fruity60/keyboard.json index 4984f3fc03c..728b0c63cbb 100644 --- a/keyboards/handwired/fruity60/keyboard.json +++ b/keyboards/handwired/fruity60/keyboard.json @@ -25,6 +25,12 @@ "console": true, "bluetooth": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["60_tsangan_hhkb"], "layouts": { "LAYOUT_60_tsangan_hhkb": { diff --git a/keyboards/handwired/gamenum/config.h b/keyboards/handwired/gamenum/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/handwired/gamenum/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/handwired/gamenum/keyboard.json b/keyboards/handwired/gamenum/keyboard.json index 17460f4dcaa..50a39621088 100644 --- a/keyboards/handwired/gamenum/keyboard.json +++ b/keyboards/handwired/gamenum/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["B6", "B2", "B3", "B1", "F7"] diff --git a/keyboards/handwired/hacked_motospeed/config.h b/keyboards/handwired/hacked_motospeed/config.h index f968fcc0d7e..1d82f55e24e 100644 --- a/keyboards/handwired/hacked_motospeed/config.h +++ b/keyboards/handwired/hacked_motospeed/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST -/* 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. diff --git a/keyboards/handwired/hacked_motospeed/keyboard.json b/keyboards/handwired/hacked_motospeed/keyboard.json index af76a4dd769..1a38cdafdc8 100644 --- a/keyboards/handwired/hacked_motospeed/keyboard.json +++ b/keyboards/handwired/hacked_motospeed/keyboard.json @@ -31,6 +31,12 @@ "backlight": true, "bluetooth": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h index 7ad28a9c225..e5671c9af75 100644 --- a/keyboards/handwired/heisenberg/config.h +++ b/keyboards/handwired/heisenberg/config.h @@ -17,12 +17,6 @@ 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 - - /** * Heisenberg-specific definitions */ diff --git a/keyboards/handwired/heisenberg/keyboard.json b/keyboards/handwired/heisenberg/keyboard.json index 88f001d0754..460018ef1e5 100644 --- a/keyboards/handwired/heisenberg/keyboard.json +++ b/keyboards/handwired/heisenberg/keyboard.json @@ -36,6 +36,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0"] diff --git a/keyboards/handwired/hnah40/config.h b/keyboards/handwired/hnah40/config.h deleted file mode 100644 index 611a6960cb5..00000000000 --- a/keyboards/handwired/hnah40/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2018 HnahKB - -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/handwired/hnah40/keyboard.json b/keyboards/handwired/hnah40/keyboard.json index 649ad84d100..e80bbdaec51 100644 --- a/keyboards/handwired/hnah40/keyboard.json +++ b/keyboards/handwired/hnah40/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1"], "rows": ["B4", "B5", "B3", "D4"] From 495e83b30f86a2ce4511f84f2e9cefb8e7f99136 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 22 May 2024 03:13:39 -0700 Subject: [PATCH 310/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: M, Part 2 (#23773) Affects: - `mkh_studio/bully` - `mlego/m48/rev1` - `mlego/m60/rev1` - `mlego/m60_split/rev1` - `mlego/m60_split/rev2` - `mntre` - `mode/m65ha_alpha` - `mode/m65hi_alpha` - `mode/m65s` - `mode/m80v1/m80h` - `mode/m80v1/m80s` - `mode/m80v2/m80v2h` - `mode/m80v2/m80v2s` - `molecule` - `momoka_ergo` - `monarch` - `monsgeek/m1` - `monsgeek/m3` - `monsgeek/m5` - `monsgeek/m6` - `monstargear/xo87/rgb` - `monstargear/xo87/solderable` - `montsinger/rebound/rev1` - `montsinger/rebound/rev2` - `montsinger/rebound/rev3` - `montsinger/rebound/rev4` - `montsinger/rewind` - `moon` - `morizon` - `mountainblocks/mb17` - `mt/blocked65` - `mt/mt64rgb` - `mt/mt980` - `mtbkeys/mtb60/hotswap` - `mtbkeys/mtb60/solder` - `murcielago/rev1` - `mxss` - `mysticworks/wyvern` --- keyboards/mkh_studio/bully/config.h | 9 ----- keyboards/mkh_studio/bully/keyboard.json | 6 +++ keyboards/mlego/m48/config.h | 21 ---------- keyboards/mlego/m48/rev1/keyboard.json | 6 +++ keyboards/mlego/m60/config.h | 21 ---------- keyboards/mlego/m60/rev1/keyboard.json | 6 +++ keyboards/mlego/m60_split/config.h | 21 ---------- keyboards/mlego/m60_split/rev1/keyboard.json | 6 +++ keyboards/mlego/m60_split/rev2/keyboard.json | 6 +++ keyboards/mntre/config.h | 5 --- keyboards/mntre/keyboard.json | 6 +++ keyboards/mode/m65ha_alpha/config.h | 5 --- keyboards/mode/m65ha_alpha/keyboard.json | 6 +++ keyboards/mode/m65hi_alpha/config.h | 5 --- keyboards/mode/m65hi_alpha/keyboard.json | 6 +++ keyboards/mode/m65s/config.h | 5 --- keyboards/mode/m65s/keyboard.json | 6 ++- keyboards/mode/m80v1/config.h | 39 ------------------- keyboards/mode/m80v1/m80h/keyboard.json | 6 +++ keyboards/mode/m80v1/m80s/keyboard.json | 6 +++ keyboards/mode/m80v2/config.h | 23 ----------- keyboards/mode/m80v2/m80v2h/keyboard.json | 6 +++ keyboards/mode/m80v2/m80v2s/keyboard.json | 6 +++ keyboards/molecule/config.h | 5 --- keyboards/molecule/keyboard.json | 6 +++ keyboards/momoka_ergo/config.h | 5 --- keyboards/momoka_ergo/keyboard.json | 6 +++ keyboards/monarch/config.h | 5 --- keyboards/monarch/keyboard.json | 6 +++ keyboards/monsgeek/m1/config.h | 5 --- keyboards/monsgeek/m1/keyboard.json | 6 +++ keyboards/monsgeek/m3/config.h | 5 --- keyboards/monsgeek/m3/keyboard.json | 6 +++ keyboards/monsgeek/m5/config.h | 5 --- keyboards/monsgeek/m5/keyboard.json | 6 +++ keyboards/monsgeek/m6/config.h | 5 --- keyboards/monsgeek/m6/keyboard.json | 6 +++ keyboards/monstargear/xo87/rgb/config.h | 20 ---------- keyboards/monstargear/xo87/rgb/keyboard.json | 6 +++ .../monstargear/xo87/solderable/config.h | 3 -- .../monstargear/xo87/solderable/keyboard.json | 6 +++ keyboards/montsinger/rebound/rev1/config.h | 20 ---------- .../montsinger/rebound/rev1/keyboard.json | 6 +++ keyboards/montsinger/rebound/rev2/config.h | 20 ---------- .../montsinger/rebound/rev2/keyboard.json | 6 +++ keyboards/montsinger/rebound/rev3/config.h | 20 ---------- .../montsinger/rebound/rev3/keyboard.json | 6 +++ keyboards/montsinger/rebound/rev4/config.h | 20 ---------- .../montsinger/rebound/rev4/keyboard.json | 6 +++ keyboards/montsinger/rewind/config.h | 20 ---------- keyboards/montsinger/rewind/keyboard.json | 6 +++ keyboards/moon/config.h | 5 --- keyboards/moon/keyboard.json | 6 +++ keyboards/morizon/config.h | 23 ----------- keyboards/morizon/keyboard.json | 6 +++ keyboards/mountainblocks/mb17/config.h | 23 ----------- keyboards/mountainblocks/mb17/keyboard.json | 6 +++ keyboards/mt/blocked65/config.h | 23 ----------- keyboards/mt/blocked65/keyboard.json | 6 +++ keyboards/mt/mt64rgb/config.h | 5 --- keyboards/mt/mt64rgb/keyboard.json | 6 +++ keyboards/mt/mt980/config.h | 7 ---- keyboards/mt/mt980/keyboard.json | 6 +++ keyboards/mtbkeys/mtb60/hotswap/config.h | 24 ------------ keyboards/mtbkeys/mtb60/hotswap/keyboard.json | 6 +++ keyboards/mtbkeys/mtb60/solder/config.h | 24 ------------ keyboards/mtbkeys/mtb60/solder/keyboard.json | 6 +++ keyboards/murcielago/rev1/config.h | 5 --- keyboards/murcielago/rev1/keyboard.json | 6 +++ keyboards/mxss/config.h | 23 ----------- keyboards/mxss/keyboard.json | 6 +++ keyboards/mysticworks/wyvern/config.h | 22 ----------- keyboards/mysticworks/wyvern/keyboard.json | 6 +++ 73 files changed, 227 insertions(+), 497 deletions(-) delete mode 100644 keyboards/mkh_studio/bully/config.h delete mode 100644 keyboards/mlego/m48/config.h delete mode 100644 keyboards/mlego/m60/config.h delete mode 100644 keyboards/mlego/m60_split/config.h delete mode 100644 keyboards/mode/m80v1/config.h delete mode 100644 keyboards/mode/m80v2/config.h delete mode 100644 keyboards/monstargear/xo87/rgb/config.h delete mode 100644 keyboards/montsinger/rebound/rev1/config.h delete mode 100644 keyboards/montsinger/rebound/rev2/config.h delete mode 100644 keyboards/montsinger/rebound/rev3/config.h delete mode 100644 keyboards/montsinger/rebound/rev4/config.h delete mode 100644 keyboards/montsinger/rewind/config.h delete mode 100644 keyboards/morizon/config.h delete mode 100644 keyboards/mountainblocks/mb17/config.h delete mode 100644 keyboards/mt/blocked65/config.h delete mode 100644 keyboards/mt/mt980/config.h delete mode 100644 keyboards/mtbkeys/mtb60/hotswap/config.h delete mode 100644 keyboards/mtbkeys/mtb60/solder/config.h delete mode 100644 keyboards/mxss/config.h delete mode 100644 keyboards/mysticworks/wyvern/config.h diff --git a/keyboards/mkh_studio/bully/config.h b/keyboards/mkh_studio/bully/config.h deleted file mode 100644 index 53958accae1..00000000000 --- a/keyboards/mkh_studio/bully/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2022 zhol -// 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/mkh_studio/bully/keyboard.json b/keyboards/mkh_studio/bully/keyboard.json index ddd50665f6e..5102ffa632f 100644 --- a/keyboards/mkh_studio/bully/keyboard.json +++ b/keyboards/mkh_studio/bully/keyboard.json @@ -20,6 +20,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mlego/m48/config.h b/keyboards/mlego/m48/config.h deleted file mode 100644 index 70e1beb43e7..00000000000 --- a/keyboards/mlego/m48/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021-2022 alin m elena - * - * 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 diff --git a/keyboards/mlego/m48/rev1/keyboard.json b/keyboards/mlego/m48/rev1/keyboard.json index c8259424f3e..efd38882951 100644 --- a/keyboards/mlego/m48/rev1/keyboard.json +++ b/keyboards/mlego/m48/rev1/keyboard.json @@ -13,6 +13,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A15", "B3", "B4", "B5", "B7", "B6", "A1", "A2", "A3", "A4", "A5"], "rows": ["A6", "A7", "B0", "B10"] diff --git a/keyboards/mlego/m60/config.h b/keyboards/mlego/m60/config.h deleted file mode 100644 index 70e1beb43e7..00000000000 --- a/keyboards/mlego/m60/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021-2022 alin m elena - * - * 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 diff --git a/keyboards/mlego/m60/rev1/keyboard.json b/keyboards/mlego/m60/rev1/keyboard.json index 989474db830..126338b0c8e 100644 --- a/keyboards/mlego/m60/rev1/keyboard.json +++ b/keyboards/mlego/m60/rev1/keyboard.json @@ -13,6 +13,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A15", "B3", "B4", "B5", "B7", "B6", "A1", "A2", "A3", "A4", "A5"], "rows": ["A6", "A7", "B0", "B1", "B10"] diff --git a/keyboards/mlego/m60_split/config.h b/keyboards/mlego/m60_split/config.h deleted file mode 100644 index 70e1beb43e7..00000000000 --- a/keyboards/mlego/m60_split/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021-2022 alin m elena - * - * 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 diff --git a/keyboards/mlego/m60_split/rev1/keyboard.json b/keyboards/mlego/m60_split/rev1/keyboard.json index 9be9708081e..d0c6275dc9a 100644 --- a/keyboards/mlego/m60_split/rev1/keyboard.json +++ b/keyboards/mlego/m60_split/rev1/keyboard.json @@ -11,6 +11,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B14", "A10", "A15", "B3", "B4", "B5"], "rows": ["B0", "A6", "A7", "B1", "A5"] diff --git a/keyboards/mlego/m60_split/rev2/keyboard.json b/keyboards/mlego/m60_split/rev2/keyboard.json index 5185a2e6456..48d962f9cc0 100644 --- a/keyboards/mlego/m60_split/rev2/keyboard.json +++ b/keyboards/mlego/m60_split/rev2/keyboard.json @@ -11,6 +11,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B14", "A10", "A15", "B3", "B4", "B5"], "rows": ["B0", "A6", "A7", "B1", "A5"] diff --git a/keyboards/mntre/config.h b/keyboards/mntre/config.h index c12ca236724..1887ae7b3dd 100644 --- a/keyboards/mntre/config.h +++ b/keyboards/mntre/config.h @@ -5,11 +5,6 @@ #define BACKLIGHT_RESOLUTION 0x400 -/* 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. diff --git a/keyboards/mntre/keyboard.json b/keyboards/mntre/keyboard.json index 4e14dd19f53..26dc66dc48d 100644 --- a/keyboards/mntre/keyboard.json +++ b/keyboards/mntre/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "F7", "E6", "C7", "B3", "B2", "B1", "B0", "F0", "F1", "F4", "F5", "F6", "C6"], "rows": ["B6", "B5", "B4", "D7", "D6", "D4"] diff --git a/keyboards/mode/m65ha_alpha/config.h b/keyboards/mode/m65ha_alpha/config.h index 52f0c6784df..9f49dcabf7d 100644 --- a/keyboards/mode/m65ha_alpha/config.h +++ b/keyboards/mode/m65ha_alpha/config.h @@ -17,11 +17,6 @@ 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 EEPROM_I2C_24LC256 //#define I2C1_CLOCK_SPEED 400000 //#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 diff --git a/keyboards/mode/m65ha_alpha/keyboard.json b/keyboards/mode/m65ha_alpha/keyboard.json index 8297f3b2bd6..cc5271b5c2c 100644 --- a/keyboards/mode/m65ha_alpha/keyboard.json +++ b/keyboards/mode/m65ha_alpha/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B10", "B12", "C8", "C4", "C5", "B0", "C10", "B13", "B14", "B15", "A15", "C6", "C7", "A8", "C9"], "rows": ["A7", "A10", "D2", "C12", "B1", "C11"] diff --git a/keyboards/mode/m65hi_alpha/config.h b/keyboards/mode/m65hi_alpha/config.h index 52f0c6784df..9f49dcabf7d 100644 --- a/keyboards/mode/m65hi_alpha/config.h +++ b/keyboards/mode/m65hi_alpha/config.h @@ -17,11 +17,6 @@ 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 EEPROM_I2C_24LC256 //#define I2C1_CLOCK_SPEED 400000 //#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 diff --git a/keyboards/mode/m65hi_alpha/keyboard.json b/keyboards/mode/m65hi_alpha/keyboard.json index ff6c75f55be..c0c843d4de4 100644 --- a/keyboards/mode/m65hi_alpha/keyboard.json +++ b/keyboards/mode/m65hi_alpha/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B10", "B12", "C8", "C4", "C5", "B0", "C10", "B13", "B14", "B15", "A15", "C6", "C7", "A8", "C9"], "rows": ["A7", "A10", "D2", "C12", "B1", "C11"] diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h index 80d31d8d756..f41925995b5 100644 --- a/keyboards/mode/m65s/config.h +++ b/keyboards/mode/m65s/config.h @@ -17,11 +17,6 @@ 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 EEPROM_I2C_24LC128 //#define I2C1_CLOCK_SPEED 400000 //#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 diff --git a/keyboards/mode/m65s/keyboard.json b/keyboards/mode/m65s/keyboard.json index 8ed817a1801..ae8df282ad9 100644 --- a/keyboards/mode/m65s/keyboard.json +++ b/keyboards/mode/m65s/keyboard.json @@ -9,7 +9,11 @@ "device_version": "0.0.1" }, "qmk": { - "tap_keycode_delay": 50 + "tap_keycode_delay": 50, + "locking": { + "enabled": true, + "resync": true + } }, "features": { "bootmagic": true, diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h deleted file mode 100644 index 72ad3079054..00000000000 --- a/keyboards/mode/m80v1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Alvaro "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/mode/m80v1/m80h/keyboard.json b/keyboards/mode/m80v1/m80h/keyboard.json index 8d743dcb62f..dcebcb6d494 100644 --- a/keyboards/mode/m80v1/m80h/keyboard.json +++ b/keyboards/mode/m80v1/m80h/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B8", "B7", "B6", "B5", "B4", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5"], "rows": ["A10", "A15", "B3", "B9", "A3", "A4"] diff --git a/keyboards/mode/m80v1/m80s/keyboard.json b/keyboards/mode/m80v1/m80s/keyboard.json index f4585389344..27622de022b 100644 --- a/keyboards/mode/m80v1/m80s/keyboard.json +++ b/keyboards/mode/m80v1/m80s/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B8", "B7", "B6", "B5", "B4", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5"], "rows": ["A10", "A15", "B3", "B9", "A3", "A4"] diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h deleted file mode 100644 index d553d5d8942..00000000000 --- a/keyboards/mode/m80v2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - Copyright 2020 Á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 diff --git a/keyboards/mode/m80v2/m80v2h/keyboard.json b/keyboards/mode/m80v2/m80v2h/keyboard.json index e8bd7f2912b..1844e0775cd 100644 --- a/keyboards/mode/m80v2/m80v2h/keyboard.json +++ b/keyboards/mode/m80v2/m80v2h/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "A8", "A10", "B15", "A15", "B5", "B8", "C13"], "rows": ["B12", "B13", "B14", "B3", "B4", "B9"] diff --git a/keyboards/mode/m80v2/m80v2s/keyboard.json b/keyboards/mode/m80v2/m80v2s/keyboard.json index 8f5ecc9ac2e..8ab060668c9 100644 --- a/keyboards/mode/m80v2/m80v2s/keyboard.json +++ b/keyboards/mode/m80v2/m80v2s/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "A8", "A10", "B15", "A15", "B5", "B8", "C13"], "rows": ["B12", "B13", "B14", "B3", "B4", "B9"] diff --git a/keyboards/molecule/config.h b/keyboards/molecule/config.h index 1755979bbc8..3de5dc14cc4 100755 --- a/keyboards/molecule/config.h +++ b/keyboards/molecule/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . /* OLED */ #define OLED_TIMEOUT 0 -/* 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. diff --git a/keyboards/molecule/keyboard.json b/keyboards/molecule/keyboard.json index f3bd818122c..94c721f7524 100755 --- a/keyboards/molecule/keyboard.json +++ b/keyboards/molecule/keyboard.json @@ -14,6 +14,12 @@ "extrakey": true, "pointing_device": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "B6"] diff --git a/keyboards/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h index 54d60e9963f..dbd81b12135 100644 --- a/keyboards/momoka_ergo/config.h +++ b/keyboards/momoka_ergo/config.h @@ -19,10 +19,5 @@ along with this program. If not, see . #define SELECT_SOFT_SERIAL_SPEED 5 -/* 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 SPLIT_USB_DETECT #define EE_HANDS diff --git a/keyboards/momoka_ergo/keyboard.json b/keyboards/momoka_ergo/keyboard.json index da21c509b92..68fe1b308f5 100644 --- a/keyboards/momoka_ergo/keyboard.json +++ b/keyboards/momoka_ergo/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7"] diff --git a/keyboards/monarch/config.h b/keyboards/monarch/config.h index 30181978df9..aa89dc3eacf 100644 --- a/keyboards/monarch/config.h +++ b/keyboards/monarch/config.h @@ -23,11 +23,6 @@ along with this program. If not, see . #define SLEEP_LED_GPT_DRIVER GPTD1 -/* 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. diff --git a/keyboards/monarch/keyboard.json b/keyboards/monarch/keyboard.json index f5dee1f9f60..c42db64a26f 100644 --- a/keyboards/monarch/keyboard.json +++ b/keyboards/monarch/keyboard.json @@ -19,6 +19,12 @@ "nkro": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B10", "B2", "B1", "B0", "A5", "A7", "A4", "A3", "B6"], "rows": ["A15", "B3", "B11", "A2", "A1", "B9"] diff --git a/keyboards/monsgeek/m1/config.h b/keyboards/monsgeek/m1/config.h index 4aa60123309..4b6f30ded3f 100644 --- a/keyboards/monsgeek/m1/config.h +++ b/keyboards/monsgeek/m1/config.h @@ -16,11 +16,6 @@ #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 ENCODER_DEFAULT_POS 0x3 /* SPI Config for spi flash*/ diff --git a/keyboards/monsgeek/m1/keyboard.json b/keyboards/monsgeek/m1/keyboard.json index 5d5d030214c..1551b2a1137 100644 --- a/keyboards/monsgeek/m1/keyboard.json +++ b/keyboards/monsgeek/m1/keyboard.json @@ -21,6 +21,12 @@ "encoder": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": 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/monsgeek/m3/config.h b/keyboards/monsgeek/m3/config.h index ba77115d40f..c179436ca75 100644 --- a/keyboards/monsgeek/m3/config.h +++ b/keyboards/monsgeek/m3/config.h @@ -20,11 +20,6 @@ #define LED_MAC_OS_PIN C10 #define LED_WIN_LOCK_PIN C11 -/* 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 - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/monsgeek/m3/keyboard.json b/keyboards/monsgeek/m3/keyboard.json index 09ce11c4476..cb7c3abf212 100644 --- a/keyboards/monsgeek/m3/keyboard.json +++ b/keyboards/monsgeek/m3/keyboard.json @@ -26,6 +26,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "dynamic_keymap": { "layer_count": 6 }, diff --git a/keyboards/monsgeek/m5/config.h b/keyboards/monsgeek/m5/config.h index d18d1fdacdc..f7cedc4d41e 100644 --- a/keyboards/monsgeek/m5/config.h +++ b/keyboards/monsgeek/m5/config.h @@ -19,11 +19,6 @@ /* LED Indicators */ #define LED_WIN_LOCK_PIN C11 -/* 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 - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/monsgeek/m5/keyboard.json b/keyboards/monsgeek/m5/keyboard.json index 77d474d5db2..b9ef0099bc3 100644 --- a/keyboards/monsgeek/m5/keyboard.json +++ b/keyboards/monsgeek/m5/keyboard.json @@ -20,6 +20,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C1","C2","C3","A0","A1","A2","A3","A4","A5","A6","A7","C4","C5","B0","B1","B2","B10","B11","B12","B13","B14"], "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] diff --git a/keyboards/monsgeek/m6/config.h b/keyboards/monsgeek/m6/config.h index 3586c2cb466..d5131a1bb2a 100644 --- a/keyboards/monsgeek/m6/config.h +++ b/keyboards/monsgeek/m6/config.h @@ -16,11 +16,6 @@ #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 - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/monsgeek/m6/keyboard.json b/keyboards/monsgeek/m6/keyboard.json index 7931d0d1224..12d7def4c77 100644 --- a/keyboards/monsgeek/m6/keyboard.json +++ b/keyboards/monsgeek/m6/keyboard.json @@ -20,6 +20,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], "rows": ["C6", "C7", "C8", "C9", "A8"] diff --git a/keyboards/monstargear/xo87/rgb/config.h b/keyboards/monstargear/xo87/rgb/config.h deleted file mode 100644 index e32abb6630c..00000000000 --- a/keyboards/monstargear/xo87/rgb/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2021 datafx - * - * 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 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/monstargear/xo87/rgb/keyboard.json b/keyboards/monstargear/xo87/rgb/keyboard.json index cedc1868450..5571b919907 100644 --- a/keyboards/monstargear/xo87/rgb/keyboard.json +++ b/keyboards/monstargear/xo87/rgb/keyboard.json @@ -73,6 +73,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C5", "C3", "C1", "E1", "D6", "D2", "B7", "B3", "F6", "F7", "F3", "A5", "A1", "E2", "C7", "A6"], "rows": ["E6", "E7", "E3", "B0", "B1", "A2"] diff --git a/keyboards/monstargear/xo87/solderable/config.h b/keyboards/monstargear/xo87/solderable/config.h index 088e09dc81a..68da1addfa7 100644 --- a/keyboards/monstargear/xo87/solderable/config.h +++ b/keyboards/monstargear/xo87/solderable/config.h @@ -23,6 +23,3 @@ #define KEYLED_COLS 16 #define KEYLED_ROW_PINS { E5,B4,B5,F0,C6,D5 } #define KEYLED_COL_PINS { C4,C2,C0,E0,D4,E4,B6,B2,F4,A0,F2,A4,F1,A7,D3,A3 } - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/monstargear/xo87/solderable/keyboard.json b/keyboards/monstargear/xo87/solderable/keyboard.json index f8436f4bacd..a230649b49c 100644 --- a/keyboards/monstargear/xo87/solderable/keyboard.json +++ b/keyboards/monstargear/xo87/solderable/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C5", "C3", "C1", "E1", "D6", "D2", "B7", "B3", "F6", "F7", "F3", "A5", "A1", "E2", "C7", "A6"], "rows": ["E6", "E7", "E3", "B0", "B1", "A2"] diff --git a/keyboards/montsinger/rebound/rev1/config.h b/keyboards/montsinger/rebound/rev1/config.h deleted file mode 100644 index 274c715a937..00000000000 --- a/keyboards/montsinger/rebound/rev1/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Ross Montsinger -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 diff --git a/keyboards/montsinger/rebound/rev1/keyboard.json b/keyboards/montsinger/rebound/rev1/keyboard.json index 66ed41a6740..b03f0250688 100644 --- a/keyboards/montsinger/rebound/rev1/keyboard.json +++ b/keyboards/montsinger/rebound/rev1/keyboard.json @@ -15,6 +15,12 @@ "console": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D1", "B5", "B2", "B6"] diff --git a/keyboards/montsinger/rebound/rev2/config.h b/keyboards/montsinger/rebound/rev2/config.h deleted file mode 100644 index 274c715a937..00000000000 --- a/keyboards/montsinger/rebound/rev2/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Ross Montsinger -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 diff --git a/keyboards/montsinger/rebound/rev2/keyboard.json b/keyboards/montsinger/rebound/rev2/keyboard.json index a3a99247ab3..3bee7fc3efd 100644 --- a/keyboards/montsinger/rebound/rev2/keyboard.json +++ b/keyboards/montsinger/rebound/rev2/keyboard.json @@ -16,6 +16,12 @@ "command": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D1", "B5", "B2", "B6", "B0"] diff --git a/keyboards/montsinger/rebound/rev3/config.h b/keyboards/montsinger/rebound/rev3/config.h deleted file mode 100644 index 274c715a937..00000000000 --- a/keyboards/montsinger/rebound/rev3/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Ross Montsinger -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 diff --git a/keyboards/montsinger/rebound/rev3/keyboard.json b/keyboards/montsinger/rebound/rev3/keyboard.json index 630761b4013..a0d3fc6db84 100644 --- a/keyboards/montsinger/rebound/rev3/keyboard.json +++ b/keyboards/montsinger/rebound/rev3/keyboard.json @@ -16,6 +16,12 @@ "command": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"], "rows": ["F4", "F5", "D1", "D0", "B0"] diff --git a/keyboards/montsinger/rebound/rev4/config.h b/keyboards/montsinger/rebound/rev4/config.h deleted file mode 100644 index 274c715a937..00000000000 --- a/keyboards/montsinger/rebound/rev4/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Ross Montsinger -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 diff --git a/keyboards/montsinger/rebound/rev4/keyboard.json b/keyboards/montsinger/rebound/rev4/keyboard.json index ad17ca423ea..7497bdc80d0 100644 --- a/keyboards/montsinger/rebound/rev4/keyboard.json +++ b/keyboards/montsinger/rebound/rev4/keyboard.json @@ -16,6 +16,12 @@ "command": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5", "B2", "B3", "B1"], "rows": ["D1", "D0", "D4", "C6", "F7", "F6", "F5", "F4"] diff --git a/keyboards/montsinger/rewind/config.h b/keyboards/montsinger/rewind/config.h deleted file mode 100644 index 274c715a937..00000000000 --- a/keyboards/montsinger/rewind/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Ross Montsinger -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 diff --git a/keyboards/montsinger/rewind/keyboard.json b/keyboards/montsinger/rewind/keyboard.json index b8a70296633..ddb6ab64968 100644 --- a/keyboards/montsinger/rewind/keyboard.json +++ b/keyboards/montsinger/rewind/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["B5", "B4", "D2", "D3", "B2"] diff --git a/keyboards/moon/config.h b/keyboards/moon/config.h index dda16185227..ca4c770a3bc 100644 --- a/keyboards/moon/config.h +++ b/keyboards/moon/config.h @@ -21,8 +21,3 @@ along with this program. If not, see . /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 11 - -/* 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/moon/keyboard.json b/keyboards/moon/keyboard.json index 4c66cb51a9b..76d2c08f7e2 100644 --- a/keyboards/moon/keyboard.json +++ b/keyboards/moon/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "C6" }, diff --git a/keyboards/morizon/config.h b/keyboards/morizon/config.h deleted file mode 100644 index 5b0945d4d4b..00000000000 --- a/keyboards/morizon/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 Steven Karrmann - -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 diff --git a/keyboards/morizon/keyboard.json b/keyboards/morizon/keyboard.json index 440047c6902..73097dd113a 100644 --- a/keyboards/morizon/keyboard.json +++ b/keyboards/morizon/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/mountainblocks/mb17/config.h b/keyboards/mountainblocks/mb17/config.h deleted file mode 100644 index 2aca1d46b3b..00000000000 --- a/keyboards/mountainblocks/mb17/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 mechmerlin - -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 diff --git a/keyboards/mountainblocks/mb17/keyboard.json b/keyboards/mountainblocks/mb17/keyboard.json index dca8ca8ee97..9e9bb984066 100644 --- a/keyboards/mountainblocks/mb17/keyboard.json +++ b/keyboards/mountainblocks/mb17/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "E6", "D7", "C6"], "rows": ["F4", "B1", "B3", "B2", "B6"] diff --git a/keyboards/mt/blocked65/config.h b/keyboards/mt/blocked65/config.h deleted file mode 100644 index 28be4f1a5b4..00000000000 --- a/keyboards/mt/blocked65/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Evy Dekkers - -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 diff --git a/keyboards/mt/blocked65/keyboard.json b/keyboards/mt/blocked65/keyboard.json index 14e5942228d..9a0ce520430 100644 --- a/keyboards/mt/blocked65/keyboard.json +++ b/keyboards/mt/blocked65/keyboard.json @@ -35,6 +35,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h index 50c9ca5f64b..f69c778b8b6 100644 --- a/keyboards/mt/mt64rgb/config.h +++ b/keyboards/mt/mt64rgb/config.h @@ -18,8 +18,3 @@ #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND #define RGB_MATRIX_LED_COUNT 64 - -/* 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/mt/mt64rgb/keyboard.json b/keyboards/mt/mt64rgb/keyboard.json index 5dbcf309697..0858e85ecae 100644 --- a/keyboards/mt/mt64rgb/keyboard.json +++ b/keyboards/mt/mt64rgb/keyboard.json @@ -77,6 +77,12 @@ "rgblight": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"], "rows": ["D7", "D6", "D5", "D3", "D2"] diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/mt/mt980/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/mt/mt980/keyboard.json b/keyboards/mt/mt980/keyboard.json index 6ecc9f86108..2fa17224cb4 100644 --- a/keyboards/mt/mt980/keyboard.json +++ b/keyboards/mt/mt980/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h deleted file mode 100644 index 19881718ef2..00000000000 --- a/keyboards/mtbkeys/mtb60/hotswap/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 MTBKeys - -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 diff --git a/keyboards/mtbkeys/mtb60/hotswap/keyboard.json b/keyboards/mtbkeys/mtb60/hotswap/keyboard.json index 8d39de83230..cca7bb726ac 100644 --- a/keyboards/mtbkeys/mtb60/hotswap/keyboard.json +++ b/keyboards/mtbkeys/mtb60/hotswap/keyboard.json @@ -41,6 +41,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "B7", "B6", "F7", "C6", "C7", "F6", "F4", "F1", "F0", "F5", "E6"], "rows": ["D6", "D7", "B4", "B5", "D5"] diff --git a/keyboards/mtbkeys/mtb60/solder/config.h b/keyboards/mtbkeys/mtb60/solder/config.h deleted file mode 100644 index 19881718ef2..00000000000 --- a/keyboards/mtbkeys/mtb60/solder/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 MTBKeys - -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 diff --git a/keyboards/mtbkeys/mtb60/solder/keyboard.json b/keyboards/mtbkeys/mtb60/solder/keyboard.json index 1770e3a997a..1059f1fd76e 100644 --- a/keyboards/mtbkeys/mtb60/solder/keyboard.json +++ b/keyboards/mtbkeys/mtb60/solder/keyboard.json @@ -41,6 +41,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F0", "F5", "F6", "F7", "D5", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D0", "D1", "F4", "F1", "D2"] diff --git a/keyboards/murcielago/rev1/config.h b/keyboards/murcielago/rev1/config.h index 156f708632b..17f316d6af8 100644 --- a/keyboards/murcielago/rev1/config.h +++ b/keyboards/murcielago/rev1/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define EE_HANDS #define SPLIT_USB_DETECT -/* 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. diff --git a/keyboards/murcielago/rev1/keyboard.json b/keyboards/murcielago/rev1/keyboard.json index 2dd650666a2..39c2d4fc3d5 100644 --- a/keyboards/murcielago/rev1/keyboard.json +++ b/keyboards/murcielago/rev1/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "D7", "D6", "D4"], "rows": ["B4", "D5", "B3", "B2", "B1", "B0"] diff --git a/keyboards/mxss/config.h b/keyboards/mxss/config.h deleted file mode 100644 index 704da3911aa..00000000000 --- a/keyboards/mxss/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2018 Jumail Mundekkat / MxBlue - -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 diff --git a/keyboards/mxss/keyboard.json b/keyboards/mxss/keyboard.json index 08461574579..defa0ae6b7e 100644 --- a/keyboards/mxss/keyboard.json +++ b/keyboards/mxss/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/mysticworks/wyvern/config.h b/keyboards/mysticworks/wyvern/config.h deleted file mode 100644 index d025a3d4de6..00000000000 --- a/keyboards/mysticworks/wyvern/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Albert Dong - * - * 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 diff --git a/keyboards/mysticworks/wyvern/keyboard.json b/keyboards/mysticworks/wyvern/keyboard.json index ddc240dd8f3..77f2aa19bd4 100644 --- a/keyboards/mysticworks/wyvern/keyboard.json +++ b/keyboards/mysticworks/wyvern/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D0", "D1", "D5", "D3", "F7", "F6", "F5", "F4", "F1", "F0"] From 071434c04f77c3c277199982b3c4b5ffcd97618c Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 22 May 2024 03:17:43 -0700 Subject: [PATCH 311/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: L (#23771) Affects: - `labbe/labbeminiv1` - `labyrinth75` - `laneware/lpad` - `laneware/lw67` - `laneware/lw75` - `laneware/macro1` - `laneware/raindrop` - `laser_ninja/pumpkinpad` - `latincompass/latin47ble` - `lazydesigners/dimple/ortho` - `lazydesigners/dimple/staggered/rev1` - `lazydesigners/dimple/staggered/rev2` - `lazydesigners/dimple/staggered/rev3` - `lazydesigners/dimple` - `lazydesigners/the50` - `lazydesigners/the60/rev1` - `lets_split/rev1` - `lets_split/rev2` - `lfkeyboards/lfk65_hs` - `lfkeyboards/lfk78/revb` - `lfkeyboards/lfk78/revc` - `lfkeyboards/lfk78/revj` - `lfkeyboards/lfk87/reva` - `lfkeyboards/lfk87/revc` - `lfkeyboards/lfkpad` - `lfkeyboards/mini1800/reva` - `lfkeyboards/mini1800/revc` - `lfkeyboards/smk65/revb` - `lfkeyboards/smk65/revf` - `linworks/fave60` - `lizard_trick/tenkey_plusplus` - `lm_keyboard/lm60n` - `lucid/alexa` - `lucid/alexa_solder` - `lucid/kbd8x_hs` - `lucid/phantom_hs` - `lucid/phantom_solder` - `lucid/scarlet` - `lyso1/lck75` - `lyso1/lefishe` --- keyboards/labbe/labbeminiv1/config.h | 22 ---------- keyboards/labbe/labbeminiv1/keyboard.json | 6 +++ keyboards/labyrinth75/config.h | 39 ------------------ keyboards/labyrinth75/keyboard.json | 6 +++ keyboards/laneware/lpad/config.h | 10 ----- keyboards/laneware/lpad/keyboard.json | 6 +++ keyboards/laneware/lw67/config.h | 23 ----------- keyboards/laneware/lw67/keyboard.json | 6 +++ keyboards/laneware/lw75/config.h | 10 ----- keyboards/laneware/lw75/keyboard.json | 6 +++ keyboards/laneware/macro1/config.h | 26 ------------ keyboards/laneware/macro1/keyboard.json | 6 +++ keyboards/laneware/raindrop/config.h | 10 ----- keyboards/laneware/raindrop/keyboard.json | 6 +++ keyboards/laser_ninja/pumpkinpad/config.h | 22 ---------- .../laser_ninja/pumpkinpad/keyboard.json | 6 +++ keyboards/latincompass/latin47ble/config.h | 38 ----------------- .../latincompass/latin47ble/keyboard.json | 6 +++ keyboards/lazydesigners/dimple/config.h | 24 ----------- .../lazydesigners/dimple/ortho/keyboard.json | 6 +++ .../dimple/staggered/rev1/keyboard.json | 6 +++ .../dimple/staggered/rev2/keyboard.json | 6 +++ .../dimple/staggered/rev3/keyboard.json | 6 +++ keyboards/lazydesigners/the50/config.h | 7 ---- keyboards/lazydesigners/the50/keyboard.json | 6 +++ keyboards/lazydesigners/the60/rev1/config.h | 7 ---- .../lazydesigners/the60/rev1/keyboard.json | 6 +++ keyboards/lets_split/rev1/config.h | 40 ------------------ keyboards/lets_split/rev1/keyboard.json | 6 +++ keyboards/lets_split/rev2/config.h | 40 ------------------ keyboards/lets_split/rev2/keyboard.json | 6 +++ keyboards/lfkeyboards/lfk65_hs/config.h | 22 ---------- keyboards/lfkeyboards/lfk65_hs/keyboard.json | 6 +++ keyboards/lfkeyboards/lfk78/config.h | 5 --- .../lfkeyboards/lfk78/revb/keyboard.json | 6 +++ .../lfkeyboards/lfk78/revc/keyboard.json | 6 +++ .../lfkeyboards/lfk78/revj/keyboard.json | 6 +++ keyboards/lfkeyboards/lfk87/config.h | 5 --- .../lfkeyboards/lfk87/reva/keyboard.json | 6 +++ .../lfkeyboards/lfk87/revc/keyboard.json | 6 +++ keyboards/lfkeyboards/lfkpad/config.h | 39 ------------------ keyboards/lfkeyboards/lfkpad/keyboard.json | 6 +++ keyboards/lfkeyboards/mini1800/config.h | 5 --- .../lfkeyboards/mini1800/reva/keyboard.json | 6 +++ .../lfkeyboards/mini1800/revc/keyboard.json | 6 +++ keyboards/lfkeyboards/smk65/revb/config.h | 5 --- .../lfkeyboards/smk65/revb/keyboard.json | 6 +++ keyboards/lfkeyboards/smk65/revf/config.h | 5 --- .../lfkeyboards/smk65/revf/keyboard.json | 6 +++ keyboards/linworks/fave60/config.h | 25 ----------- keyboards/linworks/fave60/keyboard.json | 6 +++ .../lizard_trick/tenkey_plusplus/config.h | 40 ------------------ .../tenkey_plusplus/keyboard.json | 6 +++ keyboards/lm_keyboard/lm60n/config.h | 39 ------------------ keyboards/lm_keyboard/lm60n/keyboard.json | 6 +++ keyboards/lucid/alexa/config.h | 41 ------------------- keyboards/lucid/alexa/keyboard.json | 6 +++ keyboards/lucid/alexa_solder/config.h | 41 ------------------- keyboards/lucid/alexa_solder/keyboard.json | 6 +++ keyboards/lucid/kbd8x_hs/config.h | 41 ------------------- keyboards/lucid/kbd8x_hs/keyboard.json | 6 +++ keyboards/lucid/phantom_hs/config.h | 41 ------------------- keyboards/lucid/phantom_hs/keyboard.json | 6 +++ keyboards/lucid/phantom_solder/config.h | 41 ------------------- keyboards/lucid/phantom_solder/keyboard.json | 6 +++ keyboards/lucid/scarlet/config.h | 41 ------------------- keyboards/lucid/scarlet/keyboard.json | 6 +++ keyboards/lyso1/lck75/config.h | 7 ---- keyboards/lyso1/lck75/keyboard.json | 6 +++ keyboards/lyso1/lefishe/config.h | 24 ----------- keyboards/lyso1/lefishe/keyboard.json | 6 +++ 71 files changed, 234 insertions(+), 785 deletions(-) delete mode 100644 keyboards/labbe/labbeminiv1/config.h delete mode 100644 keyboards/labyrinth75/config.h delete mode 100644 keyboards/laneware/lpad/config.h delete mode 100644 keyboards/laneware/lw67/config.h delete mode 100644 keyboards/laneware/lw75/config.h delete mode 100644 keyboards/laneware/macro1/config.h delete mode 100644 keyboards/laneware/raindrop/config.h delete mode 100644 keyboards/laser_ninja/pumpkinpad/config.h delete mode 100644 keyboards/latincompass/latin47ble/config.h delete mode 100644 keyboards/lazydesigners/dimple/config.h delete mode 100644 keyboards/lazydesigners/the50/config.h delete mode 100755 keyboards/lazydesigners/the60/rev1/config.h delete mode 100644 keyboards/lets_split/rev1/config.h delete mode 100644 keyboards/lets_split/rev2/config.h delete mode 100644 keyboards/lfkeyboards/lfk65_hs/config.h delete mode 100644 keyboards/lfkeyboards/lfkpad/config.h delete mode 100644 keyboards/linworks/fave60/config.h delete mode 100644 keyboards/lizard_trick/tenkey_plusplus/config.h delete mode 100644 keyboards/lm_keyboard/lm60n/config.h delete mode 100644 keyboards/lucid/alexa/config.h delete mode 100644 keyboards/lucid/alexa_solder/config.h delete mode 100644 keyboards/lucid/kbd8x_hs/config.h delete mode 100644 keyboards/lucid/phantom_hs/config.h delete mode 100644 keyboards/lucid/phantom_solder/config.h delete mode 100644 keyboards/lucid/scarlet/config.h delete mode 100644 keyboards/lyso1/lefishe/config.h diff --git a/keyboards/labbe/labbeminiv1/config.h b/keyboards/labbe/labbeminiv1/config.h deleted file mode 100644 index 3b8a4eda99c..00000000000 --- a/keyboards/labbe/labbeminiv1/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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 \ No newline at end of file diff --git a/keyboards/labbe/labbeminiv1/keyboard.json b/keyboards/labbe/labbeminiv1/keyboard.json index 1bb3b6ff4bd..da53de3da5e 100644 --- a/keyboards/labbe/labbeminiv1/keyboard.json +++ b/keyboards/labbe/labbeminiv1/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4"], "rows": ["F5", "F6"] diff --git a/keyboards/labyrinth75/config.h b/keyboards/labyrinth75/config.h deleted file mode 100644 index 92a3858433b..00000000000 --- a/keyboards/labyrinth75/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Livi - -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/labyrinth75/keyboard.json b/keyboards/labyrinth75/keyboard.json index 5ff83582b1f..1e70a8318d3 100644 --- a/keyboards/labyrinth75/keyboard.json +++ b/keyboards/labyrinth75/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"], "rows": ["B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"] diff --git a/keyboards/laneware/lpad/config.h b/keyboards/laneware/lpad/config.h deleted file mode 100644 index ce4da1d32e6..00000000000 --- a/keyboards/laneware/lpad/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2023 Laneware Peripherals -// 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/laneware/lpad/keyboard.json b/keyboards/laneware/lpad/keyboard.json index d143b363b30..464205846b8 100644 --- a/keyboards/laneware/lpad/keyboard.json +++ b/keyboards/laneware/lpad/keyboard.json @@ -19,6 +19,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D4", "D6"], "rows": ["E6", "B7", "D0"] diff --git a/keyboards/laneware/lw67/config.h b/keyboards/laneware/lw67/config.h deleted file mode 100644 index c9f23257a35..00000000000 --- a/keyboards/laneware/lw67/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Laneware Peripherals - * - * 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 diff --git a/keyboards/laneware/lw67/keyboard.json b/keyboards/laneware/lw67/keyboard.json index 08c5bc355cb..e48506f58ed 100644 --- a/keyboards/laneware/lw67/keyboard.json +++ b/keyboards/laneware/lw67/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "B0", "B1"], "rows": ["E6", "B7", "D0", "D1", "D2"] diff --git a/keyboards/laneware/lw75/config.h b/keyboards/laneware/lw75/config.h deleted file mode 100644 index ce4da1d32e6..00000000000 --- a/keyboards/laneware/lw75/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2023 Laneware Peripherals -// 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/laneware/lw75/keyboard.json b/keyboards/laneware/lw75/keyboard.json index 7fae15b1758..27601d1e280 100644 --- a/keyboards/laneware/lw75/keyboard.json +++ b/keyboards/laneware/lw75/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "B0", "B2"], "rows": ["E6", "B7", "D0", "D1", "D2", "B1"] diff --git a/keyboards/laneware/macro1/config.h b/keyboards/laneware/macro1/config.h deleted file mode 100644 index 30b3906f0da..00000000000 --- a/keyboards/laneware/macro1/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2021 Laneware Peripherals - * - * 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 - - - diff --git a/keyboards/laneware/macro1/keyboard.json b/keyboards/laneware/macro1/keyboard.json index ea9be78cd34..a432db59152 100644 --- a/keyboards/laneware/macro1/keyboard.json +++ b/keyboards/laneware/macro1/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D4", "D6", "D7"], "rows": ["E6", "B7", "D0", "D1", "D2", "B3"] diff --git a/keyboards/laneware/raindrop/config.h b/keyboards/laneware/raindrop/config.h deleted file mode 100644 index 1f083ec616b..00000000000 --- a/keyboards/laneware/raindrop/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2023 QMK -// 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/laneware/raindrop/keyboard.json b/keyboards/laneware/raindrop/keyboard.json index d1896a41b45..4e5d674b2b4 100644 --- a/keyboards/laneware/raindrop/keyboard.json +++ b/keyboards/laneware/raindrop/keyboard.json @@ -23,6 +23,12 @@ "command": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_64_ansi_split_bs" }, diff --git a/keyboards/laser_ninja/pumpkinpad/config.h b/keyboards/laser_ninja/pumpkinpad/config.h deleted file mode 100644 index fbb4aaafcef..00000000000 --- a/keyboards/laser_ninja/pumpkinpad/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2022 Joah Nelson (Jels) - * - * 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 diff --git a/keyboards/laser_ninja/pumpkinpad/keyboard.json b/keyboards/laser_ninja/pumpkinpad/keyboard.json index 3908e99fc28..64e62911a60 100644 --- a/keyboards/laser_ninja/pumpkinpad/keyboard.json +++ b/keyboards/laser_ninja/pumpkinpad/keyboard.json @@ -14,6 +14,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["A9", "B3", "B9", "NO_PIN"], diff --git a/keyboards/latincompass/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h deleted file mode 100644 index 4551532bfa7..00000000000 --- a/keyboards/latincompass/latin47ble/config.h +++ /dev/null @@ -1,38 +0,0 @@ - /* Copyright 2020 haierwangwei2005 - * - * 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/latincompass/latin47ble/keyboard.json b/keyboards/latincompass/latin47ble/keyboard.json index b0b14d66446..ac07f68152f 100644 --- a/keyboards/latincompass/latin47ble/keyboard.json +++ b/keyboards/latincompass/latin47ble/keyboard.json @@ -48,6 +48,12 @@ "rgblight": true, "bluetooth": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h deleted file mode 100644 index 5a7ea57b432..00000000000 --- a/keyboards/lazydesigners/dimple/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2019 Erovia - -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 diff --git a/keyboards/lazydesigners/dimple/ortho/keyboard.json b/keyboards/lazydesigners/dimple/ortho/keyboard.json index f5c0cf3ad0f..08a6dc264c8 100644 --- a/keyboards/lazydesigners/dimple/ortho/keyboard.json +++ b/keyboards/lazydesigners/dimple/ortho/keyboard.json @@ -14,6 +14,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D0", "D1", "D2", "D3"] diff --git a/keyboards/lazydesigners/dimple/staggered/rev1/keyboard.json b/keyboards/lazydesigners/dimple/staggered/rev1/keyboard.json index bc5822214ab..4afe83df486 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev1/keyboard.json +++ b/keyboards/lazydesigners/dimple/staggered/rev1/keyboard.json @@ -6,6 +6,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/lazydesigners/dimple/staggered/rev2/keyboard.json b/keyboards/lazydesigners/dimple/staggered/rev2/keyboard.json index d8b051db650..013f2aa8332 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev2/keyboard.json +++ b/keyboards/lazydesigners/dimple/staggered/rev2/keyboard.json @@ -5,6 +5,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/keyboard.json b/keyboards/lazydesigners/dimple/staggered/rev3/keyboard.json index 9262048c8ab..f82a2bb379d 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev3/keyboard.json +++ b/keyboards/lazydesigners/dimple/staggered/rev3/keyboard.json @@ -6,6 +6,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "B7" }, diff --git a/keyboards/lazydesigners/the50/config.h b/keyboards/lazydesigners/the50/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/lazydesigners/the50/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/lazydesigners/the50/keyboard.json b/keyboards/lazydesigners/the50/keyboard.json index 75e39ab0ca0..1039625f066 100644 --- a/keyboards/lazydesigners/the50/keyboard.json +++ b/keyboards/lazydesigners/the50/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/lazydesigners/the60/rev1/config.h b/keyboards/lazydesigners/the60/rev1/config.h deleted file mode 100755 index 5f360813239..00000000000 --- a/keyboards/lazydesigners/the60/rev1/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/lazydesigners/the60/rev1/keyboard.json b/keyboards/lazydesigners/the60/rev1/keyboard.json index f06e695bf42..815cf8e04d9 100755 --- a/keyboards/lazydesigners/the60/rev1/keyboard.json +++ b/keyboards/lazydesigners/the60/rev1/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h deleted file mode 100644 index 0b8941e7760..00000000000 --- a/keyboards/lets_split/rev1/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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/lets_split/rev1/keyboard.json b/keyboards/lets_split/rev1/keyboard.json index ec85e70519f..49bbcbabc97 100644 --- a/keyboards/lets_split/rev1/keyboard.json +++ b/keyboards/lets_split/rev1/keyboard.json @@ -27,6 +27,12 @@ "extrakey": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h deleted file mode 100644 index 0b8941e7760..00000000000 --- a/keyboards/lets_split/rev2/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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/lets_split/rev2/keyboard.json b/keyboards/lets_split/rev2/keyboard.json index 81ad2606b8d..13da4f9624a 100644 --- a/keyboards/lets_split/rev2/keyboard.json +++ b/keyboards/lets_split/rev2/keyboard.json @@ -27,6 +27,12 @@ "extrakey": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/lfkeyboards/lfk65_hs/config.h b/keyboards/lfkeyboards/lfk65_hs/config.h deleted file mode 100644 index 7bc78f68d69..00000000000 --- a/keyboards/lfkeyboards/lfk65_hs/config.h +++ /dev/null @@ -1,22 +0,0 @@ -#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/lfkeyboards/lfk65_hs/keyboard.json b/keyboards/lfkeyboards/lfk65_hs/keyboard.json index 0034fced4aa..fac1e5969df 100644 --- a/keyboards/lfkeyboards/lfk65_hs/keyboard.json +++ b/keyboards/lfkeyboards/lfk65_hs/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x6064", "device_version": "0.0.1" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F4", "B7", "D5", "D3", "D2", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B0", "B3", "B2", "B1", "F5"] diff --git a/keyboards/lfkeyboards/lfk78/config.h b/keyboards/lfkeyboards/lfk78/config.h index 99c39042138..2118c4d2029 100644 --- a/keyboards/lfkeyboards/lfk78/config.h +++ b/keyboards/lfkeyboards/lfk78/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define AUDIO_PIN C6 #define AUDIO_VOICES -/* 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. diff --git a/keyboards/lfkeyboards/lfk78/revb/keyboard.json b/keyboards/lfkeyboards/lfk78/revb/keyboard.json index 7a4d881692b..a4c0d83902a 100644 --- a/keyboards/lfkeyboards/lfk78/revb/keyboard.json +++ b/keyboards/lfkeyboards/lfk78/revb/keyboard.json @@ -21,6 +21,12 @@ "extrakey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lfkeyboards/lfk78/revc/keyboard.json b/keyboards/lfkeyboards/lfk78/revc/keyboard.json index e1788b68565..56ab9b49bee 100644 --- a/keyboards/lfkeyboards/lfk78/revc/keyboard.json +++ b/keyboards/lfkeyboards/lfk78/revc/keyboard.json @@ -21,6 +21,12 @@ "extrakey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lfkeyboards/lfk78/revj/keyboard.json b/keyboards/lfkeyboards/lfk78/revj/keyboard.json index 725425f0124..df8ac8d0f61 100644 --- a/keyboards/lfkeyboards/lfk78/revj/keyboard.json +++ b/keyboards/lfkeyboards/lfk78/revj/keyboard.json @@ -22,6 +22,12 @@ "nkro": true, "audio": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lfkeyboards/lfk87/config.h b/keyboards/lfkeyboards/lfk87/config.h index 84c2fd11dcb..469d237b861 100644 --- a/keyboards/lfkeyboards/lfk87/config.h +++ b/keyboards/lfkeyboards/lfk87/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define AUDIO_VOICES #define AUDIO_PIN C6 -/* 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. diff --git a/keyboards/lfkeyboards/lfk87/reva/keyboard.json b/keyboards/lfkeyboards/lfk87/reva/keyboard.json index 95b5ff81b7e..c0f3407308d 100644 --- a/keyboards/lfkeyboards/lfk87/reva/keyboard.json +++ b/keyboards/lfkeyboards/lfk87/reva/keyboard.json @@ -1,6 +1,12 @@ { "processor": "at90usb1286", "bootloader": "atmel-dfu", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "E6", "E7", "F0", "F1", "F2", "F3", "C0", "C1", "C2"], "rows": ["D2", "D3", "D4", "D5", "D6", "D7"] diff --git a/keyboards/lfkeyboards/lfk87/revc/keyboard.json b/keyboards/lfkeyboards/lfk87/revc/keyboard.json index cf8c74397f3..579f153b85b 100644 --- a/keyboards/lfkeyboards/lfk87/revc/keyboard.json +++ b/keyboards/lfkeyboards/lfk87/revc/keyboard.json @@ -1,6 +1,12 @@ { "processor": "at90usb646", "bootloader": "atmel-dfu", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C1", "C0", "E1", "E0", "C2", "C3", "C4"], "rows": ["F2", "D7", "D6", "D5", "D4", "D3", "F3"] diff --git a/keyboards/lfkeyboards/lfkpad/config.h b/keyboards/lfkeyboards/lfkpad/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/lfkeyboards/lfkpad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/lfkeyboards/lfkpad/keyboard.json b/keyboards/lfkeyboards/lfkpad/keyboard.json index 50e02cb7ee4..6de415b8e01 100644 --- a/keyboards/lfkeyboards/lfkpad/keyboard.json +++ b/keyboards/lfkeyboards/lfkpad/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "D4", "D6"], "rows": ["D5", "F4", "F6", "F7", "C7", "C6"] diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h index 84c2fd11dcb..469d237b861 100644 --- a/keyboards/lfkeyboards/mini1800/config.h +++ b/keyboards/lfkeyboards/mini1800/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define AUDIO_VOICES #define AUDIO_PIN C6 -/* 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. diff --git a/keyboards/lfkeyboards/mini1800/reva/keyboard.json b/keyboards/lfkeyboards/mini1800/reva/keyboard.json index 8d93a054e4d..8745b077e98 100644 --- a/keyboards/lfkeyboards/mini1800/reva/keyboard.json +++ b/keyboards/lfkeyboards/mini1800/reva/keyboard.json @@ -8,5 +8,11 @@ "nkro": true, "audio": true, "watchdog": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } } } diff --git a/keyboards/lfkeyboards/mini1800/revc/keyboard.json b/keyboards/lfkeyboards/mini1800/revc/keyboard.json index 408181d3280..592998cc0e7 100644 --- a/keyboards/lfkeyboards/mini1800/revc/keyboard.json +++ b/keyboards/lfkeyboards/mini1800/revc/keyboard.json @@ -8,5 +8,11 @@ "nkro": true, "audio": true, "watchdog": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } } } diff --git a/keyboards/lfkeyboards/smk65/revb/config.h b/keyboards/lfkeyboards/smk65/revb/config.h index 38b05291788..c8af878df71 100644 --- a/keyboards/lfkeyboards/smk65/revb/config.h +++ b/keyboards/lfkeyboards/smk65/revb/config.h @@ -30,11 +30,6 @@ along with this program. If not, see . #define AUDIO_VOICES #define AUDIO_PIN C6 -/* 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. diff --git a/keyboards/lfkeyboards/smk65/revb/keyboard.json b/keyboards/lfkeyboards/smk65/revb/keyboard.json index 148465d27db..f7b4078b8a6 100644 --- a/keyboards/lfkeyboards/smk65/revb/keyboard.json +++ b/keyboards/lfkeyboards/smk65/revb/keyboard.json @@ -4,6 +4,12 @@ }, "processor": "at90usb646", "bootloader": "atmel-dfu", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi" }, diff --git a/keyboards/lfkeyboards/smk65/revf/config.h b/keyboards/lfkeyboards/smk65/revf/config.h index 9e32ac9d3fe..74296c7286e 100644 --- a/keyboards/lfkeyboards/smk65/revf/config.h +++ b/keyboards/lfkeyboards/smk65/revf/config.h @@ -31,11 +31,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* 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. diff --git a/keyboards/lfkeyboards/smk65/revf/keyboard.json b/keyboards/lfkeyboards/smk65/revf/keyboard.json index 63e9d0abc75..4e8a44d3bcb 100644 --- a/keyboards/lfkeyboards/smk65/revf/keyboard.json +++ b/keyboards/lfkeyboards/smk65/revf/keyboard.json @@ -4,6 +4,12 @@ }, "processor": "atmega32u4", "bootloader": "halfkay", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/linworks/fave60/config.h b/keyboards/linworks/fave60/config.h deleted file mode 100644 index 55402104ddb..00000000000 --- a/keyboards/linworks/fave60/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2020 Moritz Plattner - -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 - diff --git a/keyboards/linworks/fave60/keyboard.json b/keyboards/linworks/fave60/keyboard.json index c801c594cae..5b9a14b43fa 100644 --- a/keyboards/linworks/fave60/keyboard.json +++ b/keyboards/linworks/fave60/keyboard.json @@ -33,6 +33,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D6", "D4", "B5", "B4", "B6", "C6", "C7", "F4", "F0", "E6", "D1", "D2", "D3", "D5", "B0"], "rows": ["F6", "F7", "D7", "F1", "D0"] diff --git a/keyboards/lizard_trick/tenkey_plusplus/config.h b/keyboards/lizard_trick/tenkey_plusplus/config.h deleted file mode 100644 index 960e9ea0198..00000000000 --- a/keyboards/lizard_trick/tenkey_plusplus/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2020 Jonathon Carstens jonathon@lizardtrick.com - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#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/lizard_trick/tenkey_plusplus/keyboard.json b/keyboards/lizard_trick/tenkey_plusplus/keyboard.json index 9371ef22d66..0877d99885c 100644 --- a/keyboards/lizard_trick/tenkey_plusplus/keyboard.json +++ b/keyboards/lizard_trick/tenkey_plusplus/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "F7"], "rows": ["B7", "D4", "B5", "B6", "C6", "C7"] diff --git a/keyboards/lm_keyboard/lm60n/config.h b/keyboards/lm_keyboard/lm60n/config.h deleted file mode 100644 index aea945a035d..00000000000 --- a/keyboards/lm_keyboard/lm60n/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 gkeyboard - -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/lm_keyboard/lm60n/keyboard.json b/keyboards/lm_keyboard/lm60n/keyboard.json index fe7b1b946e8..f12bdec0316 100644 --- a/keyboards/lm_keyboard/lm60n/keyboard.json +++ b/keyboards/lm_keyboard/lm60n/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "C6", "B6", "B5", "F4", "F0", "E6"], "rows": ["F1", "F5", "F6", "F7", "B3", "B2", "B1"] diff --git a/keyboards/lucid/alexa/config.h b/keyboards/lucid/alexa/config.h deleted file mode 100644 index 2b4eb9c9106..00000000000 --- a/keyboards/lucid/alexa/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/lucid/alexa/keyboard.json b/keyboards/lucid/alexa/keyboard.json index 4c2bd739ca5..3acedb42001 100644 --- a/keyboards/lucid/alexa/keyboard.json +++ b/keyboards/lucid/alexa/keyboard.json @@ -25,6 +25,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs"], "layouts": { "LAYOUT_65_ansi_blocker_split_bs": { diff --git a/keyboards/lucid/alexa_solder/config.h b/keyboards/lucid/alexa_solder/config.h deleted file mode 100644 index 80a707a180b..00000000000 --- a/keyboards/lucid/alexa_solder/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2022 - -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/lucid/alexa_solder/keyboard.json b/keyboards/lucid/alexa_solder/keyboard.json index 881fed5deee..8460462a33d 100644 --- a/keyboards/lucid/alexa_solder/keyboard.json +++ b/keyboards/lucid/alexa_solder/keyboard.json @@ -25,6 +25,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": [ "65_ansi_blocker", "65_ansi_blocker_split_bs", diff --git a/keyboards/lucid/kbd8x_hs/config.h b/keyboards/lucid/kbd8x_hs/config.h deleted file mode 100644 index bedbdb7de73..00000000000 --- a/keyboards/lucid/kbd8x_hs/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2020 - -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/lucid/kbd8x_hs/keyboard.json b/keyboards/lucid/kbd8x_hs/keyboard.json index a542cde0239..78d25642583 100644 --- a/keyboards/lucid/kbd8x_hs/keyboard.json +++ b/keyboards/lucid/kbd8x_hs/keyboard.json @@ -25,6 +25,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/lucid/phantom_hs/config.h b/keyboards/lucid/phantom_hs/config.h deleted file mode 100644 index bedbdb7de73..00000000000 --- a/keyboards/lucid/phantom_hs/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2020 - -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/lucid/phantom_hs/keyboard.json b/keyboards/lucid/phantom_hs/keyboard.json index ce331051670..fbaa45af89c 100644 --- a/keyboards/lucid/phantom_hs/keyboard.json +++ b/keyboards/lucid/phantom_hs/keyboard.json @@ -25,6 +25,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/lucid/phantom_solder/config.h b/keyboards/lucid/phantom_solder/config.h deleted file mode 100644 index bedbdb7de73..00000000000 --- a/keyboards/lucid/phantom_solder/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2020 - -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/lucid/phantom_solder/keyboard.json b/keyboards/lucid/phantom_solder/keyboard.json index 53ba8eaeaa8..bfa3e08df60 100644 --- a/keyboards/lucid/phantom_solder/keyboard.json +++ b/keyboards/lucid/phantom_solder/keyboard.json @@ -25,6 +25,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": [ "65_ansi_blocker", "65_ansi_blocker_split_bs", diff --git a/keyboards/lucid/scarlet/config.h b/keyboards/lucid/scarlet/config.h deleted file mode 100644 index bedbdb7de73..00000000000 --- a/keyboards/lucid/scarlet/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2020 - -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/lucid/scarlet/keyboard.json b/keyboards/lucid/scarlet/keyboard.json index bcd56281c0d..c2cd914b06b 100644 --- a/keyboards/lucid/scarlet/keyboard.json +++ b/keyboards/lucid/scarlet/keyboard.json @@ -22,6 +22,12 @@ "command": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_tkl_all": { "layout": [ diff --git a/keyboards/lyso1/lck75/config.h b/keyboards/lyso1/lck75/config.h index b7ade40289a..9968249aa47 100644 --- a/keyboards/lyso1/lck75/config.h +++ b/keyboards/lyso1/lck75/config.h @@ -32,13 +32,6 @@ along with this program. If not, see . /* #define NO_AUTO_SHIFT_SPECIAL */ /* #define NO_AUTO_SHIFT_NUMERIC */ -#ifdef LOCKING_SUPPORT_ENABLE -# undef LOCKING_SUPPORT_ENABLE -#endif -#ifdef LOCKING_RESYNC_ENABLE -# undef LOCKING_RESYNC_ENABLE -#endif - #define PERMISSIVE_HOLD #define NO_ACTION_ONESHOT diff --git a/keyboards/lyso1/lck75/keyboard.json b/keyboards/lyso1/lck75/keyboard.json index a161172d490..714248bad33 100644 --- a/keyboards/lyso1/lck75/keyboard.json +++ b/keyboards/lyso1/lck75/keyboard.json @@ -29,6 +29,12 @@ "encoder": true, "wpm": true }, + "qmk": { + "locking": { + "enabled": false, + "resync": false + } + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/lyso1/lefishe/config.h b/keyboards/lyso1/lefishe/config.h deleted file mode 100644 index 5f12ded8443..00000000000 --- a/keyboards/lyso1/lefishe/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/*Copyright 2019 Lyso1 - -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 - diff --git a/keyboards/lyso1/lefishe/keyboard.json b/keyboards/lyso1/lefishe/keyboard.json index d2036895658..6104f47e470 100644 --- a/keyboards/lyso1/lefishe/keyboard.json +++ b/keyboards/lyso1/lefishe/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "D5", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B3", "B2", "B1"], "rows": ["B7", "F7", "F6", "F5", "F4"] From 16d2db5048acedfc9dd5f8e85ca19e50f139ba13 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 22 May 2024 11:06:09 -0700 Subject: [PATCH 312/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: I-J (#23767) Affects: - `ianklug/grooveboard` - `ibm/model_m/modelh` - `ibm/model_m_122/ibm122m` - `ibnuda/gurindam` - `idb/idb_60` - `idobao/id75/v1` - `idobao/id75/v2` - `idobao/id96` - `idobao/montex/v1` - `illuminati/is0` - `illusion/rosa` - `ilumkb/primus75` - `ilumkb/volcano660` - `inland/kb83` - `input_club/ergodox_infinity` - `irene` - `iriskeyboards` - `iron180` - `jacky_studio/bear_65/rev1` - `jacky_studio/bear_65/rev2` - `jacky_studio/s7_elephant/rev1` - `jacky_studio/s7_elephant/rev2` - `jadookb/jkb65` - `jae/j01` - `jagdpietr/drakon` - `jd40` - `jd45` - `jels/boaty` - `jels/jels60/v1` - `jels/jels60/v2` - `jels/jels88` - `jolofsor/denial75` - `jorne/rev1` - `joshajohnson/hub16` - `joshajohnson/hub20` - `jukaie/jk01` --- keyboards/ianklug/grooveboard/config.h | 39 ------------------- keyboards/ianklug/grooveboard/keyboard.json | 6 +++ keyboards/ibm/model_m/modelh/config.h | 6 --- keyboards/ibm/model_m/modelh/keyboard.json | 6 +++ keyboards/ibm/model_m_122/ibm122m/config.h | 5 --- .../ibm/model_m_122/ibm122m/keyboard.json | 6 +++ keyboards/ibnuda/gurindam/config.h | 39 ------------------- keyboards/ibnuda/gurindam/keyboard.json | 6 +++ keyboards/idb/idb_60/config.h | 39 ------------------- keyboards/idb/idb_60/keyboard.json | 6 +++ keyboards/idobao/id75/v1/config.h | 39 ------------------- keyboards/idobao/id75/v1/keyboard.json | 6 +++ keyboards/idobao/id75/v2/config.h | 38 ------------------ keyboards/idobao/id75/v2/keyboard.json | 6 +++ keyboards/idobao/id96/config.h | 25 ------------ keyboards/idobao/id96/keyboard.json | 6 +++ keyboards/idobao/montex/v1/config.h | 23 ----------- keyboards/idobao/montex/v1/keyboard.json | 6 +++ keyboards/illuminati/is0/config.h | 39 ------------------- keyboards/illuminati/is0/keyboard.json | 6 +++ keyboards/illusion/rosa/config.h | 23 ----------- keyboards/illusion/rosa/keyboard.json | 6 +++ keyboards/ilumkb/primus75/config.h | 22 ----------- keyboards/ilumkb/primus75/keyboard.json | 6 +++ keyboards/ilumkb/volcano660/config.h | 21 ---------- keyboards/ilumkb/volcano660/keyboard.json | 6 +++ keyboards/inland/kb83/config.h | 5 --- keyboards/inland/kb83/keyboard.json | 6 ++- .../input_club/ergodox_infinity/config.h | 5 --- .../input_club/ergodox_infinity/keyboard.json | 6 +++ keyboards/irene/config.h | 39 ------------------- keyboards/irene/keyboard.json | 6 +++ keyboards/iriskeyboards/config.h | 39 ------------------- keyboards/iriskeyboards/keyboard.json | 6 +++ keyboards/iron180/config.h | 5 --- keyboards/iron180/keyboard.json | 6 +++ keyboards/jacky_studio/bear_65/config.h | 10 ----- .../jacky_studio/bear_65/rev1/keyboard.json | 6 +++ .../jacky_studio/bear_65/rev2/keyboard.json | 6 +++ .../jacky_studio/s7_elephant/rev1/config.h | 23 ----------- .../s7_elephant/rev1/keyboard.json | 6 +++ .../jacky_studio/s7_elephant/rev2/config.h | 23 ----------- .../s7_elephant/rev2/keyboard.json | 6 +++ keyboards/jadookb/jkb65/config.h | 3 -- keyboards/jadookb/jkb65/info.json | 6 +++ keyboards/jae/j01/config.h | 39 ------------------- keyboards/jae/j01/keyboard.json | 6 +++ keyboards/jagdpietr/drakon/config.h | 39 ------------------- keyboards/jagdpietr/drakon/keyboard.json | 6 +++ keyboards/jd40/config.h | 23 ----------- keyboards/jd40/keyboard.json | 6 +++ keyboards/jd45/config.h | 39 ------------------- keyboards/jd45/keyboard.json | 6 +++ keyboards/jels/boaty/config.h | 23 ----------- keyboards/jels/boaty/keyboard.json | 6 +++ keyboards/jels/jels60/v1/config.h | 23 ----------- keyboards/jels/jels60/v1/keyboard.json | 6 +++ keyboards/jels/jels60/v2/config.h | 22 ----------- keyboards/jels/jels60/v2/keyboard.json | 6 +++ keyboards/jels/jels88/config.h | 22 ----------- keyboards/jels/jels88/keyboard.json | 6 +++ keyboards/jolofsor/denial75/config.h | 7 ---- keyboards/jolofsor/denial75/keyboard.json | 6 +++ keyboards/jorne/rev1/config.h | 9 ----- keyboards/jorne/rev1/keyboard.json | 6 +++ keyboards/joshajohnson/hub16/config.h | 5 --- keyboards/joshajohnson/hub16/keyboard.json | 6 +++ keyboards/joshajohnson/hub20/config.h | 24 ------------ keyboards/joshajohnson/hub20/keyboard.json | 6 ++- keyboards/jukaie/jk01/config.h | 5 --- keyboards/jukaie/jk01/keyboard.json | 6 ++- 71 files changed, 213 insertions(+), 793 deletions(-) delete mode 100644 keyboards/ianklug/grooveboard/config.h delete mode 100644 keyboards/ibnuda/gurindam/config.h delete mode 100644 keyboards/idb/idb_60/config.h delete mode 100644 keyboards/idobao/id75/v1/config.h delete mode 100644 keyboards/idobao/id75/v2/config.h delete mode 100644 keyboards/idobao/id96/config.h delete mode 100644 keyboards/idobao/montex/v1/config.h delete mode 100644 keyboards/illuminati/is0/config.h delete mode 100644 keyboards/illusion/rosa/config.h delete mode 100644 keyboards/ilumkb/primus75/config.h delete mode 100644 keyboards/ilumkb/volcano660/config.h delete mode 100644 keyboards/irene/config.h delete mode 100644 keyboards/iriskeyboards/config.h delete mode 100644 keyboards/jacky_studio/bear_65/config.h delete mode 100644 keyboards/jacky_studio/s7_elephant/rev1/config.h delete mode 100644 keyboards/jacky_studio/s7_elephant/rev2/config.h delete mode 100644 keyboards/jae/j01/config.h delete mode 100644 keyboards/jagdpietr/drakon/config.h delete mode 100644 keyboards/jd40/config.h delete mode 100644 keyboards/jd45/config.h delete mode 100644 keyboards/jels/boaty/config.h delete mode 100644 keyboards/jels/jels60/v1/config.h delete mode 100644 keyboards/jels/jels60/v2/config.h delete mode 100644 keyboards/jels/jels88/config.h delete mode 100644 keyboards/jorne/rev1/config.h delete mode 100644 keyboards/joshajohnson/hub20/config.h diff --git a/keyboards/ianklug/grooveboard/config.h b/keyboards/ianklug/grooveboard/config.h deleted file mode 100644 index 12ff57c16be..00000000000 --- a/keyboards/ianklug/grooveboard/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 ianklug - -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/ianklug/grooveboard/keyboard.json b/keyboards/ianklug/grooveboard/keyboard.json index 81dd715867d..ce7ac8cc227 100644 --- a/keyboards/ianklug/grooveboard/keyboard.json +++ b/keyboards/ianklug/grooveboard/keyboard.json @@ -18,6 +18,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["F7", "F6", "D1", "D2"] diff --git a/keyboards/ibm/model_m/modelh/config.h b/keyboards/ibm/model_m/modelh/config.h index ac95ccfe662..eff37a4b3b3 100644 --- a/keyboards/ibm/model_m/modelh/config.h +++ b/keyboards/ibm/model_m/modelh/config.h @@ -22,12 +22,6 @@ along with this program. If not, see . #define MODELH_STATUS_LED C13 -/* 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. diff --git a/keyboards/ibm/model_m/modelh/keyboard.json b/keyboards/ibm/model_m/modelh/keyboard.json index 897d9be2f44..513d5d9bb6b 100644 --- a/keyboards/ibm/model_m/modelh/keyboard.json +++ b/keyboards/ibm/model_m/modelh/keyboard.json @@ -12,6 +12,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "B8", "num_lock": "B7", diff --git a/keyboards/ibm/model_m_122/ibm122m/config.h b/keyboards/ibm/model_m_122/ibm122m/config.h index af3de54eb2b..32227836991 100644 --- a/keyboards/ibm/model_m_122/ibm122m/config.h +++ b/keyboards/ibm/model_m_122/ibm122m/config.h @@ -17,11 +17,6 @@ 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 AUDIO_PIN_ALT B6 #define AUDIO_PIN C6 diff --git a/keyboards/ibm/model_m_122/ibm122m/keyboard.json b/keyboards/ibm/model_m_122/ibm122m/keyboard.json index 3c43d17d92d..a9e10ffd6a5 100644 --- a/keyboards/ibm/model_m_122/ibm122m/keyboard.json +++ b/keyboards/ibm/model_m_122/ibm122m/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C7", "F1"], "rows": ["F0", "B5", "B4", "B3", "B2", "B1", "B0", "E7"] diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h deleted file mode 100644 index ae358106eb0..00000000000 --- a/keyboards/ibnuda/gurindam/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Ibnu D. Aji - -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/ibnuda/gurindam/keyboard.json b/keyboards/ibnuda/gurindam/keyboard.json index e1253b7d7a4..1cf74068b6a 100644 --- a/keyboards/ibnuda/gurindam/keyboard.json +++ b/keyboards/ibnuda/gurindam/keyboard.json @@ -34,6 +34,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"], "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"] diff --git a/keyboards/idb/idb_60/config.h b/keyboards/idb/idb_60/config.h deleted file mode 100644 index baf09cebb5e..00000000000 --- a/keyboards/idb/idb_60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/idb/idb_60/keyboard.json b/keyboards/idb/idb_60/keyboard.json index df88de1dff6..80bbd17a5ae 100644 --- a/keyboards/idb/idb_60/keyboard.json +++ b/keyboards/idb/idb_60/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B3", "B4", "C6", "B6", "B7", "C7", "B5"], "rows": ["C2", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "B0", "B1"] diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h deleted file mode 100644 index d876570c808..00000000000 --- a/keyboards/idobao/id75/v1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 MechMerlin - -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/idobao/id75/v1/keyboard.json b/keyboards/idobao/id75/v1/keyboard.json index 99b7f6e2b31..f52938d0d8b 100644 --- a/keyboards/idobao/id75/v1/keyboard.json +++ b/keyboards/idobao/id75/v1/keyboard.json @@ -21,6 +21,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B3", "C7", "B6", "C6"] diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h deleted file mode 100644 index 51d84749a5d..00000000000 --- a/keyboards/idobao/id75/v2/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 peepeetee - * - * 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/idobao/id75/v2/keyboard.json b/keyboards/idobao/id75/v2/keyboard.json index b33e7b69074..09e24dbd47e 100644 --- a/keyboards/idobao/id75/v2/keyboard.json +++ b/keyboards/idobao/id75/v2/keyboard.json @@ -59,6 +59,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B3", "C7", "B6", "C6"] diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h deleted file mode 100644 index 23990f6ef9e..00000000000 --- a/keyboards/idobao/id96/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * This file is part of the QMK Firmware distribution (https://github.com/qmk/qmk_firmware). - * Copyright 2018-2021 "kaylanm" [Melody96] - * Vino Rodrigues [ID96] - * - * 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, version 3. - * - * 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/idobao/id96/keyboard.json b/keyboards/idobao/id96/keyboard.json index 3213cd74a9f..c06dfdd4542 100644 --- a/keyboards/idobao/id96/keyboard.json +++ b/keyboards/idobao/id96/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h deleted file mode 100644 index 6cbdda8572d..00000000000 --- a/keyboards/idobao/montex/v1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 NachoxMacho -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/idobao/montex/v1/keyboard.json b/keyboards/idobao/montex/v1/keyboard.json index d439a2d09ca..2d9f503832f 100644 --- a/keyboards/idobao/montex/v1/keyboard.json +++ b/keyboards/idobao/montex/v1/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0"], "rows": ["D4", "D6", "D7", "B4", "B5", "C6"] diff --git a/keyboards/illuminati/is0/config.h b/keyboards/illuminati/is0/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/illuminati/is0/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -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/illuminati/is0/keyboard.json b/keyboards/illuminati/is0/keyboard.json index d03af345073..ee90646b19a 100644 --- a/keyboards/illuminati/is0/keyboard.json +++ b/keyboards/illuminati/is0/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0"], "rows": ["D2"] diff --git a/keyboards/illusion/rosa/config.h b/keyboards/illusion/rosa/config.h deleted file mode 100644 index 7b9007c1f65..00000000000 --- a/keyboards/illusion/rosa/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Brandon Lee - -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 diff --git a/keyboards/illusion/rosa/keyboard.json b/keyboards/illusion/rosa/keyboard.json index c5e9c88a770..7fef56841d8 100644 --- a/keyboards/illusion/rosa/keyboard.json +++ b/keyboards/illusion/rosa/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D2", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["D1", "D4", "F0", "B0", "B1"] diff --git a/keyboards/ilumkb/primus75/config.h b/keyboards/ilumkb/primus75/config.h deleted file mode 100644 index ee087cc051a..00000000000 --- a/keyboards/ilumkb/primus75/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 dztech - * - * 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 diff --git a/keyboards/ilumkb/primus75/keyboard.json b/keyboards/ilumkb/primus75/keyboard.json index f00c146740d..15831ffda68 100644 --- a/keyboards/ilumkb/primus75/keyboard.json +++ b/keyboards/ilumkb/primus75/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"], "rows": ["D0", "D1", "D2", "D3", "D5", "B7"] diff --git a/keyboards/ilumkb/volcano660/config.h b/keyboards/ilumkb/volcano660/config.h deleted file mode 100644 index fa9d81cec23..00000000000 --- a/keyboards/ilumkb/volcano660/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 dztech - * - * 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 diff --git a/keyboards/ilumkb/volcano660/keyboard.json b/keyboards/ilumkb/volcano660/keyboard.json index 7412a249f8f..297b28a5f92 100644 --- a/keyboards/ilumkb/volcano660/keyboard.json +++ b/keyboards/ilumkb/volcano660/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B1", "B2", "B3", "B6"] diff --git a/keyboards/inland/kb83/config.h b/keyboards/inland/kb83/config.h index c003d218c28..0ddf8582bec 100644 --- a/keyboards/inland/kb83/config.h +++ b/keyboards/inland/kb83/config.h @@ -18,11 +18,6 @@ #define RGB_TRIGGER_ON_KEYDOWN -/* 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 - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/inland/kb83/keyboard.json b/keyboards/inland/kb83/keyboard.json index 31ca8f1bda9..4c82a557ee7 100644 --- a/keyboards/inland/kb83/keyboard.json +++ b/keyboards/inland/kb83/keyboard.json @@ -64,7 +64,11 @@ ] }, "qmk": { - "tap_keycode_delay": 15 + "tap_keycode_delay": 15, + "locking": { + "enabled": true, + "resync": true + } }, "layouts": { "LAYOUT": { diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h index bf9ebc980f9..28b7d5d7776 100644 --- a/keyboards/input_club/ergodox_infinity/config.h +++ b/keyboards/input_club/ergodox_infinity/config.h @@ -23,11 +23,6 @@ along with this program. If not, see . #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* 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 - /* key combination for command */ #define IS_COMMAND() ( \ get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ diff --git a/keyboards/input_club/ergodox_infinity/keyboard.json b/keyboards/input_club/ergodox_infinity/keyboard.json index 6f47d72685f..fd89806b000 100644 --- a/keyboards/input_club/ergodox_infinity/keyboard.json +++ b/keyboards/input_club/ergodox_infinity/keyboard.json @@ -55,6 +55,12 @@ "sleep_led": true, "st7565": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "board": "IC_TEENSY_3_1", "tapping": { "toggle": 1 diff --git a/keyboards/irene/config.h b/keyboards/irene/config.h deleted file mode 100644 index 656deab55a6..00000000000 --- a/keyboards/irene/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Ramon Imbao - -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/irene/keyboard.json b/keyboards/irene/keyboard.json index fb8b1818c27..3280c34c036 100644 --- a/keyboards/irene/keyboard.json +++ b/keyboards/irene/keyboard.json @@ -35,6 +35,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C6", "B6", "B5", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B0", "F0", "C7", "B4", "B7"] diff --git a/keyboards/iriskeyboards/config.h b/keyboards/iriskeyboards/config.h deleted file mode 100644 index d813c012ef3..00000000000 --- a/keyboards/iriskeyboards/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 SonOfAres - -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/iriskeyboards/keyboard.json b/keyboards/iriskeyboards/keyboard.json index b0926531b65..4a821b2649a 100644 --- a/keyboards/iriskeyboards/keyboard.json +++ b/keyboards/iriskeyboards/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/iron180/config.h b/keyboards/iron180/config.h index f2d3a3c36ff..b7a6f9baf9a 100644 --- a/keyboards/iron180/config.h +++ b/keyboards/iron180/config.h @@ -21,10 +21,5 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 - // Turn backlight on-off according to capslock (off by default) #define CAPSLOCK_BACKLIGHT diff --git a/keyboards/iron180/keyboard.json b/keyboards/iron180/keyboard.json index 3952656d28f..8daae1b1eb9 100644 --- a/keyboards/iron180/keyboard.json +++ b/keyboards/iron180/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B7", "B6", "B5", "B4", "B3", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B2", "A4", "B1", "A3"], "rows": ["B9", "B8", "A15", "B0", "A7", "A5"] diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h deleted file mode 100644 index 805f9ad0542..00000000000 --- a/keyboards/jacky_studio/bear_65/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2017-2021 QMK -// 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/jacky_studio/bear_65/rev1/keyboard.json b/keyboards/jacky_studio/bear_65/rev1/keyboard.json index 2c79dc41f52..df7be71869a 100644 --- a/keyboards/jacky_studio/bear_65/rev1/keyboard.json +++ b/keyboards/jacky_studio/bear_65/rev1/keyboard.json @@ -12,6 +12,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/jacky_studio/bear_65/rev2/keyboard.json b/keyboards/jacky_studio/bear_65/rev2/keyboard.json index ec2ff1b7c78..0fa471d44a4 100644 --- a/keyboards/jacky_studio/bear_65/rev2/keyboard.json +++ b/keyboards/jacky_studio/bear_65/rev2/keyboard.json @@ -12,6 +12,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h deleted file mode 100644 index b9eeb3bf152..00000000000 --- a/keyboards/jacky_studio/s7_elephant/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 MudkipMao - * - * 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 diff --git a/keyboards/jacky_studio/s7_elephant/rev1/keyboard.json b/keyboards/jacky_studio/s7_elephant/rev1/keyboard.json index fc87e986ba7..cbbb27ca04c 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/keyboard.json +++ b/keyboards/jacky_studio/s7_elephant/rev1/keyboard.json @@ -38,6 +38,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7", "F1"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h deleted file mode 100644 index b9eeb3bf152..00000000000 --- a/keyboards/jacky_studio/s7_elephant/rev2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 MudkipMao - * - * 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 diff --git a/keyboards/jacky_studio/s7_elephant/rev2/keyboard.json b/keyboards/jacky_studio/s7_elephant/rev2/keyboard.json index 1a32d95c778..23112f5b339 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/keyboard.json +++ b/keyboards/jacky_studio/s7_elephant/rev2/keyboard.json @@ -21,6 +21,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h index 4d138814be6..a0793c58611 100644 --- a/keyboards/jadookb/jkb65/config.h +++ b/keyboards/jadookb/jkb65/config.h @@ -17,6 +17,3 @@ #pragma once #define RGB_MATRIX_LED_COUNT 67 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/jadookb/jkb65/info.json b/keyboards/jadookb/jkb65/info.json index 99460a30024..054b1c5452c 100644 --- a/keyboards/jadookb/jkb65/info.json +++ b/keyboards/jadookb/jkb65/info.json @@ -14,6 +14,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "usb": { "vid": "0x4A4B", "pid": "0xEF6A" diff --git a/keyboards/jae/j01/config.h b/keyboards/jae/j01/config.h deleted file mode 100644 index 6b5c1ab3f90..00000000000 --- a/keyboards/jae/j01/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Evy Dekkers - -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/jae/j01/keyboard.json b/keyboards/jae/j01/keyboard.json index 4bf7171dd5f..56a5062c94c 100644 --- a/keyboards/jae/j01/keyboard.json +++ b/keyboards/jae/j01/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], "rows": ["B2", "B1", "B3", "B0", "D0"] diff --git a/keyboards/jagdpietr/drakon/config.h b/keyboards/jagdpietr/drakon/config.h deleted file mode 100644 index 96c32b09f28..00000000000 --- a/keyboards/jagdpietr/drakon/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 jagdpietr - -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/jagdpietr/drakon/keyboard.json b/keyboards/jagdpietr/drakon/keyboard.json index bbb945aadf2..2d2b68a41ac 100644 --- a/keyboards/jagdpietr/drakon/keyboard.json +++ b/keyboards/jagdpietr/drakon/keyboard.json @@ -22,6 +22,12 @@ "oled": true, "wpm": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C6", "B2", "B3", "B7", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["C7", "B5", "B6", "B0", "B1", "F1"] diff --git a/keyboards/jd40/config.h b/keyboards/jd40/config.h deleted file mode 100644 index 4e596948184..00000000000 --- a/keyboards/jd40/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 diff --git a/keyboards/jd40/keyboard.json b/keyboards/jd40/keyboard.json index 6ce0ca5da3a..f56602b2151 100644 --- a/keyboards/jd40/keyboard.json +++ b/keyboards/jd40/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2"], "rows": ["F0", "F1", "F5", "B4"] diff --git a/keyboards/jd45/config.h b/keyboards/jd45/config.h deleted file mode 100644 index 9b7700e0139..00000000000 --- a/keyboards/jd45/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/jd45/keyboard.json b/keyboards/jd45/keyboard.json index c9d5bfb123e..6c103ec6dd0 100644 --- a/keyboards/jd45/keyboard.json +++ b/keyboards/jd45/keyboard.json @@ -18,6 +18,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2", "B0"], "rows": ["F0", "F1", "F5", "B4"] diff --git a/keyboards/jels/boaty/config.h b/keyboards/jels/boaty/config.h deleted file mode 100644 index d78952f2611..00000000000 --- a/keyboards/jels/boaty/config.h +++ /dev/null @@ -1,23 +0,0 @@ - /* Copyright 2022 Joah Nelson (Jels) - * - * 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 - diff --git a/keyboards/jels/boaty/keyboard.json b/keyboards/jels/boaty/keyboard.json index 6d85c5bd4f7..11a6e0aa151 100644 --- a/keyboards/jels/boaty/keyboard.json +++ b/keyboards/jels/boaty/keyboard.json @@ -18,6 +18,12 @@ "console": false, "command": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "C0", "C1", "C2", "D4", "D1", "D0", "C5", "C4", "C3", "D5"], "rows": ["D6", "B0", "D7", "B5", "B3", "B4", "B2"] diff --git a/keyboards/jels/jels60/v1/config.h b/keyboards/jels/jels60/v1/config.h deleted file mode 100644 index 92b3d368015..00000000000 --- a/keyboards/jels/jels60/v1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2022 Joah Nelson (Jels) -* -* 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 - diff --git a/keyboards/jels/jels60/v1/keyboard.json b/keyboards/jels/jels60/v1/keyboard.json index 6dc88d7895f..1f7b45adef8 100644 --- a/keyboards/jels/jels60/v1/keyboard.json +++ b/keyboards/jels/jels60/v1/keyboard.json @@ -14,6 +14,12 @@ "command": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/jels/jels60/v2/config.h b/keyboards/jels/jels60/v2/config.h deleted file mode 100644 index 274e7fcf628..00000000000 --- a/keyboards/jels/jels60/v2/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2022 Joah Nelson (Jels) -* -* 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 diff --git a/keyboards/jels/jels60/v2/keyboard.json b/keyboards/jels/jels60/v2/keyboard.json index 69ec00193a0..4ab87eff494 100644 --- a/keyboards/jels/jels60/v2/keyboard.json +++ b/keyboards/jels/jels60/v2/keyboard.json @@ -9,6 +9,12 @@ "command": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["GP24", "GP25", "GP23", "GP21", "GP22", "GP2", "GP1", "GP0", "GP6", "GP18", "GP19", "GP20", "GP9", "GP8"], "rows": ["GP26", "GP27", "GP3", "GP4", "GP5"] diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h deleted file mode 100644 index 2d5641fa699..00000000000 --- a/keyboards/jels/jels88/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Joah Nelson (Jels) - * - * 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 diff --git a/keyboards/jels/jels88/keyboard.json b/keyboards/jels/jels88/keyboard.json index bcddf648a02..ee9b64ed6ae 100644 --- a/keyboards/jels/jels88/keyboard.json +++ b/keyboards/jels/jels88/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "C6", "F7", "F6", "F5", "F4", "B1", "D2", "D3"], "rows": ["B3", "B2", "D1", "D0", "E6", "B0", "F0", "F1", "B5", "B4", "D7", "D6"] diff --git a/keyboards/jolofsor/denial75/config.h b/keyboards/jolofsor/denial75/config.h index 785fdc3e5ee..da9b8fd9b21 100644 --- a/keyboards/jolofsor/denial75/config.h +++ b/keyboards/jolofsor/denial75/config.h @@ -16,12 +16,5 @@ #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 - - /* RGB Definitions */ #define RGBLIGHT_MAX_LAYERS 32 diff --git a/keyboards/jolofsor/denial75/keyboard.json b/keyboards/jolofsor/denial75/keyboard.json index e77c9e4a1fb..df7c3157c9a 100644 --- a/keyboards/jolofsor/denial75/keyboard.json +++ b/keyboards/jolofsor/denial75/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B5", "B4", "D7", "D6", "D4", "E6", "B1", "B2", "B3", "B7", "D0", "D1", "D3"], "rows": ["B0", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h deleted file mode 100644 index 3b854d3afc9..00000000000 --- a/keyboards/jorne/rev1/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2021 Joric (@joric) -// 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/jorne/rev1/keyboard.json b/keyboards/jorne/rev1/keyboard.json index 93ece816bb9..7f67edc6ec1 100644 --- a/keyboards/jorne/rev1/keyboard.json +++ b/keyboards/jorne/rev1/keyboard.json @@ -39,6 +39,12 @@ "rgblight": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/joshajohnson/hub16/config.h b/keyboards/joshajohnson/hub16/config.h index 68576635a8f..82ec6081ad4 100755 --- a/keyboards/joshajohnson/hub16/config.h +++ b/keyboards/joshajohnson/hub16/config.h @@ -25,8 +25,3 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -/* 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/joshajohnson/hub16/keyboard.json b/keyboards/joshajohnson/hub16/keyboard.json index 7d8f0ab3568..1c9d3ea436c 100644 --- a/keyboards/joshajohnson/hub16/keyboard.json +++ b/keyboards/joshajohnson/hub16/keyboard.json @@ -44,6 +44,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "debounce": 20, "layouts": { "LAYOUT": { diff --git a/keyboards/joshajohnson/hub20/config.h b/keyboards/joshajohnson/hub20/config.h deleted file mode 100644 index 29471149d15..00000000000 --- a/keyboards/joshajohnson/hub20/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2020 joshajohnson -Copyright 2021 peepeetee - -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 diff --git a/keyboards/joshajohnson/hub20/keyboard.json b/keyboards/joshajohnson/hub20/keyboard.json index 4bedd20c4a2..44a3361838a 100644 --- a/keyboards/joshajohnson/hub20/keyboard.json +++ b/keyboards/joshajohnson/hub20/keyboard.json @@ -52,7 +52,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "rgblight": { "led_count": 27 diff --git a/keyboards/jukaie/jk01/config.h b/keyboards/jukaie/jk01/config.h index e66f9227796..d8dfb9f5354 100644 --- a/keyboards/jukaie/jk01/config.h +++ b/keyboards/jukaie/jk01/config.h @@ -16,11 +16,6 @@ #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 - /* External spi flash */ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14 diff --git a/keyboards/jukaie/jk01/keyboard.json b/keyboards/jukaie/jk01/keyboard.json index c713fe2749a..cde0b38034b 100644 --- a/keyboards/jukaie/jk01/keyboard.json +++ b/keyboards/jukaie/jk01/keyboard.json @@ -38,7 +38,11 @@ }, "processor": "WB32FQ95", "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "rgb_matrix": { "animations": { From efe0d96845306a7083dd191dce7c2714c2a406ab Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 22 May 2024 12:41:29 -0700 Subject: [PATCH 313/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: N (#23774) Affects: - `nacly/sodium42` - `nacly/sodium50` - `nacly/sodium62` - `nacly/splitreus62` - `nacly/ua62` - `nek_type_a` - `nemui` - `nibiria/stream15` - `nightingale_studios/hailey` - `nightly_boards/adellein` - `nightly_boards/alter/rev1` - `nightly_boards/alter_lite` - `nightly_boards/conde60` - `nightly_boards/daily60` - `nightly_boards/jisoo` - `nightly_boards/n2` - `nightly_boards/n40_o` - `nightly_boards/n60_s` - `nightly_boards/n87` - `nightly_boards/n9` - `nightly_boards/octopad` - `nightly_boards/octopadplus` - `nightly_boards/paraluman` - `nightly_boards/ph_arisu` - `nightmare` - `nimrod` - `nix_studio/oxalys80` - `nopunin10did/jabberwocky/v1` - `nopunin10did/jabberwocky/v2` - `nopunin10did/railroad/rev0` - `novelkeys/novelpad` - `noxary/220` - `noxary/260` - `noxary/268` - `noxary/268_2` - `noxary/268_2_rgb` - `noxary/280` - `noxary/378` - `noxary/valhalla` - `noxary/vulcan` - `noxary/x268` - `numatreus` --- keyboards/nacly/sodium42/config.h | 5 --- keyboards/nacly/sodium42/keyboard.json | 6 +++ keyboards/nacly/sodium50/config.h | 5 --- keyboards/nacly/sodium50/keyboard.json | 6 +++ keyboards/nacly/sodium62/config.h | 4 -- keyboards/nacly/sodium62/keyboard.json | 6 +++ keyboards/nacly/splitreus62/config.h | 5 --- keyboards/nacly/splitreus62/keyboard.json | 6 +++ keyboards/nacly/ua62/config.h | 39 ------------------- keyboards/nacly/ua62/keyboard.json | 6 +++ keyboards/nek_type_a/config.h | 6 --- keyboards/nek_type_a/keyboard.json | 6 +++ keyboards/nemui/config.h | 38 ------------------ keyboards/nemui/keyboard.json | 6 +++ keyboards/nibiria/stream15/config.h | 39 ------------------- keyboards/nibiria/stream15/keyboard.json | 6 +++ keyboards/nightingale_studios/hailey/config.h | 5 --- .../nightingale_studios/hailey/keyboard.json | 6 +++ keyboards/nightly_boards/adellein/config.h | 23 ----------- .../nightly_boards/adellein/keyboard.json | 6 +++ keyboards/nightly_boards/alter/rev1/config.h | 20 ---------- .../nightly_boards/alter/rev1/keyboard.json | 6 +++ keyboards/nightly_boards/alter_lite/config.h | 21 ---------- .../nightly_boards/alter_lite/keyboard.json | 6 +++ keyboards/nightly_boards/conde60/config.h | 23 ----------- .../nightly_boards/conde60/keyboard.json | 6 +++ keyboards/nightly_boards/daily60/config.h | 23 ----------- .../nightly_boards/daily60/keyboard.json | 6 +++ keyboards/nightly_boards/jisoo/config.h | 23 ----------- keyboards/nightly_boards/jisoo/keyboard.json | 6 +++ keyboards/nightly_boards/n2/config.h | 20 ---------- keyboards/nightly_boards/n2/keyboard.json | 6 +++ keyboards/nightly_boards/n40_o/config.h | 5 --- keyboards/nightly_boards/n40_o/keyboard.json | 6 +++ keyboards/nightly_boards/n60_s/config.h | 5 --- keyboards/nightly_boards/n60_s/keyboard.json | 6 +++ keyboards/nightly_boards/n87/config.h | 5 --- keyboards/nightly_boards/n87/keyboard.json | 6 +++ keyboards/nightly_boards/n9/config.h | 20 ---------- keyboards/nightly_boards/n9/keyboard.json | 6 +++ keyboards/nightly_boards/octopad/config.h | 5 --- .../nightly_boards/octopad/keyboard.json | 6 +++ keyboards/nightly_boards/octopadplus/config.h | 23 ----------- .../nightly_boards/octopadplus/keyboard.json | 6 ++- keyboards/nightly_boards/paraluman/config.h | 24 ------------ .../nightly_boards/paraluman/keyboard.json | 6 +++ keyboards/nightly_boards/ph_arisu/config.h | 7 ---- .../nightly_boards/ph_arisu/keyboard.json | 6 +++ keyboards/nightmare/config.h | 39 ------------------- keyboards/nightmare/keyboard.json | 6 +++ keyboards/nimrod/config.h | 21 ---------- keyboards/nimrod/keyboard.json | 6 +++ keyboards/nix_studio/oxalys80/config.h | 22 ----------- keyboards/nix_studio/oxalys80/keyboard.json | 6 +++ .../nopunin10did/jabberwocky/v1/config.h | 23 ----------- .../nopunin10did/jabberwocky/v1/keyboard.json | 6 +++ .../nopunin10did/jabberwocky/v2/config.h | 23 ----------- .../nopunin10did/jabberwocky/v2/keyboard.json | 6 +++ keyboards/nopunin10did/railroad/rev0/config.h | 23 ----------- .../nopunin10did/railroad/rev0/keyboard.json | 6 +++ keyboards/novelkeys/novelpad/config.h | 39 ------------------- keyboards/novelkeys/novelpad/keyboard.json | 6 +++ keyboards/noxary/220/config.h | 39 ------------------- keyboards/noxary/220/keyboard.json | 6 +++ keyboards/noxary/260/config.h | 39 ------------------- keyboards/noxary/260/keyboard.json | 6 +++ keyboards/noxary/268/config.h | 24 ------------ keyboards/noxary/268/keyboard.json | 6 +++ keyboards/noxary/268_2/config.h | 39 ------------------- keyboards/noxary/268_2/keyboard.json | 6 +++ keyboards/noxary/268_2_rgb/config.h | 20 ---------- keyboards/noxary/268_2_rgb/keyboard.json | 6 +++ keyboards/noxary/280/config.h | 39 ------------------- keyboards/noxary/280/keyboard.json | 6 +++ keyboards/noxary/378/config.h | 39 ------------------- keyboards/noxary/378/keyboard.json | 6 +++ keyboards/noxary/valhalla/config.h | 39 ------------------- keyboards/noxary/valhalla/keyboard.json | 6 +++ keyboards/noxary/vulcan/config.h | 39 ------------------- keyboards/noxary/vulcan/keyboard.json | 6 +++ keyboards/noxary/x268/config.h | 39 ------------------- keyboards/noxary/x268/keyboard.json | 6 +++ keyboards/numatreus/config.h | 5 --- keyboards/numatreus/keyboard.json | 6 +++ 84 files changed, 251 insertions(+), 945 deletions(-) delete mode 100644 keyboards/nacly/ua62/config.h delete mode 100644 keyboards/nemui/config.h delete mode 100644 keyboards/nibiria/stream15/config.h delete mode 100644 keyboards/nightly_boards/adellein/config.h delete mode 100644 keyboards/nightly_boards/alter/rev1/config.h delete mode 100644 keyboards/nightly_boards/alter_lite/config.h delete mode 100644 keyboards/nightly_boards/conde60/config.h delete mode 100644 keyboards/nightly_boards/daily60/config.h delete mode 100644 keyboards/nightly_boards/jisoo/config.h delete mode 100644 keyboards/nightly_boards/n2/config.h delete mode 100644 keyboards/nightly_boards/n9/config.h delete mode 100644 keyboards/nightly_boards/octopadplus/config.h delete mode 100644 keyboards/nightly_boards/paraluman/config.h delete mode 100644 keyboards/nightly_boards/ph_arisu/config.h delete mode 100644 keyboards/nightmare/config.h delete mode 100644 keyboards/nimrod/config.h delete mode 100644 keyboards/nix_studio/oxalys80/config.h delete mode 100644 keyboards/nopunin10did/jabberwocky/v1/config.h delete mode 100644 keyboards/nopunin10did/jabberwocky/v2/config.h delete mode 100644 keyboards/nopunin10did/railroad/rev0/config.h delete mode 100755 keyboards/novelkeys/novelpad/config.h delete mode 100644 keyboards/noxary/220/config.h delete mode 100644 keyboards/noxary/260/config.h delete mode 100644 keyboards/noxary/268/config.h delete mode 100644 keyboards/noxary/268_2/config.h delete mode 100644 keyboards/noxary/268_2_rgb/config.h delete mode 100644 keyboards/noxary/280/config.h delete mode 100644 keyboards/noxary/378/config.h delete mode 100644 keyboards/noxary/valhalla/config.h delete mode 100644 keyboards/noxary/vulcan/config.h delete mode 100644 keyboards/noxary/x268/config.h diff --git a/keyboards/nacly/sodium42/config.h b/keyboards/nacly/sodium42/config.h index 1bbaec44c66..fe3f0e0cc96 100644 --- a/keyboards/nacly/sodium42/config.h +++ b/keyboards/nacly/sodium42/config.h @@ -18,11 +18,6 @@ #define SPLIT_HAND_PIN F4 -/* 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. diff --git a/keyboards/nacly/sodium42/keyboard.json b/keyboards/nacly/sodium42/keyboard.json index f084ca2a239..491a2cf955f 100644 --- a/keyboards/nacly/sodium42/keyboard.json +++ b/keyboards/nacly/sodium42/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "C6", "E6", "B5", "B2", "B3"], "rows": ["F7", "D4", "D7", "B4"] diff --git a/keyboards/nacly/sodium50/config.h b/keyboards/nacly/sodium50/config.h index 1bbaec44c66..fe3f0e0cc96 100644 --- a/keyboards/nacly/sodium50/config.h +++ b/keyboards/nacly/sodium50/config.h @@ -18,11 +18,6 @@ #define SPLIT_HAND_PIN F4 -/* 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. diff --git a/keyboards/nacly/sodium50/keyboard.json b/keyboards/nacly/sodium50/keyboard.json index ff7b691d9d7..ec0edbfd9a9 100644 --- a/keyboards/nacly/sodium50/keyboard.json +++ b/keyboards/nacly/sodium50/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"], "rows": ["F7", "D4", "D7", "B4"] diff --git a/keyboards/nacly/sodium62/config.h b/keyboards/nacly/sodium62/config.h index c526c9c9c50..341e0e0d893 100644 --- a/keyboards/nacly/sodium62/config.h +++ b/keyboards/nacly/sodium62/config.h @@ -18,10 +18,6 @@ #define SPLIT_HAND_PIN F4 -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE #define OLED_BRIGHTNESS 128 /* diff --git a/keyboards/nacly/sodium62/keyboard.json b/keyboards/nacly/sodium62/keyboard.json index 941bad2bd6c..2d9f01e801f 100644 --- a/keyboards/nacly/sodium62/keyboard.json +++ b/keyboards/nacly/sodium62/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"], "rows": ["F7", "D4", "D7", "B4", "B6"] diff --git a/keyboards/nacly/splitreus62/config.h b/keyboards/nacly/splitreus62/config.h index fe1acecf248..b4f9d582ce2 100644 --- a/keyboards/nacly/splitreus62/config.h +++ b/keyboards/nacly/splitreus62/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN F4 -/* 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. diff --git a/keyboards/nacly/splitreus62/keyboard.json b/keyboards/nacly/splitreus62/keyboard.json index 4efc32f5c5d..08a80104837 100644 --- a/keyboards/nacly/splitreus62/keyboard.json +++ b/keyboards/nacly/splitreus62/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B4", "B5", "B6", "B2", "B3"], "rows": ["D3", "D2", "D1", "D4", "C6", "D7"] diff --git a/keyboards/nacly/ua62/config.h b/keyboards/nacly/ua62/config.h deleted file mode 100644 index 643a3b52db9..00000000000 --- a/keyboards/nacly/ua62/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 NaCly - -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/nacly/ua62/keyboard.json b/keyboards/nacly/ua62/keyboard.json index 92323d51646..43f2e9e6628 100644 --- a/keyboards/nacly/ua62/keyboard.json +++ b/keyboards/nacly/ua62/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0", "D4"] diff --git a/keyboards/nek_type_a/config.h b/keyboards/nek_type_a/config.h index dee2cf4fbd6..ec8d78136a8 100644 --- a/keyboards/nek_type_a/config.h +++ b/keyboards/nek_type_a/config.h @@ -28,9 +28,3 @@ along with this program. If not, see . #define NEK_MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 } #define DIODE_DIRECTION ROW2COL - -/* 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/nek_type_a/keyboard.json b/keyboards/nek_type_a/keyboard.json index 632eafee44c..39bad11a189 100644 --- a/keyboards/nek_type_a/keyboard.json +++ b/keyboards/nek_type_a/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "bluetooth": { "driver": "bluefruit_le" }, diff --git a/keyboards/nemui/config.h b/keyboards/nemui/config.h deleted file mode 100644 index a371cd708d9..00000000000 --- a/keyboards/nemui/config.h +++ /dev/null @@ -1,38 +0,0 @@ - -/* Copyright 2020 Bachoo - * - * 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/nemui/keyboard.json b/keyboards/nemui/keyboard.json index d8fbc4db1c2..fb2adb6ae46 100644 --- a/keyboards/nemui/keyboard.json +++ b/keyboards/nemui/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B1", "B0", "B10", "B11", "A7", "B12", "B13", "B14", "A10", "A9", "A8", "B7", "B8", "B9"], "rows": ["A3", "A4", "A5", "A6", "A2"] diff --git a/keyboards/nibiria/stream15/config.h b/keyboards/nibiria/stream15/config.h deleted file mode 100644 index 8a1f5b6c2b7..00000000000 --- a/keyboards/nibiria/stream15/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Matt Clendaniel - -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/nibiria/stream15/keyboard.json b/keyboards/nibiria/stream15/keyboard.json index 899a5ecbce0..9daeef7cf9e 100644 --- a/keyboards/nibiria/stream15/keyboard.json +++ b/keyboards/nibiria/stream15/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A1", "A2", "B11", "B12", "B13"], "rows": ["B10", "B9", "B8"] diff --git a/keyboards/nightingale_studios/hailey/config.h b/keyboards/nightingale_studios/hailey/config.h index ae2ee205a4d..563fb415a1d 100644 --- a/keyboards/nightingale_studios/hailey/config.h +++ b/keyboards/nightingale_studios/hailey/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/nightingale_studios/hailey/keyboard.json b/keyboards/nightingale_studios/hailey/keyboard.json index ccf4e9adba6..f8c2455958d 100644 --- a/keyboards/nightingale_studios/hailey/keyboard.json +++ b/keyboards/nightingale_studios/hailey/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A4", "A3", "F1", "F0", "C15", "C14", "C13", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A6", "B5", "A15"], "rows": ["A8", "B15", "B14", "B13", "B12", "B6", "A14"] diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h deleted file mode 100644 index 549b82fe0d8..00000000000 --- a/keyboards/nightly_boards/adellein/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 Neil Brian Ramirez - -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 diff --git a/keyboards/nightly_boards/adellein/keyboard.json b/keyboards/nightly_boards/adellein/keyboard.json index 1a6c7d8a5ca..3f873ba5f5d 100644 --- a/keyboards/nightly_boards/adellein/keyboard.json +++ b/keyboards/nightly_boards/adellein/keyboard.json @@ -21,6 +21,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B7", "B3", "B2", "D0", "D1", "D2", "D3"], "rows": ["B1", "B0", "B5", "B6"] diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h deleted file mode 100644 index 3223a5a19be..00000000000 --- a/keyboards/nightly_boards/alter/rev1/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Neil Brian Ramirez -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 diff --git a/keyboards/nightly_boards/alter/rev1/keyboard.json b/keyboards/nightly_boards/alter/rev1/keyboard.json index 84eb93fac31..e02e7e5b1b3 100644 --- a/keyboards/nightly_boards/alter/rev1/keyboard.json +++ b/keyboards/nightly_boards/alter/rev1/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B0", "B1", "B2", "B3"], "rows": ["F7", "F6", "F5", "E6", "D0", "B7", "D5", "D3", "D2", "D1"] diff --git a/keyboards/nightly_boards/alter_lite/config.h b/keyboards/nightly_boards/alter_lite/config.h deleted file mode 100644 index e462b35b07c..00000000000 --- a/keyboards/nightly_boards/alter_lite/config.h +++ /dev/null @@ -1,21 +0,0 @@ - /* -Copyright 2020 DeskDaily -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 - diff --git a/keyboards/nightly_boards/alter_lite/keyboard.json b/keyboards/nightly_boards/alter_lite/keyboard.json index f92e848d22a..d06dd3aacd3 100644 --- a/keyboards/nightly_boards/alter_lite/keyboard.json +++ b/keyboards/nightly_boards/alter_lite/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "E6", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], "rows": ["F0", "F1", "D3", "D5", "B5"] diff --git a/keyboards/nightly_boards/conde60/config.h b/keyboards/nightly_boards/conde60/config.h deleted file mode 100644 index 3d0b7f438c8..00000000000 --- a/keyboards/nightly_boards/conde60/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 DeskDaily - -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 diff --git a/keyboards/nightly_boards/conde60/keyboard.json b/keyboards/nightly_boards/conde60/keyboard.json index f26c400712b..38e7b8383af 100644 --- a/keyboards/nightly_boards/conde60/keyboard.json +++ b/keyboards/nightly_boards/conde60/keyboard.json @@ -20,6 +20,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B3", "B7", "B6", "C6", "C7", "F7", "F6", "F5", "D4", "D6", "D7", "B4", "B5"], "rows": ["B1", "B2", "F0", "F1", "F4"] diff --git a/keyboards/nightly_boards/daily60/config.h b/keyboards/nightly_boards/daily60/config.h deleted file mode 100644 index 3d0b7f438c8..00000000000 --- a/keyboards/nightly_boards/daily60/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 DeskDaily - -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 diff --git a/keyboards/nightly_boards/daily60/keyboard.json b/keyboards/nightly_boards/daily60/keyboard.json index 7a05b2f86d8..d13ead3251d 100644 --- a/keyboards/nightly_boards/daily60/keyboard.json +++ b/keyboards/nightly_boards/daily60/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["GP22", "GP0", "GP1", "GP2", "GP5", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15"], "rows": ["GP23", "GP24", "GP20", "GP19", "GP18"] diff --git a/keyboards/nightly_boards/jisoo/config.h b/keyboards/nightly_boards/jisoo/config.h deleted file mode 100644 index 3d0b7f438c8..00000000000 --- a/keyboards/nightly_boards/jisoo/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 DeskDaily - -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 diff --git a/keyboards/nightly_boards/jisoo/keyboard.json b/keyboards/nightly_boards/jisoo/keyboard.json index 978c6c323ba..21b8122497f 100644 --- a/keyboards/nightly_boards/jisoo/keyboard.json +++ b/keyboards/nightly_boards/jisoo/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["GP25", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP0"], "rows": ["GP26", "GP27", "GP28", "GP18", "GP19", "GP20"] diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h deleted file mode 100644 index 3223a5a19be..00000000000 --- a/keyboards/nightly_boards/n2/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Neil Brian Ramirez -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 diff --git a/keyboards/nightly_boards/n2/keyboard.json b/keyboards/nightly_boards/n2/keyboard.json index 050f6fedeef..4aa554716f3 100644 --- a/keyboards/nightly_boards/n2/keyboard.json +++ b/keyboards/nightly_boards/n2/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "C6"], "rows": ["F1", "C7"] diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h index 27a82c8acda..46a02c3bd17 100644 --- a/keyboards/nightly_boards/n40_o/config.h +++ b/keyboards/nightly_boards/n40_o/config.h @@ -18,8 +18,3 @@ along with this program. If not, see . #pragma once #define AUDIO_CLICKY - -/* 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/nightly_boards/n40_o/keyboard.json b/keyboards/nightly_boards/n40_o/keyboard.json index 1f341441a4e..f749c143eb9 100644 --- a/keyboards/nightly_boards/n40_o/keyboard.json +++ b/keyboards/nightly_boards/n40_o/keyboard.json @@ -13,6 +13,12 @@ "build": { "lto": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "usb": { "vid": "0xD812", "pid": "0x0009", diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h index 519ac7b82a9..9e3016e53a4 100644 --- a/keyboards/nightly_boards/n60_s/config.h +++ b/keyboards/nightly_boards/n60_s/config.h @@ -21,8 +21,3 @@ along with this program. If not, see . #define B7_AUDIO #define AUDIO_CLICKY - -/* 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/nightly_boards/n60_s/keyboard.json b/keyboards/nightly_boards/n60_s/keyboard.json index 8370ce93b3a..f6e235fec50 100644 --- a/keyboards/nightly_boards/n60_s/keyboard.json +++ b/keyboards/nightly_boards/n60_s/keyboard.json @@ -22,6 +22,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "B5", "B6", "C6", "C7"], "rows": ["B4", "D7", "D6", "D0", "E6"] diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h index 04056f78716..b7cafeda2a6 100644 --- a/keyboards/nightly_boards/n87/config.h +++ b/keyboards/nightly_boards/n87/config.h @@ -23,11 +23,6 @@ along with this program. If not, see . #define NO_MUSIC_MODE -/* 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. diff --git a/keyboards/nightly_boards/n87/keyboard.json b/keyboards/nightly_boards/n87/keyboard.json index fd8589b18d8..ddfd27125ca 100644 --- a/keyboards/nightly_boards/n87/keyboard.json +++ b/keyboards/nightly_boards/n87/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "C7", "C6", "B6", "B5", "D6"], "rows": ["B0", "B1", "B2", "B3", "F1", "F0", "D7", "B4", "D1", "D2", "D3", "D5"] diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h deleted file mode 100644 index 3223a5a19be..00000000000 --- a/keyboards/nightly_boards/n9/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Neil Brian Ramirez -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 diff --git a/keyboards/nightly_boards/n9/keyboard.json b/keyboards/nightly_boards/n9/keyboard.json index 6adb9efe683..83f94954454 100644 --- a/keyboards/nightly_boards/n9/keyboard.json +++ b/keyboards/nightly_boards/n9/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "D4"], "rows": ["F4", "B1", "B3"] diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h index a0ee1a92af8..763aef22e99 100644 --- a/keyboards/nightly_boards/octopad/config.h +++ b/keyboards/nightly_boards/octopad/config.h @@ -23,8 +23,3 @@ along with this program. If not, see . #define AUDIO_CLICKY #define NO_MUSIC_MODE - -/* 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/nightly_boards/octopad/keyboard.json b/keyboards/nightly_boards/octopad/keyboard.json index 7649dbefdfa..797f26a2c2e 100644 --- a/keyboards/nightly_boards/octopad/keyboard.json +++ b/keyboards/nightly_boards/octopad/keyboard.json @@ -22,6 +22,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "D0", "D1", "B1"], "rows": ["B2", "B3"] diff --git a/keyboards/nightly_boards/octopadplus/config.h b/keyboards/nightly_boards/octopadplus/config.h deleted file mode 100644 index 3d0b7f438c8..00000000000 --- a/keyboards/nightly_boards/octopadplus/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 DeskDaily - -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 diff --git a/keyboards/nightly_boards/octopadplus/keyboard.json b/keyboards/nightly_boards/octopadplus/keyboard.json index 629aa93aa3e..ca5a7cdad16 100644 --- a/keyboards/nightly_boards/octopadplus/keyboard.json +++ b/keyboards/nightly_boards/octopadplus/keyboard.json @@ -30,7 +30,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/nightly_boards/paraluman/config.h b/keyboards/nightly_boards/paraluman/config.h deleted file mode 100644 index b21da143b59..00000000000 --- a/keyboards/nightly_boards/paraluman/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2020 DeskDaily - -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 - diff --git a/keyboards/nightly_boards/paraluman/keyboard.json b/keyboards/nightly_boards/paraluman/keyboard.json index eb5b4014285..f18cefe6018 100644 --- a/keyboards/nightly_boards/paraluman/keyboard.json +++ b/keyboards/nightly_boards/paraluman/keyboard.json @@ -19,6 +19,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "F6", "F5", "F4", "F1", "F0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D0", "F7", "B1", "B0", "E6"] diff --git a/keyboards/nightly_boards/ph_arisu/config.h b/keyboards/nightly_boards/ph_arisu/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/nightly_boards/ph_arisu/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/nightly_boards/ph_arisu/keyboard.json b/keyboards/nightly_boards/ph_arisu/keyboard.json index 90cd8f3b8f6..55f9e6e90c7 100644 --- a/keyboards/nightly_boards/ph_arisu/keyboard.json +++ b/keyboards/nightly_boards/ph_arisu/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h deleted file mode 100644 index 39eec86786a..00000000000 --- a/keyboards/nightmare/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 cfbender - -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/nightmare/keyboard.json b/keyboards/nightmare/keyboard.json index c41d95e64d8..c4d984ac19f 100644 --- a/keyboards/nightmare/keyboard.json +++ b/keyboards/nightmare/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "B5", "D3", "D2", "D1", "D0", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/nimrod/config.h b/keyboards/nimrod/config.h deleted file mode 100644 index d74e88c63ad..00000000000 --- a/keyboards/nimrod/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 cjcodell1 - * - * 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 diff --git a/keyboards/nimrod/keyboard.json b/keyboards/nimrod/keyboard.json index 5f07885d0d7..08351efb20c 100644 --- a/keyboards/nimrod/keyboard.json +++ b/keyboards/nimrod/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "F4", "B5", "B4", "E6", "F6", "F7", "B1", "B3", "B2"], "rows": ["F5", "B6", "D7", "C6"] diff --git a/keyboards/nix_studio/oxalys80/config.h b/keyboards/nix_studio/oxalys80/config.h deleted file mode 100644 index 0e5dd8a043c..00000000000 --- a/keyboards/nix_studio/oxalys80/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Nix Studio - * - * 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 diff --git a/keyboards/nix_studio/oxalys80/keyboard.json b/keyboards/nix_studio/oxalys80/keyboard.json index 9f41d0a210b..5fa489f72bf 100644 --- a/keyboards/nix_studio/oxalys80/keyboard.json +++ b/keyboards/nix_studio/oxalys80/keyboard.json @@ -21,6 +21,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"], "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"] diff --git a/keyboards/nopunin10did/jabberwocky/v1/config.h b/keyboards/nopunin10did/jabberwocky/v1/config.h deleted file mode 100644 index ae6256b351b..00000000000 --- a/keyboards/nopunin10did/jabberwocky/v1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#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/nopunin10did/jabberwocky/v1/keyboard.json b/keyboards/nopunin10did/jabberwocky/v1/keyboard.json index b82a9642c71..6c8b71460e4 100644 --- a/keyboards/nopunin10did/jabberwocky/v1/keyboard.json +++ b/keyboards/nopunin10did/jabberwocky/v1/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "D7", "C6", "D4", "D0", "D2", "D3"], "rows": ["E6", "B4", "B5", "B7", "D5", "C7", "F1", "F0", "B1", "B3", "B2", "B6"] diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h deleted file mode 100644 index b00b2242dc2..00000000000 --- a/keyboards/nopunin10did/jabberwocky/v2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#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/nopunin10did/jabberwocky/v2/keyboard.json b/keyboards/nopunin10did/jabberwocky/v2/keyboard.json index 549daef9719..177f5235f45 100644 --- a/keyboards/nopunin10did/jabberwocky/v2/keyboard.json +++ b/keyboards/nopunin10did/jabberwocky/v2/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D2", "D3", "D5", "B5", "D7", "F6", "F7", "C7", "B6"], "rows": ["B2", "B3", "B1", "D4", "B4", "D1", "E6", "B0", "F0", "F1", "F4", "F5"] diff --git a/keyboards/nopunin10did/railroad/rev0/config.h b/keyboards/nopunin10did/railroad/rev0/config.h deleted file mode 100644 index 15ea042da21..00000000000 --- a/keyboards/nopunin10did/railroad/rev0/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#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/nopunin10did/railroad/rev0/keyboard.json b/keyboards/nopunin10did/railroad/rev0/keyboard.json index db740a4d483..7dcc17f7620 100644 --- a/keyboards/nopunin10did/railroad/rev0/keyboard.json +++ b/keyboards/nopunin10did/railroad/rev0/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6"], "rows": ["D2", "D3", "D5", "C6", "C7", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/novelkeys/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h deleted file mode 100755 index 5c82c9a7ca3..00000000000 --- a/keyboards/novelkeys/novelpad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Cole Markham - -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/novelkeys/novelpad/keyboard.json b/keyboards/novelkeys/novelpad/keyboard.json index 03c76764dfb..bb190dd2849 100644 --- a/keyboards/novelkeys/novelpad/keyboard.json +++ b/keyboards/novelkeys/novelpad/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "D6", "D5", "D4"], "rows": ["C2", "C4", "C5", "C6", "C7"] diff --git a/keyboards/noxary/220/config.h b/keyboards/noxary/220/config.h deleted file mode 100644 index b5b661bef2a..00000000000 --- a/keyboards/noxary/220/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 MechMerlin - -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/noxary/220/keyboard.json b/keyboards/noxary/220/keyboard.json index f40c0f7280a..75d71aac8a3 100644 --- a/keyboards/noxary/220/keyboard.json +++ b/keyboards/noxary/220/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "C5", "D2", "D1"], "rows": ["C4", "B0", "D3", "D4", "D5", "D6"] diff --git a/keyboards/noxary/260/config.h b/keyboards/noxary/260/config.h deleted file mode 100644 index b5b661bef2a..00000000000 --- a/keyboards/noxary/260/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 MechMerlin - -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/noxary/260/keyboard.json b/keyboards/noxary/260/keyboard.json index bcf1db37041..b5f876f5d91 100644 --- a/keyboards/noxary/260/keyboard.json +++ b/keyboards/noxary/260/keyboard.json @@ -20,6 +20,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "F4", "E6", "D0", "B4", "D1", "D2", "D3", "D7", "D6", "D4", "F1", "D5"], "rows": ["F7", "F6", "F5", "F0", "B5"] diff --git a/keyboards/noxary/268/config.h b/keyboards/noxary/268/config.h deleted file mode 100644 index ef4a0a745d3..00000000000 --- a/keyboards/noxary/268/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2020 Rozakiin - -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 \ No newline at end of file diff --git a/keyboards/noxary/268/keyboard.json b/keyboards/noxary/268/keyboard.json index bb0bc191d39..a44f48fad56 100644 --- a/keyboards/noxary/268/keyboard.json +++ b/keyboards/noxary/268/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "E6", "B0", "D1", "B2", "B3", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["F5", "F4", "F0", "F1", "D0"] diff --git a/keyboards/noxary/268_2/config.h b/keyboards/noxary/268_2/config.h deleted file mode 100644 index 98d8ea885ec..00000000000 --- a/keyboards/noxary/268_2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Rozakiin - -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/noxary/268_2/keyboard.json b/keyboards/noxary/268_2/keyboard.json index 6e983a07f61..c724d07a493 100644 --- a/keyboards/noxary/268_2/keyboard.json +++ b/keyboards/noxary/268_2/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "B6", "C7", "F4", "E6", "D0", "D7", "D1", "D2", "B4", "D6", "D4", "D5", "F1", "D3", "B1"], "rows": ["F7", "F6", "F5", "F0", "B5"] diff --git a/keyboards/noxary/268_2_rgb/config.h b/keyboards/noxary/268_2_rgb/config.h deleted file mode 100644 index 7d8bba5f4b7..00000000000 --- a/keyboards/noxary/268_2_rgb/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Rozakiin -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 diff --git a/keyboards/noxary/268_2_rgb/keyboard.json b/keyboards/noxary/268_2_rgb/keyboard.json index 971e4450367..380a7727676 100644 --- a/keyboards/noxary/268_2_rgb/keyboard.json +++ b/keyboards/noxary/268_2_rgb/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F1", "E6", "B2", "B1", "D6", "B4", "D7", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["F6", "F5", "F4", "F0", "B6"] diff --git a/keyboards/noxary/280/config.h b/keyboards/noxary/280/config.h deleted file mode 100644 index b5b661bef2a..00000000000 --- a/keyboards/noxary/280/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 MechMerlin - -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/noxary/280/keyboard.json b/keyboards/noxary/280/keyboard.json index f4b77260a57..17acb96cdf4 100644 --- a/keyboards/noxary/280/keyboard.json +++ b/keyboards/noxary/280/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "B0", "B3"], "rows": ["F0", "E6", "D6", "D4", "F6", "F5", "F4", "F1", "B2", "D3", "D2", "D1"] diff --git a/keyboards/noxary/378/config.h b/keyboards/noxary/378/config.h deleted file mode 100644 index f608132b5af..00000000000 --- a/keyboards/noxary/378/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/noxary/378/keyboard.json b/keyboards/noxary/378/keyboard.json index 09c5d39b048..3502604d6cb 100644 --- a/keyboards/noxary/378/keyboard.json +++ b/keyboards/noxary/378/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A7", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A2", "A1", "A0", "F1", "F0", "C14", "C15"], "rows": ["A10", "B11", "A4", "A5", "A6"] diff --git a/keyboards/noxary/valhalla/config.h b/keyboards/noxary/valhalla/config.h deleted file mode 100644 index f608132b5af..00000000000 --- a/keyboards/noxary/valhalla/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/noxary/valhalla/keyboard.json b/keyboards/noxary/valhalla/keyboard.json index 9cf12969c18..3bc3d80a340 100644 --- a/keyboards/noxary/valhalla/keyboard.json +++ b/keyboards/noxary/valhalla/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B12", "B11", "B10", "B2", "B1", "B0", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], "rows": ["A8", "A9", "B13", "B14", "B15"] diff --git a/keyboards/noxary/vulcan/config.h b/keyboards/noxary/vulcan/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/noxary/vulcan/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -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/noxary/vulcan/keyboard.json b/keyboards/noxary/vulcan/keyboard.json index 8ae658f68e1..821cb000b59 100644 --- a/keyboards/noxary/vulcan/keyboard.json +++ b/keyboards/noxary/vulcan/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["D1", "D0", "D2", "F0", "F1"] diff --git a/keyboards/noxary/x268/config.h b/keyboards/noxary/x268/config.h deleted file mode 100644 index 98d8ea885ec..00000000000 --- a/keyboards/noxary/x268/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Rozakiin - -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/noxary/x268/keyboard.json b/keyboards/noxary/x268/keyboard.json index 675cc0b1a39..f5a991deff5 100644 --- a/keyboards/noxary/x268/keyboard.json +++ b/keyboards/noxary/x268/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "B6", "C7", "F4", "E6", "B2", "D6", "D0", "D1", "D7", "D4", "D5", "D3", "F1", "D2", "B1"], "rows": ["F7", "F6", "F5", "F0", "B4"] diff --git a/keyboards/numatreus/config.h b/keyboards/numatreus/config.h index 46a94d10c09..69d1cb1f1ad 100644 --- a/keyboards/numatreus/config.h +++ b/keyboards/numatreus/config.h @@ -14,11 +14,6 @@ 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 - #if defined(RGBLIGHT_ENABLE) // USB_MAX_POWER_CONSUMPTION value for stonehenge30 keyboard // 120 RGBoff, OLEDoff diff --git a/keyboards/numatreus/keyboard.json b/keyboards/numatreus/keyboard.json index cfb612a5416..3120b48f55d 100644 --- a/keyboards/numatreus/keyboard.json +++ b/keyboards/numatreus/keyboard.json @@ -15,6 +15,12 @@ "nkro": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D2", "D1", "D0", "D4"], "rows": ["C6", "D7", "E6", "B4"] From 7baaac9531c2806e38d8c9e2e0357b3eadbf2a7f Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 22 May 2024 13:41:34 -0700 Subject: [PATCH 314/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: K, Part 1 (#23768) Affects: - `kabedon/kabedon98e` - `kagizaraya/chidori` - `kagizaraya/halberd` - `kagizaraya/miniaxe` - `kagizaraya/scythe` - `kakunpc/angel17/alpha` - `kakunpc/angel17/rev1` - `kakunpc/angel64/alpha` - `kakunpc/angel64/rev1` - `kakunpc/business_card/alpha` - `kakunpc/business_card/beta` - `kakunpc/choc_taro` - `kakunpc/rabbit_capture_plan` - `kakunpc/suihankey/alpha` - `kakunpc/suihankey/rev1` - `kakunpc/suihankey/split/alpha` - `kakunpc/suihankey/split/rev1` - `kakunpc/thedogkeyboard` - `kapcave/arya` - `kapcave/gskt00` - `kapcave/paladin64` - `kapl/rev1` - `kb58` - `kb_elmo/aek2_usb` - `kb_elmo/m0110a_usb` - `kb_elmo/m0116_usb` - `kbdclack/kaishi65` - `kbdfans/bella/soldered` - `kbdfans/bounce/pad` - `kbdfans/jm60` - `kbdfans/kbd19x` - `kbdfans/kbd4x` - `kbdfans/kbd66` - `kbdfans/kbd67/hotswap` - `kbdfans/kbd67/mkii_soldered` - `kbdfans/kbd6x` - `kbdfans/kbd75/rev1` - `kbdfans/kbd75/rev2` - `kbdfans/kbd8x` - `kbdfans/kbd8x_mk2` - `kbdfans/kbdpad/mk2` - `kbdfans/maja_soldered` - `kbdfans/niu_mini` - `kbdfans/phaseone` - `kbdmania/kmac` - `kbdmania/kmac_pad` - `kc60` --- keyboards/kabedon/kabedon98e/config.h | 5 --- keyboards/kabedon/kabedon98e/keyboard.json | 6 +++ keyboards/kagizaraya/chidori/config.h | 5 --- keyboards/kagizaraya/chidori/keyboard.json | 6 +++ keyboards/kagizaraya/halberd/config.h | 38 ------------------ keyboards/kagizaraya/halberd/keyboard.json | 6 +++ keyboards/kagizaraya/miniaxe/config.h | 5 --- keyboards/kagizaraya/miniaxe/keyboard.json | 6 +++ keyboards/kagizaraya/scythe/config.h | 5 --- keyboards/kagizaraya/scythe/keyboard.json | 6 +++ keyboards/kakunpc/angel17/alpha/config.h | 39 ------------------ keyboards/kakunpc/angel17/alpha/keyboard.json | 6 +++ keyboards/kakunpc/angel17/rev1/config.h | 39 ------------------ keyboards/kakunpc/angel17/rev1/keyboard.json | 6 +++ keyboards/kakunpc/angel64/alpha/config.h | 5 --- keyboards/kakunpc/angel64/alpha/keyboard.json | 6 +++ keyboards/kakunpc/angel64/rev1/config.h | 5 --- keyboards/kakunpc/angel64/rev1/keyboard.json | 6 +++ .../kakunpc/business_card/alpha/config.h | 39 ------------------ .../kakunpc/business_card/alpha/keyboard.json | 6 +++ keyboards/kakunpc/business_card/beta/config.h | 39 ------------------ .../kakunpc/business_card/beta/keyboard.json | 6 +++ keyboards/kakunpc/choc_taro/config.h | 5 --- keyboards/kakunpc/choc_taro/keyboard.json | 6 +++ .../kakunpc/rabbit_capture_plan/config.h | 39 ------------------ .../kakunpc/rabbit_capture_plan/keyboard.json | 6 +++ keyboards/kakunpc/suihankey/alpha/config.h | 39 ------------------ .../kakunpc/suihankey/alpha/keyboard.json | 6 +++ keyboards/kakunpc/suihankey/rev1/config.h | 39 ------------------ .../kakunpc/suihankey/rev1/keyboard.json | 6 +++ .../kakunpc/suihankey/split/alpha/config.h | 5 --- .../suihankey/split/alpha/keyboard.json | 6 +++ .../kakunpc/suihankey/split/rev1/config.h | 5 --- .../suihankey/split/rev1/keyboard.json | 6 +++ keyboards/kakunpc/thedogkeyboard/config.h | 5 --- .../kakunpc/thedogkeyboard/keyboard.json | 6 +++ keyboards/kapcave/arya/config.h | 39 ------------------ keyboards/kapcave/arya/keyboard.json | 6 ++- keyboards/kapcave/gskt00/config.h | 25 ------------ keyboards/kapcave/gskt00/keyboard.json | 6 +++ keyboards/kapcave/paladin64/config.h | 6 --- keyboards/kapcave/paladin64/keyboard.json | 6 +++ keyboards/kapl/rev1/config.h | 5 --- keyboards/kapl/rev1/keyboard.json | 6 +++ keyboards/kb58/config.h | 39 ------------------ keyboards/kb58/keyboard.json | 6 +++ keyboards/kb_elmo/aek2_usb/config.h | 5 --- keyboards/kb_elmo/aek2_usb/keyboard.json | 6 +++ keyboards/kb_elmo/m0110a_usb/config.h | 23 ----------- keyboards/kb_elmo/m0110a_usb/keyboard.json | 6 +++ keyboards/kb_elmo/m0116_usb/config.h | 23 ----------- keyboards/kb_elmo/m0116_usb/keyboard.json | 6 +++ keyboards/kbdclack/kaishi65/config.h | 39 ------------------ keyboards/kbdclack/kaishi65/keyboard.json | 6 +++ keyboards/kbdfans/bella/soldered/config.h | 19 --------- .../kbdfans/bella/soldered/keyboard.json | 6 +++ keyboards/kbdfans/bounce/pad/config.h | 20 ---------- keyboards/kbdfans/bounce/pad/keyboard.json | 6 +++ keyboards/kbdfans/jm60/config.h | 39 ------------------ keyboards/kbdfans/jm60/keyboard.json | 6 +++ keyboards/kbdfans/kbd19x/config.h | 39 ------------------ keyboards/kbdfans/kbd19x/keyboard.json | 6 +++ keyboards/kbdfans/kbd4x/config.h | 39 ------------------ keyboards/kbdfans/kbd4x/keyboard.json | 6 +++ keyboards/kbdfans/kbd66/config.h | 39 ------------------ keyboards/kbdfans/kbd66/keyboard.json | 6 +++ keyboards/kbdfans/kbd67/hotswap/config.h | 39 ------------------ keyboards/kbdfans/kbd67/hotswap/keyboard.json | 6 +++ .../kbdfans/kbd67/mkii_soldered/config.h | 23 ----------- .../kbdfans/kbd67/mkii_soldered/keyboard.json | 6 +++ keyboards/kbdfans/kbd6x/config.h | 39 ------------------ keyboards/kbdfans/kbd6x/keyboard.json | 6 +++ keyboards/kbdfans/kbd75/config.h | 10 ----- keyboards/kbdfans/kbd75/rev1/keyboard.json | 6 +++ keyboards/kbdfans/kbd75/rev2/keyboard.json | 6 +++ keyboards/kbdfans/kbd8x/config.h | 29 -------------- keyboards/kbdfans/kbd8x/keyboard.json | 6 +++ keyboards/kbdfans/kbd8x_mk2/config.h | 39 ------------------ keyboards/kbdfans/kbd8x_mk2/keyboard.json | 6 +++ keyboards/kbdfans/kbdpad/mk2/config.h | 39 ------------------ keyboards/kbdfans/kbdpad/mk2/keyboard.json | 6 +++ keyboards/kbdfans/maja_soldered/config.h | 22 ---------- keyboards/kbdfans/maja_soldered/keyboard.json | 6 +++ keyboards/kbdfans/niu_mini/config.h | 40 ------------------- keyboards/kbdfans/niu_mini/keyboard.json | 6 +++ keyboards/kbdfans/phaseone/config.h | 5 --- keyboards/kbdfans/phaseone/keyboard.json | 6 +++ keyboards/kbdmania/kmac/config.h | 5 --- keyboards/kbdmania/kmac/keyboard.json | 6 +++ keyboards/kbdmania/kmac_pad/config.h | 5 --- keyboards/kbdmania/kmac_pad/keyboard.json | 6 +++ keyboards/kc60/config.h | 39 ------------------ keyboards/kc60/keyboard.json | 6 +++ 93 files changed, 281 insertions(+), 1095 deletions(-) delete mode 100644 keyboards/kagizaraya/halberd/config.h delete mode 100644 keyboards/kakunpc/angel17/alpha/config.h delete mode 100644 keyboards/kakunpc/angel17/rev1/config.h delete mode 100644 keyboards/kakunpc/business_card/alpha/config.h delete mode 100644 keyboards/kakunpc/business_card/beta/config.h delete mode 100644 keyboards/kakunpc/rabbit_capture_plan/config.h delete mode 100644 keyboards/kakunpc/suihankey/alpha/config.h delete mode 100644 keyboards/kakunpc/suihankey/rev1/config.h delete mode 100644 keyboards/kapcave/arya/config.h delete mode 100755 keyboards/kapcave/gskt00/config.h delete mode 100644 keyboards/kb58/config.h delete mode 100644 keyboards/kb_elmo/m0110a_usb/config.h delete mode 100644 keyboards/kb_elmo/m0116_usb/config.h delete mode 100644 keyboards/kbdclack/kaishi65/config.h delete mode 100755 keyboards/kbdfans/bella/soldered/config.h delete mode 100644 keyboards/kbdfans/bounce/pad/config.h delete mode 100644 keyboards/kbdfans/jm60/config.h delete mode 100644 keyboards/kbdfans/kbd19x/config.h delete mode 100644 keyboards/kbdfans/kbd4x/config.h delete mode 100644 keyboards/kbdfans/kbd66/config.h delete mode 100644 keyboards/kbdfans/kbd67/hotswap/config.h delete mode 100644 keyboards/kbdfans/kbd67/mkii_soldered/config.h delete mode 100644 keyboards/kbdfans/kbd6x/config.h delete mode 100644 keyboards/kbdfans/kbd75/config.h delete mode 100644 keyboards/kbdfans/kbd8x/config.h delete mode 100644 keyboards/kbdfans/kbd8x_mk2/config.h delete mode 100644 keyboards/kbdfans/kbdpad/mk2/config.h delete mode 100755 keyboards/kbdfans/maja_soldered/config.h delete mode 100644 keyboards/kbdfans/niu_mini/config.h delete mode 100644 keyboards/kc60/config.h diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h index 8eb549c134d..e3c016bd7ce 100644 --- a/keyboards/kabedon/kabedon98e/config.h +++ b/keyboards/kabedon/kabedon98e/config.h @@ -19,8 +19,3 @@ #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 #define WS2812_PWM_DMA_CHANNEL 3 - -/* 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/kabedon/kabedon98e/keyboard.json b/keyboards/kabedon/kabedon98e/keyboard.json index a08bfeb0aa4..beff70d5d9f 100644 --- a/keyboards/kabedon/kabedon98e/keyboard.json +++ b/keyboards/kabedon/kabedon98e/keyboard.json @@ -38,6 +38,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A0", "B7", "B8", "B6", "A3", "A2", "A1", "B9", "A7", "A5", "A6"], "rows": ["A4", "B10", "B2", "B1", "B0", "B15", "B13", "B14", "B12", "A10", "A9", "A8"] diff --git a/keyboards/kagizaraya/chidori/config.h b/keyboards/kagizaraya/chidori/config.h index eb719e95049..12716026e51 100644 --- a/keyboards/kagizaraya/chidori/config.h +++ b/keyboards/kagizaraya/chidori/config.h @@ -22,11 +22,6 @@ along with this program. If not, see . #define MATRIX_ROWS 12 #define MATRIX_COLS 6 -/* 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 - /* key combination for magic key command */ /* defined by default; to change, uncomment and set to the combination you want */ #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LCTL))) diff --git a/keyboards/kagizaraya/chidori/keyboard.json b/keyboards/kagizaraya/chidori/keyboard.json index f1b064baba0..2f9066149d9 100644 --- a/keyboards/kagizaraya/chidori/keyboard.json +++ b/keyboards/kagizaraya/chidori/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kagizaraya/halberd/config.h b/keyboards/kagizaraya/halberd/config.h deleted file mode 100644 index aa3ac65cea9..00000000000 --- a/keyboards/kagizaraya/halberd/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 ENDO Katsuhiro - -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/kagizaraya/halberd/keyboard.json b/keyboards/kagizaraya/halberd/keyboard.json index ecaa267cbd3..c8c5b5e2146 100644 --- a/keyboards/kagizaraya/halberd/keyboard.json +++ b/keyboards/kagizaraya/halberd/keyboard.json @@ -40,6 +40,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "B4", "C7", "C6", "B6", "B5", "F7", "F6", "F5", "F4", "F1"], "rows": ["D6", "D4", "D5", "E6"] diff --git a/keyboards/kagizaraya/miniaxe/config.h b/keyboards/kagizaraya/miniaxe/config.h index 716fdf387a8..a0e31b0f1a2 100644 --- a/keyboards/kagizaraya/miniaxe/config.h +++ b/keyboards/kagizaraya/miniaxe/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/kagizaraya/miniaxe/keyboard.json b/keyboards/kagizaraya/miniaxe/keyboard.json index fa9f4d79dfc..c1de30ea79b 100644 --- a/keyboards/kagizaraya/miniaxe/keyboard.json +++ b/keyboards/kagizaraya/miniaxe/keyboard.json @@ -42,6 +42,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["F1", "E6", "B0", "B2", "B3"], diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h index 026950e1c70..e9f7198f44e 100644 --- a/keyboards/kagizaraya/scythe/config.h +++ b/keyboards/kagizaraya/scythe/config.h @@ -16,11 +16,6 @@ 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. diff --git a/keyboards/kagizaraya/scythe/keyboard.json b/keyboards/kagizaraya/scythe/keyboard.json index eeebbe85a62..36b9a5a2d6f 100644 --- a/keyboards/kagizaraya/scythe/keyboard.json +++ b/keyboards/kagizaraya/scythe/keyboard.json @@ -53,6 +53,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/angel17/alpha/config.h b/keyboards/kakunpc/angel17/alpha/config.h deleted file mode 100644 index f79d8124759..00000000000 --- a/keyboards/kakunpc/angel17/alpha/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 kakunpc - -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/kakunpc/angel17/alpha/keyboard.json b/keyboards/kakunpc/angel17/alpha/keyboard.json index 425ac12f578..a29189aa641 100644 --- a/keyboards/kakunpc/angel17/alpha/keyboard.json +++ b/keyboards/kakunpc/angel17/alpha/keyboard.json @@ -11,6 +11,12 @@ "console": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_numpad_5x4": { "layout": [ diff --git a/keyboards/kakunpc/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h deleted file mode 100644 index f79d8124759..00000000000 --- a/keyboards/kakunpc/angel17/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 kakunpc - -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/kakunpc/angel17/rev1/keyboard.json b/keyboards/kakunpc/angel17/rev1/keyboard.json index ef609ba2387..06ac5d8cca8 100644 --- a/keyboards/kakunpc/angel17/rev1/keyboard.json +++ b/keyboards/kakunpc/angel17/rev1/keyboard.json @@ -21,6 +21,12 @@ "command": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_numpad_5x4": { "layout": [ diff --git a/keyboards/kakunpc/angel64/alpha/config.h b/keyboards/kakunpc/angel64/alpha/config.h index 4d51ac0f1af..9821406e019 100644 --- a/keyboards/kakunpc/angel64/alpha/config.h +++ b/keyboards/kakunpc/angel64/alpha/config.h @@ -29,11 +29,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } -/* 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. diff --git a/keyboards/kakunpc/angel64/alpha/keyboard.json b/keyboards/kakunpc/angel64/alpha/keyboard.json index f00dd3b42bc..59528283384 100644 --- a/keyboards/kakunpc/angel64/alpha/keyboard.json +++ b/keyboards/kakunpc/angel64/alpha/keyboard.json @@ -39,6 +39,12 @@ "rgblight": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/angel64/rev1/config.h b/keyboards/kakunpc/angel64/rev1/config.h index 4d51ac0f1af..9821406e019 100644 --- a/keyboards/kakunpc/angel64/rev1/config.h +++ b/keyboards/kakunpc/angel64/rev1/config.h @@ -29,11 +29,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } -/* 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. diff --git a/keyboards/kakunpc/angel64/rev1/keyboard.json b/keyboards/kakunpc/angel64/rev1/keyboard.json index eade3a5ec9d..9ed4904c686 100644 --- a/keyboards/kakunpc/angel64/rev1/keyboard.json +++ b/keyboards/kakunpc/angel64/rev1/keyboard.json @@ -39,6 +39,12 @@ "rgblight": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kakunpc/business_card/alpha/config.h b/keyboards/kakunpc/business_card/alpha/config.h deleted file mode 100644 index f79d8124759..00000000000 --- a/keyboards/kakunpc/business_card/alpha/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 kakunpc - -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/kakunpc/business_card/alpha/keyboard.json b/keyboards/kakunpc/business_card/alpha/keyboard.json index 02c4604c446..17c42ebb31f 100644 --- a/keyboards/kakunpc/business_card/alpha/keyboard.json +++ b/keyboards/kakunpc/business_card/alpha/keyboard.json @@ -31,6 +31,12 @@ "rgblight": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/business_card/beta/config.h b/keyboards/kakunpc/business_card/beta/config.h deleted file mode 100644 index f79d8124759..00000000000 --- a/keyboards/kakunpc/business_card/beta/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 kakunpc - -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/kakunpc/business_card/beta/keyboard.json b/keyboards/kakunpc/business_card/beta/keyboard.json index da18001a906..5b6a77f3580 100644 --- a/keyboards/kakunpc/business_card/beta/keyboard.json +++ b/keyboards/kakunpc/business_card/beta/keyboard.json @@ -31,6 +31,12 @@ "rgblight": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/choc_taro/config.h b/keyboards/kakunpc/choc_taro/config.h index cbb2a934a0f..4a4fd2a72e8 100644 --- a/keyboards/kakunpc/choc_taro/config.h +++ b/keyboards/kakunpc/choc_taro/config.h @@ -34,11 +34,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } #define MATRIX_COL_PINS { D4, C6, D7, E6, B4 } -/* 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. diff --git a/keyboards/kakunpc/choc_taro/keyboard.json b/keyboards/kakunpc/choc_taro/keyboard.json index b17e5e39206..8d8c615daf8 100644 --- a/keyboards/kakunpc/choc_taro/keyboard.json +++ b/keyboards/kakunpc/choc_taro/keyboard.json @@ -17,6 +17,12 @@ "console": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kakunpc/rabbit_capture_plan/config.h b/keyboards/kakunpc/rabbit_capture_plan/config.h deleted file mode 100644 index 617b0deeb49..00000000000 --- a/keyboards/kakunpc/rabbit_capture_plan/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 kakunpc - -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/kakunpc/rabbit_capture_plan/keyboard.json b/keyboards/kakunpc/rabbit_capture_plan/keyboard.json index 7667e5e41b1..16364fb71fe 100644 --- a/keyboards/kakunpc/rabbit_capture_plan/keyboard.json +++ b/keyboards/kakunpc/rabbit_capture_plan/keyboard.json @@ -40,6 +40,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/kakunpc/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h deleted file mode 100644 index f79d8124759..00000000000 --- a/keyboards/kakunpc/suihankey/alpha/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 kakunpc - -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/kakunpc/suihankey/alpha/keyboard.json b/keyboards/kakunpc/suihankey/alpha/keyboard.json index f76c56d746d..e90a61d87e7 100644 --- a/keyboards/kakunpc/suihankey/alpha/keyboard.json +++ b/keyboards/kakunpc/suihankey/alpha/keyboard.json @@ -43,6 +43,12 @@ "rgblight": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h deleted file mode 100644 index f79d8124759..00000000000 --- a/keyboards/kakunpc/suihankey/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 kakunpc - -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/kakunpc/suihankey/rev1/keyboard.json b/keyboards/kakunpc/suihankey/rev1/keyboard.json index 0e801b1963b..1c1da88cdb9 100644 --- a/keyboards/kakunpc/suihankey/rev1/keyboard.json +++ b/keyboards/kakunpc/suihankey/rev1/keyboard.json @@ -43,6 +43,12 @@ "rgblight": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h index a2f22644578..ebccdcca304 100644 --- a/keyboards/kakunpc/suihankey/split/alpha/config.h +++ b/keyboards/kakunpc/suihankey/split/alpha/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D2 -/* 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. diff --git a/keyboards/kakunpc/suihankey/split/alpha/keyboard.json b/keyboards/kakunpc/suihankey/split/alpha/keyboard.json index 956ee3357c7..a46d202eeed 100644 --- a/keyboards/kakunpc/suihankey/split/alpha/keyboard.json +++ b/keyboards/kakunpc/suihankey/split/alpha/keyboard.json @@ -19,6 +19,12 @@ "extrakey": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT": "LAYOUT_split_3x5_3" }, diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h index a2f22644578..ebccdcca304 100644 --- a/keyboards/kakunpc/suihankey/split/rev1/config.h +++ b/keyboards/kakunpc/suihankey/split/rev1/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D2 -/* 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. diff --git a/keyboards/kakunpc/suihankey/split/rev1/keyboard.json b/keyboards/kakunpc/suihankey/split/rev1/keyboard.json index 0640e4e26a0..8f967d16c95 100644 --- a/keyboards/kakunpc/suihankey/split/rev1/keyboard.json +++ b/keyboards/kakunpc/suihankey/split/rev1/keyboard.json @@ -31,6 +31,12 @@ "extrakey": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT": "LAYOUT_split_3x5_3" }, diff --git a/keyboards/kakunpc/thedogkeyboard/config.h b/keyboards/kakunpc/thedogkeyboard/config.h index 30b7b606c08..132c1cccaea 100644 --- a/keyboards/kakunpc/thedogkeyboard/config.h +++ b/keyboards/kakunpc/thedogkeyboard/config.h @@ -35,11 +35,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5 } #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 } -/* 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. diff --git a/keyboards/kakunpc/thedogkeyboard/keyboard.json b/keyboards/kakunpc/thedogkeyboard/keyboard.json index 185b4c4fe0a..f2c04565d1b 100644 --- a/keyboards/kakunpc/thedogkeyboard/keyboard.json +++ b/keyboards/kakunpc/thedogkeyboard/keyboard.json @@ -28,6 +28,12 @@ "command": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": [ "fullsize_ansi" ], diff --git a/keyboards/kapcave/arya/config.h b/keyboards/kapcave/arya/config.h deleted file mode 100644 index 6cd36572279..00000000000 --- a/keyboards/kapcave/arya/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 KapCave - -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/kapcave/arya/keyboard.json b/keyboards/kapcave/arya/keyboard.json index 9c08d91247e..986e9eec8b9 100644 --- a/keyboards/kapcave/arya/keyboard.json +++ b/keyboards/kapcave/arya/keyboard.json @@ -30,7 +30,11 @@ ] }, "qmk": { - "tap_keycode_delay": 25 + "tap_keycode_delay": 25, + "locking": { + "enabled": true, + "resync": true + } }, "processor": "STM32F072", "bootloader": "stm32-dfu", diff --git a/keyboards/kapcave/gskt00/config.h b/keyboards/kapcave/gskt00/config.h deleted file mode 100755 index dfeb9c44d16..00000000000 --- a/keyboards/kapcave/gskt00/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2021 KapCave - -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 - - diff --git a/keyboards/kapcave/gskt00/keyboard.json b/keyboards/kapcave/gskt00/keyboard.json index 10fd2307e3b..0d2fd292c64 100644 --- a/keyboards/kapcave/gskt00/keyboard.json +++ b/keyboards/kapcave/gskt00/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "D7", "F5", "C7", "B4", "C6", "B6", "B5"], "rows": ["F1", "D1", "D2", "D4", "D6", "F7", "B0", "F4"] diff --git a/keyboards/kapcave/paladin64/config.h b/keyboards/kapcave/paladin64/config.h index 9d449cb0167..9fab1e066a9 100644 --- a/keyboards/kapcave/paladin64/config.h +++ b/keyboards/kapcave/paladin64/config.h @@ -71,9 +71,3 @@ along with this program. If not, see . #define PS2_INT_VECT INT2_vect #endif - -/* 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/kapcave/paladin64/keyboard.json b/keyboards/kapcave/paladin64/keyboard.json index d03a98be529..6fdd64a5007 100644 --- a/keyboards/kapcave/paladin64/keyboard.json +++ b/keyboards/kapcave/paladin64/keyboard.json @@ -20,6 +20,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "D1"], "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "B0", "D3"] diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h index 8b9c2f14ee8..80db6dce607 100644 --- a/keyboards/kapl/rev1/config.h +++ b/keyboards/kapl/rev1/config.h @@ -4,8 +4,3 @@ /* Select hand configuration */ #define MASTER_LEFT - -/* 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/kapl/rev1/keyboard.json b/keyboards/kapl/rev1/keyboard.json index 650702ba5fc..71e0678a422 100644 --- a/keyboards/kapl/rev1/keyboard.json +++ b/keyboards/kapl/rev1/keyboard.json @@ -78,6 +78,12 @@ "extrakey": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/kb58/config.h b/keyboards/kb58/config.h deleted file mode 100644 index da9f91c5f57..00000000000 --- a/keyboards/kb58/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 beanaccle - -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/kb58/keyboard.json b/keyboards/kb58/keyboard.json index 950bc51eaf0..70581c2d8ae 100644 --- a/keyboards/kb58/keyboard.json +++ b/keyboards/kb58/keyboard.json @@ -30,6 +30,12 @@ "mousekey": false, "extrakey": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/aek2_usb/config.h b/keyboards/kb_elmo/aek2_usb/config.h index 085db9791c7..604bca0284b 100644 --- a/keyboards/kb_elmo/aek2_usb/config.h +++ b/keyboards/kb_elmo/aek2_usb/config.h @@ -17,9 +17,4 @@ 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 LAYER_STATE_8BIT diff --git a/keyboards/kb_elmo/aek2_usb/keyboard.json b/keyboards/kb_elmo/aek2_usb/keyboard.json index 3ee3c521f73..038d980b7b6 100644 --- a/keyboards/kb_elmo/aek2_usb/keyboard.json +++ b/keyboards/kb_elmo/aek2_usb/keyboard.json @@ -28,6 +28,12 @@ "mousekey": false, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/m0110a_usb/config.h b/keyboards/kb_elmo/m0110a_usb/config.h deleted file mode 100644 index fd067c7fb73..00000000000 --- a/keyboards/kb_elmo/m0110a_usb/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 kb-elmo - -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 diff --git a/keyboards/kb_elmo/m0110a_usb/keyboard.json b/keyboards/kb_elmo/m0110a_usb/keyboard.json index c106e35c301..a84772554c9 100644 --- a/keyboards/kb_elmo/m0110a_usb/keyboard.json +++ b/keyboards/kb_elmo/m0110a_usb/keyboard.json @@ -20,6 +20,12 @@ "mousekey": false, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/m0116_usb/config.h b/keyboards/kb_elmo/m0116_usb/config.h deleted file mode 100644 index fd067c7fb73..00000000000 --- a/keyboards/kb_elmo/m0116_usb/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 kb-elmo - -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 diff --git a/keyboards/kb_elmo/m0116_usb/keyboard.json b/keyboards/kb_elmo/m0116_usb/keyboard.json index 7279dc3c861..db2b9640544 100644 --- a/keyboards/kb_elmo/m0116_usb/keyboard.json +++ b/keyboards/kb_elmo/m0116_usb/keyboard.json @@ -23,6 +23,12 @@ "mousekey": false, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kbdclack/kaishi65/config.h b/keyboards/kbdclack/kaishi65/config.h deleted file mode 100644 index 39765a5bf73..00000000000 --- a/keyboards/kbdclack/kaishi65/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 KBDClack - -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/kbdclack/kaishi65/keyboard.json b/keyboards/kbdclack/kaishi65/keyboard.json index 573f2b8a3af..1f7509e53f9 100644 --- a/keyboards/kbdclack/kaishi65/keyboard.json +++ b/keyboards/kbdclack/kaishi65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3"], "rows": ["D0", "D1", "B0", "F0", "F1"] diff --git a/keyboards/kbdfans/bella/soldered/config.h b/keyboards/kbdfans/bella/soldered/config.h deleted file mode 100755 index 0c6f580f59a..00000000000 --- a/keyboards/kbdfans/bella/soldered/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 dztech - * - * 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 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/kbdfans/bella/soldered/keyboard.json b/keyboards/kbdfans/bella/soldered/keyboard.json index 10e45f1cf70..31d8e9ffb7a 100644 --- a/keyboards/kbdfans/bella/soldered/keyboard.json +++ b/keyboards/kbdfans/bella/soldered/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B1", "B2", "B3", "D1", "B6"] diff --git a/keyboards/kbdfans/bounce/pad/config.h b/keyboards/kbdfans/bounce/pad/config.h deleted file mode 100644 index 0aae477dc19..00000000000 --- a/keyboards/kbdfans/bounce/pad/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2022 DZTECH - * - * 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 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/kbdfans/bounce/pad/keyboard.json b/keyboards/kbdfans/bounce/pad/keyboard.json index 0e4f2e9d85d..d95010954b9 100644 --- a/keyboards/kbdfans/bounce/pad/keyboard.json +++ b/keyboards/kbdfans/bounce/pad/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B4", "D0", "C2"], "rows": ["C7", "B7", "B6", "B0", "B1", "B2"] diff --git a/keyboards/kbdfans/jm60/config.h b/keyboards/kbdfans/jm60/config.h deleted file mode 100644 index 4b007cf387e..00000000000 --- a/keyboards/kbdfans/jm60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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/kbdfans/jm60/keyboard.json b/keyboards/kbdfans/jm60/keyboard.json index 4b0f9609524..ffa205daa08 100644 --- a/keyboards/kbdfans/jm60/keyboard.json +++ b/keyboards/kbdfans/jm60/keyboard.json @@ -19,6 +19,12 @@ "extrakey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "bootloader": "custom", "processor": "STM32F103", "community_layouts": ["60_ansi"], diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h deleted file mode 100644 index 99c25201ad6..00000000000 --- a/keyboards/kbdfans/kbd19x/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Jeff Shufelt @jshuf - -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/kbdfans/kbd19x/keyboard.json b/keyboards/kbdfans/kbd19x/keyboard.json index a8a71de3b65..080cf82d808 100644 --- a/keyboards/kbdfans/kbd19x/keyboard.json +++ b/keyboards/kbdfans/kbd19x/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "F1", "F4", "F5", "F6", "F7", "D7", "B4", "B5", "D0", "D1", "D2", "D3"], "rows": ["B7", "B3", "E6", "F0", "D5", "D4", "D6", "C7"] diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h deleted file mode 100644 index e347de77599..00000000000 --- a/keyboards/kbdfans/kbd4x/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 sevenseacat - -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/kbdfans/kbd4x/keyboard.json b/keyboards/kbdfans/kbd4x/keyboard.json index a1dc8e3dd49..77abf71f28e 100644 --- a/keyboards/kbdfans/kbd4x/keyboard.json +++ b/keyboards/kbdfans/kbd4x/keyboard.json @@ -49,6 +49,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/kbdfans/kbd66/config.h b/keyboards/kbdfans/kbd66/config.h deleted file mode 100644 index 61533b79095..00000000000 --- a/keyboards/kbdfans/kbd66/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Alex Peters - -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/kbdfans/kbd66/keyboard.json b/keyboards/kbdfans/kbd66/keyboard.json index d95a80baa42..2b614442a0c 100644 --- a/keyboards/kbdfans/kbd66/keyboard.json +++ b/keyboards/kbdfans/kbd66/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "C7", "E2", "F5", "F6", "F4", "D3", "D2", "D5", "D0", "D1", "B4", "D7", "D6", "E6", "B3"], "rows": ["B0", "B1", "F0", "F1", "D4"] diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h deleted file mode 100644 index b5b661bef2a..00000000000 --- a/keyboards/kbdfans/kbd67/hotswap/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 MechMerlin - -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/kbdfans/kbd67/hotswap/keyboard.json b/keyboards/kbdfans/kbd67/hotswap/keyboard.json index 574633396cd..fb0c165d14f 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keyboard.json +++ b/keyboards/kbdfans/kbd67/hotswap/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7", "C6"], "rows": ["B3", "B2", "B1", "B0", "D4"] diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/config.h b/keyboards/kbdfans/kbd67/mkii_soldered/config.h deleted file mode 100644 index 8309a11eb8a..00000000000 --- a/keyboards/kbdfans/kbd67/mkii_soldered/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -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 diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keyboard.json b/keyboards/kbdfans/kbd67/mkii_soldered/keyboard.json index 7a9d4f8444b..397f525f7ae 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/keyboard.json +++ b/keyboards/kbdfans/kbd67/mkii_soldered/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], "rows": ["B3", "D0", "D1", "D2", "D3"] diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h deleted file mode 100644 index d876570c808..00000000000 --- a/keyboards/kbdfans/kbd6x/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 MechMerlin - -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/kbdfans/kbd6x/keyboard.json b/keyboards/kbdfans/kbd6x/keyboard.json index 85cfdf8388e..c2b9f28b633 100644 --- a/keyboards/kbdfans/kbd6x/keyboard.json +++ b/keyboards/kbdfans/kbd6x/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"], "rows": ["B3", "B2", "B1", "B0", "D4"] diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h deleted file mode 100644 index 805f9ad0542..00000000000 --- a/keyboards/kbdfans/kbd75/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2017-2021 QMK -// 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/kbdfans/kbd75/rev1/keyboard.json b/keyboards/kbdfans/kbd75/rev1/keyboard.json index 94f96988ffa..01429c8ebbe 100644 --- a/keyboards/kbdfans/kbd75/rev1/keyboard.json +++ b/keyboards/kbdfans/kbd75/rev1/keyboard.json @@ -52,6 +52,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_ansi_1u": "LAYOUT_75_ansi" }, diff --git a/keyboards/kbdfans/kbd75/rev2/keyboard.json b/keyboards/kbdfans/kbd75/rev2/keyboard.json index 9bfd69f7fdc..322eba661a1 100644 --- a/keyboards/kbdfans/kbd75/rev2/keyboard.json +++ b/keyboards/kbdfans/kbd75/rev2/keyboard.json @@ -52,6 +52,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_ansi_1u": "LAYOUT_75_ansi" }, diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h deleted file mode 100644 index 32ab8df8375..00000000000 --- a/keyboards/kbdfans/kbd8x/config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright 2017 MechMerlin - -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 - - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/kbdfans/kbd8x/keyboard.json b/keyboards/kbdfans/kbd8x/keyboard.json index f98f12d8b1e..fe0106165d8 100644 --- a/keyboards/kbdfans/kbd8x/keyboard.json +++ b/keyboards/kbdfans/kbd8x/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D0", "F7", "F6", "F5", "D5", "D3", "D2", "C7", "C6", "B5", "F4", "F1", "B4", "B0"], "rows": ["E6", "B7", "D4", "F0", "D6", "D7"] diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/kbdfans/kbd8x_mk2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -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/kbdfans/kbd8x_mk2/keyboard.json b/keyboards/kbdfans/kbd8x_mk2/keyboard.json index 1bded44b6c7..b5d1ee6a258 100644 --- a/keyboards/kbdfans/kbd8x_mk2/keyboard.json +++ b/keyboards/kbdfans/kbd8x_mk2/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"], "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"] diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/kbdfans/kbdpad/mk2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -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/kbdfans/kbdpad/mk2/keyboard.json b/keyboards/kbdfans/kbdpad/mk2/keyboard.json index 7c174a62a25..c4af51f0344 100644 --- a/keyboards/kbdfans/kbdpad/mk2/keyboard.json +++ b/keyboards/kbdfans/kbdpad/mk2/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C4", "C5", "B3", "B2"], "rows": ["D3", "D1", "D2", "C6", "C7", "B6"] diff --git a/keyboards/kbdfans/maja_soldered/config.h b/keyboards/kbdfans/maja_soldered/config.h deleted file mode 100755 index fef6bf1e5ba..00000000000 --- a/keyboards/kbdfans/maja_soldered/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 dztech kbdfans - * - * 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 diff --git a/keyboards/kbdfans/maja_soldered/keyboard.json b/keyboards/kbdfans/maja_soldered/keyboard.json index f9ae338ae73..bf73f04d8a4 100644 --- a/keyboards/kbdfans/maja_soldered/keyboard.json +++ b/keyboards/kbdfans/maja_soldered/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"], "rows": ["F0", "B6", "D6", "B4", "D7"] diff --git a/keyboards/kbdfans/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h deleted file mode 100644 index 69c6b57a35b..00000000000 --- a/keyboards/kbdfans/niu_mini/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/kbdfans/niu_mini/keyboard.json b/keyboards/kbdfans/niu_mini/keyboard.json index d4918e7713e..4c7d6f6d507 100644 --- a/keyboards/kbdfans/niu_mini/keyboard.json +++ b/keyboards/kbdfans/niu_mini/keyboard.json @@ -48,6 +48,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h index cc19b0f44fc..5eeb7a249eb 100644 --- a/keyboards/kbdfans/phaseone/config.h +++ b/keyboards/kbdfans/phaseone/config.h @@ -16,9 +16,4 @@ #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 RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) diff --git a/keyboards/kbdfans/phaseone/keyboard.json b/keyboards/kbdfans/phaseone/keyboard.json index 517dafc96b3..fcc6bdc7b3d 100644 --- a/keyboards/kbdfans/phaseone/keyboard.json +++ b/keyboards/kbdfans/phaseone/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "E6", "B7", "D0", "D1", "D2", "D3", "D5"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/kbdmania/kmac/config.h b/keyboards/kbdmania/kmac/config.h index dd12560fb6c..97357827093 100644 --- a/keyboards/kbdmania/kmac/config.h +++ b/keyboards/kbdmania/kmac/config.h @@ -32,11 +32,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS \ { B6, C6, C7, F1, F0, B5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } -/* 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. diff --git a/keyboards/kbdmania/kmac/keyboard.json b/keyboards/kbdmania/kmac/keyboard.json index c372cb1fc81..b0f8be910d8 100644 --- a/keyboards/kbdmania/kmac/keyboard.json +++ b/keyboards/kbdmania/kmac/keyboard.json @@ -25,6 +25,12 @@ "nkro": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/kbdmania/kmac_pad/config.h b/keyboards/kbdmania/kmac_pad/config.h index ee27565dcef..26e800f3c80 100644 --- a/keyboards/kbdmania/kmac_pad/config.h +++ b/keyboards/kbdmania/kmac_pad/config.h @@ -30,11 +30,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { E2, D0, D1, D2, D3, D5 } #define MATRIX_COL_PINS { C7, C6, B6, B5 } -/* 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. diff --git a/keyboards/kbdmania/kmac_pad/keyboard.json b/keyboards/kbdmania/kmac_pad/keyboard.json index 8dbb196f3e9..ea584f772c3 100644 --- a/keyboards/kbdmania/kmac_pad/keyboard.json +++ b/keyboards/kbdmania/kmac_pad/keyboard.json @@ -15,6 +15,12 @@ "extrakey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kc60/config.h b/keyboards/kc60/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/kc60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/kc60/keyboard.json b/keyboards/kc60/keyboard.json index e2c408e0c4c..2b2f9c49510 100644 --- a/keyboards/kc60/keyboard.json +++ b/keyboards/kc60/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "F6", "F7", "D5"] From 199f01cc5760055dfbdc89f426bf5a8f9b49bfb7 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 22 May 2024 13:49:15 -0700 Subject: [PATCH 315/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: M, Part 1 (#23772) Affects: - `m10a` - `machine_industries/m4_a` - `magic_force/mf34` - `majistic` - `makenova/omega/omega4` - `makrosu` - `manta60` - `maple_computing/christmas_tree/v2017` - `maple_computing/ivy/rev1` - `maple_computing/launchpad/rev1` - `maple_computing/minidox/rev1` - `maple_computing/the_ruler` - `marksard/leftover30` - `marksard/treadstone48/rev1` - `marksard/treadstone48/rev2` - `masterworks/classy_tkl/rev_a` - `maxipad` - `maxr1998/phoebe` - `mc_76k` - `mechkeys/acr60` - `mechkeys/alu84` - `mechkeys/espectro` - `mechkeys/mechmini/v2` - `mechkeys/mk60` - `mechlovin/hannah910/rev1` - `mechlovin/hannah910/rev2` - `mechlovin/hannah910/rev3` - `mechlovin/jay60` - `mechlovin/tmkl` - `mechwild/bde/lefty` - `mechwild/bde/rev2` - `mechwild/bde/righty` - `mechwild/mercutio` - `mechwild/mokulua/mirrored` - `mechwild/mokulua/standard` - `mechwild/murphpad` - `mechwild/obe` - `mechwild/puckbuddy` - `meletrix/zoom98` - `melgeek/mj6xy/rev3` - `meme` - `meow65` - `mesa/mesa_tkl` - `meson` - `mikeneko65` - `millipad` - `mini_elixivy` - `mini_ten_key_plus` - `minimon/index_tab` - `mint60` - `misonoworks/karina` - `miuni32` - `mixi` --- keyboards/m10a/config.h | 40 ------------------- keyboards/m10a/keyboard.json | 6 +++ keyboards/machine_industries/m4_a/config.h | 25 ------------ .../machine_industries/m4_a/keyboard.json | 6 +++ keyboards/magic_force/mf34/config.h | 21 ---------- keyboards/magic_force/mf34/keyboard.json | 6 +++ keyboards/majistic/config.h | 24 ----------- keyboards/majistic/keyboard.json | 6 +++ keyboards/makenova/omega/omega4/config.h | 9 ----- keyboards/makenova/omega/omega4/keyboard.json | 6 +++ keyboards/makrosu/config.h | 23 ----------- keyboards/makrosu/keyboard.json | 6 ++- keyboards/manta60/config.h | 5 --- keyboards/manta60/keyboard.json | 6 +++ .../maple_computing/christmas_tree/config.h | 23 ----------- .../christmas_tree/v2017/keyboard.json | 6 +++ keyboards/maple_computing/ivy/config.h | 38 ------------------ .../maple_computing/ivy/rev1/keyboard.json | 6 +++ keyboards/maple_computing/launchpad/config.h | 39 ------------------ .../launchpad/rev1/keyboard.json | 6 +++ keyboards/maple_computing/minidox/config.h | 34 ---------------- .../minidox/rev1/keyboard.json | 6 +++ keyboards/maple_computing/the_ruler/config.h | 39 ------------------ .../maple_computing/the_ruler/keyboard.json | 6 +++ keyboards/marksard/leftover30/config.h | 39 ------------------ keyboards/marksard/leftover30/keyboard.json | 6 +++ keyboards/marksard/treadstone48/rev1/config.h | 5 --- .../marksard/treadstone48/rev1/keyboard.json | 6 +++ keyboards/marksard/treadstone48/rev2/config.h | 39 ------------------ .../marksard/treadstone48/rev2/keyboard.json | 6 +++ .../masterworks/classy_tkl/rev_a/config.h | 23 ----------- .../classy_tkl/rev_a/keyboard.json | 6 +++ keyboards/maxipad/config.h | 37 ----------------- keyboards/maxipad/info.json | 6 +++ keyboards/maxr1998/phoebe/config.h | 6 --- keyboards/maxr1998/phoebe/keyboard.json | 6 +++ keyboards/mc_76k/config.h | 23 ----------- keyboards/mc_76k/keyboard.json | 6 +++ keyboards/mechkeys/acr60/config.h | 23 ----------- keyboards/mechkeys/acr60/keyboard.json | 6 +++ keyboards/mechkeys/alu84/config.h | 23 ----------- keyboards/mechkeys/alu84/keyboard.json | 6 +++ keyboards/mechkeys/espectro/config.h | 23 ----------- keyboards/mechkeys/espectro/keyboard.json | 6 +++ keyboards/mechkeys/mechmini/v2/config.h | 22 ---------- keyboards/mechkeys/mechmini/v2/keyboard.json | 6 +++ keyboards/mechkeys/mk60/config.h | 39 ------------------ keyboards/mechkeys/mk60/keyboard.json | 6 +++ keyboards/mechlovin/hannah910/config.h | 39 ------------------ .../mechlovin/hannah910/rev1/keyboard.json | 6 +++ .../mechlovin/hannah910/rev2/keyboard.json | 6 +++ .../mechlovin/hannah910/rev3/keyboard.json | 6 +++ keyboards/mechlovin/jay60/config.h | 39 ------------------ keyboards/mechlovin/jay60/keyboard.json | 6 +++ keyboards/mechlovin/tmkl/config.h | 21 ---------- keyboards/mechlovin/tmkl/keyboard.json | 6 +++ keyboards/mechwild/bde/config.h | 25 ------------ keyboards/mechwild/bde/lefty/keyboard.json | 6 +++ keyboards/mechwild/bde/rev2/keyboard.json | 6 +++ keyboards/mechwild/bde/righty/keyboard.json | 6 +++ keyboards/mechwild/mercutio/config.h | 6 --- keyboards/mechwild/mercutio/keyboard.json | 6 ++- keyboards/mechwild/mokulua/mirrored/config.h | 5 --- .../mechwild/mokulua/mirrored/keyboard.json | 6 ++- keyboards/mechwild/mokulua/standard/config.h | 5 --- .../mechwild/mokulua/standard/keyboard.json | 6 ++- keyboards/mechwild/murphpad/config.h | 6 --- keyboards/mechwild/murphpad/keyboard.json | 6 ++- keyboards/mechwild/obe/config.h | 39 ------------------ keyboards/mechwild/obe/info.json | 6 ++- keyboards/mechwild/puckbuddy/config.h | 5 --- keyboards/mechwild/puckbuddy/keyboard.json | 6 ++- keyboards/meletrix/zoom98/config.h | 24 ----------- keyboards/meletrix/zoom98/keyboard.json | 6 +++ keyboards/melgeek/mj6xy/config.h | 22 ---------- keyboards/melgeek/mj6xy/rev3/keyboard.json | 6 +++ keyboards/meme/config.h | 39 ------------------ keyboards/meme/keyboard.json | 6 +++ keyboards/meow65/config.h | 39 ------------------ keyboards/meow65/keyboard.json | 6 +++ keyboards/mesa/mesa_tkl/config.h | 23 ----------- keyboards/mesa/mesa_tkl/keyboard.json | 6 +++ keyboards/meson/config.h | 5 --- keyboards/meson/keyboard.json | 6 +++ keyboards/mikeneko65/config.h | 39 ------------------ keyboards/mikeneko65/keyboard.json | 6 +++ keyboards/millipad/config.h | 20 ---------- keyboards/millipad/keyboard.json | 6 +++ keyboards/mini_elixivy/config.h | 39 ------------------ keyboards/mini_elixivy/keyboard.json | 6 +++ keyboards/mini_ten_key_plus/config.h | 39 ------------------ keyboards/mini_ten_key_plus/keyboard.json | 6 +++ keyboards/minimon/index_tab/config.h | 22 ---------- keyboards/minimon/index_tab/keyboard.json | 6 +++ keyboards/mint60/config.h | 39 ------------------ keyboards/mint60/keyboard.json | 6 +++ keyboards/misonoworks/karina/config.h | 3 -- keyboards/misonoworks/karina/keyboard.json | 6 +++ keyboards/miuni32/config.h | 39 ------------------ keyboards/miuni32/keyboard.json | 6 +++ keyboards/mixi/config.h | 6 --- keyboards/mixi/keyboard.json | 6 +++ 102 files changed, 311 insertions(+), 1217 deletions(-) delete mode 100644 keyboards/m10a/config.h delete mode 100644 keyboards/machine_industries/m4_a/config.h delete mode 100644 keyboards/magic_force/mf34/config.h delete mode 100644 keyboards/majistic/config.h delete mode 100644 keyboards/makenova/omega/omega4/config.h delete mode 100644 keyboards/makrosu/config.h delete mode 100644 keyboards/maple_computing/christmas_tree/config.h delete mode 100644 keyboards/maple_computing/ivy/config.h delete mode 100644 keyboards/maple_computing/launchpad/config.h delete mode 100644 keyboards/maple_computing/minidox/config.h delete mode 100644 keyboards/maple_computing/the_ruler/config.h delete mode 100644 keyboards/marksard/leftover30/config.h delete mode 100644 keyboards/marksard/treadstone48/rev2/config.h delete mode 100644 keyboards/masterworks/classy_tkl/rev_a/config.h delete mode 100644 keyboards/maxipad/config.h delete mode 100644 keyboards/mc_76k/config.h delete mode 100644 keyboards/mechkeys/acr60/config.h delete mode 100755 keyboards/mechkeys/alu84/config.h delete mode 100755 keyboards/mechkeys/espectro/config.h delete mode 100755 keyboards/mechkeys/mechmini/v2/config.h delete mode 100644 keyboards/mechkeys/mk60/config.h delete mode 100644 keyboards/mechlovin/hannah910/config.h delete mode 100644 keyboards/mechlovin/jay60/config.h delete mode 100644 keyboards/mechlovin/tmkl/config.h delete mode 100644 keyboards/mechwild/bde/config.h delete mode 100644 keyboards/mechwild/obe/config.h delete mode 100644 keyboards/meletrix/zoom98/config.h delete mode 100755 keyboards/melgeek/mj6xy/config.h delete mode 100644 keyboards/meme/config.h delete mode 100644 keyboards/meow65/config.h delete mode 100644 keyboards/mesa/mesa_tkl/config.h delete mode 100644 keyboards/mikeneko65/config.h delete mode 100644 keyboards/millipad/config.h delete mode 100644 keyboards/mini_elixivy/config.h delete mode 100644 keyboards/mini_ten_key_plus/config.h delete mode 100644 keyboards/minimon/index_tab/config.h delete mode 100644 keyboards/mint60/config.h delete mode 100644 keyboards/miuni32/config.h diff --git a/keyboards/m10a/config.h b/keyboards/m10a/config.h deleted file mode 100644 index 6c9b63c5ee6..00000000000 --- a/keyboards/m10a/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright - * 2017 Josh Black (@consolenaut) - * 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 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/m10a/keyboard.json b/keyboards/m10a/keyboard.json index 7f2c7c90b7c..544d2535ed5 100644 --- a/keyboards/m10a/keyboard.json +++ b/keyboards/m10a/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F1", "F0"], "rows": ["B6", "F7", "F6", "D6"] diff --git a/keyboards/machine_industries/m4_a/config.h b/keyboards/machine_industries/m4_a/config.h deleted file mode 100644 index da001ee1da7..00000000000 --- a/keyboards/machine_industries/m4_a/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2022 naut -// 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 - -/* - * 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/machine_industries/m4_a/keyboard.json b/keyboards/machine_industries/m4_a/keyboard.json index bf89d742393..04510f92e12 100644 --- a/keyboards/machine_industries/m4_a/keyboard.json +++ b/keyboards/machine_industries/m4_a/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7"], "rows": ["C7", "C6"] diff --git a/keyboards/magic_force/mf34/config.h b/keyboards/magic_force/mf34/config.h deleted file mode 100644 index 1cb16c5f86d..00000000000 --- a/keyboards/magic_force/mf34/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -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 diff --git a/keyboards/magic_force/mf34/keyboard.json b/keyboards/magic_force/mf34/keyboard.json index 50ad33408f7..7178d0405e4 100644 --- a/keyboards/magic_force/mf34/keyboard.json +++ b/keyboards/magic_force/mf34/keyboard.json @@ -73,6 +73,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A2", "A1", "B14", "B4", "B5", "B6", "B7"], "rows": ["A7", "B0", "B1", "B2", "B10", "B11"] diff --git a/keyboards/majistic/config.h b/keyboards/majistic/config.h deleted file mode 100644 index c896b124782..00000000000 --- a/keyboards/majistic/config.h +++ /dev/null @@ -1,24 +0,0 @@ - -/* -Copyright 2020 yossiyossy - -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 diff --git a/keyboards/majistic/keyboard.json b/keyboards/majistic/keyboard.json index 258df08d883..2a93a99e869 100644 --- a/keyboards/majistic/keyboard.json +++ b/keyboards/majistic/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"], "rows": ["F6", "F7", "B1", "B3", "B2"] diff --git a/keyboards/makenova/omega/omega4/config.h b/keyboards/makenova/omega/omega4/config.h deleted file mode 100644 index 6902952ede2..00000000000 --- a/keyboards/makenova/omega/omega4/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2022 makenova (@makenova) -// 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/makenova/omega/omega4/keyboard.json b/keyboards/makenova/omega/omega4/keyboard.json index b5f3a96cb5f..41161685790 100644 --- a/keyboards/makenova/omega/omega4/keyboard.json +++ b/keyboards/makenova/omega/omega4/keyboard.json @@ -10,6 +10,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "F4", "B5", "F5", "F6", "B6", "B2", "B3", "B1", "F7"], "rows": ["C6", "D7", "E6", "B4"] diff --git a/keyboards/makrosu/config.h b/keyboards/makrosu/config.h deleted file mode 100644 index 2977cd9d40a..00000000000 --- a/keyboards/makrosu/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Valdydesu_ - * - * 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 diff --git a/keyboards/makrosu/keyboard.json b/keyboards/makrosu/keyboard.json index 99b425d81a8..ec6b8a3bfd9 100644 --- a/keyboards/makrosu/keyboard.json +++ b/keyboards/makrosu/keyboard.json @@ -28,7 +28,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "bootmagic": { "matrix": [0, 5] diff --git a/keyboards/manta60/config.h b/keyboards/manta60/config.h index cd3521fd657..3f0a8cf4e13 100644 --- a/keyboards/manta60/config.h +++ b/keyboards/manta60/config.h @@ -33,11 +33,6 @@ along with this program. If not, see . # define USB_MAX_POWER_CONSUMPTION 100 #endif -/* 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. diff --git a/keyboards/manta60/keyboard.json b/keyboards/manta60/keyboard.json index 8482970b9b2..dbeb6628a54 100644 --- a/keyboards/manta60/keyboard.json +++ b/keyboards/manta60/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/maple_computing/christmas_tree/config.h b/keyboards/maple_computing/christmas_tree/config.h deleted file mode 100644 index 5070f051560..00000000000 --- a/keyboards/maple_computing/christmas_tree/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 diff --git a/keyboards/maple_computing/christmas_tree/v2017/keyboard.json b/keyboards/maple_computing/christmas_tree/v2017/keyboard.json index dd54b78f5d4..604b1b382a2 100644 --- a/keyboards/maple_computing/christmas_tree/v2017/keyboard.json +++ b/keyboards/maple_computing/christmas_tree/v2017/keyboard.json @@ -19,6 +19,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1"], "rows": ["D3", "F4", "D0", "F6", "F5", "D4"] diff --git a/keyboards/maple_computing/ivy/config.h b/keyboards/maple_computing/ivy/config.h deleted file mode 100644 index 49b31f1edff..00000000000 --- a/keyboards/maple_computing/ivy/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/maple_computing/ivy/rev1/keyboard.json b/keyboards/maple_computing/ivy/rev1/keyboard.json index a4c5cdcce3e..aac35a5dccf 100644 --- a/keyboards/maple_computing/ivy/rev1/keyboard.json +++ b/keyboards/maple_computing/ivy/rev1/keyboard.json @@ -25,6 +25,12 @@ "extrakey": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/launchpad/config.h b/keyboards/maple_computing/launchpad/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/maple_computing/launchpad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/maple_computing/launchpad/rev1/keyboard.json b/keyboards/maple_computing/launchpad/rev1/keyboard.json index 7308c496702..8c75561179b 100644 --- a/keyboards/maple_computing/launchpad/rev1/keyboard.json +++ b/keyboards/maple_computing/launchpad/rev1/keyboard.json @@ -39,6 +39,12 @@ "extrakey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/minidox/config.h b/keyboards/maple_computing/minidox/config.h deleted file mode 100644 index c59b7d33b15..00000000000 --- a/keyboards/maple_computing/minidox/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 - -/* 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/maple_computing/minidox/rev1/keyboard.json b/keyboards/maple_computing/minidox/rev1/keyboard.json index e7f1e027ae5..7fc69dd9dd2 100644 --- a/keyboards/maple_computing/minidox/rev1/keyboard.json +++ b/keyboards/maple_computing/minidox/rev1/keyboard.json @@ -25,6 +25,12 @@ "extrakey": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["split_3x5_3"], "layout_aliases": { "LAYOUT": "LAYOUT_split_3x5_3" diff --git a/keyboards/maple_computing/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/maple_computing/the_ruler/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/maple_computing/the_ruler/keyboard.json b/keyboards/maple_computing/the_ruler/keyboard.json index c38af0a3205..7d15bb9bb8d 100644 --- a/keyboards/maple_computing/the_ruler/keyboard.json +++ b/keyboards/maple_computing/the_ruler/keyboard.json @@ -36,6 +36,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5", "B6", "C6"], "rows": ["C7"] diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h deleted file mode 100644 index 4d408c6e4bd..00000000000 --- a/keyboards/marksard/leftover30/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 marksard - -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/marksard/leftover30/keyboard.json b/keyboards/marksard/leftover30/keyboard.json index 72a1f9a3e05..546b3dbdd33 100644 --- a/keyboards/marksard/leftover30/keyboard.json +++ b/keyboards/marksard/leftover30/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6"], "rows": ["B6", "B2", "F7", "F6", "B3", "B1", "D4", "D0"] diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h index 66007ee2ef4..07141d20acd 100644 --- a/keyboards/marksard/treadstone48/rev1/config.h +++ b/keyboards/marksard/treadstone48/rev1/config.h @@ -25,11 +25,6 @@ along with this program. If not, see . #define RGBLED_SPLIT {12, 20} #endif -/* 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. diff --git a/keyboards/marksard/treadstone48/rev1/keyboard.json b/keyboards/marksard/treadstone48/rev1/keyboard.json index f8da65b7b50..d841e12cbe5 100644 --- a/keyboards/marksard/treadstone48/rev1/keyboard.json +++ b/keyboards/marksard/treadstone48/rev1/keyboard.json @@ -41,6 +41,12 @@ "rgblight": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_base": { "layout": [ diff --git a/keyboards/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h deleted file mode 100644 index 4d408c6e4bd..00000000000 --- a/keyboards/marksard/treadstone48/rev2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 marksard - -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/marksard/treadstone48/rev2/keyboard.json b/keyboards/marksard/treadstone48/rev2/keyboard.json index 56346d080a6..205132a2e70 100644 --- a/keyboards/marksard/treadstone48/rev2/keyboard.json +++ b/keyboards/marksard/treadstone48/rev2/keyboard.json @@ -38,6 +38,12 @@ "rgblight": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT_full": "LAYOUT_base" }, diff --git a/keyboards/masterworks/classy_tkl/rev_a/config.h b/keyboards/masterworks/classy_tkl/rev_a/config.h deleted file mode 100644 index 5f1fd650f1a..00000000000 --- a/keyboards/masterworks/classy_tkl/rev_a/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 Mathias Andersson - -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 diff --git a/keyboards/masterworks/classy_tkl/rev_a/keyboard.json b/keyboards/masterworks/classy_tkl/rev_a/keyboard.json index 7c7458f9c89..d3e723d413d 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/keyboard.json +++ b/keyboards/masterworks/classy_tkl/rev_a/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "C6", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0", "E6", "F7"], "rows": ["C7", "F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/maxipad/config.h b/keyboards/maxipad/config.h deleted file mode 100644 index e4b62e2821c..00000000000 --- a/keyboards/maxipad/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2019 - * - * 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/maxipad/info.json b/keyboards/maxipad/info.json index 00cc16e887f..bf054e4b83e 100644 --- a/keyboards/maxipad/info.json +++ b/keyboards/maxipad/info.json @@ -11,6 +11,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "usb": { "vid": "0xFEED", "pid": "0x6060", diff --git a/keyboards/maxr1998/phoebe/config.h b/keyboards/maxr1998/phoebe/config.h index a8824e48677..2dec78e6296 100644 --- a/keyboards/maxr1998/phoebe/config.h +++ b/keyboards/maxr1998/phoebe/config.h @@ -17,10 +17,4 @@ 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 RGBLIGHT_EFFECT_CHRISTMAS_STEP 1 diff --git a/keyboards/maxr1998/phoebe/keyboard.json b/keyboards/maxr1998/phoebe/keyboard.json index f6913ece0b9..86407414fa2 100644 --- a/keyboards/maxr1998/phoebe/keyboard.json +++ b/keyboards/maxr1998/phoebe/keyboard.json @@ -14,6 +14,12 @@ "key_lock": true, "leader": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "usb": { "vid": "0xFEED", "pid": "0x6060", diff --git a/keyboards/mc_76k/config.h b/keyboards/mc_76k/config.h deleted file mode 100644 index 3616da4ede5..00000000000 --- a/keyboards/mc_76k/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 Yiancar-Designs - -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 diff --git a/keyboards/mc_76k/keyboard.json b/keyboards/mc_76k/keyboard.json index 2d8e7351be8..049483bed99 100644 --- a/keyboards/mc_76k/keyboard.json +++ b/keyboards/mc_76k/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D3", "D4", "B1", "D6", "D7", "B4", "B5", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["C7", "C6", "B6", "B0", "D1", "D0"] diff --git a/keyboards/mechkeys/acr60/config.h b/keyboards/mechkeys/acr60/config.h deleted file mode 100644 index a55618488c5..00000000000 --- a/keyboards/mechkeys/acr60/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2017 Ryan Mitchell (@newtmitch) - * - * 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 diff --git a/keyboards/mechkeys/acr60/keyboard.json b/keyboards/mechkeys/acr60/keyboard.json index 916a750b963..90b1fd25711 100644 --- a/keyboards/mechkeys/acr60/keyboard.json +++ b/keyboards/mechkeys/acr60/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/mechkeys/alu84/config.h b/keyboards/mechkeys/alu84/config.h deleted file mode 100755 index 1620751facf..00000000000 --- a/keyboards/mechkeys/alu84/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2017 @TurboMech /u/TurboMech @A9entOran9e#6134 - * - * 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 diff --git a/keyboards/mechkeys/alu84/keyboard.json b/keyboards/mechkeys/alu84/keyboard.json index 890ddabbc44..30f70b17c96 100644 --- a/keyboards/mechkeys/alu84/keyboard.json +++ b/keyboards/mechkeys/alu84/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"], "rows": ["D0", "D1", "D2", "D3", "D5", "B7"] diff --git a/keyboards/mechkeys/espectro/config.h b/keyboards/mechkeys/espectro/config.h deleted file mode 100755 index 41ccde97026..00000000000 --- a/keyboards/mechkeys/espectro/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2018 @TurboMech /u/TurboMech @A9entOran9e#6134 - * - * 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 diff --git a/keyboards/mechkeys/espectro/keyboard.json b/keyboards/mechkeys/espectro/keyboard.json index 838ff42bd18..f4d2aa29bb9 100644 --- a/keyboards/mechkeys/espectro/keyboard.json +++ b/keyboards/mechkeys/espectro/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "F1", "F4", "F5", "F6", "F7", "D7", "B4", "B5", "D0", "D1", "D2", "D3"], "rows": ["B7", "B3", "E6", "F0", "D5", "D4", "D6", "C7"] diff --git a/keyboards/mechkeys/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h deleted file mode 100755 index 93c5aa9e24d..00000000000 --- a/keyboards/mechkeys/mechmini/v2/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2018 TurboMech /u/TurboMech @A9entOran9e#6134 - * 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 diff --git a/keyboards/mechkeys/mechmini/v2/keyboard.json b/keyboards/mechkeys/mechmini/v2/keyboard.json index da53e842038..ee2ba925e23 100644 --- a/keyboards/mechkeys/mechmini/v2/keyboard.json +++ b/keyboards/mechkeys/mechmini/v2/keyboard.json @@ -16,6 +16,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B1", "B0", "D5", "B7", "C7"], "rows": ["D0", "D1", "D2", "D3"] diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h deleted file mode 100644 index b5b661bef2a..00000000000 --- a/keyboards/mechkeys/mk60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 MechMerlin - -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/mechkeys/mk60/keyboard.json b/keyboards/mechkeys/mk60/keyboard.json index c1e8af5348c..e47d7def2c9 100644 --- a/keyboards/mechkeys/mk60/keyboard.json +++ b/keyboards/mechkeys/mk60/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h deleted file mode 100644 index a6ae7f4a106..00000000000 --- a/keyboards/mechlovin/hannah910/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Mechlovin - -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/mechlovin/hannah910/rev1/keyboard.json b/keyboards/mechlovin/hannah910/rev1/keyboard.json index 8f01f6f39b1..61cf3653375 100644 --- a/keyboards/mechlovin/hannah910/rev1/keyboard.json +++ b/keyboards/mechlovin/hannah910/rev1/keyboard.json @@ -15,6 +15,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], "rows": ["B5", "B6", "D3", "C6", "C7"] diff --git a/keyboards/mechlovin/hannah910/rev2/keyboard.json b/keyboards/mechlovin/hannah910/rev2/keyboard.json index c6fe19c34d1..9fb5847124b 100644 --- a/keyboards/mechlovin/hannah910/rev2/keyboard.json +++ b/keyboards/mechlovin/hannah910/rev2/keyboard.json @@ -15,6 +15,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], "rows": ["B5", "B6", "D3", "C6", "C7"] diff --git a/keyboards/mechlovin/hannah910/rev3/keyboard.json b/keyboards/mechlovin/hannah910/rev3/keyboard.json index 8a6ea4d1234..ba883198901 100644 --- a/keyboards/mechlovin/hannah910/rev3/keyboard.json +++ b/keyboards/mechlovin/hannah910/rev3/keyboard.json @@ -15,6 +15,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], "rows": ["B5", "B6", "D3", "C6", "C7"] diff --git a/keyboards/mechlovin/jay60/config.h b/keyboards/mechlovin/jay60/config.h deleted file mode 100644 index d685b926313..00000000000 --- a/keyboards/mechlovin/jay60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Mechlovin' - -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/mechlovin/jay60/keyboard.json b/keyboards/mechlovin/jay60/keyboard.json index 37f25f36fe8..c7e05d2327f 100644 --- a/keyboards/mechlovin/jay60/keyboard.json +++ b/keyboards/mechlovin/jay60/keyboard.json @@ -13,6 +13,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "C3"], "rows": ["C2", "C1", "C0", "D7", "A1"] diff --git a/keyboards/mechlovin/tmkl/config.h b/keyboards/mechlovin/tmkl/config.h deleted file mode 100644 index 03e3beacd0f..00000000000 --- a/keyboards/mechlovin/tmkl/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2020 Team Mechlovin' - -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 diff --git a/keyboards/mechlovin/tmkl/keyboard.json b/keyboards/mechlovin/tmkl/keyboard.json index 8b66e9a4666..783ca4b7c66 100644 --- a/keyboards/mechlovin/tmkl/keyboard.json +++ b/keyboards/mechlovin/tmkl/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": false + } + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"], "rows": ["A8", "A4", "A5", "A3", "A2", "A1"] diff --git a/keyboards/mechwild/bde/config.h b/keyboards/mechwild/bde/config.h deleted file mode 100644 index 232d4808fee..00000000000 --- a/keyboards/mechwild/bde/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2022 Kyle McCreery - -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 diff --git a/keyboards/mechwild/bde/lefty/keyboard.json b/keyboards/mechwild/bde/lefty/keyboard.json index 751a65b1a45..65a90b008fd 100644 --- a/keyboards/mechwild/bde/lefty/keyboard.json +++ b/keyboards/mechwild/bde/lefty/keyboard.json @@ -11,6 +11,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "rows": ["D1", "D7", "D3"], "cols": ["F7", "B1", "B6", "B2", "B3", "F6", "F5", "F4", "D0", "D4", "C6", "E6", "B5", "B4"] diff --git a/keyboards/mechwild/bde/rev2/keyboard.json b/keyboards/mechwild/bde/rev2/keyboard.json index beb2624f3e3..932f99f0e96 100644 --- a/keyboards/mechwild/bde/rev2/keyboard.json +++ b/keyboards/mechwild/bde/rev2/keyboard.json @@ -13,6 +13,12 @@ "encoder": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D3"} diff --git a/keyboards/mechwild/bde/righty/keyboard.json b/keyboards/mechwild/bde/righty/keyboard.json index 54a7a4459f0..769d0044269 100644 --- a/keyboards/mechwild/bde/righty/keyboard.json +++ b/keyboards/mechwild/bde/righty/keyboard.json @@ -11,6 +11,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "rows": ["D1", "D7", "D3"], "cols": ["B4", "B5", "E6", "C6", "D4", "D0", "F4", "F5", "F6", "B3", "B2", "B6", "B1", "F7"] diff --git a/keyboards/mechwild/mercutio/config.h b/keyboards/mechwild/mercutio/config.h index 7a7d9cfd15b..b2e31c11dc3 100755 --- a/keyboards/mechwild/mercutio/config.h +++ b/keyboards/mechwild/mercutio/config.h @@ -19,9 +19,3 @@ /* Define custom font */ #define OLED_FONT_H "lib/mercutiofont.c" - -/* 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/mechwild/mercutio/keyboard.json b/keyboards/mechwild/mercutio/keyboard.json index a07874e2a2a..0a7d7581282 100644 --- a/keyboards/mechwild/mercutio/keyboard.json +++ b/keyboards/mechwild/mercutio/keyboard.json @@ -29,7 +29,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "processor": "atmega328p", "bootloader": "usbasploader", diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h index d62d7b49f0b..c6504ff392c 100644 --- a/keyboards/mechwild/mokulua/mirrored/config.h +++ b/keyboards/mechwild/mokulua/mirrored/config.h @@ -7,8 +7,3 @@ #define MASTER_LEFT //#define MASTER_RIGHT - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/mechwild/mokulua/mirrored/keyboard.json b/keyboards/mechwild/mokulua/mirrored/keyboard.json index be74fabbd32..e1ca30efdb8 100644 --- a/keyboards/mechwild/mokulua/mirrored/keyboard.json +++ b/keyboards/mechwild/mokulua/mirrored/keyboard.json @@ -27,7 +27,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "split": { "enabled": true, diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h index 953e53c2360..c3b067e5ba3 100644 --- a/keyboards/mechwild/mokulua/standard/config.h +++ b/keyboards/mechwild/mokulua/standard/config.h @@ -8,11 +8,6 @@ #define MASTER_LEFT //#define MASTER_RIGHT -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/mechwild/mokulua/standard/keyboard.json b/keyboards/mechwild/mokulua/standard/keyboard.json index 044573d82c5..bd248712e73 100644 --- a/keyboards/mechwild/mokulua/standard/keyboard.json +++ b/keyboards/mechwild/mokulua/standard/keyboard.json @@ -27,7 +27,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "split": { "enabled": true, diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h index 6898c0a344c..c9503f101cc 100644 --- a/keyboards/mechwild/murphpad/config.h +++ b/keyboards/mechwild/murphpad/config.h @@ -18,9 +18,3 @@ along with this program. If not, see . #pragma once #define OLED_FONT_H "keyboards/mechwild/murphpad/lib/murphpadfont.c" - -/* 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/mechwild/murphpad/keyboard.json b/keyboards/mechwild/murphpad/keyboard.json index a2a5eba926b..47d99f78e9d 100644 --- a/keyboards/mechwild/murphpad/keyboard.json +++ b/keyboards/mechwild/murphpad/keyboard.json @@ -31,7 +31,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "bootmagic": { "matrix": [0, 1] diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h deleted file mode 100644 index d9eed88676a..00000000000 --- a/keyboards/mechwild/obe/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Kyle McCreery - -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/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json index 2baf5422f04..2247f69fac5 100644 --- a/keyboards/mechwild/obe/info.json +++ b/keyboards/mechwild/obe/info.json @@ -29,7 +29,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "indicators": { "caps_lock": "B9", diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h index ad4823c741c..ab67d10dada 100644 --- a/keyboards/mechwild/puckbuddy/config.h +++ b/keyboards/mechwild/puckbuddy/config.h @@ -21,11 +21,6 @@ #define CIRQUE_PINNACLE_SPI_DIVISOR 8 #define CIRQUE_PINNACLE_SPI_CS_PIN A4 -/* 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. diff --git a/keyboards/mechwild/puckbuddy/keyboard.json b/keyboards/mechwild/puckbuddy/keyboard.json index 4e827d1ba87..ebe477907b7 100644 --- a/keyboards/mechwild/puckbuddy/keyboard.json +++ b/keyboards/mechwild/puckbuddy/keyboard.json @@ -34,7 +34,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "indicators": { "caps_lock": "C13", diff --git a/keyboards/meletrix/zoom98/config.h b/keyboards/meletrix/zoom98/config.h deleted file mode 100644 index 88c82de3bfc..00000000000 --- a/keyboards/meletrix/zoom98/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2023 meletrix - -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 diff --git a/keyboards/meletrix/zoom98/keyboard.json b/keyboards/meletrix/zoom98/keyboard.json index 0a57fc3bb64..e58d80f216e 100644 --- a/keyboards/meletrix/zoom98/keyboard.json +++ b/keyboards/meletrix/zoom98/keyboard.json @@ -27,6 +27,12 @@ "nkro": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "B7" }, diff --git a/keyboards/melgeek/mj6xy/config.h b/keyboards/melgeek/mj6xy/config.h deleted file mode 100755 index 79f977638b0..00000000000 --- a/keyboards/melgeek/mj6xy/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 MelGeek - * - * 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 diff --git a/keyboards/melgeek/mj6xy/rev3/keyboard.json b/keyboards/melgeek/mj6xy/rev3/keyboard.json index 8888b78c2db..ae44451236e 100644 --- a/keyboards/melgeek/mj6xy/rev3/keyboard.json +++ b/keyboards/melgeek/mj6xy/rev3/keyboard.json @@ -9,6 +9,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "F7", "D2", "D1", "D0"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/meme/config.h b/keyboards/meme/config.h deleted file mode 100644 index d876570c808..00000000000 --- a/keyboards/meme/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 MechMerlin - -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/meme/keyboard.json b/keyboards/meme/keyboard.json index e75f7e13aa6..021c8f998ae 100644 --- a/keyboards/meme/keyboard.json +++ b/keyboards/meme/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D2", "B5", "B6", "C7", "C6", "C5", "C4"], "rows": ["C2", "D0", "D1", "D4", "D5", "D6", "B0", "B1", "B2", "B3"] diff --git a/keyboards/meow65/config.h b/keyboards/meow65/config.h deleted file mode 100644 index edaab9eb0d1..00000000000 --- a/keyboards/meow65/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 mrninhvn - -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/meow65/keyboard.json b/keyboards/meow65/keyboard.json index 510f8318c8c..5870152ee01 100644 --- a/keyboards/meow65/keyboard.json +++ b/keyboards/meow65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "B0", "F4", "F1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "C7"], "rows": ["C6", "B6", "B5", "B7", "F7"] diff --git a/keyboards/mesa/mesa_tkl/config.h b/keyboards/mesa/mesa_tkl/config.h deleted file mode 100644 index 5ebe5ccc58d..00000000000 --- a/keyboards/mesa/mesa_tkl/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 Mesa Keyboards - -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 diff --git a/keyboards/mesa/mesa_tkl/keyboard.json b/keyboards/mesa/mesa_tkl/keyboard.json index ac12e879778..85d1c2b5a01 100644 --- a/keyboards/mesa/mesa_tkl/keyboard.json +++ b/keyboards/mesa/mesa_tkl/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3"], "rows": ["D2", "D1", "D0", "B0", "C6", "C7"] diff --git a/keyboards/meson/config.h b/keyboards/meson/config.h index a84e55df1f2..ab2191472f9 100644 --- a/keyboards/meson/config.h +++ b/keyboards/meson/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define USE_I2C -/* 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. diff --git a/keyboards/meson/keyboard.json b/keyboards/meson/keyboard.json index 72d9ec58e72..88bbc18886a 100644 --- a/keyboards/meson/keyboard.json +++ b/keyboards/meson/keyboard.json @@ -16,6 +16,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "D7", "E6", "B3", "B2", "B6", "F4"], "rows": ["F7", "C6", "F6", "F5"] diff --git a/keyboards/mikeneko65/config.h b/keyboards/mikeneko65/config.h deleted file mode 100644 index 42ab44fce1d..00000000000 --- a/keyboards/mikeneko65/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2020 kkatano - Copyright 2022 takishim - -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/mikeneko65/keyboard.json b/keyboards/mikeneko65/keyboard.json index 77bb74598e4..873bb7d042b 100644 --- a/keyboards/mikeneko65/keyboard.json +++ b/keyboards/mikeneko65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D4", "D6", "D7", "B6", "B5", "B4"], "rows": ["D0", "D1", "D2", "D3", "C7"] diff --git a/keyboards/millipad/config.h b/keyboards/millipad/config.h deleted file mode 100644 index 8ceeef163d5..00000000000 --- a/keyboards/millipad/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2021 Jirou - -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 - -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/millipad/keyboard.json b/keyboards/millipad/keyboard.json index f7646b39ea6..7230fa750b4 100644 --- a/keyboards/millipad/keyboard.json +++ b/keyboards/millipad/keyboard.json @@ -18,6 +18,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": false, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "D7", "D6", "D4"], "rows": ["C6", "C7"] diff --git a/keyboards/mini_elixivy/config.h b/keyboards/mini_elixivy/config.h deleted file mode 100644 index d90fdba2715..00000000000 --- a/keyboards/mini_elixivy/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 minibois - -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/mini_elixivy/keyboard.json b/keyboards/mini_elixivy/keyboard.json index 2485897ef60..2d45d70cf44 100644 --- a/keyboards/mini_elixivy/keyboard.json +++ b/keyboards/mini_elixivy/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "F5", "F4", "F1", "F0", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B4", "C6"], "rows": ["B5", "B6", "E6", "F6", "C7"] diff --git a/keyboards/mini_ten_key_plus/config.h b/keyboards/mini_ten_key_plus/config.h deleted file mode 100644 index d90fdba2715..00000000000 --- a/keyboards/mini_ten_key_plus/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 minibois - -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/mini_ten_key_plus/keyboard.json b/keyboards/mini_ten_key_plus/keyboard.json index 2284c58d3c6..10507fa6e57 100644 --- a/keyboards/mini_ten_key_plus/keyboard.json +++ b/keyboards/mini_ten_key_plus/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F4", "B6", "D7", "C6"], "rows": ["D4", "B1", "B5", "B4", "E6"] diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h deleted file mode 100644 index 52607b345c2..00000000000 --- a/keyboards/minimon/index_tab/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 Kyrre Havik Eriksen - -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 diff --git a/keyboards/minimon/index_tab/keyboard.json b/keyboards/minimon/index_tab/keyboard.json index c8ff091790a..14e45241145 100644 --- a/keyboards/minimon/index_tab/keyboard.json +++ b/keyboards/minimon/index_tab/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D2", "F1", "F0"], "rows": ["D3", "B7", "B3", "B2", "B1", "B0"] diff --git a/keyboards/mint60/config.h b/keyboards/mint60/config.h deleted file mode 100644 index a93b381c85b..00000000000 --- a/keyboards/mint60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Eucalyn - -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/mint60/keyboard.json b/keyboards/mint60/keyboard.json index 332a366aa6e..98f91a44690 100644 --- a/keyboards/mint60/keyboard.json +++ b/keyboards/mint60/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "B3", "B1", "F7", "B2", "B6", "F6", "F5"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/misonoworks/karina/config.h b/keyboards/misonoworks/karina/config.h index d36739d42b3..2246a75916c 100644 --- a/keyboards/misonoworks/karina/config.h +++ b/keyboards/misonoworks/karina/config.h @@ -19,6 +19,3 @@ along with this program. If not, see . #define MK_3_SPEED #define TERMINAL_HELP - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/misonoworks/karina/keyboard.json b/keyboards/misonoworks/karina/keyboard.json index cf01cbdbf27..0d9d55d206c 100644 --- a/keyboards/misonoworks/karina/keyboard.json +++ b/keyboards/misonoworks/karina/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": false, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["D2", "D3", "D5", "F0"] diff --git a/keyboards/miuni32/config.h b/keyboards/miuni32/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/miuni32/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/miuni32/keyboard.json b/keyboards/miuni32/keyboard.json index 43f74f1812e..0b52b058fa6 100644 --- a/keyboards/miuni32/keyboard.json +++ b/keyboards/miuni32/keyboard.json @@ -36,6 +36,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F1", "E6", "B7", "B3", "B2", "B1", "B0"], "rows": ["F0", "F4", "D7"] diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h index b24301443d2..e5c829d8117 100644 --- a/keyboards/mixi/config.h +++ b/keyboards/mixi/config.h @@ -1,10 +1,4 @@ #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 RGBLIGHT_LAYERS #define RGBLIGHT_LAYER_BLINK diff --git a/keyboards/mixi/keyboard.json b/keyboards/mixi/keyboard.json index 2f948931731..a08d54b883a 100644 --- a/keyboards/mixi/keyboard.json +++ b/keyboards/mixi/keyboard.json @@ -47,6 +47,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["D1", "D4", "F4"], From 030d503d35c01aad65ecfec171b08a963da9866e Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 22 May 2024 13:59:35 -0700 Subject: [PATCH 316/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: K, Part 3 (#23770) Affects: - `kindakeyboards/conone65` - `kinesis` - `kingly_keys/ave/ortho` - `kingly_keys/ave/staggered` - `kingly_keys/little_foot` - `kingly_keys/romac` - `kingly_keys/romac_plus` - `kingly_keys/ropro` - `kingly_keys/smd_milk` - `kingly_keys/soap` - `kira/kira75` - `kisakeyluxury/qtz` - `kiserdesigns/madeline` - `kiwikeebs/macro` - `kiwikeebs/macro_v2` - `kiwikey/borderland` - `kiwikey/kawii9` - `kiwikey/wanderland` - `kkatano/bakeneko60` - `kkatano/bakeneko65/rev2` - `kkatano/bakeneko65/rev3` - `kkatano/bakeneko80` - `kkatano/wallaby` - `kkatano/yurei` - `knops/mini` - `kona_classic` - `kopibeng/mnk60_stm32` - `kopibeng/mnk65` - `kopibeng/mnk65_stm32` - `kopibeng/mnk88` - `kopibeng/typ65` - `kopibeng/xt60` - `kopibeng/xt60_singa` - `kopibeng/xt65` - `kopibeng/xt8x` - `kprepublic/bm16s` - `kprepublic/bm40hsrgb/rev1` - `kprepublic/bm65hsrgb/rev1` - `kprepublic/bm68hsrgb/rev1` - `kprepublic/bm980hsrgb` - `kprepublic/cospad` - `ktec/daisy` - `kumaokobo/kudox/columner` - `kumaokobo/kudox/rev1` - `kumaokobo/kudox/rev2` - `kumaokobo/kudox/rev3` - `kumaokobo/kudox_full/rev1` - `kumaokobo/kudox_game/rev1` - `kumaokobo/kudox_game/rev2` - `kumaokobo/pico/65keys` - `kumaokobo/pico/70keys` - `kv/revt` - `kwub/bloop` - `ky01` --- keyboards/kindakeyboards/conone65/config.h | 39 ------------------- .../kindakeyboards/conone65/keyboard.json | 6 +++ keyboards/kinesis/config.h | 5 --- keyboards/kinesis/info.json | 8 +++- keyboards/kingly_keys/ave/config.h | 23 ----------- keyboards/kingly_keys/ave/ortho/keyboard.json | 6 +++ .../kingly_keys/ave/staggered/keyboard.json | 6 +++ keyboards/kingly_keys/little_foot/config.h | 23 ----------- .../kingly_keys/little_foot/keyboard.json | 6 +++ keyboards/kingly_keys/romac/config.h | 7 ---- keyboards/kingly_keys/romac/keyboard.json | 6 +++ keyboards/kingly_keys/romac_plus/config.h | 7 ---- .../kingly_keys/romac_plus/keyboard.json | 6 +++ keyboards/kingly_keys/ropro/config.h | 23 ----------- keyboards/kingly_keys/ropro/keyboard.json | 6 +++ keyboards/kingly_keys/smd_milk/config.h | 22 ----------- keyboards/kingly_keys/smd_milk/keyboard.json | 6 +++ keyboards/kingly_keys/soap/config.h | 21 ---------- keyboards/kingly_keys/soap/keyboard.json | 6 +++ keyboards/kira/kira75/config.h | 39 ------------------- keyboards/kira/kira75/keyboard.json | 6 +++ keyboards/kisakeyluxury/qtz/config.h | 23 ----------- keyboards/kisakeyluxury/qtz/keyboard.json | 6 +++ keyboards/kiserdesigns/madeline/config.h | 3 -- keyboards/kiserdesigns/madeline/keyboard.json | 8 +++- keyboards/kiwikeebs/macro/config.h | 39 ------------------- keyboards/kiwikeebs/macro/keyboard.json | 6 +++ keyboards/kiwikeebs/macro_v2/config.h | 39 ------------------- keyboards/kiwikeebs/macro_v2/keyboard.json | 6 +++ keyboards/kiwikey/borderland/config.h | 25 ------------ keyboards/kiwikey/borderland/keyboard.json | 6 ++- keyboards/kiwikey/kawii9/config.h | 39 ------------------- keyboards/kiwikey/kawii9/keyboard.json | 6 +++ keyboards/kiwikey/wanderland/config.h | 39 ------------------- keyboards/kiwikey/wanderland/keyboard.json | 6 +++ keyboards/kkatano/bakeneko60/config.h | 39 ------------------- keyboards/kkatano/bakeneko60/keyboard.json | 6 +++ keyboards/kkatano/bakeneko65/rev2/config.h | 39 ------------------- .../kkatano/bakeneko65/rev2/keyboard.json | 6 +++ keyboards/kkatano/bakeneko65/rev3/config.h | 39 ------------------- .../kkatano/bakeneko65/rev3/keyboard.json | 6 +++ keyboards/kkatano/bakeneko80/config.h | 39 ------------------- keyboards/kkatano/bakeneko80/keyboard.json | 6 +++ keyboards/kkatano/wallaby/config.h | 39 ------------------- keyboards/kkatano/wallaby/keyboard.json | 6 +++ keyboards/kkatano/yurei/config.h | 39 ------------------- keyboards/kkatano/yurei/keyboard.json | 6 +++ keyboards/knops/mini/config.h | 39 ------------------- keyboards/knops/mini/keyboard.json | 6 +++ keyboards/kona_classic/config.h | 39 ------------------- keyboards/kona_classic/keyboard.json | 6 +++ keyboards/kopibeng/mnk60_stm32/config.h | 22 ----------- keyboards/kopibeng/mnk60_stm32/keyboard.json | 6 +++ keyboards/kopibeng/mnk65/config.h | 22 ----------- keyboards/kopibeng/mnk65/keyboard.json | 6 +++ keyboards/kopibeng/mnk65_stm32/config.h | 22 ----------- keyboards/kopibeng/mnk65_stm32/keyboard.json | 6 +++ keyboards/kopibeng/mnk88/config.h | 22 ----------- keyboards/kopibeng/mnk88/keyboard.json | 6 +++ keyboards/kopibeng/typ65/config.h | 5 --- keyboards/kopibeng/typ65/keyboard.json | 6 +++ keyboards/kopibeng/xt60/config.h | 22 ----------- keyboards/kopibeng/xt60/keyboard.json | 6 +++ keyboards/kopibeng/xt60_singa/config.h | 22 ----------- keyboards/kopibeng/xt60_singa/keyboard.json | 6 +++ keyboards/kopibeng/xt65/config.h | 38 ------------------ keyboards/kopibeng/xt65/keyboard.json | 6 +++ keyboards/kopibeng/xt8x/config.h | 5 --- keyboards/kopibeng/xt8x/keyboard.json | 6 +++ keyboards/kprepublic/bm16s/config.h | 7 ---- keyboards/kprepublic/bm16s/keyboard.json | 6 +++ keyboards/kprepublic/bm40hsrgb/rev1/config.h | 22 ----------- .../kprepublic/bm40hsrgb/rev1/keyboard.json | 6 +++ keyboards/kprepublic/bm65hsrgb/rev1/config.h | 39 ------------------- .../kprepublic/bm65hsrgb/rev1/keyboard.json | 6 +++ keyboards/kprepublic/bm68hsrgb/rev1/config.h | 39 ------------------- .../kprepublic/bm68hsrgb/rev1/keyboard.json | 6 +++ keyboards/kprepublic/bm980hsrgb/config.h | 39 ------------------- keyboards/kprepublic/bm980hsrgb/keyboard.json | 6 +++ keyboards/kprepublic/cospad/config.h | 39 ------------------- keyboards/kprepublic/cospad/keyboard.json | 6 +++ keyboards/ktec/daisy/config.h | 39 ------------------- keyboards/ktec/daisy/keyboard.json | 6 +++ keyboards/kumaokobo/kudox/columner/config.h | 5 --- .../kumaokobo/kudox/columner/keyboard.json | 6 +++ keyboards/kumaokobo/kudox/rev1/config.h | 5 --- keyboards/kumaokobo/kudox/rev1/keyboard.json | 6 +++ keyboards/kumaokobo/kudox/rev2/config.h | 5 --- keyboards/kumaokobo/kudox/rev2/keyboard.json | 6 +++ keyboards/kumaokobo/kudox/rev3/config.h | 5 --- keyboards/kumaokobo/kudox/rev3/keyboard.json | 6 +++ keyboards/kumaokobo/kudox_full/rev1/config.h | 25 ------------ .../kumaokobo/kudox_full/rev1/keyboard.json | 6 +++ keyboards/kumaokobo/kudox_game/rev1/config.h | 5 --- .../kumaokobo/kudox_game/rev1/keyboard.json | 6 +++ keyboards/kumaokobo/kudox_game/rev2/config.h | 5 --- .../kumaokobo/kudox_game/rev2/keyboard.json | 6 +++ keyboards/kumaokobo/pico/65keys/config.h | 5 --- keyboards/kumaokobo/pico/65keys/keyboard.json | 6 +++ keyboards/kumaokobo/pico/70keys/config.h | 5 --- keyboards/kumaokobo/pico/70keys/keyboard.json | 6 +++ keyboards/kv/revt/config.h | 19 --------- keyboards/kv/revt/keyboard.json | 6 +++ keyboards/kwub/bloop/config.h | 23 ----------- keyboards/kwub/bloop/keyboard.json | 6 +++ keyboards/ky01/config.h | 39 ------------------- keyboards/ky01/keyboard.json | 6 +++ 107 files changed, 324 insertions(+), 1282 deletions(-) delete mode 100644 keyboards/kindakeyboards/conone65/config.h delete mode 100644 keyboards/kingly_keys/ave/config.h delete mode 100644 keyboards/kingly_keys/little_foot/config.h delete mode 100644 keyboards/kingly_keys/romac/config.h delete mode 100644 keyboards/kingly_keys/romac_plus/config.h delete mode 100644 keyboards/kingly_keys/ropro/config.h delete mode 100644 keyboards/kingly_keys/smd_milk/config.h delete mode 100644 keyboards/kingly_keys/soap/config.h delete mode 100644 keyboards/kira/kira75/config.h delete mode 100644 keyboards/kisakeyluxury/qtz/config.h delete mode 100644 keyboards/kiwikeebs/macro/config.h delete mode 100644 keyboards/kiwikeebs/macro_v2/config.h delete mode 100644 keyboards/kiwikey/borderland/config.h delete mode 100644 keyboards/kiwikey/kawii9/config.h delete mode 100644 keyboards/kiwikey/wanderland/config.h delete mode 100644 keyboards/kkatano/bakeneko60/config.h delete mode 100644 keyboards/kkatano/bakeneko65/rev2/config.h delete mode 100644 keyboards/kkatano/bakeneko65/rev3/config.h delete mode 100644 keyboards/kkatano/bakeneko80/config.h delete mode 100644 keyboards/kkatano/wallaby/config.h delete mode 100644 keyboards/kkatano/yurei/config.h delete mode 100644 keyboards/knops/mini/config.h delete mode 100644 keyboards/kona_classic/config.h delete mode 100644 keyboards/kopibeng/mnk60_stm32/config.h delete mode 100644 keyboards/kopibeng/mnk65/config.h delete mode 100644 keyboards/kopibeng/mnk65_stm32/config.h delete mode 100644 keyboards/kopibeng/mnk88/config.h delete mode 100644 keyboards/kopibeng/xt60/config.h delete mode 100644 keyboards/kopibeng/xt60_singa/config.h delete mode 100644 keyboards/kopibeng/xt65/config.h delete mode 100755 keyboards/kprepublic/bm16s/config.h delete mode 100755 keyboards/kprepublic/bm40hsrgb/rev1/config.h delete mode 100644 keyboards/kprepublic/bm65hsrgb/rev1/config.h delete mode 100644 keyboards/kprepublic/bm68hsrgb/rev1/config.h delete mode 100644 keyboards/kprepublic/bm980hsrgb/config.h delete mode 100644 keyboards/kprepublic/cospad/config.h delete mode 100644 keyboards/ktec/daisy/config.h delete mode 100644 keyboards/kumaokobo/kudox_full/rev1/config.h delete mode 100644 keyboards/kv/revt/config.h delete mode 100644 keyboards/kwub/bloop/config.h delete mode 100644 keyboards/ky01/config.h diff --git a/keyboards/kindakeyboards/conone65/config.h b/keyboards/kindakeyboards/conone65/config.h deleted file mode 100644 index d3147b115a3..00000000000 --- a/keyboards/kindakeyboards/conone65/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Kindakeyboards - -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/kindakeyboards/conone65/keyboard.json b/keyboards/kindakeyboards/conone65/keyboard.json index 0c44723f62b..6786b6a3d5a 100644 --- a/keyboards/kindakeyboards/conone65/keyboard.json +++ b/keyboards/kindakeyboards/conone65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B7", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F6", "F5", "F4", "F1", "F0", "D0"], "rows": ["D5", "D3", "E6", "D1", "D2"] diff --git a/keyboards/kinesis/config.h b/keyboards/kinesis/config.h index 52ea641d6eb..e8381f8635e 100644 --- a/keyboards/kinesis/config.h +++ b/keyboards/kinesis/config.h @@ -26,11 +26,6 @@ along with this program. If not, see . #define MOUSEKEY_WHEEL_DELTA 1 #define MOUSEKEY_WHEEL_TIME_TO_MAX 1 -/* 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. diff --git a/keyboards/kinesis/info.json b/keyboards/kinesis/info.json index 4454639ab0f..49025977bd3 100644 --- a/keyboards/kinesis/info.json +++ b/keyboards/kinesis/info.json @@ -1,4 +1,10 @@ { "url": "", - "maintainer": "qmk" + "maintainer": "qmk", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + } } diff --git a/keyboards/kingly_keys/ave/config.h b/keyboards/kingly_keys/ave/config.h deleted file mode 100644 index e43087b6978..00000000000 --- a/keyboards/kingly_keys/ave/config.h +++ /dev/null @@ -1,23 +0,0 @@ - /* - Copyright 2020 Garret Gartner - - 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 diff --git a/keyboards/kingly_keys/ave/ortho/keyboard.json b/keyboards/kingly_keys/ave/ortho/keyboard.json index 8c91b27615c..d277e68e47f 100644 --- a/keyboards/kingly_keys/ave/ortho/keyboard.json +++ b/keyboards/kingly_keys/ave/ortho/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B3", "F4", "F7", "F6", "F5"] diff --git a/keyboards/kingly_keys/ave/staggered/keyboard.json b/keyboards/kingly_keys/ave/staggered/keyboard.json index 581e86c11b8..3f5bf70ce89 100644 --- a/keyboards/kingly_keys/ave/staggered/keyboard.json +++ b/keyboards/kingly_keys/ave/staggered/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B3", "F4", "F7", "F6", "F5"] diff --git a/keyboards/kingly_keys/little_foot/config.h b/keyboards/kingly_keys/little_foot/config.h deleted file mode 100644 index a2c4815a207..00000000000 --- a/keyboards/kingly_keys/little_foot/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2019 Garret G. (TheRoyalSweatshirt) - * - * 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 diff --git a/keyboards/kingly_keys/little_foot/keyboard.json b/keyboards/kingly_keys/little_foot/keyboard.json index 19e6a0f5478..a511d48905c 100644 --- a/keyboards/kingly_keys/little_foot/keyboard.json +++ b/keyboards/kingly_keys/little_foot/keyboard.json @@ -39,6 +39,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["F6", "B6", "B2", "B3", "B1"] diff --git a/keyboards/kingly_keys/romac/config.h b/keyboards/kingly_keys/romac/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/kingly_keys/romac/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/kingly_keys/romac/keyboard.json b/keyboards/kingly_keys/romac/keyboard.json index 4c5e9298481..9927bdc25ff 100644 --- a/keyboards/kingly_keys/romac/keyboard.json +++ b/keyboards/kingly_keys/romac/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "B1", "B3"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/kingly_keys/romac_plus/config.h b/keyboards/kingly_keys/romac_plus/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/kingly_keys/romac_plus/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/kingly_keys/romac_plus/keyboard.json b/keyboards/kingly_keys/romac_plus/keyboard.json index bc4ad616e18..8b6c43333d9 100644 --- a/keyboards/kingly_keys/romac_plus/keyboard.json +++ b/keyboards/kingly_keys/romac_plus/keyboard.json @@ -19,6 +19,12 @@ "oled": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F5", "F4"], "rows": ["C6", "D4", "D2", "D3"] diff --git a/keyboards/kingly_keys/ropro/config.h b/keyboards/kingly_keys/ropro/config.h deleted file mode 100644 index a11ec4dfb28..00000000000 --- a/keyboards/kingly_keys/ropro/config.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -/* Copyright 2019 Garret G. (TheRoyalSweatshirt) - * - * 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 diff --git a/keyboards/kingly_keys/ropro/keyboard.json b/keyboards/kingly_keys/ropro/keyboard.json index ed0bba5366f..fb22d06a7d9 100644 --- a/keyboards/kingly_keys/ropro/keyboard.json +++ b/keyboards/kingly_keys/ropro/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3", "B2", "B6", "D2", "C7"], "rows": ["F4", "F5", "F6", "F7", "B1", "F1", null] diff --git a/keyboards/kingly_keys/smd_milk/config.h b/keyboards/kingly_keys/smd_milk/config.h deleted file mode 100644 index 7bbb5b4e941..00000000000 --- a/keyboards/kingly_keys/smd_milk/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2019 Sebastian Williams - * - * 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 diff --git a/keyboards/kingly_keys/smd_milk/keyboard.json b/keyboards/kingly_keys/smd_milk/keyboard.json index e510ea80b41..9f8a10a5bfc 100644 --- a/keyboards/kingly_keys/smd_milk/keyboard.json +++ b/keyboards/kingly_keys/smd_milk/keyboard.json @@ -39,6 +39,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3"], "rows": ["C5", "D2"] diff --git a/keyboards/kingly_keys/soap/config.h b/keyboards/kingly_keys/soap/config.h deleted file mode 100644 index 847cfcd5be7..00000000000 --- a/keyboards/kingly_keys/soap/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2019 Garret G. (TheRoyalSweatshirt) - * - * 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 diff --git a/keyboards/kingly_keys/soap/keyboard.json b/keyboards/kingly_keys/soap/keyboard.json index b4f8fb9e86b..615014ffbfa 100644 --- a/keyboards/kingly_keys/soap/keyboard.json +++ b/keyboards/kingly_keys/soap/keyboard.json @@ -36,6 +36,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F1", "F0", "D5"], "rows": ["C7", "C6"] diff --git a/keyboards/kira/kira75/config.h b/keyboards/kira/kira75/config.h deleted file mode 100644 index d876570c808..00000000000 --- a/keyboards/kira/kira75/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 MechMerlin - -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/kira/kira75/keyboard.json b/keyboards/kira/kira75/keyboard.json index c48f2bf4923..fb4c90a8b55 100644 --- a/keyboards/kira/kira75/keyboard.json +++ b/keyboards/kira/kira75/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "C7", "C6", "B6", "B5", "B4", "F5", "F4", "F1", "F0", "E6", "B3", "B2", "B1", "B0"], "rows": ["D0", "D1", "D2", "D3", "D5", "D4"] diff --git a/keyboards/kisakeyluxury/qtz/config.h b/keyboards/kisakeyluxury/qtz/config.h deleted file mode 100644 index 7660e3d7e98..00000000000 --- a/keyboards/kisakeyluxury/qtz/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2023 kisakeyluxury - -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 diff --git a/keyboards/kisakeyluxury/qtz/keyboard.json b/keyboards/kisakeyluxury/qtz/keyboard.json index 3225336890d..d215f578959 100644 --- a/keyboards/kisakeyluxury/qtz/keyboard.json +++ b/keyboards/kisakeyluxury/qtz/keyboard.json @@ -13,6 +13,12 @@ "extrakey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D5", "D4", "D6", "C6"] diff --git a/keyboards/kiserdesigns/madeline/config.h b/keyboards/kiserdesigns/madeline/config.h index 8522d7cd431..027e62e3c63 100644 --- a/keyboards/kiserdesigns/madeline/config.h +++ b/keyboards/kiserdesigns/madeline/config.h @@ -15,9 +15,6 @@ */ #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U diff --git a/keyboards/kiserdesigns/madeline/keyboard.json b/keyboards/kiserdesigns/madeline/keyboard.json index 73d3f5ccff4..8a1a988a6f9 100644 --- a/keyboards/kiserdesigns/madeline/keyboard.json +++ b/keyboards/kiserdesigns/madeline/keyboard.json @@ -24,7 +24,11 @@ }, "processor": "RP2040", "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "url": "https://qmk.fm/keyboards", "usb": { @@ -74,4 +78,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/kiwikeebs/macro/config.h b/keyboards/kiwikeebs/macro/config.h deleted file mode 100644 index 2238a4171fd..00000000000 --- a/keyboards/kiwikeebs/macro/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 KiwiKeebs - -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/kiwikeebs/macro/keyboard.json b/keyboards/kiwikeebs/macro/keyboard.json index d8bc9f39254..faaebe88cf1 100644 --- a/keyboards/kiwikeebs/macro/keyboard.json +++ b/keyboards/kiwikeebs/macro/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "B1", "B3", "B2"], "rows": ["E6", "D7"] diff --git a/keyboards/kiwikeebs/macro_v2/config.h b/keyboards/kiwikeebs/macro_v2/config.h deleted file mode 100644 index 2238a4171fd..00000000000 --- a/keyboards/kiwikeebs/macro_v2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 KiwiKeebs - -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/kiwikeebs/macro_v2/keyboard.json b/keyboards/kiwikeebs/macro_v2/keyboard.json index d9b693dd1ac..38484579904 100644 --- a/keyboards/kiwikeebs/macro_v2/keyboard.json +++ b/keyboards/kiwikeebs/macro_v2/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "C6", "C7", "D4"], "rows": ["B5", "B4"] diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h deleted file mode 100644 index bff2f881e87..00000000000 --- a/keyboards/kiwikey/borderland/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2021 KiwiKey (@KiwiKey) -// 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 - -/* - * 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/kiwikey/borderland/keyboard.json b/keyboards/kiwikey/borderland/keyboard.json index 247c6b304d4..c4bf2eaba5e 100644 --- a/keyboards/kiwikey/borderland/keyboard.json +++ b/keyboards/kiwikey/borderland/keyboard.json @@ -20,7 +20,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "rgblight": { "saturation_steps": 8, diff --git a/keyboards/kiwikey/kawii9/config.h b/keyboards/kiwikey/kawii9/config.h deleted file mode 100644 index bc1b5f6c88d..00000000000 --- a/keyboards/kiwikey/kawii9/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 KiwiKey - -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/kiwikey/kawii9/keyboard.json b/keyboards/kiwikey/kawii9/keyboard.json index 07b4cca097a..bb11911cdef 100644 --- a/keyboards/kiwikey/kawii9/keyboard.json +++ b/keyboards/kiwikey/kawii9/keyboard.json @@ -42,6 +42,12 @@ "extrakey": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h deleted file mode 100644 index 1a4dea1b385..00000000000 --- a/keyboards/kiwikey/wanderland/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 KiwiKey - -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/kiwikey/wanderland/keyboard.json b/keyboards/kiwikey/wanderland/keyboard.json index b4d4d4f5166..3dd7c668ac0 100644 --- a/keyboards/kiwikey/wanderland/keyboard.json +++ b/keyboards/kiwikey/wanderland/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "B4", "D7", "D6", "D5", "D2", "D3", "B0", "F0", "B1", "B2", "B3"], "rows": ["F4", "F1", "E6", "E2", "C7", "D4"] diff --git a/keyboards/kkatano/bakeneko60/config.h b/keyboards/kkatano/bakeneko60/config.h deleted file mode 100644 index 6aac1d9a5eb..00000000000 --- a/keyboards/kkatano/bakeneko60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Koichi Katano - -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/kkatano/bakeneko60/keyboard.json b/keyboards/kkatano/bakeneko60/keyboard.json index a8d9e655a19..fee9b9d533d 100644 --- a/keyboards/kkatano/bakeneko60/keyboard.json +++ b/keyboards/kkatano/bakeneko60/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/kkatano/bakeneko65/rev2/config.h b/keyboards/kkatano/bakeneko65/rev2/config.h deleted file mode 100644 index 6aac1d9a5eb..00000000000 --- a/keyboards/kkatano/bakeneko65/rev2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Koichi Katano - -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/kkatano/bakeneko65/rev2/keyboard.json b/keyboards/kkatano/bakeneko65/rev2/keyboard.json index 92193e52dbb..93ac8a5e500 100644 --- a/keyboards/kkatano/bakeneko65/rev2/keyboard.json +++ b/keyboards/kkatano/bakeneko65/rev2/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/kkatano/bakeneko65/rev3/config.h b/keyboards/kkatano/bakeneko65/rev3/config.h deleted file mode 100644 index 6aac1d9a5eb..00000000000 --- a/keyboards/kkatano/bakeneko65/rev3/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Koichi Katano - -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/kkatano/bakeneko65/rev3/keyboard.json b/keyboards/kkatano/bakeneko65/rev3/keyboard.json index d0717c1893d..3892da5d04e 100644 --- a/keyboards/kkatano/bakeneko65/rev3/keyboard.json +++ b/keyboards/kkatano/bakeneko65/rev3/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/kkatano/bakeneko80/config.h b/keyboards/kkatano/bakeneko80/config.h deleted file mode 100644 index 6aac1d9a5eb..00000000000 --- a/keyboards/kkatano/bakeneko80/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Koichi Katano - -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/kkatano/bakeneko80/keyboard.json b/keyboards/kkatano/bakeneko80/keyboard.json index ee005086c3b..06f7eeb4db5 100644 --- a/keyboards/kkatano/bakeneko80/keyboard.json +++ b/keyboards/kkatano/bakeneko80/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["E6", "B0", "B1", "B7", "D1", "D0"] diff --git a/keyboards/kkatano/wallaby/config.h b/keyboards/kkatano/wallaby/config.h deleted file mode 100644 index 6aac1d9a5eb..00000000000 --- a/keyboards/kkatano/wallaby/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Koichi Katano - -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/kkatano/wallaby/keyboard.json b/keyboards/kkatano/wallaby/keyboard.json index e7c76c46a0a..ee475a54bc0 100644 --- a/keyboards/kkatano/wallaby/keyboard.json +++ b/keyboards/kkatano/wallaby/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"], "rows": ["B5", "B4", "B3", "B2", "B1", "B0"] diff --git a/keyboards/kkatano/yurei/config.h b/keyboards/kkatano/yurei/config.h deleted file mode 100644 index 6954b381821..00000000000 --- a/keyboards/kkatano/yurei/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Koichi Katano - -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/kkatano/yurei/keyboard.json b/keyboards/kkatano/yurei/keyboard.json index 32490148465..7bf08957872 100644 --- a/keyboards/kkatano/yurei/keyboard.json +++ b/keyboards/kkatano/yurei/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"], "rows": ["B5", "B4", "B3", "B2", "B1", "B0"] diff --git a/keyboards/knops/mini/config.h b/keyboards/knops/mini/config.h deleted file mode 100644 index 8b274e7f0f8..00000000000 --- a/keyboards/knops/mini/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2017 Pawnerd - -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/knops/mini/keyboard.json b/keyboards/knops/mini/keyboard.json index 721e3d7b36b..10b18faf8d7 100644 --- a/keyboards/knops/mini/keyboard.json +++ b/keyboards/knops/mini/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D0"] diff --git a/keyboards/kona_classic/config.h b/keyboards/kona_classic/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/kona_classic/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/kona_classic/keyboard.json b/keyboards/kona_classic/keyboard.json index 01388f363a8..79bef89bb64 100644 --- a/keyboards/kona_classic/keyboard.json +++ b/keyboards/kona_classic/keyboard.json @@ -37,6 +37,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F4", "B5", "B4", "D7", "D6", "B0", "B1", "B3", "D2", "B7", "D0", "D1", "D3", "C6", "C7"], "rows": ["F1", "F5", "F6", "F7", "B6"] diff --git a/keyboards/kopibeng/mnk60_stm32/config.h b/keyboards/kopibeng/mnk60_stm32/config.h deleted file mode 100644 index 625c24bde00..00000000000 --- a/keyboards/kopibeng/mnk60_stm32/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2023 Samuel Lu - * - * 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 diff --git a/keyboards/kopibeng/mnk60_stm32/keyboard.json b/keyboards/kopibeng/mnk60_stm32/keyboard.json index be1f3cd409f..e0853d543f5 100644 --- a/keyboards/kopibeng/mnk60_stm32/keyboard.json +++ b/keyboards/kopibeng/mnk60_stm32/keyboard.json @@ -13,6 +13,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "A0" }, diff --git a/keyboards/kopibeng/mnk65/config.h b/keyboards/kopibeng/mnk65/config.h deleted file mode 100644 index 62a2978f67c..00000000000 --- a/keyboards/kopibeng/mnk65/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Samuel Lu - * - * 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 diff --git a/keyboards/kopibeng/mnk65/keyboard.json b/keyboards/kopibeng/mnk65/keyboard.json index 24113c3ce51..3c6e04f1167 100644 --- a/keyboards/kopibeng/mnk65/keyboard.json +++ b/keyboards/kopibeng/mnk65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B7", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F5"], "rows": ["B3", "D0", "F6", "F4", "F1"] diff --git a/keyboards/kopibeng/mnk65_stm32/config.h b/keyboards/kopibeng/mnk65_stm32/config.h deleted file mode 100644 index 62a2978f67c..00000000000 --- a/keyboards/kopibeng/mnk65_stm32/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Samuel Lu - * - * 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 diff --git a/keyboards/kopibeng/mnk65_stm32/keyboard.json b/keyboards/kopibeng/mnk65_stm32/keyboard.json index f3c57063c94..c71394ba843 100644 --- a/keyboards/kopibeng/mnk65_stm32/keyboard.json +++ b/keyboards/kopibeng/mnk65_stm32/keyboard.json @@ -13,6 +13,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "A8" }, diff --git a/keyboards/kopibeng/mnk88/config.h b/keyboards/kopibeng/mnk88/config.h deleted file mode 100644 index 62a2978f67c..00000000000 --- a/keyboards/kopibeng/mnk88/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Samuel Lu - * - * 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 diff --git a/keyboards/kopibeng/mnk88/keyboard.json b/keyboards/kopibeng/mnk88/keyboard.json index 8a63d6562b0..29d2d70ba93 100644 --- a/keyboards/kopibeng/mnk88/keyboard.json +++ b/keyboards/kopibeng/mnk88/keyboard.json @@ -34,6 +34,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A2", "A1", "A0", "B11", "B10", "B2", "F1", "B1", "B0", "A7", "A6", "A5", "F0", "A4", "C15", "C14", "C13"], "rows": ["A8", "B15", "A9", "B12", "A3", "B14"] diff --git a/keyboards/kopibeng/typ65/config.h b/keyboards/kopibeng/typ65/config.h index 76cd3ae659d..48c3abee25f 100644 --- a/keyboards/kopibeng/typ65/config.h +++ b/keyboards/kopibeng/typ65/config.h @@ -19,8 +19,3 @@ #define INDICATOR_0 B2 #define INDICATOR_1 B7 #define INDICATOR_2 B3 - -/* 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/kopibeng/typ65/keyboard.json b/keyboards/kopibeng/typ65/keyboard.json index c2598cadcb6..57a23da4ad2 100644 --- a/keyboards/kopibeng/typ65/keyboard.json +++ b/keyboards/kopibeng/typ65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F5", "F4", "F1", "F0", "E6"], "rows": ["D0", "D1", "D2", "F6", "B0"] diff --git a/keyboards/kopibeng/xt60/config.h b/keyboards/kopibeng/xt60/config.h deleted file mode 100644 index 62a2978f67c..00000000000 --- a/keyboards/kopibeng/xt60/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Samuel Lu - * - * 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 diff --git a/keyboards/kopibeng/xt60/keyboard.json b/keyboards/kopibeng/xt60/keyboard.json index 70b5a06ab4e..2901c056dd9 100644 --- a/keyboards/kopibeng/xt60/keyboard.json +++ b/keyboards/kopibeng/xt60/keyboard.json @@ -33,6 +33,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "F5", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1"], "rows": ["F7", "F4", "D0", "B3", "B7"] diff --git a/keyboards/kopibeng/xt60_singa/config.h b/keyboards/kopibeng/xt60_singa/config.h deleted file mode 100644 index 62a2978f67c..00000000000 --- a/keyboards/kopibeng/xt60_singa/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Samuel Lu - * - * 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 diff --git a/keyboards/kopibeng/xt60_singa/keyboard.json b/keyboards/kopibeng/xt60_singa/keyboard.json index 844d9b7aca6..688fa2f73aa 100644 --- a/keyboards/kopibeng/xt60_singa/keyboard.json +++ b/keyboards/kopibeng/xt60_singa/keyboard.json @@ -33,6 +33,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "F5", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1"], "rows": ["F7", "F4", "D0", "B3", "B7"] diff --git a/keyboards/kopibeng/xt65/config.h b/keyboards/kopibeng/xt65/config.h deleted file mode 100644 index 2ef1d22576d..00000000000 --- a/keyboards/kopibeng/xt65/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2021 Samuel Lu - * - * 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/kopibeng/xt65/keyboard.json b/keyboards/kopibeng/xt65/keyboard.json index f5d53e0af42..c73ff703d5d 100644 --- a/keyboards/kopibeng/xt65/keyboard.json +++ b/keyboards/kopibeng/xt65/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "B6", "C6", "C7", "F0", "F1", "F4", "F5", "F6", "F7", "B2", "B3", "B7"], "rows": ["B5", "B4", "D7", "D6", "D4"] diff --git a/keyboards/kopibeng/xt8x/config.h b/keyboards/kopibeng/xt8x/config.h index 5f12451e15d..65961eb2263 100644 --- a/keyboards/kopibeng/xt8x/config.h +++ b/keyboards/kopibeng/xt8x/config.h @@ -17,8 +17,3 @@ #pragma once #define INDICATOR_PIN_0 B13 - -/* 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/kopibeng/xt8x/keyboard.json b/keyboards/kopibeng/xt8x/keyboard.json index 379ca9ee679..7167cb1d078 100644 --- a/keyboards/kopibeng/xt8x/keyboard.json +++ b/keyboards/kopibeng/xt8x/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A2", "A1", "A0", "B11", "B10", "B2", "F1", "B1", "B0", "A7", "A6", "A5", "F0", "A4", "C15", "C14", "C13"], "rows": ["A8", "B15", "A9", "B12", "A3", "B14"] diff --git a/keyboards/kprepublic/bm16s/config.h b/keyboards/kprepublic/bm16s/config.h deleted file mode 100755 index 5f360813239..00000000000 --- a/keyboards/kprepublic/bm16s/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/kprepublic/bm16s/keyboard.json b/keyboards/kprepublic/bm16s/keyboard.json index c1dce5d3009..8c6ce05bb96 100644 --- a/keyboards/kprepublic/bm16s/keyboard.json +++ b/keyboards/kprepublic/bm16s/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "F6", "D4", "D6"], "rows": ["D1", "D0", "D3", "D2"] diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/config.h b/keyboards/kprepublic/bm40hsrgb/rev1/config.h deleted file mode 100755 index 0ddf7838246..00000000000 --- a/keyboards/kprepublic/bm40hsrgb/rev1/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 tominabox1 - * - * 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 diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keyboard.json b/keyboards/kprepublic/bm40hsrgb/rev1/keyboard.json index 83da66a0a1c..7bdeafbcad2 100644 --- a/keyboards/kprepublic/bm40hsrgb/rev1/keyboard.json +++ b/keyboards/kprepublic/bm40hsrgb/rev1/keyboard.json @@ -73,6 +73,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "C6", "B4", "D7", "D4", "D6", "C7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B3", "B2", "E6", "B5"] diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h deleted file mode 100644 index 944a3a8423a..00000000000 --- a/keyboards/kprepublic/bm65hsrgb/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 bytesapart - -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/kprepublic/bm65hsrgb/rev1/keyboard.json b/keyboards/kprepublic/bm65hsrgb/rev1/keyboard.json index fcc2101b01e..dc63acfa418 100644 --- a/keyboards/kprepublic/bm65hsrgb/rev1/keyboard.json +++ b/keyboards/kprepublic/bm65hsrgb/rev1/keyboard.json @@ -26,6 +26,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h deleted file mode 100644 index 458ef985698..00000000000 --- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 peepeetee - -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/kprepublic/bm68hsrgb/rev1/keyboard.json b/keyboards/kprepublic/bm68hsrgb/rev1/keyboard.json index ca68c78756c..6e2d3a92087 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev1/keyboard.json +++ b/keyboards/kprepublic/bm68hsrgb/rev1/keyboard.json @@ -72,6 +72,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h deleted file mode 100644 index 458ef985698..00000000000 --- a/keyboards/kprepublic/bm980hsrgb/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 peepeetee - -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/kprepublic/bm980hsrgb/keyboard.json b/keyboards/kprepublic/bm980hsrgb/keyboard.json index 717a514fe87..8ee498b7b60 100644 --- a/keyboards/kprepublic/bm980hsrgb/keyboard.json +++ b/keyboards/kprepublic/bm980hsrgb/keyboard.json @@ -23,6 +23,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "E6", "F0", "F1", "F4", "F5", "D6"], "rows": ["D4", "B6", "B5", "B4", "F7", "F6", "D7"] diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h deleted file mode 100644 index 5e90ea1c05b..00000000000 --- a/keyboards/kprepublic/cospad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 - -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/kprepublic/cospad/keyboard.json b/keyboards/kprepublic/cospad/keyboard.json index 233e258e1d7..51a824b8165 100644 --- a/keyboards/kprepublic/cospad/keyboard.json +++ b/keyboards/kprepublic/cospad/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7"], "rows": ["D0", "D1", "D2", "D3", "D4", "D5"] diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h deleted file mode 100644 index 5e90ea1c05b..00000000000 --- a/keyboards/ktec/daisy/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 - -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/ktec/daisy/keyboard.json b/keyboards/ktec/daisy/keyboard.json index 3d230b03f48..d0a24f5b0d3 100644 --- a/keyboards/ktec/daisy/keyboard.json +++ b/keyboards/ktec/daisy/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6"], "rows": ["D2", "D3", "D5", "B7"] diff --git a/keyboards/kumaokobo/kudox/columner/config.h b/keyboards/kumaokobo/kudox/columner/config.h index 04bc8cb2d21..fc2549733e8 100644 --- a/keyboards/kumaokobo/kudox/columner/config.h +++ b/keyboards/kumaokobo/kudox/columner/config.h @@ -16,11 +16,6 @@ #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. diff --git a/keyboards/kumaokobo/kudox/columner/keyboard.json b/keyboards/kumaokobo/kudox/columner/keyboard.json index 903d0d97a57..2fde419205a 100644 --- a/keyboards/kumaokobo/kudox/columner/keyboard.json +++ b/keyboards/kumaokobo/kudox/columner/keyboard.json @@ -46,6 +46,12 @@ "command": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/kudox/rev1/config.h b/keyboards/kumaokobo/kudox/rev1/config.h index 666cb49b2e4..1bf4f3c026e 100644 --- a/keyboards/kumaokobo/kudox/rev1/config.h +++ b/keyboards/kumaokobo/kudox/rev1/config.h @@ -16,11 +16,6 @@ #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. diff --git a/keyboards/kumaokobo/kudox/rev1/keyboard.json b/keyboards/kumaokobo/kudox/rev1/keyboard.json index 2be4cefc569..ba4dbe7ae37 100644 --- a/keyboards/kumaokobo/kudox/rev1/keyboard.json +++ b/keyboards/kumaokobo/kudox/rev1/keyboard.json @@ -46,6 +46,12 @@ "command": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/kudox/rev2/config.h b/keyboards/kumaokobo/kudox/rev2/config.h index 666cb49b2e4..1bf4f3c026e 100644 --- a/keyboards/kumaokobo/kudox/rev2/config.h +++ b/keyboards/kumaokobo/kudox/rev2/config.h @@ -16,11 +16,6 @@ #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. diff --git a/keyboards/kumaokobo/kudox/rev2/keyboard.json b/keyboards/kumaokobo/kudox/rev2/keyboard.json index a5dad94322b..a7423adf111 100644 --- a/keyboards/kumaokobo/kudox/rev2/keyboard.json +++ b/keyboards/kumaokobo/kudox/rev2/keyboard.json @@ -46,6 +46,12 @@ "command": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/kudox/rev3/config.h b/keyboards/kumaokobo/kudox/rev3/config.h index 04bc8cb2d21..fc2549733e8 100644 --- a/keyboards/kumaokobo/kudox/rev3/config.h +++ b/keyboards/kumaokobo/kudox/rev3/config.h @@ -16,11 +16,6 @@ #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. diff --git a/keyboards/kumaokobo/kudox/rev3/keyboard.json b/keyboards/kumaokobo/kudox/rev3/keyboard.json index 1fe349a99ef..25ead435052 100644 --- a/keyboards/kumaokobo/kudox/rev3/keyboard.json +++ b/keyboards/kumaokobo/kudox/rev3/keyboard.json @@ -46,6 +46,12 @@ "command": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/kudox_full/rev1/config.h b/keyboards/kumaokobo/kudox_full/rev1/config.h deleted file mode 100644 index f1dcbbcf3df..00000000000 --- a/keyboards/kumaokobo/kudox_full/rev1/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2021 Kumao Kobo (@kumaokobo) -// SPDX-License-Identifier: GPL-2.0+ - -#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/kumaokobo/kudox_full/rev1/keyboard.json b/keyboards/kumaokobo/kudox_full/rev1/keyboard.json index 046bc8e1824..09d1cd152c7 100644 --- a/keyboards/kumaokobo/kudox_full/rev1/keyboard.json +++ b/keyboards/kumaokobo/kudox_full/rev1/keyboard.json @@ -44,6 +44,12 @@ "unicode": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/kumaokobo/kudox_game/rev1/config.h b/keyboards/kumaokobo/kudox_game/rev1/config.h index b0b9607f4bb..0a8c5278dca 100644 --- a/keyboards/kumaokobo/kudox_game/rev1/config.h +++ b/keyboards/kumaokobo/kudox_game/rev1/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/kumaokobo/kudox_game/rev1/keyboard.json b/keyboards/kumaokobo/kudox_game/rev1/keyboard.json index 2163b89d971..975fbcd5467 100644 --- a/keyboards/kumaokobo/kudox_game/rev1/keyboard.json +++ b/keyboards/kumaokobo/kudox_game/rev1/keyboard.json @@ -35,6 +35,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/kudox_game/rev2/config.h b/keyboards/kumaokobo/kudox_game/rev2/config.h index 37fde915999..f1572e18d50 100644 --- a/keyboards/kumaokobo/kudox_game/rev2/config.h +++ b/keyboards/kumaokobo/kudox_game/rev2/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/kumaokobo/kudox_game/rev2/keyboard.json b/keyboards/kumaokobo/kudox_game/rev2/keyboard.json index 554d03c76bd..ac13e1b216b 100644 --- a/keyboards/kumaokobo/kudox_game/rev2/keyboard.json +++ b/keyboards/kumaokobo/kudox_game/rev2/keyboard.json @@ -36,6 +36,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/pico/65keys/config.h b/keyboards/kumaokobo/pico/65keys/config.h index 04bc8cb2d21..fc2549733e8 100644 --- a/keyboards/kumaokobo/pico/65keys/config.h +++ b/keyboards/kumaokobo/pico/65keys/config.h @@ -16,11 +16,6 @@ #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. diff --git a/keyboards/kumaokobo/pico/65keys/keyboard.json b/keyboards/kumaokobo/pico/65keys/keyboard.json index efcc96e1dcd..00113a931f3 100644 --- a/keyboards/kumaokobo/pico/65keys/keyboard.json +++ b/keyboards/kumaokobo/pico/65keys/keyboard.json @@ -46,6 +46,12 @@ "command": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kumaokobo/pico/70keys/config.h b/keyboards/kumaokobo/pico/70keys/config.h index 04bc8cb2d21..fc2549733e8 100644 --- a/keyboards/kumaokobo/pico/70keys/config.h +++ b/keyboards/kumaokobo/pico/70keys/config.h @@ -16,11 +16,6 @@ #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. diff --git a/keyboards/kumaokobo/pico/70keys/keyboard.json b/keyboards/kumaokobo/pico/70keys/keyboard.json index 8fe91b84cce..a820c7eee32 100644 --- a/keyboards/kumaokobo/pico/70keys/keyboard.json +++ b/keyboards/kumaokobo/pico/70keys/keyboard.json @@ -46,6 +46,12 @@ "command": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kv/revt/config.h b/keyboards/kv/revt/config.h deleted file mode 100644 index c2fe5d4d755..00000000000 --- a/keyboards/kv/revt/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Hybrid65 - * - * 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 diff --git a/keyboards/kv/revt/keyboard.json b/keyboards/kv/revt/keyboard.json index 1c2ee5a84ab..8553dcdd355 100644 --- a/keyboards/kv/revt/keyboard.json +++ b/keyboards/kv/revt/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": false + } + }, "matrix_pins": { "cols": ["B7", "B6", "B5", "B4", "B3", "B2", "B14", "B1", "B15", "B0", "B9", "B10", "B11", "B12", "A14", "A13", "A4", "A5", "A7", "A8", "A15"], "rows": ["A6", "B13", "B8", "A0", "A1", "A2"] diff --git a/keyboards/kwub/bloop/config.h b/keyboards/kwub/bloop/config.h deleted file mode 100644 index 87dc81c24d5..00000000000 --- a/keyboards/kwub/bloop/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Kwabena Aduse-Poku (Kwub) - * - * 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 diff --git a/keyboards/kwub/bloop/keyboard.json b/keyboards/kwub/bloop/keyboard.json index b482b571be3..2889ef1598c 100644 --- a/keyboards/kwub/bloop/keyboard.json +++ b/keyboards/kwub/bloop/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "F6", "F1", "F7", "F0", "B0", "B7", "D3", "D2", "D1", "D5", "D4", "D6"], "rows": ["F5", "F4", "C6", "C7", "D7"] diff --git a/keyboards/ky01/config.h b/keyboards/ky01/config.h deleted file mode 100644 index 224b56103a5..00000000000 --- a/keyboards/ky01/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 KnoblesseOblige - -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/ky01/keyboard.json b/keyboards/ky01/keyboard.json index b9e4eeef70f..f5657ac93f2 100644 --- a/keyboards/ky01/keyboard.json +++ b/keyboards/ky01/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6"], "rows": ["E6", "B5", "B4", "D7", "D4", "D6"] From 2e0498080f79c0d79bfa4ae91405d6cf0c3d959b Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 22 May 2024 14:14:00 -0700 Subject: [PATCH 317/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: K, Part 2 (#23769) Affects: - `keebio/bamfk4` - `keebio/bdn9/rev1` - `keebio/bdn9/rev2` - `keebio/bfo9000` - `keebio/bigswitchseat` - `keebio/choconum` - `keebio/dilly` - `keebio/dsp40/rev1` - `keebio/ergodicity` - `keebio/foldkb/rev1` - `keebio/fourier` - `keebio/iris/rev1` - `keebio/iris/rev1_led` - `keebio/iris/rev2` - `keebio/iris/rev3` - `keebio/iris/rev4` - `keebio/kbo5000/rev1` - `keebio/levinson/rev1` - `keebio/levinson/rev2` - `keebio/levinson/rev3` - `keebio/nyquist/rev1` - `keebio/nyquist/rev2` - `keebio/nyquist/rev3` - `keebio/quefrency/rev1` - `keebio/quefrency/rev4` - `keebio/quefrency/rev5` - `keebio/rorschach/rev1` - `keebio/sinc/rev1` - `keebio/sinc/rev2` - `keebio/tragicforce68` - `keebio/tukey` - `keebio/viterbi/rev1` - `keebio/viterbi/rev2` - `keebio/wavelet` - `keebio/wtf60` - `keebsforall/coarse60` - `keebsforall/freebirdnp/lite` - `keebsforall/freebirdnp/pro` - `keebsforall/freebirdtkl` - `keebwerk/nano_slider` - `keebzdotnet/fme` - `keebzdotnet/wazowski` - `keyboardio/atreus` - `keycapsss/kimiko/rev1` - `keycapsss/o4l_5x12` - `keygem/kg60ansi` - `keygem/kg65rgbv2` - `keyhive/absinthe` - `keyhive/ergosaurus` - `keyhive/lattice60` - `keyhive/maypad` - `keyhive/navi10/rev0` - `keyhive/navi10/rev2` - `keyhive/navi10/rev3` - `keyhive/opus` - `keyhive/southpole` - `keyhive/ut472` - `keyprez/bison` - `keyprez/corgi` - `keyprez/rhino` - `keyprez/unicorn` - `keysofkings/twokey` - `keystonecaps/gameroyadvance` --- keyboards/keebio/bamfk4/config.h | 5 --- keyboards/keebio/bamfk4/keyboard.json | 6 +++ keyboards/keebio/bdn9/rev1/config.h | 23 ----------- keyboards/keebio/bdn9/rev1/keyboard.json | 6 +++ keyboards/keebio/bdn9/rev2/config.h | 23 ----------- keyboards/keebio/bdn9/rev2/keyboard.json | 6 ++- keyboards/keebio/bfo9000/config.h | 40 ------------------ keyboards/keebio/bfo9000/keyboard.json | 6 +++ keyboards/keebio/bigswitchseat/config.h | 25 ----------- keyboards/keebio/bigswitchseat/keyboard.json | 6 +++ keyboards/keebio/choconum/config.h | 39 ------------------ keyboards/keebio/choconum/keyboard.json | 6 +++ keyboards/keebio/dilly/config.h | 7 ---- keyboards/keebio/dilly/keyboard.json | 6 +++ keyboards/keebio/dsp40/rev1/config.h | 5 --- keyboards/keebio/dsp40/rev1/keyboard.json | 6 ++- keyboards/keebio/ergodicity/config.h | 39 ------------------ keyboards/keebio/ergodicity/keyboard.json | 6 +++ keyboards/keebio/foldkb/rev1/config.h | 5 --- keyboards/keebio/foldkb/rev1/keyboard.json | 6 +++ keyboards/keebio/fourier/config.h | 5 --- keyboards/keebio/fourier/keyboard.json | 6 +++ keyboards/keebio/iris/rev1/config.h | 23 ----------- keyboards/keebio/iris/rev1/keyboard.json | 6 +++ keyboards/keebio/iris/rev1_led/config.h | 23 ----------- keyboards/keebio/iris/rev1_led/keyboard.json | 6 +++ keyboards/keebio/iris/rev2/config.h | 23 ----------- keyboards/keebio/iris/rev2/keyboard.json | 6 +++ keyboards/keebio/iris/rev3/config.h | 5 --- keyboards/keebio/iris/rev3/keyboard.json | 6 +++ keyboards/keebio/iris/rev4/config.h | 5 --- keyboards/keebio/iris/rev4/keyboard.json | 6 +++ keyboards/keebio/kbo5000/rev1/config.h | 5 --- keyboards/keebio/kbo5000/rev1/keyboard.json | 6 +++ keyboards/keebio/levinson/rev1/config.h | 25 ----------- keyboards/keebio/levinson/rev1/keyboard.json | 6 +++ keyboards/keebio/levinson/rev2/config.h | 25 ----------- keyboards/keebio/levinson/rev2/keyboard.json | 6 +++ keyboards/keebio/levinson/rev3/config.h | 5 --- keyboards/keebio/levinson/rev3/keyboard.json | 6 +++ keyboards/keebio/nyquist/rev1/config.h | 39 ------------------ keyboards/keebio/nyquist/rev1/keyboard.json | 6 +++ keyboards/keebio/nyquist/rev2/config.h | 39 ------------------ keyboards/keebio/nyquist/rev2/keyboard.json | 6 +++ keyboards/keebio/nyquist/rev3/config.h | 5 --- keyboards/keebio/nyquist/rev3/keyboard.json | 6 +++ keyboards/keebio/quefrency/rev1/config.h | 5 --- keyboards/keebio/quefrency/rev1/keyboard.json | 6 +++ keyboards/keebio/quefrency/rev4/config.h | 5 --- keyboards/keebio/quefrency/rev4/keyboard.json | 6 +++ keyboards/keebio/quefrency/rev5/config.h | 5 --- keyboards/keebio/quefrency/rev5/keyboard.json | 6 +++ keyboards/keebio/rorschach/rev1/config.h | 23 ----------- keyboards/keebio/rorschach/rev1/keyboard.json | 6 +++ keyboards/keebio/sinc/rev1/config.h | 5 --- keyboards/keebio/sinc/rev1/keyboard.json | 6 +++ keyboards/keebio/sinc/rev2/config.h | 5 --- keyboards/keebio/sinc/rev2/keyboard.json | 6 +++ keyboards/keebio/tragicforce68/config.h | 23 ----------- keyboards/keebio/tragicforce68/keyboard.json | 6 +++ keyboards/keebio/tukey/config.h | 23 ----------- keyboards/keebio/tukey/keyboard.json | 6 +++ keyboards/keebio/viterbi/rev1/config.h | 23 ----------- keyboards/keebio/viterbi/rev1/keyboard.json | 6 +++ keyboards/keebio/viterbi/rev2/config.h | 5 --- keyboards/keebio/viterbi/rev2/keyboard.json | 6 +++ keyboards/keebio/wavelet/config.h | 25 ----------- keyboards/keebio/wavelet/keyboard.json | 6 +++ keyboards/keebio/wtf60/config.h | 5 --- keyboards/keebio/wtf60/keyboard.json | 6 +++ keyboards/keebsforall/coarse60/config.h | 5 --- keyboards/keebsforall/coarse60/keyboard.json | 6 +++ .../keebsforall/freebirdnp/lite/config.h | 23 ----------- .../keebsforall/freebirdnp/lite/keyboard.json | 6 +++ keyboards/keebsforall/freebirdnp/pro/config.h | 23 ----------- .../keebsforall/freebirdnp/pro/keyboard.json | 6 +++ keyboards/keebsforall/freebirdtkl/config.h | 21 ---------- .../keebsforall/freebirdtkl/keyboard.json | 6 +++ keyboards/keebwerk/nano_slider/config.h | 5 --- keyboards/keebwerk/nano_slider/keyboard.json | 6 +++ keyboards/keebzdotnet/fme/config.h | 24 ----------- keyboards/keebzdotnet/fme/keyboard.json | 6 +++ keyboards/keebzdotnet/wazowski/config.h | 39 ------------------ keyboards/keebzdotnet/wazowski/keyboard.json | 6 +++ keyboards/keyboardio/atreus/config.h | 38 ----------------- keyboards/keyboardio/atreus/keyboard.json | 6 +++ keyboards/keycapsss/kimiko/rev1/config.h | 5 --- keyboards/keycapsss/kimiko/rev1/keyboard.json | 6 +++ keyboards/keycapsss/o4l_5x12/config.h | 22 ---------- keyboards/keycapsss/o4l_5x12/keyboard.json | 6 +++ keyboards/keygem/kg60ansi/config.h | 41 ------------------- keyboards/keygem/kg60ansi/keyboard.json | 6 +++ keyboards/keygem/kg65rgbv2/config.h | 41 ------------------- keyboards/keygem/kg65rgbv2/keyboard.json | 6 +++ keyboards/keyhive/absinthe/config.h | 23 ----------- keyboards/keyhive/absinthe/keyboard.json | 6 +++ keyboards/keyhive/ergosaurus/config.h | 39 ------------------ keyboards/keyhive/ergosaurus/keyboard.json | 6 +++ keyboards/keyhive/lattice60/config.h | 39 ------------------ keyboards/keyhive/lattice60/keyboard.json | 6 +++ keyboards/keyhive/maypad/config.h | 36 ---------------- keyboards/keyhive/maypad/keyboard.json | 6 +++ keyboards/keyhive/navi10/rev0/config.h | 24 ----------- keyboards/keyhive/navi10/rev0/keyboard.json | 6 +++ keyboards/keyhive/navi10/rev2/config.h | 24 ----------- keyboards/keyhive/navi10/rev2/keyboard.json | 6 +++ keyboards/keyhive/navi10/rev3/config.h | 24 ----------- keyboards/keyhive/navi10/rev3/keyboard.json | 6 +++ keyboards/keyhive/opus/config.h | 22 ---------- keyboards/keyhive/opus/keyboard.json | 6 +++ keyboards/keyhive/southpole/config.h | 7 ---- keyboards/keyhive/southpole/keyboard.json | 6 +++ keyboards/keyhive/ut472/config.h | 22 ---------- keyboards/keyhive/ut472/keyboard.json | 6 +++ keyboards/keyprez/bison/config.h | 39 ------------------ keyboards/keyprez/bison/keyboard.json | 6 +++ keyboards/keyprez/corgi/config.h | 23 ----------- keyboards/keyprez/corgi/keyboard.json | 6 +++ keyboards/keyprez/rhino/config.h | 5 --- keyboards/keyprez/rhino/keyboard.json | 6 +++ keyboards/keyprez/unicorn/config.h | 5 --- keyboards/keyprez/unicorn/keyboard.json | 6 +++ keyboards/keysofkings/twokey/config.h | 6 --- keyboards/keysofkings/twokey/keyboard.json | 6 +++ .../keystonecaps/gameroyadvance/config.h | 24 ----------- .../keystonecaps/gameroyadvance/keyboard.json | 6 +++ 126 files changed, 376 insertions(+), 1241 deletions(-) delete mode 100644 keyboards/keebio/bdn9/rev1/config.h delete mode 100644 keyboards/keebio/bdn9/rev2/config.h delete mode 100644 keyboards/keebio/bfo9000/config.h delete mode 100644 keyboards/keebio/bigswitchseat/config.h delete mode 100644 keyboards/keebio/choconum/config.h delete mode 100644 keyboards/keebio/dilly/config.h delete mode 100644 keyboards/keebio/ergodicity/config.h delete mode 100644 keyboards/keebio/iris/rev1/config.h delete mode 100644 keyboards/keebio/iris/rev1_led/config.h delete mode 100644 keyboards/keebio/iris/rev2/config.h delete mode 100644 keyboards/keebio/levinson/rev1/config.h delete mode 100644 keyboards/keebio/levinson/rev2/config.h delete mode 100644 keyboards/keebio/nyquist/rev1/config.h delete mode 100644 keyboards/keebio/nyquist/rev2/config.h delete mode 100644 keyboards/keebio/rorschach/rev1/config.h delete mode 100644 keyboards/keebio/tragicforce68/config.h delete mode 100644 keyboards/keebio/tukey/config.h delete mode 100644 keyboards/keebio/viterbi/rev1/config.h delete mode 100644 keyboards/keebio/wavelet/config.h delete mode 100644 keyboards/keebsforall/freebirdnp/lite/config.h delete mode 100644 keyboards/keebsforall/freebirdnp/pro/config.h delete mode 100644 keyboards/keebsforall/freebirdtkl/config.h delete mode 100644 keyboards/keebzdotnet/fme/config.h delete mode 100644 keyboards/keebzdotnet/wazowski/config.h delete mode 100644 keyboards/keyboardio/atreus/config.h delete mode 100644 keyboards/keycapsss/o4l_5x12/config.h delete mode 100644 keyboards/keygem/kg60ansi/config.h delete mode 100644 keyboards/keygem/kg65rgbv2/config.h delete mode 100644 keyboards/keyhive/absinthe/config.h delete mode 100644 keyboards/keyhive/ergosaurus/config.h delete mode 100644 keyboards/keyhive/lattice60/config.h delete mode 100644 keyboards/keyhive/maypad/config.h delete mode 100644 keyboards/keyhive/navi10/rev0/config.h delete mode 100644 keyboards/keyhive/navi10/rev2/config.h delete mode 100644 keyboards/keyhive/navi10/rev3/config.h delete mode 100644 keyboards/keyhive/opus/config.h delete mode 100644 keyboards/keyhive/southpole/config.h delete mode 100644 keyboards/keyhive/ut472/config.h delete mode 100644 keyboards/keyprez/bison/config.h delete mode 100644 keyboards/keyprez/corgi/config.h delete mode 100644 keyboards/keystonecaps/gameroyadvance/config.h diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h index 21ce4672bf5..e97e28f5a9e 100644 --- a/keyboards/keebio/bamfk4/config.h +++ b/keyboards/keebio/bamfk4/config.h @@ -5,11 +5,6 @@ #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/keebio/bamfk4/keyboard.json b/keyboards/keebio/bamfk4/keyboard.json index a132a4bd46f..829395d6714 100644 --- a/keyboards/keebio/bamfk4/keyboard.json +++ b/keyboards/keebio/bamfk4/keyboard.json @@ -87,6 +87,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "D5", "B6", "B7"], "rows": ["F0"] diff --git a/keyboards/keebio/bdn9/rev1/config.h b/keyboards/keebio/bdn9/rev1/config.h deleted file mode 100644 index 3ed1c2ed30f..00000000000 --- a/keyboards/keebio/bdn9/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Danny Nguyen - -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 diff --git a/keyboards/keebio/bdn9/rev1/keyboard.json b/keyboards/keebio/bdn9/rev1/keyboard.json index 9ab64e25d6f..1deecf0d5b3 100644 --- a/keyboards/keebio/bdn9/rev1/keyboard.json +++ b/keyboards/keebio/bdn9/rev1/keyboard.json @@ -48,6 +48,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["D2", "D4", "F4"], diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h deleted file mode 100644 index 5cfd269d500..00000000000 --- a/keyboards/keebio/bdn9/rev2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 Danny Nguyen - -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 diff --git a/keyboards/keebio/bdn9/rev2/keyboard.json b/keyboards/keebio/bdn9/rev2/keyboard.json index 174c5c826a9..a8a0c8d10da 100644 --- a/keyboards/keebio/bdn9/rev2/keyboard.json +++ b/keyboards/keebio/bdn9/rev2/keyboard.json @@ -81,7 +81,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "processor": "STM32F072", "bootloader": "stm32-dfu", diff --git a/keyboards/keebio/bfo9000/config.h b/keyboards/keebio/bfo9000/config.h deleted file mode 100644 index 0b8941e7760..00000000000 --- a/keyboards/keebio/bfo9000/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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/keebio/bfo9000/keyboard.json b/keyboards/keebio/bfo9000/keyboard.json index 86fd59a5986..36fd272b90d 100644 --- a/keyboards/keebio/bfo9000/keyboard.json +++ b/keyboards/keebio/bfo9000/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D4", "C6", "D7", "E6"] diff --git a/keyboards/keebio/bigswitchseat/config.h b/keyboards/keebio/bigswitchseat/config.h deleted file mode 100644 index 6d03529f682..00000000000 --- a/keyboards/keebio/bigswitchseat/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2021 Danny Nguyen (@nooges) -// 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 - -/* - * 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/keebio/bigswitchseat/keyboard.json b/keyboards/keebio/bigswitchseat/keyboard.json index b1acf6c1b39..3d6ce65bde4 100644 --- a/keyboards/keebio/bigswitchseat/keyboard.json +++ b/keyboards/keebio/bigswitchseat/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0"], "rows": ["E6"] diff --git a/keyboards/keebio/choconum/config.h b/keyboards/keebio/choconum/config.h deleted file mode 100644 index 38e745515ab..00000000000 --- a/keyboards/keebio/choconum/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Keebio - -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/keebio/choconum/keyboard.json b/keyboards/keebio/choconum/keyboard.json index 0315a9f3dce..6ff2cc4fb1c 100644 --- a/keyboards/keebio/choconum/keyboard.json +++ b/keyboards/keebio/choconum/keyboard.json @@ -18,6 +18,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["B2", "B10", "B3", "B4"], diff --git a/keyboards/keebio/dilly/config.h b/keyboards/keebio/dilly/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/keebio/dilly/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/keebio/dilly/keyboard.json b/keyboards/keebio/dilly/keyboard.json index 45665940544..83bf1eac9d6 100644 --- a/keyboards/keebio/dilly/keyboard.json +++ b/keyboards/keebio/dilly/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D4", "C6", "F6", "F5"], "rows": ["D7", "E6", "B4", "B1", "B3", "B2"] diff --git a/keyboards/keebio/dsp40/rev1/config.h b/keyboards/keebio/dsp40/rev1/config.h index 390ac98a231..f70aad5fd01 100644 --- a/keyboards/keebio/dsp40/rev1/config.h +++ b/keyboards/keebio/dsp40/rev1/config.h @@ -19,8 +19,3 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 - -/* 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/keebio/dsp40/rev1/keyboard.json b/keyboards/keebio/dsp40/rev1/keyboard.json index 2011a23b7e5..776f67837c1 100644 --- a/keyboards/keebio/dsp40/rev1/keyboard.json +++ b/keyboards/keebio/dsp40/rev1/keyboard.json @@ -19,7 +19,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "backlight": { "pin": "A6", diff --git a/keyboards/keebio/ergodicity/config.h b/keyboards/keebio/ergodicity/config.h deleted file mode 100644 index 64b776e9f4a..00000000000 --- a/keyboards/keebio/ergodicity/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Keebio - -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/keebio/ergodicity/keyboard.json b/keyboards/keebio/ergodicity/keyboard.json index 1305a4359f1..f1b1649f8a4 100644 --- a/keyboards/keebio/ergodicity/keyboard.json +++ b/keyboards/keebio/ergodicity/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B7", "B3"], "rows": ["B0", "B1", "C7", "B6", "B4"] diff --git a/keyboards/keebio/foldkb/rev1/config.h b/keyboards/keebio/foldkb/rev1/config.h index 73521bc5352..0435a34e7fb 100644 --- a/keyboards/keebio/foldkb/rev1/config.h +++ b/keyboards/keebio/foldkb/rev1/config.h @@ -18,9 +18,4 @@ along with this program. If not, see . #define SPLIT_HAND_PIN F7 -/* 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 RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) diff --git a/keyboards/keebio/foldkb/rev1/keyboard.json b/keyboards/keebio/foldkb/rev1/keyboard.json index 891e2ce74bb..c7055400a55 100644 --- a/keyboards/keebio/foldkb/rev1/keyboard.json +++ b/keyboards/keebio/foldkb/rev1/keyboard.json @@ -55,6 +55,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/keebio/fourier/config.h b/keyboards/keebio/fourier/config.h index d1797c83d57..49d868c9688 100644 --- a/keyboards/keebio/fourier/config.h +++ b/keyboards/keebio/fourier/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . /* Split Defines */ #define SPLIT_HAND_PIN D2 -/* 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. diff --git a/keyboards/keebio/fourier/keyboard.json b/keyboards/keebio/fourier/keyboard.json index a1dab05c567..189276b877e 100644 --- a/keyboards/keebio/fourier/keyboard.json +++ b/keyboards/keebio/fourier/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["F4", "D7", "E6", "B4"] diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h deleted file mode 100644 index 824ba0bfe4c..00000000000 --- a/keyboards/keebio/iris/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2017 Danny Nguyen - -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 diff --git a/keyboards/keebio/iris/rev1/keyboard.json b/keyboards/keebio/iris/rev1/keyboard.json index c6b69c36778..334fbdfc93b 100644 --- a/keyboards/keebio/iris/rev1/keyboard.json +++ b/keyboards/keebio/iris/rev1/keyboard.json @@ -14,6 +14,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D7", "E6", "B4", "B5", "D4"] diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h deleted file mode 100644 index 824ba0bfe4c..00000000000 --- a/keyboards/keebio/iris/rev1_led/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2017 Danny Nguyen - -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 diff --git a/keyboards/keebio/iris/rev1_led/keyboard.json b/keyboards/keebio/iris/rev1_led/keyboard.json index 70500da27e9..fe934c6c039 100644 --- a/keyboards/keebio/iris/rev1_led/keyboard.json +++ b/keyboards/keebio/iris/rev1_led/keyboard.json @@ -14,6 +14,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "F4"], "rows": ["D7", "E6", "B4", "B5", "D4"] diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h deleted file mode 100644 index 824ba0bfe4c..00000000000 --- a/keyboards/keebio/iris/rev2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2017 Danny Nguyen - -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 diff --git a/keyboards/keebio/iris/rev2/keyboard.json b/keyboards/keebio/iris/rev2/keyboard.json index fafa9ba9240..7afe1c5cae7 100644 --- a/keyboards/keebio/iris/rev2/keyboard.json +++ b/keyboards/keebio/iris/rev2/keyboard.json @@ -46,6 +46,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h index e6ddc94df93..ff730d345c4 100644 --- a/keyboards/keebio/iris/rev3/config.h +++ b/keyboards/keebio/iris/rev3/config.h @@ -18,8 +18,3 @@ along with this program. If not, see . #pragma once #define SPLIT_HAND_PIN F0 - -/* 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/keebio/iris/rev3/keyboard.json b/keyboards/keebio/iris/rev3/keyboard.json index 8ce5ed89794..e2353d751f4 100644 --- a/keyboards/keebio/iris/rev3/keyboard.json +++ b/keyboards/keebio/iris/rev3/keyboard.json @@ -57,6 +57,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h index 5586f5890dd..246049a7309 100644 --- a/keyboards/keebio/iris/rev4/config.h +++ b/keyboards/keebio/iris/rev4/config.h @@ -18,8 +18,3 @@ along with this program. If not, see . #pragma once #define SPLIT_HAND_PIN D5 - -/* 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/keebio/iris/rev4/keyboard.json b/keyboards/keebio/iris/rev4/keyboard.json index 88856e0030f..ee06554d08c 100644 --- a/keyboards/keebio/iris/rev4/keyboard.json +++ b/keyboards/keebio/iris/rev4/keyboard.json @@ -70,6 +70,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/keebio/kbo5000/rev1/config.h b/keyboards/keebio/kbo5000/rev1/config.h index e1d3f968bef..edc732d668b 100644 --- a/keyboards/keebio/kbo5000/rev1/config.h +++ b/keyboards/keebio/kbo5000/rev1/config.h @@ -21,8 +21,3 @@ along with this program. If not, see . #define SPLIT_HAND_PIN F7 #define CAPS_LOCK_LED_PIN B6 - -/* 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/keebio/kbo5000/rev1/keyboard.json b/keyboards/keebio/kbo5000/rev1/keyboard.json index 7733f06efcf..b42b7116db3 100644 --- a/keyboards/keebio/kbo5000/rev1/keyboard.json +++ b/keyboards/keebio/kbo5000/rev1/keyboard.json @@ -69,6 +69,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/keebio/levinson/rev1/config.h b/keyboards/keebio/levinson/rev1/config.h deleted file mode 100644 index 2fd8b7d4d04..00000000000 --- a/keyboards/keebio/levinson/rev1/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert -Copyright 2018 Danny Nguyen - -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 diff --git a/keyboards/keebio/levinson/rev1/keyboard.json b/keyboards/keebio/levinson/rev1/keyboard.json index 1ed976b4a9e..ef4996615c0 100644 --- a/keyboards/keebio/levinson/rev1/keyboard.json +++ b/keyboards/keebio/levinson/rev1/keyboard.json @@ -29,6 +29,12 @@ "extrakey": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/keebio/levinson/rev2/config.h b/keyboards/keebio/levinson/rev2/config.h deleted file mode 100644 index 2fd8b7d4d04..00000000000 --- a/keyboards/keebio/levinson/rev2/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert -Copyright 2018 Danny Nguyen - -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 diff --git a/keyboards/keebio/levinson/rev2/keyboard.json b/keyboards/keebio/levinson/rev2/keyboard.json index 73969388d18..a5d3cad8443 100644 --- a/keyboards/keebio/levinson/rev2/keyboard.json +++ b/keyboards/keebio/levinson/rev2/keyboard.json @@ -29,6 +29,12 @@ "extrakey": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/keebio/levinson/rev3/config.h b/keyboards/keebio/levinson/rev3/config.h index e1c73cd56ee..2c1ea67b7aa 100644 --- a/keyboards/keebio/levinson/rev3/config.h +++ b/keyboards/keebio/levinson/rev3/config.h @@ -20,8 +20,3 @@ along with this program. If not, see . #pragma once #define SPLIT_HAND_PIN D2 - -/* 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/keebio/levinson/rev3/keyboard.json b/keyboards/keebio/levinson/rev3/keyboard.json index 5f38fe9874a..995fb8327d8 100644 --- a/keyboards/keebio/levinson/rev3/keyboard.json +++ b/keyboards/keebio/levinson/rev3/keyboard.json @@ -35,6 +35,12 @@ "extrakey": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/keebio/nyquist/rev1/config.h b/keyboards/keebio/nyquist/rev1/config.h deleted file mode 100644 index 6fdc15c582d..00000000000 --- a/keyboards/keebio/nyquist/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2017 Danny Nguyen - -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/keebio/nyquist/rev1/keyboard.json b/keyboards/keebio/nyquist/rev1/keyboard.json index 717b49e9713..7714e4a11c0 100644 --- a/keyboards/keebio/nyquist/rev1/keyboard.json +++ b/keyboards/keebio/nyquist/rev1/keyboard.json @@ -12,6 +12,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/keebio/nyquist/rev2/config.h b/keyboards/keebio/nyquist/rev2/config.h deleted file mode 100644 index 6fdc15c582d..00000000000 --- a/keyboards/keebio/nyquist/rev2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2017 Danny Nguyen - -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/keebio/nyquist/rev2/keyboard.json b/keyboards/keebio/nyquist/rev2/keyboard.json index 435cdd189fc..bfabd92c55d 100644 --- a/keyboards/keebio/nyquist/rev2/keyboard.json +++ b/keyboards/keebio/nyquist/rev2/keyboard.json @@ -14,6 +14,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/keebio/nyquist/rev3/config.h b/keyboards/keebio/nyquist/rev3/config.h index f7bc4f8b923..177b2832f58 100644 --- a/keyboards/keebio/nyquist/rev3/config.h +++ b/keyboards/keebio/nyquist/rev3/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D5 -/* 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. diff --git a/keyboards/keebio/nyquist/rev3/keyboard.json b/keyboards/keebio/nyquist/rev3/keyboard.json index 80e5a10a17a..062b7ebeae8 100644 --- a/keyboards/keebio/nyquist/rev3/keyboard.json +++ b/keyboards/keebio/nyquist/rev3/keyboard.json @@ -14,6 +14,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F4", "B7", "D2", "D3", "D4"], "rows": ["F0", "F5", "D7", "F6", "F7"] diff --git a/keyboards/keebio/quefrency/rev1/config.h b/keyboards/keebio/quefrency/rev1/config.h index 058d8b6cb53..c62ff4fef94 100644 --- a/keyboards/keebio/quefrency/rev1/config.h +++ b/keyboards/keebio/quefrency/rev1/config.h @@ -19,8 +19,3 @@ along with this program. If not, see . #pragma once #define SPLIT_HAND_PIN D2 - -/* 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/keebio/quefrency/rev1/keyboard.json b/keyboards/keebio/quefrency/rev1/keyboard.json index 6bca115e660..598fc550000 100644 --- a/keyboards/keebio/quefrency/rev1/keyboard.json +++ b/keyboards/keebio/quefrency/rev1/keyboard.json @@ -49,6 +49,12 @@ "extrakey": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/keebio/quefrency/rev4/config.h b/keyboards/keebio/quefrency/rev4/config.h index 73521bc5352..0435a34e7fb 100644 --- a/keyboards/keebio/quefrency/rev4/config.h +++ b/keyboards/keebio/quefrency/rev4/config.h @@ -18,9 +18,4 @@ along with this program. If not, see . #define SPLIT_HAND_PIN F7 -/* 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 RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) diff --git a/keyboards/keebio/quefrency/rev4/keyboard.json b/keyboards/keebio/quefrency/rev4/keyboard.json index 936502fdcfd..8cf21b4962f 100644 --- a/keyboards/keebio/quefrency/rev4/keyboard.json +++ b/keyboards/keebio/quefrency/rev4/keyboard.json @@ -63,6 +63,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/keebio/quefrency/rev5/config.h b/keyboards/keebio/quefrency/rev5/config.h index 73521bc5352..0435a34e7fb 100644 --- a/keyboards/keebio/quefrency/rev5/config.h +++ b/keyboards/keebio/quefrency/rev5/config.h @@ -18,9 +18,4 @@ along with this program. If not, see . #define SPLIT_HAND_PIN F7 -/* 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 RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) diff --git a/keyboards/keebio/quefrency/rev5/keyboard.json b/keyboards/keebio/quefrency/rev5/keyboard.json index e0fd9847720..b5f9c994af1 100644 --- a/keyboards/keebio/quefrency/rev5/keyboard.json +++ b/keyboards/keebio/quefrency/rev5/keyboard.json @@ -63,6 +63,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/keebio/rorschach/rev1/config.h b/keyboards/keebio/rorschach/rev1/config.h deleted file mode 100644 index 53c95d722d3..00000000000 --- a/keyboards/keebio/rorschach/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2018 Danny Nguyen - -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 diff --git a/keyboards/keebio/rorschach/rev1/keyboard.json b/keyboards/keebio/rorschach/rev1/keyboard.json index f7ea8fccc22..8286a791741 100644 --- a/keyboards/keebio/rorschach/rev1/keyboard.json +++ b/keyboards/keebio/rorschach/rev1/keyboard.json @@ -51,6 +51,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/sinc/rev1/config.h b/keyboards/keebio/sinc/rev1/config.h index 7ddfa79fafe..80762574abc 100644 --- a/keyboards/keebio/sinc/rev1/config.h +++ b/keyboards/keebio/sinc/rev1/config.h @@ -19,9 +19,4 @@ along with this program. If not, see . // wiring of each half #define SPLIT_HAND_PIN F7 -/* 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 RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) diff --git a/keyboards/keebio/sinc/rev1/keyboard.json b/keyboards/keebio/sinc/rev1/keyboard.json index b7774fa0edf..a026aea0079 100644 --- a/keyboards/keebio/sinc/rev1/keyboard.json +++ b/keyboards/keebio/sinc/rev1/keyboard.json @@ -14,6 +14,12 @@ "rgblight": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "B6" }, diff --git a/keyboards/keebio/sinc/rev2/config.h b/keyboards/keebio/sinc/rev2/config.h index 7ddfa79fafe..80762574abc 100644 --- a/keyboards/keebio/sinc/rev2/config.h +++ b/keyboards/keebio/sinc/rev2/config.h @@ -19,9 +19,4 @@ along with this program. If not, see . // wiring of each half #define SPLIT_HAND_PIN F7 -/* 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 RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) diff --git a/keyboards/keebio/sinc/rev2/keyboard.json b/keyboards/keebio/sinc/rev2/keyboard.json index ff5ef2667a0..77f8f3c9caf 100644 --- a/keyboards/keebio/sinc/rev2/keyboard.json +++ b/keyboards/keebio/sinc/rev2/keyboard.json @@ -14,6 +14,12 @@ "rgblight": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "B6" }, diff --git a/keyboards/keebio/tragicforce68/config.h b/keyboards/keebio/tragicforce68/config.h deleted file mode 100644 index 5070f051560..00000000000 --- a/keyboards/keebio/tragicforce68/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 diff --git a/keyboards/keebio/tragicforce68/keyboard.json b/keyboards/keebio/tragicforce68/keyboard.json index 49ada60863c..f2f27a7194a 100644 --- a/keyboards/keebio/tragicforce68/keyboard.json +++ b/keyboards/keebio/tragicforce68/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "D2", "D1", "D0", "B4", "E6", "C6", "D7", "D4"] diff --git a/keyboards/keebio/tukey/config.h b/keyboards/keebio/tukey/config.h deleted file mode 100644 index 436f111fcf8..00000000000 --- a/keyboards/keebio/tukey/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Keebio - -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 diff --git a/keyboards/keebio/tukey/keyboard.json b/keyboards/keebio/tukey/keyboard.json index 5d8bd37a282..a030f041b7b 100644 --- a/keyboards/keebio/tukey/keyboard.json +++ b/keyboards/keebio/tukey/keyboard.json @@ -39,6 +39,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["D4", "F6"] diff --git a/keyboards/keebio/viterbi/rev1/config.h b/keyboards/keebio/viterbi/rev1/config.h deleted file mode 100644 index 18b5d426e43..00000000000 --- a/keyboards/keebio/viterbi/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2017 Danny Nguyen - -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 diff --git a/keyboards/keebio/viterbi/rev1/keyboard.json b/keyboards/keebio/viterbi/rev1/keyboard.json index ebea5392486..b369066fc5f 100644 --- a/keyboards/keebio/viterbi/rev1/keyboard.json +++ b/keyboards/keebio/viterbi/rev1/keyboard.json @@ -24,6 +24,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_5x14" }, diff --git a/keyboards/keebio/viterbi/rev2/config.h b/keyboards/keebio/viterbi/rev2/config.h index 010fcffc9ba..5b609ab777e 100644 --- a/keyboards/keebio/viterbi/rev2/config.h +++ b/keyboards/keebio/viterbi/rev2/config.h @@ -18,8 +18,3 @@ along with this program. If not, see . #pragma once #define SPLIT_HAND_PIN D2 - -/* 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/keebio/viterbi/rev2/keyboard.json b/keyboards/keebio/viterbi/rev2/keyboard.json index 36570e7c7ac..599529a365a 100644 --- a/keyboards/keebio/viterbi/rev2/keyboard.json +++ b/keyboards/keebio/viterbi/rev2/keyboard.json @@ -29,6 +29,12 @@ "extrakey": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/keebio/wavelet/config.h b/keyboards/keebio/wavelet/config.h deleted file mode 100644 index 2fd8b7d4d04..00000000000 --- a/keyboards/keebio/wavelet/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert -Copyright 2018 Danny Nguyen - -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 diff --git a/keyboards/keebio/wavelet/keyboard.json b/keyboards/keebio/wavelet/keyboard.json index 7c87bcf4766..70430e0f4dc 100644 --- a/keyboards/keebio/wavelet/keyboard.json +++ b/keyboards/keebio/wavelet/keyboard.json @@ -33,6 +33,12 @@ "backlight": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x12"], "layout_aliases": { "LAYOUT_ortho_4x12": "LAYOUT" diff --git a/keyboards/keebio/wtf60/config.h b/keyboards/keebio/wtf60/config.h index 44151100a02..bd4b4d5b00f 100644 --- a/keyboards/keebio/wtf60/config.h +++ b/keyboards/keebio/wtf60/config.h @@ -17,8 +17,3 @@ along with this program. If not, see . #pragma once #define AUDIO_PIN C6 - -/* 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/keebio/wtf60/keyboard.json b/keyboards/keebio/wtf60/keyboard.json index 5ce22cc42e8..2c14740eff3 100644 --- a/keyboards/keebio/wtf60/keyboard.json +++ b/keyboards/keebio/wtf60/keyboard.json @@ -40,6 +40,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "C7", "F7", "B1", "B2", "B3", "D2", "D3", "D5", "D4", "D6", "D7"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/keebsforall/coarse60/config.h b/keyboards/keebsforall/coarse60/config.h index 9a4bf0a144d..56193d3e713 100644 --- a/keyboards/keebsforall/coarse60/config.h +++ b/keyboards/keebsforall/coarse60/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/keebsforall/coarse60/keyboard.json b/keyboards/keebsforall/coarse60/keyboard.json index d8e769914c5..776ff641c3b 100644 --- a/keyboards/keebsforall/coarse60/keyboard.json +++ b/keyboards/keebsforall/coarse60/keyboard.json @@ -19,6 +19,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "B0", "A7", "B14", "A5", "A4", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], "rows": ["A9", "A10", "B12", "A2", "C13"] diff --git a/keyboards/keebsforall/freebirdnp/lite/config.h b/keyboards/keebsforall/freebirdnp/lite/config.h deleted file mode 100644 index d1c3c23ee68..00000000000 --- a/keyboards/keebsforall/freebirdnp/lite/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 ELliot Powell - -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 diff --git a/keyboards/keebsforall/freebirdnp/lite/keyboard.json b/keyboards/keebsforall/freebirdnp/lite/keyboard.json index c27bb0e2b99..af986614269 100644 --- a/keyboards/keebsforall/freebirdnp/lite/keyboard.json +++ b/keyboards/keebsforall/freebirdnp/lite/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "B2", "B1", "B0"], "rows": ["B7", "B6", "B5", "B4", "B3"] diff --git a/keyboards/keebsforall/freebirdnp/pro/config.h b/keyboards/keebsforall/freebirdnp/pro/config.h deleted file mode 100644 index b129ce3add9..00000000000 --- a/keyboards/keebsforall/freebirdnp/pro/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Elliot Powell - -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 diff --git a/keyboards/keebsforall/freebirdnp/pro/keyboard.json b/keyboards/keebsforall/freebirdnp/pro/keyboard.json index 7ed9584f823..8eae2f89f91 100644 --- a/keyboards/keebsforall/freebirdnp/pro/keyboard.json +++ b/keyboards/keebsforall/freebirdnp/pro/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "B2", "B1", "B0"], "rows": ["D3", "B7", "B6", "B5", "B4", "B3"] diff --git a/keyboards/keebsforall/freebirdtkl/config.h b/keyboards/keebsforall/freebirdtkl/config.h deleted file mode 100644 index 5de1d62f93f..00000000000 --- a/keyboards/keebsforall/freebirdtkl/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 KnoblesseOblige - -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 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/keebsforall/freebirdtkl/keyboard.json b/keyboards/keebsforall/freebirdtkl/keyboard.json index a2c6ec426d9..37a6243beb8 100644 --- a/keyboards/keebsforall/freebirdtkl/keyboard.json +++ b/keyboards/keebsforall/freebirdtkl/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D3", "D2", "D1"], "rows": ["B2", "B1", "B0", "B3", "D5", "B7"] diff --git a/keyboards/keebwerk/nano_slider/config.h b/keyboards/keebwerk/nano_slider/config.h index b5a1f0e3e52..c3f14734d22 100644 --- a/keyboards/keebwerk/nano_slider/config.h +++ b/keyboards/keebwerk/nano_slider/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define SLIDER_PIN D4 -/* 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. diff --git a/keyboards/keebwerk/nano_slider/keyboard.json b/keyboards/keebwerk/nano_slider/keyboard.json index cc61c497d73..64f59d6c10d 100644 --- a/keyboards/keebwerk/nano_slider/keyboard.json +++ b/keyboards/keebwerk/nano_slider/keyboard.json @@ -48,6 +48,12 @@ "rgblight": true, "midi": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/keebzdotnet/fme/config.h b/keyboards/keebzdotnet/fme/config.h deleted file mode 100644 index bdd65f7f63f..00000000000 --- a/keyboards/keebzdotnet/fme/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 keebnewb - -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 diff --git a/keyboards/keebzdotnet/fme/keyboard.json b/keyboards/keebzdotnet/fme/keyboard.json index f1a352c1e5e..d7b9ebca0ca 100644 --- a/keyboards/keebzdotnet/fme/keyboard.json +++ b/keyboards/keebzdotnet/fme/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B4", "B1", "B3", "B2"], "rows": ["B6", "B5", "B7", "D2"] diff --git a/keyboards/keebzdotnet/wazowski/config.h b/keyboards/keebzdotnet/wazowski/config.h deleted file mode 100644 index a1746ba0a6a..00000000000 --- a/keyboards/keebzdotnet/wazowski/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 keebzdotnet - -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/keebzdotnet/wazowski/keyboard.json b/keyboards/keebzdotnet/wazowski/keyboard.json index 0047deeb4cd..150fa3c7900 100644 --- a/keyboards/keebzdotnet/wazowski/keyboard.json +++ b/keyboards/keebzdotnet/wazowski/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "B1", "B3", "B2", "B6"], "rows": ["F4", "F5", "F6"] diff --git a/keyboards/keyboardio/atreus/config.h b/keyboards/keyboardio/atreus/config.h deleted file mode 100644 index 5766657a6a8..00000000000 --- a/keyboards/keyboardio/atreus/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 2019, 2020 Keyboard.io, Inc - * - * 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/keyboardio/atreus/keyboard.json b/keyboards/keyboardio/atreus/keyboard.json index 4bdea354bde..5185d9ee287 100644 --- a/keyboards/keyboardio/atreus/keyboard.json +++ b/keyboards/keyboardio/atreus/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "E2", "C7", "C6", "B6", "B5", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F6", "F5", "F4", "F1"] diff --git a/keyboards/keycapsss/kimiko/rev1/config.h b/keyboards/keycapsss/kimiko/rev1/config.h index 8e44b27ace9..54441ebf9dc 100644 --- a/keyboards/keycapsss/kimiko/rev1/config.h +++ b/keyboards/keycapsss/kimiko/rev1/config.h @@ -22,8 +22,3 @@ #else #define RGBLIGHT_LIMIT_VAL 80 #endif - -/* 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/keycapsss/kimiko/rev1/keyboard.json b/keyboards/keycapsss/kimiko/rev1/keyboard.json index 1a7f62b2c8f..81427517bd6 100644 --- a/keyboards/keycapsss/kimiko/rev1/keyboard.json +++ b/keyboards/keycapsss/kimiko/rev1/keyboard.json @@ -12,6 +12,12 @@ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "encoder": { "rotary": [ diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h deleted file mode 100644 index 7bc78f68d69..00000000000 --- a/keyboards/keycapsss/o4l_5x12/config.h +++ /dev/null @@ -1,22 +0,0 @@ -#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/keycapsss/o4l_5x12/keyboard.json b/keyboards/keycapsss/o4l_5x12/keyboard.json index 8816155fcca..d83bc58795b 100644 --- a/keyboards/keycapsss/o4l_5x12/keyboard.json +++ b/keyboards/keycapsss/o4l_5x12/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "F6", "F5", "F4"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/keygem/kg60ansi/config.h b/keyboards/keygem/kg60ansi/config.h deleted file mode 100644 index 13c17d597d1..00000000000 --- a/keyboards/keygem/kg60ansi/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2022 - -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/keygem/kg60ansi/keyboard.json b/keyboards/keygem/kg60ansi/keyboard.json index ea6353516bd..585aec170bb 100644 --- a/keyboards/keygem/kg60ansi/keyboard.json +++ b/keyboards/keygem/kg60ansi/keyboard.json @@ -46,6 +46,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/keygem/kg65rgbv2/config.h b/keyboards/keygem/kg65rgbv2/config.h deleted file mode 100644 index 13c17d597d1..00000000000 --- a/keyboards/keygem/kg65rgbv2/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2022 - -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/keygem/kg65rgbv2/keyboard.json b/keyboards/keygem/kg65rgbv2/keyboard.json index c6738f1e606..da9e8cbf916 100644 --- a/keyboards/keygem/kg65rgbv2/keyboard.json +++ b/keyboards/keygem/kg65rgbv2/keyboard.json @@ -46,6 +46,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h deleted file mode 100644 index 37867c3cd14..00000000000 --- a/keyboards/keyhive/absinthe/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 cfbender - -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 diff --git a/keyboards/keyhive/absinthe/keyboard.json b/keyboards/keyhive/absinthe/keyboard.json index 2a58178bf16..82a5ae5631b 100644 --- a/keyboards/keyhive/absinthe/keyboard.json +++ b/keyboards/keyhive/absinthe/keyboard.json @@ -33,6 +33,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D3", "D0"], "rows": ["D2", "D1", "B6", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h deleted file mode 100644 index 39eec86786a..00000000000 --- a/keyboards/keyhive/ergosaurus/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 cfbender - -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/keyhive/ergosaurus/keyboard.json b/keyboards/keyhive/ergosaurus/keyboard.json index bce4b9d0fec..9a4810a9a57 100644 --- a/keyboards/keyhive/ergosaurus/keyboard.json +++ b/keyboards/keyhive/ergosaurus/keyboard.json @@ -31,6 +31,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "C6", "D0", "D1", "F7", "B1", "B3", "B2"], "rows": ["B5", "B4", "E6", "D4", "F6", "D3", "D2", "F4", "F5"] diff --git a/keyboards/keyhive/lattice60/config.h b/keyboards/keyhive/lattice60/config.h deleted file mode 100644 index bf9e7337c2b..00000000000 --- a/keyboards/keyhive/lattice60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ethan Durrant (emdarcher) - -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/keyhive/lattice60/keyboard.json b/keyboards/keyhive/lattice60/keyboard.json index 4afdd839d00..b805a73357a 100644 --- a/keyboards/keyhive/lattice60/keyboard.json +++ b/keyboards/keyhive/lattice60/keyboard.json @@ -20,6 +20,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["60_hhkb"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h deleted file mode 100644 index 26e1d21dc4f..00000000000 --- a/keyboards/keyhive/maypad/config.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2019 codybender -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/keyhive/maypad/keyboard.json b/keyboards/keyhive/maypad/keyboard.json index c4c39b0eddf..d0dad2b6cf3 100644 --- a/keyboards/keyhive/maypad/keyboard.json +++ b/keyboards/keyhive/maypad/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/keyhive/navi10/rev0/config.h b/keyboards/keyhive/navi10/rev0/config.h deleted file mode 100644 index 2e0110934bb..00000000000 --- a/keyboards/keyhive/navi10/rev0/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2019 Ethan Durrant (emdarcher) - -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 - diff --git a/keyboards/keyhive/navi10/rev0/keyboard.json b/keyboards/keyhive/navi10/rev0/keyboard.json index 092c2343ab5..ab0e63ef1e8 100644 --- a/keyboards/keyhive/navi10/rev0/keyboard.json +++ b/keyboards/keyhive/navi10/rev0/keyboard.json @@ -16,6 +16,12 @@ "console": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keyhive/navi10/rev2/config.h b/keyboards/keyhive/navi10/rev2/config.h deleted file mode 100644 index 2e0110934bb..00000000000 --- a/keyboards/keyhive/navi10/rev2/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2019 Ethan Durrant (emdarcher) - -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 - diff --git a/keyboards/keyhive/navi10/rev2/keyboard.json b/keyboards/keyhive/navi10/rev2/keyboard.json index 2c7b9972dfa..ac5148b7870 100644 --- a/keyboards/keyhive/navi10/rev2/keyboard.json +++ b/keyboards/keyhive/navi10/rev2/keyboard.json @@ -16,6 +16,12 @@ "console": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keyhive/navi10/rev3/config.h b/keyboards/keyhive/navi10/rev3/config.h deleted file mode 100644 index 2e0110934bb..00000000000 --- a/keyboards/keyhive/navi10/rev3/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2019 Ethan Durrant (emdarcher) - -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 - diff --git a/keyboards/keyhive/navi10/rev3/keyboard.json b/keyboards/keyhive/navi10/rev3/keyboard.json index 5e1b27f7ce9..9f403a35139 100644 --- a/keyboards/keyhive/navi10/rev3/keyboard.json +++ b/keyboards/keyhive/navi10/rev3/keyboard.json @@ -16,6 +16,12 @@ "console": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keyhive/opus/config.h b/keyboards/keyhive/opus/config.h deleted file mode 100644 index ae2fa676f6a..00000000000 --- a/keyboards/keyhive/opus/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 rtwayland - * - * 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 diff --git a/keyboards/keyhive/opus/keyboard.json b/keyboards/keyhive/opus/keyboard.json index 252958c0b98..e92c8604ced 100644 --- a/keyboards/keyhive/opus/keyboard.json +++ b/keyboards/keyhive/opus/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7"], "rows": ["B1", "B3", "B2", "B6"] diff --git a/keyboards/keyhive/southpole/config.h b/keyboards/keyhive/southpole/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/keyhive/southpole/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/keyhive/southpole/keyboard.json b/keyboards/keyhive/southpole/keyboard.json index aea03ffc60b..71366758810 100644 --- a/keyboards/keyhive/southpole/keyboard.json +++ b/keyboards/keyhive/southpole/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "E6"], "rows": ["D2", "D3", "C6", "C7", "D5"] diff --git a/keyboards/keyhive/ut472/config.h b/keyboards/keyhive/ut472/config.h deleted file mode 100644 index 8dd82d2464c..00000000000 --- a/keyboards/keyhive/ut472/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2018 Carlos Filoteo - -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 diff --git a/keyboards/keyhive/ut472/keyboard.json b/keyboards/keyhive/ut472/keyboard.json index 340e5210742..828058a9554 100644 --- a/keyboards/keyhive/ut472/keyboard.json +++ b/keyboards/keyhive/ut472/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C4", "C5", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5"], "rows": ["D1", "D2", "D3", "D4"] diff --git a/keyboards/keyprez/bison/config.h b/keyboards/keyprez/bison/config.h deleted file mode 100644 index c4bb34279d0..00000000000 --- a/keyboards/keyprez/bison/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 csandven - -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/keyprez/bison/keyboard.json b/keyboards/keyprez/bison/keyboard.json index 462b9d4274c..dd35c3c5034 100644 --- a/keyboards/keyprez/bison/keyboard.json +++ b/keyboards/keyprez/bison/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "E6", "B2", "B4", "D4", "F6", "F5", "F4"], "rows": ["D2", "F7", "B1", "B3", "D7"] diff --git a/keyboards/keyprez/corgi/config.h b/keyboards/keyprez/corgi/config.h deleted file mode 100644 index b04e4a036e2..00000000000 --- a/keyboards/keyprez/corgi/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Christian Sandven - -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 diff --git a/keyboards/keyprez/corgi/keyboard.json b/keyboards/keyprez/corgi/keyboard.json index 07962899c4e..8e664de03db 100644 --- a/keyboards/keyprez/corgi/keyboard.json +++ b/keyboards/keyprez/corgi/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6", "D2", "B7"], "rows": ["F5", "F7", "B2", "B6", "F4", "F6", "B1", "B3"] diff --git a/keyboards/keyprez/rhino/config.h b/keyboards/keyprez/rhino/config.h index ce59f90c355..738dabf7006 100644 --- a/keyboards/keyprez/rhino/config.h +++ b/keyboards/keyprez/rhino/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define AUDIO_PIN C6 #define MUSIC_MAP -/* 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. diff --git a/keyboards/keyprez/rhino/keyboard.json b/keyboards/keyprez/rhino/keyboard.json index 4f334e8fcfa..75854f6f997 100644 --- a/keyboards/keyprez/rhino/keyboard.json +++ b/keyboards/keyprez/rhino/keyboard.json @@ -18,6 +18,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D2", "D4", "D7", "E6", "B4", "B5"], "rows": ["B3", "B2", "B6", "B1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/keyprez/unicorn/config.h b/keyboards/keyprez/unicorn/config.h index 76a88901084..d01d3b80e97 100644 --- a/keyboards/keyprez/unicorn/config.h +++ b/keyboards/keyprez/unicorn/config.h @@ -5,11 +5,6 @@ #define MASTER_RIGHT -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/keyprez/unicorn/keyboard.json b/keyboards/keyprez/unicorn/keyboard.json index 56061290ea7..238560321d1 100644 --- a/keyboards/keyprez/unicorn/keyboard.json +++ b/keyboards/keyprez/unicorn/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "B2", "B5", "D7", "B4", "B6", "E6", "D4"], "rows": ["F4", "D3", "F6", "F7", "B1", "B3"] diff --git a/keyboards/keysofkings/twokey/config.h b/keyboards/keysofkings/twokey/config.h index c2f47d2d8e7..adab9c3ed4a 100755 --- a/keyboards/keysofkings/twokey/config.h +++ b/keyboards/keysofkings/twokey/config.h @@ -16,12 +16,6 @@ #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 AUDIO_PIN B6 #define AUDIO_CLICKY diff --git a/keyboards/keysofkings/twokey/keyboard.json b/keyboards/keysofkings/twokey/keyboard.json index 5f9a84e58ba..2b75891329a 100644 --- a/keyboards/keysofkings/twokey/keyboard.json +++ b/keyboards/keysofkings/twokey/keyboard.json @@ -40,6 +40,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "B2"], "rows": ["B4", "B5"] diff --git a/keyboards/keystonecaps/gameroyadvance/config.h b/keyboards/keystonecaps/gameroyadvance/config.h deleted file mode 100644 index f3286df1230..00000000000 --- a/keyboards/keystonecaps/gameroyadvance/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2022 @RoyMeetsWorld - -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 diff --git a/keyboards/keystonecaps/gameroyadvance/keyboard.json b/keyboards/keystonecaps/gameroyadvance/keyboard.json index 89b30fe4d80..5a1d9f49210 100644 --- a/keyboards/keystonecaps/gameroyadvance/keyboard.json +++ b/keyboards/keystonecaps/gameroyadvance/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "D0", "D1", "C6", "D7", "E6", "F4", "B2", "B6"], "rows": ["F5", "F6", "F7", "B1", "B3"] From e659c3dae9c50293a1483190db07601a83b73fef Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 24 May 2024 04:21:39 +1000 Subject: [PATCH 318/333] Remove some useless code from keymaps (#23787) --- .../half_n_half/keymaps/default/keymap.c | 28 --------------- .../i75/keymaps/default/keymap.c | 28 --------------- keyboards/ai03/lunar/keymaps/default/keymap.c | 6 ---- keyboards/ai03/soyuz/keymaps/1U/keymap.c | 3 -- .../cu24/keymaps/default/keymap.c | 4 --- .../ckeys/obelus/keymaps/default/keymap.c | 4 --- .../ckeys/thedora/keymaps/default/keymap.c | 4 --- .../keymaps/default/keymap.c | 6 ---- .../wraith/keymaps/default/keymap.c | 6 ---- keyboards/do60/keymaps/test/keymap.c | 5 --- .../edi/standaside/keymaps/default/keymap.c | 5 --- keyboards/ep/96/keymaps/default/keymap.c | 28 --------------- keyboards/ergodox_ez/util/compile_keymap.py | 5 --- .../e6v2/le_bmc/keymaps/default/keymap.c | 28 --------------- .../e6v2/oe_bmc/keymaps/default/keymap.c | 28 --------------- .../downbubble/keymaps/default/keymap.c | 28 --------------- keyboards/ft/mars80/keymaps/default/keymap.c | 28 --------------- .../gboards/gergo/keymaps/colemak/keymap.c | 5 --- .../space65/keymaps/default/keymap.c | 28 --------------- .../keymaps/default_tapdance/keymap.c | 14 -------- .../dactyl/keymaps/erincalling/keymap.c | 9 ----- .../dactyl_left/keymaps/default/keymap.c | 25 ------------- .../dactylmacropad/keymaps/default/keymap.c | 2 -- .../hacked_motospeed/keymaps/default/keymap.c | 28 --------------- .../handwired/jn68m/keymaps/default/keymap.c | 28 --------------- .../keymaps/default/keymap.c | 12 ------- .../owlet60/keymaps/default/keymap.c | 28 --------------- .../owlet60/keymaps/oled_testing/keymap.c | 28 --------------- .../prime_exl/keymaps/default/keymap.c | 28 --------------- .../videowriter/keymaps/default/keymap.c | 34 ------------------ .../videowriter/keymaps/oleg/keymap.c | 25 ------------- keyboards/hineybush/h87a/keymaps/wkl/keymap.c | 12 ------- keyboards/hineybush/h88/keymaps/wkl/keymap.c | 13 ------- .../hineybush/hbcp/keymaps/default/keymap.c | 28 --------------- keyboards/hineybush/hbcp/keymaps/wkl/keymap.c | 36 ------------------- .../hineyg80/keymaps/default/keymap.c | 6 ---- .../hineybush/hineyg80/keymaps/wkl/keymap.c | 2 -- .../hineybush/sm68/keymaps/default/keymap.c | 6 ---- .../hs60/v2/iso/keymaps/iso_andys8/keymap.c | 12 ------- .../hs60/v2/iso/keymaps/win_osx_dual/keymap.c | 10 ------ .../keymaps/input_club/keymap.c | 6 ---- .../kbd67/hotswap/keymaps/default/keymap.c | 28 --------------- .../kbd67/rev2/keymaps/default/keymap.c | 28 --------------- .../keymaps/hhkb-default-improved/keymap.c | 14 -------- .../kbd6x/keymaps/hhkb-default/keymap.c | 15 -------- .../ergodicity/keymaps/default/keymap.c | 28 --------------- .../launchpad/keymaps/default_rgb/keymap.c | 2 -- .../mechkeys/mk60/keymaps/default/keymap.c | 28 --------------- keyboards/molecule/keymaps/default/keymap.c | 6 ---- keyboards/panc60/keymaps/default/keymap.c | 28 --------------- .../primekb/prime_o/keymaps/default/keymap.c | 28 --------------- .../quantrik/kyuu/keymaps/default/keymap.c | 9 ----- .../rabbit/rabbit68/keymaps/default/keymap.c | 4 --- .../rabbit/rabbit68/keymaps/kaiec/keymap.c | 4 --- .../katana60/rev2/keymaps/default/keymap.c | 6 ---- .../keymaps/default_with_nafuda/keymap.c | 5 --- .../keymaps/default_with_setta21/keymap.c | 4 --- .../keymaps/default_with_nafuda/keymap.c | 4 --- .../keymaps/default_with_setta21/keymap.c | 4 --- .../keymaps/default_with_setta21/keymap.c | 4 --- keyboards/sck/neiso/keymaps/default/keymap.c | 12 ++----- .../sentraq/s65_plus/keymaps/default/keymap.c | 4 --- .../sentraq/s65_plus/keymaps/iso/keymap.c | 4 --- .../silverbullet44/keymaps/default/keymap.c | 5 --- .../hecomi/keymaps/default/keymap.c | 28 --------------- .../otaku_split/rev0/keymaps/default/keymap.c | 5 --- .../treasure/type9/keymaps/default/keymap.c | 28 --------------- keyboards/xiudi/xd87/keymaps/default/keymap.c | 30 ---------------- .../xd87/keymaps/default_underglow/keymap.c | 29 --------------- .../yushakobo/quick7/keymaps/default/keymap.c | 3 -- .../yushakobo/quick7/keymaps/via/keymap.c | 3 -- 71 files changed, 3 insertions(+), 1066 deletions(-) diff --git a/keyboards/40percentclub/half_n_half/keymaps/default/keymap.c b/keyboards/40percentclub/half_n_half/keymaps/default/keymap.c index 73d40abd489..5410a9b8d57 100644 --- a/keyboards/40percentclub/half_n_half/keymaps/default/keymap.c +++ b/keyboards/40percentclub/half_n_half/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* Base */ QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCTL, KC_RCTL, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, @@ -29,25 +23,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_SPC, KC_SPC ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/40percentclub/i75/keymaps/default/keymap.c b/keyboards/40percentclub/i75/keymaps/default/keymap.c index e070c2e7d85..e39887dd068 100644 --- a/keyboards/40percentclub/i75/keymaps/default/keymap.c +++ b/keyboards/40percentclub/i75/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_ortho_5x15( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, @@ -30,25 +24,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/ai03/lunar/keymaps/default/keymap.c b/keyboards/ai03/lunar/keymaps/default/keymap.c index e7362da8773..2668ff759d4 100644 --- a/keyboards/ai03/lunar/keymaps/default/keymap.c +++ b/keyboards/ai03/lunar/keymaps/default/keymap.c @@ -59,18 +59,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case MANUAL: if (record->event.pressed) { - // when keycode QMKBEST is pressed SEND_STRING("https://kb.ai03.me/redir/lunar/index.html"); - } else { - // when keycode QMKBEST is released } break; case SWPLURL: if (record->event.pressed) { - // when keycode QMKURL is pressed SEND_STRING("https://switchplate.co/collections/lunar-group-buy"); - } else { - // when keycode QMKURL is released } break; } diff --git a/keyboards/ai03/soyuz/keymaps/1U/keymap.c b/keyboards/ai03/soyuz/keymaps/1U/keymap.c index 792457cf107..a473231ab8d 100644 --- a/keyboards/ai03/soyuz/keymaps/1U/keymap.c +++ b/keyboards/ai03/soyuz/keymaps/1U/keymap.c @@ -34,10 +34,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case DBLZERO: if (record->event.pressed) { - // when keycode QMKBEST is pressed SEND_STRING("00"); - } else { - // when keycode QMKBEST is released } break; } diff --git a/keyboards/capsunlocked/cu24/keymaps/default/keymap.c b/keyboards/capsunlocked/cu24/keymaps/default/keymap.c index 7877229a37c..8e3078601fc 100644 --- a/keyboards/capsunlocked/cu24/keymaps/default/keymap.c +++ b/keyboards/capsunlocked/cu24/keymaps/default/keymap.c @@ -34,7 +34,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, QK_BOOT , KC_TRNS ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} diff --git a/keyboards/ckeys/obelus/keymaps/default/keymap.c b/keyboards/ckeys/obelus/keymaps/default/keymap.c index 4ee9a5f7101..b02b240c201 100644 --- a/keyboards/ckeys/obelus/keymaps/default/keymap.c +++ b/keyboards/ckeys/obelus/keymaps/default/keymap.c @@ -105,7 +105,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MU_TOGG, MU_NEXT, XXXXXXX, TO(0) ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} diff --git a/keyboards/ckeys/thedora/keymaps/default/keymap.c b/keyboards/ckeys/thedora/keymaps/default/keymap.c index 96b83b1c469..9c0d7565622 100755 --- a/keyboards/ckeys/thedora/keymaps/default/keymap.c +++ b/keyboards/ckeys/thedora/keymaps/default/keymap.c @@ -156,10 +156,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -}; - bool encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { /* First encoder */ if (clockwise) { diff --git a/keyboards/converter/numeric_keypad_iie/keymaps/default/keymap.c b/keyboards/converter/numeric_keypad_iie/keymaps/default/keymap.c index a8b8f568ffc..4f2b887dda7 100644 --- a/keyboards/converter/numeric_keypad_iie/keymaps/default/keymap.c +++ b/keyboards/converter/numeric_keypad_iie/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* +-------+ +-------+-------+-------+ +-------+-------+ diff --git a/keyboards/cutie_club/wraith/keymaps/default/keymap.c b/keyboards/cutie_club/wraith/keymaps/default/keymap.c index 60477c58d28..7759bb6e469 100644 --- a/keyboards/cutie_club/wraith/keymaps/default/keymap.c +++ b/keyboards/cutie_club/wraith/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( 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_F12, KC_PSCR, MO(1), diff --git a/keyboards/do60/keymaps/test/keymap.c b/keyboards/do60/keymaps/test/keymap.c index 6cb1e970832..5f1022e288e 100644 --- a/keyboards/do60/keymaps/test/keymap.c +++ b/keyboards/do60/keymaps/test/keymap.c @@ -20,8 +20,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC,KC_SPC, KC_DEL, KC_RGUI, MO(1), KC_HOME, KC_PGDN, KC_END), }; - -// Loop -void matrix_scan_user(void) { - // Empty -}; diff --git a/keyboards/edi/standaside/keymaps/default/keymap.c b/keyboards/edi/standaside/keymaps/default/keymap.c index d18606b94b7..1d3663e021f 100644 --- a/keyboards/edi/standaside/keymaps/default/keymap.c +++ b/keyboards/edi/standaside/keymaps/default/keymap.c @@ -70,8 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; - - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} \ No newline at end of file diff --git a/keyboards/ep/96/keymaps/default/keymap.c b/keyboards/ep/96/keymaps/default/keymap.c index c5d35ac70fe..22e72e380ee 100644 --- a/keyboards/ep/96/keymaps/default/keymap.c +++ b/keyboards/ep/96/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* Base */ 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_F12, KC_PSCR, KC_DEL, KC_HOME, KC_END, KC_PGUP, KC_PGDN, @@ -31,25 +25,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/ergodox_ez/util/compile_keymap.py b/keyboards/ergodox_ez/util/compile_keymap.py index 310512c920e..eea53971430 100755 --- a/keyboards/ergodox_ez/util/compile_keymap.py +++ b/keyboards/ergodox_ez/util/compile_keymap.py @@ -431,11 +431,6 @@ def parse_keymaps(config, valid_keycodes): # keymap.c output USERCODE = """ -// Runs just one time when the keyboard initializes. -void matrix_init_user(void) { - -}; - // Runs constantly in the background, in a loop. void matrix_scan_user(void) { uint8_t layer = get_highest_layer(layer_state); diff --git a/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c b/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c index 4d28618091c..c5f43bab54e 100644 --- a/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c +++ b/keyboards/exclusive/e6v2/le_bmc/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_60_ansi( QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, @@ -38,25 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c b/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c index 4d28618091c..c5f43bab54e 100644 --- a/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c +++ b/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_60_ansi( QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, @@ -38,25 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/flehrad/downbubble/keymaps/default/keymap.c b/keyboards/flehrad/downbubble/keymaps/default/keymap.c index 2b02e9d7f6f..15bab5a6946 100644 --- a/keyboards/flehrad/downbubble/keymaps/default/keymap.c +++ b/keyboards/flehrad/downbubble/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_standard( 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_F12, KC_PSCR, KC_NUM, KC_HOME, KC_TRNS, @@ -67,25 +61,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC, KC_SPC, KC_P0, KC_TRNS, KC_PDOT, KC_TRNS, KC_BSPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/ft/mars80/keymaps/default/keymap.c b/keyboards/ft/mars80/keymaps/default/keymap.c index d489aefb578..04fb322921a 100644 --- a/keyboards/ft/mars80/keymaps/default/keymap.c +++ b/keyboards/ft/mars80/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_tkl_ansi( 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_F12, KC_PSCR, KC_SCRL, KC_BRK, @@ -39,25 +33,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/gboards/gergo/keymaps/colemak/keymap.c b/keyboards/gboards/gergo/keymaps/colemak/keymap.c index 39bafc5e31b..07835788047 100644 --- a/keyboards/gboards/gergo/keymaps/colemak/keymap.c +++ b/keyboards/gboards/gergo/keymaps/colemak/keymap.c @@ -138,11 +138,6 @@ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, K KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), */ -// Runs just one time when the keyboard initializes. -void matrix_init_user(void) { - -}; - // Runs constantly in the background, in a loop. void matrix_scan_user(void) { //uint8_t layer = get_highest_layer(layer_state); diff --git a/keyboards/gray_studio/space65/keymaps/default/keymap.c b/keyboards/gray_studio/space65/keymaps/default/keymap.c index 8d51b3e4db6..c32f3f3db73 100644 --- a/keyboards/gray_studio/space65/keymaps/default/keymap.c +++ b/keyboards/gray_studio/space65/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - 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, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL, @@ -37,25 +31,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/handwired/2x5keypad/keymaps/default_tapdance/keymap.c b/keyboards/handwired/2x5keypad/keymaps/default_tapdance/keymap.c index 945613f9873..9fddc59cd75 100644 --- a/keyboards/handwired/2x5keypad/keymaps/default_tapdance/keymap.c +++ b/keyboards/handwired/2x5keypad/keymaps/default_tapdance/keymap.c @@ -119,20 +119,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, TD(A_Y), TD(I_I), TD(O_C), TD(U_U)) }; - -/* DISABLED -void matrix_init_user(void) { -} - -void matrix_scan_user(void) { -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} -*/ - - void matrix_init_user(void) { set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE); /* See https://jayliu50.github.io/qmk-cheatsheet/ */ diff --git a/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c b/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c index 1c4bdfd5ee0..d25bd6acd4e 100644 --- a/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c +++ b/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c @@ -149,12 +149,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } - -// Runs just one time when the keyboard initializes. -void matrix_init_user(void) { - -}; - - -// Runs constantly in the background, in a loop. -void matrix_scan_user(void) {}; diff --git a/keyboards/handwired/dactyl_left/keymaps/default/keymap.c b/keyboards/handwired/dactyl_left/keymaps/default/keymap.c index 631a979efd4..0e5abb0b602 100644 --- a/keyboards/handwired/dactyl_left/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_left/keymaps/default/keymap.c @@ -15,9 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { QMKBEST = SAFE_RANGE, QMKURL }; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT(/* Base */ KC_SPC, KC_1, KC_2, KC_3, KC_4, KC_5, @@ -27,25 +24,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/handwired/dactylmacropad/keymaps/default/keymap.c b/keyboards/handwired/dactylmacropad/keymaps/default/keymap.c index 468d9449352..65c7f445b77 100644 --- a/keyboards/handwired/dactylmacropad/keymaps/default/keymap.c +++ b/keyboards/handwired/dactylmacropad/keymaps/default/keymap.c @@ -87,8 +87,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { // creates pivot table in excel SEND_STRING(SS_LALT("nvt")); - } else { - // when keycode QMKBEST is released } break; case snap: diff --git a/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c b/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c index 28721c6b7d5..9739863cef1 100644 --- a/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c +++ b/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* Base */ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, @@ -29,25 +23,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, KC_BSPC, KC_ENT, KC_SPC, KC_LSFT, KC_LCTL, KC_LALT, KC_ALGR, KC_LWIN, XXXXXXX ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/handwired/jn68m/keymaps/default/keymap.c b/keyboards/handwired/jn68m/keymaps/default/keymap.c index 9665a74026a..71944964ac9 100644 --- a/keyboards/handwired/jn68m/keymaps/default/keymap.c +++ b/keyboards/handwired/jn68m/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( QK_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_INS, KC_PGUP, @@ -39,25 +33,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/handwired/mechboards_micropad/keymaps/default/keymap.c b/keyboards/handwired/mechboards_micropad/keymaps/default/keymap.c index fa0c8e97af4..69bd7ec877a 100644 --- a/keyboards/handwired/mechboards_micropad/keymaps/default/keymap.c +++ b/keyboards/handwired/mechboards_micropad/keymaps/default/keymap.c @@ -35,35 +35,23 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case MECHBOARDURL: if (record->event.pressed) { - // when keycode QMKBEST is pressed SEND_STRING("https://mechboards.co.uk/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKBEST is released } break; case QMKURL: if (record->event.pressed) { - // when keycode QMKURL is pressed SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released } break; case MKUK: if (record->event.pressed) { - // when keycode QMKURL is pressed SEND_STRING("MKUK4 was amazing!"); - } else { - // when keycode QMKURL is released } break; case LEDCHANGE: if (record->event.pressed) { - // when keycode QMKURL is pressed led_state = !led_state; writePin(F6, led_state); - } else { - // when keycode QMKURL is released } break; } diff --git a/keyboards/handwired/owlet60/keymaps/default/keymap.c b/keyboards/handwired/owlet60/keymaps/default/keymap.c index 5df0b9fbd9f..b0924eb0552 100644 --- a/keyboards/handwired/owlet60/keymaps/default/keymap.c +++ b/keyboards/handwired/owlet60/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_owlet60_full_bsp( KC_1, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, @@ -38,25 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c b/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c index f54ceb44910..4531a3c3f63 100644 --- a/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c +++ b/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_owlet60_full_bsp( KC_1, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, @@ -39,28 +33,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} - #ifdef OLED_ENABLE oled_rotation_t oled_init_user(oled_rotation_t rotation) { //return OLED_ROTATION_180; diff --git a/keyboards/handwired/prime_exl/keymaps/default/keymap.c b/keyboards/handwired/prime_exl/keymaps/default/keymap.c index 260b8877043..ed3da63a150 100644 --- a/keyboards/handwired/prime_exl/keymaps/default/keymap.c +++ b/keyboards/handwired/prime_exl/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_NUM, KC_LPRN, KC_RPRN, KC_PSLS, KC_PAST, KC_BSPC, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, @@ -72,28 +66,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} - bool led_update_user(led_t led_state) { writePin(NUM_LOCK_LED_PIN, led_state.num_lock); writePin(CAPS_LOCK_LED_PIN, led_state.caps_lock); diff --git a/keyboards/handwired/videowriter/keymaps/default/keymap.c b/keyboards/handwired/videowriter/keymaps/default/keymap.c index 7bdf45e7aba..d1c9e26655c 100644 --- a/keyboards/handwired/videowriter/keymaps/default/keymap.c +++ b/keyboards/handwired/videowriter/keymaps/default/keymap.c @@ -21,14 +21,6 @@ enum layer_names { _FN1 }; -// Example of custom keycodes used by macros in process_record_user -/* -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - */ - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * ,---------------------------------------------------------------------------------------. @@ -79,29 +71,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______ ) }; - -/* macros template (example) -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/\n"); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} - -*/ - diff --git a/keyboards/handwired/videowriter/keymaps/oleg/keymap.c b/keyboards/handwired/videowriter/keymaps/oleg/keymap.c index db6b843e6ad..e9adc11ad7b 100644 --- a/keyboards/handwired/videowriter/keymaps/oleg/keymap.c +++ b/keyboards/handwired/videowriter/keymaps/oleg/keymap.c @@ -21,14 +21,6 @@ enum layer_names { _FN1 }; -// Example of custom keycodes used by macros in process_record_user -/* -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - */ - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* @@ -85,23 +77,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -/* macros template (example) -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case USECT: - if (record->event.pressed) { - // when keycode USECT is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode USECT is released - } - break; - } - return true; -} -*/ - - void matrix_init_user(void) { set_unicode_input_mode(UNICODE_MODE_WINDOWS); } diff --git a/keyboards/hineybush/h87a/keymaps/wkl/keymap.c b/keyboards/hineybush/h87a/keymaps/wkl/keymap.c index f83b8a5f226..c11a96dee7e 100644 --- a/keyboards/hineybush/h87a/keymaps/wkl/keymap.c +++ b/keyboards/hineybush/h87a/keymaps/wkl/keymap.c @@ -34,15 +34,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; - -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} diff --git a/keyboards/hineybush/h88/keymaps/wkl/keymap.c b/keyboards/hineybush/h88/keymaps/wkl/keymap.c index 2a40a244ac8..2e6385d425d 100644 --- a/keyboards/hineybush/h88/keymaps/wkl/keymap.c +++ b/keyboards/hineybush/h88/keymaps/wkl/keymap.c @@ -34,16 +34,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; - -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} - diff --git a/keyboards/hineybush/hbcp/keymaps/default/keymap.c b/keyboards/hineybush/hbcp/keymaps/default/keymap.c index c1240a3f12a..4b1e63a5935 100644 --- a/keyboards/hineybush/hbcp/keymaps/default/keymap.c +++ b/keyboards/hineybush/hbcp/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( /* Base */ @@ -43,25 +37,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/hineybush/hbcp/keymaps/wkl/keymap.c b/keyboards/hineybush/hbcp/keymaps/wkl/keymap.c index 7015080edb7..d26e9f2c3c8 100644 --- a/keyboards/hineybush/hbcp/keymaps/wkl/keymap.c +++ b/keyboards/hineybush/hbcp/keymaps/wkl/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_wkl( /* Base */ @@ -43,33 +37,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} - -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} diff --git a/keyboards/hineybush/hineyg80/keymaps/default/keymap.c b/keyboards/hineybush/hineyg80/keymaps/default/keymap.c index cd43aaf9ccd..b5312ef7516 100644 --- a/keyboards/hineybush/hineyg80/keymaps/default/keymap.c +++ b/keyboards/hineybush/hineyg80/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL, -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_ansi_100u_mods( /* Base */ 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_F12, KC_INS, KC_HOME, KC_PGUP, KC_PSCR, diff --git a/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c b/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c index ab5836fc2d8..c7109dfd849 100644 --- a/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c +++ b/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c @@ -17,8 +17,6 @@ // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL, ______ = KC_TRNS, XXXXXX = KC_NO }; diff --git a/keyboards/hineybush/sm68/keymaps/default/keymap.c b/keyboards/hineybush/sm68/keymaps/default/keymap.c index 4e552cd5826..3afc33fa108 100644 --- a/keyboards/hineybush/sm68/keymaps/default/keymap.c +++ b/keyboards/hineybush/sm68/keymaps/default/keymap.c @@ -37,9 +37,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} - - diff --git a/keyboards/hs60/v2/iso/keymaps/iso_andys8/keymap.c b/keyboards/hs60/v2/iso/keymaps/iso_andys8/keymap.c index 3b3ac052e55..5044d56d43f 100644 --- a/keyboards/hs60/v2/iso/keymaps/iso_andys8/keymap.c +++ b/keyboards/hs60/v2/iso/keymaps/iso_andys8/keymap.c @@ -47,15 +47,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; - -void matrix_init_user(void) { - //user initialization -} - -void matrix_scan_user(void) { - //user matrix -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} \ No newline at end of file diff --git a/keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c b/keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c index 40ba530163e..ab65671d407 100644 --- a/keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c +++ b/keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c @@ -69,16 +69,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -void matrix_init_user(void) { - //user initialization -} - - -void matrix_scan_user(void) { - //user matrix -} - - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: diff --git a/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c index 17ff9d615d8..7276c44394b 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c +++ b/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c @@ -214,12 +214,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -// Runs just one time when the keyboard initializes. -void matrix_init_user(void) { - -}; - - // Runs constantly in the background, in a loop. void matrix_scan_user(void) { diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/default/keymap.c index 08166a99ad1..cebb731e086 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/default/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - 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, KC_EQL, KC_BSLS, KC_DEL, KC_HOME, @@ -36,25 +30,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/default/keymap.c index 21ff6843b3d..50a8bdfee08 100644 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/default/keymap.c +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap (Base Layer) Default Layer * ,----------------------------------------------------------------. @@ -63,25 +57,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______,_______,_______,KC_HOME,KC_PGDN, KC_END), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/keymap.c index 99c65a6ab39..b9e815b142d 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/keymap.c +++ b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default-improved/keymap.c @@ -34,17 +34,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; - - -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} - diff --git a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/keymap.c index 4e021993a81..d8bcf4b729a 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/keymap.c +++ b/keyboards/kbdfans/kbd6x/keymaps/hhkb-default/keymap.c @@ -34,18 +34,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; - - - -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} - diff --git a/keyboards/keebio/ergodicity/keymaps/default/keymap.c b/keyboards/keebio/ergodicity/keymaps/default/keymap.c index 0bb07cbb150..d38b2cb6ec7 100644 --- a/keyboards/keebio/ergodicity/keymaps/default/keymap.c +++ b/keyboards/keebio/ergodicity/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, @@ -37,25 +31,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______ ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c b/keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c index 69fb3ce5613..61d5d9532e9 100644 --- a/keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c +++ b/keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c @@ -74,5 +74,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -void matrix_init_user(void) {} diff --git a/keyboards/mechkeys/mk60/keymaps/default/keymap.c b/keyboards/mechkeys/mk60/keymaps/default/keymap.c index a917b7ce5c7..d844051d70e 100644 --- a/keyboards/mechkeys/mk60/keymaps/default/keymap.c +++ b/keyboards/mechkeys/mk60/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - 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, KC_EQL, KC_BSPC, KC_INS, @@ -38,25 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/molecule/keymaps/default/keymap.c b/keyboards/molecule/keymaps/default/keymap.c index bceed5774d8..9030ba98d11 100755 --- a/keyboards/molecule/keymaps/default/keymap.c +++ b/keyboards/molecule/keymaps/default/keymap.c @@ -24,12 +24,6 @@ enum layer_names { _FN, }; -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY_BASE] = LAYOUT( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, diff --git a/keyboards/panc60/keymaps/default/keymap.c b/keyboards/panc60/keymaps/default/keymap.c index 2754d89ff5e..503baf69bbb 100644 --- a/keyboards/panc60/keymaps/default/keymap.c +++ b/keyboards/panc60/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_60_hhkb( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, @@ -36,25 +30,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/primekb/prime_o/keymaps/default/keymap.c b/keyboards/primekb/prime_o/keymaps/default/keymap.c index 64326b0f131..9092ca728e3 100644 --- a/keyboards/primekb/prime_o/keymaps/default/keymap.c +++ b/keyboards/primekb/prime_o/keymaps/default/keymap.c @@ -17,12 +17,6 @@ #define L1BS LT(1, KC_BSPC) -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_ESC, KC_PMNS, KC_PSLS, KC_PAST, KC_NUM, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_9, KC_DEL, @@ -41,25 +35,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/quantrik/kyuu/keymaps/default/keymap.c b/keyboards/quantrik/kyuu/keymaps/default/keymap.c index 3b3c09f2d96..7878b8dbea2 100644 --- a/keyboards/quantrik/kyuu/keymaps/default/keymap.c +++ b/keyboards/quantrik/kyuu/keymaps/default/keymap.c @@ -18,7 +18,6 @@ // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { QMKBEST = SAFE_RANGE, - QMKURL }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -48,14 +47,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // when keycode QMKBEST is released } break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; } return true; } diff --git a/keyboards/rabbit/rabbit68/keymaps/default/keymap.c b/keyboards/rabbit/rabbit68/keymaps/default/keymap.c index ef5cfff8d78..88e45a58d24 100644 --- a/keyboards/rabbit/rabbit68/keymaps/default/keymap.c +++ b/keyboards/rabbit/rabbit68/keymaps/default/keymap.c @@ -15,10 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -// enum custom_keycodes { QMKBEST = SAFE_RANGE, QMKURL }; - - #define _BASE 0 #define _FN 1 diff --git a/keyboards/rabbit/rabbit68/keymaps/kaiec/keymap.c b/keyboards/rabbit/rabbit68/keymaps/kaiec/keymap.c index 44b2ca8c6d9..7b6c4d97ec2 100644 --- a/keyboards/rabbit/rabbit68/keymaps/kaiec/keymap.c +++ b/keyboards/rabbit/rabbit68/keymaps/kaiec/keymap.c @@ -15,10 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -// enum custom_keycodes { QMKBEST = SAFE_RANGE, QMKURL }; - - #define _BASE 0 #define _FN 1 diff --git a/keyboards/rominronin/katana60/rev2/keymaps/default/keymap.c b/keyboards/rominronin/katana60/rev2/keymaps/default/keymap.c index 0a2182bdf7e..ee057c5c11b 100644 --- a/keyboards/rominronin/katana60/rev2/keymaps/default/keymap.c +++ b/keyboards/rominronin/katana60/rev2/keymaps/default/keymap.c @@ -33,12 +33,6 @@ enum layer_names { CURS, }; -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT_1_a(/* Base */ KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, DF(1), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c index 510f59e5608..26385640bde 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c +++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c @@ -128,8 +128,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return result; } - -void matrix_init_user(void) { - -} - diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c index a8200ecb349..ffe73c8b984 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c +++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c @@ -132,7 +132,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return result; } - -void matrix_init_user(void) { - -} diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c index 606ca3a881c..75b6e5971ef 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c +++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c @@ -150,7 +150,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return result; } - -void matrix_init_user(void) { - -} diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c index 2e97b919b55..4dd6d75826c 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c +++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c @@ -150,7 +150,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return result; } - -void matrix_init_user(void) { - -} diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c index 2d7f729db6a..f3b8ae68260 100644 --- a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c +++ b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c @@ -175,7 +175,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return result; } - -void matrix_init_user(void) { - -} diff --git a/keyboards/sck/neiso/keymaps/default/keymap.c b/keyboards/sck/neiso/keymaps/default/keymap.c index 05335947b5a..c7d8e5f8593 100644 --- a/keyboards/sck/neiso/keymaps/default/keymap.c +++ b/keyboards/sck/neiso/keymaps/default/keymap.c @@ -16,7 +16,9 @@ #include QMK_KEYBOARD_H // Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { QMKBEST = SAFE_RANGE, QMKURL }; +enum custom_keycodes { + QMKBEST = SAFE_RANGE, +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT(/* Base */ @@ -41,14 +43,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // when keycode QMKBEST is released } break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; } return true; } diff --git a/keyboards/sentraq/s65_plus/keymaps/default/keymap.c b/keyboards/sentraq/s65_plus/keymaps/default/keymap.c index 30ce79d0213..971e700dc44 100644 --- a/keyboards/sentraq/s65_plus/keymaps/default/keymap.c +++ b/keyboards/sentraq/s65_plus/keymaps/default/keymap.c @@ -50,7 +50,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ) }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} diff --git a/keyboards/sentraq/s65_plus/keymaps/iso/keymap.c b/keyboards/sentraq/s65_plus/keymaps/iso/keymap.c index 63565681463..8e6f0fb7d7e 100644 --- a/keyboards/sentraq/s65_plus/keymaps/iso/keymap.c +++ b/keyboards/sentraq/s65_plus/keymaps/iso/keymap.c @@ -50,7 +50,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ) }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c index 61718b9e581..83e28e28022 100644 --- a/keyboards/silverbullet44/keymaps/default/keymap.c +++ b/keyboards/silverbullet44/keymaps/default/keymap.c @@ -15,11 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -//enum custom_keycodes { -// QMKBEST = SAFE_RANGE, -// QMKURL -//}; enum layer { _QWERTY, _CURSOL, diff --git a/keyboards/takashiski/hecomi/keymaps/default/keymap.c b/keyboards/takashiski/hecomi/keymaps/default/keymap.c index e56529f3d8f..d962b4df94a 100644 --- a/keyboards/takashiski/hecomi/keymaps/default/keymap.c +++ b/keyboards/takashiski/hecomi/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - //R1:7 + 8 = 15 //R2:7 + 8 = 15 //R3:6 + 7 = 13 @@ -53,28 +47,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} - layer_state_t layer_state_set_user(layer_state_t state) { uint8_t layer=get_highest_layer(state); diff --git a/keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c b/keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c index 4af573107d8..4d7afe7d67f 100644 --- a/keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c +++ b/keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c @@ -14,11 +14,6 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( diff --git a/keyboards/treasure/type9/keymaps/default/keymap.c b/keyboards/treasure/type9/keymaps/default/keymap.c index 6b15c0486db..5f7d876ef22 100644 --- a/keyboards/treasure/type9/keymaps/default/keymap.c +++ b/keyboards/treasure/type9/keymaps/default/keymap.c @@ -15,12 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* Base */ KC_0, KC_1, KC_2, @@ -28,25 +22,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_6, KC_7, KC_8 ), }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/xiudi/xd87/keymaps/default/keymap.c b/keyboards/xiudi/xd87/keymaps/default/keymap.c index ed7da858902..c732e9b1b3c 100644 --- a/keyboards/xiudi/xd87/keymaps/default/keymap.c +++ b/keyboards/xiudi/xd87/keymaps/default/keymap.c @@ -15,13 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_tkl_iso( 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, @@ -31,26 +24,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT,KC_NUBS,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL,KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ) }; - - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/xiudi/xd87/keymaps/default_underglow/keymap.c b/keyboards/xiudi/xd87/keymaps/default_underglow/keymap.c index fc8fa313efd..47511a048be 100755 --- a/keyboards/xiudi/xd87/keymaps/default_underglow/keymap.c +++ b/keyboards/xiudi/xd87/keymaps/default_underglow/keymap.c @@ -15,13 +15,6 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QMKBEST = SAFE_RANGE, - QMKURL -}; - - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_tkl_ansi( 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_F12, KC_PSCR, KC_SCRL, KC_PAUS, @@ -38,25 +31,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released - } - break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} diff --git a/keyboards/yushakobo/quick7/keymaps/default/keymap.c b/keyboards/yushakobo/quick7/keymaps/default/keymap.c index 027bc4fe118..547396dc7d5 100644 --- a/keyboards/yushakobo/quick7/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick7/keymaps/default/keymap.c @@ -44,10 +44,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case YUSHAURL: if (record->event.pressed) { - // when keycode QMKURL is pressed SEND_STRING("https://yushakobo.jp/\n"); - } else { - // when keycode QMKURL is released } break; } diff --git a/keyboards/yushakobo/quick7/keymaps/via/keymap.c b/keyboards/yushakobo/quick7/keymaps/via/keymap.c index 0f3d44963d6..ec9c034ebf5 100644 --- a/keyboards/yushakobo/quick7/keymaps/via/keymap.c +++ b/keyboards/yushakobo/quick7/keymaps/via/keymap.c @@ -56,10 +56,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case YUSHAURL: if (record->event.pressed) { - // when keycode QMKURL is pressed SEND_STRING("https://yushakobo.jp/\n"); - } else { - // when keycode QMKURL is released } break; } From 04bf30aad8540fb2cdcf19f9a5170ea099fa3476 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 23 May 2024 11:40:41 -0700 Subject: [PATCH 319/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: U-V (#23786) Affects: - `uk78` - `ungodly/nines` - `unikeyboard/diverge3` - `unikeyboard/divergetm2` - `unikeyboard/felix` - `uranuma` - `utd80` - `v60_type_r` - `vagrant_10` - `viendi8l` - `viktus/at101_bh` - `viktus/omnikey_bh` - `viktus/smolka` - `viktus/sp111` - `viktus/styrka` - `viktus/z150_bh` - `vitamins_included/rev1` --- keyboards/uk78/config.h | 24 ------------ keyboards/uk78/keyboard.json | 6 +++ keyboards/ungodly/nines/config.h | 21 ---------- keyboards/ungodly/nines/keyboard.json | 6 +++ keyboards/unikeyboard/diverge3/config.h | 5 --- keyboards/unikeyboard/diverge3/keyboard.json | 6 +++ keyboards/unikeyboard/divergetm2/config.h | 23 ----------- .../unikeyboard/divergetm2/keyboard.json | 6 +++ keyboards/unikeyboard/felix/config.h | 22 ----------- keyboards/unikeyboard/felix/keyboard.json | 6 +++ keyboards/uranuma/config.h | 22 ----------- keyboards/uranuma/keyboard.json | 6 +++ keyboards/utd80/config.h | 22 ----------- keyboards/utd80/keyboard.json | 6 +++ keyboards/v60_type_r/config.h | 5 --- keyboards/v60_type_r/keyboard.json | 6 +++ keyboards/vagrant_10/config.h | 32 --------------- keyboards/vagrant_10/keyboard.json | 6 +++ keyboards/viendi8l/config.h | 5 --- keyboards/viendi8l/keyboard.json | 6 +++ keyboards/viktus/at101_bh/config.h | 7 ---- keyboards/viktus/at101_bh/keyboard.json | 6 +++ keyboards/viktus/omnikey_bh/config.h | 7 ---- keyboards/viktus/omnikey_bh/keyboard.json | 6 +++ keyboards/viktus/smolka/config.h | 39 ------------------- keyboards/viktus/smolka/keyboard.json | 6 +++ keyboards/viktus/sp111/config.h | 5 --- keyboards/viktus/sp111/keyboard.json | 6 +++ keyboards/viktus/styrka/config.h | 39 ------------------- keyboards/viktus/styrka/keyboard.json | 6 +++ keyboards/viktus/z150_bh/config.h | 7 ---- keyboards/viktus/z150_bh/keyboard.json | 6 +++ keyboards/vitamins_included/rev1/config.h | 5 --- .../vitamins_included/rev1/keyboard.json | 6 +++ 34 files changed, 102 insertions(+), 290 deletions(-) delete mode 100644 keyboards/uk78/config.h delete mode 100644 keyboards/ungodly/nines/config.h delete mode 100644 keyboards/unikeyboard/divergetm2/config.h delete mode 100644 keyboards/unikeyboard/felix/config.h delete mode 100644 keyboards/uranuma/config.h delete mode 100644 keyboards/utd80/config.h delete mode 100755 keyboards/vagrant_10/config.h delete mode 100644 keyboards/viktus/at101_bh/config.h delete mode 100644 keyboards/viktus/omnikey_bh/config.h delete mode 100644 keyboards/viktus/smolka/config.h delete mode 100644 keyboards/viktus/styrka/config.h delete mode 100644 keyboards/viktus/z150_bh/config.h diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h deleted file mode 100644 index 822b37da7f7..00000000000 --- a/keyboards/uk78/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2017 Ruari Armstrong - -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 diff --git a/keyboards/uk78/keyboard.json b/keyboards/uk78/keyboard.json index 8b6b5e9feda..673497ca9c0 100644 --- a/keyboards/uk78/keyboard.json +++ b/keyboards/uk78/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A2", "A1", "F5", "F4", "E6", "E7", "E5", "E4", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B5", "E0"], "rows": ["F3", "F2", "F1", "F0", "A0"] diff --git a/keyboards/ungodly/nines/config.h b/keyboards/ungodly/nines/config.h deleted file mode 100644 index ce4d927f09f..00000000000 --- a/keyboards/ungodly/nines/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Ungodly Design - * - * 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 diff --git a/keyboards/ungodly/nines/keyboard.json b/keyboards/ungodly/nines/keyboard.json index 07496dd5150..5e5418e14d4 100644 --- a/keyboards/ungodly/nines/keyboard.json +++ b/keyboards/ungodly/nines/keyboard.json @@ -25,6 +25,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["F4", "F5", "F6"], diff --git a/keyboards/unikeyboard/diverge3/config.h b/keyboards/unikeyboard/diverge3/config.h index b5ed9415d5f..bdd2b7cbb29 100644 --- a/keyboards/unikeyboard/diverge3/config.h +++ b/keyboards/unikeyboard/diverge3/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define SELECT_SOFT_SERIAL_SPEED 3 #endif -/* 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 - /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. * This is useful for the Windows task manager shortcut (ctrl+shift+esc). */ diff --git a/keyboards/unikeyboard/diverge3/keyboard.json b/keyboards/unikeyboard/diverge3/keyboard.json index a6dd684be6d..36f056187b8 100644 --- a/keyboards/unikeyboard/diverge3/keyboard.json +++ b/keyboards/unikeyboard/diverge3/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/unikeyboard/divergetm2/config.h b/keyboards/unikeyboard/divergetm2/config.h deleted file mode 100644 index 78d133446e3..00000000000 --- a/keyboards/unikeyboard/divergetm2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2018 Christon DeWan (xton) - * Copyright 2017 IslandMan93 - * - * 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 diff --git a/keyboards/unikeyboard/divergetm2/keyboard.json b/keyboards/unikeyboard/divergetm2/keyboard.json index 3c1420c39ad..b2db7a19db1 100644 --- a/keyboards/unikeyboard/divergetm2/keyboard.json +++ b/keyboards/unikeyboard/divergetm2/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/unikeyboard/felix/config.h b/keyboards/unikeyboard/felix/config.h deleted file mode 100644 index 7bc78f68d69..00000000000 --- a/keyboards/unikeyboard/felix/config.h +++ /dev/null @@ -1,22 +0,0 @@ -#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/unikeyboard/felix/keyboard.json b/keyboards/unikeyboard/felix/keyboard.json index 319340f5e62..b55138a15ce 100644 --- a/keyboards/unikeyboard/felix/keyboard.json +++ b/keyboards/unikeyboard/felix/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7"], "rows": ["B2", "B3", "B1", "F7", "F6"] diff --git a/keyboards/uranuma/config.h b/keyboards/uranuma/config.h deleted file mode 100644 index 7bc78f68d69..00000000000 --- a/keyboards/uranuma/config.h +++ /dev/null @@ -1,22 +0,0 @@ -#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/uranuma/keyboard.json b/keyboards/uranuma/keyboard.json index 8ac5b8063ae..b24ce74d9ff 100644 --- a/keyboards/uranuma/keyboard.json +++ b/keyboards/uranuma/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D2", "D4"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h deleted file mode 100644 index 4a4d65e62f8..00000000000 --- a/keyboards/utd80/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 UTDKeyboard & Dominic Gan - * - * 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 diff --git a/keyboards/utd80/keyboard.json b/keyboards/utd80/keyboard.json index 6e4c966d403..41bd35c66a4 100644 --- a/keyboards/utd80/keyboard.json +++ b/keyboards/utd80/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D3", "E6", "D7", "D6", "D4", "D2", "D1"], "rows": ["B4", "D5", "D0", "B2", "B3", "B0"] diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h index c8b7da2ae82..6b92da01246 100644 --- a/keyboards/v60_type_r/config.h +++ b/keyboards/v60_type_r/config.h @@ -23,11 +23,6 @@ along with this program. If not, see . #define RGB_GREEN_PIN F5 #define RGB_BLUE_PIN F4 -/* 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. diff --git a/keyboards/v60_type_r/keyboard.json b/keyboards/v60_type_r/keyboard.json index a9c01dc7501..eba729220a8 100644 --- a/keyboards/v60_type_r/keyboard.json +++ b/keyboards/v60_type_r/keyboard.json @@ -20,6 +20,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] diff --git a/keyboards/vagrant_10/config.h b/keyboards/vagrant_10/config.h deleted file mode 100755 index 195f3f617cd..00000000000 --- a/keyboards/vagrant_10/config.h +++ /dev/null @@ -1,32 +0,0 @@ - -/** -MIT License - -Copyright (c) 2020 Shanduur & QMK Firmware - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -#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/vagrant_10/keyboard.json b/keyboards/vagrant_10/keyboard.json index 7291dea3028..26b68b69234 100644 --- a/keyboards/vagrant_10/keyboard.json +++ b/keyboards/vagrant_10/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F6", "F5"], "rows": ["F7", "B1", "B3", "B2"] diff --git a/keyboards/viendi8l/config.h b/keyboards/viendi8l/config.h index a449301c2b2..0a22c61a091 100644 --- a/keyboards/viendi8l/config.h +++ b/keyboards/viendi8l/config.h @@ -17,11 +17,6 @@ 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 I2C_DRIVER I2CD1 #define I2C_SCL_PIN B6 #define I2C_SDA_PIN B7 diff --git a/keyboards/viendi8l/keyboard.json b/keyboards/viendi8l/keyboard.json index 4a7ac1b5acb..f6df59e08b6 100644 --- a/keyboards/viendi8l/keyboard.json +++ b/keyboards/viendi8l/keyboard.json @@ -28,6 +28,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "C7", "C8", "C9", "A8", "B3", "B4", "A10", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"], "rows": ["C3", "C2", "C1", "C0", "B14", "A7"] diff --git a/keyboards/viktus/at101_bh/config.h b/keyboards/viktus/at101_bh/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/viktus/at101_bh/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/viktus/at101_bh/keyboard.json b/keyboards/viktus/at101_bh/keyboard.json index b950aec2d02..a315288cac4 100644 --- a/keyboards/viktus/at101_bh/keyboard.json +++ b/keyboards/viktus/at101_bh/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D0", "B7", "B3", "B2", "B1", "B0", "E6", "D2", "D3"], "rows": ["F0", "F1", "F4", "D4", "F6", "F5", "F7", "B6", "B5", "D5", "C7", "C6"] diff --git a/keyboards/viktus/omnikey_bh/config.h b/keyboards/viktus/omnikey_bh/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/viktus/omnikey_bh/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/viktus/omnikey_bh/keyboard.json b/keyboards/viktus/omnikey_bh/keyboard.json index a44b23d6552..3356bf1eb28 100644 --- a/keyboards/viktus/omnikey_bh/keyboard.json +++ b/keyboards/viktus/omnikey_bh/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C2", "C3", "C4", "C7", "C1", "C0", "E1", "E0", "D7", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "E6", "E7", "B0", "B1", "B2", "B3"], "rows": ["B7", "D0", "D1", "D2", "D3", "D4"] diff --git a/keyboards/viktus/smolka/config.h b/keyboards/viktus/smolka/config.h deleted file mode 100644 index bb14ae71b11..00000000000 --- a/keyboards/viktus/smolka/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 jrfhoutx - -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/viktus/smolka/keyboard.json b/keyboards/viktus/smolka/keyboard.json index ade26b37351..e2cd55a4052 100644 --- a/keyboards/viktus/smolka/keyboard.json +++ b/keyboards/viktus/smolka/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5", "B6", "D4", "B1", "B2"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6"] diff --git a/keyboards/viktus/sp111/config.h b/keyboards/viktus/sp111/config.h index de698349026..cbd6dbc4d94 100644 --- a/keyboards/viktus/sp111/config.h +++ b/keyboards/viktus/sp111/config.h @@ -20,11 +20,6 @@ #define MATRIX_ROWS 6*2 #define MATRIX_COLS 11 -/* 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. diff --git a/keyboards/viktus/sp111/keyboard.json b/keyboards/viktus/sp111/keyboard.json index a309c14afe3..8cf65a5522a 100644 --- a/keyboards/viktus/sp111/keyboard.json +++ b/keyboards/viktus/sp111/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/viktus/styrka/config.h b/keyboards/viktus/styrka/config.h deleted file mode 100644 index c0e0f2bef8b..00000000000 --- a/keyboards/viktus/styrka/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 jrfhoutx - -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/viktus/styrka/keyboard.json b/keyboards/viktus/styrka/keyboard.json index e5a642e471e..98d46bc81a0 100644 --- a/keyboards/viktus/styrka/keyboard.json +++ b/keyboards/viktus/styrka/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "B14", "B15", "A8", "A9"], "rows": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B13", "B12"] diff --git a/keyboards/viktus/z150_bh/config.h b/keyboards/viktus/z150_bh/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/viktus/z150_bh/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/viktus/z150_bh/keyboard.json b/keyboards/viktus/z150_bh/keyboard.json index 5875b6d1712..27754da5438 100644 --- a/keyboards/viktus/z150_bh/keyboard.json +++ b/keyboards/viktus/z150_bh/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D7", "E0", "C7", "C6", "C5", "C4", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"], "rows": ["C3", "C2", "C1", "C0", "E1"] diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h index 027686726df..6faac18ae1d 100644 --- a/keyboards/vitamins_included/rev1/config.h +++ b/keyboards/vitamins_included/rev1/config.h @@ -23,11 +23,6 @@ along with this program. If not, see . #define EE_HANDS -/* 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 - /* Audio settings */ #ifdef AUDIO_ENABLE #define AUDIO_PIN C6 // Define this to enable the buzzer diff --git a/keyboards/vitamins_included/rev1/keyboard.json b/keyboards/vitamins_included/rev1/keyboard.json index de21929c39b..dc55407b6af 100644 --- a/keyboards/vitamins_included/rev1/keyboard.json +++ b/keyboards/vitamins_included/rev1/keyboard.json @@ -7,6 +7,12 @@ "rows": ["F5", "F6", "C7", "F7"] }, "diode_direction": "COL2ROW", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split": { "enabled": true, "soft_serial_pin": "D0" From 912124f71cfcd9276fec13b27dea0029e49b1483 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 23 May 2024 11:48:32 -0700 Subject: [PATCH 320/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: T (#23785) Affects: - `takashicompany/center_enter` - `takashicompany/endzone34` - `takashicompany/qoolee` - `takashicompany/radialex` - `takashiski/namecard2x4/rev1` - `takashiski/namecard2x4/rev2` - `takashiski/otaku_split/rev0` - `takashiski/otaku_split/rev1` - `taleguers/taleguers75` - `tanuki` - `team0110/p1800fl` - `technika` - `tenki` - `tetris` - `tg4x` - `the_royal/liminal` - `the_royal/schwann` - `thevankeyboards/bananasplit` - `thevankeyboards/caravan` - `thevankeyboards/jetvan` - `thevankeyboards/minivan` - `thevankeyboards/roadkit` - `tkc/california` - `tkc/m0lly` - `tkc/tkc1800` - `tkc/tkl_ab87` - `tkw/stoutgat/v2` - `tmo50` - `toad` - `toffee_studio/blueberry` - `tokyokeyboard/alix40` - `tokyokeyboard/tokyo60` - `tominabox1/adalyn` - `tominabox1/le_chiffre` - `tominabox1/qaz` - `tr60w` - `treasure/type9` - `tszaboo/ortho4exent` --- .../takashicompany/center_enter/config.h | 39 ------------------ .../takashicompany/center_enter/keyboard.json | 6 +++ keyboards/takashicompany/endzone34/config.h | 39 ------------------ .../takashicompany/endzone34/keyboard.json | 6 +++ keyboards/takashicompany/qoolee/config.h | 39 ------------------ keyboards/takashicompany/qoolee/keyboard.json | 6 +++ keyboards/takashicompany/radialex/config.h | 39 ------------------ .../takashicompany/radialex/keyboard.json | 6 +++ .../takashiski/namecard2x4/rev1/config.h | 39 ------------------ .../takashiski/namecard2x4/rev1/keyboard.json | 6 +++ .../takashiski/namecard2x4/rev2/config.h | 39 ------------------ .../takashiski/namecard2x4/rev2/keyboard.json | 6 +++ .../takashiski/otaku_split/rev0/config.h | 39 ------------------ .../takashiski/otaku_split/rev0/keyboard.json | 6 +++ .../takashiski/otaku_split/rev1/config.h | 5 --- .../takashiski/otaku_split/rev1/keyboard.json | 6 +++ keyboards/taleguers/taleguers75/config.h | 23 ----------- keyboards/taleguers/taleguers75/keyboard.json | 6 +++ keyboards/tanuki/config.h | 39 ------------------ keyboards/tanuki/keyboard.json | 6 +++ keyboards/team0110/p1800fl/config.h | 23 ----------- keyboards/team0110/p1800fl/keyboard.json | 6 +++ keyboards/technika/config.h | 39 ------------------ keyboards/technika/keyboard.json | 6 +++ keyboards/tenki/config.h | 7 ---- keyboards/tenki/keyboard.json | 6 +++ keyboards/tetris/config.h | 6 --- keyboards/tetris/keyboard.json | 6 +++ keyboards/tg4x/config.h | 39 ------------------ keyboards/tg4x/keyboard.json | 6 +++ keyboards/the_royal/liminal/config.h | 6 --- keyboards/the_royal/liminal/keyboard.json | 6 +++ keyboards/the_royal/schwann/config.h | 6 --- keyboards/the_royal/schwann/keyboard.json | 6 +++ .../thevankeyboards/bananasplit/config.h | 24 ----------- .../thevankeyboards/bananasplit/keyboard.json | 6 +++ keyboards/thevankeyboards/caravan/config.h | 23 ----------- .../thevankeyboards/caravan/keyboard.json | 6 +++ keyboards/thevankeyboards/jetvan/config.h | 41 ------------------- .../thevankeyboards/jetvan/keyboard.json | 6 +++ keyboards/thevankeyboards/minivan/config.h | 23 ----------- .../thevankeyboards/minivan/keyboard.json | 6 +++ keyboards/thevankeyboards/roadkit/config.h | 39 ------------------ .../thevankeyboards/roadkit/keyboard.json | 6 +++ keyboards/tkc/california/config.h | 39 ------------------ keyboards/tkc/california/keyboard.json | 6 +++ keyboards/tkc/m0lly/config.h | 39 ------------------ keyboards/tkc/m0lly/keyboard.json | 6 +++ keyboards/tkc/tkc1800/config.h | 39 ------------------ keyboards/tkc/tkc1800/keyboard.json | 6 +++ keyboards/tkc/tkl_ab87/config.h | 39 ------------------ keyboards/tkc/tkl_ab87/keyboard.json | 6 +++ keyboards/tkw/stoutgat/v2/config.h | 5 --- keyboards/tkw/stoutgat/v2/info.json | 6 ++- keyboards/tmo50/config.h | 39 ------------------ keyboards/tmo50/keyboard.json | 6 +++ keyboards/toad/config.h | 7 ---- keyboards/toad/keyboard.json | 6 +++ keyboards/toffee_studio/blueberry/config.h | 22 ---------- .../toffee_studio/blueberry/keyboard.json | 6 +++ keyboards/tokyokeyboard/alix40/config.h | 6 --- keyboards/tokyokeyboard/alix40/keyboard.json | 6 +++ keyboards/tokyokeyboard/tokyo60/config.h | 7 ---- keyboards/tokyokeyboard/tokyo60/keyboard.json | 6 +++ keyboards/tominabox1/adalyn/config.h | 21 ---------- keyboards/tominabox1/adalyn/keyboard.json | 6 +++ keyboards/tominabox1/le_chiffre/config.h | 21 ---------- keyboards/tominabox1/le_chiffre/info.json | 6 +++ keyboards/tominabox1/qaz/config.h | 6 --- keyboards/tominabox1/qaz/keyboard.json | 6 +++ keyboards/tr60w/config.h | 7 ---- keyboards/tr60w/keyboard.json | 6 +++ keyboards/treasure/type9/config.h | 39 ------------------ keyboards/treasure/type9/keyboard.json | 6 +++ keyboards/tszaboo/ortho4exent/config.h | 31 -------------- keyboards/tszaboo/ortho4exent/keyboard.json | 6 +++ 76 files changed, 227 insertions(+), 984 deletions(-) delete mode 100644 keyboards/takashicompany/center_enter/config.h delete mode 100644 keyboards/takashicompany/endzone34/config.h delete mode 100644 keyboards/takashicompany/qoolee/config.h delete mode 100644 keyboards/takashicompany/radialex/config.h delete mode 100644 keyboards/takashiski/namecard2x4/rev1/config.h delete mode 100644 keyboards/takashiski/namecard2x4/rev2/config.h delete mode 100644 keyboards/takashiski/otaku_split/rev0/config.h delete mode 100644 keyboards/taleguers/taleguers75/config.h delete mode 100644 keyboards/tanuki/config.h delete mode 100644 keyboards/team0110/p1800fl/config.h delete mode 100644 keyboards/technika/config.h delete mode 100644 keyboards/tenki/config.h delete mode 100644 keyboards/tg4x/config.h delete mode 100644 keyboards/the_royal/liminal/config.h delete mode 100644 keyboards/the_royal/schwann/config.h delete mode 100644 keyboards/thevankeyboards/bananasplit/config.h delete mode 100644 keyboards/thevankeyboards/caravan/config.h delete mode 100644 keyboards/thevankeyboards/jetvan/config.h delete mode 100644 keyboards/thevankeyboards/minivan/config.h delete mode 100644 keyboards/thevankeyboards/roadkit/config.h delete mode 100644 keyboards/tkc/california/config.h delete mode 100644 keyboards/tkc/m0lly/config.h delete mode 100644 keyboards/tkc/tkc1800/config.h delete mode 100644 keyboards/tkc/tkl_ab87/config.h delete mode 100644 keyboards/tmo50/config.h delete mode 100644 keyboards/toad/config.h delete mode 100644 keyboards/toffee_studio/blueberry/config.h delete mode 100644 keyboards/tokyokeyboard/tokyo60/config.h delete mode 100644 keyboards/tominabox1/adalyn/config.h delete mode 100644 keyboards/tominabox1/le_chiffre/config.h delete mode 100644 keyboards/tominabox1/qaz/config.h delete mode 100644 keyboards/tr60w/config.h delete mode 100644 keyboards/treasure/type9/config.h delete mode 100644 keyboards/tszaboo/ortho4exent/config.h diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h deleted file mode 100644 index 7b4e38bd964..00000000000 --- a/keyboards/takashicompany/center_enter/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 takashicompany - -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/takashicompany/center_enter/keyboard.json b/keyboards/takashicompany/center_enter/keyboard.json index 41a3e450931..b8188bd7182 100644 --- a/keyboards/takashicompany/center_enter/keyboard.json +++ b/keyboards/takashicompany/center_enter/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D7", "B2", "B6", "D0", "D4", "C6"], "rows": ["E6", "B4", "B5"] diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h deleted file mode 100644 index 7b4e38bd964..00000000000 --- a/keyboards/takashicompany/endzone34/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 takashicompany - -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/takashicompany/endzone34/keyboard.json b/keyboards/takashicompany/endzone34/keyboard.json index 382d2f06724..3549d2c0893 100644 --- a/keyboards/takashicompany/endzone34/keyboard.json +++ b/keyboards/takashicompany/endzone34/keyboard.json @@ -39,6 +39,12 @@ "oled": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "D4", "C6", "D7", "E6", "B4"], "rows": ["B3", "B2", "B6", "B5"] diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h deleted file mode 100644 index 7b4e38bd964..00000000000 --- a/keyboards/takashicompany/qoolee/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 takashicompany - -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/takashicompany/qoolee/keyboard.json b/keyboards/takashicompany/qoolee/keyboard.json index 52e6d61b803..bce23352936 100644 --- a/keyboards/takashicompany/qoolee/keyboard.json +++ b/keyboards/takashicompany/qoolee/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D0", "D4", "C6", "D7"], "rows": ["E6", "B4", "B5"] diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h deleted file mode 100644 index 7b4e38bd964..00000000000 --- a/keyboards/takashicompany/radialex/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 takashicompany - -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/takashicompany/radialex/keyboard.json b/keyboards/takashicompany/radialex/keyboard.json index 3cc94cdd913..34ef3d2f1fc 100644 --- a/keyboards/takashicompany/radialex/keyboard.json +++ b/keyboards/takashicompany/radialex/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["B6", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h deleted file mode 100644 index 8ecec41e2a9..00000000000 --- a/keyboards/takashiski/namecard2x4/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 takashiski - -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/takashiski/namecard2x4/rev1/keyboard.json b/keyboards/takashiski/namecard2x4/rev1/keyboard.json index aaab760be3b..5eed4727a52 100644 --- a/keyboards/takashiski/namecard2x4/rev1/keyboard.json +++ b/keyboards/takashiski/namecard2x4/rev1/keyboard.json @@ -1,4 +1,10 @@ { + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "hue_steps": 10, "saturation_steps": 10, diff --git a/keyboards/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h deleted file mode 100644 index 8ecec41e2a9..00000000000 --- a/keyboards/takashiski/namecard2x4/rev2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 takashiski - -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/takashiski/namecard2x4/rev2/keyboard.json b/keyboards/takashiski/namecard2x4/rev2/keyboard.json index edef6a31b41..a66da76c445 100644 --- a/keyboards/takashiski/namecard2x4/rev2/keyboard.json +++ b/keyboards/takashiski/namecard2x4/rev2/keyboard.json @@ -1,4 +1,10 @@ { + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "hue_steps": 10, "saturation_steps": 10, diff --git a/keyboards/takashiski/otaku_split/rev0/config.h b/keyboards/takashiski/otaku_split/rev0/config.h deleted file mode 100644 index b43d9c74c80..00000000000 --- a/keyboards/takashiski/otaku_split/rev0/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 takashiski - -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/takashiski/otaku_split/rev0/keyboard.json b/keyboards/takashiski/otaku_split/rev0/keyboard.json index db577c22606..e8e3b35d623 100644 --- a/keyboards/takashiski/otaku_split/rev0/keyboard.json +++ b/keyboards/takashiski/otaku_split/rev0/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["B5", "B4", "E6", "D7", "C6"] diff --git a/keyboards/takashiski/otaku_split/rev1/config.h b/keyboards/takashiski/otaku_split/rev1/config.h index 6a81e8ddcb9..8bede1c4213 100644 --- a/keyboards/takashiski/otaku_split/rev1/config.h +++ b/keyboards/takashiski/otaku_split/rev1/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D2 //fix pin. HIGH is left, LOW is right -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/takashiski/otaku_split/rev1/keyboard.json b/keyboards/takashiski/otaku_split/rev1/keyboard.json index 0c83593eea6..039838144fb 100644 --- a/keyboards/takashiski/otaku_split/rev1/keyboard.json +++ b/keyboards/takashiski/otaku_split/rev1/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/taleguers/taleguers75/config.h b/keyboards/taleguers/taleguers75/config.h deleted file mode 100644 index 6b1277af2ce..00000000000 --- a/keyboards/taleguers/taleguers75/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Borja Lopez Jimenez - * - * 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 diff --git a/keyboards/taleguers/taleguers75/keyboard.json b/keyboards/taleguers/taleguers75/keyboard.json index 5526c0b0a87..8c3a1565e21 100644 --- a/keyboards/taleguers/taleguers75/keyboard.json +++ b/keyboards/taleguers/taleguers75/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "E6", "B7", "C7", "C6", "D4", "D6", "D7", "B4", "D0", "D1", "F7"], "rows": ["B0", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h deleted file mode 100644 index 4b007cf387e..00000000000 --- a/keyboards/tanuki/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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/tanuki/keyboard.json b/keyboards/tanuki/keyboard.json index cebcc4404e4..0c4045e320c 100644 --- a/keyboards/tanuki/keyboard.json +++ b/keyboards/tanuki/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "F4", "F5", "F6"], "rows": ["F7", "B1", "D4", "D0"] diff --git a/keyboards/team0110/p1800fl/config.h b/keyboards/team0110/p1800fl/config.h deleted file mode 100644 index effb62971cd..00000000000 --- a/keyboards/team0110/p1800fl/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 marhalloweenvt - -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 diff --git a/keyboards/team0110/p1800fl/keyboard.json b/keyboards/team0110/p1800fl/keyboard.json index d5a34de0494..a56864cd36a 100644 --- a/keyboards/team0110/p1800fl/keyboard.json +++ b/keyboards/team0110/p1800fl/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2"], "rows": ["B6", "B5", "B4", "D7", "D6", "D4"] diff --git a/keyboards/technika/config.h b/keyboards/technika/config.h deleted file mode 100644 index f608132b5af..00000000000 --- a/keyboards/technika/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/technika/keyboard.json b/keyboards/technika/keyboard.json index 303983dfb41..a6f3c2bd01a 100644 --- a/keyboards/technika/keyboard.json +++ b/keyboards/technika/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B14", "B12", "B2", "B1", "B0", "A7", "A6", "A3", "B9", "B8", "B7"], "rows": ["B11", "B10", "A5", "A4"] diff --git a/keyboards/tenki/config.h b/keyboards/tenki/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/tenki/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/tenki/keyboard.json b/keyboards/tenki/keyboard.json index 7c05c98ef7d..628e2068bae 100644 --- a/keyboards/tenki/keyboard.json +++ b/keyboards/tenki/keyboard.json @@ -39,6 +39,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "D4", "D0"], "rows": ["B1", "B4", "F6", "B6", "B2"] diff --git a/keyboards/tetris/config.h b/keyboards/tetris/config.h index bc2273d5478..ac304699bf7 100755 --- a/keyboards/tetris/config.h +++ b/keyboards/tetris/config.h @@ -1,11 +1,5 @@ #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 - #ifdef AUDIO_ENABLE #define AUDIO_PIN B5 #define STARTUP_SONG SONG(ONE_UP_SOUND) diff --git a/keyboards/tetris/keyboard.json b/keyboards/tetris/keyboard.json index 01df052ba60..57cfd42c70d 100644 --- a/keyboards/tetris/keyboard.json +++ b/keyboards/tetris/keyboard.json @@ -43,6 +43,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "B4", "B6", "C6", "C7", "F6", "F7", "D4", "D2", "D3", "D5", "D6"], "rows": ["B3", "B2", "B1", "B0", "E6"] diff --git a/keyboards/tg4x/config.h b/keyboards/tg4x/config.h deleted file mode 100644 index b5b661bef2a..00000000000 --- a/keyboards/tg4x/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 MechMerlin - -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/tg4x/keyboard.json b/keyboards/tg4x/keyboard.json index d108774dfd3..ae4cd53a289 100644 --- a/keyboards/tg4x/keyboard.json +++ b/keyboards/tg4x/keyboard.json @@ -41,6 +41,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"] diff --git a/keyboards/the_royal/liminal/config.h b/keyboards/the_royal/liminal/config.h deleted file mode 100644 index fa9a83d08ec..00000000000 --- a/keyboards/the_royal/liminal/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#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/the_royal/liminal/keyboard.json b/keyboards/the_royal/liminal/keyboard.json index c0fa5524ad0..0a5bd361e7c 100644 --- a/keyboards/the_royal/liminal/keyboard.json +++ b/keyboards/the_royal/liminal/keyboard.json @@ -26,6 +26,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D6", "C4", "D3", "D2", "D1", "D0", "C2", "B0", "B1", "B2", "B3", "B4", "D5", "C5"], "rows": ["C6", "B6", "B7", "C7"] diff --git a/keyboards/the_royal/schwann/config.h b/keyboards/the_royal/schwann/config.h deleted file mode 100644 index fa9a83d08ec..00000000000 --- a/keyboards/the_royal/schwann/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#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/the_royal/schwann/keyboard.json b/keyboards/the_royal/schwann/keyboard.json index dcb32312f95..800d45b83af 100644 --- a/keyboards/the_royal/schwann/keyboard.json +++ b/keyboards/the_royal/schwann/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "D5", "D3", "D2", "C6", "B6", "B5", "B4", "D7", "D6", "D1"], "rows": ["F0", "F1", "F6", "C7"] diff --git a/keyboards/thevankeyboards/bananasplit/config.h b/keyboards/thevankeyboards/bananasplit/config.h deleted file mode 100644 index c2949ab3a7a..00000000000 --- a/keyboards/thevankeyboards/bananasplit/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 - diff --git a/keyboards/thevankeyboards/bananasplit/keyboard.json b/keyboards/thevankeyboards/bananasplit/keyboard.json index 3b1d5c846dc..1fb7fc50544 100644 --- a/keyboards/thevankeyboards/bananasplit/keyboard.json +++ b/keyboards/thevankeyboards/bananasplit/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "B1", "F0", "F1", "F4", "B3", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B0", "B2", "B4", "B5", "B6"] diff --git a/keyboards/thevankeyboards/caravan/config.h b/keyboards/thevankeyboards/caravan/config.h deleted file mode 100644 index 5070f051560..00000000000 --- a/keyboards/thevankeyboards/caravan/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 diff --git a/keyboards/thevankeyboards/caravan/keyboard.json b/keyboards/thevankeyboards/caravan/keyboard.json index 595c7c9fc9c..a5c00abf4e9 100644 --- a/keyboards/thevankeyboards/caravan/keyboard.json +++ b/keyboards/thevankeyboards/caravan/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "B4", "B5", "B6", "B7", "D2", "D3", "D5", "D4", "D6"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/thevankeyboards/jetvan/config.h b/keyboards/thevankeyboards/jetvan/config.h deleted file mode 100644 index 950d17c8137..00000000000 --- a/keyboards/thevankeyboards/jetvan/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2020 - -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/thevankeyboards/jetvan/keyboard.json b/keyboards/thevankeyboards/jetvan/keyboard.json index 5e1535a8ad1..a5a9b96ac8b 100644 --- a/keyboards/thevankeyboards/jetvan/keyboard.json +++ b/keyboards/thevankeyboards/jetvan/keyboard.json @@ -35,6 +35,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D3", "D5", "D6", "B4", "B6", "F6", "F5", "F4", "F1", "F0", "B3"], "rows": ["D7", "B5", "F7", "D4"] diff --git a/keyboards/thevankeyboards/minivan/config.h b/keyboards/thevankeyboards/minivan/config.h deleted file mode 100644 index 5070f051560..00000000000 --- a/keyboards/thevankeyboards/minivan/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 diff --git a/keyboards/thevankeyboards/minivan/keyboard.json b/keyboards/thevankeyboards/minivan/keyboard.json index 11684b6cf80..53b3e0d89c4 100644 --- a/keyboards/thevankeyboards/minivan/keyboard.json +++ b/keyboards/thevankeyboards/minivan/keyboard.json @@ -24,6 +24,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D3", "D5", "D6", "B4", "B6", "F6", "F5", "F4", "F1", "F0", "B3"], "rows": ["D7", "B5", "F7", "D4"] diff --git a/keyboards/thevankeyboards/roadkit/config.h b/keyboards/thevankeyboards/roadkit/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/thevankeyboards/roadkit/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/thevankeyboards/roadkit/keyboard.json b/keyboards/thevankeyboards/roadkit/keyboard.json index 3b8a5b21591..e3c282bffe7 100644 --- a/keyboards/thevankeyboards/roadkit/keyboard.json +++ b/keyboards/thevankeyboards/roadkit/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F4", "D6", "D4"], "rows": ["F0", "F5", "D7", "B4"] diff --git a/keyboards/tkc/california/config.h b/keyboards/tkc/california/config.h deleted file mode 100644 index 827133aed36..00000000000 --- a/keyboards/tkc/california/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Terry Mathews - -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/tkc/california/keyboard.json b/keyboards/tkc/california/keyboard.json index 1d52466bbab..465544bc03e 100644 --- a/keyboards/tkc/california/keyboard.json +++ b/keyboards/tkc/california/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B4", "D7", "D6", "F7", "F6", "F5", "D5", "D1", "F4"], "rows": ["C7", "C6", "B6", "D4", "D3", "D0", "E6", "B0", "B1", "B2", "D2", "B3"] diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/tkc/m0lly/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/tkc/m0lly/keyboard.json b/keyboards/tkc/m0lly/keyboard.json index e37b9e7bb2a..ae76f1e6d9b 100644 --- a/keyboards/tkc/m0lly/keyboard.json +++ b/keyboards/tkc/m0lly/keyboard.json @@ -19,6 +19,12 @@ "oled": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "F5", "F6", "F7"], "rows": ["F2", "F1", "F0", "E1", "E0"] diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/tkc/tkc1800/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/tkc/tkc1800/keyboard.json b/keyboards/tkc/tkc1800/keyboard.json index bdc6aa13a75..2965c61d83a 100644 --- a/keyboards/tkc/tkc1800/keyboard.json +++ b/keyboards/tkc/tkc1800/keyboard.json @@ -19,6 +19,12 @@ "oled": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "F5", "F6", "F7"], "rows": ["F4", "F3", "F2", "F1", "F0", "E1", "E0"] diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h deleted file mode 100644 index ef2f04081f6..00000000000 --- a/keyboards/tkc/tkl_ab87/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Terry Mathews - -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/tkc/tkl_ab87/keyboard.json b/keyboards/tkc/tkl_ab87/keyboard.json index a3583c0d678..c3d14bd8cf0 100644 --- a/keyboards/tkc/tkl_ab87/keyboard.json +++ b/keyboards/tkc/tkl_ab87/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E6", "F6", "F4"], "rows": ["B1", "F5", "F7", "B0", "B2", "B3"] diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h index 79f47b9bb38..04c41e2a112 100644 --- a/keyboards/tkw/stoutgat/v2/config.h +++ b/keyboards/tkw/stoutgat/v2/config.h @@ -20,8 +20,3 @@ #define WS2812_PWM_PAL_MODE 2 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 #define WS2812_PWM_DMA_CHANNEL 5 - -/* 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/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json index dbb227b0fdc..c6960e0fe96 100644 --- a/keyboards/tkw/stoutgat/v2/info.json +++ b/keyboards/tkw/stoutgat/v2/info.json @@ -49,7 +49,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "community_layouts": ["65_iso", "65_ansi"], "layouts": { diff --git a/keyboards/tmo50/config.h b/keyboards/tmo50/config.h deleted file mode 100644 index 8964ad6d2f4..00000000000 --- a/keyboards/tmo50/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 funderburker - -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/tmo50/keyboard.json b/keyboards/tmo50/keyboard.json index d3d4b15e63d..dbb79802cac 100644 --- a/keyboards/tmo50/keyboard.json +++ b/keyboards/tmo50/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D4", "F0", "F1", "F4", "F5", "F6", "F7", "D6", "D7", "B4", "B5", "B6", "C6"], "rows": ["D5", "D3", "D2", "D0"] diff --git a/keyboards/toad/config.h b/keyboards/toad/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/toad/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/toad/keyboard.json b/keyboards/toad/keyboard.json index edb45794556..073fa6411ce 100644 --- a/keyboards/toad/keyboard.json +++ b/keyboards/toad/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "E6", "B7", "C7", "C6", "D4", "D6", "D7", "B4", "D0", "D1", "F7"], "rows": ["B0", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/toffee_studio/blueberry/config.h b/keyboards/toffee_studio/blueberry/config.h deleted file mode 100644 index f15e82696a2..00000000000 --- a/keyboards/toffee_studio/blueberry/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2023 Toffee Studio - * - * 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 diff --git a/keyboards/toffee_studio/blueberry/keyboard.json b/keyboards/toffee_studio/blueberry/keyboard.json index 45dda172b63..99a87b0a959 100644 --- a/keyboards/toffee_studio/blueberry/keyboard.json +++ b/keyboards/toffee_studio/blueberry/keyboard.json @@ -38,6 +38,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "D4", "D6", "D7", "B4", "B5", "C6", "C7"], "rows": ["E6", "B0", "B1", "F6", "F5", "F1", "F7", "F0", "F4"] diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h index 1ca9b6c46df..51d446c6d2a 100644 --- a/keyboards/tokyokeyboard/alix40/config.h +++ b/keyboards/tokyokeyboard/alix40/config.h @@ -14,11 +14,5 @@ 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 - /* Bluetooth */ #define BATTERY_LEVEL_PIN B6 diff --git a/keyboards/tokyokeyboard/alix40/keyboard.json b/keyboards/tokyokeyboard/alix40/keyboard.json index e4c27aaec21..b8b5420c662 100644 --- a/keyboards/tokyokeyboard/alix40/keyboard.json +++ b/keyboards/tokyokeyboard/alix40/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D0", "D1", "D2", "D3", "D5", "D6"], "rows": ["D7", "C6", "C7", "B5"] diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/tokyokeyboard/tokyo60/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/tokyokeyboard/tokyo60/keyboard.json b/keyboards/tokyokeyboard/tokyo60/keyboard.json index 78fdcae0e37..b590946a3a8 100644 --- a/keyboards/tokyokeyboard/tokyo60/keyboard.json +++ b/keyboards/tokyokeyboard/tokyo60/keyboard.json @@ -19,6 +19,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B2", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/tominabox1/adalyn/config.h b/keyboards/tominabox1/adalyn/config.h deleted file mode 100644 index 389cdb9c132..00000000000 --- a/keyboards/tominabox1/adalyn/config.h +++ /dev/null @@ -1,21 +0,0 @@ - /* Copyright TJ Campie - * - * 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 diff --git a/keyboards/tominabox1/adalyn/keyboard.json b/keyboards/tominabox1/adalyn/keyboard.json index f896dd4ab1c..113ef690ede 100644 --- a/keyboards/tominabox1/adalyn/keyboard.json +++ b/keyboards/tominabox1/adalyn/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4", "F1"], "rows": ["C7", "D6", "B7", "B3"] diff --git a/keyboards/tominabox1/le_chiffre/config.h b/keyboards/tominabox1/le_chiffre/config.h deleted file mode 100644 index 333d0a100eb..00000000000 --- a/keyboards/tominabox1/le_chiffre/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 tominabox1 - * - * 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 diff --git a/keyboards/tominabox1/le_chiffre/info.json b/keyboards/tominabox1/le_chiffre/info.json index 47c07ab3618..cb4097d61d4 100644 --- a/keyboards/tominabox1/le_chiffre/info.json +++ b/keyboards/tominabox1/le_chiffre/info.json @@ -12,6 +12,12 @@ "oled": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "animations": { "alternating": true, diff --git a/keyboards/tominabox1/qaz/config.h b/keyboards/tominabox1/qaz/config.h deleted file mode 100644 index fa9a83d08ec..00000000000 --- a/keyboards/tominabox1/qaz/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#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/tominabox1/qaz/keyboard.json b/keyboards/tominabox1/qaz/keyboard.json index 691a1129bc7..9e18f0ddf4f 100644 --- a/keyboards/tominabox1/qaz/keyboard.json +++ b/keyboards/tominabox1/qaz/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "D3", "D2", "F5", "B5", "F6", "D7"], "rows": ["F4", "D4", "C6", "E6", "D1", "D0"] diff --git a/keyboards/tr60w/config.h b/keyboards/tr60w/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/tr60w/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/tr60w/keyboard.json b/keyboards/tr60w/keyboard.json index 6fa5914d6cf..60c01bdcfc6 100644 --- a/keyboards/tr60w/keyboard.json +++ b/keyboards/tr60w/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F4", "F1", "F0", "B0", "D5", "D3", "D6", "D7", "B4", "B5", "B6", "C6", "D2"], "rows": ["D0", "D1", "B1", "B2", "E6", "B3"] diff --git a/keyboards/treasure/type9/config.h b/keyboards/treasure/type9/config.h deleted file mode 100644 index d876570c808..00000000000 --- a/keyboards/treasure/type9/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 MechMerlin - -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/treasure/type9/keyboard.json b/keyboards/treasure/type9/keyboard.json index 2970c012967..0c1ee1987ad 100644 --- a/keyboards/treasure/type9/keyboard.json +++ b/keyboards/treasure/type9/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D0", "D4"], "rows": ["E6", "D7", "C6"] diff --git a/keyboards/tszaboo/ortho4exent/config.h b/keyboards/tszaboo/ortho4exent/config.h deleted file mode 100644 index ec16cc36b10..00000000000 --- a/keyboards/tszaboo/ortho4exent/config.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -Copyright 2021 tszaboo - -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 - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/tszaboo/ortho4exent/keyboard.json b/keyboards/tszaboo/ortho4exent/keyboard.json index 8aa0a34cd7a..83d7348d1ec 100644 --- a/keyboards/tszaboo/ortho4exent/keyboard.json +++ b/keyboards/tszaboo/ortho4exent/keyboard.json @@ -41,6 +41,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D6", "D5", "D3", "D2", "D1", "B7", "B3", "B2"], "rows": ["B0", "B1", "D4", "D7", "B4"] From f37f27f02a55f750c21f671e712e3f704ba57885 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 23 May 2024 11:49:30 -0700 Subject: [PATCH 321/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: O (#23778) Affects: - `oddball` - `oddforge/vea` - `ok60` - `om60` - `omkbd/ergodash/mini` - `omkbd/ergodash/rev1` - `omkbd/runner3680/3x6` - `omkbd/runner3680/3x7` - `omkbd/runner3680/3x8` - `omkbd/runner3680/4x6` - `omkbd/runner3680/4x7` - `omkbd/runner3680/4x8` - `omkbd/runner3680/5x6` - `omkbd/runner3680/5x6_5x8` - `omkbd/runner3680/5x7` - `omkbd/runner3680/5x8` - `omnikeyish` - `orange75` - `org60` - `ortho5by12` - `orthocode` --- keyboards/oddball/config.h | 5 ---- keyboards/oddball/info.json | 6 +++++ keyboards/oddforge/vea/config.h | 3 --- keyboards/oddforge/vea/keyboard.json | 6 +++++ keyboards/ok60/config.h | 24 ------------------- keyboards/ok60/keyboard.json | 6 +++++ keyboards/om60/config.h | 5 ---- keyboards/om60/keyboard.json | 6 ++++- keyboards/omkbd/ergodash/mini/config.h | 5 ---- keyboards/omkbd/ergodash/mini/keyboard.json | 6 +++++ keyboards/omkbd/ergodash/rev1/config.h | 5 ---- keyboards/omkbd/ergodash/rev1/keyboard.json | 6 +++++ keyboards/omkbd/runner3680/3x6/config.h | 5 ---- keyboards/omkbd/runner3680/3x6/keyboard.json | 6 +++++ keyboards/omkbd/runner3680/3x7/config.h | 5 ---- keyboards/omkbd/runner3680/3x7/keyboard.json | 6 +++++ keyboards/omkbd/runner3680/3x8/config.h | 5 ---- keyboards/omkbd/runner3680/3x8/keyboard.json | 6 +++++ keyboards/omkbd/runner3680/4x6/config.h | 5 ---- keyboards/omkbd/runner3680/4x6/keyboard.json | 6 +++++ keyboards/omkbd/runner3680/4x7/config.h | 5 ---- keyboards/omkbd/runner3680/4x7/keyboard.json | 6 +++++ keyboards/omkbd/runner3680/4x8/config.h | 5 ---- keyboards/omkbd/runner3680/4x8/keyboard.json | 6 +++++ keyboards/omkbd/runner3680/5x6/config.h | 5 ---- keyboards/omkbd/runner3680/5x6/keyboard.json | 6 +++++ keyboards/omkbd/runner3680/5x6_5x8/config.h | 5 ---- .../omkbd/runner3680/5x6_5x8/keyboard.json | 6 +++++ keyboards/omkbd/runner3680/5x7/config.h | 5 ---- keyboards/omkbd/runner3680/5x7/keyboard.json | 6 +++++ keyboards/omkbd/runner3680/5x8/config.h | 5 ---- keyboards/omkbd/runner3680/5x8/keyboard.json | 6 +++++ keyboards/omnikeyish/config.h | 6 ----- keyboards/omnikeyish/keyboard.json | 6 +++++ keyboards/orange75/config.h | 7 ------ keyboards/orange75/keyboard.json | 6 +++++ keyboards/org60/config.h | 23 ------------------ keyboards/org60/keyboard.json | 6 +++++ keyboards/ortho5by12/config.h | 20 ---------------- keyboards/ortho5by12/keyboard.json | 6 +++++ keyboards/orthocode/config.h | 22 ----------------- keyboards/orthocode/keyboard.json | 6 ++++- 42 files changed, 124 insertions(+), 177 deletions(-) delete mode 100644 keyboards/ok60/config.h delete mode 100644 keyboards/orange75/config.h delete mode 100644 keyboards/org60/config.h delete mode 100644 keyboards/ortho5by12/config.h delete mode 100644 keyboards/orthocode/config.h diff --git a/keyboards/oddball/config.h b/keyboards/oddball/config.h index 71c4ecd4dbb..73d4cbe862a 100644 --- a/keyboards/oddball/config.h +++ b/keyboards/oddball/config.h @@ -21,11 +21,6 @@ #define SPLIT_USB_DETECT #define MASTER_RIGHT -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* optical sensor settings */ #define SCROLL_DIVIDER 12 #define CPI_1 2000 diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json index fdbb8b2b1db..3e6ffb0a90f 100644 --- a/keyboards/oddball/info.json +++ b/keyboards/oddball/info.json @@ -15,6 +15,12 @@ "nkro": false, "pointing_device": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split": { "enabled": true }, diff --git a/keyboards/oddforge/vea/config.h b/keyboards/oddforge/vea/config.h index 316f8392c0d..c31783065cb 100644 --- a/keyboards/oddforge/vea/config.h +++ b/keyboards/oddforge/vea/config.h @@ -21,7 +21,4 @@ along with this program. If not, see . #define MATRIX_ROWS 8 #define MATRIX_COLS 15 -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 9 diff --git a/keyboards/oddforge/vea/keyboard.json b/keyboards/oddforge/vea/keyboard.json index 6a6780ea53c..a93f843aa06 100644 --- a/keyboards/oddforge/vea/keyboard.json +++ b/keyboards/oddforge/vea/keyboard.json @@ -15,6 +15,12 @@ "mousekey": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "D4" }, diff --git a/keyboards/ok60/config.h b/keyboards/ok60/config.h deleted file mode 100644 index 74f7ff51815..00000000000 --- a/keyboards/ok60/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2018 Edward Browncross - -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 diff --git a/keyboards/ok60/keyboard.json b/keyboards/ok60/keyboard.json index f6459907bea..5cf55b666d6 100644 --- a/keyboards/ok60/keyboard.json +++ b/keyboards/ok60/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "B6", "C6", "C7", "F1", "F0", "E6", "B3", "B2", "B1", "B0"], "rows": ["B5", "B4", "D7", "D6", "D4"] diff --git a/keyboards/om60/config.h b/keyboards/om60/config.h index e5c8d9426ab..1a6dfd12813 100644 --- a/keyboards/om60/config.h +++ b/keyboards/om60/config.h @@ -29,11 +29,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, E6 } -/* 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 - #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 90 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/om60/keyboard.json b/keyboards/om60/keyboard.json index 22386db039a..08eb898b014 100644 --- a/keyboards/om60/keyboard.json +++ b/keyboards/om60/keyboard.json @@ -22,7 +22,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "rgblight": { "hue_steps": 10, diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h index 26543ebb9df..12b408ff562 100644 --- a/keyboards/omkbd/ergodash/mini/config.h +++ b/keyboards/omkbd/ergodash/mini/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define AUDIO_PIN C6 -/* 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 SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/omkbd/ergodash/mini/keyboard.json b/keyboards/omkbd/ergodash/mini/keyboard.json index 04233261779..6286b73b90d 100644 --- a/keyboards/omkbd/ergodash/mini/keyboard.json +++ b/keyboards/omkbd/ergodash/mini/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h index 26543ebb9df..12b408ff562 100644 --- a/keyboards/omkbd/ergodash/rev1/config.h +++ b/keyboards/omkbd/ergodash/rev1/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define AUDIO_PIN C6 -/* 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 SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/omkbd/ergodash/rev1/keyboard.json b/keyboards/omkbd/ergodash/rev1/keyboard.json index 07405e22f72..fb4a1c22549 100644 --- a/keyboards/omkbd/ergodash/rev1/keyboard.json +++ b/keyboards/omkbd/ergodash/rev1/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/omkbd/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h index c0a755e251b..2b0210d2be2 100644 --- a/keyboards/omkbd/runner3680/3x6/config.h +++ b/keyboards/omkbd/runner3680/3x6/config.h @@ -16,11 +16,6 @@ #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 SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/omkbd/runner3680/3x6/keyboard.json b/keyboards/omkbd/runner3680/3x6/keyboard.json index f2a169d2288..3e1ab5ba824 100644 --- a/keyboards/omkbd/runner3680/3x6/keyboard.json +++ b/keyboards/omkbd/runner3680/3x6/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7"] diff --git a/keyboards/omkbd/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h index c0a755e251b..2b0210d2be2 100644 --- a/keyboards/omkbd/runner3680/3x7/config.h +++ b/keyboards/omkbd/runner3680/3x7/config.h @@ -16,11 +16,6 @@ #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 SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/omkbd/runner3680/3x7/keyboard.json b/keyboards/omkbd/runner3680/3x7/keyboard.json index e4b36983e73..496be949256 100644 --- a/keyboards/omkbd/runner3680/3x7/keyboard.json +++ b/keyboards/omkbd/runner3680/3x7/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7"] diff --git a/keyboards/omkbd/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h index c0a755e251b..2b0210d2be2 100644 --- a/keyboards/omkbd/runner3680/3x8/config.h +++ b/keyboards/omkbd/runner3680/3x8/config.h @@ -16,11 +16,6 @@ #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 SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/omkbd/runner3680/3x8/keyboard.json b/keyboards/omkbd/runner3680/3x8/keyboard.json index e001332796c..80719fd0e47 100644 --- a/keyboards/omkbd/runner3680/3x8/keyboard.json +++ b/keyboards/omkbd/runner3680/3x8/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7"] diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h index c0a755e251b..2b0210d2be2 100644 --- a/keyboards/omkbd/runner3680/4x6/config.h +++ b/keyboards/omkbd/runner3680/4x6/config.h @@ -16,11 +16,6 @@ #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 SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/omkbd/runner3680/4x6/keyboard.json b/keyboards/omkbd/runner3680/4x6/keyboard.json index 6568a9e845e..f9d3146a785 100644 --- a/keyboards/omkbd/runner3680/4x6/keyboard.json +++ b/keyboards/omkbd/runner3680/4x6/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/omkbd/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h index c0a755e251b..2b0210d2be2 100644 --- a/keyboards/omkbd/runner3680/4x7/config.h +++ b/keyboards/omkbd/runner3680/4x7/config.h @@ -16,11 +16,6 @@ #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 SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/omkbd/runner3680/4x7/keyboard.json b/keyboards/omkbd/runner3680/4x7/keyboard.json index 88f3bdd18de..120e254e5cc 100644 --- a/keyboards/omkbd/runner3680/4x7/keyboard.json +++ b/keyboards/omkbd/runner3680/4x7/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/omkbd/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h index c0a755e251b..2b0210d2be2 100644 --- a/keyboards/omkbd/runner3680/4x8/config.h +++ b/keyboards/omkbd/runner3680/4x8/config.h @@ -16,11 +16,6 @@ #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 SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/omkbd/runner3680/4x8/keyboard.json b/keyboards/omkbd/runner3680/4x8/keyboard.json index 1ee1d482c92..e0b91088da0 100644 --- a/keyboards/omkbd/runner3680/4x8/keyboard.json +++ b/keyboards/omkbd/runner3680/4x8/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/omkbd/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h index c0a755e251b..2b0210d2be2 100644 --- a/keyboards/omkbd/runner3680/5x6/config.h +++ b/keyboards/omkbd/runner3680/5x6/config.h @@ -16,11 +16,6 @@ #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 SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/omkbd/runner3680/5x6/keyboard.json b/keyboards/omkbd/runner3680/5x6/keyboard.json index 28fddf18738..c06bff537fb 100644 --- a/keyboards/omkbd/runner3680/5x6/keyboard.json +++ b/keyboards/omkbd/runner3680/5x6/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h index 8cf1e8238d3..b6f3f5ff865 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/config.h +++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h @@ -16,11 +16,6 @@ #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 SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json b/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json index 8a7b34597e1..4c359b27ebd 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json +++ b/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x5658", "device_version": "0.0.5" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgb_matrix": { "driver": "ws2812", "split_count": [30, 40] diff --git a/keyboards/omkbd/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h index c0a755e251b..2b0210d2be2 100644 --- a/keyboards/omkbd/runner3680/5x7/config.h +++ b/keyboards/omkbd/runner3680/5x7/config.h @@ -16,11 +16,6 @@ #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 SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/omkbd/runner3680/5x7/keyboard.json b/keyboards/omkbd/runner3680/5x7/keyboard.json index 10a833a839e..55936eb9d36 100644 --- a/keyboards/omkbd/runner3680/5x7/keyboard.json +++ b/keyboards/omkbd/runner3680/5x7/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/omkbd/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h index c0a755e251b..2b0210d2be2 100644 --- a/keyboards/omkbd/runner3680/5x8/config.h +++ b/keyboards/omkbd/runner3680/5x8/config.h @@ -16,11 +16,6 @@ #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 SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/omkbd/runner3680/5x8/keyboard.json b/keyboards/omkbd/runner3680/5x8/keyboard.json index 8b2ca0142ce..9e96e69bbb8 100644 --- a/keyboards/omkbd/runner3680/5x8/keyboard.json +++ b/keyboards/omkbd/runner3680/5x8/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0000", "device_version": "0.0.5" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/omnikeyish/config.h b/keyboards/omnikeyish/config.h index c4edb8427c6..ad307854e03 100644 --- a/keyboards/omnikeyish/config.h +++ b/keyboards/omnikeyish/config.h @@ -14,12 +14,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -/* 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 DYNAMIC_MACRO_COUNT 12 #define DYNAMIC_MACRO_SIZE 48 #define DYNAMIC_MACRO_EEPROM_STORAGE diff --git a/keyboards/omnikeyish/keyboard.json b/keyboards/omnikeyish/keyboard.json index cd61f2954bb..82363b10bfa 100644 --- a/keyboards/omnikeyish/keyboard.json +++ b/keyboards/omnikeyish/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "E1", "num_lock": "E0", diff --git a/keyboards/orange75/config.h b/keyboards/orange75/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/orange75/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/orange75/keyboard.json b/keyboards/orange75/keyboard.json index 4208cc0f586..a0ef8196513 100644 --- a/keyboards/orange75/keyboard.json +++ b/keyboards/orange75/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "B7", "B3"], "rows": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B4", "D7", "D4", "D5", "D6"] diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h deleted file mode 100644 index 4e596948184..00000000000 --- a/keyboards/org60/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 diff --git a/keyboards/org60/keyboard.json b/keyboards/org60/keyboard.json index d4994346af2..2586d16b083 100644 --- a/keyboards/org60/keyboard.json +++ b/keyboards/org60/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/ortho5by12/config.h b/keyboards/ortho5by12/config.h deleted file mode 100644 index 2e979809874..00000000000 --- a/keyboards/ortho5by12/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2019 Takuya Urakawa (dm9records.com) -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#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/ortho5by12/keyboard.json b/keyboards/ortho5by12/keyboard.json index c45788ba2fe..49ce4944175 100644 --- a/keyboards/ortho5by12/keyboard.json +++ b/keyboards/ortho5by12/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C2", "D0", "D1", "D4", "C3", "C1"], "rows": ["B5", "B1", "B2", "B3", "B4", "C0", "D5", "D6", "D7", "B0"] diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h deleted file mode 100644 index 3cc80db3764..00000000000 --- a/keyboards/orthocode/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/*Copyright 2020 Jrodna - -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 diff --git a/keyboards/orthocode/keyboard.json b/keyboards/orthocode/keyboard.json index 69f3374b27f..11c720c6b1d 100644 --- a/keyboards/orthocode/keyboard.json +++ b/keyboards/orthocode/keyboard.json @@ -31,7 +31,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "rgblight": { "saturation_steps": 8, From bfa05cc5e7a41c0291690516c2954aaefde7d9b9 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 23 May 2024 11:49:48 -0700 Subject: [PATCH 322/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: P, Part 1 (#23779) Affects: - `p3d/eu_isolation` - `p3d/glitch` - `p3d/q4z` - `p3d/synapse` - `p3d/tw40` - `panc40` - `papercranekeyboards/gerald65` - `parallel/parallel_65/hotswap` - `parallel/parallel_65/soldered` - `pdxkbc` - `pearlboards/atlas` - `pearlboards/pandora` - `pearlboards/pearl` - `pearlboards/zeus` - `pearlboards/zeuspad` - `pegasus` - `phantom` - `phoenix` - `picolab/frusta_fundamental` - `pimentoso/paddino02/rev1` - `pimentoso/paddino02/rev2/left` - `pimentoso/paddino02/rev2/right` - `pisces` - `pizzakeyboards/pizza65` - `pkb65` - `planck` - `playkbtw/ca66` - `playkbtw/pk60` - `playkbtw/pk64rgb` - `pluckey` - `plume/plume65` - `plywrks/ahgase` - `plywrks/lune` - `pohjolaworks/louhi` - `polycarbdiet/s20` - `pom_keyboards/tnln95` - `portal_66/hotswap` - `portal_66/soldered` - `pos78` --- keyboards/p3d/eu_isolation/config.h | 21 ---------- keyboards/p3d/eu_isolation/keyboard.json | 6 +++ keyboards/p3d/glitch/config.h | 34 ---------------- keyboards/p3d/glitch/keyboard.json | 6 +++ keyboards/p3d/q4z/config.h | 21 ---------- keyboards/p3d/q4z/keyboard.json | 6 +++ keyboards/p3d/synapse/config.h | 19 --------- keyboards/p3d/synapse/keyboard.json | 6 +++ keyboards/p3d/tw40/config.h | 22 ----------- keyboards/p3d/tw40/keyboard.json | 6 +++ keyboards/panc40/config.h | 7 ---- keyboards/panc40/keyboard.json | 6 +++ .../papercranekeyboards/gerald65/config.h | 25 ------------ .../gerald65/keyboard.json | 6 +++ .../parallel/parallel_65/hotswap/config.h | 39 ------------------- .../parallel_65/hotswap/keyboard.json | 6 +++ .../parallel/parallel_65/soldered/config.h | 39 ------------------- .../parallel_65/soldered/keyboard.json | 6 +++ keyboards/pdxkbc/config.h | 39 ------------------- keyboards/pdxkbc/keyboard.json | 6 +++ keyboards/pearlboards/atlas/config.h | 6 --- keyboards/pearlboards/atlas/keyboard.json | 6 +++ keyboards/pearlboards/pandora/config.h | 24 ------------ keyboards/pearlboards/pandora/keyboard.json | 6 +++ keyboards/pearlboards/pearl/config.h | 6 --- keyboards/pearlboards/pearl/keyboard.json | 6 +++ keyboards/pearlboards/zeus/config.h | 6 --- keyboards/pearlboards/zeus/keyboard.json | 6 +++ keyboards/pearlboards/zeuspad/config.h | 6 --- keyboards/pearlboards/zeuspad/keyboard.json | 6 +++ keyboards/pegasus/config.h | 39 ------------------- keyboards/pegasus/keyboard.json | 6 +++ keyboards/phantom/config.h | 39 ------------------- keyboards/phantom/keyboard.json | 6 +++ keyboards/phoenix/config.h | 3 -- keyboards/phoenix/keyboard.json | 6 +++ keyboards/picolab/frusta_fundamental/config.h | 23 ----------- .../picolab/frusta_fundamental/keyboard.json | 6 +++ keyboards/pimentoso/paddino02/rev1/config.h | 7 ---- .../pimentoso/paddino02/rev1/keyboard.json | 6 +++ .../pimentoso/paddino02/rev2/left/config.h | 7 ---- .../paddino02/rev2/left/keyboard.json | 6 +++ .../pimentoso/paddino02/rev2/right/config.h | 7 ---- .../paddino02/rev2/right/keyboard.json | 6 +++ keyboards/pisces/config.h | 5 --- keyboards/pisces/keyboard.json | 6 +++ keyboards/pizzakeyboards/pizza65/config.h | 28 ------------- .../pizzakeyboards/pizza65/keyboard.json | 6 +++ keyboards/pkb65/config.h | 28 ------------- keyboards/pkb65/keyboard.json | 6 +++ keyboards/planck/config.h | 5 --- keyboards/planck/info.json | 8 +++- keyboards/playkbtw/ca66/config.h | 7 ---- keyboards/playkbtw/ca66/keyboard.json | 6 +++ keyboards/playkbtw/pk60/config.h | 7 ---- keyboards/playkbtw/pk60/keyboard.json | 6 +++ keyboards/playkbtw/pk64rgb/config.h | 5 --- keyboards/playkbtw/pk64rgb/keyboard.json | 6 +++ keyboards/pluckey/config.h | 39 ------------------- keyboards/pluckey/keyboard.json | 6 +++ keyboards/plume/plume65/config.h | 38 ------------------ keyboards/plume/plume65/keyboard.json | 6 +++ keyboards/plywrks/ahgase/config.h | 23 ----------- keyboards/plywrks/ahgase/keyboard.json | 6 +++ keyboards/plywrks/lune/config.h | 23 ----------- keyboards/plywrks/lune/keyboard.json | 6 +++ keyboards/pohjolaworks/louhi/config.h | 39 ------------------- keyboards/pohjolaworks/louhi/keyboard.json | 6 +++ keyboards/polycarbdiet/s20/config.h | 22 ----------- keyboards/polycarbdiet/s20/keyboard.json | 6 +++ keyboards/pom_keyboards/tnln95/config.h | 22 ----------- keyboards/pom_keyboards/tnln95/keyboard.json | 6 +++ keyboards/portal_66/hotswap/config.h | 39 ------------------- keyboards/portal_66/hotswap/keyboard.json | 6 +++ keyboards/portal_66/soldered/config.h | 39 ------------------- keyboards/portal_66/soldered/keyboard.json | 6 +++ keyboards/pos78/config.h | 39 ------------------- keyboards/pos78/keyboard.json | 6 +++ 78 files changed, 235 insertions(+), 848 deletions(-) delete mode 100644 keyboards/p3d/eu_isolation/config.h delete mode 100644 keyboards/p3d/glitch/config.h delete mode 100644 keyboards/p3d/q4z/config.h delete mode 100644 keyboards/p3d/synapse/config.h delete mode 100644 keyboards/p3d/tw40/config.h delete mode 100644 keyboards/panc40/config.h delete mode 100644 keyboards/papercranekeyboards/gerald65/config.h delete mode 100644 keyboards/parallel/parallel_65/hotswap/config.h delete mode 100644 keyboards/parallel/parallel_65/soldered/config.h delete mode 100644 keyboards/pdxkbc/config.h delete mode 100644 keyboards/pearlboards/pandora/config.h delete mode 100644 keyboards/pegasus/config.h delete mode 100644 keyboards/phantom/config.h delete mode 100644 keyboards/picolab/frusta_fundamental/config.h delete mode 100755 keyboards/pimentoso/paddino02/rev1/config.h delete mode 100755 keyboards/pimentoso/paddino02/rev2/left/config.h delete mode 100755 keyboards/pimentoso/paddino02/rev2/right/config.h delete mode 100644 keyboards/pizzakeyboards/pizza65/config.h delete mode 100644 keyboards/pkb65/config.h delete mode 100644 keyboards/playkbtw/ca66/config.h delete mode 100644 keyboards/playkbtw/pk60/config.h delete mode 100644 keyboards/pluckey/config.h delete mode 100644 keyboards/plume/plume65/config.h delete mode 100644 keyboards/plywrks/ahgase/config.h delete mode 100644 keyboards/plywrks/lune/config.h delete mode 100644 keyboards/pohjolaworks/louhi/config.h delete mode 100644 keyboards/polycarbdiet/s20/config.h delete mode 100644 keyboards/pom_keyboards/tnln95/config.h delete mode 100644 keyboards/portal_66/hotswap/config.h delete mode 100644 keyboards/portal_66/soldered/config.h delete mode 100644 keyboards/pos78/config.h diff --git a/keyboards/p3d/eu_isolation/config.h b/keyboards/p3d/eu_isolation/config.h deleted file mode 100644 index de7206efe2a..00000000000 --- a/keyboards/p3d/eu_isolation/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Austin "TuckTuckFloof" Ashmore -* -* 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 diff --git a/keyboards/p3d/eu_isolation/keyboard.json b/keyboards/p3d/eu_isolation/keyboard.json index a94ee990ad2..715515c42d3 100644 --- a/keyboards/p3d/eu_isolation/keyboard.json +++ b/keyboards/p3d/eu_isolation/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], "rows": ["D2", "D3", "F1", "F0"] diff --git a/keyboards/p3d/glitch/config.h b/keyboards/p3d/glitch/config.h deleted file mode 100644 index 0fc3805ff7f..00000000000 --- a/keyboards/p3d/glitch/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2021 Matthew Dias - -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 diff --git a/keyboards/p3d/glitch/keyboard.json b/keyboards/p3d/glitch/keyboard.json index 366707f807d..5de1405f4ff 100644 --- a/keyboards/p3d/glitch/keyboard.json +++ b/keyboards/p3d/glitch/keyboard.json @@ -20,6 +20,12 @@ "oled": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "D2", "B3", "B7", "F5", "F4", "F1", "F0"], "rows": ["D5", "D6", "B6", "D7", "C7", "B4", "B5", "D3", "D4", "C6"] diff --git a/keyboards/p3d/q4z/config.h b/keyboards/p3d/q4z/config.h deleted file mode 100644 index 67553a44320..00000000000 --- a/keyboards/p3d/q4z/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 rjboone - * - * 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 diff --git a/keyboards/p3d/q4z/keyboard.json b/keyboards/p3d/q4z/keyboard.json index 0b71df61b3a..9dfa123c6c1 100644 --- a/keyboards/p3d/q4z/keyboard.json +++ b/keyboards/p3d/q4z/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], "rows": ["F4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/p3d/synapse/config.h b/keyboards/p3d/synapse/config.h deleted file mode 100644 index 9f86bdabd72..00000000000 --- a/keyboards/p3d/synapse/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 qpockets - * - * 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 - -#define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/p3d/synapse/keyboard.json b/keyboards/p3d/synapse/keyboard.json index 277be632a5a..accd9ad47ed 100644 --- a/keyboards/p3d/synapse/keyboard.json +++ b/keyboards/p3d/synapse/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": false + } + }, "matrix_pins": { "cols": ["F0", "D4", "F5", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "B6"], "rows": ["E6", "B0", "F4", "F1"] diff --git a/keyboards/p3d/tw40/config.h b/keyboards/p3d/tw40/config.h deleted file mode 100644 index 99549d9efa1..00000000000 --- a/keyboards/p3d/tw40/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 KnoblesseOblige - -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 - -#define LOCKING_SUPPORT_ENABLE - -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/p3d/tw40/keyboard.json b/keyboards/p3d/tw40/keyboard.json index 356b610b2a5..459e187533d 100644 --- a/keyboards/p3d/tw40/keyboard.json +++ b/keyboards/p3d/tw40/keyboard.json @@ -35,6 +35,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B0", "D5", "D3", "D2"] diff --git a/keyboards/panc40/config.h b/keyboards/panc40/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/panc40/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/panc40/keyboard.json b/keyboards/panc40/keyboard.json index c1867903f9a..fe98da7f2e8 100644 --- a/keyboards/panc40/keyboard.json +++ b/keyboards/panc40/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D0", "D1"], "rows": ["F0", "F1", "F4", "F5"] diff --git a/keyboards/papercranekeyboards/gerald65/config.h b/keyboards/papercranekeyboards/gerald65/config.h deleted file mode 100644 index 7848476216d..00000000000 --- a/keyboards/papercranekeyboards/gerald65/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2021 PaperCraneKeyboards (@PaperCraneKeyboards) -// 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 - -/* - * 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/papercranekeyboards/gerald65/keyboard.json b/keyboards/papercranekeyboards/gerald65/keyboard.json index 1d2c8d40ae2..255727d508c 100644 --- a/keyboards/papercranekeyboards/gerald65/keyboard.json +++ b/keyboards/papercranekeyboards/gerald65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D7", "D4", "D3", "D2", "D1", "D0", "B6", "C6", "C7"], "rows": ["B7", "D6", "E6", "B4", "B5"] diff --git a/keyboards/parallel/parallel_65/hotswap/config.h b/keyboards/parallel/parallel_65/hotswap/config.h deleted file mode 100644 index 4dfd5e1d021..00000000000 --- a/keyboards/parallel/parallel_65/hotswap/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Matthew Dias - -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/parallel/parallel_65/hotswap/keyboard.json b/keyboards/parallel/parallel_65/hotswap/keyboard.json index 1f59cd5734c..8b1e31191f9 100644 --- a/keyboards/parallel/parallel_65/hotswap/keyboard.json +++ b/keyboards/parallel/parallel_65/hotswap/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/parallel/parallel_65/soldered/config.h b/keyboards/parallel/parallel_65/soldered/config.h deleted file mode 100644 index 4dfd5e1d021..00000000000 --- a/keyboards/parallel/parallel_65/soldered/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Matthew Dias - -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/parallel/parallel_65/soldered/keyboard.json b/keyboards/parallel/parallel_65/soldered/keyboard.json index fe87fb84449..2e8d049dbf6 100644 --- a/keyboards/parallel/parallel_65/soldered/keyboard.json +++ b/keyboards/parallel/parallel_65/soldered/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/pdxkbc/config.h b/keyboards/pdxkbc/config.h deleted file mode 100644 index 2f8b6d1f5b3..00000000000 --- a/keyboards/pdxkbc/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Franklin Harding - -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/pdxkbc/keyboard.json b/keyboards/pdxkbc/keyboard.json index 2585c7ab389..642adc08787 100644 --- a/keyboards/pdxkbc/keyboard.json +++ b/keyboards/pdxkbc/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "E6"], "rows": ["F7", "B6", "F4"] diff --git a/keyboards/pearlboards/atlas/config.h b/keyboards/pearlboards/atlas/config.h index 6fbdda292b5..32f04f16ead 100644 --- a/keyboards/pearlboards/atlas/config.h +++ b/keyboards/pearlboards/atlas/config.h @@ -28,9 +28,3 @@ along with this program. If not, see . /* Motor settings */ #define DRV2605L_RATED_VOLTAGE 3 #define DRV2605L_V_PEAK 5 - -/* 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/pearlboards/atlas/keyboard.json b/keyboards/pearlboards/atlas/keyboard.json index 714a344c33a..6886885e03b 100644 --- a/keyboards/pearlboards/atlas/keyboard.json +++ b/keyboards/pearlboards/atlas/keyboard.json @@ -21,6 +21,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D4", "C1", "C2", "C3", "C5", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7"], "rows": ["D6", "E1", "C0", "C4", "E3"] diff --git a/keyboards/pearlboards/pandora/config.h b/keyboards/pearlboards/pandora/config.h deleted file mode 100644 index 7efef3364bf..00000000000 --- a/keyboards/pearlboards/pandora/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Koobaczech - -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 diff --git a/keyboards/pearlboards/pandora/keyboard.json b/keyboards/pearlboards/pandora/keyboard.json index 944e696edec..869852b58d6 100644 --- a/keyboards/pearlboards/pandora/keyboard.json +++ b/keyboards/pearlboards/pandora/keyboard.json @@ -22,6 +22,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D1", "D0", "D3", "D5", "B5", "B6", "B7", "D4", "C6", "C7", "F0", "F1", "F4", "F7"], "rows": ["B4", "D7", "D6", "B3", "B0"] diff --git a/keyboards/pearlboards/pearl/config.h b/keyboards/pearlboards/pearl/config.h index e0ed66359a6..1667a0ad29a 100644 --- a/keyboards/pearlboards/pearl/config.h +++ b/keyboards/pearlboards/pearl/config.h @@ -28,9 +28,3 @@ along with this program. If not, see . /* Motor settings */ #define DRV2605L_RATED_VOLTAGE 3 #define DRV2605L_V_PEAK 5 - -/* 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/pearlboards/pearl/keyboard.json b/keyboards/pearlboards/pearl/keyboard.json index 0dc6f9a7a5e..e91192475f5 100644 --- a/keyboards/pearlboards/pearl/keyboard.json +++ b/keyboards/pearlboards/pearl/keyboard.json @@ -20,6 +20,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "F1", "F4", "F5", "F6", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], "rows": ["D3", "F7", "F0", "E6"] diff --git a/keyboards/pearlboards/zeus/config.h b/keyboards/pearlboards/zeus/config.h index ae2ca44ab55..2c24e86511e 100644 --- a/keyboards/pearlboards/zeus/config.h +++ b/keyboards/pearlboards/zeus/config.h @@ -32,9 +32,3 @@ along with this program. If not, see . /* Motor settings */ #define DRV2605L_RATED_VOLTAGE 2 #define DRV2605L_V_PEAK 5 - -/* 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/pearlboards/zeus/keyboard.json b/keyboards/pearlboards/zeus/keyboard.json index 43639179509..9a3e7ead5fa 100644 --- a/keyboards/pearlboards/zeus/keyboard.json +++ b/keyboards/pearlboards/zeus/keyboard.json @@ -21,6 +21,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C2", "C0"], "rows": ["F0", "C1", "E1", "E0", "D7", "D6"] diff --git a/keyboards/pearlboards/zeuspad/config.h b/keyboards/pearlboards/zeuspad/config.h index c012875d68c..5c7c79c433d 100644 --- a/keyboards/pearlboards/zeuspad/config.h +++ b/keyboards/pearlboards/zeuspad/config.h @@ -23,9 +23,3 @@ along with this program. If not, see . /* Audio Function */ #define AUDIO_CLICKY #define AUDIO_PIN C6 - -/* 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/pearlboards/zeuspad/keyboard.json b/keyboards/pearlboards/zeuspad/keyboard.json index 641840e4e55..6f67bd74b08 100644 --- a/keyboards/pearlboards/zeuspad/keyboard.json +++ b/keyboards/pearlboards/zeuspad/keyboard.json @@ -22,6 +22,12 @@ "oled": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "F0", "F5", "F6"], "rows": ["D2", "D3", "D5", "F7", "F4", "F1"] diff --git a/keyboards/pegasus/config.h b/keyboards/pegasus/config.h deleted file mode 100644 index de6628cfbd8..00000000000 --- a/keyboards/pegasus/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 melonbred - -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/pegasus/keyboard.json b/keyboards/pegasus/keyboard.json index d5d2172ee0d..4de1631379e 100644 --- a/keyboards/pegasus/keyboard.json +++ b/keyboards/pegasus/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5"], "rows": ["F0", "F1", "F4", "E6"] diff --git a/keyboards/phantom/config.h b/keyboards/phantom/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/phantom/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/phantom/keyboard.json b/keyboards/phantom/keyboard.json index ab794b40f09..6f2b99b2b11 100644 --- a/keyboards/phantom/keyboard.json +++ b/keyboards/phantom/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"], "rows": ["B5", "B4", "B3", "B2", "B1", "B0"] diff --git a/keyboards/phoenix/config.h b/keyboards/phoenix/config.h index 92419507312..4903f19f7f1 100644 --- a/keyboards/phoenix/config.h +++ b/keyboards/phoenix/config.h @@ -23,9 +23,6 @@ #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - #define SPLIT_HAND_PIN B9 #define SERIAL_USART_DRIVER SD1 #define SERIAL_USART_TX_PAL_MODE 7 diff --git a/keyboards/phoenix/keyboard.json b/keyboards/phoenix/keyboard.json index b6dd3599662..51be9790fb5 100644 --- a/keyboards/phoenix/keyboard.json +++ b/keyboards/phoenix/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": false, + "resync": true + } + }, "matrix_pins": { "cols": ["B10", "B12", "B13", "B14", "B15", "A8", "A10"], "rows": ["B1", "B0", "A7", "A6", "A5", "B7"] diff --git a/keyboards/picolab/frusta_fundamental/config.h b/keyboards/picolab/frusta_fundamental/config.h deleted file mode 100644 index 916ca10b460..00000000000 --- a/keyboards/picolab/frusta_fundamental/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 PicoLab - * - * 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 diff --git a/keyboards/picolab/frusta_fundamental/keyboard.json b/keyboards/picolab/frusta_fundamental/keyboard.json index 6a47fb13272..56c145e03c6 100644 --- a/keyboards/picolab/frusta_fundamental/keyboard.json +++ b/keyboards/picolab/frusta_fundamental/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7", "D5", "D3", "D2", "D1", "D0"], "rows": ["D4", "D6", "D7", "B4", "B5"] diff --git a/keyboards/pimentoso/paddino02/rev1/config.h b/keyboards/pimentoso/paddino02/rev1/config.h deleted file mode 100755 index 5f360813239..00000000000 --- a/keyboards/pimentoso/paddino02/rev1/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/pimentoso/paddino02/rev1/keyboard.json b/keyboards/pimentoso/paddino02/rev1/keyboard.json index 681cbff9261..74f11ab7ad9 100644 --- a/keyboards/pimentoso/paddino02/rev1/keyboard.json +++ b/keyboards/pimentoso/paddino02/rev1/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["D1", "D0", "D4"] diff --git a/keyboards/pimentoso/paddino02/rev2/left/config.h b/keyboards/pimentoso/paddino02/rev2/left/config.h deleted file mode 100755 index 5f360813239..00000000000 --- a/keyboards/pimentoso/paddino02/rev2/left/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/pimentoso/paddino02/rev2/left/keyboard.json b/keyboards/pimentoso/paddino02/rev2/left/keyboard.json index 30be3a3836e..8ba456e29e1 100644 --- a/keyboards/pimentoso/paddino02/rev2/left/keyboard.json +++ b/keyboards/pimentoso/paddino02/rev2/left/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["D0", "D4", "D1"] diff --git a/keyboards/pimentoso/paddino02/rev2/right/config.h b/keyboards/pimentoso/paddino02/rev2/right/config.h deleted file mode 100755 index 5f360813239..00000000000 --- a/keyboards/pimentoso/paddino02/rev2/right/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/pimentoso/paddino02/rev2/right/keyboard.json b/keyboards/pimentoso/paddino02/rev2/right/keyboard.json index b4021c076de..4da270119b3 100644 --- a/keyboards/pimentoso/paddino02/rev2/right/keyboard.json +++ b/keyboards/pimentoso/paddino02/rev2/right/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1"], "rows": ["F4", "F6", "F5"] diff --git a/keyboards/pisces/config.h b/keyboards/pisces/config.h index cbdce6f83e5..c88e62a824f 100644 --- a/keyboards/pisces/config.h +++ b/keyboards/pisces/config.h @@ -22,8 +22,3 @@ #define MATRIX_MASKED #define SPLIT_USB_DETECT - -/* 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/pisces/keyboard.json b/keyboards/pisces/keyboard.json index 2783f1085fd..afdddfaf4d1 100644 --- a/keyboards/pisces/keyboard.json +++ b/keyboards/pisces/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "B2", "B3", "B4", "B5", "B6", "B7"], "rows": ["C4", "B0", "C7"] diff --git a/keyboards/pizzakeyboards/pizza65/config.h b/keyboards/pizzakeyboards/pizza65/config.h deleted file mode 100644 index 1500ab9b880..00000000000 --- a/keyboards/pizzakeyboards/pizza65/config.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -Copyright 2020 mmonte - -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 - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/pizzakeyboards/pizza65/keyboard.json b/keyboards/pizzakeyboards/pizza65/keyboard.json index 735cae4ac3f..ee0a68dea5c 100644 --- a/keyboards/pizzakeyboards/pizza65/keyboard.json +++ b/keyboards/pizzakeyboards/pizza65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A9", "A8", "F0", "A2", "A3", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A13"], "rows": ["B15", "A10", "F1", "A0", "A1"] diff --git a/keyboards/pkb65/config.h b/keyboards/pkb65/config.h deleted file mode 100644 index 7f37e401190..00000000000 --- a/keyboards/pkb65/config.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - -Copyright 2021 MCKeebs -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 diff --git a/keyboards/pkb65/keyboard.json b/keyboards/pkb65/keyboard.json index 7aea7615650..d645d278b7e 100644 --- a/keyboards/pkb65/keyboard.json +++ b/keyboards/pkb65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["C7", "C6", "B6", "B7", "F0"] diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h index 84c2fd11dcb..469d237b861 100644 --- a/keyboards/planck/config.h +++ b/keyboards/planck/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define AUDIO_VOICES #define AUDIO_PIN C6 -/* 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. diff --git a/keyboards/planck/info.json b/keyboards/planck/info.json index 3f92fa168d4..39e9b3369a5 100644 --- a/keyboards/planck/info.json +++ b/keyboards/planck/info.json @@ -1,4 +1,10 @@ { "url": "https://olkb.com/planck", - "maintainer": "jackhumbert" + "maintainer": "jackhumbert", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + } } diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/playkbtw/ca66/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/playkbtw/ca66/keyboard.json b/keyboards/playkbtw/ca66/keyboard.json index 73a2efe1d30..d94a8d6b4d7 100644 --- a/keyboards/playkbtw/ca66/keyboard.json +++ b/keyboards/playkbtw/ca66/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "F6", "B7", "E6"], "rows": ["F5", "F4", "F1", "B0", "B3"] diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/playkbtw/pk60/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/playkbtw/pk60/keyboard.json b/keyboards/playkbtw/pk60/keyboard.json index a11348d2e6c..15de711ad1c 100644 --- a/keyboards/playkbtw/pk60/keyboard.json +++ b/keyboards/playkbtw/pk60/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h index abcdafdbd00..76f02334b4d 100644 --- a/keyboards/playkbtw/pk64rgb/config.h +++ b/keyboards/playkbtw/pk64rgb/config.h @@ -19,8 +19,3 @@ #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND #define RGB_MATRIX_LED_COUNT 64 - -/* 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/playkbtw/pk64rgb/keyboard.json b/keyboards/playkbtw/pk64rgb/keyboard.json index d3a757d714b..1f200e2089f 100644 --- a/keyboards/playkbtw/pk64rgb/keyboard.json +++ b/keyboards/playkbtw/pk64rgb/keyboard.json @@ -27,6 +27,12 @@ "rgblight": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"], "rows": ["D7", "D6", "D5", "D3", "D2"] diff --git a/keyboards/pluckey/config.h b/keyboards/pluckey/config.h deleted file mode 100644 index fc758dec34e..00000000000 --- a/keyboards/pluckey/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 floookay - -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/pluckey/keyboard.json b/keyboards/pluckey/keyboard.json index 52e951e875c..9517bf54b48 100644 --- a/keyboards/pluckey/keyboard.json +++ b/keyboards/pluckey/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "F7"], "rows": ["B4", "F5", "F6", "B6", "B5"] diff --git a/keyboards/plume/plume65/config.h b/keyboards/plume/plume65/config.h deleted file mode 100644 index 4183c7db05e..00000000000 --- a/keyboards/plume/plume65/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 Evy Dekkers - * - * 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/plume/plume65/keyboard.json b/keyboards/plume/plume65/keyboard.json index f0b6097a186..46f264e43e7 100644 --- a/keyboards/plume/plume65/keyboard.json +++ b/keyboards/plume/plume65/keyboard.json @@ -35,6 +35,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B7", "F7", "C7", "C6", "B6", "F0", "B5", "F1", "B4", "F4", "D7", "F5", "D6", "F6", "D4"], "rows": ["D2", "D5", "E6", "D0", "D1"] diff --git a/keyboards/plywrks/ahgase/config.h b/keyboards/plywrks/ahgase/config.h deleted file mode 100644 index 06b97ae4ab8..00000000000 --- a/keyboards/plywrks/ahgase/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 Ramon Imbao - -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 diff --git a/keyboards/plywrks/ahgase/keyboard.json b/keyboards/plywrks/ahgase/keyboard.json index b98d4f69ee9..9c1da6d5793 100644 --- a/keyboards/plywrks/ahgase/keyboard.json +++ b/keyboards/plywrks/ahgase/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D5", "B0", "B1", "D1"], "rows": ["B2", "B3", "B7", "D6", "D3", "D2"] diff --git a/keyboards/plywrks/lune/config.h b/keyboards/plywrks/lune/config.h deleted file mode 100644 index 06b97ae4ab8..00000000000 --- a/keyboards/plywrks/lune/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 Ramon Imbao - -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 diff --git a/keyboards/plywrks/lune/keyboard.json b/keyboards/plywrks/lune/keyboard.json index 9368627e981..5ec1d97c6bb 100644 --- a/keyboards/plywrks/lune/keyboard.json +++ b/keyboards/plywrks/lune/keyboard.json @@ -36,6 +36,12 @@ "oled": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "D4", "D5", "D3", "D2"], "rows": ["F1", "F0", "B7", "B0", "B6", "B5", "D7", "B4", "D6"] diff --git a/keyboards/pohjolaworks/louhi/config.h b/keyboards/pohjolaworks/louhi/config.h deleted file mode 100644 index 9dbdc010503..00000000000 --- a/keyboards/pohjolaworks/louhi/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Erkki Halinen - -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/pohjolaworks/louhi/keyboard.json b/keyboards/pohjolaworks/louhi/keyboard.json index 7edf1535561..90d7a964336 100644 --- a/keyboards/pohjolaworks/louhi/keyboard.json +++ b/keyboards/pohjolaworks/louhi/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "B6", "F4", "F5", "F6", "F7", "B1"], "rows": ["D3", "D2", "D1", "D0", "D7", "C6", "B4", "E6"] diff --git a/keyboards/polycarbdiet/s20/config.h b/keyboards/polycarbdiet/s20/config.h deleted file mode 100644 index fcff1b29cfc..00000000000 --- a/keyboards/polycarbdiet/s20/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Muhammad Galib (polycarbdiet) - -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 diff --git a/keyboards/polycarbdiet/s20/keyboard.json b/keyboards/polycarbdiet/s20/keyboard.json index e734673ffc6..f87429b4a7a 100644 --- a/keyboards/polycarbdiet/s20/keyboard.json +++ b/keyboards/polycarbdiet/s20/keyboard.json @@ -19,6 +19,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "C7", "D4", "D6"], "rows": ["B7", "E6", "D0", "D1", "D5"] diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h deleted file mode 100644 index d1b911c4c4a..00000000000 --- a/keyboards/pom_keyboards/tnln95/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 Nguyen Minh Hoang - -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 diff --git a/keyboards/pom_keyboards/tnln95/keyboard.json b/keyboards/pom_keyboards/tnln95/keyboard.json index 8e8de4403df..c92ac5b38f1 100644 --- a/keyboards/pom_keyboards/tnln95/keyboard.json +++ b/keyboards/pom_keyboards/tnln95/keyboard.json @@ -21,6 +21,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F1", "F0", "F6", "F7", "D0", "D1", "D2", "D3", "D5"], "rows": ["B6", "B4", "B0", "D7", "E6", "D4", "F5", "D6", "C6", "B5"] diff --git a/keyboards/portal_66/hotswap/config.h b/keyboards/portal_66/hotswap/config.h deleted file mode 100644 index 4dfd5e1d021..00000000000 --- a/keyboards/portal_66/hotswap/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Matthew Dias - -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/portal_66/hotswap/keyboard.json b/keyboards/portal_66/hotswap/keyboard.json index 764d0f62053..266ca516ece 100644 --- a/keyboards/portal_66/hotswap/keyboard.json +++ b/keyboards/portal_66/hotswap/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/portal_66/soldered/config.h b/keyboards/portal_66/soldered/config.h deleted file mode 100644 index 4dfd5e1d021..00000000000 --- a/keyboards/portal_66/soldered/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Matthew Dias - -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/portal_66/soldered/keyboard.json b/keyboards/portal_66/soldered/keyboard.json index 0f0ac6b1844..369a6efa13b 100644 --- a/keyboards/portal_66/soldered/keyboard.json +++ b/keyboards/portal_66/soldered/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/pos78/config.h b/keyboards/pos78/config.h deleted file mode 100644 index 4739dcb2ad3..00000000000 --- a/keyboards/pos78/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 smssmssms - -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/pos78/keyboard.json b/keyboards/pos78/keyboard.json index b9902195e3f..0a6a8141554 100644 --- a/keyboards/pos78/keyboard.json +++ b/keyboards/pos78/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B1", "D2", "D3", "D1", "D0", "C6", "E6", "B5", "B6", "B7", "D6", "C7"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] From c4e182b98e0b072dd97133b71b01f59f0eb07501 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 23 May 2024 11:49:53 -0700 Subject: [PATCH 323/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: P, Part 2 (#23780) Affects: - `preonic/rev1` - `preonic/rev2` - `preonic/rev3` - `preonic/rev3_drop` - `primekb/meridian/ktr1010` - `primekb/meridian/ws2812` - `primekb/meridian_rgb` - `primekb/prime_m` - `primekb/prime_o` - `primekb/prime_r` - `projectcain/relic` - `projectcain/vault45` - `projectd/65/projectd_65_ansi` - `projectd/75/ansi` - `projectkb/alice/rev1` - `projectkb/alice/rev2` - `projectkb/signature65` - `projectkb/signature87` - `prototypist/allison` - `prototypist/allison_numpad` - `prototypist/j01` - `psuieee/pluto12` - `pteron36` - `puck` - `punk75` --- keyboards/preonic/config.h | 5 --- keyboards/preonic/rev1/keyboard.json | 6 +++ keyboards/preonic/rev2/keyboard.json | 6 +++ keyboards/preonic/rev3/keyboard.json | 6 +++ keyboards/preonic/rev3_drop/keyboard.json | 6 +++ keyboards/primekb/meridian/config.h | 5 --- keyboards/primekb/meridian/info.json | 6 +++ keyboards/primekb/meridian/ktr1010/config.h | 5 --- keyboards/primekb/meridian/ws2812/config.h | 5 --- keyboards/primekb/meridian_rgb/config.h | 23 ----------- keyboards/primekb/meridian_rgb/keyboard.json | 6 +++ keyboards/primekb/prime_m/config.h | 24 ------------ keyboards/primekb/prime_m/keyboard.json | 6 +++ keyboards/primekb/prime_o/config.h | 23 ----------- keyboards/primekb/prime_o/keyboard.json | 6 +++ keyboards/primekb/prime_r/config.h | 24 ------------ keyboards/primekb/prime_r/keyboard.json | 6 +++ keyboards/projectcain/relic/config.h | 39 ------------------- keyboards/projectcain/relic/keyboard.json | 6 +++ keyboards/projectcain/vault45/config.h | 39 ------------------- keyboards/projectcain/vault45/keyboard.json | 6 +++ .../projectd/65/projectd_65_ansi/config.h | 5 --- .../65/projectd_65_ansi/keyboard.json | 6 ++- keyboards/projectd/75/ansi/config.h | 5 --- keyboards/projectd/75/ansi/keyboard.json | 6 ++- keyboards/projectkb/alice/rev1/config.h | 5 --- keyboards/projectkb/alice/rev1/keyboard.json | 6 +++ keyboards/projectkb/alice/rev2/config.h | 5 --- keyboards/projectkb/alice/rev2/keyboard.json | 6 +++ keyboards/projectkb/signature65/config.h | 23 ----------- keyboards/projectkb/signature65/keyboard.json | 6 +++ keyboards/projectkb/signature87/config.h | 23 ----------- keyboards/projectkb/signature87/keyboard.json | 6 +++ keyboards/prototypist/allison/config.h | 39 ------------------- keyboards/prototypist/allison/keyboard.json | 6 +++ keyboards/prototypist/allison_numpad/config.h | 39 ------------------- .../prototypist/allison_numpad/keyboard.json | 6 +++ keyboards/prototypist/j01/config.h | 22 ----------- keyboards/prototypist/j01/keyboard.json | 6 +++ keyboards/psuieee/pluto12/config.h | 9 ----- keyboards/psuieee/pluto12/keyboard.json | 6 +++ keyboards/pteron36/config.h | 39 ------------------- keyboards/pteron36/keyboard.json | 6 +++ keyboards/puck/config.h | 4 -- keyboards/puck/keyboard.json | 6 +++ keyboards/punk75/config.h | 5 --- keyboards/punk75/keyboard.json | 6 +++ 47 files changed, 142 insertions(+), 417 deletions(-) delete mode 100644 keyboards/primekb/meridian_rgb/config.h delete mode 100644 keyboards/primekb/prime_m/config.h delete mode 100644 keyboards/primekb/prime_o/config.h delete mode 100644 keyboards/primekb/prime_r/config.h delete mode 100644 keyboards/projectcain/relic/config.h delete mode 100644 keyboards/projectcain/vault45/config.h delete mode 100644 keyboards/projectkb/signature65/config.h delete mode 100644 keyboards/projectkb/signature87/config.h delete mode 100644 keyboards/prototypist/allison/config.h delete mode 100644 keyboards/prototypist/allison_numpad/config.h delete mode 100644 keyboards/prototypist/j01/config.h delete mode 100644 keyboards/psuieee/pluto12/config.h delete mode 100644 keyboards/pteron36/config.h delete mode 100644 keyboards/puck/config.h diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h index 5301e26ab31..c47b9e7ed42 100644 --- a/keyboards/preonic/config.h +++ b/keyboards/preonic/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define AUDIO_VOICES #define AUDIO_PIN C6 -/* 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. diff --git a/keyboards/preonic/rev1/keyboard.json b/keyboards/preonic/rev1/keyboard.json index aa43fe2c474..648dafe5760 100644 --- a/keyboards/preonic/rev1/keyboard.json +++ b/keyboards/preonic/rev1/keyboard.json @@ -19,6 +19,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D2", "D5", "B5", "B6", "D3"] diff --git a/keyboards/preonic/rev2/keyboard.json b/keyboards/preonic/rev2/keyboard.json index 3a6cab1e17b..d24c3db42f6 100644 --- a/keyboards/preonic/rev2/keyboard.json +++ b/keyboards/preonic/rev2/keyboard.json @@ -19,6 +19,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D2", "D5", "B5", "B6", "D3"] diff --git a/keyboards/preonic/rev3/keyboard.json b/keyboards/preonic/rev3/keyboard.json index 472229c0da7..96cebf9ea01 100644 --- a/keyboards/preonic/rev3/keyboard.json +++ b/keyboards/preonic/rev3/keyboard.json @@ -40,6 +40,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "A7", "B0"], "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"] diff --git a/keyboards/preonic/rev3_drop/keyboard.json b/keyboards/preonic/rev3_drop/keyboard.json index f1cf1dfec1f..22374fa5f75 100644 --- a/keyboards/preonic/rev3_drop/keyboard.json +++ b/keyboards/preonic/rev3_drop/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "led_count": 9, "animations": { diff --git a/keyboards/primekb/meridian/config.h b/keyboards/primekb/meridian/config.h index 8593536eecd..c6cf02fc4cf 100644 --- a/keyboards/primekb/meridian/config.h +++ b/keyboards/primekb/meridian/config.h @@ -21,8 +21,3 @@ along with this program. If not, see . #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 #define WS2812_SPI_SCK_PIN B13 - -/* 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/primekb/meridian/info.json b/keyboards/primekb/meridian/info.json index 1e624892119..38358a3a7b3 100644 --- a/keyboards/primekb/meridian/info.json +++ b/keyboards/primekb/meridian/info.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], "rows": ["A6", "A5", "A4", "A3", "A2"] diff --git a/keyboards/primekb/meridian/ktr1010/config.h b/keyboards/primekb/meridian/ktr1010/config.h index 3da9ff72c42..ba56ce49847 100644 --- a/keyboards/primekb/meridian/ktr1010/config.h +++ b/keyboards/primekb/meridian/ktr1010/config.h @@ -24,8 +24,3 @@ along with this program. If not, see . #define WS2812_T0L 975 #define WS2812_T1L 350 #define WS2812_RES_US 100 - -/* 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/primekb/meridian/ws2812/config.h b/keyboards/primekb/meridian/ws2812/config.h index 8593536eecd..c6cf02fc4cf 100644 --- a/keyboards/primekb/meridian/ws2812/config.h +++ b/keyboards/primekb/meridian/ws2812/config.h @@ -21,8 +21,3 @@ along with this program. If not, see . #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 #define WS2812_SPI_SCK_PIN B13 - -/* 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/primekb/meridian_rgb/config.h b/keyboards/primekb/meridian_rgb/config.h deleted file mode 100644 index 66857199142..00000000000 --- a/keyboards/primekb/meridian_rgb/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 Holten Campbell - -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 diff --git a/keyboards/primekb/meridian_rgb/keyboard.json b/keyboards/primekb/meridian_rgb/keyboard.json index 49491b769ad..145d4eeb8bc 100644 --- a/keyboards/primekb/meridian_rgb/keyboard.json +++ b/keyboards/primekb/meridian_rgb/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "D4", "B7", "B3", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "F0", "F6", "D7", "D6"] diff --git a/keyboards/primekb/prime_m/config.h b/keyboards/primekb/prime_m/config.h deleted file mode 100644 index 053bc6236a7..00000000000 --- a/keyboards/primekb/prime_m/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2018 Jumail Mundekkat -Copyright 2020 Holten Campbell - -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 diff --git a/keyboards/primekb/prime_m/keyboard.json b/keyboards/primekb/prime_m/keyboard.json index b63b96bf702..eb06dcdb7ea 100644 --- a/keyboards/primekb/prime_m/keyboard.json +++ b/keyboards/primekb/prime_m/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "C7", "C6", "D2", "D1", "D0"], "rows": ["C5", "B5", "B2", "D5", "D3"] diff --git a/keyboards/primekb/prime_o/config.h b/keyboards/primekb/prime_o/config.h deleted file mode 100644 index 9c9e5754a93..00000000000 --- a/keyboards/primekb/prime_o/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2018 Jumail Mundekkat - -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 diff --git a/keyboards/primekb/prime_o/keyboard.json b/keyboards/primekb/prime_o/keyboard.json index f3b427e148a..04da8ab1343 100644 --- a/keyboards/primekb/prime_o/keyboard.json +++ b/keyboards/primekb/prime_o/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "C7", "C6", "D2", "D1", "D0", "C2"], "rows": ["D4", "D6", "B1", "C5", "B4", "B3", "C4", "B2", "B0", "D5"] diff --git a/keyboards/primekb/prime_r/config.h b/keyboards/primekb/prime_r/config.h deleted file mode 100644 index 2baa495f2c4..00000000000 --- a/keyboards/primekb/prime_r/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2018 Andrew Heaston - -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 diff --git a/keyboards/primekb/prime_r/keyboard.json b/keyboards/primekb/prime_r/keyboard.json index a45db2351a6..b2a7ecec7a8 100644 --- a/keyboards/primekb/prime_r/keyboard.json +++ b/keyboards/primekb/prime_r/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "C7", "C6", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D1", "D0", "B7", "B3", "B2"] diff --git a/keyboards/projectcain/relic/config.h b/keyboards/projectcain/relic/config.h deleted file mode 100644 index 199375c173f..00000000000 --- a/keyboards/projectcain/relic/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 projectcain - -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/projectcain/relic/keyboard.json b/keyboards/projectcain/relic/keyboard.json index 9ebfbf72d45..f9df6770d1f 100644 --- a/keyboards/projectcain/relic/keyboard.json +++ b/keyboards/projectcain/relic/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D5", "B0", "F0", "F1", "F4", "F5", "F6", "C7", "C6", "B4"], "rows": ["D7", "B2", "B6", "B5"] diff --git a/keyboards/projectcain/vault45/config.h b/keyboards/projectcain/vault45/config.h deleted file mode 100644 index 199375c173f..00000000000 --- a/keyboards/projectcain/vault45/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 projectcain - -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/projectcain/vault45/keyboard.json b/keyboards/projectcain/vault45/keyboard.json index d09c8be7641..2ab3e010e71 100644 --- a/keyboards/projectcain/vault45/keyboard.json +++ b/keyboards/projectcain/vault45/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "D5", "D4", "D6", "D7", "B4", "D3", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["C6", "B6", "B5", "C7"] diff --git a/keyboards/projectd/65/projectd_65_ansi/config.h b/keyboards/projectd/65/projectd_65_ansi/config.h index d7f9a52afe4..c8da5c42a7c 100644 --- a/keyboards/projectd/65/projectd_65_ansi/config.h +++ b/keyboards/projectd/65/projectd_65_ansi/config.h @@ -16,11 +16,6 @@ #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 - /* External spi flash */ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14 diff --git a/keyboards/projectd/65/projectd_65_ansi/keyboard.json b/keyboards/projectd/65/projectd_65_ansi/keyboard.json index 9cfe8ffb5d3..5d75389e2a0 100644 --- a/keyboards/projectd/65/projectd_65_ansi/keyboard.json +++ b/keyboards/projectd/65/projectd_65_ansi/keyboard.json @@ -32,7 +32,11 @@ }, "processor": "WB32FQ95", "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "rgb_matrix": { "animations": { diff --git a/keyboards/projectd/75/ansi/config.h b/keyboards/projectd/75/ansi/config.h index a42dd6c1eee..282e20a8e2b 100644 --- a/keyboards/projectd/75/ansi/config.h +++ b/keyboards/projectd/75/ansi/config.h @@ -16,11 +16,6 @@ #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 - /* External spi flash */ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14 diff --git a/keyboards/projectd/75/ansi/keyboard.json b/keyboards/projectd/75/ansi/keyboard.json index 2e57c353282..2296c639373 100644 --- a/keyboards/projectd/75/ansi/keyboard.json +++ b/keyboards/projectd/75/ansi/keyboard.json @@ -32,7 +32,11 @@ }, "processor": "WB32FQ95", "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "rgb_matrix": { "animations": { diff --git a/keyboards/projectkb/alice/rev1/config.h b/keyboards/projectkb/alice/rev1/config.h index 829976ebd6a..66d3b75731b 100644 --- a/keyboards/projectkb/alice/rev1/config.h +++ b/keyboards/projectkb/alice/rev1/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/projectkb/alice/rev1/keyboard.json b/keyboards/projectkb/alice/rev1/keyboard.json index 1e97746ee88..7e957d7ff41 100644 --- a/keyboards/projectkb/alice/rev1/keyboard.json +++ b/keyboards/projectkb/alice/rev1/keyboard.json @@ -9,6 +9,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "led_count": 14, "animations": { diff --git a/keyboards/projectkb/alice/rev2/config.h b/keyboards/projectkb/alice/rev2/config.h index 6e250bb14ef..3e786c18056 100644 --- a/keyboards/projectkb/alice/rev2/config.h +++ b/keyboards/projectkb/alice/rev2/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/projectkb/alice/rev2/keyboard.json b/keyboards/projectkb/alice/rev2/keyboard.json index 0ed3b88ea2a..639fc268779 100644 --- a/keyboards/projectkb/alice/rev2/keyboard.json +++ b/keyboards/projectkb/alice/rev2/keyboard.json @@ -9,6 +9,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "led_count": 14, "animations": { diff --git a/keyboards/projectkb/signature65/config.h b/keyboards/projectkb/signature65/config.h deleted file mode 100644 index 4d31d4b095f..00000000000 --- a/keyboards/projectkb/signature65/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 MechMerlin - -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 diff --git a/keyboards/projectkb/signature65/keyboard.json b/keyboards/projectkb/signature65/keyboard.json index 7f865fbaaf3..b72ff9926c0 100644 --- a/keyboards/projectkb/signature65/keyboard.json +++ b/keyboards/projectkb/signature65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B14", "A2", "B9", "B8", "B5", "B4", "B3", "A15", "B11", "B10", "B2", "A3", "B1", "B0", "A4", "A5"], "rows": ["A8", "A9", "B13", "A6", "A7"] diff --git a/keyboards/projectkb/signature87/config.h b/keyboards/projectkb/signature87/config.h deleted file mode 100644 index 4d31d4b095f..00000000000 --- a/keyboards/projectkb/signature87/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 MechMerlin - -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 diff --git a/keyboards/projectkb/signature87/keyboard.json b/keyboards/projectkb/signature87/keyboard.json index 2f8666aeb9e..2b18bf45721 100644 --- a/keyboards/projectkb/signature87/keyboard.json +++ b/keyboards/projectkb/signature87/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A7", "A6", "A5", "A4", "A3", "A2", "A15", "B3", "B4"], "rows": ["B13", "B12", "A8", "B15", "A10", "A9", "B9", "B8", "B1", "B0", "B10", "B2"] diff --git a/keyboards/prototypist/allison/config.h b/keyboards/prototypist/allison/config.h deleted file mode 100644 index 9765ad6b1a8..00000000000 --- a/keyboards/prototypist/allison/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Yiancar - -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/prototypist/allison/keyboard.json b/keyboards/prototypist/allison/keyboard.json index 0261b204bb0..ea80e853bf2 100644 --- a/keyboards/prototypist/allison/keyboard.json +++ b/keyboards/prototypist/allison/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "F1", "F0"], "rows": ["D2", "D1", "D0", "B1", "B2", "D3"] diff --git a/keyboards/prototypist/allison_numpad/config.h b/keyboards/prototypist/allison_numpad/config.h deleted file mode 100644 index 9765ad6b1a8..00000000000 --- a/keyboards/prototypist/allison_numpad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Yiancar - -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/prototypist/allison_numpad/keyboard.json b/keyboards/prototypist/allison_numpad/keyboard.json index 974573fc64e..a995cd6bbf2 100644 --- a/keyboards/prototypist/allison_numpad/keyboard.json +++ b/keyboards/prototypist/allison_numpad/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F5", "F1", "F0"], "rows": ["F4", "C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/prototypist/j01/config.h b/keyboards/prototypist/j01/config.h deleted file mode 100644 index 1d22c074e20..00000000000 --- a/keyboards/prototypist/j01/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Shaun Mitchell (Flex) - * - * 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 diff --git a/keyboards/prototypist/j01/keyboard.json b/keyboards/prototypist/j01/keyboard.json index d6e24dc9e59..68296e1b776 100644 --- a/keyboards/prototypist/j01/keyboard.json +++ b/keyboards/prototypist/j01/keyboard.json @@ -20,6 +20,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "F0", "F7", "F1", "F4", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B3", "B2", "B0", "F6", "F5"] diff --git a/keyboards/psuieee/pluto12/config.h b/keyboards/psuieee/pluto12/config.h deleted file mode 100644 index cabf72507ff..00000000000 --- a/keyboards/psuieee/pluto12/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2021-22 Willem McGloughlin (wymcg) -// 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/psuieee/pluto12/keyboard.json b/keyboards/psuieee/pluto12/keyboard.json index 6dcb3d33ac7..382d9fe030e 100644 --- a/keyboards/psuieee/pluto12/keyboard.json +++ b/keyboards/psuieee/pluto12/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["D0", "D4", "C6"] diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h deleted file mode 100644 index 72b4ea84e71..00000000000 --- a/keyboards/pteron36/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Harshit Goel - -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/pteron36/keyboard.json b/keyboards/pteron36/keyboard.json index f4bab524196..abd94d599af 100644 --- a/keyboards/pteron36/keyboard.json +++ b/keyboards/pteron36/keyboard.json @@ -19,6 +19,12 @@ "oled": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2"], "rows": ["E6", "D7", "B4", "B5"] diff --git a/keyboards/puck/config.h b/keyboards/puck/config.h deleted file mode 100644 index 2f38776326e..00000000000 --- a/keyboards/puck/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/puck/keyboard.json b/keyboards/puck/keyboard.json index 1ee73dc4375..4ec04d72bea 100644 --- a/keyboards/puck/keyboard.json +++ b/keyboards/puck/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": false, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "D7", "D6"], "rows": ["D2", "D3", "C6", "C7"] diff --git a/keyboards/punk75/config.h b/keyboards/punk75/config.h index b314f6dae97..321865330c7 100644 --- a/keyboards/punk75/config.h +++ b/keyboards/punk75/config.h @@ -18,8 +18,3 @@ along with this program. If not, see . #pragma once #define LED A0 - -/* 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/punk75/keyboard.json b/keyboards/punk75/keyboard.json index 5c1bd94a5ed..dd084a147c4 100644 --- a/keyboards/punk75/keyboard.json +++ b/keyboards/punk75/keyboard.json @@ -15,6 +15,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C2", "C3", "C6", "C5", "C4", "A7", "A6", "A5", "A4", "B4", "A3", "B3", "A2", "B2", "A1"], "rows": ["D6", "D5", "C1", "C0", "D7"] From 013b51a90428342f26d4f0909120c1ae7c2135f8 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 23 May 2024 11:55:38 -0700 Subject: [PATCH 324/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: W, Part 1 (#23788) Affects: - `waldo` - `walletburner/cajal` - `walletburner/neuron` - `wavtype/foundation` - `wavtype/p01_ultra` - `weirdo/geminate60` - `weirdo/kelowna/rgb64` - `weirdo/ls_60` - `weirdo/naiping/np64` - `weirdo/naiping/nphhkb` - `weirdo/naiping/npminila` - `weirdo/tiger910` - `wekey/polaris` - `westfoxtrot/aanzee` - `westfoxtrot/cyclops` - `westfoxtrot/cypher/rev1` - `westfoxtrot/cypher/rev5` - `westfoxtrot/prophet` - `westm/westm9` - `westm/westm68` --- keyboards/waldo/config.h | 39 ------------------- keyboards/waldo/keyboard.json | 6 +++ keyboards/walletburner/cajal/config.h | 23 ----------- keyboards/walletburner/cajal/keyboard.json | 6 +++ keyboards/walletburner/neuron/config.h | 7 ---- keyboards/walletburner/neuron/keyboard.json | 6 +++ keyboards/wavtype/foundation/config.h | 25 ------------ keyboards/wavtype/foundation/keyboard.json | 6 +++ keyboards/wavtype/p01_ultra/config.h | 39 ------------------- keyboards/wavtype/p01_ultra/keyboard.json | 6 +++ keyboards/weirdo/geminate60/config.h | 25 ------------ keyboards/weirdo/geminate60/keyboard.json | 6 +++ keyboards/weirdo/kelowna/rgb64/config.h | 25 ------------ keyboards/weirdo/kelowna/rgb64/keyboard.json | 6 +++ keyboards/weirdo/ls_60/config.h | 25 ------------ keyboards/weirdo/ls_60/keyboard.json | 6 +++ keyboards/weirdo/naiping/np64/config.h | 25 ------------ keyboards/weirdo/naiping/np64/keyboard.json | 6 +++ keyboards/weirdo/naiping/nphhkb/config.h | 25 ------------ keyboards/weirdo/naiping/nphhkb/keyboard.json | 6 +++ keyboards/weirdo/naiping/npminila/config.h | 25 ------------ .../weirdo/naiping/npminila/keyboard.json | 6 +++ keyboards/weirdo/tiger910/config.h | 23 ----------- keyboards/weirdo/tiger910/keyboard.json | 6 +++ keyboards/wekey/polaris/config.h | 39 ------------------- keyboards/wekey/polaris/keyboard.json | 6 +++ keyboards/westfoxtrot/aanzee/config.h | 5 --- keyboards/westfoxtrot/aanzee/keyboard.json | 6 +++ keyboards/westfoxtrot/cyclops/config.h | 39 ------------------- keyboards/westfoxtrot/cyclops/keyboard.json | 6 +++ keyboards/westfoxtrot/cypher/rev1/config.h | 5 --- .../westfoxtrot/cypher/rev1/keyboard.json | 6 +++ keyboards/westfoxtrot/cypher/rev5/config.h | 5 --- .../westfoxtrot/cypher/rev5/keyboard.json | 6 +++ keyboards/westfoxtrot/prophet/config.h | 5 --- keyboards/westfoxtrot/prophet/keyboard.json | 6 +++ keyboards/westm/westm68/config.h | 5 --- keyboards/westm/westm68/info.json | 6 +++ keyboards/westm/westm9/config.h | 5 --- keyboards/westm/westm9/info.json | 6 +++ 40 files changed, 120 insertions(+), 414 deletions(-) delete mode 100644 keyboards/waldo/config.h delete mode 100644 keyboards/walletburner/cajal/config.h delete mode 100644 keyboards/walletburner/neuron/config.h delete mode 100644 keyboards/wavtype/foundation/config.h delete mode 100644 keyboards/wavtype/p01_ultra/config.h delete mode 100644 keyboards/weirdo/geminate60/config.h delete mode 100644 keyboards/weirdo/kelowna/rgb64/config.h delete mode 100644 keyboards/weirdo/ls_60/config.h delete mode 100644 keyboards/weirdo/naiping/np64/config.h delete mode 100644 keyboards/weirdo/naiping/nphhkb/config.h delete mode 100644 keyboards/weirdo/naiping/npminila/config.h delete mode 100644 keyboards/weirdo/tiger910/config.h delete mode 100644 keyboards/wekey/polaris/config.h delete mode 100644 keyboards/westfoxtrot/cyclops/config.h diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/waldo/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/waldo/keyboard.json b/keyboards/waldo/keyboard.json index 204f4bf7072..b3076d79ccc 100644 --- a/keyboards/waldo/keyboard.json +++ b/keyboards/waldo/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "D5", "D3", "D2", "B3", "B2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B1"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/walletburner/cajal/config.h b/keyboards/walletburner/cajal/config.h deleted file mode 100644 index af1fe3ab43e..00000000000 --- a/keyboards/walletburner/cajal/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Worldspawn - * - * 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 diff --git a/keyboards/walletburner/cajal/keyboard.json b/keyboards/walletburner/cajal/keyboard.json index 2419c6c7f42..e11c62ec876 100644 --- a/keyboards/walletburner/cajal/keyboard.json +++ b/keyboards/walletburner/cajal/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "B4", "F6"], "rows": ["D4", "D5", "C7", "C6"] diff --git a/keyboards/walletburner/neuron/config.h b/keyboards/walletburner/neuron/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/walletburner/neuron/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/walletburner/neuron/keyboard.json b/keyboards/walletburner/neuron/keyboard.json index 7637f5435a9..1d9ce893878 100644 --- a/keyboards/walletburner/neuron/keyboard.json +++ b/keyboards/walletburner/neuron/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F7", "F6", "F4", "F1", "E6", "D6", "D2", "B4", "D7", "B6", "D5"], "rows": ["D0", "D1", "D3", "F5"] diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h deleted file mode 100644 index 4376386c3e6..00000000000 --- a/keyboards/wavtype/foundation/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2022 wavtype (@wavtype) -// 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 - -/* - * 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/wavtype/foundation/keyboard.json b/keyboards/wavtype/foundation/keyboard.json index f13d2268064..4b1dd1d3483 100644 --- a/keyboards/wavtype/foundation/keyboard.json +++ b/keyboards/wavtype/foundation/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "D2", "D1", "D0", "D3", "D5", "D4", "B7", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["B3", "B2", "B1", "F0", "F1"] diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h deleted file mode 100644 index 3da58bc5d2d..00000000000 --- a/keyboards/wavtype/p01_ultra/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 wavtype - -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/wavtype/p01_ultra/keyboard.json b/keyboards/wavtype/p01_ultra/keyboard.json index 7bfc2424686..c44f0bd3bd8 100644 --- a/keyboards/wavtype/p01_ultra/keyboard.json +++ b/keyboards/wavtype/p01_ultra/keyboard.json @@ -37,6 +37,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5"], "rows": ["B4", "D7", "D6", "B5", "B6", "D4"] diff --git a/keyboards/weirdo/geminate60/config.h b/keyboards/weirdo/geminate60/config.h deleted file mode 100644 index 5e0e8b40a9f..00000000000 --- a/keyboards/weirdo/geminate60/config.h +++ /dev/null @@ -1,25 +0,0 @@ - /* Copyright 2020 Weirdo - * - * 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 - - - diff --git a/keyboards/weirdo/geminate60/keyboard.json b/keyboards/weirdo/geminate60/keyboard.json index 4240d3a075e..828630725a0 100644 --- a/keyboards/weirdo/geminate60/keyboard.json +++ b/keyboards/weirdo/geminate60/keyboard.json @@ -23,6 +23,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], "rows": ["A9", "A10", "B10", "B11", "B15"] diff --git a/keyboards/weirdo/kelowna/rgb64/config.h b/keyboards/weirdo/kelowna/rgb64/config.h deleted file mode 100644 index 5c0ed9cf612..00000000000 --- a/keyboards/weirdo/kelowna/rgb64/config.h +++ /dev/null @@ -1,25 +0,0 @@ - /* Copyright 2021 Weirdo - * - * 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 - - - diff --git a/keyboards/weirdo/kelowna/rgb64/keyboard.json b/keyboards/weirdo/kelowna/rgb64/keyboard.json index 6e86f8cc478..4822f979fe6 100644 --- a/keyboards/weirdo/kelowna/rgb64/keyboard.json +++ b/keyboards/weirdo/kelowna/rgb64/keyboard.json @@ -23,6 +23,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A3", "A4", "A5", "A7", "B0", "B1", "B10", "B15", "A8", "A9", "A10", "B7", "B6", "B5", "B4"], "rows": ["B12", "B13", "B14", "C11", "A1"] diff --git a/keyboards/weirdo/ls_60/config.h b/keyboards/weirdo/ls_60/config.h deleted file mode 100644 index 5c0ed9cf612..00000000000 --- a/keyboards/weirdo/ls_60/config.h +++ /dev/null @@ -1,25 +0,0 @@ - /* Copyright 2021 Weirdo - * - * 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 - - - diff --git a/keyboards/weirdo/ls_60/keyboard.json b/keyboards/weirdo/ls_60/keyboard.json index eeaf5a23a59..7ab1f2f6cb5 100644 --- a/keyboards/weirdo/ls_60/keyboard.json +++ b/keyboards/weirdo/ls_60/keyboard.json @@ -23,6 +23,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], "rows": ["A9", "A10", "B10", "B11", "B15"] diff --git a/keyboards/weirdo/naiping/np64/config.h b/keyboards/weirdo/naiping/np64/config.h deleted file mode 100644 index 2c7e4c037b5..00000000000 --- a/keyboards/weirdo/naiping/np64/config.h +++ /dev/null @@ -1,25 +0,0 @@ - /* Copyright 2021 Weirdo - * - * 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 - - - diff --git a/keyboards/weirdo/naiping/np64/keyboard.json b/keyboards/weirdo/naiping/np64/keyboard.json index ddbbfecc3c1..f620fb11696 100644 --- a/keyboards/weirdo/naiping/np64/keyboard.json +++ b/keyboards/weirdo/naiping/np64/keyboard.json @@ -23,6 +23,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/weirdo/naiping/nphhkb/config.h b/keyboards/weirdo/naiping/nphhkb/config.h deleted file mode 100644 index 5c0ed9cf612..00000000000 --- a/keyboards/weirdo/naiping/nphhkb/config.h +++ /dev/null @@ -1,25 +0,0 @@ - /* Copyright 2021 Weirdo - * - * 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 - - - diff --git a/keyboards/weirdo/naiping/nphhkb/keyboard.json b/keyboards/weirdo/naiping/nphhkb/keyboard.json index 13fe77f4764..e89854f02e4 100644 --- a/keyboards/weirdo/naiping/nphhkb/keyboard.json +++ b/keyboards/weirdo/naiping/nphhkb/keyboard.json @@ -23,6 +23,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A4", "C15", "C14", "A5", "A6", "A15", "B1", "B10", "B12", "B13", "B14", "B15", "B6", "A8", "B5"], "rows": ["B7", "B8", "B9", "C13", "B4"] diff --git a/keyboards/weirdo/naiping/npminila/config.h b/keyboards/weirdo/naiping/npminila/config.h deleted file mode 100644 index 5c0ed9cf612..00000000000 --- a/keyboards/weirdo/naiping/npminila/config.h +++ /dev/null @@ -1,25 +0,0 @@ - /* Copyright 2021 Weirdo - * - * 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 - - - diff --git a/keyboards/weirdo/naiping/npminila/keyboard.json b/keyboards/weirdo/naiping/npminila/keyboard.json index 37c297a3fc1..b4048a52cf0 100644 --- a/keyboards/weirdo/naiping/npminila/keyboard.json +++ b/keyboards/weirdo/naiping/npminila/keyboard.json @@ -23,6 +23,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/weirdo/tiger910/config.h b/keyboards/weirdo/tiger910/config.h deleted file mode 100644 index e484ffe49ed..00000000000 --- a/keyboards/weirdo/tiger910/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Weirdo - -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 diff --git a/keyboards/weirdo/tiger910/keyboard.json b/keyboards/weirdo/tiger910/keyboard.json index 90f4208b8d7..ca24561ebdd 100644 --- a/keyboards/weirdo/tiger910/keyboard.json +++ b/keyboards/weirdo/tiger910/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B6", "B7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0", "D1", "D2", "D3", "D4"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/wekey/polaris/config.h b/keyboards/wekey/polaris/config.h deleted file mode 100644 index c86ead57bd8..00000000000 --- a/keyboards/wekey/polaris/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 @wekey - -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/wekey/polaris/keyboard.json b/keyboards/wekey/polaris/keyboard.json index 356e3f951ee..29d79b6a0bc 100644 --- a/keyboards/wekey/polaris/keyboard.json +++ b/keyboards/wekey/polaris/keyboard.json @@ -19,6 +19,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B4", "B5", "B6", "D0", "D1", "D2", "D3"], "rows": ["F4", "F1", "F0", "B7", "F7", "D5", "C6", "C7", "F5", "F6"] diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h index cd1f84bc1fc..5c058cddf1d 100644 --- a/keyboards/westfoxtrot/aanzee/config.h +++ b/keyboards/westfoxtrot/aanzee/config.h @@ -17,11 +17,6 @@ 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 - /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. * This is useful for the Windows task manager shortcut (ctrl+shift+esc). */ diff --git a/keyboards/westfoxtrot/aanzee/keyboard.json b/keyboards/westfoxtrot/aanzee/keyboard.json index 898fe9e62b3..3a15014c4e8 100644 --- a/keyboards/westfoxtrot/aanzee/keyboard.json +++ b/keyboards/westfoxtrot/aanzee/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D1", "D0", "D3", "D5", "C7", "C6", "B6", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "B0"], "rows": ["B4", "D7", "D6", "D4", "B3"] diff --git a/keyboards/westfoxtrot/cyclops/config.h b/keyboards/westfoxtrot/cyclops/config.h deleted file mode 100644 index d1de752f793..00000000000 --- a/keyboards/westfoxtrot/cyclops/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 westfoxtrot - -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/westfoxtrot/cyclops/keyboard.json b/keyboards/westfoxtrot/cyclops/keyboard.json index 7bfcd859b03..a74926511d2 100644 --- a/keyboards/westfoxtrot/cyclops/keyboard.json +++ b/keyboards/westfoxtrot/cyclops/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D2", "D5", "D6", "B6", "B1", "B2", "B3", "C6", "C7", "F7", "F6", "F4", "F5", "F1"], "rows": ["D1", "D0", "D7", "B4", "F0"] diff --git a/keyboards/westfoxtrot/cypher/rev1/config.h b/keyboards/westfoxtrot/cypher/rev1/config.h index cd1f84bc1fc..5c058cddf1d 100644 --- a/keyboards/westfoxtrot/cypher/rev1/config.h +++ b/keyboards/westfoxtrot/cypher/rev1/config.h @@ -17,11 +17,6 @@ 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 - /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. * This is useful for the Windows task manager shortcut (ctrl+shift+esc). */ diff --git a/keyboards/westfoxtrot/cypher/rev1/keyboard.json b/keyboards/westfoxtrot/cypher/rev1/keyboard.json index 46c0dd298ef..09294d169c2 100644 --- a/keyboards/westfoxtrot/cypher/rev1/keyboard.json +++ b/keyboards/westfoxtrot/cypher/rev1/keyboard.json @@ -15,6 +15,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E6", "F0"], "rows": ["B0", "B1", "B2", "B3", "B4", "F6", "B6", "B7", "C6", "C7"] diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h index cd1f84bc1fc..5c058cddf1d 100644 --- a/keyboards/westfoxtrot/cypher/rev5/config.h +++ b/keyboards/westfoxtrot/cypher/rev5/config.h @@ -17,11 +17,6 @@ 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 - /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. * This is useful for the Windows task manager shortcut (ctrl+shift+esc). */ diff --git a/keyboards/westfoxtrot/cypher/rev5/keyboard.json b/keyboards/westfoxtrot/cypher/rev5/keyboard.json index 74938c45635..fbb487534d5 100644 --- a/keyboards/westfoxtrot/cypher/rev5/keyboard.json +++ b/keyboards/westfoxtrot/cypher/rev5/keyboard.json @@ -16,6 +16,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5", "B6", "B7", "B3", "B2", "B1", "F0"], "rows": ["B0", "F1", "F5", "F6", "F7", "D1", "F4", "D4", "C6", "C7"] diff --git a/keyboards/westfoxtrot/prophet/config.h b/keyboards/westfoxtrot/prophet/config.h index d7d992f50ec..95fb682e171 100644 --- a/keyboards/westfoxtrot/prophet/config.h +++ b/keyboards/westfoxtrot/prophet/config.h @@ -1,8 +1,3 @@ #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 SLEEP_LED_GPT_DRIVER GPTD1 diff --git a/keyboards/westfoxtrot/prophet/keyboard.json b/keyboards/westfoxtrot/prophet/keyboard.json index 1d6067a4e2b..049f5cd7fc5 100644 --- a/keyboards/westfoxtrot/prophet/keyboard.json +++ b/keyboards/westfoxtrot/prophet/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A6", "A7", "B0", "A9", "A8", "A14", "A15", "B3", "B4", "B5", "B8", "B7", "B6", "B9"], "rows": ["C13", "B2", "B1", "A4", "A3"] diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h index 9a425a91a89..83153c1241a 100644 --- a/keyboards/westm/westm68/config.h +++ b/keyboards/westm/westm68/config.h @@ -19,8 +19,3 @@ /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE - -/* 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/westm/westm68/info.json b/keyboards/westm/westm68/info.json index 85dd61bf86b..d863273ced3 100644 --- a/keyboards/westm/westm68/info.json +++ b/keyboards/westm/westm68/info.json @@ -16,6 +16,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["A13", "B9", "F1", "A10", "A9"] diff --git a/keyboards/westm/westm9/config.h b/keyboards/westm/westm9/config.h index 9a425a91a89..83153c1241a 100644 --- a/keyboards/westm/westm9/config.h +++ b/keyboards/westm/westm9/config.h @@ -19,8 +19,3 @@ /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE - -/* 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/westm/westm9/info.json b/keyboards/westm/westm9/info.json index 43f12b17add..85b93b47a7d 100644 --- a/keyboards/westm/westm9/info.json +++ b/keyboards/westm/westm9/info.json @@ -15,6 +15,12 @@ "oled": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B8", "B5", "B4"], "rows": ["A14", "A15", "B3"] From 634ebc9763b7320beb669085188aaa7abbed615d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 23 May 2024 12:30:25 -0700 Subject: [PATCH 325/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: Q-R (#23781) Affects: - `qpockets/space_space/rev1` - `qpockets/space_space/rev2` - `quad_h/lb75` - `quantrik/kyuu` - `qwertlekeys/calice` - `rabbit/rabbit68` - `rainkeebs/delilah` - `rainkeebs/rainkeeb` - `rainkeebs/yasui` - `rart/rart45` - `rart/rart4x4` - `rart/rart60` - `rart/rart67` - `rart/rart67m` - `rart/rart75` - `rart/rart75m` - `rart/rartand` - `rart/rartland` - `rart/rartlice` - `rart/rartlite` - `rart/rartpad` - `rate/pistachio/rev1` - `rate/pistachio/rev2` - `rate/pistachio_mp` - `rate/pistachio_pro` - `redox/rev1` - `redscarf_iiplus/verb` - `redscarf_iiplus/verc` - `redscarf_iiplus/verd` - `retro_75` - `reversestudio/decadepad` - `reviung/reviung5` - `reviung/reviung33` - `reviung/reviung34` - `reviung/reviung39` - `reviung/reviung41` - `reviung/reviung53` - `rgbkb/zen/rev1` - `rgbkb/zen/rev2` - `rmi_kb/aelith` - `rmi_kb/chevron` - `rmi_kb/herringbone/pro` - `rmi_kb/herringbone/v1` - `rmi_kb/squishy65` - `rmi_kb/squishyfrl` - `rmi_kb/squishytkl` - `rmi_kb/wete/v1` - `rmi_kb/wete/v2` - `rocketboard_16` - `rominronin/katana60/rev1` - `rominronin/katana60/rev2` - `roseslite` - `rotr` - `rpiguy9907/southpaw66` - `rubi` - `rura66/rev1` - `ryanbaekr/rb1` - `ryanbaekr/rb18` - `ryanbaekr/rb69` - `ryanbaekr/rb86` - `ryanbaekr/rb87` - `ryanskidmore/rskeys100` - `ryloo_studio/m0110` --- keyboards/qpockets/space_space/rev1/config.h | 19 --------- .../qpockets/space_space/rev1/keyboard.json | 6 +++ keyboards/qpockets/space_space/rev2/config.h | 19 --------- .../qpockets/space_space/rev2/keyboard.json | 6 +++ keyboards/quad_h/lb75/config.h | 39 ------------------ keyboards/quad_h/lb75/keyboard.json | 6 +++ keyboards/quantrik/kyuu/config.h | 39 ------------------ keyboards/quantrik/kyuu/keyboard.json | 6 +++ keyboards/qwertlekeys/calice/config.h | 22 ---------- keyboards/qwertlekeys/calice/keyboard.json | 6 +++ keyboards/rabbit/rabbit68/config.h | 39 ------------------ keyboards/rabbit/rabbit68/keyboard.json | 6 +++ keyboards/rainkeebs/delilah/config.h | 22 ---------- keyboards/rainkeebs/delilah/keyboard.json | 6 +++ keyboards/rainkeebs/rainkeeb/config.h | 22 ---------- keyboards/rainkeebs/rainkeeb/keyboard.json | 6 +++ keyboards/rainkeebs/yasui/config.h | 22 ---------- keyboards/rainkeebs/yasui/keyboard.json | 6 +++ keyboards/rart/rart45/config.h | 21 ---------- keyboards/rart/rart45/keyboard.json | 6 +++ keyboards/rart/rart4x4/config.h | 24 ----------- keyboards/rart/rart4x4/keyboard.json | 6 +++ keyboards/rart/rart60/config.h | 35 ---------------- keyboards/rart/rart60/keyboard.json | 6 +++ keyboards/rart/rart67/config.h | 24 ----------- keyboards/rart/rart67/keyboard.json | 6 +++ keyboards/rart/rart67m/config.h | 5 --- keyboards/rart/rart67m/keyboard.json | 6 +++ keyboards/rart/rart75/config.h | 24 ----------- keyboards/rart/rart75/keyboard.json | 6 +++ keyboards/rart/rart75m/config.h | 5 --- keyboards/rart/rart75m/keyboard.json | 6 +++ keyboards/rart/rartand/config.h | 21 ---------- keyboards/rart/rartand/keyboard.json | 6 +++ keyboards/rart/rartland/config.h | 5 --- keyboards/rart/rartland/keyboard.json | 6 +++ keyboards/rart/rartlice/config.h | 5 --- keyboards/rart/rartlice/keyboard.json | 6 +++ keyboards/rart/rartlite/config.h | 24 ----------- keyboards/rart/rartlite/keyboard.json | 6 +++ keyboards/rart/rartpad/config.h | 24 ----------- keyboards/rart/rartpad/keyboard.json | 6 +++ keyboards/rate/pistachio/rev1/config.h | 5 --- keyboards/rate/pistachio/rev1/keyboard.json | 6 +++ keyboards/rate/pistachio/rev2/config.h | 5 --- keyboards/rate/pistachio/rev2/keyboard.json | 6 +++ keyboards/rate/pistachio_mp/config.h | 5 --- keyboards/rate/pistachio_mp/keyboard.json | 6 +++ keyboards/rate/pistachio_pro/config.h | 5 --- keyboards/rate/pistachio_pro/keyboard.json | 6 +++ keyboards/redox/rev1/config.h | 39 ------------------ keyboards/redox/rev1/info.json | 6 +++ keyboards/redscarf_iiplus/verb/config.h | 5 --- keyboards/redscarf_iiplus/verb/keyboard.json | 6 +++ keyboards/redscarf_iiplus/verc/config.h | 5 --- keyboards/redscarf_iiplus/verc/keyboard.json | 6 +++ keyboards/redscarf_iiplus/verd/config.h | 5 --- keyboards/redscarf_iiplus/verd/keyboard.json | 6 +++ keyboards/retro_75/config.h | 39 ------------------ keyboards/retro_75/keyboard.json | 6 +++ keyboards/reversestudio/decadepad/config.h | 40 ------------------- .../reversestudio/decadepad/keyboard.json | 6 +++ keyboards/reviung/reviung33/config.h | 39 ------------------ keyboards/reviung/reviung33/keyboard.json | 6 +++ keyboards/reviung/reviung34/config.h | 39 ------------------ keyboards/reviung/reviung34/keyboard.json | 6 +++ keyboards/reviung/reviung39/config.h | 39 ------------------ keyboards/reviung/reviung39/keyboard.json | 6 +++ keyboards/reviung/reviung41/config.h | 39 ------------------ keyboards/reviung/reviung41/keyboard.json | 6 +++ keyboards/reviung/reviung5/config.h | 39 ------------------ keyboards/reviung/reviung5/keyboard.json | 6 +++ keyboards/reviung/reviung53/config.h | 25 ------------ keyboards/reviung/reviung53/keyboard.json | 6 +++ keyboards/rgbkb/zen/rev1/config.h | 39 ------------------ keyboards/rgbkb/zen/rev1/keyboard.json | 6 +++ keyboards/rgbkb/zen/rev2/config.h | 5 --- keyboards/rgbkb/zen/rev2/keyboard.json | 6 +++ keyboards/rmi_kb/aelith/config.h | 39 ------------------ keyboards/rmi_kb/aelith/keyboard.json | 6 +++ keyboards/rmi_kb/chevron/config.h | 5 --- keyboards/rmi_kb/chevron/keyboard.json | 6 +++ keyboards/rmi_kb/herringbone/pro/config.h | 5 --- .../rmi_kb/herringbone/pro/keyboard.json | 6 +++ keyboards/rmi_kb/herringbone/v1/config.h | 5 --- keyboards/rmi_kb/herringbone/v1/keyboard.json | 6 +++ keyboards/rmi_kb/squishy65/config.h | 39 ------------------ keyboards/rmi_kb/squishy65/keyboard.json | 6 +++ keyboards/rmi_kb/squishyfrl/config.h | 5 --- keyboards/rmi_kb/squishyfrl/keyboard.json | 6 +++ keyboards/rmi_kb/squishytkl/config.h | 5 --- keyboards/rmi_kb/squishytkl/keyboard.json | 6 +++ keyboards/rmi_kb/wete/v1/config.h | 5 --- keyboards/rmi_kb/wete/v1/keyboard.json | 6 +++ keyboards/rmi_kb/wete/v2/config.h | 5 --- keyboards/rmi_kb/wete/v2/keyboard.json | 6 +++ keyboards/rocketboard_16/config.h | 3 -- keyboards/rocketboard_16/keyboard.json | 6 ++- keyboards/rominronin/katana60/rev1/config.h | 39 ------------------ .../rominronin/katana60/rev1/keyboard.json | 6 +++ keyboards/rominronin/katana60/rev2/config.h | 39 ------------------ .../rominronin/katana60/rev2/keyboard.json | 6 +++ keyboards/roseslite/config.h | 39 ------------------ keyboards/roseslite/keyboard.json | 6 +++ keyboards/rotr/config.h | 7 ---- keyboards/rotr/keyboard.json | 6 +++ keyboards/rpiguy9907/southpaw66/config.h | 22 ---------- keyboards/rpiguy9907/southpaw66/keyboard.json | 6 +++ keyboards/rubi/config.h | 5 --- keyboards/rubi/keyboard.json | 6 +++ keyboards/rura66/rev1/config.h | 5 --- keyboards/rura66/rev1/keyboard.json | 6 +++ keyboards/ryanbaekr/rb1/config.h | 23 ----------- keyboards/ryanbaekr/rb1/keyboard.json | 6 +++ keyboards/ryanbaekr/rb18/config.h | 23 ----------- keyboards/ryanbaekr/rb18/keyboard.json | 6 +++ keyboards/ryanbaekr/rb69/config.h | 23 ----------- keyboards/ryanbaekr/rb69/keyboard.json | 6 +++ keyboards/ryanbaekr/rb86/config.h | 23 ----------- keyboards/ryanbaekr/rb86/keyboard.json | 6 +++ keyboards/ryanbaekr/rb87/config.h | 23 ----------- keyboards/ryanbaekr/rb87/keyboard.json | 6 +++ keyboards/ryanskidmore/rskeys100/config.h | 5 --- .../ryanskidmore/rskeys100/keyboard.json | 6 +++ keyboards/ryloo_studio/m0110/config.h | 24 ----------- keyboards/ryloo_studio/m0110/keyboard.json | 6 +++ 126 files changed, 377 insertions(+), 1294 deletions(-) delete mode 100644 keyboards/qpockets/space_space/rev1/config.h delete mode 100644 keyboards/qpockets/space_space/rev2/config.h delete mode 100644 keyboards/quad_h/lb75/config.h delete mode 100644 keyboards/quantrik/kyuu/config.h delete mode 100644 keyboards/qwertlekeys/calice/config.h delete mode 100644 keyboards/rabbit/rabbit68/config.h delete mode 100644 keyboards/rainkeebs/delilah/config.h delete mode 100644 keyboards/rainkeebs/rainkeeb/config.h delete mode 100644 keyboards/rainkeebs/yasui/config.h delete mode 100644 keyboards/rart/rart45/config.h delete mode 100644 keyboards/rart/rart4x4/config.h delete mode 100644 keyboards/rart/rart60/config.h delete mode 100644 keyboards/rart/rart67/config.h delete mode 100644 keyboards/rart/rart75/config.h delete mode 100644 keyboards/rart/rartand/config.h delete mode 100644 keyboards/rart/rartlite/config.h delete mode 100644 keyboards/rart/rartpad/config.h delete mode 100644 keyboards/redox/rev1/config.h delete mode 100644 keyboards/retro_75/config.h delete mode 100644 keyboards/reversestudio/decadepad/config.h delete mode 100644 keyboards/reviung/reviung33/config.h delete mode 100755 keyboards/reviung/reviung34/config.h delete mode 100644 keyboards/reviung/reviung39/config.h delete mode 100644 keyboards/reviung/reviung41/config.h delete mode 100644 keyboards/reviung/reviung5/config.h delete mode 100644 keyboards/reviung/reviung53/config.h delete mode 100644 keyboards/rgbkb/zen/rev1/config.h delete mode 100644 keyboards/rmi_kb/aelith/config.h delete mode 100644 keyboards/rmi_kb/squishy65/config.h delete mode 100644 keyboards/rominronin/katana60/rev1/config.h delete mode 100644 keyboards/rominronin/katana60/rev2/config.h delete mode 100644 keyboards/roseslite/config.h delete mode 100644 keyboards/rotr/config.h delete mode 100644 keyboards/rpiguy9907/southpaw66/config.h delete mode 100644 keyboards/ryanbaekr/rb1/config.h delete mode 100644 keyboards/ryanbaekr/rb18/config.h delete mode 100644 keyboards/ryanbaekr/rb69/config.h delete mode 100644 keyboards/ryanbaekr/rb86/config.h delete mode 100644 keyboards/ryanbaekr/rb87/config.h delete mode 100755 keyboards/ryloo_studio/m0110/config.h diff --git a/keyboards/qpockets/space_space/rev1/config.h b/keyboards/qpockets/space_space/rev1/config.h deleted file mode 100644 index 3caf7fdbcbe..00000000000 --- a/keyboards/qpockets/space_space/rev1/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 qpockets - * - * 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 - -#define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/qpockets/space_space/rev1/keyboard.json b/keyboards/qpockets/space_space/rev1/keyboard.json index 70adf4997c2..cc8cda49a8f 100644 --- a/keyboards/qpockets/space_space/rev1/keyboard.json +++ b/keyboards/qpockets/space_space/rev1/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": false + } + }, "matrix_pins": { "cols": ["D4", "B4", "B5", "B6", "C6", "F7", "F6", "F0", "B0", "E6", "B1"], "rows": ["F1", "F4", "F5", "C7"] diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h deleted file mode 100644 index 9f86bdabd72..00000000000 --- a/keyboards/qpockets/space_space/rev2/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 qpockets - * - * 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 - -#define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/qpockets/space_space/rev2/keyboard.json b/keyboards/qpockets/space_space/rev2/keyboard.json index b57e16db68b..e2f24032a30 100644 --- a/keyboards/qpockets/space_space/rev2/keyboard.json +++ b/keyboards/qpockets/space_space/rev2/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": false + } + }, "matrix_pins": { "cols": ["C6", "F6", "F1", "F4", "F5", "E6", "D6", "B2", "B5", "D3", "D2"], "rows": ["B1", "B0", "D5", "B6"] diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/quad_h/lb75/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -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/quad_h/lb75/keyboard.json b/keyboards/quad_h/lb75/keyboard.json index 98bcde60ccb..0a51d4f47f4 100644 --- a/keyboards/quad_h/lb75/keyboard.json +++ b/keyboards/quad_h/lb75/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D1", "D0", "F1", "F4", "F5", "F6", "F7"], "rows": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D3", "D5", "F0", "E6"] diff --git a/keyboards/quantrik/kyuu/config.h b/keyboards/quantrik/kyuu/config.h deleted file mode 100644 index 44c3746d29d..00000000000 --- a/keyboards/quantrik/kyuu/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 mechmerlin - -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/quantrik/kyuu/keyboard.json b/keyboards/quantrik/kyuu/keyboard.json index 6e3fe5b74cd..5827f08d21c 100644 --- a/keyboards/quantrik/kyuu/keyboard.json +++ b/keyboards/quantrik/kyuu/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "C6", "F0", "B7", "D0", "D5", "D3", "D2", "D1", "B3"], "rows": ["B6", "B5", "B4", "D7", "D6"] diff --git a/keyboards/qwertlekeys/calice/config.h b/keyboards/qwertlekeys/calice/config.h deleted file mode 100644 index a15f35c4443..00000000000 --- a/keyboards/qwertlekeys/calice/config.h +++ /dev/null @@ -1,22 +0,0 @@ - /* Copyright 2021 Joah Nelson (Jels) - * - * 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 diff --git a/keyboards/qwertlekeys/calice/keyboard.json b/keyboards/qwertlekeys/calice/keyboard.json index 3355400ccc6..676ca7a4330 100644 --- a/keyboards/qwertlekeys/calice/keyboard.json +++ b/keyboards/qwertlekeys/calice/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "B4", "F7", "F6", "D1", "B7", "B3", "B2"], "rows": ["F0", "F1", "F5", "F4", "C6", "C7", "B5", "B6", "D4", "D2", "D5", "D3"] diff --git a/keyboards/rabbit/rabbit68/config.h b/keyboards/rabbit/rabbit68/config.h deleted file mode 100644 index a7cfc593aef..00000000000 --- a/keyboards/rabbit/rabbit68/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Kai Eckert - -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/rabbit/rabbit68/keyboard.json b/keyboards/rabbit/rabbit68/keyboard.json index 31389e06383..ce35a7d3c29 100644 --- a/keyboards/rabbit/rabbit68/keyboard.json +++ b/keyboards/rabbit/rabbit68/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D6", "D1", "B4", "D2", "B5", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2"], "rows": ["B6", "D7", "D0", "B3", "B7"] diff --git a/keyboards/rainkeebs/delilah/config.h b/keyboards/rainkeebs/delilah/config.h deleted file mode 100644 index 30e2a8bf276..00000000000 --- a/keyboards/rainkeebs/delilah/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Regan Palmer - * - * 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 diff --git a/keyboards/rainkeebs/delilah/keyboard.json b/keyboards/rainkeebs/delilah/keyboard.json index 9abdfc583dc..bd3d142741c 100644 --- a/keyboards/rainkeebs/delilah/keyboard.json +++ b/keyboards/rainkeebs/delilah/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F0", "E6", "D5", "D3", "D4", "D6", "D7", "B4"], "rows": ["B5", "B6", "C6", "C7"] diff --git a/keyboards/rainkeebs/rainkeeb/config.h b/keyboards/rainkeebs/rainkeeb/config.h deleted file mode 100644 index f01175abd85..00000000000 --- a/keyboards/rainkeebs/rainkeeb/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Regan Palmer - * - * 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 diff --git a/keyboards/rainkeebs/rainkeeb/keyboard.json b/keyboards/rainkeebs/rainkeeb/keyboard.json index 742db864bd5..a291d61d3b0 100644 --- a/keyboards/rainkeebs/rainkeeb/keyboard.json +++ b/keyboards/rainkeebs/rainkeeb/keyboard.json @@ -19,6 +19,12 @@ "oled": true, "wpm": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D3", "D2", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/rainkeebs/yasui/config.h b/keyboards/rainkeebs/yasui/config.h deleted file mode 100644 index 30e2a8bf276..00000000000 --- a/keyboards/rainkeebs/yasui/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Regan Palmer - * - * 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 diff --git a/keyboards/rainkeebs/yasui/keyboard.json b/keyboards/rainkeebs/yasui/keyboard.json index 926b1084dd3..43bbc46fae5 100644 --- a/keyboards/rainkeebs/yasui/keyboard.json +++ b/keyboards/rainkeebs/yasui/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D4", "C6", "B5", "E6"] diff --git a/keyboards/rart/rart45/config.h b/keyboards/rart/rart45/config.h deleted file mode 100644 index 2039f083f1f..00000000000 --- a/keyboards/rart/rart45/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Alabahuy - * 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 diff --git a/keyboards/rart/rart45/keyboard.json b/keyboards/rart/rart45/keyboard.json index fdc92b689b2..42a5d054d7e 100644 --- a/keyboards/rart/rart45/keyboard.json +++ b/keyboards/rart/rart45/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D6", "D4", "B2", "B5", "B4", "B3"], "rows": ["D1", "C2", "C1", "B1", "D0", "C3", "C0", "D7", "B0"] diff --git a/keyboards/rart/rart4x4/config.h b/keyboards/rart/rart4x4/config.h deleted file mode 100644 index 42556799eb8..00000000000 --- a/keyboards/rart/rart4x4/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2020 Alabahuy - -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 diff --git a/keyboards/rart/rart4x4/keyboard.json b/keyboards/rart/rart4x4/keyboard.json index 8cd6ea5bd26..c38e2103de9 100644 --- a/keyboards/rart/rart4x4/keyboard.json +++ b/keyboards/rart/rart4x4/keyboard.json @@ -40,6 +40,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "B2", "B5", "B4"], "rows": ["F4", "B6", "B3", "B1"] diff --git a/keyboards/rart/rart60/config.h b/keyboards/rart/rart60/config.h deleted file mode 100644 index 410fd3bd95e..00000000000 --- a/keyboards/rart/rart60/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2022 Alabahuy - -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 - -/* 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/rart/rart60/keyboard.json b/keyboards/rart/rart60/keyboard.json index 3d0f6c8b550..d5cc7bf0b42 100644 --- a/keyboards/rart/rart60/keyboard.json +++ b/keyboards/rart/rart60/keyboard.json @@ -12,6 +12,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["GP24", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP6", "GP5", "GP4", "GP3", "GP1", "GP0", "GP18", "GP22"], "rows": ["GP23", "GP25", "GP15", "GP16", "GP17"] diff --git a/keyboards/rart/rart67/config.h b/keyboards/rart/rart67/config.h deleted file mode 100644 index 42556799eb8..00000000000 --- a/keyboards/rart/rart67/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2020 Alabahuy - -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 diff --git a/keyboards/rart/rart67/keyboard.json b/keyboards/rart/rart67/keyboard.json index 6a86ec74cad..66515617437 100644 --- a/keyboards/rart/rart67/keyboard.json +++ b/keyboards/rart/rart67/keyboard.json @@ -39,6 +39,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F7", "F6", "F5", "F4", "F1", "E6"], "rows": ["D0", "D1", "D2", "D3", "B0"] diff --git a/keyboards/rart/rart67m/config.h b/keyboards/rart/rart67m/config.h index 3541d6d9ca6..2306296c70b 100644 --- a/keyboards/rart/rart67m/config.h +++ b/keyboards/rart/rart67m/config.h @@ -16,9 +16,4 @@ 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 OLED_TIMEOUT 600000 diff --git a/keyboards/rart/rart67m/keyboard.json b/keyboards/rart/rart67m/keyboard.json index 66f28e45119..0d6cfdeed1a 100644 --- a/keyboards/rart/rart67m/keyboard.json +++ b/keyboards/rart/rart67m/keyboard.json @@ -18,6 +18,12 @@ "oled": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "C6", "F7", "D7", "B1", "E6", "B6"], "rows": ["D3", "D2", "D4", "F6", "B3", "B4", "B2", "B5"] diff --git a/keyboards/rart/rart75/config.h b/keyboards/rart/rart75/config.h deleted file mode 100644 index 42556799eb8..00000000000 --- a/keyboards/rart/rart75/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2020 Alabahuy - -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 diff --git a/keyboards/rart/rart75/keyboard.json b/keyboards/rart/rart75/keyboard.json index 2d0c1e4001d..beb8a7cc392 100644 --- a/keyboards/rart/rart75/keyboard.json +++ b/keyboards/rart/rart75/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "C6", "B6", "B5", "B4", "D7", "D6", "B3", "B1", "F7", "F5", "B2", "B7"], "rows": ["F1", "F4", "F6", "C7", "D4", "D0"] diff --git a/keyboards/rart/rart75m/config.h b/keyboards/rart/rart75m/config.h index 3541d6d9ca6..2306296c70b 100644 --- a/keyboards/rart/rart75m/config.h +++ b/keyboards/rart/rart75m/config.h @@ -16,9 +16,4 @@ 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 OLED_TIMEOUT 600000 diff --git a/keyboards/rart/rart75m/keyboard.json b/keyboards/rart/rart75m/keyboard.json index 18e8432e70e..925e8dff5e7 100644 --- a/keyboards/rart/rart75m/keyboard.json +++ b/keyboards/rart/rart75m/keyboard.json @@ -19,6 +19,12 @@ "oled": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "D4", "F0", "C6", "F1", "D7", "F4", "E6", "F5", "B4", "F6", "B5", "F7", "B6"], "rows": ["C7", "B3", "B1", "B0", "D3", "D2"] diff --git a/keyboards/rart/rartand/config.h b/keyboards/rart/rartand/config.h deleted file mode 100644 index 5ae5dc84a3a..00000000000 --- a/keyboards/rart/rartand/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 Alabahuy - * 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 diff --git a/keyboards/rart/rartand/keyboard.json b/keyboards/rart/rartand/keyboard.json index 50d94a1cc7d..330beca3e10 100644 --- a/keyboards/rart/rartand/keyboard.json +++ b/keyboards/rart/rartand/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "B4", "B5", "B3", "D4", "D6"], "rows": ["C3", "B2", "C2", "B1", "C1", "D7", "C0", "B0"] diff --git a/keyboards/rart/rartland/config.h b/keyboards/rart/rartland/config.h index 79c27d81717..288dfbc3eb8 100644 --- a/keyboards/rart/rartland/config.h +++ b/keyboards/rart/rartland/config.h @@ -16,9 +16,4 @@ 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 OLED_TIMEOUT 10000 diff --git a/keyboards/rart/rartland/keyboard.json b/keyboards/rart/rartland/keyboard.json index ea037b78b60..158cbb86398 100644 --- a/keyboards/rart/rartland/keyboard.json +++ b/keyboards/rart/rartland/keyboard.json @@ -17,6 +17,12 @@ "oled": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "A1", "B1", "A2", "B2", "A3", "B3", "A4", "C7", "C6", "D0", "C5", "D1", "C4"], "rows": ["B4", "A7", "A5", "A6", "C3"] diff --git a/keyboards/rart/rartlice/config.h b/keyboards/rart/rartlice/config.h index 116f8d544bb..88c452be393 100644 --- a/keyboards/rart/rartlice/config.h +++ b/keyboards/rart/rartlice/config.h @@ -17,11 +17,6 @@ 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 WS2812_SPI_DRIVER SPID2 /* diff --git a/keyboards/rart/rartlice/keyboard.json b/keyboards/rart/rartlice/keyboard.json index b22ca30c558..c55919e6a68 100644 --- a/keyboards/rart/rartlice/keyboard.json +++ b/keyboards/rart/rartlice/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B12", "B8", "B5", "B4", "B3", "B11", "B10", "B1", "B0", "A7", "A6", "A5", "A3", "A4", "A1"], "rows": ["B13", "A15", "B9", "A2", "A0"] diff --git a/keyboards/rart/rartlite/config.h b/keyboards/rart/rartlite/config.h deleted file mode 100644 index d2937838f6f..00000000000 --- a/keyboards/rart/rartlite/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Alabahuy - -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 diff --git a/keyboards/rart/rartlite/keyboard.json b/keyboards/rart/rartlite/keyboard.json index e88507161df..f542654db77 100644 --- a/keyboards/rart/rartlite/keyboard.json +++ b/keyboards/rart/rartlite/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B3", "F7", "D3"], "rows": ["F4", "D2", "B2", "B4", "B6", "B5", "D0", "D1"] diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h deleted file mode 100644 index 42556799eb8..00000000000 --- a/keyboards/rart/rartpad/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2020 Alabahuy - -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 diff --git a/keyboards/rart/rartpad/keyboard.json b/keyboards/rart/rartpad/keyboard.json index 06be8a5f691..ac9b2a38f1c 100644 --- a/keyboards/rart/rartpad/keyboard.json +++ b/keyboards/rart/rartpad/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "D1", "D2", "D3"], "rows": ["B6", "F6", "D0", "D4", "C6"] diff --git a/keyboards/rate/pistachio/rev1/config.h b/keyboards/rate/pistachio/rev1/config.h index cad548df8e6..097551d6661 100644 --- a/keyboards/rate/pistachio/rev1/config.h +++ b/keyboards/rate/pistachio/rev1/config.h @@ -26,8 +26,3 @@ along with this program. If not, see . #else #define USB_MAX_POWER_CONSUMPTION 100 #endif - -/* 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/rate/pistachio/rev1/keyboard.json b/keyboards/rate/pistachio/rev1/keyboard.json index 2a74e00c0d2..cabbbc08973 100644 --- a/keyboards/rate/pistachio/rev1/keyboard.json +++ b/keyboards/rate/pistachio/rev1/keyboard.json @@ -7,6 +7,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "hue_steps": 10, "led_count": 2, diff --git a/keyboards/rate/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h index 8a12d3d9ee7..02ddb2130e6 100644 --- a/keyboards/rate/pistachio/rev2/config.h +++ b/keyboards/rate/pistachio/rev2/config.h @@ -30,8 +30,3 @@ along with this program. If not, see . #else #define USB_MAX_POWER_CONSUMPTION 100 #endif - -/* 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/rate/pistachio/rev2/keyboard.json b/keyboards/rate/pistachio/rev2/keyboard.json index 72ad90478e5..ac1866dc754 100644 --- a/keyboards/rate/pistachio/rev2/keyboard.json +++ b/keyboards/rate/pistachio/rev2/keyboard.json @@ -7,6 +7,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "D2" }, diff --git a/keyboards/rate/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h index eaa46500a1f..7d109b347a8 100644 --- a/keyboards/rate/pistachio_mp/config.h +++ b/keyboards/rate/pistachio_mp/config.h @@ -22,8 +22,3 @@ along with this program. If not, see . #else #define USB_MAX_POWER_CONSUMPTION 100 #endif - -/* 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/rate/pistachio_mp/keyboard.json b/keyboards/rate/pistachio_mp/keyboard.json index 613f7bb8fa5..dadb936942c 100644 --- a/keyboards/rate/pistachio_mp/keyboard.json +++ b/keyboards/rate/pistachio_mp/keyboard.json @@ -26,6 +26,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "B1", "F7", "F6"], "rows": ["B4", "E6", "D7", "C6", "D4"] diff --git a/keyboards/rate/pistachio_pro/config.h b/keyboards/rate/pistachio_pro/config.h index b79e4dcbe3e..309d51f79c0 100644 --- a/keyboards/rate/pistachio_pro/config.h +++ b/keyboards/rate/pistachio_pro/config.h @@ -24,11 +24,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D4, C6, D7, B3, B4, B5 } #define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B6, D6 } -/* 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. diff --git a/keyboards/rate/pistachio_pro/keyboard.json b/keyboards/rate/pistachio_pro/keyboard.json index 4dc439c4721..a52a3486ae1 100644 --- a/keyboards/rate/pistachio_pro/keyboard.json +++ b/keyboards/rate/pistachio_pro/keyboard.json @@ -16,6 +16,12 @@ "nkro": false, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D3"} diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h deleted file mode 100644 index fdda27552df..00000000000 --- a/keyboards/redox/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Mattia Dal Ben - -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/redox/rev1/info.json b/keyboards/redox/rev1/info.json index 446020179c2..ee9786d8382 100644 --- a/keyboards/redox/rev1/info.json +++ b/keyboards/redox/rev1/info.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split":{ "enabled": true }, diff --git a/keyboards/redscarf_iiplus/verb/config.h b/keyboards/redscarf_iiplus/verb/config.h index c92878c147e..256a0cc4f59 100755 --- a/keyboards/redscarf_iiplus/verb/config.h +++ b/keyboards/redscarf_iiplus/verb/config.h @@ -39,11 +39,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* 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. diff --git a/keyboards/redscarf_iiplus/verb/keyboard.json b/keyboards/redscarf_iiplus/verb/keyboard.json index a027fe1003f..99d763e39ac 100644 --- a/keyboards/redscarf_iiplus/verb/keyboard.json +++ b/keyboards/redscarf_iiplus/verb/keyboard.json @@ -15,6 +15,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "B7" }, diff --git a/keyboards/redscarf_iiplus/verc/config.h b/keyboards/redscarf_iiplus/verc/config.h index c92878c147e..256a0cc4f59 100755 --- a/keyboards/redscarf_iiplus/verc/config.h +++ b/keyboards/redscarf_iiplus/verc/config.h @@ -39,11 +39,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* 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. diff --git a/keyboards/redscarf_iiplus/verc/keyboard.json b/keyboards/redscarf_iiplus/verc/keyboard.json index c7f5314e7a8..a6defe4851b 100644 --- a/keyboards/redscarf_iiplus/verc/keyboard.json +++ b/keyboards/redscarf_iiplus/verc/keyboard.json @@ -15,6 +15,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "B7" }, diff --git a/keyboards/redscarf_iiplus/verd/config.h b/keyboards/redscarf_iiplus/verd/config.h index 08ba1b48d88..6a3f64268ea 100644 --- a/keyboards/redscarf_iiplus/verd/config.h +++ b/keyboards/redscarf_iiplus/verd/config.h @@ -38,11 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* 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. diff --git a/keyboards/redscarf_iiplus/verd/keyboard.json b/keyboards/redscarf_iiplus/verd/keyboard.json index ef8dba4a4e1..d0ba57553a1 100644 --- a/keyboards/redscarf_iiplus/verd/keyboard.json +++ b/keyboards/redscarf_iiplus/verd/keyboard.json @@ -15,6 +15,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "B7" }, diff --git a/keyboards/retro_75/config.h b/keyboards/retro_75/config.h deleted file mode 100644 index 1464cc5f23d..00000000000 --- a/keyboards/retro_75/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 zvecr - -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/retro_75/keyboard.json b/keyboards/retro_75/keyboard.json index 513379ff5f2..e077be2ee96 100644 --- a/keyboards/retro_75/keyboard.json +++ b/keyboards/retro_75/keyboard.json @@ -35,6 +35,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A5", "A4", "A3", "F0", "C15", "C14", "C13", "A6", "B11", "B10", "B2", "B1", "B0", "A7", "A14", "A15"], "rows": ["A8", "B15", "B14", "B13", "B12", "B8"] diff --git a/keyboards/reversestudio/decadepad/config.h b/keyboards/reversestudio/decadepad/config.h deleted file mode 100644 index 69c6b57a35b..00000000000 --- a/keyboards/reversestudio/decadepad/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/reversestudio/decadepad/keyboard.json b/keyboards/reversestudio/decadepad/keyboard.json index d9dc9f52533..601122aa37b 100644 --- a/keyboards/reversestudio/decadepad/keyboard.json +++ b/keyboards/reversestudio/decadepad/keyboard.json @@ -38,6 +38,12 @@ "rgblight": true, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/reviung/reviung33/config.h b/keyboards/reviung/reviung33/config.h deleted file mode 100644 index a0711511018..00000000000 --- a/keyboards/reviung/reviung33/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 gtips - -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/reviung/reviung33/keyboard.json b/keyboards/reviung/reviung33/keyboard.json index ff0078f1970..0b5ceb4e546 100644 --- a/keyboards/reviung/reviung33/keyboard.json +++ b/keyboards/reviung/reviung33/keyboard.json @@ -39,6 +39,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B1", "B3", "B2", "B6", "B5"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/reviung/reviung34/config.h b/keyboards/reviung/reviung34/config.h deleted file mode 100755 index 72befe1da14..00000000000 --- a/keyboards/reviung/reviung34/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 gtips - -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/reviung/reviung34/keyboard.json b/keyboards/reviung/reviung34/keyboard.json index 99ddd28b819..26f520d4ccf 100755 --- a/keyboards/reviung/reviung34/keyboard.json +++ b/keyboards/reviung/reviung34/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B1", "B3", "B2", "B6"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/reviung/reviung39/config.h b/keyboards/reviung/reviung39/config.h deleted file mode 100644 index 72befe1da14..00000000000 --- a/keyboards/reviung/reviung39/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 gtips - -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/reviung/reviung39/keyboard.json b/keyboards/reviung/reviung39/keyboard.json index 56200a6a3d3..04cbe909c3b 100644 --- a/keyboards/reviung/reviung39/keyboard.json +++ b/keyboards/reviung/reviung39/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "led_count": 11, "hue_steps": 16, diff --git a/keyboards/reviung/reviung41/config.h b/keyboards/reviung/reviung41/config.h deleted file mode 100644 index a0711511018..00000000000 --- a/keyboards/reviung/reviung41/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 gtips - -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/reviung/reviung41/keyboard.json b/keyboards/reviung/reviung41/keyboard.json index cf5827935bc..8e72ff5762a 100644 --- a/keyboards/reviung/reviung41/keyboard.json +++ b/keyboards/reviung/reviung41/keyboard.json @@ -39,6 +39,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"] diff --git a/keyboards/reviung/reviung5/config.h b/keyboards/reviung/reviung5/config.h deleted file mode 100644 index 4977d4b5872..00000000000 --- a/keyboards/reviung/reviung5/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 gtips - -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/reviung/reviung5/keyboard.json b/keyboards/reviung/reviung5/keyboard.json index 674f044eeeb..5c932020a2b 100644 --- a/keyboards/reviung/reviung5/keyboard.json +++ b/keyboards/reviung/reviung5/keyboard.json @@ -40,6 +40,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4"], "rows": ["F4"] diff --git a/keyboards/reviung/reviung53/config.h b/keyboards/reviung/reviung53/config.h deleted file mode 100644 index 321f116f92b..00000000000 --- a/keyboards/reviung/reviung53/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2021 gtips (@gtips) -// 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 - -/* - * 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/reviung/reviung53/keyboard.json b/keyboards/reviung/reviung53/keyboard.json index e5556af10b9..33eec7d8285 100644 --- a/keyboards/reviung/reviung53/keyboard.json +++ b/keyboards/reviung/reviung53/keyboard.json @@ -39,6 +39,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/rgbkb/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h deleted file mode 100644 index 1578432cf80..00000000000 --- a/keyboards/rgbkb/zen/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2017 Danny Nguyen - -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/rgbkb/zen/rev1/keyboard.json b/keyboards/rgbkb/zen/rev1/keyboard.json index fd552b8f900..8e192d9dfd7 100644 --- a/keyboards/rgbkb/zen/rev1/keyboard.json +++ b/keyboards/rgbkb/zen/rev1/keyboard.json @@ -16,6 +16,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B3", "B1", "F7", "F6", "D4", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h index a06ddd9d3ca..44766c7a838 100644 --- a/keyboards/rgbkb/zen/rev2/config.h +++ b/keyboards/rgbkb/zen/rev2/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/rgbkb/zen/rev2/keyboard.json b/keyboards/rgbkb/zen/rev2/keyboard.json index 2c8e25deb3f..9079185b26d 100644 --- a/keyboards/rgbkb/zen/rev2/keyboard.json +++ b/keyboards/rgbkb/zen/rev2/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B3", "B1", "B2"], "rows": ["C6", "E6", "B5", "D7", "B4"] diff --git a/keyboards/rmi_kb/aelith/config.h b/keyboards/rmi_kb/aelith/config.h deleted file mode 100644 index d5f4fd90db9..00000000000 --- a/keyboards/rmi_kb/aelith/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Ramon Imbao - -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/rmi_kb/aelith/keyboard.json b/keyboards/rmi_kb/aelith/keyboard.json index bacc4801876..de16e5ac317 100644 --- a/keyboards/rmi_kb/aelith/keyboard.json +++ b/keyboards/rmi_kb/aelith/keyboard.json @@ -14,6 +14,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A6", "A5", "A0", "A1", "A2", "A3", "A4"], "rows": ["D5", "D1", "D0", "D6", "A7"] diff --git a/keyboards/rmi_kb/chevron/config.h b/keyboards/rmi_kb/chevron/config.h index 7cc6ae4689a..a9eda24a73e 100644 --- a/keyboards/rmi_kb/chevron/config.h +++ b/keyboards/rmi_kb/chevron/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/rmi_kb/chevron/keyboard.json b/keyboards/rmi_kb/chevron/keyboard.json index a4cb864705e..8eda552902a 100644 --- a/keyboards/rmi_kb/chevron/keyboard.json +++ b/keyboards/rmi_kb/chevron/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "A4", "A3", "A2", "B4"], "rows": ["D5", "D6", "C0", "D7"] diff --git a/keyboards/rmi_kb/herringbone/pro/config.h b/keyboards/rmi_kb/herringbone/pro/config.h index 27cd8fb6b6e..13f50d5145e 100644 --- a/keyboards/rmi_kb/herringbone/pro/config.h +++ b/keyboards/rmi_kb/herringbone/pro/config.h @@ -17,11 +17,6 @@ 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 - /* Small QoL improvements */ #define PERMISSIVE_HOLD diff --git a/keyboards/rmi_kb/herringbone/pro/keyboard.json b/keyboards/rmi_kb/herringbone/pro/keyboard.json index 506022a42b4..53031856928 100644 --- a/keyboards/rmi_kb/herringbone/pro/keyboard.json +++ b/keyboards/rmi_kb/herringbone/pro/keyboard.json @@ -20,6 +20,12 @@ "oled": true, "wpm": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "D6", "D5", "D1", "B0", "B1", "B2", "B3", "B4", "D7"], "rows": ["C4", "C5", "C6", "C7", "A7", "A6", null] diff --git a/keyboards/rmi_kb/herringbone/v1/config.h b/keyboards/rmi_kb/herringbone/v1/config.h index 27cd8fb6b6e..13f50d5145e 100644 --- a/keyboards/rmi_kb/herringbone/v1/config.h +++ b/keyboards/rmi_kb/herringbone/v1/config.h @@ -17,11 +17,6 @@ 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 - /* Small QoL improvements */ #define PERMISSIVE_HOLD diff --git a/keyboards/rmi_kb/herringbone/v1/keyboard.json b/keyboards/rmi_kb/herringbone/v1/keyboard.json index 91fbf2cf244..2883f341ab5 100644 --- a/keyboards/rmi_kb/herringbone/v1/keyboard.json +++ b/keyboards/rmi_kb/herringbone/v1/keyboard.json @@ -14,6 +14,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "D6", "D5", "D1", "B0", "B1", "B2", "B3", "B4", "D7"], "rows": ["C4", "C5", "C6", "C7", "A7", "A6"] diff --git a/keyboards/rmi_kb/squishy65/config.h b/keyboards/rmi_kb/squishy65/config.h deleted file mode 100644 index 4b007cf387e..00000000000 --- a/keyboards/rmi_kb/squishy65/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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/rmi_kb/squishy65/keyboard.json b/keyboards/rmi_kb/squishy65/keyboard.json index 1025584b6a2..adc83200d3d 100644 --- a/keyboards/rmi_kb/squishy65/keyboard.json +++ b/keyboards/rmi_kb/squishy65/keyboard.json @@ -35,6 +35,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A9", "B9", "B7", "B6", "B5", "B4", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A10", "A3", "A2"], "rows": ["A15", "B3", "A0", "B10", "B11"] diff --git a/keyboards/rmi_kb/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h index f36369d6c75..25a16f14dde 100644 --- a/keyboards/rmi_kb/squishyfrl/config.h +++ b/keyboards/rmi_kb/squishyfrl/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/rmi_kb/squishyfrl/keyboard.json b/keyboards/rmi_kb/squishyfrl/keyboard.json index 7f6943e8641..8a14a2a4edb 100644 --- a/keyboards/rmi_kb/squishyfrl/keyboard.json +++ b/keyboards/rmi_kb/squishyfrl/keyboard.json @@ -35,6 +35,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A7", "C4", "C5", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "C6", "C9", "C7", "C8", "A10", "A4", "C14", "A3", "A2", "C3"], "rows": ["B9", "B8", "A0", "A1", "A9", "A8", "B11", "A6", "A5"] diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h index f36369d6c75..25a16f14dde 100644 --- a/keyboards/rmi_kb/squishytkl/config.h +++ b/keyboards/rmi_kb/squishytkl/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/rmi_kb/squishytkl/keyboard.json b/keyboards/rmi_kb/squishytkl/keyboard.json index c9b0c276717..ae63d83c5d0 100644 --- a/keyboards/rmi_kb/squishytkl/keyboard.json +++ b/keyboards/rmi_kb/squishytkl/keyboard.json @@ -36,6 +36,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A15", "C10", "C11", "C12", "D2", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "C6", "C9", "C7", "C8", "A10", "A4", "C14", "A3", "A2", "C3"], "rows": ["B3", "B4", "B5", "C13", "B9", "B8", "A0", "A1", "A9", "A8", "B11", "A6", "A5", "C0"] diff --git a/keyboards/rmi_kb/wete/v1/config.h b/keyboards/rmi_kb/wete/v1/config.h index b3b42c6c3ec..9a49ebf8b27 100644 --- a/keyboards/rmi_kb/wete/v1/config.h +++ b/keyboards/rmi_kb/wete/v1/config.h @@ -23,11 +23,6 @@ along with this program. If not, see . #define SLEEP_LED_GPT_DRIVER GPTD1 -/* 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. diff --git a/keyboards/rmi_kb/wete/v1/keyboard.json b/keyboards/rmi_kb/wete/v1/keyboard.json index 569455923ca..8e8059c103d 100644 --- a/keyboards/rmi_kb/wete/v1/keyboard.json +++ b/keyboards/rmi_kb/wete/v1/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B13", "B14", "B15", "A8", "B0", "A7", "A5", "A4", "A3", "B9", "C13", "C14", "C15", "F0", "F1", "A0", "A1", "A2", "B8", "B7"], "rows": ["A9", "B12", "B11", "B10", "B2", "B1"] diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h index 121c9046e02..7990439a73e 100644 --- a/keyboards/rmi_kb/wete/v2/config.h +++ b/keyboards/rmi_kb/wete/v2/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -/* 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. diff --git a/keyboards/rmi_kb/wete/v2/keyboard.json b/keyboards/rmi_kb/wete/v2/keyboard.json index 140071d01f7..2c925ee9195 100644 --- a/keyboards/rmi_kb/wete/v2/keyboard.json +++ b/keyboards/rmi_kb/wete/v2/keyboard.json @@ -16,6 +16,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "B0", "B7", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B3", "B2", "B6", "C6", "C7", "E6", "F7", "F6", "F5", "F4", "F1", "F0", null] diff --git a/keyboards/rocketboard_16/config.h b/keyboards/rocketboard_16/config.h index 5e04a24ba58..d0c53cbe8ba 100644 --- a/keyboards/rocketboard_16/config.h +++ b/keyboards/rocketboard_16/config.h @@ -21,9 +21,6 @@ along with this program. If not, see . #define OLED_DISPLAY_128X64 #define OLED_FONT_H "custom_font.h" -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/rocketboard_16/keyboard.json b/keyboards/rocketboard_16/keyboard.json index 84baf6c5a76..4831911f4fd 100644 --- a/keyboards/rocketboard_16/keyboard.json +++ b/keyboards/rocketboard_16/keyboard.json @@ -36,7 +36,11 @@ ] }, "qmk": { - "tap_keycode_delay": 20 + "tap_keycode_delay": 20, + "locking": { + "enabled": true, + "resync": true + } }, "bootmagic": { "matrix": [4, 1] diff --git a/keyboards/rominronin/katana60/rev1/config.h b/keyboards/rominronin/katana60/rev1/config.h deleted file mode 100644 index 13f0a19cbd2..00000000000 --- a/keyboards/rominronin/katana60/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2017 Baris Tosun - -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/rominronin/katana60/rev1/keyboard.json b/keyboards/rominronin/katana60/rev1/keyboard.json index 56b4709857d..0a9bb4ea493 100644 --- a/keyboards/rominronin/katana60/rev1/keyboard.json +++ b/keyboards/rominronin/katana60/rev1/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B7", "B3", "B2", "B1", "B0", "C7", "D1", "D2", "C6", "B6", "B5", "B4", "D4", "D6", "D7"], "rows": ["F5", "F6", "F4", "F1", "D0"] diff --git a/keyboards/rominronin/katana60/rev2/config.h b/keyboards/rominronin/katana60/rev2/config.h deleted file mode 100644 index 8e3d35a7beb..00000000000 --- a/keyboards/rominronin/katana60/rev2/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 rominronin - -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/rominronin/katana60/rev2/keyboard.json b/keyboards/rominronin/katana60/rev2/keyboard.json index 241a35d4034..41fc723dcf3 100644 --- a/keyboards/rominronin/katana60/rev2/keyboard.json +++ b/keyboards/rominronin/katana60/rev2/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "D6", "D4", "D3", "D2", "D1", "D0"], "rows": ["B0", "E6", "D5", "B4", "B5"] diff --git a/keyboards/roseslite/config.h b/keyboards/roseslite/config.h deleted file mode 100644 index 3cf449a32bf..00000000000 --- a/keyboards/roseslite/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Fate - -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/roseslite/keyboard.json b/keyboards/roseslite/keyboard.json index f315e21770a..88b8c7a2057 100644 --- a/keyboards/roseslite/keyboard.json +++ b/keyboards/roseslite/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/rotr/config.h b/keyboards/rotr/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/rotr/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/rotr/keyboard.json b/keyboards/rotr/keyboard.json index 24694e93f83..cb1a7e923d2 100644 --- a/keyboards/rotr/keyboard.json +++ b/keyboards/rotr/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D0", "D4"], "rows": ["E6"] diff --git a/keyboards/rpiguy9907/southpaw66/config.h b/keyboards/rpiguy9907/southpaw66/config.h deleted file mode 100644 index b4da5d530f8..00000000000 --- a/keyboards/rpiguy9907/southpaw66/config.h +++ /dev/null @@ -1,22 +0,0 @@ - /* Copyright 2020 gooberpsycho - * - * 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 diff --git a/keyboards/rpiguy9907/southpaw66/keyboard.json b/keyboards/rpiguy9907/southpaw66/keyboard.json index 78a513e3677..f2fdf4f5ff5 100644 --- a/keyboards/rpiguy9907/southpaw66/keyboard.json +++ b/keyboards/rpiguy9907/southpaw66/keyboard.json @@ -19,6 +19,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D7", "C6", "D4", "D0", "D1", "D2", "D3"] diff --git a/keyboards/rubi/config.h b/keyboards/rubi/config.h index 725e6e29f43..c44e3ba03b9 100644 --- a/keyboards/rubi/config.h +++ b/keyboards/rubi/config.h @@ -17,9 +17,4 @@ 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 OLED_FONT_H "lib/glcdfont.c" diff --git a/keyboards/rubi/keyboard.json b/keyboards/rubi/keyboard.json index e434977b37c..cb94b586156 100644 --- a/keyboards/rubi/keyboard.json +++ b/keyboards/rubi/keyboard.json @@ -16,6 +16,12 @@ "nkro": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "F7"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/rura66/rev1/config.h b/keyboards/rura66/rev1/config.h index e9a1ae40890..4c82cee9103 100644 --- a/keyboards/rura66/rev1/config.h +++ b/keyboards/rura66/rev1/config.h @@ -25,11 +25,6 @@ along with this program. If not, see . /* Custom font */ #define OLED_FONT_H "keyboards/rura66/common/glcdfont.c" -/* 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. diff --git a/keyboards/rura66/rev1/keyboard.json b/keyboards/rura66/rev1/keyboard.json index ded87a7e0e9..43f65783940 100644 --- a/keyboards/rura66/rev1/keyboard.json +++ b/keyboards/rura66/rev1/keyboard.json @@ -19,6 +19,12 @@ "oled": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/ryanbaekr/rb1/config.h b/keyboards/ryanbaekr/rb1/config.h deleted file mode 100644 index 9024fa25d5b..00000000000 --- a/keyboards/ryanbaekr/rb1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 ryanbaekr - -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 diff --git a/keyboards/ryanbaekr/rb1/keyboard.json b/keyboards/ryanbaekr/rb1/keyboard.json index 0d14acb6bb0..31f2fa20c4f 100644 --- a/keyboards/ryanbaekr/rb1/keyboard.json +++ b/keyboards/ryanbaekr/rb1/keyboard.json @@ -18,6 +18,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["B1"] diff --git a/keyboards/ryanbaekr/rb18/config.h b/keyboards/ryanbaekr/rb18/config.h deleted file mode 100644 index 9024fa25d5b..00000000000 --- a/keyboards/ryanbaekr/rb18/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 ryanbaekr - -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 diff --git a/keyboards/ryanbaekr/rb18/keyboard.json b/keyboards/ryanbaekr/rb18/keyboard.json index 41677aa148e..03a1335c7bd 100644 --- a/keyboards/ryanbaekr/rb18/keyboard.json +++ b/keyboards/ryanbaekr/rb18/keyboard.json @@ -35,6 +35,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B6", "B5", "B4"], "rows": ["B1", "F7", "F6", "F5", "F4"] diff --git a/keyboards/ryanbaekr/rb69/config.h b/keyboards/ryanbaekr/rb69/config.h deleted file mode 100644 index 2e802ba3630..00000000000 --- a/keyboards/ryanbaekr/rb69/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 ryanbaekr - -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 diff --git a/keyboards/ryanbaekr/rb69/keyboard.json b/keyboards/ryanbaekr/rb69/keyboard.json index 5a50b691cb4..c1cce7508ea 100644 --- a/keyboards/ryanbaekr/rb69/keyboard.json +++ b/keyboards/ryanbaekr/rb69/keyboard.json @@ -35,6 +35,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "B4", "B5", "B7", "D5", "C7", "E6"], "rows": ["D7", "C6", "D4", "D0", "D1"] diff --git a/keyboards/ryanbaekr/rb86/config.h b/keyboards/ryanbaekr/rb86/config.h deleted file mode 100644 index 2e802ba3630..00000000000 --- a/keyboards/ryanbaekr/rb86/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 ryanbaekr - -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 diff --git a/keyboards/ryanbaekr/rb86/keyboard.json b/keyboards/ryanbaekr/rb86/keyboard.json index 1255864c522..5813a2fa7b0 100644 --- a/keyboards/ryanbaekr/rb86/keyboard.json +++ b/keyboards/ryanbaekr/rb86/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "D5", "C7", "F1", "F0", "D3", "D2", "D1", "D0", "D4", "E6", "B7", "C6", "F4", "F5", "F6"], "rows": ["B0", "B1", "B2", "B3", "B4", "D7"] diff --git a/keyboards/ryanbaekr/rb87/config.h b/keyboards/ryanbaekr/rb87/config.h deleted file mode 100644 index 9024fa25d5b..00000000000 --- a/keyboards/ryanbaekr/rb87/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 ryanbaekr - -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 diff --git a/keyboards/ryanbaekr/rb87/keyboard.json b/keyboards/ryanbaekr/rb87/keyboard.json index ea19528cb31..6d19c3c29d4 100644 --- a/keyboards/ryanbaekr/rb87/keyboard.json +++ b/keyboards/ryanbaekr/rb87/keyboard.json @@ -37,6 +37,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "C7", "E6", "B4", "B5", "B7", "D5", "D3"], "rows": ["D2", "D7", "C6", "D4", "D0", "D1"] diff --git a/keyboards/ryanskidmore/rskeys100/config.h b/keyboards/ryanskidmore/rskeys100/config.h index 9f01b96248d..9ee24243f82 100644 --- a/keyboards/ryanskidmore/rskeys100/config.h +++ b/keyboards/ryanskidmore/rskeys100/config.h @@ -28,8 +28,3 @@ /* The number of RGB LEDs connected */ #define RGB_MATRIX_LED_COUNT 105 - -/* 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/ryanskidmore/rskeys100/keyboard.json b/keyboards/ryanskidmore/rskeys100/keyboard.json index b42a23217dc..0e2d3eb6af5 100644 --- a/keyboards/ryanskidmore/rskeys100/keyboard.json +++ b/keyboards/ryanskidmore/rskeys100/keyboard.json @@ -15,6 +15,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "C7" }, diff --git a/keyboards/ryloo_studio/m0110/config.h b/keyboards/ryloo_studio/m0110/config.h deleted file mode 100755 index 592d0be42a9..00000000000 --- a/keyboards/ryloo_studio/m0110/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2020 newtonapple - -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 diff --git a/keyboards/ryloo_studio/m0110/keyboard.json b/keyboards/ryloo_studio/m0110/keyboard.json index 3f2f366cbbe..9eb4662e366 100644 --- a/keyboards/ryloo_studio/m0110/keyboard.json +++ b/keyboards/ryloo_studio/m0110/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"], "rows": ["D0", "D1", "D2", "D3", "D5"] From 0094a6f571d4ab56e7a4747a35482c5f98e821f3 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 23 May 2024 12:34:56 -0700 Subject: [PATCH 326/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: S, Part 2 (#23784) Affects: - `slz40` - `smithrune/iron160/iron160_s` - `smithrune/iron165r2/f072` - `smithrune/iron165r2/f411` - `smithrune/iron180` - `smithrune/iron180v2/v2h` - `smithrune/iron180v2/v2s` - `smoll/lefty` - `snampad` - `sneakbox/aliceclone` - `sneakbox/disarray/ortho` - `sneakbox/disarray/staggered` - `soup10` - `soy20` - `sparrow62` - `split67` - `splitish` - `splitography` - `star75` - `stello65/beta` - `stello65/hs_rev1` - `stello65/sl_rev1` - `stenokeyboards/the_uni/pro_micro` - `stenokeyboards/the_uni/usb_c` - `strech/soulstone` - `studiokestra/bourgeau` - `studiokestra/cascade` - `studiokestra/frl84` - `studiokestra/galatea/rev1` - `studiokestra/galatea/rev2` - `studiokestra/galatea/rev3` - `studiokestra/line_friends_tkl` - `studiokestra/nascent` - `studiokestra/nue` - `suavity/ehan` - `subatomic` - `switchplate/southpaw_65` - `switchplate/southpaw_fullsize` - `switchplate/switchplate910` - `sx60` - `system76/launch_1` --- keyboards/slz40/config.h | 39 ----------------- keyboards/slz40/keyboard.json | 6 +++ .../smithrune/iron160/iron160_s/config.h | 4 -- .../smithrune/iron160/iron160_s/keyboard.json | 6 +++ keyboards/smithrune/iron165r2/config.h | 3 -- .../smithrune/iron165r2/f072/keyboard.json | 6 +++ .../smithrune/iron165r2/f411/keyboard.json | 6 +++ keyboards/smithrune/iron180/config.h | 5 --- keyboards/smithrune/iron180/keyboard.json | 6 +++ keyboards/smithrune/iron180v2/v2h/config.h | 5 --- .../smithrune/iron180v2/v2h/keyboard.json | 6 +++ keyboards/smithrune/iron180v2/v2s/config.h | 5 --- .../smithrune/iron180v2/v2s/keyboard.json | 6 +++ keyboards/smoll/lefty/config.h | 23 ---------- keyboards/smoll/lefty/info.json | 6 +++ keyboards/snampad/config.h | 39 ----------------- keyboards/snampad/keyboard.json | 6 +++ keyboards/sneakbox/aliceclone/config.h | 24 ----------- keyboards/sneakbox/aliceclone/keyboard.json | 6 +++ keyboards/sneakbox/disarray/ortho/config.h | 24 ----------- .../sneakbox/disarray/ortho/keyboard.json | 6 +++ .../sneakbox/disarray/staggered/config.h | 24 ----------- .../sneakbox/disarray/staggered/keyboard.json | 6 +++ keyboards/soup10/config.h | 39 ----------------- keyboards/soup10/keyboard.json | 6 +++ keyboards/soy20/config.h | 23 ---------- keyboards/soy20/keyboard.json | 6 +++ keyboards/sparrow62/config.h | 5 --- keyboards/sparrow62/keyboard.json | 6 +++ keyboards/split67/config.h | 26 ------------ keyboards/split67/keyboard.json | 8 +++- keyboards/splitish/config.h | 24 ----------- keyboards/splitish/keyboard.json | 6 +++ keyboards/splitography/config.h | 22 ---------- keyboards/splitography/keyboard.json | 6 +++ keyboards/star75/config.h | 6 --- keyboards/star75/keyboard.json | 6 +++ keyboards/stello65/beta/config.h | 25 ----------- keyboards/stello65/beta/keyboard.json | 6 +++ keyboards/stello65/hs_rev1/config.h | 25 ----------- keyboards/stello65/hs_rev1/keyboard.json | 6 +++ keyboards/stello65/sl_rev1/config.h | 25 ----------- keyboards/stello65/sl_rev1/keyboard.json | 6 +++ .../stenokeyboards/the_uni/pro_micro/config.h | 24 ----------- .../the_uni/pro_micro/keyboard.json | 6 +++ .../stenokeyboards/the_uni/usb_c/config.h | 24 ----------- .../the_uni/usb_c/keyboard.json | 6 +++ keyboards/strech/soulstone/config.h | 5 --- keyboards/strech/soulstone/keyboard.json | 6 +++ keyboards/studiokestra/bourgeau/config.h | 28 ------------- keyboards/studiokestra/bourgeau/keyboard.json | 6 +++ keyboards/studiokestra/cascade/config.h | 28 ------------- keyboards/studiokestra/cascade/keyboard.json | 6 +++ keyboards/studiokestra/frl84/config.h | 9 ---- keyboards/studiokestra/frl84/keyboard.json | 6 +++ keyboards/studiokestra/galatea/config.h | 9 ---- .../studiokestra/galatea/rev1/keyboard.json | 6 +++ .../studiokestra/galatea/rev2/keyboard.json | 6 +++ .../studiokestra/galatea/rev3/keyboard.json | 6 +++ .../studiokestra/line_friends_tkl/config.h | 9 ---- .../line_friends_tkl/keyboard.json | 6 +++ keyboards/studiokestra/nascent/config.h | 23 ---------- keyboards/studiokestra/nascent/keyboard.json | 6 +++ keyboards/studiokestra/nue/config.h | 23 ---------- keyboards/studiokestra/nue/keyboard.json | 6 +++ keyboards/suavity/ehan/config.h | 24 ----------- keyboards/suavity/ehan/keyboard.json | 6 +++ keyboards/subatomic/config.h | 42 ------------------- keyboards/subatomic/keyboard.json | 6 +++ keyboards/switchplate/southpaw_65/config.h | 5 --- .../switchplate/southpaw_65/keyboard.json | 6 +++ .../switchplate/southpaw_fullsize/config.h | 39 ----------------- .../southpaw_fullsize/keyboard.json | 6 +++ keyboards/switchplate/switchplate910/config.h | 39 ----------------- .../switchplate/switchplate910/keyboard.json | 6 +++ keyboards/sx60/config.h | 6 --- keyboards/sx60/keyboard.json | 6 +++ keyboards/system76/launch_1/config.h | 6 --- keyboards/system76/launch_1/keyboard.json | 6 +++ 79 files changed, 247 insertions(+), 759 deletions(-) delete mode 100644 keyboards/slz40/config.h delete mode 100644 keyboards/smoll/lefty/config.h delete mode 100644 keyboards/snampad/config.h delete mode 100644 keyboards/sneakbox/aliceclone/config.h delete mode 100644 keyboards/sneakbox/disarray/ortho/config.h delete mode 100644 keyboards/sneakbox/disarray/staggered/config.h delete mode 100644 keyboards/soup10/config.h delete mode 100644 keyboards/soy20/config.h delete mode 100644 keyboards/split67/config.h delete mode 100644 keyboards/splitish/config.h delete mode 100644 keyboards/splitography/config.h delete mode 100644 keyboards/stello65/beta/config.h delete mode 100644 keyboards/stello65/hs_rev1/config.h delete mode 100644 keyboards/stello65/sl_rev1/config.h delete mode 100644 keyboards/stenokeyboards/the_uni/pro_micro/config.h delete mode 100644 keyboards/stenokeyboards/the_uni/usb_c/config.h delete mode 100644 keyboards/studiokestra/bourgeau/config.h delete mode 100644 keyboards/studiokestra/cascade/config.h delete mode 100644 keyboards/studiokestra/frl84/config.h delete mode 100644 keyboards/studiokestra/galatea/config.h delete mode 100644 keyboards/studiokestra/line_friends_tkl/config.h delete mode 100644 keyboards/studiokestra/nascent/config.h delete mode 100644 keyboards/studiokestra/nue/config.h delete mode 100644 keyboards/suavity/ehan/config.h delete mode 100644 keyboards/subatomic/config.h delete mode 100644 keyboards/switchplate/southpaw_fullsize/config.h delete mode 100644 keyboards/switchplate/switchplate910/config.h diff --git a/keyboards/slz40/config.h b/keyboards/slz40/config.h deleted file mode 100644 index e66e3202cc2..00000000000 --- a/keyboards/slz40/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 SithLord - -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/slz40/keyboard.json b/keyboards/slz40/keyboard.json index 97533fd939e..138c7d21cf5 100644 --- a/keyboards/slz40/keyboard.json +++ b/keyboards/slz40/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "D2", "F5", "D1", "F6", "D0", "F7", "D4", "B1", "C6", "E6", "D7"], "rows": ["B4", "B5", "B3", "B2", "B6"] diff --git a/keyboards/smithrune/iron160/iron160_s/config.h b/keyboards/smithrune/iron160/iron160_s/config.h index e5da34f3121..981a344d68e 100644 --- a/keyboards/smithrune/iron160/iron160_s/config.h +++ b/keyboards/smithrune/iron160/iron160_s/config.h @@ -20,7 +20,3 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 2 #define BACKLIGHT_PAL_MODE 1 -/* 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/smithrune/iron160/iron160_s/keyboard.json b/keyboards/smithrune/iron160/iron160_s/keyboard.json index b2a465399f5..d6bf0a43f5c 100644 --- a/keyboards/smithrune/iron160/iron160_s/keyboard.json +++ b/keyboards/smithrune/iron160/iron160_s/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "matrix_pins": { diff --git a/keyboards/smithrune/iron165r2/config.h b/keyboards/smithrune/iron165r2/config.h index b803959d13c..a3e46ee8d2c 100644 --- a/keyboards/smithrune/iron165r2/config.h +++ b/keyboards/smithrune/iron165r2/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - //#define ALL_RGBS // Define the RGB option here //#define LINE_RGBS //#define RUNE_RGBS diff --git a/keyboards/smithrune/iron165r2/f072/keyboard.json b/keyboards/smithrune/iron165r2/f072/keyboard.json index e16493d0b5c..b3b307d71c2 100644 --- a/keyboards/smithrune/iron165r2/f072/keyboard.json +++ b/keyboards/smithrune/iron165r2/f072/keyboard.json @@ -11,6 +11,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "A6", "levels": 20, diff --git a/keyboards/smithrune/iron165r2/f411/keyboard.json b/keyboards/smithrune/iron165r2/f411/keyboard.json index d3d4b3de506..75edab14aff 100644 --- a/keyboards/smithrune/iron165r2/f411/keyboard.json +++ b/keyboards/smithrune/iron165r2/f411/keyboard.json @@ -11,6 +11,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "eeprom": { "driver": "i2c" }, diff --git a/keyboards/smithrune/iron180/config.h b/keyboards/smithrune/iron180/config.h index 7506922b008..efc249f466e 100644 --- a/keyboards/smithrune/iron180/config.h +++ b/keyboards/smithrune/iron180/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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. diff --git a/keyboards/smithrune/iron180/keyboard.json b/keyboards/smithrune/iron180/keyboard.json index 0a7367649a1..b0c6e1a8ffb 100644 --- a/keyboards/smithrune/iron180/keyboard.json +++ b/keyboards/smithrune/iron180/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B7", "B6", "B5", "B4", "B3", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B2", "A4", "B1", "A3"], "rows": ["B9", "B8", "A15", "B0", "A7", "A5"] diff --git a/keyboards/smithrune/iron180v2/v2h/config.h b/keyboards/smithrune/iron180v2/v2h/config.h index 1d195c5a458..a3810f7d794 100644 --- a/keyboards/smithrune/iron180v2/v2h/config.h +++ b/keyboards/smithrune/iron180v2/v2h/config.h @@ -17,10 +17,5 @@ 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 WEAR_LEVELING_LOGICAL_SIZE 2048 #define WEAR_LEVELING_BACKING_SIZE 4096 diff --git a/keyboards/smithrune/iron180v2/v2h/keyboard.json b/keyboards/smithrune/iron180v2/v2h/keyboard.json index a41c9d7e952..1580a12b8c9 100644 --- a/keyboards/smithrune/iron180v2/v2h/keyboard.json +++ b/keyboards/smithrune/iron180v2/v2h/keyboard.json @@ -20,6 +20,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/smithrune/iron180v2/v2s/config.h b/keyboards/smithrune/iron180v2/v2s/config.h index bf443b56f15..acd45ba2805 100644 --- a/keyboards/smithrune/iron180v2/v2s/config.h +++ b/keyboards/smithrune/iron180v2/v2s/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 3 #define BACKLIGHT_PAL_MODE 2 -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - #define WEAR_LEVELING_LOGICAL_SIZE 2048 #define WEAR_LEVELING_BACKING_SIZE 4096 diff --git a/keyboards/smithrune/iron180v2/v2s/keyboard.json b/keyboards/smithrune/iron180v2/v2s/keyboard.json index 82744159912..f8f27f4cc1f 100644 --- a/keyboards/smithrune/iron180v2/v2s/keyboard.json +++ b/keyboards/smithrune/iron180v2/v2s/keyboard.json @@ -21,6 +21,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "build": { "lto": true }, diff --git a/keyboards/smoll/lefty/config.h b/keyboards/smoll/lefty/config.h deleted file mode 100644 index b1432e4d879..00000000000 --- a/keyboards/smoll/lefty/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Smoll Chungus (@smollchungus) -* -* 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 diff --git a/keyboards/smoll/lefty/info.json b/keyboards/smoll/lefty/info.json index 28fa865888c..c34e264176f 100644 --- a/keyboards/smoll/lefty/info.json +++ b/keyboards/smoll/lefty/info.json @@ -15,6 +15,12 @@ "nkro": false, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "usb": { "vid": "0x5363", "pid": "0x0001", diff --git a/keyboards/snampad/config.h b/keyboards/snampad/config.h deleted file mode 100644 index 63349588eca..00000000000 --- a/keyboards/snampad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Peter Tillemans - -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/snampad/keyboard.json b/keyboards/snampad/keyboard.json index a5ea2cda2f1..e2a269d5c71 100644 --- a/keyboards/snampad/keyboard.json +++ b/keyboards/snampad/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3"] diff --git a/keyboards/sneakbox/aliceclone/config.h b/keyboards/sneakbox/aliceclone/config.h deleted file mode 100644 index 7c7cad23905..00000000000 --- a/keyboards/sneakbox/aliceclone/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2020 Bryan Ong - -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 diff --git a/keyboards/sneakbox/aliceclone/keyboard.json b/keyboards/sneakbox/aliceclone/keyboard.json index 0e134c84d48..869b8bd20b6 100644 --- a/keyboards/sneakbox/aliceclone/keyboard.json +++ b/keyboards/sneakbox/aliceclone/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"], "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "F7", "B7"] diff --git a/keyboards/sneakbox/disarray/ortho/config.h b/keyboards/sneakbox/disarray/ortho/config.h deleted file mode 100644 index 25382dd5f1c..00000000000 --- a/keyboards/sneakbox/disarray/ortho/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Bryan Ong - -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 diff --git a/keyboards/sneakbox/disarray/ortho/keyboard.json b/keyboards/sneakbox/disarray/ortho/keyboard.json index 49a321a2da1..31a201e0d24 100644 --- a/keyboards/sneakbox/disarray/ortho/keyboard.json +++ b/keyboards/sneakbox/disarray/ortho/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["B7", "D0", "D1", "D2", "D3", "B0"] diff --git a/keyboards/sneakbox/disarray/staggered/config.h b/keyboards/sneakbox/disarray/staggered/config.h deleted file mode 100644 index 25382dd5f1c..00000000000 --- a/keyboards/sneakbox/disarray/staggered/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Bryan Ong - -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 diff --git a/keyboards/sneakbox/disarray/staggered/keyboard.json b/keyboards/sneakbox/disarray/staggered/keyboard.json index 01334273e49..46317951309 100644 --- a/keyboards/sneakbox/disarray/staggered/keyboard.json +++ b/keyboards/sneakbox/disarray/staggered/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6"], "rows": ["B7", "D0", "D1", "D2", "D3"] diff --git a/keyboards/soup10/config.h b/keyboards/soup10/config.h deleted file mode 100644 index f479b157941..00000000000 --- a/keyboards/soup10/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 icesoup - -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/soup10/keyboard.json b/keyboards/soup10/keyboard.json index b2ec4968e09..f4e19476529 100644 --- a/keyboards/soup10/keyboard.json +++ b/keyboards/soup10/keyboard.json @@ -19,6 +19,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "B4"], "rows": ["D1", "D0", "D4", "C6"] diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h deleted file mode 100644 index 14fc40cd625..00000000000 --- a/keyboards/soy20/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Soy20 PCB}} -Copyright (C) {{ 2020 }} {{ Drewkeys }} - -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/soy20/keyboard.json b/keyboards/soy20/keyboard.json index e5c4499af54..77524eff6ca 100644 --- a/keyboards/soy20/keyboard.json +++ b/keyboards/soy20/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B6", "B7", "C7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/sparrow62/config.h b/keyboards/sparrow62/config.h index 3f234d31cba..2b9669e9383 100644 --- a/keyboards/sparrow62/config.h +++ b/keyboards/sparrow62/config.h @@ -18,8 +18,3 @@ along with this program. If not, see . #pragma once #define SPLIT_HAND_PIN F4 - -/* 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/sparrow62/keyboard.json b/keyboards/sparrow62/keyboard.json index e551bb48517..796d18b9bb8 100644 --- a/keyboards/sparrow62/keyboard.json +++ b/keyboards/sparrow62/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/split67/config.h b/keyboards/split67/config.h deleted file mode 100644 index 9d50d9bdd1c..00000000000 --- a/keyboards/split67/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 - - - diff --git a/keyboards/split67/keyboard.json b/keyboards/split67/keyboard.json index f24eea4ce07..f9a3632c01f 100644 --- a/keyboards/split67/keyboard.json +++ b/keyboards/split67/keyboard.json @@ -15,6 +15,12 @@ "extrakey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6", null, null], "rows": ["D4", "C6", "D7", "E6", "B4"] @@ -108,4 +114,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/splitish/config.h b/keyboards/splitish/config.h deleted file mode 100644 index f3fe3850d70..00000000000 --- a/keyboards/splitish/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2019 Reid Schneyer - -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 - -#define LOCKING_SUPPORT_ENABLE - -#define LOCKING_RESYNC_ENABLE - - diff --git a/keyboards/splitish/keyboard.json b/keyboards/splitish/keyboard.json index 08043173717..3df635e6bc2 100644 --- a/keyboards/splitish/keyboard.json +++ b/keyboards/splitish/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["B4", "B5", "B2", "B6"] diff --git a/keyboards/splitography/config.h b/keyboards/splitography/config.h deleted file mode 100644 index d01dd17a188..00000000000 --- a/keyboards/splitography/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Alexis Jeandeau - * - * 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 diff --git a/keyboards/splitography/keyboard.json b/keyboards/splitography/keyboard.json index 3805f1ca2b0..947622096c9 100644 --- a/keyboards/splitography/keyboard.json +++ b/keyboards/splitography/keyboard.json @@ -13,6 +13,12 @@ "console": false, "command": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "rows": ["D0", "D1", "D2", "D3"], "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7"] diff --git a/keyboards/star75/config.h b/keyboards/star75/config.h index 056ee84a8f3..65d751197af 100644 --- a/keyboards/star75/config.h +++ b/keyboards/star75/config.h @@ -3,11 +3,5 @@ Copyright 2022 Horns Lyn (@hornslyn) 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 - #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/star75/keyboard.json b/keyboards/star75/keyboard.json index 5abd5a57b93..e4ea684a0f2 100644 --- a/keyboards/star75/keyboard.json +++ b/keyboards/star75/keyboard.json @@ -42,6 +42,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["B7", "D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/stello65/beta/config.h b/keyboards/stello65/beta/config.h deleted file mode 100644 index a1ac3b7b2a7..00000000000 --- a/keyboards/stello65/beta/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2021 @wekey (@@wekey) -// 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 - -/* - * 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/stello65/beta/keyboard.json b/keyboards/stello65/beta/keyboard.json index 230cc6ff007..5dbc3b1338d 100644 --- a/keyboards/stello65/beta/keyboard.json +++ b/keyboards/stello65/beta/keyboard.json @@ -20,6 +20,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], "rows": ["F0", "E6", "D0", "D1", "C6", "F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/stello65/hs_rev1/config.h b/keyboards/stello65/hs_rev1/config.h deleted file mode 100644 index 81fc04139c7..00000000000 --- a/keyboards/stello65/hs_rev1/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2022 @wekey (@wekey) -// 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 - -/* - * 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/stello65/hs_rev1/keyboard.json b/keyboards/stello65/hs_rev1/keyboard.json index ebda63da6d0..783b73c599e 100644 --- a/keyboards/stello65/hs_rev1/keyboard.json +++ b/keyboards/stello65/hs_rev1/keyboard.json @@ -35,6 +35,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["F1", "F0", "D1", "D2", "B6", "C6", "C7", "F7", "F6", "F5"] diff --git a/keyboards/stello65/sl_rev1/config.h b/keyboards/stello65/sl_rev1/config.h deleted file mode 100644 index 81fc04139c7..00000000000 --- a/keyboards/stello65/sl_rev1/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2022 @wekey (@wekey) -// 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 - -/* - * 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/stello65/sl_rev1/keyboard.json b/keyboards/stello65/sl_rev1/keyboard.json index 9204986cd1e..8be7b07d0a9 100644 --- a/keyboards/stello65/sl_rev1/keyboard.json +++ b/keyboards/stello65/sl_rev1/keyboard.json @@ -35,6 +35,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F0", "E6", "D0", "D1", "C6", "F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/config.h b/keyboards/stenokeyboards/the_uni/pro_micro/config.h deleted file mode 100644 index a527c077968..00000000000 --- a/keyboards/stenokeyboards/the_uni/pro_micro/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Peter C. Park - -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 diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/keyboard.json b/keyboards/stenokeyboards/the_uni/pro_micro/keyboard.json index f14728b577f..03466935b0d 100644 --- a/keyboards/stenokeyboards/the_uni/pro_micro/keyboard.json +++ b/keyboards/stenokeyboards/the_uni/pro_micro/keyboard.json @@ -12,6 +12,12 @@ "nkro": true, "steno": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B5", "B4", "E6", "D7", "C6", "D4"], "rows": ["F4", "B2", "B6"] diff --git a/keyboards/stenokeyboards/the_uni/usb_c/config.h b/keyboards/stenokeyboards/the_uni/usb_c/config.h deleted file mode 100644 index a527c077968..00000000000 --- a/keyboards/stenokeyboards/the_uni/usb_c/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Peter C. Park - -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 diff --git a/keyboards/stenokeyboards/the_uni/usb_c/keyboard.json b/keyboards/stenokeyboards/the_uni/usb_c/keyboard.json index 5226fb0a8ee..efe3b979bef 100644 --- a/keyboards/stenokeyboards/the_uni/usb_c/keyboard.json +++ b/keyboards/stenokeyboards/the_uni/usb_c/keyboard.json @@ -12,6 +12,12 @@ "nkro": true, "steno": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "D5", "D3", "D2", "D1", "D0", "D4"], "rows": ["B7", "D6", "C7"] diff --git a/keyboards/strech/soulstone/config.h b/keyboards/strech/soulstone/config.h index 425546d77eb..98c17fbee21 100644 --- a/keyboards/strech/soulstone/config.h +++ b/keyboards/strech/soulstone/config.h @@ -16,9 +16,4 @@ #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 LAYER_INDICATOR_LED_PIN B3 diff --git a/keyboards/strech/soulstone/keyboard.json b/keyboards/strech/soulstone/keyboard.json index 53037d1460f..32671eba11a 100644 --- a/keyboards/strech/soulstone/keyboard.json +++ b/keyboards/strech/soulstone/keyboard.json @@ -17,6 +17,12 @@ "command": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["B7", "F1", "B0", "F4", "E6", "F0", "D5", "D3", "D2", "D1", "B4", "D7", "D6"], diff --git a/keyboards/studiokestra/bourgeau/config.h b/keyboards/studiokestra/bourgeau/config.h deleted file mode 100644 index 91e152a0981..00000000000 --- a/keyboards/studiokestra/bourgeau/config.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -Copyright 2021 Studio Kestra - -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 - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/studiokestra/bourgeau/keyboard.json b/keyboards/studiokestra/bourgeau/keyboard.json index 22cc6095363..3e0111a6188 100644 --- a/keyboards/studiokestra/bourgeau/keyboard.json +++ b/keyboards/studiokestra/bourgeau/keyboard.json @@ -38,6 +38,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B0", "D2", "D1", "D0", "D3", "B6", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B5", "B4"], "rows": ["D4", "D6", "D7", "D5", "B1", "F0"] diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h deleted file mode 100644 index 91e152a0981..00000000000 --- a/keyboards/studiokestra/cascade/config.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -Copyright 2021 Studio Kestra - -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 - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/studiokestra/cascade/keyboard.json b/keyboards/studiokestra/cascade/keyboard.json index f6d95261ac1..962276e62aa 100644 --- a/keyboards/studiokestra/cascade/keyboard.json +++ b/keyboards/studiokestra/cascade/keyboard.json @@ -38,6 +38,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "D5", "D1", "D0", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D6", "D7"], "rows": ["F0", "B1", "D4", "F4", "F1"] diff --git a/keyboards/studiokestra/frl84/config.h b/keyboards/studiokestra/frl84/config.h deleted file mode 100644 index 70ff15e35cf..00000000000 --- a/keyboards/studiokestra/frl84/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2023 Studio Kestra -// 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/studiokestra/frl84/keyboard.json b/keyboards/studiokestra/frl84/keyboard.json index c0b05dec46d..d131b09eac7 100644 --- a/keyboards/studiokestra/frl84/keyboard.json +++ b/keyboards/studiokestra/frl84/keyboard.json @@ -13,6 +13,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D5", "D0", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["D6", "D4", "B4", "D7", "B6", "B5", "C7", "C6", "D2", "D1"] diff --git a/keyboards/studiokestra/galatea/config.h b/keyboards/studiokestra/galatea/config.h deleted file mode 100644 index c37d8a5ad28..00000000000 --- a/keyboards/studiokestra/galatea/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2023 studiokestra (@studiokestra) -// 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/studiokestra/galatea/rev1/keyboard.json b/keyboards/studiokestra/galatea/rev1/keyboard.json index dcc7898f619..ff2adbce4d1 100644 --- a/keyboards/studiokestra/galatea/rev1/keyboard.json +++ b/keyboards/studiokestra/galatea/rev1/keyboard.json @@ -12,6 +12,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B2", "D5"], "rows": ["D1", "D0", "B0", "B7", "E6", "B3", "B6", "C6", "D6", "D7", "B4", "D3"] diff --git a/keyboards/studiokestra/galatea/rev2/keyboard.json b/keyboards/studiokestra/galatea/rev2/keyboard.json index 5c1363f750c..115b5684cd3 100644 --- a/keyboards/studiokestra/galatea/rev2/keyboard.json +++ b/keyboards/studiokestra/galatea/rev2/keyboard.json @@ -13,6 +13,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B2", "D5"], "rows": ["D1", "D0", "B0", "B7", "E6", "B3", "B6", "C6", "D6", "D7", "B4", "D3"] diff --git a/keyboards/studiokestra/galatea/rev3/keyboard.json b/keyboards/studiokestra/galatea/rev3/keyboard.json index 1669e3a1836..a4b07bb4df6 100644 --- a/keyboards/studiokestra/galatea/rev3/keyboard.json +++ b/keyboards/studiokestra/galatea/rev3/keyboard.json @@ -13,6 +13,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP14", "GP6"], "rows": ["GP3", "GP4", "GP1", "GP2", "GP5", "GP29", "GP20", "GP19", "GP17", "GP16", "GP13", "GP12"] diff --git a/keyboards/studiokestra/line_friends_tkl/config.h b/keyboards/studiokestra/line_friends_tkl/config.h deleted file mode 100644 index c37d8a5ad28..00000000000 --- a/keyboards/studiokestra/line_friends_tkl/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2023 studiokestra (@studiokestra) -// 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/studiokestra/line_friends_tkl/keyboard.json b/keyboards/studiokestra/line_friends_tkl/keyboard.json index 9c2db93a92f..d8902e2a2f7 100644 --- a/keyboards/studiokestra/line_friends_tkl/keyboard.json +++ b/keyboards/studiokestra/line_friends_tkl/keyboard.json @@ -12,6 +12,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "B6", "on_state": 1, diff --git a/keyboards/studiokestra/nascent/config.h b/keyboards/studiokestra/nascent/config.h deleted file mode 100644 index f1b419a3e20..00000000000 --- a/keyboards/studiokestra/nascent/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 Studio Kestra - -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 diff --git a/keyboards/studiokestra/nascent/keyboard.json b/keyboards/studiokestra/nascent/keyboard.json index c2b14a71bc4..f411859acc4 100644 --- a/keyboards/studiokestra/nascent/keyboard.json +++ b/keyboards/studiokestra/nascent/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D3", "D7", "D6", "D4", "D5", "B0", "E6"], "rows": ["F5", "F4", "F7", "F6", "C6", "C7", "B4", "B5", "D0", "D1"] diff --git a/keyboards/studiokestra/nue/config.h b/keyboards/studiokestra/nue/config.h deleted file mode 100644 index e2d4270dd62..00000000000 --- a/keyboards/studiokestra/nue/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Studio Kestra - -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 diff --git a/keyboards/studiokestra/nue/keyboard.json b/keyboards/studiokestra/nue/keyboard.json index ffd5581fee5..a98d8382482 100644 --- a/keyboards/studiokestra/nue/keyboard.json +++ b/keyboards/studiokestra/nue/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F6", "F7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["B0", "B7", "F1", "F5", "F4"] diff --git a/keyboards/suavity/ehan/config.h b/keyboards/suavity/ehan/config.h deleted file mode 100644 index befff72ca81..00000000000 --- a/keyboards/suavity/ehan/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Suavity Designs - -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 - diff --git a/keyboards/suavity/ehan/keyboard.json b/keyboards/suavity/ehan/keyboard.json index a025ec4992b..5a6675bfc39 100755 --- a/keyboards/suavity/ehan/keyboard.json +++ b/keyboards/suavity/ehan/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "C14", "B7", "B6", "B5", "B4", "B3", "A15", "C13", "B9", "B8"], "rows": ["A7", "B0", "A3", "A4", "A5", "A6"] diff --git a/keyboards/subatomic/config.h b/keyboards/subatomic/config.h deleted file mode 100644 index b0c6bce36a6..00000000000 --- a/keyboards/subatomic/config.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 - -// #define AUDIO_VOICES -// #define AUDIO_PIN C6 - -/* 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/subatomic/keyboard.json b/keyboards/subatomic/keyboard.json index 64f254a087a..0816130bbb8 100644 --- a/keyboards/subatomic/keyboard.json +++ b/keyboards/subatomic/keyboard.json @@ -18,6 +18,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7", "C6", "C5"], "rows": ["D2", "D5", "B5", "B6", "D3"] diff --git a/keyboards/switchplate/southpaw_65/config.h b/keyboards/switchplate/southpaw_65/config.h index 8fe96fc5dd3..a4d8996af99 100644 --- a/keyboards/switchplate/southpaw_65/config.h +++ b/keyboards/switchplate/southpaw_65/config.h @@ -21,11 +21,6 @@ #define MATRIX_ROWS 5 #define MATRIX_COLS 19 -/* 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. diff --git a/keyboards/switchplate/southpaw_65/keyboard.json b/keyboards/switchplate/southpaw_65/keyboard.json index fd879349f25..e4090e49c72 100644 --- a/keyboards/switchplate/southpaw_65/keyboard.json +++ b/keyboards/switchplate/southpaw_65/keyboard.json @@ -19,6 +19,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "B5", "levels": 10 diff --git a/keyboards/switchplate/southpaw_fullsize/config.h b/keyboards/switchplate/southpaw_fullsize/config.h deleted file mode 100644 index 8abadb95221..00000000000 --- a/keyboards/switchplate/southpaw_fullsize/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Ryota Goto - -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/switchplate/southpaw_fullsize/keyboard.json b/keyboards/switchplate/southpaw_fullsize/keyboard.json index 822fc660815..ad897821c35 100644 --- a/keyboards/switchplate/southpaw_fullsize/keyboard.json +++ b/keyboards/switchplate/southpaw_fullsize/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A7", "C7", "C6", "C5", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "E0", "D7", "D6"], "rows": ["E1", "C0", "C1", "C2", "C3", "C4"] diff --git a/keyboards/switchplate/switchplate910/config.h b/keyboards/switchplate/switchplate910/config.h deleted file mode 100644 index ef90a43c6f2..00000000000 --- a/keyboards/switchplate/switchplate910/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Stefan Karsch - -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/switchplate/switchplate910/keyboard.json b/keyboards/switchplate/switchplate910/keyboard.json index 40a2a246374..47353fe81ea 100644 --- a/keyboards/switchplate/switchplate910/keyboard.json +++ b/keyboards/switchplate/switchplate910/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "B3", "B2", "B0", "B1"], "rows": ["F4", "F5", "F6", "F7", "D1"] diff --git a/keyboards/sx60/config.h b/keyboards/sx60/config.h index 46921665c9e..a37aeb6a7ba 100755 --- a/keyboards/sx60/config.h +++ b/keyboards/sx60/config.h @@ -31,9 +31,3 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -/* 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/sx60/keyboard.json b/keyboards/sx60/keyboard.json index 42eefbc81a8..ba5b439cec2 100644 --- a/keyboards/sx60/keyboard.json +++ b/keyboards/sx60/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "B7" }, diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h index 986a4db76e0..7e7fa9be9c3 100644 --- a/keyboards/system76/launch_1/config.h +++ b/keyboards/system76/launch_1/config.h @@ -19,12 +19,6 @@ #define RGB_MATRIX_DISABLE_KEYCODES // Disables control of rgb matrix by keycodes (must use code functions to control the feature) -// 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 - // I2C { #define F_SCL 100000UL // Run I2C bus at 100 kHz #define I2C_START_RETRY_COUNT 20 diff --git a/keyboards/system76/launch_1/keyboard.json b/keyboards/system76/launch_1/keyboard.json index 28a505448ef..929b8c9794d 100644 --- a/keyboards/system76/launch_1/keyboard.json +++ b/keyboards/system76/launch_1/keyboard.json @@ -19,6 +19,12 @@ "raw": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "E2" }, From 84134115711f5165bffc862e6386346b29099c18 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 23 May 2024 12:38:43 -0700 Subject: [PATCH 327/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: S, Part 1 (#23783) Affects: - `salicylic_acid3/7skb/rev1` - `salicylic_acid3/7splus` - `salicylic_acid3/ajisai74` - `salicylic_acid3/ergoarrows` - `salicylic_acid3/getta25/rev1` - `salicylic_acid3/jisplit89/rev1` - `salicylic_acid3/nafuda` - `salicylic_acid3/naked48/rev1` - `salicylic_acid3/naked60/rev1` - `salicylic_acid3/naked64/rev1` - `salicylic_acid3/nknl7en` - `salicylic_acid3/nknl7jp` - `salicylic_acid3/setta21/rev1` - `sandwich/keeb68` - `satt/vision` - `sauce/mild` - `scatter42` - `sck/gtm` - `sck/m0116b` - `sck/neiso` - `sekigon/grs_70ec` - `sendyyeah/pix` - `senselessclay/ck65` - `senselessclay/gos65` - `senselessclay/had60` - `sentraq/s60_x/default` - `sentraq/s60_x/rgb` - `sentraq/s65_plus` - `sentraq/s65_x` - `sets3n/kk980` - `shambles` - `shandoncodes/flygone60/rev3` - `shandoncodes/mino/hotswap` - `shapeshifter4060` - `shiro` - `shk9` - `sidderskb/majbritt/rev2` - `sixkeyboard` - `skeletonkbd/skeletonnumpad` - `skme/zeno` --- keyboards/salicylic_acid3/7skb/rev1/config.h | 5 --- .../salicylic_acid3/7skb/rev1/keyboard.json | 6 +++ keyboards/salicylic_acid3/7splus/config.h | 5 --- .../salicylic_acid3/7splus/keyboard.json | 6 +++ keyboards/salicylic_acid3/ajisai74/config.h | 5 --- .../salicylic_acid3/ajisai74/keyboard.json | 6 +++ keyboards/salicylic_acid3/ergoarrows/config.h | 5 --- .../salicylic_acid3/ergoarrows/keyboard.json | 6 +++ .../salicylic_acid3/getta25/rev1/config.h | 5 --- .../getta25/rev1/keyboard.json | 6 +++ .../salicylic_acid3/jisplit89/rev1/config.h | 5 --- .../jisplit89/rev1/keyboard.json | 6 +++ keyboards/salicylic_acid3/nafuda/config.h | 5 --- .../salicylic_acid3/nafuda/keyboard.json | 6 +++ .../salicylic_acid3/naked48/rev1/config.h | 23 ----------- .../naked48/rev1/keyboard.json | 6 +++ .../salicylic_acid3/naked60/rev1/config.h | 23 ----------- .../naked60/rev1/keyboard.json | 6 +++ .../salicylic_acid3/naked64/rev1/config.h | 5 --- .../naked64/rev1/keyboard.json | 6 +++ keyboards/salicylic_acid3/nknl7en/config.h | 5 --- .../salicylic_acid3/nknl7en/keyboard.json | 6 +++ keyboards/salicylic_acid3/nknl7jp/config.h | 5 --- .../salicylic_acid3/nknl7jp/keyboard.json | 6 +++ .../salicylic_acid3/setta21/rev1/config.h | 5 --- .../setta21/rev1/keyboard.json | 6 +++ keyboards/sandwich/keeb68/config.h | 39 ------------------- keyboards/sandwich/keeb68/keyboard.json | 6 +++ keyboards/satt/vision/config.h | 39 ------------------- keyboards/satt/vision/keyboard.json | 6 +++ keyboards/sauce/mild/config.h | 22 ----------- keyboards/sauce/mild/keyboard.json | 6 +++ keyboards/scatter42/config.h | 39 ------------------- keyboards/scatter42/keyboard.json | 6 +++ keyboards/sck/gtm/config.h | 7 ---- keyboards/sck/gtm/keyboard.json | 6 +++ keyboards/sck/m0116b/config.h | 39 ------------------- keyboards/sck/m0116b/keyboard.json | 6 +++ keyboards/sck/neiso/config.h | 39 ------------------- keyboards/sck/neiso/keyboard.json | 6 +++ keyboards/sekigon/grs_70ec/config.h | 5 --- keyboards/sekigon/grs_70ec/keyboard.json | 6 +++ keyboards/sendyyeah/pix/config.h | 6 --- keyboards/sendyyeah/pix/keyboard.json | 6 +++ keyboards/senselessclay/ck65/config.h | 5 --- keyboards/senselessclay/ck65/keyboard.json | 6 +++ keyboards/senselessclay/gos65/config.h | 39 ------------------- keyboards/senselessclay/gos65/keyboard.json | 6 +++ keyboards/senselessclay/had60/config.h | 39 ------------------- keyboards/senselessclay/had60/keyboard.json | 6 +++ keyboards/sentraq/s60_x/default/config.h | 6 --- keyboards/sentraq/s60_x/default/keyboard.json | 6 +++ keyboards/sentraq/s60_x/rgb/config.h | 7 ---- keyboards/sentraq/s60_x/rgb/keyboard.json | 6 +++ keyboards/sentraq/s65_plus/config.h | 6 --- keyboards/sentraq/s65_plus/keyboard.json | 6 +++ keyboards/sentraq/s65_x/config.h | 6 --- keyboards/sentraq/s65_x/keyboard.json | 6 +++ keyboards/sets3n/kk980/config.h | 6 --- keyboards/sets3n/kk980/keyboard.json | 6 +++ keyboards/shambles/config.h | 7 ---- keyboards/shambles/keyboard.json | 6 +++ .../shandoncodes/flygone60/rev3/config.h | 23 ----------- .../shandoncodes/flygone60/rev3/keyboard.json | 6 +++ keyboards/shandoncodes/mino/hotswap/config.h | 23 ----------- .../shandoncodes/mino/hotswap/keyboard.json | 6 +++ keyboards/shapeshifter4060/config.h | 39 ------------------- keyboards/shapeshifter4060/keyboard.json | 6 +++ keyboards/shiro/config.h | 39 ------------------- keyboards/shiro/keyboard.json | 6 +++ keyboards/shk9/config.h | 23 ----------- keyboards/shk9/keyboard.json | 6 +++ keyboards/sidderskb/majbritt/rev2/config.h | 23 ----------- .../sidderskb/majbritt/rev2/keyboard.json | 6 +++ keyboards/sixkeyboard/config.h | 5 --- keyboards/sixkeyboard/keyboard.json | 6 +++ keyboards/skeletonkbd/skeletonnumpad/config.h | 39 ------------------- .../skeletonkbd/skeletonnumpad/keyboard.json | 6 +++ keyboards/skme/zeno/config.h | 23 ----------- keyboards/skme/zeno/keyboard.json | 6 +++ 80 files changed, 240 insertions(+), 694 deletions(-) delete mode 100644 keyboards/salicylic_acid3/naked48/rev1/config.h delete mode 100644 keyboards/salicylic_acid3/naked60/rev1/config.h delete mode 100644 keyboards/sandwich/keeb68/config.h delete mode 100644 keyboards/satt/vision/config.h delete mode 100644 keyboards/sauce/mild/config.h delete mode 100644 keyboards/scatter42/config.h delete mode 100644 keyboards/sck/gtm/config.h delete mode 100644 keyboards/sck/m0116b/config.h delete mode 100644 keyboards/sck/neiso/config.h delete mode 100644 keyboards/senselessclay/gos65/config.h delete mode 100644 keyboards/senselessclay/had60/config.h delete mode 100644 keyboards/sentraq/s60_x/rgb/config.h delete mode 100644 keyboards/shambles/config.h delete mode 100644 keyboards/shandoncodes/flygone60/rev3/config.h delete mode 100644 keyboards/shandoncodes/mino/hotswap/config.h delete mode 100644 keyboards/shapeshifter4060/config.h delete mode 100644 keyboards/shiro/config.h delete mode 100644 keyboards/shk9/config.h delete mode 100644 keyboards/sidderskb/majbritt/rev2/config.h delete mode 100644 keyboards/skeletonkbd/skeletonnumpad/config.h delete mode 100644 keyboards/skme/zeno/config.h diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h index 644ce27575b..c1a6005b587 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/config.h +++ b/keyboards/salicylic_acid3/7skb/rev1/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN B6 -/* 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 - #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 180 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json index 5b5e63b7ca2..73b3c0bec7c 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json @@ -16,6 +16,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/7splus/config.h b/keyboards/salicylic_acid3/7splus/config.h index 3a82c91526a..1139de696fd 100644 --- a/keyboards/salicylic_acid3/7splus/config.h +++ b/keyboards/salicylic_acid3/7splus/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN B6 -/* 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 - #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 180 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/salicylic_acid3/7splus/keyboard.json b/keyboards/salicylic_acid3/7splus/keyboard.json index 38ca750cd47..c33e79b52fc 100644 --- a/keyboards/salicylic_acid3/7splus/keyboard.json +++ b/keyboards/salicylic_acid3/7splus/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/ajisai74/config.h b/keyboards/salicylic_acid3/ajisai74/config.h index 8f24db085d1..9e47a9c2b44 100644 --- a/keyboards/salicylic_acid3/ajisai74/config.h +++ b/keyboards/salicylic_acid3/ajisai74/config.h @@ -18,8 +18,3 @@ along with this program. If not, see . #pragma once #define SPLIT_HAND_PIN B6 - -/* 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/salicylic_acid3/ajisai74/keyboard.json b/keyboards/salicylic_acid3/ajisai74/keyboard.json index b29c5bf178c..fd008007157 100644 --- a/keyboards/salicylic_acid3/ajisai74/keyboard.json +++ b/keyboards/salicylic_acid3/ajisai74/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D3"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/ergoarrows/config.h b/keyboards/salicylic_acid3/ergoarrows/config.h index e373d2a88b7..3b5e630f48d 100644 --- a/keyboards/salicylic_acid3/ergoarrows/config.h +++ b/keyboards/salicylic_acid3/ergoarrows/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN B6 -/* 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 - #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 90 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/salicylic_acid3/ergoarrows/keyboard.json b/keyboards/salicylic_acid3/ergoarrows/keyboard.json index bb9956a2d07..0993eb1b9be 100644 --- a/keyboards/salicylic_acid3/ergoarrows/keyboard.json +++ b/keyboards/salicylic_acid3/ergoarrows/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/salicylic_acid3/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h index a8fd75dc9db..b2fb6591859 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/config.h +++ b/keyboards/salicylic_acid3/getta25/rev1/config.h @@ -18,11 +18,6 @@ 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 - #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 180 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/salicylic_acid3/getta25/rev1/keyboard.json b/keyboards/salicylic_acid3/getta25/rev1/keyboard.json index 3399f9e081b..884ed684eaa 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/getta25/rev1/keyboard.json @@ -16,6 +16,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "hue_steps": 10, "led_count": 9, diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h index 144d743b327..fb6c21aec85 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/config.h +++ b/keyboards/salicylic_acid3/jisplit89/rev1/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN B6 -/* 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 - #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 180 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json index 7c72c9b17aa..e36b27bd2f0 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json @@ -16,6 +16,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/nafuda/config.h b/keyboards/salicylic_acid3/nafuda/config.h index fb94963ca0e..552fb486119 100644 --- a/keyboards/salicylic_acid3/nafuda/config.h +++ b/keyboards/salicylic_acid3/nafuda/config.h @@ -18,11 +18,6 @@ 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 - #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 180 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/salicylic_acid3/nafuda/keyboard.json b/keyboards/salicylic_acid3/nafuda/keyboard.json index 59e646c5b7f..87dceed05f2 100644 --- a/keyboards/salicylic_acid3/nafuda/keyboard.json +++ b/keyboards/salicylic_acid3/nafuda/keyboard.json @@ -36,6 +36,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6"], "rows": ["D1", "D0", "D4"] diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h deleted file mode 100644 index 2f62289261b..00000000000 --- a/keyboards/salicylic_acid3/naked48/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Salicylic_Acid - -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 diff --git a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json index f390db51f14..2786f50a03f 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json @@ -15,6 +15,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/salicylic_acid3/naked60/rev1/config.h b/keyboards/salicylic_acid3/naked60/rev1/config.h deleted file mode 100644 index 2f62289261b..00000000000 --- a/keyboards/salicylic_acid3/naked60/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Salicylic_Acid - -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 diff --git a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json index 1916b01eb21..52a503c9400 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json @@ -14,6 +14,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D7", "E6", "B4", "B5", "D3"], "rows": ["B6", "D1", "D0", "D4", "C6"] diff --git a/keyboards/salicylic_acid3/naked64/rev1/config.h b/keyboards/salicylic_acid3/naked64/rev1/config.h index a8fd75dc9db..b2fb6591859 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/config.h +++ b/keyboards/salicylic_acid3/naked64/rev1/config.h @@ -18,11 +18,6 @@ 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 - #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 180 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json index 8dc9a49c7a6..6cc68976597 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json @@ -16,6 +16,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D3"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/salicylic_acid3/nknl7en/config.h b/keyboards/salicylic_acid3/nknl7en/config.h index 5bc9c2c789b..5b4a4a25f33 100644 --- a/keyboards/salicylic_acid3/nknl7en/config.h +++ b/keyboards/salicylic_acid3/nknl7en/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN B6 -/* 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 - #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 180 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/salicylic_acid3/nknl7en/keyboard.json b/keyboards/salicylic_acid3/nknl7en/keyboard.json index 4d6b494b9fb..25165663f5a 100644 --- a/keyboards/salicylic_acid3/nknl7en/keyboard.json +++ b/keyboards/salicylic_acid3/nknl7en/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/nknl7jp/config.h b/keyboards/salicylic_acid3/nknl7jp/config.h index 5bc9c2c789b..5b4a4a25f33 100644 --- a/keyboards/salicylic_acid3/nknl7jp/config.h +++ b/keyboards/salicylic_acid3/nknl7jp/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN B6 -/* 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 - #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 180 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/salicylic_acid3/nknl7jp/keyboard.json b/keyboards/salicylic_acid3/nknl7jp/keyboard.json index 0f260cdfdd7..179860ea293 100644 --- a/keyboards/salicylic_acid3/nknl7jp/keyboard.json +++ b/keyboards/salicylic_acid3/nknl7jp/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h index fb94963ca0e..552fb486119 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/config.h +++ b/keyboards/salicylic_acid3/setta21/rev1/config.h @@ -18,11 +18,6 @@ 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 - #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 180 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/salicylic_acid3/setta21/rev1/keyboard.json b/keyboards/salicylic_acid3/setta21/rev1/keyboard.json index 0d20c99f269..452d0211c37 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/setta21/rev1/keyboard.json @@ -15,6 +15,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "hue_steps": 10, "led_count": 21, diff --git a/keyboards/sandwich/keeb68/config.h b/keyboards/sandwich/keeb68/config.h deleted file mode 100644 index fdd0cd8c864..00000000000 --- a/keyboards/sandwich/keeb68/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 sandwich - -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/sandwich/keeb68/keyboard.json b/keyboards/sandwich/keeb68/keyboard.json index ffad82b8271..ad3ced0da2c 100644 --- a/keyboards/sandwich/keeb68/keyboard.json +++ b/keyboards/sandwich/keeb68/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "C6", "F7", "E6", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B4", "B5"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/satt/vision/config.h b/keyboards/satt/vision/config.h deleted file mode 100644 index 4b007cf387e..00000000000 --- a/keyboards/satt/vision/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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/satt/vision/keyboard.json b/keyboards/satt/vision/keyboard.json index 7683855f42b..88ec732cd65 100644 --- a/keyboards/satt/vision/keyboard.json +++ b/keyboards/satt/vision/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "B0", "A7", "A6", "A5", "A4", "A3", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], "rows": ["B12", "B2", "A2", "A1"] diff --git a/keyboards/sauce/mild/config.h b/keyboards/sauce/mild/config.h deleted file mode 100644 index 037c0b0a232..00000000000 --- a/keyboards/sauce/mild/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Andy Yong (Sauce) - * - * 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 diff --git a/keyboards/sauce/mild/keyboard.json b/keyboards/sauce/mild/keyboard.json index 48cc1c772f3..5f827ec4beb 100644 --- a/keyboards/sauce/mild/keyboard.json +++ b/keyboards/sauce/mild/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A4", "A3", "A2", "A1", "B6", "B5", "B4"], "rows": ["C13", "C14", "C15", "A15", "F0", "F1"] diff --git a/keyboards/scatter42/config.h b/keyboards/scatter42/config.h deleted file mode 100644 index 2021cca3b0f..00000000000 --- a/keyboards/scatter42/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 bbrfkr - -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/scatter42/keyboard.json b/keyboards/scatter42/keyboard.json index 7ccf9cb9fcf..63aaaa46b2c 100644 --- a/keyboards/scatter42/keyboard.json +++ b/keyboards/scatter42/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/sck/gtm/config.h b/keyboards/sck/gtm/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/sck/gtm/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/sck/gtm/keyboard.json b/keyboards/sck/gtm/keyboard.json index 54f6eda446b..7ed3915114a 100644 --- a/keyboards/sck/gtm/keyboard.json +++ b/keyboards/sck/gtm/keyboard.json @@ -36,6 +36,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "B7", "C7", "D0"], "rows": ["C4", "C5", "D1"] diff --git a/keyboards/sck/m0116b/config.h b/keyboards/sck/m0116b/config.h deleted file mode 100644 index a3c400ab478..00000000000 --- a/keyboards/sck/m0116b/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 jrfhoutx - -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/sck/m0116b/keyboard.json b/keyboards/sck/m0116b/keyboard.json index 68184f340cf..ec96ebc5a34 100644 --- a/keyboards/sck/m0116b/keyboard.json +++ b/keyboards/sck/m0116b/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D0", "B3", "B2", "B1", "B0", "E6", "B5", "B6", "C6", "C7", "F7", "D4", "D6", "D7", "B4"], "rows": ["D1", "F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/sck/neiso/config.h b/keyboards/sck/neiso/config.h deleted file mode 100644 index a3c400ab478..00000000000 --- a/keyboards/sck/neiso/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 jrfhoutx - -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/sck/neiso/keyboard.json b/keyboards/sck/neiso/keyboard.json index 59132579c92..15cec588492 100644 --- a/keyboards/sck/neiso/keyboard.json +++ b/keyboards/sck/neiso/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "D2", "F5", "F7", "B4"], "rows": ["F4"] diff --git a/keyboards/sekigon/grs_70ec/config.h b/keyboards/sekigon/grs_70ec/config.h index ad92abd5d71..4541823684a 100644 --- a/keyboards/sekigon/grs_70ec/config.h +++ b/keyboards/sekigon/grs_70ec/config.h @@ -47,11 +47,6 @@ along with this program. If not, see . #define EE_HANDS -/* 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. diff --git a/keyboards/sekigon/grs_70ec/keyboard.json b/keyboards/sekigon/grs_70ec/keyboard.json index e940e71d884..fbea73fb996 100644 --- a/keyboards/sekigon/grs_70ec/keyboard.json +++ b/keyboards/sekigon/grs_70ec/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "split": { "enabled": true, "soft_serial_pin": "D3" diff --git a/keyboards/sendyyeah/pix/config.h b/keyboards/sendyyeah/pix/config.h index d6dfea8506b..3a6cb6297f2 100644 --- a/keyboards/sendyyeah/pix/config.h +++ b/keyboards/sendyyeah/pix/config.h @@ -19,11 +19,5 @@ #define OLED_FONT_H "keymaps/default/glcdfont.c" #define OLED_TIMEOUT 600000 // Turn of after 10 minutes -/* 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 RGBLIGHT_LAYERS #define RGBLIGHT_LAYER_BLINK diff --git a/keyboards/sendyyeah/pix/keyboard.json b/keyboards/sendyyeah/pix/keyboard.json index 40c432fb01c..6a9864cc351 100644 --- a/keyboards/sendyyeah/pix/keyboard.json +++ b/keyboards/sendyyeah/pix/keyboard.json @@ -47,6 +47,12 @@ "oled": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["C6", "D7", "E6", "B4", "F6"] diff --git a/keyboards/senselessclay/ck65/config.h b/keyboards/senselessclay/ck65/config.h index 7c029a283db..1dd42538e6d 100644 --- a/keyboards/senselessclay/ck65/config.h +++ b/keyboards/senselessclay/ck65/config.h @@ -17,11 +17,6 @@ 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. diff --git a/keyboards/senselessclay/ck65/keyboard.json b/keyboards/senselessclay/ck65/keyboard.json index 6ac3de4b8ae..150479177d3 100644 --- a/keyboards/senselessclay/ck65/keyboard.json +++ b/keyboards/senselessclay/ck65/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "D5", "D3", "D2", "D1", "D0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B3", "B2", "F1", "F4", "F5"] diff --git a/keyboards/senselessclay/gos65/config.h b/keyboards/senselessclay/gos65/config.h deleted file mode 100644 index cef01cf341c..00000000000 --- a/keyboards/senselessclay/gos65/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Hadi Iskandarani - -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/senselessclay/gos65/keyboard.json b/keyboards/senselessclay/gos65/keyboard.json index bf79cf7fff5..b869d913015 100644 --- a/keyboards/senselessclay/gos65/keyboard.json +++ b/keyboards/senselessclay/gos65/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "D5", "D3", "D2", "D1", "D0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B1", "B2", "F1", "F6", "F5"] diff --git a/keyboards/senselessclay/had60/config.h b/keyboards/senselessclay/had60/config.h deleted file mode 100644 index bdeea958dc7..00000000000 --- a/keyboards/senselessclay/had60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Hadi Iskandarani - -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/senselessclay/had60/keyboard.json b/keyboards/senselessclay/had60/keyboard.json index 4aa263fb7a9..ca05589a2e4 100644 --- a/keyboards/senselessclay/had60/keyboard.json +++ b/keyboards/senselessclay/had60/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F1", "F0", "F7", "F6", "F5"] diff --git a/keyboards/sentraq/s60_x/default/config.h b/keyboards/sentraq/s60_x/default/config.h index c265dc1ef12..b4ee0992fe6 100644 --- a/keyboards/sentraq/s60_x/default/config.h +++ b/keyboards/sentraq/s60_x/default/config.h @@ -1,9 +1,3 @@ #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 NO_ACTION_ONESHOT diff --git a/keyboards/sentraq/s60_x/default/keyboard.json b/keyboards/sentraq/s60_x/default/keyboard.json index 262c3ae862a..1f65b907750 100644 --- a/keyboards/sentraq/s60_x/default/keyboard.json +++ b/keyboards/sentraq/s60_x/default/keyboard.json @@ -8,6 +8,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E6", "F1"], "rows": ["B7", "B3", "B2", "B1", "B0"] diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/sentraq/s60_x/rgb/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/sentraq/s60_x/rgb/keyboard.json b/keyboards/sentraq/s60_x/rgb/keyboard.json index 20b67976c4d..c2be7f43564 100644 --- a/keyboards/sentraq/s60_x/rgb/keyboard.json +++ b/keyboards/sentraq/s60_x/rgb/keyboard.json @@ -10,6 +10,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "B6", "C6", "C7", "F1", "F0", "E6", "B3", "B2", "B1", "B0"], "rows": ["B5", "B4", "D7", "D6", "D4"] diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h index 675b4c58fa7..1c37c896709 100644 --- a/keyboards/sentraq/s65_plus/config.h +++ b/keyboards/sentraq/s65_plus/config.h @@ -1,9 +1,3 @@ #pragma once #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20 - -/* 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/sentraq/s65_plus/keyboard.json b/keyboards/sentraq/s65_plus/keyboard.json index d802c88d9c5..01e2f0a2750 100644 --- a/keyboards/sentraq/s65_plus/keyboard.json +++ b/keyboards/sentraq/s65_plus/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "D5", "B2", "B3", "D0", "D1", "D2", "D4", "D6", "D7", "F7"], "rows": ["C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h index 675b4c58fa7..1c37c896709 100644 --- a/keyboards/sentraq/s65_x/config.h +++ b/keyboards/sentraq/s65_x/config.h @@ -1,9 +1,3 @@ #pragma once #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20 - -/* 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/sentraq/s65_x/keyboard.json b/keyboards/sentraq/s65_x/keyboard.json index d5b20392e3b..0d0b0fc5fd3 100644 --- a/keyboards/sentraq/s65_x/keyboard.json +++ b/keyboards/sentraq/s65_x/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F1", "F0", "E6", "B0", "B1", "D5", "B2", "B3", "D0", "D1", "D2", "D4", "D6", "D7", "F7"], "rows": ["C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/sets3n/kk980/config.h b/keyboards/sets3n/kk980/config.h index 5e35453f1f2..2855d8602f0 100644 --- a/keyboards/sets3n/kk980/config.h +++ b/keyboards/sets3n/kk980/config.h @@ -16,11 +16,5 @@ #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 RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/sets3n/kk980/keyboard.json b/keyboards/sets3n/kk980/keyboard.json index 0a4a87d2992..1589b0a7b4a 100644 --- a/keyboards/sets3n/kk980/keyboard.json +++ b/keyboards/sets3n/kk980/keyboard.json @@ -38,6 +38,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "B1", "B0", "D0", "D1"], "rows": ["B2", "B3", "D3", "D4", "D5", "D6"] diff --git a/keyboards/shambles/config.h b/keyboards/shambles/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/shambles/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/shambles/keyboard.json b/keyboards/shambles/keyboard.json index 7f11204be0e..34ec240cae2 100644 --- a/keyboards/shambles/keyboard.json +++ b/keyboards/shambles/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "F4", "F6"], "rows": ["F5", "B3", "B1", "F7"] diff --git a/keyboards/shandoncodes/flygone60/rev3/config.h b/keyboards/shandoncodes/flygone60/rev3/config.h deleted file mode 100644 index 339cf3c782f..00000000000 --- a/keyboards/shandoncodes/flygone60/rev3/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 ShandonCodes - -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 diff --git a/keyboards/shandoncodes/flygone60/rev3/keyboard.json b/keyboards/shandoncodes/flygone60/rev3/keyboard.json index 70a57528f17..6e2e62701f8 100644 --- a/keyboards/shandoncodes/flygone60/rev3/keyboard.json +++ b/keyboards/shandoncodes/flygone60/rev3/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "E6", "B1", "B2", "B3", "B0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D2", "D3", "D5", "B7", "F1"] diff --git a/keyboards/shandoncodes/mino/hotswap/config.h b/keyboards/shandoncodes/mino/hotswap/config.h deleted file mode 100644 index 45fec5af48a..00000000000 --- a/keyboards/shandoncodes/mino/hotswap/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 ShandonCodes - -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 diff --git a/keyboards/shandoncodes/mino/hotswap/keyboard.json b/keyboards/shandoncodes/mino/hotswap/keyboard.json index 56bca83a926..5bd0b933cef 100644 --- a/keyboards/shandoncodes/mino/hotswap/keyboard.json +++ b/keyboards/shandoncodes/mino/hotswap/keyboard.json @@ -18,6 +18,12 @@ "oled": true, "wpm": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7"], "rows": ["D3", "C6", "D4", "D2"] diff --git a/keyboards/shapeshifter4060/config.h b/keyboards/shapeshifter4060/config.h deleted file mode 100644 index 514076daf84..00000000000 --- a/keyboards/shapeshifter4060/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Chuck "@vosechu" Lauer Vose - -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/shapeshifter4060/keyboard.json b/keyboards/shapeshifter4060/keyboard.json index 8c83153d007..9274923088d 100644 --- a/keyboards/shapeshifter4060/keyboard.json +++ b/keyboards/shapeshifter4060/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/shiro/config.h b/keyboards/shiro/config.h deleted file mode 100644 index e962d786668..00000000000 --- a/keyboards/shiro/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 T.Shinohara - -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/shiro/keyboard.json b/keyboards/shiro/keyboard.json index bd541b3e7d8..c401126591f 100644 --- a/keyboards/shiro/keyboard.json +++ b/keyboards/shiro/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/shk9/config.h b/keyboards/shk9/config.h deleted file mode 100644 index deabfc99736..00000000000 --- a/keyboards/shk9/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 Sam Hudson - -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 diff --git a/keyboards/shk9/keyboard.json b/keyboards/shk9/keyboard.json index 19c30ec08dc..968f2d91f7d 100644 --- a/keyboards/shk9/keyboard.json +++ b/keyboards/shk9/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "B4", "B5"], "rows": ["B0", "B1", "B2"] diff --git a/keyboards/sidderskb/majbritt/rev2/config.h b/keyboards/sidderskb/majbritt/rev2/config.h deleted file mode 100644 index ced239c8334..00000000000 --- a/keyboards/sidderskb/majbritt/rev2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Sleepdealer - -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 diff --git a/keyboards/sidderskb/majbritt/rev2/keyboard.json b/keyboards/sidderskb/majbritt/rev2/keyboard.json index 2c71f49dfdb..69c24b08abd 100644 --- a/keyboards/sidderskb/majbritt/rev2/keyboard.json +++ b/keyboards/sidderskb/majbritt/rev2/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "C7", "B6", "D6", "B4", "D4", "D7", "D5", "D3", "D2", "D1", "D0"], "rows": ["B0", "B1", "F7", "C6", "B5"] diff --git a/keyboards/sixkeyboard/config.h b/keyboards/sixkeyboard/config.h index ad495eb23c0..9afa126d801 100644 --- a/keyboards/sixkeyboard/config.h +++ b/keyboards/sixkeyboard/config.h @@ -22,11 +22,6 @@ along with this program. If not, see . #define MATRIX_ROWS 2 #define MATRIX_COLS 3 -/* 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. diff --git a/keyboards/sixkeyboard/keyboard.json b/keyboards/sixkeyboard/keyboard.json index aff5c985f79..1c103e03b3d 100644 --- a/keyboards/sixkeyboard/keyboard.json +++ b/keyboards/sixkeyboard/keyboard.json @@ -15,6 +15,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega16u2", "bootloader": "atmel-dfu", "community_layouts": ["ortho_2x3"], diff --git a/keyboards/skeletonkbd/skeletonnumpad/config.h b/keyboards/skeletonkbd/skeletonnumpad/config.h deleted file mode 100644 index 1636a977cf0..00000000000 --- a/keyboards/skeletonkbd/skeletonnumpad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2022 SkeletonKBD - -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/skeletonkbd/skeletonnumpad/keyboard.json b/keyboards/skeletonkbd/skeletonnumpad/keyboard.json index 5b72e5d8ec6..cd007f81b64 100644 --- a/keyboards/skeletonkbd/skeletonnumpad/keyboard.json +++ b/keyboards/skeletonkbd/skeletonnumpad/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5"], "rows": ["B6", "C6", "C7", "F7", "F6"] diff --git a/keyboards/skme/zeno/config.h b/keyboards/skme/zeno/config.h deleted file mode 100644 index 6c8ce4c0eaf..00000000000 --- a/keyboards/skme/zeno/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Holten Campbell - -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 diff --git a/keyboards/skme/zeno/keyboard.json b/keyboards/skme/zeno/keyboard.json index bc359675376..bbea513ed59 100644 --- a/keyboards/skme/zeno/keyboard.json +++ b/keyboards/skme/zeno/keyboard.json @@ -24,6 +24,12 @@ "command": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_default": { "layout": [ From 8abd87d586d023105d689fd22bd9d3b7d514c454 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 23 May 2024 19:14:06 -0700 Subject: [PATCH 328/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: W, Part 2 (#23789) Affects: - `wilba_tech/rama_works_kara` - `wilba_tech/rama_works_koyu` - `wilba_tech/rama_works_m10_b` - `wilba_tech/rama_works_m10_c` - `wilba_tech/rama_works_m50_a` - `wilba_tech/rama_works_m50_ax` - `wilba_tech/rama_works_m60_a` - `wilba_tech/rama_works_m65_b` - `wilba_tech/rama_works_m65_bx` - `wilba_tech/rama_works_m6_a` - `wilba_tech/rama_works_m6_b` - `wilba_tech/rama_works_u80_a` - `wilba_tech/wt60_a` - `wilba_tech/wt60_b` - `wilba_tech/wt60_bx` - `wilba_tech/wt60_c` - `wilba_tech/wt60_d` - `wilba_tech/wt60_g` - `wilba_tech/wt60_g2` - `wilba_tech/wt60_h1` - `wilba_tech/wt60_h2` - `wilba_tech/wt60_h3` - `wilba_tech/wt60_xt` - `wilba_tech/wt65_a` - `wilba_tech/wt65_b` - `wilba_tech/wt65_d` - `wilba_tech/wt65_f` - `wilba_tech/wt65_fx` - `wilba_tech/wt65_g` - `wilba_tech/wt65_g2` - `wilba_tech/wt65_h1` - `wilba_tech/wt65_xt` - `wilba_tech/wt65_xtx` - `wilba_tech/wt69_a` - `wilba_tech/wt70_jb` - `wilba_tech/wt75_a` - `wilba_tech/wt75_b` - `wilba_tech/wt75_c` - `wilba_tech/wt80_a` - `wilba_tech/wt80_g` - `wilba_tech/zeal60` - `wilba_tech/zeal65` - `woodkeys/meira/featherble` - `wsk/alpha9` - `wsk/g4m3ralpha` - `wsk/gothic50` - `wsk/gothic70` - `wsk/houndstooth` - `wsk/jerkin` - `wsk/kodachi50` - `wsk/pain27` - `wsk/sl40` - `wsk/tkl30` - `wuque/ikki68` - `wuque/mammoth20x` - `wuque/mammoth75x` - `wuque/nemui65` - `wuque/tata80/wk` - `wuque/tata80/wkl` --- keyboards/wilba_tech/rama_works_kara/config.h | 5 --- .../wilba_tech/rama_works_kara/keyboard.json | 6 +++ keyboards/wilba_tech/rama_works_koyu/config.h | 6 --- .../wilba_tech/rama_works_koyu/keyboard.json | 6 +++ .../wilba_tech/rama_works_m10_b/config.h | 39 ------------------- .../wilba_tech/rama_works_m10_b/keyboard.json | 6 +++ .../wilba_tech/rama_works_m10_c/config.h | 5 --- .../wilba_tech/rama_works_m10_c/keyboard.json | 6 +++ .../wilba_tech/rama_works_m50_a/config.h | 5 --- .../wilba_tech/rama_works_m50_a/keyboard.json | 6 +++ .../wilba_tech/rama_works_m50_ax/config.h | 21 ---------- .../rama_works_m50_ax/keyboard.json | 6 +++ .../wilba_tech/rama_works_m60_a/config.h | 5 --- .../wilba_tech/rama_works_m60_a/keyboard.json | 6 +++ .../wilba_tech/rama_works_m65_b/config.h | 5 --- .../wilba_tech/rama_works_m65_b/keyboard.json | 6 +++ .../wilba_tech/rama_works_m65_bx/config.h | 5 --- .../rama_works_m65_bx/keyboard.json | 6 +++ keyboards/wilba_tech/rama_works_m6_a/config.h | 5 --- .../wilba_tech/rama_works_m6_a/keyboard.json | 6 +++ keyboards/wilba_tech/rama_works_m6_b/config.h | 5 --- .../wilba_tech/rama_works_m6_b/keyboard.json | 6 +++ .../wilba_tech/rama_works_u80_a/config.h | 5 --- .../wilba_tech/rama_works_u80_a/keyboard.json | 6 +++ keyboards/wilba_tech/wt60_a/config.h | 5 --- keyboards/wilba_tech/wt60_a/keyboard.json | 6 +++ keyboards/wilba_tech/wt60_b/config.h | 6 --- keyboards/wilba_tech/wt60_b/keyboard.json | 6 +++ keyboards/wilba_tech/wt60_bx/config.h | 6 --- keyboards/wilba_tech/wt60_bx/keyboard.json | 6 +++ keyboards/wilba_tech/wt60_c/config.h | 6 --- keyboards/wilba_tech/wt60_c/keyboard.json | 6 +++ keyboards/wilba_tech/wt60_d/config.h | 22 ----------- keyboards/wilba_tech/wt60_d/keyboard.json | 6 +++ keyboards/wilba_tech/wt60_g/config.h | 22 ----------- keyboards/wilba_tech/wt60_g/keyboard.json | 6 +++ keyboards/wilba_tech/wt60_g2/config.h | 22 ----------- keyboards/wilba_tech/wt60_g2/keyboard.json | 6 +++ keyboards/wilba_tech/wt60_h1/config.h | 9 ----- keyboards/wilba_tech/wt60_h1/keyboard.json | 6 +++ keyboards/wilba_tech/wt60_h2/config.h | 22 ----------- keyboards/wilba_tech/wt60_h2/keyboard.json | 6 +++ keyboards/wilba_tech/wt60_h3/config.h | 9 ----- keyboards/wilba_tech/wt60_h3/keyboard.json | 6 +++ keyboards/wilba_tech/wt60_xt/config.h | 5 --- keyboards/wilba_tech/wt60_xt/keyboard.json | 6 +++ keyboards/wilba_tech/wt65_a/config.h | 5 --- keyboards/wilba_tech/wt65_a/keyboard.json | 6 +++ keyboards/wilba_tech/wt65_b/config.h | 5 --- keyboards/wilba_tech/wt65_b/keyboard.json | 6 +++ keyboards/wilba_tech/wt65_d/config.h | 10 ----- keyboards/wilba_tech/wt65_d/keyboard.json | 6 +++ keyboards/wilba_tech/wt65_f/config.h | 22 ----------- keyboards/wilba_tech/wt65_f/keyboard.json | 6 +++ keyboards/wilba_tech/wt65_fx/config.h | 22 ----------- keyboards/wilba_tech/wt65_fx/keyboard.json | 6 +++ keyboards/wilba_tech/wt65_g/config.h | 22 ----------- keyboards/wilba_tech/wt65_g/keyboard.json | 6 +++ keyboards/wilba_tech/wt65_g2/config.h | 22 ----------- keyboards/wilba_tech/wt65_g2/keyboard.json | 6 +++ keyboards/wilba_tech/wt65_h1/config.h | 22 ----------- keyboards/wilba_tech/wt65_h1/keyboard.json | 6 +++ keyboards/wilba_tech/wt65_xt/config.h | 22 ----------- keyboards/wilba_tech/wt65_xt/keyboard.json | 6 +++ keyboards/wilba_tech/wt65_xtx/config.h | 21 ---------- keyboards/wilba_tech/wt65_xtx/keyboard.json | 6 +++ keyboards/wilba_tech/wt69_a/config.h | 38 ------------------ keyboards/wilba_tech/wt69_a/keyboard.json | 6 +++ keyboards/wilba_tech/wt70_jb/config.h | 21 ---------- keyboards/wilba_tech/wt70_jb/keyboard.json | 6 +++ keyboards/wilba_tech/wt75_a/config.h | 5 --- keyboards/wilba_tech/wt75_a/keyboard.json | 6 +++ keyboards/wilba_tech/wt75_b/config.h | 5 --- keyboards/wilba_tech/wt75_b/keyboard.json | 6 +++ keyboards/wilba_tech/wt75_c/config.h | 5 --- keyboards/wilba_tech/wt75_c/keyboard.json | 6 +++ keyboards/wilba_tech/wt80_a/config.h | 5 --- keyboards/wilba_tech/wt80_a/keyboard.json | 6 +++ keyboards/wilba_tech/wt80_g/config.h | 22 ----------- keyboards/wilba_tech/wt80_g/keyboard.json | 6 +++ keyboards/wilba_tech/zeal60/config.h | 5 --- keyboards/wilba_tech/zeal60/keyboard.json | 6 +++ keyboards/wilba_tech/zeal65/config.h | 5 --- keyboards/wilba_tech/zeal65/keyboard.json | 6 +++ keyboards/woodkeys/meira/featherble/config.h | 5 --- .../woodkeys/meira/featherble/keyboard.json | 6 +++ keyboards/wsk/alpha9/config.h | 23 ----------- keyboards/wsk/alpha9/keyboard.json | 6 +++ keyboards/wsk/g4m3ralpha/config.h | 23 ----------- keyboards/wsk/g4m3ralpha/keyboard.json | 6 +++ keyboards/wsk/gothic50/config.h | 6 --- keyboards/wsk/gothic50/keyboard.json | 6 +++ keyboards/wsk/gothic70/config.h | 7 ---- keyboards/wsk/gothic70/keyboard.json | 6 +++ keyboards/wsk/houndstooth/config.h | 7 ---- keyboards/wsk/houndstooth/keyboard.json | 6 +++ keyboards/wsk/jerkin/config.h | 7 ---- keyboards/wsk/jerkin/keyboard.json | 6 +++ keyboards/wsk/kodachi50/config.h | 7 ---- keyboards/wsk/kodachi50/keyboard.json | 6 +++ keyboards/wsk/pain27/config.h | 7 ---- keyboards/wsk/pain27/keyboard.json | 6 +++ keyboards/wsk/sl40/config.h | 23 ----------- keyboards/wsk/sl40/keyboard.json | 6 +++ keyboards/wsk/tkl30/config.h | 7 ---- keyboards/wsk/tkl30/keyboard.json | 6 +++ keyboards/wuque/ikki68/config.h | 24 ------------ keyboards/wuque/ikki68/keyboard.json | 6 +++ keyboards/wuque/mammoth20x/config.h | 24 ------------ keyboards/wuque/mammoth20x/keyboard.json | 6 +++ keyboards/wuque/mammoth75x/config.h | 24 ------------ keyboards/wuque/mammoth75x/keyboard.json | 6 +++ keyboards/wuque/nemui65/config.h | 24 ------------ keyboards/wuque/nemui65/keyboard.json | 6 +++ keyboards/wuque/tata80/wk/config.h | 21 ---------- keyboards/wuque/tata80/wk/keyboard.json | 6 +++ keyboards/wuque/tata80/wkl/config.h | 21 ---------- keyboards/wuque/tata80/wkl/keyboard.json | 6 +++ 118 files changed, 354 insertions(+), 789 deletions(-) delete mode 100644 keyboards/wilba_tech/rama_works_m10_b/config.h delete mode 100644 keyboards/wilba_tech/rama_works_m50_ax/config.h delete mode 100644 keyboards/wilba_tech/wt60_d/config.h delete mode 100644 keyboards/wilba_tech/wt60_g/config.h delete mode 100644 keyboards/wilba_tech/wt60_g2/config.h delete mode 100644 keyboards/wilba_tech/wt60_h1/config.h delete mode 100644 keyboards/wilba_tech/wt60_h2/config.h delete mode 100644 keyboards/wilba_tech/wt60_h3/config.h delete mode 100644 keyboards/wilba_tech/wt65_d/config.h delete mode 100644 keyboards/wilba_tech/wt65_f/config.h delete mode 100644 keyboards/wilba_tech/wt65_fx/config.h delete mode 100644 keyboards/wilba_tech/wt65_g/config.h delete mode 100644 keyboards/wilba_tech/wt65_g2/config.h delete mode 100644 keyboards/wilba_tech/wt65_h1/config.h delete mode 100644 keyboards/wilba_tech/wt65_xt/config.h delete mode 100644 keyboards/wilba_tech/wt65_xtx/config.h delete mode 100644 keyboards/wilba_tech/wt69_a/config.h delete mode 100644 keyboards/wilba_tech/wt70_jb/config.h delete mode 100644 keyboards/wilba_tech/wt80_g/config.h delete mode 100644 keyboards/wsk/alpha9/config.h delete mode 100644 keyboards/wsk/g4m3ralpha/config.h delete mode 100644 keyboards/wsk/gothic70/config.h delete mode 100644 keyboards/wsk/houndstooth/config.h delete mode 100644 keyboards/wsk/jerkin/config.h delete mode 100644 keyboards/wsk/kodachi50/config.h delete mode 100644 keyboards/wsk/pain27/config.h delete mode 100644 keyboards/wsk/sl40/config.h delete mode 100644 keyboards/wsk/tkl30/config.h delete mode 100644 keyboards/wuque/ikki68/config.h delete mode 100644 keyboards/wuque/mammoth20x/config.h delete mode 100644 keyboards/wuque/mammoth75x/config.h delete mode 100644 keyboards/wuque/nemui65/config.h delete mode 100644 keyboards/wuque/tata80/wk/config.h delete mode 100644 keyboards/wuque/tata80/wkl/config.h diff --git a/keyboards/wilba_tech/rama_works_kara/config.h b/keyboards/wilba_tech/rama_works_kara/config.h index ba02ba652a8..8a18f654a09 100644 --- a/keyboards/wilba_tech/rama_works_kara/config.h +++ b/keyboards/wilba_tech/rama_works_kara/config.h @@ -20,11 +20,6 @@ #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA #define IS31FL3731_LED_COUNT 72 -// 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. diff --git a/keyboards/wilba_tech/rama_works_kara/keyboard.json b/keyboards/wilba_tech/rama_works_kara/keyboard.json index 896892e2847..f5838a48e50 100644 --- a/keyboards/wilba_tech/rama_works_kara/keyboard.json +++ b/keyboards/wilba_tech/rama_works_kara/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_koyu/config.h b/keyboards/wilba_tech/rama_works_koyu/config.h index 1d57ac9e557..a978189362a 100644 --- a/keyboards/wilba_tech/rama_works_koyu/config.h +++ b/keyboards/wilba_tech/rama_works_koyu/config.h @@ -20,12 +20,6 @@ #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA #define IS31FL3731_LED_COUNT 72 -// 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. diff --git a/keyboards/wilba_tech/rama_works_koyu/keyboard.json b/keyboards/wilba_tech/rama_works_koyu/keyboard.json index 507b5e1546f..269714d6f5a 100644 --- a/keyboards/wilba_tech/rama_works_koyu/keyboard.json +++ b/keyboards/wilba_tech/rama_works_koyu/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_m10_b/config.h b/keyboards/wilba_tech/rama_works_m10_b/config.h deleted file mode 100644 index c8c922be6fe..00000000000 --- a/keyboards/wilba_tech/rama_works_m10_b/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Wilba - -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/wilba_tech/rama_works_m10_b/keyboard.json b/keyboards/wilba_tech/rama_works_m10_b/keyboard.json index b66b5c64cf5..157baa1c5a3 100644 --- a/keyboards/wilba_tech/rama_works_m10_b/keyboard.json +++ b/keyboards/wilba_tech/rama_works_m10_b/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"], "rows": ["E6"] diff --git a/keyboards/wilba_tech/rama_works_m10_c/config.h b/keyboards/wilba_tech/rama_works_m10_c/config.h index 736506a493e..f9315e00932 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/config.h +++ b/keyboards/wilba_tech/rama_works_m10_c/config.h @@ -15,11 +15,6 @@ */ #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 - // IS31FL3731 driver #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_LED_COUNT 12 diff --git a/keyboards/wilba_tech/rama_works_m10_c/keyboard.json b/keyboards/wilba_tech/rama_works_m10_c/keyboard.json index bba4720aa34..92b6947b59c 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/keyboard.json +++ b/keyboards/wilba_tech/rama_works_m10_c/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"], "rows": ["E6"] diff --git a/keyboards/wilba_tech/rama_works_m50_a/config.h b/keyboards/wilba_tech/rama_works_m50_a/config.h index bad8f7f3465..706230af3bf 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/config.h +++ b/keyboards/wilba_tech/rama_works_m50_a/config.h @@ -15,11 +15,6 @@ */ #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 - // IS31FL3731 driver #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA diff --git a/keyboards/wilba_tech/rama_works_m50_a/keyboard.json b/keyboards/wilba_tech/rama_works_m50_a/keyboard.json index bf33a12277f..64eb902672e 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/keyboard.json +++ b/keyboards/wilba_tech/rama_works_m50_a/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"], "rows": ["F0", "F1", "F5", "F6"] diff --git a/keyboards/wilba_tech/rama_works_m50_ax/config.h b/keyboards/wilba_tech/rama_works_m50_ax/config.h deleted file mode 100644 index 9b6b3c79558..00000000000 --- a/keyboards/wilba_tech/rama_works_m50_ax/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/rama_works_m50_ax/keyboard.json b/keyboards/wilba_tech/rama_works_m50_ax/keyboard.json index 29dec482bbe..c44032f97ce 100644 --- a/keyboards/wilba_tech/rama_works_m50_ax/keyboard.json +++ b/keyboards/wilba_tech/rama_works_m50_ax/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"], "rows": ["F0", "F1", "F5", "F6"] diff --git a/keyboards/wilba_tech/rama_works_m60_a/config.h b/keyboards/wilba_tech/rama_works_m60_a/config.h index 7af0f156c81..ecd6ba1e917 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/config.h +++ b/keyboards/wilba_tech/rama_works_m60_a/config.h @@ -20,11 +20,6 @@ #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA #define IS31FL3731_LED_COUNT 72 -// 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. diff --git a/keyboards/wilba_tech/rama_works_m60_a/keyboard.json b/keyboards/wilba_tech/rama_works_m60_a/keyboard.json index 566f6cd42a4..187305808c4 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/keyboard.json +++ b/keyboards/wilba_tech/rama_works_m60_a/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_m65_b/config.h b/keyboards/wilba_tech/rama_works_m65_b/config.h index 0f3f228cdaf..e8820868aa1 100644 --- a/keyboards/wilba_tech/rama_works_m65_b/config.h +++ b/keyboards/wilba_tech/rama_works_m65_b/config.h @@ -15,11 +15,6 @@ */ #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 - // IS31FL3731 driver #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA diff --git a/keyboards/wilba_tech/rama_works_m65_b/keyboard.json b/keyboards/wilba_tech/rama_works_m65_b/keyboard.json index 156affff7da..869dd5c19e3 100644 --- a/keyboards/wilba_tech/rama_works_m65_b/keyboard.json +++ b/keyboards/wilba_tech/rama_works_m65_b/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_m65_bx/config.h b/keyboards/wilba_tech/rama_works_m65_bx/config.h index ed0d79aba32..e40a4987aac 100644 --- a/keyboards/wilba_tech/rama_works_m65_bx/config.h +++ b/keyboards/wilba_tech/rama_works_m65_bx/config.h @@ -15,11 +15,6 @@ */ #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 - // IS31FL3731 driver #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA diff --git a/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json b/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json index 9b4edcc6efc..a58a1f469c6 100644 --- a/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json +++ b/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_m6_a/config.h b/keyboards/wilba_tech/rama_works_m6_a/config.h index 6a19f1e7e9f..f74e6c53892 100644 --- a/keyboards/wilba_tech/rama_works_m6_a/config.h +++ b/keyboards/wilba_tech/rama_works_m6_a/config.h @@ -15,11 +15,6 @@ */ #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 RGB_BACKLIGHT_ENABLED 0 // NOTE: M6-A doesn't use RGB backlight, but we keep this diff --git a/keyboards/wilba_tech/rama_works_m6_a/keyboard.json b/keyboards/wilba_tech/rama_works_m6_a/keyboard.json index df7fc90a962..fdb3eac8933 100644 --- a/keyboards/wilba_tech/rama_works_m6_a/keyboard.json +++ b/keyboards/wilba_tech/rama_works_m6_a/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "B5", "F4", "D7", "C6", "F6"], "rows": ["E6"] diff --git a/keyboards/wilba_tech/rama_works_m6_b/config.h b/keyboards/wilba_tech/rama_works_m6_b/config.h index 112cd500beb..2395700561d 100644 --- a/keyboards/wilba_tech/rama_works_m6_b/config.h +++ b/keyboards/wilba_tech/rama_works_m6_b/config.h @@ -15,11 +15,6 @@ */ #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 IS31FL3218_LED_COUNT 6 #define RGB_BACKLIGHT_ENABLED 1 diff --git a/keyboards/wilba_tech/rama_works_m6_b/keyboard.json b/keyboards/wilba_tech/rama_works_m6_b/keyboard.json index 4d258b826b9..497c053edae 100644 --- a/keyboards/wilba_tech/rama_works_m6_b/keyboard.json +++ b/keyboards/wilba_tech/rama_works_m6_b/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "B5", "F4", "D7", "C6", "F6"], "rows": ["E6"] diff --git a/keyboards/wilba_tech/rama_works_u80_a/config.h b/keyboards/wilba_tech/rama_works_u80_a/config.h index ddbbcfba9bd..606d2ce3865 100644 --- a/keyboards/wilba_tech/rama_works_u80_a/config.h +++ b/keyboards/wilba_tech/rama_works_u80_a/config.h @@ -16,11 +16,6 @@ #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. diff --git a/keyboards/wilba_tech/rama_works_u80_a/keyboard.json b/keyboards/wilba_tech/rama_works_u80_a/keyboard.json index bf06d9508f2..17d18737e8d 100644 --- a/keyboards/wilba_tech/rama_works_u80_a/keyboard.json +++ b/keyboards/wilba_tech/rama_works_u80_a/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_a/config.h b/keyboards/wilba_tech/wt60_a/config.h index 4dec42b21de..794799bdcda 100644 --- a/keyboards/wilba_tech/wt60_a/config.h +++ b/keyboards/wilba_tech/wt60_a/config.h @@ -16,11 +16,6 @@ #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. diff --git a/keyboards/wilba_tech/wt60_a/keyboard.json b/keyboards/wilba_tech/wt60_a/keyboard.json index 1c6d9f8c35d..7ebe2927541 100644 --- a/keyboards/wilba_tech/wt60_a/keyboard.json +++ b/keyboards/wilba_tech/wt60_a/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_b/config.h b/keyboards/wilba_tech/wt60_b/config.h index 3a9808dfc52..bb5c3d6fc17 100644 --- a/keyboards/wilba_tech/wt60_b/config.h +++ b/keyboards/wilba_tech/wt60_b/config.h @@ -16,12 +16,6 @@ #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 - - // IS31FL3731 driver #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA diff --git a/keyboards/wilba_tech/wt60_b/keyboard.json b/keyboards/wilba_tech/wt60_b/keyboard.json index 765ba96f61f..9cbd43cdbb9 100644 --- a/keyboards/wilba_tech/wt60_b/keyboard.json +++ b/keyboards/wilba_tech/wt60_b/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_bx/config.h b/keyboards/wilba_tech/wt60_bx/config.h index 1a722e2a2c6..0015fb2da4c 100644 --- a/keyboards/wilba_tech/wt60_bx/config.h +++ b/keyboards/wilba_tech/wt60_bx/config.h @@ -16,12 +16,6 @@ #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 - - // IS31FL3731 driver #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA diff --git a/keyboards/wilba_tech/wt60_bx/keyboard.json b/keyboards/wilba_tech/wt60_bx/keyboard.json index 6b4b6e9fb18..7699df71063 100644 --- a/keyboards/wilba_tech/wt60_bx/keyboard.json +++ b/keyboards/wilba_tech/wt60_bx/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_c/config.h b/keyboards/wilba_tech/wt60_c/config.h index 97a6790fffd..8795a1c9175 100644 --- a/keyboards/wilba_tech/wt60_c/config.h +++ b/keyboards/wilba_tech/wt60_c/config.h @@ -16,12 +16,6 @@ #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 - - // IS31FL3731 driver #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA diff --git a/keyboards/wilba_tech/wt60_c/keyboard.json b/keyboards/wilba_tech/wt60_c/keyboard.json index 569cca93b75..27a59c69ff5 100644 --- a/keyboards/wilba_tech/wt60_c/keyboard.json +++ b/keyboards/wilba_tech/wt60_c/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_d/config.h b/keyboards/wilba_tech/wt60_d/config.h deleted file mode 100644 index 1377a18714c..00000000000 --- a/keyboards/wilba_tech/wt60_d/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt60_d/keyboard.json b/keyboards/wilba_tech/wt60_d/keyboard.json index 84ef6838714..95ecda66edc 100644 --- a/keyboards/wilba_tech/wt60_d/keyboard.json +++ b/keyboards/wilba_tech/wt60_d/keyboard.json @@ -10,6 +10,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "indicators": { "caps_lock": "F1" }, diff --git a/keyboards/wilba_tech/wt60_g/config.h b/keyboards/wilba_tech/wt60_g/config.h deleted file mode 100644 index 9541b1df126..00000000000 --- a/keyboards/wilba_tech/wt60_g/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt60_g/keyboard.json b/keyboards/wilba_tech/wt60_g/keyboard.json index 3c1a6aef557..ba8a6a4d47d 100644 --- a/keyboards/wilba_tech/wt60_g/keyboard.json +++ b/keyboards/wilba_tech/wt60_g/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_g2/config.h b/keyboards/wilba_tech/wt60_g2/config.h deleted file mode 100644 index b7d24e1cd3c..00000000000 --- a/keyboards/wilba_tech/wt60_g2/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt60_g2/keyboard.json b/keyboards/wilba_tech/wt60_g2/keyboard.json index 2167847133d..85d51d0cd73 100644 --- a/keyboards/wilba_tech/wt60_g2/keyboard.json +++ b/keyboards/wilba_tech/wt60_g2/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_h1/config.h b/keyboards/wilba_tech/wt60_h1/config.h deleted file mode 100644 index 793d8d8baf9..00000000000 --- a/keyboards/wilba_tech/wt60_h1/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2023 Jason Williams (@wilba) -// 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/wilba_tech/wt60_h1/keyboard.json b/keyboards/wilba_tech/wt60_h1/keyboard.json index 279f7eab51d..2832cf3cd78 100644 --- a/keyboards/wilba_tech/wt60_h1/keyboard.json +++ b/keyboards/wilba_tech/wt60_h1/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_h2/config.h b/keyboards/wilba_tech/wt60_h2/config.h deleted file mode 100644 index 9541b1df126..00000000000 --- a/keyboards/wilba_tech/wt60_h2/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt60_h2/keyboard.json b/keyboards/wilba_tech/wt60_h2/keyboard.json index 9655469ffcd..f48e03940c8 100644 --- a/keyboards/wilba_tech/wt60_h2/keyboard.json +++ b/keyboards/wilba_tech/wt60_h2/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_h3/config.h b/keyboards/wilba_tech/wt60_h3/config.h deleted file mode 100644 index 793d8d8baf9..00000000000 --- a/keyboards/wilba_tech/wt60_h3/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2023 Jason Williams (@wilba) -// 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/wilba_tech/wt60_h3/keyboard.json b/keyboards/wilba_tech/wt60_h3/keyboard.json index 5ff272a98d3..9078fa92421 100644 --- a/keyboards/wilba_tech/wt60_h3/keyboard.json +++ b/keyboards/wilba_tech/wt60_h3/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_xt/config.h b/keyboards/wilba_tech/wt60_xt/config.h index ea2f490317b..c5a745e4b6c 100644 --- a/keyboards/wilba_tech/wt60_xt/config.h +++ b/keyboards/wilba_tech/wt60_xt/config.h @@ -20,11 +20,6 @@ #define AUDIO_PIN C6 #define AUDIO_CLICKY -/* 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. diff --git a/keyboards/wilba_tech/wt60_xt/keyboard.json b/keyboards/wilba_tech/wt60_xt/keyboard.json index 6cd3d64be28..8afafd93143 100644 --- a/keyboards/wilba_tech/wt60_xt/keyboard.json +++ b/keyboards/wilba_tech/wt60_xt/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_a/config.h b/keyboards/wilba_tech/wt65_a/config.h index 9135642f591..d2afedff5c0 100644 --- a/keyboards/wilba_tech/wt65_a/config.h +++ b/keyboards/wilba_tech/wt65_a/config.h @@ -16,11 +16,6 @@ #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. diff --git a/keyboards/wilba_tech/wt65_a/keyboard.json b/keyboards/wilba_tech/wt65_a/keyboard.json index ec87e830f07..9878b520845 100644 --- a/keyboards/wilba_tech/wt65_a/keyboard.json +++ b/keyboards/wilba_tech/wt65_a/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_b/config.h b/keyboards/wilba_tech/wt65_b/config.h index 5f3671004d4..4683c6a69eb 100644 --- a/keyboards/wilba_tech/wt65_b/config.h +++ b/keyboards/wilba_tech/wt65_b/config.h @@ -16,11 +16,6 @@ #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. diff --git a/keyboards/wilba_tech/wt65_b/keyboard.json b/keyboards/wilba_tech/wt65_b/keyboard.json index 56f71f3fc11..e4fb39c00b9 100644 --- a/keyboards/wilba_tech/wt65_b/keyboard.json +++ b/keyboards/wilba_tech/wt65_b/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_d/config.h b/keyboards/wilba_tech/wt65_d/config.h deleted file mode 100644 index f37e4b2db65..00000000000 --- a/keyboards/wilba_tech/wt65_d/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2022 Jason Williams (@wilba) -// 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 \ No newline at end of file diff --git a/keyboards/wilba_tech/wt65_d/keyboard.json b/keyboards/wilba_tech/wt65_d/keyboard.json index d41d39bcb29..3754b3788b4 100644 --- a/keyboards/wilba_tech/wt65_d/keyboard.json +++ b/keyboards/wilba_tech/wt65_d/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "D3", "D2", "B7", "B0", "B3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["E6", "F0", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_f/config.h b/keyboards/wilba_tech/wt65_f/config.h deleted file mode 100644 index b7d24e1cd3c..00000000000 --- a/keyboards/wilba_tech/wt65_f/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt65_f/keyboard.json b/keyboards/wilba_tech/wt65_f/keyboard.json index bb39a09a91c..fb798565789 100644 --- a/keyboards/wilba_tech/wt65_f/keyboard.json +++ b/keyboards/wilba_tech/wt65_f/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_fx/config.h b/keyboards/wilba_tech/wt65_fx/config.h deleted file mode 100644 index b7d24e1cd3c..00000000000 --- a/keyboards/wilba_tech/wt65_fx/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt65_fx/keyboard.json b/keyboards/wilba_tech/wt65_fx/keyboard.json index a070bfd6f93..f53332b6af6 100644 --- a/keyboards/wilba_tech/wt65_fx/keyboard.json +++ b/keyboards/wilba_tech/wt65_fx/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_g/config.h b/keyboards/wilba_tech/wt65_g/config.h deleted file mode 100644 index 9541b1df126..00000000000 --- a/keyboards/wilba_tech/wt65_g/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt65_g/keyboard.json b/keyboards/wilba_tech/wt65_g/keyboard.json index d9fe012ce40..e0974770742 100644 --- a/keyboards/wilba_tech/wt65_g/keyboard.json +++ b/keyboards/wilba_tech/wt65_g/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_g2/config.h b/keyboards/wilba_tech/wt65_g2/config.h deleted file mode 100644 index 9541b1df126..00000000000 --- a/keyboards/wilba_tech/wt65_g2/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt65_g2/keyboard.json b/keyboards/wilba_tech/wt65_g2/keyboard.json index 7c55f5e3efa..8a7862dcbee 100644 --- a/keyboards/wilba_tech/wt65_g2/keyboard.json +++ b/keyboards/wilba_tech/wt65_g2/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_h1/config.h b/keyboards/wilba_tech/wt65_h1/config.h deleted file mode 100644 index 9541b1df126..00000000000 --- a/keyboards/wilba_tech/wt65_h1/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt65_h1/keyboard.json b/keyboards/wilba_tech/wt65_h1/keyboard.json index a6f22273dcb..d56321ce5fc 100644 --- a/keyboards/wilba_tech/wt65_h1/keyboard.json +++ b/keyboards/wilba_tech/wt65_h1/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_xt/config.h b/keyboards/wilba_tech/wt65_xt/config.h deleted file mode 100644 index 9541b1df126..00000000000 --- a/keyboards/wilba_tech/wt65_xt/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt65_xt/keyboard.json b/keyboards/wilba_tech/wt65_xt/keyboard.json index 73d39017769..53318562693 100644 --- a/keyboards/wilba_tech/wt65_xt/keyboard.json +++ b/keyboards/wilba_tech/wt65_xt/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_xtx/config.h b/keyboards/wilba_tech/wt65_xtx/config.h deleted file mode 100644 index 9b6b3c79558..00000000000 --- a/keyboards/wilba_tech/wt65_xtx/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt65_xtx/keyboard.json b/keyboards/wilba_tech/wt65_xtx/keyboard.json index 96678860ee2..7d60043b910 100644 --- a/keyboards/wilba_tech/wt65_xtx/keyboard.json +++ b/keyboards/wilba_tech/wt65_xtx/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt69_a/config.h b/keyboards/wilba_tech/wt69_a/config.h deleted file mode 100644 index bc06d6ce9c0..00000000000 --- a/keyboards/wilba_tech/wt69_a/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * - * 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/wilba_tech/wt69_a/keyboard.json b/keyboards/wilba_tech/wt69_a/keyboard.json index 8321ae86c40..bbe65178506 100644 --- a/keyboards/wilba_tech/wt69_a/keyboard.json +++ b/keyboards/wilba_tech/wt69_a/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt70_jb/config.h b/keyboards/wilba_tech/wt70_jb/config.h deleted file mode 100644 index 9b6b3c79558..00000000000 --- a/keyboards/wilba_tech/wt70_jb/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt70_jb/keyboard.json b/keyboards/wilba_tech/wt70_jb/keyboard.json index a1ffe1e5616..bfa27f225be 100644 --- a/keyboards/wilba_tech/wt70_jb/keyboard.json +++ b/keyboards/wilba_tech/wt70_jb/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "D3", "D2", "D1", "D0", "B7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B3"], "rows": ["E6", "F0", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt75_a/config.h b/keyboards/wilba_tech/wt75_a/config.h index 9dbe0405082..f9fc82ec421 100644 --- a/keyboards/wilba_tech/wt75_a/config.h +++ b/keyboards/wilba_tech/wt75_a/config.h @@ -16,11 +16,6 @@ #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. diff --git a/keyboards/wilba_tech/wt75_a/keyboard.json b/keyboards/wilba_tech/wt75_a/keyboard.json index 609dff0c36f..ee0a7b067bb 100644 --- a/keyboards/wilba_tech/wt75_a/keyboard.json +++ b/keyboards/wilba_tech/wt75_a/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt75_b/config.h b/keyboards/wilba_tech/wt75_b/config.h index 9a9db88ab14..edeb728a17d 100644 --- a/keyboards/wilba_tech/wt75_b/config.h +++ b/keyboards/wilba_tech/wt75_b/config.h @@ -16,11 +16,6 @@ #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. diff --git a/keyboards/wilba_tech/wt75_b/keyboard.json b/keyboards/wilba_tech/wt75_b/keyboard.json index 15bc61e9236..9d5ca0c13b4 100644 --- a/keyboards/wilba_tech/wt75_b/keyboard.json +++ b/keyboards/wilba_tech/wt75_b/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B7", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "D4"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt75_c/config.h b/keyboards/wilba_tech/wt75_c/config.h index d2164ceea03..d3d6adf6908 100644 --- a/keyboards/wilba_tech/wt75_c/config.h +++ b/keyboards/wilba_tech/wt75_c/config.h @@ -16,11 +16,6 @@ #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. diff --git a/keyboards/wilba_tech/wt75_c/keyboard.json b/keyboards/wilba_tech/wt75_c/keyboard.json index 38d1450ae09..08b373993b9 100644 --- a/keyboards/wilba_tech/wt75_c/keyboard.json +++ b/keyboards/wilba_tech/wt75_c/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B7", "D4"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt80_a/config.h b/keyboards/wilba_tech/wt80_a/config.h index bda91f562ce..92e8322f081 100644 --- a/keyboards/wilba_tech/wt80_a/config.h +++ b/keyboards/wilba_tech/wt80_a/config.h @@ -16,11 +16,6 @@ #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. diff --git a/keyboards/wilba_tech/wt80_a/keyboard.json b/keyboards/wilba_tech/wt80_a/keyboard.json index d7d6d11882e..737d2b0eb60 100644 --- a/keyboards/wilba_tech/wt80_a/keyboard.json +++ b/keyboards/wilba_tech/wt80_a/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt80_g/config.h b/keyboards/wilba_tech/wt80_g/config.h deleted file mode 100644 index 9541b1df126..00000000000 --- a/keyboards/wilba_tech/wt80_g/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Jason Williams (Wilba) - * - * 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 diff --git a/keyboards/wilba_tech/wt80_g/keyboard.json b/keyboards/wilba_tech/wt80_g/keyboard.json index 410b5a8ec21..cc148a9fa00 100644 --- a/keyboards/wilba_tech/wt80_g/keyboard.json +++ b/keyboards/wilba_tech/wt80_g/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/zeal60/config.h b/keyboards/wilba_tech/zeal60/config.h index 225c878b20a..9ff8a94af10 100644 --- a/keyboards/wilba_tech/zeal60/config.h +++ b/keyboards/wilba_tech/zeal60/config.h @@ -20,11 +20,6 @@ #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA #define IS31FL3731_LED_COUNT 72 -// 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. diff --git a/keyboards/wilba_tech/zeal60/keyboard.json b/keyboards/wilba_tech/zeal60/keyboard.json index 34f7a312aaf..77500c69c30 100644 --- a/keyboards/wilba_tech/zeal60/keyboard.json +++ b/keyboards/wilba_tech/zeal60/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/zeal65/config.h b/keyboards/wilba_tech/zeal65/config.h index 71977f40907..947eeeb20c0 100644 --- a/keyboards/wilba_tech/zeal65/config.h +++ b/keyboards/wilba_tech/zeal65/config.h @@ -20,11 +20,6 @@ #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA #define IS31FL3731_LED_COUNT 72 -// 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. diff --git a/keyboards/wilba_tech/zeal65/keyboard.json b/keyboards/wilba_tech/zeal65/keyboard.json index 2bc5e65b7b2..f216ccacae0 100644 --- a/keyboards/wilba_tech/zeal65/keyboard.json +++ b/keyboards/wilba_tech/zeal65/keyboard.json @@ -14,6 +14,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/woodkeys/meira/featherble/config.h b/keyboards/woodkeys/meira/featherble/config.h index fd224b2d50e..8a6da720e19 100644 --- a/keyboards/woodkeys/meira/featherble/config.h +++ b/keyboards/woodkeys/meira/featherble/config.h @@ -36,11 +36,6 @@ along with this program. If not, see . #define AUDIO_PIN B5 #define AUDIO_VOICES -/* 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. diff --git a/keyboards/woodkeys/meira/featherble/keyboard.json b/keyboards/woodkeys/meira/featherble/keyboard.json index 416b788c904..8d42515541f 100644 --- a/keyboards/woodkeys/meira/featherble/keyboard.json +++ b/keyboards/woodkeys/meira/featherble/keyboard.json @@ -1,6 +1,12 @@ { "processor": "atmega32u4", "bootloader": "caterina", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "bluetooth": { "driver": "bluefruit_le" }, diff --git a/keyboards/wsk/alpha9/config.h b/keyboards/wsk/alpha9/config.h deleted file mode 100644 index af1fe3ab43e..00000000000 --- a/keyboards/wsk/alpha9/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Worldspawn - * - * 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 diff --git a/keyboards/wsk/alpha9/keyboard.json b/keyboards/wsk/alpha9/keyboard.json index 517e22238a3..41b95130c66 100644 --- a/keyboards/wsk/alpha9/keyboard.json +++ b/keyboards/wsk/alpha9/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "D1", "D0", "D2"], "rows": ["D4", "B4", "B5"] diff --git a/keyboards/wsk/g4m3ralpha/config.h b/keyboards/wsk/g4m3ralpha/config.h deleted file mode 100644 index af1fe3ab43e..00000000000 --- a/keyboards/wsk/g4m3ralpha/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Worldspawn - * - * 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 diff --git a/keyboards/wsk/g4m3ralpha/keyboard.json b/keyboards/wsk/g4m3ralpha/keyboard.json index 312e207a2f3..fcb2f26f5fd 100644 --- a/keyboards/wsk/g4m3ralpha/keyboard.json +++ b/keyboards/wsk/g4m3ralpha/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], "rows": ["D4", "B4", "B5", "D1"] diff --git a/keyboards/wsk/gothic50/config.h b/keyboards/wsk/gothic50/config.h index 55edc22470d..b51a46bc8ac 100644 --- a/keyboards/wsk/gothic50/config.h +++ b/keyboards/wsk/gothic50/config.h @@ -1,11 +1,5 @@ #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 - /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. * This is useful for the Windows task manager shortcut (ctrl+shift+esc). */ diff --git a/keyboards/wsk/gothic50/keyboard.json b/keyboards/wsk/gothic50/keyboard.json index c40390315e5..ecd87d9e816 100644 --- a/keyboards/wsk/gothic50/keyboard.json +++ b/keyboards/wsk/gothic50/keyboard.json @@ -37,6 +37,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "C7", "C6", "B6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B0"], "rows": ["B5", "B4", "D7", "D6"] diff --git a/keyboards/wsk/gothic70/config.h b/keyboards/wsk/gothic70/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/wsk/gothic70/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/wsk/gothic70/keyboard.json b/keyboards/wsk/gothic70/keyboard.json index a3de1e274c3..15acd70287a 100644 --- a/keyboards/wsk/gothic70/keyboard.json +++ b/keyboards/wsk/gothic70/keyboard.json @@ -37,6 +37,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/wsk/houndstooth/config.h b/keyboards/wsk/houndstooth/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/wsk/houndstooth/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/wsk/houndstooth/keyboard.json b/keyboards/wsk/houndstooth/keyboard.json index 682aa68e5c9..2be2b369688 100644 --- a/keyboards/wsk/houndstooth/keyboard.json +++ b/keyboards/wsk/houndstooth/keyboard.json @@ -19,6 +19,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "F4", "D0", "F5", "D4", "F6"], "rows": ["C6", "F7", "D7", "B1", "B4", "B2", "B5", "B6"] diff --git a/keyboards/wsk/jerkin/config.h b/keyboards/wsk/jerkin/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/wsk/jerkin/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/wsk/jerkin/keyboard.json b/keyboards/wsk/jerkin/keyboard.json index 3e105f317f1..43fc8d107d1 100644 --- a/keyboards/wsk/jerkin/keyboard.json +++ b/keyboards/wsk/jerkin/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "B1", "F7", "F6", "F5", "F4", "E6", "D7"], "rows": ["B3", "B4", "B5"] diff --git a/keyboards/wsk/kodachi50/config.h b/keyboards/wsk/kodachi50/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/wsk/kodachi50/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/wsk/kodachi50/keyboard.json b/keyboards/wsk/kodachi50/keyboard.json index 4580e548e33..3f5843fd1af 100644 --- a/keyboards/wsk/kodachi50/keyboard.json +++ b/keyboards/wsk/kodachi50/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"], "rows": ["D2", "B5", "B6", "B2", "B3", "B1", "F7", "F6"] diff --git a/keyboards/wsk/pain27/config.h b/keyboards/wsk/pain27/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/wsk/pain27/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/wsk/pain27/keyboard.json b/keyboards/wsk/pain27/keyboard.json index b2ac95d9c5c..a01e887e99f 100644 --- a/keyboards/wsk/pain27/keyboard.json +++ b/keyboards/wsk/pain27/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "B3", "F6", "B1", "B2", "B6", "D4", "C6", "D7", "E6"], "rows": ["F4", "F5", "D0"] diff --git a/keyboards/wsk/sl40/config.h b/keyboards/wsk/sl40/config.h deleted file mode 100644 index af1fe3ab43e..00000000000 --- a/keyboards/wsk/sl40/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Worldspawn - * - * 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 diff --git a/keyboards/wsk/sl40/keyboard.json b/keyboards/wsk/sl40/keyboard.json index cfb0d7d86ac..aba29855dd6 100644 --- a/keyboards/wsk/sl40/keyboard.json +++ b/keyboards/wsk/sl40/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D1", "F6", "F7", "B6", "B2", "B3", "B1", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "D2", "D0"] diff --git a/keyboards/wsk/tkl30/config.h b/keyboards/wsk/tkl30/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/wsk/tkl30/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/wsk/tkl30/keyboard.json b/keyboards/wsk/tkl30/keyboard.json index 2c222d9781b..909f72d4cfc 100644 --- a/keyboards/wsk/tkl30/keyboard.json +++ b/keyboards/wsk/tkl30/keyboard.json @@ -36,6 +36,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D1", "D0", "D4", "F7", "C6", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "F6", "E5"], "rows": ["D2", "B5", "F4"] diff --git a/keyboards/wuque/ikki68/config.h b/keyboards/wuque/ikki68/config.h deleted file mode 100644 index f0510424ffe..00000000000 --- a/keyboards/wuque/ikki68/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2020 wuquestudio - -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 diff --git a/keyboards/wuque/ikki68/keyboard.json b/keyboards/wuque/ikki68/keyboard.json index c1ed459238b..c6070e74fa5 100644 --- a/keyboards/wuque/ikki68/keyboard.json +++ b/keyboards/wuque/ikki68/keyboard.json @@ -39,6 +39,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/wuque/mammoth20x/config.h b/keyboards/wuque/mammoth20x/config.h deleted file mode 100644 index db5a8d534ef..00000000000 --- a/keyboards/wuque/mammoth20x/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 wuquestudio - -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 diff --git a/keyboards/wuque/mammoth20x/keyboard.json b/keyboards/wuque/mammoth20x/keyboard.json index 24b1715a0f7..6c8e2525416 100644 --- a/keyboards/wuque/mammoth20x/keyboard.json +++ b/keyboards/wuque/mammoth20x/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "E6", "F7"], "rows": ["D5", "F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/wuque/mammoth75x/config.h b/keyboards/wuque/mammoth75x/config.h deleted file mode 100644 index db5a8d534ef..00000000000 --- a/keyboards/wuque/mammoth75x/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 wuquestudio - -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 diff --git a/keyboards/wuque/mammoth75x/keyboard.json b/keyboards/wuque/mammoth75x/keyboard.json index 486a0422d53..1e0028dfe90 100644 --- a/keyboards/wuque/mammoth75x/keyboard.json +++ b/keyboards/wuque/mammoth75x/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "E6", "F0", "F1", "F4", "F5", "F6", "C6", "B7", "B3"], "rows": ["B0", "C7", "D2", "F7", "D1", "D0"] diff --git a/keyboards/wuque/nemui65/config.h b/keyboards/wuque/nemui65/config.h deleted file mode 100644 index 489059d8ab3..00000000000 --- a/keyboards/wuque/nemui65/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2023 wuque - * - * 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 - diff --git a/keyboards/wuque/nemui65/keyboard.json b/keyboards/wuque/nemui65/keyboard.json index 65cfebf9b40..239fe991bb8 100644 --- a/keyboards/wuque/nemui65/keyboard.json +++ b/keyboards/wuque/nemui65/keyboard.json @@ -20,6 +20,12 @@ "nkro": true, "rbglight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F6", diff --git a/keyboards/wuque/tata80/wk/config.h b/keyboards/wuque/tata80/wk/config.h deleted file mode 100644 index e8a42741810..00000000000 --- a/keyboards/wuque/tata80/wk/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2022 wuque - * - * 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 diff --git a/keyboards/wuque/tata80/wk/keyboard.json b/keyboards/wuque/tata80/wk/keyboard.json index 0fb1230c3fe..957a635dcb0 100644 --- a/keyboards/wuque/tata80/wk/keyboard.json +++ b/keyboards/wuque/tata80/wk/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/wuque/tata80/wkl/config.h b/keyboards/wuque/tata80/wkl/config.h deleted file mode 100644 index e8a42741810..00000000000 --- a/keyboards/wuque/tata80/wkl/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2022 wuque - * - * 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 diff --git a/keyboards/wuque/tata80/wkl/keyboard.json b/keyboards/wuque/tata80/wkl/keyboard.json index f11fa34acc6..4613f97f670 100644 --- a/keyboards/wuque/tata80/wkl/keyboard.json +++ b/keyboards/wuque/tata80/wkl/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] From 8ff8e9eae5b20b1a0a6cafe7689bfc34188f7aa8 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 23 May 2024 19:14:15 -0700 Subject: [PATCH 329/333] Migrate `LOCKING_*_ENABLE` to Data-Driven: X-Z (#23790) Affects: - `x16` - `xelus/akis` - `xelus/dharma` - `xelus/kangaroo/rev1` - `xelus/kangaroo/rev2` - `xelus/ninjin` - `xelus/pachi/mini_32u4` - `xelus/pachi/rev1` - `xelus/snap96` - `xelus/xs108` - `xiudi/xd60/rev2` - `xiudi/xd60/rev3` - `xiudi/xd68` - `xiudi/xd75` - `xiudi/xd84pro` - `xiudi/xd87` - `xmmx` - `ydkb/chili` - `ydkb/grape` - `ydkb/just60` - `yiancardesigns/barleycorn` - `yiancardesigns/gingham` - `yiancardesigns/seigaiha` - `ymdk/melody96/soldered` - `ymdk/np21` - `ymdk/yd60mq` - `ymdk/ymd09` - `ymdk/ymd67` - `yoichiro/lunakey_mini` - `yushakobo/quick7` - `yynmt/acperience12/rev1` - `yynmt/dozen0` - `yynmt/kagamidget` - `zigotica/z12` - `zigotica/z34` - `zj68` - `zlant` - `zoo/wampus` - `zsa/moonlander` - `ztboards/after` - `ztboards/noon` --- keyboards/x16/config.h | 38 ------------------ keyboards/x16/keyboard.json | 6 +++ keyboards/xelus/akis/config.h | 23 ----------- keyboards/xelus/akis/keyboard.json | 6 +++ keyboards/xelus/dharma/config.h | 23 ----------- keyboards/xelus/dharma/keyboard.json | 6 +++ keyboards/xelus/kangaroo/rev1/config.h | 5 --- keyboards/xelus/kangaroo/rev1/keyboard.json | 6 +++ keyboards/xelus/kangaroo/rev2/config.h | 22 ----------- keyboards/xelus/kangaroo/rev2/keyboard.json | 6 +++ keyboards/xelus/ninjin/config.h | 6 --- keyboards/xelus/ninjin/keyboard.json | 6 +++ keyboards/xelus/pachi/mini_32u4/config.h | 22 ----------- keyboards/xelus/pachi/mini_32u4/keyboard.json | 6 +++ keyboards/xelus/pachi/rev1/config.h | 22 ----------- keyboards/xelus/pachi/rev1/keyboard.json | 6 +++ keyboards/xelus/snap96/config.h | 6 --- keyboards/xelus/snap96/keyboard.json | 6 +++ keyboards/xelus/xs108/config.h | 5 --- keyboards/xelus/xs108/keyboard.json | 6 +++ keyboards/xiudi/xd60/rev2/config.h | 23 ----------- keyboards/xiudi/xd60/rev2/keyboard.json | 6 +++ keyboards/xiudi/xd60/rev3/config.h | 23 ----------- keyboards/xiudi/xd60/rev3/keyboard.json | 6 +++ keyboards/xiudi/xd68/config.h | 39 ------------------- keyboards/xiudi/xd68/keyboard.json | 6 +++ keyboards/xiudi/xd75/config.h | 39 ------------------- keyboards/xiudi/xd75/keyboard.json | 6 +++ keyboards/xiudi/xd84pro/config.h | 22 ----------- keyboards/xiudi/xd84pro/keyboard.json | 6 +++ keyboards/xiudi/xd87/config.h | 39 ------------------- keyboards/xiudi/xd87/keyboard.json | 6 +++ keyboards/xmmx/config.h | 7 ---- keyboards/xmmx/keyboard.json | 6 +++ keyboards/ydkb/chili/config.h | 39 ------------------- keyboards/ydkb/chili/keyboard.json | 6 +++ keyboards/ydkb/grape/config.h | 5 --- keyboards/ydkb/grape/keyboard.json | 6 +++ keyboards/ydkb/just60/config.h | 23 ----------- keyboards/ydkb/just60/keyboard.json | 6 +++ keyboards/yiancardesigns/barleycorn/config.h | 5 --- .../yiancardesigns/barleycorn/keyboard.json | 6 +++ keyboards/yiancardesigns/gingham/config.h | 5 --- .../yiancardesigns/gingham/keyboard.json | 6 +++ keyboards/yiancardesigns/seigaiha/config.h | 5 --- .../yiancardesigns/seigaiha/keyboard.json | 6 +++ keyboards/ymdk/melody96/soldered/config.h | 7 ---- .../ymdk/melody96/soldered/keyboard.json | 6 +++ keyboards/ymdk/np21/config.h | 39 ------------------- keyboards/ymdk/np21/keyboard.json | 6 +++ keyboards/ymdk/yd60mq/config.h | 4 -- keyboards/ymdk/yd60mq/info.json | 6 +++ keyboards/ymdk/ymd09/config.h | 24 ------------ keyboards/ymdk/ymd09/keyboard.json | 6 +++ keyboards/ymdk/ymd67/config.h | 4 -- keyboards/ymdk/ymd67/keyboard.json | 6 +++ keyboards/yoichiro/lunakey_mini/config.h | 5 --- keyboards/yoichiro/lunakey_mini/keyboard.json | 6 +++ keyboards/yushakobo/quick7/config.h | 39 ------------------- keyboards/yushakobo/quick7/keyboard.json | 6 +++ keyboards/yynmt/acperience12/rev1/config.h | 27 ------------- .../yynmt/acperience12/rev1/keyboard.json | 6 +++ keyboards/yynmt/dozen0/config.h | 39 ------------------- keyboards/yynmt/dozen0/keyboard.json | 6 +++ keyboards/yynmt/kagamidget/config.h | 39 ------------------- keyboards/yynmt/kagamidget/keyboard.json | 6 +++ keyboards/zigotica/z12/config.h | 22 ----------- keyboards/zigotica/z12/keyboard.json | 6 +++ keyboards/zigotica/z34/config.h | 5 --- keyboards/zigotica/z34/keyboard.json | 6 +++ keyboards/zj68/config.h | 24 ------------ keyboards/zj68/keyboard.json | 6 +++ keyboards/zlant/config.h | 7 ---- keyboards/zlant/keyboard.json | 6 +++ keyboards/zoo/wampus/config.h | 5 --- keyboards/zoo/wampus/keyboard.json | 6 +++ keyboards/zsa/moonlander/config.h | 5 --- keyboards/zsa/moonlander/keyboard.json | 6 +++ keyboards/ztboards/after/config.h | 23 ----------- keyboards/ztboards/after/keyboard.json | 6 +++ keyboards/ztboards/noon/config.h | 23 ----------- keyboards/ztboards/noon/keyboard.json | 6 +++ 82 files changed, 246 insertions(+), 787 deletions(-) delete mode 100644 keyboards/x16/config.h delete mode 100644 keyboards/xelus/akis/config.h delete mode 100644 keyboards/xelus/dharma/config.h delete mode 100644 keyboards/xelus/kangaroo/rev2/config.h delete mode 100644 keyboards/xelus/pachi/mini_32u4/config.h delete mode 100644 keyboards/xelus/pachi/rev1/config.h delete mode 100644 keyboards/xelus/snap96/config.h delete mode 100644 keyboards/xiudi/xd60/rev2/config.h delete mode 100644 keyboards/xiudi/xd60/rev3/config.h delete mode 100644 keyboards/xiudi/xd68/config.h delete mode 100644 keyboards/xiudi/xd75/config.h delete mode 100644 keyboards/xiudi/xd84pro/config.h delete mode 100644 keyboards/xiudi/xd87/config.h delete mode 100644 keyboards/xmmx/config.h delete mode 100644 keyboards/ydkb/chili/config.h delete mode 100644 keyboards/ydkb/just60/config.h delete mode 100644 keyboards/ymdk/melody96/soldered/config.h delete mode 100644 keyboards/ymdk/np21/config.h delete mode 100644 keyboards/ymdk/yd60mq/config.h delete mode 100644 keyboards/ymdk/ymd09/config.h delete mode 100644 keyboards/ymdk/ymd67/config.h delete mode 100644 keyboards/yushakobo/quick7/config.h delete mode 100644 keyboards/yynmt/acperience12/rev1/config.h delete mode 100644 keyboards/yynmt/dozen0/config.h delete mode 100644 keyboards/yynmt/kagamidget/config.h delete mode 100644 keyboards/zigotica/z12/config.h delete mode 100644 keyboards/zj68/config.h delete mode 100755 keyboards/zlant/config.h delete mode 100644 keyboards/ztboards/after/config.h delete mode 100644 keyboards/ztboards/noon/config.h diff --git a/keyboards/x16/config.h b/keyboards/x16/config.h deleted file mode 100644 index c30966d9d2f..00000000000 --- a/keyboards/x16/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 - * - * 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/x16/keyboard.json b/keyboards/x16/keyboard.json index faf90df99a5..4d407e53329 100644 --- a/keyboards/x16/keyboard.json +++ b/keyboards/x16/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "C6", "B4", "D7"], "rows": ["E6", "F7", "D6", "B6"] diff --git a/keyboards/xelus/akis/config.h b/keyboards/xelus/akis/config.h deleted file mode 100644 index 5df8b9c56bd..00000000000 --- a/keyboards/xelus/akis/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * 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 diff --git a/keyboards/xelus/akis/keyboard.json b/keyboards/xelus/akis/keyboard.json index 5163b414c41..23a8178b265 100644 --- a/keyboards/xelus/akis/keyboard.json +++ b/keyboards/xelus/akis/keyboard.json @@ -38,6 +38,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "F6", "F7", "C7", "C6", "B6", "B5"], "rows": ["F5", "F4", "F1", "F0", "E6"] diff --git a/keyboards/xelus/dharma/config.h b/keyboards/xelus/dharma/config.h deleted file mode 100644 index 5df8b9c56bd..00000000000 --- a/keyboards/xelus/dharma/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * 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 diff --git a/keyboards/xelus/dharma/keyboard.json b/keyboards/xelus/dharma/keyboard.json index 84ef6045588..8d6b7465277 100644 --- a/keyboards/xelus/dharma/keyboard.json +++ b/keyboards/xelus/dharma/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "D5", "D4", "E6", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], "rows": ["D0", "D1", "D2", "D3", "B0"] diff --git a/keyboards/xelus/kangaroo/rev1/config.h b/keyboards/xelus/kangaroo/rev1/config.h index c174b67e573..62c06133c06 100644 --- a/keyboards/xelus/kangaroo/rev1/config.h +++ b/keyboards/xelus/kangaroo/rev1/config.h @@ -16,11 +16,6 @@ #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 - // I2C OLED defines #define I2C1_SCL_PIN B8 #define I2C1_SDA_PIN B9 diff --git a/keyboards/xelus/kangaroo/rev1/keyboard.json b/keyboards/xelus/kangaroo/rev1/keyboard.json index 12d72f43737..cc5f09b15f8 100644 --- a/keyboards/xelus/kangaroo/rev1/keyboard.json +++ b/keyboards/xelus/kangaroo/rev1/keyboard.json @@ -11,6 +11,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B10", "B2", "B11", "A10", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["A9", "A8", "B15", "B14", "B13", "B12", "A4", "A5", "A6", "A7", "B0", "B1"] diff --git a/keyboards/xelus/kangaroo/rev2/config.h b/keyboards/xelus/kangaroo/rev2/config.h deleted file mode 100644 index dfe8035b10c..00000000000 --- a/keyboards/xelus/kangaroo/rev2/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Harrison Chan (Xelus) - * - * 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 diff --git a/keyboards/xelus/kangaroo/rev2/keyboard.json b/keyboards/xelus/kangaroo/rev2/keyboard.json index 1d6794cfa32..1fb7aaa6937 100644 --- a/keyboards/xelus/kangaroo/rev2/keyboard.json +++ b/keyboards/xelus/kangaroo/rev2/keyboard.json @@ -11,6 +11,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B10", "B2", "B11", "A10", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["A9", "A8", "B15", "B14", "B13", "B12", "A4", "A5", "A6", "A7", "B0", "B1"] diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h index 7a8ac2f0130..6180fe50d7a 100644 --- a/keyboards/xelus/ninjin/config.h +++ b/keyboards/xelus/ninjin/config.h @@ -23,9 +23,3 @@ #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 #define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_EXTERNAL_PULLUP - -/* 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/xelus/ninjin/keyboard.json b/keyboards/xelus/ninjin/keyboard.json index 36e6a390339..34032ea4269 100644 --- a/keyboards/xelus/ninjin/keyboard.json +++ b/keyboards/xelus/ninjin/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "B6", "B5"], "rows": ["B4", "B3", "A15", "A3", "B9", "B8"] diff --git a/keyboards/xelus/pachi/mini_32u4/config.h b/keyboards/xelus/pachi/mini_32u4/config.h deleted file mode 100644 index 651f613045d..00000000000 --- a/keyboards/xelus/pachi/mini_32u4/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * 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 diff --git a/keyboards/xelus/pachi/mini_32u4/keyboard.json b/keyboards/xelus/pachi/mini_32u4/keyboard.json index e5058d0f088..590b32de6b6 100644 --- a/keyboards/xelus/pachi/mini_32u4/keyboard.json +++ b/keyboards/xelus/pachi/mini_32u4/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "E6", "B7", "D0"], "rows": ["B0", "B1", "B2", "F0", "D2", "D1"] diff --git a/keyboards/xelus/pachi/rev1/config.h b/keyboards/xelus/pachi/rev1/config.h deleted file mode 100644 index 651f613045d..00000000000 --- a/keyboards/xelus/pachi/rev1/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * 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 diff --git a/keyboards/xelus/pachi/rev1/keyboard.json b/keyboards/xelus/pachi/rev1/keyboard.json index 1afdfe11935..98b59c8641a 100644 --- a/keyboards/xelus/pachi/rev1/keyboard.json +++ b/keyboards/xelus/pachi/rev1/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A2", "A1", "A0", "A3", "B6", "B5"], "rows": ["B4", "B3", "A15", "B15", "B9", "B8"] diff --git a/keyboards/xelus/snap96/config.h b/keyboards/xelus/snap96/config.h deleted file mode 100644 index c6f9a6c1bfd..00000000000 --- a/keyboards/xelus/snap96/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#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/xelus/snap96/keyboard.json b/keyboards/xelus/snap96/keyboard.json index c4c806d8e8b..f9ce42dd15f 100644 --- a/keyboards/xelus/snap96/keyboard.json +++ b/keyboards/xelus/snap96/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "D5", "B7", "D0", "F5", "D3", "B4", "B5", "D4", "D6"], "rows": ["B2", "B1", "B0", "C7", "F6", "F7", "B3", "D1", "D2", "D7", "B6", "C6"] diff --git a/keyboards/xelus/xs108/config.h b/keyboards/xelus/xs108/config.h index 4b3b447c957..3ac31458a15 100644 --- a/keyboards/xelus/xs108/config.h +++ b/keyboards/xelus/xs108/config.h @@ -16,11 +16,6 @@ #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 - // I2C setup #define I2C1_SCL_PIN B8 #define I2C1_SDA_PIN B9 diff --git a/keyboards/xelus/xs108/keyboard.json b/keyboards/xelus/xs108/keyboard.json index e80292365a6..14d442d197c 100644 --- a/keyboards/xelus/xs108/keyboard.json +++ b/keyboards/xelus/xs108/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["C14", "C13", "A10", "A3", "A1", "A0"] diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h deleted file mode 100644 index 4e596948184..00000000000 --- a/keyboards/xiudi/xd60/rev2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 diff --git a/keyboards/xiudi/xd60/rev2/keyboard.json b/keyboards/xiudi/xd60/rev2/keyboard.json index 639c2dda9e0..8e03fdba20a 100644 --- a/keyboards/xiudi/xd60/rev2/keyboard.json +++ b/keyboards/xiudi/xd60/rev2/keyboard.json @@ -13,6 +13,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h deleted file mode 100644 index 61a74eb88a9..00000000000 --- a/keyboards/xiudi/xd60/rev3/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Rodrigo Feijao - -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 diff --git a/keyboards/xiudi/xd60/rev3/keyboard.json b/keyboards/xiudi/xd60/rev3/keyboard.json index 5b12c38f8ec..09af3681af3 100644 --- a/keyboards/xiudi/xd60/rev3/keyboard.json +++ b/keyboards/xiudi/xd60/rev3/keyboard.json @@ -13,6 +13,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h deleted file mode 100644 index 139fb913228..00000000000 --- a/keyboards/xiudi/xd68/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Michael Campbell - -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/xiudi/xd68/keyboard.json b/keyboards/xiudi/xd68/keyboard.json index 1836feb49d5..620c0b59639 100644 --- a/keyboards/xiudi/xd68/keyboard.json +++ b/keyboards/xiudi/xd68/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F7"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h deleted file mode 100644 index 9bbab0cdf0b..00000000000 --- a/keyboards/xiudi/xd75/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2017 Benjamin Kesselring - -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/xiudi/xd75/keyboard.json b/keyboards/xiudi/xd75/keyboard.json index 5086134cf1a..df1ec335776 100644 --- a/keyboards/xiudi/xd75/keyboard.json +++ b/keyboards/xiudi/xd75/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "B0"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h deleted file mode 100644 index 1e378e8f472..00000000000 --- a/keyboards/xiudi/xd84pro/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 - * - * 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 diff --git a/keyboards/xiudi/xd84pro/keyboard.json b/keyboards/xiudi/xd84pro/keyboard.json index 23bad3fcab1..5388d8f7c22 100644 --- a/keyboards/xiudi/xd84pro/keyboard.json +++ b/keyboards/xiudi/xd84pro/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F7"], "rows": ["F4", "D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h deleted file mode 100644 index 95110fa5900..00000000000 --- a/keyboards/xiudi/xd87/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Alexander Fougner - -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/xiudi/xd87/keyboard.json b/keyboards/xiudi/xd87/keyboard.json index a84c5660a8a..d46c6ccba72 100644 --- a/keyboards/xiudi/xd87/keyboard.json +++ b/keyboards/xiudi/xd87/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5", "B6", "C6", "D4", "D6", "D7", "B4", "B2", "B3", "D2"], "rows": ["D1", "B0", "B1", "C7", "D3", "D5"] diff --git a/keyboards/xmmx/config.h b/keyboards/xmmx/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/xmmx/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/xmmx/keyboard.json b/keyboards/xmmx/keyboard.json index c0687ca1b7b..2e6813520c0 100644 --- a/keyboards/xmmx/keyboard.json +++ b/keyboards/xmmx/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "E6", "B7", "C7", "C6", "D4", "D6", "D7", "B4", "D0", "D1", "F7", "D2", "D3", "D5"], "rows": ["B0", "F6", "F5", "F4", "F1", "F0"] diff --git a/keyboards/ydkb/chili/config.h b/keyboards/ydkb/chili/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/ydkb/chili/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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/ydkb/chili/keyboard.json b/keyboards/ydkb/chili/keyboard.json index 78dd6318fe8..92552d96a3d 100644 --- a/keyboards/ydkb/chili/keyboard.json +++ b/keyboards/ydkb/chili/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F5", "F4", "F1", "F0", "E6", "B0", "D5", "D3", "D2", "D1", "D0"] diff --git a/keyboards/ydkb/grape/config.h b/keyboards/ydkb/grape/config.h index a835243d580..5b08baa214c 100644 --- a/keyboards/ydkb/grape/config.h +++ b/keyboards/ydkb/grape/config.h @@ -23,8 +23,3 @@ #define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, B3, B2, B1, B0 } #define SN74X138_ADDRESS_PINS { D2, D1, D0 } - -/* 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/ydkb/grape/keyboard.json b/keyboards/ydkb/grape/keyboard.json index f8f0364d93d..e1645d7d035 100644 --- a/keyboards/ydkb/grape/keyboard.json +++ b/keyboards/ydkb/grape/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/ydkb/just60/config.h b/keyboards/ydkb/just60/config.h deleted file mode 100644 index 4ec059e4b58..00000000000 --- a/keyboards/ydkb/just60/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Jianfei Wang - -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 diff --git a/keyboards/ydkb/just60/keyboard.json b/keyboards/ydkb/just60/keyboard.json index fb46e08ea31..586ea80f21f 100644 --- a/keyboards/ydkb/just60/keyboard.json +++ b/keyboards/ydkb/just60/keyboard.json @@ -11,6 +11,12 @@ "features": { "bootmagic": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B6", "B5", "B7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0"], "rows": ["E2", "C7", "B3", "B2", "B1"] diff --git a/keyboards/yiancardesigns/barleycorn/config.h b/keyboards/yiancardesigns/barleycorn/config.h index 5e90dd35159..137ad99b8d8 100644 --- a/keyboards/yiancardesigns/barleycorn/config.h +++ b/keyboards/yiancardesigns/barleycorn/config.h @@ -41,11 +41,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* 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. diff --git a/keyboards/yiancardesigns/barleycorn/keyboard.json b/keyboards/yiancardesigns/barleycorn/keyboard.json index 2fd79052c91..a1676840a55 100644 --- a/keyboards/yiancardesigns/barleycorn/keyboard.json +++ b/keyboards/yiancardesigns/barleycorn/keyboard.json @@ -13,6 +13,12 @@ "extrakey": true, "mousekey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/yiancardesigns/gingham/config.h b/keyboards/yiancardesigns/gingham/config.h index fe06114dd56..20dd8f5eaf7 100644 --- a/keyboards/yiancardesigns/gingham/config.h +++ b/keyboards/yiancardesigns/gingham/config.h @@ -41,11 +41,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* 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. diff --git a/keyboards/yiancardesigns/gingham/keyboard.json b/keyboards/yiancardesigns/gingham/keyboard.json index eb5573a355b..d1d9b866e8d 100644 --- a/keyboards/yiancardesigns/gingham/keyboard.json +++ b/keyboards/yiancardesigns/gingham/keyboard.json @@ -14,6 +14,12 @@ "extrakey": true, "mousekey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/yiancardesigns/seigaiha/config.h b/keyboards/yiancardesigns/seigaiha/config.h index 70ce1c29abf..427da6610a9 100644 --- a/keyboards/yiancardesigns/seigaiha/config.h +++ b/keyboards/yiancardesigns/seigaiha/config.h @@ -41,11 +41,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* 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. diff --git a/keyboards/yiancardesigns/seigaiha/keyboard.json b/keyboards/yiancardesigns/seigaiha/keyboard.json index 5890357c99f..bb694f5b8ee 100644 --- a/keyboards/yiancardesigns/seigaiha/keyboard.json +++ b/keyboards/yiancardesigns/seigaiha/keyboard.json @@ -14,6 +14,12 @@ "extrakey": true, "mousekey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "bootmagic": { "matrix": [1, 0] }, diff --git a/keyboards/ymdk/melody96/soldered/config.h b/keyboards/ymdk/melody96/soldered/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/ymdk/melody96/soldered/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/ymdk/melody96/soldered/keyboard.json b/keyboards/ymdk/melody96/soldered/keyboard.json index 06d39472406..dbb2ddc32bb 100644 --- a/keyboards/ymdk/melody96/soldered/keyboard.json +++ b/keyboards/ymdk/melody96/soldered/keyboard.json @@ -16,6 +16,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h deleted file mode 100644 index 6c187131d44..00000000000 --- a/keyboards/ymdk/np21/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2017 Luiz Ribeiro - -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/ymdk/np21/keyboard.json b/keyboards/ymdk/np21/keyboard.json index 14a075042b5..a1997161ee9 100644 --- a/keyboards/ymdk/np21/keyboard.json +++ b/keyboards/ymdk/np21/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/ymdk/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h deleted file mode 100644 index 6f34d5132a8..00000000000 --- a/keyboards/ymdk/yd60mq/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ymdk/yd60mq/info.json b/keyboards/ymdk/yd60mq/info.json index a1c4bc8f760..4152ed6e077 100644 --- a/keyboards/ymdk/yd60mq/info.json +++ b/keyboards/ymdk/yd60mq/info.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": false + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/ymdk/ymd09/config.h b/keyboards/ymdk/ymd09/config.h deleted file mode 100644 index 8d59b7832f4..00000000000 --- a/keyboards/ymdk/ymd09/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2020 Patrick Fruh -Copyright 2023 SHVD3x - -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 diff --git a/keyboards/ymdk/ymd09/keyboard.json b/keyboards/ymdk/ymd09/keyboard.json index 52dc9d31609..571aa8c45f6 100644 --- a/keyboards/ymdk/ymd09/keyboard.json +++ b/keyboards/ymdk/ymd09/keyboard.json @@ -24,6 +24,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "E2" }, diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h deleted file mode 100644 index 6f34d5132a8..00000000000 --- a/keyboards/ymdk/ymd67/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ymdk/ymd67/keyboard.json b/keyboards/ymdk/ymd67/keyboard.json index 5e470553d5f..5f9ba275f97 100644 --- a/keyboards/ymdk/ymd67/keyboard.json +++ b/keyboards/ymdk/ymd67/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": false + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/yoichiro/lunakey_mini/config.h b/keyboards/yoichiro/lunakey_mini/config.h index 079dd3e3d73..c817b5cfe3e 100644 --- a/keyboards/yoichiro/lunakey_mini/config.h +++ b/keyboards/yoichiro/lunakey_mini/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . /* Audio Support */ #define AUDIO_PIN C6 -/* 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. diff --git a/keyboards/yoichiro/lunakey_mini/keyboard.json b/keyboards/yoichiro/lunakey_mini/keyboard.json index 5fbf6c8fbc9..e31f09c285e 100644 --- a/keyboards/yoichiro/lunakey_mini/keyboard.json +++ b/keyboards/yoichiro/lunakey_mini/keyboard.json @@ -12,6 +12,12 @@ "bootmagic": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "D7", "E6", "B4"] diff --git a/keyboards/yushakobo/quick7/config.h b/keyboards/yushakobo/quick7/config.h deleted file mode 100644 index 1c876487949..00000000000 --- a/keyboards/yushakobo/quick7/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 yushakobo - -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/yushakobo/quick7/keyboard.json b/keyboards/yushakobo/quick7/keyboard.json index 14d65945ce9..ba4854015bf 100644 --- a/keyboards/yushakobo/quick7/keyboard.json +++ b/keyboards/yushakobo/quick7/keyboard.json @@ -41,6 +41,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ ["D2", "D4", "F4"], diff --git a/keyboards/yynmt/acperience12/rev1/config.h b/keyboards/yynmt/acperience12/rev1/config.h deleted file mode 100644 index 65a752a97f5..00000000000 --- a/keyboards/yynmt/acperience12/rev1/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 yynmt - * - * 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 - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/yynmt/acperience12/rev1/keyboard.json b/keyboards/yynmt/acperience12/rev1/keyboard.json index deb02bd55d4..ccdf2fa1113 100644 --- a/keyboards/yynmt/acperience12/rev1/keyboard.json +++ b/keyboards/yynmt/acperience12/rev1/keyboard.json @@ -13,6 +13,12 @@ "extrakey": true, "mousekey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "matrix_pins": { diff --git a/keyboards/yynmt/dozen0/config.h b/keyboards/yynmt/dozen0/config.h deleted file mode 100644 index eb679ebba0a..00000000000 --- a/keyboards/yynmt/dozen0/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 yynmt - -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/yynmt/dozen0/keyboard.json b/keyboards/yynmt/dozen0/keyboard.json index cdd55389f3c..1ad2b13be05 100644 --- a/keyboards/yynmt/dozen0/keyboard.json +++ b/keyboards/yynmt/dozen0/keyboard.json @@ -37,6 +37,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "B5", "B4", "E6", "D7", "C6", "D4"], "rows": ["F4"] diff --git a/keyboards/yynmt/kagamidget/config.h b/keyboards/yynmt/kagamidget/config.h deleted file mode 100644 index eb679ebba0a..00000000000 --- a/keyboards/yynmt/kagamidget/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 yynmt - -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/yynmt/kagamidget/keyboard.json b/keyboards/yynmt/kagamidget/keyboard.json index 15e48da7dd3..a4dff734b5f 100644 --- a/keyboards/yynmt/kagamidget/keyboard.json +++ b/keyboards/yynmt/kagamidget/keyboard.json @@ -37,6 +37,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"], "rows": ["D1", "D0", "F4", "F5"] diff --git a/keyboards/zigotica/z12/config.h b/keyboards/zigotica/z12/config.h deleted file mode 100644 index fef7fb59bd1..00000000000 --- a/keyboards/zigotica/z12/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Sergi Meseguer - -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 diff --git a/keyboards/zigotica/z12/keyboard.json b/keyboards/zigotica/z12/keyboard.json index d9791d9c5ef..2d3e92d6e2c 100644 --- a/keyboards/zigotica/z12/keyboard.json +++ b/keyboards/zigotica/z12/keyboard.json @@ -29,6 +29,12 @@ "nkro": false, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "direct": [ [null, "E6", "C6", null], diff --git a/keyboards/zigotica/z34/config.h b/keyboards/zigotica/z34/config.h index d2ec68cc394..10c442f2066 100644 --- a/keyboards/zigotica/z34/config.h +++ b/keyboards/zigotica/z34/config.h @@ -16,11 +16,6 @@ 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 - // EE_HANDS MASTER_RIGHT MASTER_LEFT #define MASTER_RIGHT diff --git a/keyboards/zigotica/z34/keyboard.json b/keyboards/zigotica/z34/keyboard.json index 5faa9b23b21..c08934360e4 100644 --- a/keyboards/zigotica/z34/keyboard.json +++ b/keyboards/zigotica/z34/keyboard.json @@ -14,6 +14,12 @@ "features": { "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/zj68/config.h b/keyboards/zj68/config.h deleted file mode 100644 index f97ce7b0f84..00000000000 --- a/keyboards/zj68/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2019 Collin Diekvoss - -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 diff --git a/keyboards/zj68/keyboard.json b/keyboards/zj68/keyboard.json index 3adf890df90..9273b81cd5a 100644 --- a/keyboards/zj68/keyboard.json +++ b/keyboards/zj68/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h deleted file mode 100755 index 5f360813239..00000000000 --- a/keyboards/zlant/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/zlant/keyboard.json b/keyboards/zlant/keyboard.json index d59b1c3f19d..965a259c3be 100644 --- a/keyboards/zlant/keyboard.json +++ b/keyboards/zlant/keyboard.json @@ -15,6 +15,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B7", "D1", "D2", "D3", "B3", "B2"], "rows": ["B0", "B1", "D4", "D5"] diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h index e0ddfaca88c..b64c645a415 100644 --- a/keyboards/zoo/wampus/config.h +++ b/keyboards/zoo/wampus/config.h @@ -36,8 +36,3 @@ along with this program. If not, see . #define I2C1_TIMINGR_SDADEL 1U #define I2C1_TIMINGR_SCLH 3U #define I2C1_TIMINGR_SCLL 9U - -/* 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/zoo/wampus/keyboard.json b/keyboards/zoo/wampus/keyboard.json index fdc10ae2108..3e65c502319 100644 --- a/keyboards/zoo/wampus/keyboard.json +++ b/keyboards/zoo/wampus/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B12", "A15", "A13", "A7", "A2", "A1", "A0", "F1", "F0", "B3", "B4", "B5"], "rows": ["C13", "C14", "A5", "A4", "A3"] diff --git a/keyboards/zsa/moonlander/config.h b/keyboards/zsa/moonlander/config.h index 9fbb7a64b5f..08870fba9d5 100644 --- a/keyboards/zsa/moonlander/config.h +++ b/keyboards/zsa/moonlander/config.h @@ -44,11 +44,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -/* 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. diff --git a/keyboards/zsa/moonlander/keyboard.json b/keyboards/zsa/moonlander/keyboard.json index 08864fe2d77..571674fe1c8 100644 --- a/keyboards/zsa/moonlander/keyboard.json +++ b/keyboards/zsa/moonlander/keyboard.json @@ -22,6 +22,12 @@ "rgb_matrix": true, "swap_hands": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "audio": { "driver": "dac_additive" }, diff --git a/keyboards/ztboards/after/config.h b/keyboards/ztboards/after/config.h deleted file mode 100644 index 59d91c329de..00000000000 --- a/keyboards/ztboards/after/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2019 - * - * 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 diff --git a/keyboards/ztboards/after/keyboard.json b/keyboards/ztboards/after/keyboard.json index 08fcdb3625f..1b023908377 100644 --- a/keyboards/ztboards/after/keyboard.json +++ b/keyboards/ztboards/after/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D7", "D6", "D4", "C7", "C6", "B6", "B5", "B4", "F7", "F0", "F4", "F1"], "rows": ["B3", "F6", "F5", "D5", "B2"] diff --git a/keyboards/ztboards/noon/config.h b/keyboards/ztboards/noon/config.h deleted file mode 100644 index 59d91c329de..00000000000 --- a/keyboards/ztboards/noon/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2019 - * - * 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 diff --git a/keyboards/ztboards/noon/keyboard.json b/keyboards/ztboards/noon/keyboard.json index 0f965963cfc..a3f9912acc4 100644 --- a/keyboards/ztboards/noon/keyboard.json +++ b/keyboards/ztboards/noon/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D1", "D0", "D4", "D6", "B2", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], "rows": ["B5", "D5", "D3", "B1", "F0"] From b8f29c38652fb56fd122e61018778fd5355a8739 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 25 May 2024 04:38:57 +1000 Subject: [PATCH 330/333] Update GPIO macros in keymaps (#23792) --- .../1up60rgb/keymaps/default/keymap.c | 8 ++--- .../1up60rgb/keymaps/iso/keymap.c | 8 ++--- .../1up60rgb/keymaps/tsangan/keymap.c | 8 ++--- keyboards/45_ats/keymaps/default/keymap.c | 6 ++-- keyboards/45_ats/keymaps/via/keymap.c | 6 ++-- .../blu/vimclutch/keymaps/default/keymap.c | 4 +-- keyboards/bobpad/keymaps/default/keymap.c | 2 +- keyboards/bobpad/keymaps/via/keymap.c | 10 +++--- .../siemens_tastatur/keymaps/default/keymap.c | 8 ++--- .../wraith/keymaps/default/keymap.c | 4 +-- .../keymaps/default/keymap.c | 2 +- .../kd83a_bfg_edition/keymaps/via/keymap.c | 2 +- .../keymaps/default/keymap.c | 2 +- .../kd87a_bfg_edition/keymaps/via/keymap.c | 2 +- keyboards/db/db63/keymaps/default/keymap.c | 4 +-- .../dm9records/plaid/keymaps/default/keymap.c | 32 ++++++++--------- .../dm9records/plaid/keymaps/via/keymap.c | 4 +-- .../dosa40rgb/keymaps/default/keymap.c | 4 +-- .../dyz/synthesis60/keymaps/default/keymap.c | 4 +-- .../keymaps/default_arrow/keymap.c | 4 +-- .../dyz/synthesis60/keymaps/via/keymap.c | 4 +-- .../evyd13/nt650/keymaps/default/keymap.c | 6 ++-- .../wonderland/keymaps/default/keymap.c | 6 ++-- .../handwired/daishi/keymaps/default/keymap.c | 12 +++---- .../dqz11n1g/keymaps/default/keymap.c | 6 ++-- .../handwired/jopr/keymaps/default/keymap.c | 12 +++---- .../jopr/keymaps/modded_white/keymap.c | 12 +++---- .../jotanck/keymaps/default/keymap.c | 12 +++---- .../handwired/kbod/keymaps/default/keymap.c | 8 ++--- .../keymaps/default/keymap.c | 6 ++-- .../prime_exl/keymaps/default/keymap.c | 8 ++--- .../handwired/prime_exl/keymaps/via/keymap.c | 8 ++--- .../handwired/sono1/keymaps/default/keymap.c | 12 +++---- keyboards/hp69/keymaps/via/keymap.c | 4 +-- .../jukaie/jk01/keymaps/default/keymap.c | 2 +- keyboards/jukaie/jk01/keymaps/via/keymap.c | 2 +- .../kmac_pad/keymaps/default/keymap.c | 4 +-- .../plaid_pad/keymaps/default/keymap.c | 2 +- .../keycapsss/plaid_pad/keymaps/via/keymap.c | 2 +- .../keyhive/navi10/keymaps/default/keymap.c | 4 +-- keyboards/kin80/keymaps/default/keymap.c | 2 +- keyboards/kinesis/keymaps/alvicstep/keymap.c | 8 ++--- keyboards/kmini/keymaps/default/keymap.c | 4 +-- keyboards/lime/keymaps/default/keymap.c | 4 +-- keyboards/makrosu/keymaps/default/keymap.c | 18 +++++----- keyboards/makrosu/keymaps/via/keymap.c | 18 +++++----- .../leftover30/keymaps/default/keymap.c | 4 +-- .../keymaps/default_isoenter/keymap.c | 4 +-- .../mechlovin/kay65/keymaps/default/keymap.c | 4 +-- .../mechlovin/kay65/keymaps/via/keymap.c | 4 +-- .../wearhaus66/keymaps/default/keymap.c | 4 +-- .../wearhaus66/keymaps/via/keymap.c | 4 +-- keyboards/minimon/bartlesplit/matrix.c | 20 +++++------ keyboards/noxary/268/keymaps/ansi/keymap.c | 8 ++--- keyboards/noxary/268/keymaps/default/keymap.c | 8 ++--- keyboards/noxary/268/keymaps/iso/keymap.c | 8 ++--- keyboards/orange75/keymaps/default/keymap.c | 24 ++++++------- .../peej/lumberjack/keymaps/via/keymap.c | 12 +++---- keyboards/planck/keymaps/default/keymap.c | 4 +-- .../playkbtw/pk60/keymaps/default/keymap.c | 8 ++--- keyboards/preonic/keymaps/default/keymap.c | 4 +-- .../primekb/prime_e/keymaps/default/keymap.c | 24 ++++++------- .../primekb/prime_e/keymaps/via/keymap.c | 24 ++++++------- keyboards/punk75/keymaps/default/keymap.c | 2 +- keyboards/punk75/keymaps/via/keymap.c | 2 +- .../retropad/keymaps/default/keymap.c | 18 +++++----- .../swiftrax/retropad/keymaps/via/keymap.c | 18 +++++----- keyboards/uk78/keymaps/default/keymap.c | 8 ++--- .../viktus/at101_bh/keymaps/default/keymap.c | 18 +++++----- .../viktus/sp_mini/keymaps/default/keymap.c | 24 ++++++------- keyboards/viktus/sp_mini/keymaps/via/keymap.c | 36 +++++++++---------- .../cajal/keymaps/default/keymap.c | 30 ++++++++-------- .../cajal/keymaps/default_ortho/keymap.c | 26 +++++++------- .../walletburner/cajal/keymaps/via/keymap.c | 30 ++++++++-------- .../cypher/rev1/keymaps/kwer/keymap.c | 12 +++---- .../work_board/keymaps/via/keymap.c | 12 +++---- .../wsk/g4m3ralpha/keymaps/default/keymap.c | 18 +++++----- .../wsk/gothic50/keymaps/default/keymap.c | 18 +++++----- .../wsk/gothic70/keymaps/default/keymap.c | 18 +++++----- keyboards/wsk/gothic70/keymaps/via/keymap.c | 12 +++---- keyboards/wsk/jerkin/keymaps/default/keymap.c | 22 ++++++------ keyboards/zsa/voyager/matrix.c | 2 +- 82 files changed, 402 insertions(+), 402 deletions(-) diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c index 5792f51ca82..3b5442c9574 100644 --- a/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c @@ -20,11 +20,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { if (led_state.caps_lock) { - setPinOutput(B2); - writePinLow(B2); + gpio_set_pin_output(B2); + gpio_write_pin_low(B2); } else { - setPinInput(B2); - writePinLow(B2); + gpio_set_pin_input(B2); + gpio_write_pin_low(B2); } return false; } diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c index 20783c22cba..b720c984e45 100644 --- a/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c +++ b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c @@ -20,11 +20,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { if (led_state.caps_lock) { - setPinOutput(B2); - writePinLow(B2); + gpio_set_pin_output(B2); + gpio_write_pin_low(B2); } else { - setPinInput(B2); - writePinLow(B2); + gpio_set_pin_input(B2); + gpio_write_pin_low(B2); } return false; } diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c index 5cc92278859..a634d913b2c 100644 --- a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c +++ b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c @@ -20,11 +20,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { if (led_state.caps_lock) { - setPinOutput(B2); - writePinLow(B2); + gpio_set_pin_output(B2); + gpio_write_pin_low(B2); } else { - setPinInput(B2); - writePinLow(B2); + gpio_set_pin_input(B2); + gpio_write_pin_low(B2); } return false; } diff --git a/keyboards/45_ats/keymaps/default/keymap.c b/keyboards/45_ats/keymaps/default/keymap.c index 3208614b329..3d4b74ab40d 100644 --- a/keyboards/45_ats/keymaps/default/keymap.c +++ b/keyboards/45_ats/keymaps/default/keymap.c @@ -90,9 +90,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //function for layer indicator LED layer_state_t layer_state_set_user(layer_state_t state) { - writePin(D0, layer_state_cmp(state, 0)); - writePin(D1, layer_state_cmp(state, 1)); - writePin(D2, layer_state_cmp(state, 2)); + gpio_write_pin(D0, layer_state_cmp(state, 0)); + gpio_write_pin(D1, layer_state_cmp(state, 1)); + gpio_write_pin(D2, layer_state_cmp(state, 2)); return state; } diff --git a/keyboards/45_ats/keymaps/via/keymap.c b/keyboards/45_ats/keymaps/via/keymap.c index 3208614b329..3d4b74ab40d 100644 --- a/keyboards/45_ats/keymaps/via/keymap.c +++ b/keyboards/45_ats/keymaps/via/keymap.c @@ -90,9 +90,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //function for layer indicator LED layer_state_t layer_state_set_user(layer_state_t state) { - writePin(D0, layer_state_cmp(state, 0)); - writePin(D1, layer_state_cmp(state, 1)); - writePin(D2, layer_state_cmp(state, 2)); + gpio_write_pin(D0, layer_state_cmp(state, 0)); + gpio_write_pin(D1, layer_state_cmp(state, 1)); + gpio_write_pin(D2, layer_state_cmp(state, 2)); return state; } diff --git a/keyboards/blu/vimclutch/keymaps/default/keymap.c b/keyboards/blu/vimclutch/keymaps/default/keymap.c index 49eaa2b8816..9c602571d8b 100644 --- a/keyboards/blu/vimclutch/keymaps/default/keymap.c +++ b/keyboards/blu/vimclutch/keymaps/default/keymap.c @@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer-specific lighting */ layer_state_t layer_state_set_user(layer_state_t state) { - writePin(F4, !layer_state_cmp(state, _VC)); - writePin(F5, !layer_state_cmp(state, _VIM)); + gpio_write_pin(F4, !layer_state_cmp(state, _VC)); + gpio_write_pin(F5, !layer_state_cmp(state, _VIM)); return state; }; diff --git a/keyboards/bobpad/keymaps/default/keymap.c b/keyboards/bobpad/keymaps/default/keymap.c index 5c7dcd591e1..f02c9764b7a 100644 --- a/keyboards/bobpad/keymaps/default/keymap.c +++ b/keyboards/bobpad/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; layer_state_t layer_state_set_user(layer_state_t state) { - writePin(D0, IS_LAYER_ON_STATE(state, 1)); + gpio_write_pin(D0, IS_LAYER_ON_STATE(state, 1)); return state; } diff --git a/keyboards/bobpad/keymaps/via/keymap.c b/keyboards/bobpad/keymaps/via/keymap.c index c244c6037e5..61292299036 100644 --- a/keyboards/bobpad/keymaps/via/keymap.c +++ b/keyboards/bobpad/keymaps/via/keymap.c @@ -46,11 +46,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // C6 E6 D7 void matrix_scan_user(void) { - writePin(C6, layer_state_is(1)); - writePin(E6, layer_state_is(2)); - writePin(D7, layer_state_is(3)); - writePin(D4, layer_state_is(4)); - writePin(D0, layer_state_is(5)); + gpio_write_pin(C6, layer_state_is(1)); + gpio_write_pin(E6, layer_state_is(2)); + gpio_write_pin(D7, layer_state_is(3)); + gpio_write_pin(D4, layer_state_is(4)); + gpio_write_pin(D0, layer_state_is(5)); if (is_alt_tab_active) { if (timer_elapsed(alt_tab_timer) > 1000) { unregister_code(KC_LWIN); diff --git a/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c b/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c index 0f3911a2d36..c6bda674e33 100644 --- a/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c +++ b/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c @@ -47,15 +47,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } void matrix_init_user(void) { - setPinOutput(B0); - writePinLow(B0); + gpio_set_pin_output(B0); + gpio_write_pin_low(B0); } bool led_update_user(led_t led_state) { if (led_state.caps_lock) { - writePinHigh(B0); + gpio_write_pin_high(B0); } else { - writePinLow(B0); + gpio_write_pin_low(B0); } return false; } diff --git a/keyboards/cutie_club/wraith/keymaps/default/keymap.c b/keyboards/cutie_club/wraith/keymaps/default/keymap.c index 7759bb6e469..3e6c460a566 100644 --- a/keyboards/cutie_club/wraith/keymaps/default/keymap.c +++ b/keyboards/cutie_club/wraith/keymaps/default/keymap.c @@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void matrix_scan_user(void) { // escape LED on layer 1 if (IS_LAYER_ON(1)) { - writePinLow(B0); + gpio_write_pin_low(B0); } else { - writePinHigh(B0); + gpio_write_pin_high(B0); } } diff --git a/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c b/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c index 0d426d3c9ac..0c23701f5b8 100644 --- a/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c +++ b/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c @@ -73,6 +73,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { #endif layer_state_t layer_state_set_user(layer_state_t state) { - writePin(C0, layer_state_cmp(state, 1)); + gpio_write_pin(C0, layer_state_cmp(state, 1)); return state; }; diff --git a/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c b/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c index 0d426d3c9ac..0c23701f5b8 100644 --- a/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c +++ b/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c @@ -73,6 +73,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { #endif layer_state_t layer_state_set_user(layer_state_t state) { - writePin(C0, layer_state_cmp(state, 1)); + gpio_write_pin(C0, layer_state_cmp(state, 1)); return state; }; diff --git a/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c b/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c index 5f475caa1b6..8d48ed9acfe 100644 --- a/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c +++ b/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c @@ -64,6 +64,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; layer_state_t layer_state_set_user(layer_state_t state) { - writePin(C0, layer_state_cmp(state, 1)); + gpio_write_pin(C0, layer_state_cmp(state, 1)); return state; }; \ No newline at end of file diff --git a/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c index 300855c452f..e4de9aff089 100644 --- a/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c +++ b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c @@ -64,6 +64,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; layer_state_t layer_state_set_user(layer_state_t state) { - writePin(C0, layer_state_cmp(state, 1)); + gpio_write_pin(C0, layer_state_cmp(state, 1)); return state; }; diff --git a/keyboards/db/db63/keymaps/default/keymap.c b/keyboards/db/db63/keymaps/default/keymap.c index 409545b2a94..b1cc922c8f4 100644 --- a/keyboards/db/db63/keymaps/default/keymap.c +++ b/keyboards/db/db63/keymaps/default/keymap.c @@ -51,10 +51,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { if (led_state.caps_lock) { rgblight_sethsv(HSV_CYAN); - writePinHigh(D1); + gpio_write_pin_high(D1); } else { rgblight_sethsv(HSV_GREEN); - writePinLow(D1); + gpio_write_pin_low(D1); } return false; } diff --git a/keyboards/dm9records/plaid/keymaps/default/keymap.c b/keyboards/dm9records/plaid/keymaps/default/keymap.c index 419f2590caf..2b366f49309 100644 --- a/keyboards/dm9records/plaid/keymaps/default/keymap.c +++ b/keyboards/dm9records/plaid/keymaps/default/keymap.c @@ -215,18 +215,18 @@ led_config_t led_config; //Set leds to saved state during powerup void keyboard_post_init_user(void) { // set LED pin modes - setPinOutput(LED_RED); - setPinOutput(LED_GREEN); + gpio_set_pin_output(LED_RED); + gpio_set_pin_output(LED_GREEN); // Call the post init code. led_config.raw = eeconfig_read_user(); if(led_config.red_mode == LEDMODE_ON) { - writePinHigh(LED_RED); + gpio_write_pin_high(LED_RED); } if(led_config.green_mode == LEDMODE_ON) { - writePinHigh(LED_GREEN); + gpio_write_pin_high(LED_GREEN); } } @@ -248,10 +248,10 @@ void led_keypress_update(uint8_t led, uint8_t led_mode, uint16_t keycode, keyrec for (int i=0;ievent.pressed) { - writePinHigh(led); + gpio_write_pin_high(led); } else { - writePinLow(led); + gpio_write_pin_low(led); } } } @@ -260,30 +260,30 @@ void led_keypress_update(uint8_t led, uint8_t led_mode, uint16_t keycode, keyrec if (record->event.pressed) { if(rand() % 2 == 1) { if(rand() % 2 == 0) { - writePinLow(led); + gpio_write_pin_low(led); } else { - writePinHigh(led); + gpio_write_pin_high(led); } } } break; case LEDMODE_KEY: if (record->event.pressed) { - writePinHigh(led); + gpio_write_pin_high(led); return; } else { - writePinLow(led); + gpio_write_pin_low(led); return; } break; case LEDMODE_ENTER: if (keycode==KC_ENT) { - writePinHigh(led); + gpio_write_pin_high(led); } else { - writePinLow(led); + gpio_write_pin_low(led); } break; @@ -345,11 +345,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { if (led_config.red_mode==LEDMODE_ON) { led_config.red_mode=LEDMODE_OFF; - writePinLow(LED_RED); + gpio_write_pin_low(LED_RED); } else { led_config.red_mode=LEDMODE_ON; - writePinHigh(LED_RED); + gpio_write_pin_high(LED_RED); } } eeconfig_update_user(led_config.raw); @@ -359,11 +359,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { if (led_config.green_mode==LEDMODE_ON) { led_config.green_mode=LEDMODE_OFF; - writePinLow(LED_GREEN); + gpio_write_pin_low(LED_GREEN); } else { led_config.green_mode=LEDMODE_ON; - writePinHigh(LED_GREEN); + gpio_write_pin_high(LED_GREEN); } } eeconfig_update_user(led_config.raw); diff --git a/keyboards/dm9records/plaid/keymaps/via/keymap.c b/keyboards/dm9records/plaid/keymaps/via/keymap.c index f54c5b9008b..37019e89a5f 100644 --- a/keyboards/dm9records/plaid/keymaps/via/keymap.c +++ b/keyboards/dm9records/plaid/keymaps/via/keymap.c @@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; bool led_update_user(led_t led_state) { - writePin(LED_RED, led_state.caps_lock); - writePin(LED_GREEN, led_state.scroll_lock); + gpio_write_pin(LED_RED, led_state.caps_lock); + gpio_write_pin(LED_GREEN, led_state.scroll_lock); return false; } diff --git a/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c b/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c index 92a10afc34f..38db55938a0 100644 --- a/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c +++ b/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c @@ -66,6 +66,6 @@ bool rgb_matrix_indicators_user(void) { } void keyboard_pre_init_user(void) { - setPinOutput(B5); - writePinLow(B5); + gpio_set_pin_output(B5); + gpio_write_pin_low(B5); } diff --git a/keyboards/dyz/synthesis60/keymaps/default/keymap.c b/keyboards/dyz/synthesis60/keymaps/default/keymap.c index bdc705f90b3..5173689dd0e 100644 --- a/keyboards/dyz/synthesis60/keymaps/default/keymap.c +++ b/keyboards/dyz/synthesis60/keymaps/default/keymap.c @@ -48,9 +48,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { layer_state_t layer_state_set_user(layer_state_t state) { if (get_highest_layer(state) != 0) { - writePinLow(C6); + gpio_write_pin_low(C6); } else { - writePinHigh(C6); + gpio_write_pin_high(C6); } return state; } diff --git a/keyboards/dyz/synthesis60/keymaps/default_arrow/keymap.c b/keyboards/dyz/synthesis60/keymaps/default_arrow/keymap.c index 5ef6db46753..3836e902f20 100644 --- a/keyboards/dyz/synthesis60/keymaps/default_arrow/keymap.c +++ b/keyboards/dyz/synthesis60/keymaps/default_arrow/keymap.c @@ -48,9 +48,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { layer_state_t layer_state_set_user(layer_state_t state) { if (get_highest_layer(state) != 0) { - writePinLow(C6); + gpio_write_pin_low(C6); } else { - writePinHigh(C6); + gpio_write_pin_high(C6); } return state; } diff --git a/keyboards/dyz/synthesis60/keymaps/via/keymap.c b/keyboards/dyz/synthesis60/keymaps/via/keymap.c index bdc705f90b3..5173689dd0e 100644 --- a/keyboards/dyz/synthesis60/keymaps/via/keymap.c +++ b/keyboards/dyz/synthesis60/keymaps/via/keymap.c @@ -48,9 +48,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { layer_state_t layer_state_set_user(layer_state_t state) { if (get_highest_layer(state) != 0) { - writePinLow(C6); + gpio_write_pin_low(C6); } else { - writePinHigh(C6); + gpio_write_pin_high(C6); } return state; } diff --git a/keyboards/evyd13/nt650/keymaps/default/keymap.c b/keyboards/evyd13/nt650/keymaps/default/keymap.c index e9978376d06..bc77aebae22 100644 --- a/keyboards/evyd13/nt650/keymaps/default/keymap.c +++ b/keyboards/evyd13/nt650/keymaps/default/keymap.c @@ -56,13 +56,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; layer_state_t layer_state_set_user(layer_state_t state) { - setPinOutput(LOCK_LED_PIN); + gpio_set_pin_output(LOCK_LED_PIN); switch (get_highest_layer(state)) { case _LOCK: - writePin(LOCK_LED_PIN, 0); + gpio_write_pin(LOCK_LED_PIN, 0); break; default: // for any other layers, or the default layer - writePin(LOCK_LED_PIN, 1); + gpio_write_pin(LOCK_LED_PIN, 1); break; } return state; diff --git a/keyboards/evyd13/wonderland/keymaps/default/keymap.c b/keyboards/evyd13/wonderland/keymaps/default/keymap.c index cb81428043e..3ef74fe3595 100644 --- a/keyboards/evyd13/wonderland/keymaps/default/keymap.c +++ b/keyboards/evyd13/wonderland/keymaps/default/keymap.c @@ -46,9 +46,9 @@ layer_state_t layer_state_set_user(layer_state_t state) { // override kb level function bool led_update_user(led_t usb_led) { - writePin(B1, !top); - writePin(B2, !middle); - writePin(B3, !bottom); + gpio_write_pin(B1, !top); + gpio_write_pin(B2, !middle); + gpio_write_pin(B3, !bottom); return false; // we are using LEDs for something else override kb } #endif diff --git a/keyboards/handwired/daishi/keymaps/default/keymap.c b/keyboards/handwired/daishi/keymaps/default/keymap.c index 696dda3a05b..453be5b095f 100644 --- a/keyboards/handwired/daishi/keymaps/default/keymap.c +++ b/keyboards/handwired/daishi/keymaps/default/keymap.c @@ -95,15 +95,15 @@ void matrix_init_user(void) { // Call the keymap level matrix init. // Set our LED pins as output - setPinOutput(C4); - setPinOutput(C5); - setPinOutput(C6); + gpio_set_pin_output(C4); + gpio_set_pin_output(C5); + gpio_set_pin_output(C6); } bool led_update_user(led_t led_state) { - writePin(C4, led_state.num_lock); - writePin(C5, led_state.caps_lock); - writePin(C6, led_state.scroll_lock); + gpio_write_pin(C4, led_state.num_lock); + gpio_write_pin(C5, led_state.caps_lock); + gpio_write_pin(C6, led_state.scroll_lock); return false; } diff --git a/keyboards/handwired/dqz11n1g/keymaps/default/keymap.c b/keyboards/handwired/dqz11n1g/keymaps/default/keymap.c index 29d9cad7b72..2a4ca0c7033 100644 --- a/keyboards/handwired/dqz11n1g/keymaps/default/keymap.c +++ b/keyboards/handwired/dqz11n1g/keymaps/default/keymap.c @@ -54,12 +54,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Show "Fun Lock" layer state via the "Fun Lock" LED */ layer_state_t layer_state_set_user(layer_state_t state) { - setPinOutput(LED_FUN_LOCK_PIN); + gpio_set_pin_output(LED_FUN_LOCK_PIN); if (layer_state_cmp(state, _FUNCTION)) - writePinHigh(LED_FUN_LOCK_PIN); + gpio_write_pin_high(LED_FUN_LOCK_PIN); else - writePinLow(LED_FUN_LOCK_PIN); + gpio_write_pin_low(LED_FUN_LOCK_PIN); return state; } diff --git a/keyboards/handwired/jopr/keymaps/default/keymap.c b/keyboards/handwired/jopr/keymaps/default/keymap.c index fc615b01091..9630ce6816f 100644 --- a/keyboards/handwired/jopr/keymaps/default/keymap.c +++ b/keyboards/handwired/jopr/keymaps/default/keymap.c @@ -25,15 +25,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { if (led_state.caps_lock) { - writePinHigh(F1); + gpio_write_pin_high(F1); } else { - writePinLow(F1); + gpio_write_pin_low(F1); } if (led_state.scroll_lock) { - writePinHigh(F0); + gpio_write_pin_high(F0); } else { - writePinLow(F0); + gpio_write_pin_low(F0); } if (!led_state.num_lock) { @@ -46,13 +46,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { if (sysreq_led) { sysreq_led = false; - writePinLow(F4); + gpio_write_pin_low(F4); } else { switch(keycode) { case KC_SYSTEM_REQUEST: sysreq_led = true; - writePinHigh(F4); + gpio_write_pin_high(F4); } } } diff --git a/keyboards/handwired/jopr/keymaps/modded_white/keymap.c b/keyboards/handwired/jopr/keymaps/modded_white/keymap.c index 69d1a56bb5c..f062953b3fa 100644 --- a/keyboards/handwired/jopr/keymaps/modded_white/keymap.c +++ b/keyboards/handwired/jopr/keymaps/modded_white/keymap.c @@ -25,15 +25,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { if (led_state.caps_lock) { - writePinHigh(F1); + gpio_write_pin_high(F1); } else { - writePinLow(F1); + gpio_write_pin_low(F1); } if (led_state.scroll_lock) { - writePinHigh(F0); + gpio_write_pin_high(F0); } else { - writePinLow(F0); + gpio_write_pin_low(F0); } if (!led_state.num_lock) { @@ -46,13 +46,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { if (sysreq_led) { sysreq_led = false; - writePinLow(F4); + gpio_write_pin_low(F4); } else { switch(keycode) { case KC_SYSTEM_REQUEST: sysreq_led = true; - writePinHigh(F4); + gpio_write_pin_high(F4); } } } diff --git a/keyboards/handwired/jotanck/keymaps/default/keymap.c b/keyboards/handwired/jotanck/keymaps/default/keymap.c index 6c3e757cecd..6a581d420b9 100644 --- a/keyboards/handwired/jotanck/keymaps/default/keymap.c +++ b/keyboards/handwired/jotanck/keymaps/default/keymap.c @@ -84,16 +84,16 @@ layer_state_t layer_state_set_user(layer_state_t state) { #ifdef JOTANCK_LEDS switch (get_highest_layer(state)) { case _LOWER: - writePinHigh(JOTANCK_LED1); - writePinLow(JOTANCK_LED2); + gpio_write_pin_high(JOTANCK_LED1); + gpio_write_pin_low(JOTANCK_LED2); break; case _RAISE: - writePinLow(JOTANCK_LED1); - writePinHigh(JOTANCK_LED2); + gpio_write_pin_low(JOTANCK_LED1); + gpio_write_pin_high(JOTANCK_LED2); break; default: - writePinLow(JOTANCK_LED1); - writePinLow(JOTANCK_LED2); + gpio_write_pin_low(JOTANCK_LED1); + gpio_write_pin_low(JOTANCK_LED2); break; }; #endif diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index 856f0eda60f..24fc4c20afd 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -76,15 +76,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } void matrix_init_user(void) { - setPinOutput(C7); - writePinLow(C7); + gpio_set_pin_output(C7); + gpio_write_pin_low(C7); } layer_state_t layer_state_set_user(layer_state_t state) { if (get_highest_layer(state)) { - writePinHigh(C7); + gpio_write_pin_high(C7); } else { - writePinLow(C7); + gpio_write_pin_low(C7); } return state; } diff --git a/keyboards/handwired/mechboards_micropad/keymaps/default/keymap.c b/keyboards/handwired/mechboards_micropad/keymaps/default/keymap.c index 69bd7ec877a..9a99d233318 100644 --- a/keyboards/handwired/mechboards_micropad/keymaps/default/keymap.c +++ b/keyboards/handwired/mechboards_micropad/keymaps/default/keymap.c @@ -51,7 +51,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case LEDCHANGE: if (record->event.pressed) { led_state = !led_state; - writePin(F6, led_state); + gpio_write_pin(F6, led_state); } break; } @@ -59,6 +59,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } void matrix_init_user(void) { - setPinOutput(F6); - writePinLow(F6); + gpio_set_pin_output(F6); + gpio_write_pin_low(F6); } diff --git a/keyboards/handwired/prime_exl/keymaps/default/keymap.c b/keyboards/handwired/prime_exl/keymaps/default/keymap.c index ed3da63a150..2f310b0b415 100644 --- a/keyboards/handwired/prime_exl/keymaps/default/keymap.c +++ b/keyboards/handwired/prime_exl/keymaps/default/keymap.c @@ -67,16 +67,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; bool led_update_user(led_t led_state) { - writePin(NUM_LOCK_LED_PIN, led_state.num_lock); - writePin(CAPS_LOCK_LED_PIN, led_state.caps_lock); - // writePin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock); + gpio_write_pin(NUM_LOCK_LED_PIN, led_state.num_lock); + gpio_write_pin(CAPS_LOCK_LED_PIN, led_state.caps_lock); + // gpio_write_pin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock); return false; } //function for layer indicator LED layer_state_t layer_state_set_user(layer_state_t state) { - writePin(SCROLL_LOCK_LED_PIN, (get_highest_layer(state) == 1)); + gpio_write_pin(SCROLL_LOCK_LED_PIN, (get_highest_layer(state) == 1)); return state; } diff --git a/keyboards/handwired/prime_exl/keymaps/via/keymap.c b/keyboards/handwired/prime_exl/keymaps/via/keymap.c index 2081d672de0..b2f53cfdc6c 100644 --- a/keyboards/handwired/prime_exl/keymaps/via/keymap.c +++ b/keyboards/handwired/prime_exl/keymaps/via/keymap.c @@ -52,16 +52,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; bool led_update_user(led_t led_state) { - writePin(NUM_LOCK_LED_PIN, led_state.num_lock); - writePin(CAPS_LOCK_LED_PIN, led_state.caps_lock); - // writePin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock); + gpio_write_pin(NUM_LOCK_LED_PIN, led_state.num_lock); + gpio_write_pin(CAPS_LOCK_LED_PIN, led_state.caps_lock); + // gpio_write_pin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock); return false; } //function for layer indicator LED layer_state_t layer_state_set_user(layer_state_t state) { - writePin(SCROLL_LOCK_LED_PIN, (get_highest_layer(state) == 1)); + gpio_write_pin(SCROLL_LOCK_LED_PIN, (get_highest_layer(state) == 1)); return state; } diff --git a/keyboards/handwired/sono1/keymaps/default/keymap.c b/keyboards/handwired/sono1/keymaps/default/keymap.c index a3bf8b71066..cd9f9bcdb69 100644 --- a/keyboards/handwired/sono1/keymaps/default/keymap.c +++ b/keyboards/handwired/sono1/keymaps/default/keymap.c @@ -150,18 +150,18 @@ layer_state_t layer_state_set_user(layer_state_t state) { /* Use LED0 and 4 (Kana and KB Lock as layer indicators) */ switch (get_highest_layer(state)) { case _FN: - writePinLow(LED_KANA_PIN); + gpio_write_pin_low(LED_KANA_PIN); break; case _MUS: - writePinLow(LED_KB_LOCK_PIN); + gpio_write_pin_low(LED_KB_LOCK_PIN); break; case _LOCK: - writePinLow(LED_KANA_PIN); - writePinLow(LED_KB_LOCK_PIN); + gpio_write_pin_low(LED_KANA_PIN); + gpio_write_pin_low(LED_KB_LOCK_PIN); break; default: // for any other layers, or the default layer - writePinHigh(LED_KANA_PIN); - writePinHigh(LED_KB_LOCK_PIN); + gpio_write_pin_high(LED_KANA_PIN); + gpio_write_pin_high(LED_KB_LOCK_PIN); break; } return state; diff --git a/keyboards/hp69/keymaps/via/keymap.c b/keyboards/hp69/keymaps/via/keymap.c index e97e1bab7d0..106cd1940dd 100644 --- a/keyboards/hp69/keymaps/via/keymap.c +++ b/keyboards/hp69/keymaps/via/keymap.c @@ -50,10 +50,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void matrix_scan_user(void) { - writePin(A7, layer_state_is(1)); + gpio_write_pin(A7, layer_state_is(1)); } bool led_update_user(led_t led_state) { - writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, led_state.caps_lock); return false; }; diff --git a/keyboards/jukaie/jk01/keymaps/default/keymap.c b/keyboards/jukaie/jk01/keymaps/default/keymap.c index 156fb77d697..243c782fad2 100644 --- a/keyboards/jukaie/jk01/keymaps/default/keymap.c +++ b/keyboards/jukaie/jk01/keymaps/default/keymap.c @@ -73,6 +73,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { #endif layer_state_t layer_state_set_user(layer_state_t state) { - writePin(C0, layer_state_cmp(state, 1)); + gpio_write_pin(C0, layer_state_cmp(state, 1)); return state; }; diff --git a/keyboards/jukaie/jk01/keymaps/via/keymap.c b/keyboards/jukaie/jk01/keymaps/via/keymap.c index 156fb77d697..243c782fad2 100644 --- a/keyboards/jukaie/jk01/keymaps/via/keymap.c +++ b/keyboards/jukaie/jk01/keymaps/via/keymap.c @@ -73,6 +73,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { #endif layer_state_t layer_state_set_user(layer_state_t state) { - writePin(C0, layer_state_cmp(state, 1)); + gpio_write_pin(C0, layer_state_cmp(state, 1)); return state; }; diff --git a/keyboards/kbdmania/kmac_pad/keymaps/default/keymap.c b/keyboards/kbdmania/kmac_pad/keymaps/default/keymap.c index e6afa533469..da94b40d79b 100644 --- a/keyboards/kbdmania/kmac_pad/keymaps/default/keymap.c +++ b/keyboards/kbdmania/kmac_pad/keymaps/default/keymap.c @@ -132,12 +132,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } bool led_update_user(led_t led_state) { - writePin(B1, led_state.num_lock); + gpio_write_pin(B1, led_state.num_lock); return false; } layer_state_t layer_state_set_user(layer_state_t state) { - writePin(B3, !IS_LAYER_ON_STATE(state, 0)); + gpio_write_pin(B3, !IS_LAYER_ON_STATE(state, 0)); return state; } diff --git a/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c index 789bb7af024..55c89dc7e80 100644 --- a/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c +++ b/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c @@ -28,7 +28,7 @@ LAYOUT_ortho_4x4( // Only for Rev1 & Rev2 #ifdef LED_RED void keyboard_post_init_user(void) { - writePinHigh(LED_RED); + gpio_write_pin_high(LED_RED); } #endif diff --git a/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c index 4ca3fc944b5..5163aa89008 100644 --- a/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c +++ b/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Only for Rev1 & Rev2 #ifdef LED_RED void keyboard_post_init_user(void) { - writePinHigh(LED_RED); + gpio_write_pin_high(LED_RED); } #endif diff --git a/keyboards/keyhive/navi10/keymaps/default/keymap.c b/keyboards/keyhive/navi10/keymaps/default/keymap.c index bbf51f56ff8..2a9de350478 100644 --- a/keyboards/keyhive/navi10/keymaps/default/keymap.c +++ b/keyboards/keyhive/navi10/keymaps/default/keymap.c @@ -99,13 +99,13 @@ void tk_finished(tap_dance_state_t *state, void *user_data){ layer_off(_ML1); //turn off the indicator LED //set LED HI to turn it off - writePinHigh(INDICATOR_LED); + gpio_write_pin_high(INDICATOR_LED); } else { //turn on the media layer layer_on(_ML1); //turn on the indicator LED //set LED pin to LOW to turn it on - writePinLow(INDICATOR_LED); + gpio_write_pin_low(INDICATOR_LED); } break; case SINGLE_HOLD: diff --git a/keyboards/kin80/keymaps/default/keymap.c b/keyboards/kin80/keymaps/default/keymap.c index 311aeed9891..50bad2a9744 100644 --- a/keyboards/kin80/keymaps/default/keymap.c +++ b/keyboards/kin80/keymaps/default/keymap.c @@ -97,6 +97,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { layer_state_t layer_state_set_user(layer_state_t state) { - writePin(LED4_PIN, layer_state_cmp(state, _NM)); + gpio_write_pin(LED4_PIN, layer_state_cmp(state, _NM)); return state; } diff --git a/keyboards/kinesis/keymaps/alvicstep/keymap.c b/keyboards/kinesis/keymaps/alvicstep/keymap.c index e9373ea2145..0068ef7d959 100644 --- a/keyboards/kinesis/keymaps/alvicstep/keymap.c +++ b/keyboards/kinesis/keymaps/alvicstep/keymap.c @@ -111,11 +111,11 @@ KC_GRV,KC_LGUI,KC_ESC,MO(_NUMPAD), KC_LBRC, layer_state_t layer_state_set_user(layer_state_t state) { //set LEDs which are triggered by a layer change #ifdef LED_COMPOSE_PIN - writePin(LED_COMPOSE_PIN, !layer_state_cmp(state, _KEYPAD)); + gpio_write_pin(LED_COMPOSE_PIN, !layer_state_cmp(state, _KEYPAD)); #endif #ifdef LED_NUM_LOCK_PIN - writePin(LED_NUM_LOCK_PIN, !layer_state_cmp(state, _NUMPAD)); + gpio_write_pin(LED_NUM_LOCK_PIN, !layer_state_cmp(state, _NUMPAD)); #endif return state; @@ -123,11 +123,11 @@ layer_state_t layer_state_set_user(layer_state_t state) { bool led_update_user(led_t led_state) { #ifdef LED_CAPS_LOCK_PIN - writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); #endif #ifdef LED_SCROLL_LOCK_PIN - writePin(LED_SCROLL_LOCK_PIN, !led_state.scroll_lock); + gpio_write_pin(LED_SCROLL_LOCK_PIN, !led_state.scroll_lock); #endif //disable default processing of LEDs diff --git a/keyboards/kmini/keymaps/default/keymap.c b/keyboards/kmini/keymaps/default/keymap.c index 571572f38f3..60fcac30eff 100755 --- a/keyboards/kmini/keymaps/default/keymap.c +++ b/keyboards/kmini/keymaps/default/keymap.c @@ -41,9 +41,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { if (led_state.caps_lock) { - writePinLow(B1); + gpio_write_pin_low(B1); } else { - writePinHigh(B1); + gpio_write_pin_high(B1); } return false; } diff --git a/keyboards/lime/keymaps/default/keymap.c b/keyboards/lime/keymaps/default/keymap.c index b208bd01e78..e3e5d5a323b 100644 --- a/keyboards/lime/keymaps/default/keymap.c +++ b/keyboards/lime/keymaps/default/keymap.c @@ -173,8 +173,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Joystick + Encoder fix */ void keyboard_post_init_kb(void) { if (is_keyboard_master()) { - writePinLow(JOYSTICK_X_PIN); - writePinLow(JOYSTICK_Y_PIN); + gpio_write_pin_low(JOYSTICK_X_PIN); + gpio_write_pin_low(JOYSTICK_Y_PIN); } } diff --git a/keyboards/makrosu/keymaps/default/keymap.c b/keyboards/makrosu/keymaps/default/keymap.c index b0c47dbdd9f..3de4f71df3a 100644 --- a/keyboards/makrosu/keymaps/default/keymap.c +++ b/keyboards/makrosu/keymaps/default/keymap.c @@ -60,9 +60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { layer_state_t layer_state_set_user(layer_state_t state) { state = update_tri_layer_state(state, _4, X_PAUSE, X_PAUSE); - writePin(IND_1, layer_state_cmp(state, 1)); - writePin(IND_2, layer_state_cmp(state, 2)); - writePin(IND_3, layer_state_cmp(state, 3)); + gpio_write_pin(IND_1, layer_state_cmp(state, 1)); + gpio_write_pin(IND_2, layer_state_cmp(state, 2)); + gpio_write_pin(IND_3, layer_state_cmp(state, 3)); return state; } @@ -89,13 +89,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { void matrix_init_user(void) { //init the Pro Micro on-board LEDs - setPinOutput(IND_1); - setPinOutput(IND_2); - setPinOutput(IND_3); + gpio_set_pin_output(IND_1); + gpio_set_pin_output(IND_2); + gpio_set_pin_output(IND_3); //set to off - writePinHigh(IND_1); - writePinHigh(IND_2); - writePinHigh(IND_3); + gpio_write_pin_high(IND_1); + gpio_write_pin_high(IND_2); + gpio_write_pin_high(IND_3); } bool encoder_update_user(uint8_t index, bool clockwise) { diff --git a/keyboards/makrosu/keymaps/via/keymap.c b/keyboards/makrosu/keymaps/via/keymap.c index b0c47dbdd9f..3de4f71df3a 100644 --- a/keyboards/makrosu/keymaps/via/keymap.c +++ b/keyboards/makrosu/keymaps/via/keymap.c @@ -60,9 +60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { layer_state_t layer_state_set_user(layer_state_t state) { state = update_tri_layer_state(state, _4, X_PAUSE, X_PAUSE); - writePin(IND_1, layer_state_cmp(state, 1)); - writePin(IND_2, layer_state_cmp(state, 2)); - writePin(IND_3, layer_state_cmp(state, 3)); + gpio_write_pin(IND_1, layer_state_cmp(state, 1)); + gpio_write_pin(IND_2, layer_state_cmp(state, 2)); + gpio_write_pin(IND_3, layer_state_cmp(state, 3)); return state; } @@ -89,13 +89,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { void matrix_init_user(void) { //init the Pro Micro on-board LEDs - setPinOutput(IND_1); - setPinOutput(IND_2); - setPinOutput(IND_3); + gpio_set_pin_output(IND_1); + gpio_set_pin_output(IND_2); + gpio_set_pin_output(IND_3); //set to off - writePinHigh(IND_1); - writePinHigh(IND_2); - writePinHigh(IND_3); + gpio_write_pin_high(IND_1); + gpio_write_pin_high(IND_2); + gpio_write_pin_high(IND_3); } bool encoder_update_user(uint8_t index, bool clockwise) { diff --git a/keyboards/marksard/leftover30/keymaps/default/keymap.c b/keyboards/marksard/leftover30/keymaps/default/keymap.c index 2e0d2aa6bb1..ce527ea5a7b 100644 --- a/keyboards/marksard/leftover30/keymaps/default/keymap.c +++ b/keyboards/marksard/leftover30/keymaps/default/keymap.c @@ -156,7 +156,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { // for exsample customize of LED inducator // bool led_update_user(led_t led_state) { -// writePin(D2, IS_LAYER_ON(_LOWER)); -// writePin(D1, IS_LAYER_ON(_RAISE)); +// gpio_write_pin(D2, IS_LAYER_ON(_LOWER)); +// gpio_write_pin(D1, IS_LAYER_ON(_RAISE)); // return false; // } diff --git a/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c b/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c index db2baa90852..831d7fa69e2 100644 --- a/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c +++ b/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c @@ -156,7 +156,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { // for exsample customize of LED inducator // bool led_update_user(led_t led_state) { -// writePin(D2, IS_LAYER_ON(_LOWER)); -// writePin(D1, IS_LAYER_ON(_RAISE)); +// gpio_write_pin(D2, IS_LAYER_ON(_LOWER)); +// gpio_write_pin(D1, IS_LAYER_ON(_RAISE)); // return false; // } diff --git a/keyboards/mechlovin/kay65/keymaps/default/keymap.c b/keyboards/mechlovin/kay65/keymaps/default/keymap.c index 189b782b206..9c2bda5ac23 100644 --- a/keyboards/mechlovin/kay65/keymaps/default/keymap.c +++ b/keyboards/mechlovin/kay65/keymaps/default/keymap.c @@ -36,12 +36,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case LOGO_LED_ON: if (record->event.pressed) { - writePinLow(D7); + gpio_write_pin_low(D7); } break; case LOGO_LED_OFF: if (record->event.pressed) { - writePinHigh(D7); + gpio_write_pin_high(D7); } break; } diff --git a/keyboards/mechlovin/kay65/keymaps/via/keymap.c b/keyboards/mechlovin/kay65/keymaps/via/keymap.c index 1f29ba8c3a8..943d8d9bf0e 100644 --- a/keyboards/mechlovin/kay65/keymaps/via/keymap.c +++ b/keyboards/mechlovin/kay65/keymaps/via/keymap.c @@ -59,12 +59,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case LOGO_LED_ON: if (record->event.pressed) { - writePinLow(D7); + gpio_write_pin_low(D7); } break; case LOGO_LED_OFF: if (record->event.pressed) { - writePinHigh(D7); + gpio_write_pin_high(D7); } break; } diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/default/keymap.c b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/default/keymap.c index 017f57b1605..a360d2c1eab 100644 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/default/keymap.c +++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/default/keymap.c @@ -32,12 +32,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case BL_ON: if (record->event.pressed) { - writePinHigh(B7); + gpio_write_pin_high(B7); } break; case BL_OFF: if (record->event.pressed) { - writePinLow(B7); + gpio_write_pin_low(B7); } break; } diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/keymap.c b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/keymap.c index 344be9548cd..e6b991de7f8 100644 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/keymap.c +++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keymaps/via/keymap.c @@ -57,12 +57,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case LOGO_LED_ON: if (record->event.pressed) { - writePinHigh(B7); + gpio_write_pin_high(B7); } break; case LOGO_LED_OFF: if (record->event.pressed) { - writePinLow(B7); + gpio_write_pin_low(B7); } break; } diff --git a/keyboards/minimon/bartlesplit/matrix.c b/keyboards/minimon/bartlesplit/matrix.c index 351781f5207..4be8496dcf4 100644 --- a/keyboards/minimon/bartlesplit/matrix.c +++ b/keyboards/minimon/bartlesplit/matrix.c @@ -30,32 +30,32 @@ static const pin_t row_pins[] = MATRIX_ROW_PINS; static const pin_t col_pins[] = MATRIX_COL_PINS; static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinLow(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_low(col_pins[col]); } static void unselect_col(uint8_t col) { - setPinInputHigh(col_pins[col]); + gpio_set_pin_input_high(col_pins[col]); } static void unselect_cols(void) { for (uint8_t x = 0; x < MATRIX_COLS/2; x++) { - setPinInputHigh(col_pins[x*2]); + gpio_set_pin_input_high(col_pins[x*2]); } } @@ -76,7 +76,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) for (uint8_t col_index = 0; col_index < MATRIX_COLS / 2; col_index++) { uint16_t column_index_bitmask = ROW_SHIFTER << ((col_index * 2) + 1); // Check row pin state - if (readPin(col_pins[col_index*2])) { + if (gpio_read_pin(col_pins[col_index*2])) { // Pin HI, clear col bit current_matrix[current_row] &= ~column_index_bitmask; } else { @@ -105,7 +105,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) uint16_t column_index_bitmask = ROW_SHIFTER << (current_col * 2); // Check row pin state - if (readPin(row_pins[row_index])) { + if (gpio_read_pin(row_pins[row_index])) { // Pin HI, clear col bit current_matrix[row_index] &= ~column_index_bitmask; } else { diff --git a/keyboards/noxary/268/keymaps/ansi/keymap.c b/keyboards/noxary/268/keymaps/ansi/keymap.c index dfbf6445499..6a81718d490 100644 --- a/keyboards/noxary/268/keymaps/ansi/keymap.c +++ b/keyboards/noxary/268/keymaps/ansi/keymap.c @@ -54,11 +54,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { if (led_state.caps_lock) { - setPinOutput(B6); - writePinHigh(B6); + gpio_set_pin_output(B6); + gpio_write_pin_high(B6); } else { - setPinInput(B6); - writePinLow(B6); + gpio_set_pin_input(B6); + gpio_write_pin_low(B6); } return false; } diff --git a/keyboards/noxary/268/keymaps/default/keymap.c b/keyboards/noxary/268/keymaps/default/keymap.c index 717dba04b27..4692ca6fc6d 100644 --- a/keyboards/noxary/268/keymaps/default/keymap.c +++ b/keyboards/noxary/268/keymaps/default/keymap.c @@ -72,12 +72,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { if (led_state.caps_lock) { - setPinOutput(B6); - writePinHigh(B6); + gpio_set_pin_output(B6); + gpio_write_pin_high(B6); } else { - setPinInput(B6); - writePinLow(B6); + gpio_set_pin_input(B6); + gpio_write_pin_low(B6); } return false; } diff --git a/keyboards/noxary/268/keymaps/iso/keymap.c b/keyboards/noxary/268/keymaps/iso/keymap.c index 827aa8bbd6a..df218461671 100644 --- a/keyboards/noxary/268/keymaps/iso/keymap.c +++ b/keyboards/noxary/268/keymaps/iso/keymap.c @@ -54,11 +54,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { if (led_state.caps_lock) { - setPinOutput(B6); - writePinHigh(B6); + gpio_set_pin_output(B6); + gpio_write_pin_high(B6); } else { - setPinInput(B6); - writePinLow(B6); + gpio_set_pin_input(B6); + gpio_write_pin_low(B6); } return false; } diff --git a/keyboards/orange75/keymaps/default/keymap.c b/keyboards/orange75/keymaps/default/keymap.c index 19321f289c8..cf5deb93752 100644 --- a/keyboards/orange75/keymaps/default/keymap.c +++ b/keyboards/orange75/keymaps/default/keymap.c @@ -55,27 +55,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { if (led_state.num_lock) { - setPinOutput(B0); - writePinLow(B0); + gpio_set_pin_output(B0); + gpio_write_pin_low(B0); } else { - setPinInput(B0); - writePinLow(B0); + gpio_set_pin_input(B0); + gpio_write_pin_low(B0); } if (led_state.caps_lock) { - setPinOutput(B1); - writePinLow(B1); + gpio_set_pin_output(B1); + gpio_write_pin_low(B1); } else { - setPinInput(B1); - writePinLow(B1); + gpio_set_pin_input(B1); + gpio_write_pin_low(B1); } if (led_state.scroll_lock) { - setPinOutput(B2); - writePinLow(B2); + gpio_set_pin_output(B2); + gpio_write_pin_low(B2); } else { - setPinInput(B2); - writePinLow(B2); + gpio_set_pin_input(B2); + gpio_write_pin_low(B2); } return false; } diff --git a/keyboards/peej/lumberjack/keymaps/via/keymap.c b/keyboards/peej/lumberjack/keymaps/via/keymap.c index 018f284a4f7..c46b868c63f 100644 --- a/keyboards/peej/lumberjack/keymaps/via/keymap.c +++ b/keyboards/peej/lumberjack/keymaps/via/keymap.c @@ -50,23 +50,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; void keyboard_pre_init_user() { - writePin(LED1, true); - writePin(LED2, true); + gpio_write_pin(LED1, true); + gpio_write_pin(LED2, true); } void keyboard_post_init_user() { - writePin(LED1, false); - writePin(LED2, false); + gpio_write_pin(LED1, false); + gpio_write_pin(LED2, false); } bool process_record_user(uint16_t keycode, keyrecord_t *record) { - writePin(LED1, record->event.pressed); + gpio_write_pin(LED1, record->event.pressed); return true; } layer_state_t layer_state_set_user(layer_state_t state) { - writePin(LED2, state); + gpio_write_pin(LED2, state); return state; } diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c index 93ee9199237..5b2b83df1a5 100644 --- a/keyboards/planck/keymaps/default/keymap.c +++ b/keyboards/planck/keymaps/default/keymap.c @@ -210,12 +210,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { backlight_step(); #endif #ifdef KEYBOARD_planck_rev5 - writePinLow(E6); + gpio_write_pin_low(E6); #endif } else { unregister_code(KC_RSFT); #ifdef KEYBOARD_planck_rev5 - writePinHigh(E6); + gpio_write_pin_high(E6); #endif } return false; diff --git a/keyboards/playkbtw/pk60/keymaps/default/keymap.c b/keyboards/playkbtw/pk60/keymaps/default/keymap.c index d8c61edf14a..c5d9da63bcd 100644 --- a/keyboards/playkbtw/pk60/keymaps/default/keymap.c +++ b/keyboards/playkbtw/pk60/keymaps/default/keymap.c @@ -22,11 +22,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { if (led_state.caps_lock) { - setPinOutput(F4); - writePinLow(F4); + gpio_set_pin_output(F4); + gpio_write_pin_low(F4); } else { - setPinInput(F4); - writePinLow(F4); + gpio_set_pin_input(F4); + gpio_write_pin_low(F4); } return false; } diff --git a/keyboards/preonic/keymaps/default/keymap.c b/keyboards/preonic/keymaps/default/keymap.c index 12bec41a85a..511ac41f20c 100644 --- a/keyboards/preonic/keymaps/default/keymap.c +++ b/keyboards/preonic/keymaps/default/keymap.c @@ -216,12 +216,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { rgblight_step(); #endif #ifdef __AVR__ - writePinLow(E6); + gpio_write_pin_low(E6); #endif } else { unregister_code(KC_RSFT); #ifdef __AVR__ - writePinHigh(E6); + gpio_write_pin_high(E6); #endif } return false; diff --git a/keyboards/primekb/prime_e/keymaps/default/keymap.c b/keyboards/primekb/prime_e/keymaps/default/keymap.c index e5e47cffc2c..0178efba2e0 100644 --- a/keyboards/primekb/prime_e/keymaps/default/keymap.c +++ b/keyboards/primekb/prime_e/keymaps/default/keymap.c @@ -47,26 +47,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void matrix_init_user(void) { // set CapsLock LED to output and low - setPinOutput(B1); - writePinLow(B1); + gpio_set_pin_output(B1); + gpio_write_pin_low(B1); // set NumLock LED to output and low - setPinOutput(B2); - writePinLow(B2); + gpio_set_pin_output(B2); + gpio_write_pin_low(B2); // set ScrollLock LED to output and low - setPinOutput(B3); - writePinLow(B3); + gpio_set_pin_output(B3); + gpio_write_pin_low(B3); } bool led_update_user(led_t led_state) { if (led_state.num_lock) { - writePinHigh(B2); + gpio_write_pin_high(B2); } else { - writePinLow(B2); + gpio_write_pin_low(B2); } if (led_state.caps_lock) { - writePinHigh(B1); + gpio_write_pin_high(B1); } else { - writePinLow(B1); + gpio_write_pin_low(B1); } return false; } @@ -75,9 +75,9 @@ bool led_update_user(led_t led_state) { layer_state_t layer_state_set_user(layer_state_t state) { if (get_highest_layer(state) == 1) { - writePinHigh(B3); + gpio_write_pin_high(B3); } else { - writePinLow(B3); + gpio_write_pin_low(B3); } return state; } diff --git a/keyboards/primekb/prime_e/keymaps/via/keymap.c b/keyboards/primekb/prime_e/keymaps/via/keymap.c index 09a42b0d165..b8d2c24797e 100644 --- a/keyboards/primekb/prime_e/keymaps/via/keymap.c +++ b/keyboards/primekb/prime_e/keymaps/via/keymap.c @@ -75,26 +75,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void matrix_init_user(void) { // set CapsLock LED to output and low - setPinOutput(B1); - writePinLow(B1); + gpio_set_pin_output(B1); + gpio_write_pin_low(B1); // set NumLock LED to output and low - setPinOutput(B2); - writePinLow(B2); + gpio_set_pin_output(B2); + gpio_write_pin_low(B2); // set ScrollLock LED to output and low - setPinOutput(B3); - writePinLow(B3); + gpio_set_pin_output(B3); + gpio_write_pin_low(B3); } bool led_update_user(led_t led_state) { if (led_state.num_lock) { - writePinHigh(B2); + gpio_write_pin_high(B2); } else { - writePinLow(B2); + gpio_write_pin_low(B2); } if (led_state.caps_lock) { - writePinHigh(B1); + gpio_write_pin_high(B1); } else { - writePinLow(B1); + gpio_write_pin_low(B1); } return false; } @@ -103,9 +103,9 @@ bool led_update_user(led_t led_state) { layer_state_t layer_state_set_user(layer_state_t state) { if (get_highest_layer(state) == 1) { - writePinHigh(B3); + gpio_write_pin_high(B3); } else { - writePinLow(B3); + gpio_write_pin_low(B3); } return state; } diff --git a/keyboards/punk75/keymaps/default/keymap.c b/keyboards/punk75/keymaps/default/keymap.c index c867e0e493d..9a6ef29307e 100644 --- a/keyboards/punk75/keymaps/default/keymap.c +++ b/keyboards/punk75/keymaps/default/keymap.c @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void led_keypress_update(pin_t led_pin, uint16_t keycode, keyrecord_t *record) { // When a key is pressed turn on the LED, when released turn it off - writePin(led_pin, record->event.pressed); + gpio_write_pin(led_pin, record->event.pressed); } bool process_record_user(uint16_t keycode, keyrecord_t *record) { diff --git a/keyboards/punk75/keymaps/via/keymap.c b/keyboards/punk75/keymaps/via/keymap.c index e284c525b64..72ef91fd370 100644 --- a/keyboards/punk75/keymaps/via/keymap.c +++ b/keyboards/punk75/keymaps/via/keymap.c @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void led_keypress_update(pin_t led_pin, uint16_t keycode, keyrecord_t *record) { // When a key is pressed turn on the LED, when released turn it off - writePin(led_pin, record->event.pressed); + gpio_write_pin(led_pin, record->event.pressed); } bool process_record_user(uint16_t keycode, keyrecord_t *record) { diff --git a/keyboards/swiftrax/retropad/keymaps/default/keymap.c b/keyboards/swiftrax/retropad/keymaps/default/keymap.c index 6fd2ff5daa2..fcbe1ededdb 100644 --- a/keyboards/swiftrax/retropad/keymaps/default/keymap.c +++ b/keyboards/swiftrax/retropad/keymaps/default/keymap.c @@ -51,20 +51,20 @@ bool encoder_update_user(uint8_t index, bool clockwise) { void matrix_init_user(void) { // set top LED to output and off (active low) - setPinOutput(D5); - writePinHigh(D5); + gpio_set_pin_output(D5); + gpio_write_pin_high(D5); // set middle LED to output and off (active low) - setPinOutput(D4); - writePinHigh(D4); + gpio_set_pin_output(D4); + gpio_write_pin_high(D4); // set bottom LED to output and off (active low) - setPinOutput(D3); - writePinHigh(D3); + gpio_set_pin_output(D3); + gpio_write_pin_high(D3); } // write to above indicators in a binary fashion based on current layer layer_state_t layer_state_set_user(layer_state_t state) { - writePin(D5, get_highest_layer(state)); - writePin(D4, !layer_state_cmp(state, 1)); - writePin(D3, !layer_state_cmp(state, 2)); + gpio_write_pin(D5, get_highest_layer(state)); + gpio_write_pin(D4, !layer_state_cmp(state, 1)); + gpio_write_pin(D3, !layer_state_cmp(state, 2)); return state; } diff --git a/keyboards/swiftrax/retropad/keymaps/via/keymap.c b/keyboards/swiftrax/retropad/keymaps/via/keymap.c index 6fd2ff5daa2..fcbe1ededdb 100644 --- a/keyboards/swiftrax/retropad/keymaps/via/keymap.c +++ b/keyboards/swiftrax/retropad/keymaps/via/keymap.c @@ -51,20 +51,20 @@ bool encoder_update_user(uint8_t index, bool clockwise) { void matrix_init_user(void) { // set top LED to output and off (active low) - setPinOutput(D5); - writePinHigh(D5); + gpio_set_pin_output(D5); + gpio_write_pin_high(D5); // set middle LED to output and off (active low) - setPinOutput(D4); - writePinHigh(D4); + gpio_set_pin_output(D4); + gpio_write_pin_high(D4); // set bottom LED to output and off (active low) - setPinOutput(D3); - writePinHigh(D3); + gpio_set_pin_output(D3); + gpio_write_pin_high(D3); } // write to above indicators in a binary fashion based on current layer layer_state_t layer_state_set_user(layer_state_t state) { - writePin(D5, get_highest_layer(state)); - writePin(D4, !layer_state_cmp(state, 1)); - writePin(D3, !layer_state_cmp(state, 2)); + gpio_write_pin(D5, get_highest_layer(state)); + gpio_write_pin(D4, !layer_state_cmp(state, 1)); + gpio_write_pin(D3, !layer_state_cmp(state, 2)); return state; } diff --git a/keyboards/uk78/keymaps/default/keymap.c b/keyboards/uk78/keymaps/default/keymap.c index 0385f8bf17c..831b872ef13 100644 --- a/keyboards/uk78/keymaps/default/keymap.c +++ b/keyboards/uk78/keymaps/default/keymap.c @@ -77,11 +77,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { if (led_state.caps_lock) { - setPinOutput(A3); - writePinHigh(A3); + gpio_set_pin_output(A3); + gpio_write_pin_high(A3); } else { - setPinInput(A3); - writePinLow(A3); + gpio_set_pin_input(A3); + gpio_write_pin_low(A3); } return false; } diff --git a/keyboards/viktus/at101_bh/keymaps/default/keymap.c b/keyboards/viktus/at101_bh/keymaps/default/keymap.c index cef4ad93cb1..5e8fae3ccd4 100644 --- a/keyboards/viktus/at101_bh/keymaps/default/keymap.c +++ b/keyboards/viktus/at101_bh/keymaps/default/keymap.c @@ -20,26 +20,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; bool led_update_user(led_t led_state) { - setPinOutput(B4); - setPinOutput(D6); - setPinOutput(D7); + gpio_set_pin_output(B4); + gpio_set_pin_output(D6); + gpio_set_pin_output(D7); if (led_state.num_lock) { - writePinHigh(D7); + gpio_write_pin_high(D7); } else { - writePinLow(D7); + gpio_write_pin_low(D7); } if (led_state.caps_lock) { - writePinHigh(B4); + gpio_write_pin_high(B4); } else { - writePinLow(B4); + gpio_write_pin_low(B4); } if (led_state.scroll_lock) { - writePinHigh(D6); + gpio_write_pin_high(D6); } else { - writePinLow(D6); + gpio_write_pin_low(D6); } return false; } diff --git a/keyboards/viktus/sp_mini/keymaps/default/keymap.c b/keyboards/viktus/sp_mini/keymaps/default/keymap.c index 939b545d0ba..3e844b2c087 100644 --- a/keyboards/viktus/sp_mini/keymaps/default/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/default/keymap.c @@ -75,30 +75,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; void keyboard_pre_init_user(void) { - setPinOutput(F5); // initialize F5 for LED - setPinOutput(F6); // initialize F6 for LED - setPinOutput(F7); // initialize F7 for LED + gpio_set_pin_output(F5); // initialize F5 for LED + gpio_set_pin_output(F6); // initialize F6 for LED + gpio_set_pin_output(F7); // initialize F7 for LED } layer_state_t layer_state_set_user(layer_state_t state) { - writePinLow(F5); - writePinLow(F6); - writePinLow(F7); + gpio_write_pin_low(F5); + gpio_write_pin_low(F6); + gpio_write_pin_low(F7); switch (get_highest_layer(state)) { case _FN1: - writePinHigh(F5); + gpio_write_pin_high(F5); break; case _FN2: - writePinHigh(F6); + gpio_write_pin_high(F6); break; case _FN3: // replace 'XXXX' with the layer or function name - writePinHigh(F7); + gpio_write_pin_high(F7); break; case KC_F24: - writePinHigh(F7); - writePinHigh(F5); - writePinHigh(F6); + gpio_write_pin_high(F7); + gpio_write_pin_high(F5); + gpio_write_pin_high(F6); break; } return state; diff --git a/keyboards/viktus/sp_mini/keymaps/via/keymap.c b/keyboards/viktus/sp_mini/keymaps/via/keymap.c index 7fd1eb0961c..e9e626a467a 100644 --- a/keyboards/viktus/sp_mini/keymaps/via/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/via/keymap.c @@ -75,38 +75,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; void keyboard_pre_init_user(void) { - setPinOutput(F5); // initialize F5 for LED - setPinOutput(F6); // initialize F6 for LED - setPinOutput(F7); // initialize F7 for LED + gpio_set_pin_output(F5); // initialize F5 for LED + gpio_set_pin_output(F6); // initialize F6 for LED + gpio_set_pin_output(F7); // initialize F7 for LED } layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case _FN1: - writePinHigh(F5); - writePinLow(F6); - writePinLow(F7); + gpio_write_pin_high(F5); + gpio_write_pin_low(F6); + gpio_write_pin_low(F7); break; case _FN2: - writePinHigh(F6); - writePinLow(F5); - writePinLow(F7); + gpio_write_pin_high(F6); + gpio_write_pin_low(F5); + gpio_write_pin_low(F7); break; case _FN3: // replace 'XXXX' with the layer or function name - writePinHigh(F7); - writePinLow(F5); - writePinLow(F6); + gpio_write_pin_high(F7); + gpio_write_pin_low(F5); + gpio_write_pin_low(F6); break; case KC_F24: - writePinHigh(F7); - writePinHigh(F5); - writePinHigh(F6); + gpio_write_pin_high(F7); + gpio_write_pin_high(F5); + gpio_write_pin_high(F6); break; default: - writePinLow(F5); - writePinLow(F6); - writePinLow(F7); + gpio_write_pin_low(F5); + gpio_write_pin_low(F6); + gpio_write_pin_low(F7); break; } return state; diff --git a/keyboards/walletburner/cajal/keymaps/default/keymap.c b/keyboards/walletburner/cajal/keymaps/default/keymap.c index 4586e5695b3..3851bc806cd 100644 --- a/keyboards/walletburner/cajal/keymaps/default/keymap.c +++ b/keyboards/walletburner/cajal/keymaps/default/keymap.c @@ -49,38 +49,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //Initialize indicator LEDs void matrix_init_user(void) { - setPinOutput(B5); - writePinLow(B5); - setPinOutput(B6); - writePinLow(B6); - setPinOutput(B7); - writePinLow(B7); + gpio_set_pin_output(B5); + gpio_write_pin_low(B5); + gpio_set_pin_output(B6); + gpio_write_pin_low(B6); + gpio_set_pin_output(B7); + gpio_write_pin_low(B7); } layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case 1: - writePinHigh(B7); - writePinLow(B6); + gpio_write_pin_high(B7); + gpio_write_pin_low(B6); break; case 2: - writePinLow(B7); - writePinHigh(B6); + gpio_write_pin_low(B7); + gpio_write_pin_high(B6); break; case 3: - writePinHigh(B7); - writePinHigh(B6); + gpio_write_pin_high(B7); + gpio_write_pin_high(B6); break; default: - writePinLow(B7); - writePinLow(B6); + gpio_write_pin_low(B7); + gpio_write_pin_low(B6); break; } return state; } bool led_update_user(led_t led_state) { - writePin(B5, led_state.caps_lock); + gpio_write_pin(B5, led_state.caps_lock); return false; } diff --git a/keyboards/walletburner/cajal/keymaps/default_ortho/keymap.c b/keyboards/walletburner/cajal/keymaps/default_ortho/keymap.c index 87575e492fd..2947f31ca84 100644 --- a/keyboards/walletburner/cajal/keymaps/default_ortho/keymap.c +++ b/keyboards/walletburner/cajal/keymaps/default_ortho/keymap.c @@ -49,34 +49,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //Initialize indicator LEDs void matrix_init_user(void) { - setPinOutput(B5); - writePinLow(B5); - setPinOutput(B6); - writePinLow(B6); - setPinOutput(B7); - writePinLow(B7); + gpio_set_pin_output(B5); + gpio_write_pin_low(B5); + gpio_set_pin_output(B6); + gpio_write_pin_low(B6); + gpio_set_pin_output(B7); + gpio_write_pin_low(B7); } layer_state_t layer_state_set_user(layer_state_t state) { - writePinLow(B7); - writePinLow(B6); + gpio_write_pin_low(B7); + gpio_write_pin_low(B6); switch (get_highest_layer(state)) { case 1: - writePinHigh(B7); + gpio_write_pin_high(B7); break; case 2: - writePinHigh(B6); + gpio_write_pin_high(B6); break; case 3: - writePinHigh(B7); - writePinHigh(B6); + gpio_write_pin_high(B7); + gpio_write_pin_high(B6); break; } return state; } bool led_update_user(led_t led_state) { - writePin(B5, led_state.caps_lock); + gpio_write_pin(B5, led_state.caps_lock); return false; } diff --git a/keyboards/walletburner/cajal/keymaps/via/keymap.c b/keyboards/walletburner/cajal/keymaps/via/keymap.c index 246bbfa2463..e104a195750 100644 --- a/keyboards/walletburner/cajal/keymaps/via/keymap.c +++ b/keyboards/walletburner/cajal/keymaps/via/keymap.c @@ -49,38 +49,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //Initialize indicator LEDs void matrix_init_user(void) { - setPinOutput(B5); - writePinLow(B5); - setPinOutput(B6); - writePinLow(B6); - setPinOutput(B7); - writePinLow(B7); + gpio_set_pin_output(B5); + gpio_write_pin_low(B5); + gpio_set_pin_output(B6); + gpio_write_pin_low(B6); + gpio_set_pin_output(B7); + gpio_write_pin_low(B7); } layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case 1: - writePinHigh(B7); - writePinLow(B6); + gpio_write_pin_high(B7); + gpio_write_pin_low(B6); break; case 2: - writePinLow(B7); - writePinHigh(B6); + gpio_write_pin_low(B7); + gpio_write_pin_high(B6); break; case 3: - writePinHigh(B7); - writePinHigh(B6); + gpio_write_pin_high(B7); + gpio_write_pin_high(B6); break; default: - writePinLow(B7); - writePinLow(B6); + gpio_write_pin_low(B7); + gpio_write_pin_low(B6); break; } return state; } bool led_update_user(led_t led_state) { - writePin(B5, led_state.caps_lock); + gpio_write_pin(B5, led_state.caps_lock); return false; } diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c index 9763abe3691..baeda467e63 100644 --- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c +++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c @@ -54,13 +54,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { // Insert custom handling for CAPS_LOCK, NUM_LOCK, SCROLL_LOCK here if (led_state.num_lock) { - writePinHigh(F4); - writePinHigh(F1); - writePinHigh(F5); + gpio_write_pin_high(F4); + gpio_write_pin_high(F1); + gpio_write_pin_high(F5); } else { - writePinLow(F4); - writePinLow(F1); - writePinLow(F5); + gpio_write_pin_low(F4); + gpio_write_pin_low(F1); + gpio_write_pin_low(F5); } return false; } diff --git a/keyboards/work_louder/work_board/keymaps/via/keymap.c b/keyboards/work_louder/work_board/keymaps/via/keymap.c index 7f0627eb672..255ee3ed789 100644 --- a/keyboards/work_louder/work_board/keymaps/via/keymap.c +++ b/keyboards/work_louder/work_board/keymaps/via/keymap.c @@ -114,20 +114,20 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } layer_state_t layer_state_set_user(layer_state_t state) { - writePinLow(B2); - writePinLow(B3); - writePinLow(B7); + gpio_write_pin_low(B2); + gpio_write_pin_low(B3); + gpio_write_pin_low(B7); if (work_louder_config.led_level) { switch (get_highest_layer(state)) { case 1: - writePinHigh(B2); + gpio_write_pin_high(B2); break; case 2: - writePinHigh(B3); + gpio_write_pin_high(B3); break; case 3: - writePinHigh(B7); + gpio_write_pin_high(B7); break; } } diff --git a/keyboards/wsk/g4m3ralpha/keymaps/default/keymap.c b/keyboards/wsk/g4m3ralpha/keymaps/default/keymap.c index 54ff0f9df50..d1e5f62d4a7 100644 --- a/keyboards/wsk/g4m3ralpha/keymaps/default/keymap.c +++ b/keyboards/wsk/g4m3ralpha/keymaps/default/keymap.c @@ -56,26 +56,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case _FN: - writePinHigh(D3); - writePinLow(D2); + gpio_write_pin_high(D3); + gpio_write_pin_low(D2); break; case _FNCHAR: - writePinLow(D3); - writePinHigh(D2); + gpio_write_pin_low(D3); + gpio_write_pin_high(D2); break; case _FKEYS: - writePinHigh(D3); - writePinHigh(D2); + gpio_write_pin_high(D3); + gpio_write_pin_high(D2); break; default: // for any other layers, or the default layer - writePinLow(D3); - writePinLow(D2); + gpio_write_pin_low(D3); + gpio_write_pin_low(D2); break; } return state; } bool led_update_user(led_t led_state) { - writePin(D0, led_state.caps_lock); + gpio_write_pin(D0, led_state.caps_lock); return false; } diff --git a/keyboards/wsk/gothic50/keymaps/default/keymap.c b/keyboards/wsk/gothic50/keymaps/default/keymap.c index 71ad616eb63..de3288b4e6a 100644 --- a/keyboards/wsk/gothic50/keymaps/default/keymap.c +++ b/keyboards/wsk/gothic50/keymaps/default/keymap.c @@ -32,21 +32,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void matrix_init_user(void) { // set CapsLock LED to output and low - setPinOutput(F6); - writePinLow(F6); + gpio_set_pin_output(F6); + gpio_write_pin_low(F6); // set NumLock LED to output and low - setPinOutput(F5); - writePinLow(F5); + gpio_set_pin_output(F5); + gpio_write_pin_low(F5); // set ScrollLock LED to output and low - setPinOutput(F4); - writePinLow(F4); + gpio_set_pin_output(F4); + gpio_write_pin_low(F4); } layer_state_t layer_state_set_user(layer_state_t state) { - writePin(F4, (state & 0x1)); - writePin(F5, (state & 0x2)); - writePin(F6, (state & 0x4)); + gpio_write_pin(F4, (state & 0x1)); + gpio_write_pin(F5, (state & 0x2)); + gpio_write_pin(F6, (state & 0x4)); return state; } diff --git a/keyboards/wsk/gothic70/keymaps/default/keymap.c b/keyboards/wsk/gothic70/keymaps/default/keymap.c index 589b30c4ef0..cbc40bb93b6 100644 --- a/keyboards/wsk/gothic70/keymaps/default/keymap.c +++ b/keyboards/wsk/gothic70/keymaps/default/keymap.c @@ -42,22 +42,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void matrix_init_user(void) { // set CapsLock LED to output and off (active low) - setPinOutput(F5); - writePinHigh(F5); + gpio_set_pin_output(F5); + gpio_write_pin_high(F5); // set NumLock LED to output and off (active low) - setPinOutput(F6); - writePinHigh(F6); + gpio_set_pin_output(F6); + gpio_write_pin_high(F6); // set ScrollLock LED to output and off (active low) - setPinOutput(F7); - writePinHigh(F7); + gpio_set_pin_output(F7); + gpio_write_pin_high(F7); } // write to above indicators in a binary fashion based on current layer layer_state_t layer_state_set_user(layer_state_t state) { - writePin(F5, (state & 0x1)); - writePin(F6, (state & 0x2)); - writePin(F7, (state & 0x4)); + gpio_write_pin(F5, (state & 0x1)); + gpio_write_pin(F6, (state & 0x2)); + gpio_write_pin(F7, (state & 0x4)); return state; } diff --git a/keyboards/wsk/gothic70/keymaps/via/keymap.c b/keyboards/wsk/gothic70/keymaps/via/keymap.c index 3f72979b924..6b511a94b1c 100644 --- a/keyboards/wsk/gothic70/keymaps/via/keymap.c +++ b/keyboards/wsk/gothic70/keymaps/via/keymap.c @@ -59,18 +59,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void matrix_init_user(void) { // set CapsLock LED to output and off (active high) - setPinOutput(F5); + gpio_set_pin_output(F5); // set NumLock LED to output and off (active high) - setPinOutput(F6); + gpio_set_pin_output(F6); // set ScrollLock LED to output and off (active high) - setPinOutput(F7); + gpio_set_pin_output(F7); } // write to above indicators in a binary fashion based on current layer layer_state_t layer_state_set_user(layer_state_t state) { - writePin(F5, (state & 0x1)); - writePin(F6, (state & 0x2)); - writePin(F7, (state & 0x4)); + gpio_write_pin(F5, (state & 0x1)); + gpio_write_pin(F6, (state & 0x2)); + gpio_write_pin(F7, (state & 0x4)); return state; } diff --git a/keyboards/wsk/jerkin/keymaps/default/keymap.c b/keyboards/wsk/jerkin/keymaps/default/keymap.c index 046d703c39c..64bec404a20 100644 --- a/keyboards/wsk/jerkin/keymaps/default/keymap.c +++ b/keyboards/wsk/jerkin/keymaps/default/keymap.c @@ -39,27 +39,27 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { void matrix_init_user(void) { // set CapsLock LED to output and low - setPinOutput(B2); - writePinLow(B2); + gpio_set_pin_output(B2); + gpio_write_pin_low(B2); // set NumLock LED to output and low - setPinOutput(B6); - writePinLow(B6); + gpio_set_pin_output(B6); + gpio_write_pin_low(B6); } layer_state_t layer_state_set_user(layer_state_t state) { if (layer_state_cmp(state, 1)) { - writePinHigh(B2); + gpio_write_pin_high(B2); } else if (state & (1<<2)) { - writePinLow(B2); - writePinHigh(B6); + gpio_write_pin_low(B2); + gpio_write_pin_high(B6); } else if (state & (1<<3)) { - writePinHigh(B2); - writePinHigh(B6); + gpio_write_pin_high(B2); + gpio_write_pin_high(B6); } else { - writePinLow(B2); - writePinLow(B6); + gpio_write_pin_low(B2); + gpio_write_pin_low(B6); } return state; } diff --git a/keyboards/zsa/voyager/matrix.c b/keyboards/zsa/voyager/matrix.c index 614c3ffa041..931af40bc83 100644 --- a/keyboards/zsa/voyager/matrix.c +++ b/keyboards/zsa/voyager/matrix.c @@ -116,7 +116,7 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { 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)); + data = ((gpio_read_pin(A0) << 0) | (gpio_read_pin(A1) << 1) | (gpio_read_pin(A2) << 2) | (gpio_read_pin(A3) << 3) | (gpio_read_pin(A6) << 4) | (gpio_read_pin(A7) << 5) | (gpio_read_pin(B0) << 6)); // unstrobe row switch (row) { case 0: From 249f1706f16a118e05b597614a85435153308056 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 26 May 2024 13:45:29 -0700 Subject: [PATCH 331/333] noroadsleft's 0.25.0 Changelogs and Touch-Ups (#23793) * Modify PR23309 changelog Adds a direct link to the pull request. * Add PR23329 changelog * Update keyboard aliases file Updates the legacy keyboard aliases for the JJ40 and JJ50, which have been moved again for version 0.25.0. * Minor touch-up for JJ40 rev1 readme --- data/mappings/keyboard_aliases.hjson | 4 ++-- docs/ChangeLog/20240526/PR23309.md | 2 +- docs/ChangeLog/20240526/PR23329.md | 13 +++++++++++++ keyboards/kprepublic/jj40/rev1/readme.md | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 docs/ChangeLog/20240526/PR23329.md diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 7421b8bfacd..57585aae923 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -306,13 +306,13 @@ "target": "jacky_studio/piggy60/rev1" }, "jj40": { - "target": "kprepublic/jj40" + "target": "kprepublic/jj40/rev1" }, "jj4x4": { "target": "kprepublic/jj4x4" }, "jj50": { - "target": "kprepublic/jj50" + "target": "kprepublic/jj50/rev1" }, "jm60": { "target": "kbdfans/jm60" diff --git a/docs/ChangeLog/20240526/PR23309.md b/docs/ChangeLog/20240526/PR23309.md index b5ca5f1e4d0..1270e74d934 100644 --- a/docs/ChangeLog/20240526/PR23309.md +++ b/docs/ChangeLog/20240526/PR23309.md @@ -1,4 +1,4 @@ -# MechKeys ACR60 Layout Updates +# MechKeys ACR60 Layout Updates ([#23309](https://github.com/qmk/qmk_firmware/pull/23309)) This PR removed and changed some of the layouts that were configured for the ACR60. If you use one of the following layouts, you will need to diff --git a/docs/ChangeLog/20240526/PR23329.md b/docs/ChangeLog/20240526/PR23329.md new file mode 100644 index 00000000000..78dc609c094 --- /dev/null +++ b/docs/ChangeLog/20240526/PR23329.md @@ -0,0 +1,13 @@ +# P3D Spacey Layout Updates ([#23329](https://github.com/qmk/qmk_firmware/pull/23329)) + +This PR removed the `LAYOUT` macro that was configured for the Spacey. +If you have a keymap for this keyboard, you will need to update your +keymap using the following steps: + +1. Change your layout macro to `LAYOUT_all`. +2. Remove the two `KC_NO` keycodes following the Space and Delete keys + on the bottom row. +3. Move the keycode for the encoder pushbutton (customarily Mute) to the + end of the top row, after the customary Backspace key. +4. Move the keycode for the Right Arrow to the end of the Shift row, + after the Down Arrow key. diff --git a/keyboards/kprepublic/jj40/rev1/readme.md b/keyboards/kprepublic/jj40/rev1/readme.md index 12d65869da3..49f644849e9 100644 --- a/keyboards/kprepublic/jj40/rev1/readme.md +++ b/keyboards/kprepublic/jj40/rev1/readme.md @@ -5,7 +5,7 @@ A compact 40% (12x4) ortholinear keyboard kit made and KPRepublic on AliExpress. * Keyboard Maintainer: [QMK Community](https://github.com/qmk) -* Hardware Supported: JJ40 rev1 (Atmega32A) +* Hardware Supported: JJ40 rev1 (ATmega32A) * Hardware Availability: [AliExpress](https://www.aliexpress.com/store/product/jj40-Custom-Mechanical-Keyboard-40-PCB-programmed-40-planck-layouts-bface-firmware-gh40/3034003_32828781103.html) Make example for this keyboard (after setting up your build environment): From c9f9cb25103817aa05da494a4551ed235a750d4c Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 28 May 2024 02:48:48 +0100 Subject: [PATCH 332/333] 2024 Q2 changelog (#23794) Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Nick Brassel --- docs/ChangeLog/20240526.md | 334 +++++++++++++++++++++++++++++ docs/ChangeLog/20240526/PR23309.md | 35 --- docs/ChangeLog/20240526/PR23329.md | 13 -- docs/_summary.md | 2 +- docs/breaking_changes.md | 20 +- docs/breaking_changes_history.md | 1 + util/list-moved-keyboards.sh | 11 + 7 files changed, 357 insertions(+), 59 deletions(-) create mode 100644 docs/ChangeLog/20240526.md delete mode 100644 docs/ChangeLog/20240526/PR23309.md delete mode 100644 docs/ChangeLog/20240526/PR23329.md create mode 100755 util/list-moved-keyboards.sh diff --git a/docs/ChangeLog/20240526.md b/docs/ChangeLog/20240526.md new file mode 100644 index 00000000000..4cf185234ce --- /dev/null +++ b/docs/ChangeLog/20240526.md @@ -0,0 +1,334 @@ +# QMK Breaking Changes - 2024 May 26 Changelog + +## Notable Features :id=notable-features + +May 2024 brings about another heavy maintenance release of QMK. Of the 209 PRs created this breaking changes cycle against the `develop` branch, 174 behind-the-scenes PRs (83%!) were aimed at converting, consolidating, and cleaning up keyboards and their configuration data. Not the most glamorous work, but it means QMK is in a much more manageable spot than what it was 3 months prior. The work steadily continues! + +## Changes Requiring User Action :id=changes-requiring-user-action + +### Updated Keyboard Codebases :id=updated-keyboard-codebases + +One note with updated keyboard names -- historical keyboard names are still considered valid when using [External Userspace](newbs_external_userspace.md) for builds. If you're already using External Userspace, you do not need to move your keymap inside your repository. + +| Old Keyboard Name | New Keyboard Name | +|------------------------------|-----------------------------------| +| adkb96 | adkb96/rev1 | +| canary/canary60rgb | canary/canary60rgb/v1 | +| handwired/meck_tkl | handwired/meck_tkl/blackpill_f401 | +| handwired/qc60 | handwired/qc60/proto | +| handwired/stef9998/split_5x7 | handwired/stef9998/split_5x7/rev1 | +| junco | junco/rev1 | +| keaboard | keaboard/rev1 | +| kprepublic/jj40 | kprepublic/jj40/rev1 | +| kprepublic/jj50 | kprepublic/jj50/rev1 | +| melgeek/mj65 | melgeek/mj65/rev3 | +| melgeek/mojo68 | melgeek/mojo68/rev1 | +| melgeek/mojo75 | melgeek/mojo75/rev1 | +| melgeek/tegic | melgeek/tegic/rev1 | +| melgeek/z70ultra | melgeek/z70ultra/rev1 | +| miiiw/blackio83 | miiiw/blackio83/rev_0100 | +| murcielago | murcielago/rev1 | +| polilla | polilla/rev1 | +| qwertyydox | qwertyydox/rev1 | +| spaceholdings/nebula68b | spaceholdings/nebula68b/solder | +| splitty | splitty/rev1 | +| xiudi/xd004 | xiudi/xd004/v1 | + +### Remove deprecated quantum keycodes ([#23407](https://github.com/qmk/qmk_firmware/pull/23407)) + +A bunch of legacy keycodes have been removed -- check [the affected keycodes](https://github.com/qmk/qmk_firmware/blob/70e34e491c297231a3f987fd69760d38e79dbfa4/quantum/quantum_keycodes_legacy.h) if you run into compilation problems, as it'll show you what the problematic keycodes should be replaced with. + +The latest of these were officially deprecated within QMK in the August 2023 breaking changes -- the new keycodes are the way forward. + +### P3D Spacey Layout Updates ([#23329](https://github.com/qmk/qmk_firmware/pull/23329)) :id=spacey-layout-updates + +This PR removed the `LAYOUT` macro that was configured for the Spacey. +If you have a keymap for this keyboard, you will need to update your +keymap using the following steps: + +1. Change your layout macro to `LAYOUT_all`. +2. Remove the two `KC_NO` keycodes following the Space and Delete keys + on the bottom row. +3. Move the keycode for the encoder pushbutton (customarily Mute) to the + end of the top row, after the customary Backspace key. +4. Move the keycode for the Right Arrow to the end of the Shift row, + after the Down Arrow key. + +### MechKeys ACR60 Layout Updates ([#23309](https://github.com/qmk/qmk_firmware/pull/23309)) :id=acr60-layout-updates + +This PR removed and changed some of the layouts that were configured for the ACR60. If you use one of the following layouts, you will need to update your keymap: + +- [`LAYOUT_hhkb`](#layout-hhkb) +- [`LAYOUT_true_hhkb`](#layout-true-hhkb) +- [`LAYOUT_directional`](#layout-directional) +- [`LAYOUT_mitchsplit`](#layout-mitchsplit) + +#### `LAYOUT_hhkb` :id=acr60-layout-hhkb + +1. Change your layout macro to `LAYOUT_60_hhkb`. +1. Remove any keycodes for the key between Left Shift and QWERTY Z. + +#### `LAYOUT_true_hhkb` :id=acr60-layout-true-hhkb + +1. Change your layout macro to `LAYOUT_60_true_hhkb`. +1. Remove any keycodes for the key between Left Shift and QWERTY Z. + +#### `LAYOUT_directional` :id=acr60-layout-directional + +1. Change your layout macro to `LAYOUT_60_ansi_arrow_split_bs`. +1. Remove any keycodes for the key between Left Shift and QWERTY Z. +1. Remove any keycodes for the keys immediately before *and* after the 1.25u key of Split Spacebar. + +If you need split spacebars, you may implement `LAYOUT_60_ansi_arrow_split_space_split_bs` and change your layout to it, removing the keycode between Left Shift and QWERTY Z. + +#### `LAYOUT_mitchsplit` :id=acr60-layout-mitchsplit + +1. Use `LAYOUT_60_ansi_split_space_split_rshift`. + +## Notable core changes :id=notable-core + +### Introduction of `keyboard.json` ([22891](https://github.com/qmk/qmk_firmware/pull/22891)) :id=keyboard-json + +One longer term goal of QMK is increased maintainability. +As part of the continued push towards [Data Driven Configuration](data_driven_config.md), the build system has been updated to simplify the existing codebase, and power future workflows. + +The `keyboard.json` configuration file allows the support of a single data file for keyboard level config. + +Additionally, +* `info.json` now represents potential fragments of config that can be shared across keyboard revisions. +* `rules.mk` is now optional - Completely blank files are no longer required. +* Currently supported keyboards have been migrated to reflect this change. + +Backwards compatibility of the old system has been maintained, but will be removed in a future breaking changes cycle. + +### Refactor ChibiOS USB endpoints to be fully async ([#21656](https://github.com/qmk/qmk_firmware/pull/21656)) + +For most users, this change will mean suspend and resume on ARM-based boards works correctly. Others will notice that their keyboard now works correctly in BIOS/UEFI. + +Essentially, changes were made in the internals of how QMK interacts with USB for ARM-based devices. Before this change, whenever a packet was attempted to be sent from the keyboard to the host machine, QMK would wait for the transmission to complete. After this change, those packets are queued and sent when opportune; this results in much better "correctness" as far as the USB protocol is concerned, and means far less likelihood of failure scenarios such as "stuck keys" or "random lockups" and the like. + +Compliance checks were run against QMK firmwares for the most popular ARM microcontrollers, as well as suspend/resume tests. As far as we can tell, a whole host of hard-to-reproduce issues are mitigated by this change. + +## Full changelist :id=full-changelist + +Core: +* Refactor vusb to protocol use pre/post task ([#14944](https://github.com/qmk/qmk_firmware/pull/14944)) +* Refactor ChibiOS USB endpoints to be fully async ([#21656](https://github.com/qmk/qmk_firmware/pull/21656)) +* Infer eeconfig identifiers ([#22135](https://github.com/qmk/qmk_firmware/pull/22135)) +* [Audio] Add support for audio shutdown pin ([#22731](https://github.com/qmk/qmk_firmware/pull/22731)) +* Enable 'keyboard.json' as a build target ([#22891](https://github.com/qmk/qmk_firmware/pull/22891)) +* Remove unuseful layer_on() call ([#23055](https://github.com/qmk/qmk_firmware/pull/23055)) +* Add init function to RGBLight driver struct ([#23076](https://github.com/qmk/qmk_firmware/pull/23076)) +* Add utility functions for Pointing Device Auto Mouse feature ([#23144](https://github.com/qmk/qmk_firmware/pull/23144)) +* Remove midi_ep_task from ChibiOS ([#23162](https://github.com/qmk/qmk_firmware/pull/23162)) +* LED drivers: add support for IS31FL3236 ([#23264](https://github.com/qmk/qmk_firmware/pull/23264)) +* Un-`extern` RGBLight `led[]` array ([#23322](https://github.com/qmk/qmk_firmware/pull/23322)) +* Update I2C API usage in keyboard code ([#23360](https://github.com/qmk/qmk_firmware/pull/23360)) +* Update GPIO expander API naming ([#23375](https://github.com/qmk/qmk_firmware/pull/23375)) +* Remove deprecated quantum keycodes ([#23407](https://github.com/qmk/qmk_firmware/pull/23407)) +* Add MacOS Czech ISO and ANSI keymaps #23346 ([#23412](https://github.com/qmk/qmk_firmware/pull/23412)) +* Rename `process_{led,rgb}_matrix()` ([#23422](https://github.com/qmk/qmk_firmware/pull/23422)) +* Separate keycode handling for LED Matrix and Backlight ([#23426](https://github.com/qmk/qmk_firmware/pull/23426)) +* Add new set of keycodes for LED Matrix ([#23432](https://github.com/qmk/qmk_firmware/pull/23432)) +* Oneshot locked mods split transaction ([#23434](https://github.com/qmk/qmk_firmware/pull/23434)) +* Bodge consolidation. ([#23448](https://github.com/qmk/qmk_firmware/pull/23448)) +* LED Matrix: replace backlight keycodes with newly added ones ([#23455](https://github.com/qmk/qmk_firmware/pull/23455)) +* Add new set of keycodes for RGB Matrix ([#23463](https://github.com/qmk/qmk_firmware/pull/23463)) +* Refactoring successive press() release() calls into tap_key() calls ([#23573](https://github.com/qmk/qmk_firmware/pull/23573)) +* Rename `RGBW` define to `WS2812_RGBW` ([#23585](https://github.com/qmk/qmk_firmware/pull/23585)) +* Normalise RGBLight (underglow) keycodes ([#23656](https://github.com/qmk/qmk_firmware/pull/23656)) +* split_util: rename `usbIsActive` to `usb_bus_detected` ([#23657](https://github.com/qmk/qmk_firmware/pull/23657)) +* Insert delay between shifted chars in send_string_with_delay for AVR ([#23673](https://github.com/qmk/qmk_firmware/pull/23673)) +* Remove useless `LED/RGB_MATRIX_ENABLE` ifdefs ([#23726](https://github.com/qmk/qmk_firmware/pull/23726)) + +CLI: +* Some metadata on QGF/QFF files ([#20101](https://github.com/qmk/qmk_firmware/pull/20101)) +* `qmk new-keyboard` - detach community layout when selecting "none of the above" ([#20405](https://github.com/qmk/qmk_firmware/pull/20405)) +* Initial `qmk test-c` functionality ([#23038](https://github.com/qmk/qmk_firmware/pull/23038)) +* Reject duplicate matrix locations in LAYOUT macros ([#23273](https://github.com/qmk/qmk_firmware/pull/23273)) +* Align 'qmk lint' argument handling ([#23297](https://github.com/qmk/qmk_firmware/pull/23297)) +* Produce warning if keyboard is not configured via `keyboard.json` ([#23321](https://github.com/qmk/qmk_firmware/pull/23321)) + +Submodule updates: +* Update ChibiOS submodules. ([#23405](https://github.com/qmk/qmk_firmware/pull/23405)) + +Keyboards: +* Move `SPLIT_KEYBOARD` to data driven ([#21410](https://github.com/qmk/qmk_firmware/pull/21410)) +* Change to `development_board` ([#21695](https://github.com/qmk/qmk_firmware/pull/21695)) +* Add solid_reactive effects for MIIIW BlackIO83 ([#22251](https://github.com/qmk/qmk_firmware/pull/22251)) +* Migrate content where only parent info.json exists ([#22895](https://github.com/qmk/qmk_firmware/pull/22895)) +* Remove redundant disabling of features ([#22926](https://github.com/qmk/qmk_firmware/pull/22926)) +* Update ScottoAlp handwired keyboard to 12 column layout ([#22962](https://github.com/qmk/qmk_firmware/pull/22962)) +* Overhaul ploopyco devices ([#22967](https://github.com/qmk/qmk_firmware/pull/22967)) +* Add rp2040_ce option to lotus58 ([#23185](https://github.com/qmk/qmk_firmware/pull/23185)) +* Migrate features from rules.mk to data driven - 0-9 ([#23202](https://github.com/qmk/qmk_firmware/pull/23202)) +* Change default RGB effect for momokai keypads to solid white ([#23217](https://github.com/qmk/qmk_firmware/pull/23217)) +* Migrate annepro2 away from custom matrix ([#23221](https://github.com/qmk/qmk_firmware/pull/23221)) +* Update BAMFK-1 ([#23236](https://github.com/qmk/qmk_firmware/pull/23236)) +* Migrate features from rules.mk to data driven - ABCD ([#23247](https://github.com/qmk/qmk_firmware/pull/23247)) +* Migrate features from rules.mk to data driven - EFGH ([#23248](https://github.com/qmk/qmk_firmware/pull/23248)) +* Remove 60_ansi_arrow_split_bs_7u_spc Community Layout ([#23259](https://github.com/qmk/qmk_firmware/pull/23259)) +* Migrate features from rules.mk to data driven - IJK ([#23276](https://github.com/qmk/qmk_firmware/pull/23276)) +* Migrate features from rules.mk to data driven - LMN ([#23277](https://github.com/qmk/qmk_firmware/pull/23277)) +* Migrate features from rules.mk to data driven - OPQR ([#23285](https://github.com/qmk/qmk_firmware/pull/23285)) +* Migrate features from rules.mk to data driven - ST ([#23286](https://github.com/qmk/qmk_firmware/pull/23286)) +* Migrate features from rules.mk to data driven - UVWXYZ ([#23287](https://github.com/qmk/qmk_firmware/pull/23287)) +* Swift65 Hotswap Layout Name Standardization ([#23288](https://github.com/qmk/qmk_firmware/pull/23288)) +* Swift65 Solder Layout Name Standardization ([#23289](https://github.com/qmk/qmk_firmware/pull/23289)) +* Migrate build target markers to keyboard.json ([#23293](https://github.com/qmk/qmk_firmware/pull/23293)) +* KPRepublic JJ50 rev1 Refactor ([#23294](https://github.com/qmk/qmk_firmware/pull/23294)) +* KPRepublic JJ40 rev1 Refactor ([#23299](https://github.com/qmk/qmk_firmware/pull/23299)) +* Migrate features and LTO from rules.mk to data driven ([#23302](https://github.com/qmk/qmk_firmware/pull/23302)) +* Add RGB lighting for the PetruziaMini ([#23305](https://github.com/qmk/qmk_firmware/pull/23305)) +* Migrate features and LTO from rules.mk to data driven ([#23307](https://github.com/qmk/qmk_firmware/pull/23307)) +* MechKeys ACR60 Layout Updates ([#23309](https://github.com/qmk/qmk_firmware/pull/23309)) +* Remove RGBLight `led[]` references ([#23311](https://github.com/qmk/qmk_firmware/pull/23311)) +* Reduce firmware size of helix/rev3 ([#23324](https://github.com/qmk/qmk_firmware/pull/23324)) +* P3D Spacey Layout Updates ([#23329](https://github.com/qmk/qmk_firmware/pull/23329)) +* Data-Driven Keyboard Conversions: 0-9 ([#23357](https://github.com/qmk/qmk_firmware/pull/23357)) +* Update GPIO API usage in keyboard code ([#23361](https://github.com/qmk/qmk_firmware/pull/23361)) +* Remove "w": 1 from keyboards/ ([#23367](https://github.com/qmk/qmk_firmware/pull/23367)) +* Remove `quantum.h` includes from keyboard custom `matrix.c`s ([#23371](https://github.com/qmk/qmk_firmware/pull/23371)) +* refactor: mechwild/bbs ([#23373](https://github.com/qmk/qmk_firmware/pull/23373)) +* Remove 'NO_USB_STARTUP_CHECK = no' from keyboards ([#23376](https://github.com/qmk/qmk_firmware/pull/23376)) +* Remove completely redundant DEFAULT_FOLDER from keyboards ([#23377](https://github.com/qmk/qmk_firmware/pull/23377)) +* Miscellaneous keyboard.json migrations ([#23378](https://github.com/qmk/qmk_firmware/pull/23378)) +* Data-Driven Keyboard Conversions: A ([#23379](https://github.com/qmk/qmk_firmware/pull/23379)) +* refactor: flehrad/bigswitch ([#23384](https://github.com/qmk/qmk_firmware/pull/23384)) +* add second encoder to matrix info of arrowmechanics/wings ([#23390](https://github.com/qmk/qmk_firmware/pull/23390)) +* Change the VID and PID of the file kb38 info.json ([#23393](https://github.com/qmk/qmk_firmware/pull/23393)) +* Remove `quantum.h` includes from keyboard code ([#23394](https://github.com/qmk/qmk_firmware/pull/23394)) +* [ UPDATE 15PAD & 6PAD ] ([#23397](https://github.com/qmk/qmk_firmware/pull/23397)) +* Remove more unnecessary `quantum.h` includes ([#23402](https://github.com/qmk/qmk_firmware/pull/23402)) +* KB name change to Part.1-75-HS ([#23403](https://github.com/qmk/qmk_firmware/pull/23403)) +* Tidy up keyboards/zvecr ([#23418](https://github.com/qmk/qmk_firmware/pull/23418)) +* "features.split" is not a valid key ([#23419](https://github.com/qmk/qmk_firmware/pull/23419)) +* Migrate build target markers to keyboard.json - YZ ([#23421](https://github.com/qmk/qmk_firmware/pull/23421)) +* refactor: mechwild/waka60 ([#23423](https://github.com/qmk/qmk_firmware/pull/23423)) +* Convert some AVR GPIO operations to macros ([#23424](https://github.com/qmk/qmk_firmware/pull/23424)) +* Data-Driven Keyboard Conversions: B ([#23425](https://github.com/qmk/qmk_firmware/pull/23425)) +* Tidy up default layer handling in keymaps ([#23436](https://github.com/qmk/qmk_firmware/pull/23436)) +* Added Chapter1 ([#23452](https://github.com/qmk/qmk_firmware/pull/23452)) +* Data-driven Keyboard Conversions: C ([#23453](https://github.com/qmk/qmk_firmware/pull/23453)) +* Migrate build target markers to keyboard.json - X ([#23460](https://github.com/qmk/qmk_firmware/pull/23460)) +* Data-Driven Keyboard Conversions: D ([#23461](https://github.com/qmk/qmk_firmware/pull/23461)) +* Miscellaneous keyboard.json migrations ([#23486](https://github.com/qmk/qmk_firmware/pull/23486)) +* Migrate build target markers to keyboard.json - 0AB ([#23488](https://github.com/qmk/qmk_firmware/pull/23488)) +* Migrate build target markers to keyboard.json - W ([#23511](https://github.com/qmk/qmk_firmware/pull/23511)) +* Data-Driven Keyboard Conversions: E ([#23512](https://github.com/qmk/qmk_firmware/pull/23512)) +* Migrate build target markers to keyboard.json - TUV ([#23514](https://github.com/qmk/qmk_firmware/pull/23514)) +* Migrate build target markers to keyboard.json - DE ([#23515](https://github.com/qmk/qmk_firmware/pull/23515)) +* Data-Driven Keyboard Conversions: F ([#23516](https://github.com/qmk/qmk_firmware/pull/23516)) +* Data-Driven Keyboard Conversions: G ([#23522](https://github.com/qmk/qmk_firmware/pull/23522)) +* Data-Driven Keyboard Conversions: H, Part 1 ([#23524](https://github.com/qmk/qmk_firmware/pull/23524)) +* Data-Driven Keyboard Conversions: H, Part 2 ([#23525](https://github.com/qmk/qmk_firmware/pull/23525)) +* Migrate build target markers to keyboard.json - C ([#23529](https://github.com/qmk/qmk_firmware/pull/23529)) +* Data-Driven Keyboard Conversions: H, Part 3 ([#23530](https://github.com/qmk/qmk_firmware/pull/23530)) +* Migrate build target markers to keyboard.json - S ([#23532](https://github.com/qmk/qmk_firmware/pull/23532)) +* Data-Driven Keyboard Conversions: I ([#23533](https://github.com/qmk/qmk_firmware/pull/23533)) +* Migrate build target markers to keyboard.json - FG ([#23534](https://github.com/qmk/qmk_firmware/pull/23534)) +* Migrate build target markers to keyboard.json - HI ([#23540](https://github.com/qmk/qmk_firmware/pull/23540)) +* Remove *_SUPPORTED = yes ([#23541](https://github.com/qmk/qmk_firmware/pull/23541)) +* Migrate build target markers to keyboard.json - R ([#23542](https://github.com/qmk/qmk_firmware/pull/23542)) +* Data-Driven Keyboard Conversions: J ([#23547](https://github.com/qmk/qmk_firmware/pull/23547)) +* Data-Driven Keyboard Conversions: K, Part 1 ([#23556](https://github.com/qmk/qmk_firmware/pull/23556)) +* Tidy use of raw hid within keyboards ([#23557](https://github.com/qmk/qmk_firmware/pull/23557)) +* Data-Driven Keyboard Conversions: K, Part 2 ([#23562](https://github.com/qmk/qmk_firmware/pull/23562)) +* Migrate build target markers to keyboard.json - OQ ([#23564](https://github.com/qmk/qmk_firmware/pull/23564)) +* Migrate build target markers to keyboard.json - P ([#23565](https://github.com/qmk/qmk_firmware/pull/23565)) +* Data-Driven Keyboard Conversions: K, Part 3 ([#23566](https://github.com/qmk/qmk_firmware/pull/23566)) +* Data-Driven Keyboard Conversions: K, Part 4 ([#23567](https://github.com/qmk/qmk_firmware/pull/23567)) +* Data-Driven Keyboard Conversions: K, Part 5 ([#23569](https://github.com/qmk/qmk_firmware/pull/23569)) +* Data-Driven Keyboard Conversions: L ([#23576](https://github.com/qmk/qmk_firmware/pull/23576)) +* Migrate build target markers to keyboard.json - JK ([#23588](https://github.com/qmk/qmk_firmware/pull/23588)) +* Migrate build target markers to keyboard.json - N ([#23589](https://github.com/qmk/qmk_firmware/pull/23589)) +* Data-Driven Keyboard Conversions: M, Part 1 ([#23590](https://github.com/qmk/qmk_firmware/pull/23590)) +* Add haptic driver to keyboard.json schema ([#23591](https://github.com/qmk/qmk_firmware/pull/23591)) +* Migrate build target markers to keyboard.json - Keychron ([#23593](https://github.com/qmk/qmk_firmware/pull/23593)) +* Remove RGBLIGHT_SPLIT in rules.mk ([#23599](https://github.com/qmk/qmk_firmware/pull/23599)) +* Data-Driven Keyboard Conversions: M, Part 2 ([#23601](https://github.com/qmk/qmk_firmware/pull/23601)) +* Align NO_SUSPEND_POWER_DOWN keyboard config ([#23606](https://github.com/qmk/qmk_firmware/pull/23606)) +* Migrate build target markers to keyboard.json - L ([#23607](https://github.com/qmk/qmk_firmware/pull/23607)) +* Migrate build target markers to keyboard.json - Misc ([#23609](https://github.com/qmk/qmk_firmware/pull/23609)) +* Migrate build target markers to keyboard.json - Misc ([#23612](https://github.com/qmk/qmk_firmware/pull/23612)) +* Data-Driven Keyboard Conversions: M, Part 3 ([#23614](https://github.com/qmk/qmk_firmware/pull/23614)) +* Add audio driver to keyboard.json schema ([#23616](https://github.com/qmk/qmk_firmware/pull/23616)) +* Data-Driven Keyboard Conversions: BastardKB ([#23622](https://github.com/qmk/qmk_firmware/pull/23622)) +* Data-Driven Keyboard Conversions: Mechlovin ([#23624](https://github.com/qmk/qmk_firmware/pull/23624)) +* Migrate build target markers to keyboard.json - BM ([#23627](https://github.com/qmk/qmk_firmware/pull/23627)) +* gh80_3000 - Enable indicator LED functionality ([#23633](https://github.com/qmk/qmk_firmware/pull/23633)) +* Iris keymap update ([#23635](https://github.com/qmk/qmk_firmware/pull/23635)) +* Migrate build target markers to keyboard.json - Misc ([#23653](https://github.com/qmk/qmk_firmware/pull/23653)) +* Add via support for craftwalk ([#23658](https://github.com/qmk/qmk_firmware/pull/23658)) +* Align RGBKB keyboards to current standards ([#23663](https://github.com/qmk/qmk_firmware/pull/23663)) +* Remove 'split.transport.protocol=serial_usart' ([#23668](https://github.com/qmk/qmk_firmware/pull/23668)) +* Remove redundant keymap templates ([#23685](https://github.com/qmk/qmk_firmware/pull/23685)) +* Change all RGB mode keycodes to short aliases ([#23691](https://github.com/qmk/qmk_firmware/pull/23691)) +* Adjust keycode alignment around `QK_BOOT` ([#23697](https://github.com/qmk/qmk_firmware/pull/23697)) +* Remove RGB keycodes from boards with no RGB config ([#23709](https://github.com/qmk/qmk_firmware/pull/23709)) +* Miscellaneous Data-Driven Keyboard Conversions ([#23712](https://github.com/qmk/qmk_firmware/pull/23712)) +* Delete trivial keymap readmes ([#23714](https://github.com/qmk/qmk_firmware/pull/23714)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: 0-9 ([#23716](https://github.com/qmk/qmk_firmware/pull/23716)) +* Add media key support to Riot Pad ([#23719](https://github.com/qmk/qmk_firmware/pull/23719)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: A-C, Part 1 ([#23745](https://github.com/qmk/qmk_firmware/pull/23745)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: A-C, Part 2 ([#23746](https://github.com/qmk/qmk_firmware/pull/23746)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: A-C, Part 3 ([#23747](https://github.com/qmk/qmk_firmware/pull/23747)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: D, Part 1 ([#23749](https://github.com/qmk/qmk_firmware/pull/23749)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: D, Part 2 ([#23750](https://github.com/qmk/qmk_firmware/pull/23750)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: E ([#23751](https://github.com/qmk/qmk_firmware/pull/23751)) +* Move VIA config to keymap level ([#23754](https://github.com/qmk/qmk_firmware/pull/23754)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: F ([#23757](https://github.com/qmk/qmk_firmware/pull/23757)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: G ([#23758](https://github.com/qmk/qmk_firmware/pull/23758)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: H, Part 1 ([#23759](https://github.com/qmk/qmk_firmware/pull/23759)) +* Remove includes of config.h ([#23760](https://github.com/qmk/qmk_firmware/pull/23760)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: H, Part 2 ([#23762](https://github.com/qmk/qmk_firmware/pull/23762)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: H, Part 3 ([#23763](https://github.com/qmk/qmk_firmware/pull/23763)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: H, Part 4 ([#23764](https://github.com/qmk/qmk_firmware/pull/23764)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: I-J ([#23767](https://github.com/qmk/qmk_firmware/pull/23767)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: K, Part 1 ([#23768](https://github.com/qmk/qmk_firmware/pull/23768)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: K, Part 2 ([#23769](https://github.com/qmk/qmk_firmware/pull/23769)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: K, Part 3 ([#23770](https://github.com/qmk/qmk_firmware/pull/23770)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: L ([#23771](https://github.com/qmk/qmk_firmware/pull/23771)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: M, Part 1 ([#23772](https://github.com/qmk/qmk_firmware/pull/23772)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: M, Part 2 ([#23773](https://github.com/qmk/qmk_firmware/pull/23773)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: N ([#23774](https://github.com/qmk/qmk_firmware/pull/23774)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: O ([#23778](https://github.com/qmk/qmk_firmware/pull/23778)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: P, Part 1 ([#23779](https://github.com/qmk/qmk_firmware/pull/23779)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: P, Part 2 ([#23780](https://github.com/qmk/qmk_firmware/pull/23780)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: Q-R ([#23781](https://github.com/qmk/qmk_firmware/pull/23781)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: S, Part 1 ([#23783](https://github.com/qmk/qmk_firmware/pull/23783)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: S, Part 2 ([#23784](https://github.com/qmk/qmk_firmware/pull/23784)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: T ([#23785](https://github.com/qmk/qmk_firmware/pull/23785)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: U-V ([#23786](https://github.com/qmk/qmk_firmware/pull/23786)) +* Remove some useless code from keymaps ([#23787](https://github.com/qmk/qmk_firmware/pull/23787)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: W, Part 1 ([#23788](https://github.com/qmk/qmk_firmware/pull/23788)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: W, Part 2 ([#23789](https://github.com/qmk/qmk_firmware/pull/23789)) +* Migrate `LOCKING_*_ENABLE` to Data-Driven: X-Z ([#23790](https://github.com/qmk/qmk_firmware/pull/23790)) +* Update GPIO macros in keymaps ([#23792](https://github.com/qmk/qmk_firmware/pull/23792)) +* noroadsleft's 0.25.0 Changelogs and Touch-Ups ([#23793](https://github.com/qmk/qmk_firmware/pull/23793)) + +Keyboard fixes: +* Fix mapping of GUI/ALT for Win/Mac layers ([#22662](https://github.com/qmk/qmk_firmware/pull/22662)) +* Adding standard keymap for wave keyboard to fix #22695 ([#22741](https://github.com/qmk/qmk_firmware/pull/22741)) +* Fixup qk100 (firmware size) ([#23169](https://github.com/qmk/qmk_firmware/pull/23169)) +* Fixup mechlovin/octagon ([#23179](https://github.com/qmk/qmk_firmware/pull/23179)) +* Fix up scanning for Djinn, post-asyncUSB. ([#23188](https://github.com/qmk/qmk_firmware/pull/23188)) +* Fixup annepro2 ([#23206](https://github.com/qmk/qmk_firmware/pull/23206)) +* Fixed keychron q1v1 led config for iso layout ([#23222](https://github.com/qmk/qmk_firmware/pull/23222)) +* Fixes for idobao vendor keymaps ([#23246](https://github.com/qmk/qmk_firmware/pull/23246)) +* Fixup work_board ([#23266](https://github.com/qmk/qmk_firmware/pull/23266)) +* Linworks FAve 87H Keymap Refactor/Bugfix ([#23292](https://github.com/qmk/qmk_firmware/pull/23292)) +* Align encoder layout validation with encoder.h logic ([#23330](https://github.com/qmk/qmk_firmware/pull/23330)) +* 0xcb/splaytoraid: remove `CONVERT_TO` at keyboard level ([#23395](https://github.com/qmk/qmk_firmware/pull/23395)) +* 40percentclub/gherkin: remove `CONVERT_TO` at keyboard level ([#23396](https://github.com/qmk/qmk_firmware/pull/23396)) +* Fix spaceholdings/nebula68b ([#23399](https://github.com/qmk/qmk_firmware/pull/23399)) +* Fix failing keyboards on develop ([#23406](https://github.com/qmk/qmk_firmware/pull/23406)) +* Corrections to split keyboard migrations ([#23462](https://github.com/qmk/qmk_firmware/pull/23462)) +* Fix iris via keymap ([#23652](https://github.com/qmk/qmk_firmware/pull/23652)) +* xiudi/xd75 - Fix backlight compilation issues ([#23655](https://github.com/qmk/qmk_firmware/pull/23655)) + +Bugs: +* WS2812 PWM: prefix for DMA defines ([#23111](https://github.com/qmk/qmk_firmware/pull/23111)) +* Fix rgblight init ([#23335](https://github.com/qmk/qmk_firmware/pull/23335)) +* Fix WAIT_FOR_USB handling ([#23598](https://github.com/qmk/qmk_firmware/pull/23598)) +* Fix PS/2 Trackpoint mouse clicks (#22265) ([#23694](https://github.com/qmk/qmk_firmware/pull/23694)) diff --git a/docs/ChangeLog/20240526/PR23309.md b/docs/ChangeLog/20240526/PR23309.md deleted file mode 100644 index 1270e74d934..00000000000 --- a/docs/ChangeLog/20240526/PR23309.md +++ /dev/null @@ -1,35 +0,0 @@ -# MechKeys ACR60 Layout Updates ([#23309](https://github.com/qmk/qmk_firmware/pull/23309)) - -This PR removed and changed some of the layouts that were configured for -the ACR60. If you use one of the following layouts, you will need to -update your keymap: - -- [`LAYOUT_hhkb`](#layout-hhkb) -- [`LAYOUT_true_hhkb`](#layout-true-hhkb) -- [`LAYOUT_directional`](#layout-directional) -- [`LAYOUT_mitchsplit`](#layout-mitchsplit) - -## `LAYOUT_hhkb` :id=layout-hhkb - -1. Change your layout macro to `LAYOUT_60_hhkb`. -2. Remove any keycodes for the key between Left Shift and QWERTY Z. - -## `LAYOUT_true_hhkb` :id=layout-true-hhkb - -1. Change your layout macro to `LAYOUT_60_true_hhkb`. -2. Remove any keycodes for the key between Left Shift and QWERTY Z. - -## `LAYOUT_directional` :id=layout-directional - -1. Change your layout macro to `LAYOUT_60_ansi_arrow_split_bs`. -2. Remove any keycodes for the key between Left Shift and QWERTY Z. -3. Remove any keycodes for the keys immediately before *and* after the -1.25u key of Split Spacebar. - -If you need split spacebars, you may implement -`LAYOUT_60_ansi_arrow_split_space_split_bs` and change your layout to -it, removing the keycode between Left Shift and QWERTY Z. - -## `LAYOUT_mitchsplit` :id=layout-mitchsplit - -1. Use `LAYOUT_60_ansi_split_space_split_rshift`. diff --git a/docs/ChangeLog/20240526/PR23329.md b/docs/ChangeLog/20240526/PR23329.md deleted file mode 100644 index 78dc609c094..00000000000 --- a/docs/ChangeLog/20240526/PR23329.md +++ /dev/null @@ -1,13 +0,0 @@ -# P3D Spacey Layout Updates ([#23329](https://github.com/qmk/qmk_firmware/pull/23329)) - -This PR removed the `LAYOUT` macro that was configured for the Spacey. -If you have a keymap for this keyboard, you will need to update your -keymap using the following steps: - -1. Change your layout macro to `LAYOUT_all`. -2. Remove the two `KC_NO` keycodes following the Space and Delete keys - on the bottom row. -3. Move the keycode for the encoder pushbutton (customarily Mute) to the - end of the top row, after the customary Backspace key. -4. Move the keycode for the Right Arrow to the end of the Shift row, - after the Down Arrow key. diff --git a/docs/_summary.md b/docs/_summary.md index fb584955ce1..adf48cec85d 100644 --- a/docs/_summary.md +++ b/docs/_summary.md @@ -138,7 +138,7 @@ * Breaking Changes * [Overview](breaking_changes.md) * [My Pull Request Was Flagged](breaking_changes_instructions.md) - * [Most Recent ChangeLog](ChangeLog/20240225.md "QMK v0.24.0 - 2024 Feb 25") + * [Most Recent ChangeLog](ChangeLog/20240526.md "QMK v0.25.0 - 2024 May 26") * [Past Breaking Changes](breaking_changes_history.md) * C Development diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index b60118cd641..1c0b1bafceb 100644 --- a/docs/breaking_changes.md +++ b/docs/breaking_changes.md @@ -10,25 +10,25 @@ Practically, this means QMK merges the `develop` branch into the `master` branch ## What has been included in past Breaking Changes? +* [2024 May 26](ChangeLog/20240526.md) * [2024 Feb 25](ChangeLog/20240225.md) * [2023 Nov 26](ChangeLog/20231126.md) -* [2023 Aug 27](ChangeLog/20230827.md) * [Older Breaking Changes](breaking_changes_history.md) ## When is the next Breaking Change? -The next Breaking Change is scheduled for May 26, 2024. +The next Breaking Change is scheduled for August 25, 2024. ### Important Dates -* 2024 Feb 25 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. -* 2024 Apr 28 - `develop` closed to new PRs. -* 2024 Apr 28 - Call for testers. -* 2024 May 5 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes -* 2024 May 19 - `develop` is locked, only critical bugfix PRs merged. -* 2024 May 23 - `master` is locked, no PRs merged. -* 2024 May 26 - Merge `develop` to `master`. -* 2024 May 26 - `master` is unlocked. PRs can be merged again. +* 2024 May 26 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. +* 2024 Jul 28 - `develop` closed to new PRs. +* 2024 Jul 28 - Call for testers. +* 2024 Aug 4 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes +* 2024 Aug 18 - `develop` is locked, only critical bugfix PRs merged. +* 2024 Aug 22 - `master` is locked, no PRs merged. +* 2024 Aug 25 - Merge `develop` to `master`. +* 2024 Aug 25 - `master` is unlocked. PRs can be merged again. ## What changes will be included? diff --git a/docs/breaking_changes_history.md b/docs/breaking_changes_history.md index 6e304685b52..6f0f25be0e6 100644 --- a/docs/breaking_changes_history.md +++ b/docs/breaking_changes_history.md @@ -2,6 +2,7 @@ This page links to all previous changelogs from the QMK Breaking Changes process. +* [2024 May 26](ChangeLog/20240526.md) - version 0.25.0 * [2024 Feb 25](ChangeLog/20240225.md) - version 0.24.0 * [2023 Nov 26](ChangeLog/20231126.md) - version 0.23.0 * [2023 Aug 27](ChangeLog/20230827.md) - version 0.22.0 diff --git a/util/list-moved-keyboards.sh b/util/list-moved-keyboards.sh new file mode 100755 index 00000000000..1a39f512a25 --- /dev/null +++ b/util/list-moved-keyboards.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +echo "This might take a while... let it sit." >&2 + +git cherry upstream/master upstream/develop | awk '{print $2}' | while read sha1; do + git diff --name-status -M25 ${sha1}^..${sha1} | grep 'keyboards/' | grep '^R' | grep -E '(info|keyboard).json' +done | sed -e 's@keyboards/@@g' -e 's@/info.json@@g' -e 's@/keyboard.json@@g' | sort -k+2 | while IFS=$'\n' read line; do + if [[ $(echo $line | awk '{print $2}') != $(echo $line | awk '{print $3}') ]]; then + echo $line + fi +done | sort -k+2 | awk '{printf "| %s | %s |\n", $2, $3}' | column -t | sort From 465ab5a20643722c9b712c6b6924472b7345dd64 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 28 May 2024 14:37:58 +1000 Subject: [PATCH 333/333] Merge point for 2024q2 Breaking Changes. - Remove `develop` notice from readme. --- readme.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/readme.md b/readme.md index c277ca0aade..f0e49a08e95 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,3 @@ -# THIS IS THE DEVELOP BRANCH - -Warning- This is the `develop` branch of QMK Firmware. You may encounter broken code here. Please see [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) for more information. - # Quantum Mechanical Keyboard Firmware [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)